Gộp một số endpoint vào /chat

app.py

@@ -66,8 +66,13 @@ class StateManager:
         """Clear all conversation history and reset state via API"""
         if state.session_id is not None and API_BASE_URL:
             try:
-                requests.post(f"{API_BASE_URL}/clear_memory",
-                              json={"reset_cache": True, "reset_model": False, "session_id": state.session_id})
+                payload = {
+                    "reset_cache": True, 
+                    "reset_model": False, 
+                    "session_id": state.session_id
+                }
+                response = requests.post(f"{API_BASE_URL}/clear_memory", json=payload)
+                print(f"Clear memory response: {response.status_code}")
             except Exception as e:
                 print(f"Warning: clear_memory failed: {e}")
         
@@ -79,15 +84,7 @@ class StateManager:
     @staticmethod
     def change_model(state: ConversationState, model_name: str):
         """Change the selected model"""
-        if API_BASE_URL:
-            try:
-                requests.post(f"{API_BASE_URL}/set_model",
-                              json={"model_name": model_name})
-                state.selected_model = model_name
-            except Exception as e:
-                print(f"Warning: set_model failed: {e}")
-        else:
-            state.selected_model = model_name
+        state.selected_model = model_name
     
     @staticmethod
     def toggle_product_model_search(state: ConversationState):
@@ -117,46 +114,64 @@ class ChatService:
         # Call API
         try:
             if image_path:
+                # For image uploads, use form-data format as expected by API
                 with open(image_path, 'rb') as f:
                     files = {"image": f}
                     data = {
                         "message": message,
                         "product_model_search": str(state.product_model_search).lower(),
-                        "session_id": state.session_id
+                        "session_id": state.session_id,
+                        "llm_model": state.selected_model,
+                        "debug": "Normal"
                     }
                     resp = requests.post(
-                        f"{API_BASE_URL}/chat_with_image", files=files, data=data, timeout=120)
+                        f"{API_BASE_URL}/chat_with_image", 
+                        files=files, 
+                        data=data, 
+                        timeout=120
+                    )
             else:
-                payload = {
+                # For text messages, use form-data format as expected by API
+                data = {
                     "message": message,
                     "session_id": state.session_id,
                     "debug": "Normal",
-                    "product_model_search": state.product_model_search
+                    "product_model_search": state.product_model_search,
+                    "llm_model": state.selected_model
                 }
-                resp = requests.post(f"{API_BASE_URL}/chat",
-                                     json=payload, timeout=120)
+                resp = requests.post(
+                    f"{API_BASE_URL}/chat",
+                    data=data,  # Changed from json to data for form format
+                    timeout=120
+                )
 
             if resp.status_code == 200:
                 j = resp.json()
                 response = j.get("response", "")
                 specs_advantages = j.get("specs_advantages")
                 solution_packages = j.get("solution_packages")
-                raw_documents = j.get("raw_documents")
+                raw_documents = j.get("raw_documents")  # This might be None from API
                 outputs = j.get("outputs")
             else:
+                print(f"API Error: {resp.status_code} - {resp.text}")
                 response = f"Error: API status {resp.status_code}"
                 specs_advantages, solution_packages, raw_documents, outputs = None, None, None, None
         except Exception as e:
+            print(f"Exception calling API: {e}")
             response = f"Error calling API: {e}"
             specs_advantages, solution_packages, raw_documents, outputs = None, None, None, None
 
         end = time.perf_counter()
 
         # Update state
-        state.specs_advantages = specs_advantages
-        state.solution_packages = solution_packages
-        state.raw_documents = raw_documents
-        state.outputs = outputs
+        if specs_advantages is not None:
+            state.specs_advantages = specs_advantages
+        if solution_packages is not None:
+            state.solution_packages = solution_packages
+        if raw_documents is not None:
+            state.raw_documents = raw_documents
+        if outputs is not None:
+            state.outputs = outputs
 
         # Filter products based on query
         if state.specs_advantages is not None:
@@ -211,7 +226,7 @@ class DisplayService:
 
             # Handle both products and solution packages
             if url:
-                full_name = f"**[{data['name']} {model}]({url})**"
+                full_name = f"**[{data['name']} {model}]({url + '.html'})**"
             else:
                 full_name = f"**{data['name']} {model}**"
 
@@ -296,41 +311,6 @@ class DisplayService:
         markdown_table = df.to_markdown(index=False)
         return f"📄 **Thông số kỹ thuật**\n\n{markdown_table}"
     
-    # @staticmethod
-    # def show_advantages(state: ConversationState) -> str:
-    #     """Generate advantages table"""
-    #     specs_map = state.specs_advantages
-    #     columns = ["Tên", "Ưu điểm nổi trội"]
-    #     table_data = []
-
-    #     if not specs_map:
-    #         return "💡 **Ưu điểm nổi trội**\n\nKhông có ưu điểm nào."
-
-    #     for prod_id, data in specs_map.items():
-    #         adv = data.get("advantages", "Không có ưu điểm")
-    #         model = data.get("model", "")
-    #         url = data.get("url", "")
-
-    #         if adv not in ["Không có ưu điểm", "", None]:
-    #             adv = adv.replace("\n", "") 
-
-    #         # Handle both products and solution packages
-    #         if url:
-    #             full_name = f"**[{data['name']} {model}]({url})**"
-    #         else:
-    #             full_name = f"**{data['name']} {model}**"
-
-    #         if adv not in ["Không có ưu điểm", "", None]:
-    #             table_data.append([full_name, adv])
-
-    #     if table_data:
-    #         df = pd.DataFrame(table_data, columns=columns)
-    #     else:
-    #         df = pd.DataFrame([["Không có ưu điểm", ""]], columns=columns)
-
-    #     markdown_table = df.to_markdown(index=False)
-    #     return f"💡 **Ưu điểm nổi trội**\n\n{markdown_table}"
-
     @staticmethod
     def show_advantages(state: ConversationState) -> str:
         """Generate advantages as bullet list instead of table"""
@@ -377,21 +357,24 @@ class DisplayService:
     @staticmethod
     def show_all_products_table(state: ConversationState):
         outputs = state.outputs or {}
-        tags = outputs.get("tags", [])
 
         if not outputs:
             return "Không có dữ liệu sản phẩm"
         
         try:
+            # Updated to match API format - send outputs in request body
+            payload = {"outputs": outputs}
             resp = requests.post(f"{API_BASE_URL}/products_by_category",
-                                 json={"outputs": outputs}, timeout=60)
+                                 json=payload, timeout=60)
 
             if resp.status_code == 200:
                 data = resp.json()
                 return data.get("markdown_table", "Không có dữ liệu sản phẩm")
             else:
+                print(f"All products API error: {resp.status_code} - {resp.text}")
                 return "Không có dữ liệu sản phẩm"
         except Exception as e:
+            print(f"Exception in show_all_products_table: {e}")
             return f"Error: {e}"