Revert "Thử dùng app_old.py để kiểm tra tính năng multimodal"

This reverts commit bb81714c275c5ce0e18f1c0605cd91256c56ff4c.

app.py

@@ -11,7 +11,7 @@ import uuid
 from datetime import datetime, timedelta
 
 
-API_BASE_URL = os.getenv("API_BASE_URL")
+API_BASE_URL = "https://sale-agent-m179.onrender.com"
 
 
 @dataclass
@@ -26,6 +26,7 @@ class ConversationState:
     product_model_search: bool = False
     method: str = "dense"  # "dense", "sparse", "hybrid"
     is_enhance_query: bool = False  # New field for query enhancement toggle
+    enhanced_image_retrieval: bool = False  # New field for enhanced image retrieval toggle
     # New fields for delayed cleanup - now using asyncio
     pending_cleanup: bool = False
     cleanup_task: Optional[asyncio.Task] = None
@@ -42,6 +43,7 @@ class ConversationState:
         self.product_model_search = False
         self.method = "dense"
         self.is_enhance_query = False
+        self.enhanced_image_retrieval = False
         # Reset cleanup fields but don't touch tasks
         self.pending_cleanup = False
         self.last_activity = datetime.now()
@@ -196,6 +198,12 @@ class StateManager:
         """Toggle query enhancement mode"""
         state.is_enhance_query = not state.is_enhance_query
         state.last_activity = datetime.now()
+
+    @staticmethod
+    async def toggle_enhanced_image_retrieval(state: ConversationState):
+        """Toggle enhanced image retrieval mode"""
+        state.enhanced_image_retrieval = not state.enhanced_image_retrieval
+        state.last_activity = datetime.now()
     
     @staticmethod
     async def cycle_search_method(state: ConversationState):
@@ -221,7 +229,8 @@ class StateManager:
                     "selected_model": state.selected_model,
                     "product_model_search": state.product_model_search,
                     "method": state.method,
-                    "is_enhance_query": state.is_enhance_query
+                    "is_enhance_query": state.is_enhance_query,
+                    "enhanced_image_retrieval": state.enhanced_image_retrieval
                 }
             return status
 
@@ -262,7 +271,8 @@ class ChatService:
                         "session_id": state.session_id,
                         "llm_model": state.selected_model,
                         "debug": "Normal",
-                        "is_enhance_query": str(state.is_enhance_query).lower()
+                        "is_enhance_query": str(state.is_enhance_query).lower(),
+                        "enhanced_image_retrieval": str(state.enhanced_image_retrieval).lower()
                     }
                     
                     # Use multipart form data for image upload
@@ -281,7 +291,8 @@ class ChatService:
                         "product_model_search": str(state.product_model_search).lower(),
                         "method": state.method,
                         "llm_model": state.selected_model,
-                        "is_enhance_query": str(state.is_enhance_query).lower()
+                        "is_enhance_query": str(state.is_enhance_query).lower(),
+                        "enhanced_image_retrieval": str(state.enhanced_image_retrieval).lower()
                     }
                     resp = await client.post(
                         f"{API_BASE_URL}/chat",
@@ -598,6 +609,7 @@ class UIService:
         }
         method_status = method_labels.get(state.method, "🔎 Tìm kiếm: Dense")
         enhance_status = "🧠 Tăng cường truy vấn (Đang tắt)" if not state.is_enhance_query else "🧠 Tăng cường truy vấn (Đang bật)"
+        enhanced_retrieval_status = "🖼️ Tìm bằng ảnh nâng cao (Đang tắt)" if not state.enhanced_image_retrieval else "🖼️ Tìm bằng ảnh nâng cao (Đang bật)"
         
         return [
             cl.Action(name="show_specs", value="specs", label="📄 Thông số kỹ thuật", payload={"action": "specs"}),
@@ -607,6 +619,7 @@ class UIService:
             cl.Action(name="toggle_product_search", value="toggle_search", label=search_status, payload={"action": "toggle_search"}),
             cl.Action(name="change_search_method", value="change_method", label="🔎 Đổi phương thức tìm kiếm", payload={"action": "change_method"}),
             cl.Action(name="toggle_enhance_query", value="toggle_enhance", label=enhance_status, payload={"action": "toggle_enhance"}),
+            cl.Action(name="toggle_enhanced_image_retrieval", value="toggle_enhanced_retrieval", label=enhanced_retrieval_status, payload={"action": "toggle_enhanced_retrieval"}),
             cl.Action(name="change_model", value="model", label="🔄 Đổi model", payload={"action": "model"}),
         ]
 
@@ -621,11 +634,13 @@ class UIService:
         }
         method_status = method_labels.get(state.method, "🔎 Tìm kiếm: Dense")
         enhance_status = "🧠 Tăng cường truy vấn (Đang tắt)" if not state.is_enhance_query else "🧠 Tăng cường truy vấn (Đang bật)"
