Merge remote-tracking branch 'origin/develop' into bwq/0825_edit_bug

Author: Bavichi

backend/agents/create_agent_info.py

@@ -1,5 +1,4 @@
 import threading
-import yaml
 import logging
 from urllib.parse import urljoin
 from nexent.core.utils.observer import MessageObserver
@@ -8,7 +7,7 @@
 from utils.auth_utils import get_current_user_id
 
 from database.agent_db import search_agent_info_by_agent_id, search_tools_for_sub_agent, \
-    query_or_create_main_agent_id, query_sub_agents_id_list
+    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_agent_prompt_template

backend/apps/memory_config_app.py

@@ -5,7 +5,6 @@
 from fastapi import APIRouter, Header, Body, Path, Query
 from fastapi.responses import JSONResponse
 
-from consts import const as _c
 from consts.model import MemoryAgentShareMode
 from utils.auth_utils import get_current_user_id
 from utils.memory_utils import build_memory_config

backend/apps/tenant_config_app.py

@@ -1,5 +1,4 @@
 import logging
-import os
 import requests
 from fastapi import APIRouter, Header, Body
 from typing import Optional, List

backend/data_process/app.py

@@ -1,7 +1,6 @@
 """
 Celery application configuration for data processing tasks
 """
-import os
 import logging
 from celery import Celery
 from consts.const import REDIS_URL, REDIS_BACKEND_URL, ELASTICSEARCH_SERVICE

backend/database/agent_db.py

@@ -54,26 +54,6 @@ def search_blank_sub_agent_by_main_agent_id(tenant_id: str):
         else:
             return None
 
-def query_or_create_main_agent_id(tenant_id: str, user_id: str) -> int:
-    """
-    obtain the main_agent id, create a blank placeholder if it does not exist
-    """
-    with get_db_session() as session:
-        query = session.query(AgentInfo).filter(AgentInfo.delete_flag != 'Y',
-                                                AgentInfo.parent_agent_id.is_(None),
-                                                AgentInfo.tenant_id == tenant_id)
-
-        main_agent = query.first()
-
-        if main_agent is None:
-            main_agent = create_agent(agent_info={"name": "manager_agent",
-                                                  "description": "You are a manager agent capable of invoking other agents and tools.",
-                                                  "enabled": True}, tenant_id=tenant_id, user_id=user_id)
-
-            return main_agent["agent_id"]
-        else:
-            return main_agent.agent_id
-
 
 def query_sub_agents_id_list(main_agent_id: int, tenant_id: str):
     """

backend/services/conversation_management_service.py

@@ -1,7 +1,6 @@
 import asyncio
 import json
 import logging
-import yaml
 from typing import List, Optional, Dict, Any
 from datetime import datetime
 from jinja2 import StrictUndefined, Template

backend/tool_collection/mcp/local_mcp_service.py

@@ -7,5 +7,6 @@
                         description="test_tool_description")
 async def demo_tool(para_1: str, para_2: int) -> str:
     print("tool is called successfully")
+    print(para_1, para_2)
     return "success"
 

backend/utils/conversation_management_utils.py

@@ -0,0 +1,6 @@
+{
+  "extends": [
+    "next/core-web-vitals",
+    "next/typescript"
+  ]
+}

frontend/.eslintrc.json

@@ -1,16 +1,10 @@
-'use client'
+"use client";
 
-import { useState, useRef, useEffect } from "react"
-import { Button } from "@/components/ui/button"
-import { Input } from "@/components/ui/input"
-import {
-  Share,
-  Bookmark,
-  MoreHorizontal,
-  BrainCircuit,
-  Globe
-} from "lucide-react"
-import { DownOutlined } from '@ant-design/icons'
+import { useState, useRef, useEffect } from "react";
+import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
+import { BrainCircuit, Globe } from "lucide-react";
+import { DownOutlined } from "@ant-design/icons";
 
 // Gradient definition for BrainCircuit icon
 const GradientDefs = () => (
@@ -22,31 +16,25 @@ const GradientDefs = () => (
       </linearGradient>
     </defs>
   </svg>
-)
+);
 
-import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from "@/components/ui/dropdownMenu"
-import { useTranslation } from "react-i18next"
-import { Dropdown } from "antd"
-import { languageOptions } from '@/lib/constants'
-import { useLanguageSwitch } from '@/lib/languageUtils'
-import MemoryManageModal from "../internal/memory/memoryManageModal"
+import { useTranslation } from "react-i18next";
+import { Dropdown } from "antd";
+import { languageOptions } from "@/lib/constants";
+import { useLanguageSwitch } from "@/lib/language";
+import MemoryManageModal from "../internal/memory/memoryManageModal";
 
 interface ChatHeaderProps {
-  title: string
-  onShare?: () => void
-  onRename?: (newTitle: string) => void
+  title: string;
+  onRename?: (newTitle: string) => void;
 }
 
-export function ChatHeader({
-  title,
-  onShare,
-  onRename
-}: ChatHeaderProps) {
+export function ChatHeader({ title, onRename }: ChatHeaderProps) {
   const [isEditing, setIsEditing] = useState(false);
   const [editTitle, setEditTitle] = useState(title);
   const [memoryModalVisible, setMemoryModalVisible] = useState(false);
   const inputRef = useRef<HTMLInputElement>(null);
-  const { t } = useTranslation('common');
+  const { t } = useTranslation("common");
   const { currentLanguage, handleLanguageChange } = useLanguageSwitch();
 
   // Update editTitle when the title attribute changes
@@ -87,8 +75,6 @@ export function ChatHeader({
     }
   };
 
-
-
   return (
     <>
       <GradientDefs />
@@ -127,27 +113,39 @@ export function ChatHeader({
               {/* Language Switch */}
               <Dropdown
                 menu={{
-                  items: languageOptions.map(opt => ({ key: opt.value, label: opt.label })),
+                  items: languageOptions.map((opt) => ({
+                    key: opt.value,
+                    label: opt.label,
+                  })),
                   onClick: ({ key }) => handleLanguageChange(key as string),
                 }}
               >
-                <a
-                  className="ant-dropdown-link text-sm font-medium text-slate-600 hover:text-slate-900 dark:text-slate-300 dark:hover:text-white transition-colors flex items-center gap-2 cursor-pointer w-[100px] border-0 shadow-none bg-transparent text-left"
-                >
+                <a className="ant-dropdown-link text-sm font-medium text-slate-600 hover:text-slate-900 dark:text-slate-300 dark:hover:text-white transition-colors flex items-center gap-2 cursor-pointer w-[100px] border-0 shadow-none bg-transparent text-left">
                   <Globe className="h-4 w-4" />
-                  {languageOptions.find(o => o.value === currentLanguage)?.label || currentLanguage}
+                  {languageOptions.find((o) => o.value === currentLanguage)
+                    ?.label || currentLanguage}
                   <DownOutlined className="text-[10px]" />
                 </a>
               </Dropdown>
               {/* Memory Setting */}
-              <Button variant="ghost" className="h-8 w-12 rounded-full" onClick={() => setMemoryModalVisible(true)}>
-                <BrainCircuit className="size-5" stroke="url(#brainCogGradient)" />
+              <Button
+                variant="ghost"
+                className="h-8 w-12 rounded-full"
+                onClick={() => setMemoryModalVisible(true)}
+              >
+                <BrainCircuit
+                  className="size-5"
+                  stroke="url(#brainCogGradient)"
+                />
               </Button>
             </div>
           </div>
         </div>
       </header>
-      <MemoryManageModal visible={memoryModalVisible} onClose={() => setMemoryModalVisible(false)} />
+      <MemoryManageModal
+        visible={memoryModalVisible}
+        onClose={() => setMemoryModalVisible(false)}
+      />
     </>
-  )
-} 
+  );
+}