✨ Agent duplicate name handling logic improvement #1622

[Specification Details] 1.Fix test cases.

Author: YehongPan

backend/services/prompt_service.py

@@ -13,7 +13,15 @@
     query_sub_agents_id_list
 from database.model_management_db import get_model_by_model_id
 from database.tool_db import query_tools_by_ids
-from services.agent_service import get_enable_tool_id_by_agent_id
+from services.agent_service import (
+    get_enable_tool_id_by_agent_id,
+    _check_agent_name_duplicate,
+    _check_agent_display_name_duplicate,
+    _regenerate_agent_name_with_llm,
+    _regenerate_agent_display_name_with_llm,
+    _generate_unique_agent_name_with_suffix,
+    _generate_unique_display_name_with_suffix
+)
 from utils.config_utils import get_model_name_from_config
 from utils.prompt_template_utils import get_prompt_generate_prompt_template
 
@@ -158,16 +166,6 @@ def generate_and_save_system_prompt_impl(agent_id: int,
     final_results = {"duty": "", "constraint": "", "few_shots": "", "agent_var_name": "", "agent_display_name": "",
                      "agent_description": ""}
 
-    # Import functions locally to avoid circular import
-    from services.agent_service import (
-        _check_agent_name_duplicate,
-        _check_agent_display_name_duplicate,
-        _regenerate_agent_name_with_llm,
-        _regenerate_agent_display_name_with_llm,
-        _generate_unique_agent_name_with_suffix,
-        _generate_unique_display_name_with_suffix
-    )
-    
     # Get all existing agent names and display names for duplicate checking (only if not in create mode)
     all_agents = query_all_agent_info_by_tenant_id(tenant_id)
     existing_names = [

test/backend/services/test_agent_service.py

@@ -2378,7 +2378,8 @@ async def test_import_agent_impl_success_with_mcp(mock_get_current_user_info, mo
     mock_import_agent.assert_called_once_with(
         import_agent_info=agent_info,
         tenant_id="test_tenant",
-        user_id="test_user"
+        user_id="test_user",
+        skip_duplicate_regeneration=False,
     )
 
 
@@ -2685,7 +2686,8 @@ async def test_import_agent_impl_no_mcp_info(mock_get_current_user_info, mock_up
     mock_import_agent.assert_called_once_with(
         import_agent_info=agent_info,
         tenant_id="test_tenant",
-        user_id="test_user"
+        user_id="test_user",
+        skip_duplicate_regeneration=False,
     )
 
 
@@ -3722,15 +3724,15 @@ async def test_generate_stream_with_memory_emits_tokens_and_unregisters(monkeypa
     )
     http_request = Request(scope={"type": "http", "headers": []})
 
-    # Enable memory switch in preview
+    # Enable memory switch in preview (memory enabled)
     monkeypatch.setattr(
         "backend.services.agent_service.build_memory_context",
         MagicMock(return_value=MagicMock(
             user_config=MagicMock(memory_switch=True))),
         raising=False,
     )
 
-    # Prepare run returned values
+    # Prepare run returned values (agent_run_info, memory_context)
     monkeypatch.setattr(
         "backend.services.agent_service.prepare_agent_run",
         AsyncMock(return_value=(MagicMock(), MagicMock())),
@@ -3776,8 +3778,10 @@ def fake_unregister(task_id):
         out.append(d)
 
     # Expect start and done memory tokens then body chunks
-    assert any("memory_search" in s and "<MEM_START>" in s for s in out)
-    assert any("memory_search" in s and "<MEM_DONE>" in s for s in out)
+    from consts.const import MEMORY_SEARCH_START_MSG, MEMORY_SEARCH_DONE_MSG
+
+    assert any("memory_search" in s and MEMORY_SEARCH_START_MSG in s for s in out)
+    assert any("memory_search" in s and MEMORY_SEARCH_DONE_MSG in s for s in out)
     assert "data: bodyA\n\n" in out and "data: bodyB\n\n" in out
     # Unregister must be called
     assert calls["registered"] is not None
@@ -3843,7 +3847,9 @@ def fake_unregister(task_id):
     ):
         out.append(d)
 
-    assert any("memory_search" in s and "<MEM_FAILED>" in s for s in out)
+    from consts.const import MEMORY_SEARCH_FAIL_MSG
+
+    assert any("memory_search" in s and MEMORY_SEARCH_FAIL_MSG in s for s in out)
     assert "data: fb1\n\n" in out
     assert called["unregistered"]
 

test/backend/services/test_prompt_service.py

@@ -91,15 +91,24 @@ def test_call_llm_for_system_prompt(self, mock_get_model_name, mock_openai, mock
     @patch('backend.services.prompt_service.generate_system_prompt')
     @patch('backend.services.prompt_service.query_tools_by_ids')
     @patch('backend.services.prompt_service.search_agent_info_by_agent_id')
+    @patch('backend.services.prompt_service.query_all_agent_info_by_tenant_id')
     @patch('backend.services.prompt_service.update_agent')
-    def test_generate_and_save_system_prompt_impl(self, mock_update_agent, mock_search_agent_info,
-                                                  mock_query_tools, mock_generate_system_prompt):
+    def test_generate_and_save_system_prompt_impl(
+        self,
+        mock_update_agent,
+        mock_query_all_agents,
+        mock_search_agent_info,
+        mock_query_tools,
+        mock_generate_system_prompt,
+    ):
         # Setup
         mock_tool1 = {"name": "tool1", "description": "Tool 1 desc",
                       "inputs": "input1", "output_type": "output1"}
         mock_tool2 = {"name": "tool2", "description": "Tool 2 desc",
                       "inputs": "input2", "output_type": "output2"}
         mock_query_tools.return_value = [mock_tool1, mock_tool2]
+        # No existing agents so that duplicate detection path is not triggered
+        mock_query_all_agents.return_value = []
 
         mock_agent1 = {"name": "agent1", "description": "Agent 1 desc"}
         mock_agent2 = {"name": "agent2", "description": "Agent 2 desc"}
@@ -161,8 +170,18 @@ def mock_generator(*args, **kwargs):
         self.assertEqual(agent_info.business_description, "Test task")
 
     @patch('backend.services.prompt_service.generate_system_prompt')
+    @patch('backend.services.prompt_service.query_all_agent_info_by_tenant_id')
+    @patch('backend.services.prompt_service.get_enabled_sub_agent_description_for_generate_prompt')
+    @patch('backend.services.prompt_service.get_enabled_tool_description_for_generate_prompt')
     @patch('backend.services.prompt_service.update_agent')
-    def test_generate_and_save_system_prompt_impl_create_mode(self, mock_update_agent, mock_generate_system_prompt):
+    def test_generate_and_save_system_prompt_impl_create_mode(
+        self,
+        mock_update_agent,
+        mock_get_enabled_tools,
+        mock_get_enabled_sub_agents,
+        mock_query_all_agents,
+        mock_generate_system_prompt,
+    ):
         """Test generate_and_save_system_prompt_impl in create mode (agent_id=0)"""
         # Setup - Mock the generator to return the expected data structure
         def mock_generator(*args, **kwargs):
@@ -177,6 +196,13 @@ def mock_generator(*args, **kwargs):
             yield {"type": "few_shots", "content": "Final few shots prompt", "is_complete": True}
 
         mock_generate_system_prompt.side_effect = mock_generator
+        # Simulate no existing agents (no duplicates)
+        mock_query_all_agents.return_value = []
+        # Simulate back-end enabled tools / sub-agents when IDs are empty
+        enabled_tools = [{"name": "db_tool", "description": "DB tool"}]
+        enabled_sub_agents = [{"name": "db_agent", "description": "DB agent"}]
+        mock_get_enabled_tools.return_value = enabled_tools
+        mock_get_enabled_sub_agents.return_value = enabled_sub_agents
 
         # Execute - test as a generator with agent_id=0 (create mode) and empty tool/sub-agent IDs
         result_gen = generate_and_save_system_prompt_impl(
@@ -194,11 +220,11 @@ def mock_generator(*args, **kwargs):
         # Assert
         self.assertGreater(len(result), 0)
 
-        # Should call generate_system_prompt with empty lists for tools and sub-agents
+        # Should call generate_system_prompt with back-end enabled tools and sub-agents
         mock_generate_system_prompt.assert_called_once_with(
-            [],  # Empty sub_agent_info_list
+            enabled_sub_agents,  # sub_agent_info_list from helper
             "Test task",
-            [],  # Empty tool_info_list
+            enabled_tools,  # tool_info_list from helper
             "tenant456",
             self.test_model_id,
             "zh"