Merge remote-tracking branch 'origin/develop' into csy/csy_0813

# Conflicts:
#	backend/database/agent_db.py

Author: ljy65535

.github/workflows/docker-build-push-mainland.yml

@@ -23,7 +23,7 @@ jobs:
         uses: actions/checkout@v4
       - name: Build main image (amd64) and load locally
         run: |
-          docker buildx build --platform linux/amd64 --load -t ccr.ccs.tencentyun.com/nexent-hub/nexent:amd64 -f make/main/Dockerfile .
+          docker buildx build --platform linux/amd64 --load -t ccr.ccs.tencentyun.com/nexent-hub/nexent:amd64 -f make/main/Dockerfile --build-arg MIRROR=https://pypi.tuna.tsinghua.edu.cn/simple --build-arg APT_MIRROR=tsinghua .
       - name: Login to Tencent Cloud
         run: echo ${{ secrets.TCR_PASSWORD }} | docker login ccr.ccs.tencentyun.com --username=${{ secrets.TCR_USERNAME }} --password-stdin
       - name: Push main image (amd64) to Tencent Cloud
@@ -43,7 +43,7 @@ jobs:
         uses: actions/checkout@v4
       - name: Build main image (arm64) and load locally
         run: |
-          docker buildx build --platform linux/arm64 --load -t ccr.ccs.tencentyun.com/nexent-hub/nexent:arm64 -f make/main/Dockerfile .
+          docker buildx build --platform linux/arm64 --load -t ccr.ccs.tencentyun.com/nexent-hub/nexent:arm64 -f make/main/Dockerfile --build-arg MIRROR=https://pypi.tuna.tsinghua.edu.cn/simple --build-arg APT_MIRROR=tsinghua .
       - name: Login to Tencent Cloud
         run: echo ${{ secrets.TCR_PASSWORD }} | docker login ccr.ccs.tencentyun.com --username=${{ secrets.TCR_USERNAME }} --password-stdin
       - name: Push main image (arm64) to Tencent Cloud
@@ -72,7 +72,7 @@ jobs:
           rm -rf .git .gitattributes
       - name: Build data process image (amd64) and load locally
         run: |
-          docker buildx build --platform linux/amd64 --load -t ccr.ccs.tencentyun.com/nexent-hub/nexent-data-process:amd64 -f make/data_process/Dockerfile .
+          docker buildx build --platform linux/amd64 --load -t ccr.ccs.tencentyun.com/nexent-hub/nexent-data-process:amd64 -f make/data_process/Dockerfile --build-arg MIRROR=https://pypi.tuna.tsinghua.edu.cn/simple --build-arg APT_MIRROR=tsinghua .
       - name: Login to Tencent Cloud
         run: echo ${{ secrets.TCR_PASSWORD }} | docker login ccr.ccs.tencentyun.com --username=${{ secrets.TCR_USERNAME }} --password-stdin
       - name: Push data process image (amd64) to Tencent Cloud
@@ -101,7 +101,7 @@ jobs:
           rm -rf .git .gitattributes
       - name: Build data process image (arm64) and load locally
         run: |
-          docker buildx build --platform linux/arm64 --load -t ccr.ccs.tencentyun.com/nexent-hub/nexent-data-process:arm64 -f make/data_process/Dockerfile .
+          docker buildx build --platform linux/arm64 --load -t ccr.ccs.tencentyun.com/nexent-hub/nexent-data-process:arm64 -f make/data_process/Dockerfile --build-arg MIRROR=https://pypi.tuna.tsinghua.edu.cn/simple --build-arg APT_MIRROR=tsinghua .
       - name: Login to Tencent Cloud
         run: echo ${{ secrets.TCR_PASSWORD }} | docker login ccr.ccs.tencentyun.com --username=${{ secrets.TCR_USERNAME }} --password-stdin
       - name: Push data process image (arm64) to Tencent Cloud
