Merge branch 'dev' into feat/evaluation_doc_qa

Author: CaralHsi

src/memos/api/handlers/chat_handler.py

@@ -415,7 +415,7 @@ def generate_chat_response() -> Generator[str, None, None]:
                         top_k=5,
                         chat_history=chat_req.history,
                         session_id=chat_req.session_id,
-                        include_preference=False,
+                        include_preference=True,
                         pref_top_k=chat_req.pref_top_k,
                         filter=chat_req.filter,
                         search_tool_memory=False,
@@ -440,9 +440,18 @@ def generate_chat_response() -> Generator[str, None, None]:
 
                     # Prepare reference data (first search)
                     reference = prepare_reference_data(filtered_memories)
+                    # get preference string
+                    pref_string = search_response.data.get("pref_string", "")
 
                     yield f"data: {json.dumps({'type': 'reference', 'data': reference})}\n\n"
 
+                    # Prepare preference markdown string
+                    if chat_req.include_preference:
+                        pref_list = search_response.data.get("pref_mem") or []
+                        pref_memories = pref_list[0].get("memories", []) if pref_list else []
+                        pref_md_string = self._build_pref_md_string_for_playground(pref_memories)
+                        yield f"data: {json.dumps({'type': 'pref_md_string', 'data': pref_md_string})}\n\n"
+
                     # Use first readable cube ID for scheduler (backward compatibility)
                     scheduler_cube_id = (
                         readable_cube_ids[0] if readable_cube_ids else chat_req.user_id
@@ -487,7 +496,7 @@ def generate_chat_response() -> Generator[str, None, None]:
                         top_k=chat_req.top_k,
                         chat_history=chat_req.history,
                         session_id=chat_req.session_id,
-                        include_preference=chat_req.include_preference,
+                        include_preference=False,
                         pref_top_k=chat_req.pref_top_k,
                         filter=chat_req.filter,
                         search_memory_type="All",
@@ -516,19 +525,11 @@ def generate_chat_response() -> Generator[str, None, None]:
 
                     # Prepare remain reference data (second search)
                     reference = prepare_reference_data(filtered_memories)
-                    # get preference string
-                    pref_string = search_response.data.get("pref_string", "")
                     # get internet reference
                     internet_reference = self._get_internet_reference(
                         search_response.data.get("text_mem")[0]["memories"]
                     )
                     yield f"data: {json.dumps({'type': 'reference', 'data': reference})}\n\n"
-                    # Prepare preference markdown string
-                    if chat_req.include_preference:
-                        pref_list = search_response.data.get("pref_mem") or []
-                        pref_memories = pref_list[0].get("memories", []) if pref_list else []
-                        pref_md_string = self._build_pref_md_string_for_playground(pref_memories)
-                        yield f"data: {json.dumps({'type': 'pref_md_string', 'data': pref_md_string})}\n\n"
 
                     # Step 2: Build system prompt with memories
                     system_prompt = self._build_enhance_system_prompt(

src/memos/graph_dbs/polardb.py

@@ -4744,7 +4744,7 @@ def delete_node_by_prams(
 
         # Then, combine with user_name condition using AND (must match user_name AND one of the data conditions)
         user_name_where = " OR ".join(user_name_conditions)
-        ids_where = f"({user_name_where}) AND ({data_conditions})"
+        ids_where = f"{user_name_where} AND ({data_conditions})"
 
         # Use Cypher DELETE query
         # First count matching nodes to get accurate count

src/memos/mem_scheduler/webservice_modules/rabbitmq_service.py

@@ -283,18 +283,28 @@ def rabbitmq_publish_message(self, message: dict):
 
         exchange_name = self.rabbitmq_exchange_name
         routing_key = self.rabbit_queue_name
+        label = message.get("label")
 
-        if message.get("label") == "knowledgeBaseUpdate":
-            kb_specific_exchange_name = os.getenv("MEMSCHEDULER_RABBITMQ_EXCHANGE_NAME")
+        # Special handling for knowledgeBaseUpdate in local environment: always empty routing key
+        if label == "knowledgeBaseUpdate":
+            routing_key = ""
 
-            if kb_specific_exchange_name:
-                exchange_name = kb_specific_exchange_name
-
-            routing_key = ""  # User specified empty routing key for KB updates
+        # Cloud environment override: applies to specific message types if MEMSCHEDULER_RABBITMQ_EXCHANGE_NAME is set
+        env_exchange_name = os.getenv("MEMSCHEDULER_RABBITMQ_EXCHANGE_NAME")
+        if env_exchange_name and label in ["taskStatus", "knowledgeBaseUpdate"]:
+            exchange_name = env_exchange_name
+            routing_key = ""  # Routing key is always empty in cloud environment for these types
 
+            # Specific diagnostic logging for messages affected by cloud environment settings
+            logger.info(
+                f"[DIAGNOSTIC] Publishing {label} message in Cloud Env. "
+                f"Exchange: {exchange_name}, Routing Key: '{routing_key}'."
+            )
+            logger.info(f"  - Message Content: {json.dumps(message, indent=2)}")
+        elif label == "knowledgeBaseUpdate":
+            # Original diagnostic logging for knowledgeBaseUpdate if NOT in cloud env
             logger.info(
-                f"[DIAGNOSTIC] Publishing KB Update message. "
-                f"ENV_EXCHANGE_NAME_USED: {kb_specific_exchange_name is not None}. "
+                f"[DIAGNOSTIC] Publishing knowledgeBaseUpdate message (Local Env). "
                 f"Current configured Exchange: {exchange_name}, Routing Key: '{routing_key}'."
             )
             logger.info(f"  - Message Content: {json.dumps(message, indent=2)}")