+        enhanced_retrieval_status = "🖼️ Tìm bằng ảnh nâng cao (Đang tắt)" if not state.enhanced_image_retrieval else "🖼️ Tìm bằng ảnh nâng cao (Đang bật)"
         
         return [
             cl.Action(name="toggle_product_search", value="toggle_search", label=search_status, payload={"action": "toggle_search"}),
             cl.Action(name="change_search_method", value="change_method", label="🔎 Đổi phương thức tìm kiếm", payload={"action": "change_method"}),
             cl.Action(name="toggle_enhance_query", value="toggle_enhance", label=enhance_status, payload={"action": "toggle_enhance"}),
+            cl.Action(name="toggle_enhanced_image_retrieval", value="toggle_enhanced_retrieval", label=enhanced_retrieval_status, payload={"action": "toggle_enhanced_retrieval"}),
             cl.Action(name="change_model", value="model", label="🔄 Đổi model", payload={"action": "model"}),
         ]
     
@@ -826,6 +841,27 @@ async def on_toggle_product_search(action):
     await UIService.send_message_with_buttons(status_message, app_state, author="assistant")
 
 
+@cl.action_callback("toggle_enhanced_image_retrieval")
+async def on_toggle_enhanced_image_retrieval(action):
+    """Handle toggle enhanced image retrieval action"""
+    app_state = await ensure_session_state()
+    if app_state is None:
+        await cl.Message(content="Error: Session state not found", author="assistant").send()
+        return
+        
+    await StateManager.toggle_enhanced_image_retrieval(app_state)
+    
+    status_message = (
+        "✅ **Đã bật tìm bằng ảnh nâng cao**\n\n"
+        "Hệ thống sẽ sử dụng Gemini để phân tích kỹ hình ảnh và tạo từ khóa tìm kiếm chi tiết."
+        if app_state.enhanced_image_retrieval 
+        else "✅ **Đã tắt tìm bằng ảnh nâng cao**\n\n"
+        "Hệ thống sẽ sử dụng tìm kiếm hình ảnh thông thường (Visual Semantic Search)."
+    )
+    
+    await UIService.send_message_with_buttons(status_message, app_state, author="assistant")
+
+
 @cl.action_callback("toggle_enhance_query")
 async def on_toggle_enhance_query(action):
     """Handle toggle enhance query action"""

app_new.py → app_old.py

@@ -11,7 +11,7 @@ import uuid
 from datetime import datetime, timedelta
 
 
-API_BASE_URL = "https://sale-agent-m179.onrender.com"
+API_BASE_URL = os.getenv("API_BASE_URL")
 
 
 @dataclass
@@ -26,7 +26,6 @@ class ConversationState:
     product_model_search: bool = False
     method: str = "dense"  # "dense", "sparse", "hybrid"
     is_enhance_query: bool = False  # New field for query enhancement toggle
-    enhanced_image_retrieval: bool = False  # New field for enhanced image retrieval toggle
     # New fields for delayed cleanup - now using asyncio
     pending_cleanup: bool = False
     cleanup_task: Optional[asyncio.Task] = None
@@ -43,7 +42,6 @@ class ConversationState:
         self.product_model_search = False
         self.method = "dense"
         self.is_enhance_query = False
-        self.enhanced_image_retrieval = False
         # Reset cleanup fields but don't touch tasks
         self.pending_cleanup = False
         self.last_activity = datetime.now()
@@ -198,12 +196,6 @@ class StateManager:
         """Toggle query enhancement mode"""
         state.is_enhance_query = not state.is_enhance_query
         state.last_activity = datetime.now()
-
-    @staticmethod
-    async def toggle_enhanced_image_retrieval(state: ConversationState):
-        """Toggle enhanced image retrieval mode"""
-        state.enhanced_image_retrieval = not state.enhanced_image_retrieval
-        state.last_activity = datetime.now()
     
     @staticmethod
     async def cycle_search_method(state: ConversationState):
@@ -229,8 +221,7 @@ class StateManager:
                     "selected_model": state.selected_model,
                     "product_model_search": state.product_model_search,
                     "method": state.method,
-                    "is_enhance_query": state.is_enhance_query,
-                    "enhanced_image_retrieval": state.enhanced_image_retrieval
+                    "is_enhance_query": state.is_enhance_query
                 }
             return status
 
@@ -271,8 +262,7 @@ class ChatService:
                         "session_id": state.session_id,
                         "llm_model": state.selected_model,
                         "debug": "Normal",
-                        "is_enhance_query": str(state.is_enhance_query).lower(),
-                        "enhanced_image_retrieval": str(state.enhanced_image_retrieval).lower()
+                        "is_enhance_query": str(state.is_enhance_query).lower()
                     }
                     
                     # Use multipart form data for image upload