@@ -121,7 +121,7 @@ jobs:
         uses: actions/checkout@v4
       - name: Build web image (amd64) and load locally
         run: |
-          docker buildx build --platform linux/amd64 --load -t ccr.ccs.tencentyun.com/nexent-hub/nexent-web:amd64 -f make/web/Dockerfile .
+          docker buildx build --platform linux/amd64 --load -t ccr.ccs.tencentyun.com/nexent-hub/nexent-web:amd64 -f make/web/Dockerfile --build-arg MIRROR=https://registry.npmmirror.com --build-arg APK_MIRROR=tsinghua .
       - name: Login to Tencent Cloud
         run: echo ${{ secrets.TCR_PASSWORD }} | docker login ccr.ccs.tencentyun.com --username=${{ secrets.TCR_USERNAME }} --password-stdin
       - name: Push web image (amd64) to Tencent Cloud
@@ -141,7 +141,7 @@ jobs:
         uses: actions/checkout@v4
       - name: Build web image (arm64) and load locally
         run: |
-          docker buildx build --platform linux/arm64 --load -t ccr.ccs.tencentyun.com/nexent-hub/nexent-web:arm64 -f make/web/Dockerfile .
+          docker buildx build --platform linux/arm64 --load -t ccr.ccs.tencentyun.com/nexent-hub/nexent-web:arm64 -f make/web/Dockerfile --build-arg MIRROR=https://registry.npmmirror.com --build-arg APK_MIRROR=tsinghua .
       - name: Login to Tencent Cloud
         run: echo ${{ secrets.TCR_PASSWORD }} | docker login ccr.ccs.tencentyun.com --username=${{ secrets.TCR_USERNAME }} --password-stdin
       - name: Push web image (arm64) to Tencent Cloud

.github/workflows/docker-deploy.yml

@@ -26,7 +26,7 @@ jobs:
           fetch-depth: 1
           retries: 3
       - name: Build main application image
-        run: docker build --build-arg MIRROR=https://pypi.tuna.tsinghua.edu.cn/simple -t nexent/nexent -f make/main/Dockerfile .
+        run: docker build --build-arg MIRROR=https://pypi.tuna.tsinghua.edu.cn/simple --build-arg APT_MIRROR=tsinghua -t nexent/nexent -f make/main/Dockerfile .
 
   build-data-process:
     runs-on: ${{ fromJson(inputs.runner_label_json) }}
@@ -53,7 +53,7 @@ jobs:
           GIT_TRACE=1 GIT_CURL_VERBOSE=1 GIT_LFS_LOG=debug git lfs pull
           rm -rf .git .gitattributes
       - name: Build data process image
-        run: docker build --build-arg MIRROR=https://pypi.tuna.tsinghua.edu.cn/simple -t nexent/nexent-data-process -f make/data_process/Dockerfile .
+        run: docker build --build-arg MIRROR=https://pypi.tuna.tsinghua.edu.cn/simple --build-arg APT_MIRROR=tsinghua -t nexent/nexent-data-process -f make/data_process/Dockerfile .
 
   build-web:
     runs-on: ${{ fromJson(inputs.runner_label_json) }}
@@ -64,7 +64,7 @@ jobs:
           fetch-depth: 1
           retries: 3
       - name: Build web frontend image
-        run: docker build --build-arg MIRROR=https://registry.npmmirror.com -t nexent/nexent-web -f make/web/Dockerfile .
+        run: docker build --build-arg MIRROR=https://registry.npmmirror.com --build-arg APK_MIRROR=tsinghua -t nexent/nexent-web -f make/web/Dockerfile .
 
   build-docs:
     runs-on: ${{ fromJson(inputs.runner_label_json) }}

backend/agents/create_agent_info.py

@@ -11,11 +11,11 @@
     query_or_create_main_agent_id, query_sub_agents_id_list
 from services.elasticsearch_service import ElasticSearchService, elastic_core, get_embedding_model
 from services.tenant_config_service import get_selected_knowledge_list
-from utils.prompt_template_utils import get_prompt_template_path
+from utils.prompt_template_utils import get_agent_prompt_template
 from utils.config_utils import config_manager, tenant_config_manager, get_model_name_from_config
-from smolagents.agents import populate_template
 from smolagents.utils import BASE_BUILTIN_MODULES
 from services.memory_config_service import build_memory_context
+from jinja2 import Template, StrictUndefined
 
 from nexent.memory.memory_service import search_memory_in_levels
 
@@ -63,10 +63,8 @@ async def create_agent_config(agent_id, tenant_id, user_id, language: str = 'zh'
     constraint_prompt = agent_info.get("constraint_prompt", "")
     few_shots_prompt = agent_info.get("few_shots_prompt", "")
 
-    # Get template path
-    prompt_template_path = get_prompt_template_path(is_manager=len(managed_agents) > 0, language=language)
-    with open(prompt_template_path, "r", encoding="utf-8") as file:
-        prompt_template = yaml.safe_load(file)
+    # Get template content
+    prompt_template = get_agent_prompt_template(is_manager=len(managed_agents) > 0, language=language)
 
     # Get app information
     default_app_description = 'Nexent 是一个开源智能体SDK和平台' if language == 'zh' else 'Nexent is an open-source agent SDK and platform'
@@ -99,10 +97,30 @@ async def create_agent_config(agent_id, tenant_id, user_id, language: str = 'zh'
         logger.debug(f"Retrieved memory list: {memory_list}")
         # TODO: 前端展示"已抽取 xx 条回忆"
 
+    # Build knowledge base summary
+    knowledge_base_summary = ""
+    try:
+        for tool in tool_list:
+            if "KnowledgeBaseSearchTool" == tool.class_name:
+                knowledge_info_list = get_selected_knowledge_list(tenant_id=tenant_id, user_id=user_id)
+                if knowledge_info_list:
+                    for knowledge_info in knowledge_info_list:
+                        knowledge_name = knowledge_info.get("index_name")
+                        try:
+                            message = ElasticSearchService().get_summary(index_name=knowledge_name)
+                            summary = message.get("summary", "")
+                            knowledge_base_summary += f"**{knowledge_name}**: {summary}\n\n"
+                        except Exception as e:
+                            logger.warning(f"Failed to get summary for knowledge base {knowledge_name}: {e}")
+                else:
+                    knowledge_base_summary = "当前没有可用的知识库索引。\n" if language == 'zh' else "No knowledge base indexes are currently available.\n"
+                break  # Only process the first KnowledgeBaseSearchTool found
+    except Exception as e:
+        logger.error(f"Failed to build knowledge base summary: {e}")
+    
     # Assemble system_prompt
-    system_prompt = populate_template(
-        prompt_template["system_prompt"],
-        variables={
+    if (duty_prompt or constraint_prompt or few_shots_prompt):
+        system_prompt = Template(prompt_template["system_prompt"], undefined=StrictUndefined).render({
             "duty": duty_prompt,
             "constraint": constraint_prompt,
             "few_shots": few_shots_prompt,
@@ -111,26 +129,12 @@ async def create_agent_config(agent_id, tenant_id, user_id, language: str = 'zh'
             "authorized_imports": str(BASE_BUILTIN_MODULES),
             "APP_NAME": app_name,
             "APP_DESCRIPTION": app_description,
-            "memory_list": memory_list
-        },
-    ) if (duty_prompt or constraint_prompt or few_shots_prompt) else agent_info.get("prompt", "")
-
-    # special logic
-    try:
-        for tool in tool_list:
-            if "KnowledgeBaseSearchTool" == tool.class_name:
-                # TODO: use prompt template
-                knowledge_base_summary = "\n\n### 本地知识库信息 ###\n" if language == 'zh' else "\n\n### Local Knowledge Base Information ###\n"
-
-                knowledge_info_list = get_selected_knowledge_list(tenant_id=tenant_id, user_id=user_id)
-                for knowledge_info in knowledge_info_list:
-                    knowledge_name = knowledge_info.get("index_name")
-                    message = ElasticSearchService().get_summary(index_name=knowledge_name)
-                    knowledge_base_summary += f"{knowledge_name}:{message['summary']}\n"
-                system_prompt += knowledge_base_summary
-    except Exception as e:
-        logger.error(f"add knowledge base summary to system prompt failed, error: {e}")
-
+            "memory_list": memory_list,
+            "knowledge_base_summary": knowledge_base_summary
+        })
+    else:
+        system_prompt = agent_info.get("prompt", "")
+    
     agent_config = AgentConfig(
         name="undefined" if agent_info["name"] is None else agent_info["name"],
         description="undefined" if agent_info["description"] is None else agent_info["description"],
@@ -230,9 +234,7 @@ async def prepare_prompt_templates(is_manager: bool, system_prompt: str, languag
     Returns:
         dict: Prompt template configuration
     """
-    prompt_template_path = get_prompt_template_path(is_manager, language)
-    with open(prompt_template_path, "r", encoding="utf-8") as f:
-        prompt_templates = yaml.safe_load(f)
+    prompt_templates = get_agent_prompt_template(is_manager, language)
     prompt_templates["system_prompt"] = system_prompt
     return prompt_templates
 

backend/apps/conversation_management_app.py

@@ -1,7 +1,7 @@
 import logging
 from typing import Dict, Any, Optional
 
-from fastapi import HTTPException, APIRouter, Header
+from fastapi import HTTPException, APIRouter, Header, Request
 from fastapi.encoders import jsonable_encoder
 from pydantic import BaseModel
 
@@ -176,7 +176,9 @@ async def get_sources_endpoint(request: Dict[str, Any], authorization: Optional[
 
 
 @router.post("/generate_title", response_model=ConversationResponse)
-async def generate_conversation_title_endpoint(request: GenerateTitleRequest, authorization: Optional[str] = Header(None)):
+async def generate_conversation_title_endpoint(request: GenerateTitleRequest, 
+                                            http_request: Request,
+                                            authorization: Optional[str] = Header(None)):
     """
     Generate conversation title
 
@@ -190,8 +192,8 @@ async def generate_conversation_title_endpoint(request: GenerateTitleRequest, au
         ConversationResponse object containing generated title
     """
     try:
-        user_id, tenant_id, language = get_current_user_info(authorization=authorization)
-        title = generate_conversation_title_service(request.conversation_id, request.history, user_id,tenant_id=tenant_id)
+        user_id, tenant_id, language = get_current_user_info(authorization=authorization, request=http_request)
+        title = await generate_conversation_title_service(request.conversation_id, request.history, user_id, tenant_id=tenant_id, language=language)
         return ConversationResponse(code=0, message="success", data=title)
     except Exception as e:
         logging.error(f"Failed to generate conversation title: {str(e)}")

backend/apps/file_management_app.py

@@ -517,7 +517,7 @@ async def process_text_file(query, filename, file_content, tenant_id: str, langu
         if response.status_code == 200:
             result = response.json()
             raw_text = result.get("text", "")
-            logger.info(f"File processed successfully: {raw_text[:100]}...")
+            logger.info(f"File processed successfully: {raw_text[:200]}...{raw_text[-200:]}...， length: {len(raw_text)}")
         else:
             error_detail = response.json().get('detail', '未知错误') if response.headers.get('content-type', '').startswith('application/json') else response.text
             logger.error(f"File processing failed (status code: {response.status_code}): {error_detail}")

backend/apps/model_managment_app.py

@@ -1,5 +1,5 @@
 import logging
-from typing import Optional
+from typing import Optional, List
 
 from fastapi import Query, APIRouter, Header, Body
 
@@ -210,6 +210,26 @@ async def update_single_model(request: dict, authorization: Optional[str] = Head
         )
 
 
+@router.post("/batch_update_models", response_model=ModelResponse)
+async def batch_update_models(request: List[dict], authorization: Optional[str] = Header(None)):
+    try:
+        user_id, tenant_id = get_current_user_id(authorization)
+        model_list = request
+        for model in model_list:
+            update_model_record(model["model_id"], model, user_id)
+        return ModelResponse(
+            code=200,
+            message=f"Batch update models successfully",
+            data=None
+        )
+    except Exception as e:
+        return ModelResponse(
+            code=500,
+            message=f"Failed to batch update models: {str(e)}",
+            data=None
+        )
+
+
 @router.post("/delete", response_model=ModelResponse)
 async def delete_model(display_name: str = Query(..., embed=True), authorization: Optional[str] = Header(None)):
     """

backend/database/agent_db.py

@@ -303,6 +303,8 @@ def add_tool_field(tool_info):
         tool_info["class_name"] = tool.class_name
         tool_info["is_available"] = tool.is_available
         tool_info["usage"] = tool.usage
+        tool_info["inputs"] = tool.inputs
+        tool_info["output_type"] = tool.output_type
         return tool_info
 
 def search_tools_for_sub_agent(agent_id, tenant_id):

backend/database/conversation_db.py

@@ -320,7 +320,7 @@ def rename_conversation(conversation_id: int, new_title: str, user_id: Optional[
         # Prepare update data
         update_data = {
             "conversation_title": new_title,
-            "update_time": func.current_timestamp()  # Use the database's CURRENT_TIMESTAMP function
+            "update_time": func.current_timestamp()  
         }
         if user_id:
             update_data = add_update_tracking(update_data, user_id)

backend/prompts/analyze_file.yaml

@@ -3,7 +3,7 @@
 
 image_analysis:
   system_prompt: |-
-    用户提出了一个问题：{query}，请从回答这个问题的角度精简、仔细描述一下这个图片，200字以内。
+    用户提出了一个问题：{{ query }}，请从回答这个问题的角度精简、仔细描述一下这个图片，200字以内。
     
     **图片分析要求：**
     1. 重点关注与用户问题相关的图片内容
@@ -16,7 +16,7 @@ image_analysis:
 
 long_text_analysis:
   system_prompt: |-
-    用户提出了一个问题：{query}，请从回答这个问题的角度精简、仔细描述一下这段文本，200字以内。
+    用户提出了一个问题：{{ query }}，请从回答这个问题的角度精简、仔细描述一下这段文本，200字以内。
     
     **文本分析要求：**
     1. 重点提取与用户问题相关的文本内容
@@ -25,4 +25,4 @@ long_text_analysis:
     4. 避免冗余信息，专注于问题相关内容
     
   user_prompt: |
-    请仔细阅读并分析这段文本：{file_context} 
+    请仔细阅读并分析这段文本：

backend/prompts/analyze_file_en.yaml

@@ -3,7 +3,7 @@
 
 image_analysis:
   system_prompt: |-
-    The user has asked a question: {query}. Please provide a concise and careful description of this image from the perspective of answering this question, within 200 words.
+    The user has asked a question: {{ query }}. Please provide a concise and careful description of this image from the perspective of answering this question, within 200 words.
     
     **Image Analysis Requirements:**
     1. Focus on image content relevant to the user's question
@@ -16,7 +16,7 @@ image_analysis:
 
 long_text_analysis:
   system_prompt: |-
-    The user has asked a question: {query}. Please provide a concise and careful description of this text from the perspective of answering this question, within 200 words.
+    The user has asked a question: {{ query }}. Please provide a concise and careful description of this text from the perspective of answering this question, within 200 words.
     
     **Text Analysis Requirements:**
     1. Focus on extracting text content relevant to the user's question
@@ -25,4 +25,4 @@ long_text_analysis:
     4. Avoid redundant information, focus on question-relevant content
     
   user_prompt: |
-    Please carefully read and analyze this text: {file_context} 
+    Please carefully read and analyze this text: