Cập nhật app.py sử dụng chainlit_hf.py ở dev

app.py

@@ -24,6 +24,8 @@ class ConversationState:
     outputs: Optional[Dict[str, Any]] = None
     selected_model: str = "Gemini 2.0 Flash"
     product_model_search: bool = False
+    method: str = "dense"  # "dense", "sparse", "hybrid"
+    is_enhance_query: bool = False  # New field for query enhancement toggle
     # New fields for delayed cleanup - now using asyncio
     pending_cleanup: bool = False
     cleanup_task: Optional[asyncio.Task] = None
@@ -38,6 +40,8 @@ class ConversationState:
         self.outputs = None
         self.selected_model = "Gemini 2.0 Flash"
         self.product_model_search = False
+        self.method = "dense"
+        self.is_enhance_query = False
         # Reset cleanup fields but don't touch tasks
         self.pending_cleanup = False
         self.last_activity = datetime.now()
@@ -187,6 +191,23 @@ class StateManager:
         state.product_model_search = not state.product_model_search
         state.last_activity = datetime.now()
     
+    @staticmethod
+    async def toggle_enhance_query(state: ConversationState):
+        """Toggle query enhancement mode"""
+        state.is_enhance_query = not state.is_enhance_query
+        state.last_activity = datetime.now()
+    
+    @staticmethod
+    async def cycle_search_method(state: ConversationState):
+        """Cycle search method: dense -> sparse -> hybrid -> dense"""
+        if state.method == "dense":
+            state.method = "sparse"
+        elif state.method == "sparse":
+            state.method = "hybrid"
+        else:
+            state.method = "dense"
+        state.last_activity = datetime.now()
+    
     @staticmethod
     async def get_session_status() -> Dict[str, Dict[str, Any]]:
         """Get status of all sessions (for debugging)"""
@@ -198,7 +219,9 @@ class StateManager:
                     "has_task": state.cleanup_task is not None and not state.cleanup_task.done(),
                     "last_activity": state.last_activity.isoformat(),
                     "selected_model": state.selected_model,
-                    "product_model_search": state.product_model_search
+                    "product_model_search": state.product_model_search,
+                    "method": state.method,
+                    "is_enhance_query": state.is_enhance_query
                 }
             return status
 
@@ -213,13 +236,11 @@ class ChatService:
         image_path: Optional[str] = None
     ) -> str:
         """Handle chat responses with image support using async HTTP"""
-        print(f"🔄 === DEBUG STATE ===\n Chat request with model: {state.selected_model}, Product Model Search: {state.product_model_search}, Session ID: {state.session_id}")
+        print(f"🔄 === DEBUG STATE ===\nChat request with model: {state.selected_model}, Product Model Search: {state.product_model_search}, Method: {state.method}, Session ID: {state.session_id}")
         
         # Update activity timestamp - this is KEY to prevent cleanup during active use
         state.last_activity = datetime.now()
-        
-        start = time.perf_counter()
-        
+                
         if not API_BASE_URL:
             return "Error: API_BASE_URL not configured"
         
@@ -237,9 +258,11 @@ class ChatService:
                     data = {
                         "message": message,
                         "product_model_search": str(state.product_model_search).lower(),
+                        "method": state.method,
                         "session_id": state.session_id,
                         "llm_model": state.selected_model,
-                        "debug": "Normal"
+                        "debug": "Normal",
+                        "is_enhance_query": str(state.is_enhance_query).lower()
                     }
                     
                     # Use multipart form data for image upload
@@ -256,7 +279,9 @@ class ChatService:
                         "session_id": state.session_id,
                         "debug": "Normal",
                         "product_model_search": str(state.product_model_search).lower(),