@@ -291,8 +281,7 @@ class ChatService:
                         "product_model_search": str(state.product_model_search).lower(),
                         "method": state.method,
                         "llm_model": state.selected_model,
-                        "is_enhance_query": str(state.is_enhance_query).lower(),
-                        "enhanced_image_retrieval": str(state.enhanced_image_retrieval).lower()
+                        "is_enhance_query": str(state.is_enhance_query).lower()
                     }
                     resp = await client.post(
                         f"{API_BASE_URL}/chat",
@@ -609,7 +598,6 @@ class UIService:
         }
         method_status = method_labels.get(state.method, "🔎 Tìm kiếm: Dense")
         enhance_status = "🧠 Tăng cường truy vấn (Đang tắt)" if not state.is_enhance_query else "🧠 Tăng cường truy vấn (Đang bật)"
-        enhanced_retrieval_status = "🖼️ Tìm bằng ảnh nâng cao (Đang tắt)" if not state.enhanced_image_retrieval else "🖼️ Tìm bằng ảnh nâng cao (Đang bật)"
         
         return [
             cl.Action(name="show_specs", value="specs", label="📄 Thông số kỹ thuật", payload={"action": "specs"}),
@@ -619,7 +607,6 @@ class UIService:
             cl.Action(name="toggle_product_search", value="toggle_search", label=search_status, payload={"action": "toggle_search"}),
             cl.Action(name="change_search_method", value="change_method", label="🔎 Đổi phương thức tìm kiếm", payload={"action": "change_method"}),
             cl.Action(name="toggle_enhance_query", value="toggle_enhance", label=enhance_status, payload={"action": "toggle_enhance"}),
-            cl.Action(name="toggle_enhanced_image_retrieval", value="toggle_enhanced_retrieval", label=enhanced_retrieval_status, payload={"action": "toggle_enhanced_retrieval"}),
             cl.Action(name="change_model", value="model", label="🔄 Đổi model", payload={"action": "model"}),
         ]
 
@@ -634,13 +621,11 @@ class UIService:
         }
         method_status = method_labels.get(state.method, "🔎 Tìm kiếm: Dense")
         enhance_status = "🧠 Tăng cường truy vấn (Đang tắt)" if not state.is_enhance_query else "🧠 Tăng cường truy vấn (Đang bật)"
-        enhanced_retrieval_status = "🖼️ Tìm bằng ảnh nâng cao (Đang tắt)" if not state.enhanced_image_retrieval else "🖼️ Tìm bằng ảnh nâng cao (Đang bật)"
         
         return [
             cl.Action(name="toggle_product_search", value="toggle_search", label=search_status, payload={"action": "toggle_search"}),
             cl.Action(name="change_search_method", value="change_method", label="🔎 Đổi phương thức tìm kiếm", payload={"action": "change_method"}),
             cl.Action(name="toggle_enhance_query", value="toggle_enhance", label=enhance_status, payload={"action": "toggle_enhance"}),
-            cl.Action(name="toggle_enhanced_image_retrieval", value="toggle_enhanced_retrieval", label=enhanced_retrieval_status, payload={"action": "toggle_enhanced_retrieval"}),
             cl.Action(name="change_model", value="model", label="🔄 Đổi model", payload={"action": "model"}),
         ]
     
@@ -841,27 +826,6 @@ async def on_toggle_product_search(action):
     await UIService.send_message_with_buttons(status_message, app_state, author="assistant")
 
 
-@cl.action_callback("toggle_enhanced_image_retrieval")
-async def on_toggle_enhanced_image_retrieval(action):
-    """Handle toggle enhanced image retrieval action"""
-    app_state = await ensure_session_state()
-    if app_state is None:
-        await cl.Message(content="Error: Session state not found", author="assistant").send()
-        return
-        
-    await StateManager.toggle_enhanced_image_retrieval(app_state)
-    
-    status_message = (
-        "✅ **Đã bật tìm bằng ảnh nâng cao**\n\n"
-        "Hệ thống sẽ sử dụng Gemini để phân tích kỹ hình ảnh và tạo từ khóa tìm kiếm chi tiết."
-        if app_state.enhanced_image_retrieval 
-        else "✅ **Đã tắt tìm bằng ảnh nâng cao**\n\n"
-        "Hệ thống sẽ sử dụng tìm kiếm hình ảnh thông thường (Visual Semantic Search)."
-    )
-    
-    await UIService.send_message_with_buttons(status_message, app_state, author="assistant")
-
-
 @cl.action_callback("toggle_enhance_query")
 async def on_toggle_enhance_query(action):
     """Handle toggle enhance query action"""