♻️ Sort backend imports #1037

Author: Phinease

backend/services/agent_service.py

@@ -2,30 +2,50 @@
 import json
 import logging
 import os
-from collections import deque
 import uuid
+from collections import deque
 
 from fastapi import Header, Request
 from fastapi.responses import JSONResponse, StreamingResponse
+from nexent.core.agents.run_agent import agent_run
+from nexent.memory.memory_service import clear_memory
 
 from agents.agent_run_manager import agent_run_manager
-from agents.create_agent_info import create_agent_run_info
-from agents.create_agent_info import create_tool_config_list
+from agents.create_agent_info import create_agent_run_info, create_tool_config_list
 from agents.preprocess_manager import preprocess_manager
 from consts.exceptions import AgentRunException, MemoryPreparationException
-from consts.model import AgentInfoRequest, ExportAndImportAgentInfo, ExportAndImportDataFormat, ToolInstanceInfoRequest, \
-    ToolSourceEnum, MCPInfo
-from consts.model import AgentRequest
-from database.agent_db import create_agent, search_blank_sub_agent_by_main_agent_id, \
-    search_agent_info_by_agent_id, update_agent, delete_agent_by_id, query_all_agent_info_by_tenant_id, \
-    query_sub_agents_id_list, insert_related_agent, delete_agent_relationship, search_agent_id_by_agent_name, \
-    delete_related_agent
-from database.remote_mcp_db import get_mcp_server_by_name_and_tenant, check_mcp_name_exists
-from database.tool_db import create_or_update_tool_by_tool_info, query_all_tools, query_all_enabled_tool_instances, \
-    search_tools_for_sub_agent, check_tool_is_available, delete_tools_by_agent_id
-from nexent.core.agents.run_agent import agent_run
-from nexent.memory.memory_service import clear_memory
-from services.conversation_management_service import save_conversation_user, save_conversation_assistant
+from consts.model import (
+    AgentInfoRequest,
+    AgentRequest,
+    ExportAndImportAgentInfo,
+    ExportAndImportDataFormat,
+    MCPInfo,
+    ToolInstanceInfoRequest,
+    ToolSourceEnum
+)
+from database.agent_db import (
+    create_agent,
+    delete_agent_by_id,
+    delete_agent_relationship,
+    delete_related_agent,
+    insert_related_agent,
+    query_all_agent_info_by_tenant_id,
+    query_sub_agents_id_list,
+    search_agent_id_by_agent_name,
+    search_agent_info_by_agent_id,
+    search_blank_sub_agent_by_main_agent_id,
+    update_agent
+)
+from database.remote_mcp_db import check_mcp_name_exists, get_mcp_server_by_name_and_tenant
+from database.tool_db import (
+    check_tool_is_available,
+    create_or_update_tool_by_tool_info,
+    delete_tools_by_agent_id,
+    query_all_enabled_tool_instances,
+    query_all_tools,
+    search_tools_for_sub_agent
+)
+from services.conversation_management_service import save_conversation_assistant, save_conversation_user
 from services.memory_config_service import build_memory_context
 from services.remote_mcp_service import add_remote_mcp_server_list
 from services.tool_configuration_service import update_tool_list
@@ -758,7 +778,8 @@ async def run_agent_stream(
     """
     # Save user message only if not in debug mode (before streaming starts)
     if not agent_request.is_debug:
-        save_messages(agent_request, target="user", authorization=authorization)
+        save_messages(agent_request, target="user",
+                      authorization=authorization)
 
     # Choose streaming strategy based on user's memory switch
     resolved_user_id, resolved_tenant_id, _ = _resolve_user_tenant_language(

backend/services/config_sync_service.py

@@ -1,11 +1,25 @@
 import logging
 
-from consts.const import DEFAULT_APP_NAME_ZH, DEFAULT_APP_NAME_EN, DEFAULT_APP_DESCRIPTION_ZH, \
-    DEFAULT_APP_DESCRIPTION_EN, DEFAULT_APP_ICON_URL, MODEL_CONFIG_MAPPING, APP_NAME, APP_DESCRIPTION, ICON_TYPE, \
-    AVATAR_URI, CUSTOM_ICON_URL
+from consts.const import (
+    APP_DESCRIPTION,
+    APP_NAME,
+    AVATAR_URI,
+    CUSTOM_ICON_URL,
+    DEFAULT_APP_DESCRIPTION_EN,
+    DEFAULT_APP_DESCRIPTION_ZH,
+    DEFAULT_APP_ICON_URL,
+    DEFAULT_APP_NAME_EN,
+    DEFAULT_APP_NAME_ZH,
+    ICON_TYPE,
+    MODEL_CONFIG_MAPPING
+)
 from database.model_management_db import get_model_id_by_display_name
-from utils.config_utils import tenant_config_manager, get_env_key, safe_value, \
-    get_model_name_from_config
+from utils.config_utils import (
+    get_env_key,
+    get_model_name_from_config,
+    safe_value,
+    tenant_config_manager
+)
 
 logger = logging.getLogger("config_sync_service")
 

backend/services/conversation_management_service.py

@@ -2,23 +2,36 @@
 import json
 import logging
 from datetime import datetime
-from typing import List, Optional, Dict, Any
+from typing import Any, Dict, List, Optional
 
 from fastapi import Header
 from jinja2 import StrictUndefined, Template
+from nexent.core.utils.observer import ProcessType
 from smolagents import OpenAIServerModel
 
-from consts.model import MessageRequest, ConversationResponse, AgentRequest, MessageUnit
-from database.conversation_db import create_conversation_message, create_source_search, create_message_units, \
-    create_source_image, rename_conversation, get_conversation_list, get_conversation_history, \
-    get_source_images_by_message, \
-    get_source_images_by_conversation, get_source_searches_by_message, get_source_searches_by_conversation, \
-    delete_conversation, get_conversation, create_conversation, update_message_opinion, get_message_id_by_index
-from nexent.core.utils.observer import ProcessType
+from consts.model import AgentRequest, ConversationResponse, MessageRequest, MessageUnit
+from database.conversation_db import (
+    create_conversation,
+    create_conversation_message,
+    create_message_units,
+    create_source_image,
+    create_source_search,
+    delete_conversation,
+    get_conversation,
+    get_conversation_history,
+    get_conversation_list,
+    get_message_id_by_index,
+    get_source_images_by_conversation,
+    get_source_images_by_message,
+    get_source_searches_by_conversation,
+    get_source_searches_by_message,
+    rename_conversation,
+    update_message_opinion
+)
 from utils.auth_utils import get_current_user_id
-from utils.config_utils import tenant_config_manager, get_model_name_from_config
+from utils.config_utils import get_model_name_from_config, tenant_config_manager
 from utils.prompt_template_utils import get_generate_title_prompt_template
-from utils.str_utils import remove_think_tags, add_no_think_token
+from utils.str_utils import add_no_think_token, remove_think_tags
 
 logger = logging.getLogger("conversation_management_service")
 
@@ -688,4 +701,4 @@ async def get_message_id_by_index_impl(conversation_id: int, message_index: int)
     message_id = get_message_id_by_index(conversation_id, message_index)
     if message_id is None:
         raise Exception("Message not found.")
-    return message_id
+    return message_id

backend/services/data_process_service.py

@@ -1,8 +1,11 @@
+import asyncio
 import base64
+import concurrent.futures
 import io
 import logging
 import os
 import tempfile
+import threading
 import time
 import warnings
 from typing import Optional, List, Dict, Any
@@ -13,14 +16,11 @@
 from PIL import Image
 from transformers import CLIPProcessor, CLIPModel
 
-from consts.model import BatchTaskRequest
-from data_process.utils import get_task_info, get_all_task_ids_from_redis
-import concurrent.futures
-import asyncio
-
 from consts.const import CLIP_MODEL_PATH, IMAGE_FILTER, REDIS_BACKEND_URL, REDIS_URL
+from consts.model import BatchTaskRequest
 from data_process.app import app as celery_app
 from data_process.tasks import process_and_forward
+from data_process.utils import get_task_info, get_all_task_ids_from_redis
 
 # Configure logging
 logger = logging.getLogger("data_process.service")
@@ -45,9 +45,8 @@ def __init__(self):
 
         self._inspector = None
         self._inspector_last_time = 0
-        self._inspector_ttl = 60  # inspector缓存时间，秒
+        self._inspector_ttl = 60  # Inspector cache time in seconds
         self._inspector_lock = None
-        import threading
         self._inspector_lock = threading.Lock()
 
     def _init_redis_client(self):
@@ -66,8 +65,7 @@ def _init_redis_client(self):
                     connection_pool=self.redis_pool)
                 logger.info("Redis client initialized successfully.")
             else:
-                logger.warning(
-                    "REDIS_BACKEND_URL not set, Redis client not initialized.")
+                logger.warning("REDIS_BACKEND_URL not set, Redis client not initialized.")
         except Exception as e:
             logger.error(f"Failed to initialize Redis client: {str(e)}")
 
@@ -84,8 +82,7 @@ def _init_clip_model(self):
             self.clip_available = True
             logger.info("CLIP model loaded successfully")
         except Exception as e:
-            logger.warning(
-                f"Failed to load CLIP model, size-only filtering will be used: {str(e)}")
+            logger.warning(f"Failed to load CLIP model, size-only filtering will be used: {str(e)}")
             self.clip_available = False
 
     async def start(self):
@@ -105,8 +102,7 @@ def _get_celery_inspector(self):
             if not celery_app.conf.broker_url or not celery_app.conf.result_backend:
                 celery_app.conf.broker_url = REDIS_URL
                 celery_app.conf.result_backend = REDIS_BACKEND_URL
-                logger.warning(
-                    f"Celery broker URL is not configured properly, reconfiguring to {celery_app.conf.broker_url}")
+                logger.warning(f"Celery broker URL is not configured properly, reconfiguring to {celery_app.conf.broker_url}")
             try:
                 inspector = celery_app.control.inspect()
                 inspector.ping()