-                        "llm_model": state.selected_model
+                        "method": state.method,
+                        "llm_model": state.selected_model,
+                        "is_enhance_query": str(state.is_enhance_query).lower()
                     }
                     resp = await client.post(
                         f"{API_BASE_URL}/chat",
@@ -279,7 +304,6 @@ class ChatService:
             response = f"Error calling API: {e}"
             specs_advantages, solution_packages, raw_documents, outputs = None, None, None, None
 
-        end = time.perf_counter()
 
         # Update state
         if specs_advantages is not None:
@@ -295,10 +319,10 @@ class ChatService:
         if state.specs_advantages is not None:
             await ChatService.get_specific_product_from_query(message, state)
 
-        # Format response with 2-column grid for products
+        # NEW: Format response with 2-column grid for products
         formatted_response = ChatService.format_product_grid(response)
-                                          
-        return formatted_response + f"\n\n*Thời gian xử lí: {end - start:.6f}s*"
+
+        return formatted_response
 
     @staticmethod
     def format_product_grid(response_text: str) -> str:
@@ -392,15 +416,19 @@ class DisplayService:
 
         print(specs_map)
         for prod_id, data in specs_map.items():
-            spec = data.get("specification", None)
+            spec = data.get("specification")
+            if spec is None or spec == "" or spec == "None":
+                spec = "Hiện tại trong dữ liệu chưa có thông tin về thông số kĩ thuật của sản phẩm này!"
             model = data.get("model", "")
             url = data.get("url", "")
 
             # Handle both products and solution packages
             if url:
-                full_name = f"**[{data['name']} {model}]({url})**"
+                # full_name = f"**[{data['name']} {model}]({url})**"
+                full_name = f"**[{data['name']}]({url})**"
             else:
-                full_name = f"**{data['name']} {model}**"
+                # full_name = f"**{data['name']} {model}**"
+                full_name = f"**{data['name']}**"
 
             if full_name not in columns:
                 columns.append(full_name)
@@ -458,6 +486,9 @@ class DisplayService:
                             if spec_key == "Vậtl iệu":
                                 spec_key = "Vật liệu"
 
+                            if "|" in spec_key:
+                                spec_key = spec_key.strip().replace("|", "").capitalize()
+
                             existing_row = None
                             for row in raw_data:
                                 if row["Thông số"] == spec_key:
@@ -494,24 +525,26 @@ class DisplayService:
         content = "💡 **Ưu điểm nổi trội**\n\n"
         
         for prod_id, data in specs_map.items():
-            adv = data.get("advantages", "Không có ưu điểm")
+            # adv = data.get("advantages", "Hiện tại trong dữ liệu chưa có thông tin về ưu điểm nổi trội của sản phẩm này!")
+            adv = data.get("advantages")
+            if adv is None or adv == "" or adv == "None":
+                adv = "Hiện tại trong dữ liệu chưa có thông tin về ưu điểm nổi trội của sản phẩm này!"
             model = data.get("model", "")
             url = data.get("url", "")
 
             # Handle both products and solution packages
             if url:
-                full_name = f"**[{data['name']} {model}]({url})**"
+                full_name = f"**[{data['name']}]({url})**"
             else:
-                full_name = f"**{data['name']} {model}**"
+                full_name = f"**{data['name']}**"
 
-            if adv not in ["Không có ưu điểm", "", None]:
-                content += f"### {full_name}\n"
-                
-                # Split by newlines and create bullet points
-                advantages_list = [line.strip() for line in adv.split('\n') if line.strip()]
-                for advantage in advantages_list:
-                    content += f"- {advantage}\n"
-                content += "\n"
+            content += f"### {full_name}\n"
+            
+            # Split by newlines and create bullet points
+            advantages_list = [line.strip() for line in adv.split('\n') if line.strip()]
+            for advantage in advantages_list:
+                content += f"- {advantage}\n"
+            content += "\n"
 
         return content
     
@@ -558,6 +591,13 @@ class UIService:
     def create_action_buttons(state: ConversationState):
         """Create persistent action buttons"""
         search_status = "🔍 Tìm theo mã sản phẩm (Đang tắt)" if not state.product_model_search else "🔍 Tìm theo mã sản phẩm (Đang bật)"
+        method_labels = {
+            "dense": "🔎 Tìm kiếm: Dense",
+            "sparse": "🔎 Tìm kiếm: Sparse (BM25)",
+            "hybrid": "🔎 Tìm kiếm: Hybrid"
+        }
+        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)"
         
         return [
             cl.Action(name="show_specs", value="specs", label="📄 Thông số kỹ thuật", payload={"action": "specs"}),
@@ -565,6 +605,8 @@ class UIService:
             cl.Action(name="show_packages", value="packages", label="📦 Gói sản phẩm", payload={"action": "packages"}),
             cl.Action(name="show_all_products", value="all_products", label="🛒 Tất cả sản phẩm", payload={"action": "all_products"}),
             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="change_model", value="model", label="🔄 Đổi model", payload={"action": "model"}),
         ]
 
@@ -572,9 +614,18 @@ class UIService:
     def create_start_buttons(state: ConversationState):
         """Create start buttons"""
         search_status = "🔍 Tìm theo mã sản phẩm (Đang tắt)" if not state.product_model_search else "🔍 Tìm theo mã sản phẩm (Đang bật)"
+        method_labels = {
+            "dense": "🔎 Tìm kiếm: Dense",
+            "sparse": "🔎 Tìm kiếm: Sparse (BM25)",
+            "hybrid": "🔎 Tìm kiếm: Hybrid"
+        }
+        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)"
         
         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="change_model", value="model", label="🔄 Đổi model", payload={"action": "model"}),
         ]
     
@@ -775,6 +826,92 @@ async def on_toggle_product_search(action):
     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_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_enhance_query(app_state)
+    
+    status_message = (
+        "✅ **Đã bật tăng cường truy vấn**\n\n"
+        "Hệ thống sẽ tự động cải thiện và mở rộng câu hỏi của bạn để tìm kiếm chính xác hơn."
+        if app_state.is_enhance_query 
+        else "✅ **Đã tắt tăng cường truy vấn**\n\n"
+        "Hệ thống sẽ sử dụng câu hỏi gốc của bạn mà không cải thiện."
+    )
+    
+    await UIService.send_message_with_buttons(status_message, app_state, author="assistant")
+
+
+@cl.action_callback("change_search_method")
+async def on_change_search_method(action):
+    """Handle change search method 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
+        
+    method_actions = [
+        cl.Action(name="select_method_dense", value="dense", label="🔎 Dense (Mặc định)", payload={"method": "dense"}),
+        cl.Action(name="select_method_sparse", value="sparse", label="🔎 Sparse (BM25)", payload={"method": "sparse"}),
+        cl.Action(name="select_method_hybrid", value="hybrid", label="🔎 Hybrid", payload={"method": "hybrid"}),
+        cl.Action(name="back_to_main", value="back", label="🔙 Quay lại", payload={"action": "back"})
+    ]
+    
+    current_method_labels = {
+        "dense": "Dense",
+        "sparse": "Sparse (BM25)",
+        "hybrid": "Hybrid"
+    }
+    current = current_method_labels.get(app_state.method, "Dense")
+    
+    await cl.Message(
+        content=f"**Model hiện tại**: {app_state.selected_model}\n**Tìm kiếm theo mã**: {'Đang bật' if app_state.product_model_search else 'Đang tắt'}\n**Phương thức tìm kiếm**: {current}\n**Tăng cường truy vấn**: {'Đang bật' if app_state.is_enhance_query else 'Đang tắt'}\n\nChọn phương thức tìm kiếm mới:",
+        actions=method_actions,
+        author="assistant"
+    ).send()
+
+
+@cl.action_callback("select_method_dense")
+async def on_select_method_dense(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
+        
+    app_state.method = "dense"
+    app_state.last_activity = datetime.now()
+    await UIService.send_message_with_buttons("✅ Đã chuyển sang **Dense Search**\n\nHệ thống sẽ sử dụng tìm kiếm semantic vector thông thường.", app_state, author="assistant")
+
+
+@cl.action_callback("select_method_sparse")
+async def on_select_method_sparse(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
+        
+    app_state.method = "sparse"
+    app_state.last_activity = datetime.now()
+    await UIService.send_message_with_buttons("✅ Đã chuyển sang **Sparse Search (BM25)**\n\nHệ thống sẽ sử dụng tìm kiếm từ khóa BM25.", app_state, author="assistant")
+
+
+@cl.action_callback("select_method_hybrid")
+async def on_select_method_hybrid(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
+        
+    app_state.method = "hybrid"
+    app_state.last_activity = datetime.now()
+    await UIService.send_message_with_buttons("✅ Đã chuyển sang **Hybrid Search**\n\nHệ thống sẽ kết hợp cả Dense và Sparse vector.", app_state, author="assistant")
+
+
 @cl.action_callback("change_model")
 async def on_change_model(action):
     """Handle model change action"""
@@ -795,7 +932,7 @@ async def on_change_model(action):
     )
     
     await cl.Message(
-        content=f"**Model hiện tại**: {app_state.selected_model}\n**Tìm kiếm theo mã**: {'Đang bật' if app_state.product_model_search else 'Đang tắt'}\n\nChọn model mới:",
+        content=f"**Model hiện tại**: {app_state.selected_model}\n**Tìm kiếm theo mã**: {'Đang bật' if app_state.product_model_search else 'Đang tắt'}\n**Phương thức tìm kiếm**: {app_state.method}\n**Tăng cường truy vấn**: {'Đang bật' if app_state.is_enhance_query else 'Đang tắt'}\n\nChọn model mới:",
         actions=model_actions,
         author="assistant"
     ).send()
@@ -867,7 +1004,8 @@ async def on_debug_sessions(action):
                 debug_content += f"- Has task: {info['has_task']}\n"
                 debug_content += f"- Last activity: {info['last_activity']}\n"
                 debug_content += f"- Model: {info['selected_model']}\n"
-                debug_content += f"- Product search: {info['product_model_search']}\n\n"
+                debug_content += f"- Product search: {info['product_model_search']}\n"
+                debug_content += f"- Method: {info.get('method', 'dense')}\n\n"
         
         await cl.Message(content=debug_content, author="assistant").send()
     except Exception as e: