From 469ae408943ab4c9f5bc59e7ba3571ebaba6eda9 Mon Sep 17 00:00:00 2001
From: dolphin <shanghang@dataelem.com>
Date: Thu, 10 Apr 2025 10:59:46 +0800
Subject: [PATCH 001/186] =?UTF-8?q?feat:=20mcp=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/bs-comp/sheets/ToolsSheet.tsx  |  15 +-
 .../platform/src/controllers/API/assistant.ts |   6 +
 .../src/pages/BuildPage/flow/Sidebar.tsx      |   1 +
 .../src/pages/BuildPage/tools/EditMcp.tsx     | 350 ++++++++++++++++++
 .../src/pages/BuildPage/tools/EditTool.tsx    |  38 +-
 .../src/pages/BuildPage/tools/ToolItem.tsx    |   2 +-
 .../src/pages/BuildPage/tools/index.tsx       | 111 +++++-
 .../pages/SystemPage/components/EditRole.tsx  |   3 +-
 8 files changed, 494 insertions(+), 32 deletions(-)
 create mode 100644 src/frontend/platform/src/pages/BuildPage/tools/EditMcp.tsx

diff --git a/src/frontend/platform/src/components/bs-comp/sheets/ToolsSheet.tsx b/src/frontend/platform/src/components/bs-comp/sheets/ToolsSheet.tsx
index 930bedbab..6c7a36b18 100644
--- a/src/frontend/platform/src/components/bs-comp/sheets/ToolsSheet.tsx
+++ b/src/frontend/platform/src/components/bs-comp/sheets/ToolsSheet.tsx
@@ -2,9 +2,9 @@ import { Accordion } from "@/components/bs-ui/accordion";
 import { Button } from "@/components/bs-ui/button";
 import { SearchInput } from "@/components/bs-ui/input";
 import { Sheet, SheetContent, SheetTitle, SheetTrigger } from "@/components/bs-ui/sheet";
-import { getAssistantToolsApi } from "@/controllers/API/assistant";
+import { getAssistantMcpApi, getAssistantToolsApi } from "@/controllers/API/assistant";
 import ToolItem from "@/pages/BuildPage/tools/ToolItem";
-import { Star, User } from "lucide-react";
+import { CpuIcon, Star, User } from "lucide-react";
 import { useEffect, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 
@@ -16,7 +16,8 @@ export default function ToolsSheet({ select, onSelect, children }) {
     const [allData, setAllData] = useState([])
 
     useEffect(() => {
-        getAssistantToolsApi(type).then(res => {
+        const p = type === 'mcp' ? getAssistantMcpApi() : getAssistantToolsApi(type)
+        p.then(res => {
             setAllData(res)
             setKeyword('')
         })
@@ -61,6 +62,14 @@ export default function ToolsSheet({ select, onSelect, children }) {
                                 <Star />
                                 <span>{t('tools.customTools')}</span>
                             </div>
+                            <div
+                                className={`mt-1 flex cursor-pointer items-center gap-2 rounded-md px-4 py-2 transition-all duration-200 hover:bg-muted-foreground/10 ${type === "mcp" && "bg-muted-foreground/10"
+                                    }`}
+                                onClick={() => setType("mcp")}
+                            >
+                                <CpuIcon />
+                                <span>MCP工具</span>
+                            </div>
                         </div>
                     </div>
                     <div className="flex-1 bg-background-main p-5 pt-12 h-full overflow-auto scrollbar-hide">
diff --git a/src/frontend/platform/src/controllers/API/assistant.ts b/src/frontend/platform/src/controllers/API/assistant.ts
index 74e908cbd..cb03b8eec 100644
--- a/src/frontend/platform/src/controllers/API/assistant.ts
+++ b/src/frontend/platform/src/controllers/API/assistant.ts
@@ -89,6 +89,12 @@ export const getAssistantToolsApi = async (type: 'all' | 'default' | 'custom'):
     return await axios.get(`/api/v1/assistant/tool_list${queryStr[type]}`)
 };
 
+// 获取mcp服务集合
+export const getAssistantMcpApi = async (): Promise<any> => {
+    // TODO 转换数据结构与getAssistantToolsApi一致,方便ui处理
+    return await axios.get(`/api/v1/assistant/tool_list?is_preset=false`)
+}
+
 // 修改内置工具配置
 export const updateAssistantToolApi = async (tool_id, extra) => {
     return await axios.post(`/api/v1/assistant/tool/config`, { tool_id, extra })
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/Sidebar.tsx b/src/frontend/platform/src/pages/BuildPage/flow/Sidebar.tsx
index 2df0d3e9e..5976e8c27 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/Sidebar.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/Sidebar.tsx
@@ -31,6 +31,7 @@ export default function Sidebar({ dropdown = false, disabledNodes = [], onInitSt
 
     const nodeTemps = useMemo(() => {
         if (!tempData) return []
+        // TODO 追加MCP工具
         return tempData.reduce((list, temp) => {
             if (disabledNodes.includes(temp.type)) return list
             const newNode = getNodeDataByTemp(temp)
diff --git a/src/frontend/platform/src/pages/BuildPage/tools/EditMcp.tsx b/src/frontend/platform/src/pages/BuildPage/tools/EditMcp.tsx
new file mode 100644
index 000000000..3757ac74b
--- /dev/null
+++ b/src/frontend/platform/src/pages/BuildPage/tools/EditMcp.tsx
@@ -0,0 +1,350 @@
+import { bsConfirm } from "@/components/bs-ui/alertDialog/useConfirm";
+import { Button } from "@/components/bs-ui/button";
+import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/bs-ui/dialog";
+import { Input, Textarea } from "@/components/bs-ui/input";
+import { Label } from "@/components/bs-ui/label";
+import { Popover, PopoverClose, PopoverContent, PopoverTrigger } from "@/components/bs-ui/popover";
+import { Select, SelectContent, SelectGroup, SelectItem, SelectTrigger } from "@/components/bs-ui/select";
+import { Sheet, SheetContent, SheetFooter, SheetHeader, SheetTitle } from "@/components/bs-ui/sheet";
+import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/bs-ui/table";
+import { useToast } from "@/components/bs-ui/toast/use-toast";
+// import { createMcpServer, deleteMcpServer, getMcpTools, testMcpTool, updateMcpServer } from "@/controllers/API/mcp";
+import { captureAndAlertRequestErrorHoc } from "@/controllers/request";
+import { Plus } from "lucide-react";
+import { forwardRef, useEffect, useImperativeHandle, useRef, useState } from "react";
+
+// 测试对话框组件
+const TestDialog = forwardRef((props, ref) => {
+    const [testShow, setTestShow] = useState(false);
+    const [toolData, setToolData] = useState(null);
+    const [params, setParams] = useState({});
+    const [result, setResult] = useState("");
+    const [loading, setLoading] = useState(false);
+    const { message } = useToast();
+
+    useImperativeHandle(ref, () => ({
+        open: (tool, config) => {
+            setToolData({ ...tool, config });
+            setParams({});
+            setResult("");
+            setTestShow(true);
+        }
+    }));
+
+    const handleTest = async () => {
+        // 校验必填参数
+        const requiredParams = Object.entries(toolData.inputSchema.properties)
+            .filter(([_, schema]) => schema.required)
+            .map(([name]) => name);
+
+        const errors = requiredParams.filter(name => !params[name]);
+        if (errors.length > 0) {
+            return message({ description: `以下参数必填：${errors.join(", ")}`, variant: "warning" });
+        }
+
+        setLoading(true);
+        try {
+            // const res = await captureAndAlertRequestErrorHoc(
+            //     testMcpTool({
+            //         config: toolData.config,
+            //         toolName: toolData.name,
+            //         params
+            //     })
+            // );
+            // setResult(JSON.stringify(res, null, 2));
+        } finally {
+            setLoading(false);
+        }
+    };
+
+    return (
+        <Dialog open={testShow} onOpenChange={setTestShow}>
+            <DialogContent className="sm:max-w-[625px]">
+                <DialogHeader>
+                    <DialogTitle>{toolData?.name}</DialogTitle>
+                </DialogHeader>
+                <div className="flex flex-col gap-8 py-6">
+                    <div className="max-h-[600px] overflow-y-auto">
+                        <Table>
+                            <TableHeader>
+                                <TableRow>
+                                    <TableHead>参数</TableHead>
+                                    <TableHead>值</TableHead>
+                                </TableRow>
+                            </TableHeader>
+                            <TableBody>
+                                {Object.entries(toolData?.inputSchema?.properties || {}).map(([name, schema]) => (
+                                    <TableRow key={name}>
+                                        <TableCell>
+                                            {name}
+                                            {schema.required && <span className="text-red-500">*</span>}
+                                        </TableCell>
+                                        <TableCell>
+                                            <Input
+                                                placeholder={`输入${schema.type}类型值`}
+                                                onChange={(e) => setParams(prev => ({
+                                                    ...prev,
+                                                    [name]: e.target.value
+                                                }))}
+                                            />
+                                        </TableCell>
+                                    </TableRow>
+                                ))}
+                            </TableBody>
+                        </Table>
+                    </div>
+                    <Button onClick={handleTest} disabled={loading}>测试</Button>
+                    <Textarea
+                        value={result}
+                        placeholder="点击按钮，输出测试结果"
+                        readOnly
+                        className="mt-2 min-h-[100px]"
+                    />
+                </div>
+            </DialogContent>
+        </Dialog>
+    );
+});
+
+// 主组件
+const McpServerDialog = forwardRef(({ existingNames = [], onReload }, ref) => {
+    const [open, setOpen] = useState(false);
+    const [isEdit, setIsEdit] = useState(false);
+    const [tools, setTools] = useState([]);
+    const initialData = {
+        name: "",
+        config: "{}"
+    };
+    const [formData, setFormData] = useState(initialData);
+    const serverRef = useRef(initialData);
+    const { message } = useToast();
+    const testDialogRef = useRef();
+
+    // 示例配置
+    const examples = {
+        tavily: JSON.stringify({
+            base_url: "https://api.tavily.com",
+            api_key: "YOUR_API_KEY"
+        }, null, 2)
+    };
+
+    // 暴露方法给父组件
+    useImperativeHandle(ref, () => ({
+        open: (server = null) => {
+            if (server) {
+                setFormData(server);
+                serverRef.current = server;
+                setIsEdit(true);
+                fetchTools(server.config);
+            } else {
+                resetForm();
+                setIsEdit(false);
+            }
+            setOpen(true);
+        }
+    }));
+
+    // 重置表单
+    const resetForm = () => {
+        setFormData(initialData);
+        serverRef.current = initialData;
+        setTools([]);
+    };
+
+    // 获取工具列表
+    const fetchTools = async (config) => {
+        try {
+            const jsonConfig = JSON.parse(config);
+            console.log('jsonConfig :>> ', jsonConfig);
+            // const tools = await captureAndAlertRequestErrorHoc(getMcpTools(jsonConfig));
+            // setTools(tools || []);
+            setTools([{
+                name: 'xxx',
+                description: 'yyyyy',
+                inputSchema: {
+                    type: "object",
+                    properties: {
+                        name: {
+                            type: "string",
+                            required: true
+                        }
+                    }
+                }
+            }]);
+        } catch (error) {
+            message({ description: "配置解析失败，请检查JSON格式", variant: "warning" });
+            setTools([]);
+        }
+    };
+
+    // 表单提交
+    const handleSubmit = () => {
+        // 校验逻辑
+        const errors = [];
+        if (!formData.name.trim()) errors.push("名称不能为空");
+        if (!formData.config.trim()) errors.push("配置不能为空");
+
+        // 名称唯一性校验（不区分大小写）
+        const nameLower = formData.name.toLowerCase();
+        if (existingNames.some(n => n.toLowerCase() === nameLower && n !== serverRef.current.name)) {
+            errors.push("名称已存在，请修改");
+        }
+
+        // JSON格式校验
+        try {
+            JSON.parse(formData.config);
+        } catch {
+            errors.push("配置格式错误，请检查JSON格式是否正确");
+        }
+
+        if (errors.length > 0) {
+            return message({ description: errors, variant: "warning" });
+        }
+
+        // 提交数据
+        // const apiMethod = isEdit ? updateMcpServer : createMcpServer;
+        // captureAndAlertRequestErrorHoc(apiMethod({
+        //     ...serverRef.current,
+        //     ...formData,
+        //     config: JSON.parse(formData.config) // 确保存储的是对象
+        // })).then(() => {
+        //     message({ description: "保存成功", variant: "success" });
+        //     setOpen(false);
+        // });
+    };
+
+    // 删除服务器
+    const handleDelete = () => {
+        bsConfirm({
+            title: "确认删除",
+            desc: "确认删除该 MCP 服务器？",
+            onOk(next) {
+                // captureAndAlertRequestErrorHoc(deleteMcpServer(serverRef.current.id)).then(() => {
+                //     setOpen(false);
+                // onReload()
+                //     next();
+                // });
+            }
+        });
+    };
+
+    return (
+        <div>
+            <Sheet open={open} onOpenChange={setOpen}>
+                <SheetContent className="w-[800px] sm:max-w-[800px] p-4 bg-background-login">
+                    <SheetHeader>
+                        <SheetTitle>{isEdit ? "编辑" : "添加"} MCP 服务器</SheetTitle>
+                    </SheetHeader>
+
+                    <div className="mt-4 space-y-6 px-6 overflow-y-auto h-[calc(100vh-200px)]">
+                        {/* 名称输入 */}
+                        <div>
+                            <Label className="bisheng-label">名称</Label>
+                            <Input
+                                value={formData.name}
+                                className="mt-2"
+                                placeholder="输入MCP 服务名称"
+                                onChange={(e) => setFormData(prev => ({
+                                    ...prev,
+                                    name: e.target.value
+                                }))}
+                            />
+                        </div>
+
+                        {/* 配置输入 */}
+                        <div>
+                            <div className="flex justify-between items-center mb-2">
+                                <Label className="bisheng-label">MCP服务器配置</Label>
+                                <Select onValueChange={(v) => setFormData(prev => {
+                                    fetchTools(examples[v])
+                                    return {
+                                        ...prev,
+                                        config: examples[v]
+                                    }
+                                })
+                                }>
+                                    <SelectTrigger className="w-[180px]">
+                                        <span>配置示例</span>
+                                    </SelectTrigger>
+                                    <SelectContent>
+                                        <SelectGroup>
+                                            <SelectItem value="tavily">Tavily 搜索</SelectItem>
+                                        </SelectGroup>
+                                    </SelectContent>
+                                </Select>
+                            </div>
+                            <Textarea
+                                value={formData.config}
+                                placeholder="输入您的 MCP 服务器配置 json"
+                                className="min-h-[200px] font-mono"
+                                onChange={(e) => setFormData(prev => ({
+                                    ...prev,
+                                    config: e.target.value
+                                }))}
+                                onBlur={() => fetchTools(formData.config)}
+                            />
+                        </div>
+
+                        {/* 工具列表 */}
+                        <div>
+                            <div className="flex justify-between items-center mb-2">
+                                <Label>可用工具</Label>
+                                <Button variant="outline" onClick={() => fetchTools(formData.config)}>
+                                    刷新列表
+                                </Button>
+                            </div>
+                            <Table>
+                                <TableHeader>
+                                    <TableRow>
+                                        <TableHead>工具名称</TableHead>
+                                        <TableHead>描述</TableHead>
+                                        <TableHead>操作</TableHead>
+                                    </TableRow>
+                                </TableHeader>
+                                <TableBody>
+                                    {tools.map((tool) => (
+                                        <TableRow key={tool.name}>
+                                            <TableCell>{tool.name}</TableCell>
+                                            <TableCell>{tool.description}</TableCell>
+                                            <TableCell>
+                                                <Button
+                                                    variant="outline"
+                                                    onClick={() => testDialogRef.current.open(
+                                                        tool,
+                                                        JSON.parse(formData.config)
+                                                    )}
+                                                >
+                                                    测试
+                                                </Button>
+                                            </TableCell>
+                                        </TableRow>
+                                    ))}
+                                </TableBody>
+                            </Table>
+                        </div>
+                    </div>
+
+                    {/* 底部操作按钮 */}
+                    <SheetFooter className="absolute bottom-0 right-0 w-full px-6 py-4">
+                        {isEdit && (
+                            <Button
+                                variant="destructive"
+                                className="mr-auto"
+                                onClick={handleDelete}
+                            >
+                                删除
+                            </Button>
+                        )}
+                        <Button variant="outline" onClick={() => setOpen(false)}>
+                            取消
+                        </Button>
+                        <Button onClick={handleSubmit}>保存</Button>
+                    </SheetFooter>
+                </SheetContent>
+            </Sheet>
+            <TestDialog ref={testDialogRef} />
+        </div>
+    );
+});
+
+export default McpServerDialog;
\ No newline at end of file
diff --git a/src/frontend/platform/src/pages/BuildPage/tools/EditTool.tsx b/src/frontend/platform/src/pages/BuildPage/tools/EditTool.tsx
index 5fd606458..e3ffeb8aa 100644
--- a/src/frontend/platform/src/pages/BuildPage/tools/EditTool.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/tools/EditTool.tsx
@@ -16,34 +16,44 @@ import { Plus } from "lucide-react"
 import { forwardRef, useEffect, useImperativeHandle, useRef, useState } from "react"
 import { useTranslation } from "react-i18next"
 
-const TestDialog = forwardRef((props: any, ref) => {
+interface TestDialogProps {
+    tool: any;
+    formState: any;
+}
+
+const TestDialog = forwardRef<{
+    open: (item, tool, formState) => void
+}, TestDialogProps>((props: any, ref) => {
     const { t } = useTranslation()
     const [testShow, setTestShow] = useState(false)
     const [apiData, setApiData] = useState<any>({})
     const toolRef = useRef<any>({})
-    const formRef = useRef<any>({})
-    const formRuleRef = useRef<any>({})
-    const formStateRef = useRef<any>({})
+
+    const formRef = useRef<{
+        values: Record<string, string>;
+        rules: Record<string, boolean>;
+        state?: any;
+    }>({ values: {}, rules: {} });
 
     useImperativeHandle(ref, () => ({
         open: (item, tool, formState) => {
             toolRef.current = tool
-            formStateRef.current = formState
+            formRef.current.state = formState
             setResult('')
             setApiData(item)
             setTestShow(true)
             // fill form
             item.api_params.forEach(param => {
-                formRef.current[param.name] = ''
-                formRuleRef.current[param.name] = param.required
+                formRef.current.values[param.name] = ''
+                formRef.current.rules[param.name] = param.required
             });
         }
     }))
     // 重置
     useEffect(() => {
         if (!testShow) {
-            formRef.current = {}
-            formRuleRef.current = {}
+            formRef.current.values = {}
+            formRef.current.rules = {}
         }
     }, [testShow])
 
@@ -53,8 +63,8 @@ const TestDialog = forwardRef((props: any, ref) => {
     const handleTest = async () => {
         // 校验
         const errors = []
-        Object.keys(formRef.current).forEach(key => {
-            if (formRuleRef.current[key] && formRef.current[key] === '') {
+        Object.keys(formRef.current.values).forEach(key => {
+            if (formRef.current.rules[key] && formRef.current.values[key] === '') {
                 errors.push(key + '为必填项')
             }
         })
@@ -75,7 +85,7 @@ const TestDialog = forwardRef((props: any, ref) => {
             auth_method: formStateRef.current.authMethod === 'apikey' ? 1 : 0,
             auth_type: formStateRef.current.authType,
             api_key: formStateRef.current.apiKey,
-            request_params: formRef.current,
+            request_params: formRef.current.values,
             api_location: formStateRef.current.apiLocation,
             parameter_name: formStateRef.current.parameter
         }).then(setResult))
@@ -104,7 +114,7 @@ const TestDialog = forwardRef((props: any, ref) => {
                                         <TableCell>{param.name}{param.required && <span className="text-red-500">*</span>}</TableCell>
                                         <TableCell>
                                             <Input onChange={(e) => {
-                                                formRef.current[param.name] = e.target.value;
+                                                formRef.current.values[param.name] = e.target.value;
                                             }}></Input>
                                         </TableCell>
                                     </TableRow>
@@ -262,7 +272,7 @@ const EditTool = forwardRef((props: any, ref) => {
             errors.push('schema不能为空');
         }
         if (formState.authMethod === "apikey") {
-            if (!formState.apiKey) {
+            if (!formState.apiKey?.trim()) {
                 errors.push('API Key不可为空');
             } else if (formState.apiKey.length > 1000) {
                 errors.push('API Key不可大于1000字符');
diff --git a/src/frontend/platform/src/pages/BuildPage/tools/ToolItem.tsx b/src/frontend/platform/src/pages/BuildPage/tools/ToolItem.tsx
index 3b7598fca..faa3ca8fc 100644
--- a/src/frontend/platform/src/pages/BuildPage/tools/ToolItem.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/tools/ToolItem.tsx
@@ -28,7 +28,7 @@ export default function ToolItem({
                 <div className="flex-1 min-w-0">
                     <div className="w-full text-sm font-medium leading-none flex items-center gap-2">{data.name}
                         {
-                            type === 'edit' && <div
+                            ['edit', 'mcp'].includes(type) && <div
                                 className="group-hover:opacity-100 opacity-0 hover:bg-[#EAEDF3] rounded cursor-pointer"
                                 onClick={(e) => onEdit(data.id)}
                             ><SettingIcon /></div>
diff --git a/src/frontend/platform/src/pages/BuildPage/tools/index.tsx b/src/frontend/platform/src/pages/BuildPage/tools/index.tsx
index a6024e40e..c5ec3b4e2 100644
--- a/src/frontend/platform/src/pages/BuildPage/tools/index.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/tools/index.tsx
@@ -2,15 +2,29 @@ import { Accordion } from "@/components/bs-ui/accordion";
 import { Button } from "@/components/bs-ui/button";
 import { SearchInput } from "@/components/bs-ui/input";
 import { userContext } from "@/contexts/userContext";
-import { getAssistantToolsApi } from "@/controllers/API/assistant";
-import { Star, User } from "lucide-react";
+import { getAssistantMcpApi, getAssistantToolsApi } from "@/controllers/API/assistant";
+import { CpuIcon, Star, User } from "lucide-react";
 import { useContext, useEffect, useMemo, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
+import McpServerDialog from "./EditMcp";
 import EditTool from "./EditTool";
 import ToolItem from "./ToolItem";
 import ToolSet from "./ToolSet";
+import { LoadIcon } from "@/components/bs-icons";
+import { useToast } from "@/components/bs-ui/toast/use-toast";
 
-export default function tabTools({ select = null, onSelect }) {
+const MANAGED_TOOLS = [
+    'Dalle3绘画', 'Bing web搜索', '天眼查',
+    'Firecrawl', 'Jina AI', 'SiliconFlow',
+    '发送邮件', '飞书消息'
+];
+
+interface TabToolsProps {
+    select?: any;
+    onSelect: (tool: any) => void;
+}
+
+const TabTools = ({ select = null, onSelect }: TabToolsProps) => {
     const [keyword, setKeyword] = useState(" ");
     const [allData, setAllData] = useState([]);
     const { t } = useTranslation()
@@ -19,6 +33,7 @@ export default function tabTools({ select = null, onSelect }) {
 
     const [type, setType] = useState(""); // '' add edit
     const editRef = useRef(null);
+    const mcpDialogRef = useRef(null);
 
     const loadData = (_type = "custom") => {
         getAssistantToolsApi(_type).then((res) => {
@@ -26,7 +41,14 @@ export default function tabTools({ select = null, onSelect }) {
             setKeyword("");
         });
     };
+    const loadMcpData = () => {
+        getAssistantMcpApi().then((res) => {
+            setAllData(res);
+            setKeyword("");
+        });
+    }
     useEffect(() => {
+        if (type === 'mcp') return loadMcpData()
         loadData(type === "" ? "default" : "custom");
     }, [type]);
 
@@ -40,10 +62,11 @@ export default function tabTools({ select = null, onSelect }) {
 
     const hasSet = (name) => {
         if (user.role !== 'admin') return false
-        return ['Dalle3绘画', 'Bing web搜索', '天眼查', 'Firecrawl', 'Jina AI', 'SiliconFlow', '发送邮件', '飞书消息'].includes(name)
+        return MANAGED_TOOLS.includes(name)
     }
 
     const toolsetRef = useRef(null)
+    const { loading, refresh } = useMcpRefrensh()
 
     return (
         <div className="flex h-full relative" onClick={(e) => e.stopPropagation()}>
@@ -55,12 +78,6 @@ export default function tabTools({ select = null, onSelect }) {
                         className="mt-6"
                         onChange={(e) => setKeyword(e.target.value)}
                     />
-                    <Button
-                        className="mt-4 w-full text-[white]"
-                        onClick={() => editRef.current.open()}
-                    >
-                        {t('create')}{t("tools.createCustomTool")}
-                    </Button>
                     <div className="mt-4">
                         <div
                             className={`flex cursor-pointer items-center gap-2 rounded-md px-4 py-2 transition-all duration-200 hover:bg-muted-foreground/10 ${type === "" && "bg-muted-foreground/10"
@@ -78,6 +95,14 @@ export default function tabTools({ select = null, onSelect }) {
                             <Star />
                             <span>{t("tools.customTools")}</span>
                         </div>
+                        <div
+                            className={`mt-1 flex cursor-pointer items-center gap-2 rounded-md px-4 py-2 transition-all duration-200 hover:bg-muted-foreground/10 ${type === "mcp" && "bg-muted-foreground/10"
+                                }`}
+                            onClick={() => setType("mcp")}
+                        >
+                            <CpuIcon />
+                            <span>MCP工具</span>
+                        </div>
                     </div>
                     <div className="absolute bottom-0 left-0 flex h-16 w-full items-center justify-betwee px-2">
                         <p className="text-sm text-muted-foreground break-all">
@@ -85,7 +110,29 @@ export default function tabTools({ select = null, onSelect }) {
                         </p>
                     </div>
                 </div>
-                <div className="h-full w-full flex-1 overflow-auto bg-background-login p-5 pb-20 pt-12 scrollbar-hide">
+                <div className="h-full w-full flex-1 overflow-auto bg-background-login p-5 pb-20 pt-2 scrollbar-hide">
+                    <div className="mb-4">
+                        {type === 'edit' && <Button
+                            className="mt-4  text-[white]"
+                            onClick={() => editRef.current.open()}
+                        >
+                            {t('create')}{t("tools.createCustomTool")}
+                        </Button>}
+                        {type === 'mcp' && <Button
+                            className="mt-4  text-[white]"
+                            onClick={() => mcpDialogRef.current.open()}
+                        >
+                            添加 MCP 服务器
+                        </Button>}
+                        {type === 'mcp' && <Button
+                            disabled={loading}
+                            className="mt-4 ml-4 text-[white]"
+                            onClick={refresh}
+                        >
+                            {loading && <LoadIcon />}
+                            刷新
+                        </Button>}
+                    </div>
                     <Accordion type="single" collapsible className="w-full">
                         {options.length ? (
                             options.map((el) => (
@@ -96,7 +143,10 @@ export default function tabTools({ select = null, onSelect }) {
                                     data={el}
                                     onSelect={onSelect}
                                     onSetClick={hasSet(el.name) ? () => toolsetRef.current.edit(el) : null}
-                                    onEdit={(id) => editRef.current.edit(el)}
+                                    onEdit={(id) => {
+                                        type === 'mcp' ? mcpDialogRef.current.open(el) :
+                                            editRef.current.edit(el)
+                                    }}
                                 ></ToolItem>
                             ))
                         ) : (
@@ -116,8 +166,43 @@ export default function tabTools({ select = null, onSelect }) {
                 }}
                 ref={editRef}
             />
+
+            <McpServerDialog
+                ref={mcpDialogRef}
+                existingNames={options.map((el) => el.name)}
+                onReload={loadMcpData}
+                onSuccess={() => { }}
+            />
+
             {/* 内置工具设置 */}
             <ToolSet ref={toolsetRef} onChange={() => loadData("default")} />
         </div>
     );
-}
\ No newline at end of file
+}
+
+// 刷新mcp服务
+const useMcpRefrensh = () => {
+    const [loading, setLoading] = useState(false);
+    const { message } = useToast()
+
+    return {
+        loading,
+        async refresh() {
+            setLoading(true);
+            // api
+            setTimeout(() => {
+                message({
+                    variant: "success",
+                    description: "刷新成功"
+                })
+                message({
+                    variant: "error",
+                    description: "{xxx MCP服务器名称}工具获取失败，请重试"
+                })
+                setLoading(false);
+            }, 1000);
+        }
+    }
+}
+
+export default TabTools;
\ No newline at end of file
diff --git a/src/frontend/platform/src/pages/SystemPage/components/EditRole.tsx b/src/frontend/platform/src/pages/SystemPage/components/EditRole.tsx
index 216bfde4b..a84f2726a 100644
--- a/src/frontend/platform/src/pages/SystemPage/components/EditRole.tsx
+++ b/src/frontend/platform/src/pages/SystemPage/components/EditRole.tsx
@@ -34,6 +34,7 @@ const SearchPanne = ({ groupId, title, type, children }) => {
             case 'skill':
                 return getGroupResourcesApi({ ...param, resource_type: 2 });
             case 'tool':
+                // TODO 追加mcp工具
                 return getGroupResourcesApi({ ...param, resource_type: 4 });
             case 'assistant':
                 return getGroupResourcesApi({ ...param, resource_type: 3 });
@@ -85,7 +86,7 @@ export default function EditRole({ id, name, groupId, onChange, onBeforeChange }
         if (id !== -1) {
             // 获取详情，初始化选中数据
             getRolePermissionsApi(id).then(res => {
-                const useSkills = [], useLibs = [], manageLibs = [], useAssistant = [],useFlows=[], useTools = [],
+                const useSkills = [], useLibs = [], manageLibs = [], useAssistant = [], useFlows = [], useTools = [],
                     useMenu = []
                 res.data.forEach(item => {
                     switch (item.type) {

From b01d057a581efebea287f3271eb8446962a45372 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Fri, 11 Apr 2025 14:35:07 +0800
Subject: [PATCH 002/186] feat: upgrade langchain to 0.3.*

---
 src/backend/Dockerfile                        |   4 +
 src/backend/bisheng/api/services/chat_imp.py  |   2 +-
 src/backend/bisheng/api/services/utils.py     |   2 +-
 src/backend/bisheng/api/v1/assistant.py       |  32 ++---
 src/backend/bisheng/api/v1/audit.py           |  10 +-
 src/backend/bisheng/api/v1/chat.py            |  20 +--
 src/backend/bisheng/api/v1/component.py       |  14 +-
 src/backend/bisheng/api/v1/endpoints.py       |   8 +-
 src/backend/bisheng/api/v1/evaluation.py      |   6 +-
 src/backend/bisheng/api/v1/finetune.py        |  32 ++---
 src/backend/bisheng/api/v1/flows.py           |   8 +-
 src/backend/bisheng/api/v1/knowledge.py       |   6 +-
 src/backend/bisheng/api/v1/llm.py             | 131 ++++++------------
 src/backend/bisheng/api/v1/qa.py              |   2 +-
 .../bisheng/api/v1/schema/base_schema.py      |   2 +-
 src/backend/bisheng/api/v1/schemas.py         |  17 ++-
 src/backend/bisheng/api/v1/server.py          |  10 +-
 src/backend/bisheng/api/v1/skillcenter.py     |   8 +-
 src/backend/bisheng/api/v1/tag.py             |  16 +--
 src/backend/bisheng/api/v1/user.py            |  10 +-
 src/backend/bisheng/api/v1/usergroup.py       |  28 ++--
 src/backend/bisheng/api/v1/validate.py        |   6 +-
 src/backend/bisheng/api/v1/variable.py        |   4 +-
 src/backend/bisheng/api/v1/workflow.py        |   8 +-
 src/backend/bisheng/api/v2/assistant.py       |   4 +-
 src/backend/bisheng/api/v2/filelib.py         |  12 +-
 src/backend/bisheng/database/models/base.py   |   4 +-
 .../bisheng/database/models/flow_version.py   |   2 +-
 .../bisheng/interface/chains/custom.py        |   8 +-
 .../bisheng/interface/embeddings/custom.py    |   9 +-
 src/backend/bisheng/interface/llms/custom.py  |   2 +-
 .../bisheng/interface/prompts/custom.py       |   5 +-
 src/backend/bisheng/interface/tools/base.py   |   4 +-
 src/backend/bisheng/interface/tools/custom.py |   2 +-
 src/backend/bisheng/mcp_manage/__init__.py    |   0
 src/backend/bisheng/mcp_manage/client.py      |  15 ++
 src/backend/bisheng/mcp_manage/constant.py    |   5 +
 src/backend/bisheng/settings.py               |  19 +--
 src/backend/bisheng/utils/util.py             |   8 +-
 src/backend/pyproject.toml                    |  26 ++--
 .../agents/chatglm_functions_agent/base.py    |   9 +-
 .../agents/llm_functions_agent/base.py        |   9 +-
 .../chains/qa_generation/base.py              |   2 +-
 .../bisheng_langchain/chains/transform.py     |   2 +-
 .../bisheng_langchain/chat_models/host_llm.py |   8 +-
 .../bisheng_langchain/chat_models/minimax.py  |   7 +-
 .../chat_models/proxy_llm.py                  |   8 +-
 .../bisheng_langchain/chat_models/qwen.py     |   8 +-
 .../chat_models/sensetime.py                  |   8 +-
 .../bisheng_langchain/chat_models/wenxin.py   |   7 +-
 .../bisheng_langchain/chat_models/xunfeiai.py |   7 +-
 .../bisheng_langchain/chat_models/zhipuai.py  |   7 +-
 .../embeddings/host_embedding.py              |   8 +-
 .../embeddings/huggingfacegte.py              |   2 +-
 .../embeddings/huggingfacemultilingual.py     |   2 +-
 .../bisheng_langchain/embeddings/wenxin.py    |   7 +-
 .../gpts/tools/api_tools/base.py              |   6 +-
 .../gpts/tools/api_tools/firecrawl.py         |   2 +-
 .../gpts/tools/api_tools/flow.py              |   2 +-
 .../gpts/tools/api_tools/macro_data.py        |   2 +-
 .../gpts/tools/api_tools/sina.py              |   2 +-
 .../gpts/tools/api_tools/tianyancha.py        |   9 +-
 .../gpts/tools/bing_search/tool.py            |   4 +-
 .../gpts/tools/calculator/tool.py             |   2 +-
 .../gpts/tools/code_interpreter/tool.py       |   2 +-
 .../gpts/tools/dalle_image_generator/tool.py  |  12 +-
 .../gpts/tools/get_current_time/tool.py       |   2 +-
 .../gpts/tools/message/dingding.py            |   3 +-
 .../gpts/tools/message/email.py               |   6 +-
 .../gpts/tools/message/feishu.py              |   5 +-
 .../gpts/tools/message/wechat.py              |   5 +-
 .../gpts/tools/sql_agent/tool.py              |   8 +-
 .../bisheng_langchain/memory/redis.py         |   6 +-
 .../rag/bisheng_rag_chain.py                  |   4 +-
 .../bisheng_langchain/rag/bisheng_rag_tool.py |   2 +-
 .../baseline_vector_retriever.py              |   2 +-
 .../rag/init_retrievers/keyword_retriever.py  |   2 +-
 .../rag/init_retrievers/mix_retriever.py      |   2 +-
 .../smaller_chunks_retriever.py               |   4 +-
 .../rag/test/test_smaller_chunks.py           |   2 +-
 .../bisheng_langchain/retrievers/ensemble.py  |   5 +-
 .../utils/azure_dalle_image_generator.py      |   5 +-
 .../vectorstores/retriever.py                 |   5 +-
 src/bisheng-langchain/requirements.txt        |   8 +-
 src/bisheng-langchain/version.txt             |   2 +-
 85 files changed, 358 insertions(+), 375 deletions(-)
 create mode 100644 src/backend/bisheng/mcp_manage/__init__.py
 create mode 100644 src/backend/bisheng/mcp_manage/client.py
 create mode 100644 src/backend/bisheng/mcp_manage/constant.py

diff --git a/src/backend/Dockerfile b/src/backend/Dockerfile
index 6c2f03ba8..4a74fb85b 100644
--- a/src/backend/Dockerfile
+++ b/src/backend/Dockerfile
@@ -10,4 +10,8 @@ RUN poetry update --without dev
 # patch langchain-openai lib. remove this when upgrade langchain-openai
 RUN patch -p1 < /app/bisheng/patches/langchain_openai.patch /usr/local/lib/python3.10/site-packages/langchain_openai/chat_models/base.py
 
+# patch fastapi-jwt-auth lib. remove this when remove fastapi-jwt-auth
+# fix fastapi-jwt-auth not support pydantic:v2
+RUN patch -p1 < /app/bisheng/patches/fastapi_jwt_auth.patch /usr/local/lib/python3.10/site-packages/fastapi_jwt_auth/config.py
+
 CMD ["sh entrypoint.sh"]
diff --git a/src/backend/bisheng/api/services/chat_imp.py b/src/backend/bisheng/api/services/chat_imp.py
index 11cb990d1..74ea3dd3e 100644
--- a/src/backend/bisheng/api/services/chat_imp.py
+++ b/src/backend/bisheng/api/services/chat_imp.py
@@ -53,7 +53,7 @@ async def clean_inactive_queues(queue: defaultdict, timeout_threshold: timedelta
 
 # 维护一个连接池
 connection_pool = defaultdict(TimedQueue)
-clean_inactive_queues(connection_pool, timedelta(minutes=5))
+# clean_inactive_queues(connection_pool, timedelta(minutes=5))
 
 
 async def get_connection(uri, identifier):
diff --git a/src/backend/bisheng/api/services/utils.py b/src/backend/bisheng/api/services/utils.py
index e66bd8832..6ff69747c 100644
--- a/src/backend/bisheng/api/services/utils.py
+++ b/src/backend/bisheng/api/services/utils.py
@@ -1,6 +1,6 @@
 from bisheng.template.field.base import TemplateField
 from bisheng.template.template.base import Template
-from langchain.pydantic_v1 import BaseModel
+from pydantic import BaseModel
 from langchain_core.language_models import BaseLanguageModel
 
 
diff --git a/src/backend/bisheng/api/v1/assistant.py b/src/backend/bisheng/api/v1/assistant.py
index 24e7fd388..5b8c23fd0 100644
--- a/src/backend/bisheng/api/v1/assistant.py
+++ b/src/backend/bisheng/api/v1/assistant.py
@@ -29,7 +29,7 @@ router = APIRouter(prefix='/assistant', tags=['Assistant'])
 chat_manager = ChatManager()
 
 
-@router.get('', response_model=UnifiedResponseModel[List[AssistantInfo]])
+@router.get('')
 def get_assistant(*,
                   name: str = Query(default=None, description='助手名称，模糊匹配, 包含描述的模糊匹配'),
                   tag_id: int = Query(default=None, description='标签ID'),
@@ -41,13 +41,13 @@ def get_assistant(*,
 
 
 # 获取某个助手的详细信息
-@router.get('/info/{assistant_id}', response_model=UnifiedResponseModel[AssistantInfo])
+@router.get('/info/{assistant_id}')
 def get_assistant_info(*, assistant_id: str, login_user: UserPayload = Depends(get_login_user)):
     """获取助手信息"""
     return AssistantService.get_assistant_info(assistant_id, login_user)
 
 
-@router.post('/delete', response_model=UnifiedResponseModel)
+@router.post('/delete')
 def delete_assistant(*,
                      request: Request,
                      assistant_id: str,
@@ -56,7 +56,7 @@ def delete_assistant(*,
     return AssistantService.delete_assistant(request, login_user, assistant_id)
 
 
-@router.post('', response_model=UnifiedResponseModel[AssistantInfo])
+@router.post('')
 async def create_assistant(*,
                            request: Request,
                            req: AssistantCreateReq,
@@ -70,7 +70,7 @@ async def create_assistant(*,
         return resp_500(message=f'创建助手出错：{str(e)}')
 
 
-@router.put('', response_model=UnifiedResponseModel[AssistantInfo])
+@router.put('')
 async def update_assistant(*,
                            request: Request,
                            req: AssistantUpdateReq,
@@ -79,7 +79,7 @@ async def update_assistant(*,
     return await AssistantService.update_assistant(request, login_user, req)
 
 
-@router.post('/status', response_model=UnifiedResponseModel)
+@router.post('/status')
 async def update_status(*,
                         request: Request,
                         assistant_id: str = Body(description='助手唯一ID', alias='id'),
@@ -129,7 +129,7 @@ async def auto_update_assistant(*, task_id: str = Query(description='优化任
 
 
 # 更新助手的提示词
-@router.post('/prompt', response_model=UnifiedResponseModel)
+@router.post('/prompt')
 async def update_prompt(*,
                         assistant_id: str = Body(description='助手唯一ID', alias='id'),
                         prompt: str = Body(description='用户使用的prompt'),
@@ -137,7 +137,7 @@ async def update_prompt(*,
     return AssistantService.update_prompt(assistant_id, prompt, login_user)
 
 
-@router.post('/flow', response_model=UnifiedResponseModel)
+@router.post('/flow')
 async def update_flow_list(*,
                            assistant_id: str = Body(description='助手唯一ID', alias='id'),
                            flow_list: List[str] = Body(description='用户选择的技能列表'),
@@ -145,7 +145,7 @@ async def update_flow_list(*,
     return AssistantService.update_flow_list(assistant_id, flow_list, login_user)
 
 
-@router.post('/tool', response_model=UnifiedResponseModel)
+@router.post('/tool')
 async def update_tool_list(*,
                            assistant_id: str = Body(description='助手唯一ID', alias='id'),
                            tool_list: List[int] = Body(description='用户选择的工具列表'),
@@ -186,7 +186,7 @@ async def chat(*,
             await websocket.close(code=http_status.WS_1011_INTERNAL_ERROR, reason=message)
 
 
-@router.get('/tool_list', response_model=UnifiedResponseModel)
+@router.get('/tool_list')
 def get_tool_list(*,
                   is_preset: Optional[bool] = None,
                   login_user: UserPayload = Depends(get_login_user)):
@@ -194,7 +194,7 @@ def get_tool_list(*,
     return resp_200(AssistantService.get_gpts_tools(login_user, is_preset))
 
 
-@router.post('/tool/config', response_model=UnifiedResponseModel)
+@router.post('/tool/config')
 async def update_tool_config(*,
                              login_user: UserPayload = Depends(get_admin_user),
                              tool_id: int = Body(description='工具类别唯一ID'),
@@ -204,7 +204,7 @@ async def update_tool_config(*,
     return resp_200(data=data)
 
 
-@router.post('/tool_schema', response_model=UnifiedResponseModel)
+@router.post('/tool_schema')
 async def get_tool_schema(*,
                           download_url: Optional[str] = Body(default=None,
                                                              description='下载url不为空的话优先用下载url'),
@@ -266,7 +266,7 @@ async def get_tool_schema(*,
         return resp_500(message='openapi schema解析失败：' + str(e))
 
 
-@router.post('/tool_list', response_model=UnifiedResponseModel[GptsToolsTypeRead])
+@router.post('/tool_list')
 def add_tool_type(*,
                   req: Dict = Body(default={}, description='openapi解析后的工具对象'),
                   login_user: UserPayload = Depends(get_login_user)):
@@ -275,7 +275,7 @@ def add_tool_type(*,
     return AssistantService.add_gpts_tools(login_user, req)
 
 
-@router.put('/tool_list', response_model=UnifiedResponseModel[GptsToolsTypeRead])
+@router.put('/tool_list')
 def update_tool_type(*,
                      login_user: UserPayload = Depends(get_login_user),
                      req: Dict = Body(default={}, description='通过openapi 解析后的内容，包含类别的唯一ID')):
@@ -284,13 +284,13 @@ def update_tool_type(*,
     return AssistantService.update_gpts_tools(login_user, req)
 
 
-@router.delete('/tool_list', response_model=UnifiedResponseModel)
+@router.delete('/tool_list')
 def delete_tool_type(*, login_user: UserPayload = Depends(get_login_user), req: DeleteToolTypeReq):
     """ 删除自定义工具 """
     return AssistantService.delete_gpts_tools(login_user, req.tool_type_id)
 
 
-@router.post('/tool_test', response_model=UnifiedResponseModel)
+@router.post('/tool_test')
 async def test_tool_type(*, login_user: UserPayload = Depends(get_login_user), req: TestToolReq):
     """ 测试自定义工具 """
     extra = json.loads(req.extra)
diff --git a/src/backend/bisheng/api/v1/audit.py b/src/backend/bisheng/api/v1/audit.py
index ab5be9a70..a52b15d47 100644
--- a/src/backend/bisheng/api/v1/audit.py
+++ b/src/backend/bisheng/api/v1/audit.py
@@ -10,7 +10,7 @@ from bisheng.api.v1.schemas import UnifiedResponseModel, resp_200
 router = APIRouter(prefix='/audit', tags=['AuditLog'])
 
 
-@router.get('', response_model=UnifiedResponseModel)
+@router.get('')
 def get_audit_logs(*,
                    group_ids: Optional[List[str]] = Query(default=[], description='分组id列表'),
                    operator_ids: Optional[List[int]] = Query(default=[], description='操作人id列表'),
@@ -27,7 +27,7 @@ def get_audit_logs(*,
                                          start_time, end_time, system_id, event_type, page, limit)
 
 
-@router.get('/operators', response_model=UnifiedResponseModel)
+@router.get('/operators')
 def get_all_operators(*, login_user: UserPayload = Depends(get_login_user)):
     """
     获取操作过组下资源的所有用户
@@ -35,7 +35,7 @@ def get_all_operators(*, login_user: UserPayload = Depends(get_login_user)):
     return AuditLogService.get_all_operators(login_user)
 
 
-@router.get('/session', response_model=UnifiedResponseModel)
+@router.get('/session')
 def get_session_list(login_user: UserPayload = Depends(get_login_user),
                      flow_ids: Optional[List[str]] = Query(default=[], description='应用id列表'),
                      user_ids: Optional[List[int]] = Query(default=[], description='用户id列表'),
@@ -55,7 +55,7 @@ def get_session_list(login_user: UserPayload = Depends(get_login_user),
     })
 
 
-@router.get('/session/export', response_model=UnifiedResponseModel)
+@router.get('/session/export')
 def export_session_messages(login_user: UserPayload = Depends(get_login_user),
                             flow_ids: Optional[List[str]] = Query(default=[], description='应用id列表'),
                             user_ids: Optional[List[int]] = Query(default=[], description='用户id列表'),
@@ -73,7 +73,7 @@ def export_session_messages(login_user: UserPayload = Depends(get_login_user),
     })
 
 
-@router.get('/session/export/data', response_model=UnifiedResponseModel)
+@router.get('/session/export/data')
 def get_session_messages(login_user: UserPayload = Depends(get_login_user),
                          flow_ids: Optional[List[str]] = Query(default=[], description='应用id列表'),
                          user_ids: Optional[List[int]] = Query(default=[], description='用户id列表'),
diff --git a/src/backend/bisheng/api/v1/chat.py b/src/backend/bisheng/api/v1/chat.py
index 54252c7ce..1f27421ca 100644
--- a/src/backend/bisheng/api/v1/chat.py
+++ b/src/backend/bisheng/api/v1/chat.py
@@ -71,9 +71,7 @@ async def chat_completions(request: APIChatCompletion, Authorize: AuthJWT = Depe
                              media_type='text/event-stream')
 
 
-@router.get('/chat/app/list',
-            response_model=UnifiedResponseModel[PageList[AppChatList]],
-            status_code=200)
+@router.get('/chat/app/list')
 def get_app_chat_list(*,
                       keyword: Optional[str] = None,
                       mark_user: Optional[str] = None,
@@ -174,9 +172,7 @@ def get_app_chat_list(*,
     return resp_200(PageList(list=result, total=total))
 
 
-@router.get('/chat/history',
-            response_model=UnifiedResponseModel[List[ChatMessageRead]],
-            status_code=200)
+@router.get('/chat/history')
 def get_chatmessage(*,
                     chat_id: str,
                     flow_id: str,
@@ -381,7 +377,7 @@ def comment_resp(*, data: ChatInput):
     return resp_200(message='操作成功')
 
 
-@router.get('/chat/list', response_model=UnifiedResponseModel[List[ChatList]], status_code=200)
+@router.get('/chat/list')
 def get_session_list(*,
                       page: Optional[int] = 1,
                       limit: Optional[int] = 10,
@@ -414,9 +410,7 @@ def get_session_list(*,
 
 
 # 获取所有已上线的技能和助手
-@router.get('/chat/online',
-            response_model=UnifiedResponseModel[List[FlowGptsOnlineList]],
-            status_code=200)
+@router.get('/chat/online')
 def get_online_chat(*,
                     keyword: Optional[str] = None,
                     tag_id: Optional[int] = None,
@@ -495,9 +489,7 @@ async def chat(
             await websocket.close(code=status.WS_1011_INTERNAL_ERROR, reason=messsage)
 
 
-@router.post('/build/init/{flow_id}',
-             response_model=UnifiedResponseModel[InitResponse],
-             status_code=201)
+@router.post('/build/init/{flow_id}')
 async def init_build(*,
                      graph_data: dict,
                      flow_id: str,
@@ -533,7 +525,7 @@ async def init_build(*,
         return HTTPException(status_code=500, detail=str(exc))
 
 
-@router.get('/build/{flow_id}/status', response_model=UnifiedResponseModel[BuiltResponse])
+@router.get('/build/{flow_id}/status')
 async def build_status(flow_id: str,
                        chat_id: Optional[str] = None,
                        version_id: Optional[int] = Query(default=None, description='技能版本ID')):
diff --git a/src/backend/bisheng/api/v1/component.py b/src/backend/bisheng/api/v1/component.py
index 6764e8b5c..a57db87b5 100644
--- a/src/backend/bisheng/api/v1/component.py
+++ b/src/backend/bisheng/api/v1/component.py
@@ -18,7 +18,7 @@ from bisheng.interface.custom.utils import build_custom_component_template
 router = APIRouter(prefix='/component', tags=['Component'], dependencies=[Depends(get_login_user)])
 
 
-@router.get('', response_model=UnifiedResponseModel[List[Component]])
+@router.get('')
 def get_all_components(*, Authorize: AuthJWT = Depends()):
     # get login user
     Authorize.jwt_required()
@@ -26,7 +26,7 @@ def get_all_components(*, Authorize: AuthJWT = Depends()):
     return ComponentService.get_all_component(current_user)
 
 
-@router.post('', response_model=UnifiedResponseModel[Component])
+@router.post('')
 def save_components(*, data: CreateComponentReq, Authorize: AuthJWT = Depends()):
     # get login user
     Authorize.jwt_required()
@@ -38,7 +38,7 @@ def save_components(*, data: CreateComponentReq, Authorize: AuthJWT = Depends())
     return ComponentService.save_component(component)
 
 
-@router.patch('', response_model=UnifiedResponseModel[Component])
+@router.patch('')
 def update_component(*, data: CreateComponentReq, Authorize: AuthJWT = Depends()):
     # get login user
     Authorize.jwt_required()
@@ -50,7 +50,7 @@ def update_component(*, data: CreateComponentReq, Authorize: AuthJWT = Depends()
     return ComponentService.update_component(component)
 
 
-@router.delete('', response_model=UnifiedResponseModel[Component])
+@router.delete('')
 def delete_component(*,
                      name: str = Body(..., embed=True, description='组件名'),
                      Authorize: AuthJWT = Depends()):
@@ -60,7 +60,7 @@ def delete_component(*,
     return ComponentService.delete_component(current_user.get('user_id'), name)
 
 
-@router.post('/custom_component', response_model=UnifiedResponseModel[Component])
+@router.post('/custom_component')
 async def custom_component(
         raw_code: CustomComponentCode,
         Authorize: AuthJWT = Depends(),
@@ -78,7 +78,7 @@ async def custom_component(
     return resp_200(data=built_frontend_node)
 
 
-@router.post('/custom_component/reload', response_model=UnifiedResponseModel[Component])
+@router.post('/custom_component/reload')
 async def reload_custom_component(path: str, Authorize: AuthJWT = Depends()):
     from bisheng.interface.custom.utils import build_custom_component_template
 
@@ -98,7 +98,7 @@ async def reload_custom_component(path: str, Authorize: AuthJWT = Depends()):
         return resp_500(message=str(exc))
 
 
-@router.post('/custom_component/update', response_model=UnifiedResponseModel[Component])
+@router.post('/custom_component/update')
 async def custom_component_update(
         raw_code: CustomComponentCode,
         Authorize: AuthJWT = Depends(),
diff --git a/src/backend/bisheng/api/v1/endpoints.py b/src/backend/bisheng/api/v1/endpoints.py
index cf7d2a4eb..f26fb8b8c 100644
--- a/src/backend/bisheng/api/v1/endpoints.py
+++ b/src/backend/bisheng/api/v1/endpoints.py
@@ -137,8 +137,8 @@ async def process_flow_old(
 
 
 # For backwards compatibility we will keep the old endpoint
-# @router.post('/predict/{flow_id}', response_model=UnifiedResponseModel[ProcessResponse])
-@router.post('/process', response_model=UnifiedResponseModel[ProcessResponse])
+# @router.post('/predict/{flow_id}')
+@router.post('/process')
 async def process_flow(
         flow_id: Annotated[UUID, Body(embed=True)],
         inputs: Optional[dict] = None,
@@ -319,9 +319,7 @@ async def upload_icon_workflow(request: Request,
     return resp_200(data=resp)
 
 
-@router.post('/upload/{flow_id}',
-             response_model=UnifiedResponseModel[UploadFileResponse],
-             status_code=201)
+@router.post('/upload/{flow_id}')
 async def create_upload_file(file: UploadFile, flow_id: str):
     # Cache file
     try:
diff --git a/src/backend/bisheng/api/v1/evaluation.py b/src/backend/bisheng/api/v1/evaluation.py
index 0544e6686..d19e48e10 100644
--- a/src/backend/bisheng/api/v1/evaluation.py
+++ b/src/backend/bisheng/api/v1/evaluation.py
@@ -15,7 +15,7 @@ from bisheng.cache.utils import convert_encoding_cchardet
 router = APIRouter(prefix='/evaluation', tags=['Skills'], dependencies=[Depends(get_login_user)])
 
 
-@router.get('', response_model=UnifiedResponseModel[List[Evaluation]])
+@router.get('')
 def get_evaluation(*,
                    page: Optional[int] = Query(default=1, gt=0, description='页码'),
                    limit: Optional[int] = Query(default=10, gt=0, description='每页条数'),
@@ -27,7 +27,7 @@ def get_evaluation(*,
     return EvaluationService.get_evaluation(user, page, limit)
 
 
-@router.post('', response_model=UnifiedResponseModel[EvaluationRead], status_code=201)
+@router.post('')
 def create_evaluation(*,
                       file: UploadFile,
                       prompt: str = Form(),
@@ -78,7 +78,7 @@ def delete_evaluation(*, evaluation_id: int, Authorize: AuthJWT = Depends()):
     return EvaluationService.delete_evaluation(evaluation_id, user_payload=user)
 
 
-@router.get('/result/file/download', response_model=UnifiedResponseModel)
+@router.get('/result/file/download')
 async def get_download_url(*,
                            file_url: str,
                            Authorize: AuthJWT = Depends()):
diff --git a/src/backend/bisheng/api/v1/finetune.py b/src/backend/bisheng/api/v1/finetune.py
index b2200078f..3fe4211df 100644
--- a/src/backend/bisheng/api/v1/finetune.py
+++ b/src/backend/bisheng/api/v1/finetune.py
@@ -23,7 +23,7 @@ router = APIRouter(prefix='/finetune', tags=['Finetune'], dependencies=[Depends(
 
 
 # create finetune job
-@router.post('/job', response_model=UnifiedResponseModel[Finetune])
+@router.post('/job')
 async def create_job(*, finetune: FinetuneCreateReq, Authorize: AuthJWT = Depends()):
     # get login user
     Authorize.jwt_required()
@@ -36,7 +36,7 @@ async def create_job(*, finetune: FinetuneCreateReq, Authorize: AuthJWT = Depend
 
 
 # 删除训练任务
-@router.delete('/job', response_model=UnifiedResponseModel)
+@router.delete('/job')
 async def delete_job(*, job_id: str, Authorize: AuthJWT = Depends()):
     # get login user
     Authorize.jwt_required()
@@ -45,7 +45,7 @@ async def delete_job(*, job_id: str, Authorize: AuthJWT = Depends()):
 
 
 # 中止训练任务
-@router.post('/job/cancel', response_model=UnifiedResponseModel)
+@router.post('/job/cancel')
 async def cancel_job(*, job_id: str, Authorize: AuthJWT = Depends()):
     # get login user
     Authorize.jwt_required()
@@ -54,7 +54,7 @@ async def cancel_job(*, job_id: str, Authorize: AuthJWT = Depends()):
 
 
 # 发布训练任务
-@router.post('/job/publish', response_model=UnifiedResponseModel)
+@router.post('/job/publish')
 async def publish_job(*, job_id: str, Authorize: AuthJWT = Depends()):
     # get login user
     Authorize.jwt_required()
@@ -62,7 +62,7 @@ async def publish_job(*, job_id: str, Authorize: AuthJWT = Depends()):
     return FinetuneService.publish_job(job_id, current_user)
 
 
-@router.post('/job/publish/cancel', response_model=UnifiedResponseModel)
+@router.post('/job/publish/cancel')
 async def cancel_publish_job(*, job_id: str, Authorize: AuthJWT = Depends()):
     # get login user
     Authorize.jwt_required()
@@ -71,7 +71,7 @@ async def cancel_publish_job(*, job_id: str, Authorize: AuthJWT = Depends()):
 
 
 # 获取训练任务列表，支持分页
-@router.get('/job', response_model=UnifiedResponseModel[List[Finetune]])
+@router.get('/job')
 async def get_job(*,
                   server: str = Query(default=None, description='关联的RT服务名字'),
                   status: str = Query(
@@ -96,14 +96,14 @@ async def get_job(*,
 
 
 # 获取任务最新详细信息，此接口会同步查询SFT-backend侧将任务状态更新到最新
-@router.get('/job/info', response_model=UnifiedResponseModel[Finetune])
+@router.get('/job/info')
 async def get_job_info(*, job_id: str, Authorize: AuthJWT = Depends()):
     # get login user
     Authorize.jwt_required()
     return FinetuneService.get_job_info(job_id)
 
 
-@router.patch('/job/model', response_model=UnifiedResponseModel)
+@router.patch('/job/model')
 async def update_job(*, req_data: FinetuneChangeModelName, Authorize: AuthJWT = Depends()):
     # get login user
     Authorize.jwt_required()
@@ -111,7 +111,7 @@ async def update_job(*, req_data: FinetuneChangeModelName, Authorize: AuthJWT =
     return FinetuneService.change_job_model_name(req_data, current_user)
 
 
-@router.post('/job/file', response_model=UnifiedResponseModel[List[PresetTrain]])
+@router.post('/job/file')
 async def upload_file(*,
                       files: list[UploadFile] = File(description='训练文件列表'),
                       Authorize: AuthJWT = Depends()):
@@ -122,7 +122,7 @@ async def upload_file(*,
     return FinetuneFileService.upload_file(files, False, current_user)
 
 
-@router.post('/job/file/preset', response_model=UnifiedResponseModel[List[PresetTrain]])
+@router.post('/job/file/preset')
 async def upload_preset_file(*,
                              files: Optional[str] = Body(default=None, description='预置训练文件列表'),
                              name: Optional[str] = Body(description='数据集名字'),
@@ -154,7 +154,7 @@ async def upload_preset_file(*,
 
 
 # 获取预置训练文件列表
-@router.get('/job/file/preset', response_model=UnifiedResponseModel[List[PresetTrain]])
+@router.get('/job/file/preset')
 async def get_preset_file(*,
                           page_size: Optional[int] = None,
                           page_num: Optional[int] = None,
@@ -166,7 +166,7 @@ async def get_preset_file(*,
     return resp_200(ret)
 
 
-@router.delete('/job/file/preset', response_model=UnifiedResponseModel)
+@router.delete('/job/file/preset')
 async def delete_preset_file(*, file_id: str, Authorize: AuthJWT = Depends()):
     # get login user
     Authorize.jwt_required()
@@ -174,7 +174,7 @@ async def delete_preset_file(*, file_id: str, Authorize: AuthJWT = Depends()):
     return FinetuneFileService.delete_preset_file(file_id, current_user)
 
 
-@router.get('/job/file/download', response_model=UnifiedResponseModel)
+@router.get('/job/file/download')
 async def get_download_url(*, file_url: str, Authorize: AuthJWT = Depends()):
     Authorize.jwt_required()
     minio_client = MinioClient()
@@ -182,14 +182,14 @@ async def get_download_url(*, file_url: str, Authorize: AuthJWT = Depends()):
     return resp_200(data={'url': download_url})
 
 
-@router.get('/server/filters', response_model=UnifiedResponseModel)
+@router.get('/server/filters')
 async def get_server_filters(*, Authorize: AuthJWT = Depends()):
     Authorize.jwt_required()
 
     return FinetuneService.get_server_filters()
 
 
-@router.get('/model/list', response_model=UnifiedResponseModel[List[ModelDeploy]])
+@router.get('/model/list')
 async def get_model_list(request: Request,
                          login_user: UserPayload = Depends(get_login_user),
                          server_id: int = Query(..., description='ft服务唯一ID')):
@@ -198,7 +198,7 @@ async def get_model_list(request: Request,
     return resp_200(data=ret)
 
 
-@router.get('/gpu', response_model=UnifiedResponseModel)
+@router.get('/gpu')
 async def get_gpu_info(*, Authorize: AuthJWT = Depends()):
     # get login user
     Authorize.jwt_required()
diff --git a/src/backend/bisheng/api/v1/flows.py b/src/backend/bisheng/api/v1/flows.py
index c86e38529..c5a9d6987 100644
--- a/src/backend/bisheng/api/v1/flows.py
+++ b/src/backend/bisheng/api/v1/flows.py
@@ -137,13 +137,13 @@ def read_flows(*,
         raise HTTPException(status_code=500, detail=str(e)) from e
 
 
-@router.get('/{flow_id}', response_model=UnifiedResponseModel[FlowReadWithStyle], status_code=200)
+@router.get('/{flow_id}')
 def read_flow(*, flow_id: str, login_user: UserPayload = Depends(get_login_user)):
     """Read a flow."""
     return FlowService.get_one_flow(login_user, flow_id)
 
 
-@router.patch('/{flow_id}', response_model=UnifiedResponseModel[FlowRead], status_code=200)
+@router.patch('/{flow_id}')
 async def update_flow(*,
                       request: Request,
                       flow_id: str,
@@ -205,14 +205,14 @@ def delete_flow(*,
     return resp_200(message='删除成功')
 
 
-@router.get('/download/', response_model=UnifiedResponseModel[FlowListRead], status_code=200)
+@router.get('/download/')
 async def download_file():
     """Download all flows as a file."""
     flows = read_flows()
     return resp_200(FlowListRead(flows=flows))
 
 
-@router.post('/compare', response_model=UnifiedResponseModel, status_code=200)
+@router.post('/compare')
 async def compare_flow_node(*, item: FlowCompareReq, Authorize: AuthJWT = Depends()):
     """ 技能多版本对比 """
     Authorize.jwt_required()
diff --git a/src/backend/bisheng/api/v1/knowledge.py b/src/backend/bisheng/api/v1/knowledge.py
index 4e29c5bff..ebe91c501 100644
--- a/src/backend/bisheng/api/v1/knowledge.py
+++ b/src/backend/bisheng/api/v1/knowledge.py
@@ -27,7 +27,7 @@ from fastapi.encoders import jsonable_encoder
 router = APIRouter(prefix='/knowledge', tags=['Knowledge'])
 
 
-@router.post('/upload', response_model=UnifiedResponseModel[UploadFileResponse], status_code=201)
+@router.post('/upload')
 async def upload_file(*, file: UploadFile = File(...)):
     try:
         file_name = file.filename
@@ -95,7 +95,7 @@ async def process_knowledge_file(*,
     return resp_200(res)
 
 
-@router.post('/create', response_model=UnifiedResponseModel[KnowledgeRead], status_code=201)
+@router.post('/create')
 def create_knowledge(*,
                      request: Request,
                      login_user: UserPayload = Depends(get_login_user),
@@ -105,7 +105,7 @@ def create_knowledge(*,
     return resp_200(db_knowledge)
 
 
-@router.post('/copy', response_model=UnifiedResponseModel[KnowledgeRead], status_code=201)
+@router.post('/copy')
 async def copy_knowledge(*,
                          request: Request,
                          background_tasks: BackgroundTasks,
diff --git a/src/backend/bisheng/api/v1/llm.py b/src/backend/bisheng/api/v1/llm.py
index cf6546768..7272399c2 100644
--- a/src/backend/bisheng/api/v1/llm.py
+++ b/src/backend/bisheng/api/v1/llm.py
@@ -1,163 +1,116 @@
-from typing import List
-
 from fastapi import APIRouter, Request, Depends, Body, Query
 
 from bisheng.api.services.llm import LLMService
 from bisheng.api.services.user_service import UserPayload, get_login_user, get_admin_user
-from bisheng.api.v1.schemas import UnifiedResponseModel, LLMServerInfo, resp_200, KnowledgeLLMConfig, \
-    AssistantLLMConfig, EvaluationLLMConfig, LLMServerCreateReq, LLMModelInfo
+from bisheng.api.v1.schemas import resp_200, KnowledgeLLMConfig, \
+    AssistantLLMConfig, EvaluationLLMConfig, LLMServerCreateReq
 
 router = APIRouter(prefix='/llm', tags=['LLM'])
 
 
-@router.get('', response_model=UnifiedResponseModel[List[LLMServerInfo]])
-def get_all_llm(
-        request: Request,
-        login_user: UserPayload = Depends(get_login_user),
-) -> UnifiedResponseModel[List[LLMServerInfo]]:
+@router.get('')
+def get_all_llm(request: Request, login_user: UserPayload = Depends(get_login_user)):
     ret = LLMService.get_all_llm(request, login_user)
     return resp_200(data=ret)
 
 
-@router.post('', response_model=UnifiedResponseModel[LLMServerInfo])
-def add_llm_server(
-        request: Request,
-        login_user: UserPayload = Depends(get_admin_user),
-        server: LLMServerCreateReq = Body(..., description="服务提供方所有数据"),
-) -> UnifiedResponseModel[LLMServerInfo]:
+@router.post('')
+def add_llm_server(request: Request, login_user: UserPayload = Depends(get_admin_user),
+                   server: LLMServerCreateReq = Body(..., description="服务提供方所有数据")):
     ret = LLMService.add_llm_server(request, login_user, server)
     return resp_200(data=ret)
 
 
-@router.delete('', response_model=UnifiedResponseModel)
-def delete_llm_server(
-        request: Request,
-        login_user: UserPayload = Depends(get_admin_user),
-        server_id: int = Body(..., embed=True, description="服务提供方唯一ID"),
-) -> UnifiedResponseModel:
+@router.delete('')
+def delete_llm_server(request: Request, login_user: UserPayload = Depends(get_admin_user),
+                      server_id: int = Body(..., embed=True, description="服务提供方唯一ID")):
     LLMService.delete_llm_server(request, login_user, server_id)
     return resp_200()
 
 
-@router.put('', response_model=UnifiedResponseModel[LLMServerInfo])
-def update_llm_server(
-        request: Request,
-        login_user: UserPayload = Depends(get_admin_user),
-        server: LLMServerCreateReq = Body(..., description="服务提供方所有数据"),
-) -> UnifiedResponseModel[LLMServerInfo]:
+@router.put('')
+def update_llm_server(request: Request, login_user: UserPayload = Depends(get_admin_user),
+                      server: LLMServerCreateReq = Body(..., description="服务提供方所有数据")):
     ret = LLMService.update_llm_server(request, login_user, server)
     return resp_200(data=ret)
 
 
-@router.get('/info', response_model=UnifiedResponseModel[LLMServerInfo])
-def get_one_llm(
-        request: Request,
-        login_user: UserPayload = Depends(get_admin_user),
-        server_id: int = Query(..., description="服务提供方唯一ID"),
-) -> UnifiedResponseModel[LLMServerInfo]:
+@router.get('/info')
+def get_one_llm(request: Request, login_user: UserPayload = Depends(get_admin_user),
+                server_id: int = Query(..., description="服务提供方唯一ID")):
     ret = LLMService.get_one_llm(request, login_user, server_id)
     return resp_200(data=ret)
 
 
-@router.post('/online', response_model=UnifiedResponseModel[LLMModelInfo])
-def update_model_online(
-        request: Request,
-        login_user: UserPayload = Depends(get_admin_user),
-        model_id: int = Body(..., embed=True, description="模型的唯一ID"),
-        online: bool = Body(..., embed=True, description="是否上线"),
-) -> UnifiedResponseModel[LLMModelInfo]:
+@router.post('/online')
+def update_model_online(request: Request, login_user: UserPayload = Depends(get_admin_user),
+                        model_id: int = Body(..., embed=True, description="模型的唯一ID"),
+                        online: bool = Body(..., embed=True, description="是否上线")):
     ret = LLMService.update_model_online(request, login_user, model_id, online)
     return resp_200(data=ret)
 
 
-@router.get('/knowledge', response_model=UnifiedResponseModel[KnowledgeLLMConfig])
-def get_knowledge_llm(
-        request: Request,
-        login_user: UserPayload = Depends(get_login_user),
-) -> UnifiedResponseModel[KnowledgeLLMConfig]:
+@router.get('/knowledge')
+def get_knowledge_llm(request: Request, login_user: UserPayload = Depends(get_login_user)):
     ret = LLMService.get_knowledge_llm()
     return resp_200(data=ret)
 
 
-@router.post('/knowledge', response_model=UnifiedResponseModel[KnowledgeLLMConfig])
-def update_knowledge_llm(
-        request: Request,
-        login_user: UserPayload = Depends(get_admin_user),
-        data: KnowledgeLLMConfig = Body(..., description="知识库默认模型配置"),
-) -> UnifiedResponseModel[KnowledgeLLMConfig]:
+@router.post('/knowledge')
+def update_knowledge_llm(request: Request, login_user: UserPayload = Depends(get_admin_user),
+                         data: KnowledgeLLMConfig = Body(..., description="知识库默认模型配置")):
     """ 更新知识库相关的默认模型配置 """
     ret = LLMService.update_knowledge_llm(request, login_user, data)
     return resp_200(data=ret)
 
 
-@router.get('/assistant', response_model=UnifiedResponseModel[AssistantLLMConfig])
-def get_assistant_llm(
-        request: Request,
-        login_user: UserPayload = Depends(get_login_user),
-) -> UnifiedResponseModel[AssistantLLMConfig]:
+@router.get('/assistant')
+def get_assistant_llm(request: Request, login_user: UserPayload = Depends(get_login_user)):
     """ 获取助手相关的模型配置 """
     ret = LLMService.get_assistant_llm()
     return resp_200(data=ret)
 
 
-@router.post('/assistant', response_model=UnifiedResponseModel[AssistantLLMConfig])
-def update_assistant_llm(
-        request: Request,
-        login_user: UserPayload = Depends(get_admin_user),
-        data: AssistantLLMConfig = Body(..., description="助手默认模型配置"),
-) -> UnifiedResponseModel[AssistantLLMConfig]:
+@router.post('/assistant')
+def update_assistant_llm(request: Request, login_user: UserPayload = Depends(get_admin_user),
+                         data: AssistantLLMConfig = Body(..., description="助手默认模型配置")):
     """ 更新助手相关的模型配置 """
     ret = LLMService.update_assistant_llm(request, login_user, data)
     return resp_200(data=ret)
 
 
-@router.get('/evaluation', response_model=UnifiedResponseModel[EvaluationLLMConfig])
-def get_evaluation_llm(
-        request: Request,
-        login_user: UserPayload = Depends(get_login_user),
-) -> UnifiedResponseModel[EvaluationLLMConfig]:
+@router.get('/evaluation')
+def get_evaluation_llm(request: Request, login_user: UserPayload = Depends(get_login_user)):
     """ 获取评价相关的模型配置 """
     ret = LLMService.get_evaluation_llm()
     return resp_200(data=ret)
 
 
-@router.post('/evaluation', response_model=UnifiedResponseModel[EvaluationLLMConfig])
-def update_evaluation_llm(
-        request: Request,
-        login_user: UserPayload = Depends(get_admin_user),
-        data: EvaluationLLMConfig = Body(..., description="评价默认模型配置"),
-) -> UnifiedResponseModel[EvaluationLLMConfig]:
+@router.post('/evaluation')
+def update_evaluation_llm(request: Request, login_user: UserPayload = Depends(get_admin_user),
+                          data: EvaluationLLMConfig = Body(..., description="评价默认模型配置")):
     """ 更新评价相关的模型配置 """
     ret = LLMService.update_evaluation_llm(request, login_user, data)
     return resp_200(data=ret)
 
 
-@router.get('/workflow', response_model=UnifiedResponseModel[EvaluationLLMConfig])
-def get_workflow_llm(
-        request: Request,
-        login_user: UserPayload = Depends(get_login_user),
-) -> UnifiedResponseModel[EvaluationLLMConfig]:
+@router.get('/workflow')
+def get_workflow_llm(request: Request, login_user: UserPayload = Depends(get_login_user)):
     """ 获取评价相关的模型配置 """
     ret = LLMService.get_workflow_llm()
     return resp_200(data=ret)
 
 
-@router.post('/workflow', response_model=UnifiedResponseModel[EvaluationLLMConfig])
-def update_workflow_llm(
-        request: Request,
-        login_user: UserPayload = Depends(get_admin_user),
-        data: EvaluationLLMConfig = Body(..., description="工作流默认模型配置"),
-) -> UnifiedResponseModel[EvaluationLLMConfig]:
+@router.post('/workflow')
+def update_workflow_llm(request: Request, login_user: UserPayload = Depends(get_admin_user),
+                        data: EvaluationLLMConfig = Body(..., description="工作流默认模型配置")):
     """ 更新评价相关的模型配置 """
     ret = LLMService.update_workflow_llm(request, login_user, data)
     return resp_200(data=ret)
 
 
-@router.get('/assistant/llm_list', response_model=UnifiedResponseModel[List[LLMServerInfo]])
-async def get_assistant_llm_list(
-        request: Request,
-        login_user: UserPayload = Depends(get_login_user),
-) -> UnifiedResponseModel[List[LLMServerInfo]]:
+@router.get('/assistant/llm_list')
+async def get_assistant_llm_list(request: Request, login_user: UserPayload = Depends(get_login_user)):
     """ 获取助手可选的模型列表 """
     ret = LLMService.get_assistant_llm_list(request, login_user)
     return resp_200(data=ret)
diff --git a/src/backend/bisheng/api/v1/qa.py b/src/backend/bisheng/api/v1/qa.py
index a6906d373..d3d2c8f93 100644
--- a/src/backend/bisheng/api/v1/qa.py
+++ b/src/backend/bisheng/api/v1/qa.py
@@ -16,7 +16,7 @@ from bisheng.utils.minio_client import MinioClient
 router = APIRouter(prefix='/qa', tags=['QA'])
 
 
-@router.get('/keyword', response_model=UnifiedResponseModel[List[str]], status_code=200)
+@router.get('/keyword')
 async def get_answer_keyword(message_id: int):
     # 获取命中的key
     conter = 3
diff --git a/src/backend/bisheng/api/v1/schema/base_schema.py b/src/backend/bisheng/api/v1/schema/base_schema.py
index cb20f602c..573d31cc1 100644
--- a/src/backend/bisheng/api/v1/schema/base_schema.py
+++ b/src/backend/bisheng/api/v1/schema/base_schema.py
@@ -6,6 +6,6 @@ from pydantic import BaseModel
 DataT = TypeVar('DataT')
 
 
-class PageList(Generic[DataT], BaseModel):
+class PageList(BaseModel, Generic[DataT]):
     list: List[DataT]
     total: int
diff --git a/src/backend/bisheng/api/v1/schemas.py b/src/backend/bisheng/api/v1/schemas.py
index 3cb8df359..76b20a934 100644
--- a/src/backend/bisheng/api/v1/schemas.py
+++ b/src/backend/bisheng/api/v1/schemas.py
@@ -12,7 +12,7 @@ from bisheng.database.models.message import ChatMessageRead
 from bisheng.database.models.tag import Tag
 from langchain.docstore.document import Document
 from orjson import orjson
-from pydantic import BaseModel, Field, root_validator, validator
+from pydantic import BaseModel, Field, root_validator, validator, model_validator, field_validator
 
 
 class CaptchaInput(BaseModel):
@@ -55,7 +55,7 @@ class InputRequest(BaseModel):
 
 
 class TweaksRequest(BaseModel):
-    tweaks: Optional[Dict[str, Dict[str, str]]] = Field(default_factory=dict)
+    tweaks: Optional[Dict[str, Dict[str, str]]] = Field(default_factory=dict, description='List of dictionaries')
 
 
 class UpdateTemplateRequest(BaseModel):
@@ -66,7 +66,7 @@ class UpdateTemplateRequest(BaseModel):
 DataT = TypeVar('DataT')
 
 
-class UnifiedResponseModel(Generic[DataT], BaseModel):
+class UnifiedResponseModel(BaseModel, Generic[DataT]):
     """统一响应模型"""
     status_code: int
     status_message: str
@@ -163,7 +163,8 @@ class ChatResponse(ChatMessage):
     is_bot: bool = True
     category: str = 'processing'
 
-    @validator('type')
+    @field_validator('type')
+    @classmethod
     def validate_message_type(cls, v):
         """
         end_cover: 结束并覆盖上一条message
@@ -184,7 +185,8 @@ class FileResponse(ChatMessage):
     type: str = 'file'
     is_bot: bool = True
 
-    @validator('data_type')
+    @field_validator('data_type')
+    @classmethod
     def validate_data_type(cls, v):
         if v not in ['image', 'csv']:
             raise ValueError('data_type must be image or csv')
@@ -427,8 +429,9 @@ class FileProcessBase(BaseModel):
     chunk_size: Optional[int] = Field(default=1000, description='切分文本长度，不传则为默认')
     chunk_overlap: Optional[int] = Field(default=100, description='切分文本重叠长度，不传则为默认')
 
-    @root_validator
-    def check_separator_rule(cls, values):
+    @model_validator(mode='before')
+    @classmethod
+    def check_separator_rule(cls, values: Any):
         if values['separator'] is None:
             values['separator'] = ['\n\n', '\n']
         if values['separator_rule'] is None:
diff --git a/src/backend/bisheng/api/v1/server.py b/src/backend/bisheng/api/v1/server.py
index cb14e0fad..dd2c20d14 100644
--- a/src/backend/bisheng/api/v1/server.py
+++ b/src/backend/bisheng/api/v1/server.py
@@ -26,7 +26,7 @@ thread_pool = ThreadPoolExecutor(3)
 required_param = ['type', 'pymodel_type', 'gpu_memory', 'instance_groups']
 
 
-@router.post('/add', response_model=UnifiedResponseModel[ServerRead], status_code=201)
+@router.post('/add')
 async def add_server(*, server: ServerCreate):
     try:
         db_server = Server.from_orm(server)
@@ -42,7 +42,7 @@ async def add_server(*, server: ServerCreate):
         raise HTTPException(status_code=500, detail=str(exc)) from exc
 
 
-@router.get('/list_server', response_model=UnifiedResponseModel[List[ServerRead]], status_code=200)
+@router.get('/list_server')
 async def list_server():
     try:
         with session_getter() as session:
@@ -73,7 +73,7 @@ async def delete_server(*, server_id: int):
         raise HTTPException(status_code=500, detail=str(exc)) from exc
 
 
-@router.get('/list', response_model=UnifiedResponseModel[List[ModelDeployRead]], status_code=201)
+@router.get('/list')
 async def list(*, query: ModelDeployQuery = None):
     try:
         # 更新模型
@@ -105,7 +105,7 @@ async def list(*, query: ModelDeployQuery = None):
         raise HTTPException(status_code=500, detail=str(exc)) from exc
 
 
-@router.get('/model/{deploy_id}', response_model=UnifiedResponseModel[ModelDeployRead], status_code=201)
+@router.get('/model/{deploy_id}')
 async def get_model_deploy(*, deploy_id: int):
     try:
         model_deploy = ModelDeployDao.find_model(deploy_id)
@@ -117,7 +117,7 @@ async def get_model_deploy(*, deploy_id: int):
         raise HTTPException(status_code=500, detail=str(exc)) from exc
 
 
-@router.post('/update', response_model=UnifiedResponseModel[ModelDeployRead], status_code=201)
+@router.post('/update')
 async def update_deploy(*, deploy: ModelDeployUpdate):
     try:
         with session_getter() as session:
diff --git a/src/backend/bisheng/api/v1/skillcenter.py b/src/backend/bisheng/api/v1/skillcenter.py
index 7a2c19b44..88d329449 100644
--- a/src/backend/bisheng/api/v1/skillcenter.py
+++ b/src/backend/bisheng/api/v1/skillcenter.py
@@ -17,9 +17,7 @@ router = APIRouter(prefix='/skill', tags=['Skills'], dependencies=[Depends(get_l
 ORDER_GAP = 65535
 
 
-@router.post('/template/create',
-             response_model=UnifiedResponseModel[TemplateRead],
-             status_code=201)
+@router.post('/template/create')
 def create_template(*, template: TemplateCreate):
     """Create a new flow."""
     db_template = Template.model_validate(template)
@@ -46,7 +44,7 @@ def create_template(*, template: TemplateCreate):
     return resp_200(db_template)
 
 
-@router.get('/template', response_model=UnifiedResponseModel[list[Template]], status_code=200)
+@router.get('/template')
 def read_template(page_size: Optional[int] = None,
                   page_name: Optional[int] = None,
                   flow_type: Optional[int] = None,
@@ -75,7 +73,7 @@ def read_template(page_size: Optional[int] = None,
     return resp_200(templates)
 
 
-@router.post('/template/{id}', response_model=UnifiedResponseModel[TemplateRead], status_code=200)
+@router.post('/template/{id}')
 def update_template(*, id: int, template: TemplateUpdate):
     """Update a flow."""
     with session_getter() as session:
diff --git a/src/backend/bisheng/api/v1/tag.py b/src/backend/bisheng/api/v1/tag.py
index 5fcfa1891..76e8b809a 100644
--- a/src/backend/bisheng/api/v1/tag.py
+++ b/src/backend/bisheng/api/v1/tag.py
@@ -11,7 +11,7 @@ from bisheng.database.models.tag import Tag, TagLink
 router = APIRouter(prefix='/tag', tags=['Tag'])
 
 
-@router.get('', response_model=UnifiedResponseModel[List[Tag]])
+@router.get('')
 def get_all_tag(request: Request,
                 login_user: UserPayload = Depends(get_login_user),
                 keyword: str = Query(default=None, description='搜索关键字'),
@@ -24,7 +24,7 @@ def get_all_tag(request: Request,
     })
 
 
-@router.post('', response_model=UnifiedResponseModel[Tag])
+@router.post('')
 def create_tag(request: Request,
                login_user: UserPayload = Depends(get_admin_user),
                name: str = Body(..., embed=True, description='标签名称')):
@@ -32,7 +32,7 @@ def create_tag(request: Request,
     return resp_200(result)
 
 
-@router.put('', response_model=UnifiedResponseModel[Tag])
+@router.put('')
 def update_tag(request: Request,
                login_user: UserPayload = Depends(get_admin_user),
                tag_id: int = Body(..., embed=True, description='标签ID'),
@@ -41,7 +41,7 @@ def update_tag(request: Request,
     return resp_200(result)
 
 
-@router.delete('', response_model=UnifiedResponseModel)
+@router.delete('')
 def delete_tag(request: Request,
                login_user: UserPayload = Depends(get_admin_user),
                tag_id: int = Body(..., embed=True, description='标签ID')):
@@ -49,7 +49,7 @@ def delete_tag(request: Request,
     return resp_200()
 
 
-@router.post('/link', response_model=UnifiedResponseModel[TagLink])
+@router.post('/link')
 def create_tag_link(request: Request,
                     login_user: UserPayload = Depends(get_login_user),
                     tag_id: int = Body(..., embed=True, description='标签ID'),
@@ -59,7 +59,7 @@ def create_tag_link(request: Request,
     return resp_200(result)
 
 
-@router.delete('/link', response_model=UnifiedResponseModel)
+@router.delete('/link')
 def delete_tag_link(
         request: Request,
         login_user: UserPayload = Depends(get_login_user),
@@ -70,7 +70,7 @@ def delete_tag_link(
     return resp_200()
 
 
-@router.get('/home', response_model=UnifiedResponseModel[List[Tag]])
+@router.get('/home')
 def get_home_tag(request: Request,
                  login_user: UserPayload = Depends(get_login_user)):
     """
@@ -81,7 +81,7 @@ def get_home_tag(request: Request,
     return resp_200(result)
 
 
-@router.post('/home', response_model=UnifiedResponseModel[List[Tag]])
+@router.post('/home')
 def update_home_tag(request: Request,
                     login_user: UserPayload = Depends(get_admin_user),
                     tag_ids: List[int] = Body(..., embed=True, description='标签ID列表')):
diff --git a/src/backend/bisheng/api/v1/user.py b/src/backend/bisheng/api/v1/user.py
index d869ee3cb..924e01672 100644
--- a/src/backend/bisheng/api/v1/user.py
+++ b/src/backend/bisheng/api/v1/user.py
@@ -47,7 +47,7 @@ router = APIRouter(prefix='', tags=['User'])
 oauth2_scheme = OAuth2PasswordBearer(tokenUrl='token')
 
 
-@router.post('/user/regist', response_model=UnifiedResponseModel[UserRead], status_code=201)
+@router.post('/user/regist')
 async def regist(*, user: UserCreate):
     # 验证码校验
     if settings.get_from_db('use_captcha'):
@@ -78,7 +78,7 @@ async def regist(*, user: UserCreate):
     return resp_200(db_user)
 
 
-@router.post('/user/sso', response_model=UnifiedResponseModel[UserRead], status_code=201)
+@router.post('/user/sso')
 async def sso(*, user: UserCreate):
     """ 给闭源网关提供的登录接口 """
     if settings.get_system_login_method().bisheng_pro:  # 判断sso 是否打开
@@ -116,7 +116,7 @@ def clear_error_password_key(username: str):
     redis_client.delete(error_key)
 
 
-@router.post('/user/login', response_model=UnifiedResponseModel[UserRead], status_code=201)
+@router.post('/user/login')
 async def login(*, request: Request, user: UserLogin, Authorize: AuthJWT = Depends()):
     # 验证码校验
     if settings.get_from_db('use_captcha'):
@@ -175,7 +175,7 @@ async def login(*, request: Request, user: UserLogin, Authorize: AuthJWT = Depen
     return resp_200(UserRead(role=str(role), web_menu=web_menu, access_token=access_token, **db_user.__dict__))
 
 
-@router.get('/user/admin', response_model=UnifiedResponseModel[UserRead], status_code=200)
+@router.get('/user/admin')
 async def get_admins(login_user: UserPayload = Depends(get_login_user)):
     """
     获取所有的超级管理员账号
@@ -194,7 +194,7 @@ async def get_admins(login_user: UserPayload = Depends(get_login_user)):
         raise HTTPException(status_code=500, detail='用户信息失败')
 
 
-@router.get('/user/info', response_model=UnifiedResponseModel[UserRead], status_code=201)
+@router.get('/user/info')
 async def get_info(login_user: UserPayload = Depends(get_login_user)):
     # check if user already exist
     try:
diff --git a/src/backend/bisheng/api/v1/usergroup.py b/src/backend/bisheng/api/v1/usergroup.py
index ff20517de..ed5fc410f 100644
--- a/src/backend/bisheng/api/v1/usergroup.py
+++ b/src/backend/bisheng/api/v1/usergroup.py
@@ -23,7 +23,7 @@ from bisheng.database.models.user_group import UserGroupDao, UserGroupRead
 router = APIRouter(prefix='/group', tags=['User'], dependencies=[Depends(get_login_user)])
 
 
-@router.get('/list', response_model=UnifiedResponseModel[List[GroupRead]])
+@router.get('/list')
 async def get_all_group(Authorize: AuthJWT = Depends()):
     """
     获取所有分组
@@ -48,7 +48,7 @@ async def get_all_group(Authorize: AuthJWT = Depends()):
     return resp_200({'records': groups_res})
 
 
-@router.post('/create', response_model=UnifiedResponseModel[GroupRead], status_code=200)
+@router.post('/create')
 async def create_group(request: Request, group: GroupCreate, Authorize: AuthJWT = Depends()):
     """
     新建用户组
@@ -59,7 +59,7 @@ async def create_group(request: Request, group: GroupCreate, Authorize: AuthJWT
     return resp_200(RoleGroupService().create_group(request, login_user, group))
 
 
-@router.put('/create', response_model=UnifiedResponseModel[GroupRead], status_code=200)
+@router.put('/create')
 async def update_group(request: Request,
                        group: Group,
                        login_user: UserPayload = Depends(get_login_user)):
@@ -84,9 +84,7 @@ async def delete_group(request: Request,
     return RoleGroupService().delete_group(request, login_user, group_id)
 
 
-@router.post('/set_user_group',
-             response_model=UnifiedResponseModel[UserGroupRead],
-             status_code=200)
+@router.post('/set_user_group')
 async def set_user_group(request: Request,
                          user_id: Annotated[int, Body(embed=True)],
                          group_id: Annotated[List[int], Body(embed=True)],
@@ -100,9 +98,7 @@ async def set_user_group(request: Request,
     return resp_200(RoleGroupService().replace_user_groups(request, login_user, user_id, group_id))
 
 
-@router.get('/get_user_group',
-            response_model=UnifiedResponseModel[List[GroupRead]],
-            status_code=200)
+@router.get('/get_user_group')
 async def get_user_group(user_id: int, Authorize: AuthJWT = Depends()):
     """
     获取用户所属分组
@@ -111,7 +107,7 @@ async def get_user_group(user_id: int, Authorize: AuthJWT = Depends()):
     return resp_200(RoleGroupService().get_user_groups_list(user_id))
 
 
-@router.get('/get_group_user', response_model=UnifiedResponseModel[List[User]], status_code=200)
+@router.get('/get_group_user')
 async def get_group_user(group_id: int,
                          page_size: int = None,
                          page_num: int = None,
@@ -123,9 +119,7 @@ async def get_group_user(group_id: int,
     return RoleGroupService().get_group_user_list(group_id, page_size, page_num)
 
 
-@router.post('/set_group_admin',
-             response_model=UnifiedResponseModel[List[UserGroupRead]],
-             status_code=200)
+@router.post('/set_group_admin')
 async def set_group_admin(
         request: Request,
         user_ids: Annotated[List[int], Body(embed=True)],
@@ -152,9 +146,7 @@ async def set_update_user(group_id: Annotated[int, Body(embed=True)],
     return resp_200(RoleGroupService().set_group_update_user(login_user, group_id))
 
 
-@router.get('/get_group_resources',
-            response_model=UnifiedResponseModel[List[UserGroupRead]],
-            status_code=200)
+@router.get('/get_group_resources')
 async def get_group_resources(*,
                               group_id: int,
                               resource_type: int,
@@ -180,7 +172,7 @@ async def get_group_resources(*,
     })
 
 
-@router.get("/roles", response_model=UnifiedResponseModel)
+@router.get("/roles")
 async def get_group_roles(*,
                           group_id: List[int] = Query(..., description="用户组ID列表"),
                           keyword: str = Query(None, description="搜索关键字"),
@@ -203,7 +195,7 @@ async def get_group_roles(*,
     })
 
 
-@router.get("/manage/resources", response_model=UnifiedResponseModel)
+@router.get("/manage/resources")
 async def get_manage_resources(login_user: UserPayload = Depends(get_login_user),
                                keyword: str = Query(None, description="搜索关键字"),
                                page: int = 1,
diff --git a/src/backend/bisheng/api/v1/validate.py b/src/backend/bisheng/api/v1/validate.py
index dfb4535ce..12730c55e 100644
--- a/src/backend/bisheng/api/v1/validate.py
+++ b/src/backend/bisheng/api/v1/validate.py
@@ -10,7 +10,7 @@ from fastapi import APIRouter, HTTPException
 router = APIRouter(prefix='/validate', tags=['Validate'])
 
 
-@router.post('/code', status_code=200, response_model=UnifiedResponseModel[CodeValidationResponse])
+@router.post('/code', status_code=200)
 def post_validate_code(code: Code):
     try:
         errors = validate_code(code.code)
@@ -23,9 +23,7 @@ def post_validate_code(code: Code):
         return HTTPException(status_code=500, detail=str(e))
 
 
-@router.post('/prompt',
-             status_code=200,
-             response_model=UnifiedResponseModel[PromptValidationResponse])
+@router.post('/prompt')
 def post_validate_prompt(prompt_request: ValidatePromptRequest):
     try:
         input_variables = validate_prompt(prompt_request.template)
diff --git a/src/backend/bisheng/api/v1/variable.py b/src/backend/bisheng/api/v1/variable.py
index 554f67884..6da441415 100644
--- a/src/backend/bisheng/api/v1/variable.py
+++ b/src/backend/bisheng/api/v1/variable.py
@@ -13,7 +13,7 @@ from bisheng.database.models.variable_value import Variable, VariableCreate, Var
 router = APIRouter(prefix='/variable', tags=['variable'])
 
 
-@router.post('/', status_code=200, response_model=UnifiedResponseModel[VariableRead])
+@router.post('/', status_code=200)
 def post_variable(variable: Variable):
     try:
         if not variable.version_id:
@@ -47,7 +47,7 @@ def post_variable(variable: Variable):
         return HTTPException(status_code=500, detail=str(e))
 
 
-@router.get('/list', response_model=UnifiedResponseModel[List[VariableRead]], status_code=200)
+@router.get('/list')
 def get_variables(*,
                   flow_id: str,
                   node_id: Optional[str] = None,
diff --git a/src/backend/bisheng/api/v1/workflow.py b/src/backend/bisheng/api/v1/workflow.py
index ca24d8f25..5f7a96d6e 100644
--- a/src/backend/bisheng/api/v1/workflow.py
+++ b/src/backend/bisheng/api/v1/workflow.py
@@ -28,7 +28,7 @@ from bisheng.utils import generate_uuid
 router = APIRouter(prefix='/workflow', tags=['Workflow'])
 
 
-@router.get("/report/file", response_model=UnifiedResponseModel, status_code=200)
+@router.get("/report/file")
 async def get_report_file(
         request: Request,
         login_user: UserPayload = Depends(get_login_user),
@@ -216,13 +216,13 @@ def change_version(*,
     return FlowService.change_current_version(request, login_user, flow_id, version_id)
 
 
-@router.get('/get_one_flow/{flow_id}', response_model=UnifiedResponseModel[FlowReadWithStyle], status_code=200)
+@router.get('/get_one_flow/{flow_id}')
 def read_flow(*, flow_id: str, login_user: UserPayload = Depends(get_login_user)):
     """Read a flow."""
     return FlowService.get_one_flow(login_user, flow_id)
 
 
-@router.patch('/update/{flow_id}', response_model=UnifiedResponseModel[FlowRead], status_code=200)
+@router.patch('/update/{flow_id}')
 async def update_flow(*,
                       request: Request,
                       flow_id: str,
@@ -253,7 +253,7 @@ async def update_flow(*,
     return resp_200(db_flow)
 
 
-@router.patch('/status', response_model=UnifiedResponseModel[FlowRead], status_code=200)
+@router.patch('/status')
 async def update_flow_status(request: Request, login_user: UserPayload = Depends(get_login_user),
                              flow_id: str = Body(..., description='技能ID'),
                              version_id: int = Body(..., description='版本ID'),
diff --git a/src/backend/bisheng/api/v2/assistant.py b/src/backend/bisheng/api/v2/assistant.py
index 4621482b1..7ed7ba2e0 100644
--- a/src/backend/bisheng/api/v2/assistant.py
+++ b/src/backend/bisheng/api/v2/assistant.py
@@ -24,7 +24,7 @@ from bisheng.utils import generate_uuid
 router = APIRouter(prefix='/assistant', tags=['OpenAPI', 'Assistant'])
 
 
-@router.post('/chat/completions', response_model=OpenAIChatCompletionResp)
+@router.post('/chat/completions')
 async def assistant_chat_completions(request: Request, req_data: OpenAIChatCompletionReq):
     """
     兼容openai接口格式，所有的错误必须返回非http200的状态码
@@ -105,7 +105,7 @@ async def assistant_chat_completions(request: Request, req_data: OpenAIChatCompl
         return ORJSONResponse(status_code=500, content=str(exc))
 
 
-@router.get('/info/{assistant_id}', response_model=UnifiedResponseModel[AssistantInfo])
+@router.get('/info/{assistant_id}')
 async def get_assistant_info(request: Request, assistant_id: UUID):
     """
     获取助手信息, 用系统配置里的default_operator.user的用户信息来做权限校验
diff --git a/src/backend/bisheng/api/v2/filelib.py b/src/backend/bisheng/api/v2/filelib.py
index 5db999637..1f2875c26 100644
--- a/src/backend/bisheng/api/v2/filelib.py
+++ b/src/backend/bisheng/api/v2/filelib.py
@@ -72,9 +72,7 @@ def clear_knowledge_files(*, request: Request, knowledge_id: int):
     return resp_200(message='knowledge clear successfully')
 
 
-@router.post('/file/{knowledge_id}',
-             response_model=UnifiedResponseModel[KnowledgeFileRead],
-             status_code=200)
+@router.post('/file/{knowledge_id}')
 async def upload_file(request: Request,
                       knowledge_id: int,
                       separator: Optional[List[str]] = Form(default=None,
@@ -139,7 +137,7 @@ def get_filelist(request: Request,
     return resp_200(data={'data': data, 'total': total, 'writeable': flag})
 
 
-@router.post('/chunks', response_model=UnifiedResponseModel[KnowledgeFileRead], status_code=200)
+@router.post('/chunks')
 async def post_chunks(request: Request,
                       knowledge_id: int = Form(...),
                       metadata: str = Form(...),
@@ -169,9 +167,7 @@ async def post_chunks(request: Request,
     return resp_200(data=res[0])
 
 
-@router.post('/chunks_string',
-             response_model=UnifiedResponseModel[KnowledgeFileRead],
-             status_code=200)
+@router.post('/chunks_string')
 async def post_string_chunks(request: Request, document: ChunkInput):
     """ 获取知识库文件信息. """
 
@@ -268,7 +264,7 @@ def add_qa(*,
     return resp_200(res)
 
 
-@router.post('/add_relative_qa', response_model=QAKnowledge)
+@router.post('/add_relative_qa')
 def append_qa(*,
               knowledge_id: int = Body(embed=True),
               data: APIAppendQAParam = Body(embed=True),
diff --git a/src/backend/bisheng/database/models/base.py b/src/backend/bisheng/database/models/base.py
index 2aca81001..cdbc94971 100644
--- a/src/backend/bisheng/database/models/base.py
+++ b/src/backend/bisheng/database/models/base.py
@@ -23,9 +23,7 @@ def orjson_dumps(v, *, default=None, sort_keys=False, indent_2=True):
 class SQLModelSerializable(SQLModel):
 
     class Config:
-        orm_mode = True
-        json_loads = orjson.loads
-        json_dumps = orjson_dumps
+        from_attributes = True
 
     def to_dict(self):
         result = self.model_dump()
diff --git a/src/backend/bisheng/database/models/flow_version.py b/src/backend/bisheng/database/models/flow_version.py
index 80f44bb89..88b4fe3e8 100644
--- a/src/backend/bisheng/database/models/flow_version.py
+++ b/src/backend/bisheng/database/models/flow_version.py
@@ -54,7 +54,7 @@ class FlowVersionRead(FlowVersionBase):
     pass
 
 
-class FlowVersionDao(FlowVersion):
+class FlowVersionDao(FlowVersionBase):
 
     @classmethod
     def create_version(cls, version: FlowVersion) -> FlowVersion:
diff --git a/src/backend/bisheng/interface/chains/custom.py b/src/backend/bisheng/interface/chains/custom.py
index f308e926a..2907fb9d0 100644
--- a/src/backend/bisheng/interface/chains/custom.py
+++ b/src/backend/bisheng/interface/chains/custom.py
@@ -12,8 +12,7 @@ from langchain.prompts import PromptTemplate
 from langchain.schema import BaseMemory
 from langchain.schema.prompt_template import BasePromptTemplate
 from langchain_community.utilities.dalle_image_generator import DallEAPIWrapper
-from langchain_core.pydantic_v1 import Field, root_validator
-from pydantic import BaseModel
+from pydantic import Field, model_validator
 
 DEFAULT_SUFFIX = """"
 Current conversation:
@@ -30,7 +29,8 @@ class BaseCustomConversationChain(ConversationChain):
     ai_prefix_value: Optional[str]
     """Field to use as the ai_prefix. It needs to be set and has to be in the template"""
 
-    @root_validator(pre=False)
+    @model_validator(mode='before')
+    @classmethod
     def build_template(cls, values):
         format_dict = {}
         input_variables = extract_input_variables_from_prompt(values['template'])
@@ -168,7 +168,7 @@ prompt_default = PromptTemplate(
     {image_desc}""")
 
 
-class DalleGeneratorChain(CustomChain, BaseModel):
+class DalleGeneratorChain(CustomChain):
     """Implementation of dall-e generate images"""
     dalle: DallEAPIWrapper
     llm: Optional[BaseLanguageModel]
diff --git a/src/backend/bisheng/interface/embeddings/custom.py b/src/backend/bisheng/interface/embeddings/custom.py
index 0393c3b4b..3084d39ce 100644
--- a/src/backend/bisheng/interface/embeddings/custom.py
+++ b/src/backend/bisheng/interface/embeddings/custom.py
@@ -1,4 +1,4 @@
-from typing import List, Optional
+from typing import List, Optional, Dict
 
 import numpy as np
 from bisheng.database.models.llm_server import (LLMDao, LLMModel, LLMModelType, LLMServer,
@@ -6,9 +6,8 @@ from bisheng.database.models.llm_server import (LLMDao, LLMModel, LLMModelType,
 from bisheng.interface.importing import import_by_type
 from bisheng.interface.utils import wrapper_bisheng_model_limit_check
 from langchain.embeddings.base import Embeddings
-from langchain_core.pydantic_v1 import BaseModel
 from loguru import logger
-from pydantic import Field
+from pydantic import Field, BaseModel
 
 
 class OpenAIProxyEmbedding(Embeddings):
@@ -57,7 +56,7 @@ class BishengEmbedding(BaseModel, Embeddings):
     model_kwargs: dict = Field(default={}, description='embedding模型调用参数')
 
     embeddings: Optional[Embeddings] = Field(default=None)
-    llm_node_type = {
+    llm_node_type: Dict = {
         # 开源推理框架
         LLMServerType.OLLAMA.value: 'OllamaEmbeddings',
         LLMServerType.XINFERENCE.value: 'OpenAIEmbeddings',
@@ -80,7 +79,7 @@ class BishengEmbedding(BaseModel, Embeddings):
 
     class Config:
         """Configuration for this pydantic object."""
-        allow_population_by_field_name = True
+        validate_by_name = True
         arbitrary_types_allowed = True
 
     def __init__(self, **kwargs):
diff --git a/src/backend/bisheng/interface/llms/custom.py b/src/backend/bisheng/interface/llms/custom.py
index cf7b93aab..b9b1ab42c 100644
--- a/src/backend/bisheng/interface/llms/custom.py
+++ b/src/backend/bisheng/interface/llms/custom.py
@@ -28,7 +28,7 @@ class BishengLLM(BaseChatModel):
     cache: bool = Field(default=False, description="是否使用缓存")
 
     llm: Optional[BaseChatModel] = Field(default=None)
-    llm_node_type = {
+    llm_node_type: Dict = {
         # 开源推理框架
         LLMServerType.OLLAMA.value: 'ChatOllama',
         LLMServerType.XINFERENCE.value: 'ChatOpenAI',
diff --git a/src/backend/bisheng/interface/prompts/custom.py b/src/backend/bisheng/interface/prompts/custom.py
index 35d0ce443..81a18aa51 100644
--- a/src/backend/bisheng/interface/prompts/custom.py
+++ b/src/backend/bisheng/interface/prompts/custom.py
@@ -2,7 +2,7 @@ from typing import Dict, List, Optional, Type
 
 from bisheng.interface.utils import extract_input_variables_from_prompt
 from langchain.prompts import PromptTemplate
-from langchain_core.pydantic_v1 import root_validator
+from pydantic import model_validator
 
 # Steps to create a BaseCustomPrompt:
 # 1. Create a prompt template that endes with:
@@ -27,7 +27,8 @@ class BaseCustomPrompt(PromptTemplate):
     description: Optional[str]
     ai_prefix: Optional[str]
 
-    @root_validator(pre=False)
+    @model_validator(mode='before')
+    @classmethod
     def build_template(cls, values):
         format_dict = {}
         ai_prefix_format_dict = {}
diff --git a/src/backend/bisheng/interface/tools/base.py b/src/backend/bisheng/interface/tools/base.py
index a8df56a88..a2d3bbb89 100644
--- a/src/backend/bisheng/interface/tools/base.py
+++ b/src/backend/bisheng/interface/tools/base.py
@@ -121,8 +121,8 @@ class ToolCreator(LangChainTypeCreator):
 
             # Pop unnecessary fields and add name
             fields.pop('_type')  # type: ignore
-            fields.pop('return_direct')  # type: ignore
-            fields.pop('verbose')  # type: ignore
+            fields.pop('return_direct', None)  # type: ignore
+            fields.pop('verbose', None)  # type: ignore
 
             tool_params = {
                 'name': fields.pop('name')['value'],  # type: ignore
diff --git a/src/backend/bisheng/interface/tools/custom.py b/src/backend/bisheng/interface/tools/custom.py
index 0079cf634..0577748d5 100644
--- a/src/backend/bisheng/interface/tools/custom.py
+++ b/src/backend/bisheng/interface/tools/custom.py
@@ -32,7 +32,7 @@ class Function(BaseModel):
         return validate.create_function(self.code, function_name)
 
 
-class PythonFunctionTool(Function, Tool):
+class PythonFunctionTool(Tool):
     """Python function"""
 
     name: str = 'Custom Tool'
diff --git a/src/backend/bisheng/mcp_manage/__init__.py b/src/backend/bisheng/mcp_manage/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/backend/bisheng/mcp_manage/client.py b/src/backend/bisheng/mcp_manage/client.py
new file mode 100644
index 000000000..ed662d5bf
--- /dev/null
+++ b/src/backend/bisheng/mcp_manage/client.py
@@ -0,0 +1,15 @@
+from typing import Dict
+
+from mcp import ClientSession
+from mcp.client.stdio import stdio_client
+
+class ClientManager:
+
+    # 缓存对应的mcp连接
+    client_map: Dict[str, ClientSession] = {}
+
+    def __init__(self, client):
+        self.client = client
+
+    def get_client(self):
+        return self.client
\ No newline at end of file
diff --git a/src/backend/bisheng/mcp_manage/constant.py b/src/backend/bisheng/mcp_manage/constant.py
new file mode 100644
index 000000000..9d307e75e
--- /dev/null
+++ b/src/backend/bisheng/mcp_manage/constant.py
@@ -0,0 +1,5 @@
+from enum import Enum
+
+class McpClientType(Enum):
+    SSE = 'sse'
+    STDIO = 'stdio'
diff --git a/src/backend/bisheng/settings.py b/src/backend/bisheng/settings.py
index 08aade354..4920d6197 100644
--- a/src/backend/bisheng/settings.py
+++ b/src/backend/bisheng/settings.py
@@ -5,16 +5,15 @@ from typing import Dict, List, Optional, Union
 
 import yaml
 from cryptography.fernet import Fernet
-from langchain.pydantic_v1 import BaseSettings, root_validator, validator
 from loguru import logger
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, field_validator, model_validator
 from sqlmodel import select
 
 
 class LoggerConf(BaseModel):
     level: str = 'DEBUG'
     format: str = '<level>[{level.name} process-{process.id}-{thread.id} {name}:{line}]</level> - <level>trace={extra[trace_id]} {message}</level>'  # noqa
-    handlers: List[Dict] = []
+    handlers: List[Dict] = Field(default_factory=list, description='日志处理器')
 
     @classmethod
     def parse_logger_sink(cls, sink: str) -> str:
@@ -26,7 +25,7 @@ class LoggerConf(BaseModel):
             env_keys[one] = os.getenv(one, '')
         return sink.format(**env_keys)
 
-    @validator('handlers', pre=True)
+    @field_validator('handlers')
     @classmethod
     def set_handlers(cls, value):
         if value is None:
@@ -133,7 +132,8 @@ class Settings(BaseModel):
     object_storage: ObjectStore = {}
     workflow_conf: WorkflowConf = WorkflowConf()
 
-    @validator('database_url', pre=True)
+    @field_validator('database_url')
+    @classmethod
     def set_database_url(cls, value):
         if not value:
             logger.debug('No database_url provided, trying bisheng_DATABASE_URL env variable')
@@ -155,7 +155,8 @@ class Settings(BaseModel):
 
         return value
 
-    @root_validator()
+    @model_validator(mode='before')
+    @classmethod
     def set_redis_url(cls, values):
         if 'redis_url' in values:
             if isinstance(values['redis_url'], dict):
@@ -174,7 +175,8 @@ class Settings(BaseModel):
                     values['redis_url'] = new_redis_url
         return values
 
-    @root_validator()
+    @model_validator(mode='before')
+    @classmethod
     def set_celery_redis_url(cls, values):
         if 'celery_redis_url' in values:
             if isinstance(values['celery_redis_url'], dict):
@@ -193,7 +195,8 @@ class Settings(BaseModel):
                     values['celery_redis_url'] = new_redis_url
         return values
 
-    @root_validator()
+    @model_validator(mode='before')
+    @classmethod
     def validate_lists(cls, values):
         for key, value in values.items():
             if key != 'dev' and not value:
diff --git a/src/backend/bisheng/utils/util.py b/src/backend/bisheng/utils/util.py
index 6c5b6a5c9..53b35df14 100644
--- a/src/backend/bisheng/utils/util.py
+++ b/src/backend/bisheng/utils/util.py
@@ -5,6 +5,8 @@ from functools import wraps
 from typing import Dict, Optional
 from urllib.parse import urlparse
 
+from pydantic import BaseModel
+
 from bisheng.template.frontend_node.constants import FORCE_SHOW_FIELDS
 from bisheng.utils import constants
 from docstring_parser import parse  # type: ignore
@@ -70,8 +72,8 @@ def build_template_from_class(name: str, type_to_cls_dict: Dict, add_function: b
 
             variables = {'_type': _type}
 
-            if '__fields__' in _class.__dict__:
-                for class_field_items, value in _class.__fields__.items():
+            if getattr(_class, 'model_fields'):
+                for class_field_items, value in _class.model_fields.items():
                     if class_field_items in ['callback_manager']:
                         continue
                     variables[class_field_items] = {}
@@ -217,7 +219,7 @@ def format_dict(d, name: Optional[str] = None):
         if key == '_type':
             continue
 
-        _type = value['type']
+        _type = value['type'] if 'type' in value else value['annotation']
 
         if not isinstance(_type, str):
             _type = type_to_string(_type)
diff --git a/src/backend/pyproject.toml b/src/backend/pyproject.toml
index ba09f183a..ed272e270 100644
--- a/src/backend/pyproject.toml
+++ b/src/backend/pyproject.toml
@@ -18,22 +18,24 @@ include = ["./bisheng/*", "bisheng/**/*"]
 bisheng = "bisheng.__main__:main"
 
 [tool.poetry.dependencies]
-bisheng_langchain = "1.0.1"
+python = ">=3.9,<3.11"
+bisheng_langchain = "1.2.0"
 bisheng_pyautogen = "0.3.2"
-langchain = "^0.2.16"
+langchain = "^0.3.23"
+langchain-community = "^0.3.21"
 langchain_experimental = "*"
-langchain_openai = "^0.1.25"
-langchain-community = "^0.2.17"
-langgraph = "^0.2.37"
-openai = "^1.51.2"
-langchain-google-genai = "^1.0.10"
-langchain-anthropic = "^0.1.4"
+langchain_openai = "^0.3.12"
+langchain-ollama = "^0.3.0"
+langchain-google-genai = "^2.1.0"
+langchain-anthropic = "^0.3.10"
+langgraph = "^0.3.27"
+openai = "^1.68.2"
 minio = "7.2.0"
 loguru = "^0.7.1"
 fastapi_jwt_auth = "^0.5.0"
 captcha = "^0.5.0"
 rsa = "4.9"
-pydantic = "^1.10.18"
+pydantic = "^2.7.2"
 numexpr = "^2.8.6"
 pypinyin = "0.50.0"
 celery = { extras = ["redis"], version = "^5.3.6" }
@@ -41,9 +43,8 @@ redis = "^5.0.0"
 jieba = "^0.42.1"
 PyMuPDF = "^1.23.8"
 shapely = "^2.0.1"
-python = ">=3.9,<3.11"
 fastapi = "^0.108.0"
-uvicorn = "^0.22.0"
+uvicorn = "^0.23.1"
 beautifulsoup4 = "^4.12.2"
 google-search-results = "^2.4.1"
 google-api-python-client = "^2.79.0"
@@ -93,7 +94,8 @@ bisheng-ragas = "^1.0.1"
 qianfan = "^0.4.4"
 dashscope = "^1.20.3"
 blobfile = "^3.0.0"
-langchain-ollama = "0.1.3"
+mcp = "^1.6.0"
+numpy = "^1.26.2"
 
 [tool.poetry.dev-dependencies]
 black = "^23.1.0"
diff --git a/src/bisheng-langchain/bisheng_langchain/agents/chatglm_functions_agent/base.py b/src/bisheng-langchain/bisheng_langchain/agents/chatglm_functions_agent/base.py
index 00a1af080..e38f349b2 100644
--- a/src/bisheng-langchain/bisheng_langchain/agents/chatglm_functions_agent/base.py
+++ b/src/bisheng-langchain/bisheng_langchain/agents/chatglm_functions_agent/base.py
@@ -2,6 +2,8 @@ import json
 import re
 from typing import Any, Dict, List, Optional, Sequence, Tuple, Union
 
+from pydantic import model_validator, Field
+
 from bisheng_langchain.chat_models.host_llm import HostChatGLM
 from langchain.agents.agent import Agent, AgentOutputParser, BaseSingleActionAgent
 from langchain.agents.structured_chat.output_parser import StructuredChatOutputParserWithRetries
@@ -14,7 +16,6 @@ from langchain.schema import AgentAction, AgentFinish, BasePromptTemplate
 from langchain.schema.language_model import BaseLanguageModel
 from langchain.schema.messages import ChatMessage
 from langchain.tools import BaseTool, StructuredTool
-from langchain_core.pydantic_v1 import Field, root_validator
 
 HUMAN_MESSAGE_TEMPLATE = '{input}\n\n{agent_scratchpad}'
 
@@ -81,13 +82,15 @@ class ChatglmFunctionsAgent(BaseSingleActionAgent):
         """Get allowed tools."""
         return list([t.name for t in self.tools])
 
-    @root_validator
+    @model_validator(mode='before')
+    @classmethod
     def validate_llm(cls, values: dict) -> dict:
         if not isinstance(values['llm'], HostChatGLM):
             raise ValueError('Only supported with ChatGLM3 models.')
         return values
 
-    @root_validator
+    @model_validator(mode='before')
+    @classmethod
     def validate_prompt(cls, values: dict) -> dict:
         prompt: BasePromptTemplate = values['prompt']
         if 'agent_scratchpad' not in prompt.input_variables:
diff --git a/src/bisheng-langchain/bisheng_langchain/agents/llm_functions_agent/base.py b/src/bisheng-langchain/bisheng_langchain/agents/llm_functions_agent/base.py
index e6b9d8a17..d6c332aac 100644
--- a/src/bisheng-langchain/bisheng_langchain/agents/llm_functions_agent/base.py
+++ b/src/bisheng-langchain/bisheng_langchain/agents/llm_functions_agent/base.py
@@ -3,6 +3,8 @@ import json
 from json import JSONDecodeError
 from typing import Any, List, Optional, Sequence, Tuple, Union
 
+from pydantic import model_validator
+
 from bisheng_langchain.chat_models.host_llm import HostQwenChat
 from bisheng_langchain.chat_models.proxy_llm import ProxyChatLLM
 from langchain.agents import BaseSingleActionAgent
@@ -16,7 +18,6 @@ from langchain.schema.messages import AIMessage, BaseMessage, FunctionMessage, S
 from langchain.tools import BaseTool
 from langchain.tools.convert_to_openai import format_tool_to_openai_function
 from langchain_core.agents import AgentActionMessageLog
-from langchain_core.pydantic_v1 import root_validator
 from langchain_openai import ChatOpenAI
 
 
@@ -135,7 +136,8 @@ class LLMFunctionsAgent(BaseSingleActionAgent):
         """Get allowed tools."""
         return list([t.name for t in self.tools])
 
-    @root_validator
+    @model_validator(mode='before')
+    @classmethod
     def validate_llm(cls, values: dict) -> dict:
         if ((not isinstance(values['llm'], ChatOpenAI))
                 and (not isinstance(values['llm'], HostQwenChat))
@@ -144,7 +146,8 @@ class LLMFunctionsAgent(BaseSingleActionAgent):
                 'Only supported with ChatOpenAI and HostQwenChat and ProxyChatLLM models.')
         return values
 
-    @root_validator
+    @model_validator(mode='before')
+    @classmethod
     def validate_prompt(cls, values: dict) -> dict:
         prompt: BasePromptTemplate = values['prompt']
         if 'agent_scratchpad' not in prompt.input_variables:
diff --git a/src/bisheng-langchain/bisheng_langchain/chains/qa_generation/base.py b/src/bisheng-langchain/bisheng_langchain/chains/qa_generation/base.py
index 9b8e268b4..9525f97c0 100644
--- a/src/bisheng-langchain/bisheng_langchain/chains/qa_generation/base.py
+++ b/src/bisheng-langchain/bisheng_langchain/chains/qa_generation/base.py
@@ -9,7 +9,7 @@ from typing import Any, Dict, List, Optional
 from langchain_core.callbacks import CallbackManagerForChainRun
 from langchain_core.language_models import BaseLanguageModel
 from langchain_core.prompts import BasePromptTemplate, ChatPromptTemplate
-from langchain_core.pydantic_v1 import Field
+from pydantic import Field
 from langchain_text_splitters import RecursiveCharacterTextSplitter, TextSplitter
 
 from langchain.chains.base import Chain
diff --git a/src/bisheng-langchain/bisheng_langchain/chains/transform.py b/src/bisheng-langchain/bisheng_langchain/chains/transform.py
index f666f8720..a29416b1a 100644
--- a/src/bisheng-langchain/bisheng_langchain/chains/transform.py
+++ b/src/bisheng-langchain/bisheng_langchain/chains/transform.py
@@ -6,7 +6,7 @@ from typing import Any, Awaitable, Callable, Dict, List, Optional
 
 from langchain.chains.base import Chain
 from langchain_core.callbacks import AsyncCallbackManagerForChainRun, CallbackManagerForChainRun
-from langchain_core.pydantic_v1 import Field
+from pydantic import Field
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/bisheng-langchain/bisheng_langchain/chat_models/host_llm.py b/src/bisheng-langchain/bisheng_langchain/chat_models/host_llm.py
index fe2d5151f..294855625 100644
--- a/src/bisheng-langchain/bisheng_langchain/chat_models/host_llm.py
+++ b/src/bisheng-langchain/bisheng_langchain/chat_models/host_llm.py
@@ -7,6 +7,8 @@ import sys
 from typing import TYPE_CHECKING, Any, Callable, Dict, List, Mapping, Optional, Tuple, Union
 
 import requests
+from pydantic import model_validator, Field
+
 from bisheng_langchain.utils.requests import Requests
 from langchain.callbacks.manager import AsyncCallbackManagerForLLMRun, CallbackManagerForLLMRun
 from langchain.chat_models.base import BaseChatModel
@@ -15,7 +17,6 @@ from langchain.schema.messages import (AIMessage, BaseMessage, ChatMessage, Func
                                        HumanMessage, SystemMessage)
 from langchain.utils import get_from_dict_or_env
 from langchain_core.language_models.llms import create_base_retry_decorator
-from langchain_core.pydantic_v1 import Field, root_validator
 
 # from requests.exceptions import HTTPError
 
@@ -141,9 +142,10 @@ class BaseHostChatLLM(BaseChatModel):
     class Config:
         """Configuration for this pydantic object."""
 
-        allow_population_by_field_name = True
+        validate_by_name = True
 
-    @root_validator()
+    @model_validator(mode='before')
+    @classmethod
     def validate_environment(cls, values: Dict) -> Dict:
         """Validate that api key and python package exists in environment."""
         values['host_base_url'] = get_from_dict_or_env(values, 'host_base_url', 'HostBaseUrl')
diff --git a/src/bisheng-langchain/bisheng_langchain/chat_models/minimax.py b/src/bisheng-langchain/bisheng_langchain/chat_models/minimax.py
index 78df85ac4..d24ed075c 100644
--- a/src/bisheng-langchain/bisheng_langchain/chat_models/minimax.py
+++ b/src/bisheng-langchain/bisheng_langchain/chat_models/minimax.py
@@ -12,7 +12,7 @@ from langchain.schema import ChatGeneration, ChatResult
 from langchain.schema.messages import (AIMessage, BaseMessage, ChatMessage, FunctionMessage,
                                        HumanMessage, SystemMessage)
 from langchain.utils import get_from_dict_or_env
-from langchain_core.pydantic_v1 import Field, root_validator
+from pydantic import model_validator, Field
 from tenacity import (before_sleep_log, retry, retry_if_exception_type, stop_after_attempt,
                       wait_exponential)
 
@@ -145,9 +145,10 @@ class ChatMinimaxAI(BaseChatModel):
     class Config:
         """Configuration for this pydantic object."""
 
-        allow_population_by_field_name = True
+        validate_by_name = True
 
-    @root_validator()
+    @model_validator(mode='before')
+    @classmethod
     def validate_environment(cls, values: Dict) -> Dict:
         """Validate that api key and python package exists in environment."""
         values['minimaxai_api_key'] = get_from_dict_or_env(values, 'minimaxai_api_key',
diff --git a/src/bisheng-langchain/bisheng_langchain/chat_models/proxy_llm.py b/src/bisheng-langchain/bisheng_langchain/chat_models/proxy_llm.py
index bfaab40cf..7e90eee92 100644
--- a/src/bisheng-langchain/bisheng_langchain/chat_models/proxy_llm.py
+++ b/src/bisheng-langchain/bisheng_langchain/chat_models/proxy_llm.py
@@ -6,6 +6,8 @@ import logging
 import sys
 from typing import TYPE_CHECKING, Any, Callable, Dict, List, Mapping, Optional, Tuple, Union
 
+from pydantic import model_validator, Field
+
 from bisheng_langchain.utils import requests
 from langchain.callbacks.manager import AsyncCallbackManagerForLLMRun, CallbackManagerForLLMRun
 from langchain.chat_models.base import BaseChatModel
@@ -13,7 +15,6 @@ from langchain.schema import ChatGeneration, ChatResult
 from langchain.schema.messages import (AIMessage, BaseMessage, ChatMessage, FunctionMessage,
                                        HumanMessage, SystemMessage)
 from langchain.utils import get_from_dict_or_env
-from langchain_core.pydantic_v1 import Field, root_validator
 from tenacity import (before_sleep_log, retry, retry_if_exception_type, stop_after_attempt,
                       wait_exponential)
 
@@ -141,9 +142,10 @@ class ProxyChatLLM(BaseChatModel):
     class Config:
         """Configuration for this pydantic object."""
 
-        allow_population_by_field_name = True
+        validate_by_name = True
 
-    @root_validator()
+    @model_validator(mode='before')
+    @classmethod
     def validate_environment(cls, values: Dict) -> Dict:
         """Validate that api key and python package exists in environment."""
         values['elemai_api_key'] = get_from_dict_or_env(values, 'elemai_api_key', 'ELEMAI_API_KEY')
diff --git a/src/bisheng-langchain/bisheng_langchain/chat_models/qwen.py b/src/bisheng-langchain/bisheng_langchain/chat_models/qwen.py
index 9e596e81d..3baa5fb66 100644
--- a/src/bisheng-langchain/bisheng_langchain/chat_models/qwen.py
+++ b/src/bisheng-langchain/bisheng_langchain/chat_models/qwen.py
@@ -7,6 +7,8 @@ import logging
 import sys
 from typing import TYPE_CHECKING, Any, Callable, Dict, List, Mapping, Optional, Tuple, Union
 
+from pydantic import model_validator, Field
+
 from bisheng_langchain.utils.requests import Requests
 # import requests
 from langchain.callbacks.manager import AsyncCallbackManagerForLLMRun, CallbackManagerForLLMRun
@@ -15,7 +17,6 @@ from langchain.schema import ChatGeneration, ChatResult
 from langchain.schema.messages import (AIMessage, BaseMessage, ChatMessage, FunctionMessage,
                                        HumanMessage, SystemMessage, ToolMessage)
 from langchain.utils import get_from_dict_or_env
-from langchain_core.pydantic_v1 import Field, root_validator
 from tenacity import (before_sleep_log, retry, retry_if_exception_type, stop_after_attempt,
                       wait_exponential)
 
@@ -169,9 +170,10 @@ class ChatQWen(BaseChatModel):
     class Config:
         """Configuration for this pydantic object."""
 
-        allow_population_by_field_name = True
+        validate_by_name = True
 
-    @root_validator()
+    @model_validator(mode='before')
+    @classmethod
     def validate_environment(cls, values: Dict) -> Dict:
         """Validate that api key and python package exists in environment."""
         values['api_key'] = get_from_dict_or_env(values, 'api_key', 'QWEN_API_KEY')
diff --git a/src/bisheng-langchain/bisheng_langchain/chat_models/sensetime.py b/src/bisheng-langchain/bisheng_langchain/chat_models/sensetime.py
index 095c00b86..6e327ffbf 100644
--- a/src/bisheng-langchain/bisheng_langchain/chat_models/sensetime.py
+++ b/src/bisheng-langchain/bisheng_langchain/chat_models/sensetime.py
@@ -7,6 +7,8 @@ import time
 from typing import Any, Dict, List, Mapping, Optional, Tuple, Union
 
 import jwt
+from pydantic import model_validator, Field
+
 from bisheng_langchain.utils.requests import Requests
 from langchain.callbacks.manager import AsyncCallbackManagerForLLMRun, CallbackManagerForLLMRun
 from langchain.chat_models.base import BaseChatModel
@@ -14,7 +16,6 @@ from langchain.schema import ChatGeneration, ChatResult
 from langchain.schema.messages import (AIMessage, BaseMessage, ChatMessage, FunctionMessage,
                                        HumanMessage, SystemMessage)
 from langchain.utils import get_from_dict_or_env
-from langchain_core.pydantic_v1 import Field, root_validator
 from tenacity import (before_sleep_log, retry, retry_if_exception_type, stop_after_attempt,
                       wait_exponential)
 
@@ -161,9 +162,10 @@ class SenseChat(BaseChatModel):
     class Config:
         """Configuration for this pydantic object."""
 
-        allow_population_by_field_name = True
+        validate_by_name = True
 
-    @root_validator()
+    @model_validator(mode='before')
+    @classmethod
     def validate_environment(cls, values: Dict) -> Dict:
         """Validate that api key and python package exists in environment."""
 
diff --git a/src/bisheng-langchain/bisheng_langchain/chat_models/wenxin.py b/src/bisheng-langchain/bisheng_langchain/chat_models/wenxin.py
index b8e2f1e7f..209c7be64 100644
--- a/src/bisheng-langchain/bisheng_langchain/chat_models/wenxin.py
+++ b/src/bisheng-langchain/bisheng_langchain/chat_models/wenxin.py
@@ -12,7 +12,7 @@ from langchain.schema import ChatGeneration, ChatResult
 from langchain.schema.messages import (AIMessage, BaseMessage, ChatMessage, FunctionMessage,
                                        HumanMessage, SystemMessage)
 from langchain.utils import get_from_dict_or_env
-from langchain_core.pydantic_v1 import Field, root_validator
+from pydantic import model_validator, Field
 from tenacity import (before_sleep_log, retry, retry_if_exception_type, stop_after_attempt,
                       wait_exponential)
 
@@ -142,9 +142,10 @@ class ChatWenxin(BaseChatModel):
     class Config:
         """Configuration for this pydantic object."""
 
-        allow_population_by_field_name = True
+        validate_by_name = True
 
-    @root_validator()
+    @model_validator(mode='before')
+    @classmethod
     def validate_environment(cls, values: Dict) -> Dict:
         """Validate that api key and python package exists in environment."""
         values['wenxin_api_key'] = get_from_dict_or_env(values, 'wenxin_api_key', 'WENXIN_API_KEY')
diff --git a/src/bisheng-langchain/bisheng_langchain/chat_models/xunfeiai.py b/src/bisheng-langchain/bisheng_langchain/chat_models/xunfeiai.py
index 99f6cd4ef..4b6318a54 100644
--- a/src/bisheng-langchain/bisheng_langchain/chat_models/xunfeiai.py
+++ b/src/bisheng-langchain/bisheng_langchain/chat_models/xunfeiai.py
@@ -12,7 +12,7 @@ from langchain.schema import ChatGeneration, ChatResult
 from langchain.schema.messages import (AIMessage, BaseMessage, ChatMessage, FunctionMessage,
                                        HumanMessage, SystemMessage)
 from langchain.utils import get_from_dict_or_env
-from langchain_core.pydantic_v1 import Field, root_validator
+from pydantic import model_validator, Field
 from tenacity import (before_sleep_log, retry, retry_if_exception_type, stop_after_attempt,
                       wait_exponential)
 
@@ -145,9 +145,10 @@ class ChatXunfeiAI(BaseChatModel):
     class Config:
         """Configuration for this pydantic object."""
 
-        allow_population_by_field_name = True
+        validate_by_name = True
 
-    @root_validator()
+    @model_validator(mode='before')
+    @classmethod
     def validate_environment(cls, values: Dict) -> Dict:
         """Validate that api key and python package exists in environment."""
         values['xunfeiai_appid'] = get_from_dict_or_env(
diff --git a/src/bisheng-langchain/bisheng_langchain/chat_models/zhipuai.py b/src/bisheng-langchain/bisheng_langchain/chat_models/zhipuai.py
index b5b6254db..ee858fb1f 100644
--- a/src/bisheng-langchain/bisheng_langchain/chat_models/zhipuai.py
+++ b/src/bisheng-langchain/bisheng_langchain/chat_models/zhipuai.py
@@ -12,7 +12,7 @@ from langchain.schema import ChatGeneration, ChatResult
 from langchain.schema.messages import (AIMessage, BaseMessage, ChatMessage, FunctionMessage,
                                        HumanMessage, SystemMessage)
 from langchain.utils import get_from_dict_or_env
-from langchain_core.pydantic_v1 import Field, root_validator
+from pydantic import model_validator, Field
 from tenacity import (before_sleep_log, retry, retry_if_exception_type, stop_after_attempt,
                       wait_exponential)
 
@@ -153,9 +153,10 @@ class ChatZhipuAI(BaseChatModel):
     class Config:
         """Configuration for this pydantic object."""
 
-        allow_population_by_field_name = True
+        validate_by_name = True
 
-    @root_validator()
+    @model_validator(mode='before')
+    @classmethod
     def validate_environment(cls, values: Dict) -> Dict:
         """Validate that api key and python package exists in environment."""
         values['zhipuai_api_key'] = get_from_dict_or_env(values, 'zhipuai_api_key',
diff --git a/src/bisheng-langchain/bisheng_langchain/embeddings/host_embedding.py b/src/bisheng-langchain/bisheng_langchain/embeddings/host_embedding.py
index 57da49b1d..a6caf8cff 100644
--- a/src/bisheng-langchain/bisheng_langchain/embeddings/host_embedding.py
+++ b/src/bisheng-langchain/bisheng_langchain/embeddings/host_embedding.py
@@ -6,7 +6,7 @@ from typing import Any, Callable, Dict, List, Optional, Tuple, Union
 import requests
 from langchain.embeddings.base import Embeddings
 from langchain.utils import get_from_dict_or_env
-from langchain_core.pydantic_v1 import BaseModel, Field, root_validator
+from pydantic import model_validator, BaseModel, Field
 from tenacity import (before_sleep_log, retry, retry_if_exception_type, stop_after_attempt,
                       wait_exponential)
 
@@ -64,7 +64,8 @@ class HostEmbeddings(BaseModel, Embeddings):
 
     url_ep: Optional[str] = None
 
-    @root_validator()
+    @model_validator(mode='before')
+    @classmethod
     def validate_environment(cls, values: Dict) -> Dict:
         """Validate that api key and python package exists in environment."""
         values['host_base_url'] = get_from_dict_or_env(values, 'host_base_url', 'HostBaseUrl')
@@ -164,7 +165,8 @@ class CustomHostEmbedding(HostEmbeddings):
     model: str = Field('custom-embedding', alias='model')
     embedding_ctx_length: int = 512
 
-    @root_validator()
+    @model_validator(mode='before')
+    @classmethod
     def validate_environment(cls, values: Dict) -> Dict:
         """Validate that api key and python package exists in environment."""
         values['host_base_url'] = get_from_dict_or_env(values, 'host_base_url', 'HostBaseUrl')
diff --git a/src/bisheng-langchain/bisheng_langchain/embeddings/huggingfacegte.py b/src/bisheng-langchain/bisheng_langchain/embeddings/huggingfacegte.py
index 780a0468a..68474672d 100644
--- a/src/bisheng-langchain/bisheng_langchain/embeddings/huggingfacegte.py
+++ b/src/bisheng-langchain/bisheng_langchain/embeddings/huggingfacegte.py
@@ -2,7 +2,7 @@ from typing import Any, Dict, List, Optional
 
 import requests
 from langchain_core.embeddings import Embeddings
-from langchain_core.pydantic_v1 import BaseModel, Extra, Field
+from pydantic import BaseModel, Extra, Field
 DEFAULT_Multilingual_MODEL = "thenlper/gte-large-zh"
 
 
diff --git a/src/bisheng-langchain/bisheng_langchain/embeddings/huggingfacemultilingual.py b/src/bisheng-langchain/bisheng_langchain/embeddings/huggingfacemultilingual.py
index af704e6c9..169557294 100644
--- a/src/bisheng-langchain/bisheng_langchain/embeddings/huggingfacemultilingual.py
+++ b/src/bisheng-langchain/bisheng_langchain/embeddings/huggingfacemultilingual.py
@@ -2,7 +2,7 @@ from typing import Any, Dict, List, Optional
 
 import requests
 from langchain_core.embeddings import Embeddings
-from langchain_core.pydantic_v1 import BaseModel, Extra, Field
+from pydantic import BaseModel, Extra, Field
 DEFAULT_Multilingual_MODEL = "intfloat/multilingual-e5-large"
 
 
diff --git a/src/bisheng-langchain/bisheng_langchain/embeddings/wenxin.py b/src/bisheng-langchain/bisheng_langchain/embeddings/wenxin.py
index 23c4ef8f8..374862b9e 100644
--- a/src/bisheng-langchain/bisheng_langchain/embeddings/wenxin.py
+++ b/src/bisheng-langchain/bisheng_langchain/embeddings/wenxin.py
@@ -7,7 +7,7 @@ from typing import Any, Callable, Dict, List, Optional, Tuple, Union
 # import numpy as np
 from langchain.embeddings.base import Embeddings
 from langchain.utils import get_from_dict_or_env
-from langchain_core.pydantic_v1 import BaseModel, Extra, Field, root_validator
+from pydantic import model_validator, BaseModel, Field
 from requests.exceptions import HTTPError
 from tenacity import (before_sleep_log, retry, retry_if_exception_type, stop_after_attempt,
                       wait_exponential)
@@ -76,9 +76,10 @@ class WenxinEmbeddings(BaseModel, Embeddings):
     class Config:
         """Configuration for this pydantic object."""
 
-        extra = Extra.forbid
+        extra = 'forbid'
 
-    @root_validator()
+    @model_validator(mode='before')
+    @classmethod
     def validate_environment(cls, values: Dict) -> Dict:
         """Validate that api key and python package exists in environment."""
         values['wenxin_api_key'] = get_from_dict_or_env(values, 'wenxin_api_key', 'WENXIN_API_KEY')
diff --git a/src/bisheng-langchain/bisheng_langchain/gpts/tools/api_tools/base.py b/src/bisheng-langchain/bisheng_langchain/gpts/tools/api_tools/base.py
index f62841d2c..740714592 100644
--- a/src/bisheng-langchain/bisheng_langchain/gpts/tools/api_tools/base.py
+++ b/src/bisheng-langchain/bisheng_langchain/gpts/tools/api_tools/base.py
@@ -1,7 +1,8 @@
 from typing import Any, Dict, Tuple, Type, Union
 
+from pydantic import model_validator, BaseModel, Extra, Field
+
 from bisheng_langchain.utils.requests import Requests, RequestsWrapper
-from langchain_core.pydantic_v1 import BaseModel, Extra, Field, root_validator
 from langchain_core.tools import BaseTool, Tool
 from loguru import logger
 
@@ -38,7 +39,8 @@ class APIToolBase(BaseModel):
 
         extra = Extra.forbid
 
-    @root_validator()
+    @model_validator(mode='before')
+    @classmethod
     def validate_environment(cls, values: Dict) -> Dict:
         """Validate that api key and python package exists in environment."""
         timeout = values.get('request_timeout', 30)
diff --git a/src/bisheng-langchain/bisheng_langchain/gpts/tools/api_tools/firecrawl.py b/src/bisheng-langchain/bisheng_langchain/gpts/tools/api_tools/firecrawl.py
index 0b474862f..fa5b90b80 100644
--- a/src/bisheng-langchain/bisheng_langchain/gpts/tools/api_tools/firecrawl.py
+++ b/src/bisheng-langchain/bisheng_langchain/gpts/tools/api_tools/firecrawl.py
@@ -3,7 +3,7 @@ from typing import Any, Dict, Type
 
 import requests
 
-from langchain_core.pydantic_v1 import BaseModel, Field, root_validator
+from pydantic import BaseModel, Field
 
 from bisheng_langchain.gpts.tools.api_tools.base import (APIToolBase,
                                                          MultArgsSchemaTool)
diff --git a/src/bisheng-langchain/bisheng_langchain/gpts/tools/api_tools/flow.py b/src/bisheng-langchain/bisheng_langchain/gpts/tools/api_tools/flow.py
index 7d7a3e372..60942dff2 100644
--- a/src/bisheng-langchain/bisheng_langchain/gpts/tools/api_tools/flow.py
+++ b/src/bisheng-langchain/bisheng_langchain/gpts/tools/api_tools/flow.py
@@ -1,5 +1,5 @@
 from loguru import logger
-from langchain_core.pydantic_v1 import BaseModel, Field
+from pydantic import BaseModel, Field
 from typing import Any
 from .base import APIToolBase
 from .base import MultArgsSchemaTool
diff --git a/src/bisheng-langchain/bisheng_langchain/gpts/tools/api_tools/macro_data.py b/src/bisheng-langchain/bisheng_langchain/gpts/tools/api_tools/macro_data.py
index 78c7923fc..a6a641422 100644
--- a/src/bisheng-langchain/bisheng_langchain/gpts/tools/api_tools/macro_data.py
+++ b/src/bisheng-langchain/bisheng_langchain/gpts/tools/api_tools/macro_data.py
@@ -4,7 +4,7 @@ from typing import Any
 
 import pandas as pd
 import requests
-from langchain.pydantic_v1 import BaseModel, Field
+from pydantic import BaseModel, Field
 from langchain_core.tools import BaseTool
 
 from .base import MultArgsSchemaTool
diff --git a/src/bisheng-langchain/bisheng_langchain/gpts/tools/api_tools/sina.py b/src/bisheng-langchain/bisheng_langchain/gpts/tools/api_tools/sina.py
index acb69d71a..3481178b5 100644
--- a/src/bisheng-langchain/bisheng_langchain/gpts/tools/api_tools/sina.py
+++ b/src/bisheng-langchain/bisheng_langchain/gpts/tools/api_tools/sina.py
@@ -7,7 +7,7 @@ import re
 from datetime import datetime
 from typing import List, Type
 
-from langchain_core.pydantic_v1 import BaseModel, Field
+from pydantic import BaseModel, Field
 from loguru import logger
 
 from .base import APIToolBase
diff --git a/src/bisheng-langchain/bisheng_langchain/gpts/tools/api_tools/tianyancha.py b/src/bisheng-langchain/bisheng_langchain/gpts/tools/api_tools/tianyancha.py
index 11610777e..d5cd013ac 100644
--- a/src/bisheng-langchain/bisheng_langchain/gpts/tools/api_tools/tianyancha.py
+++ b/src/bisheng-langchain/bisheng_langchain/gpts/tools/api_tools/tianyancha.py
@@ -3,8 +3,9 @@ from __future__ import annotations
 
 from typing import Any, Dict, Type
 
+from pydantic import model_validator, BaseModel, Field
+
 from bisheng_langchain.utils.requests import Requests, RequestsWrapper
-from langchain_core.pydantic_v1 import BaseModel, Field, root_validator
 
 from .base import APIToolBase
 
@@ -19,7 +20,8 @@ class CompanyInfo(APIToolBase):
     api_key: str = None
     args_schema: Type[BaseModel] = InputArgs
 
-    @root_validator(pre=True)
+    @model_validator(mode='before')
+    @classmethod
     def build_header(cls, values: Dict[str, Any]) -> Dict[str, Any]:
         """Build headers that were passed in."""
         if not values.get('api_key'):
@@ -30,7 +32,8 @@ class CompanyInfo(APIToolBase):
         values['headers'] = headers
         return values
 
-    @root_validator()
+    @model_validator(mode='before')
+    @classmethod
     def validate_environment(cls, values: Dict) -> Dict:
         """Validate that api key and python package exists in environment."""
         timeout = values.get('request_timeout', 30)
diff --git a/src/bisheng-langchain/bisheng_langchain/gpts/tools/bing_search/tool.py b/src/bisheng-langchain/bisheng_langchain/gpts/tools/bing_search/tool.py
index 9b9cf05f9..72d8c753e 100644
--- a/src/bisheng-langchain/bisheng_langchain/gpts/tools/bing_search/tool.py
+++ b/src/bisheng-langchain/bisheng_langchain/gpts/tools/bing_search/tool.py
@@ -2,7 +2,7 @@
 
 from typing import Optional, Type
 
-from langchain.pydantic_v1 import BaseModel, Field
+from pydantic import BaseModel, Field
 from langchain_community.utilities.bing_search import BingSearchAPIWrapper
 from langchain_core.callbacks import CallbackManagerForToolRun
 from langchain_core.tools import BaseTool
@@ -43,7 +43,7 @@ class BingSearchResults(BaseTool):
         "Input should be a search query. Output is a JSON array of the query results"
     )
     num_results: int = 5
-    args_schema = BingSearchInput
+    args_schema: Type[BaseModel] = BingSearchInput
     api_wrapper: BingSearchAPIWrapper
 
     def _run(
diff --git a/src/bisheng-langchain/bisheng_langchain/gpts/tools/calculator/tool.py b/src/bisheng-langchain/bisheng_langchain/gpts/tools/calculator/tool.py
index c3043b0c4..55356096c 100644
--- a/src/bisheng-langchain/bisheng_langchain/gpts/tools/calculator/tool.py
+++ b/src/bisheng-langchain/bisheng_langchain/gpts/tools/calculator/tool.py
@@ -2,7 +2,7 @@ import math
 from math import *
 
 import sympy
-from langchain.pydantic_v1 import BaseModel, Field
+from pydantic import BaseModel, Field
 from langchain.tools import tool
 from sympy import *
 
diff --git a/src/bisheng-langchain/bisheng_langchain/gpts/tools/code_interpreter/tool.py b/src/bisheng-langchain/bisheng_langchain/gpts/tools/code_interpreter/tool.py
index 4c0dc27fa..e131589c2 100644
--- a/src/bisheng-langchain/bisheng_langchain/gpts/tools/code_interpreter/tool.py
+++ b/src/bisheng-langchain/bisheng_langchain/gpts/tools/code_interpreter/tool.py
@@ -15,7 +15,7 @@ from uuid import uuid4
 
 import matplotlib
 from langchain_community.tools import Tool
-from langchain_core.pydantic_v1 import BaseModel, Field
+from pydantic import BaseModel, Field
 from loguru import logger
 
 CODE_BLOCK_PATTERN = r"```(\w*)\n(.*?)\n```"
diff --git a/src/bisheng-langchain/bisheng_langchain/gpts/tools/dalle_image_generator/tool.py b/src/bisheng-langchain/bisheng_langchain/gpts/tools/dalle_image_generator/tool.py
index 74ed8616e..22d16260c 100644
--- a/src/bisheng-langchain/bisheng_langchain/gpts/tools/dalle_image_generator/tool.py
+++ b/src/bisheng-langchain/bisheng_langchain/gpts/tools/dalle_image_generator/tool.py
@@ -2,13 +2,11 @@ import logging
 import os
 from typing import Any, Dict, Mapping, Optional, Tuple, Type, Union
 
-from langchain.pydantic_v1 import BaseModel, Field
-from langchain_community.utilities.dalle_image_generator import DallEAPIWrapper
 from langchain_community.utils.openai import is_openai_v1
 from langchain_core.callbacks import CallbackManagerForToolRun
-from langchain_core.pydantic_v1 import BaseModel, Extra, Field, root_validator
 from langchain_core.tools import BaseTool
 from langchain_core.utils import get_from_dict_or_env, get_pydantic_field_names
+from pydantic import model_validator, BaseModel, Field
 
 from bisheng_langchain.utils.azure_dalle_image_generator import AzureDallEWrapper
 
@@ -63,9 +61,10 @@ class DallEAPIWrapper(BaseModel):
     class Config:
         """Configuration for this pydantic object."""
 
-        extra = Extra.forbid
+        extra = 'forbid'
 
-    @root_validator(pre=True)
+    @model_validator(mode='before')
+    @classmethod
     def build_extra(cls, values: Dict[str, Any]) -> Dict[str, Any]:
         """Build extra kwargs from additional params that were passed in."""
         all_required_field_names = get_pydantic_field_names(cls)
@@ -91,7 +90,8 @@ class DallEAPIWrapper(BaseModel):
         values["model_kwargs"] = extra
         return values
 
-    @root_validator()
+    @model_validator(mode='before')
+    @classmethod
     def validate_environment(cls, values: Dict) -> Dict:
         """Validate that api key and python package exists in environment."""
         values["openai_api_key"] = get_from_dict_or_env(values, "openai_api_key", "OPENAI_API_KEY")
diff --git a/src/bisheng-langchain/bisheng_langchain/gpts/tools/get_current_time/tool.py b/src/bisheng-langchain/bisheng_langchain/gpts/tools/get_current_time/tool.py
index f23215666..2a666454b 100644
--- a/src/bisheng-langchain/bisheng_langchain/gpts/tools/get_current_time/tool.py
+++ b/src/bisheng-langchain/bisheng_langchain/gpts/tools/get_current_time/tool.py
@@ -1,7 +1,7 @@
 from datetime import datetime
 
 import pytz
-from langchain.pydantic_v1 import BaseModel, Field
+from pydantic import BaseModel, Field
 from langchain.tools import tool
 
 
diff --git a/src/bisheng-langchain/bisheng_langchain/gpts/tools/message/dingding.py b/src/bisheng-langchain/bisheng_langchain/gpts/tools/message/dingding.py
index 25bd27361..9b15700fd 100644
--- a/src/bisheng-langchain/bisheng_langchain/gpts/tools/message/dingding.py
+++ b/src/bisheng-langchain/bisheng_langchain/gpts/tools/message/dingding.py
@@ -1,8 +1,7 @@
 from typing import Any, Optional, Type
 
 import requests
-from langchain_core.pydantic_v1 import BaseModel, Field, root_validator
-from loguru import logger
+from pydantic import BaseModel, Field
 
 from bisheng_langchain.gpts.tools.api_tools.base import (APIToolBase,
                                                          MultArgsSchemaTool)
diff --git a/src/bisheng-langchain/bisheng_langchain/gpts/tools/message/email.py b/src/bisheng-langchain/bisheng_langchain/gpts/tools/message/email.py
index 7569ad8b5..58d0a7178 100644
--- a/src/bisheng-langchain/bisheng_langchain/gpts/tools/message/email.py
+++ b/src/bisheng-langchain/bisheng_langchain/gpts/tools/message/email.py
@@ -1,11 +1,9 @@
-import os
 import smtplib
-from email.mime.application import MIMEApplication
 from email.mime.multipart import MIMEMultipart
 from email.mime.text import MIMEText
-from typing import Any, Optional
+from typing import Any
 
-from langchain_core.pydantic_v1 import BaseModel, Field, root_validator
+from pydantic import BaseModel, Field
 
 from bisheng_langchain.gpts.tools.api_tools.base import (APIToolBase,
                                                          MultArgsSchemaTool)
diff --git a/src/bisheng-langchain/bisheng_langchain/gpts/tools/message/feishu.py b/src/bisheng-langchain/bisheng_langchain/gpts/tools/message/feishu.py
index 2bcfee83e..f14c88d6e 100644
--- a/src/bisheng-langchain/bisheng_langchain/gpts/tools/message/feishu.py
+++ b/src/bisheng-langchain/bisheng_langchain/gpts/tools/message/feishu.py
@@ -1,8 +1,7 @@
 from typing import Any, Optional, Type
 
 import requests
-from langchain_core.pydantic_v1 import BaseModel, Field, root_validator
-from loguru import logger
+from pydantic import BaseModel, Field
 
 from bisheng_langchain.gpts.tools.api_tools.base import (APIToolBase,
                                                          MultArgsSchemaTool)
@@ -23,7 +22,7 @@ class InputArgs(BaseModel):
 
 
 class FeishuMessageTool(BaseModel):
-    API_BASE_URL = "https://open.feishu.cn/open-apis"
+    API_BASE_URL: str = "https://open.feishu.cn/open-apis"
     app_id: str = Field(description="app_id")
     app_secret: str = Field(description="app_secret")
 
diff --git a/src/bisheng-langchain/bisheng_langchain/gpts/tools/message/wechat.py b/src/bisheng-langchain/bisheng_langchain/gpts/tools/message/wechat.py
index 9332ae699..9b3fc35ea 100644
--- a/src/bisheng-langchain/bisheng_langchain/gpts/tools/message/wechat.py
+++ b/src/bisheng-langchain/bisheng_langchain/gpts/tools/message/wechat.py
@@ -1,8 +1,7 @@
-from typing import Any, Optional, Type
+from typing import Any
 
 import requests
-from langchain_core.pydantic_v1 import BaseModel, Field, root_validator
-from loguru import logger
+from pydantic import BaseModel, Field
 
 from bisheng_langchain.gpts.tools.api_tools.base import (APIToolBase,
                                                          MultArgsSchemaTool)
diff --git a/src/bisheng-langchain/bisheng_langchain/gpts/tools/sql_agent/tool.py b/src/bisheng-langchain/bisheng_langchain/gpts/tools/sql_agent/tool.py
index ccd665018..040a25605 100644
--- a/src/bisheng-langchain/bisheng_langchain/gpts/tools/sql_agent/tool.py
+++ b/src/bisheng-langchain/bisheng_langchain/gpts/tools/sql_agent/tool.py
@@ -47,8 +47,8 @@ class SubmitFinalAnswer(BaseModel):
     final_answer: str = Field(..., description="The final answer to the user")
 
 class QueryDBTool(BaseTool):
-    name = "db_query_tool"
-    description = """Execute a SQL query against the database and get back the result.
+    name: str = "db_query_tool"
+    description: str = """Execute a SQL query against the database and get back the result.
         If the query is not correct, an error message will be returned.
         If an error is returned, rewrite the query, check the query, and try again."""
 
@@ -241,8 +241,8 @@ class SqlAgentInput(BaseModel):
 
 
 class SqlAgentTool(BaseTool):
-    name = "sql_agent"
-    description = "回答与 SQL 数据库有关的问题。给定用户问题，将从数据库中获取可用的表以及对应 DDL，生成 SQL 查询语句并进行执行，最终得到执行结果。"
+    name: str = "sql_agent"
+    description: str = "回答与 SQL 数据库有关的问题。给定用户问题，将从数据库中获取可用的表以及对应 DDL，生成 SQL 查询语句并进行执行，最终得到执行结果。"
     args_schema: Type[BaseModel] = SqlAgentInput
     api_wrapper: SqlAgentAPIWrapper
 
diff --git a/src/bisheng-langchain/bisheng_langchain/memory/redis.py b/src/bisheng-langchain/bisheng_langchain/memory/redis.py
index 29b958d05..195f82e4e 100644
--- a/src/bisheng-langchain/bisheng_langchain/memory/redis.py
+++ b/src/bisheng-langchain/bisheng_langchain/memory/redis.py
@@ -5,8 +5,7 @@ import redis
 from langchain.memory.chat_memory import BaseChatMemory
 from langchain_core.messages import (AIMessage, BaseMessage, HumanMessage, get_buffer_string,
                                      message_to_dict, messages_from_dict)
-from langchain_core.pydantic_v1 import root_validator
-from pydantic import Field
+from pydantic import Field, model_validator
 
 
 class ConversationRedisMemory(BaseChatMemory):
@@ -20,7 +19,8 @@ class ConversationRedisMemory(BaseChatMemory):
     redis_prefix: str = 'redis_buffer_'
     ttl: Optional[int] = None
 
-    @root_validator()
+    @model_validator(mode='before')
+    @classmethod
     def validate_environment(cls, values: Dict) -> Dict:
         redis_url = values.get('redis_url')
         if not redis_url:
diff --git a/src/bisheng-langchain/bisheng_langchain/rag/bisheng_rag_chain.py b/src/bisheng-langchain/bisheng_langchain/rag/bisheng_rag_chain.py
index 06ac20f46..8d634ca3e 100644
--- a/src/bisheng-langchain/bisheng_langchain/rag/bisheng_rag_chain.py
+++ b/src/bisheng-langchain/bisheng_langchain/rag/bisheng_rag_chain.py
@@ -10,7 +10,7 @@ from langchain_core.callbacks import (AsyncCallbackManagerForChainRun, CallbackM
 from langchain_core.language_models import BaseLanguageModel
 from langchain_core.prompts import (ChatPromptTemplate, HumanMessagePromptTemplate,
                                     SystemMessagePromptTemplate)
-from langchain_core.pydantic_v1 import Extra, Field
+from pydantic import Extra, Field
 
 from .bisheng_rag_tool import BishengRAGTool
 
@@ -58,7 +58,7 @@ class BishengRetrievalQA(Chain):
 
         extra = Extra.forbid
         arbitrary_types_allowed = True
-        allow_population_by_field_name = True
+        validate_by_name = True
 
     @property
     def input_keys(self) -> List[str]:
diff --git a/src/bisheng-langchain/bisheng_langchain/rag/bisheng_rag_tool.py b/src/bisheng-langchain/bisheng_langchain/rag/bisheng_rag_tool.py
index 75a192d8c..b379da31d 100644
--- a/src/bisheng-langchain/bisheng_langchain/rag/bisheng_rag_tool.py
+++ b/src/bisheng-langchain/bisheng_langchain/rag/bisheng_rag_tool.py
@@ -15,7 +15,7 @@ from langchain.chains.combine_documents import create_stuff_documents_chain
 from langchain_core.callbacks import CallbackManagerForChainRun
 from langchain_core.language_models.base import LanguageModelLike
 from langchain_core.prompts import ChatPromptTemplate
-from langchain_core.pydantic_v1 import BaseModel, Field
+from pydantic import BaseModel, Field
 from langchain_core.runnables import RunnableConfig
 from langchain_core.tools import BaseTool, Tool
 from langchain_core.vectorstores import VectorStoreRetriever
diff --git a/src/bisheng-langchain/bisheng_langchain/rag/init_retrievers/baseline_vector_retriever.py b/src/bisheng-langchain/bisheng_langchain/rag/init_retrievers/baseline_vector_retriever.py
index ad38081bf..1a6a30e01 100644
--- a/src/bisheng-langchain/bisheng_langchain/rag/init_retrievers/baseline_vector_retriever.py
+++ b/src/bisheng-langchain/bisheng_langchain/rag/init_retrievers/baseline_vector_retriever.py
@@ -2,7 +2,7 @@ from typing import Any, List, Optional
 
 from langchain.text_splitter import TextSplitter
 from langchain_core.documents import Document
-from langchain_core.pydantic_v1 import Field
+from pydantic import Field
 from langchain_core.retrievers import BaseRetriever
 from loguru import logger
 
diff --git a/src/bisheng-langchain/bisheng_langchain/rag/init_retrievers/keyword_retriever.py b/src/bisheng-langchain/bisheng_langchain/rag/init_retrievers/keyword_retriever.py
index 3f0a827c7..49c0305d4 100644
--- a/src/bisheng-langchain/bisheng_langchain/rag/init_retrievers/keyword_retriever.py
+++ b/src/bisheng-langchain/bisheng_langchain/rag/init_retrievers/keyword_retriever.py
@@ -2,7 +2,7 @@ from typing import Any, List, Optional
 
 from langchain.text_splitter import TextSplitter
 from langchain_core.documents import Document
-from langchain_core.pydantic_v1 import Field
+from pydantic import Field
 from langchain_core.retrievers import BaseRetriever
 from loguru import logger
 
diff --git a/src/bisheng-langchain/bisheng_langchain/rag/init_retrievers/mix_retriever.py b/src/bisheng-langchain/bisheng_langchain/rag/init_retrievers/mix_retriever.py
index 0ed3ec098..adad44117 100644
--- a/src/bisheng-langchain/bisheng_langchain/rag/init_retrievers/mix_retriever.py
+++ b/src/bisheng-langchain/bisheng_langchain/rag/init_retrievers/mix_retriever.py
@@ -3,7 +3,7 @@ from typing import Any, List, Optional
 from bisheng_langchain.vectorstores import ElasticKeywordsSearch
 from langchain.text_splitter import TextSplitter
 from langchain_core.documents import Document
-from langchain_core.pydantic_v1 import Field
+from pydantic import Field
 from langchain_core.retrievers import BaseRetriever
 
 
diff --git a/src/bisheng-langchain/bisheng_langchain/rag/init_retrievers/smaller_chunks_retriever.py b/src/bisheng-langchain/bisheng_langchain/rag/init_retrievers/smaller_chunks_retriever.py
index b39168441..41afad65b 100644
--- a/src/bisheng-langchain/bisheng_langchain/rag/init_retrievers/smaller_chunks_retriever.py
+++ b/src/bisheng-langchain/bisheng_langchain/rag/init_retrievers/smaller_chunks_retriever.py
@@ -3,7 +3,7 @@ from typing import Any, List, Optional
 
 from langchain.text_splitter import TextSplitter
 from langchain_core.documents import Document
-from langchain_core.pydantic_v1 import Field
+from pydantic import Field
 from langchain_core.retrievers import BaseRetriever
 
 
@@ -15,7 +15,7 @@ class SmallerChunksVectorRetriever(BaseRetriever):
     parent_splitter: Optional[TextSplitter] = None
     """The text splitter to use to create parent documents.
     If none, then the parent documents will be the raw documents passed in."""
-    id_key = 'doc_id'
+    id_key: str = 'doc_id'
 
     def add_documents(
         self,
diff --git a/src/bisheng-langchain/bisheng_langchain/rag/test/test_smaller_chunks.py b/src/bisheng-langchain/bisheng_langchain/rag/test/test_smaller_chunks.py
index eb3e4f48e..72766ef45 100644
--- a/src/bisheng-langchain/bisheng_langchain/rag/test/test_smaller_chunks.py
+++ b/src/bisheng-langchain/bisheng_langchain/rag/test/test_smaller_chunks.py
@@ -6,7 +6,7 @@ from typing import Any, Dict, Iterable, List, Optional
 import httpx
 from bisheng_langchain.vectorstores.milvus import Milvus
 from langchain_core.documents import Document
-from langchain_core.pydantic_v1 import Field
+from pydantic import Field
 from langchain_core.retrievers import BaseRetriever
 from langchain_core.vectorstores import VectorStore
 from loguru import logger
diff --git a/src/bisheng-langchain/bisheng_langchain/retrievers/ensemble.py b/src/bisheng-langchain/bisheng_langchain/retrievers/ensemble.py
index 24b0ff444..8f217b2cd 100644
--- a/src/bisheng-langchain/bisheng_langchain/retrievers/ensemble.py
+++ b/src/bisheng-langchain/bisheng_langchain/retrievers/ensemble.py
@@ -6,13 +6,13 @@ multiple retrievers by using weighted  Reciprocal Rank Fusion
 from typing import Any, Dict, List
 
 from langchain_core.documents import Document
-from langchain_core.pydantic_v1 import root_validator
 from langchain_core.retrievers import BaseRetriever
 
 from langchain.callbacks.manager import (
     AsyncCallbackManagerForRetrieverRun,
     CallbackManagerForRetrieverRun,
 )
+from pydantic import model_validator
 
 
 class EnsembleRetriever(BaseRetriever):
@@ -33,7 +33,8 @@ class EnsembleRetriever(BaseRetriever):
     weights: List[float]
     c: int = 60
 
-    @root_validator(pre=True)
+    @model_validator(mode='before')
+    @classmethod
     def set_weights(cls, values: Dict[str, Any]) -> Dict[str, Any]:
         if not values.get("weights"):
             n_retrievers = len(values["retrievers"])
diff --git a/src/bisheng-langchain/bisheng_langchain/utils/azure_dalle_image_generator.py b/src/bisheng-langchain/bisheng_langchain/utils/azure_dalle_image_generator.py
index 3d303736b..e347ef81f 100644
--- a/src/bisheng-langchain/bisheng_langchain/utils/azure_dalle_image_generator.py
+++ b/src/bisheng-langchain/bisheng_langchain/utils/azure_dalle_image_generator.py
@@ -3,7 +3,7 @@ from typing import Callable, Dict, Optional, Union
 
 import openai
 from langchain_community.utilities.dalle_image_generator import DallEAPIWrapper
-from langchain_core.pydantic_v1 import Field, SecretStr, root_validator
+from pydantic import Field, SecretStr, model_validator
 from langchain_core.utils import convert_to_secret_str, get_from_dict_or_env
 
 
@@ -56,7 +56,8 @@ class AzureDallEWrapper(DallEAPIWrapper):
     chunk_size: int = 2048
     """Maximum number of texts to embed in each batch"""
 
-    @root_validator()
+    @model_validator(mode='before')
+    @classmethod
     def validate_environment(cls, values: Dict) -> Dict:
         """Validate that api key and python package exists in environment."""
         # Check OPENAI_KEY for backwards compatibility.
diff --git a/src/bisheng-langchain/bisheng_langchain/vectorstores/retriever.py b/src/bisheng-langchain/bisheng_langchain/vectorstores/retriever.py
index 0bc4437dc..9e16a3143 100644
--- a/src/bisheng-langchain/bisheng_langchain/vectorstores/retriever.py
+++ b/src/bisheng-langchain/bisheng_langchain/vectorstores/retriever.py
@@ -6,7 +6,7 @@ from venv import logger
 import requests
 from langchain.schema.document import Document
 from langchain.vectorstores.base import VectorStore, VectorStoreRetriever
-from langchain_core.pydantic_v1 import Field, root_validator
+from pydantic import model_validator, Field
 
 if TYPE_CHECKING:
     from langchain.callbacks.manager import (
@@ -31,7 +31,8 @@ class VectorStoreFilterRetriever(VectorStoreRetriever):
 
         arbitrary_types_allowed = True
 
-    @root_validator()
+    @model_validator(mode='before')
+    @classmethod
     def validate_search_type(cls, values: Dict) -> Dict:
         """Validate search type."""
         search_type = values['search_type']
diff --git a/src/bisheng-langchain/requirements.txt b/src/bisheng-langchain/requirements.txt
index 2ad5b56e6..c4b6636cc 100644
--- a/src/bisheng-langchain/requirements.txt
+++ b/src/bisheng-langchain/requirements.txt
@@ -1,4 +1,4 @@
-langchain==0.2.*
+langchain==0.3.*
 zhipuai
 websocket-client
 elasticsearch
@@ -10,8 +10,8 @@ pydantic
 pymupdf==1.23.8
 shapely==2.0.2
 filetype==1.2.0
-langgraph==0.2.*
-openai==1.51.*
-langchain_openai>=0.1.25
+langgraph==0.3.*
+openai==1.*
+langchain_openai==0.3.*
 llama-index==0.9.48
 bisheng-ragas==1.*
\ No newline at end of file
diff --git a/src/bisheng-langchain/version.txt b/src/bisheng-langchain/version.txt
index 88a730bea..24e56e03c 100644
--- a/src/bisheng-langchain/version.txt
+++ b/src/bisheng-langchain/version.txt
@@ -1 +1 @@
-v0.3.6.dev1
+v1.2.1
\ No newline at end of file

From 9259ec61c6e06644b9045e2e8713924f54c0206a Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Mon, 14 Apr 2025 19:17:12 +0800
Subject: [PATCH 003/186] feat: pydantic v1 upgrade v2

---
 src/backend/bisheng/api/services/assistant.py |  22 ++--
 src/backend/bisheng/api/services/tool.py      | 104 ++++++++++++++++++
 src/backend/bisheng/api/v1/assistant.py       |  87 +++++++++++++--
 src/backend/bisheng/api/v1/base.py            |   8 +-
 src/backend/bisheng/api/v1/endpoints.py       |   3 +-
 .../bisheng/api/v1/schema/chat_schema.py      |  18 +--
 .../bisheng/api/v1/schema/mark_schema.py      |   4 +-
 src/backend/bisheng/api/v1/schemas.py         |  30 ++---
 src/backend/bisheng/api/v1/skillcenter.py     |   6 +-
 src/backend/bisheng/database/constants.py     |   7 ++
 .../bisheng/database/models/assistant.py      |  30 ++---
 .../bisheng/database/models/audit_log.py      |   2 +-
 src/backend/bisheng/database/models/base.py   |  33 +++++-
 .../bisheng/database/models/component.py      |   4 +-
 src/backend/bisheng/database/models/config.py |  17 ++-
 .../bisheng/database/models/dataset.py        |  20 ++--
 .../bisheng/database/models/evaluation.py     |  24 ++--
 .../bisheng/database/models/finetune.py       |  36 +++---
 src/backend/bisheng/database/models/flow.py   |  80 ++++++++------
 .../bisheng/database/models/flow_version.py   |  15 +--
 .../bisheng/database/models/gpts_tools.py     |  97 +++++++++-------
 src/backend/bisheng/database/models/group.py  |  20 ++--
 .../bisheng/database/models/group_resource.py |  24 ++--
 .../bisheng/database/models/knowledge.py      |  30 +++--
 .../bisheng/database/models/knowledge_file.py |  57 +++++-----
 .../bisheng/database/models/llm_server.py     |  33 +++---
 .../bisheng/database/models/mark_app_user.py  |  18 ++-
 .../bisheng/database/models/mark_record.py    |  61 +++++-----
 .../bisheng/database/models/mark_task.py      |  38 +++----
 .../bisheng/database/models/message.py        |  37 +++----
 .../bisheng/database/models/model_deploy.py   |  24 ++--
 .../bisheng/database/models/preset_train.py   |  13 +--
 .../bisheng/database/models/recall_chunk.py   |  33 +++---
 src/backend/bisheng/database/models/report.py |  26 ++---
 src/backend/bisheng/database/models/role.py   |  26 ++---
 .../bisheng/database/models/role_access.py    |  25 ++---
 src/backend/bisheng/database/models/server.py |  22 ++--
 .../bisheng/database/models/session.py        |  10 +-
 .../bisheng/database/models/sft_model.py      |   9 +-
 src/backend/bisheng/database/models/tag.py    |  26 ++---
 .../bisheng/database/models/template.py       |  16 ++-
 src/backend/bisheng/database/models/user.py   |  58 +++++-----
 .../bisheng/database/models/user_group.py     |  27 ++---
 .../bisheng/database/models/user_role.py      |  19 ++--
 .../bisheng/database/models/variable_value.py |  29 +++--
 .../bisheng/field_typing/range_spec.py        |  12 +-
 .../bisheng/interface/custom/schema.py        |   6 -
 .../bisheng/interface/embeddings/custom.py    |   8 +-
 src/backend/bisheng/interface/tools/custom.py |   5 +-
 src/backend/bisheng/mcp_manage/client.py      |  15 ---
 .../bisheng/mcp_manage/clients/__init__.py    |   0
 .../bisheng/mcp_manage/clients/base.py        |  45 ++++++++
 src/backend/bisheng/mcp_manage/clients/sse.py |  30 +++++
 src/backend/bisheng/mcp_manage/manager.py     |  45 ++++++++
 src/backend/bisheng/processing/process.py     |   2 +-
 .../services/database/models/api_key/model.py |   5 +-
 .../services/database/models/flow/model.py    |   4 +-
 src/backend/bisheng/services/settings/auth.py |  31 +-----
 src/backend/bisheng/services/settings/base.py |   7 +-
 src/backend/bisheng/services/store/schema.py  |  29 ++---
 src/backend/bisheng/settings.py               |   7 +-
 src/backend/bisheng/utils/__init__.py         |   9 +-
 src/backend/bisheng/utils/http_middleware.py  |   5 +-
 src/backend/bisheng/utils/util.py             |   9 +-
 src/backend/bisheng/workflow/common/node.py   |   2 +-
 .../bisheng/workflow/graph/graph_state.py     |   2 +-
 .../nodes/condition/conidition_case.py        |   5 +-
 .../workflow/nodes/output/output_fake.py      |   6 +-
 src/backend/pyproject.toml                    |   2 +-
 69 files changed, 954 insertions(+), 665 deletions(-)
 create mode 100644 src/backend/bisheng/api/services/tool.py
 delete mode 100644 src/backend/bisheng/mcp_manage/client.py
 create mode 100644 src/backend/bisheng/mcp_manage/clients/__init__.py
 create mode 100644 src/backend/bisheng/mcp_manage/clients/base.py
 create mode 100644 src/backend/bisheng/mcp_manage/clients/sse.py
 create mode 100644 src/backend/bisheng/mcp_manage/manager.py

diff --git a/src/backend/bisheng/api/services/assistant.py b/src/backend/bisheng/api/services/assistant.py
index 58fb8cb1c..ca48e75b5 100644
--- a/src/backend/bisheng/api/services/assistant.py
+++ b/src/backend/bisheng/api/services/assistant.py
@@ -19,10 +19,11 @@ from bisheng.api.utils import get_request_ip
 from bisheng.api.v1.schemas import (AssistantInfo, AssistantSimpleInfo, AssistantUpdateReq,
                                     StreamData, UnifiedResponseModel, resp_200, resp_500)
 from bisheng.cache import InMemoryCache
+from bisheng.database.constants import ToolPresetType
 from bisheng.database.models.assistant import (Assistant, AssistantDao, AssistantLinkDao,
                                                AssistantStatus)
 from bisheng.database.models.flow import Flow, FlowDao
-from bisheng.database.models.gpts_tools import GptsToolsDao, GptsToolsRead, GptsToolsTypeRead, GptsTools
+from bisheng.database.models.gpts_tools import GptsToolsDao, GptsToolsTypeRead, GptsTools
 from bisheng.database.models.group_resource import GroupResourceDao, GroupResource, ResourceTypeEnum
 from bisheng.database.models.knowledge import KnowledgeDao
 from bisheng.database.models.role_access import AccessType, RoleAccessDao
@@ -368,11 +369,11 @@ class AssistantService(BaseService, AssistantUtils):
         return resp_200()
 
     @classmethod
-    def get_gpts_tools(cls, user: UserPayload, is_preset: Optional[bool] = None) -> List[GptsToolsTypeRead]:
+    def get_gpts_tools(cls, user: UserPayload, is_preset: Optional[int] = None) -> List[GptsToolsTypeRead]:
         """ 获取用户可见的工具列表 """
         # 获取用户可见的工具类别
         tool_type_ids_extra = []
-        if not is_preset:
+        if is_preset != ToolPresetType.PRESET.value:
             # 获取自定义工具列表时，需要包含用户可用的工具列表
             user_role = UserRoleDao.get_user_roles(user.user_id)
             if user_role:
@@ -383,12 +384,13 @@ class AssistantService(BaseService, AssistantUtils):
         # 获取用户可见的所有工具列表
         if is_preset is None:
             all_tool_type = GptsToolsDao.get_user_tool_type(user.user_id, tool_type_ids_extra)
-        elif is_preset:
+        elif is_preset == ToolPresetType.PRESET.value:
             # 获取预置工具列表
             all_tool_type = GptsToolsDao.get_preset_tool_type()
         else:
             # 获取用户可见的自定义工具列表
-            all_tool_type = GptsToolsDao.get_user_tool_type(user.user_id, tool_type_ids_extra, False)
+            all_tool_type = GptsToolsDao.get_user_tool_type(user.user_id, tool_type_ids_extra, False,
+                                                            ToolPresetType(is_preset))
         tool_type_id = [one.id for one in all_tool_type]
         res = []
         tool_type_children = {}
@@ -443,7 +445,7 @@ class AssistantService(BaseService, AssistantUtils):
             one.id = None
             one.user_id = user.user_id
             one.is_delete = 0
-            one.is_preset = False
+            one.is_preset = req.is_preset
 
         # 添加工具类别和对应的 工具列表
         res = GptsToolsDao.insert_tool_type(req)
@@ -496,8 +498,8 @@ class AssistantService(BaseService, AssistantUtils):
         exist_tool_type.api_key = req.api_key
         exist_tool_type.auth_type = req.auth_type
         exist_tool_type.openapi_schema = req.openapi_schema
-        tool_extra = {"api_location":req.api_location,"parameter_name":req.parameter_name}
-        exist_tool_type.extra= json.dumps(tool_extra, ensure_ascii=False)
+        tool_extra = {"api_location": req.api_location, "parameter_name": req.parameter_name}
+        exist_tool_type.extra = json.dumps(tool_extra, ensure_ascii=False)
 
         children_map = {}
         for one in req.children:
@@ -532,7 +534,7 @@ class AssistantService(BaseService, AssistantUtils):
         for one in children_map.values():
             one.id = None
             one.user_id = user.user_id
-            one.is_preset = False
+            one.is_preset = exist_tool_type.is_preset
             one.is_delete = 0
             add_children.append(one)
 
@@ -549,7 +551,7 @@ class AssistantService(BaseService, AssistantUtils):
         exist_tool_type = GptsToolsDao.get_one_tool_type(tool_type_id)
         if not exist_tool_type:
             return resp_200()
-        if exist_tool_type.is_preset:
+        if exist_tool_type.is_preset == ToolPresetType.PRESET.value:
             return ToolTypeIsPresetError.return_resp()
         # 判断是否有更新权限
         if not user.access_check(exist_tool_type.user_id, str(exist_tool_type.id), AccessType.GPTS_TOOL_WRITE):
diff --git a/src/backend/bisheng/api/services/tool.py b/src/backend/bisheng/api/services/tool.py
new file mode 100644
index 000000000..5fface81d
--- /dev/null
+++ b/src/backend/bisheng/api/services/tool.py
@@ -0,0 +1,104 @@
+from fastapi import Request
+from loguru import logger
+from pydantic import BaseModel, ConfigDict
+
+from bisheng.api.services.user_service import UserPayload
+from bisheng.database.constants import ToolPresetType
+from bisheng.database.models.gpts_tools import GptsToolsDao, GptsTools, GptsToolsType
+from bisheng.mcp_manage.constant import McpClientType
+from bisheng.mcp_manage.manager import ClientManager
+from bisheng.utils import md5_hash
+
+
+class ToolServices(BaseModel):
+    """ 工具服务类 """
+    model_config = ConfigDict(arbitrary_types_allowed=True)
+
+    request: Request
+    login_user: UserPayload
+
+    async def refresh_all_mcp(self) -> str:
+        """ return mcp server error msg """
+        # get user all mcp tool
+        tool_types = GptsToolsDao.get_user_tool_type(self.login_user.user_id, is_preset=ToolPresetType.MCP)
+        if not tool_types:
+            return ''
+
+        tools = GptsToolsDao.get_list_by_type(tool_type_ids=[one.id for one in tool_types])
+        tools_map = {}
+        for one in tools:
+            if one.type not in tools_map:
+                tools_map[one.type] = []
+            tools_map[one.type].append(one)
+        error_msg = ''
+        for one in tool_types:
+            try:
+                await self.refresh_mcp_tools(one, tools_map.get(one.id, []))
+            except Exception as e:
+                logger.exception(f'{one.name}刷新工具失败:')
+                error_msg += f'{one.name}工具获取失败，请重试'
+        return error_msg
+
+    async def refresh_mcp_tools(self, tool_type: GptsToolsType, old_tools: list[GptsTools]):
+        """ refresh mcp tools """
+        # 1. get all new tools
+        # 实例化mcp服务对象，获取工具列表
+        client = await ClientManager.connect_mcp(McpClientType.SSE.value, url=tool_type.server_host)
+        tools = await client.list_tools()
+        new_tools = {}
+        for one in tools:
+            tool_key = GptsToolsDao.get_tool_key(tool_type.id, md5_hash(one.name))
+            new_tools[tool_key] = GptsTools(
+                name=one.name,
+                desc=one.description,
+                tool_key=tool_key,
+                is_preset=ToolPresetType.MCP.value,
+                api_params=self.convert_input_schema(one.inputSchema),
+                extra=one.model_dump_json(),
+                type=tool_type.id,
+            )
+
+        # 2. get need add or update or delete tool
+        need_delete_tool = []  # list[int]
+        need_update_tool = []  # list[GptsTools]
+        for one in old_tools:
+            if one.tool_key not in new_tools:
+                # 需要删除的工具
+                logger.info(f'delete mcp tool: {one.name}')
+                need_delete_tool.append(one.id)
+            else:
+                logger.info(f'update mcp tool: {one.name}')
+                one.name = new_tools[one.tool_key].name
+                one.desc = new_tools[one.tool_key].desc
+                one.tool_key = new_tools[one.tool_key].tool_key
+                one.api_params = new_tools[one.tool_key].api_params
+                one.extra = new_tools[one.tool_key].extra
+                need_update_tool.append(one)
+                del new_tools[one.tool_key]
+        need_add_tool = list(new_tools.values())
+
+        # 3. update db
+        if need_delete_tool:
+            GptsToolsDao.delete_tool_by_ids(need_delete_tool)
+        if need_update_tool:
+            GptsToolsDao.update_tool_list(need_update_tool)
+        if need_add_tool:
+            GptsToolsDao.update_tool_list(need_add_tool)
+
+    @classmethod
+    def convert_input_schema(cls, input_schema: dict):
+        """ 转换mcp工具的输入参数 为自定义工具的格式"""
+        required = input_schema.get('required', [])
+        properties = input_schema.get('properties', {})
+        res = []
+        for filed, field_info in properties.items():
+            res.append({
+                'in': "query",
+                'name': filed,
+                'description': field_info.get('description'),
+                'required': filed in required,
+                'schema': {
+                    'type': field_info.get('type'),
+                }
+            })
+        return res
diff --git a/src/backend/bisheng/api/v1/assistant.py b/src/backend/bisheng/api/v1/assistant.py
index 5b8c23fd0..2de3ecf5b 100644
--- a/src/backend/bisheng/api/v1/assistant.py
+++ b/src/backend/bisheng/api/v1/assistant.py
@@ -3,7 +3,6 @@ import json
 from typing import Dict, List, Optional
 
 import yaml
-from bisheng.utils import generate_uuid
 from bisheng_langchain.gpts.tools.api_tools.openapi import OpenApiTools
 from fastapi import (APIRouter, Body, Depends, HTTPException, Query, Request, WebSocket,
                      WebSocketException)
@@ -13,16 +12,21 @@ from fastapi_jwt_auth import AuthJWT
 
 from bisheng.api.services.assistant import AssistantService
 from bisheng.api.services.openapi import OpenApiSchema
+from bisheng.api.services.tool import ToolServices
 from bisheng.api.services.user_service import UserPayload, get_admin_user, get_login_user
-from bisheng.api.utils import get_url_content
-from bisheng.api.v1.schemas import (AssistantCreateReq, AssistantInfo, AssistantUpdateReq,
+from bisheng.api.utils import get_url_content, md5_hash
+from bisheng.api.v1.schemas import (AssistantCreateReq, AssistantUpdateReq,
                                     DeleteToolTypeReq, StreamData, TestToolReq,
-                                    UnifiedResponseModel, resp_200, resp_500)
+                                    resp_200, resp_500)
 from bisheng.cache.redis import redis_client
 from bisheng.chat.manager import ChatManager
 from bisheng.chat.types import WorkType
+from bisheng.database.constants import ToolPresetType
 from bisheng.database.models.assistant import Assistant
 from bisheng.database.models.gpts_tools import GptsTools, GptsToolsTypeRead
+from bisheng.mcp_manage.constant import McpClientType
+from bisheng.mcp_manage.manager import ClientManager
+from bisheng.utils import generate_uuid
 from bisheng.utils.logger import logger
 
 router = APIRouter(prefix='/assistant', tags=['Assistant'])
@@ -188,7 +192,7 @@ async def chat(*,
 
 @router.get('/tool_list')
 def get_tool_list(*,
-                  is_preset: Optional[bool] = None,
+                  is_preset: Optional[int] = None,
                   login_user: UserPayload = Depends(get_login_user)):
     """查询所有可见的tool 列表"""
     return resp_200(AssistantService.get_gpts_tools(login_user, is_preset))
@@ -238,8 +242,7 @@ async def get_tool_schema(*,
             return resp_500(message=f'server中的url必须以http或者https开头: {schema.default_server}')
         tool_type = GptsToolsTypeRead(name=schema.title,
                                       description=schema.description,
-                                      is_preset=0,
-                                      is_delete=0,
+                                      is_preset=ToolPresetType.API.value,
                                       server_host=schema.default_server,
                                       openapi_schema=file_content,
                                       api_location=schema.api_location,
@@ -266,6 +269,74 @@ async def get_tool_schema(*,
         return resp_500(message='openapi schema解析失败：' + str(e))
 
 
+@router.post('/mcp/tool_schema')
+async def get_mcp_tool_schema(login_user: UserPayload = Depends(get_login_user),
+                              file_content: Optional[str] = Body(default=None, embed=True,
+                                                                 description='mcp服务配置内容')):
+    """ 解析mcp的工具配置文件 """
+    try:
+        result = json.loads(file_content)
+        mcp_servers = result.get('mcpServers')
+    except Exception as e:
+        logger.exception(f'mcp tool schema parse error {e}')
+        return resp_500(message=f'mcp工具配置解析失败，请检查内容是否符合json格式: {str(e)}')
+    tool_type = None
+    for key, value in mcp_servers.items():
+        if not value.get('url', None) or not value.get('url').startswith(('http', 'https')):
+            return resp_500(message=f'mcp服务配置中的url必须以http或者https开头: {value.get("url")}')
+        # 解析mcp服务配置
+        tool_type = GptsToolsTypeRead(name=value.get('name'),
+                                      server_host=value.get('url'),
+                                      description=value.get('description'),
+                                      is_preset=ToolPresetType.MCP.value,
+                                      openapi_schema=file_content,
+                                      children=[])
+        # 实例化mcp服务对象，获取工具列表
+        client = await ClientManager.connect_mcp(McpClientType.SSE.value, url=value.get('url'))
+
+        tools = await client.list_tools()
+
+        for one in tools:
+            tool_type.children.append(GptsTools(
+                name=one.name,
+                desc=one.description,
+                tool_key=md5_hash(one.name),
+                is_preset=ToolPresetType.MCP.value,
+                api_params=ToolServices.convert_input_schema(one.inputSchema),
+                extra=one.model_dump_json(),
+            ))
+        break
+    if tool_type is None:
+        return resp_500(message='mcp服务配置解析失败，请检查配置里是否包含了server的url')
+    return resp_200(data=tool_type)
+
+
+@router.post('/mcp/tool_test')
+async def mcp_tool_run(login_user: UserPayload = Depends(get_login_user),
+                       req: TestToolReq = None):
+    """ 测试mcp服务的工具 """
+    try:
+        # 实例化mcp服务对象，获取工具列表
+        client = await ClientManager.connect_mcp(McpClientType.SSE.value, url=req.server_host)
+        extra = json.loads(req.extra)
+        tool_name = extra.get('name')
+        resp = await client.call_tool(tool_name, req.request_params)
+        return resp_200(data=resp)
+    except Exception as e:
+        logger.exception('mcp_tool_run error')
+        return resp_500(message=f'测试请求出错：{str(e)}')
+
+
+@router.post('/mcp/refresh')
+async def refresh_all_mcp_tools(request: Request, login_user: UserPayload = Depends(get_login_user)):
+    """ 刷新用户当前所有的mcp工具列表 """
+    services = ToolServices(request=request, login_user=login_user)
+    error_msg = await services.refresh_all_mcp()
+    if error_msg:
+        return resp_500(message=error_msg)
+    return resp_200(message='刷新成功')
+
+
 @router.post('/tool_list')
 def add_tool_type(*,
                   req: Dict = Body(default={}, description='openapi解析后的工具对象'),
@@ -291,7 +362,7 @@ def delete_tool_type(*, login_user: UserPayload = Depends(get_login_user), req:
 
 
 @router.post('/tool_test')
-async def test_tool_type(*, login_user: UserPayload = Depends(get_login_user), req: TestToolReq):
+async def tool_run(*, login_user: UserPayload = Depends(get_login_user), req: TestToolReq):
     """ 测试自定义工具 """
     extra = json.loads(req.extra)
     extra.update({'api_location': req.api_location, 'parameter_name': req.parameter_name})
diff --git a/src/backend/bisheng/api/v1/base.py b/src/backend/bisheng/api/v1/base.py
index 6d75892e3..7d8e07343 100644
--- a/src/backend/bisheng/api/v1/base.py
+++ b/src/backend/bisheng/api/v1/base.py
@@ -1,7 +1,7 @@
 from bisheng.interface.utils import extract_input_variables_from_prompt
 from bisheng.template.frontend_node.base import FrontendNode
 from langchain.prompts import PromptTemplate
-from pydantic import BaseModel, validator
+from pydantic import field_validator, BaseModel
 
 
 class CacheResponse(BaseModel):
@@ -27,11 +27,13 @@ class CodeValidationResponse(BaseModel):
     imports: dict
     function: dict
 
-    @validator('imports')
+    @field_validator('imports')
+    @classmethod
     def validate_imports(cls, v):
         return v or {'errors': []}
 
-    @validator('function')
+    @field_validator('function')
+    @classmethod
     def validate_function(cls, v):
         return v or {'errors': []}
 
diff --git a/src/backend/bisheng/api/v1/endpoints.py b/src/backend/bisheng/api/v1/endpoints.py
index f26fb8b8c..fc16fba0a 100644
--- a/src/backend/bisheng/api/v1/endpoints.py
+++ b/src/backend/bisheng/api/v1/endpoints.py
@@ -41,7 +41,8 @@ router = APIRouter(tags=['Base'])
 @router.get('/all')
 def get_all():
     """获取所有参数"""
-    return resp_200(get_all_types_dict())
+    all_types = get_all_types_dict()
+    return resp_200(all_types)
 
 
 @router.get('/env')
diff --git a/src/backend/bisheng/api/v1/schema/chat_schema.py b/src/backend/bisheng/api/v1/schema/chat_schema.py
index af7115685..a9ca5f25e 100644
--- a/src/backend/bisheng/api/v1/schema/chat_schema.py
+++ b/src/backend/bisheng/api/v1/schema/chat_schema.py
@@ -12,15 +12,15 @@ class AppChatList(BaseModel):
     flow_id: str
     flow_type: int
     create_time: datetime
-    like_count: Optional[int]
-    dislike_count: Optional[int]
-    copied_count: Optional[int]
-    sensitive_status: Optional[int]  # 敏感词审查状态
-    user_groups: Optional[List[Any]] # 用户所属的分组
-    mark_user: Optional[str]
-    mark_status: Optional[int]
-    mark_id: Optional[int]
-    messages: Optional[List[dict]] # 会话的所有消息列表数据
+    like_count: Optional[int] = None
+    dislike_count: Optional[int] = None
+    copied_count: Optional[int] = None
+    sensitive_status: Optional[int] = None  # 敏感词审查状态
+    user_groups: Optional[List[Any]] = None # 用户所属的分组
+    mark_user: Optional[str] = None
+    mark_status: Optional[int] = None
+    mark_id: Optional[int] = None
+    messages: Optional[List[dict]] = None # 会话的所有消息列表数据
 
 
 class APIAddQAParam(BaseModel):
diff --git a/src/backend/bisheng/api/v1/schema/mark_schema.py b/src/backend/bisheng/api/v1/schema/mark_schema.py
index 76394db99..214b3fce7 100644
--- a/src/backend/bisheng/api/v1/schema/mark_schema.py
+++ b/src/backend/bisheng/api/v1/schema/mark_schema.py
@@ -4,12 +4,12 @@ from pydantic import BaseModel, Field
 
 
 class MarkTaskCreate(BaseModel):
-    app_list: List[str] = Field(max_items=30)
+    app_list: List[str] = Field(max_length=30)
     user_list: List[str]
 
 class MarkData(BaseModel):
     session_id: str
     task_id: int
     status: int
-    flow_type:Optional[int]
+    flow_type:Optional[int] = None
 
diff --git a/src/backend/bisheng/api/v1/schemas.py b/src/backend/bisheng/api/v1/schemas.py
index 76b20a934..b19b20339 100644
--- a/src/backend/bisheng/api/v1/schemas.py
+++ b/src/backend/bisheng/api/v1/schemas.py
@@ -90,7 +90,7 @@ def resp_500(code: int = 500,
 class ProcessResponse(BaseModel):
     """Process response schema."""
 
-    result: Any
+    result: Any = None
     # task: Optional[TaskResponse] = None
     session_id: Optional[str] = None
     backend: Optional[str] = None
@@ -121,7 +121,7 @@ class ChatList(BaseModel):
     create_time: datetime = None
     update_time: datetime = None
     flow_type: int = None
-    latest_message: ChatMessageRead = None
+    latest_message: Optional[ChatMessageRead] = None
     logo: Optional[str] = None
 
 
@@ -180,7 +180,7 @@ class ChatResponse(ChatMessage):
 class FileResponse(ChatMessage):
     """File response schema."""
 
-    data: Any
+    data: Any = None
     data_type: str
     type: str = 'file'
     is_bot: bool = True
@@ -212,9 +212,9 @@ class BuiltResponse(BaseModel):
 class UploadFileResponse(BaseModel):
     """Upload file response schema."""
 
-    flowId: Optional[str]
+    flowId: Optional[str] = None
     file_path: str
-    relative_path: Optional[str]  # minio的相对路径，即object_name
+    relative_path: Optional[str] = None  # minio的相对路径，即object_name
 
 
 class StreamData(BaseModel):
@@ -281,10 +281,10 @@ class AssistantSimpleInfo(BaseModel):
     user_id: int
     user_name: str
     status: int
-    flow_type: Optional[int]
+    flow_type: Optional[int] = None
     write: Optional[bool] = Field(default=False)
-    group_ids: Optional[List[int]]
-    tags: Optional[List[Tag]]
+    group_ids: Optional[List[int]] = None
+    tags: Optional[List[Tag]] = None
     create_time: datetime
     update_time: datetime
 
@@ -395,14 +395,14 @@ class LLMServerInfo(LLMServerBase):
 
 
 class KnowledgeLLMConfig(BaseModel):
-    embedding_model_id: Optional[int] = Field(description='知识库默认embedding模型的ID')
-    source_model_id: Optional[int] = Field(description='知识库溯源模型的ID')
-    extract_title_model_id: Optional[int] = Field(description='文档知识库提取标题模型的ID')
-    qa_similar_model_id: Optional[int] = Field(description='QA知识库相似问模型的ID')
+    embedding_model_id: Optional[int] = Field(None, description='知识库默认embedding模型的ID')
+    source_model_id: Optional[int] = Field(None, description='知识库溯源模型的ID')
+    extract_title_model_id: Optional[int] = Field(None, description='文档知识库提取标题模型的ID')
+    qa_similar_model_id: Optional[int] = Field(None, description='QA知识库相似问模型的ID')
 
 
 class AssistantLLMItem(BaseModel):
-    model_id: Optional[int] = Field(description='模型的ID')
+    model_id: Optional[int] = Field(None, description='模型的ID')
     agent_executor_type: Optional[str] = Field(default='ReAct',
                                                description='执行模式。function call 或者 ReAct')
     knowledge_max_content: Optional[int] = Field(default=15000, description='知识库检索最大字符串数')
@@ -413,11 +413,11 @@ class AssistantLLMItem(BaseModel):
 
 class AssistantLLMConfig(BaseModel):
     llm_list: Optional[List[AssistantLLMItem]] = Field(default=[], description='助手可选的LLM列表')
-    auto_llm: Optional[AssistantLLMItem] = Field(description='助手画像自动优化模型的配置')
+    auto_llm: Optional[AssistantLLMItem] = Field(None, description='助手画像自动优化模型的配置')
 
 
 class EvaluationLLMConfig(BaseModel):
-    model_id: Optional[int] = Field(description='评测功能默认模型的ID')
+    model_id: Optional[int] = Field(None, description='评测功能默认模型的ID')
 
 
 # 文件切分请求基础参数
diff --git a/src/backend/bisheng/api/v1/skillcenter.py b/src/backend/bisheng/api/v1/skillcenter.py
index 88d329449..d68411694 100644
--- a/src/backend/bisheng/api/v1/skillcenter.py
+++ b/src/backend/bisheng/api/v1/skillcenter.py
@@ -68,9 +68,13 @@ def read_template(page_size: Optional[int] = None,
         with session_getter() as session:
             template_session = session.exec(sql)
         templates = template_session.mappings().all()
+        res = []
+        for one in templates:
+            res.append(Template.model_validate(one))
+        return resp_200(res)
+
     except Exception as e:
         raise HTTPException(status_code=500, detail=str(e)) from e
-    return resp_200(templates)
 
 
 @router.post('/template/{id}')
diff --git a/src/backend/bisheng/database/constants.py b/src/backend/bisheng/database/constants.py
index 84708fc2c..515f5a1cb 100644
--- a/src/backend/bisheng/database/constants.py
+++ b/src/backend/bisheng/database/constants.py
@@ -1,5 +1,12 @@
+from enum import Enum
 
 # 默认普通用户角色的ID
 DefaultRole = 2
 # 超级管理员角色ID
 AdminRole = 1
+
+
+class ToolPresetType(Enum):
+    PRESET = 1  # 预置工具
+    API = 0  # 自定义API工具
+    MCP = 2  # mcp类型的工具
diff --git a/src/backend/bisheng/database/models/assistant.py b/src/backend/bisheng/database/models/assistant.py
index 712cc0ec1..02b7fb8f0 100644
--- a/src/backend/bisheng/database/models/assistant.py
+++ b/src/backend/bisheng/database/models/assistant.py
@@ -2,12 +2,13 @@ from datetime import datetime
 from enum import Enum
 from typing import List, Optional, Tuple
 
+from sqlalchemy import JSON, Column, DateTime, Text, and_, func, or_, text
+from sqlmodel import Field, select
+
 from bisheng.database.base import session_getter
 from bisheng.database.models.base import SQLModelSerializable
 from bisheng.database.models.role_access import AccessType, RoleAccess
 from bisheng.utils import generate_uuid
-from sqlalchemy import JSON, Column, DateTime, Text, and_, func, or_, text
-from sqlmodel import Field, select
 
 
 class AssistantStatus(Enum):
@@ -23,33 +24,32 @@ class AssistantBase(SQLModelSerializable):
     system_prompt: str = Field(default='', sa_column=Column(Text), description='系统提示词')
     prompt: str = Field(default='', sa_column=Column(Text), description='用户可见描述词')
     guide_word: Optional[str] = Field(default='', sa_column=Column(Text), description='开场白')
-    guide_question: Optional[List] = Field(sa_column=Column(JSON), description='引导问题')
+    guide_question: Optional[List] = Field(default_factory=list, sa_column=Column(JSON), description='引导问题')
     model_name: str = Field(default='', description='对应模型管理里模型的唯一ID')
     temperature: float = Field(default=0.5, description='模型温度')
     max_token: int = Field(default=32000, description='最大token数')
     status: int = Field(default=AssistantStatus.OFFLINE.value, description='助手是否上线')
     user_id: int = Field(default=0, description='创建用户ID')
     is_delete: int = Field(default=0, description='删除标志')
-    create_time: Optional[datetime] = Field(sa_column=Column(
+    create_time: Optional[datetime] = Field(default=None, sa_column=Column(
         DateTime, nullable=False, index=True, server_default=text('CURRENT_TIMESTAMP')))
-    update_time: Optional[datetime] = Field(
-        sa_column=Column(DateTime,
-                         nullable=False,
-                         server_default=text('CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP')))
+    update_time: Optional[datetime] = Field(default=None,
+                                            sa_column=Column(DateTime,
+                                                             nullable=False,
+                                                             server_default=text(
+                                                                 'CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP')))
 
 
 class AssistantLinkBase(SQLModelSerializable):
-    id: Optional[int] = Field(nullable=False, primary_key=True, description='唯一ID')
-    assistant_id: Optional[str] = Field(index=True, description='助手ID')
+    id: Optional[int] = Field(default=None, nullable=False, primary_key=True, description='唯一ID')
+    assistant_id: Optional[str] = Field(default=0, index=True, description='助手ID')
     tool_id: Optional[int] = Field(default=0, index=True, description='工具ID')
     flow_id: Optional[str] = Field(default='', index=True, description='技能ID')
     knowledge_id: Optional[int] = Field(default=0, index=True, description='知识库ID')
-    create_time: Optional[datetime] = Field(sa_column=Column(
+    create_time: Optional[datetime] = Field(default=None, sa_column=Column(
         DateTime, nullable=False, index=True, server_default=text('CURRENT_TIMESTAMP')))
-    update_time: Optional[datetime] = Field(
-        sa_column=Column(DateTime,
-                         nullable=False,
-                         server_default=text('CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP')))
+    update_time: Optional[datetime] = Field(default=None, sa_column=Column(
+        DateTime, nullable=False, server_default=text('CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP')))
 
 
 class Assistant(AssistantBase, table=True):
diff --git a/src/backend/bisheng/database/models/audit_log.py b/src/backend/bisheng/database/models/audit_log.py
index cf505f1c4..637a47358 100644
--- a/src/backend/bisheng/database/models/audit_log.py
+++ b/src/backend/bisheng/database/models/audit_log.py
@@ -67,7 +67,7 @@ class AuditLogBase(SQLModelSerializable):
     system_id: Optional[str] = Field(index=True, description="系统模块")
     event_type: Optional[str] = Field(index=True, description="操作行为")
     object_type: Optional[str] = Field(index=True, description="操作对象类型")
-    object_id: Optional[int] = Field(index=True, description="操作对象ID")
+    object_id: Optional[str] = Field(index=True, description="操作对象ID")
     object_name: Optional[str] = Field(sa_column=Column(Text), description="操作对象名称")
     note: Optional[str] = Field(sa_column=Column(Text), description="操作备注")
     ip_address: Optional[str] = Field(index=True, description="操作时客户端的IP地址")
diff --git a/src/backend/bisheng/database/models/base.py b/src/backend/bisheng/database/models/base.py
index cdbc94971..bee308e98 100644
--- a/src/backend/bisheng/database/models/base.py
+++ b/src/backend/bisheng/database/models/base.py
@@ -1,7 +1,12 @@
 from datetime import datetime
+from typing import Union, Dict, Any
+
+from sqlmodel.main import IncEx
+from typing_extensions import Literal
 
 import orjson
 from sqlmodel import SQLModel
+from pydantic import ConfigDict
 
 
 def orjson_dumps(v, *, default=None, sort_keys=False, indent_2=True):
@@ -21,9 +26,7 @@ def orjson_dumps(v, *, default=None, sort_keys=False, indent_2=True):
 
 
 class SQLModelSerializable(SQLModel):
-
-    class Config:
-        from_attributes = True
+    model_config = ConfigDict(from_attributes=True)
 
     def to_dict(self):
         result = self.model_dump()
@@ -34,3 +37,27 @@ class SQLModelSerializable(SQLModel):
                 value = value.isoformat()
             result[column] = value
         return result
+
+    def model_dump(
+        self,
+        *,
+        mode: Union[Literal["json", "python"], str] = "json",
+        include: IncEx = None,
+        exclude: IncEx = None,
+        by_alias: bool = False,
+        exclude_unset: bool = False,
+        exclude_defaults: bool = False,
+        exclude_none: bool = False,
+        round_trip: bool = False,
+        warnings: bool = True,
+    ) -> Dict[str, Any]:
+        return super().model_dump(
+            mode=mode,
+            include=include,
+            exclude=exclude,
+            by_alias=by_alias,
+            exclude_unset=exclude_unset,
+            exclude_defaults=exclude_defaults,
+            exclude_none=exclude_none,
+            round_trip=round_trip,
+            warnings=warnings)
diff --git a/src/backend/bisheng/database/models/component.py b/src/backend/bisheng/database/models/component.py
index 3f9a08625..ee2737995 100644
--- a/src/backend/bisheng/database/models/component.py
+++ b/src/backend/bisheng/database/models/component.py
@@ -15,9 +15,9 @@ class ComponentBase(SQLModelSerializable):
     version: str = Field(default='', index=True, description='组件版本')
     user_id: int = Field(default=None, index=True, description='创建人ID')
     user_name: str = Field(default=None, description='创建人姓名')
-    create_time: Optional[datetime] = Field(sa_column=Column(
+    create_time: Optional[datetime] = Field(default=None, sa_column=Column(
         DateTime, nullable=False, index=True, server_default=text('CURRENT_TIMESTAMP')))
-    update_time: Optional[datetime] = Field(sa_column=Column(
+    update_time: Optional[datetime] = Field(default=None, sa_column=Column(
         DateTime, nullable=False, server_default=text('CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP')))
 
 
diff --git a/src/backend/bisheng/database/models/config.py b/src/backend/bisheng/database/models/config.py
index 9c3a404f2..254a286d2 100644
--- a/src/backend/bisheng/database/models/config.py
+++ b/src/backend/bisheng/database/models/config.py
@@ -5,8 +5,8 @@ from typing import Optional
 from sqlalchemy import Column, DateTime, text, Text
 from sqlmodel import Field, select
 
-from bisheng.database.models.base import SQLModelSerializable
 from bisheng.database.base import session_getter
+from bisheng.database.models.base import SQLModelSerializable
 
 
 class ConfigKeyEnum(Enum):
@@ -22,14 +22,11 @@ class ConfigKeyEnum(Enum):
 class ConfigBase(SQLModelSerializable):
     key: str = Field(index=True, unique=True)
     value: str = Field(sa_column=Column(Text))
-    comment: Optional[str] = Field(index=False)
-    create_time: Optional[datetime] = Field(sa_column=Column(
+    comment: Optional[str] = Field(default=None, index=False)
+    create_time: Optional[datetime] = Field(default=None, sa_column=Column(
         DateTime, nullable=False, index=True, server_default=text('CURRENT_TIMESTAMP')))
-    update_time: Optional[datetime] = Field(
-        sa_column=Column(DateTime,
-                         nullable=False,
-                         server_default=text('CURRENT_TIMESTAMP'),
-                         onupdate=text('CURRENT_TIMESTAMP')))
+    update_time: Optional[datetime] = Field(default=None, sa_column=Column(
+        DateTime, nullable=False, server_default=text('CURRENT_TIMESTAMP'), onupdate=text('CURRENT_TIMESTAMP')))
 
 
 class Config(ConfigBase, table=True):
@@ -46,8 +43,8 @@ class ConfigCreate(ConfigBase):
 
 class ConfigUpdate(SQLModelSerializable):
     key: str
-    value: Optional[str]
-    comment: Optional[str]
+    value: Optional[str] = None
+    comment: Optional[str] = None
 
 
 class ConfigDao(ConfigBase):
diff --git a/src/backend/bisheng/database/models/dataset.py b/src/backend/bisheng/database/models/dataset.py
index cf85663a8..c318ed082 100644
--- a/src/backend/bisheng/database/models/dataset.py
+++ b/src/backend/bisheng/database/models/dataset.py
@@ -1,25 +1,23 @@
 from datetime import datetime
 from typing import Any, List, Optional
 
-from bisheng.database.base import session_getter
-from bisheng.database.models.base import SQLModelSerializable
 from sqlalchemy import Column, DateTime, delete, text
 from sqlmodel import Field, select
 
+from bisheng.database.base import session_getter
+from bisheng.database.models.base import SQLModelSerializable
+
 
 class DatasetBase(SQLModelSerializable):
     user_id: Optional[int] = Field(index=True, description='创建用户id')
     name: str = Field(index=True, description='数据集名称')
     type: str = Field(index=False, default=0, description='预留字段')
-    description: Optional[str] = Field(index=False, description='数据集描述')
-    object_name: Optional[str] = Field(index=False, description='数据集S3名称')
-    create_time: Optional[datetime] = Field(
-        sa_column=Column(DateTime, nullable=False, server_default=text('CURRENT_TIMESTAMP')))
-    update_time: Optional[datetime] = Field(
-        sa_column=Column(DateTime,
-                         nullable=True,
-                         server_default=text('CURRENT_TIMESTAMP'),
-                         onupdate=text('CURRENT_TIMESTAMP')))
+    description: Optional[str] = Field(default=None, index=False, description='数据集描述')
+    object_name: Optional[str] = Field(default=None, index=False, description='数据集S3名称')
+    create_time: Optional[datetime] = Field(default=None, sa_column=Column(
+        DateTime, nullable=False, server_default=text('CURRENT_TIMESTAMP')))
+    update_time: Optional[datetime] = Field(default=None, sa_column=Column(
+        DateTime, nullable=True, server_default=text('CURRENT_TIMESTAMP'), onupdate=text('CURRENT_TIMESTAMP')))
 
 
 class Dataset(DatasetBase, table=True):
diff --git a/src/backend/bisheng/database/models/evaluation.py b/src/backend/bisheng/database/models/evaluation.py
index 7e07756d0..df2466e3b 100644
--- a/src/backend/bisheng/database/models/evaluation.py
+++ b/src/backend/bisheng/database/models/evaluation.py
@@ -2,11 +2,12 @@ from datetime import datetime
 from enum import Enum
 from typing import List, Optional, Dict
 
-from bisheng.database.base import session_getter
-from bisheng.database.models.base import SQLModelSerializable
 from sqlalchemy import Column, DateTime, Text, text, func, and_, JSON
 from sqlmodel import Field, select
 
+from bisheng.database.base import session_getter
+from bisheng.database.models.base import SQLModelSerializable
+
 
 class ExecType(Enum):
     FLOW = 'flow'
@@ -29,15 +30,16 @@ class EvaluationBase(SQLModelSerializable):
     status: int = Field(index=True, default=1, description='任务执行状态。1:执行中 2: 执行失败 3:执行成功')
     prompt: str = Field(default='', sa_column=Column(Text), description='评测指令文本')
     result_file_path: str = Field(default='', description='评测结果的 minio 地址')
-    result_score: Optional[Dict] = Field(sa_column=Column(JSON), default=None, description='最终评测分数')
+    result_score: Optional[Dict] = Field(default=None, sa_column=Column(JSON), description='最终评测分数')
     is_delete: int = Field(default=0, description='是否删除')
-    create_time: Optional[datetime] = Field(
-        sa_column=Column(DateTime, nullable=False, server_default=text('CURRENT_TIMESTAMP')))
-    update_time: Optional[datetime] = Field(
-        sa_column=Column(DateTime,
-                         nullable=True,
-                         server_default=text('CURRENT_TIMESTAMP'),
-                         onupdate=text('CURRENT_TIMESTAMP')))
+    create_time: Optional[datetime] = Field(default=None,
+                                            sa_column=Column(DateTime, nullable=False,
+                                                             server_default=text('CURRENT_TIMESTAMP')))
+    update_time: Optional[datetime] = Field(default=None,
+                                            sa_column=Column(DateTime,
+                                                             nullable=True,
+                                                             server_default=text('CURRENT_TIMESTAMP'),
+                                                             onupdate=text('CURRENT_TIMESTAMP')))
 
 
 class Evaluation(EvaluationBase, table=True):
@@ -46,7 +48,7 @@ class Evaluation(EvaluationBase, table=True):
 
 class EvaluationRead(EvaluationBase):
     id: int
-    user_name: Optional[str]
+    user_name: Optional[str] = None
 
 
 class EvaluationCreate(EvaluationBase):
diff --git a/src/backend/bisheng/database/models/finetune.py b/src/backend/bisheng/database/models/finetune.py
index 970ee0db2..f26b14f45 100644
--- a/src/backend/bisheng/database/models/finetune.py
+++ b/src/backend/bisheng/database/models/finetune.py
@@ -2,7 +2,7 @@ from datetime import datetime
 from enum import Enum
 from typing import Any, Dict, List, Optional
 
-from pydantic import BaseModel, validator
+from pydantic import field_validator, BaseModel
 from sqlalchemy.dialects.mysql import LONGTEXT
 from sqlmodel import JSON, Column, DateTime, Field, func, select, text, update
 
@@ -11,7 +11,6 @@ from bisheng.database.models.base import SQLModelSerializable
 from bisheng.utils import generate_uuid
 
 
-
 class TrainMethod(Enum):
     FULL = 'full'
     FREEZE = 'freeze'
@@ -44,17 +43,17 @@ class FinetuneBase(SQLModelSerializable):
     model_name: str = Field(index=True, max_length=50, description='训练模型的名称')
     method: str = Field(default=TrainMethod.FULL.value, nullable=False, max_length=20, description='训练方法')
     extra_params: Dict = Field(sa_column=Column(JSON), description='训练任务所需的额外参数')
-    train_data: Optional[List[Dict]] = Field(sa_column=Column(JSON), description='个人训练数据集信息')
-    preset_data: Optional[List[Dict]] = Field(sa_column=Column(JSON), description='预置训练数据集信息')
+    train_data: Optional[List[Dict]] = Field(default=None, sa_column=Column(JSON), description='个人训练数据集信息')
+    preset_data: Optional[List[Dict]] = Field(default=None, sa_column=Column(JSON), description='预置训练数据集信息')
     status: int = Field(default=FinetuneStatus.TRAINING.value, index=True, description='训练任务的状态')
     reason: Optional[str] = Field(default='', sa_column=Column(LONGTEXT), description='任务失败原因')
     log_path: Optional[str] = Field(default='', max_length=512, description='训练日志在minio上的路径')
-    report: Optional[Dict] = Field(sa_column=Column(JSON), description='训练任务的评估报告数据')
+    report: Optional[Dict] = Field(default=None, sa_column=Column(JSON), description='训练任务的评估报告数据')
     user_id: int = Field(default=None, index=True, description='创建人ID')
     user_name: str = Field(default=None, description='创建人姓名')
-    create_time: Optional[datetime] = Field(sa_column=Column(
+    create_time: Optional[datetime] = Field(default=None, sa_column=Column(
         DateTime, nullable=False, index=True, server_default=text('CURRENT_TIMESTAMP')))
-    update_time: Optional[datetime] = Field(sa_column=Column(
+    update_time: Optional[datetime] = Field(default=None, sa_column=Column(
         DateTime, nullable=False, server_default=text('CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP')))
 
     # 检查训练集数据格式
@@ -69,17 +68,20 @@ class FinetuneBase(SQLModelSerializable):
                 raise ValueError('Finetune.train_data each item must be {name:"",url:"",num:0}')
         return v
 
-    @validator('extra_params')
+    @field_validator('extra_params')
+    @classmethod
     def validate_params(cls, v: Optional[Dict]):
         if v is None or not isinstance(v, dict):
             raise ValueError('Finetune.extra_params must be a valid json')
         return v
 
-    @validator('train_data')
+    @field_validator('train_data')
+    @classmethod
     def validate_train_data(cls, v: Optional[Dict]):
         return cls.validate_train(v)
 
-    @validator('preset_data')
+    @field_validator('preset_data')
+    @classmethod
     def validate_preset_data(cls, v: Optional[Dict]):
         return cls.validate_train(v)
 
@@ -89,10 +91,10 @@ class Finetune(FinetuneBase, table=True):
 
 
 class FinetuneList(BaseModel):
-    server: Optional[int] = Field(description='关联的RT服务ID')
-    server_name: Optional[str] = Field(description='关联的RT服务名称')
-    status: Optional[List[int]] = Field(description='训练任务的状态')
-    model_name: Optional[str] = Field(description='模型名称, 模糊搜索')
+    server: Optional[int] = Field(None, description='关联的RT服务ID')
+    server_name: Optional[str] = Field(None, description='关联的RT服务名称')
+    status: Optional[List[int]] = Field(None, description='训练任务的状态')
+    model_name: Optional[str] = Field(None, description='模型名称, 模糊搜索')
     page: Optional[int] = Field(default=1, description='页码')
     limit: Optional[int] = Field(default=10, description='每页条数')
 
@@ -111,7 +113,8 @@ class FinetuneExtraParams(BaseModel):
     max_seq_len: int = Field(8192, gt=0, description='最大序列长度')
     cpu_load: str = Field('false', description='是否cpu载入')
 
-    @validator('per_device_train_batch_size')
+    @field_validator('per_device_train_batch_size')
+    @classmethod
     def validate_batch_size(cls, v: str):
         try:
             batch_size = int(v)
@@ -122,7 +125,8 @@ class FinetuneExtraParams(BaseModel):
         except Exception as e:
             raise ValueError(f'per_device_train_batch_size must be an integer {e}')
 
-    @validator('gpus')
+    @field_validator('gpus')
+    @classmethod
     def validate_gpus(cls, v: str):
         try:
             gpu_list = v.split(',')
diff --git a/src/backend/bisheng/database/models/flow.py b/src/backend/bisheng/database/models/flow.py
index 8c2ef9589..b255fbdc6 100644
--- a/src/backend/bisheng/database/models/flow.py
+++ b/src/backend/bisheng/database/models/flow.py
@@ -4,48 +4,49 @@ from datetime import datetime
 from enum import Enum
 from typing import Dict, List, Optional, Tuple, Union
 
-from bisheng.utils import generate_uuid
-from pydantic import validator
+from pydantic import field_validator
 from sqlalchemy import Column, DateTime, String, and_, func, or_, text
 from sqlmodel import JSON, Field, select, update
 
 from bisheng.database.base import session_getter
+from bisheng.database.models.assistant import Assistant
 from bisheng.database.models.base import SQLModelSerializable
 from bisheng.database.models.role_access import AccessType, RoleAccess, RoleAccessDao
 from bisheng.database.models.user_role import UserRoleDao
-from bisheng.database.models.assistant import Assistant
-# if TYPE_CHECKING:
+from bisheng.utils import generate_uuid
 
 
+# if TYPE_CHECKING:
+
 
 class FlowStatus(Enum):
     OFFLINE = 1
     ONLINE = 2
 
+
 class FlowType(Enum):
     FLOW = 1
     ASSISTANT = 5
     WORKFLOW = 10
 
+
 class FlowBase(SQLModelSerializable):
     name: str = Field(index=True)
-    user_id: Optional[int] = Field(index=True)
-    description: Optional[str] = Field(index=False)
+    user_id: Optional[int] = Field(default=None, index=True)
+    description: Optional[str] = Field(default=None, index=False)
     data: Optional[Dict] = Field(default=None)
-    logo: Optional[str] = Field(index=False)
+    logo: Optional[str] = Field(default=None, index=False)
     status: Optional[int] = Field(index=False, default=1)
     flow_type: Optional[int] = Field(index=False, default=1)
-    update_time: Optional[datetime] = Field(
-        sa_column=Column(DateTime,
-                         nullable=True,
-                         server_default=text('CURRENT_TIMESTAMP'),
-                         onupdate=text('CURRENT_TIMESTAMP')))
-    create_time: Optional[datetime] = Field(sa_column=Column(
+    guide_word: Optional[str] = Field(default=None, sa_column=Column(String(length=1000)))
+    update_time: Optional[datetime] = Field(default=None, sa_column=Column(
+        DateTime, nullable=True, server_default=text('CURRENT_TIMESTAMP'), onupdate=text('CURRENT_TIMESTAMP')))
+    create_time: Optional[datetime] = Field(default=None, sa_column=Column(
         DateTime, nullable=False, index=True, server_default=text('CURRENT_TIMESTAMP')))
-    guide_word: Optional[str] = Field(sa_column=Column(String(length=1000)))
 
-    @validator('data')
-    def validate_json(v):
+    @field_validator('data', mode='before')
+    @classmethod
+    def validate_json(cls, v):
         if not v:
             return v
         if not isinstance(v, dict):
@@ -66,13 +67,13 @@ class Flow(FlowBase, table=True):
 
 
 class FlowCreate(FlowBase):
-    flow_id: Optional[str]
+    flow_id: Optional[str] = None
 
 
 class FlowRead(FlowBase):
     id: str
-    user_name: Optional[str]
-    version_id: Optional[int]
+    user_name: Optional[str] = None
+    version_id: Optional[int] = None
 
 
 class FlowReadWithStyle(FlowRead):
@@ -92,7 +93,7 @@ class FlowUpdate(SQLModelSerializable):
 class FlowDao(FlowBase):
 
     @classmethod
-    def create_flow(cls, flow_info: Flow,flow_type: Optional[int]) -> Flow:
+    def create_flow(cls, flow_info: Flow, flow_type: Optional[int]) -> Flow:
         from bisheng.database.models.flow_version import FlowVersion
         with session_getter() as session:
             session.add(flow_info)
@@ -185,12 +186,13 @@ class FlowDao(FlowBase):
 
     @classmethod
     def get_flows(cls, user_id: Optional[int], extra_ids: Union[List[str], str], name: str,
-                  status: Optional[int] = None, flow_ids: List[str] = None, page: int = 0, limit: int = 0,flow_type:Optional[int]= None) \
+                  status: Optional[int] = None, flow_ids: List[str] = None, page: int = 0, limit: int = 0,
+                  flow_type: Optional[int] = None) \
             -> List[Flow]:
         with session_getter() as session:
             # data 数据量太大，对mysql 有影响
             statement = select(Flow.id, Flow.user_id, Flow.name, Flow.status, Flow.create_time,
-                               Flow.logo, Flow.update_time, Flow.description, Flow.guide_word,Flow.flow_type)
+                               Flow.logo, Flow.update_time, Flow.description, Flow.guide_word, Flow.flow_type)
             if extra_ids and isinstance(extra_ids, List):
                 statement = statement.where(or_(Flow.id.in_(extra_ids), Flow.user_id == user_id))
             elif not extra_ids:
@@ -201,7 +203,7 @@ class FlowDao(FlowBase):
             if status is not None:
                 statement = statement.where(Flow.status == status)
             if flow_type is not None:
-                statement = statement.where(Flow.flow_type== flow_type)
+                statement = statement.where(Flow.flow_type == flow_type)
             if flow_ids:
                 statement = statement.where(Flow.id.in_(flow_ids))
             statement = statement.order_by(Flow.update_time.desc())
@@ -218,7 +220,7 @@ class FlowDao(FlowBase):
                     name: str,
                     status: Optional[int] = None,
                     flow_ids: List[str] = None,
-                    flow_type:Optional[int]= None) -> int:
+                    flow_type: Optional[int] = None) -> int:
         with session_getter() as session:
             count_statement = session.query(func.count(Flow.id))
             if extra_ids and isinstance(extra_ids, List):
@@ -230,7 +232,7 @@ class FlowDao(FlowBase):
                 count_statement = count_statement.filter(
                     or_(Flow.name.like(f'%{name}%'), Flow.description.like(f'%{name}%')))
             if flow_type is not None:
-                count_statement= count_statement.where(Flow.flow_type== flow_type)
+                count_statement = count_statement.where(Flow.flow_type == flow_type)
             if flow_ids:
                 count_statement = count_statement.filter(Flow.id.in_(flow_ids))
             if status is not None:
@@ -238,7 +240,8 @@ class FlowDao(FlowBase):
             return count_statement.scalar()
 
     @classmethod
-    def get_all_online_flows(cls, keyword: str = None, flow_ids: List[str] = None,flow_type:int=FlowType.FLOW.value) -> List[Flow]:
+    def get_all_online_flows(cls, keyword: str = None, flow_ids: List[str] = None,
+                             flow_type: int = FlowType.FLOW.value) -> List[Flow]:
         with session_getter() as session:
             statement = select(Flow.id, Flow.user_id, Flow.name, Flow.status, Flow.create_time,
                                Flow.logo, Flow.update_time, Flow.description,
@@ -258,7 +261,7 @@ class FlowDao(FlowBase):
                                      limit: int = 0,
                                      keyword: str = None,
                                      flow_ids: List[str] = None,
-                                     flow_type:int=FlowType.FLOW.value) -> List[Flow]:
+                                     flow_type: int = FlowType.FLOW.value) -> List[Flow]:
         user_role = UserRoleDao.get_user_roles(user_id)
         flow_id_extra = []
         if user_role:
@@ -276,10 +279,11 @@ class FlowDao(FlowBase):
                                  FlowStatus.ONLINE.value,
                                  flow_ids=flow_ids,
                                  page=page,
-                                 limit=limit,flow_type=flow_type)
+                                 limit=limit, flow_type=flow_type)
 
     @classmethod
-    def filter_flows_by_ids(cls, flow_ids: List[str], keyword: str = None, page: int = 0, limit: int = 0,flow_type:int=FlowType.FLOW.value) \
+    def filter_flows_by_ids(cls, flow_ids: List[str], keyword: str = None, page: int = 0, limit: int = 0,
+                            flow_type: int = FlowType.FLOW.value) \
             -> (List[Flow], int):
         """
         通过技能ID过滤技能列表，只返回简略信息，不包含data
@@ -297,7 +301,7 @@ class FlowDao(FlowBase):
                 or_(Flow.name.like(f'%{keyword}%'), Flow.description.like(f'%{keyword}%')))
         if page and limit:
             statement = statement.offset((page - 1) * limit).limit(limit)
-        statement = statement.where(Flow.flow_type==flow_type)
+        statement = statement.where(Flow.flow_type == flow_type)
         statement = statement.order_by(Flow.update_time.desc())
         with session_getter() as session:
             result = session.exec(statement).mappings().all()
@@ -315,10 +319,15 @@ class FlowDao(FlowBase):
     def get_all_apps(cls, name: str = None, status: int = None, id_list: list = None, flow_type: int = None,
                      user_id: int = None, id_extra: list = None, page: int = 0, limit: int = 0) -> (List[Dict], int):
         """ 获取所有的应用 包含技能、助手、工作流 """
-        sub_query = select(Flow.id, Flow.name, Flow.description, Flow.flow_type, Flow.logo, Flow.user_id, Flow.status, Flow.create_time, Flow.update_time).union_all(
-            select(Assistant.id, Assistant.name, Assistant.desc, FlowType.ASSISTANT.value, Assistant.logo, Assistant.user_id, Assistant.status, Assistant.create_time, Assistant.update_time).where(Assistant.is_delete==0)).subquery()
+        sub_query = select(Flow.id, Flow.name, Flow.description, Flow.flow_type, Flow.logo, Flow.user_id, Flow.status,
+                           Flow.create_time, Flow.update_time).union_all(
+            select(Assistant.id, Assistant.name, Assistant.desc, FlowType.ASSISTANT.value, Assistant.logo,
+                   Assistant.user_id, Assistant.status, Assistant.create_time, Assistant.update_time).where(
+                Assistant.is_delete == 0)).subquery()
 
-        statement = select(sub_query.c.id, sub_query.c.name, sub_query.c.description, sub_query.c.flow_type, sub_query.c.logo, sub_query.c.user_id, sub_query.c.status, sub_query.c.create_time, sub_query.c.update_time)
+        statement = select(sub_query.c.id, sub_query.c.name, sub_query.c.description, sub_query.c.flow_type,
+                           sub_query.c.logo, sub_query.c.user_id, sub_query.c.status, sub_query.c.create_time,
+                           sub_query.c.update_time)
         count_statement = select(func.count(sub_query.c.id))
         if name:
             statement = statement.where(sub_query.c.name.like(f'%{name}%'))
@@ -335,7 +344,8 @@ class FlowDao(FlowBase):
         if user_id is not None:
             if id_extra:
                 statement = statement.where(or_(sub_query.c.user_id == user_id, sub_query.c.id.in_(id_extra)))
-                count_statement = count_statement.where(or_(sub_query.c.user_id == user_id, sub_query.c.id.in_(id_extra)))
+                count_statement = count_statement.where(
+                    or_(sub_query.c.user_id == user_id, sub_query.c.id.in_(id_extra)))
             else:
                 statement = statement.where(sub_query.c.user_id == user_id)
                 count_statement = count_statement.where(sub_query.c.user_id == user_id)
@@ -344,7 +354,7 @@ class FlowDao(FlowBase):
         statement = statement.order_by(sub_query.c.update_time.desc())
         with (session_getter() as session):
             ret = session.exec(statement).all()
-            total =  session.scalar(count_statement)
+            total = session.scalar(count_statement)
         data = []
         for one in ret:
             data.append({
diff --git a/src/backend/bisheng/database/models/flow_version.py b/src/backend/bisheng/database/models/flow_version.py
index 88b4fe3e8..25ac43036 100644
--- a/src/backend/bisheng/database/models/flow_version.py
+++ b/src/backend/bisheng/database/models/flow_version.py
@@ -8,7 +8,7 @@ from sqlalchemy import func
 from bisheng.database.base import session_getter
 from bisheng.database.models.base import SQLModelSerializable
 # if TYPE_CHECKING:
-from pydantic import validator
+from pydantic import field_validator
 from sqlmodel import JSON, Field, select, update, text, Column, DateTime
 
 from bisheng.database.models.flow import Flow
@@ -19,19 +19,20 @@ class FlowVersionBase(SQLModelSerializable):
     flow_id: str = Field(index=True, max_length=32, description="所属的技能ID")
     name: str = Field(index=True, description="版本的名字")
     data: Optional[Dict] = Field(default=None, description="版本的数据")
-    description: Optional[str] = Field(index=False, description="版本的描述")
-    user_id: Optional[int] = Field(index=True, description="创建者")
+    description: Optional[str] = Field(default=None, index=False, description="版本的描述")
+    user_id: Optional[int] = Field(default=None, index=True, description="创建者")
     flow_type: Optional[int] = Field(default=1, description="版本的类型")
     is_current: Optional[int] = Field(default=0, description="是否为正在使用版本")
     is_delete: Optional[int] = Field(default=0, description="是否删除")
     original_version_id: Optional[int] = Field(default=None, description="来源版本的ID")
-    create_time: Optional[datetime] = Field(sa_column=Column(
+    create_time: Optional[datetime] = Field(default=None, sa_column=Column(
         DateTime, nullable=False, index=True, server_default=text('CURRENT_TIMESTAMP')))
-    update_time: Optional[datetime] = Field(sa_column=Column(
+    update_time: Optional[datetime] = Field(default=None, sa_column=Column(
         DateTime, nullable=False, server_default=text('CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP')))
 
-    @validator('data')
-    def validate_json(v):
+    @field_validator('data')
+    @classmethod
+    def validate_json(cls, v):
         # dict_keys(['description', 'name', 'id', 'data'])
         if not v:
             return v
diff --git a/src/backend/bisheng/database/models/gpts_tools.py b/src/backend/bisheng/database/models/gpts_tools.py
index 0e38037e1..0a8c711cf 100644
--- a/src/backend/bisheng/database/models/gpts_tools.py
+++ b/src/backend/bisheng/database/models/gpts_tools.py
@@ -2,11 +2,13 @@ from datetime import datetime
 from enum import Enum
 from typing import Dict, List, Optional
 
-from bisheng.database.base import session_getter
-from bisheng.database.models.base import SQLModelSerializable
 from sqlalchemy import JSON, Column, DateTime, String, text, func
 from sqlmodel import Field, or_, select, Text, update
 
+from bisheng.database.base import session_getter
+from bisheng.database.constants import ToolPresetType
+from bisheng.database.models.base import SQLModelSerializable
+
 
 class AuthMethod(Enum):
     NO = 0
@@ -16,30 +18,31 @@ class AuthMethod(Enum):
 class AuthType(Enum):
     BASIC = "basic"
     BEARER = "bearer"
-    CUSTOM= "custom"
+    CUSTOM = "custom"
 
 
 class GptsToolsBase(SQLModelSerializable):
     name: str = Field(sa_column=Column(String(length=125), index=True))
-    logo: Optional[str] = Field(sa_column=Column(String(length=512), index=False))
-    desc: Optional[str] = Field(sa_column=Column(String(length=2048), index=False))
+    logo: Optional[str] = Field(default=None, sa_column=Column(String(length=512), index=False))
+    desc: Optional[str] = Field(default=None, sa_column=Column(String(length=2048), index=False))
     tool_key: str = Field(sa_column=Column(String(length=125), index=False))
     type: int = Field(default=0, description='所属类别的ID')
-    is_preset: bool = Field(default=True)
+    is_preset: int = Field(default=ToolPresetType.API.value, description="工具的类别，历史原因字段就不改名了")
     is_delete: int = Field(default=0, description='1 表示逻辑删除')
-    api_params: Optional[List[Dict]] = Field(sa_column=Column(JSON), description='用来存储api参数等信息')
-    user_id: Optional[int] = Field(index=True, description='创建用户ID， null表示系统创建')
-    create_time: Optional[datetime] = Field(
-        sa_column=Column(DateTime, nullable=False, server_default=text('CURRENT_TIMESTAMP')))
-    update_time: Optional[datetime] = Field(
-        sa_column=Column(DateTime,
-                         nullable=False,
-                         server_default=text('CURRENT_TIMESTAMP'),
-                         onupdate=text('CURRENT_TIMESTAMP')))
+    api_params: Optional[List[Dict]] = Field(default=None, sa_column=Column(JSON), description='用来存储api参数等信息')
+    user_id: Optional[int] = Field(default=None, index=True, description='创建用户ID， null表示系统创建')
+    create_time: Optional[datetime] = Field(default=None,
+                                            sa_column=Column(DateTime, nullable=False,
+                                                             server_default=text('CURRENT_TIMESTAMP')))
+    update_time: Optional[datetime] = Field(default=None,
+                                            sa_column=Column(DateTime,
+                                                             nullable=False,
+                                                             server_default=text('CURRENT_TIMESTAMP'),
+                                                             onupdate=text('CURRENT_TIMESTAMP')))
 
 
 class GptsToolsTypeBase(SQLModelSerializable):
-    id: Optional[int] = Field(index=True, primary_key=True)
+    id: Optional[int] = Field(default=None, index=True, primary_key=True)
     name: str = Field(default='', index=True, description="工具类别名字")
     logo: Optional[str] = Field(default='', description="工具类别的logo文件地址")
     extra: Optional[str] = Field(default='', sa_column=Column(String(length=2048)),
@@ -47,23 +50,25 @@ class GptsToolsTypeBase(SQLModelSerializable):
     description: str = Field(default='', description="工具类别的描述")
     server_host: Optional[str] = Field(default='', description="自定义工具的访问根地址，必须以http或者https开头")
     auth_method: Optional[int] = Field(default=0, description="工具类别的鉴权方式")
-    api_key: Optional[str] = Field(default='', description="工具鉴权的api_key",sa_column=Column(String(length=2048)),max_length=1000)
+    api_key: Optional[str] = Field(default='', description="工具鉴权的api_key", sa_column=Column(String(length=2048)),
+                                   max_length=1000)
     auth_type: Optional[str] = Field(default=AuthType.BASIC.value, description="工具鉴权的鉴权方式")
-    is_preset: Optional[int] = Field(default=0, description="是否是预置工具类别")
-    user_id: Optional[int] = Field(index=True, description='创建用户ID， null表示系统创建')
+    is_preset: Optional[int] = Field(default=ToolPresetType.API.value, description="工具的类别，历史原因字段就不改名了")
+    user_id: Optional[int] = Field(default=None, index=True, description='创建用户ID， null表示系统创建')
     is_delete: int = Field(default=0, description='1 表示逻辑删除')
-    create_time: Optional[datetime] = Field(
-        sa_column=Column(DateTime, nullable=False, server_default=text('CURRENT_TIMESTAMP')))
-    update_time: Optional[datetime] = Field(
-        sa_column=Column(DateTime,
-                         nullable=False,
-                         server_default=text('CURRENT_TIMESTAMP'),
-                         onupdate=text('CURRENT_TIMESTAMP')))
+    create_time: Optional[datetime] = Field(default=None,
+                                            sa_column=Column(DateTime, nullable=False,
+                                                             server_default=text('CURRENT_TIMESTAMP')))
+    update_time: Optional[datetime] = Field(default=None,
+                                            sa_column=Column(DateTime,
+                                                             nullable=False,
+                                                             server_default=text('CURRENT_TIMESTAMP'),
+                                                             onupdate=text('CURRENT_TIMESTAMP')))
 
 
 class GptsTools(GptsToolsBase, table=True):
     __tablename__ = 't_gpts_tools'
-    extra: Optional[str] = Field(sa_column=Column(String(length=2048), index=False),
+    extra: Optional[str] = Field(default=None, sa_column=Column(String(length=2048), index=False),
                                  description='用来存储额外信息，比如参数需求等，包含 &initdb_conf_key 字段'
                                              '表示配置信息从系统配置里获取,多层级用.隔开')
     id: Optional[int] = Field(default=None, primary_key=True)
@@ -77,7 +82,7 @@ class GptsToolsType(GptsToolsTypeBase, table=True):
 
 class GptsToolsTypeRead(GptsToolsTypeBase):
     openapi_schema: Optional[str] = Field(default="", description="工具类别的schema内容，符合openapi规范的数据")
-    children: Optional[List[GptsTools]] = Field(default=[], description="工具类别下的工具列表")
+    children: Optional[List[GptsTools]] = Field(default=list, description="工具类别下的工具列表")
     parameter_name: Optional[str] = Field(default="", description="自定义请求头参数名")
     api_location: Optional[str] = Field(default="", description="自定义请求头参数位置 header or query")
 
@@ -110,11 +115,26 @@ class GptsToolsDao(GptsToolsBase):
             session.refresh(data)
             return data
 
+    @classmethod
+    def update_tool_list(cls, data: List[GptsTools]) -> List[GptsTools]:
+        with session_getter() as session:
+            for one in data:
+                session.add(one)
+            session.commit()
+            return data
+
     @classmethod
     def delete_tool(cls, data: GptsTools) -> GptsTools:
         data.is_delete = 1
         return cls.update_tools(data)
 
+    @classmethod
+    def delete_tool_by_ids(cls, tool_ids: List[int]) -> None:
+        with session_getter() as session:
+            statement = update(GptsTools).where(GptsTools.id.in_(tool_ids)).values(is_delete=1)
+            session.exec(statement)
+            session.commit()
+
     @classmethod
     def get_one_tool(cls, tool_id: int) -> GptsTools:
         with session_getter() as session:
@@ -135,7 +155,7 @@ class GptsToolsDao(GptsToolsBase):
         with session_getter() as session:
             statement = select(GptsTools).where(
                 or_(GptsTools.user_id == user_id,
-                    GptsTools.is_preset == 1)).where(GptsTools.is_delete == 0)
+                    GptsTools.is_preset == ToolPresetType.PRESET.value)).where(GptsTools.is_delete == 0)
             if page and page_size:
                 statement = statement.offset((page - 1) * page_size).limit(page_size)
             statement = statement.order_by(GptsTools.create_time.desc())
@@ -171,12 +191,13 @@ class GptsToolsDao(GptsToolsBase):
         获得所有的预置工具类别
         """
         with session_getter() as session:
-            statement = select(GptsToolsType).where(GptsToolsType.is_preset == 1, GptsToolsType.is_delete == 0)
+            statement = select(GptsToolsType).where(GptsToolsType.is_preset == ToolPresetType.PRESET.value,
+                                                    GptsToolsType.is_delete == 0)
             return session.exec(statement).all()
 
     @classmethod
-    def get_user_tool_type(cls, user_id: int, extra_tool_type_ids: List[int], include_preset: bool = True) \
-            -> List[GptsToolsType]:
+    def get_user_tool_type(cls, user_id: int, extra_tool_type_ids: List[int] = None, include_preset: bool = True,
+                           is_preset: ToolPresetType = None) -> List[GptsToolsType]:
         """
         获取用户可见的所有工具类别
         """
@@ -190,7 +211,9 @@ class GptsToolsDao(GptsToolsBase):
         else:
             filters.append(GptsToolsType.user_id == user_id)
         if include_preset:
-            filters.append(GptsToolsType.is_preset == 1)
+            filters.append(GptsToolsType.is_preset == ToolPresetType.PRESET.value)
+        if is_preset is not None:
+            statement = statement.where(GptsToolsType.is_preset == is_preset.value)
         statement = statement.where(or_(*filters))
         with session_getter() as session:
             return session.exec(statement).all()
@@ -204,8 +227,8 @@ class GptsToolsDao(GptsToolsBase):
         statement = select(GptsToolsType).where(GptsToolsType.is_delete == 0)
         count_statement = select(func.count(GptsToolsType.id)).where(GptsToolsType.is_delete == 0)
         if not include_preset:
-            statement = statement.where(GptsToolsType.is_preset == 0)
-            count_statement = count_statement.where(GptsToolsType.is_preset == 0)
+            statement = statement.where(GptsToolsType.is_preset != ToolPresetType.PRESET.value)
+            count_statement = count_statement.where(GptsToolsType.is_preset != ToolPresetType.PRESET.value)
 
         if tool_type_ids:
             statement = statement.where(GptsToolsType.id.in_(tool_type_ids))
@@ -313,13 +336,13 @@ class GptsToolsDao(GptsToolsBase):
             session.exec(
                 update(GptsToolsType).filter(
                     GptsToolsType.id == tool_type_id,
-                    GptsToolsType.is_preset == 0,
+                    GptsToolsType.is_preset != ToolPresetType.PRESET.value,
                 ).values(is_delete=1)
             )
             session.exec(
                 update(GptsTools).filter(
                     GptsTools.type == tool_type_id,
-                    GptsToolsType.is_preset == False
+                    GptsToolsType.is_preset != ToolPresetType.PRESET.value
                 ).values(is_delete=1)
             )
             session.commit()
diff --git a/src/backend/bisheng/database/models/group.py b/src/backend/bisheng/database/models/group.py
index 926628ef2..bb7e3f79f 100644
--- a/src/backend/bisheng/database/models/group.py
+++ b/src/backend/bisheng/database/models/group.py
@@ -12,12 +12,12 @@ DefaultGroup = 2
 
 class GroupBase(SQLModelSerializable):
     group_name: str = Field(index=False, description='前端展示名称', unique=True)
-    remark: Optional[str] = Field(index=False)
-    create_user: Optional[int] = Field(index=True, description="创建用户的ID")
-    update_user: Optional[int] = Field(description="更新用户的ID")
-    create_time: Optional[datetime] = Field(sa_column=Column(
+    remark: Optional[str] = Field(default=None, index=False)
+    create_user: Optional[int] = Field(default=None, index=True, description="创建用户的ID")
+    update_user: Optional[int] = Field(default=None, description="更新用户的ID")
+    create_time: Optional[datetime] = Field(default=None, sa_column=Column(
         DateTime, nullable=False, index=True, server_default=text('CURRENT_TIMESTAMP')))
-    update_time: Optional[datetime] = Field(
+    update_time: Optional[datetime] = Field(default=None,
         sa_column=Column(DateTime,
                          nullable=False,
                          server_default=text('CURRENT_TIMESTAMP'),
@@ -30,17 +30,17 @@ class Group(GroupBase, table=True):
 
 
 class GroupRead(GroupBase):
-    id: Optional[int]
-    group_admins: Optional[List[Dict]]
+    id: Optional[int] = None
+    group_admins: Optional[List[Dict]] = None
 
 
 class GroupUpdate(GroupBase):
-    role_name: Optional[str]
-    remark: Optional[str]
+    role_name: Optional[str] = None
+    remark: Optional[str] = None
 
 
 class GroupCreate(GroupBase):
-    group_admins: Optional[List[int]]
+    group_admins: Optional[List[int]] = None
 
 
 class GroupDao(GroupBase):
diff --git a/src/backend/bisheng/database/models/group_resource.py b/src/backend/bisheng/database/models/group_resource.py
index 5a2902690..4c014ed93 100644
--- a/src/backend/bisheng/database/models/group_resource.py
+++ b/src/backend/bisheng/database/models/group_resource.py
@@ -2,31 +2,29 @@ from datetime import datetime
 from enum import Enum
 from typing import Dict, List, Optional
 
-from bisheng.database.base import session_getter
-from bisheng.database.models.base import SQLModelSerializable
 from sqlalchemy import Column, DateTime, text, delete
 from sqlmodel import Field, select
 
+from bisheng.database.base import session_getter
+from bisheng.database.models.base import SQLModelSerializable
+
 
 class ResourceTypeEnum(Enum):
     KNOWLEDGE = 1
     FLOW = 2
     ASSISTANT = 3
     GPTS_TOOL = 4
-    WORK_FLOW= 5
+    WORK_FLOW = 5
 
 
 class GroupResourceBase(SQLModelSerializable):
     group_id: str = Field(index=True)
     third_id: str = Field(index=False)
     type: int = Field(index=False, description='资源类别 1:知识库 2:技能 3:助手 4:工具 5:工作流')
-    create_time: Optional[datetime] = Field(sa_column=Column(
+    create_time: Optional[datetime] = Field(default=None, sa_column=Column(
         DateTime, nullable=False, index=True, server_default=text('CURRENT_TIMESTAMP')))
-    update_time: Optional[datetime] = Field(
-        sa_column=Column(DateTime,
-                         nullable=False,
-                         server_default=text('CURRENT_TIMESTAMP'),
-                         onupdate=text('CURRENT_TIMESTAMP')))
+    update_time: Optional[datetime] = Field(default=None, sa_column=Column(
+        DateTime, nullable=False, server_default=text('CURRENT_TIMESTAMP'), onupdate=text('CURRENT_TIMESTAMP')))
 
 
 class GroupResource(GroupResourceBase, table=True):
@@ -34,13 +32,13 @@ class GroupResource(GroupResourceBase, table=True):
 
 
 class GroupResourceRead(GroupResourceBase):
-    id: Optional[int]
-    group_admins: Optional[List[Dict]]
+    id: Optional[int] = None
+    group_admins: Optional[List[Dict]] = None
 
 
 class GroupResourceUpdate(GroupResourceBase):
-    role_name: Optional[str]
-    remark: Optional[str]
+    role_name: Optional[str] = None
+    remark: Optional[str] = None
 
 
 class GroupResourceCreate(GroupResourceBase):
diff --git a/src/backend/bisheng/database/models/knowledge.py b/src/backend/bisheng/database/models/knowledge.py
index 0f25aeb7e..c164efba2 100644
--- a/src/backend/bisheng/database/models/knowledge.py
+++ b/src/backend/bisheng/database/models/knowledge.py
@@ -14,28 +14,24 @@ from bisheng.database.models.user import UserDao
 from bisheng.database.models.user_role import UserRoleDao
 
 
-
 class KnowledgeTypeEnum(Enum):
     QA = 1
     NORMAL = 0
 
 
 class KnowledgeBase(SQLModelSerializable):
-    user_id: Optional[int] = Field(index=True)
+    user_id: Optional[int] = Field(default=None, index=True)
     name: str = Field(index=True, min_length=1, max_length=30, description='知识库名, 最少一个字符，最多30个字符')
     type: int = Field(index=False, default=0, description='0 为普通知识库，1 为QA知识库')
-    description: Optional[str] = Field(index=True)
-    model: Optional[str] = Field(index=False)
-    collection_name: Optional[str] = Field(index=False)
-    index_name: Optional[str] = Field(index=False)
+    description: Optional[str] = Field(default=None, index=True)
+    model: Optional[str] = Field(default=None, index=False)
+    collection_name: Optional[str] = Field(default=None, index=False)
+    index_name: Optional[str] = Field(default=None, index=False)
     state: Optional[int] = Field(index=False, default=1, description='0 为未发布，1 为已发布, 2 为复制中')
-    create_time: Optional[datetime] = Field(
-        sa_column=Column(DateTime, nullable=False, server_default=text('CURRENT_TIMESTAMP')))
-    update_time: Optional[datetime] = Field(
-        sa_column=Column(DateTime,
-                         nullable=True,
-                         server_default=text('CURRENT_TIMESTAMP'),
-                         onupdate=text('CURRENT_TIMESTAMP')))
+    create_time: Optional[datetime] = Field(default=None, sa_column=Column(
+        DateTime, nullable=False, server_default=text('CURRENT_TIMESTAMP')))
+    update_time: Optional[datetime] = Field(default=None, sa_column=Column(
+        DateTime, nullable=True, server_default=text('CURRENT_TIMESTAMP'), onupdate=text('CURRENT_TIMESTAMP')))
 
 
 class Knowledge(KnowledgeBase, table=True):
@@ -44,14 +40,14 @@ class Knowledge(KnowledgeBase, table=True):
 
 class KnowledgeRead(KnowledgeBase):
     id: int
-    user_name: Optional[str]
-    copiable: Optional[bool]
+    user_name: Optional[str] = None
+    copiable: Optional[bool] = None
 
 
 class KnowledgeUpdate(BaseModel):
     knowledge_id: int
-    name: Optional[str]
-    description: Optional[str]
+    name: Optional[str] = None
+    description: Optional[str] = None
 
 
 class KnowledgeCreate(KnowledgeBase):
diff --git a/src/backend/bisheng/database/models/knowledge_file.py b/src/backend/bisheng/database/models/knowledge_file.py
index 9455e2cee..8823f237a 100644
--- a/src/backend/bisheng/database/models/knowledge_file.py
+++ b/src/backend/bisheng/database/models/knowledge_file.py
@@ -3,13 +3,14 @@ from datetime import datetime
 from enum import Enum
 from typing import List, Optional
 
-from bisheng.database.base import session_getter
-from bisheng.database.models.base import SQLModelSerializable
 # if TYPE_CHECKING:
-from pydantic import validator
+from pydantic import field_validator
 from sqlalchemy import JSON, Column, DateTime, String, or_, text
 from sqlmodel import Field, delete, func, select
 
+from bisheng.database.base import session_getter
+from bisheng.database.models.base import SQLModelSerializable
+
 
 class KnowledgeFileStatus(Enum):
     PROCESSING = 1
@@ -23,10 +24,10 @@ class ParseType(Enum):
 
 
 class KnowledgeFileBase(SQLModelSerializable):
-    user_id: Optional[int] = Field(index=True)
+    user_id: Optional[int] = Field(default=None, index=True)
     knowledge_id: int = Field(index=True)
     file_name: str = Field(index=True)
-    md5: Optional[str] = Field(index=False)
+    md5: Optional[str] = Field(default=None, index=False)
     parse_type: Optional[str] = Field(default=ParseType.LOCAL.value,
                                       index=False,
                                       description='采用什么模式解析的文件')
@@ -35,37 +36,32 @@ class KnowledgeFileBase(SQLModelSerializable):
     status: Optional[int] = Field(default=KnowledgeFileStatus.PROCESSING.value,
                                   index=False,
                                   description='1: 解析中；2: 解析成功；3: 解析失败')
-    object_name: Optional[str] = Field(index=False, description='文件在minio存储的对象名称')
-    extra_meta: Optional[str] = Field(index=False)
+    object_name: Optional[str] = Field(default=None, index=False, description='文件在minio存储的对象名称')
+    extra_meta: Optional[str] = Field(default=None, index=False)
     remark: Optional[str] = Field(default='', sa_column=Column(String(length=512)))
-    create_time: Optional[datetime] = Field(
-        sa_column=Column(DateTime, nullable=False, server_default=text('CURRENT_TIMESTAMP')))
-    update_time: Optional[datetime] = Field(
-        sa_column=Column(DateTime,
-                         nullable=False,
-                         server_default=text('CURRENT_TIMESTAMP'),
-                         onupdate=text('CURRENT_TIMESTAMP')))
+    create_time: Optional[datetime] = Field(default=None, sa_column=Column(
+        DateTime, nullable=False, server_default=text('CURRENT_TIMESTAMP')))
+    update_time: Optional[datetime] = Field(default=None, sa_column=Column(
+        DateTime, nullable=False, server_default=text('CURRENT_TIMESTAMP'), onupdate=text('CURRENT_TIMESTAMP')))
 
 
 class QAKnowledgeBase(SQLModelSerializable):
-    user_id: Optional[int] = Field(index=True)
+    user_id: Optional[int] = Field(default=None, index=True)
     knowledge_id: int = Field(index=True)
     questions: List[str] = Field(index=False)
     answers: str = Field(index=False)
-    source: Optional[int] = Field(index=False, description='0: 未知 1: 手动；2: 审计, 3: api')
-    status: Optional[int] = Field(index=False, description='1: 解析中；2: 解析成功；3: 解析失败')
-    extra_meta: Optional[str] = Field(index=False)
-    remark: Optional[str] = Field(sa_column=Column(String(length=512)))
-    create_time: Optional[datetime] = Field(
-        sa_column=Column(DateTime, nullable=False, server_default=text('CURRENT_TIMESTAMP')))
-    update_time: Optional[datetime] = Field(
-        sa_column=Column(DateTime,
-                         nullable=False,
-                         server_default=text('CURRENT_TIMESTAMP'),
-                         onupdate=text('CURRENT_TIMESTAMP')))
+    source: Optional[int] = Field(default=0, index=False, description='0: 未知 1: 手动；2: 审计, 3: api')
+    status: Optional[int] = Field(default=1, index=False, description='1: 解析中；2: 解析成功；3: 解析失败')
+    extra_meta: Optional[str] = Field(default=None, index=False)
+    remark: Optional[str] = Field(default=None, sa_column=Column(String(length=512)))
+    create_time: Optional[datetime] = Field(default=None, sa_column=Column(
+        DateTime, nullable=False, server_default=text('CURRENT_TIMESTAMP')))
+    update_time: Optional[datetime] = Field(default=None, sa_column=Column(
+        DateTime, nullable=False, server_default=text('CURRENT_TIMESTAMP'), onupdate=text('CURRENT_TIMESTAMP')))
 
-    @validator('questions')
-    def validate_json(v):
+    @field_validator('questions')
+    @classmethod
+    def validate_json(cls, v):
         # dict_keys(['description', 'name', 'id', 'data'])
         if not v:
             return v
@@ -74,8 +70,9 @@ class QAKnowledgeBase(SQLModelSerializable):
 
         return v
 
-    @validator('answers')
-    def validate_answer(v):
+    @field_validator('answers')
+    @classmethod
+    def validate_answer(cls, v):
         # dict_keys(['description', 'name', 'id', 'data'])
         if not v:
             return v
diff --git a/src/backend/bisheng/database/models/llm_server.py b/src/backend/bisheng/database/models/llm_server.py
index b14b4f46a..97a667d4a 100644
--- a/src/backend/bisheng/database/models/llm_server.py
+++ b/src/backend/bisheng/database/models/llm_server.py
@@ -2,11 +2,12 @@ from datetime import datetime
 from enum import Enum
 from typing import Dict, List, Optional
 
-from bisheng.database.base import session_getter
-from bisheng.database.models.base import SQLModelSerializable
 from sqlalchemy import CHAR, JSON, Column, DateTime, Text, UniqueConstraint, delete, text, update
 from sqlmodel import Field, select
 
+from bisheng.database.base import session_getter
+from bisheng.database.models.base import SQLModelSerializable
+
 
 # 服务提供方枚举
 class LLMServerType(Enum):
@@ -39,46 +40,42 @@ class LLMServerBase(SQLModelSerializable):
     type: str = Field(sa_column=Column(CHAR(20)), description='服务提供方类型')
     limit_flag: bool = Field(default=False, description='是否开启每日调用次数限制')
     limit: int = Field(default=0, description='每日调用次数限制')
-    config: Optional[Dict] = Field(sa_column=Column(JSON), description='服务提供方公共配置')
+    config: Optional[Dict] = Field(default=dict, sa_column=Column(JSON), description='服务提供方公共配置')
     user_id: int = Field(default=0, description='创建人ID')
-    create_time: Optional[datetime] = Field(sa_column=Column(
+    create_time: Optional[datetime] = Field(default=None, sa_column=Column(
         DateTime, nullable=False, index=True, server_default=text('CURRENT_TIMESTAMP')))
-    update_time: Optional[datetime] = Field(
-        sa_column=Column(DateTime,
-                         nullable=False,
-                         server_default=text('CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP')))
+    update_time: Optional[datetime] = Field(default=None, sa_column=Column(
+        DateTime, nullable=False, server_default=text('CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP')))
 
 
 class LLMModelBase(SQLModelSerializable):
-    server_id: Optional[int] = Field(nullable=False, index=True, description='服务ID')
+    server_id: Optional[int] = Field(default=None, nullable=False, index=True, description='服务ID')
     name: str = Field(default='', description='模型展示名')
     description: Optional[str] = Field(default='', sa_column=Column(Text), description='模型描述')
     model_name: str = Field(default='', description='模型名称，实例化组件时用的参数')
     model_type: str = Field(sa_column=Column(CHAR(20)), description='模型类型')
-    config: Optional[Dict] = Field(sa_column=Column(JSON), description='服务提供方公共配置')
+    config: Optional[Dict] = Field(default=dict, sa_column=Column(JSON), description='服务提供方公共配置')
     status: int = Field(default=2, description='模型状态。0：正常，1：异常, 2: 未知')
     remark: Optional[str] = Field(default='', sa_column=Column(Text), description='异常原因')
     online: bool = Field(default=True, description='是否在线')
     user_id: int = Field(default=0, description='创建人ID')
-    create_time: Optional[datetime] = Field(sa_column=Column(
+    create_time: Optional[datetime] = Field(default=None, sa_column=Column(
         DateTime, nullable=False, index=True, server_default=text('CURRENT_TIMESTAMP')))
-    update_time: Optional[datetime] = Field(
-        sa_column=Column(DateTime,
-                         nullable=False,
-                         server_default=text('CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP')))
+    update_time: Optional[datetime] = Field(default=None, sa_column=Column(
+        DateTime, nullable=False, server_default=text('CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP')))
 
 
 class LLMServer(LLMServerBase, table=True):
     __tablename__ = 'llm_server'
 
-    id: Optional[int] = Field(nullable=False, primary_key=True, description='服务唯一ID')
+    id: Optional[int] = Field(default=None, nullable=False, primary_key=True, description='服务唯一ID')
 
 
 class LLMModel(LLMModelBase, table=True):
     __tablename__ = 'llm_model'
-    __table_args__ = (UniqueConstraint('server_id', 'model_name', name='server_model_uniq'), )
+    __table_args__ = (UniqueConstraint('server_id', 'model_name', name='server_model_uniq'),)
 
-    id: Optional[int] = Field(nullable=False, primary_key=True, description='模型唯一ID')
+    id: Optional[int] = Field(default=None, nullable=False, primary_key=True, description='模型唯一ID')
 
 
 class LLMDao:
diff --git a/src/backend/bisheng/database/models/mark_app_user.py b/src/backend/bisheng/database/models/mark_app_user.py
index 6c5e52323..3d1295d32 100644
--- a/src/backend/bisheng/database/models/mark_app_user.py
+++ b/src/backend/bisheng/database/models/mark_app_user.py
@@ -1,12 +1,12 @@
 from datetime import datetime
 from typing import List, Optional
 
-from bisheng.database.base import session_getter
-from bisheng.database.models.base import SQLModelSerializable
 # if TYPE_CHECKING:
 from sqlalchemy import Column, DateTime, text
 from sqlmodel import Field
 
+from bisheng.database.base import session_getter
+from bisheng.database.models.base import SQLModelSerializable
 
 
 class MarkAppUserBase(SQLModelSerializable):
@@ -15,20 +15,16 @@ class MarkAppUserBase(SQLModelSerializable):
     task_id: int = Field(index=True)
     create_id: int = Field(index=True)
     status: Optional[int] = Field(index=False, default=1)
-    update_time: Optional[datetime] = Field(
-        sa_column=Column(DateTime,
-                         nullable=True,
-                         server_default=text('CURRENT_TIMESTAMP'),
-                         onupdate=text('CURRENT_TIMESTAMP')))
-    create_time: Optional[datetime] = Field(sa_column=Column(
+    update_time: Optional[datetime] = Field(default=None, sa_column=Column(
+        DateTime, nullable=True, server_default=text('CURRENT_TIMESTAMP'), onupdate=text('CURRENT_TIMESTAMP')))
+    create_time: Optional[datetime] = Field(default=None, sa_column=Column(
         DateTime, nullable=False, index=True, server_default=text('CURRENT_TIMESTAMP')))
 
 
-class MarkAppUser(MarkAppUserBase,table=True):
+class MarkAppUser(MarkAppUserBase, table=True):
     id: Optional[int] = Field(default=None, primary_key=True)
 
 
-
 class MarkAppUserDao(MarkAppUserBase):
 
     @classmethod
@@ -36,4 +32,4 @@ class MarkAppUserDao(MarkAppUserBase):
         with session_getter() as session:
             session.add_all(task_info)
             session.commit()
-            return task_info 
+            return task_info
diff --git a/src/backend/bisheng/database/models/mark_record.py b/src/backend/bisheng/database/models/mark_record.py
index dedf79430..d8738f0c6 100644
--- a/src/backend/bisheng/database/models/mark_record.py
+++ b/src/backend/bisheng/database/models/mark_record.py
@@ -1,16 +1,13 @@
-
 from datetime import datetime
 from enum import Enum
-from typing import Dict, List, Optional, Tuple, Union
+from typing import List, Optional
+
+# if TYPE_CHECKING:
+from sqlalchemy import Column, DateTime, delete, text
+from sqlmodel import Field, select
 
 from bisheng.database.base import session_getter
 from bisheng.database.models.base import SQLModelSerializable
-from bisheng.database.models.role_access import AccessType, RoleAccess, RoleAccessDao
-from bisheng.database.models.user_role import UserRoleDao
-# if TYPE_CHECKING:
-from pydantic import validator
-from sqlalchemy import Column, DateTime, String, and_, delete, func, or_, text
-from sqlmodel import JSON, Field, select, update
 
 
 class MarkRecordStatus(Enum):
@@ -27,23 +24,18 @@ class MarkRecordBase(SQLModelSerializable):
     task_id: int = Field(index=True)
     session_id: str = Field(index=True)
     status: int = Field(index=False, default=1)
-    update_time: Optional[datetime] = Field(
-        sa_column=Column(DateTime,
-                         nullable=True,
-                         server_default=text('CURRENT_TIMESTAMP'),
-                         onupdate=text('CURRENT_TIMESTAMP')))
-    create_time: Optional[datetime] = Field(sa_column=Column(
+    update_time: Optional[datetime] = Field(default=None, sa_column=Column(
+        DateTime, nullable=True, server_default=text('CURRENT_TIMESTAMP'), onupdate=text('CURRENT_TIMESTAMP')))
+    create_time: Optional[datetime] = Field(default=None, sa_column=Column(
         DateTime, nullable=False, index=True, server_default=text('CURRENT_TIMESTAMP')))
 
 
-class MarkRecord(MarkRecordBase,table=True):
+class MarkRecord(MarkRecordBase, table=True):
     id: Optional[int] = Field(default=None, primary_key=True)
 
 
-
 class MarkRecordDao(MarkRecordBase):
 
-
     @classmethod
     def update_record(cls, record_info: MarkRecord) -> MarkRecord:
         with session_getter() as session:
@@ -53,26 +45,24 @@ class MarkRecordDao(MarkRecordBase):
             return record_info
 
     @classmethod
-    def get_prev_task(cls,user_id:int,task_id:int):
+    def get_prev_task(cls, user_id: int, task_id: int):
         with session_getter() as session:
-            statement = select(MarkRecord).where(MarkRecord.create_id==user_id).where(MarkRecord.task_id==task_id).order_by(MarkRecord.id)
+            statement = select(MarkRecord).where(MarkRecord.create_id == user_id).where(
+                MarkRecord.task_id == task_id).order_by(MarkRecord.id)
             return session.exec(statement).all()
 
-
-
     @classmethod
     def create_record(cls, record_info: MarkRecord) -> MarkRecord:
         with session_getter() as session:
             session.add(record_info)
             session.commit()
             session.refresh(record_info)
-            return record_info 
-
+            return record_info
 
     @classmethod
-    def del_record(cls,task_id:int):
+    def del_record(cls, task_id: int):
         with session_getter() as session:
-            st = delete(MarkRecord).where(MarkRecord.task_id==task_id)
+            st = delete(MarkRecord).where(MarkRecord.task_id == task_id)
             session.exec(st)
             session.commit()
             return
@@ -86,29 +76,30 @@ class MarkRecordDao(MarkRecordBase):
             return
 
     @classmethod
-    def get_list_by_taskid(cls,task_id:int):
+    def get_list_by_taskid(cls, task_id: int):
         with session_getter() as session:
-            statement = select(MarkRecord).where(MarkRecord.task_id==task_id)
+            statement = select(MarkRecord).where(MarkRecord.task_id == task_id)
             return session.exec(statement).all()
 
     @classmethod
-    def get_count(cls,task_id:int):
+    def get_count(cls, task_id: int):
         with session_getter() as session:
-            sql = text("select create_user,count(*) as user_count,create_id from markrecord where task_id=:task_id group by create_id")
-            query = session.execute(sql,{"task_id":task_id}).fetchall()
+            sql = text(
+                "select create_user,count(*) as user_count,create_id from markrecord where task_id=:task_id group by create_id")
+            query = session.execute(sql, {"task_id": task_id}).fetchall()
             return query
 
-
     @classmethod
-    def get_record(cls,task_id:int,session_id:str) -> MarkRecord:
+    def get_record(cls, task_id: int, session_id: str) -> MarkRecord:
 
         with session_getter() as session:
-            statement = select(MarkRecord).where(MarkRecord.task_id==task_id).where(MarkRecord.session_id==session_id)
+            statement = select(MarkRecord).where(MarkRecord.task_id == task_id).where(
+                MarkRecord.session_id == session_id)
             return session.exec(statement).first()
 
-
     @classmethod
-    def filter_records(cls, task_id: int, chat_ids: list[str] = None, status: int = None, mark_user: int = None) -> List[MarkRecord]:
+    def filter_records(cls, task_id: int, chat_ids: list[str] = None, status: int = None, mark_user: int = None) -> \
+            List[MarkRecord]:
         statement = select(MarkRecord).where(MarkRecord.task_id == task_id)
         if chat_ids:
             statement = statement.where(MarkRecord.session_id.in_(chat_ids))
diff --git a/src/backend/bisheng/database/models/mark_task.py b/src/backend/bisheng/database/models/mark_task.py
index 4e09a8804..3263e5f42 100644
--- a/src/backend/bisheng/database/models/mark_task.py
+++ b/src/backend/bisheng/database/models/mark_task.py
@@ -2,12 +2,13 @@ from datetime import datetime
 from enum import Enum
 from typing import List, Optional
 
-from bisheng.database.base import session_getter
-from bisheng.database.models.base import SQLModelSerializable
 # if TYPE_CHECKING:
 from sqlalchemy import Column, DateTime, and_, delete, func, or_, text
 from sqlmodel import Field, select, update
 
+from bisheng.database.base import session_getter
+from bisheng.database.models.base import SQLModelSerializable
+
 
 class MarkTaskStatus(Enum):
     DEFAULT = 1
@@ -20,14 +21,11 @@ class MarkTaskBase(SQLModelSerializable):
     create_id: int = Field(index=True)
     app_id: str = Field(index=False, max_length=2048)
     process_users: str = Field(index=False)  # 23,2323
-    mark_user: Optional[str] = Field(index=True, nullable=True)
+    mark_user: Optional[str] = Field(default=None, index=True, nullable=True)
     status: Optional[int] = Field(index=False, default=1)
-    update_time: Optional[datetime] = Field(
-        sa_column=Column(DateTime,
-                         nullable=True,
-                         server_default=text('CURRENT_TIMESTAMP'),
-                         onupdate=text('CURRENT_TIMESTAMP')))
-    create_time: Optional[datetime] = Field(sa_column=Column(
+    update_time: Optional[datetime] = Field(default=None, sa_column=Column(
+        DateTime, nullable=True, server_default=text('CURRENT_TIMESTAMP'), onupdate=text('CURRENT_TIMESTAMP')))
+    create_time: Optional[datetime] = Field(default=None, sa_column=Column(
         DateTime, nullable=False, index=True, server_default=text('CURRENT_TIMESTAMP')))
 
 
@@ -36,8 +34,8 @@ class MarkTask(MarkTaskBase, table=True):
 
 
 class MarkTaskRead(MarkTaskBase):
-    id: Optional[int]
-    mark_process: Optional[List[str]]
+    id: Optional[int] = None
+    mark_process: Optional[List[str]] = None
 
 
 class MarkTaskDao(MarkTaskBase):
@@ -84,9 +82,9 @@ class MarkTaskDao(MarkTaskBase):
 
     @classmethod
     def get_all_task(
-        cls,
-        page_size: int = 10,
-        page_num: int = 1,
+            cls,
+            page_size: int = 10,
+            page_num: int = 1,
     ):
         with session_getter() as session:
             statement = select(MarkTask)
@@ -98,12 +96,12 @@ class MarkTaskDao(MarkTaskBase):
 
     @classmethod
     def get_task_list(
-        cls,
-        status: int,
-        create_id: Optional[int],
-        user_id: Optional[int],
-        page_size: int = 10,
-        page_num: int = 1,
+            cls,
+            status: int,
+            create_id: Optional[int],
+            user_id: Optional[int],
+            page_size: int = 10,
+            page_num: int = 1,
     ):
         with session_getter() as session:
             statement = select(MarkTask)
diff --git a/src/backend/bisheng/database/models/message.py b/src/backend/bisheng/database/models/message.py
index d5d830559..37659ab69 100644
--- a/src/backend/bisheng/database/models/message.py
+++ b/src/backend/bisheng/database/models/message.py
@@ -18,35 +18,32 @@ class LikedType(Enum):
 
 class MessageBase(SQLModelSerializable):
     is_bot: bool = Field(index=False, description='聊天角色')
-    source: Optional[int] = Field(index=False, description='是否支持溯源')
+    source: Optional[int] = Field(default=None, index=False, description='是否支持溯源')
     mark_status: Optional[int] = Field(index=False, default=1, description='标记状态')
-    mark_user: Optional[int] = Field(index=False, description='标记用户')
-    mark_user_name: Optional[str] = Field(index=False, description='标记用户')
-    message: Optional[str] = Field(sa_column=Column(Text), description='聊天消息')
-    extra: Optional[str] = Field(sa_column=Column(String(length=4096)), description='连接信息等')
+    mark_user: Optional[int] = Field(default=None, index=False, description='标记用户')
+    mark_user_name: Optional[str] = Field(default=None, index=False, description='标记用户')
+    message: Optional[str] = Field(default=None, sa_column=Column(Text), description='聊天消息')
+    extra: Optional[str] = Field(default=None, sa_column=Column(String(length=4096)), description='连接信息等')
     type: str = Field(index=False, description='消息类型')
     category: str = Field(index=False, max_length=32, description='消息类别， question等')
     flow_id: str = Field(index=True, description='对应的技能id')
-    chat_id: Optional[str] = Field(index=True, description='chat_id, 前端生成')
-    user_id: Optional[str] = Field(index=True, description='用户id')
+    chat_id: Optional[str] = Field(default=None, index=True, description='chat_id, 前端生成')
+    user_id: Optional[int] = Field(default=None, index=True, description='用户id')
     liked: Optional[int] = Field(index=False, default=0, description='用户是否喜欢 0未评价/1 喜欢/2 不喜欢')
     solved: Optional[int] = Field(index=False, default=0, description='用户是否喜欢 0未评价/1 解决/2 未解决')
     copied: Optional[int] = Field(index=False, default=0, description='用户是否复制 0：未复制 1：已复制')
     sensitive_status: Optional[int] = Field(index=False, default=1, description='敏感词状态 1：通过 2：违规')
     sender: Optional[str] = Field(index=False, default='', description='autogen 的发送方')
     receiver: Optional[Dict] = Field(index=False, default=None, description='autogen 的发送方')
-    intermediate_steps: Optional[str] = Field(sa_column=Column(Text), description='过程日志')
-    files: Optional[str] = Field(sa_column=Column(String(length=4096)), description='上传的文件等')
-    remark: Optional[str] = Field(sa_column=Column(String(length=4096)),
+    intermediate_steps: Optional[str] = Field(default=None, sa_column=Column(Text), description='过程日志')
+    files: Optional[str] = Field(default=None, sa_column=Column(String(length=4096)), description='上传的文件等')
+    remark: Optional[str] = Field(default=None, sa_column=Column(String(length=4096)),
                                   description='备注。break_answer: 中断的回复不作为history传给模型')
-    create_time: Optional[datetime] = Field(
-        sa_column=Column(DateTime, nullable=False, server_default=text('CURRENT_TIMESTAMP')))
-    update_time: Optional[datetime] = Field(
-        sa_column=Column(DateTime,
-                         nullable=False,
-                         index=True,
-                         server_default=text('CURRENT_TIMESTAMP'),
-                         onupdate=text('CURRENT_TIMESTAMP')))
+    create_time: Optional[datetime] = Field(default=None, sa_column=Column(
+        DateTime, nullable=False, server_default=text('CURRENT_TIMESTAMP')))
+    update_time: Optional[datetime] = Field(default=None, sa_column=Column(
+        DateTime, nullable=False, index=True, server_default=text('CURRENT_TIMESTAMP'),
+        onupdate=text('CURRENT_TIMESTAMP')))
 
 
 class ChatMessage(MessageBase, table=True):
@@ -55,11 +52,11 @@ class ChatMessage(MessageBase, table=True):
 
 
 class ChatMessageRead(MessageBase):
-    id: Optional[int]
+    id: Optional[int] = None
 
 
 class ChatMessageQuery(BaseModel):
-    id: Optional[int]
+    id: Optional[int] = None
     flow_id: str
     chat_id: str
 
diff --git a/src/backend/bisheng/database/models/model_deploy.py b/src/backend/bisheng/database/models/model_deploy.py
index fac3364f0..40025ad68 100644
--- a/src/backend/bisheng/database/models/model_deploy.py
+++ b/src/backend/bisheng/database/models/model_deploy.py
@@ -1,28 +1,26 @@
 from datetime import datetime
 from typing import Optional, List
 
-from bisheng.database.base import session_getter
-from bisheng.database.models.base import SQLModelSerializable
 from sqlalchemy import Column, DateTime, String, UniqueConstraint, delete, text
 from sqlmodel import Field, select
 
+from bisheng.database.base import session_getter
+from bisheng.database.models.base import SQLModelSerializable
+
 
 class ModelDeployBase(SQLModelSerializable):
     endpoint: str = Field(index=False, unique=False)
     server: str = Field(index=True)
     model: str = Field(index=False)
-    config: Optional[str] = Field(sa_column=Column(String(length=512)))
-    status: Optional[str] = Field(index=False)
-    remark: Optional[str] = Field(sa_column=Column(String(length=4096)))
+    config: Optional[str] = Field(default=None, sa_column=Column(String(length=512)))
+    status: Optional[str] = Field(default=None, index=False)
+    remark: Optional[str] = Field(default=None, sa_column=Column(String(length=4096)))
 
-    create_time: Optional[datetime] = Field(
-        sa_column=Column(DateTime, nullable=False, server_default=text('CURRENT_TIMESTAMP')))
-    update_time: Optional[datetime] = Field(
-        sa_column=Column(DateTime,
-                         nullable=False,
-                         index=True,
-                         server_default=text('CURRENT_TIMESTAMP'),
-                         onupdate=text('CURRENT_TIMESTAMP')))
+    create_time: Optional[datetime] = Field(default=None, sa_column=Column(
+        DateTime, nullable=False, server_default=text('CURRENT_TIMESTAMP')))
+    update_time: Optional[datetime] = Field(default=None, sa_column=Column(
+        DateTime, nullable=False, index=True, server_default=text('CURRENT_TIMESTAMP'),
+        onupdate=text('CURRENT_TIMESTAMP')))
 
 
 class ModelDeploy(ModelDeployBase, table=True):
diff --git a/src/backend/bisheng/database/models/preset_train.py b/src/backend/bisheng/database/models/preset_train.py
index 6f96b74f2..1f9ee242d 100644
--- a/src/backend/bisheng/database/models/preset_train.py
+++ b/src/backend/bisheng/database/models/preset_train.py
@@ -1,11 +1,12 @@
 from datetime import datetime
 from typing import List, Optional, Tuple
 
+from sqlalchemy import func
+from sqlmodel import Column, DateTime, Field, select, text
+
 from bisheng.database.base import session_getter
 from bisheng.database.models.base import SQLModelSerializable
 from bisheng.utils import generate_uuid
-from sqlalchemy import func
-from sqlmodel import Column, DateTime, Field, select, text
 
 
 # Finetune任务的预置训练集
@@ -16,12 +17,10 @@ class PresetTrainBase(SQLModelSerializable):
     user_id: str = Field(default='', index=True, description='创建人ID')
     user_name: str = Field(default='', index=True, description='创建人姓名')
     type: int = Field(default=0, index=True, description='0 文件 1 QA')
-    create_time: Optional[datetime] = Field(sa_column=Column(
+    create_time: Optional[datetime] = Field(default=None, sa_column=Column(
         DateTime, nullable=False, index=True, server_default=text('CURRENT_TIMESTAMP')))
-    update_time: Optional[datetime] = Field(
-        sa_column=Column(DateTime,
-                         nullable=False,
-                         server_default=text('CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP')))
+    update_time: Optional[datetime] = Field(default=None, sa_column=Column(
+        DateTime, nullable=False, server_default=text('CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP')))
 
 
 class PresetTrain(PresetTrainBase, table=True):
diff --git a/src/backend/bisheng/database/models/recall_chunk.py b/src/backend/bisheng/database/models/recall_chunk.py
index 2e2d7efae..6046ab98e 100644
--- a/src/backend/bisheng/database/models/recall_chunk.py
+++ b/src/backend/bisheng/database/models/recall_chunk.py
@@ -1,27 +1,24 @@
 from datetime import datetime
 from typing import Optional
 
-from bisheng.database.models.base import SQLModelSerializable
 from sqlalchemy import Column, DateTime, Text, text
 from sqlmodel import Field
 
+from bisheng.database.models.base import SQLModelSerializable
+
 
 class RecallBase(SQLModelSerializable):
-    message_id: Optional[int] = Field(index=True, unique=False)
+    message_id: Optional[int] = Field(default=None, index=True, unique=False)
     chat_id: str = Field(index=False)
     keywords: str = Field(sa_column=Column(Text))
-    chunk: Optional[str] = Field(sa_column=Column(Text))
-    meta_data: Optional[str] = Field(sa_column=Column(Text))
-    file_id: Optional[int] = Field(index=False)
-
-    create_time: Optional[datetime] = Field(
-        sa_column=Column(DateTime, nullable=False, server_default=text('CURRENT_TIMESTAMP')))
-    update_time: Optional[datetime] = Field(
-        sa_column=Column(DateTime,
-                         nullable=False,
-                         index=True,
-                         server_default=text('CURRENT_TIMESTAMP'),
-                         onupdate=text('CURRENT_TIMESTAMP')))
+    chunk: Optional[str] = Field(default=None, sa_column=Column(Text))
+    meta_data: Optional[str] = Field(default=None, sa_column=Column(Text))
+    file_id: Optional[int] = Field(default=None, index=False)
+    create_time: Optional[datetime] = Field(default=None, sa_column=Column(
+        DateTime, nullable=False, server_default=text('CURRENT_TIMESTAMP')))
+    update_time: Optional[datetime] = Field(default=None, sa_column=Column(
+        DateTime, nullable=False, index=True, server_default=text('CURRENT_TIMESTAMP'),
+        onupdate=text('CURRENT_TIMESTAMP')))
 
 
 class RecallChunk(RecallBase, table=True):
@@ -29,13 +26,13 @@ class RecallChunk(RecallBase, table=True):
 
 
 class RecallChunkRead(RecallBase):
-    id: Optional[int]
-    score: Optional[int]
+    id: Optional[int] = None
+    score: Optional[int] = None
 
 
 class RecallChunkQuery(SQLModelSerializable):
-    id: Optional[int]
-    server: Optional[str]
+    id: Optional[int] = None
+    server: Optional[str] = None
 
 
 class RecallChunkCreate(RecallBase):
diff --git a/src/backend/bisheng/database/models/report.py b/src/backend/bisheng/database/models/report.py
index 42af7c2e0..455a5c0ee 100644
--- a/src/backend/bisheng/database/models/report.py
+++ b/src/backend/bisheng/database/models/report.py
@@ -1,29 +1,27 @@
 from datetime import datetime
 from typing import Optional
 
-from bisheng.database.models.base import SQLModelSerializable
 from sqlalchemy import Column, DateTime, text
 from sqlmodel import Field
 
+from bisheng.database.models.base import SQLModelSerializable
+
 
 class ReportBase(SQLModelSerializable):
     # ```
     # 使用flow_id 按更新时间倒排获取最新模板的路径
     # 会存储模板生成的最终报告的记录`
     flow_id: str = Field(index=False, description='技能名字')
-    file_name:  Optional[str] = Field(index=False, description='生成报告名字')
-    template_name:  Optional[str] = Field(index=False, description='报告模板数据存储路径')
-    version_key: Optional[str] = Field(index=True, unique=True, description='前端模板唯一key')
+    file_name: Optional[str] = Field(default=None, index=False, description='生成报告名字')
+    template_name: Optional[str] = Field(default=None, index=False, description='报告模板数据存储路径')
+    version_key: Optional[str] = Field(default=None, index=True, unique=True, description='前端模板唯一key')
     newversion_key: Optional[str] = Field(index=False, default=None, description='前端模板下一个key')
-    object_name: Optional[str] = Field(index=False, description='报告模板数据存储路径')
+    object_name: Optional[str] = Field(default=None, index=False, description='报告模板数据存储路径')
     del_yn: Optional[int] = Field(index=False, default=0, description='删除状态， 1表示删除')
-    create_time: Optional[datetime] = Field(sa_column=Column(
+    create_time: Optional[datetime] = Field(default=None, sa_column=Column(
         DateTime, nullable=False, index=True, server_default=text('CURRENT_TIMESTAMP')))
-    update_time: Optional[datetime] = Field(
-        sa_column=Column(DateTime,
-                         nullable=False,
-                         server_default=text('CURRENT_TIMESTAMP'),
-                         onupdate=text('CURRENT_TIMESTAMP')))
+    update_time: Optional[datetime] = Field(default=None, sa_column=Column(
+        DateTime, nullable=False, server_default=text('CURRENT_TIMESTAMP'), onupdate=text('CURRENT_TIMESTAMP')))
 
 
 class Report(ReportBase, table=True):
@@ -32,12 +30,12 @@ class Report(ReportBase, table=True):
 
 
 class ReportRead(ReportBase):
-    id: Optional[int]
+    id: Optional[int] = None
 
 
 class RoleUpdate(ReportBase):
-    role_name: Optional[str]
-    remark: Optional[str]
+    role_name: Optional[str] = None
+    remark: Optional[str] = None
 
 
 class RoleCreate(ReportBase):
diff --git a/src/backend/bisheng/database/models/role.py b/src/backend/bisheng/database/models/role.py
index 41327e7b2..648c3396a 100644
--- a/src/backend/bisheng/database/models/role.py
+++ b/src/backend/bisheng/database/models/role.py
@@ -1,26 +1,24 @@
 from datetime import datetime
 from typing import List, Optional
 
+from sqlalchemy import Column, DateTime, text, func, delete, and_, UniqueConstraint
+from sqlmodel import Field, select
+
 from bisheng.database.base import session_getter
-from bisheng.database.constants import DefaultRole, AdminRole
+from bisheng.database.constants import AdminRole
 from bisheng.database.models.base import SQLModelSerializable
 from bisheng.database.models.role_access import RoleAccess
 from bisheng.database.models.user_role import UserRole
-from sqlalchemy import Column, DateTime, text, func, delete, and_, UniqueConstraint
-from sqlmodel import Field, select
 
 
 class RoleBase(SQLModelSerializable):
     role_name: str = Field(index=False, description='前端展示名称')
-    group_id: Optional[int] = Field(index=True)
-    remark: Optional[str] = Field(index=False)
-    create_time: Optional[datetime] = Field(sa_column=Column(
+    group_id: Optional[int] = Field(default=None, index=True)
+    remark: Optional[str] = Field(default=None, index=False)
+    create_time: Optional[datetime] = Field(default=None, sa_column=Column(
         DateTime, nullable=False, index=True, server_default=text('CURRENT_TIMESTAMP')))
-    update_time: Optional[datetime] = Field(
-        sa_column=Column(DateTime,
-                         nullable=False,
-                         server_default=text('CURRENT_TIMESTAMP'),
-                         onupdate=text('CURRENT_TIMESTAMP')))
+    update_time: Optional[datetime] = Field(default=None, sa_column=Column(
+        DateTime, nullable=False, server_default=text('CURRENT_TIMESTAMP'), onupdate=text('CURRENT_TIMESTAMP')))
 
 
 class Role(RoleBase, table=True):
@@ -29,12 +27,12 @@ class Role(RoleBase, table=True):
 
 
 class RoleRead(RoleBase):
-    id: Optional[int]
+    id: Optional[int] = None
 
 
 class RoleUpdate(RoleBase):
-    role_name: Optional[str]
-    remark: Optional[str]
+    role_name: Optional[str] = None
+    remark: Optional[str] = None
 
 
 class RoleCreate(RoleBase):
diff --git a/src/backend/bisheng/database/models/role_access.py b/src/backend/bisheng/database/models/role_access.py
index f44cad507..b576241a8 100644
--- a/src/backend/bisheng/database/models/role_access.py
+++ b/src/backend/bisheng/database/models/role_access.py
@@ -2,25 +2,23 @@ from datetime import datetime
 from enum import Enum
 from typing import List, Optional, Union
 
-from bisheng.database.base import session_getter
-from bisheng.database.models.base import SQLModelSerializable
 from pydantic import BaseModel
 from sqlalchemy import Column, DateTime, text
 from sqlmodel import Field, select
 
+from bisheng.database.base import session_getter
+from bisheng.database.models.base import SQLModelSerializable
+
 
 class RoleAccessBase(SQLModelSerializable):
     role_id: str = Field(index=True)
     third_id: str = Field(index=False)
     type: int = Field(index=False)
-    create_time: Optional[datetime] = Field(
-        sa_column=Column(DateTime, nullable=False, server_default=text('CURRENT_TIMESTAMP')))
-    update_time: Optional[datetime] = Field(
-        sa_column=Column(DateTime,
-                         nullable=False,
-                         index=True,
-                         server_default=text('CURRENT_TIMESTAMP'),
-                         onupdate=text('CURRENT_TIMESTAMP')))
+    create_time: Optional[datetime] = Field(default=None, sa_column=Column(
+        DateTime, nullable=False, server_default=text('CURRENT_TIMESTAMP')))
+    update_time: Optional[datetime] = Field(default=None, sa_column=Column(
+        DateTime, nullable=False, index=True, server_default=text('CURRENT_TIMESTAMP'),
+        onupdate=text('CURRENT_TIMESTAMP')))
 
 
 class RoleAccess(RoleAccessBase, table=True):
@@ -28,7 +26,7 @@ class RoleAccess(RoleAccessBase, table=True):
 
 
 class RoleAccessRead(RoleAccessBase):
-    id: Optional[int]
+    id: Optional[int] = None
 
 
 class RoleAccessCreate(RoleAccessBase):
@@ -46,8 +44,8 @@ class AccessType(Enum):
     ASSISTANT_WRITE = 6
     GPTS_TOOL_READ = 7
     GPTS_TOOL_WRITE = 8
-    WORK_FLOW= 9
-    WORK_FLOW_WRITE= 10
+    WORK_FLOW = 9
+    WORK_FLOW_WRITE = 10
 
     WEB_MENU = 99  # 前端菜单栏权限限制
 
@@ -76,6 +74,7 @@ class RoleAccessDao(RoleAccessBase):
                 return session.exec(
                     select(RoleAccess).where(RoleAccess.role_id.in_(role_ids),
                                              RoleAccess.type.in_([x.value for x in access_type]))).all()
+
     @classmethod
     def judge_role_access(cls, role_ids: List[int], third_id: str, access_type: AccessType) -> Optional[RoleAccess]:
         with session_getter() as session:
diff --git a/src/backend/bisheng/database/models/server.py b/src/backend/bisheng/database/models/server.py
index 41623277a..9dfb92932 100644
--- a/src/backend/bisheng/database/models/server.py
+++ b/src/backend/bisheng/database/models/server.py
@@ -1,24 +1,22 @@
 from datetime import datetime
 from typing import Optional
 
-from bisheng.database.base import session_getter
-from bisheng.database.models.base import SQLModelSerializable
 from sqlalchemy import Column, DateTime, text
 from sqlmodel import Field, select
 
+from bisheng.database.base import session_getter
+from bisheng.database.models.base import SQLModelSerializable
+
 
 class ServerBase(SQLModelSerializable):
     endpoint: str = Field(index=False, unique=True)
     sft_endpoint: str = Field(default='', index=False, description='Finetune服务地址')
     server: str = Field(index=True)
-    remark: Optional[str] = Field(index=False)
-    create_time: Optional[datetime] = Field(sa_column=Column(
+    remark: Optional[str] = Field(default=None, index=False)
+    create_time: Optional[datetime] = Field(default=None, sa_column=Column(
         DateTime, nullable=False, index=True, server_default=text('CURRENT_TIMESTAMP')))
-    update_time: Optional[datetime] = Field(
-        sa_column=Column(DateTime,
-                         nullable=False,
-                         server_default=text('CURRENT_TIMESTAMP'),
-                         onupdate=text('CURRENT_TIMESTAMP')))
+    update_time: Optional[datetime] = Field(default=None, sa_column=Column(
+        DateTime, nullable=False, server_default=text('CURRENT_TIMESTAMP'), onupdate=text('CURRENT_TIMESTAMP')))
 
 
 class Server(ServerBase, table=True):
@@ -41,12 +39,12 @@ class ServerDao(ServerBase):
 
 
 class ServerRead(ServerBase):
-    id: Optional[int]
+    id: Optional[int] = None
 
 
 class ServerQuery(ServerBase):
-    id: Optional[int]
-    server: Optional[str]
+    id: Optional[int] = None
+    server: Optional[str] = None
 
 
 class ServerCreate(ServerBase):
diff --git a/src/backend/bisheng/database/models/session.py b/src/backend/bisheng/database/models/session.py
index 00dcd973b..aa072c8c3 100644
--- a/src/backend/bisheng/database/models/session.py
+++ b/src/backend/bisheng/database/models/session.py
@@ -25,11 +25,11 @@ class MessageSessionBase(SQLModelSerializable):
     dislike: Optional[int] = Field(default=0, description='点踩的消息数量')
     copied: Optional[int] = Field(default=0, description='已复制的消息数量')
     sensitive_status: int = Field(default=SensitiveStatus.PASS.value, description='审查状态')
-    create_time: Optional[datetime] = Field(
-        sa_column=Column(DateTime, nullable=False, index=True, server_default=text('CURRENT_TIMESTAMP')))
-    update_time: Optional[datetime] = Field(
-        sa_column=Column(DateTime, nullable=False, index=True, server_default=text('CURRENT_TIMESTAMP'),
-                         onupdate=text('CURRENT_TIMESTAMP')))
+    create_time: Optional[datetime] = Field(default=None, sa_column=Column(
+        DateTime, nullable=False, index=True, server_default=text('CURRENT_TIMESTAMP')))
+    update_time: Optional[datetime] = Field(default=None, sa_column=Column(
+        DateTime, nullable=False, index=True, server_default=text('CURRENT_TIMESTAMP'),
+        onupdate=text('CURRENT_TIMESTAMP')))
 
 
 class MessageSession(MessageSessionBase, table=True):
diff --git a/src/backend/bisheng/database/models/sft_model.py b/src/backend/bisheng/database/models/sft_model.py
index 9da8deaeb..9191078e6 100644
--- a/src/backend/bisheng/database/models/sft_model.py
+++ b/src/backend/bisheng/database/models/sft_model.py
@@ -1,18 +1,19 @@
 from datetime import datetime
 from typing import Optional
 
-from bisheng.database.base import session_getter
-from bisheng.database.models.base import SQLModelSerializable
 from sqlalchemy import Column, DateTime, delete, text, update
 from sqlmodel import Field, select
 
+from bisheng.database.base import session_getter
+from bisheng.database.models.base import SQLModelSerializable
+
 
 # 可用于训练的model列表
 class SftModelBase(SQLModelSerializable):
     id: int = Field(default=None, nullable=False, primary_key=True, description='唯一ID')
-    create_time: Optional[datetime] = Field(sa_column=Column(
+    create_time: Optional[datetime] = Field(default=None, sa_column=Column(
         DateTime, nullable=False, index=True, server_default=text('CURRENT_TIMESTAMP')))
-    update_time: Optional[datetime] = Field(sa_column=Column(
+    update_time: Optional[datetime] = Field(default=None, sa_column=Column(
         DateTime, nullable=False, server_default=text('CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP')))
 
 
diff --git a/src/backend/bisheng/database/models/tag.py b/src/backend/bisheng/database/models/tag.py
index bd219b2ac..907a8ca38 100644
--- a/src/backend/bisheng/database/models/tag.py
+++ b/src/backend/bisheng/database/models/tag.py
@@ -13,19 +13,17 @@ class TagBase(SQLModelSerializable):
     """
     标签表
     """
-    name: Optional[str] = Field(index=True, unique=True, description="标签名称")
+    name: Optional[str] = Field(default=None, index=True, unique=True, description="标签名称")
     user_id: int = Field(default=0, description='创建用户ID')
-    create_time: Optional[datetime] = Field(sa_column=Column(
+    create_time: Optional[datetime] = Field(default=None, sa_column=Column(
         DateTime, nullable=False, index=True, server_default=text('CURRENT_TIMESTAMP')), description="创建时间")
-    update_time: Optional[datetime] = Field(
-        sa_column=Column(DateTime,
-                         nullable=False,
-                         server_default=text('CURRENT_TIMESTAMP'),
-                         onupdate=text('CURRENT_TIMESTAMP')), description="更新时间")
+    update_time: Optional[datetime] = Field(default=None, sa_column=Column(
+        DateTime, nullable=False, server_default=text('CURRENT_TIMESTAMP'), onupdate=text('CURRENT_TIMESTAMP')),
+                                            description="更新时间")
 
 
 class Tag(TagBase, table=True):
-    id: Optional[int] = Field(index=True, primary_key=True, description="标签唯一ID")
+    id: Optional[int] = Field(default=None, index=True, primary_key=True, description="标签唯一ID")
 
 
 class TagLinkBase(SQLModelSerializable):
@@ -36,18 +34,16 @@ class TagLinkBase(SQLModelSerializable):
     resource_id: str = Field(description="资源唯一ID")
     resource_type: int = Field(description="资源类型")  # 使用group_resource.ResourceTypeEnum枚举值
     user_id: int = Field(default=0, description='创建用户ID')
-    create_time: Optional[datetime] = Field(sa_column=Column(
+    create_time: Optional[datetime] = Field(default=None, sa_column=Column(
         DateTime, nullable=False, index=True, server_default=text('CURRENT_TIMESTAMP')), description="创建时间")
-    update_time: Optional[datetime] = Field(
-        sa_column=Column(DateTime,
-                         nullable=False,
-                         server_default=text('CURRENT_TIMESTAMP'),
-                         onupdate=text('CURRENT_TIMESTAMP')), description="更新时间")
+    update_time: Optional[datetime] = Field(default=None, sa_column=Column(
+        DateTime, nullable=False, server_default=text('CURRENT_TIMESTAMP'), onupdate=text('CURRENT_TIMESTAMP')),
+                                            description="更新时间")
 
 
 class TagLink(TagLinkBase, table=True):
     __table_args__ = (UniqueConstraint('resource_id', 'resource_type', 'tag_id', name='resource_tag_uniq'),)
-    id: Optional[int] = Field(index=True, primary_key=True, description="标签关联唯一ID")
+    id: Optional[int] = Field(default=None, index=True, primary_key=True, description="标签关联唯一ID")
 
 
 class TagDao(Tag):
diff --git a/src/backend/bisheng/database/models/template.py b/src/backend/bisheng/database/models/template.py
index f45415c35..cae93f817 100644
--- a/src/backend/bisheng/database/models/template.py
+++ b/src/backend/bisheng/database/models/template.py
@@ -1,10 +1,11 @@
 from datetime import datetime
 from typing import Dict, Optional
 
-from bisheng.database.models.base import SQLModelSerializable
 from sqlalchemy import JSON, Column, DateTime, text, String
 from sqlmodel import Field
 
+from bisheng.database.models.base import SQLModelSerializable
+
 
 class TemplateSkillBase(SQLModelSerializable):
     name: str = Field(index=True)
@@ -13,15 +14,12 @@ class TemplateSkillBase(SQLModelSerializable):
     order_num: Optional[int] = Field(default=True)
     # 1 flow 5 assistant 10 workflow
     flow_type: Optional[int] = Field(default=1)
-    flow_id: Optional[str] = Field(index=False)
-    create_time: Optional[datetime] = Field(sa_column=Column(
+    flow_id: Optional[str] = Field(default=None, index=False)
+    create_time: Optional[datetime] = Field(default=None, sa_column=Column(
         DateTime, nullable=False, index=True, server_default=text('CURRENT_TIMESTAMP')))
-    update_time: Optional[datetime] = Field(
-        sa_column=Column(DateTime,
-                         nullable=False,
-                         server_default=text('CURRENT_TIMESTAMP'),
-                         onupdate=text('CURRENT_TIMESTAMP')))
-    guide_word: Optional[str] = Field(sa_column=Column(String(length=1000)))
+    update_time: Optional[datetime] = Field(default=None, sa_column=Column(
+        DateTime, nullable=False, server_default=text('CURRENT_TIMESTAMP'), onupdate=text('CURRENT_TIMESTAMP')))
+    guide_word: Optional[str] = Field(default=None, sa_column=Column(String(length=1000)))
 
 
 class Template(TemplateSkillBase, table=True):
diff --git a/src/backend/bisheng/database/models/user.py b/src/backend/bisheng/database/models/user.py
index ae11ef235..41744c34c 100644
--- a/src/backend/bisheng/database/models/user.py
+++ b/src/backend/bisheng/database/models/user.py
@@ -1,33 +1,32 @@
 from datetime import datetime
 from typing import List, Optional
 
+from pydantic import field_validator
+from sqlalchemy import Column, DateTime, func, text
+from sqlmodel import Field, select
+
 from bisheng.database.base import session_getter
 from bisheng.database.constants import AdminRole, DefaultRole
 from bisheng.database.models.base import SQLModelSerializable
 from bisheng.database.models.user_group import UserGroup
 from bisheng.database.models.user_role import UserRole
-from pydantic import validator
-from sqlalchemy import Column, DateTime, func, text
-from sqlmodel import Field, select
 
 
 class UserBase(SQLModelSerializable):
     user_name: str = Field(index=True, unique=True)
-    email: Optional[str] = Field(index=True)
-    phone_number: Optional[str] = Field(index=True)
-    dept_id: Optional[str] = Field(index=True)
-    remark: Optional[str] = Field(index=False)
-    delete: int = Field(index=False, default=0)
-    create_time: Optional[datetime] = Field(sa_column=Column(
+    email: Optional[str] = Field(default=None, index=True)
+    phone_number: Optional[str] = Field(default=None, index=True)
+    dept_id: Optional[str] = Field(default=None, index=True)
+    remark: Optional[str] = Field(default=None, index=False)
+    delete: int = Field(default=0, index=False)
+    create_time: Optional[datetime] = Field(default=None, sa_column=Column(
         DateTime, nullable=False, index=True, server_default=text('CURRENT_TIMESTAMP')))
-    update_time: Optional[datetime] = Field(
-        sa_column=Column(DateTime,
-                         nullable=False,
-                         server_default=text('CURRENT_TIMESTAMP'),
-                         onupdate=text('CURRENT_TIMESTAMP')))
+    update_time: Optional[datetime] = Field(default=None, sa_column=Column(
+        DateTime, nullable=False, server_default=text('CURRENT_TIMESTAMP'), onupdate=text('CURRENT_TIMESTAMP')))
 
-    @validator('user_name')
-    def validate_str(v):
+    @field_validator('user_name')
+    @classmethod
+    def validate_str(cls, v):
         # dict_keys(['description', 'name', 'id', 'data'])
         if not v:
             raise ValueError('user_name 不能为空')
@@ -37,35 +36,34 @@ class UserBase(SQLModelSerializable):
 class User(UserBase, table=True):
     user_id: Optional[int] = Field(default=None, primary_key=True)
     password: str = Field(index=False)
-    password_update_time: Optional[datetime] = Field(sa_column=Column(
-        DateTime, nullable=False, server_default=text('CURRENT_TIMESTAMP')),
-                                                     description='密码最近的修改时间')
+    password_update_time: Optional[datetime] = Field(default=None, sa_column=Column(
+        DateTime, nullable=False, server_default=text('CURRENT_TIMESTAMP')), description='密码最近的修改时间')
 
 
 class UserRead(UserBase):
-    user_id: Optional[int]
-    role: Optional[str]
-    access_token: Optional[str]
-    web_menu: Optional[List[str]]
-    admin_groups: Optional[List[int]]  # 所管理的用户组ID列表
+    user_id: Optional[int] = None
+    role: Optional[str] = None
+    access_token: Optional[str] = None
+    web_menu: Optional[List[str]] = None
+    admin_groups: Optional[List[int]] = None  # 所管理的用户组ID列表
 
 
 class UserQuery(UserBase):
-    user_id: Optional[int]
-    user_name: Optional[str]
+    user_id: Optional[int] = None
+    user_name: Optional[str] = None
 
 
 class UserLogin(UserBase):
     password: str
     user_name: str
-    captcha_key: Optional[str]
-    captcha: Optional[str]
+    captcha_key: Optional[str] = None
+    captcha: Optional[str] = None
 
 
 class UserCreate(UserBase):
     password: Optional[str] = Field(default='')
-    captcha_key: Optional[str]
-    captcha: Optional[str]
+    captcha_key: Optional[str] = None
+    captcha: Optional[str] = None
 
 
 class UserUpdate(SQLModelSerializable):
diff --git a/src/backend/bisheng/database/models/user_group.py b/src/backend/bisheng/database/models/user_group.py
index 9043ae38f..1a4ce871b 100644
--- a/src/backend/bisheng/database/models/user_group.py
+++ b/src/backend/bisheng/database/models/user_group.py
@@ -1,11 +1,11 @@
 from datetime import datetime
 from typing import List, Optional
 
+from sqlalchemy import Column, DateTime, delete, text
+from sqlmodel import Field, select
+
 from bisheng.database.base import session_getter
 from bisheng.database.models.base import SQLModelSerializable
-from sqlalchemy import Column, DateTime, delete, text
-from sqlmodel import Field, select, update
-
 from bisheng.database.models.group import DefaultGroup
 
 
@@ -13,14 +13,11 @@ class UserGroupBase(SQLModelSerializable):
     user_id: int = Field(index=True, description='用户id')
     group_id: int = Field(index=True, description='组id')
     is_group_admin: bool = Field(default=False, index=False, description='是否是组管理员')  # 管理员不属于此用户组
-    remark: Optional[str] = Field(index=False)
-    create_time: Optional[datetime] = Field(sa_column=Column(
+    remark: Optional[str] = Field(default=None, index=False)
+    create_time: Optional[datetime] = Field(default=None, sa_column=Column(
         DateTime, nullable=False, index=True, server_default=text('CURRENT_TIMESTAMP')))
-    update_time: Optional[datetime] = Field(
-        sa_column=Column(DateTime,
-                         nullable=False,
-                         server_default=text('CURRENT_TIMESTAMP'),
-                         onupdate=text('CURRENT_TIMESTAMP')))
+    update_time: Optional[datetime] = Field(default=None, sa_column=Column(
+        DateTime, nullable=False, server_default=text('CURRENT_TIMESTAMP'), onupdate=text('CURRENT_TIMESTAMP')))
 
 
 class UserGroup(UserGroupBase, table=True):
@@ -28,14 +25,14 @@ class UserGroup(UserGroupBase, table=True):
 
 
 class UserGroupRead(UserGroupBase):
-    id: Optional[int]
+    id: Optional[int] = None
 
 
 class UserGroupUpdate(UserGroupBase):
-    user_id: Optional[int]
-    group_id: Optional[int]
-    is_group_admin: Optional[bool]
-    remark: Optional[str]
+    user_id: Optional[int] = None
+    group_id: Optional[int] = None
+    is_group_admin: Optional[bool] = None
+    remark: Optional[str] = None
 
 
 class UserGroupCreate(UserGroupBase):
diff --git a/src/backend/bisheng/database/models/user_role.py b/src/backend/bisheng/database/models/user_role.py
index efd910508..aa0208f2e 100644
--- a/src/backend/bisheng/database/models/user_role.py
+++ b/src/backend/bisheng/database/models/user_role.py
@@ -1,26 +1,23 @@
 from datetime import datetime
 from typing import List, Optional
 
-from bisheng.database.base import session_getter
-from bisheng.database.models.base import SQLModelSerializable
 from pydantic import BaseModel
 from sqlalchemy import Column, DateTime, text, delete
 from sqlmodel import Field, select
 
+from bisheng.database.base import session_getter
 from bisheng.database.constants import AdminRole
+from bisheng.database.models.base import SQLModelSerializable
 
 
 class UserRoleBase(SQLModelSerializable):
     user_id: int = Field(index=True)
     role_id: int = Field(index=True)
-    create_time: Optional[datetime] = Field(
-        sa_column=Column(DateTime, nullable=False, server_default=text('CURRENT_TIMESTAMP')))
-    update_time: Optional[datetime] = Field(
-        sa_column=Column(DateTime,
-                         nullable=False,
-                         index=True,
-                         server_default=text('CURRENT_TIMESTAMP'),
-                         onupdate=text('CURRENT_TIMESTAMP')))
+    create_time: Optional[datetime] = Field(default=None, sa_column=Column(
+        DateTime, nullable=False, server_default=text('CURRENT_TIMESTAMP')))
+    update_time: Optional[datetime] = Field(default=None, sa_column=Column(
+        DateTime, nullable=False, index=True, server_default=text('CURRENT_TIMESTAMP'),
+        onupdate=text('CURRENT_TIMESTAMP')))
 
 
 class UserRole(UserRoleBase, table=True):
@@ -28,7 +25,7 @@ class UserRole(UserRoleBase, table=True):
 
 
 class UserRoleRead(UserRoleBase):
-    id: Optional[int]
+    id: Optional[int] = None
 
 
 class UserRoleCreate(BaseModel):
diff --git a/src/backend/bisheng/database/models/variable_value.py b/src/backend/bisheng/database/models/variable_value.py
index d8fd3eadd..322f8a67a 100644
--- a/src/backend/bisheng/database/models/variable_value.py
+++ b/src/backend/bisheng/database/models/variable_value.py
@@ -1,12 +1,13 @@
 from datetime import datetime
 from typing import Optional, List
 
+# if TYPE_CHECKING:
+from pydantic import field_validator
+from sqlalchemy import Column, DateTime, text
+from sqlmodel import Field, select
+
 from bisheng.database.base import session_getter
 from bisheng.database.models.base import SQLModelSerializable
-# if TYPE_CHECKING:
-from pydantic import validator
-from sqlalchemy import Column, DateTime, text
-from sqlmodel import Field, select, or_
 
 
 class VariableBase(SQLModelSerializable):
@@ -17,16 +18,14 @@ class VariableBase(SQLModelSerializable):
     value_type: int = Field(index=False, description='变量类型，1=文本 2=list 3=file')
     is_option: int = Field(index=False, default=1, description='是否必填 1=必填 0=非必填')
     value: str = Field(index=False, default=0, description='变量值，当文本的时候，传入文本长度')
-    create_time: Optional[datetime] = Field(sa_column=Column(
+    create_time: Optional[datetime] = Field(default=None, sa_column=Column(
         DateTime, nullable=False, index=True, server_default=text('CURRENT_TIMESTAMP')))
-    update_time: Optional[datetime] = Field(
-        sa_column=Column(DateTime,
-                         nullable=False,
-                         server_default=text('CURRENT_TIMESTAMP'),
-                         onupdate=text('CURRENT_TIMESTAMP')))
+    update_time: Optional[datetime] = Field(default=None, sa_column=Column(
+        DateTime, nullable=False, server_default=text('CURRENT_TIMESTAMP'), onupdate=text('CURRENT_TIMESTAMP')))
 
-    @validator('variable_name')
-    def validate_length(v):
+    @field_validator('variable_name')
+    @classmethod
+    def validate_length(cls, v):
         # dict_keys(['description', 'name', 'id', 'data'])
         if not v:
             return v
@@ -35,8 +34,9 @@ class VariableBase(SQLModelSerializable):
 
         return v
 
-    @validator('value')
-    def validate_value(v):
+    @field_validator('value')
+    @classmethod
+    def validate_value(cls, v):
         # dict_keys(['description', 'name', 'id', 'data'])
         if not v:
             return v
@@ -103,4 +103,3 @@ class VariableDao(Variable):
                 session.add(new_version)
             session.commit()
             return old_version
-
diff --git a/src/backend/bisheng/field_typing/range_spec.py b/src/backend/bisheng/field_typing/range_spec.py
index 6563147cd..e55f4aa0a 100644
--- a/src/backend/bisheng/field_typing/range_spec.py
+++ b/src/backend/bisheng/field_typing/range_spec.py
@@ -1,4 +1,4 @@
-from pydantic import BaseModel, validator
+from pydantic import field_validator, BaseModel, model_validator
 
 
 class RangeSpec(BaseModel):
@@ -6,14 +6,14 @@ class RangeSpec(BaseModel):
     max: float = 1.0
     step: float = 0.1
 
-    @validator('max')
+    @model_validator(mode='before')
     @classmethod
-    def max_must_be_greater_than_min(cls, v, values, **kwargs):
-        if 'min' in values.data and v <= values.data['min']:
+    def max_must_be_greater_than_min(cls, values):
+        if 'min' in values and values['max'] <= values['min']:
             raise ValueError('max must be greater than min')
-        return v
+        return values
 
-    @validator('step')
+    @field_validator('step')
     @classmethod
     def step_must_be_positive(cls, v):
         if v <= 0:
diff --git a/src/backend/bisheng/interface/custom/schema.py b/src/backend/bisheng/interface/custom/schema.py
index 89d75006f..7c5975150 100644
--- a/src/backend/bisheng/interface/custom/schema.py
+++ b/src/backend/bisheng/interface/custom/schema.py
@@ -15,9 +15,6 @@ class ClassCodeDetails(BaseModel):
     methods: list
     init: Optional[dict] = Field(default_factory=dict)
 
-    def model_dump(self):
-        return self.dict()
-
 
 class CallableCodeDetails(BaseModel):
     """
@@ -30,6 +27,3 @@ class CallableCodeDetails(BaseModel):
     body: list
     return_type: Optional[Any] = None
     has_return: bool = False
-
-    def model_dump(self):
-        return self.dict()
diff --git a/src/backend/bisheng/interface/embeddings/custom.py b/src/backend/bisheng/interface/embeddings/custom.py
index 3084d39ce..095c22c20 100644
--- a/src/backend/bisheng/interface/embeddings/custom.py
+++ b/src/backend/bisheng/interface/embeddings/custom.py
@@ -7,7 +7,7 @@ from bisheng.interface.importing import import_by_type
 from bisheng.interface.utils import wrapper_bisheng_model_limit_check
 from langchain.embeddings.base import Embeddings
 from loguru import logger
-from pydantic import Field, BaseModel
+from pydantic import ConfigDict, Field, BaseModel
 
 
 class OpenAIProxyEmbedding(Embeddings):
@@ -76,11 +76,7 @@ class BishengEmbedding(BaseModel, Embeddings):
     # bisheng强相关的业务参数
     model_info: Optional[LLMModel] = Field(default=None)
     server_info: Optional[LLMServer] = Field(default=None)
-
-    class Config:
-        """Configuration for this pydantic object."""
-        validate_by_name = True
-        arbitrary_types_allowed = True
+    model_config = ConfigDict(validate_by_name=True, arbitrary_types_allowed=True)
 
     def __init__(self, **kwargs):
         from bisheng.interface.initialize.loading import instantiate_embedding
diff --git a/src/backend/bisheng/interface/tools/custom.py b/src/backend/bisheng/interface/tools/custom.py
index 0577748d5..64c80f3e5 100644
--- a/src/backend/bisheng/interface/tools/custom.py
+++ b/src/backend/bisheng/interface/tools/custom.py
@@ -3,7 +3,7 @@ from typing import Callable, Optional
 from bisheng.interface.importing.utils import get_function
 from bisheng.utils import validate
 from langchain_community.tools import Tool
-from pydantic import BaseModel, validator
+from pydantic import field_validator, BaseModel
 
 
 class Function(BaseModel):
@@ -16,7 +16,8 @@ class Function(BaseModel):
         super().__init__(**data)
 
     # Validate the function
-    @validator('code')
+    @field_validator('code')
+    @classmethod
     def validate_func(cls, v):
         try:
             validate.eval_function(v)
diff --git a/src/backend/bisheng/mcp_manage/client.py b/src/backend/bisheng/mcp_manage/client.py
deleted file mode 100644
index ed662d5bf..000000000
--- a/src/backend/bisheng/mcp_manage/client.py
+++ /dev/null
@@ -1,15 +0,0 @@
-from typing import Dict
-
-from mcp import ClientSession
-from mcp.client.stdio import stdio_client
-
-class ClientManager:
-
-    # 缓存对应的mcp连接
-    client_map: Dict[str, ClientSession] = {}
-
-    def __init__(self, client):
-        self.client = client
-
-    def get_client(self):
-        return self.client
\ No newline at end of file
diff --git a/src/backend/bisheng/mcp_manage/clients/__init__.py b/src/backend/bisheng/mcp_manage/clients/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/backend/bisheng/mcp_manage/clients/base.py b/src/backend/bisheng/mcp_manage/clients/base.py
new file mode 100644
index 000000000..0b332ac00
--- /dev/null
+++ b/src/backend/bisheng/mcp_manage/clients/base.py
@@ -0,0 +1,45 @@
+from contextlib import AsyncExitStack
+from typing import Any
+
+from mcp import ClientSession
+
+
+class BaseMcpClient(object):
+    """
+    Base class for MCP clients.
+    """
+
+    def __init__(self, **kwargs):
+        self.exit_stack = AsyncExitStack()
+
+        self.client_session: ClientSession | None = None
+
+    async def get_mcp_client_transport(self):
+        raise NotImplementedError("get_mcp_client_transport() must be implemented in subclasses.")
+
+
+    async def initialize(self):
+        """
+        Initialize the client.
+        """
+        if not self.client_session:
+            read, write = await self.get_mcp_client_transport()
+            self.client_session = await self.exit_stack.enter_async_context(
+                ClientSession(read, write)
+            )
+
+        await self.client_session.initialize()
+
+    async def list_tools(self):
+        tools = await self.client_session.list_tools()
+        return tools.tools
+
+    async def call_tool(self, name: str, arguments: dict[str, Any] | None = None):
+        """
+        Call a tool.
+        """
+        return await self.client_session.call_tool(name, arguments)
+
+    async def close(self):
+        await self.exit_stack.aclose()
+        self.client_session = None
diff --git a/src/backend/bisheng/mcp_manage/clients/sse.py b/src/backend/bisheng/mcp_manage/clients/sse.py
new file mode 100644
index 000000000..63ddb8ea7
--- /dev/null
+++ b/src/backend/bisheng/mcp_manage/clients/sse.py
@@ -0,0 +1,30 @@
+from mcp.client.sse import sse_client
+
+from bisheng.mcp_manage.clients.base import BaseMcpClient
+
+
+class SseClient(BaseMcpClient):
+    """
+    SSE client for connecting to the mcp server.
+    """
+
+    def __init__(self, url: str):
+        """
+        Initialize the SSE client.
+
+        :param url: The URL of the SSE server.
+        """
+        super().__init__()
+        self.url = url
+
+    async def get_mcp_client_transport(self):
+        """
+        Initialize the SSE client.
+        """
+        return await self.exit_stack.enter_async_context(sse_client(url=self.url))
+
+    def connect(self):
+        """
+        Connect to the SSE server.
+        """
+        pass  # Implement the connection logic here
\ No newline at end of file
diff --git a/src/backend/bisheng/mcp_manage/manager.py b/src/backend/bisheng/mcp_manage/manager.py
new file mode 100644
index 000000000..a13a2e78a
--- /dev/null
+++ b/src/backend/bisheng/mcp_manage/manager.py
@@ -0,0 +1,45 @@
+from typing import Dict
+
+from bisheng.api.utils import md5_hash
+from bisheng.mcp_manage.clients.base import BaseMcpClient
+from bisheng.mcp_manage.clients.sse import SseClient
+from bisheng.mcp_manage.constant import McpClientType
+
+
+class ClientManager:
+    # 缓存对应的mcp连接
+    client_map: Dict[str, BaseMcpClient] = {}
+
+    @classmethod
+    async def connect_mcp(cls, client_type: str, **kwargs) -> BaseMcpClient:
+        """ 获取对应url的mcp连接 """
+        # 初始化对应的client
+        client_key = md5_hash(f'{client_type}:{kwargs}')
+        if cls.client_map.get(client_key) is None:
+            if client_type == McpClientType.SSE.value:
+                client = SseClient(**kwargs)
+            else:
+                raise ValueError(f'client_type {client_type} not supported')
+            cls.client_map[client_key] = client
+        else:
+            client = cls.client_map[client_key]
+
+        # 判断对应的client是否还处于链接状态
+        await client.initialize()
+
+        return client
+
+    @classmethod
+    async def disconnect_mcp(cls, client_type: str, **kwargs):
+        """ 释放对应url的mcp连接 """
+        client_key = md5_hash(f'{client_type}:{kwargs}')
+        if client_key not in cls.client_map:
+            return
+        client = cls.client_map[client_key]
+        await client.close()
+
+    async def __aexit__(self, exc_type, exc_val, exc_tb):
+        """ 释放所有的连接 """
+        for client_key in self.client_map.keys():
+            client = self.client_map[client_key]
+            await client.close()
diff --git a/src/backend/bisheng/processing/process.py b/src/backend/bisheng/processing/process.py
index 29cc668c2..52f8591a9 100644
--- a/src/backend/bisheng/processing/process.py
+++ b/src/backend/bisheng/processing/process.py
@@ -146,7 +146,7 @@ def generate_result(langchain_object: Union[Chain, VectorStore], inputs: dict):
 
 
 class Result(BaseModel):
-    result: Any
+    result: Any = None
     session_id: str
 
 
diff --git a/src/backend/bisheng/services/database/models/api_key/model.py b/src/backend/bisheng/services/database/models/api_key/model.py
index 3a91c0ae2..c77682b59 100644
--- a/src/backend/bisheng/services/database/models/api_key/model.py
+++ b/src/backend/bisheng/services/database/models/api_key/model.py
@@ -2,7 +2,7 @@ from datetime import datetime
 from typing import Optional
 from uuid import UUID, uuid4
 
-from pydantic import validator
+from pydantic import validator, field_validator
 from sqlmodel import Field, SQLModel
 
 
@@ -42,7 +42,8 @@ class ApiKeyRead(ApiKeyBase):
     api_key: str = Field()
     user_id: UUID = Field()
 
-    @validator('api_key', always=True)
+    @field_validator('api_key', mode='before')
+    @classmethod
     def mask_api_key(cls, v):
         # This validator will always run, and will mask the API key
         return f"{v[:8]}{'*' * (len(v) - 8)}"
diff --git a/src/backend/bisheng/services/database/models/flow/model.py b/src/backend/bisheng/services/database/models/flow/model.py
index 8f20770fb..95c0de23d 100644
--- a/src/backend/bisheng/services/database/models/flow/model.py
+++ b/src/backend/bisheng/services/database/models/flow/model.py
@@ -20,7 +20,8 @@ class FlowBase(SQLModel):
     folder: Optional[str] = Field(default=None, nullable=True)
 
     @field_validator('data')
-    def validate_json(v):
+    @classmethod
+    def validate_json(cls, v):
         if not v:
             return v
         if not isinstance(v, dict):
@@ -42,6 +43,7 @@ class FlowBase(SQLModel):
         return dt.isoformat()
 
     @field_validator('updated_at', mode='before')
+    @classmethod
     def validate_dt(cls, v):
         if v is None:
             return v
diff --git a/src/backend/bisheng/services/settings/auth.py b/src/backend/bisheng/services/settings/auth.py
index b8206620d..7880c1681 100644
--- a/src/backend/bisheng/services/settings/auth.py
+++ b/src/backend/bisheng/services/settings/auth.py
@@ -6,8 +6,8 @@ from bisheng.services.settings.constants import DEFAULT_SUPERUSER, DEFAULT_SUPER
 from bisheng.services.settings.utils import read_secret_from_file, write_secret_to_file
 from loguru import logger
 from passlib.context import CryptContext
-from pydantic import Field, validator
-from pydantic_settings import BaseSettings
+from pydantic import Field, field_validator
+from pydantic_settings import SettingsConfigDict, BaseSettings
 
 
 class AuthSettings(BaseSettings):
@@ -35,35 +35,14 @@ class AuthSettings(BaseSettings):
     SUPERUSER_PASSWORD: str = DEFAULT_SUPERUSER_PASSWORD
 
     pwd_context: CryptContext = CryptContext(schemes=['bcrypt'], deprecated='auto')
-
-    class Config:
-        validate_assignment = True
-        extra = 'ignore'
-        env_prefix = 'bisheng_'
+    model_config = SettingsConfigDict(validate_assignment=True, extra='ignore', env_prefix='bisheng_')
 
     def reset_credentials(self):
         self.SUPERUSER = DEFAULT_SUPERUSER
         self.SUPERUSER_PASSWORD = DEFAULT_SUPERUSER_PASSWORD
 
-    # If autologin is true, then we need to set the credentials to
-    # the default values
-    # so we need to validate the superuser and superuser_password
-    # fields
-    @validator('SUPERUSER', 'SUPERUSER_PASSWORD', pre=True)
-    def validate_superuser(cls, value, values):
-        if values.get('AUTO_LOGIN'):
-            if value != DEFAULT_SUPERUSER:
-                value = DEFAULT_SUPERUSER
-                logger.debug('Resetting superuser to default value')
-            if values.get('SUPERUSER_PASSWORD') != DEFAULT_SUPERUSER_PASSWORD:
-                values['SUPERUSER_PASSWORD'] = DEFAULT_SUPERUSER_PASSWORD
-                logger.debug('Resetting superuser password to default value')
-
-            return value
-
-        return value
-
-    @validator('SECRET_KEY', pre=True)
+    @field_validator('SECRET_KEY', mode='before')
+    @classmethod
     def get_secret_key(cls, value, values):
         config_dir = values.get('CONFIG_DIR')
 
diff --git a/src/backend/bisheng/services/settings/base.py b/src/backend/bisheng/services/settings/base.py
index 15704dc6c..407580038 100644
--- a/src/backend/bisheng/services/settings/base.py
+++ b/src/backend/bisheng/services/settings/base.py
@@ -62,7 +62,8 @@ class Settings(BaseSettings):
     ] = 'https://api.langflow.store/flows/trigger/ec611a61-8460-4438-b187-a4f65e5559d4'
     LIKE_WEBHOOK_URL: Optional[str] = 'https://api.langflow.store/flows/trigger/64275852-ec00-45c1-984e-3bff814732da'
 
-    @validator('CONFIG_DIR', pre=True, allow_reuse=True)
+    @field_validator('CONFIG_DIR', mode="before")
+    @classmethod
     def set_langflow_dir(cls, value):
         if not value:
             from platformdirs import user_cache_dir
@@ -85,7 +86,8 @@ class Settings(BaseSettings):
 
         return str(value)
 
-    @validator('DATABASE_URL', pre=True)
+    @field_validator('DATABASE_URL', mode='before')
+    @classmethod
     def set_database_url(cls, value, values):
         if not value:
             logger.debug('No database_url provided, trying LANGFLOW_DATABASE_URL env variable')
@@ -118,6 +120,7 @@ class Settings(BaseSettings):
         return value
 
     @field_validator('COMPONENTS_PATH', mode='before')
+    @classmethod
     def set_components_path(cls, value):
         if os.getenv('LANGFLOW_COMPONENTS_PATH'):
             logger.debug('Adding LANGFLOW_COMPONENTS_PATH to components_path')
diff --git a/src/backend/bisheng/services/store/schema.py b/src/backend/bisheng/services/store/schema.py
index dbceaa08e..2cecae4e1 100644
--- a/src/backend/bisheng/services/store/schema.py
+++ b/src/backend/bisheng/services/store/schema.py
@@ -1,17 +1,17 @@
 from typing import List, Optional
 from uuid import UUID
 
-from pydantic import BaseModel, validator
+from pydantic import field_validator, BaseModel
 
 
 class TagResponse(BaseModel):
     id: UUID
-    name: Optional[str]
+    name: Optional[str] = None
 
 
 class UsersLikesResponse(BaseModel):
-    likes_count: Optional[int]
-    liked_by_user: Optional[bool]
+    likes_count: Optional[int] = None
+    liked_by_user: Optional[bool] = None
 
 
 class CreateComponentResponse(BaseModel):
@@ -19,7 +19,7 @@ class CreateComponentResponse(BaseModel):
 
 
 class TagsIdResponse(BaseModel):
-    tags_id: Optional[TagResponse]
+    tags_id: Optional[TagResponse] = None
 
 
 class ListComponentResponse(BaseModel):
@@ -37,7 +37,8 @@ class ListComponentResponse(BaseModel):
     private: Optional[bool] = None
 
     # tags comes as a TagsIdResponse but we want to return a list of TagResponse
-    @validator('tags', pre=True)
+    @field_validator('tags', mode="before")
+    @classmethod
     def tags_to_list(cls, v):
         # Check if all values are have id and name
         # if so, return v else transform to TagResponse
@@ -52,24 +53,24 @@ class ListComponentResponse(BaseModel):
 class ListComponentResponseModel(BaseModel):
     count: Optional[int] = 0
     authorized: bool
-    results: Optional[List[ListComponentResponse]]
+    results: Optional[List[ListComponentResponse]] = None
 
 
 class DownloadComponentResponse(BaseModel):
     id: UUID
-    name: Optional[str]
-    description: Optional[str]
-    data: Optional[dict]
-    is_component: Optional[bool]
+    name: Optional[str] = None
+    description: Optional[str] = None
+    data: Optional[dict] = None
+    is_component: Optional[bool] = None
     metadata: Optional[dict] = {}
 
 
 class StoreComponentCreate(BaseModel):
     name: str
-    description: Optional[str]
+    description: Optional[str] = None
     data: dict
-    tags: Optional[List[str]]
+    tags: Optional[List[str]] = None
     parent: Optional[UUID] = None
-    is_component: Optional[bool]
+    is_component: Optional[bool] = None
     last_tested_version: Optional[str] = None
     private: Optional[bool] = True
diff --git a/src/backend/bisheng/settings.py b/src/backend/bisheng/settings.py
index 4920d6197..f822a8b76 100644
--- a/src/backend/bisheng/settings.py
+++ b/src/backend/bisheng/settings.py
@@ -6,7 +6,7 @@ from typing import Dict, List, Optional, Union
 import yaml
 from cryptography.fernet import Fernet
 from loguru import logger
-from pydantic import BaseModel, Field, field_validator, model_validator
+from pydantic import ConfigDict, BaseModel, Field, field_validator, model_validator
 from sqlmodel import select
 
 
@@ -87,10 +87,7 @@ class WorkflowConf(BaseModel):
 
 
 class Settings(BaseModel):
-    class Config:
-        validate_assignment = True
-        arbitrary_types_allowed = True
-        extra = 'ignore'
+    model_config = ConfigDict(validate_assignment=True, arbitrary_types_allowed=True, extra='ignore')
 
     chains: dict = {}
     agents: dict = {}
diff --git a/src/backend/bisheng/utils/__init__.py b/src/backend/bisheng/utils/__init__.py
index 0441bc625..8bfd9e2ce 100644
--- a/src/backend/bisheng/utils/__init__.py
+++ b/src/backend/bisheng/utils/__init__.py
@@ -1,3 +1,4 @@
+import hashlib
 import uuid
 
 
@@ -5,4 +6,10 @@ def generate_uuid() -> str:
     """
     生成uuid的字符串
     """
-    return uuid.uuid4().hex
\ No newline at end of file
+    return uuid.uuid4().hex
+
+
+def md5_hash(original_string: str):
+    md5 = hashlib.md5()
+    md5.update(original_string.encode('utf-8'))
+    return md5.hexdigest()
diff --git a/src/backend/bisheng/utils/http_middleware.py b/src/backend/bisheng/utils/http_middleware.py
index e2c847520..7797bc9d7 100644
--- a/src/backend/bisheng/utils/http_middleware.py
+++ b/src/backend/bisheng/utils/http_middleware.py
@@ -12,7 +12,10 @@ class CustomMiddleware(BaseHTTPMiddleware):
 
     async def dispatch(self, request: Request, call_next: RequestResponseEndpoint):
         # You can modify the request before passing it to the next middleware or endpoint
-        trace_id = str(uuid4().hex)
+        if request.headers.get('x-trace-id'):
+            trace_id = request.headers.get('x-trace-id')
+        else:
+            trace_id = str(uuid4().hex)
         start_time = time()
         with logger.contextualize(trace_id=trace_id):
             logger.info(f'{request.method} {request.url.path}')
diff --git a/src/backend/bisheng/utils/util.py b/src/backend/bisheng/utils/util.py
index 53b35df14..c0b373e75 100644
--- a/src/backend/bisheng/utils/util.py
+++ b/src/backend/bisheng/utils/util.py
@@ -213,7 +213,7 @@ def format_dict(d, name: Optional[str] = None):
     Returns:
         A new dictionary with the desired modifications applied.
     """
-
+    need_remove_key = []
     # Process remaining keys
     for key, value in d.items():
         if key == '_type':
@@ -295,6 +295,13 @@ def format_dict(d, name: Optional[str] = None):
             value['options'] = constants.ANTHROPIC_MODELS
             value['list'] = True
             value['value'] = constants.ANTHROPIC_MODELS[0]
+
+        if 'value' in value and type(value['value']) == set:
+            value['value'] = list(value['value'])
+        if 'value' in value and inspect.isfunction(value['value']):
+            need_remove_key.append(key)
+    for one in need_remove_key:
+        del d[one]
     return d
 
 
diff --git a/src/backend/bisheng/workflow/common/node.py b/src/backend/bisheng/workflow/common/node.py
index cafabaff1..b5b7c0aa2 100644
--- a/src/backend/bisheng/workflow/common/node.py
+++ b/src/backend/bisheng/workflow/common/node.py
@@ -24,7 +24,7 @@ class NodeType(Enum):
 class NodeParams(BaseModel):
     key: str = Field(default="", description="变量的key")
     label: Optional[str] = Field("", description="变量描述文本")
-    value: Optional[Any] = Field(description="变量的值")
+    value: Optional[Any] = Field(None, description="变量的值")
 
     # 变量类型 -> 数据格式的详情参考 https://dataelem.feishu.cn/wiki/IfBvwwvfFiHjuQkjFJgcxzoGnxb
     type: Optional[str] = Field("", description="变量类型")
diff --git a/src/backend/bisheng/workflow/graph/graph_state.py b/src/backend/bisheng/workflow/graph/graph_state.py
index 712a53c70..70935a935 100644
--- a/src/backend/bisheng/workflow/graph/graph_state.py
+++ b/src/backend/bisheng/workflow/graph/graph_state.py
@@ -9,7 +9,7 @@ class GraphState(BaseModel):
     """ 所有节点的 全局状态管理 """
 
     # 存储聊天历史
-    history_memory: Optional[ConversationBufferWindowMemory]
+    history_memory: Optional[ConversationBufferWindowMemory] = None
 
     # 全局变量池
     variables_pool: Dict[str, Dict[str, Any]] = Field(default={}, description='全局变量池: {node_id: {key: value}}')
diff --git a/src/backend/bisheng/workflow/nodes/condition/conidition_case.py b/src/backend/bisheng/workflow/nodes/condition/conidition_case.py
index d4a58e215..6ab001f52 100644
--- a/src/backend/bisheng/workflow/nodes/condition/conidition_case.py
+++ b/src/backend/bisheng/workflow/nodes/condition/conidition_case.py
@@ -1,7 +1,7 @@
 import re
 from typing import List, Optional, Dict
 
-from pydantic import BaseModel, Field
+from pydantic import ConfigDict, BaseModel, Field
 from loguru import logger
 
 from bisheng.workflow.nodes.base import BaseNode
@@ -60,8 +60,7 @@ class ConditionOne(BaseModel):
 
 
 class ConditionCases(BaseModel):
-    class Config:
-        arbitrary_types_allowed = True
+    model_config = ConfigDict(arbitrary_types_allowed=True)
 
     id: str = Field(..., description='Unique id for case')
     operator: Optional[str] = Field('and', description='Operator for case')
diff --git a/src/backend/bisheng/workflow/nodes/output/output_fake.py b/src/backend/bisheng/workflow/nodes/output/output_fake.py
index 719e74b80..12f40240e 100644
--- a/src/backend/bisheng/workflow/nodes/output/output_fake.py
+++ b/src/backend/bisheng/workflow/nodes/output/output_fake.py
@@ -1,14 +1,12 @@
 from bisheng.workflow.callback.event import NodeEndData
-from pydantic import BaseModel, Field
+from pydantic import ConfigDict, BaseModel, Field
 
 from bisheng.workflow.nodes.output.output import OutputNode
 
 
 class OutputFakeNode(BaseModel):
     """ 用来处理output的中断，判断是否需要用户的输入 """
-
-    class Config:
-        arbitrary_types_allowed = True
+    model_config = ConfigDict(arbitrary_types_allowed=True)
 
     id: str
     output_node: OutputNode
diff --git a/src/backend/pyproject.toml b/src/backend/pyproject.toml
index ed272e270..1ecbe1af1 100644
--- a/src/backend/pyproject.toml
+++ b/src/backend/pyproject.toml
@@ -43,7 +43,7 @@ redis = "^5.0.0"
 jieba = "^0.42.1"
 PyMuPDF = "^1.23.8"
 shapely = "^2.0.1"
-fastapi = "^0.108.0"
+fastapi = "^0.115.0"
 uvicorn = "^0.23.1"
 beautifulsoup4 = "^4.12.2"
 google-search-results = "^2.4.1"

From 3984a363d28830b9322577eca4488941b8f09f76 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Mon, 14 Apr 2025 19:23:55 +0800
Subject: [PATCH 004/186] feat: patch fastapi_jwt_auth lib

---
 src/backend/Dockerfile                        |  1 +
 .../bisheng/patches/fastapi_jwt_auth.patch    | 22 +++++++++++++++++++
 .../patches/fastapi_jwt_auth_auth_jwt.patch   |  4 ++++
 3 files changed, 27 insertions(+)
 create mode 100644 src/backend/bisheng/patches/fastapi_jwt_auth.patch
 create mode 100644 src/backend/bisheng/patches/fastapi_jwt_auth_auth_jwt.patch

diff --git a/src/backend/Dockerfile b/src/backend/Dockerfile
index 4a74fb85b..00f5124d2 100644
--- a/src/backend/Dockerfile
+++ b/src/backend/Dockerfile
@@ -13,5 +13,6 @@ RUN patch -p1 < /app/bisheng/patches/langchain_openai.patch /usr/local/lib/pytho
 # patch fastapi-jwt-auth lib. remove this when remove fastapi-jwt-auth
 # fix fastapi-jwt-auth not support pydantic:v2
 RUN patch -p1 < /app/bisheng/patches/fastapi_jwt_auth.patch /usr/local/lib/python3.10/site-packages/fastapi_jwt_auth/config.py
+RUN patch -p1 < /app/bisheng/patches/fastapi_jwt_auth_auth_jwt.patch /usr/local/lib/python3.10/site-packages/fastapi_jwt_auth/auth_jwt.py
 
 CMD ["sh entrypoint.sh"]
diff --git a/src/backend/bisheng/patches/fastapi_jwt_auth.patch b/src/backend/bisheng/patches/fastapi_jwt_auth.patch
new file mode 100644
index 000000000..f8278ce14
--- /dev/null
+++ b/src/backend/bisheng/patches/fastapi_jwt_auth.patch
@@ -0,0 +1,22 @@
+12c12
+<     authjwt_token_location: Optional[Sequence[StrictStr]] = {'headers'}
+---
+>     authjwt_token_location: Optional[List[StrictStr]] = {'headers'}
+21c21
+<     authjwt_decode_audience: Optional[Union[StrictStr,Sequence[StrictStr]]] = None
+---
+>     authjwt_decode_audience: Optional[Union[StrictStr,List[StrictStr]]] = None
+23c23
+<     authjwt_denylist_token_checks: Optional[Sequence[StrictStr]] = {'access','refresh'}
+---
+>     authjwt_denylist_token_checks: Optional[List[StrictStr]] = {'access','refresh'}
+45c45
+<     authjwt_csrf_methods: Optional[Sequence[StrictStr]] = {'POST','PUT','PATCH','DELETE'}
+---
+>     authjwt_csrf_methods: Optional[List[StrictStr]] = {'POST','PUT','PATCH','DELETE'}
+84,85c84,85
+<         min_anystr_length = 1
+<         anystr_strip_whitespace = True
+---
+>         str_min_length = 1
+>         str_strip_whitespace = True
diff --git a/src/backend/bisheng/patches/fastapi_jwt_auth_auth_jwt.patch b/src/backend/bisheng/patches/fastapi_jwt_auth_auth_jwt.patch
new file mode 100644
index 000000000..96c1ff86e
--- /dev/null
+++ b/src/backend/bisheng/patches/fastapi_jwt_auth_auth_jwt.patch
@@ -0,0 +1,4 @@
+194c194
+<         ).decode('utf-8')
+---
+>         )

From 63b263f490a4bc48d1c044ec16e5e722d2f018b8 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Mon, 14 Apr 2025 19:25:43 +0800
Subject: [PATCH 005/186] feat: upgrade python version

---
 src/backend/pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backend/pyproject.toml b/src/backend/pyproject.toml
index 1ecbe1af1..8b63ac310 100644
--- a/src/backend/pyproject.toml
+++ b/src/backend/pyproject.toml
@@ -18,7 +18,7 @@ include = ["./bisheng/*", "bisheng/**/*"]
 bisheng = "bisheng.__main__:main"
 
 [tool.poetry.dependencies]
-python = ">=3.9,<3.11"
+python = ">=3.10,<3.11"
 bisheng_langchain = "1.2.0"
 bisheng_pyautogen = "0.3.2"
 langchain = "^0.3.23"

From 09d2a8f37f7230838056d7963f958c48a381a631 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Mon, 14 Apr 2025 20:34:38 +0800
Subject: [PATCH 006/186] fix: optional field must have default value

---
 src/backend/bisheng/api/v1/schemas.py         | 22 +++++++++----------
 .../bisheng/mcp_manage/langchain/__init__.py  |  0
 .../bisheng/mcp_manage/langchain/tool.py      | 11 ++++++++++
 .../bisheng/restructure/assistants/agent.py   |  2 +-
 .../gpts/tools/sql_agent/tool.py              | 22 +++++++++----------
 5 files changed, 34 insertions(+), 23 deletions(-)
 create mode 100644 src/backend/bisheng/mcp_manage/langchain/__init__.py
 create mode 100644 src/backend/bisheng/mcp_manage/langchain/tool.py

diff --git a/src/backend/bisheng/api/v1/schemas.py b/src/backend/bisheng/api/v1/schemas.py
index b19b20339..4a845b4b4 100644
--- a/src/backend/bisheng/api/v1/schemas.py
+++ b/src/backend/bisheng/api/v1/schemas.py
@@ -12,7 +12,7 @@ from bisheng.database.models.message import ChatMessageRead
 from bisheng.database.models.tag import Tag
 from langchain.docstore.document import Document
 from orjson import orjson
-from pydantic import BaseModel, Field, root_validator, validator, model_validator, field_validator
+from pydantic import BaseModel, Field, model_validator, field_validator
 
 
 class CaptchaInput(BaseModel):
@@ -143,24 +143,24 @@ class ChatMessage(BaseModel):
     message: Union[str, None, dict, list] = ''
     type: str = 'human'
     category: str = 'processing'  # system processing answer tool
-    intermediate_steps: str = None
+    intermediate_steps: Optional[str] = None
     files: Optional[list] = []
-    user_id: int = None
-    message_id: int | str = None
+    user_id: Optional[int] = None
+    message_id: Optional[int | str] = None
     source: int = 0
-    sender: str = None
-    receiver: dict = None
+    sender: Optional[str] = None
+    receiver: Optional[dict] = None
     liked: int = 0
     extra: Optional[str | dict] = '{}'
-    flow_id: str = None
-    chat_id: str = None
+    flow_id: Optional[str] = None
+    chat_id: Optional[str] = None
 
 
 class ChatResponse(ChatMessage):
     """Chat response schema."""
 
     intermediate_steps: str = ''
-    is_bot: bool = True
+    is_bot: bool | int = True
     category: str = 'processing'
 
     @field_validator('type')
@@ -170,8 +170,8 @@ class ChatResponse(ChatMessage):
         end_cover: 结束并覆盖上一条message
         """
         if v not in [
-                'start', 'stream', 'end', 'error', 'info', 'file', 'begin', 'close', 'end_cover',
-                'over'
+            'start', 'stream', 'end', 'error', 'info', 'file', 'begin', 'close', 'end_cover',
+            'over'
         ]:
             raise ValueError('type must be start, stream, end, error, info, or file')
         return v
diff --git a/src/backend/bisheng/mcp_manage/langchain/__init__.py b/src/backend/bisheng/mcp_manage/langchain/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/backend/bisheng/mcp_manage/langchain/tool.py b/src/backend/bisheng/mcp_manage/langchain/tool.py
new file mode 100644
index 000000000..1c22e5737
--- /dev/null
+++ b/src/backend/bisheng/mcp_manage/langchain/tool.py
@@ -0,0 +1,11 @@
+from typing import Type
+
+from langchain_core.tools import BaseTool
+from pydantic import BaseModel
+
+
+class McpTool(BaseTool):
+
+    args_schema: Type[BaseModel] = BaseModel
+
+    pass
diff --git a/src/backend/bisheng/restructure/assistants/agent.py b/src/backend/bisheng/restructure/assistants/agent.py
index d1e469307..582d25f06 100644
--- a/src/backend/bisheng/restructure/assistants/agent.py
+++ b/src/backend/bisheng/restructure/assistants/agent.py
@@ -75,7 +75,7 @@ class RtcAssistantAgent(AssistantAgent):
         return tools, flows, knowledge
 
     def split_preset_personal(self, tools: tp.List[GptsTools]):
-        """区分预定义tool和自定义tool"""
+        """区分预定义tool和自定义tool、mcptool"""
         preset_tools = []
         personal_tools = []
         for one in tools:
diff --git a/src/bisheng-langchain/bisheng_langchain/gpts/tools/sql_agent/tool.py b/src/bisheng-langchain/bisheng_langchain/gpts/tools/sql_agent/tool.py
index 040a25605..9781362d7 100644
--- a/src/bisheng-langchain/bisheng_langchain/gpts/tools/sql_agent/tool.py
+++ b/src/bisheng-langchain/bisheng_langchain/gpts/tools/sql_agent/tool.py
@@ -64,17 +64,17 @@ class SqlAgentAPIWrapper(BaseModel):
     llm: BaseLanguageModel = Field(description="llm to use for sql agent")
     sql_address: str = Field(description="sql database address for SQLDatabase uri")
 
-    db: Optional[SQLDatabase]
-    list_tables_tool: Optional[BaseTool]
-    get_schema_tool: Optional[BaseTool]
-    db_query_tool: Optional[BaseTool]
-    query_check: Optional[Any]
-    query_gen: Optional[Any]
-    workflow: Optional[StateGraph]
-    app: Optional[Any]
-    schema_llm: Optional[Any]
-    query_check_llm: Optional[Any]
-    query_gen_llm: Optional[Any]
+    db: Optional[SQLDatabase] = None
+    list_tables_tool: Optional[BaseTool] = None
+    get_schema_tool: Optional[BaseTool] = None
+    db_query_tool: Optional[BaseTool] = None
+    query_check: Optional[Any] = None
+    query_gen: Optional[Any] = None
+    workflow: Optional[StateGraph] = None
+    app: Optional[Any] = None
+    schema_llm: Optional[Any] = None
+    query_check_llm: Optional[Any] = None
+    query_gen_llm: Optional[Any] = None
 
     class Config:
         arbitrary_types_allowed = True

From 78c8fe1ac2ff39a48fc61376efb22853ef09e945 Mon Sep 17 00:00:00 2001
From: dolphin <shanghang@dataelem.com>
Date: Mon, 14 Apr 2025 21:21:40 +0800
Subject: [PATCH 007/186] =?UTF-8?q?feat:=20=E5=88=B7=E6=96=B0mcp=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/bs-comp/sheets/ToolsSheet.tsx  |  5 ++---
 .../platform/src/controllers/API/assistant.ts | 19 ++++++++++++++-----
 .../src/pages/BuildPage/tools/index.tsx       | 11 +++++++----
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/frontend/platform/src/components/bs-comp/sheets/ToolsSheet.tsx b/src/frontend/platform/src/components/bs-comp/sheets/ToolsSheet.tsx
index 6c7a36b18..8476109d4 100644
--- a/src/frontend/platform/src/components/bs-comp/sheets/ToolsSheet.tsx
+++ b/src/frontend/platform/src/components/bs-comp/sheets/ToolsSheet.tsx
@@ -2,7 +2,7 @@ import { Accordion } from "@/components/bs-ui/accordion";
 import { Button } from "@/components/bs-ui/button";
 import { SearchInput } from "@/components/bs-ui/input";
 import { Sheet, SheetContent, SheetTitle, SheetTrigger } from "@/components/bs-ui/sheet";
-import { getAssistantMcpApi, getAssistantToolsApi } from "@/controllers/API/assistant";
+import { getAssistantToolsApi } from "@/controllers/API/assistant";
 import ToolItem from "@/pages/BuildPage/tools/ToolItem";
 import { CpuIcon, Star, User } from "lucide-react";
 import { useEffect, useMemo, useState } from "react";
@@ -16,8 +16,7 @@ export default function ToolsSheet({ select, onSelect, children }) {
     const [allData, setAllData] = useState([])
 
     useEffect(() => {
-        const p = type === 'mcp' ? getAssistantMcpApi() : getAssistantToolsApi(type)
-        p.then(res => {
+        getAssistantToolsApi(type).then(res => {
             setAllData(res)
             setKeyword('')
         })
diff --git a/src/frontend/platform/src/controllers/API/assistant.ts b/src/frontend/platform/src/controllers/API/assistant.ts
index cb03b8eec..51f112fe6 100644
--- a/src/frontend/platform/src/controllers/API/assistant.ts
+++ b/src/frontend/platform/src/controllers/API/assistant.ts
@@ -80,19 +80,28 @@ export const getChatOnlineApi = async (page, keyword, tag_id) => {
 
 
 // 获取工具集合
-export const getAssistantToolsApi = async (type: 'all' | 'default' | 'custom'): Promise<any> => {
+// 之前的is_preset字段改为了枚举
+// 0：自定义api工具
+// 1：预置工具
+// 2：mcp工具
+export const getAssistantToolsApi = async (type: 'all' | 'default' | 'custom' | 'mcp'): Promise<any> => {
     const queryStr = {
         all: '',
-        default: '?is_preset=true',
-        custom: '?is_preset=false'
+        default: '?is_preset=1',
+        custom: '?is_preset=0',
+        mcp: '?is_preset=2'
     }
     return await axios.get(`/api/v1/assistant/tool_list${queryStr[type]}`)
 };
 
 // 获取mcp服务集合
 export const getAssistantMcpApi = async (): Promise<any> => {
-    // TODO 转换数据结构与getAssistantToolsApi一致,方便ui处理
-    return await axios.get(`/api/v1/assistant/tool_list?is_preset=false`)
+    return getAssistantToolsApi('mcp')
+}
+
+// 刷新mcp服务
+export const refreshAssistantMcpApi = async (): Promise<any> => {
+    return await axios.post(`/api/v1/assistant/mcp/refresh`)
 }
 
 // 修改内置工具配置
diff --git a/src/frontend/platform/src/pages/BuildPage/tools/index.tsx b/src/frontend/platform/src/pages/BuildPage/tools/index.tsx
index c5ec3b4e2..17cd31833 100644
--- a/src/frontend/platform/src/pages/BuildPage/tools/index.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/tools/index.tsx
@@ -2,7 +2,7 @@ import { Accordion } from "@/components/bs-ui/accordion";
 import { Button } from "@/components/bs-ui/button";
 import { SearchInput } from "@/components/bs-ui/input";
 import { userContext } from "@/contexts/userContext";
-import { getAssistantMcpApi, getAssistantToolsApi } from "@/controllers/API/assistant";
+import { getAssistantMcpApi, getAssistantToolsApi, refreshAssistantMcpApi } from "@/controllers/API/assistant";
 import { CpuIcon, Star, User } from "lucide-react";
 import { useContext, useEffect, useMemo, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -190,17 +190,20 @@ const useMcpRefrensh = () => {
         async refresh() {
             setLoading(true);
             // api
-            setTimeout(() => {
+            const res = await refreshAssistantMcpApi()
+            console.log('刷新 :>> ', res);
+            if (res) {
                 message({
                     variant: "success",
                     description: "刷新成功"
                 })
+            } else {
                 message({
                     variant: "error",
                     description: "{xxx MCP服务器名称}工具获取失败，请重试"
                 })
-                setLoading(false);
-            }, 1000);
+            }
+            setLoading(false);
         }
     }
 }

From 6217c374e37e96558d3b0f0095442226201b1fc6 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Tue, 15 Apr 2025 19:31:39 +0800
Subject: [PATCH 008/186] feat: change assistant agent logic

---
 .../bisheng/api/services/assistant_agent.py   | 121 +++++++++++----
 src/backend/bisheng/api/v1/assistant.py       |   4 +-
 src/backend/bisheng/api/v1/callback.py        |   4 +-
 src/backend/bisheng/api/v1/schemas.py         |  29 ++--
 src/backend/bisheng/chat/manager.py           |   2 +-
 .../bisheng/database/models/gpts_tools.py     |   2 +-
 .../bisheng/database/models/llm_server.py     |   4 +-
 src/backend/bisheng/main.py                   |   2 -
 .../bisheng/mcp_manage/langchain/tool.py      |  86 ++++++++++-
 src/backend/bisheng/restructure/__init__.py   |   0
 .../restructure/assistants/__init__.py        |   0
 .../bisheng/restructure/assistants/agent.py   | 145 ------------------
 .../bisheng/restructure/assistants/routers.py |   5 -
 .../bisheng/restructure/assistants/schemas.py |  16 --
 .../restructure/assistants/services.py        |  62 --------
 .../bisheng/restructure/assistants/views.py   |  45 ------
 src/backend/bisheng/restructure/logger.py     |  17 --
 src/backend/bisheng/restructure/register.py   |   7 -
 src/backend/bisheng/restructure/routers.py    |   6 -
 src/backend/bisheng/template/field/base.py    |   2 +-
 .../bisheng/workflow/graph/graph_state.py     |   2 +-
 .../bisheng/workflow/nodes/tool/tool.py       |   7 +-
 .../bisheng_langchain/chat_models/host_llm.py |   8 +-
 .../bisheng_langchain/chat_models/minimax.py  |   8 +-
 .../chat_models/proxy_llm.py                  |   8 +-
 .../bisheng_langchain/chat_models/qwen.py     |   8 +-
 .../chat_models/sensetime.py                  |   8 +-
 .../bisheng_langchain/chat_models/wenxin.py   |   8 +-
 .../bisheng_langchain/chat_models/xunfeiai.py |   8 +-
 .../bisheng_langchain/chat_models/zhipuai.py  |   8 +-
 .../embeddings/host_embedding.py              |   2 +-
 .../embeddings/huggingfacegte.py              |   2 +-
 .../embeddings/huggingfacemultilingual.py     |   2 +-
 .../bisheng_langchain/embeddings/wenxin.py    |  10 +-
 .../gpts/agent_types/llm_functions_agent.py   |  84 +---------
 .../gpts/agent_types/llm_react_agent.py       |   7 +-
 .../gpts/tools/api_tools/base.py              |   8 +-
 .../gpts/tools/api_tools/macro_data.py        |   4 +-
 .../gpts/tools/api_tools/openapi.py           |   6 +-
 .../gpts/tools/calculator/tool.py             |   2 +-
 .../gpts/tools/code_interpreter/tool.py       |   2 +-
 .../gpts/tools/dalle_image_generator/tool.py  |  10 +-
 .../gpts/tools/message/feishu.py              |  16 +-
 .../gpts/tools/sql_agent/tool.py              |   6 +-
 .../bisheng_langchain/input_output/input.py   |  18 +--
 .../bisheng_langchain/input_output/output.py  |   8 +-
 .../rag/bisheng_rag_chain.py                  |  10 +-
 .../bisheng_langchain/utils/requests.py       |  16 +-
 .../vectorstores/retriever.py                 |   8 +-
 49 files changed, 276 insertions(+), 577 deletions(-)
 delete mode 100644 src/backend/bisheng/restructure/__init__.py
 delete mode 100644 src/backend/bisheng/restructure/assistants/__init__.py
 delete mode 100644 src/backend/bisheng/restructure/assistants/agent.py
 delete mode 100644 src/backend/bisheng/restructure/assistants/routers.py
 delete mode 100644 src/backend/bisheng/restructure/assistants/schemas.py
 delete mode 100644 src/backend/bisheng/restructure/assistants/services.py
 delete mode 100644 src/backend/bisheng/restructure/assistants/views.py
 delete mode 100644 src/backend/bisheng/restructure/logger.py
 delete mode 100644 src/backend/bisheng/restructure/register.py
 delete mode 100644 src/backend/bisheng/restructure/routers.py

diff --git a/src/backend/bisheng/api/services/assistant_agent.py b/src/backend/bisheng/api/services/assistant_agent.py
index 9bdb2d517..96bd1a059 100644
--- a/src/backend/bisheng/api/services/assistant_agent.py
+++ b/src/backend/bisheng/api/services/assistant_agent.py
@@ -6,18 +6,6 @@ import uuid
 from pathlib import Path
 from typing import Any, Dict, List
 
-from bisheng.api.services.assistant_base import AssistantUtils
-from bisheng.api.services.knowledge_imp import decide_vectorstores
-from bisheng.api.services.llm import LLMService
-from bisheng.api.services.openapi import OpenApiSchema
-from bisheng.api.utils import build_flow_no_yield
-from bisheng.api.v1.schemas import InputRequest
-from bisheng.database.models.assistant import Assistant, AssistantLink, AssistantLinkDao
-from bisheng.database.models.flow import FlowDao, FlowStatus
-from bisheng.database.models.gpts_tools import GptsTools, GptsToolsDao, GptsToolsType
-from bisheng.database.models.knowledge import Knowledge, KnowledgeDao
-from bisheng.settings import settings
-from bisheng.utils.embedding import decide_embeddings
 from bisheng_langchain.gpts.assistant import ConfigurableAssistant
 from bisheng_langchain.gpts.auto_optimization import (generate_breif_description,
                                                       generate_opening_dialog,
@@ -35,6 +23,23 @@ from langchain_core.utils.function_calling import format_tool_to_openai_tool
 from langchain_core.vectorstores import VectorStoreRetriever
 from loguru import logger
 
+from bisheng.api.services.assistant_base import AssistantUtils
+from bisheng.api.services.knowledge_imp import decide_vectorstores
+from bisheng.api.services.llm import LLMService
+from bisheng.api.services.openapi import OpenApiSchema
+from bisheng.api.utils import build_flow_no_yield
+from bisheng.api.v1.schemas import InputRequest
+from bisheng.database.constants import ToolPresetType
+from bisheng.database.models.assistant import Assistant, AssistantLink, AssistantLinkDao
+from bisheng.database.models.flow import FlowDao, FlowStatus
+from bisheng.database.models.gpts_tools import GptsTools, GptsToolsDao, GptsToolsType
+from bisheng.database.models.knowledge import Knowledge, KnowledgeDao
+from bisheng.mcp_manage.constant import McpClientType
+from bisheng.mcp_manage.langchain.tool import McpTool
+from bisheng.mcp_manage.manager import ClientManager
+from bisheng.settings import settings
+from bisheng.utils.embedding import decide_embeddings
+
 
 class AssistantAgent(AssistantUtils):
     # cohere的模型需要的特殊prompt
@@ -185,12 +190,35 @@ class AssistantAgent(AssistantUtils):
             tool_langchain.append(openapi_tool)
         return tool_langchain
 
-    async def init_personal_tools(self, tool_list: List[GptsTools], callbacks: Callbacks = None):
+    @staticmethod
+    def sync_init_mcp_tools(tool_list: List[GptsTools], callbacks: Callbacks = None):
         """
-        初始化自定义工具列表
+        初始化mcp工具列表
         """
-        return asyncio.get_running_loop().run_in_executor(None, self.sync_init_personal_tools,
-                                                          tool_list, callbacks)
+        loop = asyncio.get_event_loop()
+        future = asyncio.run_coroutine_threadsafe(AssistantAgent.async_init_mcp_tools(tool_list, callbacks), loop)
+        return future.result()
+
+    @staticmethod
+    async def async_init_mcp_tools(tool_list: List[GptsTools], callbacks: Callbacks = None):
+        """
+        初始化mcp工具列表
+        """
+        tool_type_ids = [one.type for one in tool_list]
+        all_tool_type = GptsToolsDao.get_all_tool_type(tool_type_ids)
+        all_tool_type = {one.id: one for one in all_tool_type}
+        tool_langchain = []
+        for one in tool_list:
+            tool_type = all_tool_type.get(one.type)
+            input_schema = json.loads(one.extra)
+            print("--===-------", input_schema)
+            mcp_client = await ClientManager.connect_mcp(McpClientType.SSE.value, url=tool_type.server_host)
+            mcp_tool = McpTool.get_mcp_tool(name=one.tool_key, description=one.desc, mcp_client=mcp_client,
+                                            mcp_tool_name=one.name, arg_schema=input_schema['inputSchema'],
+                                            callbacks=callbacks)
+            print("---------", mcp_tool.tool_call_schema)
+            tool_langchain.append(mcp_tool)
+        return tool_langchain
 
     @staticmethod
     def sync_init_knowledge_tool(knowledge: Knowledge,
@@ -231,22 +259,33 @@ class AssistantAgent(AssistantUtils):
                                              callbacks,
                                              self.knowledge_retriever)
 
+    @staticmethod
+    def parse_tools_type(tool_ids: List[int]) -> (list, list, list):
+        """
+        解析工具类型
+        """
+        tools_model: List[GptsTools] = GptsToolsDao.get_list_by_ids(tool_ids)
+        preset_tools = []
+        personal_tools = []
+        mcp_tools = []
+        for one in tools_model:
+            if one.is_preset == ToolPresetType.PRESET.value:
+                preset_tools.append(one)
+            elif one.is_preset == ToolPresetType.API.value:
+                personal_tools.append(one)
+            else:
+                mcp_tools.append(one)
+        return preset_tools, personal_tools, mcp_tools
+
     @staticmethod
     def init_tools_by_toolid(
             tool_ids: List[int],
             llm: BaseLanguageModel,
             callbacks: Callbacks = None,
     ):
-        """通过id初始化tool"""
-        tools_model: List[GptsTools] = GptsToolsDao.get_list_by_ids(tool_ids)
-        preset_tools = []
-        personal_tools = []
-        tools: List[BaseTool] = []
-        for one in tools_model:
-            if one.is_preset:
-                preset_tools.append(one)
-            else:
-                personal_tools.append(one)
+        """ 通过id初始化tool ！！！ 只能在没有事件循环的线程中调用 """
+        tools = []
+        preset_tools, personal_tools, mcp_tools = AssistantAgent.parse_tools_type(tool_ids)
         if preset_tools:
             tool_langchain = AssistantAgent.sync_init_preset_tools(preset_tools, llm, callbacks)
             logger.info('act=build_preset_tools size={} return_tools={}', len(preset_tools),
@@ -257,6 +296,34 @@ class AssistantAgent(AssistantUtils):
             logger.info('act=build_personal_tools size={} return_tools={}', len(personal_tools),
                         len(tool_langchain))
             tools += tool_langchain
+        if mcp_tools:
+            tool_langchain = AssistantAgent.sync_init_mcp_tools(mcp_tools, callbacks)
+            logger.info('act=build_mcp_tools size={} return_tools={}', len(mcp_tools),
+                        len(tool_langchain))
+            tools += tool_langchain
+        return tools
+
+    @staticmethod
+    async def init_tools_by_tool_ids(tool_ids: List[int],
+                                     llm: BaseLanguageModel,
+                                     callbacks: Callbacks = None, ):
+        tools = []
+        preset_tools, personal_tools, mcp_tools = AssistantAgent.parse_tools_type(tool_ids)
+        if preset_tools:
+            tool_langchain = AssistantAgent.sync_init_preset_tools(preset_tools, llm, callbacks)
+            logger.info('act=build_preset_tools size={} return_tools={}', len(preset_tools),
+                        len(tool_langchain))
+            tools += tool_langchain
+        if personal_tools:
+            tool_langchain = AssistantAgent.sync_init_personal_tools(personal_tools, callbacks)
+            logger.info('act=build_personal_tools size={} return_tools={}', len(personal_tools),
+                        len(tool_langchain))
+            tools += tool_langchain
+        if mcp_tools:
+            tools_langchain = await AssistantAgent.async_init_mcp_tools(mcp_tools, callbacks)
+            logger.info('act=build_mcp_tools size={} return_tools={}', len(mcp_tools),
+                        len(tools_langchain))
+            tools += tools_langchain
         return tools
 
     async def init_tools(self, callbacks: Callbacks = None):
@@ -275,7 +342,7 @@ class AssistantAgent(AssistantUtils):
             else:
                 flow_links.append(link)
         if tool_ids:
-            tools = self.init_tools_by_toolid(tool_ids, self.llm, callbacks)
+            tools = await self.init_tools_by_tool_ids(tool_ids, self.llm, callbacks)
 
         # flow + knowledge
         flow_data = FlowDao.get_flow_by_ids([link.flow_id for link in flow_links if link.flow_id])
diff --git a/src/backend/bisheng/api/v1/assistant.py b/src/backend/bisheng/api/v1/assistant.py
index 2de3ecf5b..216ebe812 100644
--- a/src/backend/bisheng/api/v1/assistant.py
+++ b/src/backend/bisheng/api/v1/assistant.py
@@ -192,9 +192,11 @@ async def chat(*,
 
 @router.get('/tool_list')
 def get_tool_list(*,
-                  is_preset: Optional[int] = None,
+                  is_preset: Optional[int | bool] = None,
                   login_user: UserPayload = Depends(get_login_user)):
     """查询所有可见的tool 列表"""
+    if is_preset is not None and type(is_preset) == bool:
+        is_preset = ToolPresetType.PRESET.value if is_preset else ToolPresetType.API.value
     return resp_200(AssistantService.get_gpts_tools(login_user, is_preset))
 
 
diff --git a/src/backend/bisheng/api/v1/callback.py b/src/backend/bisheng/api/v1/callback.py
index b16f436a9..3ac9561a1 100644
--- a/src/backend/bisheng/api/v1/callback.py
+++ b/src/backend/bisheng/api/v1/callback.py
@@ -14,6 +14,7 @@ from langchain.schema import AgentFinish, LLMResult
 from langchain.schema.agent import AgentAction
 from langchain.schema.document import Document
 from langchain.schema.messages import BaseMessage
+from langchain_core.messages import ToolMessage
 
 
 # https://github.com/hwchase17/chat-langchain/blob/master/callback.py
@@ -495,8 +496,9 @@ class AsyncGptsDebugCallbackHandler(AsyncGptsLLMCallbackHandler):
                             extra=json.dumps({'run_id': kwargs.get('run_id').hex}))
         await self.websocket.send_json(resp.dict())
 
-    async def on_tool_end(self, output: str, **kwargs: Any) -> Any:
+    async def on_tool_end(self, output: ToolMessage, **kwargs: Any) -> Any:
         """Run when tool ends running."""
+        output = output.content
         logger.debug(f'on_tool_end output={output} kwargs={kwargs}')
         observation_prefix = kwargs.get('observation_prefix', 'Tool output: ')
 
diff --git a/src/backend/bisheng/api/v1/schemas.py b/src/backend/bisheng/api/v1/schemas.py
index 4a845b4b4..4128ff145 100644
--- a/src/backend/bisheng/api/v1/schemas.py
+++ b/src/backend/bisheng/api/v1/schemas.py
@@ -272,6 +272,11 @@ class AssistantUpdateReq(BaseModel):
     flow_list: List[str] | None = Field(default=None, description='助手的技能ID列表，为None则不更新')
     knowledge_list: List[int] | None = Field(default=None, description='知识库ID列表，为None则不更新')
 
+    @field_validator('model_name', mode='before')
+    @classmethod
+    def convert_model_name(cls, v):
+        return str(v)
+
 
 class AssistantSimpleInfo(BaseModel):
     id: str
@@ -290,9 +295,9 @@ class AssistantSimpleInfo(BaseModel):
 
 
 class AssistantInfo(AssistantBase):
-    tool_list: List[GptsToolsRead] = Field(default=[], description='助手的工具ID列表')
-    flow_list: List[FlowRead] = Field(default=[], description='助手的技能ID列表')
-    knowledge_list: List[KnowledgeRead] = Field(default=[], description='知识库ID列表')
+    tool_list: List[GptsToolsRead] = Field(default_factory=list, description='助手的工具ID列表')
+    flow_list: List[FlowRead] = Field(default_factory=list, description='助手的技能ID列表')
+    knowledge_list: List[KnowledgeRead] = Field(default_factory=list, description='知识库ID列表')
 
 
 class FlowVersionCreate(BaseModel):
@@ -305,8 +310,8 @@ class FlowVersionCreate(BaseModel):
 
 class FlowCompareReq(BaseModel):
     inputs: Any = Field(default=None, description='技能运行所需要的输入')
-    question_list: List[str] = Field(default=[], description='测试case列表')
-    version_list: List[int] = Field(default=[], description='对比版本ID列表')
+    question_list: List[str] = Field(default_factory=list, description='测试case列表')
+    version_list: List[int] = Field(default_factory=list, description='对比版本ID列表')
     node_id: str = Field(default=None, description='需要对比的节点唯一ID')
     thread_num: Optional[int] = Field(default=1, description='对比线程数')
 
@@ -344,7 +349,7 @@ class OpenAIChatCompletionReq(BaseModel):
     n: int = Field(default=1, description='返回的答案个数, 助手侧默认为1，暂不支持多个回答')
     stream: bool = Field(default=False, description='是否开启流式回复')
     temperature: float = Field(default=0.0, description='模型温度, 传入0或者不传表示不覆盖')
-    tools: List[dict] = Field(default=[], description='工具列表, 助手暂不支持，使用助手的配置')
+    tools: List[dict] = Field(default_factory=list, description='工具列表, 助手暂不支持，使用助手的配置')
 
 
 class OpenAIChoice(BaseModel):
@@ -382,7 +387,7 @@ class LLMServerCreateReq(BaseModel):
     limit_flag: Optional[bool] = Field(default=False, description='是否开启每日调用次数限制')
     limit: Optional[int] = Field(default=0, description='每日调用次数限制')
     config: Optional[dict] = Field(default=None, description='服务提供方配置')
-    models: Optional[List[LLMModelCreateReq]] = Field(default=[], description='服务提供方下的模型列表')
+    models: Optional[List[LLMModelCreateReq]] = Field(default_factory=list, description='服务提供方下的模型列表')
 
 
 class LLMModelInfo(LLMModelBase):
@@ -390,8 +395,8 @@ class LLMModelInfo(LLMModelBase):
 
 
 class LLMServerInfo(LLMServerBase):
-    id: Optional[int]
-    models: List[LLMModelInfo] = Field(default=[], description='模型列表')
+    id: Optional[int] = None
+    models: List[LLMModelInfo] = Field(default_factory=list, description='模型列表')
 
 
 class KnowledgeLLMConfig(BaseModel):
@@ -412,7 +417,7 @@ class AssistantLLMItem(BaseModel):
 
 
 class AssistantLLMConfig(BaseModel):
-    llm_list: Optional[List[AssistantLLMItem]] = Field(default=[], description='助手可选的LLM列表')
+    llm_list: Optional[List[AssistantLLMItem]] = Field(default_factory=list, description='助手可选的LLM列表')
     auto_llm: Optional[AssistantLLMItem] = Field(None, description='助手画像自动优化模型的配置')
 
 
@@ -423,8 +428,8 @@ class EvaluationLLMConfig(BaseModel):
 # 文件切分请求基础参数
 class FileProcessBase(BaseModel):
     knowledge_id: int = Field(..., description='知识库ID')
-    separator: Optional[List[str]] = Field(default=['\n\n', '\n'], description='切分文本规则, 不传则为默认')
-    separator_rule: Optional[List[str]] = Field(default=['after', 'after'],
+    separator: Optional[List[str]] = Field(default=None, description='切分文本规则, 不传则为默认')
+    separator_rule: Optional[List[str]] = Field(default=None,
                                                 description='切分规则前还是后进行切分；before/after')
     chunk_size: Optional[int] = Field(default=1000, description='切分文本长度，不传则为默认')
     chunk_overlap: Optional[int] = Field(default=100, description='切分文本重叠长度，不传则为默认')
diff --git a/src/backend/bisheng/chat/manager.py b/src/backend/bisheng/chat/manager.py
index 384977993..4324d6f74 100644
--- a/src/backend/bisheng/chat/manager.py
+++ b/src/backend/bisheng/chat/manager.py
@@ -54,7 +54,7 @@ class ChatHistory(Subject):
         if chat_id and (message.message or message.intermediate_steps
                         or message.files) and message.type != 'stream':
             msg = message.copy()
-            msg.message = json.dumps(msg.message) if isinstance(msg.message, dict) else msg.message
+            msg.message = json.dumps(msg.message, ensure_ascii=False) if isinstance(msg.message, dict) else msg.message
             files = json.dumps(msg.files) if msg.files else ''
             msg.__dict__.pop('files')
             db_message = ChatMessage(files=files, **msg.__dict__)
diff --git a/src/backend/bisheng/database/models/gpts_tools.py b/src/backend/bisheng/database/models/gpts_tools.py
index 0a8c711cf..4650d3ea1 100644
--- a/src/backend/bisheng/database/models/gpts_tools.py
+++ b/src/backend/bisheng/database/models/gpts_tools.py
@@ -82,7 +82,7 @@ class GptsToolsType(GptsToolsTypeBase, table=True):
 
 class GptsToolsTypeRead(GptsToolsTypeBase):
     openapi_schema: Optional[str] = Field(default="", description="工具类别的schema内容，符合openapi规范的数据")
-    children: Optional[List[GptsTools]] = Field(default=list, description="工具类别下的工具列表")
+    children: Optional[List[GptsTools]] = Field(default_factory=list, description="工具类别下的工具列表")
     parameter_name: Optional[str] = Field(default="", description="自定义请求头参数名")
     api_location: Optional[str] = Field(default="", description="自定义请求头参数位置 header or query")
 
diff --git a/src/backend/bisheng/database/models/llm_server.py b/src/backend/bisheng/database/models/llm_server.py
index 97a667d4a..682a3002e 100644
--- a/src/backend/bisheng/database/models/llm_server.py
+++ b/src/backend/bisheng/database/models/llm_server.py
@@ -40,7 +40,7 @@ class LLMServerBase(SQLModelSerializable):
     type: str = Field(sa_column=Column(CHAR(20)), description='服务提供方类型')
     limit_flag: bool = Field(default=False, description='是否开启每日调用次数限制')
     limit: int = Field(default=0, description='每日调用次数限制')
-    config: Optional[Dict] = Field(default=dict, sa_column=Column(JSON), description='服务提供方公共配置')
+    config: Optional[Dict] = Field(default=None, sa_column=Column(JSON), description='服务提供方公共配置')
     user_id: int = Field(default=0, description='创建人ID')
     create_time: Optional[datetime] = Field(default=None, sa_column=Column(
         DateTime, nullable=False, index=True, server_default=text('CURRENT_TIMESTAMP')))
@@ -54,7 +54,7 @@ class LLMModelBase(SQLModelSerializable):
     description: Optional[str] = Field(default='', sa_column=Column(Text), description='模型描述')
     model_name: str = Field(default='', description='模型名称，实例化组件时用的参数')
     model_type: str = Field(sa_column=Column(CHAR(20)), description='模型类型')
-    config: Optional[Dict] = Field(default=dict, sa_column=Column(JSON), description='服务提供方公共配置')
+    config: Optional[Dict] = Field(default=None, sa_column=Column(JSON), description='服务提供方公共配置')
     status: int = Field(default=2, description='模型状态。0：正常，1：异常, 2: 未知')
     remark: Optional[str] = Field(default='', sa_column=Column(Text), description='异常原因')
     online: bool = Field(default=True, description='是否在线')
diff --git a/src/backend/bisheng/main.py b/src/backend/bisheng/main.py
index 4143a79a3..4485f81e1 100644
--- a/src/backend/bisheng/main.py
+++ b/src/backend/bisheng/main.py
@@ -5,7 +5,6 @@ from typing import Optional
 from bisheng.api import router, router_rpc
 from bisheng.database.init_data import init_default_data
 from bisheng.interface.utils import setup_llm_caching
-from bisheng.restructure.register import register_restructure
 from bisheng.services.utils import initialize_services, teardown_services
 from bisheng.settings import settings
 from bisheng.utils.http_middleware import CustomMiddleware
@@ -95,7 +94,6 @@ def create_app():
 
     app.include_router(router)
     app.include_router(router_rpc)
-    register_restructure(app)
     return app
 
 
diff --git a/src/backend/bisheng/mcp_manage/langchain/tool.py b/src/backend/bisheng/mcp_manage/langchain/tool.py
index 1c22e5737..ce6531a36 100644
--- a/src/backend/bisheng/mcp_manage/langchain/tool.py
+++ b/src/backend/bisheng/mcp_manage/langchain/tool.py
@@ -1,11 +1,85 @@
-from typing import Type
+import asyncio
+from typing import Any, Type
 
-from langchain_core.tools import BaseTool
-from pydantic import BaseModel
+from langchain_core.tools import StructuredTool
+from pydantic import Field, create_model, BaseModel, ConfigDict
+
+from bisheng.mcp_manage.clients.base import BaseMcpClient
 
 
-class McpTool(BaseTool):
+def convert_openai_params_to_model(params: list[dict]) -> Type[BaseModel]:
+    model_params = {}
+    for one in params:
+        field_type = one['schema']['type']
+        if field_type == 'number':
+            field_type = float
+        elif field_type == 'integer':
+            field_type = int
+        elif field_type == 'string':
+            field_type = str
+        elif field_type == 'boolean':
+            field_type = bool
+        elif field_type == 'array':
+            field_type = list
+        elif field_type in {'object', 'dict'}:
+            param_object_param = {}
+            for param in one['schema']['properties'].keys():
+                field_type = one['schema']['properties'][param]['type']
+                if field_type == 'number':
+                    field_type = float
+                elif field_type == 'integer':
+                    field_type = int
+                elif field_type == 'string':
+                    field_type = str
+                elif field_type == 'boolean':
+                    field_type = bool
+                elif field_type == 'array':
+                    field_type = list
+                param_object_param[param] = (
+                    field_type,
+                    Field(description=one['schema']['properties'][param]['description']))
+            param_model = create_model(
+                param,
+                __module__='bisheng.mcp_manage.langchain.tool',
+                **param_object_param)
+            field_type = param_model
+        else:
+            raise Exception(f'schema type is not support: {field_type}')
+        model_params[one['name']] = (field_type, Field(description=one['description']))
+    return create_model('InputArgs',
+                        __module__='bisheng.mcp_manage.langchain.tool',
+                        __base__=BaseModel,
+                        **model_params)
 
-    args_schema: Type[BaseModel] = BaseModel
 
-    pass
+class McpTool(BaseModel):
+    model_config = ConfigDict(arbitrary_types_allowed=True)
+
+    name: str
+    description: str
+    mcp_client: BaseMcpClient
+    mcp_tool_name: str
+
+    def run(self, *args, **kwargs: Any) -> Any:
+        loop = asyncio.get_event_loop()
+        future = asyncio.run_coroutine_threadsafe(self._arun(**kwargs), loop)
+        return future.result()
+
+    async def arun(self, *args, **kwargs: Any) -> Any:
+        """Use the tool asynchronously."""
+        print(f"================ {args}| {kwargs}")
+        resp = await self.mcp_client.call_tool(self.mcp_tool_name, kwargs)
+        return resp
+
+    @classmethod
+    def get_mcp_tool(cls, name: str, description: str, mcp_client: BaseMcpClient,
+                     mcp_tool_name: str, arg_schema: Any, **kwargs) -> StructuredTool:
+        """Get a tool from the class."""
+        c = cls(name=name, description=description, mcp_client=mcp_client,
+                mcp_tool_name=mcp_tool_name)
+        return StructuredTool(name=c.name,
+                              description=c.description,
+                              func=c.run,
+                              coroutine=c.arun,
+                              args_schema=arg_schema,
+                              **kwargs)
diff --git a/src/backend/bisheng/restructure/__init__.py b/src/backend/bisheng/restructure/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/backend/bisheng/restructure/assistants/__init__.py b/src/backend/bisheng/restructure/assistants/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/backend/bisheng/restructure/assistants/agent.py b/src/backend/bisheng/restructure/assistants/agent.py
deleted file mode 100644
index 582d25f06..000000000
--- a/src/backend/bisheng/restructure/assistants/agent.py
+++ /dev/null
@@ -1,145 +0,0 @@
-import typing as tp
-from pathlib import Path
-
-from langchain_core.messages import AIMessage
-from langchain_core.runnables import RunnableConfig
-from langchain_core.tools import BaseTool, Tool
-
-from bisheng.api.services.assistant_agent import AssistantAgent
-from bisheng.api.utils import build_flow_no_yield
-from bisheng.api.v1.schemas import InputRequest
-from bisheng.cache.flow import InMemoryCache
-from bisheng.cache.utils import CACHE_DIR
-from bisheng.database.models.assistant import Assistant, AssistantLink, AssistantLinkDao
-from bisheng.database.models.flow import FlowDao, FlowStatus
-from bisheng.database.models.gpts_tools import GptsTools, GptsToolsDao
-from bisheng.database.models.knowledge import KnowledgeDao
-from bisheng.utils.logger import logger
-
-
-class RtcAssistantAgent(AssistantAgent):
-    PersistPath = Path(CACHE_DIR) / 'assistant'
-    MemoryCache = InMemoryCache()
-
-    def __init__(self, assistant: Assistant):
-        super().__init__(assistant, '')
-
-    async def async_init(self):
-        await self.init_llm()
-        await self.init_abilities()
-        await self.init_agent()
-
-    @classmethod
-    async def create(cls, assistant: Assistant) -> "RtcAssistantAgent":
-        if ins := cls.load(assistant.id):
-            return ins
-        else:
-            ins = cls(assistant)
-            await ins.async_init()
-            ins.save()
-            return ins
-
-    @classmethod
-    def load(cls, assistant_id: str):
-        return cls.MemoryCache.get(assistant_id)
-
-    def save(self):
-        self.MemoryCache.set(self.assistant.id, self)
-
-    async def init_abilities(self):
-        """初始化能力"""
-        # link要么是tool(非零)，要么是flow(非空)，要么是knowledge(非零)
-        logger.info(f"start initialize agent abilities...")
-        links = AssistantLinkDao.get_assistant_link(assistant_id=self.assistant.id)
-        tool_links, flows_links, knowledge_links = self.split_tool_flow_knowledge(links)
-        tools = await self.init_tools(tool_links)
-        flows = await self.init_flows(flows_links)
-        knowledge = await self.init_knowledge(knowledge_links)
-        self.tools = tools + flows + knowledge  # init_agent用
-
-    def split_tool_flow_knowledge(self, links: tp.List[AssistantLink]):
-        """
-        link要么是tool(非零)，要么是flow(非空)，要么是knowledge(非零)
-        应考虑分表 todo
-        """
-        tools = []
-        flows = []
-        knowledge = []
-        for link in links:
-            if link.tool_id:
-                tools.append(link)
-            elif link.flow_id:
-                flows.append(link)
-            elif link.knowledge_id:
-                knowledge.append(link)
-        return tools, flows, knowledge
-
-    def split_preset_personal(self, tools: tp.List[GptsTools]):
-        """区分预定义tool和自定义tool、mcptool"""
-        preset_tools = []
-        personal_tools = []
-        for one in tools:
-            if one.is_preset:
-                preset_tools.append(one)
-            else:
-                personal_tools.append(one)
-        return preset_tools, personal_tools
-
-    async def init_tools(self, tool_links: tp.List[AssistantLink]) -> tp.List[BaseTool]:
-        """初始化工具"""
-        logger.info(f"start initialize agent abilities: tools...")
-        tool_chains: tp.List[BaseTool] = []
-        tool_ids = [one.tool_id for one in tool_links]
-        instances = GptsToolsDao.get_list_by_ids(tool_ids)
-        preset_tools, personal_tools = self.split_preset_personal(instances)
-        if preset_tools:
-            preset_langchain = await self.init_preset_tools(preset_tools)
-            logger.info('act=build_preset_tools size={} return_tools={}', len(preset_tools), len(preset_langchain))
-            tool_chains.extend(preset_langchain)
-        if personal_tools:
-            personal_langchain = await self.init_personal_tools(personal_tools)
-            logger.info('act=build_personal_tools size={} return_tools={}', len(personal_tools),
-                        len(personal_langchain))
-            tool_chains.extend(personal_langchain)
-        return tool_chains
-
-    async def init_flows(self, flow_links: tp.List[AssistantLink]) -> tp.List[BaseTool]:
-        """初始化技能"""
-        logger.info(f"start initialize agent abilities: flows...")
-        flow_chains = []
-        flow_ids = [one.flow_id for one in flow_links]
-        flow_data = FlowDao.get_flow_by_ids(flow_ids)
-        for datum in flow_data:
-            if datum.status != FlowStatus.ONLINE.value:
-                logger.warning('act=init_tools skip not online flow_id: {}', datum.id)
-                continue
-            tool_description = f'{datum.name}:{datum.description}'
-            fake_chat_id = self.assistant.id
-            graph = await build_flow_no_yield(graph_data=datum.data, artifacts={}, process_file=True, flow_id=datum.id,
-                                              chat_id=fake_chat_id)
-            built_obj = await graph.abuild()
-            logger.info('act=init_flow_tool build_end')
-            tool_name = f'flow_{datum.id}'
-            chain = Tool(name=tool_name, func=built_obj, coroutine=built_obj.acall, description=tool_description,
-                         args_schema=InputRequest)
-            flow_chains.append(chain)
-        return flow_chains
-
-    async def init_knowledge(self, knowledge_links: tp.List[AssistantLink]) -> tp.List[BaseTool]:
-        """初始化知识库"""
-        logger.info(f"start initialize agent abilities: knowledge...")
-        knowledge_chains = []
-        knowledge_ids = [one.knowledge_id for one in knowledge_links]
-        knowledge_data = KnowledgeDao.get_list_by_ids(knowledge_ids)
-        for datum in knowledge_data:
-            knowledge_tool = await self.init_knowledge_tool(datum)
-            knowledge_chains.extend(knowledge_tool)
-        return knowledge_chains
-
-    async def run_agent(self, inputs: list):
-        """运行智能体对话"""
-        result = await self.agent.ainvoke(inputs, config=RunnableConfig())
-        # result包含了history，最后一个是最后一次回答
-        if isinstance(result[-1], AIMessage):
-            return result[-1].content
-        return ""
diff --git a/src/backend/bisheng/restructure/assistants/routers.py b/src/backend/bisheng/restructure/assistants/routers.py
deleted file mode 100644
index 972378326..000000000
--- a/src/backend/bisheng/restructure/assistants/routers.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from fastapi import APIRouter
-from bisheng.restructure.assistants.views import router
-
-assistant_router = APIRouter(prefix='/api/v1')
-assistant_router.include_router(router)
diff --git a/src/backend/bisheng/restructure/assistants/schemas.py b/src/backend/bisheng/restructure/assistants/schemas.py
deleted file mode 100644
index 63c79864e..000000000
--- a/src/backend/bisheng/restructure/assistants/schemas.py
+++ /dev/null
@@ -1,16 +0,0 @@
-from pydantic import BaseModel
-
-
-class ChatInput(BaseModel):
-    assistant_id: str
-    message: str
-    chat_id: str = None
-    user_id: str = None
-
-
-class StreamMsg(BaseModel):
-    event: str
-    data: str = ""
-
-    def __str__(self) -> str:
-        return f'event: {self.event}\ndata: {self.data}\n\n'
diff --git a/src/backend/bisheng/restructure/assistants/services.py b/src/backend/bisheng/restructure/assistants/services.py
deleted file mode 100644
index 1f72b587d..000000000
--- a/src/backend/bisheng/restructure/assistants/services.py
+++ /dev/null
@@ -1,62 +0,0 @@
-from langchain_core.messages import AIMessage, HumanMessage
-
-from bisheng.database.models.message import ChatMessage, ChatMessageDao
-from bisheng.restructure.assistants.agent import RtcAssistantAgent
-from bisheng.settings import settings
-from bisheng.utils.logger import logger
-
-DEFAULT_SIZE = 20
-
-
-class MsgCategory:
-    Question = 'question'
-    Answer = 'answer'
-
-
-class MsgFrom:
-    Human = 1
-    Bot = 2
-
-
-def get_chat_history(chat_id: str, size: int = DEFAULT_SIZE):
-    chat_history = []
-    messages = ChatMessageDao.get_messages_by_chat_id(chat_id, ['question', 'answer'], size)
-    for one in messages:
-        # bug fix When constructing multi-turn dialogues, the input and response of
-        # the user and the assistant were reversed, leading to incorrect question-and-answer sequences.
-        if one.category == MsgCategory.Question:
-            chat_history.append(HumanMessage(content=one.message))
-        elif one.category == MsgCategory.Answer:
-            chat_history.append(AIMessage(content=one.message))
-    logger.info(f"loaded {len(chat_history)} chat history for chat_id {chat_id}")
-    return chat_history
-
-
-async def chat_by_agent(agent: RtcAssistantAgent, message: str, chat_history: list):
-    new_message = HumanMessage(content=message)
-    if chat_history:
-        chat_history.append(new_message)
-        inputs = chat_history
-    else:
-        inputs = [new_message]
-    logger.info(f"start calling langchain agent...")
-    answer = await agent.run_agent(inputs)
-    # todo: 后续优化代码解释器的实现方案，保证输出的文件可以公开访问
-    # 获取minio的share地址，把share域名去掉, 为毕昇的部署方案特殊处理下
-    if gpts_tool_conf := settings.get_from_db('gpts').get('tools'):
-        if bisheng_code_conf := gpts_tool_conf.get("bisheng_code_interpreter"):
-            answer = answer.replace(f"http://{bisheng_code_conf['minio']['MINIO_SHAREPOIN']}", "")
-    return answer
-
-
-def record_message(chat_id: str, user_id: str, msg_from: str, message: str, category: str):
-    return ChatMessageDao.insert_one(ChatMessage(
-        is_bot=msg_from == MsgFrom.Bot,
-        source=False,
-        message=message,
-        category=category,
-        type=msg_from,
-        flow_id=chat_id,  # todo 智能体不是单独的flow
-        chat_id=chat_id,
-        user_id=user_id,
-    ))
diff --git a/src/backend/bisheng/restructure/assistants/views.py b/src/backend/bisheng/restructure/assistants/views.py
deleted file mode 100644
index 8335d617d..000000000
--- a/src/backend/bisheng/restructure/assistants/views.py
+++ /dev/null
@@ -1,45 +0,0 @@
-from uuid import uuid4
-from bisheng.database.models.assistant import AssistantDao, AssistantStatus
-from bisheng.restructure.assistants.agent import RtcAssistantAgent
-from bisheng.restructure.assistants.schemas import StreamMsg, ChatInput
-from bisheng.restructure.assistants.services import MsgCategory, MsgFrom, chat_by_agent, get_chat_history, \
-    record_message
-from bisheng.restructure.logger import log_trace
-from bisheng.utils.logger import logger
-from fastapi import APIRouter
-from fastapi.responses import ORJSONResponse, StreamingResponse
-
-router = APIRouter(prefix='/assistant')
-
-
-@router.post('/sse', status_code=200, response_class=StreamingResponse)
-@log_trace
-async def chat(chat_input: ChatInput):
-    message = chat_input.message
-    user_id = chat_input.user_id
-
-    async def _event_stream():
-        if chat_id := chat_input.chat_id:
-            chat_history = get_chat_history(chat_id)
-        else:
-            chat_history = []
-            chat_id = uuid4().hex
-            yield str(StreamMsg(event='chat', data=chat_id))
-        assistant = AssistantDao.get_one_assistant(chat_input.assistant_id)
-        if not assistant:
-            yield str(StreamMsg(event='error', data="该助手已被删除"))
-            return
-        if assistant.status != AssistantStatus.ONLINE.value:
-            yield str(StreamMsg(event='error', data="当前助手未上线，无法直接对话"))
-            return
-        record_message(chat_id, user_id, MsgFrom.Human, message, MsgCategory.Question)
-        gpt_agent = await RtcAssistantAgent.create(assistant)
-        answer = await chat_by_agent(gpt_agent, message, chat_history)
-        record_message(chat_id, user_id, MsgFrom.Bot, answer, MsgCategory.Answer)
-        yield str(StreamMsg(event='message', data=answer))
-
-    try:
-        return StreamingResponse(_event_stream(), media_type='text/event-stream')
-    except Exception as exc:
-        logger.error(exc)
-        return ORJSONResponse(status_code=500, content=str(exc))
diff --git a/src/backend/bisheng/restructure/logger.py b/src/backend/bisheng/restructure/logger.py
deleted file mode 100644
index 1db31e5f1..000000000
--- a/src/backend/bisheng/restructure/logger.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# log工具
-from functools import wraps
-from uuid import uuid4
-
-from bisheng.utils.logger import logger
-
-
-def log_trace(func):
-    """添加trace_id用于log追踪"""
-
-    @wraps(func)
-    async def wrapper(*args, **kwargs):
-        trace_id = uuid4().hex
-        with logger.contextualize(trace_id=trace_id):
-            return await func(*args, **kwargs)
-
-    return wrapper
diff --git a/src/backend/bisheng/restructure/register.py b/src/backend/bisheng/restructure/register.py
deleted file mode 100644
index 16598a4ef..000000000
--- a/src/backend/bisheng/restructure/register.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from fastapi import FastAPI
-
-from bisheng.restructure.routers import router as router_restructure
-
-
-def register_restructure(app: FastAPI):
-    app.include_router(router_restructure)
diff --git a/src/backend/bisheng/restructure/routers.py b/src/backend/bisheng/restructure/routers.py
deleted file mode 100644
index 148ff2ccf..000000000
--- a/src/backend/bisheng/restructure/routers.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from fastapi import APIRouter
-
-from bisheng.restructure.assistants.routers import assistant_router
-
-router = APIRouter()
-router.include_router(assistant_router)
diff --git a/src/backend/bisheng/template/field/base.py b/src/backend/bisheng/template/field/base.py
index 5be3b5ef2..7ecfb17d8 100644
--- a/src/backend/bisheng/template/field/base.py
+++ b/src/backend/bisheng/template/field/base.py
@@ -30,7 +30,7 @@ class TemplateField(BaseModel):
     suffixes: list[str] = []
 
     fileTypes: list[str] = []
-    file_types: list[str] = Field(default=[], serialization_alias='fileTypes')
+    file_types: list[str] = Field(default_factory=list, serialization_alias='fileTypes')
     """List of file types associated with the field. Default is an empty list. (duplicate)"""
 
     file_path: Optional[str] = ''
diff --git a/src/backend/bisheng/workflow/graph/graph_state.py b/src/backend/bisheng/workflow/graph/graph_state.py
index 70935a935..6e0f362b1 100644
--- a/src/backend/bisheng/workflow/graph/graph_state.py
+++ b/src/backend/bisheng/workflow/graph/graph_state.py
@@ -12,7 +12,7 @@ class GraphState(BaseModel):
     history_memory: Optional[ConversationBufferWindowMemory] = None
 
     # 全局变量池
-    variables_pool: Dict[str, Dict[str, Any]] = Field(default={}, description='全局变量池: {node_id: {key: value}}')
+    variables_pool: Dict[str, Dict[str, Any]] = Field(default_factory=dict, description='全局变量池: {node_id: {key: value}}')
 
     def get_history_memory(self, count: int) -> str:
         """ 获取聊天历史记录
diff --git a/src/backend/bisheng/workflow/nodes/tool/tool.py b/src/backend/bisheng/workflow/nodes/tool/tool.py
index dee28b2a0..10e104986 100644
--- a/src/backend/bisheng/workflow/nodes/tool/tool.py
+++ b/src/backend/bisheng/workflow/nodes/tool/tool.py
@@ -1,6 +1,7 @@
 from typing import Any
 
 from bisheng.api.services.assistant_agent import AssistantAgent
+from bisheng.database.constants import ToolPresetType
 from bisheng.database.models.gpts_tools import GptsToolsDao
 from bisheng.workflow.nodes.base import BaseNode
 from bisheng.workflow.nodes.prompt_template import PromptTemplateParser
@@ -14,10 +15,12 @@ class ToolNode(BaseNode):
         self._tool_info = GptsToolsDao.get_tool_by_tool_key(tool_key=self._tool_key)
         if not self._tool_info:
             raise Exception(f"工具{self._tool_key}不存在")
-        if self._tool_info.is_preset:
+        if self._tool_info.is_preset == ToolPresetType.PRESET.value:
             self._tool = AssistantAgent.sync_init_preset_tools(tool_list=[self._tool_info], llm=None)[0]
-        else:
+        elif self._tool_info.is_preset == ToolPresetType.API.value:
             self._tool = AssistantAgent.sync_init_personal_tools([self._tool_info])[0]
+        else:
+            self._tool = AssistantAgent.sync_init_mcp_tools([self._tool_info])[0]
 
     def _run(self, unique_id: str):
         tool_input = self.parse_tool_input()
diff --git a/src/bisheng-langchain/bisheng_langchain/chat_models/host_llm.py b/src/bisheng-langchain/bisheng_langchain/chat_models/host_llm.py
index 8bcd25a2e..b6c2b19a2 100644
--- a/src/bisheng-langchain/bisheng_langchain/chat_models/host_llm.py
+++ b/src/bisheng-langchain/bisheng_langchain/chat_models/host_llm.py
@@ -7,7 +7,7 @@ import sys
 from typing import TYPE_CHECKING, Any, Callable, Dict, List, Mapping, Optional, Tuple, Union
 
 import requests
-from pydantic import model_validator, Field
+from pydantic import ConfigDict, model_validator, Field
 
 from bisheng_langchain.utils.requests import Requests
 from langchain.callbacks.manager import AsyncCallbackManagerForLLMRun, CallbackManagerForLLMRun
@@ -139,11 +139,7 @@ class BaseHostChatLLM(BaseChatModel):
     verbose: Optional[bool] = False
 
     decoupled: Optional[bool] = False
-
-    class Config:
-        """Configuration for this pydantic object."""
-
-        validate_by_name = True
+    model_config = ConfigDict(validate_by_name=True)
 
     @model_validator(mode='before')
     @classmethod
diff --git a/src/bisheng-langchain/bisheng_langchain/chat_models/minimax.py b/src/bisheng-langchain/bisheng_langchain/chat_models/minimax.py
index d24ed075c..b5238f954 100644
--- a/src/bisheng-langchain/bisheng_langchain/chat_models/minimax.py
+++ b/src/bisheng-langchain/bisheng_langchain/chat_models/minimax.py
@@ -12,7 +12,7 @@ from langchain.schema import ChatGeneration, ChatResult
 from langchain.schema.messages import (AIMessage, BaseMessage, ChatMessage, FunctionMessage,
                                        HumanMessage, SystemMessage)
 from langchain.utils import get_from_dict_or_env
-from pydantic import model_validator, Field
+from pydantic import ConfigDict, model_validator, Field
 from tenacity import (before_sleep_log, retry, retry_if_exception_type, stop_after_attempt,
                       wait_exponential)
 
@@ -141,11 +141,7 @@ class ChatMinimaxAI(BaseChatModel):
     when tiktoken is called, you can specify a model name to use here."""
 
     verbose: Optional[bool] = False
-
-    class Config:
-        """Configuration for this pydantic object."""
-
-        validate_by_name = True
+    model_config = ConfigDict(validate_by_name=True)
 
     @model_validator(mode='before')
     @classmethod
diff --git a/src/bisheng-langchain/bisheng_langchain/chat_models/proxy_llm.py b/src/bisheng-langchain/bisheng_langchain/chat_models/proxy_llm.py
index 7e90eee92..54888cd54 100644
--- a/src/bisheng-langchain/bisheng_langchain/chat_models/proxy_llm.py
+++ b/src/bisheng-langchain/bisheng_langchain/chat_models/proxy_llm.py
@@ -6,7 +6,7 @@ import logging
 import sys
 from typing import TYPE_CHECKING, Any, Callable, Dict, List, Mapping, Optional, Tuple, Union
 
-from pydantic import model_validator, Field
+from pydantic import ConfigDict, model_validator, Field
 
 from bisheng_langchain.utils import requests
 from langchain.callbacks.manager import AsyncCallbackManagerForLLMRun, CallbackManagerForLLMRun
@@ -138,11 +138,7 @@ class ProxyChatLLM(BaseChatModel):
     when using one of the many model providers that expose an OpenAI-like
     API but with different models. In those cases, in order to avoid erroring
     when tiktoken is called, you can specify a model name to use here."""
-
-    class Config:
-        """Configuration for this pydantic object."""
-
-        validate_by_name = True
+    model_config = ConfigDict(validate_by_name=True)
 
     @model_validator(mode='before')
     @classmethod
diff --git a/src/bisheng-langchain/bisheng_langchain/chat_models/qwen.py b/src/bisheng-langchain/bisheng_langchain/chat_models/qwen.py
index 3baa5fb66..e9f208cf5 100644
--- a/src/bisheng-langchain/bisheng_langchain/chat_models/qwen.py
+++ b/src/bisheng-langchain/bisheng_langchain/chat_models/qwen.py
@@ -7,7 +7,7 @@ import logging
 import sys
 from typing import TYPE_CHECKING, Any, Callable, Dict, List, Mapping, Optional, Tuple, Union
 
-from pydantic import model_validator, Field
+from pydantic import ConfigDict, model_validator, Field
 
 from bisheng_langchain.utils.requests import Requests
 # import requests
@@ -166,11 +166,7 @@ class ChatQWen(BaseChatModel):
     API but with different models. In those cases, in order to avoid erroring
     when tiktoken is called, you can specify a model name to use here."""
     verbose: Optional[bool] = False
-
-    class Config:
-        """Configuration for this pydantic object."""
-
-        validate_by_name = True
+    model_config = ConfigDict(validate_by_name=True)
 
     @model_validator(mode='before')
     @classmethod
diff --git a/src/bisheng-langchain/bisheng_langchain/chat_models/sensetime.py b/src/bisheng-langchain/bisheng_langchain/chat_models/sensetime.py
index 6e327ffbf..ea582e85b 100644
--- a/src/bisheng-langchain/bisheng_langchain/chat_models/sensetime.py
+++ b/src/bisheng-langchain/bisheng_langchain/chat_models/sensetime.py
@@ -7,7 +7,7 @@ import time
 from typing import Any, Dict, List, Mapping, Optional, Tuple, Union
 
 import jwt
-from pydantic import model_validator, Field
+from pydantic import ConfigDict, model_validator, Field
 
 from bisheng_langchain.utils.requests import Requests
 from langchain.callbacks.manager import AsyncCallbackManagerForLLMRun, CallbackManagerForLLMRun
@@ -158,11 +158,7 @@ class SenseChat(BaseChatModel):
     API but with different models. In those cases, in order to avoid erroring
     when tiktoken is called, you can specify a model name to use here."""
     verbose: Optional[bool] = False
-
-    class Config:
-        """Configuration for this pydantic object."""
-
-        validate_by_name = True
+    model_config = ConfigDict(validate_by_name=True)
 
     @model_validator(mode='before')
     @classmethod
diff --git a/src/bisheng-langchain/bisheng_langchain/chat_models/wenxin.py b/src/bisheng-langchain/bisheng_langchain/chat_models/wenxin.py
index 209c7be64..3170d2b21 100644
--- a/src/bisheng-langchain/bisheng_langchain/chat_models/wenxin.py
+++ b/src/bisheng-langchain/bisheng_langchain/chat_models/wenxin.py
@@ -12,7 +12,7 @@ from langchain.schema import ChatGeneration, ChatResult
 from langchain.schema.messages import (AIMessage, BaseMessage, ChatMessage, FunctionMessage,
                                        HumanMessage, SystemMessage)
 from langchain.utils import get_from_dict_or_env
-from pydantic import model_validator, Field
+from pydantic import ConfigDict, model_validator, Field
 from tenacity import (before_sleep_log, retry, retry_if_exception_type, stop_after_attempt,
                       wait_exponential)
 
@@ -138,11 +138,7 @@ class ChatWenxin(BaseChatModel):
     API but with different models. In those cases, in order to avoid erroring
     when tiktoken is called, you can specify a model name to use here."""
     verbose: Optional[bool] = False
-
-    class Config:
-        """Configuration for this pydantic object."""
-
-        validate_by_name = True
+    model_config = ConfigDict(validate_by_name=True)
 
     @model_validator(mode='before')
     @classmethod
diff --git a/src/bisheng-langchain/bisheng_langchain/chat_models/xunfeiai.py b/src/bisheng-langchain/bisheng_langchain/chat_models/xunfeiai.py
index 4b6318a54..a3ec1eaea 100644
--- a/src/bisheng-langchain/bisheng_langchain/chat_models/xunfeiai.py
+++ b/src/bisheng-langchain/bisheng_langchain/chat_models/xunfeiai.py
@@ -12,7 +12,7 @@ from langchain.schema import ChatGeneration, ChatResult
 from langchain.schema.messages import (AIMessage, BaseMessage, ChatMessage, FunctionMessage,
                                        HumanMessage, SystemMessage)
 from langchain.utils import get_from_dict_or_env
-from pydantic import model_validator, Field
+from pydantic import ConfigDict, model_validator, Field
 from tenacity import (before_sleep_log, retry, retry_if_exception_type, stop_after_attempt,
                       wait_exponential)
 
@@ -141,11 +141,7 @@ class ChatXunfeiAI(BaseChatModel):
     API but with different models. In those cases, in order to avoid erroring
     when tiktoken is called, you can specify a model name to use here."""
     verbose: Optional[bool] = False
-
-    class Config:
-        """Configuration for this pydantic object."""
-
-        validate_by_name = True
+    model_config = ConfigDict(validate_by_name=True)
 
     @model_validator(mode='before')
     @classmethod
diff --git a/src/bisheng-langchain/bisheng_langchain/chat_models/zhipuai.py b/src/bisheng-langchain/bisheng_langchain/chat_models/zhipuai.py
index ee858fb1f..dda1a8b10 100644
--- a/src/bisheng-langchain/bisheng_langchain/chat_models/zhipuai.py
+++ b/src/bisheng-langchain/bisheng_langchain/chat_models/zhipuai.py
@@ -12,7 +12,7 @@ from langchain.schema import ChatGeneration, ChatResult
 from langchain.schema.messages import (AIMessage, BaseMessage, ChatMessage, FunctionMessage,
                                        HumanMessage, SystemMessage)
 from langchain.utils import get_from_dict_or_env
-from pydantic import model_validator, Field
+from pydantic import ConfigDict, model_validator, Field
 from tenacity import (before_sleep_log, retry, retry_if_exception_type, stop_after_attempt,
                       wait_exponential)
 
@@ -149,11 +149,7 @@ class ChatZhipuAI(BaseChatModel):
     API but with different models. In those cases, in order to avoid erroring
     when tiktoken is called, you can specify a model name to use here."""
     verbose: Optional[bool] = False
-
-    class Config:
-        """Configuration for this pydantic object."""
-
-        validate_by_name = True
+    model_config = ConfigDict(validate_by_name=True)
 
     @model_validator(mode='before')
     @classmethod
diff --git a/src/bisheng-langchain/bisheng_langchain/embeddings/host_embedding.py b/src/bisheng-langchain/bisheng_langchain/embeddings/host_embedding.py
index a6caf8cff..11beff202 100644
--- a/src/bisheng-langchain/bisheng_langchain/embeddings/host_embedding.py
+++ b/src/bisheng-langchain/bisheng_langchain/embeddings/host_embedding.py
@@ -42,7 +42,7 @@ class HostEmbeddings(BaseModel, Embeddings):
     """host embedding models.
     """
 
-    client: Optional[Any]  #: :meta private:
+    client: Optional[Any] = None  #: :meta private:
     """Model name to use."""
     model: str = 'embedding-host'
     host_base_url: str = None
diff --git a/src/bisheng-langchain/bisheng_langchain/embeddings/huggingfacegte.py b/src/bisheng-langchain/bisheng_langchain/embeddings/huggingfacegte.py
index 68474672d..4cef1f76c 100644
--- a/src/bisheng-langchain/bisheng_langchain/embeddings/huggingfacegte.py
+++ b/src/bisheng-langchain/bisheng_langchain/embeddings/huggingfacegte.py
@@ -27,7 +27,7 @@ class HuggingFaceGteEmbeddings(BaseModel, Embeddings):
             )
     """
 
-    client: Any  #: :meta private:
+    client: Any = None  #: :meta private:
     model_name: str = DEFAULT_Multilingual_MODEL
     """Model name to use."""
     cache_folder: Optional[str] = None
diff --git a/src/bisheng-langchain/bisheng_langchain/embeddings/huggingfacemultilingual.py b/src/bisheng-langchain/bisheng_langchain/embeddings/huggingfacemultilingual.py
index 169557294..d9d66e39d 100644
--- a/src/bisheng-langchain/bisheng_langchain/embeddings/huggingfacemultilingual.py
+++ b/src/bisheng-langchain/bisheng_langchain/embeddings/huggingfacemultilingual.py
@@ -27,7 +27,7 @@ class HuggingFaceMultilingualEmbeddings(BaseModel, Embeddings):
             )
     """
 
-    client: Any  #: :meta private:
+    client: Any = None  #: :meta private:
     model_name: str = DEFAULT_Multilingual_MODEL
     """Model name to use."""
     cache_folder: Optional[str] = None
diff --git a/src/bisheng-langchain/bisheng_langchain/embeddings/wenxin.py b/src/bisheng-langchain/bisheng_langchain/embeddings/wenxin.py
index 374862b9e..65f5905cf 100644
--- a/src/bisheng-langchain/bisheng_langchain/embeddings/wenxin.py
+++ b/src/bisheng-langchain/bisheng_langchain/embeddings/wenxin.py
@@ -7,7 +7,7 @@ from typing import Any, Callable, Dict, List, Optional, Tuple, Union
 # import numpy as np
 from langchain.embeddings.base import Embeddings
 from langchain.utils import get_from_dict_or_env
-from pydantic import model_validator, BaseModel, Field
+from pydantic import ConfigDict, model_validator, BaseModel, Field
 from requests.exceptions import HTTPError
 from tenacity import (before_sleep_log, retry, retry_if_exception_type, stop_after_attempt,
                       wait_exponential)
@@ -55,7 +55,7 @@ class WenxinEmbeddings(BaseModel, Embeddings):
 
     """
 
-    client: Optional[Any]  #: :meta private:
+    client: Optional[Any] = None  #: :meta private:
     model: str = 'embedding-v1'
 
     deployment: Optional[str] = 'default'
@@ -72,11 +72,7 @@ class WenxinEmbeddings(BaseModel, Embeddings):
 
     model_kwargs: Optional[Dict[str, Any]] = Field(default_factory=dict)
     """Holds any model parameters valid for `create` call not explicitly specified."""
-
-    class Config:
-        """Configuration for this pydantic object."""
-
-        extra = 'forbid'
+    model_config = ConfigDict(extra='forbid')
 
     @model_validator(mode='before')
     @classmethod
diff --git a/src/bisheng-langchain/bisheng_langchain/gpts/agent_types/llm_functions_agent.py b/src/bisheng-langchain/bisheng_langchain/gpts/agent_types/llm_functions_agent.py
index 12ac7cc07..25d33dbd8 100644
--- a/src/bisheng-langchain/bisheng_langchain/gpts/agent_types/llm_functions_agent.py
+++ b/src/bisheng-langchain/bisheng_langchain/gpts/agent_types/llm_functions_agent.py
@@ -8,7 +8,7 @@ from langchain_core.language_models.base import LanguageModelLike
 from langchain_core.messages import FunctionMessage, SystemMessage, ToolMessage
 from langgraph.graph import END
 from langgraph.graph.message import MessageGraph
-from langgraph.prebuilt import ToolExecutor, ToolInvocation
+from langgraph.prebuilt import ToolNode
 from langgraph.utils.runnable import RunnableCallable
 
 
@@ -35,7 +35,7 @@ def get_openai_functions_agent_executor(tools: list[BaseTool], llm: LanguageMode
         llm_with_tools = llm
 
     agent = _get_messages | llm_with_tools
-    tool_executor = ToolExecutor(tools)
+    tool_nodes = ToolNode(tools=tools)
 
     # Define the function that determines whether to continue or not
     def should_continue(messages):
@@ -55,63 +55,11 @@ def get_openai_functions_agent_executor(tools: list[BaseTool], llm: LanguageMode
 
     # Define the function to execute tools
     async def acall_tool(messages):
-        actions: list[ToolInvocation] = []
-        # Based on the continue condition
-        # we know the last message involves a function call
-        last_message = messages[-1]
-        for tool_call in last_message.additional_kwargs['tool_calls']:
-            function = tool_call['function']
-            function_name = function['name']
-            try:
-                _tool_input = json.loads(function['arguments'] or '{}')
-            except Exception as e:
-                raise Exception(f"Error parsing arguments for function: {function_name}. arguments: {function['arguments']}. error: {str(e)}")
-            # We construct an ToolInvocation from the function_call
-            actions.append(ToolInvocation(
-                tool=function_name,
-                tool_input=_tool_input,
-            ))
-        # We call the tool_executor and get back a response
-        responses = await tool_executor.abatch(actions, **kwargs)
-        # We use the response to create a ToolMessage
-        tool_messages = [
-            LiberalToolMessage(
-                tool_call_id=tool_call['id'],
-                content=response,
-                additional_kwargs={'name': tool_call['function']['name']},
-            )
-            for tool_call, response in zip(last_message.additional_kwargs['tool_calls'], responses)
-        ]
+        tool_messages = await tool_nodes._afunc(messages, None, store=None)
         return tool_messages
 
     def call_tool(messages):
-        actions: list[ToolInvocation] = []
-        # Based on the continue condition
-        # we know the last message involves a function call
-        last_message = messages[-1]
-        for tool_call in last_message.additional_kwargs['tool_calls']:
-            function = tool_call['function']
-            function_name = function['name']
-            try:
-                _tool_input = json.loads(function['arguments'] or '{}')
-            except Exception as e:
-                raise Exception(f"Error parsing arguments for function: {function_name}. arguments: {function['arguments']}. error: {str(e)}")
-            # We construct an ToolInvocation from the function_call
-            actions.append(ToolInvocation(
-                tool=function_name,
-                tool_input=_tool_input,
-            ))
-        # We call the tool_executor and get back a response
-        responses = tool_executor.batch(actions, **kwargs)
-        # We use the response to create a ToolMessage
-        tool_messages = [
-            LiberalToolMessage(
-                tool_call_id=tool_call['id'],
-                content=response,
-                additional_kwargs={'name': tool_call['function']['name']},
-            )
-            for tool_call, response in zip(last_message.additional_kwargs['tool_calls'], responses)
-        ]
+        tool_messages = tool_nodes._func(messages, config=None, store=None)
         return tool_messages
 
     workflow = MessageGraph()
@@ -185,7 +133,7 @@ def get_qwen_local_functions_agent_executor(
     else:
         llm_with_tools = llm
     agent = _get_messages | llm_with_tools
-    tool_executor = ToolExecutor(tools)
+    tool_nodes = ToolNode(tools=tools)
 
     # Define the function that determines whether to continue or not
     def should_continue(messages):
@@ -199,27 +147,7 @@ def get_qwen_local_functions_agent_executor(
 
     # Define the function to execute tools
     async def call_tool(messages):
-        actions: list[ToolInvocation] = []
-        # Based on the continue condition
-        # we know the last message involves a function call
-        last_message = messages[-1]
-        # only one function
-        function = last_message.additional_kwargs['function_call']
-        function_name = function['name']
-        try:
-            _tool_input = json.loads(function['arguments'] or '{}')
-        except Exception as e:
-            raise Exception(
-                f"Error parsing arguments for function: {function_name}. arguments: {function['arguments']}. error: {str(e)}")
-        # We construct an ToolInvocation from the function_call
-        actions.append(ToolInvocation(
-            tool=function_name,
-            tool_input=_tool_input,
-        ))
-        # We call the tool_executor and get back a response
-        responses = await tool_executor.abatch(actions, **kwargs)
-        # We use the response to create a ToolMessage
-        tool_messages = [LiberalFunctionMessage(content=responses[0], name=function_name)]
+        tool_messages = await tool_nodes._afunc(messages, config=None, store=None)
         return tool_messages
 
     workflow = MessageGraph()
diff --git a/src/bisheng-langchain/bisheng_langchain/gpts/agent_types/llm_react_agent.py b/src/bisheng-langchain/bisheng_langchain/gpts/agent_types/llm_react_agent.py
index 0d0b0f905..37efa4cf1 100644
--- a/src/bisheng-langchain/bisheng_langchain/gpts/agent_types/llm_react_agent.py
+++ b/src/bisheng-langchain/bisheng_langchain/gpts/agent_types/llm_react_agent.py
@@ -9,7 +9,7 @@ from langchain_core.language_models import LanguageModelLike
 from langchain_core.messages import BaseMessage
 from langgraph.graph import END, StateGraph
 from langgraph.graph.state import CompiledStateGraph
-from langgraph.prebuilt.tool_executor import ToolExecutor
+from langgraph.prebuilt import ToolNode
 from langgraph.utils.runnable import RunnableCallable
 
 
@@ -64,10 +64,7 @@ def create_agent_executor(agent_runnable, tools, input_schema=None) -> CompiledS
         The `CompiledStateGraph` object.
     """
 
-    if isinstance(tools, ToolExecutor):
-        tool_executor = tools
-    else:
-        tool_executor = ToolExecutor(tools)
+    tool_executor = ToolNode(tools=tools)
 
     state = _get_agent_state(input_schema)
 
diff --git a/src/bisheng-langchain/bisheng_langchain/gpts/tools/api_tools/base.py b/src/bisheng-langchain/bisheng_langchain/gpts/tools/api_tools/base.py
index 740714592..8819ae580 100644
--- a/src/bisheng-langchain/bisheng_langchain/gpts/tools/api_tools/base.py
+++ b/src/bisheng-langchain/bisheng_langchain/gpts/tools/api_tools/base.py
@@ -1,6 +1,6 @@
 from typing import Any, Dict, Tuple, Type, Union
 
-from pydantic import model_validator, BaseModel, Extra, Field
+from pydantic import ConfigDict, model_validator, BaseModel, Field
 
 from bisheng_langchain.utils.requests import Requests, RequestsWrapper
 from langchain_core.tools import BaseTool, Tool
@@ -33,11 +33,7 @@ class APIToolBase(BaseModel):
     params: Dict[str, Any] = {}
     input_key: str = 'keyword'
     args_schema: Type[BaseModel] = ApiArg
-
-    class Config:
-        """Configuration for this pydantic object."""
-
-        extra = Extra.forbid
+    model_config = ConfigDict(extra="forbid")
 
     @model_validator(mode='before')
     @classmethod
diff --git a/src/bisheng-langchain/bisheng_langchain/gpts/tools/api_tools/macro_data.py b/src/bisheng-langchain/bisheng_langchain/gpts/tools/api_tools/macro_data.py
index a6a641422..29f38f8dc 100644
--- a/src/bisheng-langchain/bisheng_langchain/gpts/tools/api_tools/macro_data.py
+++ b/src/bisheng-langchain/bisheng_langchain/gpts/tools/api_tools/macro_data.py
@@ -11,8 +11,8 @@ from .base import MultArgsSchemaTool
 
 
 class QueryArg(BaseModel):
-    start_date: str = Field(default='', description='开始月份, 使用YYYY-MM-DD 方式表示', example='2023-01-01')
-    end_date: str = Field(default='', description='结束月份，使用YYYY-MM-DD 方式表示', example='2023-05-01')
+    start_date: str = Field(default='', description='开始月份, 使用YYYY-MM-DD 方式表示', examples=['2023-01-01'])
+    end_date: str = Field(default='', description='结束月份，使用YYYY-MM-DD 方式表示', examples=['2023-05-01'])
 
 
 class MacroData(BaseModel):
diff --git a/src/bisheng-langchain/bisheng_langchain/gpts/tools/api_tools/openapi.py b/src/bisheng-langchain/bisheng_langchain/gpts/tools/api_tools/openapi.py
index bd3bba81d..530e46ff4 100644
--- a/src/bisheng-langchain/bisheng_langchain/gpts/tools/api_tools/openapi.py
+++ b/src/bisheng-langchain/bisheng_langchain/gpts/tools/api_tools/openapi.py
@@ -9,9 +9,9 @@ from .base import APIToolBase, Field, MultArgsSchemaTool
 
 class OpenApiTools(APIToolBase):
 
-    api_key: Optional[str]
-    api_location: Optional[str]
-    parameter_name: Optional[str]
+    api_key: Optional[str] = None
+    api_location: Optional[str] = None
+    parameter_name: Optional[str] = None
 
     def get_real_path(self, path_params: dict|None):
         path = self.params['path']
diff --git a/src/bisheng-langchain/bisheng_langchain/gpts/tools/calculator/tool.py b/src/bisheng-langchain/bisheng_langchain/gpts/tools/calculator/tool.py
index 55356096c..c751a001d 100644
--- a/src/bisheng-langchain/bisheng_langchain/gpts/tools/calculator/tool.py
+++ b/src/bisheng-langchain/bisheng_langchain/gpts/tools/calculator/tool.py
@@ -10,7 +10,7 @@ from sympy import *
 class CalculatorInput(BaseModel):
     expression: str = Field(
         description="The input to this tool should be a mathematical expression using only Python's built-in mathematical operators.",
-        example='200*7',
+        examples=['200*7'],
     )
 
 
diff --git a/src/bisheng-langchain/bisheng_langchain/gpts/tools/code_interpreter/tool.py b/src/bisheng-langchain/bisheng_langchain/gpts/tools/code_interpreter/tool.py
index e131589c2..1567e2dc5 100644
--- a/src/bisheng-langchain/bisheng_langchain/gpts/tools/code_interpreter/tool.py
+++ b/src/bisheng-langchain/bisheng_langchain/gpts/tools/code_interpreter/tool.py
@@ -239,7 +239,7 @@ class CodeInterpreterToolArguments(BaseModel):
 
     python_code: str = Field(
         ...,
-        example="print('Hello World')",
+        examples=["print('Hello World')"],
         description=(
             'The pure python script to be evaluated. '
             'The contents will be in main.py. '
diff --git a/src/bisheng-langchain/bisheng_langchain/gpts/tools/dalle_image_generator/tool.py b/src/bisheng-langchain/bisheng_langchain/gpts/tools/dalle_image_generator/tool.py
index 22d16260c..0fcd888bb 100644
--- a/src/bisheng-langchain/bisheng_langchain/gpts/tools/dalle_image_generator/tool.py
+++ b/src/bisheng-langchain/bisheng_langchain/gpts/tools/dalle_image_generator/tool.py
@@ -6,7 +6,7 @@ from langchain_community.utils.openai import is_openai_v1
 from langchain_core.callbacks import CallbackManagerForToolRun
 from langchain_core.tools import BaseTool
 from langchain_core.utils import get_from_dict_or_env, get_pydantic_field_names
-from pydantic import model_validator, BaseModel, Field
+from pydantic import ConfigDict, model_validator, BaseModel, Field
 
 from bisheng_langchain.utils.azure_dalle_image_generator import AzureDallEWrapper
 
@@ -24,7 +24,7 @@ class DallEAPIWrapper(BaseModel):
     2. save your OPENAI_API_KEY in an environment variable
     """
 
-    client: Any  #: :meta private:
+    client: Any = None  #: :meta private:
     async_client: Any = Field(default=None, exclude=True)  #: :meta private:
     model_name: str = Field(default="dall-e-2", alias="model")
     model_kwargs: Dict[str, Any] = Field(default_factory=dict)
@@ -57,11 +57,7 @@ class DallEAPIWrapper(BaseModel):
     http_async_client: Union[Any, None] = None
     """Optional httpx.AsyncClient. Only used for async invocations. Must specify 
         http_client as well if you'd like a custom client for sync invocations."""
-
-    class Config:
-        """Configuration for this pydantic object."""
-
-        extra = 'forbid'
+    model_config = ConfigDict(extra='forbid')
 
     @model_validator(mode='before')
     @classmethod
diff --git a/src/bisheng-langchain/bisheng_langchain/gpts/tools/message/feishu.py b/src/bisheng-langchain/bisheng_langchain/gpts/tools/message/feishu.py
index f14c88d6e..f613f2804 100644
--- a/src/bisheng-langchain/bisheng_langchain/gpts/tools/message/feishu.py
+++ b/src/bisheng-langchain/bisheng_langchain/gpts/tools/message/feishu.py
@@ -8,16 +8,16 @@ from bisheng_langchain.gpts.tools.api_tools.base import (APIToolBase,
 
 
 class InputArgs(BaseModel):
-    message: Optional[str] = Field(description="需要发送的钉钉消息")
-    receive_id: Optional[str] = Field(description="接收的ID")
-    receive_id_type: Optional[str] = Field(description="接收的ID类型")
-    container_id: Optional[str] = Field(description="container_id")
-    start_time: Optional[str] = Field(description="start_time")
-    end_time: Optional[str] = Field(description="end_time")
+    message: Optional[str] = Field(None, description="需要发送的钉钉消息")
+    receive_id: Optional[str] = Field(None, description="接收的ID")
+    receive_id_type: Optional[str] = Field(None, description="接收的ID类型")
+    container_id: Optional[str] = Field(None, description="container_id")
+    start_time: Optional[str] = Field(None, description="start_time")
+    end_time: Optional[str] = Field(None, description="end_time")
     # page_token: Optional[str] = Field(description="page_token")
-    container_id_type: Optional[str] = Field(description="container_id_type")
+    container_id_type: Optional[str] = Field(None, description="container_id_type")
     page_size: Optional[int] = Field(default=20,description="page_size")
-    page_token: Optional[str] = Field(description="page_token")
+    page_token: Optional[str] = Field(None, description="page_token")
     sort_type: Optional[str] = Field(description="sort_type",default="ByCreateTimeAsc")
 
 
diff --git a/src/bisheng-langchain/bisheng_langchain/gpts/tools/sql_agent/tool.py b/src/bisheng-langchain/bisheng_langchain/gpts/tools/sql_agent/tool.py
index 9781362d7..7e4040172 100644
--- a/src/bisheng-langchain/bisheng_langchain/gpts/tools/sql_agent/tool.py
+++ b/src/bisheng-langchain/bisheng_langchain/gpts/tools/sql_agent/tool.py
@@ -11,7 +11,7 @@ from langchain_core.tools import BaseTool, tool
 from langgraph.constants import END, START
 from langgraph.graph import add_messages, StateGraph
 from langgraph.prebuilt import ToolNode
-from pydantic import BaseModel, Field
+from pydantic import ConfigDict, BaseModel, Field
 
 
 class State(TypedDict):
@@ -75,9 +75,7 @@ class SqlAgentAPIWrapper(BaseModel):
     schema_llm: Optional[Any] = None
     query_check_llm: Optional[Any] = None
     query_gen_llm: Optional[Any] = None
-
-    class Config:
-        arbitrary_types_allowed = True
+    model_config = ConfigDict(arbitrary_types_allowed=True)
 
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
diff --git a/src/bisheng-langchain/bisheng_langchain/input_output/input.py b/src/bisheng-langchain/bisheng_langchain/input_output/input.py
index f5e684418..48717da5b 100644
--- a/src/bisheng-langchain/bisheng_langchain/input_output/input.py
+++ b/src/bisheng-langchain/bisheng_langchain/input_output/input.py
@@ -1,12 +1,12 @@
 
 from typing import List, Optional
 
-from pydantic import BaseModel, Extra
+from pydantic import ConfigDict, BaseModel
 
 
 class InputNode(BaseModel):
     """Input组件，用来控制输入"""
-    input: Optional[List[str]]
+    input: Optional[List[str]] = None
 
     def text(self):
         return self.input
@@ -15,14 +15,10 @@ class InputNode(BaseModel):
 class VariableNode(BaseModel):
     """用来设置变量"""
     # key
-    variables: Optional[List[str]]
+    variables: Optional[List[str]] = None
     # vaulues
     variable_value: Optional[List[str]] = []
-
-    class Config:
-        """Configuration for this pydantic object."""
-
-        extra = Extra.forbid
+    model_config = ConfigDict(extra="forbid")
 
     def text(self):
         if self.variable_value:
@@ -36,9 +32,9 @@ class VariableNode(BaseModel):
 
 
 class InputFileNode(BaseModel):
-    file_path: Optional[str]
-    file_name: Optional[str]
-    file_type: Optional[str]  # tips for file
+    file_path: Optional[str] = None
+    file_name: Optional[str] = None
+    file_type: Optional[str] = None  # tips for file
     """Output组件，用来控制输出"""
 
     def text(self):
diff --git a/src/bisheng-langchain/bisheng_langchain/input_output/output.py b/src/bisheng-langchain/bisheng_langchain/input_output/output.py
index 4ba3d1521..4352b86ba 100644
--- a/src/bisheng-langchain/bisheng_langchain/input_output/output.py
+++ b/src/bisheng-langchain/bisheng_langchain/input_output/output.py
@@ -5,7 +5,7 @@ from venv import logger
 from bisheng_langchain.chains import LoaderOutputChain
 from langchain.callbacks.manager import AsyncCallbackManagerForChainRun, CallbackManagerForChainRun
 from langchain.chains.base import Chain
-from pydantic import BaseModel, Extra
+from pydantic import ConfigDict, BaseModel
 
 _TEXT_COLOR_MAPPING = {
     'blue': '36;1',
@@ -52,11 +52,7 @@ class Report(Chain):
 
     input_key: str = 'report_name'  #: :meta private:
     output_key: str = 'text'  #: :meta private:
-
-    class Config:
-        """Configuration for this pydantic object."""
-        extra = Extra.forbid
-        arbitrary_types_allowed = True
+    model_config = ConfigDict(extra="forbid", arbitrary_types_allowed=True)
 
     @property
     def input_keys(self) -> List[str]:
diff --git a/src/bisheng-langchain/bisheng_langchain/rag/bisheng_rag_chain.py b/src/bisheng-langchain/bisheng_langchain/rag/bisheng_rag_chain.py
index 8d634ca3e..35b30116d 100644
--- a/src/bisheng-langchain/bisheng_langchain/rag/bisheng_rag_chain.py
+++ b/src/bisheng-langchain/bisheng_langchain/rag/bisheng_rag_chain.py
@@ -10,7 +10,7 @@ from langchain_core.callbacks import (AsyncCallbackManagerForChainRun, CallbackM
 from langchain_core.language_models import BaseLanguageModel
 from langchain_core.prompts import (ChatPromptTemplate, HumanMessagePromptTemplate,
                                     SystemMessagePromptTemplate)
-from pydantic import Extra, Field
+from pydantic import ConfigDict, Field
 
 from .bisheng_rag_tool import BishengRAGTool
 
@@ -52,13 +52,7 @@ class BishengRetrievalQA(Chain):
     """Return the source documents or not."""
     bisheng_rag_tool: BishengRAGTool = Field(default_factory=BishengRAGTool,
                                              description='RAG tool')
-
-    class Config:
-        """Configuration for this pydantic object."""
-
-        extra = Extra.forbid
-        arbitrary_types_allowed = True
-        validate_by_name = True
+    model_config = ConfigDict(extra="forbid", arbitrary_types_allowed=True, validate_by_name=True)
 
     @property
     def input_keys(self) -> List[str]:
diff --git a/src/bisheng-langchain/bisheng_langchain/utils/requests.py b/src/bisheng-langchain/bisheng_langchain/utils/requests.py
index 4a007a120..f13155af2 100644
--- a/src/bisheng-langchain/bisheng_langchain/utils/requests.py
+++ b/src/bisheng-langchain/bisheng_langchain/utils/requests.py
@@ -5,7 +5,7 @@ from typing import Any, AsyncGenerator, Dict, Optional, Tuple, Union
 import aiohttp
 import requests
 from loguru import logger
-from pydantic import BaseModel, Extra
+from pydantic import ConfigDict, BaseModel
 
 
 class Requests(BaseModel):
@@ -19,12 +19,7 @@ class Requests(BaseModel):
     aiosession: Optional[aiohttp.ClientSession] = None
     auth: Optional[Any] = None
     request_timeout: Union[float, Tuple[float, float]] = 120
-
-    class Config:
-        """Configuration for this pydantic object."""
-
-        extra = Extra.forbid
-        arbitrary_types_allowed = True
+    model_config = ConfigDict(extra="forbid", arbitrary_types_allowed=True)
 
     def get(self, url: str, **kwargs: Any) -> requests.Response:
         """GET the URL and return the text."""
@@ -140,12 +135,7 @@ class TextRequestsWrapper(BaseModel):
     aiosession: Optional[aiohttp.ClientSession] = None
     auth: Optional[Any] = None
     request_timeout: Union[float, Tuple[float, float]] = 120
-
-    class Config:
-        """Configuration for this pydantic object."""
-
-        extra = Extra.forbid
-        arbitrary_types_allowed = True
+    model_config = ConfigDict(extra="forbid", arbitrary_types_allowed=True)
 
     @property
     def requests(self) -> Requests:
diff --git a/src/bisheng-langchain/bisheng_langchain/vectorstores/retriever.py b/src/bisheng-langchain/bisheng_langchain/vectorstores/retriever.py
index 9e16a3143..866d1a68e 100644
--- a/src/bisheng-langchain/bisheng_langchain/vectorstores/retriever.py
+++ b/src/bisheng-langchain/bisheng_langchain/vectorstores/retriever.py
@@ -6,7 +6,7 @@ from venv import logger
 import requests
 from langchain.schema.document import Document
 from langchain.vectorstores.base import VectorStore, VectorStoreRetriever
-from pydantic import model_validator, Field
+from pydantic import ConfigDict, model_validator, Field
 
 if TYPE_CHECKING:
     from langchain.callbacks.manager import (
@@ -25,11 +25,7 @@ class VectorStoreFilterRetriever(VectorStoreRetriever):
         'mmr',
     )
     access_url: str = None
-
-    class Config:
-        """Configuration for this pydantic object."""
-
-        arbitrary_types_allowed = True
+    model_config = ConfigDict(arbitrary_types_allowed=True)
 
     @model_validator(mode='before')
     @classmethod

From 5faf9bee8f369450be830248042bdda83c4ec245 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Tue, 15 Apr 2025 19:53:13 +0800
Subject: [PATCH 009/186] fix: upgrade langgraph version cache error

---
 src/backend/Dockerfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/backend/Dockerfile b/src/backend/Dockerfile
index 00f5124d2..4fbc121e2 100644
--- a/src/backend/Dockerfile
+++ b/src/backend/Dockerfile
@@ -4,6 +4,9 @@ WORKDIR /app
 
 COPY ./ ./
 
+# 临时先删除旧的langgraph相关的库，不然安装有bug。后续重新打包一个base镜像
+RUN pip uninstall -y langgraph langgraph-prebuilt langgraph-checkpoint langgraph-sdk
+
 RUN poetry config virtualenvs.create false
 RUN poetry update --without dev
 

From c85149f6a3a74e8498fdc1d065dce3f2947749d1 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Wed, 16 Apr 2025 11:36:17 +0800
Subject: [PATCH 010/186] feat: lock pyjwt version

---
 src/backend/Dockerfile                                      | 1 -
 src/backend/bisheng/patches/fastapi_jwt_auth_auth_jwt.patch | 4 ----
 src/backend/pyproject.toml                                  | 1 +
 3 files changed, 1 insertion(+), 5 deletions(-)
 delete mode 100644 src/backend/bisheng/patches/fastapi_jwt_auth_auth_jwt.patch

diff --git a/src/backend/Dockerfile b/src/backend/Dockerfile
index 4fbc121e2..80c4ca4f4 100644
--- a/src/backend/Dockerfile
+++ b/src/backend/Dockerfile
@@ -16,6 +16,5 @@ RUN patch -p1 < /app/bisheng/patches/langchain_openai.patch /usr/local/lib/pytho
 # patch fastapi-jwt-auth lib. remove this when remove fastapi-jwt-auth
 # fix fastapi-jwt-auth not support pydantic:v2
 RUN patch -p1 < /app/bisheng/patches/fastapi_jwt_auth.patch /usr/local/lib/python3.10/site-packages/fastapi_jwt_auth/config.py
-RUN patch -p1 < /app/bisheng/patches/fastapi_jwt_auth_auth_jwt.patch /usr/local/lib/python3.10/site-packages/fastapi_jwt_auth/auth_jwt.py
 
 CMD ["sh entrypoint.sh"]
diff --git a/src/backend/bisheng/patches/fastapi_jwt_auth_auth_jwt.patch b/src/backend/bisheng/patches/fastapi_jwt_auth_auth_jwt.patch
deleted file mode 100644
index 96c1ff86e..000000000
--- a/src/backend/bisheng/patches/fastapi_jwt_auth_auth_jwt.patch
+++ /dev/null
@@ -1,4 +0,0 @@
-194c194
-<         ).decode('utf-8')
----
->         )
diff --git a/src/backend/pyproject.toml b/src/backend/pyproject.toml
index 8b63ac310..a52df480b 100644
--- a/src/backend/pyproject.toml
+++ b/src/backend/pyproject.toml
@@ -96,6 +96,7 @@ dashscope = "^1.20.3"
 blobfile = "^3.0.0"
 mcp = "^1.6.0"
 numpy = "^1.26.2"
+pyjwt = "^1.7.1"
 
 [tool.poetry.dev-dependencies]
 black = "^23.1.0"

From d55770c7b45d362b7b14771df2dc09a0e578ab3b Mon Sep 17 00:00:00 2001
From: dolphin <shanghang@dataelem.com>
Date: Wed, 16 Apr 2025 14:38:25 +0800
Subject: [PATCH 011/186] =?UTF-8?q?feat:=20mcp=E6=8E=A5=E5=8F=A3=E6=8E=A5?=
 =?UTF-8?q?=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/frontend/platform/package.json            |  2 +-
 .../platform/src/controllers/API/tools.ts     | 19 ++++
 .../src/pages/BuildPage/tools/EditMcp.tsx     | 93 ++++++++++---------
 .../src/pages/BuildPage/tools/EditTool.tsx    |  2 +-
 .../src/pages/BuildPage/tools/index.tsx       |  2 +-
 5 files changed, 71 insertions(+), 47 deletions(-)

diff --git a/src/frontend/platform/package.json b/src/frontend/platform/package.json
index 5e3bcd6f3..4c194b9a1 100644
--- a/src/frontend/platform/package.json
+++ b/src/frontend/platform/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bisheng",
-  "version": "1.1.0",
+  "version": "1.2.0beta",
   "private": true,
   "dependencies": {
     "@headlessui/react": "^2.0.4",
diff --git a/src/frontend/platform/src/controllers/API/tools.ts b/src/frontend/platform/src/controllers/API/tools.ts
index fce663345..5e52b1ff4 100644
--- a/src/frontend/platform/src/controllers/API/tools.ts
+++ b/src/frontend/platform/src/controllers/API/tools.ts
@@ -57,6 +57,25 @@ export const downloadToolSchema = async (data: { download_url: string } | { file
     return await axios.post(`/api/v1/assistant/tool_schema`, data);
 };
 
+/**
+ * 解析mcp服务器配置接口
+ */
+export const getMcpServeByConfig = async (data: { file_content: string }): Promise<any> => {
+    return await axios.post(`/api/v1/assistant/mcp/tool_schema`, data);
+}
+
+/**
+ * mcp测试接口
+ */
+export const testMcpApi = async (data: { file_content: string }) => {
+    return await axios({
+        method: 'post',
+        url: '/api/v1/assistant/mcp/tool_test',
+        data
+    })
+}
+
+
 /**
  * 工具测试接口
  * @returns 
diff --git a/src/frontend/platform/src/pages/BuildPage/tools/EditMcp.tsx b/src/frontend/platform/src/pages/BuildPage/tools/EditMcp.tsx
index 3757ac74b..9803b123c 100644
--- a/src/frontend/platform/src/pages/BuildPage/tools/EditMcp.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/tools/EditMcp.tsx
@@ -3,15 +3,14 @@ import { Button } from "@/components/bs-ui/button";
 import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/bs-ui/dialog";
 import { Input, Textarea } from "@/components/bs-ui/input";
 import { Label } from "@/components/bs-ui/label";
-import { Popover, PopoverClose, PopoverContent, PopoverTrigger } from "@/components/bs-ui/popover";
 import { Select, SelectContent, SelectGroup, SelectItem, SelectTrigger } from "@/components/bs-ui/select";
 import { Sheet, SheetContent, SheetFooter, SheetHeader, SheetTitle } from "@/components/bs-ui/sheet";
 import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/bs-ui/table";
 import { useToast } from "@/components/bs-ui/toast/use-toast";
+import { createTool, deleteTool, getMcpServeByConfig, testMcpApi, updateTool } from "@/controllers/API/tools";
 // import { createMcpServer, deleteMcpServer, getMcpTools, testMcpTool, updateMcpServer } from "@/controllers/API/mcp";
 import { captureAndAlertRequestErrorHoc } from "@/controllers/request";
-import { Plus } from "lucide-react";
-import { forwardRef, useEffect, useImperativeHandle, useRef, useState } from "react";
+import { forwardRef, useImperativeHandle, useRef, useState } from "react";
 
 // 测试对话框组件
 const TestDialog = forwardRef((props, ref) => {
@@ -21,13 +20,15 @@ const TestDialog = forwardRef((props, ref) => {
     const [result, setResult] = useState("");
     const [loading, setLoading] = useState(false);
     const { message } = useToast();
+    const serverRef = useRef({});
 
     useImperativeHandle(ref, () => ({
-        open: (tool, config) => {
+        open: (tool, config, _serverRef) => {
             setToolData({ ...tool, config });
             setParams({});
             setResult("");
             setTestShow(true);
+            serverRef.current = _serverRef;
         }
     }));
 
@@ -44,13 +45,20 @@ const TestDialog = forwardRef((props, ref) => {
 
         setLoading(true);
         try {
-            // const res = await captureAndAlertRequestErrorHoc(
-            //     testMcpTool({
-            //         config: toolData.config,
-            //         toolName: toolData.name,
-            //         params
-            //     })
-            // );
+            console.log('toolData :>> ', toolData);
+            const { server_host, children, auth_method, auth_type, api_key } = serverRef.current
+
+            const res = await captureAndAlertRequestErrorHoc(
+                testMcpApi({
+                    server_host,
+                    extra: children.find(el => el.name === toolData.name).extra,
+                    auth_method,
+                    auth_type,
+                    api_key,
+                    request_params: params
+                }).then(setResult)
+            );
+            console.log('res :>> ', res);
             // setResult(JSON.stringify(res, null, 2));
         } finally {
             setLoading(false);
@@ -131,11 +139,15 @@ const McpServerDialog = forwardRef(({ existingNames = [], onReload }, ref) => {
     // 暴露方法给父组件
     useImperativeHandle(ref, () => ({
         open: (server = null) => {
+            console.log('server :>> ', server);
             if (server) {
-                setFormData(server);
+                setFormData({
+                    ...server,
+                    config: server.openapi_schema
+                });
                 serverRef.current = server;
                 setIsEdit(true);
-                fetchTools(server.config);
+                fetchTools(server.openapi_schema);
             } else {
                 resetForm();
                 setIsEdit(false);
@@ -153,24 +165,14 @@ const McpServerDialog = forwardRef(({ existingNames = [], onReload }, ref) => {
 
     // 获取工具列表
     const fetchTools = async (config) => {
+        if (!config.trim()) return;
         try {
             const jsonConfig = JSON.parse(config);
             console.log('jsonConfig :>> ', jsonConfig);
-            // const tools = await captureAndAlertRequestErrorHoc(getMcpTools(jsonConfig));
-            // setTools(tools || []);
-            setTools([{
-                name: 'xxx',
-                description: 'yyyyy',
-                inputSchema: {
-                    type: "object",
-                    properties: {
-                        name: {
-                            type: "string",
-                            required: true
-                        }
-                    }
-                }
-            }]);
+            const tools = await captureAndAlertRequestErrorHoc(getMcpServeByConfig({ file_content: config }));
+            serverRef.current = tools;
+            const apis = tools.children.map((item => JSON.parse(item.extra)));
+            setTools(apis);
         } catch (error) {
             message({ description: "配置解析失败，请检查JSON格式", variant: "warning" });
             setTools([]);
@@ -202,15 +204,17 @@ const McpServerDialog = forwardRef(({ existingNames = [], onReload }, ref) => {
         }
 
         // 提交数据
-        // const apiMethod = isEdit ? updateMcpServer : createMcpServer;
-        // captureAndAlertRequestErrorHoc(apiMethod({
-        //     ...serverRef.current,
-        //     ...formData,
-        //     config: JSON.parse(formData.config) // 确保存储的是对象
-        // })).then(() => {
-        //     message({ description: "保存成功", variant: "success" });
-        //     setOpen(false);
-        // });
+        const apiMethod = isEdit ? updateTool : createTool;
+        captureAndAlertRequestErrorHoc(apiMethod({
+            ...serverRef.current,
+            ...formData,
+            // config: JSON.parse(formData.config), // 确保存储的是对象
+            is_preset: 2
+        })).then(() => {
+            message({ description: "保存成功", variant: "success" });
+            setOpen(false);
+            onReload()
+        });
     };
 
     // 删除服务器
@@ -219,11 +223,11 @@ const McpServerDialog = forwardRef(({ existingNames = [], onReload }, ref) => {
             title: "确认删除",
             desc: "确认删除该 MCP 服务器？",
             onOk(next) {
-                // captureAndAlertRequestErrorHoc(deleteMcpServer(serverRef.current.id)).then(() => {
-                //     setOpen(false);
-                // onReload()
-                //     next();
-                // });
+                captureAndAlertRequestErrorHoc(deleteTool(formData.id)).then(() => {
+                    setOpen(false);
+                    onReload()
+                    next();
+                });
             }
         });
     };
@@ -311,7 +315,8 @@ const McpServerDialog = forwardRef(({ existingNames = [], onReload }, ref) => {
                                                     variant="outline"
                                                     onClick={() => testDialogRef.current.open(
                                                         tool,
-                                                        JSON.parse(formData.config)
+                                                        JSON.parse(formData.config),
+                                                        serverRef.current
                                                     )}
                                                 >
                                                     测试
@@ -347,4 +352,4 @@ const McpServerDialog = forwardRef(({ existingNames = [], onReload }, ref) => {
     );
 });
 
-export default McpServerDialog;
\ No newline at end of file
+export default McpServerDialog;
diff --git a/src/frontend/platform/src/pages/BuildPage/tools/EditTool.tsx b/src/frontend/platform/src/pages/BuildPage/tools/EditTool.tsx
index e3ffeb8aa..0ade80d1f 100644
--- a/src/frontend/platform/src/pages/BuildPage/tools/EditTool.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/tools/EditTool.tsx
@@ -21,7 +21,7 @@ interface TestDialogProps {
     formState: any;
 }
 
-const TestDialog = forwardRef<{
+export const TestDialog = forwardRef<{
     open: (item, tool, formState) => void
 }, TestDialogProps>((props: any, ref) => {
     const { t } = useTranslation()
diff --git a/src/frontend/platform/src/pages/BuildPage/tools/index.tsx b/src/frontend/platform/src/pages/BuildPage/tools/index.tsx
index 17cd31833..2a45aa2d4 100644
--- a/src/frontend/platform/src/pages/BuildPage/tools/index.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/tools/index.tsx
@@ -192,7 +192,7 @@ const useMcpRefrensh = () => {
             // api
             const res = await refreshAssistantMcpApi()
             console.log('刷新 :>> ', res);
-            if (res) {
+            if (!res) {
                 message({
                     variant: "success",
                     description: "刷新成功"

From 6a626719229e36928691d62349129fdb2ccc26d0 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Wed, 16 Apr 2025 15:16:57 +0800
Subject: [PATCH 012/186] fix: mcp tool test return string

---
 src/backend/bisheng/api/v1/assistant.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backend/bisheng/api/v1/assistant.py b/src/backend/bisheng/api/v1/assistant.py
index 216ebe812..c31c52aeb 100644
--- a/src/backend/bisheng/api/v1/assistant.py
+++ b/src/backend/bisheng/api/v1/assistant.py
@@ -323,7 +323,7 @@ async def mcp_tool_run(login_user: UserPayload = Depends(get_login_user),
         extra = json.loads(req.extra)
         tool_name = extra.get('name')
         resp = await client.call_tool(tool_name, req.request_params)
-        return resp_200(data=resp)
+        return resp_200(data=resp.model_dump_json())
     except Exception as e:
         logger.exception('mcp_tool_run error')
         return resp_500(message=f'测试请求出错：{str(e)}')

From a701d484162f1fd0742846982e224218b1b57c57 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Wed, 16 Apr 2025 15:44:49 +0800
Subject: [PATCH 013/186] fix: reconnect mcp server when mcp resource closed

---
 src/backend/bisheng/mcp_manage/clients/base.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/backend/bisheng/mcp_manage/clients/base.py b/src/backend/bisheng/mcp_manage/clients/base.py
index 0b332ac00..f9415dd20 100644
--- a/src/backend/bisheng/mcp_manage/clients/base.py
+++ b/src/backend/bisheng/mcp_manage/clients/base.py
@@ -1,6 +1,7 @@
 from contextlib import AsyncExitStack
 from typing import Any
 
+from anyio import ClosedResourceError
 from mcp import ClientSession
 
 
@@ -27,8 +28,16 @@ class BaseMcpClient(object):
             self.client_session = await self.exit_stack.enter_async_context(
                 ClientSession(read, write)
             )
-
-        await self.client_session.initialize()
+        try:
+            await self.client_session.initialize()
+        except ClosedResourceError as e:
+            # reconnect sse server
+            await self.close()
+            read, write = await self.get_mcp_client_transport()
+            self.client_session = await self.exit_stack.enter_async_context(
+                ClientSession(read, write)
+            )
+            await self.client_session.initialize()
 
     async def list_tools(self):
         tools = await self.client_session.list_tools()
@@ -41,5 +50,6 @@ class BaseMcpClient(object):
         return await self.client_session.call_tool(name, arguments)
 
     async def close(self):
+        print("!!!!!!!!!!!!!!!!!! close !!!!!!!!!!!!!!!")
         await self.exit_stack.aclose()
         self.client_session = None

From 0fee8002c88835402349c6a8cf27c9ea2b763d51 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Wed, 16 Apr 2025 15:49:48 +0800
Subject: [PATCH 014/186] fix: reconnect mcp server when mcp resource closed

---
 src/backend/bisheng/mcp_manage/clients/base.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/backend/bisheng/mcp_manage/clients/base.py b/src/backend/bisheng/mcp_manage/clients/base.py
index f9415dd20..927c844ce 100644
--- a/src/backend/bisheng/mcp_manage/clients/base.py
+++ b/src/backend/bisheng/mcp_manage/clients/base.py
@@ -50,6 +50,5 @@ class BaseMcpClient(object):
         return await self.client_session.call_tool(name, arguments)
 
     async def close(self):
-        print("!!!!!!!!!!!!!!!!!! close !!!!!!!!!!!!!!!")
         await self.exit_stack.aclose()
         self.client_session = None

From 26ba39f18ddad664b092f524ac3854a1d615ca2b Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Wed, 16 Apr 2025 16:37:19 +0800
Subject: [PATCH 015/186] ci: support feat branch build image

---
 .drone.yml | 190 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 190 insertions(+)

diff --git a/.drone.yml b/.drone.yml
index 5cd97c34f..93b3d0271 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -194,3 +194,193 @@ volumes:
 - name: socket
   host:
     path: /var/run/docker.sock
+
+
+---
+
+kind: pipeline # 定义对象类型，还有secret和signature两种类型
+type: docker # 定义流水线类型，还有kubernetes、exec、ssh等类型
+name: cicd # 定义流水线名称
+
+clone:
+  disable: true
+  
+steps: # 定义流水线执行步骤，这些步骤将顺序执行
+  - name: clone
+    image: alpine/git
+    pull: if-not-exists
+    environment:
+      http_proxy: 
+        from_secret: PROXY
+      https_proxy:
+        from_secret: PROXY
+    commands:
+    - git config --global core.compression 0
+    - git clone https://github.com/dataelement/bisheng.git .
+    - git checkout $DRONE_COMMIT
+
+  - name: package # 流水线名称
+    pull: if-not-exists
+    image: python:3.10-slim # 定义创建容器的Docker镜像
+    volumes: # 将容器内目录挂载到宿主机，仓库需要开启Trusted设置
+      - name: bisheng-cache
+        path: /app/build # 将应用打包好的Jar和执行脚本挂载出来
+    environment:
+      RELEASE_VERSION: 99.99.90
+      NEXUS_USER:
+        from_secret: NEXUS_USER
+      NEXUS_PASSWORD:
+        from_secret: NEXUS_PASSWORD
+      REPO:
+        from_secret: PY_NEXUS
+    commands: # 定义在Docker容器中执行的shell命令
+      - pip config set global.index-url https://pypi.tuna.tsinghua.edu.cn/simple
+      - pip install Cython
+      - pip install wheel
+      - pip install twine
+      - cd ./src/bisheng-langchain
+      - python setup.py bdist_wheel
+      - twine upload --verbose -u $NEXUS_USER  -p $NEXUS_PASSWORD --repository-url $REPO  dist/*.whl
+  
+  - name: set poetry
+    pull: if-not-exists
+    image: golang
+    environment:
+      RELEASE_VERSION: 99.99.90
+      NEXUS_PUBLIC:
+        from_secret: NEXUS_PUBLIC
+      NEXUS_PUBLIC_PASSWORD:
+        from_secret: NEXUS_PUBLIC_PASSWORD
+      REPO:
+        from_secret: PY_NEXUS
+      PROXY:
+        from_secret: APT-GET
+    volumes: # 将容器内目录挂载到宿主机，仓库需要开启Trusted设置
+      - name: bisheng-cache
+        path: /app/build/
+    commands:
+    - cd ./src/backend
+    - cp -r /app/build/nltk_data ./
+    - echo $REPO
+    - REPO2=$(echo $REPO | sed 's/http:\\/\\///g')
+    - sed  '/apt-get/ s|$| '"$PROXY"'|' Dockerfile
+    - sed -i 's/^bisheng_langchain.*/bisheng_langchain = "'$RELEASE_VERSION'"/g' pyproject.toml
+    - sed -i '6i\RUN pip config set global.index-url https://pypi.tuna.tsinghua.edu.cn/simple' Dockerfile
+    - sed -i '7i\RUN poetry source add --priority=supplemental foo http://'$NEXUS_PUBLIC':'$NEXUS_PUBLIC_PASSWORD'@'$REPO2'simple' Dockerfile
+    - sed -i '8i\RUN poetry source add --priority=primary qh https://pypi.tuna.tsinghua.edu.cn/simple' Dockerfile
+    - cat Dockerfile
+
+  - name: build_docker
+    pull: if-not-exists
+    image: docker:24.0.6
+    privileged: true
+    volumes: # 将容器内目录挂载到宿主机，仓库需要开启Trusted设置
+      - name: apt-cache
+        path: /var/cache/apt/archives # 将应用打包好的Jar和执行脚本挂载出来
+      - name: socket
+        path: /var/run/docker.sock
+      - name: pro-cache
+        path: /root/.local/share/pypoetry
+    environment:
+      http_proxy:
+        from_secret: PROXY
+      https_proxy:
+        from_secret: PROXY
+      no_proxy: 192.168.106.8
+      version: ${DRONE_BRANCH}
+      docker_registry: http://192.168.106.8:6082
+      docker_repo: 192.168.106.8:6082/dataelement/bisheng-backend
+      docker_user:
+        from_secret: NEXUS_USER
+      docker_password:
+        from_secret: NEXUS_PASSWORD
+    commands:
+      - echo "old tag is $version"
+      - version=$(echo $version | sed 's/\\//_/g')
+      - echo "build image tag is $version"
+      - cd ./src/backend/
+      - docker login -u $docker_user -p $docker_password $docker_registry
+      - docker build -t $docker_repo:$version .
+      - docker push $docker_repo:$version
+
+  - name: build_docker_frontend
+    pull: if-not-exists
+    image: docker:24.0.6
+    privileged: true
+    volumes: # 将容器内目录挂载到宿主机，仓库需要开启Trusted设置
+      - name: apt-cache
+        path: /var/cache/apt/archives # 将应用打包好的Jar和执行脚本挂载出来
+      - name: socket
+        path: /var/run/docker.sock
+    environment:
+      http_proxy:
+        from_secret: PROXY
+      https_proxy:
+        from_secret: PROXY
+      no_proxy: 192.168.106.8
+      version: ${DRONE_BRANCH}
+      docker_registry: http://192.168.106.8:6082
+      docker_repo: 192.168.106.8:6082/dataelement/bisheng-frontend
+      docker_user:
+        from_secret: NEXUS_USER
+      docker_password:
+        from_secret: NEXUS_PASSWORD
+    commands:
+      - echo "old tag is $version"
+      - version=$(echo $version | sed 's/\\//_/g')
+      - echo "build image tag is $version"
+      - cd ./src/frontend/
+      - docker login -u $docker_user -p $docker_password $docker_registry
+      - docker build -t $docker_repo:$version .
+      - docker push $docker_repo:$version
+
+  - name: notify-start # notify
+    pull: if-not-exists
+    image: plugins/webhook
+    settings:
+      debug: true
+      urls: 
+        from_secret: FEISHU_URL
+      content_type: application/json
+      template: |
+        {
+          "msg_type": "interactive",
+          "card": {
+            "type": "template",
+            "data": {
+              "template_id": "AAqkI9bnY5FUs",
+              "template_variable": {
+                "repo_name": "{{ repo.name }}",
+                "build_branch": "{{build.branch}}",
+                "build_author": "{{ DRONE_COMMIT_AUTHOR }}",
+                "link": "{{build.link}}",
+                "commit_msg": "{{ trim build.message }}",
+                "build_tag":"{{build.tag}}",
+                "build_start":"{{build.started}}",
+                "status": "{{ build.status }}"
+              }
+            }
+          }
+        }
+    when: # 成功
+      status:
+        - success
+trigger:
+  branch:
+  - feat/1.2.0
+  event:
+  - push
+   
+volumes:
+- name: bisheng-cache
+  host:
+    path: /opt/drone/data/bisheng/
+- name: pro-cache
+  host:
+    path: /opt/drone/data/pro/
+- name: apt-cache
+  host:
+    path: /opt/drone/data/bisheng/apt/
+- name: socket
+  host:
+    path: /var/run/docker.sock

From 78446ab5ba47f8a552d751dceea3239a64e1529c Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Wed, 16 Apr 2025 16:37:37 +0800
Subject: [PATCH 016/186] ci: support feat branch build image

---
 .drone.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index 93b3d0271..d751b6481 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -177,7 +177,6 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
 trigger:
   branch:
   - release
-  - feat/0.3.7rc
   event:
   - push
    

From fc4282fe80eb1c6d3b72c309bd39ad93dfe1300a Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Wed, 16 Apr 2025 16:38:15 +0800
Subject: [PATCH 017/186] ci: support feat branch build image

---
 .drone.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index d751b6481..ece2216e7 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -199,7 +199,7 @@ volumes:
 
 kind: pipeline # 定义对象类型，还有secret和signature两种类型
 type: docker # 定义流水线类型，还有kubernetes、exec、ssh等类型
-name: cicd # 定义流水线名称
+name: feat_cicd # 定义流水线名称
 
 clone:
   disable: true

From 38627ca1b551b5ce3827e5de1472e312f18ee71d Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Wed, 16 Apr 2025 17:31:59 +0800
Subject: [PATCH 018/186] fix: mcp client must in async context, so remove
 client cache

---
 .../bisheng/mcp_manage/clients/base.py        | 35 ++++++-------------
 src/backend/bisheng/mcp_manage/clients/sse.py |  7 +++-
 src/backend/bisheng/mcp_manage/manager.py     | 12 +------
 3 files changed, 18 insertions(+), 36 deletions(-)

diff --git a/src/backend/bisheng/mcp_manage/clients/base.py b/src/backend/bisheng/mcp_manage/clients/base.py
index 927c844ce..e1ed8d4bf 100644
--- a/src/backend/bisheng/mcp_manage/clients/base.py
+++ b/src/backend/bisheng/mcp_manage/clients/base.py
@@ -1,7 +1,6 @@
-from contextlib import AsyncExitStack
+from contextlib import AsyncExitStack, asynccontextmanager
 from typing import Any
 
-from anyio import ClosedResourceError
 from mcp import ClientSession
 
 
@@ -18,37 +17,25 @@ class BaseMcpClient(object):
     async def get_mcp_client_transport(self):
         raise NotImplementedError("get_mcp_client_transport() must be implemented in subclasses.")
 
-
+    @asynccontextmanager
     async def initialize(self):
         """
         Initialize the client.
         """
-        if not self.client_session:
-            read, write = await self.get_mcp_client_transport()
-            self.client_session = await self.exit_stack.enter_async_context(
-                ClientSession(read, write)
-            )
-        try:
-            await self.client_session.initialize()
-        except ClosedResourceError as e:
-            # reconnect sse server
-            await self.close()
-            read, write = await self.get_mcp_client_transport()
-            self.client_session = await self.exit_stack.enter_async_context(
-                ClientSession(read, write)
-            )
-            await self.client_session.initialize()
+        async with self.get_mcp_client_transport() as (read, write):
+            async with ClientSession(read, write) as session:
+                await session.initialize()
+                yield session
 
     async def list_tools(self):
-        tools = await self.client_session.list_tools()
+        async with self.initialize() as client_session:
+            tools = await client_session.list_tools()
         return tools.tools
 
     async def call_tool(self, name: str, arguments: dict[str, Any] | None = None):
         """
         Call a tool.
         """
-        return await self.client_session.call_tool(name, arguments)
-
-    async def close(self):
-        await self.exit_stack.aclose()
-        self.client_session = None
+        async with self.initialize() as client_session:
+            resp = await client_session.call_tool(name, arguments)
+        return resp
diff --git a/src/backend/bisheng/mcp_manage/clients/sse.py b/src/backend/bisheng/mcp_manage/clients/sse.py
index 63ddb8ea7..c5032667a 100644
--- a/src/backend/bisheng/mcp_manage/clients/sse.py
+++ b/src/backend/bisheng/mcp_manage/clients/sse.py
@@ -1,3 +1,5 @@
+from contextlib import asynccontextmanager
+
 from mcp.client.sse import sse_client
 
 from bisheng.mcp_manage.clients.base import BaseMcpClient
@@ -17,11 +19,14 @@ class SseClient(BaseMcpClient):
         super().__init__()
         self.url = url
 
+    @asynccontextmanager
     async def get_mcp_client_transport(self):
         """
         Initialize the SSE client.
         """
-        return await self.exit_stack.enter_async_context(sse_client(url=self.url))
+        async with sse_client(url=self.url) as (read, write):
+            yield read, write
+
 
     def connect(self):
         """
diff --git a/src/backend/bisheng/mcp_manage/manager.py b/src/backend/bisheng/mcp_manage/manager.py
index a13a2e78a..da67e59a2 100644
--- a/src/backend/bisheng/mcp_manage/manager.py
+++ b/src/backend/bisheng/mcp_manage/manager.py
@@ -24,9 +24,6 @@ class ClientManager:
         else:
             client = cls.client_map[client_key]
 
-        # 判断对应的client是否还处于链接状态
-        await client.initialize()
-
         return client
 
     @classmethod
@@ -35,11 +32,4 @@ class ClientManager:
         client_key = md5_hash(f'{client_type}:{kwargs}')
         if client_key not in cls.client_map:
             return
-        client = cls.client_map[client_key]
-        await client.close()
-
-    async def __aexit__(self, exc_type, exc_val, exc_tb):
-        """ 释放所有的连接 """
-        for client_key in self.client_map.keys():
-            client = self.client_map[client_key]
-            await client.close()
+        del cls.client_map[client_key]

From 42012f4c5784acc3c86b9dc209f2a26afb3517bf Mon Sep 17 00:00:00 2001
From: dolphin <shanghang@dataelem.com>
Date: Wed, 16 Apr 2025 18:19:53 +0800
Subject: [PATCH 019/186] =?UTF-8?q?fix:=20=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/frontend/platform/src/contexts/locationContext.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/frontend/platform/src/contexts/locationContext.tsx b/src/frontend/platform/src/contexts/locationContext.tsx
index 5720e550b..2d5d3abb3 100644
--- a/src/frontend/platform/src/contexts/locationContext.tsx
+++ b/src/frontend/platform/src/contexts/locationContext.tsx
@@ -69,9 +69,8 @@ export function LocationProvider({ children }: { children: ReactNode }) {
   })
 
   const loadConfig = () => {
-    Promise.all([getWorkstationConfigApi(), getAppConfig()]).then(([bench, res]) => {
+    Promise.all([getAppConfig()]).then(([res]) => {
       setAppConfig({
-        benchMenu: bench?.menuShow || false,
         isDev: res.env === 'dev',
         libAccepts: res.uns_support,
         officeUrl: res.office_url,

From c8599d1f9e2eb240e70495fc5038487eb3b2b075 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Wed, 16 Apr 2025 20:18:03 +0800
Subject: [PATCH 020/186] fix: mcp tool sync run error

---
 .../bisheng/api/services/assistant_agent.py    | 18 +++++++++++++-----
 src/backend/bisheng/mcp_manage/clients/base.py |  6 ++++--
 src/backend/bisheng/mcp_manage/clients/sse.py  |  9 +--------
 .../bisheng/mcp_manage/langchain/tool.py       | 11 +++++++----
 src/backend/bisheng/mcp_manage/manager.py      |  5 +++++
 src/backend/bisheng/workflow/common/node.py    |  2 +-
 6 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/src/backend/bisheng/api/services/assistant_agent.py b/src/backend/bisheng/api/services/assistant_agent.py
index 96bd1a059..369de4e7f 100644
--- a/src/backend/bisheng/api/services/assistant_agent.py
+++ b/src/backend/bisheng/api/services/assistant_agent.py
@@ -195,9 +195,19 @@ class AssistantAgent(AssistantUtils):
         """
         初始化mcp工具列表
         """
-        loop = asyncio.get_event_loop()
-        future = asyncio.run_coroutine_threadsafe(AssistantAgent.async_init_mcp_tools(tool_list, callbacks), loop)
-        return future.result()
+        tool_type_ids = [one.type for one in tool_list]
+        all_tool_type = GptsToolsDao.get_all_tool_type(tool_type_ids)
+        all_tool_type = {one.id: one for one in all_tool_type}
+        tool_langchain = []
+        for one in tool_list:
+            tool_type = all_tool_type.get(one.type)
+            input_schema = json.loads(one.extra)
+            mcp_client = ClientManager.sync_connect_mcp(McpClientType.SSE.value, url=tool_type.server_host)
+            mcp_tool = McpTool.get_mcp_tool(name=one.tool_key, description=one.desc, mcp_client=mcp_client,
+                                            mcp_tool_name=one.name, arg_schema=input_schema['inputSchema'],
+                                            callbacks=callbacks)
+            tool_langchain.append(mcp_tool)
+        return tool_langchain
 
     @staticmethod
     async def async_init_mcp_tools(tool_list: List[GptsTools], callbacks: Callbacks = None):
@@ -211,12 +221,10 @@ class AssistantAgent(AssistantUtils):
         for one in tool_list:
             tool_type = all_tool_type.get(one.type)
             input_schema = json.loads(one.extra)
-            print("--===-------", input_schema)
             mcp_client = await ClientManager.connect_mcp(McpClientType.SSE.value, url=tool_type.server_host)
             mcp_tool = McpTool.get_mcp_tool(name=one.tool_key, description=one.desc, mcp_client=mcp_client,
                                             mcp_tool_name=one.name, arg_schema=input_schema['inputSchema'],
                                             callbacks=callbacks)
-            print("---------", mcp_tool.tool_call_schema)
             tool_langchain.append(mcp_tool)
         return tool_langchain
 
diff --git a/src/backend/bisheng/mcp_manage/clients/base.py b/src/backend/bisheng/mcp_manage/clients/base.py
index e1ed8d4bf..0167064b0 100644
--- a/src/backend/bisheng/mcp_manage/clients/base.py
+++ b/src/backend/bisheng/mcp_manage/clients/base.py
@@ -1,3 +1,4 @@
+from abc import abstractmethod
 from contextlib import AsyncExitStack, asynccontextmanager
 from typing import Any
 
@@ -14,7 +15,8 @@ class BaseMcpClient(object):
 
         self.client_session: ClientSession | None = None
 
-    async def get_mcp_client_transport(self):
+    @abstractmethod
+    async def get_transport(self):
         raise NotImplementedError("get_mcp_client_transport() must be implemented in subclasses.")
 
     @asynccontextmanager
@@ -22,7 +24,7 @@ class BaseMcpClient(object):
         """
         Initialize the client.
         """
-        async with self.get_mcp_client_transport() as (read, write):
+        async with self.get_transport() as (read, write):
             async with ClientSession(read, write) as session:
                 await session.initialize()
                 yield session
diff --git a/src/backend/bisheng/mcp_manage/clients/sse.py b/src/backend/bisheng/mcp_manage/clients/sse.py
index c5032667a..83e03e676 100644
--- a/src/backend/bisheng/mcp_manage/clients/sse.py
+++ b/src/backend/bisheng/mcp_manage/clients/sse.py
@@ -20,16 +20,9 @@ class SseClient(BaseMcpClient):
         self.url = url
 
     @asynccontextmanager
-    async def get_mcp_client_transport(self):
+    async def get_transport(self):
         """
         Initialize the SSE client.
         """
         async with sse_client(url=self.url) as (read, write):
             yield read, write
-
-
-    def connect(self):
-        """
-        Connect to the SSE server.
-        """
-        pass  # Implement the connection logic here
\ No newline at end of file
diff --git a/src/backend/bisheng/mcp_manage/langchain/tool.py b/src/backend/bisheng/mcp_manage/langchain/tool.py
index ce6531a36..6cb920d18 100644
--- a/src/backend/bisheng/mcp_manage/langchain/tool.py
+++ b/src/backend/bisheng/mcp_manage/langchain/tool.py
@@ -1,4 +1,6 @@
 import asyncio
+import concurrent
+import concurrent.futures
 from typing import Any, Type
 
 from langchain_core.tools import StructuredTool
@@ -61,13 +63,14 @@ class McpTool(BaseModel):
     mcp_tool_name: str
 
     def run(self, *args, **kwargs: Any) -> Any:
-        loop = asyncio.get_event_loop()
-        future = asyncio.run_coroutine_threadsafe(self._arun(**kwargs), loop)
-        return future.result()
+        # todo call async method better when using in event pool
+        with concurrent.futures.ThreadPoolExecutor() as pool:
+            future = pool.submit(asyncio.run, self.arun(*args, **kwargs))
+            resp = future.result()
+        return resp
 
     async def arun(self, *args, **kwargs: Any) -> Any:
         """Use the tool asynchronously."""
-        print(f"================ {args}| {kwargs}")
         resp = await self.mcp_client.call_tool(self.mcp_tool_name, kwargs)
         return resp
 
diff --git a/src/backend/bisheng/mcp_manage/manager.py b/src/backend/bisheng/mcp_manage/manager.py
index da67e59a2..e8675fcdf 100644
--- a/src/backend/bisheng/mcp_manage/manager.py
+++ b/src/backend/bisheng/mcp_manage/manager.py
@@ -13,6 +13,11 @@ class ClientManager:
     @classmethod
     async def connect_mcp(cls, client_type: str, **kwargs) -> BaseMcpClient:
         """ 获取对应url的mcp连接 """
+        # 初始化对应的client
+        return cls.sync_connect_mcp(client_type, **kwargs)
+
+    @classmethod
+    def sync_connect_mcp(cls, client_type: str, **kwargs) -> BaseMcpClient:
         # 初始化对应的client
         client_key = md5_hash(f'{client_type}:{kwargs}')
         if cls.client_map.get(client_key) is None:
diff --git a/src/backend/bisheng/workflow/common/node.py b/src/backend/bisheng/workflow/common/node.py
index b5b7c0aa2..27770a208 100644
--- a/src/backend/bisheng/workflow/common/node.py
+++ b/src/backend/bisheng/workflow/common/node.py
@@ -49,7 +49,7 @@ class BaseNodeData(BaseModel):
     group_params: Optional[List[NodeGroupParams]] = Field(default=None, description="Node group params")
     tab: Optional[dict] = Field({}, description="tab config")
     tool_key: Optional[str] = Field("", description="unique tool id, only for tool node")
-    v: str = Field(default="", description="node version")
+    v: Optional[str | int] = Field(default="", description="node version")
 
     def get_variable_info(self, variable_key: str) -> NodeParams | None:
         for group_info in self.group_params:

From e14499af4217312eaf5d44242acee2e3a59adeb2 Mon Sep 17 00:00:00 2001
From: dolphin <shanghang@dataelem.com>
Date: Sat, 19 Apr 2025 00:04:58 +0800
Subject: [PATCH 021/186] fix: some bugfix

---
 .../platform/public/locales/zh/bs.json        |   4 +-
 .../components/bs-comp/sheets/ToolsSheet.tsx  |  20 +-
 .../src/pages/BuildPage/tools/EditMcp.tsx     | 224 ++++++++++--------
 src/frontend/platform/src/util/utils.ts       |  20 ++
 src/frontend/platform/vite.config.mts         |   2 +-
 5 files changed, 164 insertions(+), 106 deletions(-)

diff --git a/src/frontend/platform/public/locales/zh/bs.json b/src/frontend/platform/public/locales/zh/bs.json
index 7e4f4060a..605385197 100644
--- a/src/frontend/platform/public/locales/zh/bs.json
+++ b/src/frontend/platform/public/locales/zh/bs.json
@@ -566,9 +566,9 @@
   },
   "tools": {
     "addTool": "添加工具",
-    "createCustomTool": "自定义工具",
+    "createCustomTool": "API工具",
     "builtinTools": "内置工具",
-    "customTools": "自定义工具",
+    "customTools": "API工具",
     "search": "搜索",
     "empty": "空空如也",
     "manageCustomTools": "在此页面管理您的自定义工具，对自定义工具创建、编辑等等",
diff --git a/src/frontend/platform/src/components/bs-comp/sheets/ToolsSheet.tsx b/src/frontend/platform/src/components/bs-comp/sheets/ToolsSheet.tsx
index 8476109d4..4deed28b8 100644
--- a/src/frontend/platform/src/components/bs-comp/sheets/ToolsSheet.tsx
+++ b/src/frontend/platform/src/components/bs-comp/sheets/ToolsSheet.tsx
@@ -40,12 +40,6 @@ export default function ToolsSheet({ select, onSelect, children }) {
                     <div className="w-fit p-6">
                         <SheetTitle>{t('build.addTool')}</SheetTitle>
                         <SearchInput placeholder={t('build.search')} className="mt-6" onChange={(e) => setKeyword(e.target.value)} />
-                        <Button
-                            className="mt-4 w-full"
-                            onClick={() => window.open(__APP_ENV__.BASE_URL + "/build/tools")}
-                        >
-                            {t('create')}{t("tools.createCustomTool")}
-                        </Button>
                         <div className="mt-4">
                             <div
                                 className={`flex items-center gap-2 px-4 py-2 rounded-md cursor-pointer hover:bg-muted-foreground/10 transition-all duration-200 ${type === 'default' && 'bg-muted-foreground/10'}`}
@@ -72,6 +66,20 @@ export default function ToolsSheet({ select, onSelect, children }) {
                         </div>
                     </div>
                     <div className="flex-1 bg-background-main p-5 pt-12 h-full overflow-auto scrollbar-hide">
+                        <div className="mb-4">
+                            {type === 'custom' && <Button
+                                className="mt-4  text-[white]"
+                                onClick={() => window.open(__APP_ENV__.BASE_URL + "/build/tools")}
+                            >
+                                {t('create')}{t("tools.createCustomTool")}
+                            </Button>}
+                            {type === 'mcp' && <Button
+                                className="mt-4  text-[white]"
+                                onClick={() => window.open(__APP_ENV__.BASE_URL + "/build/tools")}
+                            >
+                                添加 MCP 服务器
+                            </Button>}
+                        </div>
                         <Accordion type="single" collapsible className="w-full">
                             {
                                 options.length ? options.map(el => (
diff --git a/src/frontend/platform/src/pages/BuildPage/tools/EditMcp.tsx b/src/frontend/platform/src/pages/BuildPage/tools/EditMcp.tsx
index 9803b123c..2309e8295 100644
--- a/src/frontend/platform/src/pages/BuildPage/tools/EditMcp.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/tools/EditMcp.tsx
@@ -10,6 +10,7 @@ import { useToast } from "@/components/bs-ui/toast/use-toast";
 import { createTool, deleteTool, getMcpServeByConfig, testMcpApi, updateTool } from "@/controllers/API/tools";
 // import { createMcpServer, deleteMcpServer, getMcpTools, testMcpTool, updateMcpServer } from "@/controllers/API/mcp";
 import { captureAndAlertRequestErrorHoc } from "@/controllers/request";
+import { isValidJSON } from "@/util/utils";
 import { forwardRef, useImperativeHandle, useRef, useState } from "react";
 
 // 测试对话框组件
@@ -115,129 +116,165 @@ const TestDialog = forwardRef((props, ref) => {
 });
 
 // 主组件
-const McpServerDialog = forwardRef(({ existingNames = [], onReload }, ref) => {
-    const [open, setOpen] = useState(false);
-    const [isEdit, setIsEdit] = useState(false);
-    const [tools, setTools] = useState([]);
-    const initialData = {
+const McpServerEditorDialog = forwardRef(({ existingNames = [], onReload }, ref) => {
+    const [isDialogOpen, setIsDialogOpen] = useState(false);
+    const [isEditMode, setIsEditMode] = useState(false);
+    const [availableTools, setAvailableTools] = useState([]);
+
+    const initialFormState = {
         name: "",
-        config: "{}"
+        openapiSchema: "{}"
     };
-    const [formData, setFormData] = useState(initialData);
-    const serverRef = useRef(initialData);
+    const [formData, setFormData] = useState(initialFormState);
+    const serverRef = useRef(initialFormState);
+    const originalName = useRef("");
     const { message } = useToast();
-    const testDialogRef = useRef();
+    const testToolDialogRef = useRef(null);
 
     // 示例配置
-    const examples = {
-        tavily: JSON.stringify({
-            base_url: "https://api.tavily.com",
-            api_key: "YOUR_API_KEY"
+    const exampleConfigs = {
+        gaode: JSON.stringify({
+            "mcpServers": {
+                "amap-sse": {
+                    "name": "高德地图",
+                    "description": "提供全场景覆盖的地图服务，包括地理编码、逆地理编码、IP 定位、天气查询、骑行路径规划、步行路径规划、驾车路径规划、公交路径规划、距离测量、关键词搜索、周边搜索、详情搜索等。",
+                    "url": "https://mcp.amap.com/sse?key=yourapikey"
+                }
+            }
         }, null, 2)
     };
 
     // 暴露方法给父组件
     useImperativeHandle(ref, () => ({
-        open: (server = null) => {
-            console.log('server :>> ', server);
-            if (server) {
+        open: (serverData = null) => {
+            if (serverData) {
                 setFormData({
-                    ...server,
-                    config: server.openapi_schema
+                    ...serverData,
+                    openapiSchema: serverData.openapi_schema
                 });
-                serverRef.current = server;
-                setIsEdit(true);
-                fetchTools(server.openapi_schema);
+                serverRef.current = serverData;
+                originalName.current = serverData.name;
+                setIsEditMode(true);
+                loadToolsFromSchema(serverData.openapi_schema);
             } else {
-                resetForm();
-                setIsEdit(false);
+                resetFormState();
+                setIsEditMode(false);
             }
-            setOpen(true);
+            setIsDialogOpen(true);
         }
     }));
 
+
     // 重置表单
-    const resetForm = () => {
-        setFormData(initialData);
-        serverRef.current = initialData;
-        setTools([]);
+    const resetFormState = () => {
+        setFormData(initialFormState);
+        serverRef.current = initialFormState;
+        setAvailableTools([]);
     };
 
-    // 获取工具列表
-    const fetchTools = async (config) => {
-        if (!config.trim()) return;
-        try {
-            const jsonConfig = JSON.parse(config);
-            console.log('jsonConfig :>> ', jsonConfig);
-            const tools = await captureAndAlertRequestErrorHoc(getMcpServeByConfig({ file_content: config }));
-            serverRef.current = tools;
-            const apis = tools.children.map((item => JSON.parse(item.extra)));
-            setTools(apis);
-        } catch (error) {
-            message({ description: "配置解析失败，请检查JSON格式", variant: "warning" });
-            setTools([]);
+    const loadToolsFromSchema = async (schemaContent) => {
+        if (!schemaContent.trim()) return;
+
+        if (!isValidJSON(schemaContent)) {
+            setAvailableTools([]);
+            return message({
+                description: "配置格式错误，请检查JSON格式是否正确",
+                variant: "warning"
+            });
         }
+
+        const tools = await captureAndAlertRequestErrorHoc(
+            getMcpServeByConfig({ file_content: schemaContent })
+        );
+        serverRef.current = tools;
+        const parsedApis = tools.children.map(item => JSON.parse(item.extra));
+        setAvailableTools(parsedApis);
+    };
+
+    const validateForm = () => {
+        const errors = [];
+        const name = formData.name.trim();
+        const schema = formData.openapiSchema.trim();
+
+        // 名称校验
+        if (!name) {
+            errors.push("名称不能为空");
+        } else if (
+            existingNames.some(
+                n => n.toLowerCase() === name.toLowerCase() &&
+                    n !== originalName.current
+            )
+        ) {
+            errors.push("名称已存在，请修改");
+        }
+
+        // Schema校验
+        if (!schema) {
+            errors.push("配置不能为空");
+        } else if (!isValidJSON(schema)) {
+            errors.push("配置格式错误，请检查JSON格式是否正确");
+        }
+
+        return errors;
     };
 
     // 表单提交
     const handleSubmit = () => {
         // 校验逻辑
-        const errors = [];
-        if (!formData.name.trim()) errors.push("名称不能为空");
-        if (!formData.config.trim()) errors.push("配置不能为空");
-
-        // 名称唯一性校验（不区分大小写）
-        const nameLower = formData.name.toLowerCase();
-        if (existingNames.some(n => n.toLowerCase() === nameLower && n !== serverRef.current.name)) {
-            errors.push("名称已存在，请修改");
-        }
-
-        // JSON格式校验
-        try {
-            JSON.parse(formData.config);
-        } catch {
-            errors.push("配置格式错误，请检查JSON格式是否正确");
-        }
-
-        if (errors.length > 0) {
-            return message({ description: errors, variant: "warning" });
+        const validationErrors = validateForm();
+        if (validationErrors.length > 0) {
+            return message({
+                description: validationErrors,
+                variant: "warning"
+            });
         }
 
         // 提交数据
-        const apiMethod = isEdit ? updateTool : createTool;
+        const apiMethod = isEditMode ? updateTool : createTool;
         captureAndAlertRequestErrorHoc(apiMethod({
             ...serverRef.current,
             ...formData,
-            // config: JSON.parse(formData.config), // 确保存储的是对象
             is_preset: 2
-        })).then(() => {
+        })).then((res) => {
+            if (!res) return;
             message({ description: "保存成功", variant: "success" });
-            setOpen(false);
+            setIsDialogOpen(false);
             onReload()
         });
     };
 
     // 删除服务器
-    const handleDelete = () => {
+    const handleServerDelete = () => {
         bsConfirm({
-            title: "确认删除",
+            title: "提示",
             desc: "确认删除该 MCP 服务器？",
-            onOk(next) {
-                captureAndAlertRequestErrorHoc(deleteTool(formData.id)).then(() => {
-                    setOpen(false);
-                    onReload()
-                    next();
+            onOk(closeDialog) {
+                captureAndAlertRequestErrorHoc(
+                    deleteTool(formData.id)
+                ).then(() => {
+                    setIsDialogOpen(false);
+                    onReload();
+                    closeDialog();
                 });
             }
         });
     };
 
+    const [selectValue] = useState("");
+    const handleExampleSelect = (exampleKey) => {
+        const exampleSchema = exampleConfigs[exampleKey];
+        setFormData(prev => ({
+            ...prev,
+            openapiSchema: exampleSchema
+        }));
+        loadToolsFromSchema(exampleSchema);
+    };
     return (
         <div>
-            <Sheet open={open} onOpenChange={setOpen}>
+            <Sheet open={isDialogOpen} onOpenChange={setIsDialogOpen}>
                 <SheetContent className="w-[800px] sm:max-w-[800px] p-4 bg-background-login">
                     <SheetHeader>
-                        <SheetTitle>{isEdit ? "编辑" : "添加"} MCP 服务器</SheetTitle>
+                        <SheetTitle>{isEditMode ? "编辑" : "添加"} MCP 服务器</SheetTitle>
                     </SheetHeader>
 
                     <div className="mt-4 space-y-6 px-6 overflow-y-auto h-[calc(100vh-200px)]">
@@ -259,33 +296,26 @@ const McpServerDialog = forwardRef(({ existingNames = [], onReload }, ref) => {
                         <div>
                             <div className="flex justify-between items-center mb-2">
                                 <Label className="bisheng-label">MCP服务器配置</Label>
-                                <Select onValueChange={(v) => setFormData(prev => {
-                                    fetchTools(examples[v])
-                                    return {
-                                        ...prev,
-                                        config: examples[v]
-                                    }
-                                })
-                                }>
+                                <Select value={selectValue} onValueChange={handleExampleSelect}>
                                     <SelectTrigger className="w-[180px]">
-                                        <span>配置示例</span>
+                                        <span>示例</span>
                                     </SelectTrigger>
                                     <SelectContent>
                                         <SelectGroup>
-                                            <SelectItem value="tavily">Tavily 搜索</SelectItem>
+                                            <SelectItem value="gaode">高德地图</SelectItem>
                                         </SelectGroup>
                                     </SelectContent>
                                 </Select>
                             </div>
                             <Textarea
-                                value={formData.config}
+                                value={formData.openapiSchema}
                                 placeholder="输入您的 MCP 服务器配置 json"
                                 className="min-h-[200px] font-mono"
                                 onChange={(e) => setFormData(prev => ({
                                     ...prev,
-                                    config: e.target.value
+                                    openapiSchema: e.target.value
                                 }))}
-                                onBlur={() => fetchTools(formData.config)}
+                                onBlur={() => loadToolsFromSchema(formData.openapiSchema)}
                             />
                         </div>
 
@@ -293,29 +323,29 @@ const McpServerDialog = forwardRef(({ existingNames = [], onReload }, ref) => {
                         <div>
                             <div className="flex justify-between items-center mb-2">
                                 <Label>可用工具</Label>
-                                <Button variant="outline" onClick={() => fetchTools(formData.config)}>
-                                    刷新列表
+                                <Button variant="outline" onClick={() => loadToolsFromSchema(formData.openapiSchema)}>
+                                    刷新
                                 </Button>
                             </div>
                             <Table>
                                 <TableHeader>
                                     <TableRow>
-                                        <TableHead>工具名称</TableHead>
+                                        <TableHead>名称</TableHead>
                                         <TableHead>描述</TableHead>
                                         <TableHead>操作</TableHead>
                                     </TableRow>
                                 </TableHeader>
                                 <TableBody>
-                                    {tools.map((tool) => (
+                                    {availableTools.map((tool) => (
                                         <TableRow key={tool.name}>
                                             <TableCell>{tool.name}</TableCell>
                                             <TableCell>{tool.description}</TableCell>
                                             <TableCell>
                                                 <Button
                                                     variant="outline"
-                                                    onClick={() => testDialogRef.current.open(
+                                                    onClick={() => testToolDialogRef.current.open(
                                                         tool,
-                                                        JSON.parse(formData.config),
+                                                        JSON.parse(formData.openapiSchema),
                                                         serverRef.current
                                                     )}
                                                 >
@@ -331,25 +361,25 @@ const McpServerDialog = forwardRef(({ existingNames = [], onReload }, ref) => {
 
                     {/* 底部操作按钮 */}
                     <SheetFooter className="absolute bottom-0 right-0 w-full px-6 py-4">
-                        {isEdit && (
+                        {isEditMode && (
                             <Button
                                 variant="destructive"
                                 className="mr-auto"
-                                onClick={handleDelete}
+                                onClick={handleServerDelete}
                             >
                                 删除
                             </Button>
                         )}
-                        <Button variant="outline" onClick={() => setOpen(false)}>
+                        <Button variant="outline" onClick={() => setIsDialogOpen(false)}>
                             取消
                         </Button>
                         <Button onClick={handleSubmit}>保存</Button>
                     </SheetFooter>
                 </SheetContent>
             </Sheet>
-            <TestDialog ref={testDialogRef} />
+            <TestDialog ref={testToolDialogRef} />
         </div>
     );
 });
 
-export default McpServerDialog;
+export default McpServerEditorDialog;
diff --git a/src/frontend/platform/src/util/utils.ts b/src/frontend/platform/src/util/utils.ts
index 71a2f577e..02c821cf3 100644
--- a/src/frontend/platform/src/util/utils.ts
+++ b/src/frontend/platform/src/util/utils.ts
@@ -167,4 +167,24 @@ export function exportCsv(data: any[], fileName: string = 'test_result.csv') {
         document.body.removeChild(a);
         window.URL.revokeObjectURL(url);
     }, 0);
+}
+
+// 校验合法json
+export function isValidJSON(str) {
+    if (typeof str !== 'string') return false;
+    
+    // 简单的前置检查
+    str = str.trim();
+    if (!(str.startsWith('{') && str.endsWith('}')) && 
+        !(str.startsWith('[') && str.endsWith(']'))) {
+        return false;
+    }
+    
+    // 完整解析验证
+    try {
+        JSON.parse(str);
+        return true;
+    } catch (e) {
+        return false;
+    }
 }
\ No newline at end of file
diff --git a/src/frontend/platform/vite.config.mts b/src/frontend/platform/vite.config.mts
index b26a6172d..f71a4e44a 100644
--- a/src/frontend/platform/vite.config.mts
+++ b/src/frontend/platform/vite.config.mts
@@ -8,7 +8,7 @@ import svgr from "vite-plugin-svgr";
 
 // Use environment variable to determine the target.
 //  const target = process.env.VITE_PROXY_TARGET || "http://127.0.0.1:7860";
- const target = process.env.VITE_PROXY_TARGET || "http://192.168.106.120:3002";
+ const target = process.env.VITE_PROXY_TARGET || "http://192.168.106.120:3003";
 const apiRoutes = ["^/api/", "/health"];
 
 const proxyTargets = apiRoutes.reduce((proxyObj, route) => {

From 3f4d630699ecadaa13d5eacefe5890658cedc555 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Mon, 21 Apr 2025 11:20:15 +0800
Subject: [PATCH 022/186] feat: tool list order by update time desc

---
 src/backend/bisheng/api/services/workstation.py   | 6 +++---
 src/backend/bisheng/database/constants.py         | 6 ++++++
 src/backend/bisheng/database/models/gpts_tools.py | 2 ++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/backend/bisheng/api/services/workstation.py b/src/backend/bisheng/api/services/workstation.py
index 5649b4e66..80f50edd0 100644
--- a/src/backend/bisheng/api/services/workstation.py
+++ b/src/backend/bisheng/api/services/workstation.py
@@ -7,11 +7,11 @@ from bisheng.api.services import knowledge_imp, llm
 from bisheng.api.services.knowledge import KnowledgeService
 from bisheng.api.services.user_service import UserPayload
 from bisheng.api.v1.schemas import KnowledgeFileOne, KnowledgeFileProcess, WorkstationConfig
+from bisheng.database.constants import MessageCategory
 from bisheng.database.models.config import Config, ConfigDao, ConfigKeyEnum
 from bisheng.database.models.knowledge import KnowledgeCreate, KnowledgeDao, KnowledgeTypeEnum
 from bisheng.database.models.message import ChatMessage, ChatMessageDao
 from bisheng.database.models.session import MessageSession
-from bisheng.restructure.assistants.services import MsgCategory
 from fastapi import BackgroundTasks, Request
 from langchain_core.messages import AIMessage, HumanMessage
 from loguru import logger
@@ -124,9 +124,9 @@ class WorkStationService:
             # the user and the assistant were reversed, leading to incorrect question-and-answer sequences.
             extra = json.loads(one.extra) or {}
             content = extra['prompt'] if 'prompt' in extra else one.message
-            if one.category == MsgCategory.Question:
+            if one.category == MessageCategory.QUESTION.value:
                 chat_history.append(HumanMessage(content=content))
-            elif one.category == MsgCategory.Answer:
+            elif one.category == MessageCategory.ANSWER.value:
                 chat_history.append(AIMessage(content=content))
         logger.info(f'loaded {len(chat_history)} chat history for chat_id {chat_id}')
         return chat_history
diff --git a/src/backend/bisheng/database/constants.py b/src/backend/bisheng/database/constants.py
index 515f5a1cb..67f1bbd0e 100644
--- a/src/backend/bisheng/database/constants.py
+++ b/src/backend/bisheng/database/constants.py
@@ -10,3 +10,9 @@ class ToolPresetType(Enum):
     PRESET = 1  # 预置工具
     API = 0  # 自定义API工具
     MCP = 2  # mcp类型的工具
+
+
+# 消息表里一些基础的category类型
+class MessageCategory(Enum):
+    QUESTION = 'question'  # 用户问题
+    ANSWER = 'answer'  # 答案
diff --git a/src/backend/bisheng/database/models/gpts_tools.py b/src/backend/bisheng/database/models/gpts_tools.py
index 4650d3ea1..f37f85e3d 100644
--- a/src/backend/bisheng/database/models/gpts_tools.py
+++ b/src/backend/bisheng/database/models/gpts_tools.py
@@ -193,6 +193,7 @@ class GptsToolsDao(GptsToolsBase):
         with session_getter() as session:
             statement = select(GptsToolsType).where(GptsToolsType.is_preset == ToolPresetType.PRESET.value,
                                                     GptsToolsType.is_delete == 0)
+            statement = statement.order_by(GptsToolsType.update_time.desc())
             return session.exec(statement).all()
 
     @classmethod
@@ -215,6 +216,7 @@ class GptsToolsDao(GptsToolsBase):
         if is_preset is not None:
             statement = statement.where(GptsToolsType.is_preset == is_preset.value)
         statement = statement.where(or_(*filters))
+        statement = statement.order_by(GptsToolsType.update_time.desc())
         with session_getter() as session:
             return session.exec(statement).all()
 

From 9b5faa305f90a3d1f39cd657b9ec60d5b21eb7a4 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Mon, 21 Apr 2025 11:28:48 +0800
Subject: [PATCH 023/186] feat: knowledge llm remove cache

---
 src/backend/bisheng/api/services/knowledge_imp.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backend/bisheng/api/services/knowledge_imp.py b/src/backend/bisheng/api/services/knowledge_imp.py
index d78801d78..31a2bacb1 100644
--- a/src/backend/bisheng/api/services/knowledge_imp.py
+++ b/src/backend/bisheng/api/services/knowledge_imp.py
@@ -258,7 +258,7 @@ def decide_knowledge_llm() -> Any:
         return None
 
     # 获取llm对象
-    return LLMService.get_bisheng_llm(model_id=knowledge_llm.extract_title_model_id)
+    return LLMService.get_bisheng_llm(model_id=knowledge_llm.extract_title_model_id, cache=False)
 
 
 def addEmbedding(collection_name: str,

From da46af1a79d79715912404d50fe3d0d70e6e3432 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Mon, 21 Apr 2025 16:36:36 +0800
Subject: [PATCH 024/186] feat: mcp server support stdio mode

---
 .../bisheng/api/services/assistant_agent.py   |  4 +-
 src/backend/bisheng/api/services/tool.py      |  2 +-
 src/backend/bisheng/api/v1/assistant.py       | 16 +++---
 src/backend/bisheng/api/v1/schemas.py         |  1 +
 .../bisheng/mcp_manage/clients/stdio.py       | 28 ++++++++++
 src/backend/bisheng/mcp_manage/manager.py     | 53 +++++++++++--------
 6 files changed, 71 insertions(+), 33 deletions(-)
 create mode 100644 src/backend/bisheng/mcp_manage/clients/stdio.py

diff --git a/src/backend/bisheng/api/services/assistant_agent.py b/src/backend/bisheng/api/services/assistant_agent.py
index 369de4e7f..122353a51 100644
--- a/src/backend/bisheng/api/services/assistant_agent.py
+++ b/src/backend/bisheng/api/services/assistant_agent.py
@@ -202,7 +202,7 @@ class AssistantAgent(AssistantUtils):
         for one in tool_list:
             tool_type = all_tool_type.get(one.type)
             input_schema = json.loads(one.extra)
-            mcp_client = ClientManager.sync_connect_mcp(McpClientType.SSE.value, url=tool_type.server_host)
+            mcp_client = ClientManager.sync_connect_mcp_from_json(tool_type.openapi_schema)
             mcp_tool = McpTool.get_mcp_tool(name=one.tool_key, description=one.desc, mcp_client=mcp_client,
                                             mcp_tool_name=one.name, arg_schema=input_schema['inputSchema'],
                                             callbacks=callbacks)
@@ -221,7 +221,7 @@ class AssistantAgent(AssistantUtils):
         for one in tool_list:
             tool_type = all_tool_type.get(one.type)
             input_schema = json.loads(one.extra)
-            mcp_client = await ClientManager.connect_mcp(McpClientType.SSE.value, url=tool_type.server_host)
+            mcp_client = await ClientManager.connect_mcp_from_json(tool_type.openapi_schema)
             mcp_tool = McpTool.get_mcp_tool(name=one.tool_key, description=one.desc, mcp_client=mcp_client,
                                             mcp_tool_name=one.name, arg_schema=input_schema['inputSchema'],
                                             callbacks=callbacks)
diff --git a/src/backend/bisheng/api/services/tool.py b/src/backend/bisheng/api/services/tool.py
index 5fface81d..a3e7ddc50 100644
--- a/src/backend/bisheng/api/services/tool.py
+++ b/src/backend/bisheng/api/services/tool.py
@@ -43,7 +43,7 @@ class ToolServices(BaseModel):
         """ refresh mcp tools """
         # 1. get all new tools
         # 实例化mcp服务对象，获取工具列表
-        client = await ClientManager.connect_mcp(McpClientType.SSE.value, url=tool_type.server_host)
+        client = await ClientManager.connect_mcp_from_json(tool_type.openapi_schema)
         tools = await client.list_tools()
         new_tools = {}
         for one in tools:
diff --git a/src/backend/bisheng/api/v1/assistant.py b/src/backend/bisheng/api/v1/assistant.py
index c31c52aeb..31d0922c8 100644
--- a/src/backend/bisheng/api/v1/assistant.py
+++ b/src/backend/bisheng/api/v1/assistant.py
@@ -278,23 +278,21 @@ async def get_mcp_tool_schema(login_user: UserPayload = Depends(get_login_user),
     """ 解析mcp的工具配置文件 """
     try:
         result = json.loads(file_content)
-        mcp_servers = result.get('mcpServers')
+        mcp_servers = result['mcpServers']
     except Exception as e:
         logger.exception(f'mcp tool schema parse error {e}')
-        return resp_500(message=f'mcp工具配置解析失败，请检查内容是否符合json格式: {str(e)}')
+        return resp_500(message=f'mcp工具配置解析失败，请检查内容是否符合mcp配置格式: {str(e)}')
     tool_type = None
     for key, value in mcp_servers.items():
-        if not value.get('url', None) or not value.get('url').startswith(('http', 'https')):
-            return resp_500(message=f'mcp服务配置中的url必须以http或者https开头: {value.get("url")}')
         # 解析mcp服务配置
-        tool_type = GptsToolsTypeRead(name=value.get('name'),
+        tool_type = GptsToolsTypeRead(name=value.get('name', ''),
                                       server_host=value.get('url'),
-                                      description=value.get('description'),
+                                      description=value.get('description', ''),
                                       is_preset=ToolPresetType.MCP.value,
                                       openapi_schema=file_content,
                                       children=[])
         # 实例化mcp服务对象，获取工具列表
-        client = await ClientManager.connect_mcp(McpClientType.SSE.value, url=value.get('url'))
+        client = await ClientManager.connect_mcp_from_json(result)
 
         tools = await client.list_tools()
 
@@ -309,7 +307,7 @@ async def get_mcp_tool_schema(login_user: UserPayload = Depends(get_login_user),
             ))
         break
     if tool_type is None:
-        return resp_500(message='mcp服务配置解析失败，请检查配置里是否包含了server的url')
+        return resp_500(message='mcp服务配置解析失败，请检查配置里是否配置了mcpServers')
     return resp_200(data=tool_type)
 
 
@@ -319,7 +317,7 @@ async def mcp_tool_run(login_user: UserPayload = Depends(get_login_user),
     """ 测试mcp服务的工具 """
     try:
         # 实例化mcp服务对象，获取工具列表
-        client = await ClientManager.connect_mcp(McpClientType.SSE.value, url=req.server_host)
+        client = await ClientManager.connect_mcp_from_json(req.openapi_schema)
         extra = json.loads(req.extra)
         tool_name = extra.get('name')
         resp = await client.call_tool(tool_name, req.request_params)
diff --git a/src/backend/bisheng/api/v1/schemas.py b/src/backend/bisheng/api/v1/schemas.py
index 160a7362a..6111917f8 100644
--- a/src/backend/bisheng/api/v1/schemas.py
+++ b/src/backend/bisheng/api/v1/schemas.py
@@ -322,6 +322,7 @@ class DeleteToolTypeReq(BaseModel):
 
 class TestToolReq(BaseModel):
     server_host: str = Field(default='', description='服务的根地址')
+    openapi_schema: Optional[str] = Field(default='', description='openapi schema')
     extra: str = Field(default='', description='Api 对象解析后的extra字段')
     auth_method: int = Field(default=AuthMethod.NO.value, description='认证类型')
     auth_type: Optional[str] = Field(default=AuthType.BASIC.value, description='Auth Type')
diff --git a/src/backend/bisheng/mcp_manage/clients/stdio.py b/src/backend/bisheng/mcp_manage/clients/stdio.py
new file mode 100644
index 000000000..1e94eeb1b
--- /dev/null
+++ b/src/backend/bisheng/mcp_manage/clients/stdio.py
@@ -0,0 +1,28 @@
+from contextlib import asynccontextmanager
+
+from mcp.client.stdio import stdio_client, StdioServerParameters
+
+from bisheng.mcp_manage.clients.base import BaseMcpClient
+
+
+class StdioClient(BaseMcpClient):
+    """
+    SSE client for connecting to the mcp server.
+    """
+
+    def __init__(self, **kwargs: dict):
+        """
+        Initialize the SSE client.
+
+        :param url: The URL of the SSE server.
+        """
+        super().__init__()
+        self.server_params = StdioServerParameters(**kwargs)
+
+    @asynccontextmanager
+    async def get_transport(self):
+        """
+        Initialize the SSE client.
+        """
+        async with stdio_client(server=self.server_params) as (read, write):
+            yield read, write
diff --git a/src/backend/bisheng/mcp_manage/manager.py b/src/backend/bisheng/mcp_manage/manager.py
index e8675fcdf..b0403d12a 100644
--- a/src/backend/bisheng/mcp_manage/manager.py
+++ b/src/backend/bisheng/mcp_manage/manager.py
@@ -1,14 +1,37 @@
-from typing import Dict
+import json
 
-from bisheng.api.utils import md5_hash
 from bisheng.mcp_manage.clients.base import BaseMcpClient
 from bisheng.mcp_manage.clients.sse import SseClient
+from bisheng.mcp_manage.clients.stdio import StdioClient
 from bisheng.mcp_manage.constant import McpClientType
 
 
 class ClientManager:
-    # 缓存对应的mcp连接
-    client_map: Dict[str, BaseMcpClient] = {}
+
+    @classmethod
+    async def connect_mcp_from_json(cls, client_json: dict | str):
+        """ 获取对应配置下的的mcp连接 """
+        return cls.sync_connect_mcp_from_json(client_json)
+
+    @classmethod
+    def sync_connect_mcp_from_json(cls, client_json: dict | str) -> BaseMcpClient:
+        """ 获取对应配置下的的mcp连接 """
+        if isinstance(client_json, str):
+            client_json = json.loads(client_json)
+
+        mcp_servers = client_json['mcpServers']
+        client_type = McpClientType.SSE.value
+        client_kwargs = {}
+
+        for _, kwargs in mcp_servers.items():
+            if 'command' in kwargs:
+                client_type = McpClientType.STDIO.value
+            kwargs.pop('name', '')
+            kwargs.pop('description', '')
+            client_kwargs = kwargs
+            break
+        return cls.sync_connect_mcp(client_type, **client_kwargs)
+
 
     @classmethod
     async def connect_mcp(cls, client_type: str, **kwargs) -> BaseMcpClient:
@@ -19,22 +42,10 @@ class ClientManager:
     @classmethod
     def sync_connect_mcp(cls, client_type: str, **kwargs) -> BaseMcpClient:
         # 初始化对应的client
-        client_key = md5_hash(f'{client_type}:{kwargs}')
-        if cls.client_map.get(client_key) is None:
-            if client_type == McpClientType.SSE.value:
-                client = SseClient(**kwargs)
-            else:
-                raise ValueError(f'client_type {client_type} not supported')
-            cls.client_map[client_key] = client
+        if client_type == McpClientType.SSE.value:
+            client = SseClient(**kwargs)
+        elif client_type == McpClientType.STDIO.value:
+            client = StdioClient(**kwargs)
         else:
-            client = cls.client_map[client_key]
-
+            raise ValueError(f'client_type {client_type} not supported')
         return client
-
-    @classmethod
-    async def disconnect_mcp(cls, client_type: str, **kwargs):
-        """ 释放对应url的mcp连接 """
-        client_key = md5_hash(f'{client_type}:{kwargs}')
-        if client_key not in cls.client_map:
-            return
-        del cls.client_map[client_key]

From 78568d06faeca8859895c42136a563dc868fcb4c Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Mon, 21 Apr 2025 19:16:58 +0800
Subject: [PATCH 025/186] feat: create knowledge error

---
 src/backend/bisheng/database/models/knowledge.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/backend/bisheng/database/models/knowledge.py b/src/backend/bisheng/database/models/knowledge.py
index 6cc01dff3..1efe07550 100644
--- a/src/backend/bisheng/database/models/knowledge.py
+++ b/src/backend/bisheng/database/models/knowledge.py
@@ -8,10 +8,11 @@ from bisheng.database.models.knowledge_file import KnowledgeFile, KnowledgeFileD
 from bisheng.database.models.role_access import AccessType, RoleAccessDao
 from bisheng.database.models.user import UserDao
 from bisheng.database.models.user_role import UserRoleDao
-from pydantic import BaseModel
-from sqlmodel import Column, DateTime, Field, delete, func, or_, select, text, update
+from pydantic import BaseModel, field_validator
+from sqlmodel import Column, DateTime, Field, delete, func, or_, select, text, update, CHAR
 from sqlmodel.sql.expression import Select, SelectOfScalar
 
+
 class KnowledgeTypeEnum(Enum):
     QA = 1
     NORMAL = 0
@@ -32,6 +33,13 @@ class KnowledgeBase(SQLModelSerializable):
     update_time: Optional[datetime] = Field(default=None, sa_column=Column(
         DateTime, nullable=True, server_default=text('CURRENT_TIMESTAMP'), onupdate=text('CURRENT_TIMESTAMP')))
 
+    @field_validator('model', mode='before')
+    @classmethod
+    def convert_model(cls, v: Any) -> str:
+        if isinstance(v, int):
+            v = str(v)
+        return v
+
 
 class Knowledge(KnowledgeBase, table=True):
     id: Optional[int] = Field(default=None, primary_key=True)

From 77b6dd661fc599a52e2e4a5020152950d6c27632 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Mon, 21 Apr 2025 19:43:15 +0800
Subject: [PATCH 026/186] feat: sort tool types order by preset api mcp

---
 src/backend/bisheng/database/models/gpts_tools.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/backend/bisheng/database/models/gpts_tools.py b/src/backend/bisheng/database/models/gpts_tools.py
index f37f85e3d..3081d1f4e 100644
--- a/src/backend/bisheng/database/models/gpts_tools.py
+++ b/src/backend/bisheng/database/models/gpts_tools.py
@@ -216,7 +216,10 @@ class GptsToolsDao(GptsToolsBase):
         if is_preset is not None:
             statement = statement.where(GptsToolsType.is_preset == is_preset.value)
         statement = statement.where(or_(*filters))
-        statement = statement.order_by(GptsToolsType.update_time.desc())
+        statement = statement.order_by(func.field(GptsToolsType.is_preset,
+                                                  ToolPresetType.PRESET.value,
+                                                  ToolPresetType.API.value,
+                                                  ToolPresetType.MCP.value) ,GptsToolsType.update_time.desc())
         with session_getter() as session:
             return session.exec(statement).all()
 

From 309d3628a3ab45c734d0189ebdf9cc6b1ecd42bf Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Mon, 21 Apr 2025 19:52:49 +0800
Subject: [PATCH 027/186] feat: tool type name max size 1000; tool type tools
 support empty

---
 src/backend/bisheng/api/services/assistant.py   |  6 ++----
 .../bisheng/database/models/gpts_tools.py       | 17 +++++++++--------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/backend/bisheng/api/services/assistant.py b/src/backend/bisheng/api/services/assistant.py
index ca48e75b5..8cc241d18 100644
--- a/src/backend/bisheng/api/services/assistant.py
+++ b/src/backend/bisheng/api/services/assistant.py
@@ -431,14 +431,12 @@ class AssistantService(BaseService, AssistantUtils):
     def add_gpts_tools(cls, user: UserPayload, req: GptsToolsTypeRead) -> UnifiedResponseModel:
         """ 添加自定义工具 """
         req.id = None
-        if req.name.__len__() > 30 or req.name.__len__() == 0:
-            return resp_500(message="名字不符合规范：至少1个字符，不能超过30个字符")
+        if req.name.__len__() > 1000 or req.name.__len__() == 0:
+            return resp_500(message="名字不符合规范：至少1个字符，不能超过1000个字符")
         # 判断类别是否已存在
         tool_type = GptsToolsDao.get_one_tool_type_by_name(user.user_id, req.name)
         if tool_type:
             return ToolTypeRepeatError.return_resp()
-        if len(req.children) == 0:
-            return ToolTypeEmptyError.return_resp()
         req.user_id = user.user_id
 
         for one in req.children:
diff --git a/src/backend/bisheng/database/models/gpts_tools.py b/src/backend/bisheng/database/models/gpts_tools.py
index 3081d1f4e..d96a39297 100644
--- a/src/backend/bisheng/database/models/gpts_tools.py
+++ b/src/backend/bisheng/database/models/gpts_tools.py
@@ -43,7 +43,7 @@ class GptsToolsBase(SQLModelSerializable):
 
 class GptsToolsTypeBase(SQLModelSerializable):
     id: Optional[int] = Field(default=None, index=True, primary_key=True)
-    name: str = Field(default='', index=True, description="工具类别名字")
+    name: str = Field(default='', sa_column=Column(String(length=1024), index=True), description="工具类别名字")
     logo: Optional[str] = Field(default='', description="工具类别的logo文件地址")
     extra: Optional[str] = Field(default='', sa_column=Column(String(length=2048)),
                                  description="工具类别的配置信息，用来存储工具类别所需的配置信息")
@@ -289,13 +289,14 @@ class GptsToolsDao(GptsToolsBase):
             session.add(gpts_tool_type)
             session.commit()
             session.refresh(gpts_tool_type)
-        with session_getter() as session:
-            # 插入工具列表
-            for one in children:
-                one.type = gpts_tool_type.id
-                one.tool_key = cls.get_tool_key(gpts_tool_type.id, one.tool_key)
-            session.add_all(children)
-            session.commit()
+        if children:
+            with session_getter() as session:
+                # 插入工具列表
+                for one in children:
+                    one.type = gpts_tool_type.id
+                    one.tool_key = cls.get_tool_key(gpts_tool_type.id, one.tool_key)
+                session.add_all(children)
+                session.commit()
         res = GptsToolsTypeRead(**gpts_tool_type.model_dump(), children=children)
         return res
 

From e0aaeb0743f26566ccb7e126c665e7450c7ede30 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Mon, 21 Apr 2025 19:55:12 +0800
Subject: [PATCH 028/186] ci: remove feat build image

---
 .drone.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index 68504f61a..ce53612f2 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -366,7 +366,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
         - success
 trigger:
   branch:
-  - feat/1.2.0
+  - add_some_branch_you_need
   event:
   - push
    

From 22ba4b7ce71bad25df5ebe1e51c5d3e0153f5fe0 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Mon, 21 Apr 2025 20:48:05 +0800
Subject: [PATCH 029/186] fear: update tool type support empty tools

---
 src/backend/bisheng/api/services/assistant.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/backend/bisheng/api/services/assistant.py b/src/backend/bisheng/api/services/assistant.py
index 8cc241d18..0e0d7caf6 100644
--- a/src/backend/bisheng/api/services/assistant.py
+++ b/src/backend/bisheng/api/services/assistant.py
@@ -475,10 +475,8 @@ class AssistantService(BaseService, AssistantUtils):
         exist_tool_type = GptsToolsDao.get_one_tool_type(req.id)
         if not exist_tool_type:
             return ToolTypeNotExistsError.return_resp()
-        if len(req.children) == 0:
-            return ToolTypeEmptyError.return_resp()
-        if req.name.__len__() > 30 or req.name.__len__() == 0:
-            return resp_500(message="名字不符合规范：最少一个字符，不能超过30个字符")
+        if req.name.__len__() > 1000 or req.name.__len__() == 0:
+            return resp_500(message="名字不符合规范：至少1个字符，不能超过1000个字符")
 
         #  判断工具类别名称是否重复
         tool_type = GptsToolsDao.get_one_tool_type_by_name(user.user_id, req.name)

From 0594c78ce055d4dc7f3976b45f18343d21f43a1a Mon Sep 17 00:00:00 2001
From: dolphin <shanghang@dataelem.com>
Date: Mon, 21 Apr 2025 21:47:47 +0800
Subject: [PATCH 030/186] fix: mcp some bugfix

---
 .../components/bs-comp/sheets/ToolsSheet.tsx  | 24 +++++++-
 .../src/components/bs-ui/select/index.tsx     |  2 +-
 .../src/pages/BuildPage/CreateApp.tsx         |  9 +--
 .../src/pages/BuildPage/tools/EditMcp.tsx     | 36 ++++++++----
 .../src/pages/BuildPage/tools/EditTool.tsx    | 10 ++--
 .../src/pages/BuildPage/tools/ToolItem.tsx    |  9 ++-
 .../src/pages/BuildPage/tools/index.tsx       | 55 +++++++++++++------
 src/frontend/platform/vite.config.mts         |  2 +-
 8 files changed, 106 insertions(+), 41 deletions(-)

diff --git a/src/frontend/platform/src/components/bs-comp/sheets/ToolsSheet.tsx b/src/frontend/platform/src/components/bs-comp/sheets/ToolsSheet.tsx
index 4deed28b8..a7194f34f 100644
--- a/src/frontend/platform/src/components/bs-comp/sheets/ToolsSheet.tsx
+++ b/src/frontend/platform/src/components/bs-comp/sheets/ToolsSheet.tsx
@@ -1,8 +1,10 @@
+import { LoadIcon } from "@/components/bs-icons/loading";
 import { Accordion } from "@/components/bs-ui/accordion";
 import { Button } from "@/components/bs-ui/button";
 import { SearchInput } from "@/components/bs-ui/input";
 import { Sheet, SheetContent, SheetTitle, SheetTrigger } from "@/components/bs-ui/sheet";
 import { getAssistantToolsApi } from "@/controllers/API/assistant";
+import { useMcpRefrensh } from "@/pages/BuildPage/tools";
 import ToolItem from "@/pages/BuildPage/tools/ToolItem";
 import { CpuIcon, Star, User } from "lucide-react";
 import { useEffect, useMemo, useState } from "react";
@@ -15,11 +17,15 @@ export default function ToolsSheet({ select, onSelect, children }) {
     const [keyword, setKeyword] = useState('')
     const [allData, setAllData] = useState([])
 
-    useEffect(() => {
+
+    const loadMData = () => {
         getAssistantToolsApi(type).then(res => {
             setAllData(res)
             setKeyword('')
         })
+    }
+    useEffect(() => {
+        loadMData()
     }, [type])
 
     const options = useMemo(() => {
@@ -30,6 +36,7 @@ export default function ToolsSheet({ select, onSelect, children }) {
         });
     }, [keyword, allData])
 
+    const { loading, refresh } = useMcpRefrensh()
     return (
         <Sheet onOpenChange={open => !open && setKeyword('')}>
             <SheetTrigger asChild>
@@ -69,16 +76,27 @@ export default function ToolsSheet({ select, onSelect, children }) {
                         <div className="mb-4">
                             {type === 'custom' && <Button
                                 className="mt-4  text-[white]"
-                                onClick={() => window.open(__APP_ENV__.BASE_URL + "/build/tools")}
+                                onClick={() => window.open(__APP_ENV__.BASE_URL + "/build/tools?c=api")}
                             >
                                 {t('create')}{t("tools.createCustomTool")}
                             </Button>}
                             {type === 'mcp' && <Button
                                 className="mt-4  text-[white]"
-                                onClick={() => window.open(__APP_ENV__.BASE_URL + "/build/tools")}
+                                onClick={() => window.open(__APP_ENV__.BASE_URL + "/build/tools?c=mcp")}
                             >
                                 添加 MCP 服务器
                             </Button>}
+                            {type === 'mcp' && <Button
+                                disabled={loading}
+                                className="mt-4 ml-4 text-[white]"
+                                onClick={async () => {
+                                    await refresh()
+                                    loadMData()
+                                }}
+                            >
+                                {loading && <LoadIcon />}
+                                刷新
+                            </Button>}
                         </div>
                         <Accordion type="single" collapsible className="w-full">
                             {
diff --git a/src/frontend/platform/src/components/bs-ui/select/index.tsx b/src/frontend/platform/src/components/bs-ui/select/index.tsx
index 6fb18f97f..644594ba2 100644
--- a/src/frontend/platform/src/components/bs-ui/select/index.tsx
+++ b/src/frontend/platform/src/components/bs-ui/select/index.tsx
@@ -18,7 +18,7 @@ const SelectTrigger = React.forwardRef<
     <SelectPrimitive.Trigger
         ref={ref}
         className={cname(
-            "group flex h-9 w-full items-center justify-between whitespace-nowrap rounded-md border border-input bg-search-input px-3 py-2 text-sm shadow-sm ring-offset-background placeholder:text-muted-foreground focus:outline-none focus:ring-1 focus:ring-ring disabled:cursor-not-allowed disabled:opacity-50 [&>span]:line-clamp-1 data-[placeholder]:text-gray-400",
+            "group flex h-9 w-full items-center justify-between whitespace-nowrap rounded-md border border-input bg-search-input px-3 py-2 text-sm shadow-sm ring-offset-background placeholder:text-muted-foreground focus:outline-none focus:ring-1 focus:ring-ring disabled:cursor-not-allowed disabled:opacity-50 [&>span]:line-clamp-1 data-[placeholder]:text-gray-500",
             className
         )}
         {...props}
diff --git a/src/frontend/platform/src/pages/BuildPage/CreateApp.tsx b/src/frontend/platform/src/pages/BuildPage/CreateApp.tsx
index ba567ca92..63610483d 100644
--- a/src/frontend/platform/src/pages/BuildPage/CreateApp.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/CreateApp.tsx
@@ -37,9 +37,10 @@ const CreateApp = forwardRef<ModalRef, ModalProps>(({ onSave }, ref) => {
     const [loading, setLoading] = useState(false);
     const { t } = useTranslation('flow');
     const { appConfig } = useContext(locationContext)
+    const securityRef = useRef<any>(null);
 
     // 应用id (edit)
-    const appidRef = useRef<string>('');
+    const [appId, setAppId] = useState<string>('');
     // State for errors
     const [errors, setErrors] = useState<any>({});
 
@@ -64,7 +65,7 @@ ${t('build.exampleTwo', { ns: 'bs' })}
             setErrors({})
             setOpen(true);
             tempDataRef.current = null;
-            appidRef.current = '';
+            setAppId('');
         },
         // edit
         edit(type: AppType, flow: any) {
@@ -74,7 +75,7 @@ ${t('build.exampleTwo', { ns: 'bs' })}
             setErrors({})
             setOpen(true);
             tempDataRef.current = null;
-            appidRef.current = flow.flow_id;
+            setAppId(flow.id);
         },
     }));
 
@@ -244,7 +245,7 @@ ${t('build.exampleTwo', { ns: 'bs' })}
                 </div>
                 {/* 工作流安全审查 */}
                 {appConfig.isPro && <Accordion type="multiple" className="w-full">
-                    <AssistantSetting id={'xxx'} type={3} />
+                    <AssistantSetting ref={securityRef} id={appId} type={5} />
                 </Accordion>}
                 <DialogFooter>
                     <DialogClose>
diff --git a/src/frontend/platform/src/pages/BuildPage/tools/EditMcp.tsx b/src/frontend/platform/src/pages/BuildPage/tools/EditMcp.tsx
index 2309e8295..bf9664ab7 100644
--- a/src/frontend/platform/src/pages/BuildPage/tools/EditMcp.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/tools/EditMcp.tsx
@@ -7,11 +7,12 @@ import { Select, SelectContent, SelectGroup, SelectItem, SelectTrigger } from "@
 import { Sheet, SheetContent, SheetFooter, SheetHeader, SheetTitle } from "@/components/bs-ui/sheet";
 import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/bs-ui/table";
 import { useToast } from "@/components/bs-ui/toast/use-toast";
+import { userContext } from "@/contexts/userContext";
 import { createTool, deleteTool, getMcpServeByConfig, testMcpApi, updateTool } from "@/controllers/API/tools";
 // import { createMcpServer, deleteMcpServer, getMcpTools, testMcpTool, updateMcpServer } from "@/controllers/API/mcp";
 import { captureAndAlertRequestErrorHoc } from "@/controllers/request";
 import { isValidJSON } from "@/util/utils";
-import { forwardRef, useImperativeHandle, useRef, useState } from "react";
+import { forwardRef, useContext, useImperativeHandle, useRef, useState } from "react";
 
 // 测试对话框组件
 const TestDialog = forwardRef((props, ref) => {
@@ -22,10 +23,13 @@ const TestDialog = forwardRef((props, ref) => {
     const [loading, setLoading] = useState(false);
     const { message } = useToast();
     const serverRef = useRef({});
+    const openapiSchemaRef = useRef('')
 
     useImperativeHandle(ref, () => ({
         open: (tool, config, _serverRef) => {
-            setToolData({ ...tool, config });
+            openapiSchemaRef.current = config
+            const openapiSchema = JSON.parse(config)
+            setToolData({ ...tool, openapiSchema });
             setParams({});
             setResult("");
             setTestShow(true);
@@ -86,7 +90,7 @@ const TestDialog = forwardRef((props, ref) => {
                                     <TableRow key={name}>
                                         <TableCell>
                                             {name}
-                                            {schema.required && <span className="text-red-500">*</span>}
+                                            {toolData?.inputSchema.required.includes(name) && <span className="text-red-500">*</span>}
                                         </TableCell>
                                         <TableCell>
                                             <Input
@@ -130,6 +134,8 @@ const McpServerEditorDialog = forwardRef(({ existingNames = [], onReload }, ref)
     const originalName = useRef("");
     const { message } = useToast();
     const testToolDialogRef = useRef(null);
+    const { user } = useContext(userContext);
+    const [isSelf, setIsSelf] = useState(false);
 
     // 示例配置
     const exampleConfigs = {
@@ -153,6 +159,7 @@ const McpServerEditorDialog = forwardRef(({ existingNames = [], onReload }, ref)
                     openapiSchema: serverData.openapi_schema
                 });
                 serverRef.current = serverData;
+                setIsSelf(serverData.user_id === user.user_id);
                 originalName.current = serverData.name;
                 setIsEditMode(true);
                 loadToolsFromSchema(serverData.openapi_schema);
@@ -184,11 +191,17 @@ const McpServerEditorDialog = forwardRef(({ existingNames = [], onReload }, ref)
         }
 
         const tools = await captureAndAlertRequestErrorHoc(
-            getMcpServeByConfig({ file_content: schemaContent })
+            getMcpServeByConfig({ file_content: schemaContent }),
+            (res) => {
+                serverRef.current.children = []
+                setAvailableTools([])
+            }
         );
-        serverRef.current = tools;
-        const parsedApis = tools.children.map(item => JSON.parse(item.extra));
-        setAvailableTools(parsedApis);
+        if (tools) {
+            serverRef.current = tools;
+            const parsedApis = tools.children.map(item => JSON.parse(item.extra));
+            setAvailableTools(parsedApis);
+        }
     };
 
     const validateForm = () => {
@@ -231,9 +244,12 @@ const McpServerEditorDialog = forwardRef(({ existingNames = [], onReload }, ref)
 
         // 提交数据
         const apiMethod = isEditMode ? updateTool : createTool;
+        const { openapiSchema, ...other } = formData;
         captureAndAlertRequestErrorHoc(apiMethod({
             ...serverRef.current,
-            ...formData,
+            ...other,
+            description: serverRef.current.description,
+            openapi_schema: openapiSchema,
             is_preset: 2
         })).then((res) => {
             if (!res) return;
@@ -345,7 +361,7 @@ const McpServerEditorDialog = forwardRef(({ existingNames = [], onReload }, ref)
                                                     variant="outline"
                                                     onClick={() => testToolDialogRef.current.open(
                                                         tool,
-                                                        JSON.parse(formData.openapiSchema),
+                                                        formData.openapiSchema,
                                                         serverRef.current
                                                     )}
                                                 >
@@ -361,7 +377,7 @@ const McpServerEditorDialog = forwardRef(({ existingNames = [], onReload }, ref)
 
                     {/* 底部操作按钮 */}
                     <SheetFooter className="absolute bottom-0 right-0 w-full px-6 py-4">
-                        {isEditMode && (
+                        {isEditMode && (user.role === 'admin' || isSelf) && (
                             <Button
                                 variant="destructive"
                                 className="mr-auto"
diff --git a/src/frontend/platform/src/pages/BuildPage/tools/EditTool.tsx b/src/frontend/platform/src/pages/BuildPage/tools/EditTool.tsx
index 0ade80d1f..ce67a70d0 100644
--- a/src/frontend/platform/src/pages/BuildPage/tools/EditTool.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/tools/EditTool.tsx
@@ -82,12 +82,12 @@ export const TestDialog = forwardRef<{
         await captureAndAlertRequestErrorHoc(testToolApi({
             server_host,
             extra: children.find(el => el.name === apiData.name).extra,
-            auth_method: formStateRef.current.authMethod === 'apikey' ? 1 : 0,
-            auth_type: formStateRef.current.authType,
-            api_key: formStateRef.current.apiKey,
+            auth_method: toolRef.current.authMethod === 'apikey' ? 1 : 0,
+            auth_type: toolRef.current.authType,
+            api_key: toolRef.current.apiKey,
             request_params: formRef.current.values,
-            api_location: formStateRef.current.apiLocation,
-            parameter_name: formStateRef.current.parameter
+            api_location: toolRef.current.apiLocation,
+            parameter_name: toolRef.current.parameter
         }).then(setResult))
         setLoading(false)
     }
diff --git a/src/frontend/platform/src/pages/BuildPage/tools/ToolItem.tsx b/src/frontend/platform/src/pages/BuildPage/tools/ToolItem.tsx
index faa3ca8fc..4b94eb7d0 100644
--- a/src/frontend/platform/src/pages/BuildPage/tools/ToolItem.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/tools/ToolItem.tsx
@@ -9,6 +9,7 @@ import {
 import { Badge } from "@/components/bs-ui/badge";
 import { Button } from "@/components/bs-ui/button";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/bs-ui/tooltip";
+import { useMemo } from "react";
 import { useTranslation } from "react-i18next";
 
 export default function ToolItem({
@@ -20,6 +21,12 @@ export default function ToolItem({
     onSetClick = null
 }) {
     const { t } = useTranslation();
+    const sortData = useMemo(() => {
+        if (data.children) {
+            return data.children.sort((a, b) => a.id - b.id);
+        }
+        return [];
+    }, [data.children]);
 
     return <AccordionItem key={data.id} value={data.id} className="data-[state=open]:border-2 data-[state=open]:border-primary/20 data-[state=open]:rounded-md">
         <AccordionTrigger>
@@ -46,7 +53,7 @@ export default function ToolItem({
         </AccordionTrigger>
         <AccordionContent className="">
             <div className="px-6 mb-4">
-                {data.children.map(api => (
+                {sortData.map(api => (
                     <div key={api.name} className="relative p-4 rounded-sm  border-t">
                         <h1 className="text-sm font-medium leading-none">{api.name}</h1>
                         <p className="text-sm text-muted-foreground mt-2">{api.desc}</p>
diff --git a/src/frontend/platform/src/pages/BuildPage/tools/index.tsx b/src/frontend/platform/src/pages/BuildPage/tools/index.tsx
index 2a45aa2d4..e9a01e221 100644
--- a/src/frontend/platform/src/pages/BuildPage/tools/index.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/tools/index.tsx
@@ -1,17 +1,19 @@
+import { LoadIcon } from "@/components/bs-icons";
 import { Accordion } from "@/components/bs-ui/accordion";
 import { Button } from "@/components/bs-ui/button";
 import { SearchInput } from "@/components/bs-ui/input";
+import { useToast } from "@/components/bs-ui/toast/use-toast";
 import { userContext } from "@/contexts/userContext";
 import { getAssistantMcpApi, getAssistantToolsApi, refreshAssistantMcpApi } from "@/controllers/API/assistant";
+import { captureAndAlertRequestErrorHoc } from "@/controllers/request";
 import { CpuIcon, Star, User } from "lucide-react";
 import { useContext, useEffect, useMemo, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
+import { useSearchParams } from "react-router-dom";
 import McpServerDialog from "./EditMcp";
 import EditTool from "./EditTool";
 import ToolItem from "./ToolItem";
 import ToolSet from "./ToolSet";
-import { LoadIcon } from "@/components/bs-icons";
-import { useToast } from "@/components/bs-ui/toast/use-toast";
 
 const MANAGED_TOOLS = [
     'Dalle3绘画', 'Bing web搜索', '天眼查',
@@ -31,10 +33,12 @@ const TabTools = ({ select = null, onSelect }: TabToolsProps) => {
 
     const { user } = useContext(userContext)
 
-    const [type, setType] = useState(""); // '' add edit
+    const [type, setType] = useState("");
     const editRef = useRef(null);
     const mcpDialogRef = useRef(null);
 
+    useToolType(setType)
+
     const loadData = (_type = "custom") => {
         getAssistantToolsApi(_type).then((res) => {
             setAllData(res);
@@ -55,10 +59,14 @@ const TabTools = ({ select = null, onSelect }: TabToolsProps) => {
     const options = useMemo(() => {
         return allData.filter((el) => {
             // 搜索范围：工具名称、工具描述、工具api名称、工具api描述
-            const targetStr = `${el.name}-${el.description}-${el.children?.map((el) => el.name + el.desc).join("-") || ''}`
-            return targetStr.toLowerCase().includes(keyword.toLowerCase());
+            const targetStr = `${el.name}-${el.description}-${el.children?.map((el) => {
+                // mcp 搜索包含参数名 参数描述
+                const param = type === 'mcp' ? (el.api_params.map((param) => param.name + param.description).join("-") || '') : ''
+                return el.name + el.desc + param
+            }).join("-") || ''}`
+            return targetStr.toLowerCase().includes(keyword.trim().toLowerCase());
         });
-    }, [keyword, allData]);
+    }, [keyword, type, allData]);
 
     const hasSet = (name) => {
         if (user.role !== 'admin') return false
@@ -113,12 +121,14 @@ const TabTools = ({ select = null, onSelect }: TabToolsProps) => {
                 <div className="h-full w-full flex-1 overflow-auto bg-background-login p-5 pb-20 pt-2 scrollbar-hide">
                     <div className="mb-4">
                         {type === 'edit' && <Button
+                            id="create-apitool"
                             className="mt-4  text-[white]"
                             onClick={() => editRef.current.open()}
                         >
                             {t('create')}{t("tools.createCustomTool")}
                         </Button>}
                         {type === 'mcp' && <Button
+                            id="create-mcptool"
                             className="mt-4  text-[white]"
                             onClick={() => mcpDialogRef.current.open()}
                         >
@@ -127,7 +137,10 @@ const TabTools = ({ select = null, onSelect }: TabToolsProps) => {
                         {type === 'mcp' && <Button
                             disabled={loading}
                             className="mt-4 ml-4 text-[white]"
-                            onClick={refresh}
+                            onClick={async () => {
+                                await refresh()
+                                loadMcpData()
+                            }}
                         >
                             {loading && <LoadIcon />}
                             刷新
@@ -181,7 +194,7 @@ const TabTools = ({ select = null, onSelect }: TabToolsProps) => {
 }
 
 // 刷新mcp服务
-const useMcpRefrensh = () => {
+export const useMcpRefrensh = () => {
     const [loading, setLoading] = useState(false);
     const { message } = useToast()
 
@@ -190,22 +203,32 @@ const useMcpRefrensh = () => {
         async refresh() {
             setLoading(true);
             // api
-            const res = await refreshAssistantMcpApi()
-            console.log('刷新 :>> ', res);
-            if (!res) {
+            const res = await captureAndAlertRequestErrorHoc(refreshAssistantMcpApi())
+            // console.log('刷新 :>> ', res);
+            if (res) {
                 message({
                     variant: "success",
                     description: "刷新成功"
                 })
-            } else {
-                message({
-                    variant: "error",
-                    description: "{xxx MCP服务器名称}工具获取失败，请重试"
-                })
             }
             setLoading(false);
         }
     }
 }
 
+// 处理跳转参数,默认弹出创建工具
+const useToolType = (setType) => {
+    const [searchParams, setSearchParams] = useSearchParams();
+    useEffect(() => {
+        const type = searchParams.get('c');
+        setSearchParams({})
+        if (!type) return
+
+        setType(type === 'mcp' ? type : 'edit')
+        setTimeout(() => {
+            document.getElementById(type === 'mcp' ? 'create-mcptool' : 'create-apitool')?.click()
+        }, 100)
+    }, [searchParams])
+}
+
 export default TabTools;
\ No newline at end of file
diff --git a/src/frontend/platform/vite.config.mts b/src/frontend/platform/vite.config.mts
index f71a4e44a..b26a6172d 100644
--- a/src/frontend/platform/vite.config.mts
+++ b/src/frontend/platform/vite.config.mts
@@ -8,7 +8,7 @@ import svgr from "vite-plugin-svgr";
 
 // Use environment variable to determine the target.
 //  const target = process.env.VITE_PROXY_TARGET || "http://127.0.0.1:7860";
- const target = process.env.VITE_PROXY_TARGET || "http://192.168.106.120:3003";
+ const target = process.env.VITE_PROXY_TARGET || "http://192.168.106.120:3002";
 const apiRoutes = ["^/api/", "/health"];
 
 const proxyTargets = apiRoutes.reduce((proxyObj, route) => {

From 87dcaba3b74d0d05dbc6c5d291cf35657adc33eb Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Tue, 22 Apr 2025 11:40:22 +0800
Subject: [PATCH 031/186] ci: build base image

---
 src/backend/pyproject.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/backend/pyproject.toml b/src/backend/pyproject.toml
index 12fe437b6..a3125228a 100644
--- a/src/backend/pyproject.toml
+++ b/src/backend/pyproject.toml
@@ -19,7 +19,7 @@ bisheng = "bisheng.__main__:main"
 
 [tool.poetry.dependencies]
 python = ">=3.10,<3.11"
-bisheng_langchain = "1.2.0"
+bisheng_langchain = "1.2.0.dev1"
 bisheng_pyautogen = "0.3.2"
 langchain = "^0.3.23"
 langchain-community = "^0.3.21"
@@ -90,7 +90,7 @@ matplotlib = "3.8.4"
 cchardet = "^2.1.7"
 llama-index = "0.9.48"
 tenacity = "<8.4.0"
-bisheng-ragas = "^1.0.1"
+bisheng-ragas = "^1.0.2"
 qianfan = "^0.4.4"
 dashscope = "^1.20.3"
 blobfile = "^3.0.0"

From b6cfb869eb61db7df0aff5aa705c14cc3183b305 Mon Sep 17 00:00:00 2001
From: dolphin <shanghang@dataelem.com>
Date: Tue, 22 Apr 2025 12:32:57 +0800
Subject: [PATCH 032/186] fix: MCP tool update issue

---
 .../src/components/bs-comp/sheets/ToolsSheet.tsx         | 5 +++--
 .../platform/src/pages/BuildPage/tools/EditMcp.tsx       | 9 ++++++---
 .../platform/src/pages/BuildPage/tools/ToolItem.tsx      | 3 ++-
 .../platform/src/pages/BuildPage/tools/index.tsx         | 5 +++--
 src/frontend/platform/vite.config.mts                    | 1 -
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/frontend/platform/src/components/bs-comp/sheets/ToolsSheet.tsx b/src/frontend/platform/src/components/bs-comp/sheets/ToolsSheet.tsx
index a7194f34f..feee7a368 100644
--- a/src/frontend/platform/src/components/bs-comp/sheets/ToolsSheet.tsx
+++ b/src/frontend/platform/src/components/bs-comp/sheets/ToolsSheet.tsx
@@ -87,14 +87,15 @@ export default function ToolsSheet({ select, onSelect, children }) {
                                 添加 MCP 服务器
                             </Button>}
                             {type === 'mcp' && <Button
+                                variant="outline"
                                 disabled={loading}
-                                className="mt-4 ml-4 text-[white]"
+                                className="mt-4 ml-4"
                                 onClick={async () => {
                                     await refresh()
                                     loadMData()
                                 }}
                             >
-                                {loading && <LoadIcon />}
+                                {loading && <LoadIcon className="text-gray-800" />}
                                 刷新
                             </Button>}
                         </div>
diff --git a/src/frontend/platform/src/pages/BuildPage/tools/EditMcp.tsx b/src/frontend/platform/src/pages/BuildPage/tools/EditMcp.tsx
index bf9664ab7..8b30f10bc 100644
--- a/src/frontend/platform/src/pages/BuildPage/tools/EditMcp.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/tools/EditMcp.tsx
@@ -119,7 +119,7 @@ const TestDialog = forwardRef((props, ref) => {
     );
 });
 
-// 主组件
+// 主组件  TODO(重构,状态混乱)
 const McpServerEditorDialog = forwardRef(({ existingNames = [], onReload }, ref) => {
     const [isDialogOpen, setIsDialogOpen] = useState(false);
     const [isEditMode, setIsEditMode] = useState(false);
@@ -201,6 +201,10 @@ const McpServerEditorDialog = forwardRef(({ existingNames = [], onReload }, ref)
             serverRef.current = tools;
             const parsedApis = tools.children.map(item => JSON.parse(item.extra));
             setAvailableTools(parsedApis);
+            setFormData(prev => ({
+                ...prev,
+                children: tools.children
+            }))
         }
     };
 
@@ -276,7 +280,6 @@ const McpServerEditorDialog = forwardRef(({ existingNames = [], onReload }, ref)
         });
     };
 
-    const [selectValue] = useState("");
     const handleExampleSelect = (exampleKey) => {
         const exampleSchema = exampleConfigs[exampleKey];
         setFormData(prev => ({
@@ -312,7 +315,7 @@ const McpServerEditorDialog = forwardRef(({ existingNames = [], onReload }, ref)
                         <div>
                             <div className="flex justify-between items-center mb-2">
                                 <Label className="bisheng-label">MCP服务器配置</Label>
-                                <Select value={selectValue} onValueChange={handleExampleSelect}>
+                                <Select value={'1'} onValueChange={handleExampleSelect}>
                                     <SelectTrigger className="w-[180px]">
                                         <span>示例</span>
                                     </SelectTrigger>
diff --git a/src/frontend/platform/src/pages/BuildPage/tools/ToolItem.tsx b/src/frontend/platform/src/pages/BuildPage/tools/ToolItem.tsx
index 4b94eb7d0..6a51e04ce 100644
--- a/src/frontend/platform/src/pages/BuildPage/tools/ToolItem.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/tools/ToolItem.tsx
@@ -9,6 +9,7 @@ import {
 import { Badge } from "@/components/bs-ui/badge";
 import { Button } from "@/components/bs-ui/button";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/bs-ui/tooltip";
+import { CircleHelp } from "lucide-react";
 import { useMemo } from "react";
 import { useTranslation } from "react-i18next";
 
@@ -62,7 +63,7 @@ export default function ToolItem({
                                 <TooltipProvider>
                                     <Tooltip delayDuration={100}>
                                         <TooltipTrigger asChild>
-                                            <span className="text-primary cursor-pointer">{t("build.params")}</span>
+                                            <span className="text-primary cursor-pointer flex items-center">{t("build.params")}<CircleHelp className="size-3" /></span>
                                         </TooltipTrigger>
                                         <TooltipContent side="right" className="bg-gray-50 border shadow-md p-4 text-gray-950 max-w-[520px]">
                                             <p className="flex gap-2 items-center"><Badge>{JSON.parse(api.extra)?.method || 'http'}</Badge><span className="text-xl">{api.name}</span></p>
diff --git a/src/frontend/platform/src/pages/BuildPage/tools/index.tsx b/src/frontend/platform/src/pages/BuildPage/tools/index.tsx
index e9a01e221..e0d093429 100644
--- a/src/frontend/platform/src/pages/BuildPage/tools/index.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/tools/index.tsx
@@ -135,14 +135,15 @@ const TabTools = ({ select = null, onSelect }: TabToolsProps) => {
                             添加 MCP 服务器
                         </Button>}
                         {type === 'mcp' && <Button
+                            variant="outline"
                             disabled={loading}
-                            className="mt-4 ml-4 text-[white]"
+                            className="mt-4 ml-4"
                             onClick={async () => {
                                 await refresh()
                                 loadMcpData()
                             }}
                         >
-                            {loading && <LoadIcon />}
+                            {loading && <LoadIcon className="text-gray-800" />}
                             刷新
                         </Button>}
                     </div>
diff --git a/src/frontend/platform/vite.config.mts b/src/frontend/platform/vite.config.mts
index b26a6172d..5cfecd19e 100644
--- a/src/frontend/platform/vite.config.mts
+++ b/src/frontend/platform/vite.config.mts
@@ -8,7 +8,6 @@ import svgr from "vite-plugin-svgr";
 
 // Use environment variable to determine the target.
 //  const target = process.env.VITE_PROXY_TARGET || "http://127.0.0.1:7860";
- const target = process.env.VITE_PROXY_TARGET || "http://192.168.106.120:3002";
 const apiRoutes = ["^/api/", "/health"];
 
 const proxyTargets = apiRoutes.reduce((proxyObj, route) => {

From ae71493b0f6bcd613a277bf9d347eb444149c20c Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Tue, 22 Apr 2025 14:19:35 +0800
Subject: [PATCH 033/186] feat: save tool must parse openapi schema

---
 src/backend/Dockerfile                        |   2 +-
 src/backend/bisheng/api/errcode/base.py       |   5 +
 src/backend/bisheng/api/services/assistant.py |  17 ++-
 src/backend/bisheng/api/services/tool.py      | 104 +++++++++++++++++-
 src/backend/bisheng/api/v1/assistant.py       |  96 ++--------------
 5 files changed, 129 insertions(+), 95 deletions(-)

diff --git a/src/backend/Dockerfile b/src/backend/Dockerfile
index 80c4ca4f4..6a57462e2 100644
--- a/src/backend/Dockerfile
+++ b/src/backend/Dockerfile
@@ -1,4 +1,4 @@
-FROM dataelement/bisheng-backend:base.v1
+FROM dataelement/bisheng-backend:base.v2
 
 WORKDIR /app
 
diff --git a/src/backend/bisheng/api/errcode/base.py b/src/backend/bisheng/api/errcode/base.py
index e0ceb9d17..b55c0beb7 100644
--- a/src/backend/bisheng/api/errcode/base.py
+++ b/src/backend/bisheng/api/errcode/base.py
@@ -25,3 +25,8 @@ class UnAuthorizedError(BaseErrorCode):
 class NotFoundError(BaseErrorCode):
     Code: int = 404
     Msg: str = '资源不存在'
+
+
+class ServerError(BaseErrorCode):
+    Code: int = 500
+    Msg: str = '服务器错误'
diff --git a/src/backend/bisheng/api/services/assistant.py b/src/backend/bisheng/api/services/assistant.py
index 0e0d7caf6..395e92189 100644
--- a/src/backend/bisheng/api/services/assistant.py
+++ b/src/backend/bisheng/api/services/assistant.py
@@ -7,13 +7,14 @@ from loguru import logger
 
 from bisheng.api.errcode.assistant import (AssistantInitError, AssistantNameRepeatError,
                                            AssistantNotEditError, AssistantNotExistsError, ToolTypeRepeatError,
-                                           ToolTypeEmptyError, ToolTypeNotExistsError, ToolTypeIsPresetError)
+                                           ToolTypeNotExistsError, ToolTypeIsPresetError)
 from bisheng.api.errcode.base import UnAuthorizedError, NotFoundError
 from bisheng.api.services.assistant_agent import AssistantAgent
 from bisheng.api.services.assistant_base import AssistantUtils
 from bisheng.api.services.audit_log import AuditLogService
 from bisheng.api.services.base import BaseService
 from bisheng.api.services.llm import LLMService
+from bisheng.api.services.tool import ToolServices
 from bisheng.api.services.user_service import UserPayload
 from bisheng.api.utils import get_request_ip
 from bisheng.api.v1.schemas import (AssistantInfo, AssistantSimpleInfo, AssistantUpdateReq,
@@ -430,6 +431,13 @@ class AssistantService(BaseService, AssistantUtils):
     @classmethod
     def add_gpts_tools(cls, user: UserPayload, req: GptsToolsTypeRead) -> UnifiedResponseModel:
         """ 添加自定义工具 """
+        # 尝试解析下openapi schema看下是否可以正常解析, 不能的话保存不允许保存
+        tool_service = ToolServices()
+        if req.is_preset == ToolPresetType.API.value:
+            tool_service.parse_openapi_schema('', req.openapi_schema)
+        elif req.is_preset == ToolPresetType.MCP.value:
+            tool_service.parse_mcp_schema(req.openapi_schema)
+
         req.id = None
         if req.name.__len__() > 1000 or req.name.__len__() == 0:
             return resp_500(message="名字不符合规范：至少1个字符，不能超过1000个字符")
@@ -472,6 +480,13 @@ class AssistantService(BaseService, AssistantUtils):
         """
         更新工具类别，包括更新工具类别的名称和删除、新增工具类别的API
         """
+        # 尝试解析下openapi schema看下是否可以正常解析, 不能的话保存不允许保存
+        tool_service = ToolServices()
+        if req.is_preset == ToolPresetType.API.value:
+            tool_service.parse_openapi_schema('', req.openapi_schema)
+        elif req.is_preset == ToolPresetType.MCP.value:
+            tool_service.parse_mcp_schema(req.openapi_schema)
+
         exist_tool_type = GptsToolsDao.get_one_tool_type(req.id)
         if not exist_tool_type:
             return ToolTypeNotExistsError.return_resp()
diff --git a/src/backend/bisheng/api/services/tool.py b/src/backend/bisheng/api/services/tool.py
index a3e7ddc50..00831ce40 100644
--- a/src/backend/bisheng/api/services/tool.py
+++ b/src/backend/bisheng/api/services/tool.py
@@ -1,11 +1,17 @@
+import json
+from typing import Optional
+
+import yaml
 from fastapi import Request
 from loguru import logger
 from pydantic import BaseModel, ConfigDict
 
+from bisheng.api.errcode.base import ServerError
+from bisheng.api.services.openapi import OpenApiSchema
 from bisheng.api.services.user_service import UserPayload
+from bisheng.api.utils import get_url_content
 from bisheng.database.constants import ToolPresetType
-from bisheng.database.models.gpts_tools import GptsToolsDao, GptsTools, GptsToolsType
-from bisheng.mcp_manage.constant import McpClientType
+from bisheng.database.models.gpts_tools import GptsToolsDao, GptsTools, GptsToolsType, GptsToolsTypeRead
 from bisheng.mcp_manage.manager import ClientManager
 from bisheng.utils import md5_hash
 
@@ -14,8 +20,96 @@ class ToolServices(BaseModel):
     """ 工具服务类 """
     model_config = ConfigDict(arbitrary_types_allowed=True)
 
-    request: Request
-    login_user: UserPayload
+    request: Optional[Request] = None
+    login_user: Optional[UserPayload] = None
+
+    async def parse_openapi_schema(self, download_url: str, file_content: str) -> GptsToolsTypeRead:
+        if download_url:
+            try:
+                file_content = await get_url_content(download_url)
+            except Exception as e:
+                logger.exception(f'file {download_url} download error')
+                raise ServerError.http_exception(msg='url文件下载失败：' + str(e))
+        if not file_content:
+            raise ServerError.http_exception(msg='schema内容不能为空')
+        # 根据文件内容是否以`{`开头判断用什么解析方式
+        try:
+            if file_content.startswith('{'):
+                res = json.loads(file_content)
+            else:
+                res = yaml.safe_load(file_content)
+        except Exception as e:
+            logger.exception(f'openapi schema parse error {e}')
+            raise ServerError.http_exception(msg=f'openapi schema解析报错，请检查内容是否符合json或者yaml格式: {str(e)}')
+
+        #  解析openapi schema转为助手工具的格式
+        try:
+            schema = OpenApiSchema(res)
+            schema.parse_server()
+            if not schema.default_server.startswith(('http', 'https')):
+                raise ServerError.http_exception(msg=f'server中的url必须以http或者https开头: {schema.default_server}')
+            tool_type = GptsToolsTypeRead(name=schema.title,
+                                          description=schema.description,
+                                          is_preset=ToolPresetType.API.value,
+                                          server_host=schema.default_server,
+                                          openapi_schema=file_content,
+                                          api_location=schema.api_location,
+                                          parameter_name=schema.parameter_name,
+                                          auth_type=schema.auth_type,
+                                          auth_method=schema.auth_method,
+                                          children=[])
+            # 解析获取所有的api
+            schema.parse_paths()
+            for one in schema.apis:
+                tool_type.children.append(
+                    GptsTools(
+                        name=one['operationId'],
+                        desc=one['description'],
+                        tool_key=md5_hash(one['operationId']),
+                        is_preset=0,
+                        is_delete=0,
+                        api_params=one['parameters'],
+                        extra=json.dumps(one, ensure_ascii=False),
+                    ))
+            return tool_type
+        except Exception as e:
+            logger.exception(f'openapi schema parse error {e}')
+            raise ServerError.http_exception(msg='openapi schema解析失败：' + str(e))
+
+    async def parse_mcp_schema(self, file_content: str) -> GptsToolsTypeRead:
+        try:
+            result = json.loads(file_content)
+            mcp_servers = result['mcpServers']
+        except Exception as e:
+            logger.exception(f'mcp tool schema parse error {e}')
+            raise ServerError.http_exception(msg=f'mcp工具配置解析失败，请检查内容是否符合mcp配置格式: {str(e)}')
+        tool_type = None
+        for key, value in mcp_servers.items():
+            # 解析mcp服务配置
+            tool_type = GptsToolsTypeRead(name=value.get('name', ''),
+                                          server_host=value.get('url'),
+                                          description=value.get('description', ''),
+                                          is_preset=ToolPresetType.MCP.value,
+                                          openapi_schema=file_content,
+                                          children=[])
+            # 实例化mcp服务对象，获取工具列表
+            client = await ClientManager.connect_mcp_from_json(result)
+
+            tools = await client.list_tools()
+
+            for one in tools:
+                tool_type.children.append(GptsTools(
+                    name=one.name,
+                    desc=one.description,
+                    tool_key=md5_hash(one.name),
+                    is_preset=ToolPresetType.MCP.value,
+                    api_params=ToolServices.convert_input_schema(one.inputSchema),
+                    extra=one.model_dump_json(),
+                ))
+            break
+        if tool_type is None:
+            raise ServerError.http_exception(msg='mcp服务配置解析失败，请检查配置里是否配置了mcpServers')
+        return tool_type
 
     async def refresh_all_mcp(self) -> str:
         """ return mcp server error msg """
@@ -36,7 +130,7 @@ class ToolServices(BaseModel):
                 await self.refresh_mcp_tools(one, tools_map.get(one.id, []))
             except Exception as e:
                 logger.exception(f'{one.name}刷新工具失败:')
-                error_msg += f'{one.name}工具获取失败，请重试'
+                error_msg += f'{one.name}工具获取失败，请重试\n'
         return error_msg
 
     async def refresh_mcp_tools(self, tool_type: GptsToolsType, old_tools: list[GptsTools]):
diff --git a/src/backend/bisheng/api/v1/assistant.py b/src/backend/bisheng/api/v1/assistant.py
index 31d0922c8..bc4bcf5d1 100644
--- a/src/backend/bisheng/api/v1/assistant.py
+++ b/src/backend/bisheng/api/v1/assistant.py
@@ -211,103 +211,23 @@ async def update_tool_config(*,
 
 
 @router.post('/tool_schema')
-async def get_tool_schema(*,
+async def get_tool_schema(request: Request, login_user: UserPayload = Depends(get_login_user),
                           download_url: Optional[str] = Body(default=None,
                                                              description='下载url不为空的话优先用下载url'),
-                          file_content: Optional[str] = Body(default=None, description='上传的文件'),
-                          login_user: UserPayload = Depends(get_login_user)):
+                          file_content: Optional[str] = Body(default=None, description='上传的文件')):
     """ 下载或者解析openapi schema的内容 转为助手自定义工具的格式 """
-    if download_url:
-        try:
-            file_content = await get_url_content(download_url)
-        except Exception as e:
-            logger.exception(f'file {download_url} download error')
-            return resp_500(message='url文件下载失败：' + str(e))
-
-    if not file_content:
-        return resp_500(message='schema内容不能为空')
-    # 根据文件内容是否以`{`开头判断用什么解析方式
-    try:
-        if file_content.startswith('{'):
-            res = json.loads(file_content)
-        else:
-            res = yaml.safe_load(file_content)
-    except Exception as e:
-        logger.exception(f'openapi schema parse error {e}')
-        return resp_500(message=f'openapi schema解析报错，请检查内容是否符合json或者yaml格式: {str(e)}')
-
-    #  解析openapi schema转为助手工具的格式
-    try:
-        schema = OpenApiSchema(res)
-        schema.parse_server()
-        if not schema.default_server.startswith(('http', 'https')):
-            return resp_500(message=f'server中的url必须以http或者https开头: {schema.default_server}')
-        tool_type = GptsToolsTypeRead(name=schema.title,
-                                      description=schema.description,
-                                      is_preset=ToolPresetType.API.value,
-                                      server_host=schema.default_server,
-                                      openapi_schema=file_content,
-                                      api_location=schema.api_location,
-                                      parameter_name=schema.parameter_name,
-                                      auth_type=schema.auth_type,
-                                      auth_method=schema.auth_method,
-                                      children=[])
-        # 解析获取所有的api
-        schema.parse_paths()
-        for one in schema.apis:
-            tool_type.children.append(
-                GptsTools(
-                    name=one['operationId'],
-                    desc=one['description'],
-                    tool_key=hashlib.md5(one['operationId'].encode('utf-8')).hexdigest(),
-                    is_preset=0,
-                    is_delete=0,
-                    api_params=one['parameters'],
-                    extra=json.dumps(one, ensure_ascii=False),
-                ))
-        return resp_200(data=tool_type)
-    except Exception as e:
-        logger.exception(f'openapi schema parse error {e}')
-        return resp_500(message='openapi schema解析失败：' + str(e))
+    services = ToolServices(request=request, login_user=login_user)
+    tool_type = services.parse_openapi_schema(download_url, file_content)
+    return resp_200(data=tool_type)
 
 
 @router.post('/mcp/tool_schema')
-async def get_mcp_tool_schema(login_user: UserPayload = Depends(get_login_user),
+async def get_mcp_tool_schema(request: Request, login_user: UserPayload = Depends(get_login_user),
                               file_content: Optional[str] = Body(default=None, embed=True,
                                                                  description='mcp服务配置内容')):
     """ 解析mcp的工具配置文件 """
-    try:
-        result = json.loads(file_content)
-        mcp_servers = result['mcpServers']
-    except Exception as e:
-        logger.exception(f'mcp tool schema parse error {e}')
-        return resp_500(message=f'mcp工具配置解析失败，请检查内容是否符合mcp配置格式: {str(e)}')
-    tool_type = None
-    for key, value in mcp_servers.items():
-        # 解析mcp服务配置
-        tool_type = GptsToolsTypeRead(name=value.get('name', ''),
-                                      server_host=value.get('url'),
-                                      description=value.get('description', ''),
-                                      is_preset=ToolPresetType.MCP.value,
-                                      openapi_schema=file_content,
-                                      children=[])
-        # 实例化mcp服务对象，获取工具列表
-        client = await ClientManager.connect_mcp_from_json(result)
-
-        tools = await client.list_tools()
-
-        for one in tools:
-            tool_type.children.append(GptsTools(
-                name=one.name,
-                desc=one.description,
-                tool_key=md5_hash(one.name),
-                is_preset=ToolPresetType.MCP.value,
-                api_params=ToolServices.convert_input_schema(one.inputSchema),
-                extra=one.model_dump_json(),
-            ))
-        break
-    if tool_type is None:
-        return resp_500(message='mcp服务配置解析失败，请检查配置里是否配置了mcpServers')
+    services = ToolServices(request=request, login_user=login_user)
+    tool_type = services.parse_mcp_schema(file_content)
     return resp_200(data=tool_type)
 
 

From d77884c906844cecc46c7e7c3f7646f85eb70332 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Tue, 22 Apr 2025 15:47:30 +0800
Subject: [PATCH 034/186] fix: change tool sort logic

---
 src/backend/bisheng/api/services/assistant.py     | 12 ++++++------
 src/backend/bisheng/api/v1/assistant.py           | 10 +++++-----
 src/backend/bisheng/database/models/gpts_tools.py |  4 +---
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/backend/bisheng/api/services/assistant.py b/src/backend/bisheng/api/services/assistant.py
index 395e92189..0d49d90e1 100644
--- a/src/backend/bisheng/api/services/assistant.py
+++ b/src/backend/bisheng/api/services/assistant.py
@@ -429,14 +429,14 @@ class AssistantService(BaseService, AssistantUtils):
         return tool_type
 
     @classmethod
-    def add_gpts_tools(cls, user: UserPayload, req: GptsToolsTypeRead) -> UnifiedResponseModel:
+    async def add_gpts_tools(cls, user: UserPayload, req: GptsToolsTypeRead) -> UnifiedResponseModel:
         """ 添加自定义工具 """
         # 尝试解析下openapi schema看下是否可以正常解析, 不能的话保存不允许保存
         tool_service = ToolServices()
         if req.is_preset == ToolPresetType.API.value:
-            tool_service.parse_openapi_schema('', req.openapi_schema)
+            await tool_service.parse_openapi_schema('', req.openapi_schema)
         elif req.is_preset == ToolPresetType.MCP.value:
-            tool_service.parse_mcp_schema(req.openapi_schema)
+            await tool_service.parse_mcp_schema(req.openapi_schema)
 
         req.id = None
         if req.name.__len__() > 1000 or req.name.__len__() == 0:
@@ -476,16 +476,16 @@ class AssistantService(BaseService, AssistantUtils):
         return True
 
     @classmethod
-    def update_gpts_tools(cls, user: UserPayload, req: GptsToolsTypeRead) -> UnifiedResponseModel:
+    async def update_gpts_tools(cls, user: UserPayload, req: GptsToolsTypeRead) -> UnifiedResponseModel:
         """
         更新工具类别，包括更新工具类别的名称和删除、新增工具类别的API
         """
         # 尝试解析下openapi schema看下是否可以正常解析, 不能的话保存不允许保存
         tool_service = ToolServices()
         if req.is_preset == ToolPresetType.API.value:
-            tool_service.parse_openapi_schema('', req.openapi_schema)
+            await tool_service.parse_openapi_schema('', req.openapi_schema)
         elif req.is_preset == ToolPresetType.MCP.value:
-            tool_service.parse_mcp_schema(req.openapi_schema)
+            await tool_service.parse_mcp_schema(req.openapi_schema)
 
         exist_tool_type = GptsToolsDao.get_one_tool_type(req.id)
         if not exist_tool_type:
diff --git a/src/backend/bisheng/api/v1/assistant.py b/src/backend/bisheng/api/v1/assistant.py
index bc4bcf5d1..e85d27e14 100644
--- a/src/backend/bisheng/api/v1/assistant.py
+++ b/src/backend/bisheng/api/v1/assistant.py
@@ -217,7 +217,7 @@ async def get_tool_schema(request: Request, login_user: UserPayload = Depends(ge
                           file_content: Optional[str] = Body(default=None, description='上传的文件')):
     """ 下载或者解析openapi schema的内容 转为助手自定义工具的格式 """
     services = ToolServices(request=request, login_user=login_user)
-    tool_type = services.parse_openapi_schema(download_url, file_content)
+    tool_type = await services.parse_openapi_schema(download_url, file_content)
     return resp_200(data=tool_type)
 
 
@@ -227,7 +227,7 @@ async def get_mcp_tool_schema(request: Request, login_user: UserPayload = Depend
                                                                  description='mcp服务配置内容')):
     """ 解析mcp的工具配置文件 """
     services = ToolServices(request=request, login_user=login_user)
-    tool_type = services.parse_mcp_schema(file_content)
+    tool_type = await services.parse_mcp_schema(file_content)
     return resp_200(data=tool_type)
 
 
@@ -258,16 +258,16 @@ async def refresh_all_mcp_tools(request: Request, login_user: UserPayload = Depe
 
 
 @router.post('/tool_list')
-def add_tool_type(*,
+async def add_tool_type(*,
                   req: Dict = Body(default={}, description='openapi解析后的工具对象'),
                   login_user: UserPayload = Depends(get_login_user)):
     """ 新增自定义tool """
     req = GptsToolsTypeRead(**req)
-    return AssistantService.add_gpts_tools(login_user, req)
+    return await AssistantService.add_gpts_tools(login_user, req)
 
 
 @router.put('/tool_list')
-def update_tool_type(*,
+async def update_tool_type(*,
                      login_user: UserPayload = Depends(get_login_user),
                      req: Dict = Body(default={}, description='通过openapi 解析后的内容，包含类别的唯一ID')):
     """ 更新自定义tool """
diff --git a/src/backend/bisheng/database/models/gpts_tools.py b/src/backend/bisheng/database/models/gpts_tools.py
index d96a39297..794991ac0 100644
--- a/src/backend/bisheng/database/models/gpts_tools.py
+++ b/src/backend/bisheng/database/models/gpts_tools.py
@@ -217,9 +217,7 @@ class GptsToolsDao(GptsToolsBase):
             statement = statement.where(GptsToolsType.is_preset == is_preset.value)
         statement = statement.where(or_(*filters))
         statement = statement.order_by(func.field(GptsToolsType.is_preset,
-                                                  ToolPresetType.PRESET.value,
-                                                  ToolPresetType.API.value,
-                                                  ToolPresetType.MCP.value) ,GptsToolsType.update_time.desc())
+                                                  ToolPresetType.PRESET.value).desc() ,GptsToolsType.update_time.desc())
         with session_getter() as session:
             return session.exec(statement).all()
 

From 886a14908f76c2176dde3d260ebcad95e006baef Mon Sep 17 00:00:00 2001
From: dolphin <shanghang@dataelem.com>
Date: Tue, 22 Apr 2025 16:50:35 +0800
Subject: [PATCH 035/186] =?UTF-8?q?feat:=20=E5=B7=A5=E4=BD=9C=E6=B5=81?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0mcp=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/pages/BuildPage/flow/Sidebar.tsx      | 151 +++++++++++-------
 .../src/pages/BuildPage/tools/EditMcp.tsx     |   6 +-
 .../src/pages/BuildPage/tools/ToolItem.tsx    |   5 +-
 src/frontend/platform/src/util/flowUtils.ts   |   3 +-
 4 files changed, 104 insertions(+), 61 deletions(-)

diff --git a/src/frontend/platform/src/pages/BuildPage/flow/Sidebar.tsx b/src/frontend/platform/src/pages/BuildPage/flow/Sidebar.tsx
index 5976e8c27..97692ae17 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/Sidebar.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/Sidebar.tsx
@@ -1,16 +1,73 @@
+import { LoadingIcon } from "@/components/bs-icons/loading";
 import { Accordion, AccordionContent, AccordionItem, AccordionTrigger } from "@/components/bs-ui/accordion";
 import { Button } from "@/components/bs-ui/button";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/bs-ui/tabs";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/bs-ui/tooltip";
-import { getAssistantToolsApi } from "@/controllers/API/assistant";
+import { getAssistantToolsApi, refreshAssistantMcpApi } from "@/controllers/API/assistant";
 import { getWorkflowNodeTemplate } from "@/controllers/API/workflow";
 import { getToolTree } from "@/util/flowUtils";
 import { cloneDeep } from "lodash-es";
 import { ListVideo } from "lucide-react";
-import { useMemo, useState } from "react";
+import { useMemo, useRef, useState } from "react";
+import { useTranslation } from "react-i18next";
 import { useQuery } from "react-query";
 import NodeLogo from "./FlowNode/NodeLogo";
-import { useTranslation } from "react-i18next";
+
+const ToolItem = ({ temp, index, dropdown, onDragStart, onClick }) => {
+    const sortData = useMemo(() => {
+        const { children, is_preset } = temp;
+        if (children) {
+            return is_preset === 2 ? children.sort((a, b) => a.id - b.id) : children;
+        }
+        return [];
+    }, [temp.children]);
+
+    return <AccordionItem key={temp.name} value={temp.name + index} className="border-none">
+        <AccordionTrigger className="py-2 bisheng-label">{temp.name}</AccordionTrigger>
+        <AccordionContent className="pb-2">
+            {
+                sortData.map(el =>
+                    <Tooltip key={el.name}>
+                        <TooltipTrigger className="block w-full">
+                            <div key={el.name}
+                                className={`flex gap-2 items-center p-2 cursor-pointer border border-transparent rounded-md hover:border-gray-200`}
+                                onMouseEnter={(event) => {
+                                    if (!event.currentTarget.classList.contains('border-gray-200')) {
+                                        event.currentTarget.classList.add('bg-muted');
+                                    }
+                                }}
+                                onMouseLeave={(event) => {
+                                    event.currentTarget.classList.remove('bg-muted');
+                                }}
+                                draggable={!dropdown}
+                                onDragStart={(event) => {
+                                    onDragStart(event, { type: el.type, node: el })
+                                }}
+                                onDragEnd={(event) => {
+                                    document.body.removeChild(
+                                        document.getElementsByClassName(
+                                            "cursor-dragging"
+                                        )[0]
+                                    );
+                                }}
+                                onClick={() => {
+                                    if (!dropdown) return
+                                    onClick(el.type, el.tool_key)
+                                }}
+                            >
+                                <NodeLogo type="tool" colorStr={el.name} />
+                                <span className="text-sm truncate">{el.name}</span>
+                            </div>
+                        </TooltipTrigger>
+                        {el.description && <TooltipContent side="right">
+                            <div className="max-w-96 text-left break-all whitespace-normal">{el.description}</div>
+                        </TooltipContent>}
+                    </Tooltip>
+                )
+            }
+        </AccordionContent>
+    </AccordionItem>
+}
 
 export default function Sidebar({ dropdown = false, disabledNodes = [], onInitStartNode = (node: any) => { }, onClick = (k) => { } }) {
     const { t } = useTranslation('flow')
@@ -29,6 +86,22 @@ export default function Sidebar({ dropdown = false, disabledNodes = [], onInitSt
         }
     }
 
+    // 先刷新mcp服务接口
+    const [loading, setLoading] = useState(true)
+    const onecRef = useRef(false)
+    const handleLoadTools = async (val) => {
+        if (val !== 'tool' || onecRef.current) return
+        setLoading(true)
+        onecRef.current = true
+        try {
+            await refreshAssistantMcpApi()
+        } catch (error) {
+            console.error(error)
+        }
+        refetch()
+        setLoading(false)
+    }
+
     const nodeTemps = useMemo(() => {
         if (!tempData) return []
         // TODO 追加MCP工具
@@ -79,7 +152,7 @@ export default function Sidebar({ dropdown = false, disabledNodes = [], onInitSt
     return <div className={`${dropdown ? 'relative' : 'absolute'} max-w-56 z-40 h-full transition-transform ${expand ? 'p-2' : 'py-2 translate-x-[-200px]'}`}>
         <div className="bg-background rounded-2xl shadow-md h-full p-2">
             {/* tab */}
-            <Tabs defaultValue="base" className="h-full">
+            <Tabs defaultValue="base" className="h-full" onValueChange={handleLoadTools}>
                 <div className="flex gap-1">
                     <TabsList className="grid flex-1 grid-cols-2">
                         <TabsTrigger value="base">{t('basicNodes')}</TabsTrigger>
@@ -133,63 +206,31 @@ export default function Sidebar({ dropdown = false, disabledNodes = [], onInitSt
                     </TooltipProvider>
                 </TabsContent>
                 {/* tool */}
-                <TabsContent value="tool" className="nowheel overflow-y-auto h-[calc(100vh-10rem)] max-w-44">
+                <TabsContent value="tool" className="nowheel overflow-y-auto h-[calc(100vh-10rem)] max-w-44 relative">
                     <Accordion type="multiple" className="w-full">
                         <TooltipProvider delayDuration={100}>
                             {toolTemps.map((temp, index) =>
-                                <AccordionItem key={temp.name} value={temp.name + index} className="border-none">
-                                    <AccordionTrigger className="py-2 bisheng-label">{temp.name}</AccordionTrigger>
-                                    <AccordionContent className="pb-2">
-                                        {
-                                            temp.children.map(el =>
-                                                <Tooltip key={el.name}>
-                                                    <TooltipTrigger className="block w-full">
-                                                        <div key={el.name}
-                                                            className={`flex gap-2 items-center p-2 cursor-pointer border border-transparent rounded-md hover:border-gray-200`}
-                                                            onMouseEnter={(event) => {
-                                                                if (!event.currentTarget.classList.contains('border-gray-200')) {
-                                                                    event.currentTarget.classList.add('bg-muted');
-                                                                }
-                                                            }}
-                                                            onMouseLeave={(event) => {
-                                                                event.currentTarget.classList.remove('bg-muted');
-                                                            }}
-                                                            draggable={!dropdown}
-                                                            onDragStart={(event) => {
-                                                                onDragStart(event, { type: el.type, node: el })
-                                                            }}
-                                                            onDragEnd={(event) => {
-                                                                document.body.removeChild(
-                                                                    document.getElementsByClassName(
-                                                                        "cursor-dragging"
-                                                                    )[0]
-                                                                );
-                                                            }}
-                                                            onClick={() => {
-                                                                if (!dropdown) return
-                                                                let node = null
-                                                                toolTemps.some((temp) => {
-                                                                    node = temp.children.find(node => node.tool_key === el.tool_key)
-                                                                    return node
-                                                                })
-                                                                onClick({ type: el.type, node })
-                                                            }}
-                                                        >
-                                                            <NodeLogo type="tool" colorStr={el.name} />
-                                                            <span className="text-sm truncate">{el.name}</span>
-                                                        </div>
-                                                    </TooltipTrigger>
-                                                    {el.description && <TooltipContent side="right">
-                                                        <div className="max-w-96 text-left break-all whitespace-normal">{el.description}</div>
-                                                    </TooltipContent>}
-                                                </Tooltip>
-                                            )
-                                        }
-                                    </AccordionContent>
-                                </AccordionItem>
+                                <ToolItem
+                                    key={temp.id}
+                                    temp={temp}
+                                    index={index}
+                                    dropdown={dropdown}
+                                    onDragStart={onDragStart}
+                                    onClick={(type, tool_key) => {
+                                        let node = null
+                                        toolTemps.some((temp) => {
+                                            node = temp.children.find(node => node.tool_key === tool_key)
+                                            return node
+                                        })
+                                        onClick({ type, node })
+                                    }}
+                                />
                             )}
                         </TooltipProvider>
                     </Accordion>
+                    {loading && <div className="absolute w-full h-full top-0 left-0 flex justify-center items-center z-10 bg-[rgba(255,255,255,0.6)] dark:bg-blur-shared">
+                        <LoadingIcon />
+                    </div>}
                 </TabsContent>
             </Tabs>
             {/* 搜索 */}
diff --git a/src/frontend/platform/src/pages/BuildPage/tools/EditMcp.tsx b/src/frontend/platform/src/pages/BuildPage/tools/EditMcp.tsx
index 8b30f10bc..3a781b0d5 100644
--- a/src/frontend/platform/src/pages/BuildPage/tools/EditMcp.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/tools/EditMcp.tsx
@@ -299,7 +299,7 @@ const McpServerEditorDialog = forwardRef(({ existingNames = [], onReload }, ref)
                     <div className="mt-4 space-y-6 px-6 overflow-y-auto h-[calc(100vh-200px)]">
                         {/* 名称输入 */}
                         <div>
-                            <Label className="bisheng-label">名称</Label>
+                            <label className="">名称</label>
                             <Input
                                 value={formData.name}
                                 className="mt-2"
@@ -314,7 +314,7 @@ const McpServerEditorDialog = forwardRef(({ existingNames = [], onReload }, ref)
                         {/* 配置输入 */}
                         <div>
                             <div className="flex justify-between items-center mb-2">
-                                <Label className="bisheng-label">MCP服务器配置</Label>
+                                <label className="">MCP服务器配置</label>
                                 <Select value={'1'} onValueChange={handleExampleSelect}>
                                     <SelectTrigger className="w-[180px]">
                                         <span>示例</span>
@@ -341,7 +341,7 @@ const McpServerEditorDialog = forwardRef(({ existingNames = [], onReload }, ref)
                         {/* 工具列表 */}
                         <div>
                             <div className="flex justify-between items-center mb-2">
-                                <Label>可用工具</Label>
+                                <label>可用工具</label>
                                 <Button variant="outline" onClick={() => loadToolsFromSchema(formData.openapiSchema)}>
                                     刷新
                                 </Button>
diff --git a/src/frontend/platform/src/pages/BuildPage/tools/ToolItem.tsx b/src/frontend/platform/src/pages/BuildPage/tools/ToolItem.tsx
index 6a51e04ce..c9c4a8d35 100644
--- a/src/frontend/platform/src/pages/BuildPage/tools/ToolItem.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/tools/ToolItem.tsx
@@ -23,8 +23,9 @@ export default function ToolItem({
 }) {
     const { t } = useTranslation();
     const sortData = useMemo(() => {
-        if (data.children) {
-            return data.children.sort((a, b) => a.id - b.id);
+        const { children, is_preset } = data;
+        if (children) {
+            return is_preset === 2 ? children.sort((a, b) => a.id - b.id) : children;
         }
         return [];
     }, [data.children]);
diff --git a/src/frontend/platform/src/util/flowUtils.ts b/src/frontend/platform/src/util/flowUtils.ts
index a282a0927..0bed6d1af 100644
--- a/src/frontend/platform/src/util/flowUtils.ts
+++ b/src/frontend/platform/src/util/flowUtils.ts
@@ -47,7 +47,7 @@ export function initNode(node) {
 export function getToolTree(temp) {
     const children = temp.children.map(item => {
         return {
-            id: '',
+            id: item.id,
             tool_key: item.tool_key,
             type: 'tool',
             name: item.name,
@@ -81,6 +81,7 @@ export function getToolTree(temp) {
 
     return {
         name: temp.name,
+        is_preset: temp.is_preset,
         children: children
     }
 }

From b11181f1c27b8f1755674cdaf06a669670cbadf7 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Tue, 22 Apr 2025 17:10:21 +0800
Subject: [PATCH 036/186] fix: file process error

---
 src/backend/bisheng/api/v1/schemas.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/backend/bisheng/api/v1/schemas.py b/src/backend/bisheng/api/v1/schemas.py
index 6111917f8..6b67123eb 100644
--- a/src/backend/bisheng/api/v1/schemas.py
+++ b/src/backend/bisheng/api/v1/schemas.py
@@ -475,13 +475,13 @@ class FileProcessBase(BaseModel):
     @model_validator(mode='before')
     @classmethod
     def check_separator_rule(cls, values: Any):
-        if values['separator'] is None:
+        if values.get('separator', None) is None:
             values['separator'] = ['\n\n', '\n']
-        if values['separator_rule'] is None:
+        if values.get('separator_rule', None) is None:
             values['separator_rule'] = ['after' for _ in values['separator']]
-        if values['chunk_size'] is None:
+        if values.get('chunk_size', None) is None:
             values['chunk_size'] = 1000
-        if values['chunk_overlap'] is None:
+        if values.get('chunk_overlap') is None:
             values['chunk_overlap'] = 100
         return values
 

From 974072332354aea3dd63a3a32d34075809aa615f Mon Sep 17 00:00:00 2001
From: wangchao <wangchao@jf180.cn>
Date: Tue, 22 Apr 2025 17:44:20 +0800
Subject: [PATCH 037/186] fix: delete_role_by_group_role

---
 src/backend/bisheng/database/models/role.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backend/bisheng/database/models/role.py b/src/backend/bisheng/database/models/role.py
index 648c3396a..a622cf680 100644
--- a/src/backend/bisheng/database/models/role.py
+++ b/src/backend/bisheng/database/models/role.py
@@ -113,6 +113,6 @@ class RoleDao(RoleBase):
                 Role, and_(UserRole.role_id == Role.id,
                            Role.group_id == group_id)).group_by(UserRole.id)
             all_user = session.exec(all_user).all()
-            session.exec(delete(UserRole).where(UserRole.id.in_([one.id for one in all_user])))
+            session.exec(delete(UserRole).where(UserRole.id.in_([one.UserRole.id for one in all_user])))
             session.exec(delete(Role).where(Role.group_id == group_id))
             session.commit()

From e3ddaec4035bb75fc148c10364c13f26de525e83 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Tue, 22 Apr 2025 17:56:01 +0800
Subject: [PATCH 038/186] fix: catch mcp tool run exception

---
 src/backend/bisheng/api/v1/assistant.py        | 2 +-
 src/backend/bisheng/mcp_manage/clients/base.py | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/backend/bisheng/api/v1/assistant.py b/src/backend/bisheng/api/v1/assistant.py
index e85d27e14..b479fa859 100644
--- a/src/backend/bisheng/api/v1/assistant.py
+++ b/src/backend/bisheng/api/v1/assistant.py
@@ -241,7 +241,7 @@ async def mcp_tool_run(login_user: UserPayload = Depends(get_login_user),
         extra = json.loads(req.extra)
         tool_name = extra.get('name')
         resp = await client.call_tool(tool_name, req.request_params)
-        return resp_200(data=resp.model_dump_json())
+        return resp_200(data=resp)
     except Exception as e:
         logger.exception('mcp_tool_run error')
         return resp_500(message=f'测试请求出错：{str(e)}')
diff --git a/src/backend/bisheng/mcp_manage/clients/base.py b/src/backend/bisheng/mcp_manage/clients/base.py
index 0167064b0..14fa0144e 100644
--- a/src/backend/bisheng/mcp_manage/clients/base.py
+++ b/src/backend/bisheng/mcp_manage/clients/base.py
@@ -34,10 +34,13 @@ class BaseMcpClient(object):
             tools = await client_session.list_tools()
         return tools.tools
 
-    async def call_tool(self, name: str, arguments: dict[str, Any] | None = None):
+    async def call_tool(self, name: str, arguments: dict[str, Any] | None = None) -> str:
         """
         Call a tool.
         """
         async with self.initialize() as client_session:
-            resp = await client_session.call_tool(name, arguments)
-        return resp
+            try:
+                resp = await client_session.call_tool(name, arguments)
+            except Exception as e:
+                return f"Tool call failed: {str(e)}"
+        return resp.model_dump_json()

From 887c0db7c0fbb5b4554fec2c08e4e5e40e1c40ce Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Tue, 22 Apr 2025 18:19:15 +0800
Subject: [PATCH 039/186] feat: remove pydantic warning

---
 src/backend/bisheng/api/services/llm.py | 2 +-
 src/backend/bisheng/api/v1/schemas.py   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/backend/bisheng/api/services/llm.py b/src/backend/bisheng/api/services/llm.py
index 32825977f..afcf80b4c 100644
--- a/src/backend/bisheng/api/services/llm.py
+++ b/src/backend/bisheng/api/services/llm.py
@@ -33,7 +33,7 @@ class LLMService:
         for one in llm_models:
             if one.server_id not in server_dicts:
                 server_dicts[one.server_id] = []
-            server_dicts[one.server_id].append(one.model_dump(exclude={'config'}))
+            server_dicts[one.server_id].append(LLMModelInfo(**one.model_dump(exclude={'config'})))
 
         for one in ret:
             one.models = server_dicts.get(one.id, [])
diff --git a/src/backend/bisheng/api/v1/schemas.py b/src/backend/bisheng/api/v1/schemas.py
index 6b67123eb..dadfac126 100644
--- a/src/backend/bisheng/api/v1/schemas.py
+++ b/src/backend/bisheng/api/v1/schemas.py
@@ -392,7 +392,7 @@ class LLMServerCreateReq(BaseModel):
 
 
 class LLMModelInfo(LLMModelBase):
-    id: Optional[int]
+    id: Optional[int] = None
 
 
 class LLMServerInfo(LLMServerBase):

From 1c0c1ffe7c312f4f2c76c4031c59d44385a0dc43 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Tue, 22 Apr 2025 18:27:09 +0800
Subject: [PATCH 040/186] fix: update tool error

---
 src/backend/bisheng/api/v1/assistant.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backend/bisheng/api/v1/assistant.py b/src/backend/bisheng/api/v1/assistant.py
index b479fa859..3aa3448f2 100644
--- a/src/backend/bisheng/api/v1/assistant.py
+++ b/src/backend/bisheng/api/v1/assistant.py
@@ -272,7 +272,7 @@ async def update_tool_type(*,
                      req: Dict = Body(default={}, description='通过openapi 解析后的内容，包含类别的唯一ID')):
     """ 更新自定义tool """
     req = GptsToolsTypeRead(**req)
-    return AssistantService.update_gpts_tools(login_user, req)
+    return await AssistantService.update_gpts_tools(login_user, req)
 
 
 @router.delete('/tool_list')

From 16ed31cc3f919e19096e1aece424f7b2dbe9fbde Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Tue, 22 Apr 2025 19:01:53 +0800
Subject: [PATCH 041/186] fix: multArgsSchemaTool error

---
 .../bisheng_langchain/gpts/tools/api_tools/base.py            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bisheng-langchain/bisheng_langchain/gpts/tools/api_tools/base.py b/src/bisheng-langchain/bisheng_langchain/gpts/tools/api_tools/base.py
index 8819ae580..0e5ed7d61 100644
--- a/src/bisheng-langchain/bisheng_langchain/gpts/tools/api_tools/base.py
+++ b/src/bisheng-langchain/bisheng_langchain/gpts/tools/api_tools/base.py
@@ -1,4 +1,4 @@
-from typing import Any, Dict, Tuple, Type, Union
+from typing import Any, Dict, Tuple, Type, Union, Optional
 
 from pydantic import ConfigDict, model_validator, BaseModel, Field
 
@@ -13,7 +13,7 @@ class ApiArg(BaseModel):
 
 class MultArgsSchemaTool(Tool):
 
-    def _to_args_and_kwargs(self, tool_input: Union[str, Dict]) -> Tuple[Tuple, Dict]:
+    def _to_args_and_kwargs(self, tool_input: Union[str, Dict], tool_call_id: Optional[str]) -> Tuple[Tuple, Dict]:
         # For backwards compatibility, if run_input is a string,
         # pass as a positional argument.
         if isinstance(tool_input, str):

From 73ea32dcbe3d40d0f88c8c3f8996b100a8920e9b Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Tue, 22 Apr 2025 19:20:52 +0800
Subject: [PATCH 042/186] feat: mcp sse client support headers timeout

---
 src/backend/bisheng/mcp_manage/clients/sse.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/backend/bisheng/mcp_manage/clients/sse.py b/src/backend/bisheng/mcp_manage/clients/sse.py
index 83e03e676..e25fdfda0 100644
--- a/src/backend/bisheng/mcp_manage/clients/sse.py
+++ b/src/backend/bisheng/mcp_manage/clients/sse.py
@@ -10,7 +10,7 @@ class SseClient(BaseMcpClient):
     SSE client for connecting to the mcp server.
     """
 
-    def __init__(self, url: str):
+    def __init__(self, url: str, **kwargs):
         """
         Initialize the SSE client.
 
@@ -18,11 +18,12 @@ class SseClient(BaseMcpClient):
         """
         super().__init__()
         self.url = url
+        self.kwargs = kwargs
 
     @asynccontextmanager
     async def get_transport(self):
         """
         Initialize the SSE client.
         """
-        async with sse_client(url=self.url) as (read, write):
+        async with sse_client(url=self.url, **self.kwargs) as (read, write):
             yield read, write

From d7093921f955ce6408110c94318f20a6c127e03e Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Tue, 22 Apr 2025 20:32:04 +0800
Subject: [PATCH 043/186] feat: change assistant agent tool node invoke

---
 src/backend/README.md                                       | 1 +
 .../gpts/agent_types/llm_functions_agent.py                 | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/backend/README.md b/src/backend/README.md
index af4779ac9..8abb4ce91 100644
--- a/src/backend/README.md
+++ b/src/backend/README.md
@@ -1,3 +1,4 @@
 # 毕昇后端代码
 
 * Dockerfile 使用 poetry 进行 Python 依赖管理
+
diff --git a/src/bisheng-langchain/bisheng_langchain/gpts/agent_types/llm_functions_agent.py b/src/bisheng-langchain/bisheng_langchain/gpts/agent_types/llm_functions_agent.py
index 25d33dbd8..7a6d582b0 100644
--- a/src/bisheng-langchain/bisheng_langchain/gpts/agent_types/llm_functions_agent.py
+++ b/src/bisheng-langchain/bisheng_langchain/gpts/agent_types/llm_functions_agent.py
@@ -55,11 +55,11 @@ def get_openai_functions_agent_executor(tools: list[BaseTool], llm: LanguageMode
 
     # Define the function to execute tools
     async def acall_tool(messages):
-        tool_messages = await tool_nodes._afunc(messages, None, store=None)
+        tool_messages = await tool_nodes.ainvoke(messages, None, store=None)
         return tool_messages
 
     def call_tool(messages):
-        tool_messages = tool_nodes._func(messages, config=None, store=None)
+        tool_messages = tool_nodes.invoke(messages, config=None, store=None)
         return tool_messages
 
     workflow = MessageGraph()
@@ -147,7 +147,7 @@ def get_qwen_local_functions_agent_executor(
 
     # Define the function to execute tools
     async def call_tool(messages):
-        tool_messages = await tool_nodes._afunc(messages, config=None, store=None)
+        tool_messages = await tool_nodes.ainvoke(messages, config=None, store=None)
         return tool_messages
 
     workflow = MessageGraph()

From 504228b96a925be92bbb6f8543f47aab0ce49a5d Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Tue, 22 Apr 2025 20:34:45 +0800
Subject: [PATCH 044/186] feat: workflow tool node remove empty field value

---
 src/backend/bisheng/workflow/nodes/tool/tool.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/backend/bisheng/workflow/nodes/tool/tool.py b/src/backend/bisheng/workflow/nodes/tool/tool.py
index 10e104986..397743308 100644
--- a/src/backend/bisheng/workflow/nodes/tool/tool.py
+++ b/src/backend/bisheng/workflow/nodes/tool/tool.py
@@ -50,7 +50,11 @@ class ToolNode(BaseNode):
         for key, val in self.node_params.items():
             if key == "output":
                 continue
-            ret[key] = self.parse_template_msg(val)
+            new_val = self.parse_template_msg(val)
+            if new_val == '' or new_val is None:
+                continue
+            ret[key] = new_val
+
         return ret
 
     def parse_template_msg(self, msg: str):

From d4dcaa28b9cd1bce1ef02a4181de149cae7bf997 Mon Sep 17 00:00:00 2001
From: dolphin <shanghang@dataelem.com>
Date: Tue, 22 Apr 2025 20:46:01 +0800
Subject: [PATCH 045/186] =?UTF-8?q?fix:=20=E5=B7=A5=E4=BD=9C=E6=B5=81?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E5=88=97=E8=A1=A8=E5=8E=BB=E9=99=A4=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0mcp=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/bs-ui/toast/index.tsx      |  2 +-
 .../pages/BuildPage/flow/FlowNode/RunLog.tsx  |  3 +-
 .../src/pages/BuildPage/flow/Sidebar.tsx      | 32 ++++++++-----------
 .../src/pages/BuildPage/tools/EditMcp.tsx     |  3 +-
 .../src/pages/BuildPage/tools/EditTool.tsx    | 21 +++++++-----
 5 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/src/frontend/platform/src/components/bs-ui/toast/index.tsx b/src/frontend/platform/src/components/bs-ui/toast/index.tsx
index b84f4a1dc..8021d1ab0 100644
--- a/src/frontend/platform/src/components/bs-ui/toast/index.tsx
+++ b/src/frontend/platform/src/components/bs-ui/toast/index.tsx
@@ -23,7 +23,7 @@ export function Toaster() {
                         <div className="grid gap-1">
                             {title && <ToastTitle>{title}</ToastTitle>}
                             {description && (
-                                <ToastDescription>{description}</ToastDescription>
+                                <ToastDescription className="whitespace-pre-wrap">{description}</ToastDescription>
                             )}
                         </div>
                         {action}
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/RunLog.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/RunLog.tsx
index 3e3efff1a..df86805ef 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/RunLog.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/RunLog.tsx
@@ -22,14 +22,13 @@ export default function RunLog({ node, children }) {
     const setRunCache = useFlowStore(state => state.setRunCache) // 缓存TODO
     const [data, setData] = useState<any>([])
     const { t } = useTranslation('flow')
-
     // 订阅日志事件
     useEffect(() => {
         const buildData = (data) => {
             if (data) {
                 /**
                  * newData
-                 * key: {type: value}  
+                 * key: {type, value}  
                  * "current_time": {type: "param", value: "2023-11-20 16:00:00"}
                  */
                 const newData = data.reduce((res, item) => {
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/Sidebar.tsx b/src/frontend/platform/src/pages/BuildPage/flow/Sidebar.tsx
index 97692ae17..2fc390f73 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/Sidebar.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/Sidebar.tsx
@@ -1,14 +1,13 @@
-import { LoadingIcon } from "@/components/bs-icons/loading";
 import { Accordion, AccordionContent, AccordionItem, AccordionTrigger } from "@/components/bs-ui/accordion";
 import { Button } from "@/components/bs-ui/button";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/bs-ui/tabs";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/bs-ui/tooltip";
-import { getAssistantToolsApi, refreshAssistantMcpApi } from "@/controllers/API/assistant";
+import { getAssistantToolsApi } from "@/controllers/API/assistant";
 import { getWorkflowNodeTemplate } from "@/controllers/API/workflow";
 import { getToolTree } from "@/util/flowUtils";
 import { cloneDeep } from "lodash-es";
 import { ListVideo } from "lucide-react";
-import { useMemo, useRef, useState } from "react";
+import { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { useQuery } from "react-query";
 import NodeLogo from "./FlowNode/NodeLogo";
@@ -87,19 +86,19 @@ export default function Sidebar({ dropdown = false, disabledNodes = [], onInitSt
     }
 
     // 先刷新mcp服务接口
-    const [loading, setLoading] = useState(true)
-    const onecRef = useRef(false)
+    // const [loading, setLoading] = useState(true)
+    // const onecRef = useRef(false)
     const handleLoadTools = async (val) => {
-        if (val !== 'tool' || onecRef.current) return
-        setLoading(true)
-        onecRef.current = true
-        try {
-            await refreshAssistantMcpApi()
-        } catch (error) {
-            console.error(error)
-        }
-        refetch()
-        setLoading(false)
+        // if (val !== 'tool' || onecRef.current) return
+        // setLoading(true)
+        // onecRef.current = true
+        // try {
+        //     await refreshAssistantMcpApi()
+        // } catch (error) {
+        //     console.error(error)
+        // }
+        // refetch()
+        // setLoading(false)
     }
 
     const nodeTemps = useMemo(() => {
@@ -228,9 +227,6 @@ export default function Sidebar({ dropdown = false, disabledNodes = [], onInitSt
                             )}
                         </TooltipProvider>
                     </Accordion>
-                    {loading && <div className="absolute w-full h-full top-0 left-0 flex justify-center items-center z-10 bg-[rgba(255,255,255,0.6)] dark:bg-blur-shared">
-                        <LoadingIcon />
-                    </div>}
                 </TabsContent>
             </Tabs>
             {/* 搜索 */}
diff --git a/src/frontend/platform/src/pages/BuildPage/tools/EditMcp.tsx b/src/frontend/platform/src/pages/BuildPage/tools/EditMcp.tsx
index 3a781b0d5..a3a6d7d4d 100644
--- a/src/frontend/platform/src/pages/BuildPage/tools/EditMcp.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/tools/EditMcp.tsx
@@ -60,7 +60,8 @@ const TestDialog = forwardRef((props, ref) => {
                     auth_method,
                     auth_type,
                     api_key,
-                    request_params: params
+                    request_params: params,
+                    openapi_schema: openapiSchemaRef.current
                 }).then(setResult)
             );
             console.log('res :>> ', res);
diff --git a/src/frontend/platform/src/pages/BuildPage/tools/EditTool.tsx b/src/frontend/platform/src/pages/BuildPage/tools/EditTool.tsx
index ce67a70d0..9faf483b1 100644
--- a/src/frontend/platform/src/pages/BuildPage/tools/EditTool.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/tools/EditTool.tsx
@@ -10,10 +10,11 @@ import { Sheet, SheetContent, SheetFooter, SheetHeader, SheetTitle } from "@/com
 import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/bs-ui/table"
 import { useToast } from "@/components/bs-ui/toast/use-toast"
 import { QuestionTooltip } from "@/components/bs-ui/tooltip"
+import { userContext } from "@/contexts/userContext"
 import { createTool, deleteTool, downloadToolSchema, testToolApi, updateTool } from "@/controllers/API/tools"
 import { captureAndAlertRequestErrorHoc } from "@/controllers/request"
 import { Plus } from "lucide-react"
-import { forwardRef, useEffect, useImperativeHandle, useRef, useState } from "react"
+import { forwardRef, useContext, useEffect, useImperativeHandle, useRef, useState } from "react"
 import { useTranslation } from "react-i18next"
 
 interface TestDialogProps {
@@ -180,7 +181,8 @@ const EditTool = forwardRef((props: any, ref) => {
     const schemaUrl = useRef('')
     const [formState, setFormState] = useState({ ...formData });
     const fromDataRef = useRef<any>({}) // 与formState同步，fromDataRef属性更多，透传保存
-
+    const { user } = useContext(userContext);
+    const [isSelf, setIsSelf] = useState(false);
     // 表格数据（api接口列表）
     const [tableData, setTableData] = useApiTableData()
 
@@ -200,6 +202,7 @@ const EditTool = forwardRef((props: any, ref) => {
                 apiLocation: tool.api_location || "query",
                 parameter: tool.parameter_name || ""
             })
+            setIsSelf(tool.user_id === user.user_id);
             setEditShow(true)
             setDelShow(true)
 
@@ -592,12 +595,14 @@ const EditTool = forwardRef((props: any, ref) => {
                     )}
                 </div>
                 <SheetFooter className="absolute bottom-0 right-0 w-full px-6 py-4">
-                    {delShow && <Button
-                        size="sm"
-                        variant="destructive"
-                        className="absolute left-6"
-                        onClick={handleDelete}
-                    >{t('tools.delete')}</Button>}
+                    {delShow && (user.role === 'admin' || isSelf) && (
+                        <Button
+                            size="sm"
+                            variant="destructive"
+                            className="absolute left-6"
+                            onClick={handleDelete}
+                        >{t('tools.delete')}</Button>
+                    )}
                     <Button size="sm" variant="outline" onClick={() => setEditShow(false)}>{t('tools.cancel')}</Button>
                     <Button size="sm" className="text-[white]" onClick={handleSave}>{t('tools.save')}</Button>
                 </SheetFooter>

From af4a838509b7fb5b7a27fa29e9c5abbc5b91b723 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Tue, 22 Apr 2025 21:24:03 +0800
Subject: [PATCH 046/186] fix: stdio mcp schema parse error

---
 src/backend/bisheng/api/services/tool.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backend/bisheng/api/services/tool.py b/src/backend/bisheng/api/services/tool.py
index 00831ce40..50d5544fe 100644
--- a/src/backend/bisheng/api/services/tool.py
+++ b/src/backend/bisheng/api/services/tool.py
@@ -87,7 +87,7 @@ class ToolServices(BaseModel):
         for key, value in mcp_servers.items():
             # 解析mcp服务配置
             tool_type = GptsToolsTypeRead(name=value.get('name', ''),
-                                          server_host=value.get('url'),
+                                          server_host=value.get('url', ''),
                                           description=value.get('description', ''),
                                           is_preset=ToolPresetType.MCP.value,
                                           openapi_schema=file_content,

From 0454264f53176392e3e794ed3dfcc18f5a255f7a Mon Sep 17 00:00:00 2001
From: dolphin <shanghang@dataelem.com>
Date: Tue, 22 Apr 2025 21:25:55 +0800
Subject: [PATCH 047/186] fix: Tool name display issue in workflow log

---
 .../platform/src/pages/BuildPage/flow/FlowNode/RunLog.tsx      | 3 +--
 src/frontend/platform/src/pages/BuildPage/tools/EditMcp.tsx    | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/RunLog.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/RunLog.tsx
index df86805ef..6dc377982 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/RunLog.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/RunLog.tsx
@@ -1,6 +1,6 @@
 import { LoadIcon } from "@/components/bs-icons/loading";
 import { Button } from "@/components/bs-ui/button";
-import { Select, SelectContent, SelectGroup, SelectItem, SelectTrigger, SelectValue } from "@/components/bs-ui/select";
+import { Select, SelectContent, SelectGroup, SelectItem, SelectTrigger } from "@/components/bs-ui/select";
 import { downloadFile } from "@/util/utils";
 import { Check, ChevronsRightIcon, X } from "lucide-react";
 import { useEffect, useMemo, useRef, useState } from "react";
@@ -61,7 +61,6 @@ export default function RunLog({ node, children }) {
                                 if (newData.has(p.tool_key)) {
                                     newData.get(p.tool_key)['label'] = p.label;
                                     hasKeys.push(p.tool_key);
-                                    return true;
                                 }
                             });
                         }
diff --git a/src/frontend/platform/src/pages/BuildPage/tools/EditMcp.tsx b/src/frontend/platform/src/pages/BuildPage/tools/EditMcp.tsx
index a3a6d7d4d..7a669ae0a 100644
--- a/src/frontend/platform/src/pages/BuildPage/tools/EditMcp.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/tools/EditMcp.tsx
@@ -128,7 +128,7 @@ const McpServerEditorDialog = forwardRef(({ existingNames = [], onReload }, ref)
 
     const initialFormState = {
         name: "",
-        openapiSchema: "{}"
+        openapiSchema: ""
     };
     const [formData, setFormData] = useState(initialFormState);
     const serverRef = useRef(initialFormState);

From 61382b27bf5d9b8c23ba9dd957acda24eaeb59ea Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Wed, 23 Apr 2025 15:10:45 +0800
Subject: [PATCH 048/186] feat: qa knowledge export and import

---
 src/backend/bisheng/api/services/knowledge.py |  16 +-
 src/backend/bisheng/api/v1/knowledge.py       | 203 ++++++++++++++++--
 2 files changed, 205 insertions(+), 14 deletions(-)

diff --git a/src/backend/bisheng/api/services/knowledge.py b/src/backend/bisheng/api/services/knowledge.py
index 1ddd62b26..2e818a98d 100644
--- a/src/backend/bisheng/api/services/knowledge.py
+++ b/src/backend/bisheng/api/services/knowledge.py
@@ -5,7 +5,7 @@ import os
 import time
 from typing import Any, Dict, List
 
-from bisheng.api.errcode.base import NotFoundError, UnAuthorizedError
+from bisheng.api.errcode.base import NotFoundError, UnAuthorizedError, ServerError
 from bisheng.api.errcode.knowledge import (KnowledgeChunkError, KnowledgeExistError,
                                            KnowledgeNoEmbeddingError)
 from bisheng.api.services.audit_log import AuditLogService
@@ -857,3 +857,17 @@ class KnowledgeService(KnowledgeUtils):
         cls.create_knowledge_hook(request, login_user, target_knowlege)
         background_tasks.add_task(file_worker.file_copy_celery, params)
         return target_knowlege
+
+    @classmethod
+    def judge_qa_knowledge_write(cls, login_user: UserPayload, qa_knowledge_id: int) -> Knowledge:
+        db_knowledge = KnowledgeDao.query_by_id(qa_knowledge_id)
+        # 查询当前知识库，是否有写入权限
+        if not db_knowledge:
+            raise ServerError.http_exception(msg='当前知识库不可用，返回上级目录')
+        if not login_user.access_check(db_knowledge.user_id, str(qa_knowledge_id),
+                                       AccessType.KNOWLEDGE):
+            raise UnAuthorizedError.http_exception()
+
+        if db_knowledge.type == KnowledgeTypeEnum.NORMAL.value:
+            raise ServerError.http_exception(msg='知识库为普通知识库')
+        return db_knowledge
diff --git a/src/backend/bisheng/api/v1/knowledge.py b/src/backend/bisheng/api/v1/knowledge.py
index ebe91c501..1fbd2a0a4 100644
--- a/src/backend/bisheng/api/v1/knowledge.py
+++ b/src/backend/bisheng/api/v1/knowledge.py
@@ -1,7 +1,12 @@
 import json
 import urllib.parse
+from datetime import datetime
+from io import BytesIO
 from typing import List, Optional
 
+import numpy as np
+import pandas as pd
+
 from bisheng.api.errcode.base import UnAuthorizedError
 from bisheng.api.errcode.knowledge import KnowledgeCPError, KnowledgeQAError
 from bisheng.api.services import knowledge_imp
@@ -203,22 +208,10 @@ def get_QA_list(*,
                 status: Optional[int] = None,
                 login_user: UserPayload = Depends(get_login_user)):
     """ 获取知识库文件信息. """
-
-    # 查询当前知识库，是否有写入权限
-    with session_getter() as session:
-        db_knowledge: Knowledge = session.get(Knowledge, qa_knowledge_id)
-    if not db_knowledge:
-        raise HTTPException(status_code=500, detail='当前知识库不可用，返回上级目录')
-    if not login_user.access_check(db_knowledge.user_id, str(qa_knowledge_id),
-                                   AccessType.KNOWLEDGE):
-        return UnAuthorizedError.return_resp()
-
-    if db_knowledge.type == KnowledgeTypeEnum.NORMAL.value:
-        return HTTPException(status_code=500, detail='知识库为普通知识库')
+    db_knowledge = KnowledgeService.judge_qa_knowledge_write(login_user, qa_knowledge_id)
 
     if keyword:
         question = keyword
-
     qa_list, total_count = knowledge_imp.list_qa_by_knowledge_id(qa_knowledge_id, page_size,
                                                                  page_num, question, answer,
                                                                  status)
@@ -409,3 +402,187 @@ def qa_auto_question(
     """通过大模型自动生成问题"""
     questions = knowledge_imp.recommend_question(ori_question, number=number, answer=answer)
     return resp_200(data={'questions': questions})
+
+
+@router.get('/qa/export/template', status_code=200)
+def get_export_url():
+    data = [{"问题":"","答案":"","相似问题1":"","相似问题2":""}]
+    df = pd.DataFrame(data)
+    bio = BytesIO()
+    with pd.ExcelWriter(bio, engine="openpyxl") as writer:
+        df.to_excel(writer, sheet_name="Sheet1", index=False)
+    file_name = f"QA知识库导入模板.xlsx"
+    file_path = save_uploaded_file(bio, 'bisheng', file_name)
+    return resp_200({"url": file_path})
+
+
+@router.get('/qa/export/{qa_knowledge_id}', status_code=200)
+def get_export_url(*,
+                   qa_knowledge_id: int,
+                   question: Optional[str] = None,
+                   answer: Optional[str] = None,
+                   keyword: Optional[str] = None,
+                   status: Optional[int] = None,
+                   max_lines: Optional[int] = 10000,
+                   login_user: UserPayload = Depends(get_login_user)):
+
+    # 查询当前知识库，是否有写入权限
+    db_knowledge = KnowledgeService.judge_qa_knowledge_write(login_user, qa_knowledge_id)
+
+    if keyword:
+        question = keyword
+    def get_qa_source(source):
+        '0: 未知 1: 手动；2: 审计, 3: api'
+        if int(source) == 1:
+            return "手动创建"
+        elif int(source) == 2:
+            return "审计创建"
+        elif int(source) == 3:
+            return "api创建"
+        return "未知"
+
+    def get_status(statu):
+        if int(statu) == 1:
+            return "开启"
+        return "关闭"
+
+    page_num = 1
+    total_num = 0
+    page_size = max_lines
+    user_list = UserDao.get_all_users()
+    user_map = {user.user_id: user.user_name for user in user_list}
+    file_list = []
+    file_pr = datetime.now().strftime('%Y%m%d%H%M%S')
+    file_index = 1
+    while True:
+        qa_list, total_count = knowledge_imp.list_qa_by_knowledge_id(qa_knowledge_id, page_size,
+                                                                 page_num, question, answer,
+                                                                 status)
+
+        data = [jsonable_encoder(qa) for qa in qa_list]
+        qa_dict_list = []
+        all_title = ["问题","答案"]
+        for qa in data:
+            qa_dict_list.append({
+                "问题":qa['questions'][0],
+                "答案":json.loads(qa['answers'])[0],
+                # "类型":get_qa_source(qa['source']),
+                # "创建时间":qa['create_time'],
+                # "更新时间":qa['update_time'],
+                # "创建者":user_map.get(qa['user_id'], qa['user_id']),
+                # "状态":get_status(qa['status']),
+            })
+            for index,question in enumerate(qa['questions']):
+                if index == 0:
+                    continue
+                key = f"相似问题{index}"
+                if key not in all_title:
+                    all_title.append(key)
+                qa_dict_list[-1][key] = question
+        if len(qa_dict_list) != 0:
+            df = pd.DataFrame(qa_dict_list)
+        else:
+            df = pd.DataFrame([{"问题": "", "答案": "", "相似问题1": "", "相似问题2": ""}])
+        df = df[all_title]
+        bio = BytesIO()
+        with pd.ExcelWriter(bio, engine="openpyxl") as writer:
+            df.to_excel(writer, sheet_name="Sheet1",index=False)
+        file_name = f"{file_pr}_{file_index}.xlsx"
+        file_index = file_index + 1
+        file_path = save_uploaded_file(bio,'bisheng', file_name)
+        file_list.append(file_path)
+        total_num += len(qa_list)
+        if len(qa_list) < page_size or total_num>=total_count:
+            break
+
+    return resp_200({"file_list": file_list})
+
+
+
+@router.post('/qa/preview/{qa_knowledge_id}', status_code=200)
+def post_import_file(*,
+                     qa_knowledge_id: int,
+                     file_url: str = Body(..., embed=True),
+                     size: Optional[int] = Body(default=0, embed=True),
+                     offset: Optional[int] = Body(default=0, embed=True),
+                     login_user: UserPayload = Depends(get_login_user)):
+    df = pd.read_excel(file_url)
+    columns = df.columns.to_list()
+    if '答案' not in columns or '问题' not in columns:
+        raise HTTPException(status_code=500, detail='文件格式错误，没有 ‘问题’ 或 ‘答案’ 列')
+    data = df.T.to_dict().values()
+    insert_data = []
+    for dd in data:
+        d = QAKnowledgeUpsert(
+            user_id=login_user.user_id,
+            knowledge_id=qa_knowledge_id,
+            answers=[dd['答案']],
+            questions=[dd['问题']],
+            source=4,
+            status=1,
+            create_time=datetime.now(),
+            update_time=datetime.now())
+        for key, value in dd.items():
+            if key.startswith('相似问题'):
+                d.questions.append(value)
+        insert_data.append(d)
+    try:
+        if size>0 and offset>=0:
+            if offset >= len(insert_data):
+                insert_data = []
+            else:
+                insert_data = insert_data[offset:size]
+    except Exception as e:
+        raise HTTPException(status_code=500, detail=e)
+    return resp_200({"result": insert_data})
+
+@router.post('/qa/import/{qa_knowledge_id}', status_code=200)
+def post_import_file(*,
+                     qa_knowledge_id: int,
+                     file_list: list[str] = Body(..., embed=True),
+                     login_user: UserPayload = Depends(get_login_user)):
+    # 查询当前知识库，是否有写入权限
+    db_knowledge = KnowledgeService.judge_qa_knowledge_write(login_user, qa_knowledge_id)
+
+    insert_result = []
+    error_result = []
+    have_question = []
+    for file_url in file_list:
+        df = pd.read_excel(file_url)
+        columns = df.columns.to_list()
+        if '答案' not in columns or '问题' not in columns:
+            insert_result.append(0)
+            continue
+        data = df.T.to_dict().values()
+        insert_data = []
+        have_data = []
+        all_questions = set()
+        for index,dd in enumerate(data):
+            tmp_questions = set()
+            QACreate = QAKnowledgeUpsert(
+            user_id = login_user.user_id,
+            knowledge_id = qa_knowledge_id,
+            answers = [dd['答案']],
+            questions = [dd['问题']],
+            source = 4,
+            status = 1)
+            tmp_questions.add(QACreate.questions[0])
+            for key,value in dd.items():
+                if key.startswith('相似问题'):
+                    if value is not np.nan and value and value is not None and str(value) != 'nan' and str(value) != 'null':
+                        if value not in tmp_questions:
+                            QACreate.questions.append(value)
+                            tmp_questions.add(value)
+
+            db_q = QAKnoweldgeDao.get_qa_knowledge_by_name(QACreate.questions, QACreate.knowledge_id)
+            if db_q and not QACreate.id or len(tmp_questions & all_questions) > 0:
+                have_data.append(index)
+            else:
+                insert_data.append(QACreate)
+                all_questions = all_questions | tmp_questions
+        result = QAKnoweldgeDao.batch_insert_qa(insert_data)
+        insert_result.append(result)
+        error_result.append(have_data)
+
+    return resp_200({"result": insert_result,"errors": error_result})
+

From f93f721779b08804c2ec97f60ec14d2d4da078d9 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Wed, 23 Apr 2025 16:35:18 +0800
Subject: [PATCH 049/186] feat: optional field must have default value

---
 src/backend/bisheng/api/v1/workstation.py             | 4 ++--
 src/backend/bisheng/database/models/knowledge_file.py | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/backend/bisheng/api/v1/workstation.py b/src/backend/bisheng/api/v1/workstation.py
index 5afdaaa2d..df499092b 100644
--- a/src/backend/bisheng/api/v1/workstation.py
+++ b/src/backend/bisheng/api/v1/workstation.py
@@ -103,7 +103,7 @@ def final_message(conversation: MessageSession, title: str, requestMessage: Chat
     return f'event: message\ndata: {msg}\n\n'
 
 
-@router.get('/config', response_model=UnifiedResponseModel[WorkstationConfig])
+@router.get('/config')
 def get_config(
     request: Request,
     login_user: UserPayload = Depends(get_login_user),
@@ -113,7 +113,7 @@ def get_config(
     return resp_200(data=ret)
 
 
-@router.post('/config', response_model=UnifiedResponseModel[WorkstationConfig])
+@router.post('/config')
 def update_config(
     request: Request,
     login_user: UserPayload = Depends(get_admin_user),
diff --git a/src/backend/bisheng/database/models/knowledge_file.py b/src/backend/bisheng/database/models/knowledge_file.py
index 8823f237a..371a6a69e 100644
--- a/src/backend/bisheng/database/models/knowledge_file.py
+++ b/src/backend/bisheng/database/models/knowledge_file.py
@@ -102,8 +102,8 @@ class KnowledgeFileCreate(KnowledgeFileBase):
 
 class QAKnowledgeUpsert(QAKnowledgeBase):
     """支持修改"""
-    id: Optional[int]
-    answers: Optional[List[str]]
+    id: Optional[int] = None
+    answers: Optional[List[str]] = None
 
 
 class KnowledgeFileDao(KnowledgeFileBase):

From 42bfe626dfb9d7f82328d8477ab2e21322720df8 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Wed, 23 Apr 2025 17:08:08 +0800
Subject: [PATCH 050/186] fix: insert batch qa error

---
 src/backend/bisheng/api/v1/workstation.py       |  4 ++--
 .../bisheng/database/models/knowledge_file.py   | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/backend/bisheng/api/v1/workstation.py b/src/backend/bisheng/api/v1/workstation.py
index df499092b..70135457f 100644
--- a/src/backend/bisheng/api/v1/workstation.py
+++ b/src/backend/bisheng/api/v1/workstation.py
@@ -107,7 +107,7 @@ def final_message(conversation: MessageSession, title: str, requestMessage: Chat
 def get_config(
     request: Request,
     login_user: UserPayload = Depends(get_login_user),
-) -> UnifiedResponseModel[WorkstationConfig]:
+):
     """ 获取评价相关的模型配置 """
     ret = WorkStationService.get_config()
     return resp_200(data=ret)
@@ -118,7 +118,7 @@ def update_config(
     request: Request,
     login_user: UserPayload = Depends(get_admin_user),
     data: WorkstationConfig = Body(..., description='默认模型配置'),
-) -> UnifiedResponseModel[WorkstationConfig]:
+):
     """ 更新评价相关的模型配置 """
     ret = WorkStationService.update_config(request, login_user, data)
     return resp_200(data=ret)
diff --git a/src/backend/bisheng/database/models/knowledge_file.py b/src/backend/bisheng/database/models/knowledge_file.py
index 371a6a69e..f357ee72a 100644
--- a/src/backend/bisheng/database/models/knowledge_file.py
+++ b/src/backend/bisheng/database/models/knowledge_file.py
@@ -278,6 +278,23 @@ class QAKnoweldgeDao(QAKnowledgeBase):
             session.refresh(qa)
         return qa
 
+    @classmethod
+    def batch_insert_qa(cls, qa_knowledges: List[QAKnowledgeUpsert]):
+        with session_getter() as session:
+            try:
+                qas = []
+                for qa_knowledge in qa_knowledges:
+                    qa = QAKnowledge.validate(qa_knowledge)
+                    qas.append(qa)
+                session.add_all(qas)
+                session.commit()
+                for qa in qas:
+                    session.refresh(qa)
+                return 1
+            except Exception as e:
+                session.rollback()
+                raise 0
+
     @classmethod
     def total_count(cls, sql):
         with session_getter() as session:

From 6cffa165fd44620ad96362e8fd890026d752fa97 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Wed, 23 Apr 2025 17:08:47 +0800
Subject: [PATCH 051/186] fix: insert batch qa error

---
 src/backend/bisheng/database/models/knowledge_file.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backend/bisheng/database/models/knowledge_file.py b/src/backend/bisheng/database/models/knowledge_file.py
index f357ee72a..f269b3a57 100644
--- a/src/backend/bisheng/database/models/knowledge_file.py
+++ b/src/backend/bisheng/database/models/knowledge_file.py
@@ -284,7 +284,7 @@ class QAKnoweldgeDao(QAKnowledgeBase):
             try:
                 qas = []
                 for qa_knowledge in qa_knowledges:
-                    qa = QAKnowledge.validate(qa_knowledge)
+                    qa = QAKnowledge.model_validate(qa_knowledge)
                     qas.append(qa)
                 session.add_all(qas)
                 session.commit()

From c57e4f63859e9cf76f30295c6965bc2f1f3a492d Mon Sep 17 00:00:00 2001
From: dolphin <shanghang@dataelem.com>
Date: Wed, 23 Apr 2025 17:23:55 +0800
Subject: [PATCH 052/186] feat: import qaknowlege

---
 .../platform/public/locales/zh/knowledge.json |   2 +
 .../src/components/bs-ui/upload/button.tsx    | 217 +++++++++++++
 .../src/components/bs-ui/upload/simple.tsx    |  22 +-
 .../platform/src/controllers/API/index.ts     |  40 +++
 .../KnowledgePage/components/ImportQa.tsx     | 307 ++++++++++++++++++
 .../platform/src/pages/KnowledgePage/qas.tsx  |  16 +-
 6 files changed, 601 insertions(+), 3 deletions(-)
 create mode 100644 src/frontend/platform/src/components/bs-ui/upload/button.tsx
 create mode 100644 src/frontend/platform/src/pages/KnowledgePage/components/ImportQa.tsx

diff --git a/src/frontend/platform/public/locales/zh/knowledge.json b/src/frontend/platform/public/locales/zh/knowledge.json
index d4dd016da..9b551a360 100644
--- a/src/frontend/platform/public/locales/zh/knowledge.json
+++ b/src/frontend/platform/public/locales/zh/knowledge.json
@@ -93,6 +93,8 @@
     "createQa": "创建 QA",
     "similarQuestions": "相似问题",
     "aiGenerate": "AI生成",
+    "errorMsg": "文件解析成功，其中{{value}}条问题上传失败，请检查文件后再试",
+    "successMsg": "文件上传成功",
     "cancel2": "取消",
     "confirm": "确认"
 }
\ No newline at end of file
diff --git a/src/frontend/platform/src/components/bs-ui/upload/button.tsx b/src/frontend/platform/src/components/bs-ui/upload/button.tsx
new file mode 100644
index 000000000..ba979da1e
--- /dev/null
+++ b/src/frontend/platform/src/components/bs-ui/upload/button.tsx
@@ -0,0 +1,217 @@
+import { useState, useRef, useCallback } from 'react';
+import axios, { AxiosProgressEvent, CancelTokenSource } from 'axios';
+import { Button } from "../button";
+// TODO 待测试组件
+
+interface UploadButtonProps {
+    uploadUrl: string;
+    allowedFileTypes?: string[];
+    maxFileSize?: number; // 单位：MB
+    multiple?: boolean;
+    formParams?: Record<string, any>;
+    className?: string;
+    children?: React.ReactNode;
+    onSuccess?: (response: any) => void;
+    onError?: (error: Error) => void;
+    onProgress?: (percentage: number) => void;
+    onBeforeUpload?: (files: File[]) => boolean;
+}
+
+export default function UploadButton({
+    uploadUrl,
+    allowedFileTypes = [],
+    maxFileSize = 10, // 默认10MB
+    multiple = false,
+    formParams = {},
+    className,
+    children = 'Upload',
+    onSuccess,
+    onError,
+    onProgress,
+    onBeforeUpload
+}: UploadButtonProps) {
+    const fileInputRef = useRef<HTMLInputElement>(null);
+    const [isUploading, setIsUploading] = useState(false);
+    const [previews, setPreviews] = useState<string[]>([]);
+    const [dragActive, setDragActive] = useState(false);
+    const cancelToken = useRef<CancelTokenSource>();
+
+    // 生成预览图
+    const generatePreviews = useCallback((files: File[]) => {
+        const imageFiles = files.filter(file => file.type.startsWith('image/'));
+        const previewPromises = imageFiles.map(file =>
+            new Promise<string>((resolve) => {
+                const reader = new FileReader();
+                reader.onload = (e) => resolve(e.target?.result as string);
+                reader.readAsDataURL(file);
+            })
+        );
+
+        Promise.all(previewPromises).then(urls => {
+            setPreviews(prev => [...prev, ...urls]);
+        });
+    }, []);
+
+    // 处理文件校验
+    const validateFiles = (files: File[]) => {
+        // 文件类型校验
+        if (allowedFileTypes.length > 0) {
+            const isValid = files.every(file =>
+                allowedFileTypes.includes(file.type)
+            );
+            if (!isValid) {
+                throw new Error(`只支持以下文件类型: ${allowedFileTypes.join(', ')}`);
+            }
+        }
+
+        // 文件大小校验
+        if (maxFileSize > 0) {
+            const sizeValid = files.every(file =>
+                file.size <= maxFileSize * 1024 * 1024
+            );
+            if (!sizeValid) {
+                throw new Error(`文件大小不能超过 ${maxFileSize}MB`);
+            }
+        }
+    };
+
+    const handleUpload = async (files: File[]) => {
+        try {
+            // 校验文件
+            validateFiles(files);
+
+            // 上传前回调
+            if (onBeforeUpload && !onBeforeUpload(files)) return;
+
+            setIsUploading(true);
+            const formData = new FormData();
+
+            // 添加表单参数
+            Object.entries(formParams).forEach(([key, value]) => {
+                formData.append(key, value);
+            });
+
+            // 添加文件
+            files.forEach(file => {
+                formData.append('files', file);
+            });
+
+            // 生成预览
+            generatePreviews(files);
+
+            // 创建取消令牌
+            cancelToken.current = axios.CancelToken.source();
+
+            const response = await axios.post(uploadUrl, formData, {
+                onUploadProgress: (progressEvent: AxiosProgressEvent) => {
+                    if (progressEvent.total) {
+                        const percent = Math.round(
+                            (progressEvent.loaded * 100) / progressEvent.total
+                        );
+                        onProgress?.(percent);
+                    }
+                },
+                cancelToken: cancelToken.current.token
+            });
+
+            onSuccess?.(response.data);
+        } catch (err) {
+            if (!axios.isCancel(err)) {
+                onError?.(err as Error);
+            }
+        } finally {
+            setIsUploading(false);
+        }
+    };
+
+    // 拖拽处理
+    const handleDrag = (e: React.DragEvent) => {
+        e.preventDefault();
+        e.stopPropagation();
+        if (e.type === 'dragover') {
+            setDragActive(true);
+        } else if (e.type === 'dragleave') {
+            setDragActive(false);
+        }
+    };
+
+    const handleDrop = (e: React.DragEvent) => {
+        e.preventDefault();
+        e.stopPropagation();
+        setDragActive(false);
+
+        if (e.dataTransfer.files && e.dataTransfer.files.length > 0) {
+            const files = Array.from(e.dataTransfer.files);
+            handleUpload(files);
+        }
+    };
+
+    // 文件选择处理
+    const handleFileChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+        const files = Array.from(e.target.files || []);
+        if (files.length > 0) {
+            handleUpload(files);
+        }
+    };
+
+    return (
+        <div className={className}>
+            {/* 拖拽区域 */}
+            <div
+                className={`drag-area ${dragActive ? 'drag-active' : ''}`}
+                onDragOver={handleDrag}
+                onDragLeave={handleDrag}
+                onDrop={handleDrop}
+                style={{
+                    border: '2px dashed #ccc',
+                    padding: '20px',
+                    marginBottom: '10px',
+                    backgroundColor: dragActive ? '#f0f8ff' : 'transparent'
+                }}
+            >
+                拖拽文件到此区域或点击下方按钮上传
+
+                {/* 预览区域 */}
+                {previews.length > 0 && (
+                    <div style={{
+                        display: 'flex',
+                        gap: '10px',
+                        flexWrap: 'wrap',
+                        marginTop: '10px'
+                    }}>
+                        {previews.map((src, index) => (
+                            <img
+                                key={index}
+                                src={src}
+                                alt={`预览-${index}`}
+                                style={{
+                                    width: '100px',
+                                    height: '100px',
+                                    objectFit: 'cover',
+                                    borderRadius: '4px'
+                                }}
+                            />
+                        ))}
+                    </div>
+                )}
+            </div>
+
+            <Button
+                onClick={() => fileInputRef.current?.click()}
+                disabled={isUploading}
+                style={{ width: '100%' }}
+            >
+                {isUploading ? '上传中...' : children}
+            </Button>
+
+            <input
+                type="file"
+                ref={fileInputRef}
+                style={{ display: 'none' }}
+                multiple={multiple}
+                accept={allowedFileTypes.join(',')}
+                onChange={handleFileChange}
+            />
+        </div>
+    );
+}
\ No newline at end of file
diff --git a/src/frontend/platform/src/components/bs-ui/upload/simple.tsx b/src/frontend/platform/src/components/bs-ui/upload/simple.tsx
index d93cb37fd..6744d07d6 100644
--- a/src/frontend/platform/src/components/bs-ui/upload/simple.tsx
+++ b/src/frontend/platform/src/components/bs-ui/upload/simple.tsx
@@ -5,7 +5,7 @@ import { useToast } from "../toast/use-toast";
 import { cname } from "../utils";
 import axios from "@/controllers/request";
 
-export default function SimpleUpload({ filekey, uploadUrl, accept, className = '', onUpload, onProgress, onError, onSuccess }) {
+export default function SimpleUpload({ filekey, uploadUrl, accept, className = '', preCheck, onUpload, onProgress, onError, onSuccess }) {
     const { t } = useTranslation();
     const { toast } = useToast()
 
@@ -24,6 +24,26 @@ export default function SimpleUpload({ filekey, uploadUrl, accept, className = '
         });
         if (!files.length) return
 
+        // 执行预校验（如果提供了preCheck函数）
+        if (preCheck) {
+            try {
+                const checkResult = await preCheck(files[0]);
+                if (checkResult?.valid === false) {
+                    toast({
+                        title: t('prompt'),
+                        description: checkResult.message || t('code.preCheckFailed'),
+                    });
+                    return;
+                }
+            } catch (error) {
+                toast({
+                    title: t('prompt'),
+                    description: error.message || t('code.preCheckError'),
+                });
+                return;
+            }
+        }
+
         const formData = new FormData();
         formData.append(filekey, files[0]);
 
diff --git a/src/frontend/platform/src/controllers/API/index.ts b/src/frontend/platform/src/controllers/API/index.ts
index d8dd4c221..4d0c8531a 100644
--- a/src/frontend/platform/src/controllers/API/index.ts
+++ b/src/frontend/platform/src/controllers/API/index.ts
@@ -305,6 +305,46 @@ export async function getQaList(id, data: { page, pageSize, keyword }) {
   });
 }
 
+
+/**
+ * 导出QA文件
+ */
+export async function getQaFile(id): Promise<{ file_list: string[] }> {
+  return await axios.get(`/api/v1/knowledge/qa/export/${id}`);
+}
+
+/**
+ * 导入QA文件
+ */
+export async function postImportQaFile(id, params): Promise<{
+  result: {
+    answers: string,
+    questions: string[],
+  }[]
+}> {
+  const { url } = params;
+  return await axios.post(`/api/v1/knowledge/qa/import/${id}`, {
+    file_list: [url],
+  });
+}
+
+/**
+ * 预览QA文件
+ */
+export async function getQaFilePreview(id, params): Promise<{
+  result: {
+    answers: string,
+    questions: string[],
+  }[]
+}> {
+  const { url, size, offset } = params;
+  return await axios.post(`/api/v1/knowledge/qa/preview/${id}`, {
+    file_url: url,
+    size,
+    offset,
+  });
+}
+
 /**
  * 修改qa状态
  */
diff --git a/src/frontend/platform/src/pages/KnowledgePage/components/ImportQa.tsx b/src/frontend/platform/src/pages/KnowledgePage/components/ImportQa.tsx
new file mode 100644
index 000000000..b263696f8
--- /dev/null
+++ b/src/frontend/platform/src/pages/KnowledgePage/components/ImportQa.tsx
@@ -0,0 +1,307 @@
+import { checkSassUrl } from "@/components/bs-comp/FileView";
+import { Button, LoadButton } from "@/components/bs-ui/button";
+import { Dialog, DialogClose, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/bs-ui/dialog";
+import { Label } from "@/components/bs-ui/label";
+import { Table, TableBody, TableCell, TableHead, TableRow } from "@/components/bs-ui/table";
+import { message } from "@/components/bs-ui/toast/use-toast";
+import SimpleUpload from "@/components/bs-ui/upload/simple";
+import { getQaFile, getQaFilePreview, postImportQaFile } from "@/controllers/API";
+import { captureAndAlertRequestErrorHoc } from "@/controllers/request";
+import { downloadFile } from "@/util/utils";
+import { generateUUID } from "@/utils";
+import { forwardRef, useImperativeHandle, useRef, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { useParams } from "react-router-dom";
+import * as XLSX from 'xlsx';
+
+// 添加&编辑qa
+const SimilarityProblemModal = forwardRef(function ({ questions }, ref) {
+    const { t } = useTranslation('knowledge');
+    const [open, setOpen] = useState(false);
+
+    const idRef = useRef('');
+    const sourceRef = useRef('');
+    useImperativeHandle(ref, () => ({
+        open() {
+            setOpen(true);
+        },
+    }));
+
+    const close = () => {
+        setOpen(false);
+    };
+    return (
+        <Dialog open={open} onOpenChange={(bln) => bln ? setOpen(bln) : close()}>
+            <DialogContent className="sm:max-w-[625px]">
+                <DialogHeader>
+                    <DialogTitle>相似问题</DialogTitle>
+                </DialogHeader>
+                <div className="flex flex-col gap-4 py-2 max-h-[36vh] overflow-y-auto">
+                    <Table>
+                        <TableRow>
+                            <TableHead>相似问题（仅显示前十条）</TableHead>
+                        </TableRow>
+                        <TableBody>
+                            {(questions || []).slice(0, 10).map((el, index) => {
+                                return (
+                                    <TableRow key={index}>
+                                        <TableCell className="font-medium">
+                                            {el}
+                                        </TableCell>
+                                    </TableRow>
+                                )
+                            })
+                            }
+                        </TableBody>
+                    </Table>
+                </div>
+                <DialogFooter>
+                    <DialogClose>
+                        <LoadButton type="submit" className="px-11">
+                            {t('confirm')}
+                        </LoadButton>
+                    </DialogClose>
+                </DialogFooter>
+            </DialogContent>
+        </Dialog>
+    );
+});
+
+function QaTable({ dataList }) {
+    const { t } = useTranslation('knowledge');
+    const similarityQuestions = useRef(null);
+    const [questions, setQuestions] = useState<string[]>([]);
+    return (
+        <div>
+            <Table>
+                <TableRow>
+                    <TableHead>{t('question')}</TableHead>
+                    <TableHead>{t('answer')}</TableHead>
+                    <TableHead className="">{t('similarQuestions')}</TableHead>
+                </TableRow>
+                <TableBody>
+                    {dataList.map(el => {
+                        const questions = [1,2,3,4] // el.questions.filter(item => !!item);
+                        const mainQuestion = questions.shift() || '';
+                        const answers = JSON.parse(el.answers);
+                        const answer = answers[0] || '';
+                        return (
+                            <TableRow key={generateUUID(4)}>
+                                <TableCell className="font-medium">
+                                    {mainQuestion}
+                                </TableCell>
+                                <TableCell className="font-medium">
+                                    {answer}
+                                </TableCell>
+                                <TableCell className="font-medium cursor-pointer text-primary">
+                                    <Button variant="link" className="px-1" onClick={() => {
+                                        if (!questions.length) {
+                                            return message({
+                                                variant: 'warning',
+                                                description: '暂无相似问题'
+                                            });
+                                        }
+                                        setQuestions(questions);
+                                        //打开相似问题预览窗口
+                                        similarityQuestions.current.open();
+                                    }}>
+                                        {t('view')}
+                                    </Button>
+                                </TableCell>
+                            </TableRow>
+                        )
+                    })
+                    }
+                    <SimilarityProblemModal ref={similarityQuestions} questions={questions} />
+                </TableBody>
+            </Table>
+        </div>
+    );
+}
+
+// Excel校验函数
+const excelPreCheck = async (file) => {
+    return new Promise((resolve) => {
+        // 检查是否是Excel文件
+        const ext = file.name.split('.').pop().toLowerCase();
+        if (!['xlsx', 'xls'].includes(ext)) {
+            return { valid: false, message: '请上传xlsx、xls类型的文件' }; // 非Excel文件跳过校验
+        }
+
+        const reader = new FileReader();
+
+        reader.onload = (e) => {
+            try {
+                const data = new Uint8Array(e.target.result);
+                const workbook = XLSX.read(data, { type: 'array' });
+                const firstSheet = workbook.Sheets[workbook.SheetNames[0]];
+                const jsonData = XLSX.utils.sheet_to_json(firstSheet, { header: 1 });
+
+                if (jsonData.length === 0) {
+                    resolve({ valid: false, message: 'Excel文件为空' });
+                    return;
+                }
+
+                const headers = jsonData[0].map(header => header?.toString().toLowerCase().trim());
+                const requiredColumns = ['问题', '答案'];
+                const missingColumns = requiredColumns.filter(
+                    col => !headers.includes(col.toLowerCase())
+                );
+
+                if (missingColumns.length > 0) {
+                    resolve({
+                        valid: false,
+                        message: `缺少必要列: ${missingColumns.join(', ')}`
+                    });
+                } else {
+                    resolve({ valid: true });
+                }
+            } catch (error) {
+                resolve({ valid: false, message: 'Excel文件解析失败' });
+            }
+        };
+
+        reader.onerror = () => {
+            resolve({ valid: false, message: '文件读取失败' });
+        };
+
+        reader.readAsArrayBuffer(file);
+    });
+};
+
+// 导入Qa
+export const ImportQa = forwardRef(function ({ knowlageId, onChange }: any, ref) {
+    const { t } = useTranslation('knowledge');
+    const [open, setOpen] = useState(false);
+    const [saveLoad, setSaveLoad] = useState(false);
+    const [dataList, setDataList] = useState([]);
+    const [form, setForm] = useState({
+        fileUrl: '',
+        fileName: '',
+    });
+    const [error, setError] = useState({
+        fileUrl: false,
+    });
+
+    useImperativeHandle(ref, () => ({
+        open() {
+            setOpen(true);
+            setForm({
+                fileUrl: '',
+                fileName: '',
+            });
+            setError({
+                fileUrl: false,
+            });
+            setDataList([]);
+        }
+    }));
+
+    const close = () => {
+        setOpen(false);
+        setError({
+            fileUrl: false,
+        });
+    };
+
+    const handleSubmit = async () => {
+        const isDataListEmpty = !dataList.length;
+        const errors = [];
+        setError({
+            fileUrl: isDataListEmpty,
+        });
+
+        if (isDataListEmpty) errors.push('待上传问题为空，请检查');
+        if (errors.length > 0) {
+            return message({
+                variant: 'warning',
+                description: errors
+            });
+        }
+        //提交
+        const res = await captureAndAlertRequestErrorHoc(postImportQaFile(id, {
+            url: form.fileUrl
+        }));
+        const errorLines = res.errors[0];
+        console.log('errors', errorLines);
+        if (errorLines.length) {
+            message({ variant: 'warning', description: t('errorMsg', { value: errorLines.length }) });
+        } else {
+            message({ variant: 'success', description: t('successMsg') });
+        }
+        close();
+        onChange();
+    };
+    const { id } = useParams();
+    const handleFileUploadSuccess = async (name, url) => {
+        // 发送请求进行预览
+        const res = await captureAndAlertRequestErrorHoc(getQaFilePreview(id, {
+            // 最多预览10条
+            size: 10,
+            url,
+        }));
+        const { result } = res;
+        setDataList(result);
+        setForm({
+            fileUrl: url,
+            fileName: name
+        });
+    };
+
+    return (
+        <Dialog open={open} onOpenChange={(bln) => bln ? setOpen(bln) : close()}>
+            <DialogContent className="sm:max-w-[825px]">
+                <DialogHeader>
+                    <DialogTitle>导入 QA</DialogTitle>
+                </DialogHeader>
+                <div>
+                    <div className="flex justify-between items-center">
+                        <label htmlFor="dataSetName" className="bisheng-label">
+                            <span className="text-red-500">*</span>请上传文件
+                        </label>
+                        <div className="flex gap-2 items-center">
+                            <Label>示例文件:</Label>
+                            <Button variant="link" className="px-1" onClick={() => {
+                                getQaFile('template').then(res => {
+                                    const fileUrl = res.url;
+                                    downloadFile(checkSassUrl(fileUrl), 'QA导入格式示例.xlsx');
+                                })
+                            }}>
+                                QA导入格式示例.xlsx
+                            </Button>
+                        </div>
+                    </div>
+                    <div className="flex flex-col gap-4 py-2">
+                        <SimpleUpload
+                            filekey="file"
+                            uploadUrl={'/api/v1/knowledge/upload'}
+                            accept={['xlsx']}
+                            className={`${error.fileUrl ? 'border-red-400' : ''}`}
+                            onSuccess={handleFileUploadSuccess}
+                            preCheck={excelPreCheck}
+                        />
+                        <p className="text-sm text-green-500 mt-2">{form.fileName}</p>
+                    </div>
+                </div>
+                {!!dataList.length && <div>
+                    <label htmlFor="dataSetName" className="bisheng-label">
+                    导入预览（仅显示前十条）
+                    </label>
+                    <div className="flex flex-col gap-4 py-2 max-h-[36vh] overflow-y-auto">
+                        <QaTable dataList={dataList} />
+                    </div>
+                </div>}
+                <DialogFooter>
+                    <DialogClose>
+                        <Button variant="outline" className="px-11" type="button" onClick={close}>
+                            取消
+                        </Button>
+                    </DialogClose>
+                    <LoadButton loading={saveLoad} type="submit" className="px-11" onClick={handleSubmit}>
+                        {t('submit')}
+                    </LoadButton>
+                </DialogFooter>
+            </DialogContent>
+        </Dialog>
+    );
+})
\ No newline at end of file
diff --git a/src/frontend/platform/src/pages/KnowledgePage/qas.tsx b/src/frontend/platform/src/pages/KnowledgePage/qas.tsx
index e420498dd..328eeb2b3 100644
--- a/src/frontend/platform/src/pages/KnowledgePage/qas.tsx
+++ b/src/frontend/platform/src/pages/KnowledgePage/qas.tsx
@@ -1,9 +1,12 @@
+import { checkSassUrl } from "@/components/bs-comp/FileView";
 import { LoadIcon } from "@/components/bs-icons";
+import { LoadingIcon } from "@/components/bs-icons/loading";
 import { bsConfirm } from "@/components/bs-ui/alertDialog/useConfirm";
 import { Checkbox } from "@/components/bs-ui/checkBox";
 import { Dialog, DialogClose, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/bs-ui/dialog";
 import { Switch } from "@/components/bs-ui/switch";
 import { useToast } from "@/components/bs-ui/toast/use-toast";
+import { downloadFile } from "@/util/utils";
 import { ArrowLeft } from "lucide-react";
 import { forwardRef, useEffect, useImperativeHandle, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -20,10 +23,10 @@ import {
     TableHeader,
     TableRow
 } from "../../components/bs-ui/table";
-import { deleteQa, generateSimilarQa, getQaDetail, getQaList, updateQa, updateQaStatus } from "../../controllers/API";
+import { deleteQa, generateSimilarQa, getQaDetail, getQaFile, getQaList, updateQa, updateQaStatus } from "../../controllers/API";
 import { captureAndAlertRequestErrorHoc } from "../../controllers/request";
 import { useTable } from "../../util/hook";
-import { LoadingIcon } from "@/components/bs-icons/loading";
+import { ImportQa } from "./components/ImportQa";
 
 const defaultQa = {
     question: '',
@@ -224,6 +227,7 @@ export default function QasPage() {
     const [selectedItems, setSelectedItems] = useState([]); // 存储选中的项
     const [selectAll, setSelectAll] = useState(false); // 全选状态
     const editRef = useRef(null)
+    const importRef = useRef(null)
     const [hasPermission, setHasPermission] = useState(false)
 
     const { page, pageSize, data: datalist, total, loading, setPage, search, reload, refreshData } = useTable({}, (param) =>
@@ -321,6 +325,13 @@ export default function QasPage() {
                     </div>
                     <div className="flex gap-4 items-center">
                         <SearchInput placeholder={t('qaContent')} onChange={(e) => search(e.target.value)}></SearchInput>
+                        <Button variant="outline" className="px-8" onClick={() => importRef.current.open()}>导入</Button>
+                        <Button variant="outline" className="px-8" onClick={() => {
+                            getQaFile(id).then(res => {
+                                const fileUrl = res.file_list[0];
+                                downloadFile(checkSassUrl(fileUrl), `${title}.xlsx`);
+                            })
+                        }}>导出</Button>
                         <Button className="px-8" onClick={() => editRef.current.open()}>{t('createQA')}</Button>
                     </div>
                 </div>
@@ -389,5 +400,6 @@ export default function QasPage() {
             </div>
         </div>
         <EditQa ref={editRef} knowlageId={id} onChange={reload} />
+        <ImportQa ref={importRef} knowlageId={id} onChange={reload} />
     </div >
 };

From 0c3181f6f4ab9e7fbbb19bb3b86a44b96e9585eb Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Wed, 23 Apr 2025 17:28:26 +0800
Subject: [PATCH 053/186] fix: remove pydantic warning

---
 src/backend/bisheng/api/v1/knowledge.py               | 6 +++---
 src/backend/bisheng/database/models/knowledge_file.py | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/backend/bisheng/api/v1/knowledge.py b/src/backend/bisheng/api/v1/knowledge.py
index 1fbd2a0a4..0c164669b 100644
--- a/src/backend/bisheng/api/v1/knowledge.py
+++ b/src/backend/bisheng/api/v1/knowledge.py
@@ -516,15 +516,15 @@ def post_import_file(*,
         d = QAKnowledgeUpsert(
             user_id=login_user.user_id,
             knowledge_id=qa_knowledge_id,
-            answers=[dd['答案']],
-            questions=[dd['问题']],
+            answers=[str(dd['答案'])],
+            questions=[str(dd['问题'])],
             source=4,
             status=1,
             create_time=datetime.now(),
             update_time=datetime.now())
         for key, value in dd.items():
             if key.startswith('相似问题'):
-                d.questions.append(value)
+                d.questions.append(str(value))
         insert_data.append(d)
     try:
         if size>0 and offset>=0:
diff --git a/src/backend/bisheng/database/models/knowledge_file.py b/src/backend/bisheng/database/models/knowledge_file.py
index f269b3a57..93747a2c5 100644
--- a/src/backend/bisheng/database/models/knowledge_file.py
+++ b/src/backend/bisheng/database/models/knowledge_file.py
@@ -50,7 +50,7 @@ class QAKnowledgeBase(SQLModelSerializable):
     knowledge_id: int = Field(index=True)
     questions: List[str] = Field(index=False)
     answers: str = Field(index=False)
-    source: Optional[int] = Field(default=0, index=False, description='0: 未知 1: 手动；2: 审计, 3: api')
+    source: Optional[int] = Field(default=0, index=False, description='0: 未知 1: 手动；2: 审计, 3: api, 4: 批量导入')
     status: Optional[int] = Field(default=1, index=False, description='1: 解析中；2: 解析成功；3: 解析失败')
     extra_meta: Optional[str] = Field(default=None, index=False)
     remark: Optional[str] = Field(default=None, sa_column=Column(String(length=512)))
@@ -103,7 +103,7 @@ class KnowledgeFileCreate(KnowledgeFileBase):
 class QAKnowledgeUpsert(QAKnowledgeBase):
     """支持修改"""
     id: Optional[int] = None
-    answers: Optional[List[str]] = None
+    answers: Optional[List[str] | str] = None
 
 
 class KnowledgeFileDao(KnowledgeFileBase):

From 275f068ae22116fcaf57b2d0c36cfa35a54001e2 Mon Sep 17 00:00:00 2001
From: dolphin <shanghang@dataelem.com>
Date: Wed, 23 Apr 2025 18:48:41 +0800
Subject: [PATCH 054/186] feat: workflow security review

---
 .../Pro/security/AssistantSetting.tsx         | 63 +++++++++++++++----
 .../src/pages/BuildPage/CreateApp.tsx         | 15 ++++-
 2 files changed, 63 insertions(+), 15 deletions(-)

diff --git a/src/frontend/platform/src/components/Pro/security/AssistantSetting.tsx b/src/frontend/platform/src/components/Pro/security/AssistantSetting.tsx
index 264a5aea9..b3d12460b 100644
--- a/src/frontend/platform/src/components/Pro/security/AssistantSetting.tsx
+++ b/src/frontend/platform/src/components/Pro/security/AssistantSetting.tsx
@@ -6,12 +6,21 @@ import { useToast } from "@/components/bs-ui/toast/use-toast";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/bs-ui/tooltip";
 import { getSensitiveApi, sensitiveSaveApi } from "@/controllers/API/pro";
 import { CircleHelp } from "lucide-react";
-import { useEffect, useState } from "react";
+import { forwardRef, useEffect, useImperativeHandle, useState } from "react";
 import { useTranslation } from "react-i18next";
 import FormSet from "./FormSet";
 import FormView from "./FormView";
 
-export default function AssistantSetting({ id, type }) {
+interface AssistantSettingProps {
+    id: string | number;
+    type: string;
+}
+
+export interface AssistantSettingRef {
+    create: (id: number) => Promise<boolean>;
+}
+
+const AssistantSetting = forwardRef<AssistantSettingRef, AssistantSettingProps>(({ id, type }, ref) => {
     const { t } = useTranslation();
 
     const [open, setOpen] = useState(false);
@@ -25,7 +34,7 @@ export default function AssistantSetting({ id, type }) {
 
     // load
     useEffect(() => {
-        if (id !== 3) {
+        if (id && id !== 3) {
             getSensitiveApi(id, type).then(res => {
                 const { is_check, auto_reply, words, words_type } = res;
                 setForm({
@@ -38,22 +47,47 @@ export default function AssistantSetting({ id, type }) {
         }
     }, [id, type]);
 
-    const handleFormChange = async (_form) => {
+    // 验证表单
+    const validateForm = (formData: typeof form) => {
+        if (!formData.isCheck) return true
         const errors = [];
-        if (_form.wordsType.length === 0) errors.push(t('build.errors.selectAtLeastOneWordType'));
-        if (_form.autoReply === '') errors.push(t('build.errors.autoReplyNotEmpty'));
-        if (errors.length) {
-            return toast({ title: t('prompt'), variant: 'error', description: errors.join(', ') });
+        if (formData.wordsType.length === 0) {
+            errors.push(t('build.errors.selectAtLeastOneWordType'));
         }
+        if (formData.autoReply === '') {
+            errors.push(t('build.errors.autoReplyNotEmpty'));
+        }
+        if (errors.length) {
+            toast({ title: t('prompt'), variant: 'error', description: errors.join(', ') });
+            return false
+        }
+        return true
+    };
+
+    // 暴露 save 方法给 ref
+    useImperativeHandle(ref, () => ({
+        create: async (saveId?: number) => {
+            if (!form.isCheck) return true
+            if (!validateForm(form)) return false
+            const res = await sensitiveSaveApi({ ...form, id: saveId, type });
+            return true;
+        }
+    }));
+
+    const handleFormChange = async (_form) => {
+        if (!validateForm(_form)) return true
 
         setForm(_form);
-        await sensitiveSaveApi({ ..._form, id, type });
-        message({ title: t('prompt'), variant: 'success', description: t('build.saveSuccess') });
+        if (id) {
+            await sensitiveSaveApi({ ..._form, id, type });
+            message({ title: t('prompt'), variant: 'success', description: t('build.saveSuccess') });
+            return false
+        }
     };
 
     const onOff = (bln) => {
         setForm({ ...form, isCheck: bln });
-        sensitiveSaveApi({ ...form, isCheck: bln, id, type });
+        id && sensitiveSaveApi({ ...form, isCheck: bln, id, type });
         if (bln) setOpen(true);
     };
 
@@ -99,4 +133,9 @@ export default function AssistantSetting({ id, type }) {
             </AccordionContent>
         </AccordionItem>
     );
-}
+})
+
+
+AssistantSetting.displayName = "AssistantSetting";
+
+export default AssistantSetting;
\ No newline at end of file
diff --git a/src/frontend/platform/src/pages/BuildPage/CreateApp.tsx b/src/frontend/platform/src/pages/BuildPage/CreateApp.tsx
index 63610483d..d95e19935 100644
--- a/src/frontend/platform/src/pages/BuildPage/CreateApp.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/CreateApp.tsx
@@ -181,9 +181,18 @@ ${t('build.exampleTwo', { ns: 'bs' })}
                     navigate('/assistant/' + res.id)
                 }
             } else {
-                // 工作流
-                const res = await captureAndAlertRequestErrorHoc(createWorkflowApi(formData.name, formData.desc, formData.url))
-                if (res) navigate('/flow/' + res.id)
+                if (appId) return navigate('/flow/' + appId) // 避免重复创建
+                // 创建工作流
+                const workflow = await captureAndAlertRequestErrorHoc(createWorkflowApi(formData.name, formData.desc, formData.url))
+                if (workflow) {
+                    const navigateToFlow = (id) => navigate(`/flow/${id}`);
+                    // 非Pro版本直接跳转
+                    if (!appConfig.isPro) return navigateToFlow(workflow.id)
+
+                    setAppId(workflow.id)
+                    const securityCreated = await securityRef.current.create(workflow.id)
+                    if (securityCreated) navigateToFlow(workflow.id)
+                }
             }
         }
         setLoading(false);

From fccaf04506f39f055fe4165e808db25ce18e7ee9 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Wed, 23 Apr 2025 18:52:27 +0800
Subject: [PATCH 055/186] fix: record audit log error

---
 src/backend/bisheng/api/services/role_group_service.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backend/bisheng/api/services/role_group_service.py b/src/backend/bisheng/api/services/role_group_service.py
index 332202916..ae895e82d 100644
--- a/src/backend/bisheng/api/services/role_group_service.py
+++ b/src/backend/bisheng/api/services/role_group_service.py
@@ -200,7 +200,7 @@ class RoleGroupService():
         for one in group_ids:
             note += f'{group_dict.get(one, one)}、'
         note = note.rstrip('、')
-        AuditLogService.update_user(login_user, get_request_ip(request), user_id, group_dict.keys(), note)
+        AuditLogService.update_user(login_user, get_request_ip(request), user_id, list(group_dict.keys()), note)
         return None
 
     def get_user_groups_list(self, user_id: int) -> List[GroupRead]:

From 75f479f1a8273dbaee724f617192ce99b9f6f690 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Thu, 24 Apr 2025 14:18:40 +0800
Subject: [PATCH 056/186] feat: workflow input node support image and variable

---
 src/backend/bisheng/workflow/common/node.py   |  15 +-
 .../bisheng/workflow/graph/workflow.py        |   1 -
 src/backend/bisheng/workflow/nodes/base.py    |  18 ++
 .../bisheng/workflow/nodes/input/input.py     | 174 +++++++++++++-----
 .../bisheng/workflow/nodes/output/output.py   |   2 +
 5 files changed, 165 insertions(+), 45 deletions(-)

diff --git a/src/backend/bisheng/workflow/common/node.py b/src/backend/bisheng/workflow/common/node.py
index 27770a208..26c299faa 100644
--- a/src/backend/bisheng/workflow/common/node.py
+++ b/src/backend/bisheng/workflow/common/node.py
@@ -1,7 +1,7 @@
 from enum import Enum
 from typing import Optional, Any, List
 
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, field_validator
 
 
 class NodeType(Enum):
@@ -49,11 +49,20 @@ class BaseNodeData(BaseModel):
     group_params: Optional[List[NodeGroupParams]] = Field(default=None, description="Node group params")
     tab: Optional[dict] = Field({}, description="tab config")
     tool_key: Optional[str] = Field("", description="unique tool id, only for tool node")
-    v: Optional[str | int] = Field(default="", description="node version")
+    v: Optional[int] = Field(default=0, description="node version")
+
+    @field_validator('v', mode='before')
+    @classmethod
+    def convert_v_to_int(cls, v: str | int | None) -> int:
+        if isinstance(v, str):
+            return int(v)
+        elif v is None:
+            return 0
+        return v
 
     def get_variable_info(self, variable_key: str) -> NodeParams | None:
         for group_info in self.group_params:
             for one in group_info.params:
                 if one.key == variable_key:
                     return one
-
+        return None
diff --git a/src/backend/bisheng/workflow/graph/workflow.py b/src/backend/bisheng/workflow/graph/workflow.py
index f782329bd..6a4ed2823 100644
--- a/src/backend/bisheng/workflow/graph/workflow.py
+++ b/src/backend/bisheng/workflow/graph/workflow.py
@@ -53,7 +53,6 @@ class Workflow:
         """
         # 执行workflow
         if input_data is not None:
-            self.save_user_input_history(input_data)
             self.graph_engine.continue_run(input_data)
         else:
             # 首次运行时间
diff --git a/src/backend/bisheng/workflow/nodes/base.py b/src/backend/bisheng/workflow/nodes/base.py
index 3be975636..dae37cfc9 100644
--- a/src/backend/bisheng/workflow/nodes/base.py
+++ b/src/backend/bisheng/workflow/nodes/base.py
@@ -9,6 +9,7 @@ from bisheng.workflow.callback.event import NodeEndData, NodeStartData
 from bisheng.workflow.common.node import BaseNodeData, NodeType
 from bisheng.workflow.edges.edges import EdgeBase
 from bisheng.workflow.graph.graph_state import GraphState
+from bisheng.workflow.nodes.prompt_template import PromptTemplateParser
 
 
 class BaseNode(ABC):
@@ -126,6 +127,23 @@ class BaseNode(ABC):
                 next_nodes.append(one.target)
         return next_nodes
 
+    def parse_msg_with_variables(self, msg: str) -> (str, list[str]):
+        """
+        params:
+            msg: user input msg with node variables
+        return:
+            0: new msg after replaced variable
+            1: list of variables node_id.xxxx
+        """
+        msg_template = PromptTemplateParser(template=msg)
+        variables = msg_template.extract()
+        if len(variables) > 0:
+            var_map = {}
+            for one in variables:
+                var_map[one] = self.get_other_node_variable(one)
+            msg = msg_template.format(var_map)
+        return msg, variables
+
     def run(self, state: dict) -> Any:
         """
         Run node entry
diff --git a/src/backend/bisheng/workflow/nodes/input/input.py b/src/backend/bisheng/workflow/nodes/input/input.py
index 487803d1e..95665ebf9 100644
--- a/src/backend/bisheng/workflow/nodes/input/input.py
+++ b/src/backend/bisheng/workflow/nodes/input/input.py
@@ -3,38 +3,53 @@ import shutil
 import tempfile
 from typing import Any
 
+from loguru import logger
+
 from bisheng.api.services.knowledge_imp import decide_vectorstores, read_chunk_text
 from bisheng.api.services.llm import LLMService
 from bisheng.api.utils import md5_hash
 from bisheng.cache.utils import file_download
 from bisheng.chat.types import IgnoreException
 from bisheng.workflow.nodes.base import BaseNode
-from loguru import logger
 
 
 class InputNode(BaseNode):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-
+        # 节点当前版本
+        self._current_v = 2
         # 记录是对话还是表单
         self._tab = self.node_data.tab['value']
 
         # 记录这个变量是什么类型的
         self._node_params_map = {}
         new_node_params = {}
+        # 对话框里输入文件的最大长度，超过这个长度会被截断
+        self._dialog_files_length = int(self.node_params.get('dialog_files_content_size', 15000))
+        # save image file path
+        self._dialog_images_files = []
+
         if self.is_dialog_input():
             new_node_params['user_input'] = self.node_params['user_input']
+            new_node_params['dialog_files_content'] = self.node_params.get('dialog_files_content', [])
         else:
             for value_info in self.node_params['form_input']:
                 new_node_params[value_info['key']] = value_info['value']
                 self._node_params_map[value_info['key']] = value_info
 
         self.node_params = new_node_params
-        self._file_ids = []
+        self._image_ext = ['png', 'jgp', 'jpeg', 'bmp']
+
+        self._embedding = None
+        self._vector_client = None
+        self._es_client = None
 
     def is_dialog_input(self):
         """ 是否是对话形式的输入 """
+        if self.node_data.v < self._current_v:
+            raise IgnoreException(f'{self.name} -- workflow node is update')
+
         if self._tab == 'dialog_input':
             return True
         elif self._tab == 'form_input':
@@ -44,10 +59,22 @@ class InputNode(BaseNode):
     def get_input_schema(self) -> Any:
         if self.is_dialog_input():
             return self.node_data.get_variable_info('user_input')
-        return self.node_data.get_variable_info('form_input')
+        form_input_info = self.node_data.get_variable_info('form_input')
+        for one in form_input_info['value']:
+            one['value'], _ = self.parse_msg_with_variables(one['value'])
+        return form_input_info
 
     def _run(self, unique_id: str):
         if self.is_dialog_input():
+            # 对话框形式的输入
+            dislog_files_content, self._dialog_images_files = self.parse_dialog_files()
+            res = {
+                'user_input': self.node_params['user_input'],
+                'dialog_files_content': self.parse_dialog_files(),
+                'dialog_image_files': self._dialog_images_files
+            }
+            self.graph_state.save_context(content=f'{res["dialog_files_content"]}\n{res["user_input"]}',
+                                          msg_sender='human')
             return {'user_input': self.node_params['user_input']}
 
         ret = {}
@@ -56,7 +83,7 @@ class InputNode(BaseNode):
             ret[key] = value
             key_info = self._node_params_map[key]
             if key_info['type'] == 'file':
-                new_params = self.parse_upload_file(key,key_info, value)
+                new_params = self.parse_upload_file(key, key_info, value)
                 if key_info['multiple']:
                     new_params = {key_info['key']: new_params[key_info['key']]}
                 ret.update(new_params)
@@ -65,12 +92,82 @@ class InputNode(BaseNode):
 
     def parse_log(self, unique_id: str, result: dict) -> Any:
         ret = []
-        for k,v in result.items():
+        for k, v in result.items():
             if self._node_params_map.get(k) and self._node_params_map[k]['type'] == 'file':
                 continue
             ret.append({"key": f'{self.id}.{k}', "value": v, "type": "variable"})
         return [ret]
 
+    def parse_dialog_files(self) -> (str, list[str]):
+        """ 获取对话框里上传的文件内容 """
+        file_length = 0
+        dialog_files_content = ""
+        image_files_path = []
+        if not self.node_params.get('dialog_files_content'):
+            return dialog_files_content
+        for file_id in self.node_params['dialog_files_content']:
+            file_name, file_path, chunks, metadatas = self.get_upload_file_path_content(file_id)
+            file_ext = file_name.split('.')[-1].lower()
+            if file_ext in self._image_ext:
+                image_files_path.append(file_path)
+
+            if file_length >= self._dialog_files_length:
+                continue
+            file_content = "\n".join(chunks)
+            file_content = file_content[:self._dialog_files_length - file_length]
+            file_length += len(file_content)
+
+            dialog_files_content += f"[file name]: {file_name}\n[file content begin]\n{file_content}\n[file content end]\n"
+        return dialog_files_content, image_files_path
+
+    def get_upload_file_path_content(self, file_url: str) -> (str, str, list, list):
+        """
+        params:
+            file_url: upload to minio share url
+        return:
+            0: file name
+            1: file path in system
+            2: chunks list
+            3: metadata list
+        """
+        # 1、获取默认的embedding模型
+        if self._embedding is None:
+            embedding = LLMService.get_knowledge_default_embedding()
+            if not embedding:
+                raise Exception('没有配置默认的embedding模型')
+            self._embedding = embedding
+
+        if self._vector_client is None:
+            # 2、初始化milvus和es实例
+            milvus_collection_name = self.get_milvus_collection_name(getattr(self._embedding, 'model_id'))
+            self._vector_client = decide_vectorstores(milvus_collection_name, 'Milvus', self._embedding)
+            self._es_client = decide_vectorstores(self.tmp_collection_name, 'ElasticKeywordsSearch',
+                                                  self._embedding)
+
+        file_id = md5_hash(f'{file_url}')
+        filepath, file_name = file_download(file_url)
+
+        # save original file path, because uns will convert file to pdf
+        original_file_path = os.path.join(tempfile.gettempdir(), f'{file_id}.{file_name.split(".")[-1]}')
+        shutil.copyfile(filepath, original_file_path)
+        texts = []
+        metadatas = []
+        try:
+            texts, metadatas, _, _ = read_chunk_text(filepath, file_name,
+                                                     ['\n\n', '\n'],
+                                                     ['after', 'after'], 1000, 500)
+            for metadata in metadatas:
+                metadata.update({
+                    'file_id': file_id,
+                    'knowledge_id': self.workflow_id,
+                    'extra': '',
+                    'bbox': '',  # 临时文件不能溯源，因为没有持久化存储源文件
+                })
+        except Exception:
+            logger.exception('parse input node file error')
+
+        return file_name, original_file_path, texts, metadatas
+
     def parse_upload_file(self, key: str, key_info: dict, value: str) -> dict | None:
         """
          将文件上传到milvus后
@@ -83,59 +180,54 @@ class InputNode(BaseNode):
             return {
                 key_info['key']: None,
                 key_info['file_content']: None,
-                key_info['file_path']: None
+                key_info['file_path']: None,
+                key_info['image_file']: None
             }
 
-
-        # 1、获取默认的embedding模型
-        embeddings = LLMService.get_knowledge_default_embedding()
-        if not embeddings:
-            raise Exception('没有配置默认的embedding模型')
-
-        # 2、初始化milvus和es实例
-        milvus_collection_name = self.get_milvus_collection_name(getattr(embeddings, 'model_id'))
-        vector_client = decide_vectorstores(milvus_collection_name, 'Milvus', embeddings)
-        es_client = decide_vectorstores(self.tmp_collection_name, 'ElasticKeywordsSearch',
-                                        embeddings)
-
-        # 3、解析文件
+        # 解析文件
         all_metadata = []
-        texts = []
+        all_file_content = ''
         original_file_path = ''
         file_id = md5_hash(f'{key}:{value[0]}')
-        self._file_ids.append(file_id)
+        image_files_path = []
+        file_content_max_size = key_info.get('file_content_size', 15000)
+        file_content_length = 0
         for one_file_url in value:
-            filepath, file_name = file_download(one_file_url)
-            if not original_file_path:
-                original_file_path = os.path.join(tempfile.gettempdir(), f'{file_id}.{file_name.split(".")[-1]}')
-                shutil.copyfile(filepath, original_file_path)
-            texts, metadatas, parse_type, partitions = read_chunk_text(filepath, file_name,
-                                                                       ['\n\n', '\n'],
-                                                                       ['after', 'after'], 1000, 500)
-            if len(texts) == 0:
-                raise ValueError('文件解析为空')
+            file_name, file_path, texts, metadatas = self.get_upload_file_path_content(one_file_url)
+            file_ext = file_name.split('.')[-1].lower()
+            if file_ext in self._image_ext:
+                image_files_path.append(file_path)
 
-            for metadata in metadatas:
-                metadata.update({
+            if file_content_length < file_content_max_size:
+                file_content = "\n".join(texts)
+                file_content = file_content[:self._dialog_files_length - file_content_length]
+                file_content_length += len(file_content)
+                all_file_content += f"[file name]: {file_name}\n[file content begin]\n{file_content}\n[file content end]\n"
+
+            # 同一个变量对应的文件，放在一个file_id里
+            for one in metadatas:
+                one.update({
                     'file_id': file_id,
                     'knowledge_id': self.workflow_id,
                     'extra': '',
                     'bbox': '',  # 临时文件不能溯源，因为没有持久化存储源文件
                 })
-            # 4、上传到milvus和es
-            logger.info(f'workflow_add_vectordb file={key} file_name={file_name}')
+
+            # 上传到milvus和es
+            logger.debug(f'workflow_add_vectordb file={key} file_name={file_name}')
             # 存入milvus
-            vector_client.add_texts(texts=texts, metadatas=metadatas)
+            self._vector_client.add_texts(texts=texts, metadatas=metadatas)
 
-            logger.info(f'workflow_add_es file={key} file_name={file_name}')
+            logger.debug(f'workflow_add_es file={key} file_name={file_name}')
             # 存入es
-            es_client.add_texts(texts=texts, metadatas=metadatas)
+            self._es_client.add_texts(texts=texts, metadatas=metadatas)
 
-            logger.info(f'workflow_record_file_metadata file={key} file_name={file_name}')
+            logger.debug(f'workflow_record_file_metadata file={key} file_name={file_name}')
             all_metadata.append(metadatas[0])
         # 记录文件metadata，其他节点根据metadata数据去检索对应的文件
         return {
             key_info['key']: all_metadata,
-            key_info['file_content']: "\n".join(texts),
-            key_info['file_path']: original_file_path
+            key_info['file_content']: all_file_content,
+            key_info['file_path']: original_file_path,
+            key_info['image_file']: image_files_path
         }
diff --git a/src/backend/bisheng/workflow/nodes/output/output.py b/src/backend/bisheng/workflow/nodes/output/output.py
index 4b6415f01..d4cc5c3ba 100644
--- a/src/backend/bisheng/workflow/nodes/output/output.py
+++ b/src/backend/bisheng/workflow/nodes/output/output.py
@@ -1,3 +1,4 @@
+import json
 from typing import Any
 
 from bisheng.utils.minio_client import MinioClient
@@ -35,6 +36,7 @@ class OutputNode(BaseNode):
 
     def handle_input(self, user_input: dict) -> Any:
         # 需要存入state，
+        self.graph_state.save_context(content=json.dumps(user_input, ensure_ascii=False), msg_sender='human')
         self._handled_output_result = user_input['output_result']
         self.graph_state.set_variable(self.id, 'output_result', user_input['output_result'])
 

From 89c1032d0723f2bd5dee5d9d72fd3c68a0e4f360 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Thu, 24 Apr 2025 17:11:24 +0800
Subject: [PATCH 057/186] feat: output node return message into global
 variables

---
 src/backend/bisheng/workflow/nodes/output/output.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/backend/bisheng/workflow/nodes/output/output.py b/src/backend/bisheng/workflow/nodes/output/output.py
index d4cc5c3ba..d48560433 100644
--- a/src/backend/bisheng/workflow/nodes/output/output.py
+++ b/src/backend/bisheng/workflow/nodes/output/output.py
@@ -22,8 +22,12 @@ class OutputNode(BaseNode):
         self._handled_output_result = self._output_result
 
         # user input msg
-        self._output_msg = self.node_params['output_msg']['msg']
-        self._output_files = self.node_params['output_msg']['files']
+        if 'output_msg' in self.node_params:
+            _original_output_msg = self.node_params['output_msg']
+        else:
+            _original_output_msg = self.node_params['message']
+        self._output_msg = _original_output_msg['msg']
+        self._output_files = _original_output_msg['files']
 
         # 替换变量后消息内容
         self._parsed_output_msg = ''
@@ -61,6 +65,7 @@ class OutputNode(BaseNode):
         self.parse_output_msg()
         self.send_output_msg(unique_id)
         res = {
+            'message': self._parsed_output_msg,
             'output_result': self._handled_output_result
         }
         return res

From b0f56b47140a9d94c9e418d761c0bd84d1e46eb9 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Thu, 24 Apr 2025 18:00:42 +0800
Subject: [PATCH 058/186] feat: bisheng models support max tokens

---
 .../bisheng/database/models/llm_server.py     |   4 +
 src/backend/bisheng/interface/custom_lists.py |   4 +-
 .../bisheng/interface/embeddings/custom.py    |   1 +
 src/backend/bisheng/interface/llms/custom.py  | 145 +++++++++++++++++-
 4 files changed, 148 insertions(+), 6 deletions(-)

diff --git a/src/backend/bisheng/database/models/llm_server.py b/src/backend/bisheng/database/models/llm_server.py
index 682a3002e..e07a239e5 100644
--- a/src/backend/bisheng/database/models/llm_server.py
+++ b/src/backend/bisheng/database/models/llm_server.py
@@ -25,6 +25,10 @@ class LLMServerType(Enum):
     DEEPSEEK = 'deepseek'
     SPARK = 'spark'  # 讯飞星火大模型
     BISHENG_RT = 'bisheng_rt'
+    TENCENT = 'tencent'  # 腾讯云
+    MOONSHOT = 'moonshot'  # 月之暗面的kimi
+    VOLCENGINE = 'volcengine'  # 火山引擎的大模型
+    SILICON = 'silicon'  # 硅基流动
 
 
 # 模型类型枚举
diff --git a/src/backend/bisheng/interface/custom_lists.py b/src/backend/bisheng/interface/custom_lists.py
index cc64bb904..0d1512557 100644
--- a/src/backend/bisheng/interface/custom_lists.py
+++ b/src/backend/bisheng/interface/custom_lists.py
@@ -12,7 +12,7 @@ from langchain import llms, memory, text_splitter
 from langchain_community.utilities import requests
 from langchain_anthropic import ChatAnthropic
 from langchain_community import agent_toolkits, document_loaders, embeddings
-from langchain_community.chat_models import ChatVertexAI, MiniMaxChat
+from langchain_community.chat_models import ChatVertexAI, MiniMaxChat, ChatTongyi, QianfanChatEndpoint
 from langchain_openai import AzureChatOpenAI, ChatOpenAI, OpenAIEmbeddings, AzureOpenAIEmbeddings, OpenAI
 from langchain_ollama.chat_models import ChatOllama
 
@@ -29,6 +29,8 @@ llm_type_to_cls_dict['ChatOpenAI'] = ChatOpenAI  # type: ignore
 llm_type_to_cls_dict['ChatVertexAI'] = ChatVertexAI  # type: ignore
 llm_type_to_cls_dict['MiniMaxChat'] = MiniMaxChat
 llm_type_to_cls_dict['ChatOllama'] = ChatOllama
+llm_type_to_cls_dict['ChatTongyi'] = ChatTongyi
+llm_type_to_cls_dict['QianfanChatEndpoint'] = QianfanChatEndpoint
 llm_type_to_cls_dict["OpenAI"] = OpenAI
 
 # llm contribute
diff --git a/src/backend/bisheng/interface/embeddings/custom.py b/src/backend/bisheng/interface/embeddings/custom.py
index 095c22c20..a837e4555 100644
--- a/src/backend/bisheng/interface/embeddings/custom.py
+++ b/src/backend/bisheng/interface/embeddings/custom.py
@@ -71,6 +71,7 @@ class BishengEmbedding(BaseModel, Embeddings):
         LLMServerType.QIAN_FAN.value: 'QianfanEmbeddingsEndpoint',
         LLMServerType.MINIMAX.value: 'OpenAIEmbeddings',
         LLMServerType.ZHIPU.value: 'OpenAIEmbeddings',
+        LLMServerType.TENCENT.value: 'OpenAIEmbeddings',
     }
 
     # bisheng强相关的业务参数
diff --git a/src/backend/bisheng/interface/llms/custom.py b/src/backend/bisheng/interface/llms/custom.py
index b9b1ab42c..0ee651d22 100644
--- a/src/backend/bisheng/interface/llms/custom.py
+++ b/src/backend/bisheng/interface/llms/custom.py
@@ -1,6 +1,7 @@
+import json
 from typing import List, Optional, Any, Sequence, Union, Dict, Type, Callable
 
-from langchain_core.messages import BaseMessage
+from langchain_core.messages import BaseMessage, ToolMessage
 from langchain_core.outputs import ChatResult
 from langchain_core.runnables import Runnable
 from langchain_core.tools import BaseTool
@@ -40,12 +41,16 @@ class BishengLLM(BaseChatModel):
         LLMServerType.OPENAI.value: 'ChatOpenAI',
         LLMServerType.AZURE_OPENAI.value: 'AzureChatOpenAI',
         LLMServerType.QWEN.value: 'ChatOpenAI',
-        LLMServerType.QIAN_FAN.value: 'ChatWenxin',
+        LLMServerType.QIAN_FAN.value: 'QianfanChatEndpoint',
         LLMServerType.ZHIPU.value: 'ChatOpenAI',
         LLMServerType.MINIMAX.value: 'ChatOpenAI',
         LLMServerType.ANTHROPIC.value: 'ChatAnthropic',
         LLMServerType.DEEPSEEK.value: 'ChatOpenAI',
         LLMServerType.SPARK.value: 'ChatOpenAI',
+        LLMServerType.TENCENT.value: 'ChatOpenAI',
+        LLMServerType.MOONSHOT.value: 'ChatOpenAI',
+        LLMServerType.VOLCENGINE.value: 'ChatOpenAI',
+        LLMServerType.SILICON.value: 'ChatOpenAI',
     }
 
     # bisheng强相关的业务参数
@@ -97,8 +102,11 @@ class BishengLLM(BaseChatModel):
         params = {}
         if server_info.config:
             params.update(server_info.config)
+        enable_web_search = False
         if model_info.config:
-            params.update(model_info.config)
+            enable_web_search = model_info.config.get('enable_web_search', False)
+            if model_info.config.get('max_tokens'):
+                params['max_tokens'] = model_info.config.get('max_tokens')
 
         params.update({
             'model_name': model_info.model_name,
@@ -109,21 +117,78 @@ class BishengLLM(BaseChatModel):
         })
         if server_info.type == LLMServerType.OLLAMA.value:
             params['model'] = params.pop('model_name')
+            if params.get('max_tokens'):
+                params['num_ctx'] = params.pop('max_tokens')
         elif server_info.type == LLMServerType.AZURE_OPENAI.value:
             params['azure_deployment'] = params.pop('model_name')
         elif server_info.type == LLMServerType.QIAN_FAN.value:
             params['model'] = params.pop('model_name')
+            params['qianfan_ak'] = params.pop('wenxin_api_key')
+            params['qianfan_sk'] = params.pop('wenxin_secret_key')
+            if params.get('max_tokens'):
+                params['model_kwargs'] = {"max_output_tokens": params.pop('max_tokens')}
         elif server_info.type == LLMServerType.SPARK.value:
             params['openai_api_key'] = f'{params.pop("api_key")}:{params.pop("api_secret")}'
         elif server_info.type in [LLMServerType.XINFERENCE.value, LLMServerType.LLAMACPP.value,
                                   LLMServerType.VLLM.value]:
             params['openai_api_key'] = params.pop('openai_api_key', None) or "EMPTY"
+        elif server_info.type == LLMServerType.QWEN.value:
+            params['dashscope_api_key'] = params.pop('openai_api_key')
+            params.pop('openai_api_base', None)
+            params['model_kwargs'] = {'enable_search': enable_web_search}
+            if params.get('max_tokens'):
+                params['model_kwargs']['max_tokens'] = params.pop('max_tokens')
+        elif server_info.type == LLMServerType.TENCENT.value:
+            params['extra_body'] = {'enable_enhancement': enable_web_search}
         return params
 
     @property
     def _llm_type(self):
         return self.llm._llm_type
 
+    def parse_kwargs(self, kwargs: Dict[str, Any]) -> Dict[str, Any]:
+        if self.server_info.type == LLMServerType.MINIMAX.value:
+            if self.get_model_info_config().get('enable_web_search'):
+                if 'tools' not in kwargs:
+                    kwargs.update({
+                        'tools': [{'type': 'web_search'}],
+                    })
+                else:
+                    tool_exists = False
+                    for tool in kwargs['tools']:
+                        if tool.get('type') == 'web_search':
+                            tool_exists = True
+                            break
+                    if not tool_exists:
+                        kwargs['tools'].append({
+                            'type': 'web_search',
+                        })
+        elif self.server_info.type == LLMServerType.MOONSHOT.value:
+            if self.get_model_info_config().get('enable_web_search'):
+                if 'tools' not in kwargs:
+                    kwargs.update({
+                        'tools': [{
+                            "type": "builtin_function",
+                            "function": {
+                                "name": "$web_search",
+                            },
+                        }],
+                    })
+                else:
+                    tool_exists = False
+                    for tool in kwargs['tools']:
+                        if tool.get('type') == 'builtin_function':
+                            tool_exists = True
+                            break
+                    if not tool_exists:
+                        kwargs['tools'].append({
+                            "type": "builtin_function",
+                            "function": {
+                                "name": "$web_search",
+                            },
+                        })
+        return kwargs
+
     @wrapper_bisheng_model_limit_check
     def _generate(
             self,
@@ -134,13 +199,48 @@ class BishengLLM(BaseChatModel):
             **kwargs: Any,
     ) -> ChatResult:
         try:
-            ret = self.llm._generate(messages, stop, run_manager, **kwargs)
+            kwargs = self.parse_kwargs(kwargs)
+            if self.server_info.type == LLMServerType.MOONSHOT.value:
+                ret = self.moonshot_generate(messages, stop, run_manager, **kwargs)
+            else:
+                ret = self.llm._generate(messages, stop, run_manager, **kwargs)
             self._update_model_status(0)
         except Exception as e:
             self._update_model_status(1, str(e))
             raise e
         return ret
 
+    def moonshot_generate(
+            self,
+            messages: List[BaseMessage],
+            stop: Optional[List[str]] = None,
+            run_manager: Optional[AsyncCallbackManagerForLLMRun] = None,
+            **kwargs: Any,
+    ) -> ChatResult:
+        try:
+            result = None
+            finish_reason = None
+            while finish_reason is None or finish_reason == 'tool_calls':
+                result = self.llm._generate(messages, stop, run_manager, **kwargs)
+                result_message = result.generations[0].message
+                finish_reason = result.generations[0].generation_info.get('finish_reason')
+                for tool_call in result_message.tool_calls:
+                    tool_call_name = tool_call['name']
+                    if tool_call_name == "$web_search":
+                        messages.append(result_message)
+                        messages.append(ToolMessage(
+                            tool_call_id=tool_call['id'],
+                            name=tool_call_name,
+                            content=json.dumps(tool_call['args'], ensure_ascii=False),
+                        ))
+                    else:
+                        break
+            self._update_model_status(0)
+        except Exception as e:
+            self._update_model_status(1, str(e))
+            raise e
+        return result
+
     @wrapper_bisheng_model_limit_check_async
     async def _agenerate(
             self,
@@ -151,7 +251,11 @@ class BishengLLM(BaseChatModel):
             **kwargs: Any,
     ) -> ChatResult:
         try:
-            ret = await self.llm._agenerate(messages, stop, run_manager, **kwargs)
+            kwargs = self.parse_kwargs(kwargs)
+            if self.server_info.type == LLMServerType.MOONSHOT.value:
+                ret = await self.moonshot_agenerate(messages, stop, run_manager, **kwargs)
+            else:
+                ret = await self.llm._agenerate(messages, stop, run_manager, **kwargs)
             self._update_model_status(0)
         except Exception as e:
             self._update_model_status(1, str(e))
@@ -159,6 +263,37 @@ class BishengLLM(BaseChatModel):
             raise e
         return ret
 
+    async def moonshot_agenerate(
+            self,
+            messages: List[BaseMessage],
+            stop: Optional[List[str]] = None,
+            run_manager: Optional[AsyncCallbackManagerForLLMRun] = None,
+            **kwargs: Any,
+    ) -> ChatResult:
+        try:
+            result = None
+            finish_reason = None
+            while finish_reason is None or finish_reason == 'tool_calls':
+                result = await self.llm._agenerate(messages, stop, run_manager, **kwargs)
+                result_message = result.generations[0].message
+                finish_reason = result.generations[0].generation_info.get('finish_reason')
+                for tool_call in result_message.tool_calls:
+                    tool_call_name = tool_call['name']
+                    if tool_call_name == "$web_search":
+                        messages.append(result_message)
+                        messages.append(ToolMessage(
+                            tool_call_id=tool_call['id'],
+                            name=tool_call_name,
+                            content=json.dumps(tool_call['args'], ensure_ascii=False),
+                        ))
+                    else:
+                        break
+            self._update_model_status(0)
+        except Exception as e:
+            self._update_model_status(1, str(e))
+            raise e
+        return result
+
     def _update_model_status(self, status: int, remark: str = ''):
         """更新模型状态"""
         # todo 接入到异步任务模块

From 2f1ade02d9e2e3035dd8fd00dbf4c43902268313 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Thu, 24 Apr 2025 19:08:10 +0800
Subject: [PATCH 059/186] feat: test model status after add model

---
 src/backend/bisheng/api/services/llm.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/backend/bisheng/api/services/llm.py b/src/backend/bisheng/api/services/llm.py
index afcf80b4c..bd8d49f6e 100644
--- a/src/backend/bisheng/api/services/llm.py
+++ b/src/backend/bisheng/api/services/llm.py
@@ -115,6 +115,12 @@ class LLMService:
 
         handle_types = []
         for one in server.models:
+            # test model status
+            try:
+                bisheng_model = cls.get_bisheng_llm(model_id=one.id, ignore_online=True)
+                bisheng_model.invoke('hello')
+            except Exception as e:
+                logger.exception('test model status')
             if one.model_type in handle_types:
                 continue
             handle_types.append(one.model_type)

From 9c331440038126b6c1f028abdc3fd58ad0dd335e Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Thu, 24 Apr 2025 19:24:38 +0800
Subject: [PATCH 060/186] feat: generate knowledge file title remove <think>
 tag

---
 src/backend/bisheng/api/services/knowledge_imp.py | 2 ++
 src/backend/bisheng/chat/utils.py                 | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/backend/bisheng/api/services/knowledge_imp.py b/src/backend/bisheng/api/services/knowledge_imp.py
index 31a2bacb1..da40da3ca 100644
--- a/src/backend/bisheng/api/services/knowledge_imp.py
+++ b/src/backend/bisheng/api/services/knowledge_imp.py
@@ -483,6 +483,8 @@ def read_chunk_text(input_file, file_name, separator: List[str], separator_rule:
         for one in documents:
             # 配置了相关llm的话，就对文档做总结
             title = extract_title(llm, one.page_content)
+            # remove <think>.*</think> tag content
+            title = re.sub('<think>.*</think>', '', title)
             one.metadata['title'] = title
         logger.info('file_extract_title=success timecost={}', time.time() - t)
 
diff --git a/src/backend/bisheng/chat/utils.py b/src/backend/bisheng/chat/utils.py
index cfdb0b2a3..468a54ba6 100644
--- a/src/backend/bisheng/chat/utils.py
+++ b/src/backend/bisheng/chat/utils.py
@@ -1,4 +1,6 @@
 import json
+import re
+import ast
 from enum import Enum
 from typing import Dict, List
 from urllib.parse import unquote, urlparse
@@ -81,7 +83,8 @@ def extract_answer_keys(answer, llm):
         llm_chain = LLMChain(llm=llm, prompt=PromptTemplate.from_template(prompt_template))
     try:
         keywords_str = llm_chain.run(answer)
-        keywords = eval(keywords_str[9:])
+        keywords_str = re.sub('<think>.*</think>', '', keywords_str)
+        keywords = ast.literal_eval(keywords_str[9:])
     except Exception:
         import jieba.analyse
         logger.warning(f'llm {llm} extract_not_support, change to jieba')

From f4955b9ed88634405752adcda70454fe75d22abc Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Fri, 25 Apr 2025 17:15:10 +0800
Subject: [PATCH 061/186] feat: change input node input schema

---
 src/backend/bisheng/worker/workflow/redis_callback.py | 10 ++++++++--
 src/backend/bisheng/workflow/common/node.py           |  3 ++-
 src/backend/bisheng/workflow/nodes/input/input.py     |  5 +++++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/backend/bisheng/worker/workflow/redis_callback.py b/src/backend/bisheng/worker/workflow/redis_callback.py
index 11e505616..3ac61ed7f 100644
--- a/src/backend/bisheng/worker/workflow/redis_callback.py
+++ b/src/backend/bisheng/worker/workflow/redis_callback.py
@@ -1,3 +1,4 @@
+import os
 import asyncio
 import json
 import time
@@ -200,8 +201,12 @@ class RedisCallback(BaseCallback):
                 for key_info in old_message['input_schema']['value']:
                     user_input_message += f"{key_info['value']}:{user_input.get(key_info['key'], '')}\n"
             else:
-                # 说明对话框输入
+                # 说明对话框输入, 需要加下上传的文件信息, 和输入节点的数据结构有关
                 user_input_message = user_input[old_message['input_schema']['key']]
+                dialog_files_content = user_input.get('dialog_files_content', [])
+                for one in dialog_files_content:
+                    user_input_message += f"\n{os.path.basename(one).split('?')[0]}"
+
             self.save_chat_message(ChatResponse(
                 message=user_input_message,
                 category='question',
@@ -259,7 +264,8 @@ class RedisCallback(BaseCallback):
 
             is_bot=chat_response.is_bot,
             source=chat_response.source,
-            message=json.dumps(chat_response.message, ensure_ascii=False),
+            message=chat_response.message if isinstance(chat_response.message, str) else json.dumps(
+                chat_response.message, ensure_ascii=False),
             extra=chat_response.extra,
             category=chat_response.category,
             files=json.dumps(chat_response.files, ensure_ascii=False)
diff --git a/src/backend/bisheng/workflow/common/node.py b/src/backend/bisheng/workflow/common/node.py
index 26c299faa..226697e42 100644
--- a/src/backend/bisheng/workflow/common/node.py
+++ b/src/backend/bisheng/workflow/common/node.py
@@ -1,3 +1,4 @@
+import copy
 from enum import Enum
 from typing import Optional, Any, List
 
@@ -64,5 +65,5 @@ class BaseNodeData(BaseModel):
         for group_info in self.group_params:
             for one in group_info.params:
                 if one.key == variable_key:
-                    return one
+                    return copy.deepcopy(one)
         return None
diff --git a/src/backend/bisheng/workflow/nodes/input/input.py b/src/backend/bisheng/workflow/nodes/input/input.py
index 95665ebf9..8d8608736 100644
--- a/src/backend/bisheng/workflow/nodes/input/input.py
+++ b/src/backend/bisheng/workflow/nodes/input/input.py
@@ -58,6 +58,11 @@ class InputNode(BaseNode):
 
     def get_input_schema(self) -> Any:
         if self.is_dialog_input():
+            user_input_info = self.node_data.get_variable_info('user_input')
+            user_input_info.value = [
+                self.node_data.get_variable_info('dialog_files_content'),
+                self.node_data.get_variable_info('dialog_file_accept')
+            ]
             return self.node_data.get_variable_info('user_input')
         form_input_info = self.node_data.get_variable_info('form_input')
         for one in form_input_info['value']:

From c74f22864250b9c546c2874f5f72d52ca3d7dfb9 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Fri, 25 Apr 2025 17:20:16 +0800
Subject: [PATCH 062/186] feat: qa nan error

---
 src/backend/bisheng/api/v1/knowledge.py | 80 ++++++++++++-------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/src/backend/bisheng/api/v1/knowledge.py b/src/backend/bisheng/api/v1/knowledge.py
index 0c164669b..7c11f5fa5 100644
--- a/src/backend/bisheng/api/v1/knowledge.py
+++ b/src/backend/bisheng/api/v1/knowledge.py
@@ -6,6 +6,9 @@ from typing import List, Optional
 
 import numpy as np
 import pandas as pd
+from fastapi import (APIRouter, BackgroundTasks, Body, Depends, File, HTTPException, Query, Request,
+                     UploadFile)
+from fastapi.encoders import jsonable_encoder
 
 from bisheng.api.errcode.base import UnAuthorizedError
 from bisheng.api.errcode.knowledge import KnowledgeCPError, KnowledgeQAError
@@ -13,20 +16,15 @@ from bisheng.api.services import knowledge_imp
 from bisheng.api.services.knowledge import KnowledgeService
 from bisheng.api.services.knowledge_imp import add_qa
 from bisheng.api.services.user_service import UserPayload, get_login_user
-from bisheng.api.v1.schemas import (KnowledgeFileProcess, PreviewFileChunk, UnifiedResponseModel,
-                                    UpdatePreviewFileChunk, UploadFileResponse, resp_200, resp_500)
+from bisheng.api.v1.schemas import (KnowledgeFileProcess, PreviewFileChunk, UpdatePreviewFileChunk, UploadFileResponse,
+                                    resp_200, resp_500)
 from bisheng.cache.utils import save_uploaded_file
-from bisheng.database.base import session_getter
-from bisheng.database.models.knowledge import (Knowledge, KnowledgeCreate, KnowledgeDao,
-                                               KnowledgeRead, KnowledgeTypeEnum, KnowledgeUpdate)
+from bisheng.database.models.knowledge import (KnowledgeCreate, KnowledgeDao, KnowledgeTypeEnum, KnowledgeUpdate)
 from bisheng.database.models.knowledge_file import (KnowledgeFileDao, KnowledgeFileStatus,
                                                     QAKnoweldgeDao, QAKnowledgeUpsert)
 from bisheng.database.models.role_access import AccessType
 from bisheng.database.models.user import UserDao
 from bisheng.utils.logger import logger
-from fastapi import (APIRouter, BackgroundTasks, Body, Depends, File, HTTPException, Query, Request,
-                     UploadFile)
-from fastapi.encoders import jsonable_encoder
 
 # build router
 router = APIRouter(prefix='/knowledge', tags=['Knowledge'])
@@ -128,7 +126,7 @@ async def copy_knowledge(*,
     )
     if knowledge.state != 1 or knowledge_count > 0:
         return KnowledgeCPError.return_resp()
-    knowledge = KnowledgeService.copy_knowledge(request,background_tasks, login_user, knowledge)
+    knowledge = KnowledgeService.copy_knowledge(request, background_tasks, login_user, knowledge)
     return resp_200(knowledge)
 
 
@@ -147,6 +145,7 @@ def get_knowledge(*,
                                                 page_num, page_size)
     return resp_200(data={'data': res, 'total': total})
 
+
 @router.get('/info', status_code=200)
 def get_knowledge_info(*,
                        request: Request,
@@ -156,6 +155,7 @@ def get_knowledge_info(*,
     res = KnowledgeService.get_knowledge_info(request, login_user, knowledge_id)
     return resp_200(data=res)
 
+
 @router.put('/', status_code=200)
 async def update_knowledge(*,
                            request: Request,
@@ -225,12 +225,12 @@ def get_QA_list(*,
 
     return resp_200({
         'data':
-        data,
+            data,
         'total':
-        total_count,
+            total_count,
         'writeable':
-        login_user.access_check(db_knowledge.user_id, str(qa_knowledge_id),
-                                AccessType.KNOWLEDGE_WRITE)
+            login_user.access_check(db_knowledge.user_id, str(qa_knowledge_id),
+                                    AccessType.KNOWLEDGE_WRITE)
     })
 
 
@@ -406,7 +406,7 @@ def qa_auto_question(
 
 @router.get('/qa/export/template', status_code=200)
 def get_export_url():
-    data = [{"问题":"","答案":"","相似问题1":"","相似问题2":""}]
+    data = [{"问题": "", "答案": "", "相似问题1": "", "相似问题2": ""}]
     df = pd.DataFrame(data)
     bio = BytesIO()
     with pd.ExcelWriter(bio, engine="openpyxl") as writer:
@@ -425,12 +425,12 @@ def get_export_url(*,
                    status: Optional[int] = None,
                    max_lines: Optional[int] = 10000,
                    login_user: UserPayload = Depends(get_login_user)):
-
     # 查询当前知识库，是否有写入权限
     db_knowledge = KnowledgeService.judge_qa_knowledge_write(login_user, qa_knowledge_id)
 
     if keyword:
         question = keyword
+
     def get_qa_source(source):
         '0: 未知 1: 手动；2: 审计, 3: api'
         if int(source) == 1:
@@ -456,23 +456,23 @@ def get_export_url(*,
     file_index = 1
     while True:
         qa_list, total_count = knowledge_imp.list_qa_by_knowledge_id(qa_knowledge_id, page_size,
-                                                                 page_num, question, answer,
-                                                                 status)
+                                                                     page_num, question, answer,
+                                                                     status)
 
         data = [jsonable_encoder(qa) for qa in qa_list]
         qa_dict_list = []
-        all_title = ["问题","答案"]
+        all_title = ["问题", "答案"]
         for qa in data:
             qa_dict_list.append({
-                "问题":qa['questions'][0],
-                "答案":json.loads(qa['answers'])[0],
+                "问题": qa['questions'][0],
+                "答案": json.loads(qa['answers'])[0],
                 # "类型":get_qa_source(qa['source']),
                 # "创建时间":qa['create_time'],
                 # "更新时间":qa['update_time'],
                 # "创建者":user_map.get(qa['user_id'], qa['user_id']),
                 # "状态":get_status(qa['status']),
             })
-            for index,question in enumerate(qa['questions']):
+            for index, question in enumerate(qa['questions']):
                 if index == 0:
                     continue
                 key = f"相似问题{index}"
@@ -486,19 +486,18 @@ def get_export_url(*,
         df = df[all_title]
         bio = BytesIO()
         with pd.ExcelWriter(bio, engine="openpyxl") as writer:
-            df.to_excel(writer, sheet_name="Sheet1",index=False)
+            df.to_excel(writer, sheet_name="Sheet1", index=False)
         file_name = f"{file_pr}_{file_index}.xlsx"
         file_index = file_index + 1
-        file_path = save_uploaded_file(bio,'bisheng', file_name)
+        file_path = save_uploaded_file(bio, 'bisheng', file_name)
         file_list.append(file_path)
         total_num += len(qa_list)
-        if len(qa_list) < page_size or total_num>=total_count:
+        if len(qa_list) < page_size or total_num >= total_count:
             break
 
     return resp_200({"file_list": file_list})
 
 
-
 @router.post('/qa/preview/{qa_knowledge_id}', status_code=200)
 def post_import_file(*,
                      qa_knowledge_id: int,
@@ -516,18 +515,18 @@ def post_import_file(*,
         d = QAKnowledgeUpsert(
             user_id=login_user.user_id,
             knowledge_id=qa_knowledge_id,
-            answers=[str(dd['答案'])],
-            questions=[str(dd['问题'])],
+            answers=[str(dd['答案']) if dd['答案'] != np.nan else ''],
+            questions=[str(dd['问题']) if dd['问题'] != np.nan else ''],
             source=4,
             status=1,
             create_time=datetime.now(),
             update_time=datetime.now())
         for key, value in dd.items():
             if key.startswith('相似问题'):
-                d.questions.append(str(value))
+                d.questions.append(str(value) if value != np.nan else '')
         insert_data.append(d)
     try:
-        if size>0 and offset>=0:
+        if size > 0 and offset >= 0:
             if offset >= len(insert_data):
                 insert_data = []
             else:
@@ -536,6 +535,7 @@ def post_import_file(*,
         raise HTTPException(status_code=500, detail=e)
     return resp_200({"result": insert_data})
 
+
 @router.post('/qa/import/{qa_knowledge_id}', status_code=200)
 def post_import_file(*,
                      qa_knowledge_id: int,
@@ -557,19 +557,20 @@ def post_import_file(*,
         insert_data = []
         have_data = []
         all_questions = set()
-        for index,dd in enumerate(data):
+        for index, dd in enumerate(data):
             tmp_questions = set()
             QACreate = QAKnowledgeUpsert(
-            user_id = login_user.user_id,
-            knowledge_id = qa_knowledge_id,
-            answers = [dd['答案']],
-            questions = [dd['问题']],
-            source = 4,
-            status = 1)
+                user_id=login_user.user_id,
+                knowledge_id=qa_knowledge_id,
+                answers=[str(dd['答案']) if dd['答案'] != np.nan else ''],
+                questions=[str(dd['问题']) if dd['问题'] != np.nan else ''],
+                source=4,
+                status=1)
             tmp_questions.add(QACreate.questions[0])
-            for key,value in dd.items():
+            for key, value in dd.items():
                 if key.startswith('相似问题'):
-                    if value is not np.nan and value and value is not None and str(value) != 'nan' and str(value) != 'null':
+                    if value is not np.nan and value and value is not None and str(value) != 'nan' and str(
+                            value) != 'null':
                         if value not in tmp_questions:
                             QACreate.questions.append(value)
                             tmp_questions.add(value)
@@ -584,5 +585,4 @@ def post_import_file(*,
         insert_result.append(result)
         error_result.append(have_data)
 
-    return resp_200({"result": insert_result,"errors": error_result})
-
+    return resp_200({"result": insert_result, "errors": error_result})

From add87e1d28b4429ba6ec3023f420b06553e1b42c Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Fri, 25 Apr 2025 17:33:12 +0800
Subject: [PATCH 063/186] feat: qa list keywords support answer

---
 src/backend/bisheng/api/v1/knowledge.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/backend/bisheng/api/v1/knowledge.py b/src/backend/bisheng/api/v1/knowledge.py
index 7c11f5fa5..2e8cfa6bb 100644
--- a/src/backend/bisheng/api/v1/knowledge.py
+++ b/src/backend/bisheng/api/v1/knowledge.py
@@ -212,6 +212,7 @@ def get_QA_list(*,
 
     if keyword:
         question = keyword
+        answer = keyword
     qa_list, total_count = knowledge_imp.list_qa_by_knowledge_id(qa_knowledge_id, page_size,
                                                                  page_num, question, answer,
                                                                  status)

From faf3ae09fecdfb33620b90cccec4d9a815e2204d Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Fri, 25 Apr 2025 18:52:27 +0800
Subject: [PATCH 064/186] feat: llm and agent support vision model

---
 src/backend/bisheng/interface/llms/custom.py  | 22 +++++++++++++----
 .../bisheng/workflow/nodes/agent/agent.py     | 24 ++++++++++++++-----
 src/backend/bisheng/workflow/nodes/base.py    |  7 ++++++
 src/backend/bisheng/workflow/nodes/llm/llm.py | 19 ++++++++++++++-
 4 files changed, 60 insertions(+), 12 deletions(-)

diff --git a/src/backend/bisheng/interface/llms/custom.py b/src/backend/bisheng/interface/llms/custom.py
index 0ee651d22..85d291add 100644
--- a/src/backend/bisheng/interface/llms/custom.py
+++ b/src/backend/bisheng/interface/llms/custom.py
@@ -1,7 +1,7 @@
 import json
 from typing import List, Optional, Any, Sequence, Union, Dict, Type, Callable
 
-from langchain_core.messages import BaseMessage, ToolMessage
+from langchain_core.messages import BaseMessage, ToolMessage, HumanMessage
 from langchain_core.outputs import ChatResult
 from langchain_core.runnables import Runnable
 from langchain_core.tools import BaseTool
@@ -146,7 +146,7 @@ class BishengLLM(BaseChatModel):
     def _llm_type(self):
         return self.llm._llm_type
 
-    def parse_kwargs(self, kwargs: Dict[str, Any]) -> Dict[str, Any]:
+    def parse_kwargs(self, messages: List[BaseMessage],  kwargs: Dict[str, Any]) -> (List[BaseMessage], Dict[str, Any]):
         if self.server_info.type == LLMServerType.MINIMAX.value:
             if self.get_model_info_config().get('enable_web_search'):
                 if 'tools' not in kwargs:
@@ -187,7 +187,19 @@ class BishengLLM(BaseChatModel):
                                 "name": "$web_search",
                             },
                         })
-        return kwargs
+        elif self.server_info.type == LLMServerType.QWEN.value:
+            # 对多模态的支持
+            user_message = messages[-1]
+            if isinstance(user_message, HumanMessage):
+                if isinstance(user_message.content, list):
+                    for one in user_message.content:
+                        if one.get('type') == 'image' and one.get('data'):
+                            one['type'] = 'image'
+                            one['image'] = f"data:{one.get('mime_type')};{one.get('source_type')},{one.get('data')}"
+                        elif one.get('type') == 'image_url' and one.get('image_url'):
+                            one['type'] = 'image'
+                            one['image'] = one.pop('image_url', {}).get('url')
+        return messages, kwargs
 
     @wrapper_bisheng_model_limit_check
     def _generate(
@@ -199,7 +211,7 @@ class BishengLLM(BaseChatModel):
             **kwargs: Any,
     ) -> ChatResult:
         try:
-            kwargs = self.parse_kwargs(kwargs)
+            messages, kwargs = self.parse_kwargs(messages, kwargs)
             if self.server_info.type == LLMServerType.MOONSHOT.value:
                 ret = self.moonshot_generate(messages, stop, run_manager, **kwargs)
             else:
@@ -251,7 +263,7 @@ class BishengLLM(BaseChatModel):
             **kwargs: Any,
     ) -> ChatResult:
         try:
-            kwargs = self.parse_kwargs(kwargs)
+            messages, kwargs = self.parse_kwargs(messages, kwargs)
             if self.server_info.type == LLMServerType.MOONSHOT.value:
                 ret = await self.moonshot_agenerate(messages, stop, run_manager, **kwargs)
             else:
diff --git a/src/backend/bisheng/workflow/nodes/agent/agent.py b/src/backend/bisheng/workflow/nodes/agent/agent.py
index 478a6a0cd..8704d30eb 100644
--- a/src/backend/bisheng/workflow/nodes/agent/agent.py
+++ b/src/backend/bisheng/workflow/nodes/agent/agent.py
@@ -38,6 +38,8 @@ class AgentNode(BaseNode):
         self._user_prompt = PromptTemplateParser(template=self.node_params['user_prompt'])
         self._user_variables = self._user_prompt.extract()
 
+        self._image_prompt = self.node_params.get('image_prompt', [])
+
         self._batch_variable_list = []
         self._system_prompt_list = []
         self._user_prompt_list = []
@@ -350,19 +352,29 @@ class AgentNode(BaseNode):
                                               tool_list=tool_invoke_list,
                                               cancel_llm_end=True)
         config = RunnableConfig(callbacks=[llm_callback])
+        human_message = HumanMessage(content=[{
+            'type': 'text',
+            'text': user
+        }])
+        for image_variable in self._image_prompt:
+            image_value = self.get_other_node_variable(image_variable)
+            for file_path in image_value:
+                base64_image = self.get_file_base64_data(file_path)
+                human_message.content.append({
+                    "type": "image",
+                    "source_type": "base64",
+                    "mime_type": "image/jpeg",
+                    "data": base64_image,
+                })
         logger.debug(f'user_prompt: {user}, history: {chat_history}')
+        chat_history.append(human_message)
 
         if self._agent_executor_type == 'ReAct':
-            result = self._agent.invoke({
-                'input': user,
-                'chat_history': chat_history
-            },
-                config=config)
+            result = self._agent.invoke(chat_history, config=config)
             output = result['agent_outcome'].return_values['output']
             if isinstance(output, dict):
                 output = list(output.values())[0]
             return output, llm_callback.reasoning_content
         else:
-            chat_history.append(HumanMessage(content=user))
             result = self._agent.invoke(chat_history, config=config)
             return result[-1].content, llm_callback.reasoning_content
diff --git a/src/backend/bisheng/workflow/nodes/base.py b/src/backend/bisheng/workflow/nodes/base.py
index dae37cfc9..878e1c84c 100644
--- a/src/backend/bisheng/workflow/nodes/base.py
+++ b/src/backend/bisheng/workflow/nodes/base.py
@@ -1,3 +1,4 @@
+import base64
 import copy
 import uuid
 from abc import ABC, abstractmethod
@@ -144,6 +145,12 @@ class BaseNode(ABC):
             msg = msg_template.format(var_map)
         return msg, variables
 
+    def get_file_base64_data(self, file_path: str) -> str:
+        with open(file_path, "rb") as f:
+            file_data = f.read()
+            base64_data = base64.b64encode(file_data).decode('utf-8')
+        return base64_data
+
     def run(self, state: dict) -> Any:
         """
         Run node entry
diff --git a/src/backend/bisheng/workflow/nodes/llm/llm.py b/src/backend/bisheng/workflow/nodes/llm/llm.py
index 8a50fab2e..c99aefd38 100644
--- a/src/backend/bisheng/workflow/nodes/llm/llm.py
+++ b/src/backend/bisheng/workflow/nodes/llm/llm.py
@@ -19,6 +19,8 @@ class LLMNode(BaseNode):
         # 是否输出结果给用户
         self._output_user = self.node_params.get('output_user', False)
 
+        self._image_prompt = self.node_params.get('image_prompt', [])
+
         # 初始化prompt
         self._system_prompt = PromptTemplateParser(template=self.node_params['system_prompt'])
         self._system_variables = self._system_prompt.extract()
@@ -113,7 +115,22 @@ class LLMNode(BaseNode):
         inputs = []
         if system:
             inputs.append(SystemMessage(content=system))
-        inputs.append(HumanMessage(content=user))
+
+        human_message = HumanMessage(content=[{
+            'type': 'text',
+            'text': user
+        }])
+        for image_variable in self._image_prompt:
+            image_value = self.get_other_node_variable(image_variable)
+            for file_path in image_value:
+                base64_image = self.get_file_base64_data(file_path)
+                human_message.content.append({
+                    "type": "image",
+                    "source_type": "base64",
+                    "mime_type": "image/jpeg",
+                    "data": base64_image,
+                })
+        inputs.append(human_message)
 
         result = self._llm.invoke(inputs, config=config)
 

From 814ad2d85cbb7aa043c433b8cf0e8deb0d3d797d Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Fri, 25 Apr 2025 19:07:52 +0800
Subject: [PATCH 065/186] fix: input node image variable not return

---
 .../bisheng/workflow/nodes/agent/agent.py     | 13 ++-----------
 src/backend/bisheng/workflow/nodes/base.py    | 19 +++++++++++++++++++
 .../bisheng/workflow/nodes/input/input.py     |  4 +---
 src/backend/bisheng/workflow/nodes/llm/llm.py | 11 +----------
 4 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/src/backend/bisheng/workflow/nodes/agent/agent.py b/src/backend/bisheng/workflow/nodes/agent/agent.py
index 8704d30eb..28d04f2aa 100644
--- a/src/backend/bisheng/workflow/nodes/agent/agent.py
+++ b/src/backend/bisheng/workflow/nodes/agent/agent.py
@@ -356,18 +356,9 @@ class AgentNode(BaseNode):
             'type': 'text',
             'text': user
         }])
-        for image_variable in self._image_prompt:
-            image_value = self.get_other_node_variable(image_variable)
-            for file_path in image_value:
-                base64_image = self.get_file_base64_data(file_path)
-                human_message.content.append({
-                    "type": "image",
-                    "source_type": "base64",
-                    "mime_type": "image/jpeg",
-                    "data": base64_image,
-                })
-        logger.debug(f'user_prompt: {user}, history: {chat_history}')
+        human_message = self.contact_file_into_prompt(human_message, self._image_prompt)
         chat_history.append(human_message)
+        logger.debug(f'agent invoke chat_history: {chat_history}')
 
         if self._agent_executor_type == 'ReAct':
             result = self._agent.invoke(chat_history, config=config)
diff --git a/src/backend/bisheng/workflow/nodes/base.py b/src/backend/bisheng/workflow/nodes/base.py
index 878e1c84c..2c0e26e30 100644
--- a/src/backend/bisheng/workflow/nodes/base.py
+++ b/src/backend/bisheng/workflow/nodes/base.py
@@ -4,6 +4,8 @@ import uuid
 from abc import ABC, abstractmethod
 from typing import Any, Dict, List
 
+from langchain_core.messages import HumanMessage
+
 from bisheng.utils.exceptions import IgnoreException
 from bisheng.workflow.callback.base_callback import BaseCallback
 from bisheng.workflow.callback.event import NodeEndData, NodeStartData
@@ -151,6 +153,23 @@ class BaseNode(ABC):
             base64_data = base64.b64encode(file_data).decode('utf-8')
         return base64_data
 
+    def contact_file_into_prompt(self, human_message: HumanMessage, variable_list: List[str]) -> HumanMessage:
+        if not variable_list:
+            return human_message
+        for image_variable in variable_list:
+            image_value = self.get_other_node_variable(image_variable)
+            if not image_value:
+                continue
+            for file_path in image_value:
+                base64_image = self.get_file_base64_data(file_path)
+                human_message.content.append({
+                    "type": "image",
+                    "source_type": "base64",
+                    "mime_type": "image/jpeg",
+                    "data": base64_image,
+                })
+        return human_message
+
     def run(self, state: dict) -> Any:
         """
         Run node entry
diff --git a/src/backend/bisheng/workflow/nodes/input/input.py b/src/backend/bisheng/workflow/nodes/input/input.py
index 8d8608736..7079fb6a5 100644
--- a/src/backend/bisheng/workflow/nodes/input/input.py
+++ b/src/backend/bisheng/workflow/nodes/input/input.py
@@ -80,7 +80,7 @@ class InputNode(BaseNode):
             }
             self.graph_state.save_context(content=f'{res["dialog_files_content"]}\n{res["user_input"]}',
                                           msg_sender='human')
-            return {'user_input': self.node_params['user_input']}
+            return res
 
         ret = {}
         # 表单形式的需要去处理对应的文件上传
@@ -89,8 +89,6 @@ class InputNode(BaseNode):
             key_info = self._node_params_map[key]
             if key_info['type'] == 'file':
                 new_params = self.parse_upload_file(key, key_info, value)
-                if key_info['multiple']:
-                    new_params = {key_info['key']: new_params[key_info['key']]}
                 ret.update(new_params)
 
         return ret
diff --git a/src/backend/bisheng/workflow/nodes/llm/llm.py b/src/backend/bisheng/workflow/nodes/llm/llm.py
index c99aefd38..79fd37180 100644
--- a/src/backend/bisheng/workflow/nodes/llm/llm.py
+++ b/src/backend/bisheng/workflow/nodes/llm/llm.py
@@ -120,16 +120,7 @@ class LLMNode(BaseNode):
             'type': 'text',
             'text': user
         }])
-        for image_variable in self._image_prompt:
-            image_value = self.get_other_node_variable(image_variable)
-            for file_path in image_value:
-                base64_image = self.get_file_base64_data(file_path)
-                human_message.content.append({
-                    "type": "image",
-                    "source_type": "base64",
-                    "mime_type": "image/jpeg",
-                    "data": base64_image,
-                })
+        human_message = self.contact_file_into_prompt(human_message, self._image_prompt)
         inputs.append(human_message)
 
         result = self._llm.invoke(inputs, config=config)

From 321e447074a4e419f9b0c27846a1df72582b8980 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Fri, 25 Apr 2025 19:22:20 +0800
Subject: [PATCH 066/186] fix: input node image ext error

---
 src/backend/bisheng/workflow/nodes/input/input.py | 2 +-
 src/backend/bisheng/workflow/nodes/llm/llm.py     | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/backend/bisheng/workflow/nodes/input/input.py b/src/backend/bisheng/workflow/nodes/input/input.py
index 7079fb6a5..a52513be2 100644
--- a/src/backend/bisheng/workflow/nodes/input/input.py
+++ b/src/backend/bisheng/workflow/nodes/input/input.py
@@ -39,7 +39,7 @@ class InputNode(BaseNode):
                 self._node_params_map[value_info['key']] = value_info
 
         self.node_params = new_node_params
-        self._image_ext = ['png', 'jgp', 'jpeg', 'bmp']
+        self._image_ext = ['png', 'jpg', 'jpeg', 'bmp']
 
         self._embedding = None
         self._vector_client = None
diff --git a/src/backend/bisheng/workflow/nodes/llm/llm.py b/src/backend/bisheng/workflow/nodes/llm/llm.py
index 79fd37180..de555495a 100644
--- a/src/backend/bisheng/workflow/nodes/llm/llm.py
+++ b/src/backend/bisheng/workflow/nodes/llm/llm.py
@@ -123,6 +123,8 @@ class LLMNode(BaseNode):
         human_message = self.contact_file_into_prompt(human_message, self._image_prompt)
         inputs.append(human_message)
 
+        logger.debug(f'llm invoke chat_history: {inputs}')
+
         result = self._llm.invoke(inputs, config=config)
 
         return result.content, llm_callback.reasoning_content

From f6348a1249e5529f34d030b7c7be6fa3ecd0a175 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Fri, 25 Apr 2025 19:26:13 +0800
Subject: [PATCH 067/186] fix: change qwen llm sdk

---
 src/backend/bisheng/interface/llms/custom.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backend/bisheng/interface/llms/custom.py b/src/backend/bisheng/interface/llms/custom.py
index 85d291add..fd0108a23 100644
--- a/src/backend/bisheng/interface/llms/custom.py
+++ b/src/backend/bisheng/interface/llms/custom.py
@@ -40,7 +40,7 @@ class BishengLLM(BaseChatModel):
         # 官方api服务
         LLMServerType.OPENAI.value: 'ChatOpenAI',
         LLMServerType.AZURE_OPENAI.value: 'AzureChatOpenAI',
-        LLMServerType.QWEN.value: 'ChatOpenAI',
+        LLMServerType.QWEN.value: 'ChatTongyi',
         LLMServerType.QIAN_FAN.value: 'QianfanChatEndpoint',
         LLMServerType.ZHIPU.value: 'ChatOpenAI',
         LLMServerType.MINIMAX.value: 'ChatOpenAI',

From 1c6226d159ed4ef126164e414576ed1723f64a85 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Fri, 25 Apr 2025 20:37:16 +0800
Subject: [PATCH 068/186] fix: convert qwen vl model return message to str

---
 src/backend/bisheng/interface/llms/custom.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/backend/bisheng/interface/llms/custom.py b/src/backend/bisheng/interface/llms/custom.py
index fd0108a23..5a7a2e27f 100644
--- a/src/backend/bisheng/interface/llms/custom.py
+++ b/src/backend/bisheng/interface/llms/custom.py
@@ -214,6 +214,9 @@ class BishengLLM(BaseChatModel):
             messages, kwargs = self.parse_kwargs(messages, kwargs)
             if self.server_info.type == LLMServerType.MOONSHOT.value:
                 ret = self.moonshot_generate(messages, stop, run_manager, **kwargs)
+            elif self.server_info.type == LLMServerType.QWEN.value:
+                ret = self.llm._generate(messages, stop, run_manager, **kwargs)
+                ret = self.convert_qwen_generate(ret)
             else:
                 ret = self.llm._generate(messages, stop, run_manager, **kwargs)
             self._update_model_status(0)
@@ -253,6 +256,15 @@ class BishengLLM(BaseChatModel):
             raise e
         return result
 
+    def convert_qwen_generate(self, ret: ChatResult)-> ChatResult:
+        if isinstance(ret.generations[0].message.content, list):
+            # 对多模态的结果的特殊处理
+            tmp_content = ''
+            for one in ret.generations[0].message.content:
+                tmp_content += one.get('text', '')
+            ret.generations[0].message.content = tmp_content
+        return ret
+
     @wrapper_bisheng_model_limit_check_async
     async def _agenerate(
             self,
@@ -266,6 +278,9 @@ class BishengLLM(BaseChatModel):
             messages, kwargs = self.parse_kwargs(messages, kwargs)
             if self.server_info.type == LLMServerType.MOONSHOT.value:
                 ret = await self.moonshot_agenerate(messages, stop, run_manager, **kwargs)
+            elif self.server_info.type == LLMServerType.QWEN.value:
+                ret = await self.llm._agenerate(messages, stop, run_manager, **kwargs)
+                ret = self.convert_qwen_generate(ret)
             else:
                 ret = await self.llm._agenerate(messages, stop, run_manager, **kwargs)
             self._update_model_status(0)

From f8ff02ff3541e206b1a9c8658da837fdedd08b0f Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Sun, 27 Apr 2025 17:06:51 +0800
Subject: [PATCH 069/186] fix: ChatTongYi vl model special on_llm_end text
 handle

---
 src/backend/bisheng/interface/llms/custom.py    | 17 +----------------
 src/backend/bisheng/workflow/callback/event.py  |  2 +-
 .../bisheng/workflow/callback/llm_callback.py   |  7 ++++++-
 src/backend/bisheng/workflow/nodes/llm/llm.py   |  2 +-
 4 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/src/backend/bisheng/interface/llms/custom.py b/src/backend/bisheng/interface/llms/custom.py
index 5a7a2e27f..94cca6a10 100644
--- a/src/backend/bisheng/interface/llms/custom.py
+++ b/src/backend/bisheng/interface/llms/custom.py
@@ -188,7 +188,7 @@ class BishengLLM(BaseChatModel):
                             },
                         })
         elif self.server_info.type == LLMServerType.QWEN.value:
-            # 对多模态的支持
+            # ChatTongYi 对多模态的入参比较特殊，需要转换以支持
             user_message = messages[-1]
             if isinstance(user_message, HumanMessage):
                 if isinstance(user_message.content, list):
@@ -214,9 +214,6 @@ class BishengLLM(BaseChatModel):
             messages, kwargs = self.parse_kwargs(messages, kwargs)
             if self.server_info.type == LLMServerType.MOONSHOT.value:
                 ret = self.moonshot_generate(messages, stop, run_manager, **kwargs)
-            elif self.server_info.type == LLMServerType.QWEN.value:
-                ret = self.llm._generate(messages, stop, run_manager, **kwargs)
-                ret = self.convert_qwen_generate(ret)
             else:
                 ret = self.llm._generate(messages, stop, run_manager, **kwargs)
             self._update_model_status(0)
@@ -256,15 +253,6 @@ class BishengLLM(BaseChatModel):
             raise e
         return result
 
-    def convert_qwen_generate(self, ret: ChatResult)-> ChatResult:
-        if isinstance(ret.generations[0].message.content, list):
-            # 对多模态的结果的特殊处理
-            tmp_content = ''
-            for one in ret.generations[0].message.content:
-                tmp_content += one.get('text', '')
-            ret.generations[0].message.content = tmp_content
-        return ret
-
     @wrapper_bisheng_model_limit_check_async
     async def _agenerate(
             self,
@@ -278,9 +266,6 @@ class BishengLLM(BaseChatModel):
             messages, kwargs = self.parse_kwargs(messages, kwargs)
             if self.server_info.type == LLMServerType.MOONSHOT.value:
                 ret = await self.moonshot_agenerate(messages, stop, run_manager, **kwargs)
-            elif self.server_info.type == LLMServerType.QWEN.value:
-                ret = await self.llm._agenerate(messages, stop, run_manager, **kwargs)
-                ret = self.convert_qwen_generate(ret)
             else:
                 ret = await self.llm._agenerate(messages, stop, run_manager, **kwargs)
             self._update_model_status(0)
diff --git a/src/backend/bisheng/workflow/callback/event.py b/src/backend/bisheng/workflow/callback/event.py
index e98abb18a..c9843400d 100644
--- a/src/backend/bisheng/workflow/callback/event.py
+++ b/src/backend/bisheng/workflow/callback/event.py
@@ -63,4 +63,4 @@ class StreamMsgData(BaseModel):
 
 
 class StreamMsgOverData(StreamMsgData):
-    source_documents: Optional[List[Any]] = Field([], description='Source documents')
+    source_documents: Optional[List[Any]] = Field(default=[], description='Source documents')
diff --git a/src/backend/bisheng/workflow/callback/llm_callback.py b/src/backend/bisheng/workflow/callback/llm_callback.py
index 77724611c..c78a894c8 100644
--- a/src/backend/bisheng/workflow/callback/llm_callback.py
+++ b/src/backend/bisheng/workflow/callback/llm_callback.py
@@ -97,7 +97,12 @@ class LLMNodeCallbackHandler(BaseCallbackHandler):
             return
         if not self.output:
             return
-        msg = response.generations[0][0].text
+        msg = response.generations[0][0].message
+        # ChatTongYi vl model special text
+        if isinstance(msg.content, list):
+            msg = ''.join([one.get('text', '') for one in msg.content])
+        else:
+            msg = msg.content
         if not msg:
             logger.warning('LLM output is empty')
             return
diff --git a/src/backend/bisheng/workflow/nodes/llm/llm.py b/src/backend/bisheng/workflow/nodes/llm/llm.py
index de555495a..4a7d0f6b5 100644
--- a/src/backend/bisheng/workflow/nodes/llm/llm.py
+++ b/src/backend/bisheng/workflow/nodes/llm/llm.py
@@ -123,7 +123,7 @@ class LLMNode(BaseNode):
         human_message = self.contact_file_into_prompt(human_message, self._image_prompt)
         inputs.append(human_message)
 
-        logger.debug(f'llm invoke chat_history: {inputs}')
+        logger.debug(f'llm invoke chat_history: {inputs} {self._image_prompt}')
 
         result = self._llm.invoke(inputs, config=config)
 

From 5d38066662c1426162231d815496951ea305b483 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Sun, 27 Apr 2025 17:18:52 +0800
Subject: [PATCH 070/186] fix: output node in loop source documents value error

---
 src/backend/bisheng/workflow/nodes/qa_retriever/qa_retriever.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/backend/bisheng/workflow/nodes/qa_retriever/qa_retriever.py b/src/backend/bisheng/workflow/nodes/qa_retriever/qa_retriever.py
index 645cdba0e..0c5625d9b 100644
--- a/src/backend/bisheng/workflow/nodes/qa_retriever/qa_retriever.py
+++ b/src/backend/bisheng/workflow/nodes/qa_retriever/qa_retriever.py
@@ -50,6 +50,7 @@ class QARetrieverNode(BaseNode):
             result_str = json.loads(result['result'][0].metadata['extra'])['answer']
         else:
             result_str = ''
+            self.graph_state.set_variable(self.id, '$retrieved_result$', None)
 
         return {
             'retrieved_result': result_str

From 98a0944cf40ee89f18c1470581e064de4ba12dd1 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Sun, 27 Apr 2025 17:23:57 +0800
Subject: [PATCH 071/186] fix: ChatTongYi vl model special result handle

---
 src/backend/bisheng/interface/llms/custom.py | 46 +++++++++++++++++---
 1 file changed, 39 insertions(+), 7 deletions(-)

diff --git a/src/backend/bisheng/interface/llms/custom.py b/src/backend/bisheng/interface/llms/custom.py
index 94cca6a10..b282cfba7 100644
--- a/src/backend/bisheng/interface/llms/custom.py
+++ b/src/backend/bisheng/interface/llms/custom.py
@@ -1,14 +1,14 @@
 import json
 from typing import List, Optional, Any, Sequence, Union, Dict, Type, Callable
 
+from langchain_core.callbacks import AsyncCallbackManagerForLLMRun
+from langchain_core.language_models import BaseLanguageModel, BaseChatModel, LanguageModelInput
 from langchain_core.messages import BaseMessage, ToolMessage, HumanMessage
 from langchain_core.outputs import ChatResult
-from langchain_core.runnables import Runnable
+from langchain_core.runnables import Runnable, RunnableConfig
 from langchain_core.tools import BaseTool
 from loguru import logger
 from pydantic import Field
-from langchain_core.callbacks import AsyncCallbackManagerForLLMRun
-from langchain_core.language_models import BaseLanguageModel, BaseChatModel, LanguageModelInput
 
 from bisheng.database.models.llm_server import LLMDao, LLMModelType, LLMServerType, LLMModel, LLMServer
 from bisheng.interface.importing import import_by_type
@@ -146,7 +146,7 @@ class BishengLLM(BaseChatModel):
     def _llm_type(self):
         return self.llm._llm_type
 
-    def parse_kwargs(self, messages: List[BaseMessage],  kwargs: Dict[str, Any]) -> (List[BaseMessage], Dict[str, Any]):
+    def parse_kwargs(self, messages: List[BaseMessage], kwargs: Dict[str, Any]) -> (List[BaseMessage], Dict[str, Any]):
         if self.server_info.type == LLMServerType.MINIMAX.value:
             if self.get_model_info_config().get('enable_web_search'):
                 if 'tools' not in kwargs:
@@ -312,8 +312,40 @@ class BishengLLM(BaseChatModel):
         LLMDao.update_model_status(self.model_id, status, remark)
 
     def bind_tools(
-        self,
-        tools: Sequence[Union[Dict[str, Any], Type, Callable, BaseTool]],
-        **kwargs: Any,
+            self,
+            tools: Sequence[Union[Dict[str, Any], Type, Callable, BaseTool]],
+            **kwargs: Any,
     ) -> Runnable[LanguageModelInput, BaseMessage]:
         return self.llm.bind_tools(tools, **kwargs)
+
+    def convert_qwen_result(self, message: BaseMessage) -> BaseMessage:
+        # ChatTongYi model vl model message.content is list
+        if isinstance(message.content, list):
+            message.content = ''.join([one.get('text', '') for one in message.content])
+        return message
+
+    def invoke(
+            self,
+            input: LanguageModelInput,
+            config: Optional[RunnableConfig] = None,
+            *,
+            stop: Optional[list[str]] = None,
+            **kwargs: Any,
+    ) -> BaseMessage:
+        ret = self.llm.invoke(input, config=config, stop=stop, **kwargs)
+        if self.server_info.type == LLMServerType.QWEN.value:
+            ret = self.convert_qwen_result(ret)
+        return ret
+
+    async def ainvoke(
+            self,
+            input: LanguageModelInput,
+            config: Optional[RunnableConfig] = None,
+            *,
+            stop: Optional[list[str]] = None,
+            **kwargs: Any,
+    ) -> BaseMessage:
+        ret = await self.llm.ainvoke(input, config=config, stop=stop, **kwargs)
+        if self.server_info.type == LLMServerType.QWEN.value:
+            ret = self.convert_qwen_result(ret)
+        return ret

From 0c5a9bb3c9a9c3abe88714aafd1509b3f750abe7 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Sun, 27 Apr 2025 17:46:43 +0800
Subject: [PATCH 072/186] fix: ChatTongYi vl model special result handle

---
 src/backend/bisheng/interface/llms/custom.py      | 4 ++--
 src/backend/bisheng/workflow/nodes/input/input.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/backend/bisheng/interface/llms/custom.py b/src/backend/bisheng/interface/llms/custom.py
index b282cfba7..d7518430f 100644
--- a/src/backend/bisheng/interface/llms/custom.py
+++ b/src/backend/bisheng/interface/llms/custom.py
@@ -332,7 +332,7 @@ class BishengLLM(BaseChatModel):
             stop: Optional[list[str]] = None,
             **kwargs: Any,
     ) -> BaseMessage:
-        ret = self.llm.invoke(input, config=config, stop=stop, **kwargs)
+        ret = super().invoke(input, config=config, stop=stop, **kwargs)
         if self.server_info.type == LLMServerType.QWEN.value:
             ret = self.convert_qwen_result(ret)
         return ret
@@ -345,7 +345,7 @@ class BishengLLM(BaseChatModel):
             stop: Optional[list[str]] = None,
             **kwargs: Any,
     ) -> BaseMessage:
-        ret = await self.llm.ainvoke(input, config=config, stop=stop, **kwargs)
+        ret = await super().ainvoke(input, config=config, stop=stop, **kwargs)
         if self.server_info.type == LLMServerType.QWEN.value:
             ret = self.convert_qwen_result(ret)
         return ret
diff --git a/src/backend/bisheng/workflow/nodes/input/input.py b/src/backend/bisheng/workflow/nodes/input/input.py
index a52513be2..edb126053 100644
--- a/src/backend/bisheng/workflow/nodes/input/input.py
+++ b/src/backend/bisheng/workflow/nodes/input/input.py
@@ -107,7 +107,7 @@ class InputNode(BaseNode):
         dialog_files_content = ""
         image_files_path = []
         if not self.node_params.get('dialog_files_content'):
-            return dialog_files_content
+            return dialog_files_content, image_files_path
         for file_id in self.node_params['dialog_files_content']:
             file_name, file_path, chunks, metadatas = self.get_upload_file_path_content(file_id)
             file_ext = file_name.split('.')[-1].lower()

From e768dfeb2987bd155ccbe3d35c0ef2cd1ee74fef Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Sun, 27 Apr 2025 20:16:34 +0800
Subject: [PATCH 073/186] fix: flow template error

---
 src/backend/bisheng/utils/util.py | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/backend/bisheng/utils/util.py b/src/backend/bisheng/utils/util.py
index c0b373e75..3822000f1 100644
--- a/src/backend/bisheng/utils/util.py
+++ b/src/backend/bisheng/utils/util.py
@@ -72,7 +72,7 @@ def build_template_from_class(name: str, type_to_cls_dict: Dict, add_function: b
 
             variables = {'_type': _type}
 
-            if getattr(_class, 'model_fields'):
+            if getattr(_class, 'model_fields', None):
                 for class_field_items, value in _class.model_fields.items():
                     if class_field_items in ['callback_manager']:
                         continue
@@ -89,6 +89,16 @@ def build_template_from_class(name: str, type_to_cls_dict: Dict, add_function: b
 
                     variables[class_field_items]['placeholder'] = (
                         docs.params[class_field_items] if class_field_items in docs.params else '')
+            else:
+                for name, param in inspect.signature(_class.__init__).parameters.items():
+                    if name == 'self':
+                        continue
+                    variables[name] = {}
+                    variables[name]['default'] = get_default_factory(module=_class.__base__.__module__, function=str(param.annotation))
+                    variables[name]['annotation'] = str(param.annotation)
+                    variables[name]['required'] = False
+
+
             base_classes = get_base_classes(_class)
             # Adding function to base classes to allow
             # the output to be a function
@@ -99,6 +109,7 @@ def build_template_from_class(name: str, type_to_cls_dict: Dict, add_function: b
                 'description': docs.short_description or '',
                 'base_classes': base_classes,
             }
+    return None
 
 
 def build_template_from_method(

From 362b541a4ba51405f285ef234b1efac8d91bb061 Mon Sep 17 00:00:00 2001
From: dolphin <shanghang@dataelem.com>
Date: Sun, 27 Apr 2025 21:03:28 +0800
Subject: [PATCH 074/186] =?UTF-8?q?feat:=20120=E7=89=88=E6=9C=AC=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/frontend/platform/package.json            |   2 +-
 .../platform/public/locales/en/bs.json        |   4 +-
 .../platform/public/locales/en/knowledge.json |   2 +-
 .../platform/public/locales/zh/bs.json        |   2 +-
 .../platform/public/locales/zh/flow.json      |   2 +-
 .../platform/public/locales/zh/knowledge.json |   2 +-
 src/frontend/platform/public/models/data.json | 109 +++++++++
 .../bs-comp/apiComponent/ApiAccessFlow.tsx    |   4 +-
 .../bs-comp/chatComponent/MessageBs.tsx       |   6 +-
 .../bs-comp/chatComponent/MessageButtons.tsx  |   2 +-
 .../bs-comp/chatComponent/MessagePanne.tsx    |   5 +-
 .../bs-comp/chatComponent/MessageUser.tsx     |   8 +-
 .../bs-comp/chatComponent/index.tsx           |   3 +-
 .../platform/src/components/bs-ui/alert.tsx   |   2 +-
 .../src/components/bs-ui/input/avator.tsx     |   2 +-
 .../src/components/inputComponent/index.tsx   |   1 +
 .../platform/src/contexts/locationContext.tsx |   2 +-
 .../platform/src/controllers/API/flow.ts      |  19 ++
 .../platform/src/controllers/API/workflow.ts  | 134 ++++++++++--
 .../assistant/editAssistant/TestChat.tsx      |   1 +
 .../pages/BuildPage/flow/FlowChat/Chat.tsx    |   3 +-
 .../BuildPage/flow/FlowChat/ChatFiles.tsx     | 203 +++++++++++++++++
 .../BuildPage/flow/FlowChat/ChatInput.tsx     | 206 +++++++++++++-----
 .../BuildPage/flow/FlowChat/ChatMessages.tsx  |  22 +-
 .../BuildPage/flow/FlowChat/ChatPane.tsx      |   8 +-
 .../BuildPage/flow/FlowChat/ChatTest.tsx      |   4 +-
 .../BuildPage/flow/FlowChat/InputForm.tsx     | 170 ++++++++-------
 .../BuildPage/flow/FlowChat/MessageBs.tsx     |  11 +-
 .../flow/FlowChat/MessageBsChoose.tsx         |   6 +-
 .../BuildPage/flow/FlowChat/messageStore.ts   |  30 ++-
 .../BuildPage/flow/FlowNode/Parameter.tsx     |  21 +-
 .../flow/FlowNode/ParameterGroup.tsx          |   4 +-
 .../FlowNode/component/FileTypeSelect.tsx     |  83 +++++++
 .../FlowNode/component/ImagePromptItem.tsx    | 104 +++++++++
 .../flow/FlowNode/component/InputFormItem.tsx | 199 +++++++++++++----
 .../flow/FlowNode/component/InputItem.tsx     |   1 +
 .../flow/FlowNode/component/ModelItem.tsx     |   5 +-
 .../flow/FlowNode/component/OutputItem.tsx    |   2 +-
 .../flow/FlowNode/component/SelectVar.tsx     |  16 +-
 .../flow/FlowNode/component/VarInput.tsx      |   3 +-
 .../flow/FlowNode/component/VarSelectItem.tsx |   2 +-
 .../component/VarTextareaUploadItem.tsx       |  11 +-
 .../pages/BuildPage/flow/FlowNode/index.tsx   |   1 +
 .../src/pages/BuildPage/flow/Notification.tsx |   2 +-
 .../src/pages/BuildPage/flow/flowStore.ts     |   2 +-
 .../src/pages/BuildPage/flow/index.tsx        |   5 +-
 .../ChatAppPage/components/ChatPanne.tsx      |   2 +-
 .../src/pages/KnowledgePage/KnowledgeFile.tsx |   1 +
 .../src/pages/KnowledgePage/KnowledgeQa.tsx   |   1 +
 .../pages/KnowledgePage/components/Header.tsx |   2 +-
 .../KnowledgePage/components/ImportQa.tsx     |   6 +-
 .../src/pages/KnowledgePage/filesUpload.tsx   |   2 +-
 .../platform/src/pages/KnowledgePage/qas.tsx  |   6 +-
 .../src/pages/LabelPage/taskAppChats.tsx      |   2 +-
 .../pages/LogPage/useAppLog/appChatDetail.tsx |   4 +-
 .../src/pages/ModelPage/manage/CustomForm.tsx |  81 ++++++-
 .../pages/ModelPage/manage/ModelConfig.tsx    | 177 +++++++++++----
 src/frontend/platform/src/types/flow/index.ts |   3 +-
 .../platform/src/util/flowCompatible.ts       |  85 +++++++-
 src/frontend/platform/src/util/utils.ts       |  13 +-
 60 files changed, 1489 insertions(+), 332 deletions(-)
 create mode 100644 src/frontend/platform/public/models/data.json
 create mode 100644 src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatFiles.tsx
 create mode 100644 src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/FileTypeSelect.tsx
 create mode 100644 src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/ImagePromptItem.tsx

diff --git a/src/frontend/platform/package.json b/src/frontend/platform/package.json
index 4c194b9a1..ebf669194 100644
--- a/src/frontend/platform/package.json
+++ b/src/frontend/platform/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bisheng",
-  "version": "1.2.0beta",
+  "version": "1.2.0",
   "private": true,
   "dependencies": {
     "@headlessui/react": "^2.0.4",
diff --git a/src/frontend/platform/public/locales/en/bs.json b/src/frontend/platform/public/locales/en/bs.json
index 6955c607f..2d59301f7 100644
--- a/src/frontend/platform/public/locales/en/bs.json
+++ b/src/frontend/platform/public/locales/en/bs.json
@@ -238,7 +238,7 @@
     "searchLabels": "Search labels",
     "confirmed": "Confirmed",
     "confirm": "Confirm",
-    "runNewWorkflow": "Run New Workflow",
+    "runNewWorkflow": "Run New Chat",
     "chatEndMessage": "This chat has ended"
   },
   "model": {
@@ -927,7 +927,7 @@
   "all": "All",
   "confirmButton": "Confirm",
   "add": "Add",
-  "back": "Back",
+  "back": "Return",
   "create": "Create",
   "delete": "Delete",
   "deleteSuccess": "Delete successful",
diff --git a/src/frontend/platform/public/locales/en/knowledge.json b/src/frontend/platform/public/locales/en/knowledge.json
index ac1a5965f..38ca00dc8 100644
--- a/src/frontend/platform/public/locales/en/knowledge.json
+++ b/src/frontend/platform/public/locales/en/knowledge.json
@@ -1,7 +1,7 @@
 {
     "fileManagement": "File Management",
     "chunkManagement": "Chunk Management",
-    "back": "Exit",
+    "back": "Return",
     "previewHint": "Click the button on the left to preview the results",
     "uploadHint": "Please complete file upload first",
     "nameRequired": "Knowledge Base Name Cannot Be Empty",
diff --git a/src/frontend/platform/public/locales/zh/bs.json b/src/frontend/platform/public/locales/zh/bs.json
index 605385197..869391059 100644
--- a/src/frontend/platform/public/locales/zh/bs.json
+++ b/src/frontend/platform/public/locales/zh/bs.json
@@ -234,7 +234,7 @@
     "searchLabels": "搜索标签",
     "confirmed": "已确认",
     "confirm": "确认",
-    "runNewWorkflow": "运行新工作流",
+    "runNewWorkflow": "开启新会话",
     "chatEndMessage": "本轮会话已结束"
   },
   "model": {
diff --git a/src/frontend/platform/public/locales/zh/flow.json b/src/frontend/platform/public/locales/zh/flow.json
index a5889cce0..03f974739 100644
--- a/src/frontend/platform/public/locales/zh/flow.json
+++ b/src/frontend/platform/public/locales/zh/flow.json
@@ -130,7 +130,7 @@
     "atLeastOneFormItem": "至少添加一个表单项",
     "editFormItem": "修改表单项",
     "addFormItem": "添加表单项",
-    "userInputLabel": "用户输入框展示内容",
+    "userInputLabel": "用户输入内容变量",
     "userInputPlaceholder": "此处为空时，需要用户手动输入意见；预置文本时，可允许用户在预置文本的基础上修改并提交。",
     "optionsCannotBeEmpty": "选项不可为空",
     "noInteraction": "无交互",
diff --git a/src/frontend/platform/public/locales/zh/knowledge.json b/src/frontend/platform/public/locales/zh/knowledge.json
index 9b551a360..2becc74e1 100644
--- a/src/frontend/platform/public/locales/zh/knowledge.json
+++ b/src/frontend/platform/public/locales/zh/knowledge.json
@@ -1,7 +1,7 @@
 {
     "fileManagement": "文件管理",
     "chunkManagement": "分段管理",
-    "back": "退出",
+    "back": "返回",
     "previewHint": "左侧点击按钮预览结果",
     "uploadHint": "请先完成文件上传",
     "nameRequired": "知识库名称不可为空",
diff --git a/src/frontend/platform/public/models/data.json b/src/frontend/platform/public/models/data.json
new file mode 100644
index 000000000..7137be76d
--- /dev/null
+++ b/src/frontend/platform/public/models/data.json
@@ -0,0 +1,109 @@
+{
+    "openai": [{
+            "name": "model 1",
+            "model_name": "gpt-4o",
+            "model_type": "llm"
+        },
+        {
+            "name": "model 2",
+            "model_name": "text-embedding-ada-002",
+            "model_type": "embedding"
+        }
+    ],
+    "azure_openai": [{
+            "name": "model 1",
+            "model_name": "gpt-4o",
+            "model_type": "llm"
+        },
+        {
+            "name": "model 2",
+            "model_name": "text-embedding-ada-002",
+            "model_type": "embedding"
+        }
+    ],
+    "qwen": [{
+            "name": "model 1",
+            "model_name": "qwen2.5-72b-instruct",
+            "model_type": "llm"
+        },
+        {
+            "name": "model 2",
+            "model_name": "qwen-max",
+            "model_type": "llm"
+        },
+        {
+            "name": "model 3",
+            "model_name": "qwq-plus",
+            "model_type": "llm"
+        },
+        {
+            "name": "model 4",
+            "model_name": "text-embedding-v3",
+            "model_type": "embedding"
+        }
+    ],
+    "deepseek": [{
+            "name": "model 1",
+            "model_name": "deepseek-chat",
+            "model_type": "llm"
+        },
+        {
+            "name": "model 2",
+            "model_name": "deepseek-reasoner",
+            "model_type": "llm"
+        }
+    ],
+    "qianfan": [{
+        "name": "model 1",
+        "model_name": "ernie-4.0-8k",
+        "model_type": "llm"
+    }],
+    "tencent": [{
+            "name": "model 1",
+            "model_name": "hunyuan-turbos-latest",
+            "model_type": "llm"
+        },
+        {
+            "name": "model 2",
+            "model_name": "hunyuan-t1-latest",
+            "model_type": "llm"
+        }
+    ],
+    "moonshot": [{
+        "name": "model 1",
+        "model_name": "moonshot-v1-32k",
+        "model_type": "llm"
+    }],
+    "zhipu": [{
+        "name": "model 1",
+        "model_name": "glm-4-plus",
+        "model_type": "llm"
+    }],
+    "minimax": [{
+        "name": "model 1",
+        "model_name": "MiniMax-Text-01",
+        "model_type": "llm"
+    }],
+    "火山引擎": [{
+            "name": "model 1",
+            "model_name": "deepseek-v3",
+            "model_type": "llm"
+        },
+        {
+            "name": "model 2",
+            "model_name": "deepseek-r1",
+            "model_type": "llm"
+        }
+    ],
+    "silicon": [{
+            "name": "model 1",
+            "model_name": "deepseek-ai/DeepSeek-R1",
+            "model_type": "llm"
+        },
+        {
+            "name": "model 2",
+            "model_name": "deepseek-ai/DeepSeek-V3",
+            "model_type": "llm"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/src/frontend/platform/src/components/bs-comp/apiComponent/ApiAccessFlow.tsx b/src/frontend/platform/src/components/bs-comp/apiComponent/ApiAccessFlow.tsx
index db926d8d2..34deca153 100644
--- a/src/frontend/platform/src/components/bs-comp/apiComponent/ApiAccessFlow.tsx
+++ b/src/frontend/platform/src/components/bs-comp/apiComponent/ApiAccessFlow.tsx
@@ -19,7 +19,7 @@ import { useParams } from 'react-router-dom';
 
 const ApiAccessFlow = () => {
     const { t } = useTranslation()
-    const {id} = useParams()
+    const { id } = useParams()
     // const { flow, getTweak, tabsState } = useContext(TabsContext);
     // const curl_code = getCurlCode(flow, getTweak, tabsState);
     // const pythonCode = getPythonApiCode(flow, getTweak, tabsState);
@@ -52,6 +52,8 @@ url = "${location.origin}/api/v2/workflow/invoke"
 
 payload = json.dumps({
    "workflow_id": "${id}",
+   "stream": False, # 为空或者不传，都会请求流式返回工作流事件。本示例为了直观展示返回结果，所以改
+为非流式请求，真实场景下为了用户体验建议请求流式。
 })
 
 headers = {
diff --git a/src/frontend/platform/src/components/bs-comp/chatComponent/MessageBs.tsx b/src/frontend/platform/src/components/bs-comp/chatComponent/MessageBs.tsx
index 18be25343..848a657a6 100644
--- a/src/frontend/platform/src/components/bs-comp/chatComponent/MessageBs.tsx
+++ b/src/frontend/platform/src/components/bs-comp/chatComponent/MessageBs.tsx
@@ -59,7 +59,7 @@ export const ReasoningLog = ({ loading, msg = '' }) => {
     </div>
 }
 
-export default function MessageBs({ mark = false, logo, data, onUnlike = () => { }, onSource, onMarkClick }: { logo: string, data: ChatMessageType, onUnlike?: any, onSource?: any }) {
+export default function MessageBs({ debug, mark = false, logo, data, onUnlike = () => { }, onSource, onMarkClick }: { logo: string, data: ChatMessageType, onUnlike?: any, onSource?: any }) {
     const avatarColor = colorList[
         (data.sender?.split('').reduce((num, s) => num + s.charCodeAt(), 0) || 0) % colorList.length
     ]
@@ -161,14 +161,14 @@ export default function MessageBs({ mark = false, logo, data, onUnlike = () => {
                             messageId: data.id,
                             message: data.message || data.thought,
                         })} />
-                    <MessageButtons
+                    {!debug && <MessageButtons
                         mark={mark}
                         id={data.id}
                         data={data.liked}
                         onUnlike={onUnlike}
                         onCopy={handleCopyMessage}
                         onMarkClick={onMarkClick}
-                    ></MessageButtons>
+                    ></MessageButtons>}
                 </div>
             }
         </div>
diff --git a/src/frontend/platform/src/components/bs-comp/chatComponent/MessageButtons.tsx b/src/frontend/platform/src/components/bs-comp/chatComponent/MessageButtons.tsx
index 37ec88248..3cf25feaf 100644
--- a/src/frontend/platform/src/components/bs-comp/chatComponent/MessageButtons.tsx
+++ b/src/frontend/platform/src/components/bs-comp/chatComponent/MessageButtons.tsx
@@ -38,7 +38,7 @@ export default function MessageButtons({ mark = false, id, onCopy, data, onUnlik
         copyTrackingApi(id)
     }
 
-    return <div className="flex gap-1">
+    return <div className="flex gap-1 opacity-0 group-hover:opacity-100 transition-opacity">
         {mark && <Button className="h-6 text-xs group-hover:opacity-100 opacity-0" onClick={onMarkClick}>
             <FlagIcon width={12} height={12} className="cursor-pointer" />
             <span>{t('addQa')}</span>
diff --git a/src/frontend/platform/src/components/bs-comp/chatComponent/MessagePanne.tsx b/src/frontend/platform/src/components/bs-comp/chatComponent/MessagePanne.tsx
index e135bdc6b..257b1078b 100644
--- a/src/frontend/platform/src/components/bs-comp/chatComponent/MessagePanne.tsx
+++ b/src/frontend/platform/src/components/bs-comp/chatComponent/MessagePanne.tsx
@@ -10,7 +10,7 @@ import RunLog from "./RunLog";
 import Separator from "./Separator";
 import { useMessageStore } from "./messageStore";
 
-export default function MessagePanne({ mark = false, logo, useName, guideWord, loadMore, onMarkClick = (...a: any) => { } }) {
+export default function MessagePanne({ debug = false, mark = false, logo, useName, guideWord, loadMore, onMarkClick = (...a: any) => { } }) {
     const { t } = useTranslation()
     const { chatId, messages, hisMessages } = useMessageStore()
 
@@ -125,9 +125,10 @@ export default function MessagePanne({ mark = false, logo, useName, guideWord, l
 
                 switch (type) {
                     case 'user':
-                        return <MessageUser mark={mark} key={msg.id} useName={useName} data={msg} onMarkClick={() => onMarkClick('question', msg.id, findQa(messagesList, index))} />;
+                        return <MessageUser debug={debug} mark={mark} key={msg.id} useName={useName} data={msg} onMarkClick={() => onMarkClick('question', msg.id, findQa(messagesList, index))} />;
                     case 'llm':
                         return <MessageBs
+                            debug={debug}
                             mark={mark}
                             logo={logo}
                             key={msg.id}
diff --git a/src/frontend/platform/src/components/bs-comp/chatComponent/MessageUser.tsx b/src/frontend/platform/src/components/bs-comp/chatComponent/MessageUser.tsx
index c53642c60..46f812a74 100644
--- a/src/frontend/platform/src/components/bs-comp/chatComponent/MessageUser.tsx
+++ b/src/frontend/platform/src/components/bs-comp/chatComponent/MessageUser.tsx
@@ -8,7 +8,7 @@ import { useContext } from "react";
 import { useTranslation } from "react-i18next";
 import { useMessageStore } from "./messageStore";
 
-export default function MessageUser({ mark = false, useName = '', data, onMarkClick }: { data: ChatMessageType }) {
+export default function MessageUser({ debug, mark = false, useName = '', data, onMarkClick }: { data: ChatMessageType }) {
     const { t } = useTranslation()
     const msg = data.message[data.chatKey]
 
@@ -54,13 +54,13 @@ export default function MessageUser({ mark = false, useName = '', data, onMarkCl
                             <span>{t('addSimilarQuestion')}</span>
                         </Button>}
                     </div>
-                </div> : (!Array.isArray(data.message.data) && <div className="flex justify-between mt-2">
+                </div> : (!Array.isArray(data.message.data) && <div className="flex justify-between mt-2 opacity-0 group-hover:opacity-100 transition-opacity">
                     <span></span>
-                    <div className="flex gap-0.5 text-gray-400 cursor-pointer self-end">
+                    {!debug && <div className="flex gap-0.5 text-gray-400 cursor-pointer self-end">
                         {!running && <SquarePen className="size-6 p-1 hover:text-gray-500" onClick={() => handleResend(false)} />}
                         {!running && <RefreshCw className="size-6 p-1 hover:text-gray-500" onClick={() => handleResend(true)} />}
                         {appConfig.dialogQuickSearch && <Search className="size-6 p-1 hover:text-gray-500" onClick={handleSearch} />}
-                    </div>
+                    </div>}
                 </div>)
             }
         </div>
diff --git a/src/frontend/platform/src/components/bs-comp/chatComponent/index.tsx b/src/frontend/platform/src/components/bs-comp/chatComponent/index.tsx
index 69228a3ae..8ddd179c6 100644
--- a/src/frontend/platform/src/components/bs-comp/chatComponent/index.tsx
+++ b/src/frontend/platform/src/components/bs-comp/chatComponent/index.tsx
@@ -3,6 +3,7 @@ import MessagePanne from "./MessagePanne";
 
 export default function ChatComponent({
     stop = false,
+    debug = false,
     logo = '',
     clear = false,
     questions = [],
@@ -17,7 +18,7 @@ export default function ChatComponent({
 }) {
 
     return <div className="relative h-full">
-        <MessagePanne logo={logo} useName={useName} guideWord={guideWord} loadMore={loadMore}></MessagePanne>
+        <MessagePanne logo={logo} debug={debug} useName={useName} guideWord={guideWord} loadMore={loadMore}></MessagePanne>
         <ChatInput clear={clear} questions={questions} form={form} wsUrl={wsUrl} inputForm={inputForm} onBeforSend={onBeforSend} onClickClear={onClickClear}></ChatInput>
     </div>
 };
diff --git a/src/frontend/platform/src/components/bs-ui/alert.tsx b/src/frontend/platform/src/components/bs-ui/alert.tsx
index f610caff0..3bd0fa4a8 100644
--- a/src/frontend/platform/src/components/bs-ui/alert.tsx
+++ b/src/frontend/platform/src/components/bs-ui/alert.tsx
@@ -37,7 +37,7 @@ const AlertTitle = React.forwardRef<
 >(({ className, ...props }, ref) => (
     <h5
         ref={ref}
-        className={cname("mb-1 font-medium leading-none tracking-tight", className)}
+        className={cname("mb-1 font-medium leading-none tracking-tight text-sm", className)}
         {...props}
     />
 ))
diff --git a/src/frontend/platform/src/components/bs-ui/input/avator.tsx b/src/frontend/platform/src/components/bs-ui/input/avator.tsx
index ecbd556ab..9cf019d71 100644
--- a/src/frontend/platform/src/components/bs-ui/input/avator.tsx
+++ b/src/frontend/platform/src/components/bs-ui/input/avator.tsx
@@ -37,7 +37,7 @@ export default function Avator({
     return <div className={cname("flex w-full rounded-md gap-4", className)}>
         <div className="relative group">
             {
-                value ? <img src={value} className="max-w-24 max-h-24 rounded-md object-cover" alt="" /> : children
+                value ? <img src={value} className="max-w-24 max-h-24 min-w-8 min-h-8 rounded-md object-cover" alt="" /> : children
             }
             <div className="absolute left-0 top-0 w-full h-full opacity-0 group-hover:opacity-100 transition-opacity duration-300 bg-black/50 flex items-center justify-center rounded-md">
                 <input
diff --git a/src/frontend/platform/src/components/inputComponent/index.tsx b/src/frontend/platform/src/components/inputComponent/index.tsx
index 5ba7cdf26..23ee14c67 100644
--- a/src/frontend/platform/src/components/inputComponent/index.tsx
+++ b/src/frontend/platform/src/components/inputComponent/index.tsx
@@ -33,6 +33,7 @@ export default function InputComponent({
         value={myValue}
         // maxLength={maxLength}
         className={classNames(
+          "whitespace-normal",
           disabled ? " input-disable " : "",
           password && !pwdVisible && myValue !== ""
             ? " text-clip password "
diff --git a/src/frontend/platform/src/contexts/locationContext.tsx b/src/frontend/platform/src/contexts/locationContext.tsx
index 8edff4395..b5ca0b993 100644
--- a/src/frontend/platform/src/contexts/locationContext.tsx
+++ b/src/frontend/platform/src/contexts/locationContext.tsx
@@ -78,7 +78,7 @@ export function LocationProvider({ children }: { children: ReactNode }) {
           officeUrl: res.office_url,
           dialogTips: res.dialog_tips,
           dialogQuickSearch: res.dialog_quick_search,
-          websocketHost: res.websocket_url || window.location.host,
+          websocketHost: res.websocket_url,
           isPro: !!res.pro,
           chatPrompt: !!res.application_usage_tips,
           noFace: !res.show_github_and_help,
diff --git a/src/frontend/platform/src/controllers/API/flow.ts b/src/frontend/platform/src/controllers/API/flow.ts
index f636ab6da..11197623a 100644
--- a/src/frontend/platform/src/controllers/API/flow.ts
+++ b/src/frontend/platform/src/controllers/API/flow.ts
@@ -343,3 +343,22 @@ export async function runTestCase(data: { question_list, version_list, node_id,
     return await axios.post(`/api/v1/flows/compare`, data);
 }
 
+/**
+ * 聊天窗上传文件
+ */
+export async function uploadChatFile(v, file: File, onProgress): Promise<any> {
+    const formData = new FormData();
+    formData.append("file", file);
+    return await axios.post(`/api/${v}/knowledge/upload`, formData, {
+        headers: {
+            "Content-Type": "multipart/form-data"
+        },
+        onUploadProgress: (progressEvent) => {
+            // Calculate progress percentage
+            if (progressEvent.total) {
+                const progress = Math.round((progressEvent.loaded * 100) / progressEvent.total);
+                onProgress(progress);
+            }
+        }
+    });
+}
diff --git a/src/frontend/platform/src/controllers/API/workflow.ts b/src/frontend/platform/src/controllers/API/workflow.ts
index f9a3f474f..e1b58e4c7 100644
--- a/src/frontend/platform/src/controllers/API/workflow.ts
+++ b/src/frontend/platform/src/controllers/API/workflow.ts
@@ -163,7 +163,7 @@ const workflowTemplate = [
         "name": "输入",
         "description": "接收用户在会话页面的输入，支持 2 种形式：对话框输入，表单输入。",
         "type": "input",
-        "v": "1",
+        "v": "2",
         "tab": {
             "value": "dialog_input",
             "options": [
@@ -186,10 +186,40 @@ const workflowTemplate = [
                     {
                         "key": "user_input",
                         "global": "key",
-                        "label": "用户输入内容",
+                        "label": "输入文本内容",
                         "type": "var",
                         "tab": "dialog_input"
                     },
+                    {
+                        "key": "dialog_files_content",
+                        "global": "key",
+                        "label": "上传文件内容",
+                        "type": "var",
+                        "tab": "dialog_input"
+                    },
+                    {
+                        "key": "dialog_files_content_size",
+                        "label": "文件内容长度上限(字)",
+                        "type": "number",
+                        "min": 0,
+                        "value": 15000,
+                        "tab": "dialog_input"
+                    },
+                    {
+                        "key": "dialog_file_accept",
+                        "label": "上传文件类型",
+                        "type": "select_fileaccept",
+                        "value": "all",
+                        "tab": "dialog_input"
+                    },
+                    {
+                        "key": "dialog_image_files",
+                        "global": "key",
+                        "label": "上传图片文件",
+                        "type": "var",
+                        "tab": "dialog_input",
+                        "help": "提取上传文件中的图片文件，当助手或大模型节点使用多模态大模型时，可传入此图片。"
+                    },
                     {
                         "key": "form_input",
                         "global": "item:form_input",
@@ -207,13 +237,14 @@ const workflowTemplate = [
         "name": "输出",
         "description": "可向用户发送消息，并且支持进行更丰富的交互，例如请求用户批准进行某项敏感操作、允许用户在模型输出内容的基础上直接修改并提交。",
         "type": "output",
-        "v": "1",
+        "v": "2",
         "group_params": [
             {
                 "params": [
                     {
-                        "key": "output_msg",
+                        "key": "message",
                         "label": "消息内容",
+                        "global": "key",
                         "type": "var_textarea_file",
                         "required": true,
                         "placeholder": "输入需要发送给用户的消息，例如“接下来我将执行 XX 操作，请您确认”，“以下是我的初版草稿，您可以在其基础上进行修改”",
@@ -243,7 +274,7 @@ const workflowTemplate = [
         "name": "大模型",
         "description": "调用大模型回答用户问题或者处理任务。",
         "type": "llm",
-        "v": "1",
+        "v": "2",
         "tab": {
             "value": "single",
             "options": [
@@ -284,7 +315,7 @@ const workflowTemplate = [
                         "type": "bisheng_model",
                         "value": "",
                         "required": true,
-                        "placeholder": "请选择模型"
+                        "placeholder": "请在模型管理中配置 LLM 模型"
                     },
                     {
                         "key": "temperature",
@@ -316,7 +347,14 @@ const workflowTemplate = [
                         "test": "var",
                         "value": "",
                         "required": true
-                    }
+                    },
+                    {
+                        "key": "image_prompt",
+                        "label": "视觉",
+                        "type": "image_prompt",
+                        "value": [],
+                        "help": "当使用多模态大模型时，可通过此功能传入图片，结合图像内容进行问答"
+                    },
                 ]
             },
             {
@@ -346,7 +384,7 @@ const workflowTemplate = [
         "name": "助手",
         "description": "AI 自主进行任务规划，选择合适的知识库、数据库或工具进行调用。",
         "type": "agent",
-        "v": "1",
+        "v": "2",
         "tab": {
             "value": "single",
             "options": [
@@ -387,7 +425,7 @@ const workflowTemplate = [
                         "type": "agent_model",
                         "required": true,
                         "value": "",
-                        "placeholder": "请选择模型"
+                        "placeholder": "请在模型管理-系统模型设置中配置助手推理模型"
                     },
                     {
                         "key": "temperature",
@@ -437,7 +475,14 @@ const workflowTemplate = [
                             "value": 50
                         },
                         "help": "带入模型上下文的历史消息条数，为 0 时代表不包含上下文信息。"
-                    }
+                    },
+                    {
+                        "key": "image_prompt",
+                        "label": "视觉",
+                        "type": "image_prompt",
+                        "value": "",
+                        "help": "当使用多模态大模型时，可通过此功能传入图片，结合图像内容进行问答"
+                    },
                 ]
             },
             {
@@ -638,7 +683,7 @@ const workflowTemplate = [
                         "type": "bisheng_model",
                         "value": "",
                         "required": true,
-                        "placeholder": "请选择模型"
+                        "placeholder": "请在模型管理中配置 LLM 模型"
                     },
                     {
                         "key": "temperature",
@@ -853,7 +898,7 @@ const workflowTemplateEN = [
         "name": "Input",
         "description": "Receive user input on the session page, supports two forms: dialog input, form input.",
         "type": "input",
-        "v": "1",
+        "v": "2",
         "tab": {
             "value": "dialog_input",
             "options": [
@@ -876,10 +921,40 @@ const workflowTemplateEN = [
                     {
                         "key": "user_input",
                         "global": "key",
-                        "label": "User Input Content",
+                        "label": "Enter text content",
                         "type": "var",
                         "tab": "dialog_input"
                     },
+                    {
+                        "key": "dialog_files_content",
+                        "global": "key",
+                        "label": "Upload file content",
+                        "type": "var",
+                        "tab": "dialog_input"
+                    },
+                    {
+                        "key": "dialog_files_content_size",
+                        "label": "Maximum length of file content (words)",
+                        "type": "number",
+                        "min": 0,
+                        "value": 15000,
+                        "tab": "dialog_input"
+                    },
+                    {
+                        "key": "dialog_file_accept",
+                        "label": "Upload file type",
+                        "type": "select_fileaccept",
+                        "value": "all",
+                        "tab": "dialog_input"
+                    },
+                    {
+                        "key": "dialog_image_files",
+                        "global": "key",
+                        "label": "Upload image files",
+                        "type": "var",
+                        "tab": "dialog_input",
+                        "help": "Extract the image file from the uploaded file. When the assistant or large model node uses the MultiModal Machine Learning large model, this image can be passed in."
+                    },
                     {
                         "global": "item:form_input",
                         "key": "form_input",
@@ -897,13 +972,14 @@ const workflowTemplateEN = [
         "name": "Output",
         "description": "Send messages to users and support richer interactions, such as requesting user approval for sensitive operations or allowing users to directly modify and submit model-generated content.",
         "type": "output",
-        "v": "1",
+        "v": "2",
         "group_params": [
             {
                 "params": [
                     {
-                        "key": "output_msg",
+                        "key": "message",
                         "label": "Message Content",
+                        "global": "key",
                         "type": "var_textarea_file",
                         "required": true,
                         "placeholder": "Enter the message to send to the user, e.g., 'I will perform XX operation next, please confirm', or 'Here is my draft, feel free to modify it'.",
@@ -933,7 +1009,7 @@ const workflowTemplateEN = [
         "name": "LLM",
         "description": "Invoke a large language model to answer user questions or process tasks.",
         "type": "llm",
-        "v": "1",
+        "v": "2",
         "tab": {
             "value": "single",
             "options": [
@@ -973,7 +1049,7 @@ const workflowTemplateEN = [
                         "type": "bisheng_model",
                         "value": "",
                         "required": true,
-                        "placeholder": "Select a model"
+                        "placeholder": "Please configure LLM model in model management"
                     },
                     {
                         "key": "temperature",
@@ -1002,7 +1078,14 @@ const workflowTemplateEN = [
                         "test": "var",
                         "value": "",
                         "required": true
-                    }
+                    },
+                    {
+                        "key": "image_prompt",
+                        "label": "Visual",
+                        "type": "image_prompt",
+                        "value": [],
+                        "help": "When using MultiModal Machine Learning large models, you can use this function to pass in images and combine them with image content for Q & A"
+                    },
                 ]
             },
             {
@@ -1031,7 +1114,7 @@ const workflowTemplateEN = [
         "name": "Agent",
         "description": "AI autonomously plans tasks and selects appropriate knowledge bases or tools for invocation.",
         "type": "agent",
-        "v": "1",
+        "v": "2",
         "tab": {
             "value": "single",
             "options": [
@@ -1071,7 +1154,7 @@ const workflowTemplateEN = [
                         "type": "agent_model",
                         "required": true,
                         "value": "",
-                        "placeholder": "Select a model"
+                        "placeholder": "Please configure the assistant inference model in Model Management - System Model Settings"
                     },
                     {
                         "key": "temperature",
@@ -1115,7 +1198,14 @@ const workflowTemplateEN = [
                             "value": 50
                         },
                         "help": "Include historical chat records."
-                    }
+                    },
+                    {
+                        "key": "image_prompt",
+                        "label": "Visual",
+                        "type": "image_prompt",
+                        "value": "",
+                        "help": "When using MultiModal Machine Learning large models, you can use this function to pass in images and combine them with image content for Q & A"
+                    },
                 ]
             },
             {
@@ -1315,7 +1405,7 @@ const workflowTemplateEN = [
                         "type": "bisheng_model",
                         "value": "",
                         "required": true,
-                        "placeholder": "Select a model"
+                        "placeholder": "Please configure LLM model in model management"
                     },
                     {
                         "key": "temperature",
diff --git a/src/frontend/platform/src/pages/BuildPage/assistant/editAssistant/TestChat.tsx b/src/frontend/platform/src/pages/BuildPage/assistant/editAssistant/TestChat.tsx
index a6d4e52bc..d661837f8 100644
--- a/src/frontend/platform/src/pages/BuildPage/assistant/editAssistant/TestChat.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/assistant/editAssistant/TestChat.tsx
@@ -47,6 +47,7 @@ export default function TestChat({ assisId, guideQuestion, onClear }) {
             <span className="text-sm ">{t('build.debugPreview')}</span>
         </div>
         <ChatComponent
+            debug
             clear
             logo={assistantState.logo}
             questions={guideQuestion}
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/Chat.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/Chat.tsx
index cce1df2e3..b00d3c5e3 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/Chat.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/Chat.tsx
@@ -5,6 +5,7 @@ import { LoadingIcon } from "@/components/bs-icons/loading";
 
 export default function Chat({
     stop = false,
+    debug,
     autoRun,
     logo = '',
     clear = false,
@@ -20,7 +21,7 @@ export default function Chat({
 
     return <div className="h-full bs-chat-bg" style={{ backgroundImage: `url(${__APP_ENV__.BASE_URL}/points.png)` }}>
         <div className="relative h-full">
-            <ChatMessages logo={logo} useName={useName} guideWord={guideWord} loadMore={loadMore}></ChatMessages>
+            <ChatMessages debug={debug} logo={logo} useName={useName} guideWord={guideWord} loadMore={loadMore}></ChatMessages>
             <ChatInput autoRun={autoRun} clear={clear} form={form} wsUrl={wsUrl} inputForm={inputForm} onBeforSend={onBeforSend} onLoad={() => setLoading(false)} ></ChatInput>
         </div>
         {/* {loading && <div className="absolute top-0 left-0 w-full h-full flex items-center justify-center bg-primary/5 z-10">
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatFiles.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatFiles.tsx
new file mode 100644
index 000000000..0da2b6d80
--- /dev/null
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatFiles.tsx
@@ -0,0 +1,203 @@
+import { useToast } from "@/components/bs-ui/toast/use-toast";
+import { generateUUID } from "@/components/bs-ui/utils";
+import Loading from "@/components/ui/loading";
+import { locationContext } from "@/contexts/locationContext";
+import { uploadChatFile } from "@/controllers/API/flow";
+import { getFileExtension } from "@/util/utils";
+import { FileIcon, PaperclipIcon, X } from "lucide-react";
+import { useContext, useMemo, useRef, useState } from "react";
+
+// @accepts '.png,.jpg'
+export default function ChatFiles({ v, accepts, onChange }) {
+    const [files, setFiles] = useState([]);
+    const filesRef = useRef([]);
+    const remainingUploadsRef = useRef(0);
+    const { appConfig } = useContext(locationContext);
+    // const fileAccepts = useMemo(() => appConfig.libAccepts.map((ext) => `.${ext}`), [appConfig.libAccepts]);
+    const { toast } = useToast();
+
+    const fileInputRef = useRef(null);
+    const fileSizeLimit = appConfig.uploadFileMaxSize * 1024 * 1024; // File size limit in bytes
+
+    const handleFileChange = (e) => {
+        const selectedFiles = Array.from(e.target.files);
+        const validFiles = [];
+        const invalidFiles = [];
+
+        fileInputRef.current.value = ''
+        // Validate files based on file extensions
+        selectedFiles.forEach((file) => {
+            if (file.size <= fileSizeLimit) {
+                validFiles.push({ id: generateUUID(6), file });
+            } else {
+                invalidFiles.push({ id: generateUUID(6), file });
+            }
+        });
+
+        // Show invalid file toast
+        if (invalidFiles.length > 0) {
+            toast({
+                variant: 'info',
+                description: invalidFiles.map(file => `文件：${file.file.name}超过${appConfig.uploadFileMaxSize}M，已移除`),
+            });
+        }
+
+        if (!validFiles.length) return;
+
+        // Trigger onChange with null to indicate uploading state
+        onChange(null);
+
+        // Add valid files to state with initial progress
+        const filesWithProgress = validFiles.map(({ file, id }) => {
+            return {
+                name: file.name,
+                size: file.size,
+                type: file.type,
+                isUploading: true,
+                progress: 0, // Set initial progress to 0
+                id, // Use the generated id
+                file // Keep original file object for later use
+            };
+        });
+
+        setFiles(prevFiles => {
+            const res = [...prevFiles, ...filesWithProgress];
+            filesRef.current = res;
+            return res;
+        });
+
+        // Keep track of the number of remaining uploads
+        remainingUploadsRef.current = validFiles.length;
+
+        // Create an array of promises to handle multiple file uploads concurrently
+        const uploadPromises = validFiles.map(({ file, id }) => {
+            return uploadChatFile(v, file, (progress) => {
+                // Update progress for each file individually
+                setFiles((prevFiles) => {
+                    const updatedFiles = prevFiles.map(f => {
+                        if (f.id === id) {
+                            return { ...f, progress }; // Update progress for the specific file
+                        }
+                        return f;
+                    });
+                    filesRef.current = updatedFiles;
+                    return updatedFiles;
+                });
+            }).then(response => {
+                const filePath = response.file_path; // Assuming the response contains the file ID
+                filesRef.current = filesRef.current.map(f => {
+                    if (f.id === id) {
+                        return { ...f, isUploading: false, filePath, progress: 100 }; // Set progress to 100 when uploaded
+                    }
+                    return f;
+                });
+                setFiles(filesRef.current);
+
+                remainingUploadsRef.current -= 1; // Decrease the remaining uploads count
+                if (remainingUploadsRef.current === 0) {
+                    // Once all files are uploaded, trigger onChange with the file IDs
+                    const uploadedFileIds = filesRef.current.filter(f => f.id).map(f => ({ path: f.filePath, name: f.name }));
+                    onChange(uploadedFileIds); // Pass the file IDs to onChange
+                }
+            }).catch(() => {
+                // Handle upload failure
+                toast({
+                    variant: 'error',
+                    description: `文件上传失败: ${file.name}`,
+                });
+                handleFileRemove(file.name);
+                remainingUploadsRef.current -= 1; // Decrease the remaining uploads count
+                if (remainingUploadsRef.current === 0) {
+                    // If no files remain, trigger onChange immediately
+                    const uploadedFileIds = filesRef.current.filter(f => f.id).map(f => ({ path: f.filePath, name: f.name }));
+                    onChange(uploadedFileIds);
+                }
+            });
+        });
+
+        // Wait for all files to finish uploading
+        Promise.all(uploadPromises).then(() => {
+            // Once all files are uploaded, trigger onChange with the file IDs
+            const uploadedFileIds = filesRef.current.filter(f => f.id).map(f => ({ path: f.filePath, name: f.name }));
+            onChange(uploadedFileIds); // Pass the file IDs to onChange
+        });
+    };
+
+    const handleFileRemove = (fileName) => {
+        const res = filesRef.current.filter(file => file.name !== fileName);
+        filesRef.current = res
+        setFiles(res);
+
+        // If we manually remove a file during upload, we decrease the remaining upload counter
+        remainingUploadsRef.current = Math.max(remainingUploadsRef.current - 1, 0);
+
+        if (remainingUploadsRef.current === 0) {
+            // If no files remain, trigger onChange immediately
+            const uploadedFileIds = filesRef.current.filter(f => f.id).map(f => ({ id: f.id, name: f.name }));
+            onChange(uploadedFileIds); // Trigger onChange with uploaded file IDs
+        }
+    };
+
+    const formatFileSize = (size) => {
+        let fileSize = typeof size === 'string' ? parseFloat(size) : size;
+        const units = ['B', 'KB', 'MB', 'GB'];
+        let index = 0;
+
+        while (fileSize >= 1024 && index < units.length - 1) {
+            fileSize /= 1024;
+            index++;
+        }
+
+        return `${fileSize.toFixed(2)} ${units[index]}`;
+    };
+
+    return (
+        <div className="relative z-10">
+            {/* Displaying files */}
+            {!!files.length && <div className="absolute bottom-2 left-2 flex flex-wrap gap-2  bg-gray-50 p-2 rounded-xl max-h-96 overflow-y-auto">
+                {files.map((file, index) => (
+                    <div key={index} className="group relative flex items-center space-x-3 bg-gray-100 p-2 rounded-xl cursor-default">
+                        {/* Remove button */}
+                        <span
+                            onClick={() => handleFileRemove(file.name)}
+                            className="hidden group-hover:block absolute -right-1 -top-1 bg-gray-50 border-2 border-gray-300 text-gray-600 rounded-full cursor-pointer"
+                        >
+                            <X size={14} />
+                        </span>
+
+                        {/* File Icon */}
+                        <div className="w-8 h-8 bg-gray-200 rounded-md flex items-center justify-center">
+                            {file.isUploading ? <Loading className="size-4" /> : <FileIcon className="w-6 h-6 text-gray-600" />}
+                        </div>
+
+                        {/* File details */}
+                        <div className="flex-1">
+                            <div className="text-sm font-medium text-gray-700 truncate" title={file.name}>
+                                {file.name}
+                            </div>
+                            {file.isUploading ? file.progress === 100
+                                ? <div className="text-xs text-gray-500">解析中...</div>
+                                : <div className="text-xs text-gray-500">上传中... {file.progress}%</div>
+                                : <div className="text-xs text-gray-500">{getFileExtension(file.name)} {formatFileSize(file.size)}</div>}
+                        </div>
+                    </div>
+                ))}
+            </div>}
+
+            {/* File Upload Button */}
+            <div className="absolute right-10 top-5 cursor-pointer" onClick={() => fileInputRef.current.click()}>
+                <PaperclipIcon size={18} />
+            </div>
+
+            {/* File Input */}
+            <input
+                type="file"
+                ref={fileInputRef}
+                multiple
+                accept={accepts}
+                onChange={handleFileChange}
+                className="hidden"
+            />
+        </div>
+    );
+}
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatInput.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatInput.tsx
index fd2b24571..c0132aa2e 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatInput.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatInput.tsx
@@ -4,15 +4,21 @@ import { Button } from "@/components/bs-ui/button";
 import { Textarea } from "@/components/bs-ui/input";
 import { useToast } from "@/components/bs-ui/toast/use-toast";
 import { locationContext } from "@/contexts/locationContext";
-import { useContext, useEffect, useRef, useState } from "react";
+import { useContext, useEffect, useMemo, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 // import GuideQuestions from "./GuideQuestions";
 // import { useMessageStore } from "./messageStore";
 import { RefreshCw } from "lucide-react";
-import GuideQuestions from "./GuideQuestions";
-import InputForm from "./InputForm";
-import { useMessageStore } from "./messageStore";
 import useFlowStore from "../flowStore";
+import ChatFiles from "./ChatFiles";
+import GuideQuestions from "./GuideQuestions";
+import { useMessageStore } from "./messageStore";
+import Tip from "@/components/bs-ui/tooltip/tip";
+
+const FileTypes = {
+    IMAGE: ['.PNG', '.JPEG', '.JPG', '.BMP'],
+    FILE: ['.PDF', '.TXT', '.MD', '.HTML', '.XLS', '.XLSX', '.DOC', '.DOCX', '.PPT', '.PPTX'],
+}
 
 export default function ChatInput({ autoRun, clear, form, wsUrl, onBeforSend, onLoad }) {
     const { toast } = useToast()
@@ -23,11 +29,25 @@ export default function ChatInput({ autoRun, clear, form, wsUrl, onBeforSend, on
     const questionsRef = useRef(null)
     const inputNodeIdRef = useRef('') // 当前输入框节点id
     const messageIdRef = useRef('') // 当前输入框节点messageId
-    const [inputForm, setInputForm] = useState(null) // input表单
+    const [accepts, setAccepts] = useState('*') // 接受文件类型
 
     const [showWhenLocked, setShowWhenLocked] = useState(false) // 强制开启表单按钮，不限制于input锁定
 
-    const { messages, hisMessages, chatId, createSendMsg, createWsMsg, streamWsMsg, insetSeparator, destory, insetNodeRun, setShowGuideQuestion } = useMessageStore()
+    const {
+        messages,
+        hisMessages,
+        chatId,
+        createSendMsg,
+        createWsMsg,
+        overWsMsg,
+        inputForm,
+        setInputForm,
+        streamWsMsg,
+        insetSeparator,
+        destory,
+        insetNodeRun,
+        setShowGuideQuestion
+    } = useMessageStore()
     console.log('ui messages :>> ', messages);
 
     const currentChatIdRef = useRef(null)
@@ -85,6 +105,7 @@ export default function ChatInput({ autoRun, clear, form, wsUrl, onBeforSend, on
     }, [])
 
     const handleSendClick = async () => {
+        if (fileUploading) return
         // 解除锁定状态下 form 按钮开放的状态
         // setShowWhenLocked(false)
         // 关闭引导词
@@ -92,9 +113,15 @@ export default function ChatInput({ autoRun, clear, form, wsUrl, onBeforSend, on
         // 收起表单
         // formShow && setFormShow(false)
         // setFormShow(false)
-
-        const value = inputRef.current.value
-        if (value.trim() === '') return
+        const [filePath, fileNames] = getFileIds().reduce((acc, cur) => {
+            acc[0].push(cur.path)
+            acc[1].push(cur.name)
+            return acc
+        }, [[], []])
+        // 文件拼接入消息
+        const _value = inputRef.current.value
+        if (_value.trim() === '' && filePath.length === 0) return
+        const value = fileNames.length > 0 ? fileNames.join('\n') + '\n' + _value : _value;
 
         const event = new Event('input', { bubbles: true, cancelable: true });
         inputRef.current.value = ''
@@ -104,6 +131,7 @@ export default function ChatInput({ autoRun, clear, form, wsUrl, onBeforSend, on
         const wsMsg = onBeforSend('input', {
             nodeId: inputNodeIdRef.current,
             msg: value,
+            files: filePath,
             category: "question",
             extra: '',
             message_id: messageIdRef.current,
@@ -123,25 +151,6 @@ export default function ChatInput({ autoRun, clear, form, wsUrl, onBeforSend, on
         }
     }
 
-    const handleSendForm = async ([data, msg]) => {
-        setInputForm(null)
-        createSendMsg(msg)
-        await createWebSocket()
-        sendWsMsg({
-            action: 'input',
-            data: {
-                [inputNodeIdRef.current]: {
-                    data,
-                    message: msg,
-                    message_id: messageIdRef.current,
-                    category: 'question',
-                    extra: '',
-                    source: 0
-                }
-            }
-        })
-    }
-
     const sendWsMsg = async (msg) => {
         try {
             wsRef.current.send(JSON.stringify(msg))
@@ -155,6 +164,7 @@ export default function ChatInput({ autoRun, clear, form, wsUrl, onBeforSend, on
     }
 
     const wsRef = useRef(null)
+    const reRunStateRef = useRef(false)
     const createWebSocket = () => {
         // 单例
         if (wsRef.current) return Promise.resolve('ok');
@@ -176,7 +186,9 @@ export default function ChatInput({ autoRun, clear, form, wsUrl, onBeforSend, on
 
                     if (data.type === 'begin') {
                         setStop({ show: true, disable: false })
-                    } else if (data.type === 'close') {
+                    } else if (data.type === 'close' && !reRunStateRef.current) {
+                        // 重试时阻止关闭stop
+                        reRunStateRef.current = false
                         setStop({ show: false, disable: false })
                     }
 
@@ -209,6 +221,11 @@ export default function ChatInput({ autoRun, clear, form, wsUrl, onBeforSend, on
                         }
                         setInputLock({ locked: true, reason: '' })
                     }
+                    addNotification({
+                        type: 'error',
+                        title: '运行异常',
+                        description: event.reason
+                    })
                 };
                 ws.onerror = (ev) => {
                     wsRef.current = null
@@ -233,14 +250,24 @@ export default function ChatInput({ autoRun, clear, form, wsUrl, onBeforSend, on
     }
 
     const setRunCache = useFlowStore(state => state.setRunCache)
+    const addNotification = useFlowStore((state) => state.addNotification);
     // 接受 ws 消息
     const handleWsMessage = (data) => {
         if (data.category === 'error') {
             const { code, message } = data.message
             setInputLock({ locked: true, reason: '' })
+
+            // 记录
+            const errorMsg = code == 500 ? message : t(`errors.${code}`, { type: message })
+            addNotification({
+                type: 'error',
+                title: '运行异常',
+                description: errorMsg
+            })
+
             return toast({
                 variant: 'error',
-                description: code == 500 ? message : t(`errors.${code}`, { type: message })
+                description: errorMsg
             });
         } else if (data.category === 'node_run') {
             inputNodeIdRef.current = data.message.node_id
@@ -257,6 +284,18 @@ export default function ChatInput({ autoRun, clear, form, wsUrl, onBeforSend, on
             const { node_id, input_schema } = data.message
             inputNodeIdRef.current = node_id
             messageIdRef.current = data.message_id
+            // 限制文件类型
+            if (input_schema.tab === 'dialog_input') {
+                const schemaItem = input_schema.value?.find(el => el.key === 'file_accept_select')
+                const fileAccept = schemaItem?.value
+                if (fileAccept === 'image') {
+                    setAccepts(FileTypes.IMAGE.join(','))
+                } else if (fileAccept === 'file') {
+                    setAccepts(FileTypes.FILE.join(','))
+                } else {
+                    setAccepts(FileTypes.IMAGE.join(',') + ',' + FileTypes.FILE.join(','))
+                }
+            }
             // 待用户输入
             input_schema.tab === 'form_input' ? setInputForm(input_schema) : setInputLock({ locked: false, reason: '' })
             return
@@ -264,6 +303,8 @@ export default function ChatInput({ autoRun, clear, form, wsUrl, onBeforSend, on
             return questionsRef.current.updateQuestions(data.message.guide_question.filter(q => q))
         } else if (data.category === 'stream_msg') {
             streamWsMsg(data)
+        } else if (data.category === 'end_cover') {
+            return overWsMsg(data)
         }
 
         if (data.type === 'close') {
@@ -319,9 +360,30 @@ export default function ChatInput({ autoRun, clear, form, wsUrl, onBeforSend, on
                 }
             })
         }
+        const handleSendForm = async (e) => {
+            const { data, msg } = e.detail
+            setInputForm(null)
+            createSendMsg(msg)
+            await createWebSocket()
+            sendWsMsg({
+                action: 'input',
+                data: {
+                    [inputNodeIdRef.current]: {
+                        data,
+                        message: msg,
+                        message_id: messageIdRef.current,
+                        category: 'question',
+                        extra: '',
+                        source: 0
+                    }
+                }
+            })
+        }
+        document.addEventListener('inputFormEvent', handleSendForm)
         document.addEventListener('outputMsgEvent', handleOutPutEvent)
         document.addEventListener('userResendMsgEvent', handleCustomEvent)
         return () => {
+            document.removeEventListener('inputFormEvent', handleSendForm)
             document.removeEventListener('outputMsgEvent', handleOutPutEvent)
             document.removeEventListener('userResendMsgEvent', handleCustomEvent)
         }
@@ -370,18 +432,22 @@ export default function ChatInput({ autoRun, clear, form, wsUrl, onBeforSend, on
         //         sendWsMsg(onBeforSend('init_data', {}))
         //     })
         // }, 300);
+        reRunStateRef.current = true
     }
 
+    const placholder = useMemo(() => {
+        if (inputForm) {
+            return '      点击刷新按钮可开启新对话'
+        }
+        const reason = inputLock.reason || ' '
+        return inputLock.locked ? reason : t('chat.inputPlaceholder')
+    }, [inputForm, inputLock])
+
+    // 文件上传状态
+    const { fileUploading, getFileIds, loadingChange } = useFileLoading(inputLock.locked)
+
     return <div className="absolute bottom-0 w-full pt-1 bg-[#fff] dark:bg-[#1B1B1B]">
         <div className={`relative pr-4 ${clear && 'pl-9'}`}>
-            {/* form */}
-            {
-                inputForm && <div className="relative">
-                    <div className="absolute left-0 border bottom-2 bg-background-login px-4 py-2 rounded-md w-[50%] min-w-80 z-40">
-                        <InputForm data={inputForm} onSubmit={handleSendForm} />
-                    </div>
-                </div>
-            }
             {/* 引导问题 */}
             <GuideQuestions
                 ref={questionsRef}
@@ -390,7 +456,9 @@ export default function ChatInput({ autoRun, clear, form, wsUrl, onBeforSend, on
             />
             {/* restart */}
             <div className="flex absolute left-0 top-3 z-10">
-                <Button className="rounded-full" disabled={restarted} variant="ghost" size="icon" onClick={handleRestartClick}><RefreshCw size={18} /></Button>
+                <Tip content={"重新运行"}>
+                    <Button className="rounded-full" disabled={restarted} variant="ghost" size="icon" onClick={handleRestartClick}><RefreshCw size={18} /></Button>
+                </Tip>
             </div>
             {/* form switch */}
             <div className="flex absolute left-3 top-4 z-10">
@@ -401,32 +469,27 @@ export default function ChatInput({ autoRun, clear, form, wsUrl, onBeforSend, on
                     ><FormIcon className={!showWhenLocked && inputLock.locked ? 'text-muted-foreground' : 'text-foreground'}></FormIcon></div>
                 }
             </div>
+            {/* 附件 */}
+            {!inputLock.locked && <ChatFiles accepts={accepts} v={location.href.indexOf('/chat/flow/') === -1 ? 'v1' : 'v2'} onChange={loadingChange} />}
             {/* send */}
             <div className="flex gap-2 absolute right-7 top-4 z-10">
                 <div
                     id="bs-send-btn"
                     className="w-6 h-6 rounded-sm hover:bg-gray-200 dark:hover:bg-gray-950 cursor-pointer flex justify-center items-center"
-                    onClick={() => { !inputLock.locked && handleSendClick() }}>
-                    <SendIcon className={`${inputLock.locked ? 'text-muted-foreground' : 'text-foreground'}`} />
+                    onClick={() => { !inputLock.locked && !fileUploading && handleSendClick() }}>
+                    <SendIcon className={`${inputLock.locked || fileUploading ? 'text-muted-foreground' : 'text-foreground'}`} />
                 </div>
             </div>
             {/* stop & 重置 */}
-            <div className="absolute w-full flex justify-center bottom-32">
-                {stop.show ? null
-                    // <Button
-                    //     className="rounded-full"
-                    //     variant="outline"
-                    //     disabled={stop.disable}
-                    //     onClick={handleStopClick}><CirclePause className="mr-2" />Stop
-                    // </Button>
-                    : <Button
-                        className="rounded-full"
-                        variant="outline"
-                        disabled={restarted}
-                        onClick={handleRestartClick}>
-                        <RefreshCw className="mr-1" size={16} />
-                        {t('chat.runNewWorkflow')}
-                    </Button>
+            <div className="absolute w-full flex justify-center bottom-20">
+                {!stop.show && <Button
+                    className="rounded-full"
+                    variant="outline"
+                    disabled={restarted}
+                    onClick={handleRestartClick}>
+                    <RefreshCw className="mr-1" size={16} />
+                    {t('chat.runNewWorkflow')}
+                </Button>
                 }
             </div>
             {/* question */}
@@ -437,7 +500,7 @@ export default function ChatInput({ autoRun, clear, form, wsUrl, onBeforSend, on
                 style={{ height: 56 }}
                 disabled={inputLock.locked}
                 onInput={handleTextAreaHeight}
-                placeholder={inputLock.locked ? inputLock.reason : t('chat.inputPlaceholder')}
+                placeholder={placholder}
                 className={"resize-none py-4 pr-10 text-md min-h-6 max-h-[200px] scrollbar-hide dark:bg-[#131415] text-gray-800" + (form && ' pl-10')}
                 onKeyDown={(event) => {
                     if (event.key === "Enter" && !event.shiftKey) {
@@ -450,3 +513,30 @@ export default function ChatInput({ autoRun, clear, form, wsUrl, onBeforSend, on
         <p className="text-center text-sm pt-2 pb-4 text-gray-400">{appConfig.dialogTips}</p>
     </div>
 };
+
+
+
+const useFileLoading = (locked) => {
+    const [loading, setLoading] = useState(false);
+    const filesRef = useRef([])
+    useEffect(() => {
+        if (locked) filesRef.current = []
+    }, [locked])
+    return {
+        fileUploading: loading,
+        getFileIds: () => filesRef.current,
+        loadingChange(files: string[] | null) {
+            if (files) {
+                setLoading(false)
+                filesRef.current = files
+            } else {
+                setLoading(true)
+                filesRef.current = []
+            }
+        },
+        clear() {
+            setLoading(false)
+            filesRef.current = []
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatMessages.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatMessages.tsx
index 3fa545a74..86b9df5cf 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatMessages.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatMessages.tsx
@@ -9,21 +9,30 @@ import { useTranslation } from "react-i18next";
 // import RunLog from "./RunLog";
 // import Separator from "./Separator";
 import Separator from "@/components/bs-comp/chatComponent/Separator";
+import InputForm from "./InputForm";
 import MessageBs from "./MessageBs";
 import MessageBsChoose from "./MessageBsChoose";
 import MessageNodeRun from "./MessageNodeRun";
 import { useMessageStore } from "./messageStore";
 import MessageUser from "./MessageUser";
 
-export default function ChatMessages({ mark = false, logo, useName, disableBtn = false, guideWord, loadMore, onMarkClick }) {
+export default function ChatMessages({
+    debug,
+    mark = false,
+    logo,
+    useName,
+    guideWord,
+    loadMore,
+    onMarkClick = undefined
+}) {
     const { t } = useTranslation()
-    const { chatId, messages, hisMessages } = useMessageStore()
+    const { chatId, messages, inputForm } = useMessageStore()
 
     // 反馈
     const thumbRef = useRef(null)
     // 溯
     const sourceRef = useRef(null
-)
+    )
     // 自动滚动
     const messagesRef = useRef(null)
     const scrollLockRef = useRef(false)
@@ -114,19 +123,19 @@ export default function ChatMessages({ mark = false, logo, useName, disableBtn =
                     case 'input':
                         return null
                     case 'question':
-                        return <MessageUser mark={mark} key={msg.message_id} useName={useName} data={msg} onMarkClick={() => { onMarkClick('question', msg.id, findQa(messagesList, index)) }} />;
+                        return <MessageUser mark={mark} key={msg.message_id} useName={useName} data={msg} onMarkClick={() => { onMarkClick?.('question', msg.id, findQa(messagesList, index)) }} />;
                     case 'guide_word':
                     case 'output_msg':
                     case 'stream_msg':
                         return <MessageBs
+                            debug={debug}
                             mark={mark}
                             logo={logo}
-                            disableBtn={disableBtn}
                             key={msg.message_id}
                             data={msg}
                             onUnlike={(chatId) => { thumbRef.current?.openModal(chatId) }}
                             onSource={(data) => { sourceRef.current?.openModal(data) }}
-                            onMarkClick={() => onMarkClick('answer', msg.message_id, findQa(messagesList, index))}
+                            onMarkClick={() => onMarkClick?.('answer', msg.message_id, findQa(messagesList, index))}
                         />;
                     case 'separator':
                         return <Separator key={msg.message_id} text={msg.message || t('chat.roundOver')} />;
@@ -141,6 +150,7 @@ export default function ChatMessages({ mark = false, logo, useName, disableBtn =
                 }
             })
         }
+        {inputForm && <InputForm data={inputForm} />}
         <ThumbsMessage ref={thumbRef}></ThumbsMessage>
         <ResouceModal ref={sourceRef}></ResouceModal>
     </div>
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatPane.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatPane.tsx
index 64baa4266..3887f55bc 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatPane.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatPane.tsx
@@ -2,14 +2,14 @@ import { useEffect } from "react";
 import Chat from "./Chat";
 import { useMessageStore } from "./messageStore";
 
-export default function ChatPane({ autoRun = false, chatId, flow, wsUrl = '' }: { autoRun?: boolean, chatId: string, flow: any, wsUrl?: string }) {
+export default function ChatPane({ debug = false, autoRun = false, chatId, flow, wsUrl = '' }: { debug?: boolean, autoRun?: boolean, chatId: string, flow: any, wsUrl?: string }) {
     const { changeChatId } = useMessageStore()
 
     useEffect(() => {
         changeChatId(chatId)
     }, [chatId])
 
-    const getMessage = (action, { nodeId, msg, category, extra, source, message_id }) => {
+    const getMessage = (action, { nodeId, msg, category, extra, files, source, message_id }) => {
         if (action === 'getInputForm') {
             const node = flow.nodes.find(node => node.id === nodeId)
             if (node.data.tab.value === 'input') return null
@@ -41,7 +41,8 @@ export default function ChatPane({ autoRun = false, chatId, flow, wsUrl = '' }:
                 data: {
                     [nodeId]: {
                         data: {
-                            [variable]: msg
+                            [variable]: msg,
+                            dialog_files_content: files
                         },
                         message: msg,
                         message_id,
@@ -62,6 +63,7 @@ export default function ChatPane({ autoRun = false, chatId, flow, wsUrl = '' }:
     }
 
     return <Chat
+        debug={debug}
         autoRun={autoRun}
         useName=''
         guideWord=''
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatTest.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatTest.tsx
index 50be5961b..1d1e028c7 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatTest.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatTest.tsx
@@ -72,7 +72,7 @@ export const ChatTest = forwardRef((props, ref) => {
 
     if (!open) return null;
 
-    const host = appConfig.websocketHost || '';
+    const host = appConfig.websocketHost || window.location.host;
     return (
         <div
             ref={resizableRef}
@@ -97,7 +97,7 @@ export const ChatTest = forwardRef((props, ref) => {
                 </div>
             </div>
             <div className={`h-[calc(100vh-28px)] relative overflow-y-auto ${small ? 'hidden' : ''}`} onKeyDown={(e) => e.stopPropagation()}>
-                <ChatPane autoRun chatId={chatId} flow={flow} wsUrl={`${host}${__APP_ENV__.BASE_URL}/api/v1/workflow/chat/${flow?.id}`} />
+                <ChatPane debug autoRun chatId={chatId} flow={flow} wsUrl={`${host}${__APP_ENV__.BASE_URL}/api/v1/workflow/chat/${flow?.id}`} />
             </div>
             {!small && <div
                 className="absolute left-0 top-0 bottom-0 w-2 cursor-ew-resize flex items-center"
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/InputForm.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/InputForm.tsx
index 08199f2a3..04f7bc7f7 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/InputForm.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/InputForm.tsx
@@ -14,7 +14,7 @@ const enum FormItemType {
     Select = 'select'
 }
 
-const InputForm = ({ data, onSubmit }: { data: WorkflowNodeParam, onSubmit: (data: any) => void }) => {
+const InputForm = ({ data }: { data: WorkflowNodeParam }) => {
     const { t } = useTranslation()
 
     const formDataRef = useRef(data.value.reduce((map, item) => {
@@ -56,91 +56,99 @@ const InputForm = ({ data, onSubmit }: { data: WorkflowNodeParam, onSubmit: (dat
                 variant: 'warning'
             })
         }
-        onSubmit([valuesObject, stringObject])
+        const myEvent = new CustomEvent('inputFormEvent', {
+            detail: {
+                data: valuesObject,
+                msg: stringObject
+            }
+        });
+        document.dispatchEvent(myEvent);
     }
 
     const [multiVal, setMultiVal] = useState([])
-    return <div className="flex flex-col gap-6 rounded-xl p-4 ">
-        <div className="max-h-[520px] overflow-y-auto">
-            {
-                data.value.map((item, i) => (
-                    <div key={item.id} className="w-full text-sm bisheng-label">
-                        {item.required && <span className="text-red-500">*</span>}
-                        {item.value}
-                        {/* <span className="text-status-red">{item.required ? " *" : ""}</span> */}
-                        <div className="mb-2">
-                            {(() => {
-                                switch (item.type) {
-                                    case FormItemType.Text:
-                                        return (
-                                            <InputComponent
-                                                type="textarea"
-                                                password={false}
-                                                maxLength={10000}
-                                                // value={item.value}
-                                                onChange={(val) => handleChange(item, val)}
-                                            />
-                                        )
-                                    case FormItemType.Select:
-                                        return (
-                                            item.multiple ?
-                                                <MultiSelect
-                                                    multiple
-                                                    className={''}
-                                                    value={multiVal[item.key] || []}
-                                                    options={
-                                                        item.options.map(el => ({
-                                                            label: el.text,
-                                                            value: el.text
-                                                        }))
-                                                    }
-                                                    placeholder={'请选择'}
-                                                    onChange={(v) => {
-                                                        setMultiVal(prev => ({ ...prev, [item.key]: v }));
-                                                        handleChange(item, v.join(','))
-                                                    }}
-                                                >
-                                                    {/* {children?.(reload)} */}
-                                                </MultiSelect>
-                                                : <Select onValueChange={(val) => handleChange(item, val)}>
-                                                    <SelectTrigger>
-                                                        <SelectValue placeholder="" />
-                                                    </SelectTrigger>
-                                                    <SelectContent>
-                                                        <SelectGroup>
-                                                            {item.options.map(el => (
-                                                                <SelectItem key={el.text} value={el.text}>
-                                                                    {el.text}
-                                                                </SelectItem>
-                                                            ))}
-                                                        </SelectGroup>
-                                                    </SelectContent>
-                                                </Select>
-                                        )
-                                    case FormItemType.File:
-                                        return (
-                                            <InputFileComponent
-                                                isSSO
-                                                disabled={false}
-                                                placeholder={t('report.fileRequired')}
-                                                value={''}
-                                                multiple={item.multiple}
-                                                onChange={(name) => updataFileName(item, name)}
-                                                fileTypes={["png", "jpg", "jpeg", "doc", "docx", "ppt", "pptx", "xls", "xlsx", "txt", "md", "html", "pdf"]}
-                                                suffixes={['xxx']}
-                                                onFileChange={(val) => handleChange(item, val)}
-                                            />
-                                        )
-                                    default:
-                                        return null
-                                }
-                            })()}
+    return <div className="flex w-full">
+        <div className="max-w-[90%] min-w-96">
+            <div className="min-h-8 px-6 py-4 rounded-2xl bg-[#F5F6F8] dark:bg-[#313336]">
+                {
+                    data.value.map((item, i) => (
+                        <div key={item.id} className="w-full text-sm bisheng-label">
+                            {item.required && <span className="text-red-500">*</span>}
+                            {item.value}
+                            {/* <span className="text-status-red">{item.required ? " *" : ""}</span> */}
+                            <div className="mb-2">
+                                {(() => {
+                                    switch (item.type) {
+                                        case FormItemType.Text:
+                                            return (
+                                                <InputComponent
+                                                    type="textarea"
+                                                    password={false}
+                                                    maxLength={10000}
+                                                    // value={item.value}
+                                                    onChange={(val) => handleChange(item, val)}
+                                                />
+                                            )
+                                        case FormItemType.Select:
+                                            return (
+                                                item.multiple ?
+                                                    <MultiSelect
+                                                        multiple
+                                                        className={''}
+                                                        value={multiVal[item.key] || []}
+                                                        options={
+                                                            item.options.map(el => ({
+                                                                label: el.text,
+                                                                value: el.text
+                                                            }))
+                                                        }
+                                                        placeholder={'请选择'}
+                                                        onChange={(v) => {
+                                                            setMultiVal(prev => ({ ...prev, [item.key]: v }));
+                                                            handleChange(item, v.join(','))
+                                                        }}
+                                                    >
+                                                        {/* {children?.(reload)} */}
+                                                    </MultiSelect>
+                                                    : <Select onValueChange={(val) => handleChange(item, val)}>
+                                                        <SelectTrigger>
+                                                            <SelectValue placeholder="" />
+                                                        </SelectTrigger>
+                                                        <SelectContent>
+                                                            <SelectGroup>
+                                                                {item.options.map(el => (
+                                                                    <SelectItem key={el.text} value={el.text}>
+                                                                        {el.text}
+                                                                    </SelectItem>
+                                                                ))}
+                                                            </SelectGroup>
+                                                        </SelectContent>
+                                                    </Select>
+                                            )
+                                        case FormItemType.File:
+                                            return (
+                                                <InputFileComponent
+                                                    isSSO
+                                                    disabled={false}
+                                                    placeholder={t('report.fileRequired')}
+                                                    value={''}
+                                                    multiple={item.multiple}
+                                                    onChange={(name) => updataFileName(item, name)}
+                                                    fileTypes={["png", "jpg", "jpeg", "doc", "docx", "ppt", "pptx", "xls", "xlsx", "txt", "md", "html", "pdf"]}
+                                                    suffixes={['xxx']}
+                                                    onFileChange={(val) => handleChange(item, val)}
+                                                />
+                                            )
+                                        default:
+                                            return null
+                                    }
+                                })()}
+                            </div>
                         </div>
-                    </div>
-                ))
-            }
+                    ))
+                }
+                <Button size="sm" className="w-full" onClick={submit}>{t('report.start')}</Button>
+            </div>
         </div>
-        <Button size="sm" onClick={submit}>{t('report.start')}</Button>
     </div>
 };
 
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/MessageBs.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/MessageBs.tsx
index 006b908f4..b2008a591 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/MessageBs.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/MessageBs.tsx
@@ -1,11 +1,14 @@
 import MessageButtons from "@/components/bs-comp/chatComponent/MessageButtons";
 import SourceEntry from "@/components/bs-comp/chatComponent/SourceEntry";
+import { ToastIcon } from "@/components/bs-icons";
 import { AvatarIcon } from "@/components/bs-icons/avatar";
 import { LoadIcon, LoadingIcon } from "@/components/bs-icons/loading";
+import { cname } from "@/components/bs-ui/utils";
 import { CodeBlock } from "@/modals/formModal/chatMessage/codeBlock";
 import { WorkflowMessage } from "@/types/flow";
 import { formatStrTime } from "@/util/utils";
 import { copyText } from "@/utils";
+import { ChevronDown } from "lucide-react";
 import { useMemo, useRef, useState } from "react";
 import ReactMarkdown from "react-markdown";
 import rehypeMathjax from "rehype-mathjax";
@@ -13,9 +16,6 @@ import remarkGfm from "remark-gfm";
 import remarkMath from "remark-math";
 import ChatFile from "./ChatFileFile";
 import { useMessageStore } from "./messageStore";
-import { ChevronDown } from "lucide-react";
-import { cname } from "@/components/bs-ui/utils";
-import { ToastIcon } from "@/components/bs-icons";
 
 // 颜色列表
 const colorList = [
@@ -61,7 +61,8 @@ const ReasoningLog = ({ loading, msg = '' }) => {
     </div>
 }
 
-export default function MessageBs({ mark = false, logo, data, onUnlike = () => { }, disableBtn = false, onSource, onMarkClick }: { logo: string, data: WorkflowMessage, onUnlike?: any, onSource?: any }) {
+export default function MessageBs({ debug, mark = false, logo, data, onUnlike = () => { }, onSource, onMarkClick }:
+    { debug?: boolean, ogo: string, data: WorkflowMessage, onUnlike?: any, onSource?: any }) {
     const avatarColor = colorList[
         (data.sender?.split('').reduce((num, s) => num + s.charCodeAt(), 0) || 0) % colorList.length
     ]
@@ -167,7 +168,7 @@ export default function MessageBs({ mark = false, logo, data, onUnlike = () => {
                             message,
                         })}
                     />
-                    {!disableBtn && <MessageButtons
+                    {!debug && <MessageButtons
                         mark={mark}
                         id={data.id || data.message_id}
                         data={data.liked}
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/MessageBsChoose.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/MessageBsChoose.tsx
index 69289dc92..aad2da645 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/MessageBsChoose.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/MessageBsChoose.tsx
@@ -152,7 +152,7 @@ export default function MessageBsChoose({ type = 'choose', logo, data }: { type?
                             {type === 'input' ?
                                 <div>
                                     <Textarea
-                                        className="w-96"
+                                        className="w-full"
                                         ref={textRef}
                                         disabled={inputSended}
                                         defaultValue={data.message.input_msg}
@@ -168,11 +168,11 @@ export default function MessageBsChoose({ type = 'choose', logo, data }: { type?
                                 : <div>
                                     {data.message.options.map(opt => <div
                                         key={opt.id}
-                                        className="min-w-56 bg-[#fff] dark:bg-background rounded-xl p-4 mt-2 hover:bg-gray-200 cursor-pointer flex justify-between"
+                                        className="min-w-56 bg-[#fff] dark:bg-background rounded-xl p-4 mt-2 hover:bg-gray-200 cursor-pointer flex justify-between items-center break-all"
                                         onClick={() => handleSelect(opt)}
                                     >
                                         {opt.label}
-                                        {selected === opt.id && <CheckCircle size={20} />}
+                                        {selected === opt.id && <CheckCircle size={20} className="min-w-5" />}
                                     </div>)
                                     }
                                 </div>
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/messageStore.ts b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/messageStore.ts
index c01db7627..9644efa28 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/messageStore.ts
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/messageStore.ts
@@ -1,3 +1,4 @@
+import { message } from '@/components/bs-ui/toast/use-toast';
 import { generateUUID } from '@/components/bs-ui/utils';
 import { getChatHistory } from '@/controllers/API';
 import { ChatMessageType } from '@/types/chat';
@@ -27,6 +28,7 @@ type State = {
      * 控制引导问题的显示状态
      */
     showGuideQuestion: boolean
+    inputForm: null | any
 }
 
 type Actions = {
@@ -44,6 +46,7 @@ type Actions = {
     insetBsMsg: (text: string) => void;
     setShowGuideQuestion: (text: boolean) => void;
     clearMsgs: () => void;
+    setInputForm: (inputForm: any) => void;
 }
 
 
@@ -83,7 +86,7 @@ let currentChatId = ''
 export const useMessageStore = create<State & Actions>((set, get) => ({
     chatId: '',
     messages: [],
-
+    inputForm: null,
     running: false,
     hisMessages: [],
     historyEnd: false,
@@ -226,8 +229,19 @@ export const useMessageStore = create<State & Actions>((set, get) => ({
             set({ historyEnd: true })
         }
     },
-
-
+    overWsMsg(data) {
+        // 删除所有未结束消息
+        if (data.type === 'end' && data.message) {
+            console.log('触发安全审计,删除所有未结束消息 :>> ');
+            data.category = "stream_msg"
+            data.type = 'over'
+            data.message_id = generateUUID(8)
+            get().createWsMsg(data)
+            setTimeout(() => {
+                set((state) => ({ messages: state.messages.filter(msg => msg.end) }))
+            }, 0);
+        }
+    },
     // stream end old
     updateCurrentMessage(data) {
         const messages = get().messages
@@ -256,9 +270,15 @@ export const useMessageStore = create<State & Actions>((set, get) => ({
         }, 0);
     },
     destory() {
-        set({ chatId: '', messages: [] })
+        set({
+            chatId: '',
+            messages: [],
+            inputForm: null
+        })
+    },
+    setInputForm(form) {
+        set({ inputForm: form })
     },
-
 
     // // stream end
     // updateCurrentMessage(wsdata, cover = false) {
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/Parameter.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/Parameter.tsx
index f458c3b71..98c335626 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/Parameter.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/Parameter.tsx
@@ -3,6 +3,7 @@ import CodeInputItem from "./component/CodeInputItem";
 import CodeOutputItem from "./component/CodeOutputItem";
 import CodePythonItem from "./component/CodePythonItem";
 import ConditionItem from "./component/ConditionItem";
+import FileTypeSelect from "./component/FileTypeSelect";
 import HistoryNumItem from "./component/HistoryNumItem";
 import InputFormItem from "./component/InputFormItem";
 import InputItem from "./component/InputItem";
@@ -21,9 +22,10 @@ import VarItem from "./component/VarItem";
 import VarSelectItem, { VarSelectSingleItem } from "./component/VarSelectItem";
 import VarTextareaItem from "./component/VarTextareaItem";
 import VarTextareaUploadItem from "./component/VarTextareaUploadItem";
+import ImagePromptItem from "./component/ImagePromptItem";
 
 // 节点表单项
-export default function Parameter({ node, nodeId, item, onOutPutChange, onStatusChange, onVarEvent }
+export default function Parameter({ node, nodeId, item, onOutPutChange, onStatusChange, onFouceUpdate, onVarEvent }
     : {
         nodeId: string,
         node: WorkflowNode,
@@ -31,6 +33,7 @@ export default function Parameter({ node, nodeId, item, onOutPutChange, onStatus
         onOutPutChange: (key: string, value: any) => void
         onStatusChange: (key: string, obj: any) => void
         onVarEvent: (key: string, obj: any) => void
+        onFouceUpdate: () => void
     }) {
 
     const handleOnNewValue = (newValue: any, validate?: any) => {
@@ -47,6 +50,8 @@ export default function Parameter({ node, nodeId, item, onOutPutChange, onStatus
         onVarEvent(item.key, { param: item, validate })
     }
 
+    if (item.hidden) return null
+
     // 渲染逻辑根据 `type` 返回不同的组件
     switch (item.type) {
         case 'textarea':
@@ -60,7 +65,7 @@ export default function Parameter({ node, nodeId, item, onOutPutChange, onStatus
         case 'chat_history_num':
             return <HistoryNumItem data={item} onChange={handleOnNewValue} />
         case 'form':
-            return <InputFormItem data={item} onChange={handleOnNewValue} onValidate={bindValidate} />
+            return <InputFormItem nodeId={nodeId} data={item} onChange={handleOnNewValue} onValidate={bindValidate} />
         case 'var_textarea':
             return <VarTextareaItem nodeId={nodeId} data={item} onChange={handleOnNewValue} onValidate={bindValidate} onVarEvent={bindVarValidate} />
         case 'var_textarea_file':
@@ -131,6 +136,18 @@ export default function Parameter({ node, nodeId, item, onOutPutChange, onStatus
             return <ReportItem nodeId={nodeId} data={item} onChange={handleOnNewValue} onValidate={bindValidate} />;
         case 'sql_config':
             return <SqlConfigItem nodeId={nodeId} data={item} onChange={handleOnNewValue} onValidate={bindValidate} />;
+        case 'select_fileaccept':
+            return <FileTypeSelect data={item} onChange={(val) => {
+                // group_params[0] 受input模板影响
+                const imageFileItem = node.group_params[0].params.find(param => {
+                    if (param.key === 'dialog_image_files') return true
+                })
+                imageFileItem.hidden = val === 'file'
+                handleOnNewValue(val)
+                onFouceUpdate()
+            }} />;
+        case 'image_prompt':
+            return <ImagePromptItem nodeId={nodeId} data={item} onChange={handleOnNewValue} onVarEvent={bindVarValidate}/>;
         default:
             return <div>Unsupported parameter type</div>;
     }
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/ParameterGroup.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/ParameterGroup.tsx
index db9d65853..095535703 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/ParameterGroup.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/ParameterGroup.tsx
@@ -1,7 +1,7 @@
 import { WorkflowNode } from "@/types/flow";
 import Parameter from "./Parameter";
 
-export default function ParameterGroup({ nodeId, node, cate, tab, onOutPutChange, onStatusChange, onVarEvent }
+export default function ParameterGroup({ nodeId, node, cate, tab, onOutPutChange, onStatusChange, onVarEvent, onFouceUpdate }
     : {
         nodeId: string,
         node: WorkflowNode,
@@ -10,6 +10,7 @@ export default function ParameterGroup({ nodeId, node, cate, tab, onOutPutChange
         onOutPutChange: (key: string, value: any) => void
         onStatusChange: (key: string, obj: any) => void
         onVarEvent: (key: string, obj: any) => void
+        onFouceUpdate: () => void
     }) {
 
     if (!cate.params.filter(el => tab === el.tab || !el.tab).length) return null
@@ -24,6 +25,7 @@ export default function ParameterGroup({ nodeId, node, cate, tab, onOutPutChange
             onOutPutChange={onOutPutChange}
             onStatusChange={onStatusChange}
             onVarEvent={onVarEvent}
+            onFouceUpdate={onFouceUpdate}
         /> : null)}
     </div>
 };
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/FileTypeSelect.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/FileTypeSelect.tsx
new file mode 100644
index 000000000..a6a9f24c7
--- /dev/null
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/FileTypeSelect.tsx
@@ -0,0 +1,83 @@
+import { Label } from "@/components/bs-ui/label";
+import { Select, SelectContent, SelectTrigger } from "@/components/bs-ui/select";
+import { Check } from "lucide-react";
+import { useState } from "react";
+
+interface FileTypeSelectProps {
+    data: {
+        label: string;
+        value: 'all' | 'file' | 'image';
+    };
+    onChange: (value: 'all' | 'file' | 'image') => void;
+}
+
+const options = [
+    {
+        label: '文档（pdf、txt、md、html、xls、xlsx、doc、docx、ppt、pptx）',
+        value: 'file'
+    },
+    {
+        label: '图片（png、jpg、jpeg、bmp）',
+        value: 'image'
+    }
+];
+
+export default function FileTypeSelect({ data, onChange }: FileTypeSelectProps) {
+    const [type, setType] = useState(data.value)
+    const handleSelect = (clickedValue: 'file' | 'image') => {
+        let newValue: 'all' | 'file' | 'image' = type;
+
+        if (type === 'all') {
+            // 全选时点击某个类型：取消该类型，保留另一个
+            newValue = clickedValue === 'file' ? 'image' : 'file';
+        } else if (type !== clickedValue) {
+            // 点击已选中的唯一类型：切换回全选
+            newValue = 'all';
+        } else {
+            return
+        }
+        setType(newValue);
+        onChange(newValue);
+    };
+
+    const getDisplayText = () => {
+        switch (type) {
+            case 'all': return '全部类型';
+            case 'file': return '文档';
+            case 'image': return '图片';
+            default: return '全部类型';
+        }
+    };
+
+    const isOptionSelected = (value: 'file' | 'image') => {
+        return type === 'all' || type === value;
+    };
+
+    return (
+        <div className='node-item flex gap-4 items-center mb-4'>
+            <Label className="bisheng-label whitespace-nowrap">
+                {data.label}
+            </Label>
+            <Select >
+                <SelectTrigger>
+                    {getDisplayText()}
+                </SelectTrigger>
+                <SelectContent className="">
+                    {options.map((option) => (
+                        <div
+                            key={option.value}
+                            data-focus={isOptionSelected(option.value)}
+                            className="flex justify-between w-full select-none items-center mb-1 last:mb-0 rounded-sm p-1.5 text-sm outline-none cursor-pointer hover:bg-[#EBF0FF] data-[focus=true]:bg-[#EBF0FF] dark:hover:bg-gray-700 dark:data-[focus=true]:bg-gray-700 data-[disabled]:pointer-events-none data-[disabled]:opacity-50"
+                            onClick={() => handleSelect(option.value as 'file' | 'image')}
+                        >
+                            <span className="w-64 overflow-hidden text-ellipsis">
+                                {option.label}
+                            </span>
+                            {isOptionSelected(option.value) && <Check className="h-4 w-4" />}
+                        </div>
+                    ))}
+                </SelectContent>
+            </Select>
+        </div>
+    );
+}
\ No newline at end of file
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/ImagePromptItem.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/ImagePromptItem.tsx
new file mode 100644
index 000000000..2f20a9118
--- /dev/null
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/ImagePromptItem.tsx
@@ -0,0 +1,104 @@
+import { Badge } from "@/components/bs-ui/badge"
+import { Label } from "@/components/bs-ui/label"
+import { Switch } from "@/components/bs-ui/switch"
+import { QuestionTooltip } from "@/components/bs-ui/tooltip"
+import { isVarInFlow } from "@/util/flowUtils"
+import { ChevronDown, X } from "lucide-react"
+import React, { useCallback, useEffect, useState } from "react"
+import useFlowStore from "../../flowStore"
+import SelectVar from "./SelectVar"
+
+export default function ImagePromptItem({ nodeId, data, onChange, onVarEvent }) {
+    // value ''或[] 则认为open为false
+    const [open, setOpen] = React.useState(data.value && data.value.length > 0)
+    const [value, setValue] = React.useState(() => data.value || []);
+    const [error, setError] = React.useState(false);
+
+    const updateValue = (newValues) => {
+        setValue(newValues);
+        onChange(newValues);
+    };
+
+    const handleDelete = (val) => updateValue(value.filter(el => el !== val));
+    const handleChange = (item, v) => {
+        const itemVar = `${item.id}.${v.value}`;
+        if (!value.includes(itemVar)) {
+            if (!data.varZh) data.varZh = {}; // 确保 data.varZh 已初始化
+            data.varZh[itemVar] = `${item.name}/${v.label}`;
+            const newValues = [...value, itemVar];
+            updateValue(newValues);
+        }
+    };
+
+    const handleVarChange = useCallback((checked, items) => {
+        const newValues = value.filter(el => !items.some(({ node, variable }) => `${node.id}.${variable.value}` === el));
+        if (!checked) return updateValue(newValues);
+
+        items.map(({ node, variable }) => {
+            const itemVar = `${node.id}.${variable.value}`;
+            if (!data.varZh) data.varZh = {};
+            data.varZh[itemVar] = `${node.name}/${variable.label}`;
+            newValues.push(itemVar);
+        })
+        updateValue(newValues);
+    }, [value]);
+
+    // 校验变量是否可用
+    const { flow } = useFlowStore();
+    const [errorKeys, setErrorKeys] = useState<string[]>([])
+    const validateVarAvailble = () => {
+        let error = ''
+        const _errorKeys = []
+        value.map(key => {
+            const _error = isVarInFlow(nodeId, flow.nodes, key, data.varZh?.[key]);
+            if (_error) {
+                _errorKeys.push(key)
+                error = _error
+            }
+        })
+        setErrorKeys(_errorKeys)
+        return Promise.resolve(error);
+    };
+    useEffect(() => {
+        onVarEvent && onVarEvent(validateVarAvailble);
+        return () => onVarEvent && onVarEvent(() => { });
+    }, [data, value]);
+
+
+    return <div className='node-item mb-4' data-key={data.key}>
+        <div className=" flex justify-between items-center">
+            <Label className="flex items-center bisheng-label">
+                {data.label}
+                {data.help && <QuestionTooltip content={data.help} />}
+            </Label>
+            <Switch checked={open} onCheckedChange={(bln) => {
+                setOpen(bln)
+                !bln && updateValue([])
+            }} />
+        </div>
+        {open && <SelectVar
+            findInputFile
+            nodeId={nodeId}
+            itemKey={data.key}
+            multip
+            value={value}
+            onSelect={handleChange}
+            onCheck={handleVarChange}
+        >
+            <div className={`${error && 'border-red-500'} no-drag nowheel mt-2 group flex min-h-9 w-full items-center justify-between whitespace-nowrap rounded-md border border-input bg-search-input px-3 py-1 text-sm shadow-sm ring-offset-background placeholder:text-muted-foreground focus:outline-none focus:ring-1 focus:ring-ring disabled:cursor-not-allowed disabled:opacity-50 [&>span]:line-clamp-1 data-[placeholder]:text-gray-400`}>
+                <div className="flex flex-wrap size-full max-h-32 overflow-y-auto">
+                    {value.length ? value.map(item => <Badge
+                        onPointerDown={(e) => e.stopPropagation()}
+                        key={item}
+                        className={`flex whitespace-normal items-center gap-1 select-none bg-primary/20 text-primary hover:bg-primary/15 m-[2px] ${errorKeys.includes(item) && 'bg-red-100 border-red-600'}`}>
+                        {data.varZh?.[item]}
+                        <X className="h-3 w-3 min-w-3" onClick={() => handleDelete(item)}></X>
+                    </Badge>
+                    ) : <span className="text-gray-400 mt-0.5">{data.placeholder}</span>}
+                </div>
+                <ChevronDown className="h-5 w-5 min-w-5 opacity-80 group-data-[state=open]:rotate-180" />
+            </div>
+        </SelectVar>
+        }
+    </div>
+};
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/InputFormItem.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/InputFormItem.tsx
index ee3bf7828..df3f04857 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/InputFormItem.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/InputFormItem.tsx
@@ -8,6 +8,9 @@ import { ChevronsDown, CloudUpload, Type } from "lucide-react";
 import { useEffect, useRef, useState } from "react";
 import { useTranslation } from "react-i18next"; // 引入国际化
 import DragOptions from "./DragOptions";
+import FileTypeSelect from "./FileTypeSelect";
+import InputItem from "./InputItem";
+import VarInput from "./VarInput";
 
 const enum FormType {
     Text = "text",
@@ -21,7 +24,7 @@ const names = {
     [FormType.File]: "file",
 }
 
-function Form({ initialData, onSubmit, onCancel, existingOptions }) {
+function Form({ nodeId, nodeData, initialData, onSubmit, onCancel, existingOptions }) {
     const { t } = useTranslation('flow');
     const namePlaceholders = {
         [FormType.Text]: t("nameExample"), // 例如“姓名”
@@ -35,6 +38,9 @@ function Form({ initialData, onSubmit, onCancel, existingOptions }) {
         variableName: "",
         filecontent: '',
         filepath: '',
+        fileType: 'all',
+        fileContentSize: 15000,
+        imageFile: '',
         isMultiple: true, // default value for multiple file upload
         isRequired: true,
         allowMultiple: false,  // Allow multiple file uploads
@@ -47,6 +53,7 @@ function Form({ initialData, onSubmit, onCancel, existingOptions }) {
     const oldVarNameRef = useRef("");
     const oldcontentNameRef = useRef("");
     const oldPathNameRef = useRef("");
+    const oldImageFileRef = useRef("");
     useEffect(() => {
         editRef.current = false
         if (initialData) {
@@ -57,7 +64,10 @@ function Form({ initialData, onSubmit, onCancel, existingOptions }) {
                 required: isRequired,
                 multiple: allowMultiple,
                 file_content: filecontent,
+                file_type: fileType,
                 file_path: filepath,
+                file_content_size: fileContentSize,
+                image_file: imageFile,
                 options = [] } = initialData;
             setFormData({
                 formType,
@@ -67,7 +77,10 @@ function Form({ initialData, onSubmit, onCancel, existingOptions }) {
                 allowMultiple,
                 options,
                 filecontent,
+                fileType,
                 filepath,
+                fileContentSize,
+                imageFile,
                 isMultiple: allowMultiple
             });
 
@@ -76,6 +89,7 @@ function Form({ initialData, onSubmit, onCancel, existingOptions }) {
             oldVarNameRef.current = variableName;
             oldcontentNameRef.current = filecontent;
             oldPathNameRef.current = filepath;
+            oldImageFileRef.current = imageFile;
         }
     }, [initialData]);
 
@@ -86,14 +100,16 @@ function Form({ initialData, onSubmit, onCancel, existingOptions }) {
         let initialVarName = names[formData.formType];
         let initialFileContent = 'file_content'
         let initialFilePath = 'file_path'
+        let initialFileImage = 'image_file'
         let counter = 1;
         let initialFileContentCounter = 1;
         let initialFilePathCounter = 1;
+        let initialFileImageCounter = 1
         while (existingOptions?.some(opt => opt.key === initialVarName)) {
             counter += 1;
             initialVarName = `${names[formData.formType]}${counter}`;
         }
-        const fileOtions = existingOptions?.filter(opt => opt.type === FormType.File && !opt.multiple)
+        const fileOtions = existingOptions?.filter(opt => opt.type === FormType.File)
         while (fileOtions?.some(opt => opt.file_content === initialFileContent)) {
             initialFileContentCounter += 1;
             initialFileContent = `file_content${initialFileContentCounter}`;
@@ -102,13 +118,18 @@ function Form({ initialData, onSubmit, onCancel, existingOptions }) {
             initialFilePathCounter += 1;
             initialFilePath = `file_path${initialFilePathCounter}`;
         }
+        while (fileOtions?.some(opt => opt.image_file === initialFileImage)) {
+            initialFileImageCounter += 1;
+            initialFileImage = `image_file${initialFileImageCounter}`;
+        }
         // 变量重命名
         // existingOptions.
         setFormData((prevData) => ({
             ...prevData,
             variableName: initialVarName,
             filecontent: initialFileContent,
-            filepath: initialFilePath
+            filepath: initialFilePath,
+            imageFile: initialFileImage
         }));
     }, [initialData, formData.formType])
 
@@ -139,7 +160,7 @@ function Form({ initialData, onSubmit, onCancel, existingOptions }) {
         }
 
         // Validation for file upload variables (if multiple files are allowed)
-        if (formData.formType === FormType.File && !formData.isMultiple) {
+        if (formData.formType === FormType.File) {
             // Validate file content variable name
             if (!formData.filecontent.trim()) {
                 newErrors.filecontent = t("variableNameRequired");
@@ -148,7 +169,7 @@ function Form({ initialData, onSubmit, onCancel, existingOptions }) {
             } else if (formData.filecontent.length > 50) {
                 newErrors.filecontent = t("variableNameTooLong");
             } else if (
-                existingOptions?.some(opt => !opt.multiple && opt.file_content === formData.filecontent) &&
+                existingOptions?.some(opt => opt.file_content === formData.filecontent) &&
                 formData.filecontent !== oldcontentNameRef.current
             ) {
                 newErrors.filecontent = t("variableNameExists");
@@ -162,17 +183,57 @@ function Form({ initialData, onSubmit, onCancel, existingOptions }) {
             } else if (formData.filepath.length > 50) {
                 newErrors.filepath = t("variableNameTooLong");
             } else if (
-                existingOptions?.some(opt => !opt.multiple && opt.file_path === formData.filepath) &&
+                existingOptions?.some(opt => opt.file_path === formData.filepath) &&
                 formData.filepath !== oldPathNameRef.current
             ) {
                 newErrors.filepath = t("variableNameExists");
             }
+
+            if (formData.fileType !== 'file') {
+                const _error = validateImageFileVariableName(formData.imageFile, existingOptions);
+                if (_error) {
+                    newErrors.imageFile = _error
+                }
+            }
         }
 
+
         setErrors(newErrors);
         return Object.keys(newErrors).length === 0;
     };
 
+    const validateImageFileVariableName = (varName, existingOptions) => {
+        const errors = [];
+
+        // 1. 非空检查
+        if (!varName || !varName.trim()) {
+            return '变量名称不可为空'
+        }
+
+        // 2. 不能以数字开头
+        if (/^\d/.test(varName)) {
+            return '变量名不能以数字开头';
+        }
+
+        // 3. 只能包含英文字符、数字和下划线
+        if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(varName)) {
+            return '变量名称只能包含英文字符、数字和下划线';
+        }
+
+        // 4. 长度不超过50
+        if (varName.length > 50) {
+            return '变量名称不能超过50个字符';
+        }
+
+        // 5. 不能重复
+        if (existingOptions?.some(opt => opt.image_file === formData.imageFile) &&
+            formData.imageFile !== oldImageFileRef.current) {
+            return '变量名已存在';
+        }
+
+        return '';
+    };
+
     const handleFormSubmit = (e) => {
         e.preventDefault();
         if (validateForm()) {
@@ -204,6 +265,7 @@ function Form({ initialData, onSubmit, onCancel, existingOptions }) {
             }
         }
     }
+
     // text form
     const InputForm = <div className="space-y-4">
         <div>
@@ -211,13 +273,24 @@ function Form({ initialData, onSubmit, onCancel, existingOptions }) {
                 {t("displayName")}
                 <QuestionTooltip content={t("displayNameTooltip")} />
             </Label>
-            <Input
+            {/* <Input
                 className={`mt-2 ${errors.displayName ? "border-red-500" : ""}`}
                 id="displayName"
                 placeholder={namePlaceholders[formData.formType]}
                 value={formData.displayName}
                 onChange={(e) => setFormData({ ...formData, displayName: e.target.value })}
-            />
+            /> */}
+            <VarInput
+                key={formData.variableName}
+                label={''}
+                itemKey={''}
+                nodeId={nodeId}
+                flowNode={nodeData}
+                value={formData.displayName}
+                placeholder={namePlaceholders[formData.formType]}
+                onChange={(val) => setFormData({ ...formData, displayName: val })}
+            >
+            </VarInput>
             {errors.displayName && <p className="text-red-500 text-sm">{errors.displayName}</p>}
         </div>
         <div>
@@ -324,7 +397,10 @@ function Form({ initialData, onSubmit, onCancel, existingOptions }) {
                 onCheckedChange={(checked) => setFormData({ ...formData, isMultiple: checked })}
             />
         </div>
-
+        <FileTypeSelect data={{
+            label: "上传文件类型",
+            value: formData.fileType,
+        }} onChange={(fileType) => setFormData({ ...formData, fileType })} />
         <div>
             <Label className="flex items-center bisheng-label">
                 临时知识库名称
@@ -339,39 +415,59 @@ function Form({ initialData, onSubmit, onCancel, existingOptions }) {
             />
             {errors.variableName && <p className="text-red-500 text-sm">{errors.variableName}</p>}
         </div>
-        {!formData.isMultiple && (
-            <>
-                <div>
-                    <Label className="flex items-center bisheng-label">
-                        文件内容变量名称
-                        <QuestionTooltip content={'文件解析结果全文将会存储在此变量中，使用时请注意可能会超出模型上下文长度'} />
-                    </Label>
-                    <Input
-                        className={`mt-2 ${errors.filecontent ? "border-red-500" : ""}`}
-                        id="filecontent"
-                        placeholder={t("enterVariableName")}
-                        value={formData.filecontent}
-                        onChange={(e) => setFormData({ ...formData, filecontent: e.target.value })}
-                    />
-                    {errors.filecontent && <p className="text-red-500 text-sm">{errors.filecontent}</p>}
-                </div>
 
-                <div>
-                    <Label className="flex items-center bisheng-label">
-                        文件路径变量名称
-                        <QuestionTooltip content={'文件路径将会存储在此变量中，后续可在代码节点中使用'} />
-                    </Label>
-                    <Input
-                        className={`mt-2 ${errors.filepath ? "border-red-500" : ""}`}
-                        id="filepath"
-                        placeholder={t("enterVariableName")}
-                        value={formData.filepath}
-                        onChange={(e) => setFormData({ ...formData, filepath: e.target.value })}
-                    />
-                    {errors.filepath && <p className="text-red-500 text-sm">{errors.filepath}</p>}
-                </div>
-            </>
-        )}
+        <div>
+            <Label className="flex items-center bisheng-label">
+                文件内容变量名称
+                <QuestionTooltip content={'文件解析结果全文将会存储在此变量中，使用时请注意可能会超出模型上下文长度'} />
+            </Label>
+            <Input
+                className={`mt-2 ${errors.filecontent ? "border-red-500" : ""}`}
+                id="filecontent"
+                placeholder={t("enterVariableName")}
+                value={formData.filecontent}
+                onChange={(e) => setFormData({ ...formData, filecontent: e.target.value })}
+            />
+            {errors.filecontent && <p className="text-red-500 text-sm">{errors.filecontent}</p>}
+        </div>
+        <InputItem
+            type='number'
+            data={
+                {
+                    label: "文件内容长度限制(字)",
+                    value: formData.fileContentSize,
+                }
+            }
+            onChange={(fileContentSize) => setFormData({ ...formData, fileContentSize })}
+        />
+        <div>
+            <Label className="flex items-center bisheng-label">
+                文件路径变量名称
+                <QuestionTooltip content={'文件路径将会存储在此变量中，后续可在代码节点中使用'} />
+            </Label>
+            <Input
+                className={`mt-2 ${errors.filepath ? "border-red-500" : ""}`}
+                id="filepath"
+                placeholder={t("enterVariableName")}
+                value={formData.filepath}
+                onChange={(e) => setFormData({ ...formData, filepath: e.target.value })}
+            />
+            {errors.filepath && <p className="text-red-500 text-sm">{errors.filepath}</p>}
+        </div>
+        {formData.fileType !== 'file' && <div>
+            <Label className="flex items-center bisheng-label">
+                上传图片文件
+                <QuestionTooltip content={'提取上传文件中的图片文件，当助手或大模型节点使用多模态大模型时，可传入此图片。'} />
+            </Label>
+            <Input
+                className={`mt-2 ${errors.imageFile ? "border-red-500" : ""}`}
+                id="imageFile"
+                placeholder={t("enterVariableName")}
+                value={formData.imageFile}
+                onChange={(e) => setFormData({ ...formData, imageFile: e.target.value })}
+            />
+            {errors.imageFile && <p className="text-red-500 text-sm">{errors.imageFile}</p>}
+        </div>}
     </div>;
 
     return (
@@ -424,7 +520,7 @@ function Form({ initialData, onSubmit, onCancel, existingOptions }) {
         </form>
     );
 }
-export default function InputFormItem({ data, onChange, onValidate }) {
+export default function InputFormItem({ data, nodeId, onChange, onValidate }) {
     const { t } = useTranslation('flow'); // 使用国际化
     const [isOpen, setIsOpen] = useState(false);
     const [editKey, setEditKey] = useState(""); // 控制编辑模式
@@ -455,6 +551,8 @@ export default function InputFormItem({ data, onChange, onValidate }) {
             variableName: key,
             filecontent: file_content,
             filepath: file_path,
+            fileContentSize: file_content_size,
+            imageFile: image_file
         } = _data;
 
         const multiple = type === FormType.File ? isMultiple : allowMultiple;
@@ -462,7 +560,18 @@ export default function InputFormItem({ data, onChange, onValidate }) {
             // 编辑模式，更新表单项
             data.value = data.value.map((opt) =>
                 opt.key === editKey
-                    ? { key, type, value, required, multiple, options, file_content, file_path }
+                    ? {
+                        key,
+                        type,
+                        value,
+                        required,
+                        multiple,
+                        options,
+                        file_content,
+                        file_path,
+                        file_content_size,
+                        image_file
+                    }
                     : opt
             );
         } else {
@@ -476,6 +585,8 @@ export default function InputFormItem({ data, onChange, onValidate }) {
                 file_content,
                 file_path,
                 options,
+                file_content_size,
+                image_file
             });
             setTimeout(() => {
                 scrollRef.current?.scrollTo(0, scrollRef.current?.scrollHeight); // 滚动到底部
@@ -548,6 +659,8 @@ export default function InputFormItem({ data, onChange, onValidate }) {
                     </DialogHeader>
 
                     <Form
+                        nodeId={nodeId}
+                        nodeData={data}
                         initialData={
                             editKey
                                 ? data.value.find((el) => el.key === editKey)
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/InputItem.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/InputItem.tsx
index 6e0dc9bf2..55f71878e 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/InputItem.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/InputItem.tsx
@@ -14,6 +14,7 @@ export default function InputItem({ type = 'text', data, onChange }) {
         <Input className="mt-2 nodrag"
             value={value}
             type={type}
+            min={data.min}
             onChange={(e) => {
                 setValue(e.target.value);
                 onChange(e.target.value);
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/ModelItem.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/ModelItem.tsx
index ddc80afef..4b8690192 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/ModelItem.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/ModelItem.tsx
@@ -83,12 +83,13 @@ export default function ModelItem({ agent = false, data, onChange, onValidate })
             {data.required && <span className="text-red-500">*</span>}
             {data.label}
         </Label>
-        {!loading ? <Cascader
+        <Cascader
+            key={defaultValue[0]?.value}
             error={error}
             placholder={data.placeholder}
             defaultValue={defaultValue}
             options={options}
             onChange={(val) => onChange(val[1])}
-        /> : null}
+        />
     </div>
 };
\ No newline at end of file
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/OutputItem.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/OutputItem.tsx
index 8434afce7..86cc26d92 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/OutputItem.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/OutputItem.tsx
@@ -20,7 +20,7 @@ const OutputItem = ({ nodeId, node, data, onChange, onValidate }) => {
     }, [data.options]);
 
     const nData = useMemo(() => {
-        return { ...data, label: '变量输入', required: false }
+        return { ...data, label: '用户输入内容', required: false }
     }, [data])
 
     // 根据交互类型切换不同的展示
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/SelectVar.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/SelectVar.tsx
index d51337537..09b88f829 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/SelectVar.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/SelectVar.tsx
@@ -53,7 +53,10 @@ const getSpecialVar = (obj, type) => {
  * @param  nodeId 节点id, itemKey 当前变量key, children, onSelect
  * @returns 
  */
-const SelectVar = forwardRef(({ nodeId, itemKey, multip = false, value = [], children, onSelect, onCheck, className = '' }, ref) => {
+const SelectVar = forwardRef(({
+    nodeId,
+    findInputFile = false, // 只展示input节点file_image变量
+    itemKey, multip = false, value = [], children, onSelect, onCheck, className = '' }, ref) => {
     const [open, setOpen] = useState(false)
     const { flow } = useFlowStore()
     const [select, setSelect] = useState(['', ''])
@@ -151,7 +154,16 @@ const SelectVar = forwardRef(({ nodeId, itemKey, multip = false, value = [], chi
     const nodeTemps = useMemo(() => {
         if (!flow.nodes || !open) return []
         return flow.nodes.reduce((list, temp) => {
-            const newNode = getNodeDataByTemp(temp.data)
+            let tempData = temp.data
+            if (findInputFile) {
+                // 过滤非input节点
+                if (temp.data.type !== 'input') return list
+                tempData = cloneDeep(temp.data)
+                const groupParam = tempData.group_params.find(grouparam =>
+                    grouparam.params.some(param => param.key === 'dialog_image_files'))
+                groupParam.params = groupParam.params.filter(param => param.key === 'dialog_image_files')
+            }
+            const newNode = getNodeDataByTemp(tempData)
             newNode.data && list.push(newNode)
             return list
         }, [])
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/VarInput.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/VarInput.tsx
index 7c66400ed..87d6f8091 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/VarInput.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/VarInput.tsx
@@ -56,6 +56,7 @@ export default function VarInput({
     itemKey,
     placeholder = '',
     flowNode,
+    label = undefined,
     full = false,
     value,
     error = false,
@@ -186,7 +187,7 @@ export default function VarInput({
             <div className="flex justify-between gap-1 border-b dark:border-gray-600 px-2 py-1" onClick={() => textareaRef.current.focus()}>
                 <Label className="bisheng-label text-xs" onClick={validateVarAvailble}>
                     {flowNode.required && <span className="text-red-500">*</span>}
-                    {flowNode.label}
+                    {label ?? flowNode.label}
                 </Label>
                 <div className="flex gap-2">
                     <SelectVar ref={selectVarRef} nodeId={nodeId} itemKey={itemKey} onSelect={handleInsertVariable}>
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/VarSelectItem.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/VarSelectItem.tsx
index e122b3764..15498f3c3 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/VarSelectItem.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/VarSelectItem.tsx
@@ -8,7 +8,7 @@ import { useTranslation } from "react-i18next";
 import useFlowStore from "../../flowStore";
 import SelectVar from "./SelectVar";
 
-const valueToOutput = (newValues, varZh) => {
+export const valueToOutput = (newValues, varZh) => {
     return newValues.map(el => {
         const labelName = varZh[el];
         return {
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/VarTextareaUploadItem.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/VarTextareaUploadItem.tsx
index 0d5ed392a..beeecf8fa 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/VarTextareaUploadItem.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/VarTextareaUploadItem.tsx
@@ -6,6 +6,7 @@ import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { useParams } from "react-router-dom";
 import VarInput from "./VarInput";
+import { Badge } from "@/components/bs-ui/badge";
 
 export default function VarTextareaUploadItem({ nodeId, data, onChange, onValidate, onVarEvent }) {
     // console.log('data.value :>> ', data.value);
@@ -34,10 +35,12 @@ export default function VarTextareaUploadItem({ nodeId, data, onChange, onValida
 
     return (
         <div className='node-item mb-4 nodrag' data-key={data.key}>
-            {/* <Label className='bisheng-label'>
-                {data.required && <span className="text-red-500">*</span>}
-                {data.label}
-            </Label> */}
+            <div className="flex justify-between items-center">
+                <Label className="flex items-center bisheng-label">
+                    消息内容变量
+                </Label>
+                <Badge variant="outline" className="bg-[#E6ECF6] text-[#2B53A0]">{data.key}</Badge>
+            </div>
             <VarInput
                 error={error}
                 placeholder={data.placeholder}
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/index.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/index.tsx
index a9711e50e..9a4170ccd 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/index.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/index.tsx
@@ -246,6 +246,7 @@ function CustomNode({ data: node, selected, isConnectable }: { data: WorkflowNod
                                 node={node}
                                 cate={group}
                                 onOutPutChange={handleChangeOutPut}
+                                onFouceUpdate={() => setFocusUpdate(!focusUpdate)}
                                 onStatusChange={((key, obj) => paramValidateEntities.current[key] = obj)}
                                 onVarEvent={((key, obj) => varValidateEntities.current[key] = obj)}
                             />
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/Notification.tsx b/src/frontend/platform/src/pages/BuildPage/flow/Notification.tsx
index 4d5fb7e8d..32e3d4933 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/Notification.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/Notification.tsx
@@ -23,7 +23,7 @@ export default function Notification() {
                     <Bell size={16} />
                 </Button>
             </PopoverTrigger>
-            <PopoverContent className="p-2 cursor-pointer w-[400px] h-[500px]">
+            <PopoverContent className="p-2 cursor-pointer w-[400px] h-[500px] pb-10">
                 <div className="text-md flex flex-row justify-between pl-3 font-medium text-foreground">
                     {t("flow.notification")}
                     <div className="flex gap-3 pr-3">
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/flowStore.ts b/src/frontend/platform/src/pages/BuildPage/flow/flowStore.ts
index aadf21aad..39d35fb09 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/flowStore.ts
+++ b/src/frontend/platform/src/pages/BuildPage/flow/flowStore.ts
@@ -61,7 +61,7 @@ const useFlowStore = create<State & Actions & { notifications: Notification[]; a
     // 添加消息到队列
     addNotification: (notification) =>
         set((state) => ({
-            notifications: [...state.notifications, notification]
+            notifications: [notification, ...state.notifications,]
         })),
     // 清空消息队列
     clearNotifications: () => set({ notifications: [] }),
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/index.tsx b/src/frontend/platform/src/pages/BuildPage/flow/index.tsx
index e6057a621..7581bb03f 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/index.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/index.tsx
@@ -18,12 +18,12 @@ export default function FlowPage() {
     //     }
     // }, [])
 
-    const { flow, setFlow, clearRunCache } = useFlowStore()
+    const { flow, setFlow, clearRunCache, clearNotifications } = useFlowStore()
 
     useEffect(() => {
         getFlowApi(id).then(f => {
             clearRunCache();
-            
+
             if (f.data) {
                 const { data, ..._flow } = f
                 return setFlow({
@@ -49,6 +49,7 @@ export default function FlowPage() {
         return () => {
             setFlow(null);
             clearRunCache();
+            clearNotifications()
         }
     }, [])
 
diff --git a/src/frontend/platform/src/pages/ChatAppPage/components/ChatPanne.tsx b/src/frontend/platform/src/pages/ChatAppPage/components/ChatPanne.tsx
index bc4f646f3..7fca14b3b 100644
--- a/src/frontend/platform/src/pages/ChatAppPage/components/ChatPanne.tsx
+++ b/src/frontend/platform/src/pages/ChatAppPage/components/ChatPanne.tsx
@@ -162,7 +162,7 @@ export default function ChatPanne({ customWsHost = '', appendHistory = false, da
     // 应用链接
     const { appConfig } = useContext(locationContext)
     const token = localStorage.getItem("ws_token") || '';
-    const host = appConfig.websocketHost || ''
+    const host = appConfig.websocketHost || window.location.host;
     let wsUrl = type === AppNumType.SKILL ? `${host}${__APP_ENV__.BASE_URL}/api/v1/chat/${id}?type=L1&t=${token}` :
         type === AppNumType.ASSISTANT ? `${location.host}${__APP_ENV__.BASE_URL}/api/v1/assistant/chat/${id}?t=${token}` :
             `${host}${__APP_ENV__.BASE_URL}/api/v1/workflow/chat/${id}?t=${token}&chat_id=${chatId}`
diff --git a/src/frontend/platform/src/pages/KnowledgePage/KnowledgeFile.tsx b/src/frontend/platform/src/pages/KnowledgePage/KnowledgeFile.tsx
index c2d105c41..1066ffad1 100644
--- a/src/frontend/platform/src/pages/KnowledgePage/KnowledgeFile.tsx
+++ b/src/frontend/platform/src/pages/KnowledgePage/KnowledgeFile.tsx
@@ -129,6 +129,7 @@ function CreateModal({ datalist, open, setOpen, onLoadEnd }) {
                     {
                         modal && <Cascader
                             defaultValue={modal}
+                            placholder="请在模型管理中配置 embedding 模型"
                             options={options}
                             onChange={(a, val) => setModal(val)}
                         />
diff --git a/src/frontend/platform/src/pages/KnowledgePage/KnowledgeQa.tsx b/src/frontend/platform/src/pages/KnowledgePage/KnowledgeQa.tsx
index 4e9c351e3..0828c9280 100644
--- a/src/frontend/platform/src/pages/KnowledgePage/KnowledgeQa.tsx
+++ b/src/frontend/platform/src/pages/KnowledgePage/KnowledgeQa.tsx
@@ -121,6 +121,7 @@ function CreateModal({ datalist, open, setOpen, onLoadEnd }) {
                     {
                         modal && <Cascader
                             defaultValue={modal}
+                            placholder="请在模型管理中配置 embedding 模型"
                             options={options}
                             onChange={(a, val) => setModal(val)}
                         />
diff --git a/src/frontend/platform/src/pages/KnowledgePage/components/Header.tsx b/src/frontend/platform/src/pages/KnowledgePage/components/Header.tsx
index f149f9110..ed05e6002 100644
--- a/src/frontend/platform/src/pages/KnowledgePage/components/Header.tsx
+++ b/src/frontend/platform/src/pages/KnowledgePage/components/Header.tsx
@@ -44,7 +44,7 @@ export default function Header() {
     }
 
     return <div className="flex items-start h-14">
-        <ShadTooltip content="back" side="top">
+        <ShadTooltip content={t('back')} side="top">
             <button className="extra-side-bar-buttons w-[36px]" onClick={() => { }} >
                 <Link to='/filelib'><ArrowLeft className="side-bar-button-size" /></Link>
             </button>
diff --git a/src/frontend/platform/src/pages/KnowledgePage/components/ImportQa.tsx b/src/frontend/platform/src/pages/KnowledgePage/components/ImportQa.tsx
index b263696f8..3f3534a6b 100644
--- a/src/frontend/platform/src/pages/KnowledgePage/components/ImportQa.tsx
+++ b/src/frontend/platform/src/pages/KnowledgePage/components/ImportQa.tsx
@@ -81,7 +81,7 @@ function QaTable({ dataList }) {
                 </TableRow>
                 <TableBody>
                     {dataList.map(el => {
-                        const questions = [1,2,3,4] // el.questions.filter(item => !!item);
+                        const questions = el.questions.filter(item => !!item);
                         const mainQuestion = questions.shift() || '';
                         const answers = JSON.parse(el.answers);
                         const answer = answers[0] || '';
@@ -275,7 +275,7 @@ export const ImportQa = forwardRef(function ({ knowlageId, onChange }: any, ref)
                         <SimpleUpload
                             filekey="file"
                             uploadUrl={'/api/v1/knowledge/upload'}
-                            accept={['xlsx']}
+                            accept={['xls', 'xlsx']}
                             className={`${error.fileUrl ? 'border-red-400' : ''}`}
                             onSuccess={handleFileUploadSuccess}
                             preCheck={excelPreCheck}
@@ -285,7 +285,7 @@ export const ImportQa = forwardRef(function ({ knowlageId, onChange }: any, ref)
                 </div>
                 {!!dataList.length && <div>
                     <label htmlFor="dataSetName" className="bisheng-label">
-                    导入预览（仅显示前十条）
+                        导入预览（仅显示前十条）
                     </label>
                     <div className="flex flex-col gap-4 py-2 max-h-[36vh] overflow-y-auto">
                         <QaTable dataList={dataList} />
diff --git a/src/frontend/platform/src/pages/KnowledgePage/filesUpload.tsx b/src/frontend/platform/src/pages/KnowledgePage/filesUpload.tsx
index 6c4a6200e..b82e08ac0 100644
--- a/src/frontend/platform/src/pages/KnowledgePage/filesUpload.tsx
+++ b/src/frontend/platform/src/pages/KnowledgePage/filesUpload.tsx
@@ -33,7 +33,7 @@ export default function FilesUpload() {
         {/* 文件上传 */}
         <div className="w-[44%] min-w-[520px]">
             <div className="flex items-center">
-                <ShadTooltip content="back" side="top">
+                <ShadTooltip content={t('back')} side="top">
                     <button className="extra-side-bar-buttons w-[36px]" onClick={() => navigate(-1)}  >
                         <ArrowLeft className="side-bar-button-size" />
                     </button>
diff --git a/src/frontend/platform/src/pages/KnowledgePage/qas.tsx b/src/frontend/platform/src/pages/KnowledgePage/qas.tsx
index 328eeb2b3..6d00503fa 100644
--- a/src/frontend/platform/src/pages/KnowledgePage/qas.tsx
+++ b/src/frontend/platform/src/pages/KnowledgePage/qas.tsx
@@ -6,7 +6,7 @@ import { Checkbox } from "@/components/bs-ui/checkBox";
 import { Dialog, DialogClose, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/bs-ui/dialog";
 import { Switch } from "@/components/bs-ui/switch";
 import { useToast } from "@/components/bs-ui/toast/use-toast";
-import { downloadFile } from "@/util/utils";
+import { downloadFile, formatDate } from "@/util/utils";
 import { ArrowLeft } from "lucide-react";
 import { forwardRef, useEffect, useImperativeHandle, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -329,7 +329,7 @@ export default function QasPage() {
                         <Button variant="outline" className="px-8" onClick={() => {
                             getQaFile(id).then(res => {
                                 const fileUrl = res.file_list[0];
-                                downloadFile(checkSassUrl(fileUrl), `${title}.xlsx`);
+                                downloadFile(checkSassUrl(fileUrl), `${title} ${formatDate(new Date(), 'yyyy-MM-dd')}.xlsx`);
                             })
                         }}>导出</Button>
                         <Button className="px-8" onClick={() => editRef.current.open()}>{t('createQA')}</Button>
@@ -369,7 +369,7 @@ export default function QasPage() {
                                         {el.answers}
                                     </div>
                                 </TableCell>
-                                <TableCell>{[t('unknown'), t('manualCreation'), t('auditTag')][el.source]}</TableCell>
+                                <TableCell>{['未知', '手动创建', '标注导入', 'API导入', '批量导入'][el.source]}</TableCell>
                                 <TableCell>{el.create_time.replace('T', ' ')}</TableCell>
                                 <TableCell>{el.update_time.replace('T', ' ')}</TableCell>
                                 <TableCell>{el.user_name}</TableCell>
diff --git a/src/frontend/platform/src/pages/LabelPage/taskAppChats.tsx b/src/frontend/platform/src/pages/LabelPage/taskAppChats.tsx
index f61e53553..c1fa4fe93 100644
--- a/src/frontend/platform/src/pages/LabelPage/taskAppChats.tsx
+++ b/src/frontend/platform/src/pages/LabelPage/taskAppChats.tsx
@@ -136,7 +136,7 @@ export default function index() {
         <div className="bg-background-login px-4">
             <div className="flex justify-between items-center py-4">
                 <div className="flex items-center">
-                    <ShadTooltip content="back" side="top">
+                    <ShadTooltip content={t('back')} side="top">
                         <Button
                             className="w-[36px] px-2 rounded-full"
                             variant="outline"
diff --git a/src/frontend/platform/src/pages/LogPage/useAppLog/appChatDetail.tsx b/src/frontend/platform/src/pages/LogPage/useAppLog/appChatDetail.tsx
index 4d7cbc2f9..e9e07b088 100644
--- a/src/frontend/platform/src/pages/LogPage/useAppLog/appChatDetail.tsx
+++ b/src/frontend/platform/src/pages/LogPage/useAppLog/appChatDetail.tsx
@@ -54,7 +54,7 @@ export default function AppChatDetail() {
         <div className="bg-background-login px-4">
             <div className="flex justify-between items-center py-4">
                 <div className="flex items-center">
-                    <ShadTooltip content="back" side="top">
+                    <ShadTooltip content={t('back')} side="top">
                         <Button
                             className="w-[36px] px-2 rounded-full"
                             variant="outline"
@@ -66,7 +66,7 @@ export default function AppChatDetail() {
             </div>
             <div className="h-[calc(100vh-132px)]">
                 {type === AppNumType.FLOW
-                    ? <ChatMessages logo={''} disableBtn useName={''} guideWord={''} loadMore={() => loadMoreFlowHistoryMsg(fid, true)} onMarkClick={null}></ChatMessages>
+                    ? <ChatMessages logo={''} debug useName={''} guideWord={''} loadMore={() => loadMoreFlowHistoryMsg(fid, true)} onMarkClick={null}></ChatMessages>
                     : <MessagePanne logo='' useName='' guideWord=''
                         loadMore={() => loadMoreHistoryMsg(fid, true)}
                     ></MessagePanne>
diff --git a/src/frontend/platform/src/pages/ModelPage/manage/CustomForm.tsx b/src/frontend/platform/src/pages/ModelPage/manage/CustomForm.tsx
index d9e0b5ed8..b709b690c 100644
--- a/src/frontend/platform/src/pages/ModelPage/manage/CustomForm.tsx
+++ b/src/frontend/platform/src/pages/ModelPage/manage/CustomForm.tsx
@@ -2,6 +2,7 @@ import { Input } from "@/components/bs-ui/input";
 import { Label } from "@/components/bs-ui/label";
 import { forwardRef, useEffect, useImperativeHandle, useState } from "react";
 
+// 模型表单项
 const modelProviders = {
     ollama: [
         {
@@ -104,14 +105,6 @@ const modelProviders = {
         },
     ],
     qwen: [
-        {
-            label: "Base URL",
-            type: "text",
-            default: "https://dashscope.aliyuncs.com/compatible-mode/v1",
-            placeholder: "",
-            required: true,
-            key: "openai_api_base",
-        },
         {
             label: "API Key",
             type: "password",
@@ -254,6 +247,78 @@ const modelProviders = {
             required: true,
             key: "host_base_url",
         }
+    ],
+    tencent: [
+        {
+            label: "Base URL",
+            type: "text",
+            placeholder: "https://api.hunyuan.cloud.tencent.com/v1",
+            default: "https://api.hunyuan.cloud.tencent.com/v1",
+            required: true,
+            key: "base_url",
+        },
+        {
+            label: "API Key",
+            type: "password",
+            placeholder: "",
+            default: "",
+            required: true,
+            key: "api_key",
+        },
+    ],
+    moonshot: [
+        {
+            label: "Base URL",
+            type: "text",
+            placeholder: "格式示例：https://api.moonshot.cn/v1",
+            default: "https://api.moonshot.cn/v1",
+            required: true,
+            key: "base_url",
+        },
+        {
+            label: "API Key",
+            type: "password",
+            placeholder: "",
+            default: "",
+            required: true,
+            key: "api_key",
+        },
+    ],
+    "火山引擎": [
+        {
+            label: "Base URL",
+            type: "text",
+            placeholder: "格式示例：https://ark.cn-beijing.volces.com/api/v3",
+            default: "https://ark.cn-beijing.volces.com/api/v3",
+            required: true,
+            key: "base_url",
+        },
+        {
+            label: "API Key",
+            type: "password",
+            placeholder: "",
+            default: "",
+            required: true,
+            key: "api_key",
+        },
+    ],
+    "silicon": [
+        {
+            label: "Base URL",
+            type: "text",
+            placeholder: "",
+            default: "https://api.siliconflow.cn/v1",
+            required: true,
+            key: "openai_api_base",
+        },
+        {
+            label: "API Key",
+            type: "password",
+            placeholder: "",
+            default: "",
+            required: true,
+            key: "api_key",
+        },
     ]
 };
 
diff --git a/src/frontend/platform/src/pages/ModelPage/manage/ModelConfig.tsx b/src/frontend/platform/src/pages/ModelPage/manage/ModelConfig.tsx
index 393e19b67..ddabdaedb 100644
--- a/src/frontend/platform/src/pages/ModelPage/manage/ModelConfig.tsx
+++ b/src/frontend/platform/src/pages/ModelPage/manage/ModelConfig.tsx
@@ -15,10 +15,12 @@ import { useTranslation } from "react-i18next";
 import CustomForm from "./CustomForm";
 import { LoadingIcon } from "@/components/bs-icons/loading";
 
-function ModelItem({ data, onDelete, onInput }) {
+function ModelItem({ data, type, onDelete, onInput, onConfig }) {
     const { t } = useTranslation('model')
     const [model, setModel] = useState(data)
     const [error, setError] = useState('')
+    const [isWebSearchEnabled, setIsWebSearchEnabled] = useState(data.config?.enable_web_search || false)
+    const [maxTokens, setMaxTokens] = useState(data.config?.max_tokens ?? '')
 
     const handleInput = (e) => {
         const value = e.target.value
@@ -26,14 +28,19 @@ function ModelItem({ data, onDelete, onInput }) {
         const repeated = onInput(value, model.model_type)
 
         setError('')
-        if (repeated) setError(t('model.modelNameDuplicate'))
         if (!value) setError(t('model.modelNameEmpty'))
         if (value.length > 100) setError(t('model.modelNameLength'))
+        if (repeated) setError(t('model.modelNameDuplicate'))
     }
 
     const handleSelectChange = (val) => {
         setModel({ ...model, model_type: val })
         onInput(model.model_name, val)
+
+        // Reset states when model_type changes
+        setIsWebSearchEnabled(false)  // Reset web search toggle to false
+        setMaxTokens('')  // Reset max tokens input
+        // onConfig(null)
     }
 
     const handleDelClick = () => {
@@ -46,38 +53,81 @@ function ModelItem({ data, onDelete, onInput }) {
         })
     }
 
-    return <div className="group w-full border rounded-sm p-4 mb-2">
-        <div className="flex items-center justify-between">
-            <span>{model.name.replace('model', t('model.model'))}</span>
-            <Trash2Icon onClick={handleDelClick} className="w-[16px] h-[16px] opacity-0 group-hover:opacity-100 cursor-pointer text-gray-500" />
-        </div>
-        <div className="space-y-2 mt-2">
-            <div>
-                <Label className="bisheng-label">
-                    <span>{t('model.modelName')}</span>
-                    <QuestionTooltip className="relative top-0.5 ml-1" content={t('model.modelNameTooltip')} />
-                </Label>
-                <Label className="bisheng-label"></Label>
-                <Input value={model.model_name} onChange={handleInput} className="h-8"></Input>
-                {error && <span className="text-red-500 text-xs">{error}</span>}
+    const handleSwitchChange = (checked) => {
+        setIsWebSearchEnabled(checked)
+        onConfig({ enable_web_search: checked, max_tokens: maxTokens })
+    }
+
+    const handleMaxTokensChange = (e) => {
+        const value = e.target.value
+        setMaxTokens(value)
+
+        if (value === '') {
+            onConfig({ enable_web_search: isWebSearchEnabled })
+        } else {
+            onConfig({ enable_web_search: isWebSearchEnabled, max_tokens: parseInt(value, 10) })
+        }
+    }
+
+    return (
+        <div className="group w-full border rounded-sm p-4 mb-2">
+            <div className="flex items-center justify-between">
+                <span>{model.name.replace('model', t('model.model'))}</span>
+                <Trash2Icon
+                    onClick={handleDelClick}
+                    className="w-[16px] h-[16px] opacity-0 group-hover:opacity-100 cursor-pointer text-gray-500"
+                />
             </div>
-            <div>
-                <Label className="bisheng-label">{t('model.modelType')}</Label>
-                <Select value={model.model_type} onValueChange={handleSelectChange}>
-                    <SelectTrigger className="h-8">
-                        <SelectValue placeholder="" />
-                    </SelectTrigger>
-                    <SelectContent>
-                        <SelectGroup>
-                            <SelectItem value="llm">LLM</SelectItem>
-                            <SelectItem value="embedding">Embedding</SelectItem>
-                            <SelectItem value="rerank">Rerank</SelectItem>
-                        </SelectGroup>
-                    </SelectContent>
-                </Select>
+            <div className="space-y-2 mt-2">
+                <div>
+                    <Label className="bisheng-label">
+                        <span>{t('model.modelName')}</span>
+                        <QuestionTooltip
+                            className="relative top-0.5 ml-1"
+                            content={t('model.modelNameTooltip')}
+                        />
+                    </Label>
+                    <Label className="bisheng-label"></Label>
+                    <Input value={model.model_name} onChange={handleInput} className="h-8"></Input>
+                    {error && <span className="text-red-500 text-xs">{error}</span>}
+                </div>
+                <div>
+                    <Label className="bisheng-label">{t('model.modelType')}</Label>
+                    <Select value={model.model_type} onValueChange={handleSelectChange}>
+                        <SelectTrigger className="h-8">
+                            <SelectValue placeholder="" />
+                        </SelectTrigger>
+                        <SelectContent>
+                            <SelectGroup>
+                                <SelectItem value="llm">LLM</SelectItem>
+                                <SelectItem value="embedding">Embedding</SelectItem>
+                                <SelectItem value="rerank">Rerank</SelectItem>
+                            </SelectGroup>
+                        </SelectContent>
+                    </Select>
+                </div>
+                {model.model_type === 'llm' && (
+                    <>
+                        {['qwen', 'tencent', 'moonshot'].includes(type) && <div className="flex gap-2 items-center">
+                            <Label className="bisheng-label">联网搜索</Label>
+                            <Switch checked={isWebSearchEnabled} onCheckedChange={handleSwitchChange} />
+                        </div>}
+                        <div>
+                            <Label className="bisheng-label">
+                                {type === 'qianfan' ? 'max_output_tokens' : (type === 'ollama' ? 'num_ctx' : 'max_tokens')}
+                            </Label>
+                            <Input
+                                type="number"
+                                value={maxTokens}
+                                onChange={handleMaxTokensChange}
+                                className="h-8"
+                            />
+                        </div>
+                    </>
+                )}
             </div>
         </div>
-    </div>
+    )
 }
 
 
@@ -90,12 +140,16 @@ export const modelProvider = [
     { "name": "llamacpp", "value": "llamacpp" },
     { "name": "vllm", "value": "vllm" },
     { "name": "通义千问", "value": "qwen" },
-    { "name": "百度千帆", "value": "qianfan" },
+    { "name": "Deepseek", "value": "deepseek" },
+    { "name": "硅基流动", "value": "silicon" },
+    { "name": "火山引擎", "value": "火山引擎" },
     { "name": "智谱 AI", "value": "zhipu" },
+    { "name": "讯飞星火", "value": "spark" },
+    { "name": "腾讯云", "value": "tencent" },
+    { "name": "Moonshot", "value": "moonshot" },
+    { "name": "百度千帆", "value": "qianfan" },
     { "name": "Minimax", "value": "minimax" },
     { "name": "Anthropic", "value": "anthropic" },
-    { "name": "Deepseek", "value": "deepseek" },
-    { "name": "讯飞星火", "value": "spark" }
 ]
 const bishengModelProvider = { "name": "bishengRT", "value": "bisheng_rt" }
 
@@ -121,9 +175,12 @@ export default function ModelConfig({ id, onGetName, onBack, onReload, onBerforS
         })
     }, [id])
 
+    const getModelsByType = useSelectModel()
     const handleTypeChange = (val) => {
         const name = onGetName(val)
-        setFormData({ ...formData, type: val, name })
+        // 自动填充模型
+        const models = getModelsByType(val)
+        setFormData({ ...formData, type: val, name, models })
     }
 
     const handleAddModel = () => {
@@ -146,6 +203,7 @@ export default function ModelConfig({ id, onGetName, onBack, onReload, onBerforS
     const handleModelChange = (name, type, index) => {
         const models = formData.models.map((el, i) => index === i ? {
             ...el,
+            config: type === 'llm' ? el.config : null,
             model_name: name,
             model_type: type
         } : el)
@@ -154,6 +212,14 @@ export default function ModelConfig({ id, onGetName, onBack, onReload, onBerforS
         return formData.models.find((el, i) => index !== i && el.model_name === name)
     }
 
+    const handleModelConfig = (config, index) => {
+        const models = formData.models.map((el, i) => index === i ? {
+            ...el,
+            config
+        } : el)
+        setFormData({ ...formData, models })
+    }
+
     // submit 
     const { message, toast } = useToast()
     const formRef = useRef(null)
@@ -293,9 +359,9 @@ export default function ModelConfig({ id, onGetName, onBack, onReload, onBerforS
                         <Switch checked={formData.limit_flag} onCheckedChange={(val) => setFormData(form => ({ ...form, limit_flag: val }))} />
                         <div className={`flex items-center gap-x-2 ${formData.limit_flag ? '' : 'invisible'}`}>
                             <Input type="number" value={formData.limit} onChange={(e) => setFormData({ ...formData, limit: Number(e.target.value) })}
-                                className="w-20 h-8"
+                                className="w-24 h-8"
                             ></Input>
-                            <span className="min-w-24">{t('model.timesPerDay')}</span>
+                            <span>{t('model.timesPerDay')}</span>
                         </div>
                     </div>
                 </div>
@@ -304,7 +370,14 @@ export default function ModelConfig({ id, onGetName, onBack, onReload, onBerforS
                     <Label className="bisheng-label">{t('model.model')}</Label>
                     <div className="w-[92%]">
                         {
-                            formData.models.map((m, i) => <ModelItem data={m} onInput={(name, type) => handleModelChange(name, type, i)} key={m.name} onDelete={() => handleDelete(i)} />)
+                            formData.models.map((m, i) => <ModelItem
+                                data={m}
+                                type={formData.type}
+                                onInput={(name, type) => handleModelChange(name, type, i)}
+                                onConfig={(config) => handleModelConfig(config, i)}
+                                key={m.name}
+                                onDelete={() => handleDelete(i)}
+                            />)
                         }
                         <Button className="w-full mt-2 border-dashed border-border" variant="outline" onClick={handleAddModel}>
                             <Plus className="size-5 text-primary mr-1" />
@@ -320,4 +393,32 @@ export default function ModelConfig({ id, onGetName, onBack, onReload, onBerforS
             <Button className="px-16" disabled={!formData.type} onClick={handleSave}>{t('model.save')}</Button>
         </div>
     </div>
+}
+
+
+const useSelectModel = () => {
+    const modelsRef = useRef<any>(null)
+
+    const loadData = async () => {
+        try {
+            const response = await fetch(__APP_ENV__.BASE_URL + '/models/data.json');
+            if (!response.ok) {
+                throw new Error('Failed to fetch data');
+            }
+            return await response.json();
+        } catch (error) {
+            console.error('Failed to load commitments:', error);
+            return { title: '', commitments: [] }; // 返回默认的数据结构
+        }
+    }
+
+    useEffect(() => {
+        loadData().then(
+            res => modelsRef.current = res
+        )
+    }, [])
+
+    return (type) => {
+        return modelsRef.current?.[type] || []
+    }
 }
\ No newline at end of file
diff --git a/src/frontend/platform/src/types/flow/index.ts b/src/frontend/platform/src/types/flow/index.ts
index d9e4093a2..8dbce87c9 100644
--- a/src/frontend/platform/src/types/flow/index.ts
+++ b/src/frontend/platform/src/types/flow/index.ts
@@ -185,7 +185,8 @@ export interface WorkflowNodeParam {
   multi?: boolean;
   /** Array of options */
   options?: any[];
-  test?: string
+  test?: string,
+  hidden?: boolean;
 }
 
 /** 工作流消息结构 */
diff --git a/src/frontend/platform/src/util/flowCompatible.ts b/src/frontend/platform/src/util/flowCompatible.ts
index 577970d4c..2183a5e64 100644
--- a/src/frontend/platform/src/util/flowCompatible.ts
+++ b/src/frontend/platform/src/util/flowCompatible.ts
@@ -1,6 +1,6 @@
 import { generateUUID } from "@/components/bs-ui/utils";
 
-// 历史版本工作流转换脚本(最新v1)
+// 历史版本工作流转换脚本(最新v2)
 export const flowVersionCompatible = (flow) => {
 
     flow.nodes.forEach((node) => {
@@ -9,11 +9,15 @@ export const flowVersionCompatible = (flow) => {
             case 'start': comptibleStart(node.data); break;
             case 'input': comptibleInput(node.data); break;
             case 'agent': comptibleAgent(node.data); break;
+            case 'output': comptibleOutput(node.data); break;
+            case 'llm': comptibleLLM(node.data); break;
+
         }
     })
     return flow
 }
 
+
 const comptibleStart = (node) => {
     if (!node.v) {
         node.group_params[1].params[2].global = 'item:input_list'
@@ -28,7 +32,9 @@ const comptibleStart = (node) => {
     }
 }
 
+
 const comptibleInput = (node) => {
+    // 0 => 1
     if (!node.v) {
         node.tab.value = node.tab.value === 'form' ? 'form_input' : 'dialog_input'
         node.tab.options[0].key = 'dialog_input'
@@ -54,11 +60,88 @@ const comptibleInput = (node) => {
 
         node.v = 1
     }
+    // 1 => 2
+    if (node.v == 1) {
+        node.group_params[0].params.push({
+            key: "dialog_files_content",
+            global: "key",
+            label: "上传文件内容",
+            type: "var",
+            tab: "dialog_input"
+        })
+
+        node.group_params[0].params.push({
+            key: "dialog_files_content_size",
+            label: "文件内容长度上限(字)",
+            type: "number",
+            min: 0,
+            value: 15000,
+            tab: "dialog_input"
+        })
+
+        node.group_params[0].params.push({
+            key: "dialog_file_accept",
+            label: "上传文件类型",
+            type: "select_fileaccept",
+            value: "all",
+            tab: "dialog_input"
+        })
+
+        node.group_params[0].params.push({
+            key: "dialog_image_files",
+            global: "key",
+            label: "上传图片文件",
+            type: "var",
+            tab: "dialog_input",
+            help: "提取上传文件中的图片文件，当助手或大模型节点使用多模态大模型时，可传入此图片。"
+        })
+
+        node.v = 2
+    }
 }
 
+
 const comptibleAgent = (node) => {
     if (!node.v && node.group_params[1].params[0].type === 'bisheng_model') {
         node.group_params[1].params[0].type = 'agent_model'
         node.v = 1
     }
+
+    if (node.v == 1) {
+        node.group_params[2].params.push({
+            key: "image_prompt",
+            label: "视觉",
+            type: "image_prompt",
+            value: "",
+            help: "当使用多模态大模型时，可通过此功能传入图片，结合图像内容进行问答"
+        })
+
+        node.v = 2
+    }
+}
+
+
+const comptibleOutput = (node) => {
+    if (node.v == 1) {
+        node.group_params[0].params[0].key = 'message'
+        node.group_params[0].params[0].global = 'key'
+
+        node.v = 2
+    }
+}
+
+
+const comptibleLLM = (node) => {
+    if (node.v == 1) {
+
+        node.group_params[2].params.push({
+            key: "image_prompt",
+            label: "视觉",
+            type: "image_prompt",
+            value: [],
+            help: "当使用多模态大模型时，可通过此功能传入图片，结合图像内容进行问答"
+        })
+
+        node.v = 2
+    }
 }
\ No newline at end of file
diff --git a/src/frontend/platform/src/util/utils.ts b/src/frontend/platform/src/util/utils.ts
index 02c821cf3..e0e329eba 100644
--- a/src/frontend/platform/src/util/utils.ts
+++ b/src/frontend/platform/src/util/utils.ts
@@ -172,14 +172,14 @@ export function exportCsv(data: any[], fileName: string = 'test_result.csv') {
 // 校验合法json
 export function isValidJSON(str) {
     if (typeof str !== 'string') return false;
-    
+
     // 简单的前置检查
     str = str.trim();
-    if (!(str.startsWith('{') && str.endsWith('}')) && 
+    if (!(str.startsWith('{') && str.endsWith('}')) &&
         !(str.startsWith('[') && str.endsWith(']'))) {
         return false;
     }
-    
+
     // 完整解析验证
     try {
         JSON.parse(str);
@@ -187,4 +187,11 @@ export function isValidJSON(str) {
     } catch (e) {
         return false;
     }
+}
+
+// 取后缀名
+export function getFileExtension(filename) {
+    const basename = filename.split(/[\\/]/).pop(); // 去除路径
+    const match = basename.match(/\.([^.]+)$/);
+    return (match ? match[1] : '').toUpperCase();
 }
\ No newline at end of file

From 7597e1691c73abb88e4d3109b79a23868f2cc021 Mon Sep 17 00:00:00 2001
From: dolphin <shanghang@dataelem.com>
Date: Sun, 27 Apr 2025 22:17:38 +0800
Subject: [PATCH 075/186] =?UTF-8?q?fix:=20=E4=BC=9A=E8=AF=9D=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=9B=BE=E7=89=87=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Chat/Messages/Content/Files.tsx           |  7 +++---
 src/frontend/client/vite.config.ts            | 23 +++++++++++--------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/frontend/client/src/components/Chat/Messages/Content/Files.tsx b/src/frontend/client/src/components/Chat/Messages/Content/Files.tsx
index 5b4d2d656..d2011c756 100644
--- a/src/frontend/client/src/components/Chat/Messages/Content/Files.tsx
+++ b/src/frontend/client/src/components/Chat/Messages/Content/Files.tsx
@@ -5,7 +5,8 @@ import Image from './Image';
 
 const Files = ({ message }: { message?: TMessage }) => {
   const imageFiles = useMemo(() => {
-    return message?.files?.filter((file) => file.type?.startsWith('image/')) || [];
+    const images = message?.files?.filter((file) => file.type?.startsWith('image/')) || [];
+    return images.map(file => ({ ...file, filepath: file.filepath?.replace(/^https?:\/\/[^\/]+/, __APP_ENV__.BASE_URL) }))
   }, [message?.files]);
 
   const otherFiles = useMemo(() => {
@@ -28,8 +29,8 @@ const Files = ({ message }: { message?: TMessage }) => {
               height: `${file.height ?? 1920}px`,
               width: `${file.height ?? 1080}px`,
             }}
-            // n={imageFiles.length}
-            // i={i}
+          // n={imageFiles.length}
+          // i={i}
           />
         ))}
     </>
diff --git a/src/frontend/client/vite.config.ts b/src/frontend/client/vite.config.ts
index 1d6264be7..63b8f7618 100644
--- a/src/frontend/client/vite.config.ts
+++ b/src/frontend/client/vite.config.ts
@@ -14,16 +14,11 @@ export default defineConfig({
     port: 4001,
     strictPort: false,
     proxy: {
-      '^/api/': {
-        target: 'http://192.168.106.116:7861',
-        // target: 'http://localhost:3080',
-        changeOrigin: true,
-      },
-      '/oauth': {
-        // target: 'http://localhost:3080',
-        target: 'http://192.168.106.116:7861',
-        changeOrigin: true,
-      },
+      // '^/api/': {
+      //   target: 'http://192.168.106.116:7861',
+      //   // target: 'http://localhost:3080',
+      //   changeOrigin: true,
+      // },
       '/workspace/bisheng': {
         target: "http://192.168.106.116:9000",
         changeOrigin: true,
@@ -44,6 +39,14 @@ export default defineConfig({
             console.log('Proxying request to:', proxyReq.path);
           });
         }
+      },
+      '/workspace/tmp-dir': {
+        target: 'http://192.168.106.116:9000',
+        changeOrigin: true,
+        secure: false,
+        rewrite: (path) => {
+          return path.replace(/^\/workspace\/tmp-dir/, '/tmp-dir');
+        },
       }
     },
   },

From 7643ab57874ac2457ef64bea443db0ae185a4fab Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Mon, 28 Apr 2025 10:52:36 +0800
Subject: [PATCH 076/186] feat: sensitive update message support category

---
 src/backend/bisheng/api/v1/chat.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/backend/bisheng/api/v1/chat.py b/src/backend/bisheng/api/v1/chat.py
index e8f1c3620..0981ba421 100644
--- a/src/backend/bisheng/api/v1/chat.py
+++ b/src/backend/bisheng/api/v1/chat.py
@@ -336,6 +336,7 @@ def add_chat_messages(*,
 def update_chat_message(*,
                         message_id: int,
                         message: str = Body(embed=True),
+                        category: str = Body(default=None, embed=True),
                         login_user: UserPayload = Depends(get_login_user)):
     """ 更新一条消息的内容 安全检查使用"""
     logger.info(
@@ -348,6 +349,8 @@ def update_chat_message(*,
         return resp_200(message='用户不一致')
 
     chat_message.message = message
+    if category:
+        chat_message.category = category
     chat_message.source = False
     chat_message.sensitive_status = SensitiveStatus.VIOLATIONS.value
 
@@ -360,7 +363,6 @@ def update_chat_message(*,
 
 @router.delete('/chat/message/{message_id}', status_code=200)
 def del_message_id(*, message_id: str, login_user: UserPayload = Depends(get_login_user)):
-    # 删除一条消息，安全检查使用
     ChatMessageDao.delete_by_message_id(login_user.user_id, message_id)
 
     return resp_200(message='删除成功')

From c77017ec6638a2bfab2dd9d33c4034e9a309b460 Mon Sep 17 00:00:00 2001
From: wachoo <wachoo@126.com>
Date: Mon, 28 Apr 2025 10:58:17 +0800
Subject: [PATCH 077/186] fix: delete_role_by_group_id

---
 src/backend/bisheng/database/models/role.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backend/bisheng/database/models/role.py b/src/backend/bisheng/database/models/role.py
index 648c3396a..a622cf680 100644
--- a/src/backend/bisheng/database/models/role.py
+++ b/src/backend/bisheng/database/models/role.py
@@ -113,6 +113,6 @@ class RoleDao(RoleBase):
                 Role, and_(UserRole.role_id == Role.id,
                            Role.group_id == group_id)).group_by(UserRole.id)
             all_user = session.exec(all_user).all()
-            session.exec(delete(UserRole).where(UserRole.id.in_([one.id for one in all_user])))
+            session.exec(delete(UserRole).where(UserRole.id.in_([one.UserRole.id for one in all_user])))
             session.exec(delete(Role).where(Role.group_id == group_id))
             session.commit()

From 6fd2e859c1851e4991e12913ee78111ce5697b52 Mon Sep 17 00:00:00 2001
From: wachoo <wachoo@126.com>
Date: Mon, 28 Apr 2025 10:55:01 +0800
Subject: [PATCH 078/186] fix: txt for template

---
 src/backend/bisheng/database/data/template.json | 2 +-
 src/backend/bisheng/database/init_data.py       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/backend/bisheng/database/data/template.json b/src/backend/bisheng/database/data/template.json
index ba9fa05fe..7d154e842 100644
--- a/src/backend/bisheng/database/data/template.json
+++ b/src/backend/bisheng/database/data/template.json
@@ -27838,7 +27838,7 @@
   {
     "update_time": "2025-03-03 20:06:19",
     "parameters": null,
-    "name": "「多助手并行+穿行报告生成」",
+    "name": "「多助手并行+串行报告生成」",
     "description": "",
     "flow_id": "497051c652b94cc3a2ffb482c520b1bd",
     "api_parameters": null,
diff --git a/src/backend/bisheng/database/init_data.py b/src/backend/bisheng/database/init_data.py
index 68a8473ed..a35c1c2e5 100644
--- a/src/backend/bisheng/database/init_data.py
+++ b/src/backend/bisheng/database/init_data.py
@@ -173,7 +173,7 @@ def read_from_conf(file_path: str) -> str:
 def upload_preset_minio_file():
     """ 上传预置文件到minio, 为了和工作流模板配合 """
     minio_client = MinioClient()
-    # 上传 「多助手并行+穿行报告生成」 工作流模板需要的docx文件
+    # 上传 「多助手并行+串行报告生成」 工作流模板需要的docx文件
     template_data = read_from_conf('data/0254d1808a5247d2a3ee0d0011819acb.docx')
     minio_client.upload_minio_data('workflow/report/0254d1808a5247d2a3ee0d0011819acb.docx', template_data,
                                    len(template_data), 'application/vnd.openxmlformats-officedocument.wordprocessingml.document')

From a89e074e7a8cefa00138aa4d8661aa046cfdf819 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Mon, 28 Apr 2025 11:17:52 +0800
Subject: [PATCH 079/186] fix: user input schema error

---
 src/backend/bisheng/workflow/nodes/input/input.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backend/bisheng/workflow/nodes/input/input.py b/src/backend/bisheng/workflow/nodes/input/input.py
index edb126053..5aacec573 100644
--- a/src/backend/bisheng/workflow/nodes/input/input.py
+++ b/src/backend/bisheng/workflow/nodes/input/input.py
@@ -63,7 +63,7 @@ class InputNode(BaseNode):
                 self.node_data.get_variable_info('dialog_files_content'),
                 self.node_data.get_variable_info('dialog_file_accept')
             ]
-            return self.node_data.get_variable_info('user_input')
+            return user_input_info
         form_input_info = self.node_data.get_variable_info('form_input')
         for one in form_input_info['value']:
             one['value'], _ = self.parse_msg_with_variables(one['value'])

From 8326bba9f7113445b4a8ccaecae6557de80fff8c Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Mon, 28 Apr 2025 14:49:13 +0800
Subject: [PATCH 080/186] fix: input node dialog_files_content value error

---
 src/backend/bisheng/workflow/nodes/input/input.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backend/bisheng/workflow/nodes/input/input.py b/src/backend/bisheng/workflow/nodes/input/input.py
index 5aacec573..200b58d3a 100644
--- a/src/backend/bisheng/workflow/nodes/input/input.py
+++ b/src/backend/bisheng/workflow/nodes/input/input.py
@@ -75,7 +75,7 @@ class InputNode(BaseNode):
             dislog_files_content, self._dialog_images_files = self.parse_dialog_files()
             res = {
                 'user_input': self.node_params['user_input'],
-                'dialog_files_content': self.parse_dialog_files(),
+                'dialog_files_content': dislog_files_content,
                 'dialog_image_files': self._dialog_images_files
             }
             self.graph_state.save_context(content=f'{res["dialog_files_content"]}\n{res["user_input"]}',

From 1ddf4e341ed8a181cf10a17e5d915edcbe3714e8 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Mon, 28 Apr 2025 16:30:27 +0800
Subject: [PATCH 081/186] fix: update qa error

---
 src/backend/bisheng/database/models/knowledge_file.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backend/bisheng/database/models/knowledge_file.py b/src/backend/bisheng/database/models/knowledge_file.py
index 93747a2c5..0280162e2 100644
--- a/src/backend/bisheng/database/models/knowledge_file.py
+++ b/src/backend/bisheng/database/models/knowledge_file.py
@@ -249,7 +249,7 @@ class QAKnoweldgeDao(QAKnowledgeBase):
         if qa_knowledge.id is None:
             raise ValueError('id不能为空')
         with session_getter() as session:
-            session.add(QAKnowledge.validate(qa_knowledge))
+            session.add(qa_knowledge)
             session.commit()
             session.refresh(qa_knowledge)
         return qa_knowledge

From d69d30fb19e0ef8378b531de047be96b791361c6 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Mon, 28 Apr 2025 17:18:18 +0800
Subject: [PATCH 082/186] fix: qa import not write into milvus

---
 src/backend/bisheng/api/v1/knowledge.py       | 15 ++++++----
 .../bisheng/database/models/knowledge_file.py | 28 ++++++++-----------
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/backend/bisheng/api/v1/knowledge.py b/src/backend/bisheng/api/v1/knowledge.py
index 2e8cfa6bb..39bd5e58a 100644
--- a/src/backend/bisheng/api/v1/knowledge.py
+++ b/src/backend/bisheng/api/v1/knowledge.py
@@ -14,7 +14,7 @@ from bisheng.api.errcode.base import UnAuthorizedError
 from bisheng.api.errcode.knowledge import KnowledgeCPError, KnowledgeQAError
 from bisheng.api.services import knowledge_imp
 from bisheng.api.services.knowledge import KnowledgeService
-from bisheng.api.services.knowledge_imp import add_qa
+from bisheng.api.services.knowledge_imp import add_qa, QA_save_knowledge
 from bisheng.api.services.user_service import UserPayload, get_login_user
 from bisheng.api.v1.schemas import (KnowledgeFileProcess, PreviewFileChunk, UpdatePreviewFileChunk, UploadFileResponse,
                                     resp_200, resp_500)
@@ -541,6 +541,7 @@ def post_import_file(*,
 def post_import_file(*,
                      qa_knowledge_id: int,
                      file_list: list[str] = Body(..., embed=True),
+                     background_tasks: BackgroundTasks,
                      login_user: UserPayload = Depends(get_login_user)):
     # 查询当前知识库，是否有写入权限
     db_knowledge = KnowledgeService.judge_qa_knowledge_write(login_user, qa_knowledge_id)
@@ -573,8 +574,8 @@ def post_import_file(*,
                     if value is not np.nan and value and value is not None and str(value) != 'nan' and str(
                             value) != 'null':
                         if value not in tmp_questions:
-                            QACreate.questions.append(value)
-                            tmp_questions.add(value)
+                            QACreate.questions.append(str(value))
+                            tmp_questions.add(str(value))
 
             db_q = QAKnoweldgeDao.get_qa_knowledge_by_name(QACreate.questions, QACreate.knowledge_id)
             if db_q and not QACreate.id or len(tmp_questions & all_questions) > 0:
@@ -583,7 +584,11 @@ def post_import_file(*,
                 insert_data.append(QACreate)
                 all_questions = all_questions | tmp_questions
         result = QAKnoweldgeDao.batch_insert_qa(insert_data)
-        insert_result.append(result)
+
+        # async task add qa into milvus and es
+        for one in result:
+            background_tasks.add_task(QA_save_knowledge, db_knowledge, one)
+
         error_result.append(have_data)
 
-    return resp_200({"result": insert_result, "errors": error_result})
+    return resp_200({"errors": error_result})
diff --git a/src/backend/bisheng/database/models/knowledge_file.py b/src/backend/bisheng/database/models/knowledge_file.py
index 0280162e2..45c07915b 100644
--- a/src/backend/bisheng/database/models/knowledge_file.py
+++ b/src/backend/bisheng/database/models/knowledge_file.py
@@ -51,7 +51,7 @@ class QAKnowledgeBase(SQLModelSerializable):
     questions: List[str] = Field(index=False)
     answers: str = Field(index=False)
     source: Optional[int] = Field(default=0, index=False, description='0: 未知 1: 手动；2: 审计, 3: api, 4: 批量导入')
-    status: Optional[int] = Field(default=1, index=False, description='1: 解析中；2: 解析成功；3: 解析失败')
+    status: Optional[int] = Field(default=1, index=False, description='1: 开启；0: 关闭，未写入到向量库或写入失败；')
     extra_meta: Optional[str] = Field(default=None, index=False)
     remark: Optional[str] = Field(default=None, sa_column=Column(String(length=512)))
     create_time: Optional[datetime] = Field(default=None, sa_column=Column(
@@ -272,28 +272,24 @@ class QAKnoweldgeDao(QAKnowledgeBase):
     @classmethod
     def insert_qa(cls, qa_knowledge: QAKnowledgeUpsert):
         with session_getter() as session:
-            qa = QAKnowledge.validate(qa_knowledge)
+            qa = QAKnowledge.model_validate(qa_knowledge)
             session.add(qa)
             session.commit()
             session.refresh(qa)
         return qa
 
     @classmethod
-    def batch_insert_qa(cls, qa_knowledges: List[QAKnowledgeUpsert]):
+    def batch_insert_qa(cls, qa_knowledges: List[QAKnowledgeUpsert]) -> List[QAKnowledge]:
         with session_getter() as session:
-            try:
-                qas = []
-                for qa_knowledge in qa_knowledges:
-                    qa = QAKnowledge.model_validate(qa_knowledge)
-                    qas.append(qa)
-                session.add_all(qas)
-                session.commit()
-                for qa in qas:
-                    session.refresh(qa)
-                return 1
-            except Exception as e:
-                session.rollback()
-                raise 0
+            qas = []
+            for qa_knowledge in qa_knowledges:
+                qa = QAKnowledge.model_validate(qa_knowledge)
+                qas.append(qa)
+            session.add_all(qas)
+            session.commit()
+            for qa in qas:
+                session.refresh(qa)
+            return qas
 
     @classmethod
     def total_count(cls, sql):

From 17854e929a827289d4b86277856325fbbef59eaa Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Mon, 28 Apr 2025 17:29:55 +0800
Subject: [PATCH 083/186] fix: qa preview remove nan value

---
 src/backend/bisheng/api/v1/knowledge.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/backend/bisheng/api/v1/knowledge.py b/src/backend/bisheng/api/v1/knowledge.py
index 39bd5e58a..5665603a4 100644
--- a/src/backend/bisheng/api/v1/knowledge.py
+++ b/src/backend/bisheng/api/v1/knowledge.py
@@ -523,8 +523,8 @@ def post_import_file(*,
             create_time=datetime.now(),
             update_time=datetime.now())
         for key, value in dd.items():
-            if key.startswith('相似问题'):
-                d.questions.append(str(value) if value != np.nan else '')
+            if key.startswith('相似问题') and value != np.nan and value != '' and value is not None:
+                d.questions.append(str(value))
         insert_data.append(d)
     try:
         if size > 0 and offset >= 0:

From 7e2169e46a53f2adeee5c19e35d572781bd5300d Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Mon, 28 Apr 2025 17:38:12 +0800
Subject: [PATCH 084/186] fix: qa list api keyword error

---
 src/backend/bisheng/api/v1/knowledge.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/backend/bisheng/api/v1/knowledge.py b/src/backend/bisheng/api/v1/knowledge.py
index 5665603a4..6d34a0d1d 100644
--- a/src/backend/bisheng/api/v1/knowledge.py
+++ b/src/backend/bisheng/api/v1/knowledge.py
@@ -210,12 +210,9 @@ def get_QA_list(*,
     """ 获取知识库文件信息. """
     db_knowledge = KnowledgeService.judge_qa_knowledge_write(login_user, qa_knowledge_id)
 
-    if keyword:
-        question = keyword
-        answer = keyword
     qa_list, total_count = knowledge_imp.list_qa_by_knowledge_id(qa_knowledge_id, page_size,
                                                                  page_num, question, answer,
-                                                                 status)
+                                                                 keyword, status)
     user_list = UserDao.get_user_by_ids([qa.user_id for qa in qa_list])
     user_map = {user.user_id: user.user_name for user in user_list}
     data = [jsonable_encoder(qa) for qa in qa_list]

From 219196594b05866c54eb0f67a03f29d1d88387a0 Mon Sep 17 00:00:00 2001
From: dolphin <shanghang@dataelem.com>
Date: Mon, 28 Apr 2025 19:18:00 +0800
Subject: [PATCH 085/186] =?UTF-8?q?fix:=20=E5=B7=A5=E4=BD=9C=E6=B5=81?=
 =?UTF-8?q?=E7=A6=BB=E5=BC=80=E4=BF=9D=E5=AD=98=E6=8F=90=E7=A4=BA=E6=97=B6?=
 =?UTF-8?q?=E6=9C=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BuildPage/flow/FlowChat/ChatInput.tsx     |  2 +-
 .../BuildPage/flow/FlowChat/ChatTest.tsx      |  4 +-
 .../flow/FlowNode/component/SelectVar.tsx     | 72 +++++++++++++----
 .../src/pages/BuildPage/flow/Header.tsx       | 78 ++++++++++++++-----
 .../src/pages/BuildPage/flow/Panne.tsx        | 19 ++++-
 5 files changed, 133 insertions(+), 42 deletions(-)

diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatInput.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatInput.tsx
index c0132aa2e..c3dcd3fee 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatInput.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatInput.tsx
@@ -286,7 +286,7 @@ export default function ChatInput({ autoRun, clear, form, wsUrl, onBeforSend, on
             messageIdRef.current = data.message_id
             // 限制文件类型
             if (input_schema.tab === 'dialog_input') {
-                const schemaItem = input_schema.value?.find(el => el.key === 'file_accept_select')
+                const schemaItem = input_schema.value?.find(el => el.key === 'dialog_file_accept')
                 const fileAccept = schemaItem?.value
                 if (fileAccept === 'image') {
                     setAccepts(FileTypes.IMAGE.join(','))
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatTest.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatTest.tsx
index 1d1e028c7..28d1e48cd 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatTest.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatTest.tsx
@@ -5,6 +5,7 @@ import { GripVertical, Maximize2, Minus, X } from "lucide-react";
 import { forwardRef, useContext, useImperativeHandle, useState, useRef, useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import ChatPane from "./ChatPane";
+import { cloneDeep } from "lodash-es";
 
 // ref
 export const ChatTest = forwardRef((props, ref) => {
@@ -25,7 +26,8 @@ export const ChatTest = forwardRef((props, ref) => {
                 setOpen(true);  // 通过 `run` 方法打开 `Sheet`
                 setSmall(false);
 
-                setFlow(flow);
+                // 克隆flow用于调试
+                setFlow(cloneDeep(flow));
                 setChatId(`test_${generateUUID(16)}`);
             }, 0);
         },
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/SelectVar.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/SelectVar.tsx
index 09b88f829..50c34d517 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/SelectVar.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/SelectVar.tsx
@@ -55,7 +55,7 @@ const getSpecialVar = (obj, type) => {
  */
 const SelectVar = forwardRef(({
     nodeId,
-    findInputFile = false, // 只展示input节点file_image变量
+    findInputFile = false, // 只展示input节点file_image变量(视觉表单项使用)
     itemKey, multip = false, value = [], children, onSelect, onCheck, className = '' }, ref) => {
     const [open, setOpen] = useState(false)
     const { flow } = useFlowStore()
@@ -152,22 +152,62 @@ const SelectVar = forwardRef(({
     }
 
     const nodeTemps = useMemo(() => {
-        if (!flow.nodes || !open) return []
-        return flow.nodes.reduce((list, temp) => {
-            let tempData = temp.data
-            if (findInputFile) {
-                // 过滤非input节点
-                if (temp.data.type !== 'input') return list
-                tempData = cloneDeep(temp.data)
-                const groupParam = tempData.group_params.find(grouparam =>
-                    grouparam.params.some(param => param.key === 'dialog_image_files'))
-                groupParam.params = groupParam.params.filter(param => param.key === 'dialog_image_files')
+        // 如果节点数据未加载或组件未打开，返回空数组
+        if (!flow?.nodes || !open) return [];
+
+        return flow.nodes.reduce((processedNodes, node) => {
+            let nodeData = node.data;
+
+            // 特殊处理输入节点
+            if (node.data.type === 'input') {
+                nodeData = processInputNode(node.data, findInputFile);
             }
-            const newNode = getNodeDataByTemp(tempData)
-            newNode.data && list.push(newNode)
-            return list
-        }, [])
-    }, [open])
+            // 其他节点，跳过
+            else if (findInputFile) {
+                return processedNodes;
+            }
+
+            const newNode = getNodeDataByTemp(nodeData);
+            newNode.data && processedNodes.push(newNode);
+            return processedNodes;
+        }, []);
+    }, [open, flow.nodes]);
+
+    /**
+     * 根据文件类型过滤dialog_image_files文件变量
+     * 限制findInputFileOnly为true时，过滤其他变量,只返回dialog_image_files文件变量
+     */
+    function processInputNode(inputNodeData, findInputFileOnly) {
+        const processedData = cloneDeep(inputNodeData);
+        let acceptType = 'all';
+
+        const groupParam = processedData.group_params.find(group =>
+            group.params.some(param => {
+                if (param.key === "dialog_file_accept") {
+                    acceptType = param.value;
+                    return true;
+                }
+                return false;
+            })
+        );
+
+        if (!groupParam) return processedData;
+
+        // 根据文件类型过滤参数
+        if (acceptType === 'file') {
+            groupParam.params = groupParam.params.filter(param =>
+                param.key !== 'dialog_image_files'
+            );
+        }
+        // 如果只需要文件输入参数
+        if (findInputFileOnly) {
+            groupParam.params = groupParam.params.filter(param =>
+                param.key === 'dialog_image_files'
+            );
+        }
+
+        return processedData;
+    }
 
     // 三级变量 预置问题
     const [questions, setQuestions] = useState([])
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/Header.tsx b/src/frontend/platform/src/pages/BuildPage/flow/Header.tsx
index 3e06dd638..769e778af 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/Header.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/Header.tsx
@@ -28,14 +28,13 @@ import { ChatTest } from "./FlowChat/ChatTest";
 import useFlowStore from "./flowStore";
 import Notification from "./Notification";
 
-const Header = ({ flow, onTabChange, preFlow, onChange }) => {
+const Header = ({ flow, nodes, onTabChange, preFlow, onPreFlowChange }) => {
     const { message } = useToast()
     const { dark } = useContext(darkContext);
     const testRef = useRef(null)
     const updateAppModalRef = useRef(null)
     const { uploadFlow } = useFlowStore()
     const { t, i18n } = useTranslation('flow')
-    const navigate = useNavigate()
     const [modelVersionId, setModelVersionId] = useState(0)
 
     // console.log('flow :>> ', flow);
@@ -222,7 +221,11 @@ const Header = ({ flow, onTabChange, preFlow, onChange }) => {
     const [tabType, setTabType] = useState('edit')
     const [open, setOpen] = useState(false)
 
-    const [blocker, hasChanged] = useBeforeUnload(flow, preFlow)
+    const {
+        returnPage,
+        blocker,
+        hasChanged
+    } = useBeforeUnload(flow, nodes, preFlow, onPreFlowChange)
     // 离开并保存
     const handleSaveAndClose = async () => {
         if (isOnlineVersion) {
@@ -245,9 +248,7 @@ const Header = ({ flow, onTabChange, preFlow, onChange }) => {
             {/* Left Section with Back Button and Title */}
             <div className="flex items-center">
                 <Button variant="outline" size="icon" className={`${!dark && 'bg-[#fff]'} size-8`}
-                    onClick={() => {
-                        window.history.length > 1 ? window.history.back() : navigate('/build/apps')
-                    }}
+                    onClick={returnPage}
                 ><ChevronLeft /></Button>
                 <div className="flex items-center ml-5">
                     <TitleLogo
@@ -693,12 +694,13 @@ const useVersion = (flow) => {
 
 
 // 离开页面保存提示
-const useBeforeUnload = (flow, preFlow) => {
+const useBeforeUnload = (flow, nodes, preFlow, onPreFlowChange) => {
     const { t } = useTranslation()
-
+    const navigate = useNavigate()
     // 离开提示保存
     useEffect(() => {
         const fun = (e) => {
+            // 系统 重新加载 提示
             var confirmationMessage = `${t('flow.unsavedChangesConfirmation')}`;
             (e || window.event).returnValue = confirmationMessage; // Compatible with different browsers
             return confirmationMessage;
@@ -707,21 +709,55 @@ const useBeforeUnload = (flow, preFlow) => {
         return () => { window.removeEventListener('beforeunload', fun) }
     }, [])
 
+    // 检查流程变化（忽略节点位置，只对比数据和边）
     const hasChanged = useMemo(() => {
-        if (!flow) return false
-        const oldFlowData = JSON.parse(preFlow)
-        if (!oldFlowData) return true
-        // 比较新旧
-        const { edges, nodes } = flow
-        const { edges: oldEdges, nodes: oldNodes } = oldFlowData
-        const a = !(isEqual(edges, oldEdges) && isEqual(nodes, oldNodes))
-        // console.log('12313132123 :>> ', a, isEqual(edges, oldEdges), isEqual(nodes, oldNodes));
-        // console.log('nodes:>> ', nodes.find(el => el.id === "llm_214bb").data.group_params[2].params[1].value);
-        // console.log('oldNodes:>> ', oldNodes.find(el => el.id === "llm_214bb").data.group_params[2].params[1].value);
-        return a
-    }, [preFlow, flow.nodes, flow.edges])
+        // 无新数据时视为未修改
+        if (!flow) return false;
 
-    return [useBlocker(hasChanged), hasChanged] as const;
+        try {
+            const oldFlowData = JSON.parse(preFlow);
+            // 旧数据不存在时视为有修改
+            if (!oldFlowData) return true;
+
+            // 提取新旧节点数据（忽略位置信息）
+            const { edges, nodes } = flow
+            const { edges: oldEdges, nodes: oldNodes } = oldFlowData
+
+            // 比较边和节点数据
+            return !(isEqual(edges, oldEdges) && nodes.every((node, i) =>
+                isEqual(node.data, oldNodes[i].data)));
+        } catch {
+            return true; // 解析失败视为有修改
+        }
+    }, [preFlow, nodes, flow]);
+
+    /**
+     * 处理页面返回逻辑：
+     * 1. 触发父组件更新为原始流程数据(nodes)
+     * 2. 标记本次变更为返回操作(isReturningRef)
+     * 3. 在节点更新后执行历史回退(回退后,根据hasChanged触发blocker)
+     */
+    const isReturningRef = useRef(false);
+    const handleReturn = () => {
+        onPreFlowChange();
+        isReturningRef.current = true;
+    };
+
+    // 当节点更新且为返回操作时，执行导航
+    useEffect(() => {
+        if (!isReturningRef.current) return;
+
+        isReturningRef.current = false;
+        window.history.length > 1
+            ? window.history.back()
+            : navigate('/build/apps');
+    }, [nodes]);
+
+    return {
+        returnPage: handleReturn,
+        blocker: useBlocker(hasChanged),
+        hasChanged
+    }
 }
 
 export default Header;
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/Panne.tsx b/src/frontend/platform/src/pages/BuildPage/flow/Panne.tsx
index 909fb3442..c35001baa 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/Panne.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/Panne.tsx
@@ -40,8 +40,11 @@ export default function Panne({ flow, preFlow }: { flow: WorkFlow, preFlow: stri
 
     const { takeSnapshot } = useUndoRedo()
 
-    const { reactFlowWrapper, nodes, edges, keyBoardPanneRef,
-        setNodes, onNodesChange, onSelectionChange, onEdgesChange, onEdgeSelect, onConnect, onDragOver, onDrop } = useFlow(reactFlowInstance, flow, takeSnapshot)
+    const {
+        reactFlowWrapper, nodes, edges, keyBoardPanneRef,
+        setNodes, onNodesChange, onSelectionChange, onEdgesChange,
+        onEdgeSelect, onConnect, onDragOver, onDrop
+    } = useFlow(reactFlowInstance, flow, takeSnapshot)
 
     /**
      * 监听节点变化，更新flow数据
@@ -89,7 +92,17 @@ export default function Panne({ flow, preFlow }: { flow: WorkFlow, preFlow: stri
     const [showApiPage, setShowApiPage] = useState(false)
 
     return <div className="flex flex-col h-full overflow-hidden">
-        <Header flow={flow} onTabChange={(type) => setShowApiPage('api' === type)} preFlow={preFlow}></Header>
+        <Header
+            flow={flow}
+            nodes={nodes}
+            onTabChange={(type) => setShowApiPage('api' === type)}
+            preFlow={preFlow}
+            onPreFlowChange={() => {
+                // 返回上一步前, 更新flow数据再对比
+                const { nodes } = reactFlowInstance.toObject()
+                setNodes(nodes)
+            }}
+        ></Header>
         <div className={`flex-1 min-h-0 overflow-hidden ${showApiPage ? 'hidden' : ''} relative`}>
             <Sidebar onInitStartNode={node => {
                 // start node

From 88a27398642d6470b19e46c15dbafb6188551058 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Mon, 28 Apr 2025 19:19:06 +0800
Subject: [PATCH 086/186] fix: sensitive add messages return result

---
 src/backend/bisheng/api/v1/chat.py             | 4 ++--
 src/backend/bisheng/database/models/message.py | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/backend/bisheng/api/v1/chat.py b/src/backend/bisheng/api/v1/chat.py
index 0981ba421..9ff0da345 100644
--- a/src/backend/bisheng/api/v1/chat.py
+++ b/src/backend/bisheng/api/v1/chat.py
@@ -295,7 +295,7 @@ def add_chat_messages(*,
                               sensitive_status=SensitiveStatus.PASS.value,
                               type='bot',
                               category='answer')
-    ChatMessageDao.insert_batch([human_message, bot_message])
+    message_dbs = ChatMessageDao.insert_batch([human_message, bot_message])
     # 更新会话的状态
     MessageSessionDao.update_sensitive_status(chat_id, SensitiveStatus.VIOLATIONS)
 
@@ -329,7 +329,7 @@ def add_chat_messages(*,
                 AuditLogService.create_chat_assistant(login_user, get_request_ip(request),
                                                       flow_id)
 
-    return resp_200(message='添加成功')
+    return resp_200(data=message_dbs, message='添加成功')
 
 
 @router.put('/chat/message/{message_id}', status_code=200)
diff --git a/src/backend/bisheng/database/models/message.py b/src/backend/bisheng/database/models/message.py
index 710708c08..65c37aed5 100644
--- a/src/backend/bisheng/database/models/message.py
+++ b/src/backend/bisheng/database/models/message.py
@@ -254,6 +254,11 @@ class ChatMessageDao(MessageBase):
         with session_getter() as session:
             session.add_all(messages)
             session.commit()
+            ret = []
+            for one in messages:
+                session.refresh(one)
+                ret.append(one)
+            return ret
 
     @classmethod
     def get_message_by_id(cls, message_id: int) -> Optional[ChatMessage]:

From a12af3eb6be41c517cd10c7cd0f1bb8fbd18b5e4 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Mon, 28 Apr 2025 20:02:59 +0800
Subject: [PATCH 087/186] feat: convert workflow input event to api

---
 src/backend/bisheng/api/services/workflow.py  | 7 +++++++
 src/backend/bisheng/api/v1/schema/workflow.py | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/backend/bisheng/api/services/workflow.py b/src/backend/bisheng/api/services/workflow.py
index 89c9e3452..952fba832 100644
--- a/src/backend/bisheng/api/services/workflow.py
+++ b/src/backend/bisheng/api/services/workflow.py
@@ -260,6 +260,13 @@ class WorkFlowService(BaseService):
                     required=True,
                 )
             ]
+            for one in event_input_schema.get('value', []):
+                tmp = WorkflowInputItem(**one)
+                if tmp.key == 'dialog_files_content':
+                    tmp.type = 'dialog_file'
+                    tmp.value = []
+                elif tmp.key == 'dialog_file_accept':
+                    tmp.type = 'dialog_file_accept'
         workflow_event.input_schema = input_schema
         return workflow_event
 
diff --git a/src/backend/bisheng/api/v1/schema/workflow.py b/src/backend/bisheng/api/v1/schema/workflow.py
index 94fdb2716..0fe5986c2 100644
--- a/src/backend/bisheng/api/v1/schema/workflow.py
+++ b/src/backend/bisheng/api/v1/schema/workflow.py
@@ -32,7 +32,7 @@ class WorkflowOutputSchema(BaseModel):
 class WorkflowInputItem(BaseModel):
     key: str = Field(default=None, description='Unique key corresponding to user input')
     type: str = Field(default=None, description='The input type, select or dialog or file')
-    value: str = Field(default=None, description='The input default value')
+    value: Any = Field(default=None, description='The input default value')
     label: str = Field(default=None, description='The key label')
     multiple: bool = Field(default=False, description='The input is multi select')
     required: bool = Field(default=False, description='The input is required')

From f86f38b2f8eada16ad1cbc5c8213252f9d693b89 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Tue, 29 Apr 2025 11:53:07 +0800
Subject: [PATCH 088/186] fix: app chat list model error

---
 src/backend/bisheng/api/v1/schema/chat_schema.py | 9 ++++++++-
 src/backend/pyproject.toml                       | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/backend/bisheng/api/v1/schema/chat_schema.py b/src/backend/bisheng/api/v1/schema/chat_schema.py
index 1c50b9b45..241235ea5 100644
--- a/src/backend/bisheng/api/v1/schema/chat_schema.py
+++ b/src/backend/bisheng/api/v1/schema/chat_schema.py
@@ -2,7 +2,7 @@ import json
 from datetime import datetime
 from typing import Any, Dict, List, Optional
 
-from pydantic import BaseModel
+from pydantic import BaseModel, field_validator
 
 
 class AppChatList(BaseModel):
@@ -23,6 +23,13 @@ class AppChatList(BaseModel):
     mark_id: Optional[int] = None
     messages: Optional[List[dict]] = None # 会话的所有消息列表数据
 
+    @field_validator('user_name', mode='before')
+    @classmethod
+    def convert_user_name(cls, v: Any):
+        if not isinstance(v, str):
+            return str(v)
+        return v
+
 
 class APIAddQAParam(BaseModel):
     question: str
diff --git a/src/backend/pyproject.toml b/src/backend/pyproject.toml
index a3125228a..998f43f2f 100644
--- a/src/backend/pyproject.toml
+++ b/src/backend/pyproject.toml
@@ -71,7 +71,7 @@ cohere = "^4.11.0"
 python-multipart = "^0.0.6"
 sqlmodel = "^0.0.14"
 pymysql = "^0.10.1"
-pymilvus = "2.4.0"
+pymilvus = "2.4.10"
 elasticsearch = "^8.9.0"
 orjson = "^3.9.1"
 multiprocess = "^0.70.14"

From 2c7002e66882d574641831c7d3ec5657a67759b2 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Tue, 29 Apr 2025 16:01:08 +0800
Subject: [PATCH 089/186] fix: qa add error message

---
 src/backend/bisheng/api/errcode/knowledge.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backend/bisheng/api/errcode/knowledge.py b/src/backend/bisheng/api/errcode/knowledge.py
index 3e4a8c37a..e3d026622 100644
--- a/src/backend/bisheng/api/errcode/knowledge.py
+++ b/src/backend/bisheng/api/errcode/knowledge.py
@@ -24,7 +24,7 @@ class KnowledgeSimilarError(BaseErrorCode):
 
 class KnowledgeQAError(BaseErrorCode):
     Code: int = 10930
-    Msg: str = '该问题已被标注过'
+    Msg: str = '该问题已存在'
 
 
 class KnowledgeCPError(BaseErrorCode):

From 8821c8929a62621ecf823b0ac8642fa32fc016cf Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Tue, 29 Apr 2025 17:00:19 +0800
Subject: [PATCH 090/186] fix: qa update judge repeat question

---
 src/backend/bisheng/api/v1/knowledge.py               | 5 +++--
 src/backend/bisheng/database/models/knowledge_file.py | 4 +++-
 src/backend/bisheng/database/service.py               | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/backend/bisheng/api/v1/knowledge.py b/src/backend/bisheng/api/v1/knowledge.py
index 6d34a0d1d..c6f292a44 100644
--- a/src/backend/bisheng/api/v1/knowledge.py
+++ b/src/backend/bisheng/api/v1/knowledge.py
@@ -321,8 +321,9 @@ async def qa_add(*, QACreate: QAKnowledgeUpsert,
     if db_knowledge.type != KnowledgeTypeEnum.QA.value:
         raise HTTPException(status_code=404, detail='知识库类型错误')
 
-    db_q = QAKnoweldgeDao.get_qa_knowledge_by_name(QACreate.questions, QACreate.knowledge_id)
-    if db_q and not QACreate.id:
+    db_q = QAKnoweldgeDao.get_qa_knowledge_by_name(QACreate.questions, QACreate.knowledge_id, exclude_id=QACreate.id)
+    # create repeat question or update
+    if (db_q and not QACreate.id) or (db_q and QACreate.id and db_q.id != QACreate.id):
         raise KnowledgeQAError.http_exception()
 
     add_qa(db_knowledge=db_knowledge, data=QACreate)
diff --git a/src/backend/bisheng/database/models/knowledge_file.py b/src/backend/bisheng/database/models/knowledge_file.py
index 45c07915b..37c1c6c9b 100644
--- a/src/backend/bisheng/database/models/knowledge_file.py
+++ b/src/backend/bisheng/database/models/knowledge_file.py
@@ -235,13 +235,15 @@ class QAKnoweldgeDao(QAKnowledgeBase):
             return session.exec(select(QAKnowledge).where(QAKnowledge.id == qa_id)).first()
 
     @classmethod
-    def get_qa_knowledge_by_name(cls, question: List[str], knowledge_id: int) -> QAKnowledge:
+    def get_qa_knowledge_by_name(cls, question: List[str], knowledge_id: int, exclude_id: int = None) -> QAKnowledge:
         with session_getter() as session:
             group_filters = []
             for one in question:
                 group_filters.append(func.json_contains(QAKnowledge.questions, json.dumps(one)))
             statement = select(QAKnowledge).where(
                 or_(*group_filters)).where(QAKnowledge.knowledge_id == knowledge_id)
+            if exclude_id:
+                statement = statement.where(QAKnowledge.id != exclude_id)
             return session.exec(statement).first()
 
     @classmethod
diff --git a/src/backend/bisheng/database/service.py b/src/backend/bisheng/database/service.py
index 1b80751d3..585b6ad65 100644
--- a/src/backend/bisheng/database/service.py
+++ b/src/backend/bisheng/database/service.py
@@ -27,7 +27,7 @@ class DatabaseService(Service):
             connect_args = {'check_same_thread': False}
         else:
             connect_args = {}
-        return create_engine(self.database_url, connect_args=connect_args, pool_size=100, max_overflow=20, pool_pre_ping=True)
+        return create_engine(self.database_url, connect_args=connect_args, pool_size=100, max_overflow=20, pool_timeout=3, pool_pre_ping=True)
 
     def __enter__(self):
         self._session = Session(self.engine)

From 7b6be7211e383a3e2ebafa197381b027eee09649 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Tue, 29 Apr 2025 17:19:59 +0800
Subject: [PATCH 091/186] fix: create mark task error

---
 .../bisheng/api/v1/schema/mark_schema.py      | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/backend/bisheng/api/v1/schema/mark_schema.py b/src/backend/bisheng/api/v1/schema/mark_schema.py
index 214b3fce7..589dee782 100644
--- a/src/backend/bisheng/api/v1/schema/mark_schema.py
+++ b/src/backend/bisheng/api/v1/schema/mark_schema.py
@@ -1,15 +1,26 @@
-from typing import List, Optional
+from typing import List, Optional, Any
 
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, field_validator
 
 
 class MarkTaskCreate(BaseModel):
     app_list: List[str] = Field(max_length=30)
     user_list: List[str]
 
+    @field_validator('user_list', mode='before')
+    @classmethod
+    def convert_user_list(cls, v: Any):
+        ret = []
+        for one in v:
+            if isinstance(one, str):
+                ret.append(one)
+            else:
+                ret.append(str(one))
+        return ret
+
+
 class MarkData(BaseModel):
     session_id: str
     task_id: int
     status: int
-    flow_type:Optional[int] = None
-
+    flow_type: Optional[int] = None

From 64ff9445fe8d795ed6c5f650a7356042c5dc4b47 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Tue, 29 Apr 2025 17:27:44 +0800
Subject: [PATCH 092/186] feat: workflow invoke api remove stream event when
 stream field is false

---
 src/backend/bisheng/api/v2/workflow.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/backend/bisheng/api/v2/workflow.py b/src/backend/bisheng/api/v2/workflow.py
index 05b2a84a2..2e2db93b1 100644
--- a/src/backend/bisheng/api/v2/workflow.py
+++ b/src/backend/bisheng/api/v2/workflow.py
@@ -69,10 +69,13 @@ async def invoke_workflow(request: Request,
         async for event in workflow.get_response_until_break():
             if event.category == WorkflowEventType.NodeRun.value:
                 continue
+            # 非流式请求，过滤掉节点产生的流式输出事件
+            if not stream and event.category == WorkflowEventType.StreamMsg.value and event.type == 'stream':
+                continue
             workflow_stream = WorkflowStream(session_id=session_id,
                                              data=WorkFlowService.convert_chat_response_to_workflow_event(event))
             event_list.append(workflow_stream.data)
-            yield f'data: {workflow_stream.json()}\n\n'
+            yield f'data: {workflow_stream.model_dump_json()}\n\n'
         tmp_status_info = workflow.get_workflow_status()
         if tmp_status_info['status'] in [WorkflowStatus.SUCCESS.value, WorkflowStatus.FAILED.value]:
             workflow.clear_workflow_status()
@@ -80,7 +83,7 @@ async def invoke_workflow(request: Request,
             workflow_stream = WorkflowStream(session_id=session_id,
                                              data=WorkflowEvent(event=WorkflowEventType.Close.value))
             event_list.append(workflow_stream.data)
-            yield f'data: {workflow_stream.json()}\n\n'
+            yield f'data: {workflow_stream.model_dump_json()}\n\n'
 
     res = []
     # 非流式返回累计的事件列表

From 8f1de9d1938b515f428c2f2bb8f07d938ece198a Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Tue, 29 Apr 2025 19:18:12 +0800
Subject: [PATCH 093/186] feat: form input parse error

---
 src/backend/bisheng/workflow/nodes/input/input.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backend/bisheng/workflow/nodes/input/input.py b/src/backend/bisheng/workflow/nodes/input/input.py
index 200b58d3a..e1bb84bb3 100644
--- a/src/backend/bisheng/workflow/nodes/input/input.py
+++ b/src/backend/bisheng/workflow/nodes/input/input.py
@@ -65,7 +65,7 @@ class InputNode(BaseNode):
             ]
             return user_input_info
         form_input_info = self.node_data.get_variable_info('form_input')
-        for one in form_input_info['value']:
+        for one in form_input_info.value:
             one['value'], _ = self.parse_msg_with_variables(one['value'])
         return form_input_info
 

From a767ab0375c23b3f009b8d6d966cf1288a3b0fd8 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Tue, 29 Apr 2025 20:09:04 +0800
Subject: [PATCH 094/186] feat: input node parse file ignore special error

---
 src/backend/bisheng/workflow/nodes/input/input.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/backend/bisheng/workflow/nodes/input/input.py b/src/backend/bisheng/workflow/nodes/input/input.py
index e1bb84bb3..86240299c 100644
--- a/src/backend/bisheng/workflow/nodes/input/input.py
+++ b/src/backend/bisheng/workflow/nodes/input/input.py
@@ -166,8 +166,10 @@ class InputNode(BaseNode):
                     'extra': '',
                     'bbox': '',  # 临时文件不能溯源，因为没有持久化存储源文件
                 })
-        except Exception:
+        except Exception as e:
             logger.exception('parse input node file error')
+            if str(e).find('类型不支持') == -1:
+                raise e
 
         return file_name, original_file_path, texts, metadatas
 

From 5589e0f811d9600108ce75b81c678c528c90be7c Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Tue, 29 Apr 2025 20:21:40 +0800
Subject: [PATCH 095/186] fix: convert excel value to str

---
 src/backend/bisheng/api/v1/knowledge.py | 30 +++++++++++++++----------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/backend/bisheng/api/v1/knowledge.py b/src/backend/bisheng/api/v1/knowledge.py
index c6f292a44..b9f2fd8d9 100644
--- a/src/backend/bisheng/api/v1/knowledge.py
+++ b/src/backend/bisheng/api/v1/knowledge.py
@@ -2,7 +2,7 @@ import json
 import urllib.parse
 from datetime import datetime
 from io import BytesIO
-from typing import List, Optional
+from typing import List, Optional, Any
 
 import numpy as np
 import pandas as pd
@@ -497,6 +497,13 @@ def get_export_url(*,
     return resp_200({"file_list": file_list})
 
 
+def convert_excel_value(value: Any):
+    if value is None or value == "":
+        return ''
+    if str(value) == 'nan' or str(value) == 'null':
+        return ''
+    return str(value)
+
 @router.post('/qa/preview/{qa_knowledge_id}', status_code=200)
 def post_import_file(*,
                      qa_knowledge_id: int,
@@ -514,15 +521,15 @@ def post_import_file(*,
         d = QAKnowledgeUpsert(
             user_id=login_user.user_id,
             knowledge_id=qa_knowledge_id,
-            answers=[str(dd['答案']) if dd['答案'] != np.nan else ''],
-            questions=[str(dd['问题']) if dd['问题'] != np.nan else ''],
+            answers=[convert_excel_value(dd['答案'])],
+            questions=[convert_excel_value(dd['问题'])],
             source=4,
             status=1,
             create_time=datetime.now(),
             update_time=datetime.now())
         for key, value in dd.items():
-            if key.startswith('相似问题') and value != np.nan and value != '' and value is not None:
-                d.questions.append(str(value))
+            if key.startswith('相似问题') and convert_excel_value(value):
+                d.questions.append(convert_excel_value(value))
         insert_data.append(d)
     try:
         if size > 0 and offset >= 0:
@@ -562,18 +569,17 @@ def post_import_file(*,
             QACreate = QAKnowledgeUpsert(
                 user_id=login_user.user_id,
                 knowledge_id=qa_knowledge_id,
-                answers=[str(dd['答案']) if dd['答案'] != np.nan else ''],
-                questions=[str(dd['问题']) if dd['问题'] != np.nan else ''],
+                answers=[convert_excel_value(dd['答案'])],
+                questions=[convert_excel_value(dd['问题'])],
                 source=4,
                 status=1)
             tmp_questions.add(QACreate.questions[0])
             for key, value in dd.items():
                 if key.startswith('相似问题'):
-                    if value is not np.nan and value and value is not None and str(value) != 'nan' and str(
-                            value) != 'null':
-                        if value not in tmp_questions:
-                            QACreate.questions.append(str(value))
-                            tmp_questions.add(str(value))
+                    if tmp_value := convert_excel_value(value):
+                        if tmp_value not in tmp_questions:
+                            QACreate.questions.append(tmp_value)
+                            tmp_questions.add(tmp_value)
 
             db_q = QAKnoweldgeDao.get_qa_knowledge_by_name(QACreate.questions, QACreate.knowledge_id)
             if db_q and not QACreate.id or len(tmp_questions & all_questions) > 0:

From 98d9aaceabc3e7e1909e4f5084abf434430dbeeb Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Tue, 29 Apr 2025 20:32:19 +0800
Subject: [PATCH 096/186] fix: question or answer empty raise exception

---
 src/backend/bisheng/api/v1/knowledge.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/backend/bisheng/api/v1/knowledge.py b/src/backend/bisheng/api/v1/knowledge.py
index b9f2fd8d9..61eaa8a8b 100644
--- a/src/backend/bisheng/api/v1/knowledge.py
+++ b/src/backend/bisheng/api/v1/knowledge.py
@@ -10,7 +10,7 @@ from fastapi import (APIRouter, BackgroundTasks, Body, Depends, File, HTTPExcept
                      UploadFile)
 from fastapi.encoders import jsonable_encoder
 
-from bisheng.api.errcode.base import UnAuthorizedError
+from bisheng.api.errcode.base import UnAuthorizedError, ServerError
 from bisheng.api.errcode.knowledge import KnowledgeCPError, KnowledgeQAError
 from bisheng.api.services import knowledge_imp
 from bisheng.api.services.knowledge import KnowledgeService
@@ -573,6 +573,8 @@ def post_import_file(*,
                 questions=[convert_excel_value(dd['问题'])],
                 source=4,
                 status=1)
+            if not QACreate.questions[0] or not QACreate.answers:
+                raise ServerError.http_exception(msg='上传失败，请重试')
             tmp_questions.add(QACreate.questions[0])
             for key, value in dd.items():
                 if key.startswith('相似问题'):

From 0a9c79e160f877d2da84d9a7cb1fe388e2657a67 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Wed, 30 Apr 2025 11:17:07 +0800
Subject: [PATCH 097/186] fix: question or answer empty record error

---
 src/backend/bisheng/api/v1/knowledge.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/backend/bisheng/api/v1/knowledge.py b/src/backend/bisheng/api/v1/knowledge.py
index 61eaa8a8b..0bca49956 100644
--- a/src/backend/bisheng/api/v1/knowledge.py
+++ b/src/backend/bisheng/api/v1/knowledge.py
@@ -566,15 +566,15 @@ def post_import_file(*,
         all_questions = set()
         for index, dd in enumerate(data):
             tmp_questions = set()
+            dd_question = convert_excel_value(dd['问题'])
+            dd_answer = convert_excel_value(dd['答案'])
             QACreate = QAKnowledgeUpsert(
                 user_id=login_user.user_id,
                 knowledge_id=qa_knowledge_id,
-                answers=[convert_excel_value(dd['答案'])],
-                questions=[convert_excel_value(dd['问题'])],
+                answers=[dd_answer],
+                questions=[dd_question],
                 source=4,
-                status=1)
-            if not QACreate.questions[0] or not QACreate.answers:
-                raise ServerError.http_exception(msg='上传失败，请重试')
+                status=0)
             tmp_questions.add(QACreate.questions[0])
             for key, value in dd.items():
                 if key.startswith('相似问题'):
@@ -584,7 +584,7 @@ def post_import_file(*,
                             tmp_questions.add(tmp_value)
 
             db_q = QAKnoweldgeDao.get_qa_knowledge_by_name(QACreate.questions, QACreate.knowledge_id)
-            if db_q and not QACreate.id or len(tmp_questions & all_questions) > 0:
+            if (db_q and not QACreate.id) or len(tmp_questions & all_questions) > 0 or not dd_question or not dd_answer:
                 have_data.append(index)
             else:
                 insert_data.append(QACreate)

From 0e7af11395910ca0f45daad8cb028ff36ef065bb Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Wed, 30 Apr 2025 11:50:02 +0800
Subject: [PATCH 098/186] fix: email tool error

---
 .../bisheng_langchain/gpts/tools/message/email.py               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bisheng-langchain/bisheng_langchain/gpts/tools/message/email.py b/src/bisheng-langchain/bisheng_langchain/gpts/tools/message/email.py
index 58d0a7178..39398c58e 100644
--- a/src/bisheng-langchain/bisheng_langchain/gpts/tools/message/email.py
+++ b/src/bisheng-langchain/bisheng_langchain/gpts/tools/message/email.py
@@ -15,7 +15,7 @@ class InputArgs(BaseModel):
     content: str = Field(description="邮件正文内容")
 
 
-class EmailMessageTool(APIToolBase):
+class EmailMessageTool(BaseModel):
 
     email_account: str = Field(description="发件人邮箱")
     email_password: str = Field(description="邮箱授权码/密码")

From 729fa9cf395472b27203901c147929d2bcc8f787 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Wed, 30 Apr 2025 17:36:29 +0800
Subject: [PATCH 099/186] fix: llm _stream method invalid

---
 .../bisheng/interface/embeddings/custom.py    |  5 +-
 src/backend/bisheng/interface/llms/custom.py  | 69 ++++++++++++-------
 src/backend/bisheng/interface/utils.py        | 33 ++++++++-
 3 files changed, 77 insertions(+), 30 deletions(-)

diff --git a/src/backend/bisheng/interface/embeddings/custom.py b/src/backend/bisheng/interface/embeddings/custom.py
index a837e4555..4fed4f82c 100644
--- a/src/backend/bisheng/interface/embeddings/custom.py
+++ b/src/backend/bisheng/interface/embeddings/custom.py
@@ -183,7 +183,10 @@ class BishengEmbedding(BaseModel, Embeddings):
 
     def _update_model_status(self, status: int, remark: str = ''):
         """更新模型状态"""
-        LLMDao.update_model_status(self.model_id, status, remark)
+        # todo 接入到异步任务模块 累计5分钟更新一次
+        if self.model_info.status != status:
+            self.model_info.status =  status
+            LLMDao.update_model_status(self.model_id, status, remark)
 
 
 CUSTOM_EMBEDDING = {
diff --git a/src/backend/bisheng/interface/llms/custom.py b/src/backend/bisheng/interface/llms/custom.py
index d7518430f..33969873c 100644
--- a/src/backend/bisheng/interface/llms/custom.py
+++ b/src/backend/bisheng/interface/llms/custom.py
@@ -1,10 +1,10 @@
 import json
-from typing import List, Optional, Any, Sequence, Union, Dict, Type, Callable
+from typing import List, Optional, Any, Sequence, Union, Dict, Type, Callable, Iterator, AsyncIterator
 
-from langchain_core.callbacks import AsyncCallbackManagerForLLMRun
+from langchain_core.callbacks import AsyncCallbackManagerForLLMRun, CallbackManagerForLLMRun
 from langchain_core.language_models import BaseLanguageModel, BaseChatModel, LanguageModelInput
-from langchain_core.messages import BaseMessage, ToolMessage, HumanMessage
-from langchain_core.outputs import ChatResult
+from langchain_core.messages import BaseMessage, ToolMessage, HumanMessage, BaseMessageChunk
+from langchain_core.outputs import ChatResult, ChatGenerationChunk
 from langchain_core.runnables import Runnable, RunnableConfig
 from langchain_core.tools import BaseTool
 from loguru import logger
@@ -13,7 +13,8 @@ from pydantic import Field
 from bisheng.database.models.llm_server import LLMDao, LLMModelType, LLMServerType, LLMModel, LLMServer
 from bisheng.interface.importing import import_by_type
 from bisheng.interface.initialize.loading import instantiate_llm
-from bisheng.interface.utils import wrapper_bisheng_model_limit_check, wrapper_bisheng_model_limit_check_async
+from bisheng.interface.utils import wrapper_bisheng_model_limit_check, wrapper_bisheng_model_limit_check_async, \
+    wrapper_bisheng_model_generator, wrapper_bisheng_model_generator_async
 
 
 class BishengLLM(BaseChatModel):
@@ -216,6 +217,8 @@ class BishengLLM(BaseChatModel):
                 ret = self.moonshot_generate(messages, stop, run_manager, **kwargs)
             else:
                 ret = self.llm._generate(messages, stop, run_manager, **kwargs)
+                if self.server_info.type == LLMServerType.QWEN.value:
+                    ret.generations[0].message = self.convert_qwen_result(ret.generations[0].message)
             self._update_model_status(0)
         except Exception as e:
             self._update_model_status(1, str(e))
@@ -268,6 +271,8 @@ class BishengLLM(BaseChatModel):
                 ret = await self.moonshot_agenerate(messages, stop, run_manager, **kwargs)
             else:
                 ret = await self.llm._agenerate(messages, stop, run_manager, **kwargs)
+                if self.server_info.type == LLMServerType.QWEN.value:
+                    ret.generations[0].message = self.convert_qwen_result(ret.generations[0].message)
             self._update_model_status(0)
         except Exception as e:
             self._update_model_status(1, str(e))
@@ -308,8 +313,10 @@ class BishengLLM(BaseChatModel):
 
     def _update_model_status(self, status: int, remark: str = ''):
         """更新模型状态"""
-        # todo 接入到异步任务模块
-        LLMDao.update_model_status(self.model_id, status, remark)
+        # todo 接入到异步任务模块 累计5分钟更新一次
+        if self.model_info.status != status:
+            self.model_info.status = status
+            LLMDao.update_model_status(self.model_id, status, remark)
 
     def bind_tools(
             self,
@@ -318,34 +325,44 @@ class BishengLLM(BaseChatModel):
     ) -> Runnable[LanguageModelInput, BaseMessage]:
         return self.llm.bind_tools(tools, **kwargs)
 
-    def convert_qwen_result(self, message: BaseMessage) -> BaseMessage:
+    def convert_qwen_result(self, message: BaseMessageChunk | BaseMessage) -> BaseMessageChunk | BaseMessage:
         # ChatTongYi model vl model message.content is list
         if isinstance(message.content, list):
             message.content = ''.join([one.get('text', '') for one in message.content])
         return message
 
-    def invoke(
+    @wrapper_bisheng_model_generator
+    def _stream(
             self,
-            input: LanguageModelInput,
-            config: Optional[RunnableConfig] = None,
-            *,
+            messages: list[BaseMessage],
             stop: Optional[list[str]] = None,
+            run_manager: Optional[CallbackManagerForLLMRun] = None,
             **kwargs: Any,
-    ) -> BaseMessage:
-        ret = super().invoke(input, config=config, stop=stop, **kwargs)
-        if self.server_info.type == LLMServerType.QWEN.value:
-            ret = self.convert_qwen_result(ret)
-        return ret
+    ) -> Iterator[ChatGenerationChunk]:
+        try:
+            for one in self.llm._stream(messages, stop=stop, run_manager=run_manager, **kwargs):
+                if self.server_info.type == LLMServerType.QWEN.value:
+                    one.message = self.convert_qwen_result(one.message)
+                yield one
+            self._update_model_status(0)
+        except Exception as e:
+            self._update_model_status(1, str(e))
+            raise e
 
-    async def ainvoke(
+    @wrapper_bisheng_model_generator_async
+    async def _astream(
             self,
-            input: LanguageModelInput,
-            config: Optional[RunnableConfig] = None,
-            *,
+            messages: list[BaseMessage],
             stop: Optional[list[str]] = None,
+            run_manager: Optional[AsyncCallbackManagerForLLMRun] = None,
             **kwargs: Any,
-    ) -> BaseMessage:
-        ret = await super().ainvoke(input, config=config, stop=stop, **kwargs)
-        if self.server_info.type == LLMServerType.QWEN.value:
-            ret = self.convert_qwen_result(ret)
-        return ret
+    ) -> AsyncIterator[ChatGenerationChunk]:
+        try:
+            async for one in self.llm._astream(messages, stop=stop, run_manager=run_manager, **kwargs):
+                if self.server_info.type == LLMServerType.QWEN.value:
+                    one.message = self.convert_qwen_result(one.message)
+                yield one
+            self._update_model_status(0)
+        except Exception as e:
+            self._update_model_status(1, str(e))
+            raise e
diff --git a/src/backend/bisheng/interface/utils.py b/src/backend/bisheng/interface/utils.py
index 93e4bd4c0..57e03166d 100644
--- a/src/backend/bisheng/interface/utils.py
+++ b/src/backend/bisheng/interface/utils.py
@@ -1,20 +1,19 @@
 import base64
 import datetime
 import functools
-import inspect
 import json
 import os
 import re
 from io import BytesIO
 
 import yaml
+from PIL.Image import Image
+from langchain.base_language import BaseLanguageModel
 
 from bisheng.cache.redis import redis_client
 from bisheng.chat.config import ChatConfig
 from bisheng.settings import settings
 from bisheng.utils.logger import logger
-from langchain.base_language import BaseLanguageModel
-from PIL.Image import Image
 
 
 def load_file_into_dict(file_path: str) -> dict:
@@ -127,3 +126,31 @@ def wrapper_bisheng_model_limit_check(func):
         return func(*args, **kwargs)
 
     return wrapper
+
+
+def wrapper_bisheng_model_generator(func):
+    """
+    调用次数检查的装饰器  装饰同步生成器函数
+    """
+
+    @functools.wraps(func)
+    def wrapper(*args, **kwargs):
+        bisheng_model_limit_check(args[0])
+        for item in func(*args, **kwargs):
+            yield item
+
+    return wrapper
+
+
+def wrapper_bisheng_model_generator_async(func):
+    """
+    调用次数检查的装饰器  装饰异步生成器函数
+    """
+
+    @functools.wraps(func)
+    async def wrapper(*args, **kwargs):
+        bisheng_model_limit_check(args[0])
+        async for item in func(*args, **kwargs):
+            yield item
+
+    return wrapper

From 858c3da3cf8f1183d22de2c8b63330d765c3483d Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Wed, 30 Apr 2025 18:34:55 +0800
Subject: [PATCH 100/186] fix: workstation pydantic error

---
 .../bisheng/api/services/workstation.py       | 11 ++++-
 src/backend/bisheng/api/v1/schemas.py         | 40 +++++++++----------
 2 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/src/backend/bisheng/api/services/workstation.py b/src/backend/bisheng/api/services/workstation.py
index 80f50edd0..82784ee57 100644
--- a/src/backend/bisheng/api/services/workstation.py
+++ b/src/backend/bisheng/api/services/workstation.py
@@ -1,7 +1,9 @@
 import asyncio
 import json
 from datetime import datetime
-from typing import Optional
+from typing import Optional, Any
+
+from pydantic import field_validator
 
 from bisheng.api.services import knowledge_imp, llm
 from bisheng.api.services.knowledge import KnowledgeService
@@ -184,6 +186,13 @@ class WorkstationConversation(BaseModel):
             title=session.flow_name,
         )
 
+    @field_validator('user', mode='before')
+    @classmethod
+    def convert_user(cls, v: Any) -> str:
+        if isinstance(v, str):
+            return v
+        return str(v)
+
 
 class SSECallbackClient:
 
diff --git a/src/backend/bisheng/api/v1/schemas.py b/src/backend/bisheng/api/v1/schemas.py
index dadfac126..a494bdef1 100644
--- a/src/backend/bisheng/api/v1/schemas.py
+++ b/src/backend/bisheng/api/v1/schemas.py
@@ -428,39 +428,39 @@ class EvaluationLLMConfig(BaseModel):
 
 class Icon(BaseModel):
     enabled: bool
-    image: Optional[str]
+    image: Optional[str] = None
 
 
 class WSModel(BaseModel):
-    key: Optional[str]
+    key: Optional[str] = None
     id: str
-    name: Optional[str]
-    displayName: Optional[str]
+    name: Optional[str] = None
+    displayName: Optional[str] = None
 
 
 class WSPrompt(BaseModel):
     enabled: bool
-    prompt: Optional[str]
-    model: Optional[str]
-    tool: Optional[str]
-    bingKey: Optional[str]
-    bingUrl: Optional[str]
+    prompt: Optional[str] = None
+    model: Optional[str] = None
+    tool: Optional[str] = None
+    bingKey: Optional[str] = None
+    bingUrl: Optional[str] = None
 
 
 class WorkstationConfig(BaseModel):
     menuShow: bool = Field(default=True, description='是否显示左侧菜单栏')
     maxTokens: Optional[int] = Field(default=1500, description='最大token数')
-    sidebarIcon: Optional[Icon]
-    assistantIcon: Optional[Icon]
-    sidebarSlogan: Optional[str] = Field(description='侧边栏slogan')
-    welcomeMessage: Optional[str] = Field()
-    functionDescription: Optional[str] = Field()
-    inputPlaceholder: Optional[str]
-    models: Optional[Union[List[WSModel], str]]
-    voiceInput: Optional[WSPrompt]
-    webSearch: Optional[WSPrompt]
-    knowledgeBase: Optional[WSPrompt]
-    fileUpload: Optional[WSPrompt]
+    sidebarIcon: Optional[Icon] = None
+    assistantIcon: Optional[Icon] = None
+    sidebarSlogan: Optional[str] = Field(default='', description='侧边栏slogan')
+    welcomeMessage: Optional[str] = Field(default='')
+    functionDescription: Optional[str] = Field(default='')
+    inputPlaceholder: Optional[str] = ''
+    models: Optional[Union[List[WSModel], str]] = None
+    voiceInput: Optional[WSPrompt] = None
+    webSearch: Optional[WSPrompt] = None
+    knowledgeBase: Optional[WSPrompt] = None
+    fileUpload: Optional[WSPrompt] = None
 
 
 # 文件切分请求基础参数

From 4d0b5d1942056b4b3b2ebe6c57549e0555013bfc Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Wed, 30 Apr 2025 19:03:58 +0800
Subject: [PATCH 101/186] fix: docx replace support table style

---
 src/backend/bisheng/utils/docx_temp.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/backend/bisheng/utils/docx_temp.py b/src/backend/bisheng/utils/docx_temp.py
index 8ba6d9c46..8c3b07370 100644
--- a/src/backend/bisheng/utils/docx_temp.py
+++ b/src/backend/bisheng/utils/docx_temp.py
@@ -220,7 +220,14 @@ class DocxTemplateRender(object):
                 for i, row in enumerate(table.rows):
                     for j, cell in enumerate(row.cells):
                         if k1 in cell.text:
-                            table.rows[i].cells[j].text = cell.text.replace(k1, v1)
+                            for one in cell.paragraphs:
+                                if k1 in one.text:
+                                    new_text = one.text.replace(k1, v1)
+                                    one.runs[0].text = new_text
+                                    for r_index, r in enumerate(one.runs):
+                                        if r_index == 0:
+                                            continue
+                                        r.text = ''
 
             for p in doc.paragraphs:
                 # p.text = p.text.replace(k1, v1)

From ab250abea901adb0ce0633d5793df572cc62f7d5 Mon Sep 17 00:00:00 2001
From: dolphin <shanghang@dataelem.com>
Date: Wed, 30 Apr 2025 21:21:32 +0800
Subject: [PATCH 102/186] fix: some bugfix

---
 .../platform/public/locales/zh/bs.json        |   2 +-
 .../platform/src/controllers/API/flow.ts      |   2 +-
 .../platform/src/controllers/API/workflow.ts  |   4 +-
 .../BuildPage/flow/FlowChat/ChatInput.tsx     |   6 +-
 .../BuildPage/flow/FlowChat/ChatPane.tsx      |   2 +
 .../BuildPage/flow/FlowNode/Parameter.tsx     |   4 +-
 .../pages/BuildPage/flow/FlowNode/RunLog.tsx  |   1 +
 .../flow/FlowNode/component/InputFormItem.tsx |   7 +-
 .../flow/FlowNode/component/InputItem.tsx     |  22 +++-
 .../flow/FlowNode/component/SelectVar.tsx     |   7 +-
 .../flow/FlowNode/component/VarInput.tsx      | 104 ++++++++++--------
 .../platform/src/pages/KnowledgePage/qas.tsx  |   2 +-
 .../src/pages/ModelPage/manage/CustomForm.tsx |   1 -
 .../pages/ModelPage/manage/ModelConfig.tsx    |   2 +-
 .../platform/src/util/flowCompatible.ts       |   4 +-
 src/frontend/platform/src/util/flowUtils.ts   |   6 +-
 16 files changed, 112 insertions(+), 64 deletions(-)

diff --git a/src/frontend/platform/public/locales/zh/bs.json b/src/frontend/platform/public/locales/zh/bs.json
index 869391059..7ef84aa0b 100644
--- a/src/frontend/platform/public/locales/zh/bs.json
+++ b/src/frontend/platform/public/locales/zh/bs.json
@@ -914,7 +914,7 @@
     "10606": "用户组和角色不能为空",
     "10610": "用户组内还有用户，不能删除",
     "10920": "未配置QA知识库相似问模型",
-    "10930": "该问题已被标注过",
+    "10930": "该问题已存在",
     "10527": "工作流等待用户输入超时",
     "10528": "{{type}}节点执行超过最大次数",
     "10531": "{{type}}功能已升级,需删除后重新拖入",
diff --git a/src/frontend/platform/src/controllers/API/flow.ts b/src/frontend/platform/src/controllers/API/flow.ts
index 11197623a..5950504a6 100644
--- a/src/frontend/platform/src/controllers/API/flow.ts
+++ b/src/frontend/platform/src/controllers/API/flow.ts
@@ -349,7 +349,7 @@ export async function runTestCase(data: { question_list, version_list, node_id,
 export async function uploadChatFile(v, file: File, onProgress): Promise<any> {
     const formData = new FormData();
     formData.append("file", file);
-    return await axios.post(`/api/${v}/knowledge/upload`, formData, {
+    return await axios.post(`/api/v1/knowledge/upload`, formData, {
         headers: {
             "Content-Type": "multipart/form-data"
         },
diff --git a/src/frontend/platform/src/controllers/API/workflow.ts b/src/frontend/platform/src/controllers/API/workflow.ts
index e1b58e4c7..86c2b810f 100644
--- a/src/frontend/platform/src/controllers/API/workflow.ts
+++ b/src/frontend/platform/src/controllers/API/workflow.ts
@@ -199,8 +199,8 @@ const workflowTemplate = [
                     },
                     {
                         "key": "dialog_files_content_size",
-                        "label": "文件内容长度上限(字)",
-                        "type": "number",
+                        "label": "文件内容长度上限",
+                        "type": "char_number",
                         "min": 0,
                         "value": 15000,
                         "tab": "dialog_input"
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatInput.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatInput.tsx
index c3dcd3fee..4676b12af 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatInput.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatInput.tsx
@@ -436,9 +436,9 @@ export default function ChatInput({ autoRun, clear, form, wsUrl, onBeforSend, on
     }
 
     const placholder = useMemo(() => {
-        if (inputForm) {
-            return '      点击刷新按钮可开启新对话'
-        }
+        // if (inputForm) {
+        //     return '      点击刷新按钮可开启新对话'
+        // }
         const reason = inputLock.reason || ' '
         return inputLock.locked ? reason : t('chat.inputPlaceholder')
     }, [inputForm, inputLock])
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatPane.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatPane.tsx
index 3887f55bc..015f53ca4 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatPane.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatPane.tsx
@@ -38,6 +38,8 @@ export default function ChatPane({ debug = false, autoRun = false, chatId, flow,
             )
             return {
                 action,
+                flow_id: flow.id,
+                chat_id: chatId.startsWith('test') ? undefined : chatId,
                 data: {
                     [nodeId]: {
                         data: {
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/Parameter.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/Parameter.tsx
index 98c335626..5a97a9496 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/Parameter.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/Parameter.tsx
@@ -115,6 +115,8 @@ export default function Parameter({ node, nodeId, item, onOutPutChange, onStatus
             />;
         case 'number':
             return <InputItem type='number' data={item} onChange={handleOnNewValue} />;
+        case 'char_number':
+            return <InputItem char type='number' data={item} onChange={handleOnNewValue} />;
         case 'code_input':
             return <CodeInputItem nodeId={nodeId} data={item} onChange={handleOnNewValue} onValidate={bindValidate} />;
         case 'code':
@@ -147,7 +149,7 @@ export default function Parameter({ node, nodeId, item, onOutPutChange, onStatus
                 onFouceUpdate()
             }} />;
         case 'image_prompt':
-            return <ImagePromptItem nodeId={nodeId} data={item} onChange={handleOnNewValue} onVarEvent={bindVarValidate}/>;
+            return <ImagePromptItem nodeId={nodeId} data={item} onChange={handleOnNewValue} onVarEvent={bindVarValidate} />;
         default:
             return <div>Unsupported parameter type</div>;
     }
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/RunLog.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/RunLog.tsx
index 6dc377982..c1547f6aa 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/RunLog.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/RunLog.tsx
@@ -53,6 +53,7 @@ export default function RunLog({ node, children }) {
                                 hasKeys.push(value.key);
                             });
                         } else if (newData.has(param.key)) {
+                            if (param.hidden) return newData.delete(param.key);
                             newData.get(param.key)['label'] = param.label || param.key;
                             hasKeys.push(param.key);
                         } else if (param.key === 'tool_list') {
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/InputFormItem.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/InputFormItem.tsx
index df3f04857..610d9e785 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/InputFormItem.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/InputFormItem.tsx
@@ -281,6 +281,7 @@ function Form({ nodeId, nodeData, initialData, onSubmit, onCancel, existingOptio
                 onChange={(e) => setFormData({ ...formData, displayName: e.target.value })}
             /> */}
             <VarInput
+                mini
                 key={formData.variableName}
                 label={''}
                 itemKey={''}
@@ -434,6 +435,7 @@ function Form({ nodeId, nodeData, initialData, onSubmit, onCancel, existingOptio
             type='number'
             data={
                 {
+                    min: 0,
                     label: "文件内容长度限制(字)",
                     value: formData.fileContentSize,
                 }
@@ -551,6 +553,7 @@ export default function InputFormItem({ data, nodeId, onChange, onValidate }) {
             variableName: key,
             filecontent: file_content,
             filepath: file_path,
+            fileType: file_type,
             fileContentSize: file_content_size,
             imageFile: image_file
         } = _data;
@@ -569,6 +572,7 @@ export default function InputFormItem({ data, nodeId, onChange, onValidate }) {
                         options,
                         file_content,
                         file_path,
+                        file_type,
                         file_content_size,
                         image_file
                     }
@@ -584,6 +588,7 @@ export default function InputFormItem({ data, nodeId, onChange, onValidate }) {
                 multiple,
                 file_content,
                 file_path,
+                file_type,
                 options,
                 file_content_size,
                 image_file
@@ -634,7 +639,7 @@ export default function InputFormItem({ data, nodeId, onChange, onValidate }) {
                     ref={scrollRef}
                     options={data.value.map((el) => ({
                         key: el.key,
-                        text: el.type === FormType.File && !el.multiple ? `${el.value}(${el.key},${el.file_content},${el.file_path})` : `${el.value}(${el.key})`,
+                        text: `${el.value}(${el.key},${el.file_content},${el.file_path})`,
                         type: el.type,
                     }))}
                     onEditClick={handleEditClick} // 点击编辑时执行的逻辑
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/InputItem.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/InputItem.tsx
index 55f71878e..4b9096b8f 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/InputItem.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/InputItem.tsx
@@ -3,9 +3,29 @@ import { Label } from "@/components/bs-ui/label";
 import { QuestionTooltip } from "@/components/bs-ui/tooltip";
 import { useState } from "react";
 
-export default function InputItem({ type = 'text', data, onChange }) {
+export default function InputItem({ type = 'text', char = false, data, onChange }) {
     const [value, setValue] = useState(data.value || '')
 
+    // inline style
+    if (char) return <div className='node-item mb-4 flex items-center justify-between' data-key={data.key}>
+        <Label className="flex items-center bisheng-label">
+            {data.label}
+            {data.help && <QuestionTooltip content={data.help} />}
+        </Label>
+        <div className="nodrag w-32 flex items-center gap-3">
+            <Input
+                value={value}
+                type={type}
+                min={data.min}
+                onChange={(e) => {
+                    setValue(e.target.value);
+                    onChange(e.target.value);
+                }}
+            ></Input>
+            <Label className="bisheng-label">字</Label>
+        </div>
+    </div>
+
     return <div className='node-item mb-4' data-key={data.key}>
         <Label className="flex items-center bisheng-label">
             {data.label}
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/SelectVar.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/SelectVar.tsx
index 50c34d517..c9444bdef 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/SelectVar.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/SelectVar.tsx
@@ -29,10 +29,11 @@ const getSpecialVar = (obj, type) => {
         case 'item:form_input':
             return obj.value.reduce((res, item) => {
                 if (item.type === 'file') {
-                    if (item.multiple) return res
+                    // if (item.multiple) return res
                     // res.push({ label: item.key, value: item.key })
                     res.push({ label: item.file_content, value: item.file_content })
                     res.push({ label: item.file_path, value: item.file_path })
+                    res.push({ label: item.image_file, value: item.image_file })
                 } else {
                     res.push({ label: item.key, value: item.key })
                 }
@@ -160,6 +161,8 @@ const SelectVar = forwardRef(({
 
             // 特殊处理输入节点
             if (node.data.type === 'input') {
+                // 输入节点，跳过自己
+                if (node.data.id === nodeId) return processedNodes
                 nodeData = processInputNode(node.data, findInputFile);
             }
             // 其他节点，跳过
@@ -354,7 +357,7 @@ const SelectVar = forwardRef(({
                         </div>
                     )}
                 </div>
-                {!!vars.length && <div className="w-36 border-l first:border-none">
+                {!!vars.length && <div className="w-36 border-l first:border-none overflow-y-auto scrollbar-hide">
                     {vars.map(v =>
                         <div
                             className={`${select[1] === v.value && 'bg-[#EBF0FF]'} relative flex justify-between w-full select-none items-center rounded-sm p-1.5 text-sm outline-none cursor-pointer hover:bg-[#EBF0FF] data-[focus=true]:bg-[#EBF0FF] dark:hover:bg-gray-700 dark:data-[focus=true]:bg-gray-700 data-[disabled]:pointer-events-none data-[disabled]:opacity-50`}
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/VarInput.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/VarInput.tsx
index 87d6f8091..ee54231ff 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/VarInput.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/VarInput.tsx
@@ -59,6 +59,7 @@ export default function VarInput({
     label = undefined,
     full = false,
     value,
+    mini = false,
     error = false,
     children = null,
     onUpload = undefined,
@@ -120,8 +121,13 @@ export default function VarInput({
         handleFocus();
 
         const selection = window.getSelection();
+        if (!selection.rangeCount) {
+            // 没有选区时创建默认选区（可选）
+            const range = document.createRange();
+            range.selectNodeContents(textareaRef.current); // 或选择特定位置
+            selection.addRange(range);
+        }
         let range = selection.getRangeAt(0);
-        if (!selection.rangeCount) return;
 
         if (!textareaRef.current.contains(range.commonAncestorContainer)) {
             range = document.createRange();
@@ -177,59 +183,65 @@ export default function VarInput({
         document.execCommand('insertText', false, text);
     };
     // resize
-    const { height, handleMouseDown } = useResize(textareaRef, 80, 40);
+    const heightClass = mini ? 'max-h-64' : full ? 'min-h-64' : 'max-h-64 min-h-[80px]';
+    const { height, handleMouseDown } = useResize(textareaRef, mini ? 40 : 80, 40);
 
     return (
         <div
             className={`nodrag mt-2 flex flex-col w-full relative rounded-md border bg-search-input text-sm shadow-sm ${error ? 'border-red-500' : 'border-input'
                 }`}
         >
-            <div className="flex justify-between gap-1 border-b dark:border-gray-600 px-2 py-1" onClick={() => textareaRef.current.focus()}>
-                <Label className="bisheng-label text-xs" onClick={validateVarAvailble}>
-                    {flowNode.required && <span className="text-red-500">*</span>}
-                    {label ?? flowNode.label}
-                </Label>
-                <div className="flex gap-2">
+            {mini ?
+                <div className="absolute top-2 right-2 flex gap-1">
                     <SelectVar ref={selectVarRef} nodeId={nodeId} itemKey={itemKey} onSelect={handleInsertVariable}>
                         <span className="text-muted-foreground hover:text-gray-800 text-xs"  >{"{x}"}</span>
-                        {/* <Variable size={16} className="text-muted-foreground hover:text-gray-800" /> */}
                     </SelectVar>
-                    {onUpload && (
-                        <Button variant="ghost" className="p-0 h-4 text-muted-foreground" onClick={onUpload}>
-                            <UploadCloud size={16} />
-                        </Button>
-                    )}
-                    {!full && <Dialog >
-                        <DialogTrigger asChild>
-                            <Button className="text-muted-foreground absolute right-2 top-6 size-5" size="icon" variant="ghost"><Expand size={14} /></Button>
-                        </DialogTrigger>
-                        <DialogContent className="lg:max-w-[800px]">
-                            {/* <DialogHeader>
+                </div>
+                : <div className="flex justify-between gap-1 border-b dark:border-gray-600 px-2 py-1" onClick={() => textareaRef.current.focus()}>
+                    <Label className="bisheng-label text-xs" onClick={validateVarAvailble}>
+                        {flowNode.required && <span className="text-red-500">*</span>}
+                        {label ?? flowNode.label}
+                    </Label>
+                    <div className="flex gap-2">
+                        <SelectVar ref={selectVarRef} nodeId={nodeId} itemKey={itemKey} onSelect={handleInsertVariable}>
+                            <span className="text-muted-foreground hover:text-gray-800 text-xs"  >{"{x}"}</span>
+                        </SelectVar>
+                        {onUpload && (
+                            <Button variant="ghost" className="p-0 h-4 text-muted-foreground" onClick={onUpload}>
+                                <UploadCloud size={16} />
+                            </Button>
+                        )}
+                        {!full && <Dialog >
+                            <DialogTrigger asChild>
+                                <Button className="text-muted-foreground absolute right-2 top-6 size-5" size="icon" variant="ghost"><Expand size={14} /></Button>
+                            </DialogTrigger>
+                            <DialogContent className="lg:max-w-[800px]">
+                                {/* <DialogHeader>
                                 <DialogTitle className="flex items-center"></DialogTitle>
                             </DialogHeader> */}
-                            <div>
-                                <VarInput
-                                    full
-                                    nodeId={nodeId}
-                                    itemKey={itemKey}
-                                    placeholder={placeholder}
-                                    flowNode={flowNode}
-                                    value={fullVarInputValue}
-                                    error={error}
-                                    children={children}
-                                    onUpload={onUpload}
-                                    onChange={(val) => {
-                                        textareaRef.current.innerHTML = parseToHTML(val || '')[0];
-                                        handleBlur();
-                                        handleInput();
-                                    }}
-                                >
-                                </VarInput>
-                            </div>
-                        </DialogContent>
-                    </Dialog>}
-                </div>
-            </div>
+                                <div>
+                                    <VarInput
+                                        full
+                                        nodeId={nodeId}
+                                        itemKey={itemKey}
+                                        placeholder={placeholder}
+                                        flowNode={flowNode}
+                                        value={fullVarInputValue}
+                                        error={error}
+                                        children={children}
+                                        onUpload={onUpload}
+                                        onChange={(val) => {
+                                            textareaRef.current.innerHTML = parseToHTML(val || '')[0];
+                                            handleBlur();
+                                            handleInput();
+                                        }}
+                                    >
+                                    </VarInput>
+                                </div>
+                            </DialogContent>
+                        </Dialog>}
+                    </div>
+                </div>}
             <div
                 ref={textareaRef}
                 contentEditable
@@ -265,11 +277,12 @@ export default function VarInput({
                     }
                     e.stopPropagation()
                 }}
-                className={`${full ? 'min-h-64' : 'max-h-64 min-h-[80px]'} nowheel bisheng-richtext px-3 py-2 cursor-text whitespace-pre-line overflow-y-auto overflow-x-hidden border-none outline-none bg-search-input rounded-md dark:text-gray-50 placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50`}
+                className={`${heightClass} nowheel bisheng-richtext px-3 py-2 cursor-text whitespace-pre-line overflow-y-auto overflow-x-hidden border-none outline-none bg-search-input rounded-md dark:text-gray-50 placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50`}
             ></div>
             {children}
+            {/* drag size */}
             <div
-                className="resize-handle w-4 h-4 text-transparent absolute cursor-ns-resize right-0 bottom-0 rounded-ee-md overflow-hidden"
+                className="resize-handle w-4 h-4 text-transparent absolute cursor-ns-resize right-0 bottom-0 rounded-ee-md overflow-hidden select-none"
                 onMouseDown={handleMouseDown}
             ><RbDragIcon /></div>
         </div>
@@ -321,6 +334,7 @@ function usePlaceholder(placeholder) {
         if (divRef.current && divRef.current.innerHTML.trim() === placeholder) {
             divRef.current.innerHTML = "";
             divRef.current.classList.remove("placeholder");
+            divRef.current.focus();
         }
     };
 
diff --git a/src/frontend/platform/src/pages/KnowledgePage/qas.tsx b/src/frontend/platform/src/pages/KnowledgePage/qas.tsx
index 6d00503fa..af3c5d2ed 100644
--- a/src/frontend/platform/src/pages/KnowledgePage/qas.tsx
+++ b/src/frontend/platform/src/pages/KnowledgePage/qas.tsx
@@ -369,7 +369,7 @@ export default function QasPage() {
                                         {el.answers}
                                     </div>
                                 </TableCell>
-                                <TableCell>{['未知', '手动创建', '标注导入', 'API导入', '批量导入'][el.source]}</TableCell>
+                                <TableCell>{['未知', '手动创建', '标注导入', 'api导入', '批量导入'][el.source]}</TableCell>
                                 <TableCell>{el.create_time.replace('T', ' ')}</TableCell>
                                 <TableCell>{el.update_time.replace('T', ' ')}</TableCell>
                                 <TableCell>{el.user_name}</TableCell>
diff --git a/src/frontend/platform/src/pages/ModelPage/manage/CustomForm.tsx b/src/frontend/platform/src/pages/ModelPage/manage/CustomForm.tsx
index b709b690c..eca848c48 100644
--- a/src/frontend/platform/src/pages/ModelPage/manage/CustomForm.tsx
+++ b/src/frontend/platform/src/pages/ModelPage/manage/CustomForm.tsx
@@ -252,7 +252,6 @@ const modelProviders = {
         {
             label: "Base URL",
             type: "text",
-            placeholder: "https://api.hunyuan.cloud.tencent.com/v1",
             default: "https://api.hunyuan.cloud.tencent.com/v1",
             required: true,
             key: "base_url",
diff --git a/src/frontend/platform/src/pages/ModelPage/manage/ModelConfig.tsx b/src/frontend/platform/src/pages/ModelPage/manage/ModelConfig.tsx
index ddabdaedb..fa3d652af 100644
--- a/src/frontend/platform/src/pages/ModelPage/manage/ModelConfig.tsx
+++ b/src/frontend/platform/src/pages/ModelPage/manage/ModelConfig.tsx
@@ -146,7 +146,7 @@ export const modelProvider = [
     { "name": "智谱 AI", "value": "zhipu" },
     { "name": "讯飞星火", "value": "spark" },
     { "name": "腾讯云", "value": "tencent" },
-    { "name": "Moonshot", "value": "moonshot" },
+    { "name": "月之暗面", "value": "moonshot" },
     { "name": "百度千帆", "value": "qianfan" },
     { "name": "Minimax", "value": "minimax" },
     { "name": "Anthropic", "value": "anthropic" },
diff --git a/src/frontend/platform/src/util/flowCompatible.ts b/src/frontend/platform/src/util/flowCompatible.ts
index 2183a5e64..38a238672 100644
--- a/src/frontend/platform/src/util/flowCompatible.ts
+++ b/src/frontend/platform/src/util/flowCompatible.ts
@@ -72,8 +72,8 @@ const comptibleInput = (node) => {
 
         node.group_params[0].params.push({
             key: "dialog_files_content_size",
-            label: "文件内容长度上限(字)",
-            type: "number",
+            label: "文件内容长度上限",
+            type: "char_number",
             min: 0,
             value: 15000,
             tab: "dialog_input"
diff --git a/src/frontend/platform/src/util/flowUtils.ts b/src/frontend/platform/src/util/flowUtils.ts
index 0bed6d1af..66473eff0 100644
--- a/src/frontend/platform/src/util/flowUtils.ts
+++ b/src/frontend/platform/src/util/flowUtils.ts
@@ -109,9 +109,11 @@ export function isVarInFlow(nodeId, nodes, varName, varNameCn) {
                     return false
                 } else if (param.type === 'form') {
                     return param.value.some(item => {
-                        if (item.multiple) return `${node.id}.${item.key}` === varName
-                        return [`${node.id}.${item.key}`, `${node.id}.${item.file_content}`, `${node.id}.${item.file_path}`].includes(varName)
+                        // if (item.multiple) return `${node.id}.${item.key}` === varName
+                        return [`${node.id}.${item.key}`, `${node.id}.${item.file_content}`, `${node.id}.${item.file_path}`, `${node.id}.${item.image_file}`].includes(varName)
                     })
+                } else if (param.hidden) {
+                    return false
                 } else {
                     return `${node.id}.${param.key}` === varName
                 }

From e444a20170e39e504b83f1e1c944a61bf8d7332a Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Tue, 6 May 2025 11:58:55 +0800
Subject: [PATCH 103/186] fix: convert str to int

---
 src/backend/bisheng/workflow/nodes/input/input.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backend/bisheng/workflow/nodes/input/input.py b/src/backend/bisheng/workflow/nodes/input/input.py
index 86240299c..1b94b2306 100644
--- a/src/backend/bisheng/workflow/nodes/input/input.py
+++ b/src/backend/bisheng/workflow/nodes/input/input.py
@@ -195,7 +195,7 @@ class InputNode(BaseNode):
         original_file_path = ''
         file_id = md5_hash(f'{key}:{value[0]}')
         image_files_path = []
-        file_content_max_size = key_info.get('file_content_size', 15000)
+        file_content_max_size = int(key_info.get('file_content_size', 15000))
         file_content_length = 0
         for one_file_url in value:
             file_name, file_path, texts, metadatas = self.get_upload_file_path_content(one_file_url)

From 81304300c3408b5385e86e38725fd17d0547709f Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Tue, 6 May 2025 14:35:40 +0800
Subject: [PATCH 104/186] fix: workstation logo expired error

---
 src/backend/bisheng/api/services/workstation.py | 11 ++++++++---
 src/backend/bisheng/api/v1/schemas.py           |  1 +
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/backend/bisheng/api/services/workstation.py b/src/backend/bisheng/api/services/workstation.py
index 82784ee57..aa2a217e1 100644
--- a/src/backend/bisheng/api/services/workstation.py
+++ b/src/backend/bisheng/api/services/workstation.py
@@ -6,6 +6,7 @@ from typing import Optional, Any
 from pydantic import field_validator
 
 from bisheng.api.services import knowledge_imp, llm
+from bisheng.api.services.base import BaseService
 from bisheng.api.services.knowledge import KnowledgeService
 from bisheng.api.services.user_service import UserPayload
 from bisheng.api.v1.schemas import KnowledgeFileOne, KnowledgeFileProcess, WorkstationConfig
@@ -20,7 +21,7 @@ from loguru import logger
 from openai import BaseModel
 
 
-class WorkStationService:
+class WorkStationService(BaseService):
 
     @classmethod
     def update_config(cls, request: Request, login_user: UserPayload, data: WorkstationConfig) \
@@ -37,11 +38,15 @@ class WorkStationService:
     @classmethod
     def get_config(cls) -> WorkstationConfig | None:
         """ 获取评测功能的默认模型配置 """
-        ret = {}
         config = ConfigDao.get_config(ConfigKeyEnum.WORKSTATION)
         if config:
             ret = json.loads(config.value)
-            return WorkstationConfig(**ret)
+            ret = WorkstationConfig(**ret)
+            if ret.assistantIcon and ret.assistantIcon.relative_path:
+                ret.assistantIcon.image = cls.get_logo_share_link(ret.assistantIcon.relative_path)
+            if ret.sidebarIcon and ret.sidebarIcon.relative_path:
+                ret.sidebarIcon.image = cls.get_logo_share_link(ret.sidebarIcon.relative_path)
+            return ret
         return None
 
     @classmethod
diff --git a/src/backend/bisheng/api/v1/schemas.py b/src/backend/bisheng/api/v1/schemas.py
index a494bdef1..d78204abb 100644
--- a/src/backend/bisheng/api/v1/schemas.py
+++ b/src/backend/bisheng/api/v1/schemas.py
@@ -429,6 +429,7 @@ class EvaluationLLMConfig(BaseModel):
 class Icon(BaseModel):
     enabled: bool
     image: Optional[str] = None
+    relative_path: Optional[str] = None
 
 
 class WSModel(BaseModel):

From ac58aaec144759c71e31bf9421c4f2060c1b210d Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Tue, 6 May 2025 14:38:16 +0800
Subject: [PATCH 105/186] fix: workflow input node file path empty error

---
 src/backend/bisheng/workflow/nodes/input/input.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/backend/bisheng/workflow/nodes/input/input.py b/src/backend/bisheng/workflow/nodes/input/input.py
index 1b94b2306..25faee72b 100644
--- a/src/backend/bisheng/workflow/nodes/input/input.py
+++ b/src/backend/bisheng/workflow/nodes/input/input.py
@@ -192,13 +192,14 @@ class InputNode(BaseNode):
         # 解析文件
         all_metadata = []
         all_file_content = ''
-        original_file_path = ''
+        original_file_path = []
         file_id = md5_hash(f'{key}:{value[0]}')
         image_files_path = []
         file_content_max_size = int(key_info.get('file_content_size', 15000))
         file_content_length = 0
         for one_file_url in value:
             file_name, file_path, texts, metadatas = self.get_upload_file_path_content(one_file_url)
+            original_file_path.append(file_path)
             file_ext = file_name.split('.')[-1].lower()
             if file_ext in self._image_ext:
                 image_files_path.append(file_path)

From 744354b6cbc1a9ff67ddb80457aaa19570ebb3eb Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Tue, 6 May 2025 16:10:52 +0800
Subject: [PATCH 106/186] fix: minimax client change MinimaxChat

---
 src/backend/bisheng/interface/llms/custom.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/backend/bisheng/interface/llms/custom.py b/src/backend/bisheng/interface/llms/custom.py
index 33969873c..ab8779084 100644
--- a/src/backend/bisheng/interface/llms/custom.py
+++ b/src/backend/bisheng/interface/llms/custom.py
@@ -44,7 +44,7 @@ class BishengLLM(BaseChatModel):
         LLMServerType.QWEN.value: 'ChatTongyi',
         LLMServerType.QIAN_FAN.value: 'QianfanChatEndpoint',
         LLMServerType.ZHIPU.value: 'ChatOpenAI',
-        LLMServerType.MINIMAX.value: 'ChatOpenAI',
+        LLMServerType.MINIMAX.value: 'MiniMaxChat',
         LLMServerType.ANTHROPIC.value: 'ChatAnthropic',
         LLMServerType.DEEPSEEK.value: 'ChatOpenAI',
         LLMServerType.SPARK.value: 'ChatOpenAI',
@@ -141,12 +141,20 @@ class BishengLLM(BaseChatModel):
                 params['model_kwargs']['max_tokens'] = params.pop('max_tokens')
         elif server_info.type == LLMServerType.TENCENT.value:
             params['extra_body'] = {'enable_enhancement': enable_web_search}
+        elif server_info.type == LLMServerType.MINIMAX.value:
+            params['api_key'] = params.pop('openai_api_key', None)
+            params.pop('openai_api_base', None)
         return params
 
     @property
     def _llm_type(self):
         return self.llm._llm_type
 
+    def get_model_info_config(self):
+        if self.model_info.config:
+            return self.model_info.config
+        return {}
+
     def parse_kwargs(self, messages: List[BaseMessage], kwargs: Dict[str, Any]) -> (List[BaseMessage], Dict[str, Any]):
         if self.server_info.type == LLMServerType.MINIMAX.value:
             if self.get_model_info_config().get('enable_web_search'):

From 14c2c0ea76ed340d1b067b35c1e63383e658a0e8 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Wed, 7 May 2025 17:14:51 +0800
Subject: [PATCH 107/186] feat: bisheng llm change some client

---
 src/backend/Dockerfile                        |   3 -
 src/backend/bisheng/api/services/llm.py       |   8 +-
 src/backend/bisheng/interface/custom_lists.py |  34 ++--
 src/backend/bisheng/interface/llms/base.py    |   5 +-
 .../bisheng/interface/llms/chat_spark.py      |  21 ++
 src/backend/bisheng/interface/llms/custom.py  | 188 +++++++++++++++---
 src/backend/pyproject.toml                    |   4 +
 7 files changed, 216 insertions(+), 47 deletions(-)
 create mode 100644 src/backend/bisheng/interface/llms/chat_spark.py

diff --git a/src/backend/Dockerfile b/src/backend/Dockerfile
index 6a57462e2..e244f8738 100644
--- a/src/backend/Dockerfile
+++ b/src/backend/Dockerfile
@@ -4,9 +4,6 @@ WORKDIR /app
 
 COPY ./ ./
 
-# 临时先删除旧的langgraph相关的库，不然安装有bug。后续重新打包一个base镜像
-RUN pip uninstall -y langgraph langgraph-prebuilt langgraph-checkpoint langgraph-sdk
-
 RUN poetry config virtualenvs.create false
 RUN poetry update --without dev
 
diff --git a/src/backend/bisheng/api/services/llm.py b/src/backend/bisheng/api/services/llm.py
index bd8d49f6e..7c129be51 100644
--- a/src/backend/bisheng/api/services/llm.py
+++ b/src/backend/bisheng/api/services/llm.py
@@ -117,8 +117,12 @@ class LLMService:
         for one in server.models:
             # test model status
             try:
-                bisheng_model = cls.get_bisheng_llm(model_id=one.id, ignore_online=True)
-                bisheng_model.invoke('hello')
+                if one.model_type == LLMModelType.LLM.value:
+                    bisheng_model = cls.get_bisheng_llm(model_id=one.id, ignore_online=True, cache=False)
+                    bisheng_model.invoke('hello')
+                elif one.model_type == LLMModelType.EMBEDDING.value:
+                    bisheng_embed = cls.get_bisheng_embedding(model_id=one.id, ignore_online=True, cache=False)
+                    bisheng_embed.embed_query('hello')
             except Exception as e:
                 logger.exception('test model status')
             if one.model_type in handle_types:
diff --git a/src/backend/bisheng/interface/custom_lists.py b/src/backend/bisheng/interface/custom_lists.py
index 0d1512557..e5043e3de 100644
--- a/src/backend/bisheng/interface/custom_lists.py
+++ b/src/backend/bisheng/interface/custom_lists.py
@@ -1,20 +1,24 @@
 import inspect
 from typing import Any
 
+from langchain import llms, memory, text_splitter
+from langchain_anthropic import ChatAnthropic
+from langchain_community import agent_toolkits, document_loaders, embeddings
+from langchain_community.chat_models import ChatVertexAI, MiniMaxChat, ChatTongyi, QianfanChatEndpoint, ChatZhipuAI, \
+    ChatHunyuan, MoonshotChat, VolcEngineMaasChat
+from langchain_community.utilities import requests
+from langchain_deepseek import ChatDeepSeek
+from langchain_ollama import ChatOllama
+from langchain_openai import AzureChatOpenAI, ChatOpenAI, OpenAIEmbeddings, AzureOpenAIEmbeddings, OpenAI
+from langchain_xinference import ChatXinference
+
+from bisheng_langchain import chat_models
+from bisheng_langchain import document_loaders as contribute_loader
+from bisheng_langchain import embeddings as contribute_embeddings
 from bisheng.interface.agents.custom import CUSTOM_AGENTS
 from bisheng.interface.chains.custom import CUSTOM_CHAINS
 from bisheng.interface.embeddings.custom import CUSTOM_EMBEDDING
 from bisheng.interface.importing.utils import import_class
-from bisheng_langchain import chat_models
-from bisheng_langchain import document_loaders as contribute_loader
-from bisheng_langchain import embeddings as contribute_embeddings
-from langchain import llms, memory, text_splitter
-from langchain_community.utilities import requests
-from langchain_anthropic import ChatAnthropic
-from langchain_community import agent_toolkits, document_loaders, embeddings
-from langchain_community.chat_models import ChatVertexAI, MiniMaxChat, ChatTongyi, QianfanChatEndpoint
-from langchain_openai import AzureChatOpenAI, ChatOpenAI, OpenAIEmbeddings, AzureOpenAIEmbeddings, OpenAI
-from langchain_ollama.chat_models import ChatOllama
 
 # LLMs
 llm_type_to_cls_dict = {}
@@ -32,6 +36,12 @@ llm_type_to_cls_dict['ChatOllama'] = ChatOllama
 llm_type_to_cls_dict['ChatTongyi'] = ChatTongyi
 llm_type_to_cls_dict['QianfanChatEndpoint'] = QianfanChatEndpoint
 llm_type_to_cls_dict["OpenAI"] = OpenAI
+llm_type_to_cls_dict['ChatXinference'] = ChatXinference
+llm_type_to_cls_dict['ChatZhipuAI'] = ChatZhipuAI
+llm_type_to_cls_dict['ChatDeepSeek'] = ChatDeepSeek
+llm_type_to_cls_dict['ChatHunyuan'] = ChatHunyuan
+llm_type_to_cls_dict['MoonshotChat'] = MoonshotChat
+llm_type_to_cls_dict['VolcEngineMaasChat'] = VolcEngineMaasChat
 
 # llm contribute
 llm_type_to_cls_dict.update({
@@ -60,13 +70,13 @@ for memory_name in memory.__all__:
     elif memory_name == "ConversationKGMemory":
         memory_type_to_cls_dict[memory_name] = import_class(f"langchain_community.memory.kg.{memory_name}")
     elif memory_name == "MotorheadMemory":
-        memory_type_to_cls_dict[memory_name] = import_class(f"langchain_community.memory.motorhead_memory.{memory_name}")
+        memory_type_to_cls_dict[memory_name] = import_class(
+            f"langchain_community.memory.motorhead_memory.{memory_name}")
     elif memory_name == "ZepMemory":
         memory_type_to_cls_dict[memory_name] = import_class(f"langchain_community.memory.zep_memory.{memory_name}")
     else:
         memory_type_to_cls_dict[memory_name] = import_class(f'langchain.memory.{memory_name}')
 
-
 # Wrappers
 wrapper_type_to_cls_dict: dict[str, Any] = {
     wrapper.__name__: wrapper
diff --git a/src/backend/bisheng/interface/llms/base.py b/src/backend/bisheng/interface/llms/base.py
index cb38df9d9..8a2cabb79 100644
--- a/src/backend/bisheng/interface/llms/base.py
+++ b/src/backend/bisheng/interface/llms/base.py
@@ -7,7 +7,7 @@ from bisheng.settings import settings
 from bisheng.template.frontend_node.llms import LLMFrontendNode
 from bisheng.utils.logger import logger
 from bisheng.utils.util import build_template_from_class
-
+from bisheng.interface.llms.chat_spark import ChatSparkOpenAI
 
 class LLMCreator(LangChainTypeCreator):
     type_name: str = 'llms'
@@ -21,7 +21,8 @@ class LLMCreator(LangChainTypeCreator):
         if self.type_dict is None:
             self.type_dict = llm_type_to_cls_dict
             self.type_dict.update({
-                'BishengLLM': BishengLLM
+                'BishengLLM': BishengLLM,
+                'ChatSparkOpenAI': ChatSparkOpenAI
             })
         return self.type_dict
 
diff --git a/src/backend/bisheng/interface/llms/chat_spark.py b/src/backend/bisheng/interface/llms/chat_spark.py
new file mode 100644
index 000000000..fb6ea37cd
--- /dev/null
+++ b/src/backend/bisheng/interface/llms/chat_spark.py
@@ -0,0 +1,21 @@
+from typing import Optional, Any
+
+from langchain_core.language_models import LanguageModelInput
+from langchain_openai import ChatOpenAI
+
+
+class ChatSparkOpenAI(ChatOpenAI):
+
+    def _get_request_payload(
+        self,
+        input_: LanguageModelInput,
+        *,
+        stop: Optional[list[str]] = None,
+        **kwargs: Any,
+    ) -> dict:
+        payload = super()._get_request_payload(input_, stop=stop, **kwargs)
+        # max_tokens was deprecated in favor of max_completion_tokens
+        # in September 2024 release
+        if "max_completion_tokens" in payload:
+            payload["max_tokens"] = payload.pop("max_completion_tokens")
+        return payload
\ No newline at end of file
diff --git a/src/backend/bisheng/interface/llms/custom.py b/src/backend/bisheng/interface/llms/custom.py
index ab8779084..3b86df2c6 100644
--- a/src/backend/bisheng/interface/llms/custom.py
+++ b/src/backend/bisheng/interface/llms/custom.py
@@ -5,7 +5,7 @@ from langchain_core.callbacks import AsyncCallbackManagerForLLMRun, CallbackMana
 from langchain_core.language_models import BaseLanguageModel, BaseChatModel, LanguageModelInput
 from langchain_core.messages import BaseMessage, ToolMessage, HumanMessage, BaseMessageChunk
 from langchain_core.outputs import ChatResult, ChatGenerationChunk
-from langchain_core.runnables import Runnable, RunnableConfig
+from langchain_core.runnables import Runnable
 from langchain_core.tools import BaseTool
 from loguru import logger
 from pydantic import Field
@@ -17,6 +17,132 @@ from bisheng.interface.utils import wrapper_bisheng_model_limit_check, wrapper_b
     wrapper_bisheng_model_generator, wrapper_bisheng_model_generator_async
 
 
+def _get_ollama_params(params: dict, server_config: dict, model_config: dict) -> dict:
+    params['base_url'] = server_config.get('base_url', '')
+    params['extract_reasoning'] = True
+    params['stream'] = params.pop('streaming', True)
+    if params.get('max_tokens'):
+        params['num_ctx'] = params.pop('max_tokens', None)
+    return params
+
+
+def _get_xinference_params(params: dict, server_config: dict, model_config: dict) -> dict:
+    params['stream'] = params.pop('streaming', True)
+    new_params = {
+        'server_url': server_config.get('openai_api_base', '').replace('/v1', ''),  # replace old config
+        'model_uid': params.pop('model_name', ''),
+        'model_kwargs': params
+    }
+    return new_params
+
+def _get_bisheng_rt_params(params: dict, server_config: dict, model_config: dict) -> dict:
+    params.update(server_config)
+    return params
+
+def _get_openai_params(params: dict, server_config: dict, model_config: dict) -> dict:
+    if server_config:
+        params.update({
+            'api_key': server_config.get('openai_api_key') or server_config.get('api_key'),
+            'base_url': server_config.get('openai_api_base')
+        })
+    if server_config.get('openai_proxy'):
+        params['openai_proxy'] = server_config.get('openai_proxy')
+    return params
+
+
+def _get_azure_openai_params(params: dict, server_config: dict, model_config: dict) -> dict:
+    params.update({
+        'azure_api_key': server_config.get('openai_api_key'),
+        'openai_api_key': server_config.get('openai_api_key'),
+        'openai_api_version': server_config.get('openai_api_version'),
+        'azure_deployment': params.pop('model'),
+    })
+    return params
+
+
+def _get_qwen_params(params: dict, server_config: dict, model_config: dict) -> dict:
+    params['dashscope_api_key'] = server_config.get('openai_api_key', '')
+    params['model_kwargs'] = {
+        'enable_search': model_config.get('enable_web_search', False),
+        'temperature': params.pop('temperature', 0.3),
+    }
+    if params.get('max_tokens'):
+        params['model_kwargs']['max_tokens'] = params.get('max_tokens')
+    return params
+
+
+def _get_qianfan_params(params: dict, server_config: dict, model_config: dict) -> dict:
+    params['qianfan_ak'] = server_config.get('wenxin_api_key')
+    params['qianfan_sk'] = server_config.get('wenxin_secret_key')
+    if params.get('max_tokens'):
+        params['model_kwargs'] = {"max_output_tokens": params.pop('max_tokens')}
+    return params
+
+
+def _get_minimax_params(params: dict, server_config: dict, model_config: dict) -> dict:
+    params['minimax_api_key'] = server_config.get('openai_api_key')
+    params['base_url'] = server_config.get('openai_api_base')
+    if '/chat/completions' not in params['base_url']:
+        params['base_url'] = f"{params['base_url']}/chat/completions"
+    return params
+
+
+def _get_anthropic_params(params: dict, server_config: dict, model_config: dict) -> dict:
+    params.update(server_config)
+    return params
+
+
+def _get_zhipu_params(params: dict, server_config: dict, model_config: dict) -> dict:
+    params['zhipuai_api_key'] = server_config.get('openai_api_key')
+    params['zhipuai_api_base'] = server_config.get('openai_api_base')
+    return params
+
+def _get_spark_params(params: dict, server_config: dict, model_config: dict) -> dict:
+    params.update({
+        'api_key': f'{server_config.get("api_key")}:{server_config.get("api_secret")}',
+        'base_url': server_config.get('openai_api_base'),
+    })
+    return params
+
+def _get_tencent_params(params: dict, server_config: dict, model_config: dict) -> dict:
+    params.update({
+        'hunyuan_secret_id': server_config.get('hunyuan_secret_id'),
+        'hunyuan_secret_key': server_config.get('hunyuan_secret_key'),
+    })
+    params['extra_body'] = {'enable_enhancement': model_config.get('enable_web_search', False)}
+    return params
+
+def _get_volcengine_params(params: dict, server_config: dict, model_config: dict) -> dict:
+    params.update({
+        'volc_engine_maas_ak': server_config.get('volc_engine_maas_ak'),
+        'volc_engine_maas_sk': server_config.get('volc_engine_maas_sk'),
+    })
+    return params
+
+_llm_node_type: Dict = {
+    # 开源推理框架
+    LLMServerType.OLLAMA.value: {'client': 'ChatOllama', 'params_handler': _get_ollama_params},
+    LLMServerType.XINFERENCE.value: {'client':' ChatXinference', 'params_handler': _get_xinference_params},
+    LLMServerType.LLAMACPP.value: {'client': 'ChatOpenAI', 'params_handler': _get_openai_params},  # 此组件是加载本地的模型文件，待确认是否有api服务提供
+    LLMServerType.VLLM.value: {'client': 'ChatOpenAI', 'params_handler': _get_openai_params},
+    LLMServerType.BISHENG_RT.value: {'client': 'HostChatGLM', 'params_handler': _get_bisheng_rt_params},
+
+    # 官方api服务
+    LLMServerType.OPENAI.value: {'client': 'ChatOpenAI', 'params_handler': _get_openai_params},
+    LLMServerType.AZURE_OPENAI.value: {'client': 'AzureChatOpenAI', 'params_handler': _get_azure_openai_params},
+    LLMServerType.QWEN.value: {'client': 'ChatTongyi', 'params_handler': _get_qwen_params},
+    LLMServerType.QIAN_FAN.value: {'client': 'QianfanChatEndpoint', 'params_handler': _get_qianfan_params},
+    LLMServerType.ZHIPU.value: {'client': 'ChatZhipuAI', 'params_handler': _get_zhipu_params},
+    LLMServerType.MINIMAX.value: {'client': 'MiniMaxChat', 'params_handler': _get_minimax_params},
+    LLMServerType.ANTHROPIC.value: {'client': 'ChatAnthropic', 'params_handler': _get_anthropic_params},
+    LLMServerType.DEEPSEEK.value: {'client': 'ChatDeepSeek', 'params_handler': _get_openai_params},
+    LLMServerType.SPARK.value: {'client': 'ChatSparkOpenAI', 'params_handler': _get_spark_params},
+    LLMServerType.TENCENT.value: {'client': 'ChatHunyuan', 'params_handler': _get_tencent_params},
+    LLMServerType.MOONSHOT.value: {'client': 'MoonshotChat', 'params_handler': _get_openai_params},
+    LLMServerType.VOLCENGINE.value: {'client': 'VolcEngineMaasChat', 'params_handler': _get_volcengine_params},
+    LLMServerType.SILICON.value: {'client': 'ChatOpenAI', 'params_handler': _get_openai_params},
+}
+
 class BishengLLM(BaseChatModel):
     """
      Use the llm model that has been launched in model management
@@ -30,29 +156,7 @@ class BishengLLM(BaseChatModel):
     cache: bool = Field(default=False, description="是否使用缓存")
 
     llm: Optional[BaseChatModel] = Field(default=None)
-    llm_node_type: Dict = {
-        # 开源推理框架
-        LLMServerType.OLLAMA.value: 'ChatOllama',
-        LLMServerType.XINFERENCE.value: 'ChatOpenAI',
-        LLMServerType.LLAMACPP.value: 'ChatOpenAI',  # 此组件是加载本地的模型文件，待确认是否有api服务提供
-        LLMServerType.VLLM.value: 'ChatOpenAI',
-        LLMServerType.BISHENG_RT.value: "HostChatGLM",
 
-        # 官方api服务
-        LLMServerType.OPENAI.value: 'ChatOpenAI',
-        LLMServerType.AZURE_OPENAI.value: 'AzureChatOpenAI',
-        LLMServerType.QWEN.value: 'ChatTongyi',
-        LLMServerType.QIAN_FAN.value: 'QianfanChatEndpoint',
-        LLMServerType.ZHIPU.value: 'ChatOpenAI',
-        LLMServerType.MINIMAX.value: 'MiniMaxChat',
-        LLMServerType.ANTHROPIC.value: 'ChatAnthropic',
-        LLMServerType.DEEPSEEK.value: 'ChatOpenAI',
-        LLMServerType.SPARK.value: 'ChatOpenAI',
-        LLMServerType.TENCENT.value: 'ChatOpenAI',
-        LLMServerType.MOONSHOT.value: 'ChatOpenAI',
-        LLMServerType.VOLCENGINE.value: 'ChatOpenAI',
-        LLMServerType.SILICON.value: 'ChatOpenAI',
-    }
 
     # bisheng强相关的业务参数
     model_info: Optional[LLMModel] = Field(default=None)
@@ -86,20 +190,30 @@ class BishengLLM(BaseChatModel):
         self.model_info = model_info
         self.server_info = server_info
 
-        class_object = self._get_llm_class(server_info.type)
+        class_object, class_name = self._get_llm_class(server_info.type)
         params = self._get_llm_params(server_info, model_info)
         try:
-            self.llm = instantiate_llm(self.llm_node_type.get(server_info.type), class_object, params)
+            self.llm = instantiate_llm(class_name, class_object, params)
         except Exception as e:
             logger.exception('init bisheng llm error')
             raise Exception(f'初始化llm失败，请检查配置或联系管理员。错误信息：{e}')
 
-    def _get_llm_class(self, server_type: str) -> BaseLanguageModel:
-        node_type = self.llm_node_type[server_type]
+    def _get_llm_class(self, server_type: str) -> (BaseLanguageModel, str):
+        if server_type not in _llm_node_type:
+            raise Exception(f'not support llm type: {server_type}')
+        node_type = _llm_node_type[server_type]['client']
         class_object = import_by_type(_type='llms', name=node_type)
-        return class_object
+        return class_object, node_type
 
     def _get_llm_params(self, server_info: LLMServer, model_info: LLMModel) -> dict:
+        server_config = self.get_server_info_config()
+        model_config = self.get_model_info_config()
+        default_params = self._get_default_params(server_config, model_config)
+
+        params_handler = _llm_node_type[server_info.type]['params_handler']
+        params = params_handler(default_params, server_config, model_config)
+        return params
+
         params = {}
         if server_info.config:
             params.update(server_info.config)
@@ -146,10 +260,28 @@ class BishengLLM(BaseChatModel):
             params.pop('openai_api_base', None)
         return params
 
+    def _get_default_params(self, server_config: dict, model_config: dict) -> dict:
+        default_params = {
+            'model': self.model_info.model_name,
+            'streaming': self.streaming,
+            'temperature': self.temperature,
+            'top_p': self.top_p,
+            'cache': self.cache
+        }
+        if model_config.get('max_tokens'):
+            default_params['max_tokens'] = model_config.get('max_tokens')
+
+        return default_params
+
     @property
     def _llm_type(self):
         return self.llm._llm_type
 
+    def get_server_info_config(self):
+        if self.server_info.config:
+            return self.server_info.config
+        return {}
+
     def get_model_info_config(self):
         if self.model_info.config:
             return self.model_info.config
diff --git a/src/backend/pyproject.toml b/src/backend/pyproject.toml
index 998f43f2f..8bef0dbe7 100644
--- a/src/backend/pyproject.toml
+++ b/src/backend/pyproject.toml
@@ -28,6 +28,8 @@ langchain_openai = "^0.3.12"
 langchain-ollama = "^0.3.0"
 langchain-google-genai = "^2.1.0"
 langchain-anthropic = "^0.3.10"
+langchain-xinference = "^0.1.0"
+langchain-deepseek = "^0.1.3"
 langgraph = "^0.3.27"
 openai = "^1.68.2"
 minio = "7.2.0"
@@ -97,6 +99,8 @@ blobfile = "^3.0.0"
 mcp = "^1.6.0"
 numpy = "^1.26.2"
 pyjwt = "^1.7.1"
+volcengine = "^1.0.183"
+tencentcloud-sdk-python = "^3.0.1373"
 
 [tool.poetry.dev-dependencies]
 black = "^23.1.0"

From 696a083dc94af2a066fb77090b15137a9dd38815 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Wed, 7 May 2025 17:16:19 +0800
Subject: [PATCH 108/186] feat: update flow version info support empty name

---
 src/backend/bisheng/api/v1/schemas.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backend/bisheng/api/v1/schemas.py b/src/backend/bisheng/api/v1/schemas.py
index d78204abb..40a4c3c2b 100644
--- a/src/backend/bisheng/api/v1/schemas.py
+++ b/src/backend/bisheng/api/v1/schemas.py
@@ -301,7 +301,7 @@ class AssistantInfo(AssistantBase):
 
 
 class FlowVersionCreate(BaseModel):
-    name: Optional[str] = Field(default=..., description='版本的名字')
+    name: Optional[str] = Field(default=None, description='版本的名字')
     description: Optional[str] = Field(default=None, description='版本的描述')
     data: Optional[Dict] = Field(default=None, description='技能版本的节点数据数据')
     original_version_id: Optional[int] = Field(default=None, description='版本的来源版本ID')

From 998ea25eec54c81a2330351b0a6d5778235199a6 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Wed, 7 May 2025 17:29:32 +0800
Subject: [PATCH 109/186] fix: azure params error

---
 src/backend/bisheng/interface/llms/custom.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backend/bisheng/interface/llms/custom.py b/src/backend/bisheng/interface/llms/custom.py
index 3b86df2c6..8ada935d7 100644
--- a/src/backend/bisheng/interface/llms/custom.py
+++ b/src/backend/bisheng/interface/llms/custom.py
@@ -52,7 +52,7 @@ def _get_openai_params(params: dict, server_config: dict, model_config: dict) ->
 
 def _get_azure_openai_params(params: dict, server_config: dict, model_config: dict) -> dict:
     params.update({
-        'azure_api_key': server_config.get('openai_api_key'),
+        'azure_endpoint': server_config.get('openai_api_base'),
         'openai_api_key': server_config.get('openai_api_key'),
         'openai_api_version': server_config.get('openai_api_version'),
         'azure_deployment': params.pop('model'),

From 2d8b9207c58e4a1eb42a6cf091b30aeda7a4ccfb Mon Sep 17 00:00:00 2001
From: lmr <350416710@qq.com>
Date: Wed, 7 May 2025 17:37:03 +0800
Subject: [PATCH 110/186] =?UTF-8?q?=E7=AD=89=E5=BE=85=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/public/assets/api/output.png     | Bin 0 -> 53287 bytes
 .../bs-comp/apiComponent/ApiAccessFlow.tsx    |  70 ++++++++++++++++--
 2 files changed, 65 insertions(+), 5 deletions(-)
 create mode 100644 src/frontend/platform/public/assets/api/output.png

diff --git a/src/frontend/platform/public/assets/api/output.png b/src/frontend/platform/public/assets/api/output.png
new file mode 100644
index 0000000000000000000000000000000000000000..48ec975a4629a77efe2f5183ea31a54e3a14d2d6
GIT binary patch
literal 53287
zcmce;1yfwj^EQku9^BpC-F<NjZoxee+}+(FI0Uy4T!Op126uONc?h|G|4;DNOVw7L
z*~9ed>F(*i&dfC%_E}y69u@}{1Ox<LN)o690s<QU{#k;CeE()+7EkxR@!3LD^s|(x
zDA8wo8&eA_6A%!r?@qD&G9m_8!HjaqBRScH;bb_U=#-vP<VbQ6dtiT_xU#{|=tfhL
z6ibDA3x8(&vxpMKUds`vI3Z|`Kqk%ITA}uJ5}fm{cXYJ78{C<VxEg^dnKNpBB+<p`
z+scu9XBZsk%e95OaA4k~o94!ncF}XFoSTKli92txE1$#e!RC|Gg|U_4n@zjP@}P=v
zvToevK^Ide2Nidd5p1uLBlacLU`Y71lYnYQ@s-%G8oUU}w(rY1X0`d-P=l{P<t*#X
zFV5O;O~N{7QakENi843ULa|a{fhn&=oN7m6^CFcIofH-<DXuWXz*ur}w<JCu(tC0!
z?C&`0Z!a$m;`Nxmp@_$sQFPvjd)E8h*2duE`)vWkxf7pG_R{OC^D2>H=NeyNGbEC3
zaG?Gmsr;Zj+8U}ZHJiBo#JQtjd~Bd{_F9MYZelJI4JlJOIS`unYiJPA5DO5%`xWT>
z=kHw*5U^~p|9t}*pAG(h*GqqIcJJ0&fPe^rNCAaaTtSa@pj^?#Fk8t$QQ{{&&RXwQ
zJrWS4l>xvsG-PzT_Uv2|9bpw<={3#N$4zZ8V)$2&T@&5gx|!tISdWLUrOfv~{$^e?
z>(o@BfPi;}BoGM+000#hLJB1TV^HK%kVpO3L;|3JS&wyq(v1F8ub3em>aGtZB7%kn
z^Y1v4AX3Z)mZIGECat=dj^@ge5k({uZ~N&Xze{-+=EoK4tNL^dCIa)&UC&B31q7S=
z47j``hw<XtLYBn#_kEYsLjYE~MJU2RgmSZo!p|rX7zV(RWReVo0sf~C(JN^-Iyk2F
zl1_?jZfOoMRMJ0{FA)Q!%kY9wpb`AvlR%?<NfOuf?cs?N1|Ai=$WRJ`0%JqlvY%nW
zKAzH&3N2*e3gMtmR)-n_%*B$H+#dDR-Y)+budT0dwSe8yIDwlO6+*Qp*%CPlT7HU@
ztR{y3VD!gOVL(AoQ2Sd&cwrQ*?9Cl8yv05`A^}h+!1O^*2oVuM;Yg5CU=SI&8U9*E
zs7shA*Vs^)Y>1I0O|r{PW?LTOuVta3K&h~>ZjqC|56O}ZK(mYgpUs&_kh0=)LV>BZ
zKvd>Uilq;&p}`;l*;c-vkHf+jyE-dpFgz%Eq?<i&7*?9^0;^4>WDp4i$OYR$nl&AE
z2ZRo$C>lIQQp^<@5hNVgSR<SG+Ymj#E&K!Yrr_R$RITEB$`iS&Oe)jbf?FL<zW=<!
zJt}F4GQqmSo_5mpT3%(&q$DB=1q<*W7#;l{PbPJI{_5oYfc`fKh$xVRw4qt-?40VT
zSK*^lNt3Du@%;ef#;0hBG%4}qGSYs2g99u4VJkK9Zu1J9rrxj1KW>i&E#<+&$mBQ0
zS9J*zY0V&Sej={6+{BJ$H4CE;?GzakNU2r}CiG*=dz?>5m?^hsWu2<D$qG0uj`0^!
zo4_*CC{d+z%h@b%+AE4bR6ju9L2|o2;;fid*HW^VV(i#*qpsw9LGr`YtDw^xPXoA|
z@QV(%CMZsJEzpNwdLRp7GOQMce6h)EL^f6;(!-Gc!4M?oy@32NA`YYp3WlQ+mF0|*
zsCDsd6Cv>Pn;TMfb<9iKIt45R&n#4&>rlz05eq80uQsX-I15Ldr_+;0$><i@c1~nP
z<GMvf0^W&?3Z|Er_UhelFW_K<cMEV5ML;h6KVpq@@l=68M;=M|Kg|w%$R;DP(v-Z<
zVyoaGW30~QiL4Ut<qc4lqzuwE;8np+?Few+!9N_%1p{gu3?FBH6`oL@6W-|lLeOff
zKQ;BoZl{mgp>M{Wb42fYUzkiQdlXO5?YpO^-sjT9ES`l;%)6WY3)Z1Niuy9msgxME
z1gHWz)HbP6PyYaTb9`*pd`DY0Hg2(S<8UTM-L~#Dpma?=N?N!5(eXq2A+fNLbk|}s
zhB*VthY~H;0NpA#xandnxl3tMJLld=Q&O|!sLObb2d-nC05{-+R~b9N!_A0?UZFg4
z2nZ!d<5BO3zz7w!HJD%~jmjJ!+KsyXcWy(2RYih$lJ6I5BT3257>u{oTrZEW8BF$u
zZ--W^onP+IHn}~;v0UU!o^G7uOklON^6&SJLTz_?<D@KivA}hP<>O!WiGYI#L^dlf
z-s;2C(5CN|e`%IT)qs;3LGbYatHB2d5dF(Gn>1iUEhfcZicflCu~tTxm%$Ntsl)K4
zjOAq1E7pp5T?mztlEbK&kVF=y+`2Qt3vD~C9Cwf5{VTRd8i9!<ZY<LM(T5|cN=x(i
zr-H81_YuW_YE-ZOa%GGK<(h|IpZ&@(EZixfo_MXRegG7|JzN@34Pvx=6K`97`V0*V
ztG0I#c`Aj<N*!LKvqjwgZc3yl=wfrVZWE(G$*gKpeE4iqx6A8B9>A3x0|GdL0v|UR
z9d|;<a4eH9+r31LUSWK%y`qw}20jelN`dq?#q~8IRqlC?!*PI6p!$LmQSJm6O{|bE
zg^;DNBL<F-r7#gFNq?jv8Hf>2Ju2(N&PY}k!<VLCwW#LQbA~Urws>5+?H58O@asaL
z>qJ1qsElK{_snEP0y3R6*@8|A^v`1N((O)I*I(+JS>?8^6^)nxGn^mZWi_WZc))Y?
zPN`=qhwvc^MlC8Ybzn956qRegMMdqQXe=cvsgPXYqmv>T=`?j<@M3CEBq;k0lW}eL
zv(a#@UPg$!2vU6{2srdWiP8hu*QfKzi0YOq5s}yTg5vil3WTSviI#vA7|%<YUO&Hw
zl(pZ-(&9PSKe<lfq#&zRQzbw!C*Vo`+wGe;ENw+i46!kSsUVVOeHq2C5m)%Td<qh`
zKH`o(Dt04+1&oim%s>PZ1+YvKG7OYNup8$l!GU1|NWA)2`gU=lC;ngw@+xxD*drms
zl6`E-&1FhCe~dEz+L7bL&(EJw+L`!go-(kCmFY*=d*Xg~+8^XlWD;r}mY7SkK$ojq
zS*hExi;d1GCMm!7Jm_-DuNHvHn(x9FEs6*R+{P#bc5c%sc>S3E7Jc8<)H8W<(X9ur
z7g5&{f}B<OozjJZ$MxR-U}j>2nI?llZ&lVY5K8-$-!{71Ozx*Cw2-Z^zCP2#Rcku~
zSZ$la0_I1>C0%zU5e_|SeY!0|>=dgplk3kv*9cm~pv@qaHES#<!?9X1&m#^(#V775
zQF1?^t8bU(aXAwt2YO;d<kX2he2Iy*P>Jj(slo37`j;q|K^Td5k)i-&gjuUNN2L!{
zR%wLRQ4sa{TsD$O6ujU$=RVth`6xtwzXOGGp<+CbA>hOsqs{RMud;b0!00zONC{`V
zgEfb_ihC!yC#6ELKgB6v`GBE>E9{c+VFAAiKiN4rIB>m^@!StIe&i4!1gM7dIg}kw
z9I!yd{$COG7kU=ykR;n2jnW&J|4RE&Co@EaLdnMXQA%Pz(!~WFC~^G#O-p|Lhm;;}
zK%nI2GHDzv%!g~*k&sBj^u}fWf9bsJ@86~8OEWgBMML&iS6`xYEo5l<>u|pKG)LqH
z2TYsxxuJpHkGhTo*dzqQcCFKliDl10d3Y3XIb^%MKtw31`WTkKkTG({6kZrgkU5!#
zm%{%Q{m@TfMDgqT2?Qi#w*y3!ZvV-$dLL$$9}wj~j6o9MizH<{5#RD*6KF6FXy~|k
zArhGXnsLJKCS);}()|w!;lA6<iYN~79|Rj9A_Agd*OFEI)5I4ZOoWUhR?`1}iv2a|
zC#`t(f8ehJ5|kJPSCUNlUz3RC{aHXr`oRxx`4Z{Bs}crJ7XJbN-scK7V3{O=JJ(I`
z5`}U+OUybm0r=&2a>Kb6kU7cop9|3e8RBGr${{C*cD!pniUf7I2+<0jWa0yh^>cbu
zeg*T^nP*1w@d+{hD?ZR*cG!MEM%{Y}5B~U)1TXVGz3~k9AA`zdxvMYn%G0|9^7QJk
z{~^;*0kA%c?L0ZM?qGpj`t;{KJz6Mo$CF(tes?!sE}FsrEK~swN*V_oroQNIP%umc
zf{d+AXHDipjO#(k+splDCTJog6Ox7M1BhQ5yO@45K*8ZaW`%>X%=LXtGV%}a6G3y~
z`%$3|J~xitgata8b&e3j?TP8oy4}z$T4z_5QucrNOL77l7$#Y+2UkcM0&ax<Tkc2?
zc;No0d@Y}(w{$89F8L(O=l-1e>uN44JkB#jg&<yItcirlVrwkf2Ua}~CP5-6;dWvn
zn%ns8#hY?^u4lZn-bvaMXOYP7fsw9!w%jPQ(u7E4PDiU&o>S3AV3N?U*p*tdSK_>q
zbUhk68C@;e^x<6?Fh8m&(ncS~<1CM6gjJP-G>?3cPx{tc^*zb;HcrPboldOAj!~Z*
zoA2<lul5+G(&})joemS(Y*v+=vXUDp>s)^_KRi86Kgp6DOcmrb))Y;ht~{lxJSs=y
zEfh=Kjcw@W3B9(=wCf?_usXAlODBf5VF_?8JCFr@C}2YZrbvPk`Nf3{9>;Aec3f$4
zb%pVF(HT|pH}|G%1~z9yp05kr6gutJK0>5jqa-vx|5)X}n`nBgU%^#Bk2mVk&Yy=}
zCP`MM)R_73W~2Xlf6_>+&6C5;%}r^giG4r)%}csF*hgY7#kcKw)95?F+zlk+p`3cf
zN;Y-7ToEj~wDOC4UDpu9Ki{~LB8N_K#V@dCO>RpGID=x}+tHLN3u3eX^65UclL$*?
zX`Z}%W0|H5IGrwpzr{aF@KKQKl|DbegC0ttR46gO_{#S7L$Fw>!2Yldopx>_R-uhT
zom2gAu>gE$EVDbeRx~7fGFOb2$_>`$@uA43SgS4^qyLu+7&v&zf;RragM%PKkZyS`
z>JeWx<KLvxksj<j-4_=KCHv+_eQ*?Kp~CTONXT-U>^M^;V_)~O7x@W5PeEb)bi0zs
zW`RPZ!9?h%vX1&-zRpDRnTe5J^O^J4vkSaj3fJuB`1EwZT)B=UHcNgU^4cq&b=~sv
z^8Vmf(NJo;#Z|QJl?>!ZuxEsI_>r3J@18u3(XmXKhz-`FPyW<@{Y9xD>s%>=34UNP
zaQjf>=Xe!7=;@S(f7f8M#AzaS%@ck3ZM8aqMvY45YL~I#=BQz!3&Llz>tVXs^@3!(
z4`*<0l=e8w{a_0H(PS!SyQ?kc-1zOad#EMIbGmS}aIvm5*d-kAqr`PkLq9ioW72Ci
zYC5Gr`3ztrWz-9c$v1xH3hJSXqto2BY<qs6q-hP5Q9f3yuNE_;b@0<ktPpV;N1Rrw
z2zFd^b%_i*8Ctc6xw48pzr=5bt{=?6_kHmEW-An29=&H=6T~k^&3GcZ*TiJhXq0fc
z)<qvJuE}_u4(ZTo64wm8x&NgwR-}8IZfh|Ts^K+3-#*#b5Xc+vbo;%5<H$`?Rq@0w
zA5w>)XNdTTU3^WLcGaIA6HWA*)F#rHUuXLwl3sBgI6Zeq+?qV@2p;b5rzZ0#4_05G
zYGb_!_r~>d6DY?&7e#+FU-#8j$+rb<a()Sh1$}+F!yW=9oP26_I*PX6=lnM1`*?lY
zx1EsXoykX^TO=d!;iKHZjwbpi^T}|zM0N-FwDT9CM^7Qlogeta#`ZgpCsg0DGZPFm
zB*(H~vKLsrpxY^<AEsNl1@NS9;t>chi^$<b*^~B{16v*RT3m%!b#<?gDyE^4zc8u8
z?}e6SHs6*WPl({Km!Z<1Y&<D$4UC^b+#D|ip-{@pp1B-J4y%_H*6cCN|BTQ7S9rex
zgh;NE%G6EEa$a~9S)!$bq~MmY!kOHsGBhX?uqfku!cZsiC{Pp>FuOG38f#>iu)h4Z
z^&UZ%l0vxP_xhUr_+%`pN26C>yLdX)*y<j8gIizVA4EG@Oeky68Ryl6h1~8s*gjKg
zf=bgVfGL?gc0%QLxlKbOTWAtSmm9D5UXHp%^|$K5!-25dqw)a@kvkh%GoG-u2?{B)
zUvzZ#_w;tBqO|Wu`VHN?8>3-(>vY<9SPSHiT#+`C<h-vheCL}DRyq_?`O;X-#w6h|
z=!%XwtrtrgxAM)#v!>T$+Vjz<<EQ`V!LyrP-`?gbgxnS>1i!|Zj-`$F7?RLCKrVbN
zju7EMA9LIKhhq%Mc{SCU(uRJ!%4ApOdA!aWV|z^IcD(L!8|r$hBCcn*yHxFey$)UG
z$D<YaQ_(k)p~J+j(`YXT&#>HRNtkI&=~{;)SK{>3^bkRr1twoAGmX8#IIhVEX%Ym1
zSYT8j<zlNXkIh0!Gvm!UM2*ekRs@In(u_u@lnb3+Yhd&D@jtYx3J^G4h+fu&v$M0q
zQ%qy_!g+j5INk0Q#Ws}5kSAl*Z85xxhT9qb5lAWQ**l#WsDRdZMOH|sDXV%B^XeZ3
z+l*51^}Ok#&@T#W0inx$u@-c;L`R3aC!OQWyzjSW4dm|0IS13J@vP60#XjXrv799;
zHTJljok5-bHRsn@!#{VAQ|+|7N_~+BQJTiue{q8!6>%(`W=~;OxExAn6j!FC8r@X^
z#VDV}n15s(<X1$6pVbb{TaEQ3%IiHac~m-!Y_jH!--CVa$V5Y~Suv}eZ@{t!m}y_w
zy%;QM%@Pw}<J3!(QX%EiSaCQg<R1e>J$)1>bzh!t*zl^Bf%j+gKO~eYRtc4pU7jW~
zG~27(80$<Z7Ctb-I=nEEG;s5DL*rMIH+`rUd$Ux*5E*%YqtztbCr>e`+mPtH%28n}
zk_gu@_`^Td>Ve$wSC*YcIVX{!&iBtXeurEl!BJX(!eqkR-Uc>@T~GAgr;BxgU3<K5
zLc^V(I*t0}atcRR3lFA!a{M7Kd4?Dc{^1^NKrWDMp@!Ev3p~u%SH0FueP#|325!)5
zAx}joL`?q8gJIOrN4y)dPL&`Ml-u>3Dg^qBb$m1k{0fs!m24_c0+V%ti*CjiBrt)m
zu_5hi+tSm^tfYHnG3Lht#=4vcku<%-LA8{dq=2|`9|2myFogl7at}L-(I^w4T0B`!
z0>4_Bh8lNSmcR{hB;~<kUBD0l8XC~=`A-7O)=DfJ-u^^e!DSVj&D?~BRbaiMT45wM
zm3IBeSAb`re7x+xagYLX*`63rZH^TbEGEI8YOecwUJ&1SAlR+&JQSgs?GTj;|J8a}
zF!|J%hG7rg7F~%Mw!i@}%_dnC;<y2SiiZze8%hqqLp+Br0<)NEnwT)4?ixgY>9&~q
zeJ-L|NWGV*mzMY+s$91Myssn{Oa9_Hy}k)W!+Y31{+c>8oH`ukjguUnabg^kx+q=p
zp&gklAorM*xhu#?qVVNZ=4g(KQVGucg5!k0WG_VbI6E5uD)qwqUsS%oy;%Vw1yG8R
z!rJgC440exe=z7mljyC5R#Ze^31gNhHJ={_g_YRP<|{@|OgY8r{Ra(GM2Y%B$#zTW
z$lu?eKb9=X0g*rydP1o$P1Ge3|A2JI(K`&^zFB8b|5z|vkNVq;a!a%){piv{@Q%uL
z5l`(^KZLGgy*F1=B&az_K2X5_x1EVPQ3rpj$EBlwQV?Kb3T5K=mFz+4NW0tU#9O@x
z)seD?0lPr-<J?$@;fQ<Y`G&mG_SCU^@WNz(q0{6(O|imb@LqQu*9Wk_NA^8LoE1%d
zw`}-Tqj@ZN<0g*$00#|S%Qf!4H#luJb2iO<y*`P0Bx-P4vDWm%`^m#1#SIU?#rufB
zi^GuR<#LY%78b!dQ4V=FnqQ*Z%J%{cECepuCUy;Ox~ZS)YPr`k?s1y&GSdT5Rg;P_
z*M|ru&uY~!ws1_tR5n*`2@z>Eq0+ds8b0ue9rlpj>y+lv`&st#0^Wyx%!rb)g~R{t
zv0w0DU2)pOss-xkgda+NB3}?wi*h;+b?>-v$vDy!tSyXnuVU)^QO+7x)>FTpT%_8d
zuyALs?E{7TDdy{^_5D!zS9=nE_hV5@j*}d(5P7kqMMZA6<3u;d%MtPjWv?F(sY@gg
z;K7;6jC!TFU~4ILp4^8n?yt*^Z!tgar}8KT5Z)s92)MnYU(>ECn5DjLX^W)pG3YjM
zWBftMtu<}Fps-$b6MB8N&oygz-y*omF&lp|A8gky`TUweL$3<USgKK9yeOV`*Cpty
zRB*l<a+#=9#6lknvDxT#M_eG2KJ_K~1`?-SSWlKn{m*BFp1O;@O_a1?sMQ=3{!-=E
zvPS5Ph~Pg|sjLNC!KXyCB^YUlJMU|1CDl0wZ60TF7if#EZ(QH$HDj$;+ic>>UE)1F
z;**O`sypuW`=5D|zp5}4;AB!yCr^Z&)mQ(<)Cu+x0{NxY9%0RNQERCfa!bG`74i@S
zUhcYaaTlnkCYzqYV`6`}T7tbZmMYddaH}irwN{*77kOV+R0@uBIlWh|f#*H=Ter<U
zqMAuwDq)_1Z@S%#H^PJ8eG{xg@kd|oC$>uTA+##VX<k<fKVf0V*C{6&Ev^`M#^vQN
zgQK(G)yh}oJIa{aMNxh9ghU^mx9e<<+pEnplFApQn;Uby+l^SgF%7LBK!bb4ZN1nE
zZ==asR3M5Vp@QNo#t5;nMvM>4?Ak8)j^O-15%7Bt%|j^rwJcD3Evn3Ejyw@X&Eh)$
zbb)a-l}t{<nJtmzt~O=c6J9xi!Koso7^!s$h20$%CcJZ#u-H%dZ3MgyM`>R05$FRu
z_x!<kQ{dYn^p1iNU)U@-8bAlB5!>4*(OZ5hc-}WNNrrFhCbDW%h{8^ap7Q0wvkV1<
zD3~uEqaUtNtI`S5>$S=m+(r(9uHo{q-bbI~zt?^LHmqj?Mu&~B44cersBM@7d!&@g
zB;LOFHI!RzxI*O&<;%{H6OA%|W?u3H%9n4~@%vrw&lWRha_yW%c$sT`ikN;>wOaO=
zYTYZW2!HGN-L_o30Ra>}+Q?FA{p^95nJ;@VZ7ZrRnb{cUaRza<M`TlByc-|=qe)WR
znLvp#hdYi_KBEmNbx%yM+qjTYMj+nL0Z%t2?zNzejEwTfW}(RUY^gPhd;ETFH@)Ge
z??&6jVtd@@BB0s|sbZ}~2DbtK^Ma5Nb?Umf*G0~vPY;mO^zw@i;Nc0X^a=QKVWyBa
z^Ha92G^vWq@$Qur=VchLR6P%my;NH&4rVBm$Ef7%z3rMfXx7WUcN;c;)TM){AJ5J}
zQd~>C8`Wl3jXC|xy%S*{5%(6VJ4NVb^G2%(sz`ks{uAfMmifpZXR=>ubG6)o!N$)v
zSLXNGF8CaqTnAvNohEZ+;~DL_lCI!_cNt&S*h-X33D6InPWtd29^?+y6~_?)+?E?S
zA_{JowY`U~HNmRreNTu#3Ugj~6swI-uTwl+jEbH`S5nBPE+wq!@9!b6zbgD5FZfv>
z+v-szKuPoTlk-%K-^OE41hr<aFZS%N>PP9>HZkY3LSvQimLDYk8A?`#qWh<3-IH9>
zt1Hfzs1UmP_rxHP6$yuv<t8(yT$;H0%<shJ;v1Pdd5+EyD}(GkcAQ$g#485_@Q!0w
zfaY=N^HQg<Yq3OPJ5BJ$lGS@ThjMY(QtJC;VUBmVd-R8<LUR2zpr0+M&cSo-9g;G0
zmbqr}-r*~o%s(Ll+b!4ZyenE~*w5R9a%Cu>eouqN&w_PzdE9S!{Bn%%)?0Qcs)tW>
zj@?R#Ok|Lwk>1@Xw-uGxoBFQJwmD63=*5QNUyn3?jjpY7%I}(A*>e%sEx^>E*!S#?
zJO6T4WFc$*Dl0Fg!mIXMNWN65jcZh^GWhY<Ja2#if9Xdfc=%qhyy%z2_f?ZQosgLb
zU)@Ph4jHt8bkUpe3ov1A^RXyUNmF<q*OS#!BVn>zUy!)Gy);1=4&4Z{k|BTbPdn)J
ziA$^0iqfJ17;{jtPA+}Vv%A&Pb_zDvZ;vHj=KSWxG>HtdH(!&~EtvX)W}hIKf34Ie
zd;H-orsm9oZ={6ogt}hvWw`DiLBEFhSz*&qDnTBxtK5I>b8pUj84*QbOtCulgEE~b
zpFIa{RTqOScf9+I-&^WM)cs2b5`W#ItTmAwJpq9fwOlAi@pSghdg@nh&*zpyuWxG(
zK+04f+C&D!*J6YpTnhd7h{i#y5A`}BjThs20yO5*eFPgMr&Kc~y3wHz*-DMMuyE!z
z;Hl6PM^9e6_NUAO1<Twlw9`-w(C~~*R1jX>gt{Jc6QwFt*5x6qLPn6Ip8}&U>(okO
zc(*XqEN5ZKt-`xJK;!#fwBg(f_9fTb^dEg6%r5n0pfmFX`@9OP3Ayak=B!sGet69+
zJUTW%>G@o?apPn7A?Lm2I%(f3rJL4`9JrH`x*VT37+7X6<OlJ1a#}-jCQ;9_ir8S?
zfaeG)W8IyAIPt80yUUlFaTne{*2lFVvUdE`Czq+fuGwup`8&AR1w`(3W`VW|mZRMq
z&w$|aQnv3T=x5U@f8Riw<T(Q6j-|MYmV+7eS@UVi%gZ>;P4pe!b$}T1J;TMPb1MPD
z`QB%5H5&Cug6cu|HON&t`pVod&2Hn*ZAXsJ3>s~Use`d*T{93Wg+NfJ`_}+UX;ik|
zUXE2u^L-2KryuPH5<i~LFlQ-pM1R}%n%>}rS2=sf%DvtP2ss3pDrGHY-O?Xw>HlJB
z*?oJ5k)yb3M%BgQ-3vvNc@7TJsmt0A9Pwm!c{P~jB_}_hb8|Mt^L*Q{50t1!dsq1h
zd7RbQ?a9Np3zFo%7Sm0eR^-2Ls42h1iZ8jY*6T>jbc-)G!l|pizhbhZ(%%sZ%%#ge
z1&yK*e)$%FeH^1Xta|oK_!lh4A7MsQiUbt2;NUu1nk%H^d+`#@0<_E>MA+S8&&HZ5
z-fxGr^rWGq{77tb_Y?XubGf4`M;vDbKuA>iQJR9$T}n@(bM_54p?D9<tz^eM2LH1F
zm?nLO^eh}U$x3B+4n}{KYLmh2LkQHREO1KI@wuhp0FU&3)jiNf|D^cdE9D6B+1b<T
zw|Z)NFr0pU4xja{$!hZ*irIyUC(4u-IC}-S!ob7t($rB~-FI50F$2a_Ogn(nIxNN%
zLHxlwTo+X+)8Vmz!xzUy#?k|Gp$jv5hDdB2O%DpW?H~)JC_z~pkJ}&F-u#O+Yq_Ur
z>rX=9#dmfHJjVOLK*|ZO^V4kNddmCySEK19DO^|;fKu4#i1|pn*(mPf<ee<deBX^v
z2G_7IGlxYgOJM<GQ*AcMGlB4V^zQI?)l`kignm{>vhKE*sKaV!>loJ??q-d=hlC~H
z)fFwpgU!M|O+trjkNbIUtxk$bg(nxaahSOnKSJm1A@p#~3>Nn(yc;<T`V8$l#lkvv
z*<F6mpA*LQ_GXfBY^RiE=(z2o%SLtK<SI{4%4j@HOsHG<^Nn{YkGJQ`#7xa<6)H-p
zmHIjp_Q6Z#%iPry!QY->#sQ0imBKnOWB}#VB&F18#e~Q2s!;T0(Lcusm)h&~fM}M!
zS$wr<(6tdhNoC4Q`))@k9HW*?*Icp>dL`n3R<%6TqrMXlmByAGxNO*+x5%h%uljFY
zF4?M1+hL*83d!hkdMz3e>ee}kP4$)L06PXYbPup;Om`$#=E-!fe#Sh0zjl)zGk)k@
z8p0oYLk7<Wob9D$pBoI+n%wzk=(hLvDx&?0qd4aE=NsWESW;ZRs?z_u6nPQv&X<dv
zh>a|yFls%wOQcl|wXS-D)B5Bt5u0GfpuFY&J+UdOkDAZVtz2TSL4~yRDwh)acccJA
zEbTK+d!;BrChGmvF5^nJLXL~pA2Z5*3-`WO^XtX#ui5MEG|IU|=`gpnZz+`NV43u;
znBvi?){1msochte&Ip|j4;McLFx(<}nS!!W4biS84NgBnLvOBrg`M5M_7a@=VmV^j
z8f9ieX1QhO2zic>OA2@v9zdR*%SP@vjS+Oroj4NDi{KG~-5D?Oe$#1ChEUBWE$-cJ
zp7F?O?|{U|)yGIO)~7FZ-DrusgioYOOXhH(+$7|<n=MrnPhDhT-T0+Zqtl8xAH4o@
zwTXcI91)A}5tD|$def+^@ts|Fi}UV0E~d%H2*;CA3+XeMAB>s{#Y7mSo6uZkAG{pI
zco&uH-G$f5<{gG{SoD0nPeV%0%&tdA1KjAvlO3zY_8$Le|K^l<Z76`o2`Qa9n_K7?
z;ZQ5cb?L+s)>MU2pdLsph*b+e4|~yB-}vYJ^*;G#?PcB}YY4vPS#<BrMRuko!nznh
zR11cO07}Z@I-BU(aNIm8QNFNAP{&9x6#fVy86b)q2O|+q_^eVhp!6$lR9=$6S;JiV
z`{s8QJdQu2?PjsCv`%n0J|RJ^0R28Y0l%9rds`o*CSk+f(^(V#kTLYEAPZO>zLPHz
zEIEsR6FOsjh``=m4(C#FjoD~+Ekq)y84uw1iUB-$8+(e^I$?kXs!xGtxA4{{)<Klh
z$(w^YtybJaAn#izM>KRxXX~1&&k)~E88F+w24XkmZeEu^3>@UV%*m*<;%Y5eCvYr^
z->vryek6KAXrqkX84yb-fW@Z9-`rwy=GbiEipikcIOz1%@Q%w<+I+ci{3TiLO9}c0
z@VeD+5CMk>+8j+{Tv)f&@NH=Ayn;+=SJJ$ksgnq+t5~>G1u|+zYn>EWv1~3<Hx}T9
zWb~Hx?F8RG1(NS#rL!o&d<unl*U&NB`$uD>$J1Hb8ov=S`Y@U*JU5#KG<5&{s2`Pc
zjkvY!^xl>mn2+a^xeMgQ6O?d2f-ngZ(nyBb(fnR~;@3(wc>h451W@X3OgK&<-MM{z
z$e;v#oXK|}Z?SYrTIw~E1np#q_rxd-^bfWkx-K}zYah6sAu<UUv4J?m#gin0EOwp)
zL;XI9mK(Fx{T!O-Lp0mS`RP_%1<2qXS9W!@kCK8yLQ535t(!HpfIru`*cQ(Bn~@81
z5_gV}-+Oc^qu+4tGb3C49C5IL4rZ%a3e0B$_p3hlb-osT#)V+`NaFj?>sDgh(8s?F
zU{1mL^9Q6=y$Rezb1f)p)X<ZxcK12C28i2^k9<wRucYu#RbTjR(BX0K%Ts*~$^*!D
zn;NXNL{~6J9J7|!J1ri3<r40>6wgATR|nl>{wQBT&Z1evAF1f?y`Y?WCBtB*hbG#L
z1c+nB8Aov!8}dptb?O!7xd?$t%vW5Oe6IlKU!~_oq}4;O^~;5D_-O-(id95%j*5n9
zBX`uAs0<{Z81ea0_2nTdGV1pYw<`w{5`AvIyK@wlqF48r$$+oH*8XrzGc`R-A!95k
zj&?1$tDYd?yehjhjl+P?3J*tt3oo16m}lTk%$_7U&}m~ql$0awB63g61vh`PK!+4v
z{+HYsJ591$q2@j92}H(vs{3yW)p2ATOaOk$)1BP-9*l$~MD^J|hov`Ct<0l`$Q~5V
z8Vkp$KZxnblfsVO2Ft~(@VRaW4`>3jtiRTK?b6|KyN!R`o%9n=#9H+Vl<3C{Ly24O
zrS5GNOTqJgG~rkpb)e}JBSjPxb8>F8n8lv_yudxeWK&Luar=zP2nNmZT4O~z(vRRw
zZ~i;jhf~#W@%Gmu&%$%W712O|yU@CVZ}7xhP1RSzw;a%F=PALhVEk4?%cA-RGG1KQ
z3tRkaBw;F~7CJ2?mQa=p63vLSn!VDZU(?99ZpSkaJM%KBEGqQxgb5^bj~aQ_S3@fV
zHUYLVqD(@{F;hwtrUK({)?`bj-SKeA)}I?=C7UWQH3>x%Q|b>kn+&AvI4sR2YA3m4
zkgTpt=WJFa&_%m^g^7^3lrE~aRu)DIg{->CLLIMjg%gpH??EPNeri?y9@5Q~6c`%z
z4(Ki87cX=njI%u8bKPZX^dm!71RsUnZERv6M$XNP^zZv+Z~{x?i3U_|wU?UJh5|jf
z!+P*z=8-z@4h-QuzD0f0D8_LzN@>1mnh&N3JF9fQVHr|~frmI_ul<Bi-p6OPT5pCB
zC<UizDDL*Utmnj{Uo9^BY5G!x05f=>dH&-2++cpri=z~mmeNzQkO(ukHz1R49rm)%
zBdjo2Ct`7^T7P`+YYSs*lnt(cJ}Cj#bfA79jg|e`OnuJb^2U-s27ts5QYD2qpj%vC
z@egAcJ|r|xkU97-IqiKbVWuR66N)yo7F5@}oQ<9jx9>UzWZR$-mb)|GN0p7lA)0?-
zzPCOo{WcQ^(_gIF0ps<sNDpR&ONcV$4-VIc!j&^|RD)s8yZ?)HQwr`lA~~f~*h*`C
zyB-4oisb=5*MD-7cc&DC8(e&ifJALnYu62m;PiruV9`5#Nthm)?L<r<NY^P5O~7N^
z0d+zZlamZ<m}YiPxo>}Na0Cg<FKEs>L10J7M7r5KH);2X=g}VVyP<%cw0O?|rVng?
zpjz3Ck=9?rn=Lf-vj`9)6e$-M?cRdH4v2jiYR8OKtX8Ta;DmQ3;u=Lg)Wt;<_<Vb`
zI!7Y78uIpXO-VRzdW%lnUIQ4n?SR6c-)0RU^~G?QKVZK-L#x8&E|9~vt+%9BFJ<C2
zH@ixSmfn?*`T29OHVEmm5)f^kB8^mjXdW3Y;KQ&7-sqROF%v=v8|U;b6@+LaoPwG7
z#m3yFu3`<huKR5R@BIbiTW(Rc9g*x)l9MWj=QPt>t^l$f<lcBfX67?u;tQd-%Dt;l
z{bGA|1^#zEa~)cZE#Z5<j2os3Vcdc5{H$Kw`RSS-pMF{)QPRQQM`uf6Ll{5!$A~g{
zLyg(Bz-ciFAlQd{g+s+;DlXY(blU`&S6<_(eM+Eh6RUNYut%Z-l|vMuFt>8Oi!vz{
z**y1Aq(Jew3ryakKmGOATd$FVlMPyHp*!pkv?a(GzF$Ar|Fv~$5EJ5#h>pa_*%!PY
z{Aths)5QJPBJ3%p%0WnE);_jlT!=#&tHFISp!hk{#a(EZHL#o3;o<PaG5jPalwy)m
z5+l0j{yQ#FU@I7$2N*AHMl~|_z6qa?eg(o;OoR5&D+x!e8Iw=HMY;o+wnMK+^wTEB
zZpRyw(N!le&WJvFW~32CSJxmT8%*>~EC@kuki}3gy4)w?<cCsWK;vM0_zNdGU{(~A
z2fH77x)M$(&&Yqncg>F3!gTi0N5-a~brr}37tV%?$x?-<Zv$<4nv1Hsz-x`tWx;W3
z*~6MI>bKtCiuV3fP0^mnPQT2`gD&nP`}LH}-0J3mUE_(mBl9~wFTw$t*o=7xvF&pn
zgZo+rwJ~_6{}*mLb~+;hPj#jWVikP&`nnE0IALz{ZDAZDW(}I#Dw|Kc_yDkujBlQl
zlL$od6;9JyrAA+M%3Hkx8Q(hFupLcv!id1ojI6J@a8?GEc-4z?x&bF^SX|jL3s3Ak
zD^dN(ZF;nB7T;AONNMW!5ti%HUCaez4kgS5YhxIm`IM`{32StHQ=Il@rxW_&f>QjQ
zu<cGb7lHo82;aP!;LC)|+zc-bPzEzuS?M+E6@xGhiLxM<&4;FZJ0^KT2)UjaL?7Go
zbW5ue-f|TAN-^RDL2#?@)?qk)qE8fYKlkcOt>}}Yb{(xp`0b+M3oD#oH~!ouncy-K
z+Woaeu|$oKJvlRJ+F?e`d(Kg*S)`hfHe?1i3UaIVOoC&yc?Ne75wpe$g}C2k&=;V#
zHws)hTEQ5i3;w*|0V#3ngy2$#;VD}*uCp6+72Ab+drWatTAW3KgU*G<d?Qj&-CL~L
zO~YX%g%lU0O9NS&BixR`ato-}W?RPM3O_fn^s^CNN}fzvMEx|+a?9g1j$26oNq;&3
z9=X#$SWf}bZ-AYRt`8E2UoPc4Pn|_Eq}@U@0S*Ts$h^5OPF6p?&Gw<G7uv?dM5CxP
z#E)5_nJe-R)^ZL@Xs%I5l-=5JESH@|AEc1>UfA)zh=CO3cPd>q4a^yA9}+oYsuU;|
z?wYn&)&*uJcnhzssWu$sl-AR5ty?dT4e<7Yfp{A|(2TwVaq*m(V$x;J+K@od&vV~E
zVapdRC4@lmMln-31)KF83FKtBWZ1|HDIS3ZcpcBI0co<{+|?Xh>8!y;LK5oPb7hTb
zh|&KPZ5FwJTDz_zO8V^^e5akKgKGs+W6-`ZKpv}3a{HaPRQq@i*u6mu{;X%@ZN599
zR9EO8%sVh)t-t7B2$dVe4gyv~-A0MOo`<qE|98%NN=B$zsnM{^Fv)8Br$b!*`Kc+K
zN_jq+2NkXhv70QC(L{ktiZJm7$pjQKL{veLEK=}3WY7c<^NK%)%&<SWypaqCo{b0N
z$@W&Q6_G3@F}+^kcZH&8u<s@&!KB1%b~_<HvxpI0Jy|p55BWfaI0NpMOYG>Pkn2u}
zrGqFaT$1~6aCxJBy;p|LLHc6g(BIKqeuA6ok=p;zeYuTXuT{2}4F*FLj!;PI3B7hn
z<zmG6iICY7QoUULGjToE0Ea2i$Kj#r%k$xcSmvDXw`T(w5uuABh-q7MVc@J4L1%Pd
zjuv@>j>h{-GhA1<3dRHjGIa>z7Z(yCjo%oBox*weNgW7Lh?r-@kf|2m(09;>lBb{B
zf>eVAf|;!E#ipv=az#?RW+F%-a^i&ahXPOVUWv9l`RuXS!l?-GL;;9hO9nLTusrx!
zXCR{haPdjoKyp`a=AFB$Hip~*edLLN<7>P7C-G;#%&CiJgoKn=)0>O!<(l9%$oXuC
zZ2aj*F7FGv3A^WL(r$f}y14;cyg9gUknCBOHn^D_NE$ZLr_+1c@Kcis=jg<xhYT_4
zeu!hbMBuU=I`<yk%`q43=F?24{Z!}e8fz67T=mSc3t4VDd)*#JUhR)q-W#mK9ZGH-
zKAZeO7~!GKziGne=giuVu;imAeTnIqWD0ACvY>2P^JTUwbHoF}R~zawjGZtK@jMCL
z9879F1aR~tT_LDDbuCYT5<2=dJ>8-<$c*66bdM$?6^G{+H8j!7kB`VJA$_$!aG{R+
z*mL(nz9UBAJp&e>^RCj|Z$gn+3p$RW))K9M$A%~410k+J0QEZ88qCu|K&#n~8FLiC
z9M;L{z(@{5*IN!$YK)-w3ROB9(vdoK?dko1!qqjk`DdpXmE<5jB=A1soI98+sG+MZ
z0vmhlP~_i!#h5Aj`g1cm-5sOmw`@sfHn?YD9C5@XW?UiUcRPN5nxc?V3%vb2@OM!c
zP|>n+eb1FuTMNDu7j)UJxmU68^b+sFBz~M0y~<=GcVfq4LlIwM5y@ZegkL-mEg$Em
zAF~mDLzxrwHMZzGcd`b;P+9JN+Pz~fbqbCFS!0mRVx~7wY@L@)iwGcIx2(fx33+Vp
zY$YX<M2wwt6MmeqErU|-(gJN)cf~1S=)aFRFqE#gK{6fGb~*jIuVl`4&oQ~XvU|n{
zWodF-OJ&4e)d*kaA0W5pnHWaKK}+`s1z-pU3Z&P3LN(mvdEaY3ry$WMi%&TNYYBrM
z;%`NUh7M~%j#0EGLHJ8_gd*@)`QR@4-ABH&COy5~m0Uh{TsJ}9d5?DM#FFSAEWOZi
zXfjC>VYFm^Vb4ZVW-)SZ9-4m}_heuG5*DFx#eOdzA@wxj_A>^mhrr;C$4FgA`XA^p
zrDl@a^)(Guppr`5k^k!g#Pp*=l&o!I+RSF2hgIg^*YG;x8=LQEXOi!sGIP!6?t{>X
z@sb=4fcn*My3Y5hEPZG?SicgnFHPSQv`}#ZJUP-t6t(jn!mR8ko;DWt5#zt(A3bbf
z^0*TIoen9akji=b0@Ob*)a08H%@I;~mZ-1>f=VD@_r^_RcRQ61X7rgdLlxJsgb_MF
zWu-)+`IkU3g=G?a2?^U{3jJi*TFwF)kNrpWbh@=J%@CZd>bm{cSCwl1OA*bgAmnoL
zk6maXSrUCbiA^>V;UH%E!Pp9l5;vDhDn(fsaT{ES=^y&}C0U~?gx!$^;v(I(=o$t#
zRE$j!ehT?_lzFpg#O|*}KYTKOQh2hK!$c#`%pK7f$=S=An&bV7af`QwA357L*V&ox
zk~AXvOO1a&_X7YEC$USjfJ5&Ed`poBMMdjFixYC_2n-PKoT|Ypjya%>^yl_vLQGMt
zT#wiFl;T~f>PnvzKmH{G8P%_OMAHu`-uLwV+lO}zaX^buVCIH{HKC^cjbH}P=N3YT
zMmvixrvG@+%lAHlOyEQw#c3Eb9sBNA-g5P@C8I0IjibUEny^4eYr{bg{gXF$lkD|R
z9tvm?G7N=I4^DT0fTuS7u76!y2%`IVS1sBKZs$nx`|5EWHKe78&}fsXne<J43xV`$
zY=NO22}Qcc-AP~RC$4?u)>*%zi@8F2k2viyEp=`VrfN`$f0W)(gTEn0J9qq9dBA7|
zM7F9W>5oqTBJswrRgBapa2S1QCwj((&X@&mW?X7hC=P<=Fl@2u{OoJbXvJ)Li|Pp+
zm?T;!xKuZlxVRm<wXdc+1%p6`ck6ZxxK>ot|78>iSrM(Hk#v>@O^9DBWkSF88cJ)3
z=E{coE2gO}td4e<6%@^j4=~KFbR=$RbQ?d<xP8^~kd2EHD^oiU4<u~+Gh`TLEUUa$
zbELhSyFn_va&*}Qqd^IjnUg)ZDSUK#p8-`tabmqD5+8&g4I!d;sKt&!A)8r&QN=9I
z#9pQoH!9vgQ{9a9BWLeE=9Isauhwn})Or8R%qO^As}O@W+~9kQCY<_Da_Xwsv5D7A
zI!S>1b#jGnX&sRxeq|&*z~L45Pof0Q9D66pmoW`>ZXT@8=fXd0Lao4mQ`iz37$I4{
z@>_JPaAZq$1h&M)IEoYMBu9`DClKP~ZQH5qBo0OmbZKC*JGQOR_RH48ZGBZGs(7Ul
zF-h4@H2T0bn6L&K<Sr#$-9oWExvuT7(oZ1`MvOnzv9WFnZTPI2$%1uX%&E97RrA`8
zM~6qmZFF|_^#e_08TDFAN|zgTNFyMM=}twRKlE{pf(E8aR#p?>>}`r&D*Zu-DqAve
zlG#7#eh_%4hB*&z^TjA}mbYLKAWZN*wyiC;1TtJ2+2ty?43YHN7_ZOn2;feLMJefx
zTGA(PUEqCp)h9m88MW@S%x+k-Jde31mGHALYkse9c{Szsj!ga(02G{|0NyI=o5B;Q
z5~K9Tx!Ht&;j7CFrkG_3mj;*v_CHQ((N?-}+P3*z3-i`(?-#_bvR~#Phlm^E-J6|x
z8fjIDxQ&qcPo8M3V&)yFmo1bh+0rYwfLM|o%&^gGG+=MZl-nEODd+xC?ZY|I=(^I@
z^;rD<SAol0`NAZ^KCL|og)B3c$kZKmBUoJOzeI8r1TaN{1q2E9GGSyLld<2r9P2AB
zTSPf=&)Jp{R5?*~Lx}kNGT(<Wx13t}^Hd;3f(>9TpVYodr}ePuNNYfdIlmj)5D;ZN
z?w3H*kqu_4&V(8MkMD+w#1w56!x9I)6aNfj&Z1TxwvR!(_dj9|*n3WK`=;~7Ow6tq
zOxGUfV=@E$n2<uNW5^;|cK)3*@D~CTdFRZ7@>@0jqvO0+7~=R8A=M$YkK-hu#6-Y&
zUxNDO(hqJAv)_9qk<F$t`QT^A`o1&frGyZ*tyMolKSk(W6vgN7EFUB%NuhVbJXv-K
zeFM$MG?e{Ylu(PMQ~%MGh~8;GC==aD+W$LM_fEctQ7Mr9&=Upey+pz68w~&Ycn}im
zyQm&O>3{qx80dE$0oRo~YX8_&Fz=!a!BnZ0KePY@zUv6)K5zf?f63LFQSZXNQ68nv
zx%n#GLFrdM*1v~vfmMX+wr;*<P!(><n(&we0f~_)1@Nh*|H=V1BkjQVoR#kf$;mFA
z<oE^?#`P2?<MvM`5*QI0=3aVKZb4k27|G|n_k)F(dQ9BvIpM^<1@nLikkzdo>+<bQ
zloM}N|K88meBQ($EN(YbZuAZ_VSs$oka-~@#%J(>Gcgbd2#5qYpZsv!P0TT+B|u<@
z%xm`fIKPGArR=VJd3ia^{^^byDh-%<a^?<a7)#uIJh)G|tZm!4E>qaOvOOc><z~!O
zl!rTszt9&6kjx+NNAa%T55P%h@nMroMc&QHD^QoOh0Z7-g;IgJwr1uhlD%_%kP33k
zPOS7f1O<IAy<YvN3gqPpPNhiPdE?*zj}@BF^Y~}&feLkN&kVX*R=5gTA<}0YsYEPa
z?ojrJzto>nu~90kSw&Hk&+85xW(BgR)MO~i3OYkkb^xUiqyg4bByO3Lm<#D)h<64g
zNk?=DRhEUD)=X$m^{1Oo2mpX4`101VfrqB~??D)lGg~2{&(Ec`GipeGGe^4Qgk`rL
z5$~LVdi_miOJ8$>3>=uE5D_)+N`R<}^Q3exNOng2I#MV{TnZ8^_u{V?3K#^r#tlv|
z(1TB{9{>mg*%mggQltw-EJluQwd~73j|z7@Kyw92X6VsVD}K0Gn5gY<Q0iqR&isoV
zuJHHR!SiBLqW_4HO}O_kyx5VF;{O+DdC)+&@I)?mL6~waXoV<CMe)Cf8I~GOV`&v)
z5@^kwrN7gd_<JzeT*4b6@Ovl|8qjIRlZAD+I01Ig(G=|DJw1O+zd*$tkgGE}N!v(&
zXK~B;Y4oK$7AY*C=&Cb>P`MM#&ElOTjlq4o(yV~Vs8ayDBcq+qyLfT2LCyKB`}y(O
zg1-8h=Yg@w^MU5&zFQsRAa0@2<4!=ed@&S(a9LJYHw&YPfX6Ws67eCtRQ)GV&xgHd
zGbJyRR=wh?3~<Wf<dnFU60MolAN51}oxGkCfmwltNL|+CXsvLv)KDpzocSlDV-=jz
z{O)yY<}KhhuCzxm;?Je0vB0%K!yLw*&Tq%eKDjIz(%_riMCum$=z~m31+RnQGoL)d
zw$px8V=eg{$A?3?H10D&8WkeSItyKiA1J$wIIlfnD^z0k6--w_PPR+sqP5@t7&JNV
z6pGc$VoxjWT=te2WJ+TkR2vcc0Yu668}lel6wX<+hHor6?;+}5h+fkKl7+yAlgIKm
zdm|<WmCY>9Rs*ijH%Q%|?_u5qcC$uBXGz=Lt~mHTuTyY1OJ!JJUwb!E+S=M2&sM>|
z-){E84XJ16_S$*y)|kFZvzMxK5c1fbL*LyhFT@UH^4=9Y{8?40u!c`#HOnChUL|ZZ
z6BwWD8;BE}7N#It)=r{J#WSgqT5H_{@nTzdXtLd4sk2y#4E9`Bw;=KJ6L!4Z#@4zx
z!#SL`q57rK80`JBBawwRiJ_h@Lf%OYEhOVQhL3I8*dKNNzNfr@fl7EJx;->~;NhX|
zEbCZEgDyQWFzGYZNm^9m80JrdJ?_>g__NqEl>|WwfIX?<L4H+9jEpqG=tGxp7<4re
zy&^#s)POnrQ&m`RYU6AZJslcwZTB`-CI*xb=wL4z)sm+i|B_1r;h<dP97W|&=*ZWu
zMe<J1C&uTu%fg^vlk`ZjTJtKxerFd=8t`v}Sf(nb)yAnRf0Gvmk6NYLr4Z42WTW0B
zE9Z4SE@;qluGemOav7h`=d^g_K&Muk5I5>*tv{Ox@K{N<xGFTMH9ettylt*}1|=_=
zDN&xxY`)v)Np}{&e?&GJPD-sd85LQmHp`h&+s!2ONs}y+&&+Etlp{itnmZ;ppSjcf
zyxP)eb(o7P^o0s)`(`IOZ-4Oy_c}BT?jZK`%q8~{UE1NLN!jn&&0?xYu{K1iTyDwQ
zlTdGJ=}yid`+vU$fUk9sd;BWkb1EU1?vhWbkTum*2lwsJ>WnN_Ga^ZcN>J}?@5ieI
zxeP{Kauf!=uGGt;PhoV$7Xe;*g;1=Xqy6QUtJtZamf=U81`i`UKIF9i>qgpdU&9(N
z&i8grm%@hPsrlh?trjl0ylz=e_+3T52Z(dX9ik-$;pz^oc*N|FJkW+~Fu}Kncqn~c
z$}Q&!ezRU~k-17PFM3~SoTxGLPUQbtqFAoeO1CrkJ*rRPA%vv{@?5vy)bVxG35VAW
z!O3bmmPVb*nxT6&STJEbX3LB!>g}p?Wng%^TbCof7L$+nAqLg7^s(j1S(!$)#aE7i
zETi2u%5+3qOh91#V9Psm<j#`Q!Bfsy*+|9AhDm-gML%@=K$(!oZnL&`Yqio2cQm8U
zw=Wu7*laALf$R1z(k+qLi|6ZnC5OpK%4#mMcuc$fY~S_hn?OPInMUcoV9dk!>^eNb
zrqNu!R#wYfk;UJ3w3)j{oyV%>R#K(IX`*j20!2=i7)m8dy^d-j?G5v9zN;_4FWMDf
z+}TTP4W>hUo!I&mQlx`mck>o%yjhp3)L$C11djOwzy2u|&+~aqo646usXSh4I8%BF
z{#K&c&2!yd%!t1`4fS=_LaI|(xYl!lPCAt($er43ToZ`PVO8*WW2yAyOh1xe<+Q}`
zb@ox`@OG7#1Mq7&0<PT#C624>|M7K>(Q$qK-;QlG)&xz`*tTu6u^ZcIV>PyI+i7gu
zwvA`n-~E64yxeQnnsZKOCzJib^>v(We6RQDqcbseh#ySuv_Iw3de~Ge)hvkMd_IX>
zb@Ipi(3&4foduStMHf>z#G;>u(xEC2ySHcWHeWKzo%agLQ)bJIj^00;e3C4)U+=BW
zeB_Y`xP^TubZi$e+B<%yjMi=lEN@1p$dQNd7rCymRP$N85~U6iQY_^VIp?f#))n&%
z%Ihi=c9zTJI$OpoQ!wNE;anEMGC!?96w1H2)@bXs%Q>ONF1d*Buu?~TLv|d2_x1f-
zY$z}|2W2w5_-^v?Hx6&JR=>VuoLsuKs!`)Wi%A#186d%AEK!8}zSiQXk&Yglfnm)*
zk<Lj<!0QsWwoK%2W2d%H(nB9er3)3;(%nj9E}q6tr#hU%WRi_^u04~aAE}gz9Af(%
z#yXdGC}6qKPNLi85+`f2PaB5KZb~NmaxY)1)q!)q*%rmad+wV~3EvMD@NO)z$slR=
zviUhxWAxSH_`8=mg{;%bC9}oSl^v$3zE?{)h0I%q8pCkDY?|1!72oR}>EHg*$wmkI
z{$$c%Zd5HgGfcOa<K+iwc<-dW-RdTPOye1cd2Cb$oJsgfa#jpdoyuq-YfTBn;YPdj
zB*5nO0X$5?iSVu049pk2{&y3uy80_LQdVw>FMSRZIeZQ06D;DBb;LEs$x04v#d336
zCn0M>=W8xIdBaV~(HJEj1>+M}Dr>ozVJy;wzq`$1r_o%eDlc=WPP3P=g=mQ~d66Sl
z<;=>sXE8szHZX6ve0(wPema}KdC2^XUj%1zX0_JJ2Yb)ng90m~^!aMal7pJbY!&9Q
zfyZv6e2{M{i#K&;7)Y}L>RDJ(XGULb`JuBfow0%udUxUZ?$$dpmGYflr#b(PjDXwM
zTv4we%%s>Z>mtbNZ?Pm6`;CB9+-o9ezv!m5wRz^l`*fads6u{I-h6Rl-jZMP`=~kg
z-G$@fgya;Pmv@$8k(|x(;q>O;Ce_i$JM@|agoX~kY^sV%ovG?dhgp{}S`TcsYn8DQ
z91M)X_zBUA+Yh^NhX`)z#1Cm;4kW)+Rrq{ax$sR?x3#{AQ71{<dW2Ffmy1@jHO#|_
zJq6SA;YcXYCs|-Lsp_Ei6+1lc99sxP3rt2#%)Ogp8W{E6hi51>YGX<BD9_lIc-(gN
zz363KQgH~B+~Z8EkF;2{Tb~c6^^wo$5W$%#DC`@YsHI}}D^;VG%vfbFEX9<rHT{SH
zdwyjJV|R6e!y5a8_{thg7VxGqf%k#?#4l(qi>Jc+#i*|1b4v2&N<zxnD#)dN!EPmQ
z%%*RN2a0*}(Wq#4pyIVeyXfHL4NdfxvBWsn8(JPNc8S<hN`gTItZvfjL42-cG4*dZ
zW}HX0CC5{yq1k@D?GokvVb$ry`$VJ8!v?tu6g;@3onxU<)-m<%R6Z;@00HQZ(CK_*
zMo&~!Dr7-Lp7}zfA;!?qQ~y(JvzTCSC{s1VC7j@1BS-$SOr+2Ebiu~drnC@HAs$Ug
z<tx@&UsBS?%{$)mBU%=BF^^W;m6~5_)#Y-w1f6?q@Z6@G>?eqSr7riBF~v{Y^$q)@
zZ_7=W)riwHI#*a$L=>|)fZ=R^oV@02Z`Bf=%m*Tl@0T~fzktKAl;YuL=Y%g7(k90P
zs5RQaNY=G<bY%OcA}oH)t;QLBom9RCxVuBD^4~-I{$lSULib5Cn?NdZEkT1k!mv`f
z$|Ht5JB$VYdk^^h&Uy*zc~TZygFy;)mMIM0<XD=dR56P)zo&AXy+tJ$8n)A<C;XvY
zFL~>mb^N_JEe;9Y&1eM}&&aR=J-ml|jEH%@Z>fA|%t2GTRZ1-ZVQ#=C=vNyvvp4!K
zxjY~5HoUExwe-hHqS8a=yE?lu=*~~uW_LWit5{;K)32RTy#9fXCq&Fto{cp1j*EIH
zb1m%e%#W^)YRTSo_8M2-QAc2c_h+mc1mINN=>;aE3%d9{s-bdOe53wIK5Iwv>cLm`
zo$oGID+9RjfI_K68nM}rRN>tLpE7ypr|=EzH#$};m7Lg3FR5=DR@i-y;1$DKC^=9S
z<c<_^yDCJ`i6~p##z%_~zDjM4b|ozD`eGEzj^*p2{WM@2d~PH4qAv6|SJTS9ORy{p
z5BV~~0V)+rRN=zrZ>u=zM^hjdYu*O2P_ql;tE;pVeMn<gKjHTP=8PY28|6l~s1T|0
z31Q?g6JAehQ@7$cx=Zz#nOCP$Weevj`?-1yN$+hg+zob`liMZooLb+sL!!mZX14pf
zjW2RpA!h0xn(~36tgGI~(;Yt=XLs0Zc0p8F!XKlF)}Fdep<n29a>leIr2D4TuqQ!-
zon|TSDb?vl3E^)9>gh=>ev_5PvKNS5eEJ^HDw-B8;8Vau^Lu<=Ihzj;K*S}FYlL_S
z*2g@M=9>+6DN@&#oNc@Z2h|Yy<9F2ByxNwI@OmR7BTJ2%(wKu!H3LY)IcqIH{rl>F
z^suN-c%EToaU8pz^c+xHjl+Bp4AmV{C}-U}w?1NLzwt|ddAC6qxJs8LBP1-mt(c7S
zJ|yuI3`|&JH>AA+Pv`JfWZi*T{s~n9nSmwZU@{UT28;>k$kOOE_OwS|8PZhQ$h3`E
zJdo*Up54XgWidPebD$bPo=gtdvqLdx#Fdqwf`X4RgrYIlau;LuBX?;!Zh2(6;h}fN
z$^H`_Oaln^XuqGNi05(~<mdu3?1nl8t(88^5V9Lw=#p?0We+N>0i}9lJOC|d+R{Bd
zW3H>N@M`&xl$Hg;o2PtJo*z#zjV;Z?5N6Q3*R%{SL5Nhs^yB?o@Zf=BXUt_Mk+?nr
zk&Jq!jxrI07wlIJ$7JTkIme)A@LJDDAFXcV!y$3T{l#hO&7&+|lU_HG%_w{^-#1R_
z`Q5kYa7!BLeW`tw%#b(e%}I8isC<jK7b(&nPND~o=t4(`l_9&qsmrd&8p?r;P^2Cx
z@u*}WAzGxHi8ps&E(8-kmp6?0O5O1njAd6QFk2ZE%w)=Xf!#OPb0k)fD#LXt%Q2_{
zW%F6AUMF8*!s}$Q+yH5M{;<%@(S&4y@}ka22Oigl2E<fGdVnAZD8U`m9Bf`>$Z8#r
zu&!bnIvJQfibdgr=d7DnKy|#o$*`efK7nA}av(>T_!oi;b~IV@O8^6yxtY4c4X#Eh
zDa?g=Ws8PvjhF~QL5}N$nmR2muj2@x4L?bws9>Wcw)zB&kZ#8jkgjbO>N{`ZKzJiS
zf}@FR?dKUbiK)jt(xITfM!gueGlAxKAt01#7q#NnL!)CuK*VJXrU*=(g7yg5+GEo#
zxJ|!GjK-4U`OuJYaD-Iqb>v7uD4H^m`WI*0+icdX0;=)|*6cQYvZ%Wd2WrhFhXdPx
zdGjem#`tD6#D!rB_wmFQ`E+Qp7#;9X)J%@Ar1CxPl`u<bQ=u{qh!*uVIYvTzf<ebF
z32z;odyY`~ysTle;jyZjmdW7E%#=TWD(VrA`fu<8vZOG^<wZH+Mzmr~GmvH%N}aij
z7d;K5<(U#8XHoFqiBS;}%T+3|8!XkN5rM4;0D!?lHmxJz&5dVh^=xzMcf?>dajEsf
zo2p8grRGS|;De`N5Z1*#jg`ql|4)VQ=9)0%Y;ZH%Q{pPgA>I&Z__1DmZ``bO#uI0o
zD$Qqp{(TmUQJ<7J!EA}N%1ZCc!6R&#%JIaOaA2Dt1LD~G)a=Q`XtWGDKljTxykGEH
zeaqq|Dt$&(Vcr#Nb+`+6RuAjy2zM2;-LsJxn0dFR?^vzWa!k$^IsWW-%PZH4nA^?e
zDwJg~8hxETVZ}SD;{Qr*9TAL*$mYB4a56G&VYNt8&0yd0Y73ouv+Bf3JS!o<;d|Ch
zr4kxCm@47(WS@&0A7W1pV2lP4(*88!@0~_BbHCD8bM9H=lp#ox+7B!958}V!2#v5F
zc`068RiX5i3zrf!TJE@P7ERq~aohhD)~!|7;}cBo{i32$ssV~=+vfdf_)x@SY_qQ3
z(KjWKEqP|v1@%S|O~}7Ly^ESAYl!(O7=_PYR%lU^8C8HQ9(cat8$ltjEs+KEA_n?Z
zV?*J!mTy$G=ZS^A>7UjIocoJitN@xfm!>AX#d<CEjBVC<C=v=H0sa9n+`2uaWrp8=
z=CunI{9-v7guNSI6h^EL;$OL?ex<-=wXJ%iT5<iZD1hNIb+pmpO})m<7(h7js7K^f
zAj|Us`IsxK{U;n#DG<c<Y^{t1LFN`rIg`|1jqT-7|EP(|Xl_gT)Jx$Om2N#(Ro$a#
z7us@*1P1jtyFA^?O?VHGOOZvT+seY?reI!tRfs4}8wR(hFq=t)P}nCPH9JGjOcOOM
zH%9Ddj~8Mr1is#72F*G?n7zF_hSj$hs>{tn9+Y^w6_P)Tp9^os{^qE~VD!hI^kH+j
z2)_}&qIdfG&Asj$K#<ZdHo(2ucKpWa=8k-x(rWfgZe4bQfice;?N!G9gav>{7kc+{
zAtTuQPpZvao-}*`FHW=}p3fg(kbU+@vd(;G&YdNwNdCGOmwCQXlz@*-Up6*Z*vp<y
ztVJ8X&~Ulsu-KuqNX8KN(j-It0X-%ff-iV7IMTRol9*b5Vy^l-!&Z^-Yl`@<Q!FsX
z<HP1AeKxWzxy3HvN2;bA4Q$%_`J~)|-(N7Rj5Gf{qRi{A$Hd`ueDF$MX4F90H8A)x
zQ<wwf22c})@}c^JA>z&*aK>lORO-GKgUIv1_O3O3qOAI$ZkVGb*BR{e`SlF*d}3bw
ziS4#-GWf{4ThPuZ@d<2XNowFs-XjJUr1$*%zgotS2zhvVUsZ-t%$ktYS`GhJrN%`_
zmIGGdOVvuUkw@(i0DkT@Q>XM=LwDs2df;GP10{7ys`2QB+&K5DMAZ7NAz>O?T_#y@
zv$X1^)i?YGCunzP=b>yioLrTYjH!Qsr+u?+75OYSOmrbWlLubUkJ40X$OCF~rGXL)
zg9)vX)SeSW?&EhkyAuD1R<Be22y~pKR~y1uzVOc1XZn*tbmiWNB1k^`<VOa6Y`~u_
zdg{@~Q!rCR)Ced2Hhbh<C&`rhh`dK<!e>NL;vRD{ASOg<*2h30Tk+-2XS2P{PnLsW
z-oTgxYF4#oxBTI7`dU0Xa}TOM_(t?7i2(hJT$-sQ8K^(#K`m)5D8HyiKuXAV9gMtM
z)kZN)u1Pq>NDu$rENXptXuU>F?}4&lIdLqoeP5tfVeR?-Ac6#MO6UuH>V%_xM;?Vi
zzZ0ES=Z6Cf=Jxa_e~syE>v)^x0mzd#Lo;e1hauMB)~IBhm}1Hd`JKfLULTAB9Stwh
z7dqzv;U6T)S=6xNk_q4S1r8q~RRR%xdy}%9)H?%h)=mevxOu7axTv5$15+$n<+GHc
zh7oWl@ColihM0K2V$peD?5K(YbTzF6@-^MSXpI$!GQ)xo=Th0MevYph!q`l7Yu(ML
zrX4?aB~hP~k;WkoL7;1W=cAL^f%!xh+YAqi6bMMMf@jD!tYe?8`UMk72*}DVF{o$r
zqIiHndUZM$^5h`pSb<gM@M6l(5_RF&ZgV=%Gj0Eg{D<<YqC46@^a}~9{gu@WQ(|C@
zE`oJGh>$q}_I_p<G=Fc<T&<|ld~qNHiqcxMy)Hb_V2dLbm44^iz)tV_Ku~-#d3WY6
z(bv9|s8E2t9So_cF;-zMz3vJd0_$3MM<IgUiH>&i_?J#t8FjFo>PJ3ND2EutdNdhx
zY{ee3-#>mEfsoWAu`FetW%VDuIuyX8=XR<&!c>)|g)@cY^tst>x@UWFqIP__F|>wZ
zsdhr@^^ZN|k@xrg#aiEnOo&PWkjbF_*$WL$w&`XlOAoM#=EX<b%a45Ui(wJ$CIqvi
zj$LX~mz3Uu;Ruz`LF0&Uc>U*hz<^DQ0Ii)=kdgld1DyVvH!pa^kN?Om0xYON^M=CD
z;eV_h0-!w;^Z_;W{?Cg-k%dT?Cc_6M2Eg?DLhOk~eNHM|5VN8Fz>PH^j=rZht8piF
zpcU-agn@v9y1fxARGgS5u-Y!?lH>$h8e-j4A^|Co4C?%e9bVgZzLlTN2my1lC=7tB
zHDoLKW)b)7#2OkP{0t2YOpz1~Z#*k$YtMuoojHZa=SGIFJLu}5J?HT$eG%PvVD|c}
z><-1{HQr0aexneo+aGCF4&huevR~hX?+1w}Ab>%n@<P()*DWf@D<?9bq2eXfon+S9
z@p)AOh$WLD`@Rq+FE4+BOAe9VM~czV(%3w3LJFTkgYMX1@SSh0Cy2ib%fCJSK)S)p
z^mqRgah_AS!*61gZ!qn9&k1iD=sjrF7c#^b7m{--hsi?vLu6`%{yKZk#NA|Q^X`ob
zy1P2sika_Nm{UYJK9Qr!6t@y0f@jqTd-JcEx42VsfR07b1|4QlVn3g#Z&q^}!QiJ!
zyYdobpgd0yKH<|Os8&b7mKP;VL_DQ&B)mC6stiic&-4DO{t0Wu=CeUwh$&R143f7S
zPb)xdv$}jqEb$f%M7kuPSQ*&bfDHN#%O{4O(%uUlnqaPhrN}=-3H-nmA+9!RYt&*x
zDH1reR7(<xQEVVELOGUYFl+!ly8bdKE>-+OZ(M2DxsjO|#4tgDARF4Kf?JWIerd<a
zmPzZ?a<%^>r2a!>8Q2IV^YqhlEDdwX8CwGWkMgxc4u*Y`Lq4+I)e7<-Wm5n}!VLzy
z&o_^km~p%3t1Hc43lRw20&c_pkYCpSGdV?Yfjdn?nBwcd7l~o8f%}j#m*oG5p|N7X
zO*<1a4Ew)LEC$@Q5#~dU|6vLQ^8fBy7GsD1@xS~~fxItL-2XxYz`M18NM~A9%devT
z`|bh(qQo&tiQTnpOgUwa`k*qHW?Cg|4{7&HUAc}maWg>Mo0yQ;?@wQ5mzyBa*_-e8
z4@C=QB%>f)EmNnT-)p&$M2icCuBz%A1@!+K!l0`0uhkJok?4kbf`<4#$;>YXa@t|=
zN9DL{VDI$mM3rH3XaXMYrmCqZ7<e6uO0#r;Xr{RgG0i{cRcPy{uO9#vE2&=w5DJ+9
zj2tKe)TR2%ygEHB06%0#Ph(jmBXpM+7n8n=UxwCb#{>ZVE8<E33I;w6*$plcQpoBb
za@gluHf(GR{5;lBQ~>H%tq4A5Djk#%EEpcoi%Bh*$0$*BcbiG+G_)*UUsO_Ozd#~i
zMj<j_D>%O<?r^2zDKP`uV(*CG;&WTsC3;o5-Qk=q#}!?-#bXx<5uYy+*ssT`$Tg+c
zkOiJ3!qjk9U5Rq+mCuYYrUM3LGKELg?IO)xhQGq}<AOZ_zi7c*Vo@E{%Kb04gy_za
zgz|O9EXYH@|B|57ZIQH4DynX&m^GuHeIq|D5$H^3@xG91{c+qXOLz(a!mwW@%HqC~
zYaS<=7;!vT+x?0pn%-Z28u%U@oizh=+s+BXeylilVL82C1j6h;dTz@DS+O<G(rH}e
zKnZ__g20`K_aRha`L`rW2rL8`SYWb<&YZqXJkhGj_t2G5bwae<$(@Yi!>!Vg^%7_G
zQ!RTC$TBiH=f=wo-*lHtelZ|ZGsk#%ZJhUF;v8?*QLVx!ttM#0V%85>U=^fNcAKX6
zrOOBH;8J)f$069z|IW_-5^@`X`^YYv(HZ2?wK-s@=M55hlya+nSNX?og@wvuvj;t%
zMAtIhsY5y6!1m@rs?cTHuk8Nlz9(kW;KBwHvaQ&&maCs_SY+=ab1pps3#H$Z7MYMY
z$Dk1?DSP$3pcw7S0@Y3SBD-aK1{uVoI@GS@+mlG3rF$G)^>VBW{4M*A2^xWJn5I^)
z$4o)rc(xhG;yvNx(IxF}xlpYjqc>u^Y&Nl;mz|xYlCJ>OHrOY-H$Zqe7zAY4Fy+h3
zKHnZ>16y;7?^>9YlHb|Ed@l_Ho`J_xOP#7P0P31dM=ItK4!6Gm3gW3+E-=Dd+Qaf-
z%VPAxGI!dc#`4kRd(<5}3+%NDdM=MyG+k~K6@1#Ny>?E%ACY&>4R-+BWHmX_{2n`b
zy}LX@xSzliT59OtDx>f8x+gO21oH&~2irh%S)<~j9p7trI$?KCbl$+H%|_EkwQITJ
z`p8_Zq-=P(yMsxAV8<q70b?;SXMd<LSj%HD^5XhBMhYmc$+NGvjQhT?;1(;f!AVOQ
z-KkY`>n*)z{tu{94LWXM1AXK9r+9Wh(V(5_w?HD=%z1LK7Mr^2jqHKTB|>|-FlE-?
zI?K#)(UXo+lO6BBoT*E2C$wv$*lafC$8lAPSkqj}_;v5|Wmvphn+h!I)Ta{4nu_%&
zA6{a{?F89^d*W|_Hp4cWWX@ZQ`JB49D$db3y;e=^$6%zV5@Eg(MshLVt0|iE<yt@(
z=7bSXexs+0MGmfoH}TWHG+P~Qq1j|snPLl7a=J(7YM9QJ4P0!$+TzqPk@uAU&HhB8
ztHu7xxzk=hCobC+uOlv-Pb$mocOq^BFCFleWnQ+Dam{9}f_vm1EB>^TFEpzHk;ySu
zYP7<(m3DISQ&0$!Zh5H9o|8%3cAfF8(r^o7ymK9V-Y)?a_|a50xbh>(J=z6=v%n9C
zEu+gVtDPrKiETo^*}&ZH{iI>gI-yyduk!=Q>w=@!1;Dqoq;!VAB4<vYbMwVh896w=
z4b`NnRH^Yb=5ip#%KmY-SjmoQk!y{Jr{Zls_sBm<=W=GER^@?r)siLP$$(yTAGR61
zcn4BF#J}5GF*)EJoA^Wx%5M~sNv<`cXD+0>L|u-4ilVfE&Y;%Eb_)>V^%6+z$@Z&7
z1Ack3X5F>2H9tF2$8Pb-WwuECyh-yS#vJ`p0Q~pqR+y$3cUo#cTyu>YSDb#*`0hE|
z^>{n4=*wWaYo%V7tgBFcAh1NB$uhFw9{IXIijf03%0BfW{B?XKhOaZ)^CENj_qFhF
zK^%=wg{<vq)0ry0(FYHw3f~-T)GKa+w063g-B-pqQ#9~l9`_UJ5@m`ei9UB?L@Nu0
zHh^lkH-jb+@gjg~vD$Q!TBk~_F7uqPR=yzy>^~a{mGo*U(%;$xVOzi$0$yW!k$ZUb
zlpk`L(zs>e#QL?eD-7>VQz}NzBUj@7j|C81zVEEM2T(fFJN=dQTbFW{k6EI@$62D{
zcO>`PA*`WQzZQ%t)*~A)Tg%5(j%PfkJ6=0a+#*X`hK;8hImX-bCXcUeAuW}<vRe>z
zuz)?x$9!8B4`XG~pqF$O83y2=%tcL@LxdCUNa}>qoFT)fA=Y@34)%Ap$^_2IekyJZ
z_Yb}t#O>xU)`2Kk6G!E7dav~L1V!k>z;BBZ;j)*t?DK-ZeX!Ji>IHz>ZC2vT8pHP^
zJ^;7v8dt>|1aI>rQDXP!Z$JwcklrhqQt<0896N?Vvj?LQm=nMQERS~nt_3<i`h9cC
zu%|Eb-kJ76b8H@Imx!olz(9MccB>_P!Z%Hg=b&D$O*e!Ns;3`o8hrvS3#RNwde&Kd
zt|=66Y|##fV?yAb9kTA4b^dJkv;8SyI%({sa`WF3a(leF(5|w^aYuo49`mOy+Xd0#
zPGXcI)b1uw#&<i_`4}T&ycmgPCCz0TJ-;pzUt23M)q_*^OiI9w@p&$+6-o-T$LtQ~
z;PG5aTfODFh2?yCaf?EX#65LOiPWET>j@Y3qTm)(CFl%jpI|z>q#T)Ys&Q=x70x|&
zyDou@m0%Y-LBNz7P<kpq`Ehec@ZvcETB^a;20&9yRBdVXLPloC<!tu{C=qRf;4+qX
z&Pd!{H{am-z~hFd0)E35CRwpx*8aK<0*WM~ilSeWHSLrMZQm@_>BZ@B7&!VSYt`)E
z=6=E?T<pF^G&=Talxb;Nj&<0WlLfb&g-AtG7aZ>-;5nU~k>6684^`Q7Fw_@@!1Q`=
zXIE*ksg#xWJ;p_ZT56IB|A@}yn8fB$<s*p!l^~(<_k{q3CVD*2mw@QMIiH-3w<}Ve
z)q2}5&+FoZLqfIv19w>PiFhtqkv0!kCc#Mo)2|JoM8VGbBDstYF)M$5;$F;X1sk*e
zT2(sG;u6_@C%5`rs%$#)r3L<x_5$Y+@kBYY;obU;c0~(}hKYO0LZ`|PP$aeQsBn5v
z*tj>L8<&_TU(#bdUnFi)szvqH`&AU&WFx@heBu0x^cy3rks{kq!EpZ?uvPn!a!iLf
zIdU|t&SRh?TKmgBBh%jP^j`ZB#z=s83IPQX5?$UHvcspH09c{S)!}3+8*sV~lSM`P
zGnzpf4yfTbqgBTR5wiPCtqV{c{a%_xr00#oQ*E`WXt|kN>5<IUm6rCcOQgX9J}r$-
zw;^(D<~gG4FBWO+xvZEgt&i`$xGe1I#X@Mw7;IAl6zRKPAb}v*ZsA)VOod&vi%N@^
zJ?>f)DFMHCtPeJS;DlbYl%zWs#8apUgg-l~|BXqVBK3pp*^*;Q>!Wt@n2P*TG?*Yb
zBB$FE6r#~B*2fn*?$Vh|USx%?moA=`nWJ&aPtyquT-}t|apf40z!LaZ$lGA9Bg58-
z$vx;6yzgqt+}CgXz_76Ohj&|(vhOmJ*_K2(_1r@R7hLZ6D)JN%N#%YPV$*D;f&CqY
z1nRP3i;`l}nBq`-bbxgZJL0?zIoP@MPYtl$e>-|8>pP|+hOH0+4acnN24(}dt1)%e
zmv2nVkOl;o1XIXm5M4B*#0&+Md{#@2CTP`BfI5giG3QnRUnvUdZS^`6Hqr$8^Fqm&
zuoMkB?`@Pi4g8Qmd@SRf-B?u}?6m3Y(pL<6qm6S=Vv7JjP*CK@{=32cMwY!i+<1O@
zEv?oYh{z}V4iaejq6?@`D<!0<Yhy<@OUsRB2Jx_ix}n=vmwK`N?$rC%Qp}1|F+JXp
zt$maNKRqsw&ls1rv_b4hoLe=~Y6zxC-jvQ{2h&lJ1`b?F=}w;I60c)`rHbn@8f1K*
z9<VraIuMuKv3X4U@)BH9>Mx3sVBa3xaa&mzYRmIV;o!icrI9}ynAho(%n&GkJ8Agc
zE$zG@XBw+jC;tAh+~iDKQt0aP$SM$DuyZpirLdkXL;uru-B|)vKgt>hGxmG>NPEHQ
zone|j1afno7}&WLXWZnX^+A9K4e&e$4KXzwfSoaGTGUE{0$Es0jp<O@l{H|exB?4k
zn<--c`HV#yA4^L8tv^&->`sG}&EI00qQc37cfOg~35JOGdKcwGeWd>v!{#6f?ic)J
zlqdUb{@$z$fs>n^-YVr#2*XCRN&NzCp6{=aX@<5xM3fmXDukzsNf4f1BHPx&hX^k^
z^4NJ3pc$ZUSm4*WU8_N>WN*1x0*bVr6QEg<PSzFgZ~CY)C>n8YKTKwECub*jX$|x|
zikyW_!s=WJy(lU1z_C}G%15K>rv_dr($1zhCUr4zWv5GQNRf>6DhK`;jD<H?z#3T!
zFsyTTnFxDfdo9&jN#7hc-~vflrivL#e{LMjji7|gSqn3^)kCE);k~IMQ{I#74WZ7a
zP6$M~lB(7*&=|qUR_zJ>5l9Sc$`-S>CHjr2?=V-z{Oi_7zfrk6P@b>9PA;WerQX2s
zDA!mcrM6u$*sOR6K4WglH~%@Ptiu-yA1c2&Lk_iBZa)uz8>Syz6f0&7Avb$ai6`%;
zNhIk=Vj6ybShQ`V&d=E|lS32Aj06MrBfD=t<rLYF%;+?E>Hs80nTsvwDgen0YDoTK
zKxvQ80Qe3NvL!>_LXzIAC8|hR<o{zucJ-m`Rdx`up8r**TFt*fAno}z%NMr8jU#!s
zK-MHfG%|wdX?qn2)zq|XO|T_MTZR0hs945+mK(YHptzy4d{joVt{Q|HVmL!|t16;?
z`)i)FkVhpPBy?Q2UQHKk@#=P$N{Yix0KU-o2dtcNEY#=ZS8E3$qb`SW7d$}E60Z5T
zC<s235Y|{XPxo3oDklbVnO|b(V;UPqggVc@50zkiVR_zN_C081uot#Hy6_lOO8Eu#
z_4|4HITsf<4R@P~xXz+dRPjn{>#!FWXv8EJ4?tV$%=FSBNyq#`g6{J5b$$Kf?Cfl;
z&hvKc8*|y4WO_&fxX>so17V_#VD=E{REx0e3J{Zf-bOctwP~w#U!lk92X5q$NVd{)
z2(VeVpD3sGUb6n_71I{nq_W+0i$w(RVmY1=`Az|aI7q`=MKJ0Z@k+7ZW37i1)|(!y
zdMa0p{4mM@%g2}#&c{K>-$;<w*fbT!I`}Ni6T2D+?kVLcVj4B;^W&2u$h=D5EGP#i
zmHYjGf}%8z;7YYv<onsylsg`zi&t{v!v%XJ-AaRHE|O6|j-qPcD}1Nfjz82j4|go1
z@>-%w8JY-#qW8nN%*)9jzXe$I32Pi``b2U>v*)K`!B2w?(M#L&C#}Mnfk+&g3T>9$
z6vw1#ZR?8wUr>^I8zH=sP+xhu<}|Nmgr5a^EVprL(N#X_6}`SWq8cOcGG6R$-DIXk
z;vxfAM}P7+v=bw}QFb*m+bv{wb{xOYR}drtl{-zC<PS5oK)2g+u-rI3_eyr%PBiJZ
zM_naFP1Z8#+JfEI)R>UCOM-c+XE7zE*?9=TF;qc9S+QuCf=U7_$E7#c5B_cbSkXv4
zsJi={+L3@Gs)#p6#VNfSo<RqqeS;lRA?Hz3@dOJKqYrqNJn-PkV#(;7@iIyqY3_|m
zXXlsave<U8AxM)}%RehnGTPJDJ2ww(_mIh|pYwx#Dky^F3vvcKbRosuiq*<+N?zNO
zq{F8t#7P}IX>H6^4UjhAWC0<RHeYxqbUXNDoa2+xfvr@{F?oZVo(MOZtbpYm2KSyI
zNNC>lPnhWQ1xA&x*hcQOY4hq)4&`bQ!@n40&v}1DBpKo4Ot2m_xZ?FID=<FGe^Ka<
zG-tCbpw5b@U~)O<&OHdz;EtNIL>0`YB+k~mPEGKcRTX53X9U0*R;3y&aPzrK>bWxr
z6B5bhF7w-;<-40#yC8J^h$0<Za*Hy-844x_G2)Fa4EjuBFxfVe7RV<4Dr?XR&WHo~
znrJbw>uzWE`z!tNB_)+gWWR=_4E`L&N`vimjKN62=3Zy)dx>p@C4Nr)7`1+OYIVr+
zWvW32)fu!VqnU*}jc?5z%tB58J?KoGl{O|Fe8tzU;a^wIPUf>R-g4DncE`0Oe3Zh5
zd(*sWA3~tHkr|nJV<g8DRSfI2%x_;J6tm&P8w-BUmnqARdkQYqvPy0_|0x{T%FXR5
z|KAQF9^;SwyeusFiG&Y_B@`%^8I_OBZ<6*K(f`-g!l<_megml{bKp|!yrO39lJ3_2
z{%-M(<i_#^gL#30V74(SN{OC{!kxbLPfDsWuO{;3I<Q+!!9UFlU%;Sk6OuPJGsQ3w
zzlC9m>8fDhyvD`-{v9L%2d+RR3=CR3kY;yPt@kB)$Dsve;*osKH#Tw5uxCmz{T9~P
z>u#t!FG1$u3J<SJ^|wJYhSKdt;Z@7@+`+e&6Uu=DI>5ustO^N*$rh^7C=$|-hWd9j
zgujq*whR^j#SqVPhQP24CHtipeLY-4On{%Wm{=GbIbGU&E}uBty5WS2xSG}oa5jej
zPM`pek7`hnc&U~z{WtL2foc#E{43E_SbZ;)1xw4+XSw(sG^y8Dj8;zRw%_|zD52zl
ze`NBXQ6Oq@-Ct9_67NQ4T2>~Alwr|LjEyD-9_$|%e6e+=kcE%MxTuK#Cjufvcs=v-
zJ%u!X0ox(9uXv@Z_=l+NJ_a@zI0zhCvj2&Xl|O;Q1FY8NEh7Id<-~!q=5fp@<iD8t
z4_cs3sdMThW%aL2^MeZ*LYE8Hp`-k#fm#6@89Q2!%37rVma{++)1GV3LGWK-T?aTc
z0&TH1YX<k<GCc}-nOTw~_<t>mEiK?ZG%vizFZ`2BxBiOw=}0X)3jeb3i@+X8f5Syl
zz1Y8H5h?I8PDA?v|Fl!!(+H7OI`bE>{#$YY6@IiLVLGgTC6Vq1U=8H|_o(fbi+|s^
z5C#yFm??*YlOkGeszk0X+}+ogvAKNlX1o5Z?$p5j^&AzVoH!;WMKW}lDn9+Un5L%Y
z-oe2@%M~gr1pZHf#E<gl7q{51D&&?n?!hB6k)2{s>it9w2;eLPN<Na%)k`_s3%$Jy
z3g0@kSBABKUuGr+w;&XO{MRZgo6!Q)QD5A92_mcG^>a}q<Rl9?C{SG~P+~$th=G*d
zHMgyugKbI86pJ?+ikp2wiVdWSUygT#!EAzXSP)@QU>3(X%VayWWJ)ZylA)D9XMU}B
z%rl3Y&Bg*mb|jn%&d`1e2z_UI6>?)aq6_m0ZM_z4u5tTvEwi)iln?A2>}Ym)Jg-wZ
zy_^+*HSC`Nqs<qC{EANv67TKb)Jczy)xRn`$+TyhUJg7<s~@K<^5>0iFP`&??sI#c
zA<$}dh7xEN&d$^=6F9rw?90RKe^FtxSryOneH0gzXCCE$UQMYtSca-&S#Dv4*-8;`
zN{kt*=+UpV!~=DuK<7z|nv+TwA`8)KLB*6VISZl*Dc9->BoHgX&?#y6SxLBpfs|^g
zEx2RxWH0@t^1aRQ%g=Mp@0V26o4*s%j`vdF$IkL4VD|hyP)tf*Og2Q!&Auzu;s_q7
z=8#2w06V8~r^+>6Am>Zo9O_&*Vxoils`>cej3Ja}lSS5eo|HL!OZY!G#BY=E7p!pb
z(#AeXmfFsfx(<l4-Qkf}e1%93BHCjml+7-3ANloUwHvc`KP9<z+cEO=4f_seS*$Mf
z!nR#PIj})}D6Xw{aGc{YGzoY}7(*L>5oGr?x#q<c(N9gIA7VfiP3V!?+0hq}U<*>|
zjzoJnTb2Eu3MJ&W7y(jy&ciUlD6Jn!m>rl7ELMt<5~$9rz6yTh@;Tw*WpOE%;&!>=
ziRN0T3>l`S;}e`TvjQjcI9S`)2`0_^P8ld(vru2}=U`IoWuW<<exK$#yBWT4@|uWO
z)&AIEf(8i{pA)^|0Z?xx<A4HXT~Q|K{Hgp=-tzi{bCs6^o~Gd8K@sU`-5A#S{9fdF
z*4eH9dG=MF9=X-=2XosbRYU|1j^^D7x3oJ$Tz`f-R08d;@V7<6BHmZ}*(4&w0^E6U
z^S(spddEr8letccgm0(X*hwAxCVrH8M!$>YDsJ{J^_wToeRbLR(^AR*pbB7W0yMi!
zkV(FDSp_FL#Y=7j!NsNThjc+@QF^P30)mHSl1~jVFJ{+V4S1755Rp07IF5*7+=Q6u
zMF8A4jssjJ&gNX4SnHL>B(G<UvIE5V>s_6s8&DJ21G*Rjh!rUvuL<)S$-b4KP(c)P
z!?@1m(#8sJO>VYqd9zkW1^K!&XDjtQGa>>bDI;{edJKMk<&0Uke1BNG&d$PMEUl4%
zg46MdB!WRe_CXkjd1gpa5%;>ir_p<ggSGUB_c3&I(Cqx_wMv}_amS+;KlP|cjcFg%
ze2ZFn470@RqdK(~`IzC3-el@RupMId0Ae6qgTrT|HM<Ynbp)4Gx)fRUtR}Nvi(}F0
z@peuV>OncMbD=~WCrq`#vQlrI&j$j=hvZZb#EvcAYTL5dDx^_#+&4=NnEL<|t#=dO
z(1(Iqaq`weq6*ZPTyLkA4CmS<fs?EnA}2g<AKt?_+S_@kcu9pV#HdP2?%wCR?(vxI
zrnw3V%ptw{7wP_7uZp=__L`UK7qw>AoByF$aXo_Qco^dVb_a;$Q*0Zf31mzi50OpF
z^`avRQ+#QaE#&#Unnv2<WSt!ks!Vmb6elZfut$3ttM*Dm$T%QC5x`t7Iz*DH`V}g0
z_e)g6sl9y1>F0B75bMkk#Odun(7%#W{+8A2Nf=QGH%*v7+I*9_?O<6zc_3^qACvL%
z(Nk%1fh^T;%GE5Kn?op|)#)HC8p>7;FLio4QU%LlE!Q8WsoI|?VU8{J%3m!0B5+7A
zRtJSPv`8f{h$+1<{R<i?c=j1yk%wVK$=Pa!W9bYHXbxn92lsNeuS8PYyH{wdk<%}<
zo}osZL}xY^j#=!3zpFkMlR~V_3U)r+4?)0D9*WE2K`Q=GnAp0*U!<a=6D8pGp$@nO
zW{-r@)D@f4IS6v<QRAIotn+b~<_)diaf}R*Y|du(u`eduF^5&EEL-Vrz_r<JquHBw
zA(ArE(<^^03{h6q+WRP?6rl~P^G`Ic91!Yi&32H!o(_KO$T3o|Wm4DRz)@sNC&^A+
zn=cTealU{U*8|hVyj_i;6?tlrBP*3JHk*Z1<C@i}pV+}A@K)?%u)DFIRKC7G=9YMI
z_ckaHV2~^}rknn|Qt<Ad4dPGos6)td_#ICV>UX{9Mvl7b^kkmkA`o%u6y`)Mct*HU
zDW(EeEizqAj~5aIQ%D0Q>j%1FD&mOed1hcGYLxm>U+7jPzAf6A2^|Yvb}}jQ)8UC?
z`3Lo@c<i4Sl=jVAYUZ@_TkRg?4Z8Ac6>yCm^G7VyPJ=z<(CB;XY>JED?e$mAH7L{a
zjyHqSZjXOfWS1?Dy_@NBE#w|%9pwzc6FiA$Rpse=(w`Llf=JqSd~!EYUY%4HJ3d}u
z>-==aBQSFav|jTN^VV~3#H!G66iVRS-!)XJux!yO3Xs{{W&=)q`*XIm1uAR)w&X%R
zwO@A0PBlJ|EXbUIGh1%ccX&6b?>Ua-U%lzkQgyTK^>HqCq3$4LEU2=3VI$qlXZ%vW
z9;PFxMGPfdszxWS|FMbka?&>b!uw`_g5>;^=L*Gi{gldJcE);r^#k}P;#97iAiy*2
zcWUJj>XX$>k(sy0+x7(8=tT5fgG2iDsR{sxw>@hfsmb~nzYbkS46pHGTTuxy%rp}8
zBi4P{lsc%|-NR#QW?sAeJGgAVTBM-qph0bbSe^aphK@*Wpf|aVFrK!q*w$T(biL20
zEgWoVc2bkYE1xQT%upAqx!TpXTkS7YyrgXOgbF60x+$&i^Z9jEuWW`H{W8a+d|4pv
z<*Dr0TBuo27|N;WB13E1F?wAZSVPF))HGTibM}63`COt_nhA#i`<4vDU`hXn?LM|I
zwM_9i-4{utLRSvUh-(daN@6Xo)ab<6eEgBxbVMxsZj>YoNVz@)PF$H1`h{#EwwR1>
zI=L#J)|63jkzs{ipNVM|Rfe=#%lD8fN)d4?QMQngUGOb>nwV|S*-~BDf{gfgyYc-?
zT$o6y3Y|3gD_brCg;KKP7dl><b*>(jvqFh{tpo?B$zp~6mLJtp_^PGxv#v|jM5!?N
zuh{vBcysX;$Rrr{q=K=m65B-<+!&!w#|q)Ct`)+snnv2~JCw3UH%B9jNC-nUbOPEq
ze;#2APxXB_OX`KpCFEt!gqS%#`6zln`KI(NzRhc{K0h2*jEn_aJshiMW!D&j_&Kfd
z+u6mjL6#}U{py)Zy3N*QK0GU!Kb4>ALw2dwY^-?L2y-ezlf-=BpDWRvH|17d%4a>F
z{4@89`_VM=bOw#>^WX93$IK_iXYWA{uG3<5`gHSnF9LM-wakkbH36s3F99|br#&nV
z>&0SNi=u9JW}^qCk2tlw1zKD*A?IuH0Mh`EcWr+*%s(P1y>5O8nTDIt_2}9G9z3k}
zEUe|~$|j&SZye`DrK%lFh+TPD?|f!B8QW7QjCn7&S^0z=w=;bZ01T=ZnC?AL99Mnq
zUKk9pIGFnQw|tv2OOHe~>mALuYYg4!5Oo4Fu{p7x+i>8?xtI|y7#v^emv7Nq_0Psj
zo~jUIbSu=Dv=ZbAaLFDKh?22X8RiQCl6JWG<*F4%uN>PL=z;qE&$eL*{NW5<F5P68
zdKOm-j3+$-%7>9eg2Q+*W+w%7x~|A&3x;nbxJXDhSeYj|QQKPAuq7j#HD;gWC+i)V
zJ`=uAd?W%O4sUzT1*k%^Z5==*{6WYgLkrW1Xt=TZRw6ek^Fp#f`c)yC&KZNRXmTU_
zs?47H3S>}FW|C(ivVkuS+2XyBIV`_Ye84eFecE!FqpCPWIh3qR%+u3TS)3xur-N%I
zGmw*-d!mgHRrE)F6QWHnOiwLM#Eeaa2kZ^-HVEE%j6ge{dxfRSo}CYb_RV@IH<g%@
zB}&zha!KCXrhN#vg&9(D*iEZV7QilzE{5-xrQINwv|_vW>`Z3{_2r7NGV!hAWTxn1
zV7%CXDS-kLtHx=Ywai#yk1~&+5bD`>zA4f~-i)%b*5C^VEWI>8Aon4P0De(KGsQkp
zj$c+2`OrqC4EJ6i1HdhV!sR9@vDdYvAXYyN`AYGX<i4WrStu;--TEEF1$e~-EQn{^
z(RVVy1&?KPWexAftVBhz{e=4Z;}uA?FA%#jY@?q-r+*X9(DZEfbd%l>R!q5l5(-AN
zFxZ9{!j%A-$<Bm@ZV2>#fb6la+|Df!Hku(LTMZ5vVzCN9F*oNSzC`BNE;DOEHG!M)
z*HlJ-Dq}$t)cWzmLX^w`$}ugmiSpwM6`&`}ELpVvHx#ZHoCduqqZO5yKRCXjP27f8
zx}C^`EZad38`rurzV7|(-7_^ceE$#Rw3TvLu8ZqOL`H6>hd0cZyHgxfi<M7IBnOT@
z))GD1AU)%*&;mb^&NstEKrL#yBr)!p#R3c8`-|(#NihHMpRboqJfi1)5s<TME3(|n
zb{G=$_MI!NWk>FU@s|z^J#Phg<~QtJ%J-!tG6Mul`OtN`avgW*#(6`;*}TG#B`9Kb
zcD~KOq2(?{A~01->bbn9Ye_B1Y$|B1I@$MbuUL4A7{~>;?tYr%2CdldU~#S27I;5*
zZ4Xb{gEUwvM{2RLKlAE)cCr(2x<n?{J=>55BMXPWoTs(TN$^)u0}BWmE{WP<6~4h=
zs=;pFn*yv1wng-b<mW53$`zll*u3N`0it0NH(;2!gGq6j?4w|4&jvSD<qs*7Z49IF
z9f8Hwz@JV*6aR}~$wx@8khpCXgeqKqFcG$GB0-d!IUCG8Vx@{8|3MPLud=UK1Aj&r
zHAqt@V~sXOIIDE=rgeeL-6W>f92#l=E||iy)OleQGVBiw-;cT(rnJuJEl?D?`YK2n
z8oRm_X?W2E=3%i|L69ith~((3)=KW2N&N_=LTv4XAWo>l(hqOE8Q%-5qFTe=O|-_-
zRWu#wNl>w+BL&u3H4)=nE^>~v2!<PR@2HICN-hWdAlSjwM59wJ_BcY7n)=p@Y@bNY
z)nbb}7!juJ*%($Bj)z6&9E6j_AyXfGn30D(Vj6c4BU21oCirP3v1u0O^XBX13Y#Z;
z;uQo3h_A$mxTEOkT&D+A+J}b;wwf+_?sk7_z6+Bj?`Oux_eM3Tc?rvqGK@j?P<~pt
z2poQ82=Dpa+20pEIx^J5WzOYqFxR5*Ql7W><=@mH=?z&4m@Cs=w?y&hN`BuTSJY0<
z3kZ!YkWM+vUa>b<LgxSRwcx7l+n0)^V)C+0wQ;;FBCcf1#bTi>@7G{lDoaPLF{T?i
zw8_LzvtbWhUats1MjaL%e5gi%O8>)ZkXoLwc;yWJY#${Xn`orUHp`?miV&QCoa<mE
zybQu{ed3{oMpU!6cL&D{qogQaPt{ax#&KFxR)H%;h04SOlXYDdpH&idnL2yiB{GuP
z6NitHxPy+DROW=Q^Ny^K;I3cLd1tZDw(FAbQ5f8pW_-dj8MUc)B%(H{N&bzDiOgsv
zBnK2ZA*EDHXt^M@#4IOkZDmnwo9#y58_a1N-jgy+Is>^tM?5n4uTO*e<wYC3C#A62
z(&_}eKE2^9X0KK^ZBS8GsU!zu-9n&fy$$}HfbA_J&;uBvs1S)MZzgtaw%)ApFbq7v
z^=_2cd7*B7a?&^0{fP!pE6Q(+=h@;P%tD+!HlSg}#U^L!8g+~^&QEqV(fym7NgwG=
zzYE`3v_+i|k2f=H1~F|g6)BICVY9HdEux&H0aSgcHc#eC9a0SUJ1u|(h<+%5zn``6
zC~I}1>`WL6kcY`I`bsky{bX|>r^@VvlH6}bm5NhHDlYV1M;W6o(=15j)hcEpd_>Px
zYxRpk*(o5Tx0i|hvVA3bAj)<;&W!Y4PWhYfU5EnQzJkWkc@wL`EwNf9Z%!hIza)a3
z_Y(z+W3)?Vh5mSiY4yX66NmD7!{!5iO})jbrVyDXoRxB(c)dy?^_ab2sv?8$KG<Z>
z({<DNfHCW0E}nSW{?}wlWM4Qn_-@u~e}kwIfdx}SoXt=Q`Q>abFQ*q26at}KTC;Vl
zd-arByAV@eC_!2ckDvwnDR4fqF~i?|;&CgiqgH7Hxpyq*T&X3~TFZ3OWYE#+JBq^f
zNWU6m)2$t-&rP5`p6(@Rm(SQ^@)EV!SVb$635GU~XF4IB51!FN+_XAKB1{=k{ZOnc
z>Y`0#8F1_$Kk}sDd)mV{)>n?@WH=_Yo6JR+59#unmewF=afHlQgV<`1>zmZ7dSwE6
z*#Jxf)((Xx&%|O+R^_4gE*%ZKzYhc;nw9;NNZRabUWKr8<aSb~+8%UOwwoK811(l4
zlS$$7=7%)C9gQcw9DTq?#Ph%Ys7`$fj^!Ft`SHaFBZ8cZB@3iiK@jZ63m~<W#fnLp
zkI<5hq=rx&0;u;2wncC~)_l5{&RFzC9dVTEk^2Q|S5g6L77L@FQ9}ZN-+5~Ej~|{|
zvl*@|s&T+^sTGa{qF%|4V7-CM=jZA#)aM9spV=nc=RgSeq5|^{Dj0%wERrucg`$?6
z+8n*93ApicgOLp@3F-k)au~xj8dyYUidWIhRXuFzc(O4IBDlLiFAM<^9FwMS%r7pI
zTq&!sTo0Gc=>#&Z43JuV__v~O@9ia?Nh_2>q1PLh7Pxw;7UNpWT6&&73DD))$VI%6
zW`{t@9KulmCDl^4R25bUSXT*bq6o<x377bRB*yhu=_e{z{CQu5avyYGllgS1d(tD!
zmt2if8y=$-H0W}QZ8=XAP>Ui|ikS0%EP#nNM_?rF_$+A?>niIETNa-k><@>m%tst#
zSP&|hZuq!Hqw!)VsbytI!){6xo3VCVaXu9UPs?oJ<b^3jo_=zCM1b57rEIcJ1Xyi%
zxvf{k_w+O9!G;10D2wDSzi8U!k?q=}F_KkIFK3)IcVdP<|KcbUc@CA(FZ!V6l7_kX
zW1?dI7UPstYPhU0N<>CnLp`{Hel$6}8gb{=8+GJUU+Npd@JRUv92xk@=+6ggKRB>H
z$h;!JWR>7|7iMnz)^0X-c&rxd)EZqP-+Y;eXV*zTt=UuZ6hiZ}Z@F(u9dRB=yV(t-
z1$ZX;eTd?^QSTW$)0)i|8>w{~b;~HYT9&AxNl9!fM_?&9gNX4U<B;*#i%n!^no!pv
z0W%BjGsxI%JZ@m*riH@0wdATx<zH6XJHv*A+9KkJBM;}wlp}2_$F1p*0~@-4Rzh#1
z?rR`S#Qx~RIH_L({8gB)Its@vmIFjGMKa4`l`D8_p0CkL$0eF~vW?tq6rOLx^3DK@
zxUCUqZ2L)|)hF{UsJL2=TYN^sa3ap&J-ltGWQo)%6`{EVEu?>LxBx^Kb<a3r)e`O8
zb;>MW#J=X%(XY!~9;+`uepo3AYs8J1pEi}_oBCT>iD(i!&ULb-Olv()t!*h&5C2X`
znJ8>zDNP={3rXvNjtz996<1P1gN<E72mlUTHh=_`!HzsM@#5iGQq+^UB(HJ6kwk+y
z6Zd0{jflXYKEG5xN`xbgZC=$U9i{@R>h2^UaR9aCiLt#cv}^T!$OL>xD6lt#9nHJz
z2O1}|n)1&7c>{0o5F<Cz)9p+2i76>#mcB1tl#+6o5VnM%Jf3b)*EBmRPW2deMwNNf
zu{V(ZX#&|gIKEQG%<2I7?C}u;=ytrW0CmVJE{2aAiW91$W?V3hrC+)mnuSM#zCPC(
zU2$M`KqKH>^Y;S=EW{P`!)}44631_NyK0$3P9d~;B{JK{Q8lnW3>n<}n;TUMHJk6n
z%(yfnI|%Xnxa4S{Z?TMq3k&(nXs}@{E99ssM4{3fY8LVT9ES<uu<3qxjnRbvEC$KH
zj>Ao(RNj9}LZI3|(Wh1U->_$C0MH8f-K2_3{?Bo^{j2s9E;x|?=QyANt$?KViW$oP
z9EV__<8WJ@`0d}Y%&p&l9fv)e1hM~?JbxXB;07JZe-=a1-!M11T^Y-Nbe_Y%#s*LM
zzSMt?0~zoh=-jmn6#sJ^kb##uG^ABW`-`RO20jhIet4BS^1r3~UvmZ7s^#~;XQK-R
z-oyXrQTJ5a{=M-ZRR8jF8lNstih`os*Y$nK%Rd)iTCc0u?k1dE9S&Y+!od`T$V9j4
zBnYHfz*15)<71NLB!_Y0dsYcAZ1;{~jr_Gk2MXL+`J@p+n3!hg-*0bkvu8ds$$u#X
zNrWxVQa3o0KxF&p7n&-`=%k+f00Vy?0uCoxOOX%>`wE7Q0enG0MTQ9(L8({=hrY9@
zvMQ&UoT4BMO_wK2v&5NE6a*qb-a!f~PJ%0eZeMnP<b^2(V-`xX!I8x86>r@5cTDoY
z|Ksf~gX(CYb<F^qU<ppp;O_43?(XjH?gWS6?he5nf+o1Ty9alN>Et_S>el@~^K(}<
zG_`wC-Tlh5jJG8^f%`$trX(rdEe?|dDG5oOIdLm4m;@pSCzfASl(ereL!3A_vwDY)
zT+N;m96zf217Bw`b{|P$Jh~N0Hf|M{;`dUT5?)=$+W43cq7G?kX{ZytNNxyjMd69g
z(%P-BV0+%`C=MkL!OSij4(~b&z^q(WNoGVagHMXaE7g^PKMViPR4KHZ>#D+GMp-pm
zwR@1$RsoK>9hYp6zyTjF9wnMioORw)zBe3b3p*y-JUz|Jzfe@1259<djmUsy<rh;F
zA_5KOOjyRPCQMi#F)8C9sDd~h{d^Wd4E_L2%?08R2?*>nm@_fG19Y5uSYni(o12@<
zMu@m%|7)@;Ecm!Uw+n=OW{{pkdqm`h-IRF53IxUNKe$+K7%*Cjziq>m|3ma`e*-8_
z4(&#Y|E)EQzyL-~<m8*U%fIO-xBUx=8rN%+ocQ^MsRQ4oi|-AO$0Zb*Y&V@UD=Rl4
ze;_vSdnSR-PmsJhm(gfkF}=&#M?h}onv9fm#>viGR!lB)ZsueO*rWpObGvimT~At4
zxSuhQy44})Tg-y(hLr%@@Ore+HB)}eb;3yoI2rl*JEOep3_L`?_6L&443;3%jgdi_
z{@v9~=+g~+DePO4^K@H@jZJ_%lTQur@oB{=_#1qwaR;fYV#<%zQ527wMNA50&-Vnq
z!{~#7gq$3N2~?RP>1+aRc>%H1<Ye0gi&_U5)oY+n8qsvJD3?SD+NT^C7>GpQx}HeF
z9Wcq_@gq@dOSV4~WFO1!ig;<YiH*i9B027gV>4uj=aJc1V5Ll?6I*e`1;lns3yCMX
zKMKXpXKja=?hrO0fkh%fw^lu6-G6-vGCKm?EbN5Qrcn4p*`OyE7O8}+Ua=1bMVQiu
z+1c~&(-x}PUl9;~FlTyEhl@PW>a_{0RHzW?>8%|5i-@e{9v)(pD-?Xpqt-IC<JCHl
z@_d6<hOZKrQnkrrAhJ7P>9F32e35Ev#hK4(%b=2qR*uc$HoHCfA9n|~N_qXyWpVVM
zR2NSmm!G>+GCm_@6k7f=Ae&9bmOYE|`(U7tOr7ReD)bn^i)JCPqmYc0q(VXfsGSeH
z{BRT(xw^icn(4U;jme(BkH$`^(msHH$psE`vtEgMb2|U7ebj_(D?Bg_bP>=nXG>Mn
z!kgOXfHwJS20v?)DuU0!yYH~edUt1*g}C4G-rlgancxJijrn3OE-d=2R>j1K9N+gy
zb-z^3iE%}el`;Gp+fyvfW?P!mwf0c>lMS)Y*sS>^BdYt9l-2{TSd8xaRX5G+zA2=<
zSE<>!*w|7NJkO{!x()KLV*HG5@OTn<uN!2_<;oO18$&2$=G(!chm!;|*XKJsLUbK3
z<&;uhxZju7y*+#C;^@FJMl076SHKOh#EqvD=zI)sSy*#A?;A8WlFvh6Q}g7*iC;89
zul4R(<$~O?j(H6FH@2v!?#j|Qbd@KSZ17Q*I6QWMB_t-qJ6rA{<nrV|TKb<SWCQZK
z8igcH67F~){cLqTILO?~>9J2J^JvlJJL<Tz8K;yiadY$A3)%#u=-npE-2UB`Qo@4q
zr*=$AGfY!(F!6kh_wA5L*Mvs#7gMHeI~#1aub@VQ5!_|J2T(P#W^(@qTOyFbNk3SY
z`gMLN0;uby5y2eg0&7^x1)5>L;T=%1*QLw}f6bi|w7ZYY!hW_)7gjbcvJ`%N_0OTl
zgw<g?h^Y)lSbYu$8%;J`ZH|w1V{lnKUdd`Xx5ajyuj|xu38XS(cY5A$8k&uckUnpH
zsFs*ml3Z@zrYh*VgxA+~nIG%vRMu~9oZF78wsv<;h3ZWwiXzacruCdmXWGwyiX>4&
zP7Nx!p^@ikKpK<jff(I;CcfvwG8@{TdtVd&dW_s+j(s*3lMAL+CbU@1WtH(fc9`q_
zYbLISSRH1mkzNQLn9Q3;_3C-J!CGPeD)mTcGaaZ2LhrR+@6<yIO-U)K>%!x4h*=<)
zB#9bjk>97$ENMWk^pAa5KAZ%gjs@sZ?Kewqe)5gO0?d|&HlCc)q7$8Ot)102E%h>=
zDcjLA;5Jdf6r4{n%H8%c;&Kd}<|YHy(6-V{tM~0}pD(UA64NSVE6XLlEN1FzW&M{M
zD_?t^!2*MS=;9TRDwcg@`Z{Vu|CmIjrMXu&Xj%<8qO-2LdKWxJ#rv!o2F@@qG?0(?
zxa_hMyquzZH(O?1X=`ve;``6))vhc&vDT=x;C!zy8M>P>rz;PieU6?w9d=HZn3OA2
zY1)ixY-BKn8{97iJ)hDJ4y)S5DrWMwGWpz+JD=~gJWp@g$^=6q8qBA_MKt{;wD_|)
z-4q_vS#3nQez{H}@Of9Dgm*kf-6q;RBl6=x!Nu?x&LW-;`PF+k-XpVV#rJuft}qvI
zz^TrR^Msa3g(jPd{c^?Ihu_HQp~ri*O5;bogb8nBt&ioRF()|hx`T#P`Lv7P|9dLZ
z&QFAnn<3e9uJlKi=`DHzMS(Cwc%!wZUUXg5(R@>m`-82C?9*9u*HL#~g7xvappR$6
zLVZk!7rxDgOV~cGx{#ErtpSrFTf6PW=1RMhnclE;#w6UB5mCUHOBX<SM*fOjGU$5W
zS@48e`y(sBxRD!}Z{ao0kUs-9Hq?6c(HFI-=Hcf*UusP1ri))*eacL4ha+y{w%(?K
z+>>S;O+DTpyjqt!Pgb!&xpA|VYIGBk=la*^VTVn;K4Vw6M>DaVFWXMbjaFp0#|t@4
zwo8IVQYpoEUpdqFetF=@Jo#_$?94fMU8kWDay=3v{-y<I8*gMe@mHB?tM#8QdMUM=
zfLBg|a>7;hHt7HP?z&<i46X+uO^w}rHYP&MwWv1D+EA+^wsGW?V*Z-ECh0SS_19r3
zpD@J%JeD{sBn4+8%H+m?kztU@*pxZ7ACRkV_+HSzdCwmT%QpdYw<4X@n0or%mia83
zt5m6de>OnE>Gm7_eDc1+y=>)Sm4S~k14HelGyTed<I}2%>uSlA={y#G?a4u_{bTxa
z(_Ki@e6`Zr3F2rlzS3X@p0C`ir;G7tiqOJ524L^u#&c*|R?3F#!5vMh*MVwlorhOi
zLQOK*AI8xr(K5|eMcVh2sSV>%s+Dn(O&lxYH*Wjqvz6+k>z|s9e`Y(x5OAgU9w4f9
zm_+!$1*am63Q}g=RqHYFR4i0|Q<9gLr#<l88&**+sB+*%jP7{Mj1<1?(mX#qRVIqT
z<&$c(N~dqOM*Em@fxu>`DEGNR&-2Q6ggT`2oSslX#>?44CV@9cQY<ECtCTR|4$SNY
z5`Lw_&G=nAx(CkBbX2z-qroNeTZ6?4FH5f|)bbApTNL#w@GA-RW()L{OR1^w8T7+;
zz4zi!ycQ-oF5mWfnI*d^VU7m{<`-o8g&sR_zacWc3H|9qsgAZLg;BiWw@g%_2ih>W
zWmpg~I7)iwL;>G!2=MOx3Yx+KBESvl?_y|!dZiOpK4J|zZOFKJH8UtDtI(gwg<LFE
z8=2UqY+mSzb}_aVl2Ww^pl$BzF2aTF3)51YPQJ|<U?wCa%ynD5KDnSGAqj}Z;;42;
z<M}=%EjI$7F#HeVt&aPeCarbFuN7)C!a?39^)pdu^WzW!05vf5WXz0OsOeNJS0P9<
zI97q4X4@@$9dQg|(M#<1K)}Xo#~{>}D^YxsBS63}yVif*dy8Psf(RM5!2JP=8ZxG^
z{G`i2-28nj;SW9Ml7rDlEmN8c-prdxEPBn*df02S&NmNup11Eq9Ojk$G7xR!!58Q#
zy<0{lDmu$dJ^Y9QtjFhQ&hg<EhuyfX%%q4tyZ1S&9t(~G?dE-^Pd6PUvv0S9=JS-D
zMkN|_du|Hh9^O5C-~*kc7nj{B#uR%rqf*HOa7K8hG^@X&aj5Atj}eY01U}Gr2t-2k
zr#C?j{2Z(l(Vt7dHAQRjengJO^g)+#cjrD`ZItU$8!UXp8<VYB++rKoDpcQSWXrj&
zCuzio)|bCOO2kx-ea>{#^-P6uzq*h9Quy+6#hEB>e+jrEGZZmZPZm$!Xmb#TEoSa~
z6}N#(UN1iT@B*V94~b%LqEom#u_e-E?7vyc#*w7y>Nb8WPENhk+u$}@tLmlA+P|cU
zohcYIy37-ro`WTql)eH;H2cyuT9e4&w6hL1vUHAWgMLfpt}m|)ZX6w#J#MJWKfrEJ
z=X$CX*hR0_IGeVI;;^C9V@>!2O+w=16=!i!9vI^ny-lQOozxv4=ERv2QYwGGlXjTi
zA`0?{kka$y%TUeRnvGHEq_MDBuL)hybzH9cIakV#&~-J#2T-b%PbbLn3B~d-25j;L
zd_+RU`9T?ssGr)y93CF6kkPX=5O@Aii_?{vP1m1DN6s!xvXmjmrRRGswmCc(rhVPg
zP*1M|4k7i)cftD8O#H20>YkUgYv#9Yd%~VwjNqou*C_-`p0^UxC{=?FPq^zP=yKFS
z($X!{*3Ga`AefPxZJkn`i+6o}JKx+GP49X~WLGchGUg2hozaJrM8P*kz@9|22M9}u
z-W)WG4Cf<zqN07JvQvyXO|cU34%*f4&yH9<2N(Fya#smGukF*>uVP6~I5y1o`AcQc
zM}5BqqRx<7o8n}A>76it**OS)f+9FEd?sfmEja)EqegJK=QkVseKa^tq0{sJNz2CY
zDQ7X^8ZIWAp!jcSMWiM8PxO!2J3HIT(ShvF=#G2CCa^FJaRJK{@Kp0*q~zqOtTwB;
zq<mOp1l!zUvh1$=N@PPRI?$V+BQeM|6EM#3@bR(5xaKQ$HnxNVC7fs8v_}mJb-B%c
zXB1E93L1&t9Kg3_H$Lr33LRKr5=NEMh<7Z{T}Lkm_JcExb`U`wUh_0Wc4NA*arI+g
zuOj`{#D<JHF@W$=eC)1czHF6H1~h0DgU~vbfNNYLaC0Gf2AdEA&1^WoG2t_F1Jeu+
zH_YhHdOcb`=<xv4#JIG)-em0g3JD+^t$4uC)Ee7J5q#MDct>RA1O2Jx{Y)S^g>u$M
zIs$gZX|P<+M1F&oGM*-mg*=ss<^T!JQlzjZLsb8IUuM`~y+(mZMHDKgx7W{k?2pQ9
zxytyU%k7_}V3<&w<p!0<Hs>SBnc_D|Xtw!YKL`EW@}${(6DgnV{EkQEyekuQ@GyB1
z;xd*cr%eo>=Mn9>9DU#H`aT2UK%|?xIjyAh5cqeRGi80Pcc*np76rs&!qGNB?-i58
zcGcW5lG^-L%Nm-mi8cc*!-Y_26#3G0el_L8$x@y!4O;eS@)fAb;J~V+3O(pOdS|lY
zPqjgiDQ*+NgqANwM*i)m$ftty=dKs!zRW*BLQh(SV1S;Yr<wUXm!p^zB<TWJvrF+f
z&V2L-n1bKe#A8tGs1F%>Z}}`I30T9%)>1Q!*<>p*0v~u|Ng~k|vf5nG98Ol+Q<`kn
z1nW)53dL}JwBtZkQHMXc&M*X(I-dd&=R#n@+ua2T_rFJNOMKfK$zXmD2s+CxSE-n)
zpWqfr;C)i(I6b%s7M9k1dCEAy5narX;}c+wU;z)2C03sYHC?Y+*Y!Y~%}(;pwrg>9
zFa_-35LrfbZx}kEX9``gG{D#tlD@6MGXK)Z@K+ZV!8~@P+5R@xSVy?%ke#ESkKX|6
zTm@~`IhfaV!E|%Bo-CNbmb;MsRcxc44=j@2(Dl`3ZG}qa(^nSLN9-Z`XrfL+yWiy=
z<n&!SZH_WBg282A%Tg+&SUa9vEnif@YDmMm`JjADT{7G>xPA~0Q`=N%LKDjJw=nDy
zS{cHn*boQf5(;BhfV{^{e+l92en2VQivasW{OHIIj*rYfhx8*)Vvkbg@Rn^oKa`9+
zpQLQ#{n@zgsgIFjxlM;iG$#N4?LIFXfpl!i>8)4{&nH!MgGaIGSIO0x*L%ShktiB_
zj&Gp#3l*s58$NM0?}?rceog{hlDK}a;2`ZjhCWBEEjJv_NTxb$<~sDjTI+octU(B$
zAzg(j{WZH1eTfk!o%0t5qI5CSb?!gSwrzr0^pR`kD6I1+6&sovU{!lt?{yIvzn=8$
ztBmUQgQQDEPa)%s?YQ3&ZT28B&}k0f)50-Gd8D~}9U1YB%$@LqrBbRZpsSiHv1TeJ
zqKxq5ApgeD<leY@QHa>6_+Y;z{ytfl!ddiJNvXw&WTE(#H<x;Dc+8F~Ek($XT<^8P
z(D;l!QF%1m#L@9O?U%%XNZRA(p#qWGgSd3p54U5t#NVT?r?#eBV_r5_++!Ew!Kcp7
zKuVgN!cZn`GOQkZ*z*!=*ZCa4`+h|Qi-1rv{G-VIa+)$3{M2;mY7TYaElJ(A|Cfgy
zP4L>fck<py=PUHfuh(hcw{xRYKK5Cp8fU6P`RZjL5Fhv%&xx+#LQX4M5Na+@hUvD4
z7|51fLw%Woil*5vY^?k6B@7zgR!gzW(7!V=ypsFYqu&g5fgqU6aCW6-KIJk~^#{X^
znG!rRv{m4f&`1pl{i%Kx45y8AQ<L~W7JAW1Z_HDSHrbdl$ct>h5|l_K(<87~hP)Hl
z7I+gyO2oc+*#mvUI6=no3k6>)i7{l|a=?0SV*Tce^?FdU1#0RRy?J*g!3a#)MJzrn
zf|IT79E9x;D~Yv!Kctb2O`}--e8Xrgmg_NC!8#Gi{)E#pGj6e_Q=tz^pY(mYKe>9P
z$kbNv2JSgZNlVV<Tfn&%@BU4!gA;s+4;><>Bu)G2<E`Pu_V^Q4In0<g8CqDBM8VUN
z5dqpK$>dl1N3~U~ZwHvwP(4;qj$Ki?EsdgosQyW{`1VqOP}*8_G1B)hSx){22&Jg+
zUgR`?0rvu%$$+x!D7BRm`H!a|{{kFL@pdn-DG!A3|JZBnU$aMQz!kPZihPi@Q2RoF
ztk&5+-9#Afj~(h!QnV+HNFAS)D2YZ1-m(FG?xuo7=rG4cbxK(W?e5WXd0fDBs#(`D
z$SO!_$_DP9BLC5kn@1->{G#mx0dhMY)DSuJix-IAuX|uXNQN|84oG!EO2UZX20R2S
zyL9>dblA{|m7XLdh$no<kc8BM`KSEp2h1<F7#F3rC_Wd`>_Zop?4Ti11hZ*xcD577
zJv=_b#ieezE}?*MLO*aK%?xC{_y~{-D@+xO(0z4Np?Fj!v=1_C*!eu`>)o}sx>|qU
zb!<VBAGbPOB3-3Jh(vEeau!@PSp&Z`XLb1kj}5cqSQJV?LzB?^*l8$%<EIM)b)40j
z$(j#7B|T+cH=j(!(=nZF81P}9yf;7d(0F==iJXBWa(a5reM%lr_vdU7dW*B!z>lcQ
zh`upqWyWYIh$Eb=q~V;F2j$LK4aw^p<0KGOXggLKejx`HSBy^B?+g6FV*Jfdpjkt=
zCF6V~Nlnc!Zv4M_QL>G;mzCf%!7gdqKYAb0n|NFkF6rvpat4?aZ%b;zgn=fiEw5>W
zv}viK6Xih-<HRLS0Y^j$T)0seb%|+kU4(sbV510Ey9-9C(kT}Kt=9vnWg*O`o#@r7
zdwN>j<snbJ@h@}~9Kck3fHu#P9H-;VlE&R~kmmh)LD+{3wkoIOoGeOS>{YgQV7Nri
zMM)!U2qhjbf@lu{*F4Ba5>x#$_`5KPecMy9cn7JQXO6ce-8J^B-=3BiBtg7ZWS6!M
zBK@(oq~yTPpXQFjH8EhA{PK%@`aTB4&p)DOU=yK@p@T8>@599z|C>#I#6h6T5dU*B
z&gh>301f^K3~M}{aQwfWMgY!)4lon01jS<hSqu2kyODsX+leUg@t+R?3it`w6hm-d
zfyVK_w!?QiK;(TCB*y%w@gjn*{;s{CbKXt;XBh<YcLM(zyZ;}aye`W7?;q!dNZ*My
z-(oY-8vj>|hJ^t8sXU?_Q?DlhDAXAD)xjxX+v1XvCA*2AB&Bv1`i77Dr5;cS#=2CX
z-Q8Q_np3zQA3funn~z+&#!Dj+!<pn=r>y+>71P)acc#gS5(XCr5+tA7643bu&z2_#
zMOJ9XkU<ex;76DmiP_nCZwYLMibJ8{h1!_aCvJmg6_oJh4O)hZ<xzNFK~+@f6%F5a
zog>1f4v@Y>B_Z4p$;mmiwqEh1G@;=EEsN<RQRR3>7s$k0Lb^A*FHNmfkunHrY21Ov
zNQ4x;6QXft6yn4rEJ68()1}T7c0lA;%lHo|+TQ{U3V7P;l$bDS`FN+dzgwOasVHF_
zK_RybTL`~)pacpMax2BdF0nxO7IaH{yF$p7@9+uE#JieU1Y$VRluJ)tUNmu?5f2fM
zR9d}uP53l$qzU51g?)*C9dBZ4X5I_g!#k&7usBXYd1Ojj@03Por|ve2!{syenA2yF
zWbGqnm8-A{rzCJh$Pc*W$f-}f7Ds86j3ba4<TA)0ZDcSy_%I2X5&3sLF>?~YczRr9
zuTn^pCWfBnFHHVRFhWHD@e^a>;GRGug8`G&x5Gis*eG21@pl#(Z}?w8&?Wx|6f~B|
zKq5=PfrI|vMJAGe7nzV8no24CSM31-A7lP^yGkzTuP+g3+r<2De+rn`-$g~?a^i(4
z8(D&Y9!)8a4L~Ra&V64{Li8eMC)yoZ0<(Qx7)1ttA6wknW_CFzWqZ6bwc+@#tt%;a
z0=(tP{Jo4t4HM4Ka0LSLp=5e*!Sc4c@jX;n+3ogy)KZJtzksy5hp9!l#E|pVs7QT7
z#*)C272Da*G$p$u4*QR99A><LoUAufB(?9pr&dc>@*<qkd@@LvF}H(>iRpayljDrb
z?X&>TFWVrQkAWgwHjCFP*_DZl+-vQLhRvxwlL#7B0+d<zM8_G1tx%hop00|Is9L$v
zlVGk$(W2-9)LpiaxMK;jhLdQDN|xFcSPGE|{*YS(JBm4T<2y>GfWnE#RaU6xhtI?}
zZ)9DQ*b}j2e0+E+UDDJ(8KM4Rov(XzZO7xhv-MKgNlZZNhgPSvI43DFQ&7*FEi%RT
zF8=_xT}^JFpRS887eY)ntq9Z2_83r?y?;LJ$gFWS=GPxoPtG03%~oh>88s1h@tB<f
zKzj>pl?u&}PJKi7tyVDrV-M>($3;)?fA^JLT8FclZRC9keFNnqqv+8>36zWZhNc{+
z;|<8?{+BWqiy`#w;krc8zyR5#2t*nQ!%)zVpB+DsmP*JD4-9t}%IXg{^9oEY`m@$~
z+RMFm09}5q%{ABQfL8ut?s&Fd%*==tz?VhPfXfoZX9)atgZ{5xi!uYyYf;VusI>)&
zv;b#5Q(?-%`J|AdivgjDN)<Y{W-WAda45CJqJUGmxS=Z>RC)MNc6~Fsm`8cKICQ<+
zZ?y<wXzg<_GXkiKiYd6ho3c*^%iO+pVz8eNjn)H%g+*r)bM`N+9qc@vUk0^B;9Dx|
z3B&08GG!nhS3Mgmrd(|y>|5Q8{a`<lOTi`EY?`cgIAv*RBY&aO5V2aYDGq&O`j*aO
zC7t8<81(e>Vbw^vN?W61>|wXwj)EbBc=A%n$o>9RPDK}S1SK}Qgi5VS@pzu5RQ5ET
z@+($slVO>vd3|y8L)-n7T-VF^Jz3h*#<~<&p)V1k-6Y$_+wlEB3U1nk{}RK=&G|wk
zOg@p!<375JZAV)p1+_Io7Q4&0{wRRYS%O2O{WEale#ixIuEDGP`Qu39Z?*19`Mek4
zX^zMfdW)!vr=DBkw#o|@?iw=?<*TBahKg(ctHI#?Uo{v`{jL)}kG;(ZQ{g&`72P?o
z2FrE%B)80C#cVEHb4+}$!67E}RAooe4jHU@(jN{G0e8X2Y_{@|xEMTPuIF5$6hBOg
zh_YB%tP9}h%0W|yTRwAM+}}Tr32WW80ydM%mto=8KXYZWC5zJTaV%KY=w<;LFj*&8
zXvc?V3PNQv$I0a!a@?HRoezJ+o=zh14*7P@^04MA_AO0w*4NCBn{-wm$)>u&n#*>$
zT+fO?o#_2jzOSB*Dy=DL%KWHfX{F2(QajJxOw`zH<#P8MY!R;K9Jw2K=F=_cQwj{q
zjg}@Ve1M0VWa{ci301Le?^hlSQUboy!<#gxA5+?@E6a_$YKZnKAfQfjs9c%Wy!wc6
zcofH^gtbq-_yCcHBUxKKRcu0Z+k=PA3m<jJ)o5jVo&CRM8qQANYuog8`_CQM!yw<O
z$dn}xwtS-_w7WHKW>*XWs~XhQ3|701>abrUBMH+$?8Y=PK7IHty6aXW|N2X%l4gYK
zo0#{h;+wDKeY@WNKBE-R<rM=B6;BWE7a7-@<h&s+Iv#0!L~6+BV+sR28B0y9Jl%+}
z7Kq<XqU_79eS7G>-^-Zx<%we-@Vtz11ehj&=UfI^SdHt!SxmqC6iLepowa0*g>y*F
zhc;P@hKCO|m>k1fu8=BcwE<Xc%ccBqObv6BGw2l=AS+)qUF7r;ZR4GtCPm{<nVH^#
zEWwT|MnWQ~UB?@aiYYi4On^1Bgp8DmaZ>+1%su>X747rbdD6!Y4-l*EdX;qHuh7rC
zZ)ARvJ!$m^7Jb7m%rD~tt{E<NovtBn#Y*A3RIFp_2|#;=3MJb0r24Uf;=l3=WxQBW
z3T;N_&J?$!*Z>&gvfp80vd(+Ryh4Sji4Pw3|5_TduKaEWr~Tvx?Fdex=W;UGbF8Gt
zEBMfh3oQRfd4;^x5T9#h=diE2D<3@@BjdPDlK|zNNzjFSnRhs&UH|jxs+Vxu!r9M)
zl&6rPG4gd?(rGR~hD_dv6SddL*qOJf=Gx0ysvOFEEA<WIHU=(rVYmGJe2boZv<91J
zTHh224J<y}Pf2um-M&FMIdQ7Dx*cuu7M;~n$yLQV?e{Z-TW<2tu9XeHeozEY?u~Ht
zz&{Z6&Kgr-1p7mOTwPx|nGAkkpGY@|iKPmVF?Kqj*|It<*vyq=wm$suRw<4~x&Lq^
z@9*nJtF0(pg7!2+$J8iu`#gGWhdgSHPahW_+70kFkGT1Wx+XF!Ml(Iq*yJ*~Wt`r1
ze^8?#A+ZIETl3Hsgx=RLZzZ!tAsR3)*SH|eRci(1YZ&?C>FYM7Q3gnWWY3E#D#d>C
zqm-!_eP7x$_<y@3;Gc7C%#D1vq|P=QXAWqmo@m-Bh{*?*+W#w)gmrB1S!`QIX>VPp
zwcFFUy_h6UKy;?8J;yMX;S_VSR4D$nAA~YYf8ra$cd1olN#k{06KC92&7g0*_sG75
zCLY-UWg+K_K?~29JcU0YEPf0eXy_dF7vx{r-Gc$WA!?say*P96an5J5o7Xv7Ci(hJ
zLvT_U9*?7n87Asw3p<U|r)e4<ITffNtTq`npRtQAnN8^GkC9QP6z3a6KSLNkXN-sq
zAe1~@qLeJnHtHd%pK7v{DwQ+=hRY~b#;$_xt)<Fg0fH`B>eyzK-)mAyQh&YgFI7(G
z2Miw0OMzSOv8-l{B@sys@B-0K#YbHe3O#5K9d@J8^W`%0utcZ>u{nwpxT9-6cE`oi
zmHj&+K3pXOj)F23H9mM>i)jMF^_O!Z%RalEjbSYmkx;Rg#h_(T?fND7<vqDrPU`%6
zTBPi?<Ydm4$dM}|8knf5?k)7`#`FvL<+}Bw3DudB$&{|B?PS(=EuX+<xk)aqHa9I-
z7ZT}#;cu*A#qH}hbTum0Y%|<#S0zfqEbdx3pP{`SY1(Upd!K1~yE)D6;cB|=@wzP1
z$CI<Y;pF0^<0hqO%cLYa$c6hoX#DS#F#?`0HY3M+z}}xz@Yu=M&!qTCdC)#Cr_<TX
zO*TU=HwBYlWL!`P%3H#P+|{a=#Oc3c_T{jMJ&+(T(S_)3f+KgAs7=s%s_ry7_#+}C
z7dGIr-{hH?2M+$I)N-4S$?_sk8w-YbzAs+UC|Ig-$RI>Em!fB~UTIRY5W%lITjNwX
z*VTD^OWgLn;L)$NL|ef0#d%P~?~Lkd<68;<zgTj=@P}N!35iUpbS2fy+Ffu#<R{+q
zxsS@l^cyX*!ja&JmTA4{!yEzy<wL@yP{|ac^O2n{@0+joLBari8{b^_`p>mQ38G!P
zUo9qjc1)M5#e^@lqwMGL)5!(txdyrHIjsu(MvU;Q*H;<d|EJFJ2jT5_G-P-}u|(C@
za73T5Op_z*+s(P?GeU;6d5u#nHq&C=A@{vOf1m~|Xtu%%`_ED%OIP|lDw1jt%V$I!
z;_obp0TKF~Gk~Y0+~VLwN=@VWDSagUGnd7SkC3%40x6HV4xVX74=#pJ=-AKZrw^R&
z-=Tjq62kE!>VNHylbr{3qCn&9i<Y!D{_JN?<l4{P!rAAF4$mdZm<ET5)4k|QG+{hj
z>ZqUAXMUG(Aq~Nm#y}L-`F!Y?L5RV=lR~Xk`NDyZ3=I&Wk6EW$pw1MY=Q{yNmu!Z*
zQu@s$stZO|xcCtNhalMRFyh49qKQwyREyueKT(Z&15c%vF<9b-N(0+yb=7M<gd)VN
zev>r<JdJH>uf1l07xR5TiZCGI?WGYjZ}xXy`gxBH@(1}G#qBuzrd0T3a;iDaomKB^
z%Er?Dzf*JBjE+70ZEP$p-B<4JP|T<_B)QgjHX?e)y^`Wbha<$uYeEQqv$I!c<o(VA
z6+=M-Ny=RSs;4;Z@%rd=6HB2O$)bZsJy~MrRa9o-p;cQ9;{HOrQ7Tv%2alrLSS~<W
zSHT_(E+#U7sO(wLU7Xo-@5Gf+90d+uOAH^p*LnYDY{csGEHiITsZ7r%&}6<Id@h2i
z!Wsrv$gtIAq=J<V^<aAuaI)t1-PInNj<7QdFc5=`&J|-^3xC~%(-g^_pW$H63r;MT
zn=rAsfwF#og?KK%nXl9=<zSqQxvEP#4jKG5f}cCMyB^03^zYnlOKQ_9ER335jpg!B
zhk`P;B?((3{?<1<Epr{bIgUK)sqy0wNZ*G^BN;v7!z{@&@c-sL*53}H_FjA~dk?{1
z(}E}=ue85!nJ$F(gN^OWl6GxMa&)5dWh3OnFh>DPV9eW}=m=}+cYLlE09B_y8jz9)
z#+&$Yvru^M4?CRqEQ#d`xvfX@O<$_F4p|HEpfKs_NE$RCnDio-!bOb9xL>fw^jb!L
zunuuge2lY5J|gH5Xblq%Ibe*L;N?+>{T&e-TQZd6XJ<;wq?=0{x^KvsOKQJ)zF`+b
z6_a)*_YIbB{tC-a&*M>I?-L{#&-E+_7NJWrwbnMV!uxCLw7gqEE|Gw7+SGy}H|<JQ
z_=k@|7jdJhkLd4W1<uGv^F<IYO{wBqtBB;R!hsrRsiO<gX0}j?OplQC=%A5AZl0+o
z34wNkzx9kjK03~)qxzJ|RHWB3kr_|TWNyDLr<zYlqO)HLbx;4O20`18rgNNNWgM+P
z@0yXuE3<?<9{QgRS}JX#uzPM(ThT*}U41}sE|yZ;gXc9@uQrV%Lmpjw*z8anTW;_?
z746*>9&xUh{=$W^l|p0WNor^$Q!Ero{ZvI}m66JoKNNJoQEBt1Yhfw*^({2#`gKVD
zEv3gzeL=esW%iZBHNL6-qY-NGTlsT6w;R4NM9elaz~xn8Y!V<fS{%LQN|4x%HvcnS
zmIZr4epX4xDh!T&zbw;k&OoPzy!;c4MgOzOUfb6j=+Fhrt=4&4QEP2*8m*3`dFxL~
zU*EJ&h%WE%i}(&Icb9hSlQ_)9-_I<^zcpUNaeY>>P%@**|Ijpo@Mj?j2rd5*%sR*N
z)XK)1KJDN_<`rG)Blyi%R|fBk7xxpX`*+`G?B;0=-E7d5VH0SiNO}jFKA6NPo`}%K
z(9qCgH;n7yZFkh5mb*)DBO9=zb5CDhj-@?!=FFmo>U4UM{D+<cYTYVoHb34Tw}7xh
zB#EIscuJv7HKZhDS!EWNN8oSlaZfc+sIRB$EPSj&l{L}fqfbW@5E=Z8fp9~5pYR94
znmsuGAglx=w{yO7QQv}ZcX{hSNztT55Y1u#Pgc;;r(@+t7#rgm3p>vG&5bb86+p|k
z8H}0jWu(5};1TCo+A_}>HojVZ?=-TZQl2BA)069|)@7dPCJZlI7M2o1L*k1q<@i0T
zl`zchr0o=DHNa5IK)Q1I8LEw?Op_!Pi}i<;+XhSG<^wD2*~A+}=p3h>eI}d5s(*hS
z6OODa`)f&k!cBDZdu&@B47e%us0RS$c>4@~5!VVE{vlM51Uah7Ah4EH9UPR!#XAq0
zQu08884uuTGpT?26O<JEzAwKtv@yC16XJ3h{=Qx`0TloPN6@Z5Y|JkAa6Hd2`^Oy5
zgdh`GLZZ+4Ydg$q35M5U71~OL+I~5&pu_?R3M!MsO(Tt6letXnZ&_Xgnn7CLuH!+E
zG;K|Crx!d<y%2fadDdrTJg8jPL+547jJL+KMNpsP>0)f)2X6aZxIL$#ZWvA4mCQJ?
zv{CjY!nzR6V%LYBYyS{Lq;M0|!mU&V%h^)V2MkDql*lDa-){%0-5^M_x1HFx0qbu(
zq{y9@PxX{I?ypZY4T(fe^a`~q=1gd!QMn(ems3-uy-!3cLXkM`dc3ODc}T+p`5gqi
zX&5L};CLw&Z@=x=nhbP$bGeKn4w!8Ram3hDANz)=9oa0Dhs)C5F`t1Fa0CJVD#BDf
z-sXiK;_jMTI-%VS#Lu{Hs)x7H-5{fWw1`G-^)d_vm9aE_epipQO?!CGdK7Ljl!f48
z$QktH$N&$Zw{ZQ1GO-y~)Qf2^&o}IQWJ{c+fIyLltJ`=TE1Oa_(|C_ygpcj9Y&6#V
zhzkexVN2L6gL-<A#mu+191^wu6OfCaY<6A{ciMEQSYpt}8wDr1?d@%wtavld-dq}@
zkt=Qicvx_@aDHoT*wA(|#Snfymir;cTo<N3LlPHt1bmTXaob`8#~33d@)+T5b>Tv1
zfn0a|O>;sAI$U}n=@0f#osFObWH6E2aq*7-61RXx8;6>JO)~e7CzD$WD7}ix=TWm#
ze{<pihJk>x%h0MIQk5>kIA1-OM~sFHlKiWrk!-V~>k={WKrk^+Ps<qig{ajf{>`k%
z2;$Sw5G|~h_x?;q1gaPsg2TO9ahLjk7bgQk9X<<9f}WWzuS7Gw6|Jyhs(G@19ev!;
z$Vl{tWNI;~e6l~O6bfX3VKl#_WSgeN>dMNRfo3?OM6IuIrk)34cusYwW&|H8Yu_W<
zcdEZ=oi*qSLsV3>v1)QNs=!#p@U<2RQ7FO>$URWit+&@M1%Rc&;J|@sN1=)M&<y>X
ztWch_>mK@Djg2iqH1OTtAkv&TB-$K?909?Qg3s5ClkU-jhcRveV#K3M492{ZSpkv!
z3$(rls`}>_Z=8zg51%xwD%81=MJnReo!}xHxBBE9U@%`qg|-)9y{@@RJJPg`trZ*2
zl4pyF3H;wlagG@nhF&uA#D8y02+_=ji3q|eVaJJJOHC*2`8RDF%ngEq;}bJwDJ*QI
zsf!~$Y6X&WG?0KRWl#85I36yGk?Pg#hEuLUYZJi73TKZHhrRV7mi;YF>jH-~i7R@#
zb#ptk3-v{6)U13;-qaMURzp=7xOACeANp-|Pvpg%lgXYLWI)?_4TvvhjqjC2<p8_~
zT3L!eZCNN>4*@~W*PLlC=(sPKkPx_f%^$&D@YdFxaE|d&!tVTBlq>(rw$?D@YF_L-
z?%xbmzlidaCaA%fxBdNM;-NSB%6#MnPWk>E4#UQ=V{IYJciz=lc9G-`O$!U;iW6;~
zyyqiI#QEYx$n9mmZhpZtE-Vi8KPJMjWvTLuEeiRsV1Nn~3_^RULjGA{n@_+*w!HBq
zfBBD`BoBBEIIz{IwExTm;75hGpYGK)|06O9{VgMq|5R-GXC+j{0_}t24I_)Ze;?sR
zfRaPrh2+-1v$XI6Q~UqRN!P`;<=u<y1@P@ajP-ToEG*H}(@f+{ObNRpeI7d`Vm3tG
z=c3BzmiJdz#CC7&N||0PW=+ynB+#f1ply@{3JMOAXO~i3cREX?>RRP$bE5Bk5b@5E
zyJoQGmUMduLY=(pvSoFM;Y#|+0QZ0c+Su4wQQDi(3SVRQZ0pxc4>52lQL(@^5|h$o
z9bhCRXK0j$t0yI!RDfN_G{(d_i1r`A@na8LK&%F>4B-!)o3M(7_}!wkZgh?ZV3LxS
z5rMy^j0wkGJ^p~e$OsWrQjH0b-0;YBRcKX^k?ftE%mgp<b`zCv9f&^yin?%fYGPLJ
z`1(y$l%e9vw$|8egY%xco6|LAXY}`UbSe-(>DiAgV&XJr6fu?coyLU?_Z5W@tG#|Q
z;^~Zp&XT_`=lc8_G#ncn6$^HgyLP@M-+=w1M~ZKh?@1L%H~ml>3Ik1JLkkN{L=+;m
z_OM08MN6*&zoSaTY`t!QvNSmrRRX07G;_uEdeFep0p@j?SBa|W(c@{i=-ZtbANhgh
zDVECBNEKce(pM=UjZj#g6r{YerGBkng0;IA>!+x|*J!n@wqDgCc9_$5Y_Y#;5`0Ia
zTbtH&%FVA<y_WkIJ*2%f{p4a&V2>y+En6H#&1!LprzMPN{{{S_$HcU-ymL(R-F4=6
z6P_uu0G>ehGH%n5E#Gj?{0DxLZliCg;!q$}(t=z&5a%OA`6s_?tfX?daoBw3(m(w^
z*6=^*lmpHf*@cOPP%O4m8`n<;8RlvNeE_FRg2LbRj6)g-5Y|55jIG>F6`wvIjtlTS
zenjqg8DC(w)<^g=PoZoOiDc&+_#~Ut5e)y8M~0<5<f65*lyHG0>z5pzPN%4Wb_tNs
znDXb%nsd3Ll8af1<+rqKtJ7KW`*xbSK!j|5`-GxgFNzNkE|g5T{TR{%DU<fazdpas
zv*jaO^ri18cUXRKIZ_|F>%*}pW@Sxl+?1xoGsnW`+(ee8W4sb2q|tN@rqzxpUSB&_
zIG!v=?YS@0oO3Lv#b(VZ9@(m8&b1@LE#+9?+uuLSdy>Jk8~9{+;<cUWD;0*knEZ(l
z!`q9E)8h#o*pe(ew>`TQxjUv$t=T#BL$!#5F;A_z$<#uJtEn(f$X3Y$DQ@a7-KXvS
zEP#@EoSNudI;Ufn@ksAn=$e1PTIS{T^$_1}KO+@~o5#sYV6Nh0{l0<(ADZ#cG>Jl;
zivD2sO91jkLCYIJ8LB*cz1xh0i6#W}q@hS07mxhT@%l|zhFpeI6<#d}tjPb?9~Kwg
zJvXzt9QWda1Bv{fLpg}7&B-5zRL5Izk>u+4&kAsL{*V)LIPX$++^sYInQZ#lab-<M
zWwtBZhLlt|`~it0K^*X?Emn={(=L7<-shYR>C_sg#>d5pRCm@V=I19Yg2xM(j66&Z
zHx5`#yp7!Ki3yd7-hNoF+53cmOQ%?J$C4#W{CnbS*ouOpak%koGS9H`Orww#r{@*U
z-&l^p-vY^Bu-3U%cQ=j^MK*5s?)gDQFEx-)4vARcbJ>sAU`-vsny;{!D>O;IBz2u$
zy1ALycKIXyK)@ff_qn)(zv?=F4}0#Co%KDho<eK6&|+=9y#O-~hubk-fBDaBRmia4
z$*#vO_6QO`z+h3_Z@;jLv();!Sq+r*9|FdwR)Ob!!66)@w^gJ2KPGxc*IVmBWXhfJ
zHt7^fOZ4;Z`hhR6)g}?8Pq%+c(I~pu!ar<ilEkD_C?;@~(|)y7cy5}rtNS+2H8wMo
zb=K0sAi(5?#^Fw!S*06$@UHzoI4Z1x^v@-O8ygucZ(7wZWe2p+n9iVmSrX*M8w2<{
zR5#z;s3tC9%pYql36oRFhB5^*BcgwTV(tL4o04e?V0>tOF>-p3?Mj*PAkA&!PTz1l
zY#D~KF<9s<7`B5T9FhZ2_58YD(tou^ZmkBCRJ37D*v%JaGwM8E80SjZ@l?V0G+)mb
z;sJ=BJmoIgGrs5J_vd8IMssnZkN2!!itMV_YlLh<L20AjKnGeeeGah0<c};)-~wZR
zm4fm7UVyck=l{CVd5r&;qCy&jotH2e@QduI0?+JtLA}Y7s^j6ey6=OJN8t*v?dkbT
zjoin5y3{*i+ppmCLZ^K0A^Aq}6b&LtClXN{x0jpa9{d~M${|K1NIDM|4#6{iA|op$
z!Bn8-WavS~DBSk^+HwZMoUbOnvkeM}kWgs|vr)GeOFtPQ>m^QaG#(aSoRwl~ag$dj
zGgnug%x^EIDlGAMyNt-Hul@U@vDiK-eq|E9OraehXHv&zMNgu&d81yQ>F<D|ooR)e
z(*A~LwLM4iVoBXcR;U={nY7qzPzPODOA7WGe1TGBSPRgVx?Xl?)5HZIzhljTKlq`H
zVTt3<RqA91QYH_hpF>350&FW#WwGrk>}-QW%@WB(X1f3se8~0t+W)|<Oe%zJslF{q
z$gVq3#$j;L7;(|~p!kjH$uL-}1_1s3)W2b?lPLy=VQPqfB7H4%WAv0;C05edbY6HS
zr&HW=Fl+uGHUslk57*;2lW9Oq&jXq=GY?*&se8?h5QM$AG)0c~kjukgTNKJwVH921
zidBHx)2*diLA2KWE@Av%-?A}`+;XF>>=M-nn>QWsdk>$x_a~>6oHt4XK-XVE!ol!(
z=}{~JX*B?9bT)lR66GOo^FHmOJInd57wze#oo{i~RkB)aL-(usPE$vN(E@=8^|Hs+
zu{KEG%kS}&1k@E4pO!e%Y=7iP-SPJ3Xu|4obd>E0S>oLl(s+;I!$;p8D>mA^a&iK!
zhy?J1?Qu}v917lt-TiAT$sZBS^M?g|bPbrsS#Sfa6pI`++Pq0r)0VS6eq<zDU*E6A
zs+Nu0KOq#T;GU3`)F6bnip;G4Y^?`f0zC-<Iw+zSxpy}x75H(2rk7=4C?J@3Ce}PL
zC&MUf>^@@sZqE6vW}?&aMa=HaE<|#M(bK(Usy^0bV&UZewR+|7VF=n~xxdovfzMYo
z4PEUAhd}$CZXpF8LVX0=Q=VJP8U{WFBzr90itN_K+<iu(sS$To+HjObv*${gF!0N|
zw7>Fvm>lI;6b)?!%d%O+LLDo{c@Wz-$p}SWY(nts1qf5$SyFP9egL+Bh9}xtH&Ae^
zlGX+c(cF99M-h(Xb~oF;Bc9nHE7!oJtWUtJ{y>%`Py+aY)5uq5H6U+73l2};YEfr&
zPhcV#sP|j3Cb<8H2NeZzDR_@FBp8LehbQId5yq~{*T1E;+)kZQcm#m-AjUtJ_z_$&
z#N*<ob%Zl+Gre>MrV|R^D^4q@8z5z%hAYERNEMt}=ZTJ9fBD*=iwSq#w+R+KG%*p$
zB1xy&cm_g%rJdY>LzqlJY2W9>Bf82dK9wg1XVSQ@axv$NZ9uPPmz*&@Ew0M4tRI?*
zmB;%YrgJ;wl9UOGEH8(cRQ7bOlp0a}s#M_pUA$}kbE(P*<;?;gl)F5J1QiGW=9|~@
zA>`hiD0`;>q3x*rtLH+=z6>R>swedDH-*wbH5#MQ9j*xBSVpjXj_&Q8%NJ@6>5aFa
zKp&v0%8EwQcjr9V;VW8`lp1b<fOXyRY}L1EaeiWtp+C1|XyN|BP<0TzL1Y!<k7j(&
z<OtWfHLO;QwgB@ApvB%t!J2#{IfK|PRV>1Ba?#!6x=sZU=2@JA{x&dQUu;l6e1NBv
z5Ef7tbS-&pO>GSApZ(#WquD#|uy}eI@M3pG$DLj+;P(00s3J`J2%`v(%R@EI`woY_
zsv#gTk=fPpoJ6~tBO@=DVwZ$|$m2^dp}9?~j+6R|X02;GfUafPaW9Lq;X+W{$Ud!9
zHCWGgiFi2ctf%w2e5Fo;Dh|)aIW;-w<ebz;Oj0S!_jsr?#SPxrtq!qD?4Jv~q?hcw
z0vl#Cl1{KWAo$=kFkj>JC(y2ARg8_{(cXCeeD!gU?DcuqJooTHfOu=ckr`&^@le~K
zu3V{tyW>I`!3D6A{tSZ}vWa5uPPz)2WBioxc5bPgr%25|(6jUeLpUiwTj9n=ofm%e
zK9l~4C#yR`@Mr&aq9Qt@DO)AwsHZT@5#L5rrRbgaGQ~1Qa<kgTfHa4wfg^Ps@%M*o
z+)<Y;wVlLz?GdX-I49IA!CVR!BgViBK@!t0%Yh5XQ-rJT)TY&ew9&OVHe_g!>$Y=n
z_WpP<_y!zwQE3D~jp9T6+0ju(l<+aL-OD}Zn?hCn5md}wQ=Uv>C9t7m<#zGhU!hH5
zbJh1Kt6Dh`1^PrFhTn1=6aqO$>sU&apUbZeJz}k1{W0f{4Y$sQ?Cucvz*4KtSXYpA
zPZA|P!Q9;S$})e$l6nl*v%#N@*|39t=5jqL9Xup}Ag4|ie-&V2F*>+1w(oLty3{jI
z@}sz*1F>{^em7{smx%o|FHhqeyV*rV!?HG-)q!NX5mHzLYvqv2H!ik<oP33#TyMH4
z1)c`P#gpjba%$X1O_Wqm{0nT1B7s*)5TO86j5r<jwIkClL$ZYpwkvQeP$&zunAM4p
z(V%w|*bEK8r<6>1S;pw`#T6&A4I-T!pJc!@?D_;M<}^2I0YuZvxw^6@L#Q_rG3W-k
z!PUp-G;a8^)5AmK+l=nFjEE?(hP;|J^uuuUx4iKmB<nmsi>`i^N{bwh{5<IBL;D30
z6h>ebsK6q+8L1(~0BdS&)WCBzHn3!C&AU{K8oEd*2t%5_cB207HKnP#_MS(HqpDTy
z>JsB<A%SrOSOaB7{f>>NAl-*gAn*YvcCJwxlE7D5dblMaVs>=i2wa`z$%&Z*s!DL#
zYqe}&`M4~TrNwi<3=34q?HOR>$I%xjQTj{AxA<F6)YRnr1h*VT1>2&<fSB(FR#)`T
z;{I8{bJ(8HcYY$SK%|D3E3FpjZeoaloL+K!(F2mm6udmVlCxacz1O3=6)Z&xKRQWi
zNu>fEt%D`XDJHHqSO}y_T+M^3BuJZ{B||xEmKWx(NL8_d0zJ8%&%wk-xG~k$WOIgf
z0m-1s!8mYmDy?NT9hC7`SDSJqa18uvo{fwcoOaQXrOf8IU!l$C+;Uw$PHI*D5MuKa
z*>#bqal0x8<~Vw?p6k?b;=4gZU6d=GB;n?m0)+O9Z2RM#EMk5=(k@RYBrF67M{|n|
zxET7+0vx_iKd1F|ef9-9r}n1^TRvvqg^^N)MQyjzKyettG7Sr$redfgdK`A<St^@z
zL#3+#t&x`K=;$G7`C=GxASObPdiO&lB+uz$eB6xt5%jE*3u8E4Fjy(@K|#KSkAXV?
z!52oFJs2Orhzk%Sg6^L0mP}DnrSw^ANz(g`j`$`;Z`os>x?S<GQ+lx^Gpk4l9EbmY
zJq+cc_{g6WY`*XAI&*sQO4{te#c7+PFlUjGI;+~uB5>Lhl^R-@uwu_vGgx7>*yzGc
zSv@ct%OJ(P-b#}PJ+aiKy{qE<XFNz)8wO4g<z^mD1an|bF<ky_?Oy$cmkKyp^->>8
z^1p6zjV_mr^e^DxTN=r-Thmmjj2HJk(By(gK_(m`wAKIO=%M+`U|jvJNG{ejqUJ}I
zQQCYW%r8ZHBbHzv`6gx}_NQN+SrP#4XmBs~@#>jxDQ)Td8SebT4|QqDPljC)jp31|
zm?i@T(78cyHo74!f23~i3X@Lotb34rVQv7dn};q6DFL*!B0k~bBhA+v3>Tqshr^?@
zjuhoZ3T6!U2EI2#p4&5pl*U(S&0$i;)F6KGQn`U9mL+O$RS}%%?I(Qg`8sQrnxL)|
z3nI=#4X69*Cz+C=P#?PVdLCY0k?OAvUn*trd^%+x#q`^_#(9ZGr59dAo?zHo^R~V=
zJ?B$`p`hI3wFxS{FBX~pByz^!P5U)aHGLiHre=)Z!;69_3vQLrjkDdSU?w6H@j33n
zA#vufzi~M{_A+3}|5;r~pyXlDPc&7gt^VW1!}B-tcj)|V{dJC^t?v3a-64l7g`2Jg
z+_~_fD{X1Q)roW=J?uBQkr$8Cl3EJO>lhzPAF9zI_q!>tGBB~?p3Aq1co&>)cX<oA
z3kCLG$;lQ08qzI!*SqR%i8vEw{vg$j64Dse;JnkFd$}0YUyPLWUg4{npfgNN$pKky
zwXH_rNlrqgST_q6XUaTco2f#lDdZ^TEjkI)_`0b+7y*O@DX0gudA^JrP_JB`y;tV9
z&YY{k9}Ow7mdZ*Uw@iZZz6&Gxu-*Z8^3>67mE9S1ZM;;!bQbtLADn(mYQ6TDN<Ar~
z)TPcOz5vshY51iXQRnekzSXqOHwP*j0Bq{Bi5JiX$xAS1&F1QCb%suugb7njEMvI<
z?1<lgtVo+|Xd_@+S2usLnRttl(V8eHuS11*!R5&>Y7>K|r2j^?gR|)#0P{4k(PX5S
z^6ljKXuh?nQ%{){7HD9c4~VZQ#wW;(Q&Kx(_^u8Anjq6Bbr~tXrIDMvZ*Q;@$nroY
z+>iaSj#w;c$lyR*Jy=8zkH<RR#cyztvB~+MuP_*yQcdZoz>A@G9cqgEtc>U$AitG?
zrfu}Pzt%uv-IcDg-Y7&KjpLc2Yd8ALUpPCf5jn>VZ~kGjjnm1CA*hSq<U|L;V<`dj
z1mLFsOz`5dpE`UVb(q@y6#8yRfhnzu<10o7Z%faXWbwG$tPgGe^)sLB(pu!}!9ulG
zT<3#1^hSbx#1>4r3>IWXxRsduF02wtp=DCt&D(MFF$(e&nD2WZbdiO=;r~<HxxX{L
z0C3ox(I$<J<vQ%*QfljBHn)u!bIE4z*C@nO2#E}p6mx2AObK7gQW8oI@+4a#l#-lW
z(_A`;<2oJU;P@xb=hyf7{0r|JLhCarAXQa%oqF4OR#!yI63TZ=w_E%p@lpPs!WaX|
zV*_!d3ZifcZ1&;7^)s87*i$M9nri!!?{Ch%%iU!#4G1z+UO^5`6QI@^b~L?&PG=lg
zzDKvE6y|$=c^<vUyYshFV8-+(T9y$H7HFxiBWs-NcRX=DwWR6i-1BZ!d&7HUk<#rE
z03b;Vy9)tH*Mh{h@4_nZ2ILZSs4?V3>gGZohBL!>kx)m(q7QFaq?nU+GVrtVv~q4u
zT%MomPj&y*=$!3yuPUxw8w$!wZu->o6yIk)s~xv$Nv_7U*^B<=U9=2uJ?*ojHRN3A
zvFB*my{x*^K_2-CM8RCOBbo3BpL+jL8HevhT~;G`;J|(u*eK@eqZUqyV_4omU9D?a
zD;BI?0eL_6^7Ta?P+7j3w}66&u4{KSL>Ea^L}`qPuNOWSTcQL7KG>RiPr{_I-hEeZ
zssxt0Qy*E44sszJrHZ>jQ)bK9;F%v0R3JoiW{$06UGv4mVfS6zgZR+q+0vUGK+=Ge
zEN)W^NBj3uasm?PA+vLHYy-Yg8OZ6C-jOHuZ}CdpFlO;{isB_NwYB+b?#kiUgIopC
zt@$8V?_;K6@9yv-s&_|soOH1DqK2|)TJ6mhpO4nHC_05YNWE&cs06<F1vnvtWk_@z
zU)hS{u-axRi*Y^=p<6<8?66Ma#v&5qt4zu2l*0g;c5pBHWKxZ0itPf<B8ZeRg2~yV
zCY=Q~R!+`Z^r2LG?^Q+dN^d}_{%I^@x!c^eG^;jU?!UdCP`b@ReBn&4+z4_>b7;O=
zt}3#r23w6NWly~;GhIqeVG&T{6_?uE;E7+&XB-I)uaugSv8I3i%GGjnot9u2%Dai*
z?+uv5=H`zYaOb_9zzoJOO_#tV^m~*i_rs}lv&zS@&i4B>;@O4zDH@(BLK7pXpjkI3
zJ%_$#XE&s<ujCen-*NhNuW}(<7P9SHD*J3$1h8$eXP4^MwCxo$sq-rgo#BVY0`r(A
zX4>B2@OcRZ=Wg4TIWg21UzZZl!gd>Fk@8D;hb3tgKXog_uKVPusyUZh9}UeYD*KtX
z`@%;j>*HHzm;oUGh2M%y-=qhdDO(H1NKn`>-O0$zo4VYPfuK>v>zJM`kl<fyl(GNt
zw`bMUV^4(RF>82YYhRYHV)y~z>B-!l04{_exKvYjGr==XCA`68U>$kp;(p@6#^4a<
zToM;8<z!?(@DX-y@-8dq3yx5YoXkllEDnsG#WBgUA!MOJou6?6#2Mu=bx5Cx>`Z}V
zHp)|TWuU4V*4OgMZUj8hLZ5Q&Yo5Hq^Hb612jLL+cqedpa=#N!%K+(U3Qse<BCAr)
zO3Y*$IL3Nqze(mptK|0HD%@^|W{g!9dAlzcz|Kvuin08mpXkqj{8eDo;2;Z!;`A9%
z$NEJ8hlpc50u<pJ@kGRq@H3j;T7zGpGw}rf$UPrBr`4ptM-G)@I8gowU5o?;5@2o0
zgLFMpP;BFU@&4@onSzL#2IPI=V|vl`ZTkU|HyVWKz+4`*`Ji#EHf_=yu~;mViu<Mn
zm&1V&dLR*$$zQXg2)JPSWpI<BHEn!T+0A+fAQlT{kQ~W`?T;Nm7qewO{>PK}gcND$
UL3#H`PG)D0G*`RoW5MbF0q&5*>i_@%

literal 0
HcmV?d00001

diff --git a/src/frontend/platform/src/components/bs-comp/apiComponent/ApiAccessFlow.tsx b/src/frontend/platform/src/components/bs-comp/apiComponent/ApiAccessFlow.tsx
index 34deca153..5920d8746 100644
--- a/src/frontend/platform/src/components/bs-comp/apiComponent/ApiAccessFlow.tsx
+++ b/src/frontend/platform/src/components/bs-comp/apiComponent/ApiAccessFlow.tsx
@@ -450,7 +450,7 @@ print(response.text)# 输出工作流的响应`
 
                     <h3 className='mt-8' id="guide-3">等待输入事件-对话框形式</h3>
                     <div className='border border-red-200 rounded-sm bg-orange-100 p-4 text-sm'>
-                        <p className='bisheng-label'>当工作流返回 <span className="bg-orange-50">event="input"</span> 且 <span className="bg-orange-50">input_type="dialog_input"</span>时，表示后端希望前端在对话框中接收用户输入。</p>
+                        <p className='bisheng-label'>当工作流返回 <span className="bg-orange-50">event="input"</span> 且 <span className="bg-orange-50">input_type="dialog_input"</span>时，表示后端希望前端在对话框中接收用户输入以及上传文件（非必须）。</p>
                         <p className='bisheng-label mt-2'>下一次请求 <span className="bg-orange-50">/invoke</span> 接口必带的关键字段是 <span className="bg-orange-50">node_id</span>,<span className="bg-orange-50">message_id</span>,<span className="bg-orange-50">session_id</span> 以及对话框输入。</p>
                     </div>
                     <p className='bisheng-label mt-2'>事件数据示例</p>
@@ -464,7 +464,7 @@ print(response.text)# 输出工作流的响应`
                         <TableBody>
                             <TableRow>
                                 <TableCell className='align-top'>
-                                    <div className='max-w-[300px]'><img src="/assets/api/chat3.png" className='size-full' alt="" /></div>
+                                    <div className='max-w-[300px]'><img src="/assets/api/output.png" className='size-full' alt="" /></div>
                                 </TableCell>
                                 <TableCell className='align-top'>
                                     <SyntaxHighlighter
@@ -482,6 +482,15 @@ print(response.text)# 输出工作流的响应`
             {
                 "key": "user_input",
                 "type": "text"
+            },
+            {
+                "key": "dialog_files_content", # 需要用户上传文件
+                "type": "dialog_file"
+            },
+            {
+                "key": "dialog_file_accept",  # 上传文件的格式限制
+                "type": "dialog_file_accept",
+                "value": "all"  # 允许的文件类型
             }
         ]
     }
@@ -495,7 +504,8 @@ print(response.text)# 输出工作流的响应`
                         <p className="bisheng-label py-2">处理逻辑：</p>
                         <ul className="list-disc list-inside pl-4 mt-2 bisheng-label pb-2">
                             <li className='mt-2 leading-6'>绘制对话框，接收用户输入内容</li>
-                            <li className='mt-2 leading-6'>携带 <code className="bg-gray-200 p-1 rounded">node_id</code>、<code className="bg-gray-200 p-1 rounded">session_id</code>、<code className="bg-gray-200 p-1 rounded">message_id</code> 再次请求 /workflow/invoke，示例如下：</li>
+                            <li className='mt-2 leading-6'>携带 <code className="bg-gray-200 p-1 rounded">node_id</code>、<code className="bg-gray-200 p-1 rounded">session_id</code>、<code className="bg-gray-200 p-1 rounded">message_id</code> 再次请求 /workflow/invoke</li>
+                            <li className='mt-2 leading-6'>如果用户没有在对话框内上传文件，请求示例如下</li>
                         </ul>
                     </div>
                     <SyntaxHighlighter
@@ -516,12 +526,62 @@ print(response.text)# 输出工作流的响应`
 })`}
                     </SyntaxHighlighter>
 
+                    <div className="mb-6">
+                        <ul className="list-disc list-inside pl-4 mt-2 bisheng-label pb-2">
+                            <li className='mt-2 leading-6'>如果用户在对话框内上传了文件</li>
+                            <li className='mt-2 leading-6'>如果有文件类型，调用毕昇文件上传接口获取到文件url，示例如下：</li>
+                        </ul>
+                    </div>
+                    <SyntaxHighlighter
+                        className="w-full max-w-[80vw] overflow-auto custom-scroll"
+                        language={'json'}
+                        style={oneDark}
+                    >
+                        {`import requests
+def upload_file(local_path: str):
+    server = "http://ip:port"
+    url = server + '/api/v1/knowledge/upload'
+    headers = {}
+    files = {'file': open(local_path, 'rb')}
+    res = requests.post(url, headers=headers, files=files)
+    file_path = res.json()['data'].get('file_path', '')
+    return file_path
+    
+ financeA = upload_file("caibao.pdf")
+ financeB = upload_file("caibao2.pdf")`}
+                    </SyntaxHighlighter>
+
+                    <div className="mb-6">
+                        <ul className="list-disc list-inside pl-4 mt-2 bisheng-label pb-2">
+                            <li className='mt-2 leading-6'>成功获取用户的输入和上传文件的url后，拼接为如下格式的接口入参</li>
+                        </ul>
+                    </div>
+                    <SyntaxHighlighter
+                                        className="w-full overflow-auto custom-scroll"
+                                        language={'json'}
+                                        style={oneDark}
+                                    >
+                                        {`payload = json.dumps({
+    "workflow_id": "c90bb7f2-b7d1-49bf-9fb6-3ab60ff8e414",
+    "session_id": "d4347ab8e8cd48c48ac9920dbb5a9b35_async_task_id",  # 上次返回的 session_id
+    "message_id": "385140",
+    "input": {
+        "input_2775b": {  # 这里对应返回事件里的 node_id
+            # input_schme.value中元素的 key 以及对应要传入的值
+            "user_input": "你好",
+            # 上传文件后获取到的处理任务ID列表
+            "dialog_files_content": ["minio://127.0.0.1:9000/xxxx"]
+        }
+    }
+})
+`}
+                    </SyntaxHighlighter>
 
 
                     <h3 className='mt-8' id="guide-5">等待输入事件-表单形式</h3>
                     <div className='border border-red-200 rounded-sm bg-orange-100 p-4 text-sm'>
-                        <p className='bisheng-label'>当工作流返回 <span className="bg-orange-50">event="input"</span> 且 <span className="bg-orange-50">input_type="form_input"</span>时，表示后端希望前端渲染一个表单，让用户填写内容。</p>
-                        <p className='bisheng-label mt-2'>下一次请求 <span className="bg-orange-50">/invoke</span> 接口必带的关键字段是 <span className="bg-orange-50">node_id</span>, <span className="bg-orange-50">message_id</span>, <span className="bg-orange-50">session_id</span> 以及用户填写的表单值。</p>
+                        <p className='bisheng-label'>当工作流返回 <span className="bg-orange-50">event="input"</span> 且 <span className="bg-orange-50">input_type="form_input"</span>时，后端希望前端渲染一个表单，让用户填写内容。</p>
+                        <p className='bisheng-label mt-2'>下一次请求 <span className="bg-orange-50">/invoke</span> 接口必带的字段是 <span className="bg-orange-50">node_id</span>, <span className="bg-orange-50">message_id</span>, <span className="bg-orange-50">session_id</span> 以及用户填写的表单值。</p>
                     </div>
                     <p className='bisheng-label mt-2'>事件数据示例</p>
                     <Table>

From 796dc7e1c32d412affe4b8d778c3f10fe7f32bb3 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Wed, 7 May 2025 17:38:57 +0800
Subject: [PATCH 111/186] fix: knowledge copy error

---
 src/backend/bisheng/api/services/knowledge.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backend/bisheng/api/services/knowledge.py b/src/backend/bisheng/api/services/knowledge.py
index 2e818a98d..cfeba49ef 100644
--- a/src/backend/bisheng/api/services/knowledge.py
+++ b/src/backend/bisheng/api/services/knowledge.py
@@ -840,7 +840,7 @@ class KnowledgeService(KnowledgeUtils):
         knowldge_dict = knowledge.model_dump()
         knowldge_dict.pop('id')
         knowldge_dict.pop('create_time')
-        knowldge_dict['update_time'] = ''
+        knowldge_dict.pop('update_time', None)
         knowldge_dict['user_id'] = login_user.user_id
         knowldge_dict['index_name'] = f'col_{int(time.time())}_{generate_uuid()[:8]}'
         knowldge_dict['name'] = f'{knowledge.name} 副本'

From d95e7792fafbafd0c15937937024d13805e0c4d8 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Wed, 7 May 2025 19:26:35 +0800
Subject: [PATCH 112/186] fix: azure params error

---
 src/backend/bisheng/interface/llms/custom.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backend/bisheng/interface/llms/custom.py b/src/backend/bisheng/interface/llms/custom.py
index 8ada935d7..2f312a28a 100644
--- a/src/backend/bisheng/interface/llms/custom.py
+++ b/src/backend/bisheng/interface/llms/custom.py
@@ -52,7 +52,7 @@ def _get_openai_params(params: dict, server_config: dict, model_config: dict) ->
 
 def _get_azure_openai_params(params: dict, server_config: dict, model_config: dict) -> dict:
     params.update({
-        'azure_endpoint': server_config.get('openai_api_base'),
+        'azure_endpoint': server_config.get('azure_endpoint'),
         'openai_api_key': server_config.get('openai_api_key'),
         'openai_api_version': server_config.get('openai_api_version'),
         'azure_deployment': params.pop('model'),

From 7d892de5baed781dfb99ff10dd86962724aec0d8 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Wed, 7 May 2025 19:46:25 +0800
Subject: [PATCH 113/186] fix: workflow rag node init milvus every time,
 because upload file may be change

---
 src/backend/bisheng/workflow/nodes/rag/rag.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/backend/bisheng/workflow/nodes/rag/rag.py b/src/backend/bisheng/workflow/nodes/rag/rag.py
index e98f35791..4fdd9df6f 100644
--- a/src/backend/bisheng/workflow/nodes/rag/rag.py
+++ b/src/backend/bisheng/workflow/nodes/rag/rag.py
@@ -193,8 +193,6 @@ class RagNode(BaseNode):
         self._qa_prompt = ChatPromptTemplate.from_messages(messages_general)
 
     def init_milvus(self):
-        if self._milvus:
-            return
         if self._knowledge_type == 'knowledge':
             node_type = 'MilvusWithPermissionCheck'
             params = {
@@ -228,8 +226,6 @@ class RagNode(BaseNode):
         self._milvus = instantiate_vectorstore(node_type, class_object=class_obj, params=params)
 
     def init_es(self):
-        if self._es:
-            return
         if self._knowledge_type == 'knowledge':
             node_type = 'ElasticsearchWithPermissionCheck'
             params = {

From dc2917e828e23844148bc62af9185d4443bd277f Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Wed, 7 May 2025 19:51:48 +0800
Subject: [PATCH 114/186] feat: MultArgsSchemaTool upgrade error

---
 src/bisheng-langchain/bisheng_langchain/rag/bisheng_rag_tool.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bisheng-langchain/bisheng_langchain/rag/bisheng_rag_tool.py b/src/bisheng-langchain/bisheng_langchain/rag/bisheng_rag_tool.py
index b379da31d..8fdf7c15d 100644
--- a/src/bisheng-langchain/bisheng_langchain/rag/bisheng_rag_tool.py
+++ b/src/bisheng-langchain/bisheng_langchain/rag/bisheng_rag_tool.py
@@ -24,7 +24,7 @@ from loguru import logger
 
 class MultArgsSchemaTool(Tool):
 
-    def _to_args_and_kwargs(self, tool_input: Union[str, Dict]) -> Tuple[Tuple, Dict]:
+    def _to_args_and_kwargs(self, tool_input: Union[str, Dict], tool_call_id: Optional[str]) -> Tuple[Tuple, Dict]:
         # For backwards compatibility, if run_input is a string,
         # pass as a positional argument.
         if isinstance(tool_input, str):

From ff9fb4f51209c3abd18c4a58091bf646f4b30560 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Wed, 7 May 2025 20:00:57 +0800
Subject: [PATCH 115/186] fix: workflow rag node init milvus every time,
 because upload file may be change

---
 src/backend/bisheng/api/services/workstation.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/backend/bisheng/api/services/workstation.py b/src/backend/bisheng/api/services/workstation.py
index aa2a217e1..e6916f797 100644
--- a/src/backend/bisheng/api/services/workstation.py
+++ b/src/backend/bisheng/api/services/workstation.py
@@ -153,6 +153,13 @@ class WorkstationMessage(BaseModel):
     error: Optional[bool] = False
     unfinished: Optional[bool] = False
 
+    @field_validator('messageId', mode='before')
+    @classmethod
+    def convert_message_id(cls, value: Any) -> str:
+        if isinstance(value, str):
+            return value
+        return str(value)
+
     @classmethod
     def from_chat_message(cls, message: ChatMessage):
         files = json.loads(message.files) if message.files else []

From d57fc7d3ca54c7596bf61778594403bf2214cd13 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Thu, 8 May 2025 15:15:08 +0800
Subject: [PATCH 116/186] fix: change human message content when no use
 multimodel

---
 src/backend/bisheng/api/services/workstation.py | 7 +++++++
 src/backend/bisheng/workflow/nodes/base.py      | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/src/backend/bisheng/api/services/workstation.py b/src/backend/bisheng/api/services/workstation.py
index e6916f797..b254023fa 100644
--- a/src/backend/bisheng/api/services/workstation.py
+++ b/src/backend/bisheng/api/services/workstation.py
@@ -160,6 +160,13 @@ class WorkstationMessage(BaseModel):
             return value
         return str(value)
 
+    @field_validator('parentMessageId', mode='before')
+    @classmethod
+    def convert_parent_message_id(cls, value: Any) -> str:
+        if isinstance(value, str):
+            return value
+        return str(value)
+
     @classmethod
     def from_chat_message(cls, message: ChatMessage):
         files = json.loads(message.files) if message.files else []
diff --git a/src/backend/bisheng/workflow/nodes/base.py b/src/backend/bisheng/workflow/nodes/base.py
index 2c0e26e30..d8accc14c 100644
--- a/src/backend/bisheng/workflow/nodes/base.py
+++ b/src/backend/bisheng/workflow/nodes/base.py
@@ -155,6 +155,8 @@ class BaseNode(ABC):
 
     def contact_file_into_prompt(self, human_message: HumanMessage, variable_list: List[str]) -> HumanMessage:
         if not variable_list:
+            if isinstance(human_message.content, list):
+                human_message.content = human_message.content[0].get('text')
             return human_message
         for image_variable in variable_list:
             image_value = self.get_other_node_variable(image_variable)

From 3be139c3536c4f99bada26ec079eb940b8d12a25 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Thu, 8 May 2025 15:17:11 +0800
Subject: [PATCH 117/186] fix: agent node init every time because tmp file may
 be change

---
 src/backend/bisheng/workflow/nodes/agent/agent.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/backend/bisheng/workflow/nodes/agent/agent.py b/src/backend/bisheng/workflow/nodes/agent/agent.py
index 28d04f2aa..e350a2860 100644
--- a/src/backend/bisheng/workflow/nodes/agent/agent.py
+++ b/src/backend/bisheng/workflow/nodes/agent/agent.py
@@ -80,8 +80,6 @@ class AgentNode(BaseNode):
         self._agent = None
 
     def _init_agent(self, system_prompt: str):
-        if self._agent:
-            return
         # 获取配置的助手模型列表
         assistant_llm = LLMService.get_assistant_llm()
         if not assistant_llm.llm_list:

From 4f572fd57f41405e6e540f5cc1268429740c200a Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Thu, 8 May 2025 15:28:03 +0800
Subject: [PATCH 118/186] fix: input node form file max size error

---
 src/backend/bisheng/workflow/nodes/input/input.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backend/bisheng/workflow/nodes/input/input.py b/src/backend/bisheng/workflow/nodes/input/input.py
index 25faee72b..9ff2aa2f9 100644
--- a/src/backend/bisheng/workflow/nodes/input/input.py
+++ b/src/backend/bisheng/workflow/nodes/input/input.py
@@ -206,7 +206,7 @@ class InputNode(BaseNode):
 
             if file_content_length < file_content_max_size:
                 file_content = "\n".join(texts)
-                file_content = file_content[:self._dialog_files_length - file_content_length]
+                file_content = file_content[:file_content_max_size - file_content_length]
                 file_content_length += len(file_content)
                 all_file_content += f"[file name]: {file_name}\n[file content begin]\n{file_content}\n[file content end]\n"
 

From 671adf763cd4baa096bbe23cdf450d7d822f8dff Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Thu, 8 May 2025 16:42:25 +0800
Subject: [PATCH 119/186] fix: volcengine use openai sdk

---
 src/backend/bisheng/interface/custom_lists.py |  3 +--
 src/backend/bisheng/interface/llms/custom.py  | 14 ++++----------
 src/backend/pyproject.toml                    |  1 -
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/backend/bisheng/interface/custom_lists.py b/src/backend/bisheng/interface/custom_lists.py
index e5043e3de..9d19346c5 100644
--- a/src/backend/bisheng/interface/custom_lists.py
+++ b/src/backend/bisheng/interface/custom_lists.py
@@ -5,7 +5,7 @@ from langchain import llms, memory, text_splitter
 from langchain_anthropic import ChatAnthropic
 from langchain_community import agent_toolkits, document_loaders, embeddings
 from langchain_community.chat_models import ChatVertexAI, MiniMaxChat, ChatTongyi, QianfanChatEndpoint, ChatZhipuAI, \
-    ChatHunyuan, MoonshotChat, VolcEngineMaasChat
+    ChatHunyuan, MoonshotChat
 from langchain_community.utilities import requests
 from langchain_deepseek import ChatDeepSeek
 from langchain_ollama import ChatOllama
@@ -41,7 +41,6 @@ llm_type_to_cls_dict['ChatZhipuAI'] = ChatZhipuAI
 llm_type_to_cls_dict['ChatDeepSeek'] = ChatDeepSeek
 llm_type_to_cls_dict['ChatHunyuan'] = ChatHunyuan
 llm_type_to_cls_dict['MoonshotChat'] = MoonshotChat
-llm_type_to_cls_dict['VolcEngineMaasChat'] = VolcEngineMaasChat
 
 # llm contribute
 llm_type_to_cls_dict.update({
diff --git a/src/backend/bisheng/interface/llms/custom.py b/src/backend/bisheng/interface/llms/custom.py
index 2f312a28a..558057c65 100644
--- a/src/backend/bisheng/interface/llms/custom.py
+++ b/src/backend/bisheng/interface/llms/custom.py
@@ -19,7 +19,8 @@ from bisheng.interface.utils import wrapper_bisheng_model_limit_check, wrapper_b
 
 def _get_ollama_params(params: dict, server_config: dict, model_config: dict) -> dict:
     params['base_url'] = server_config.get('base_url', '')
-    params['extract_reasoning'] = True
+    # some bugs
+    params['extract_reasoning'] = False
     params['stream'] = params.pop('streaming', True)
     if params.get('max_tokens'):
         params['num_ctx'] = params.pop('max_tokens', None)
@@ -43,7 +44,7 @@ def _get_openai_params(params: dict, server_config: dict, model_config: dict) ->
     if server_config:
         params.update({
             'api_key': server_config.get('openai_api_key') or server_config.get('api_key'),
-            'base_url': server_config.get('openai_api_base')
+            'base_url': server_config.get('openai_api_base') or server_config.get('base_url'),
         })
     if server_config.get('openai_proxy'):
         params['openai_proxy'] = server_config.get('openai_proxy')
@@ -112,13 +113,6 @@ def _get_tencent_params(params: dict, server_config: dict, model_config: dict) -
     params['extra_body'] = {'enable_enhancement': model_config.get('enable_web_search', False)}
     return params
 
-def _get_volcengine_params(params: dict, server_config: dict, model_config: dict) -> dict:
-    params.update({
-        'volc_engine_maas_ak': server_config.get('volc_engine_maas_ak'),
-        'volc_engine_maas_sk': server_config.get('volc_engine_maas_sk'),
-    })
-    return params
-
 _llm_node_type: Dict = {
     # 开源推理框架
     LLMServerType.OLLAMA.value: {'client': 'ChatOllama', 'params_handler': _get_ollama_params},
@@ -139,7 +133,7 @@ _llm_node_type: Dict = {
     LLMServerType.SPARK.value: {'client': 'ChatSparkOpenAI', 'params_handler': _get_spark_params},
     LLMServerType.TENCENT.value: {'client': 'ChatHunyuan', 'params_handler': _get_tencent_params},
     LLMServerType.MOONSHOT.value: {'client': 'MoonshotChat', 'params_handler': _get_openai_params},
-    LLMServerType.VOLCENGINE.value: {'client': 'VolcEngineMaasChat', 'params_handler': _get_volcengine_params},
+    LLMServerType.VOLCENGINE.value: {'client': 'ChatSparkOpenAI', 'params_handler': _get_openai_params},
     LLMServerType.SILICON.value: {'client': 'ChatOpenAI', 'params_handler': _get_openai_params},
 }
 
diff --git a/src/backend/pyproject.toml b/src/backend/pyproject.toml
index 8bef0dbe7..5b0ca87f5 100644
--- a/src/backend/pyproject.toml
+++ b/src/backend/pyproject.toml
@@ -99,7 +99,6 @@ blobfile = "^3.0.0"
 mcp = "^1.6.0"
 numpy = "^1.26.2"
 pyjwt = "^1.7.1"
-volcengine = "^1.0.183"
 tencentcloud-sdk-python = "^3.0.1373"
 
 [tool.poetry.dev-dependencies]

From d410b39eadbd50035acd599316d38c286992498c Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Thu, 8 May 2025 17:43:14 +0800
Subject: [PATCH 120/186] fix: xinference llm use openai sdk update llm info
 test model status

---
 src/backend/bisheng/api/services/llm.py       | 47 +++++++++++++------
 src/backend/bisheng/interface/custom_lists.py |  2 -
 src/backend/bisheng/interface/llms/custom.py  | 13 ++---
 src/backend/pyproject.toml                    |  1 -
 4 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/src/backend/bisheng/api/services/llm.py b/src/backend/bisheng/api/services/llm.py
index 7c129be51..11a438009 100644
--- a/src/backend/bisheng/api/services/llm.py
+++ b/src/backend/bisheng/api/services/llm.py
@@ -1,6 +1,11 @@
 import json
 from typing import List, Optional
 
+from fastapi import Request
+from langchain_core.embeddings import Embeddings
+from langchain_core.language_models import BaseChatModel
+from loguru import logger
+
 from bisheng.api.errcode.base import NotFoundError
 from bisheng.api.errcode.llm import ServerExistError, ModelNameRepeatError, ServerAddError, ServerAddAllError
 from bisheng.api.services.user_service import UserPayload
@@ -10,10 +15,6 @@ from bisheng.database.models.config import ConfigDao, ConfigKeyEnum, Config
 from bisheng.database.models.llm_server import LLMDao, LLMServer, LLMModel, LLMModelType
 from bisheng.interface.importing import import_by_type
 from bisheng.interface.initialize.loading import instantiate_llm, instantiate_embedding
-from fastapi import Request
-from langchain_core.embeddings import Embeddings
-from langchain_core.language_models import BaseChatModel
-from loguru import logger
 
 
 class LLMService:
@@ -116,15 +117,7 @@ class LLMService:
         handle_types = []
         for one in server.models:
             # test model status
-            try:
-                if one.model_type == LLMModelType.LLM.value:
-                    bisheng_model = cls.get_bisheng_llm(model_id=one.id, ignore_online=True, cache=False)
-                    bisheng_model.invoke('hello')
-                elif one.model_type == LLMModelType.EMBEDDING.value:
-                    bisheng_embed = cls.get_bisheng_embedding(model_id=one.id, ignore_online=True, cache=False)
-                    bisheng_embed.embed_query('hello')
-            except Exception as e:
-                logger.exception('test model status')
+            cls.test_model_status(one)
             if one.model_type in handle_types:
                 continue
             handle_types.append(one.model_type)
@@ -134,6 +127,18 @@ class LLMService:
                 cls.set_default_model(request, login_user, model_info)
         return True
 
+    @classmethod
+    def test_model_status(cls, model: LLMModel | LLMModelInfo):
+        try:
+            if model.model_type == LLMModelType.LLM.value:
+                bisheng_model = cls.get_bisheng_llm(model_id=model.id, ignore_online=True, cache=False)
+                bisheng_model.invoke('hello')
+            elif model.model_type == LLMModelType.EMBEDDING.value:
+                bisheng_embed = cls.get_bisheng_embedding(model_id=model.id, ignore_online=True, cache=False)
+                bisheng_embed.embed_query('hello')
+        except Exception as e:
+            logger.exception(f'test model status: {model.id} {model.model_name}')
+
     @classmethod
     def set_default_model(cls, request: Request, login_user: UserPayload, model: LLMModel):
         """ 设置默认的模型配置 """
@@ -186,6 +191,11 @@ class LLMService:
         exist_server = LLMDao.get_server_by_id(server.id)
         if not exist_server:
             raise NotFoundError.http_exception()
+
+        old_models = LLMDao.get_model_by_server_ids([exist_server.id])
+        old_model_dict = {
+            one.id: one for one in old_models
+        }
         if exist_server.name != server.name:
             # 改名的话判断下是否已经存在
             name_server = LLMDao.get_server_by_name(server.name)
@@ -195,7 +205,7 @@ class LLMService:
         model_dict = {}
         for one in server.models:
             if one.model_name not in model_dict:
-                model_dict[one.model_name] = LLMModel(**one.dict())
+                model_dict[one.model_name] = LLMModel(**one.model_dump())
                 # 说明是新增模型
                 if not one.id:
                     model_dict[one.model_name].user_id = login_user.user_id
@@ -211,8 +221,15 @@ class LLMService:
         exist_server.config = server.config
 
         db_server = LLMDao.update_server_with_models(exist_server, list(model_dict.values()))
+        new_server_info = cls.get_one_llm(request, login_user, db_server.id)
 
-        return cls.get_one_llm(request, login_user, db_server.id)
+        # 判断是否需要重新判断模型状态
+        for one in new_server_info.models:
+            # 新增的模型，或者模型名字或者类型发生了变化
+            if (one.id not in old_model_dict or old_model_dict[one.id].model_name != one.model_name
+                    or old_model_dict[one.id].model_type != one.model_type):
+                cls.test_model_status(one)
+        return new_server_info
 
     @classmethod
     def update_model_online(cls, request: Request, login_user: UserPayload, model_id: int,
diff --git a/src/backend/bisheng/interface/custom_lists.py b/src/backend/bisheng/interface/custom_lists.py
index 9d19346c5..4c9bd865a 100644
--- a/src/backend/bisheng/interface/custom_lists.py
+++ b/src/backend/bisheng/interface/custom_lists.py
@@ -10,7 +10,6 @@ from langchain_community.utilities import requests
 from langchain_deepseek import ChatDeepSeek
 from langchain_ollama import ChatOllama
 from langchain_openai import AzureChatOpenAI, ChatOpenAI, OpenAIEmbeddings, AzureOpenAIEmbeddings, OpenAI
-from langchain_xinference import ChatXinference
 
 from bisheng_langchain import chat_models
 from bisheng_langchain import document_loaders as contribute_loader
@@ -36,7 +35,6 @@ llm_type_to_cls_dict['ChatOllama'] = ChatOllama
 llm_type_to_cls_dict['ChatTongyi'] = ChatTongyi
 llm_type_to_cls_dict['QianfanChatEndpoint'] = QianfanChatEndpoint
 llm_type_to_cls_dict["OpenAI"] = OpenAI
-llm_type_to_cls_dict['ChatXinference'] = ChatXinference
 llm_type_to_cls_dict['ChatZhipuAI'] = ChatZhipuAI
 llm_type_to_cls_dict['ChatDeepSeek'] = ChatDeepSeek
 llm_type_to_cls_dict['ChatHunyuan'] = ChatHunyuan
diff --git a/src/backend/bisheng/interface/llms/custom.py b/src/backend/bisheng/interface/llms/custom.py
index 558057c65..1b7f96644 100644
--- a/src/backend/bisheng/interface/llms/custom.py
+++ b/src/backend/bisheng/interface/llms/custom.py
@@ -28,13 +28,10 @@ def _get_ollama_params(params: dict, server_config: dict, model_config: dict) ->
 
 
 def _get_xinference_params(params: dict, server_config: dict, model_config: dict) -> dict:
-    params['stream'] = params.pop('streaming', True)
-    new_params = {
-        'server_url': server_config.get('openai_api_base', '').replace('/v1', ''),  # replace old config
-        'model_uid': params.pop('model_name', ''),
-        'model_kwargs': params
-    }
-    return new_params
+    params = _get_openai_params(params, server_config, model_config)
+    if not params.get('api_key', None):
+        params['api_key'] = 'Empty'
+    return params
 
 def _get_bisheng_rt_params(params: dict, server_config: dict, model_config: dict) -> dict:
     params.update(server_config)
@@ -116,7 +113,7 @@ def _get_tencent_params(params: dict, server_config: dict, model_config: dict) -
 _llm_node_type: Dict = {
     # 开源推理框架
     LLMServerType.OLLAMA.value: {'client': 'ChatOllama', 'params_handler': _get_ollama_params},
-    LLMServerType.XINFERENCE.value: {'client':' ChatXinference', 'params_handler': _get_xinference_params},
+    LLMServerType.XINFERENCE.value: {'client':'ChatOpenAI', 'params_handler': _get_xinference_params},
     LLMServerType.LLAMACPP.value: {'client': 'ChatOpenAI', 'params_handler': _get_openai_params},  # 此组件是加载本地的模型文件，待确认是否有api服务提供
     LLMServerType.VLLM.value: {'client': 'ChatOpenAI', 'params_handler': _get_openai_params},
     LLMServerType.BISHENG_RT.value: {'client': 'HostChatGLM', 'params_handler': _get_bisheng_rt_params},
diff --git a/src/backend/pyproject.toml b/src/backend/pyproject.toml
index 5b0ca87f5..96af0f0cb 100644
--- a/src/backend/pyproject.toml
+++ b/src/backend/pyproject.toml
@@ -28,7 +28,6 @@ langchain_openai = "^0.3.12"
 langchain-ollama = "^0.3.0"
 langchain-google-genai = "^2.1.0"
 langchain-anthropic = "^0.3.10"
-langchain-xinference = "^0.1.0"
 langchain-deepseek = "^0.1.3"
 langgraph = "^0.3.27"
 openai = "^1.68.2"

From 60eb28a7fe99f38416fe5fd6914c2b56c2f88328 Mon Sep 17 00:00:00 2001
From: dolphin <shanghang@dataelem.com>
Date: Thu, 8 May 2025 22:02:07 +0800
Subject: [PATCH 121/186] fix: some bugfix

---
 .../src/components/bs-ui/select/cascader.tsx  | 33 ++++++-----
 .../components/inputFileComponent/index.tsx   | 53 ++++++++++++------
 .../platform/src/contexts/tabsContext.tsx     |  5 +-
 .../platform/src/controllers/API/workflow.ts  |  2 +-
 .../BuildPage/bench/IconUploadSection.tsx     |  4 +-
 .../src/pages/BuildPage/bench/index.tsx       | 16 +++---
 .../BuildPage/flow/FlowChat/ChatInput.tsx     | 21 ++++---
 .../BuildPage/flow/FlowChat/InputForm.tsx     |  5 +-
 .../BuildPage/flow/FlowNode/Parameter.tsx     |  4 +-
 .../pages/BuildPage/flow/FlowNode/RunLog.tsx  |  5 ++
 .../pages/BuildPage/flow/FlowNode/RunTest.tsx |  4 +-
 .../FlowNode/component/ImagePromptItem.tsx    |  3 +-
 .../flow/FlowNode/component/InputFormItem.tsx | 55 ++++++++++++++++---
 .../flow/FlowNode/component/InputItem.tsx     |  9 ++-
 .../flow/FlowNode/component/ModelItem.tsx     |  2 +-
 .../flow/FlowNode/component/OutputItem.tsx    | 10 ++--
 .../flow/FlowNode/component/SelectVar.tsx     | 17 +++---
 .../pages/BuildPage/flow/FlowNode/index.tsx   |  4 +-
 .../src/pages/BuildPage/flow/Header.tsx       | 37 +++++++++----
 .../src/pages/BuildPage/flow/Panne.tsx        |  9 ++-
 .../src/pages/BuildPage/flow/flowStore.ts     | 29 +---------
 .../src/pages/BuildPage/skills/l2Edit.tsx     |  5 +-
 .../pages/ChatAppPage/components/ChatHome.tsx |  2 +
 .../components/ParagraphEdit.tsx              |  8 ++-
 .../src/pages/ModelPage/manage/CustomForm.tsx | 24 +++++---
 .../pages/ModelPage/manage/ModelConfig.tsx    |  8 +--
 .../platform/src/util/flowCompatible.ts       | 11 ++++
 src/frontend/platform/src/util/flowUtils.ts   | 32 ++++++++++-
 28 files changed, 274 insertions(+), 143 deletions(-)

diff --git a/src/frontend/platform/src/components/bs-ui/select/cascader.tsx b/src/frontend/platform/src/components/bs-ui/select/cascader.tsx
index 9541c5d09..361ab317b 100644
--- a/src/frontend/platform/src/components/bs-ui/select/cascader.tsx
+++ b/src/frontend/platform/src/components/bs-ui/select/cascader.tsx
@@ -104,7 +104,7 @@ export default function Cascader({ error = false, selectClass = '', close = fals
     const [cols, setCols] = useState(() => resetCols(defaultValue, options))
 
 
-    const selectOptionsRef = useRef(defaultValue)
+    const selectOptionsRef = useRef([...defaultValue])
     const handleHover = (option, isLeaf, colIndex) => {
         setIsHover(true)
         // // setValues([]) // 从新选择清空值
@@ -167,20 +167,23 @@ export default function Cascader({ error = false, selectClass = '', close = fals
             {/* <SelectValue placeholder={selectPlaceholder} >123</SelectValue> */}
         </SelectTrigger>
         <SelectContent auto>
-            <div className="flex ">
-                {
-                    cols.map((_options, index) => {
-                        return <Col
-                            isAsync={loadData}
-                            value={isHover ? '' : values[index]?.value || ''}
-                            options={_options}
-                            onHover={(op, isLeaf) => handleHover(op, isLeaf, index)}
-                            onClick={handleClick}
-                            key={index}
-                        />
-                    })
-                }
-            </div>
+            {cols.length
+                ? <div className="flex ">
+                    {
+                        cols.map((_options, index) => {
+                            return <Col
+                                isAsync={loadData}
+                                value={isHover ? '' : values[index]?.value || ''}
+                                options={_options}
+                                onHover={(op, isLeaf) => handleHover(op, isLeaf, index)}
+                                onClick={handleClick}
+                                key={index}
+                            />
+                        })
+                    }
+                </div>
+                : <div className="w-full flex justify-center items-center bisheng-label">空</div>
+            }
         </SelectContent>
     </Select>
 };
diff --git a/src/frontend/platform/src/components/inputFileComponent/index.tsx b/src/frontend/platform/src/components/inputFileComponent/index.tsx
index 8adc159ee..86ca4a602 100644
--- a/src/frontend/platform/src/components/inputFileComponent/index.tsx
+++ b/src/frontend/platform/src/components/inputFileComponent/index.tsx
@@ -1,3 +1,4 @@
+import { locationContext } from "@/contexts/locationContext";
 import { FileSearch2 } from "lucide-react";
 import { useContext, useEffect, useState } from "react";
 import { alertContext } from "../../contexts/alertContext";
@@ -8,7 +9,6 @@ import { FileComponentType } from "../../types/components";
 import { LoadIcon } from "../bs-icons/loading";
 import { Button } from "../bs-ui/button";
 import { useToast } from "../bs-ui/toast/use-toast";
-import { locationContext } from "@/contexts/locationContext";
 
 export default function InputFileComponent({
   value,
@@ -52,13 +52,9 @@ export default function InputFileComponent({
   const checkFileSize = (file) => {
     const maxSize = (appConfig.uploadFileMaxSize || 50) * 1024 * 1024;
     if (file.size > maxSize) {
-      toast({
-        variant: 'error',
-        description: `上传文件大小不能超过 ${appConfig.uploadFileMaxSize} MB`
-      })
-      setLoading(false);
-      return true
+      return `文件：${file.name} 超过 ${appConfig.uploadFileMaxSize} MB，已移除`
     }
+    return ''
   }
 
   const handleButtonClick = () => {
@@ -76,7 +72,14 @@ export default function InputFileComponent({
       // Get the selected file
       const file = (e.target as HTMLInputElement).files?.[0];
 
-      if (checkFileSize(file)) return
+      const errorMsg = checkFileSize(file)
+      if (errorMsg) {
+        toast({
+          variant: 'error',
+          description: errorMsg
+        })
+        return setLoading(false);
+      }
       // Check if the file type is correct
       // if (file && checkFileType(file.name)) {
       // Upload the file
@@ -136,15 +139,31 @@ export default function InputFileComponent({
       setLoading(true);
 
       // Get the selected files
-      const files = (e.target as HTMLInputElement).files;
+      const _files = (e.target as HTMLInputElement).files;
 
-      if (files && files.length > 0) {
-        const fileNames = Array.from(files).map(file => file.name); // Extract file names
+      if (_files && _files.length > 0) {
         const filePaths = []; // This will hold the file paths after successful upload
-        for (let i = 0; i < files.length; i++) {
-          if (checkFileSize(files[i])) return
+
+        const errorMsgs = []
+        const files = []
+        for (let i = 0; i < _files.length; i++) {
+          const errorMsg = checkFileSize(_files[i])
+          errorMsg ? errorMsgs.push(errorMsg) : files.push(_files[i])
         }
 
+        if (errorMsgs.length) {
+          toast({
+            variant: 'error',
+            description: errorMsgs
+          })
+          // 文件都不符合要求 结束上传
+          if (errorMsgs.length === _files.length) {
+            return setLoading(false);
+          }
+        }
+
+        const fileNames = Array.from(files).map(file => file.name); // Extract file names
+
         // Perform the upload for each file
         const uploadPromises = Array.from(files).map(file => {
           return isSSO
@@ -159,19 +178,17 @@ export default function InputFileComponent({
                   setLoading(false);
                   throw new Error(res); // Exit the upload if error occurs
                 }
-                const { file_path } = res;
-                filePaths.push(file_path); // Store file paths
+                return res.file_path
               })
             : uploadFile(file, flow.id).then((data) => {
               console.log("File uploaded successfully");
-              const { file_path } = data;
-              filePaths.push(file_path); // Store file paths
+              return data.file_path
             });
         });
 
         // Wait for all file uploads to finish
         Promise.all(uploadPromises)
-          .then(() => {
+          .then((filePaths) => {
             // After all files are uploaded successfully, update the state
             setMyValue(fileNames.join(",")); // Join file names with commas
             onChange(fileNames); // Pass an array of file names
diff --git a/src/frontend/platform/src/contexts/tabsContext.tsx b/src/frontend/platform/src/contexts/tabsContext.tsx
index 903546c62..3711f3a95 100644
--- a/src/frontend/platform/src/contexts/tabsContext.tsx
+++ b/src/frontend/platform/src/contexts/tabsContext.tsx
@@ -49,10 +49,11 @@ export function TabsProvider({ children }: { children: ReactNode }) {
 
   async function saveFlow(flow: FlowType) {
     // save api
-    const newFlow = await captureAndAlertRequestErrorHoc(updateFlowApi(flow))
+    const {data, ...info} = flow
+    const newFlow = await captureAndAlertRequestErrorHoc(updateFlowApi(info))
     if (!newFlow) return null;
     console.log('action :>> ', 'save');
-    setFlow(newFlow)
+    setFlow((flow) => ({...newFlow, data: flow.data}))
     setTabsState((prev) => {
       return {
         ...prev,
diff --git a/src/frontend/platform/src/controllers/API/workflow.ts b/src/frontend/platform/src/controllers/API/workflow.ts
index 86c2b810f..0b19f5ecb 100644
--- a/src/frontend/platform/src/controllers/API/workflow.ts
+++ b/src/frontend/platform/src/controllers/API/workflow.ts
@@ -425,7 +425,7 @@ const workflowTemplate = [
                         "type": "agent_model",
                         "required": true,
                         "value": "",
-                        "placeholder": "请在模型管理-系统模型设置中配置助手推理模型"
+                        "placeholder": "请在系统模型设置中配置助手推理模型"
                     },
                     {
                         "key": "temperature",
diff --git a/src/frontend/platform/src/pages/BuildPage/bench/IconUploadSection.tsx b/src/frontend/platform/src/pages/BuildPage/bench/IconUploadSection.tsx
index 40af1ebdb..c0bc3f7da 100644
--- a/src/frontend/platform/src/pages/BuildPage/bench/IconUploadSection.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/bench/IconUploadSection.tsx
@@ -18,7 +18,7 @@ export const IconUploadSection = ({
     enabled: boolean;
     image: string;
     onToggle: (enabled: boolean) => void;
-    onUpload: (url: string) => void;
+    onUpload: (url: string, relative_path?: string) => void;
 }) => {
 
     const { toast } = useToast();
@@ -34,7 +34,7 @@ export const IconUploadSection = ({
                 // 压缩后的文件（result 是 Blob 类型）
                 const compressedFile = new File([result], file.name, { type: result.type });
                 uploadFileWithProgress(compressedFile, (progress) => { }, 'icon', '').then(res => {
-                    onUpload(res.file_path)
+                    onUpload(res.file_path, res.relative_path)
                 });
             },
             error(err) {
diff --git a/src/frontend/platform/src/pages/BuildPage/bench/index.tsx b/src/frontend/platform/src/pages/BuildPage/bench/index.tsx
index 657d85b77..b77224c15 100644
--- a/src/frontend/platform/src/pages/BuildPage/bench/index.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/bench/index.tsx
@@ -33,10 +33,12 @@ export interface ChatConfigForm {
     sidebarIcon: {
         enabled: boolean;
         image: string;
+        relative_path: string;
     };
     assistantIcon: {
         enabled: boolean;
         image: string;
+        relative_path: string;
     };
     sidebarSlogan: string;
     welcomeMessage: string;
@@ -83,11 +85,11 @@ export default function index() {
             navigate('/build/apps')
         }
     }, [user])
-    
-    const uploadAvator = (fileUrl: string, type: 'sidebar' | 'assistant') => {
+
+    const uploadAvator = (fileUrl: string, type: 'sidebar' | 'assistant', relativePath?: string) => {
         setFormData(prev => ({
             ...prev,
-            [`${type}Icon`]: { ...prev[`${type}Icon`], image: fileUrl }
+            [`${type}Icon`]: { ...prev[`${type}Icon`], image: fileUrl, relative_path: relativePath }
         }));
     };
 
@@ -128,14 +130,14 @@ export default function index() {
                                 enabled={formData.sidebarIcon.enabled}
                                 image={formData.sidebarIcon.image}
                                 onToggle={(enabled) => toggleFeature('sidebarIcon', enabled)}
-                                onUpload={(fileUrl) => uploadAvator(fileUrl, 'sidebar')}
+                                onUpload={(fileUrl, relativePath) => uploadAvator(fileUrl, 'sidebar', relativePath)}
                             />
                             <IconUploadSection
                                 label="欢迎页面图标&对话头像"
                                 enabled={formData.assistantIcon.enabled}
                                 image={formData.assistantIcon.image}
                                 onToggle={(enabled) => toggleFeature('assistantIcon', enabled)}
-                                onUpload={(fileUrl) => uploadAvator(fileUrl, 'assistant')}
+                                onUpload={(fileUrl, relativePath) => uploadAvator(fileUrl, 'assistant', relativePath)}
                             />
                         </div>
 
@@ -297,8 +299,8 @@ export default function index() {
 const useChatConfig = () => {
     const [formData, setFormData] = useState<ChatConfigForm>({
         menuShow: true,
-        sidebarIcon: { enabled: true, image: '' },
-        assistantIcon: { enabled: true, image: '' },
+        sidebarIcon: { enabled: true, image: '', relative_path: '' },
+        assistantIcon: { enabled: true, image: '', relative_path: '' },
         sidebarSlogan: '',
         welcomeMessage: '',
         functionDescription: '',
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatInput.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatInput.tsx
index 4676b12af..48edcc6a3 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatInput.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatInput.tsx
@@ -15,7 +15,7 @@ import GuideQuestions from "./GuideQuestions";
 import { useMessageStore } from "./messageStore";
 import Tip from "@/components/bs-ui/tooltip/tip";
 
-const FileTypes = {
+export const FileTypes = {
     IMAGE: ['.PNG', '.JPEG', '.JPG', '.BMP'],
     FILE: ['.PDF', '.TXT', '.MD', '.HTML', '.XLS', '.XLSX', '.DOC', '.DOCX', '.PPT', '.PPTX'],
 }
@@ -182,14 +182,15 @@ export default function ChatInput({ autoRun, clear, form, wsUrl, onBeforSend, on
                 };
                 ws.onmessage = (event) => {
                     const data = JSON.parse(event.data);
-                    console.log('result message data :>> ', data);
 
                     if (data.type === 'begin') {
                         setStop({ show: true, disable: false })
-                    } else if (data.type === 'close' && !reRunStateRef.current) {
-                        // 重试时阻止关闭stop
+                    } else if (data.type === 'close') {
+                        if (!reRunStateRef.current) {
+                            // 重试时阻止关闭stop
+                            setStop({ show: false, disable: false })
+                        }
                         reRunStateRef.current = false
-                        setStop({ show: false, disable: false })
                     }
 
                     // const errorMsg = data.category === 'error' ? data.intermediate_steps : ''
@@ -432,7 +433,9 @@ export default function ChatInput({ autoRun, clear, form, wsUrl, onBeforSend, on
         //         sendWsMsg(onBeforSend('init_data', {}))
         //     })
         // }, 300);
-        reRunStateRef.current = true
+        if (stop.show) {
+            reRunStateRef.current = true
+        }
     }
 
     const placholder = useMemo(() => {
@@ -456,7 +459,7 @@ export default function ChatInput({ autoRun, clear, form, wsUrl, onBeforSend, on
             />
             {/* restart */}
             <div className="flex absolute left-0 top-3 z-10">
-                <Tip content={"重新运行"}>
+                <Tip side='right' content={"重新运行"}>
                     <Button className="rounded-full" disabled={restarted} variant="ghost" size="icon" onClick={handleRestartClick}><RefreshCw size={18} /></Button>
                 </Tip>
             </div>
@@ -481,9 +484,9 @@ export default function ChatInput({ autoRun, clear, form, wsUrl, onBeforSend, on
                 </div>
             </div>
             {/* stop & 重置 */}
-            <div className="absolute w-full flex justify-center bottom-20">
+            <div className="absolute w-full flex justify-center bottom-16">
                 {!stop.show && <Button
-                    className="rounded-full"
+                    className="rounded-full bg-[#fff] dark:bg-[#1B1B1B]"
                     variant="outline"
                     disabled={restarted}
                     onClick={handleRestartClick}>
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/InputForm.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/InputForm.tsx
index 04f7bc7f7..3d4c06481 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/InputForm.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/InputForm.tsx
@@ -7,6 +7,7 @@ import InputFileComponent from "@/components/inputFileComponent";
 import { WorkflowNodeParam } from "@/types/flow";
 import { useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
+import { FileTypes } from "./ChatInput";
 
 const enum FormItemType {
     Text = 'text',
@@ -133,8 +134,8 @@ const InputForm = ({ data }: { data: WorkflowNodeParam }) => {
                                                     value={''}
                                                     multiple={item.multiple}
                                                     onChange={(name) => updataFileName(item, name)}
-                                                    fileTypes={["png", "jpg", "jpeg", "doc", "docx", "ppt", "pptx", "xls", "xlsx", "txt", "md", "html", "pdf"]}
-                                                    suffixes={['xxx']}
+                                                    // fileTypes={FileTypes[item.file_type.toUpperCase()]}
+                                                    suffixes={FileTypes[item.file_type.toUpperCase()]}
                                                     onFileChange={(val) => handleChange(item, val)}
                                                 />
                                             )
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/Parameter.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/Parameter.tsx
index 5a97a9496..b4b2d0e11 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/Parameter.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/Parameter.tsx
@@ -65,13 +65,13 @@ export default function Parameter({ node, nodeId, item, onOutPutChange, onStatus
         case 'chat_history_num':
             return <HistoryNumItem data={item} onChange={handleOnNewValue} />
         case 'form':
-            return <InputFormItem nodeId={nodeId} data={item} onChange={handleOnNewValue} onValidate={bindValidate} />
+            return <InputFormItem nodeId={nodeId} data={item} onChange={handleOnNewValue} onValidate={bindValidate} onVarEvent={bindVarValidate} />
         case 'var_textarea':
             return <VarTextareaItem nodeId={nodeId} data={item} onChange={handleOnNewValue} onValidate={bindValidate} onVarEvent={bindVarValidate} />
         case 'var_textarea_file':
             return <VarTextareaUploadItem nodeId={nodeId} data={item} onChange={handleOnNewValue} onValidate={bindValidate} onVarEvent={bindVarValidate} />
         case 'output_form':
-            return <OutputItem nodeId={nodeId} node={node} data={item} onChange={handleOnNewValue} onValidate={bindValidate} />
+            return <OutputItem nodeId={nodeId} node={node} data={item} onChange={handleOnNewValue} onValidate={bindValidate} onVarEvent={bindVarValidate} />
         case 'bisheng_model':
             return <ModelItem data={item} onChange={handleOnNewValue} onValidate={bindValidate} />
         case 'agent_model':
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/RunLog.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/RunLog.tsx
index c1547f6aa..f515e3032 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/RunLog.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/RunLog.tsx
@@ -42,6 +42,7 @@ export default function RunLog({ node, children }) {
                 }, new Map()); // 使用 Map 保持插入顺序
 
                 let hasKeys = [];
+                const isFormInputNode = node.type === 'input' && node.tab.value === 'form_input'
                 // 根据node params替换newData的key值 替换为name
                 node.group_params.forEach(group => {
                     group.params.forEach(param => {
@@ -64,6 +65,10 @@ export default function RunLog({ node, children }) {
                                     hasKeys.push(p.tool_key);
                                 }
                             });
+                        } else if (isFormInputNode && param.key === 'form_input') {
+                            param.value.forEach(value => {
+                                value.file_type === 'file' && newData.delete(value.image_file);
+                            })
                         }
                     });
                 });
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/RunTest.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/RunTest.tsx
index a4b532059..ce3ca149b 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/RunTest.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/RunTest.tsx
@@ -46,8 +46,8 @@ export const ResultText = ({ title, value }: { title: string, value: any }) => {
 
     return <div className="nowheel nodrag mb-2 rounded-md border bg-search-input text-sm shadow-sm" onKeyDown={e => e.stopPropagation()}>
         <div className="border-b px-2 flex justify-between items-center">
-            <p>{title}</p>
-            {copyed ? <CopyCheck size={14} /> : <Copy size={14} className="cursor-pointer" onClick={handleCopy} />}
+            <p className="truncate">{title}</p>
+            {copyed ? <CopyCheck size={14} /> : <Copy size={14} className="cursor-pointer min-w-3" onClick={handleCopy} />}
         </div>
         <textarea defaultValue={text} readOnly className="w-full min-h-28 p-2 block text-muted-foreground bg-gray-100 dark:bg-black outline-none" />
     </div>
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/ImagePromptItem.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/ImagePromptItem.tsx
index 2f20a9118..980ffe811 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/ImagePromptItem.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/ImagePromptItem.tsx
@@ -10,7 +10,7 @@ import SelectVar from "./SelectVar"
 
 export default function ImagePromptItem({ nodeId, data, onChange, onVarEvent }) {
     // value ''或[] 则认为open为false
-    const [open, setOpen] = React.useState(data.value && data.value.length > 0)
+    const [open, setOpen] = React.useState(data.open || false)
     const [value, setValue] = React.useState(() => data.value || []);
     const [error, setError] = React.useState(false);
 
@@ -73,6 +73,7 @@ export default function ImagePromptItem({ nodeId, data, onChange, onVarEvent })
             </Label>
             <Switch checked={open} onCheckedChange={(bln) => {
                 setOpen(bln)
+                data.open = bln
                 !bln && updateValue([])
             }} />
         </div>
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/InputFormItem.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/InputFormItem.tsx
index 610d9e785..8576459fc 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/InputFormItem.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/InputFormItem.tsx
@@ -4,9 +4,11 @@ import { Input } from "@/components/bs-ui/input";
 import { Label } from "@/components/bs-ui/label";
 import { Switch } from "@/components/bs-ui/switch";
 import { QuestionTooltip } from "@/components/bs-ui/tooltip";
+import { isVarInFlow } from "@/util/flowUtils";
 import { ChevronsDown, CloudUpload, Type } from "lucide-react";
 import { useEffect, useRef, useState } from "react";
 import { useTranslation } from "react-i18next"; // 引入国际化
+import useFlowStore from "../../flowStore";
 import DragOptions from "./DragOptions";
 import FileTypeSelect from "./FileTypeSelect";
 import InputItem from "./InputItem";
@@ -169,8 +171,9 @@ function Form({ nodeId, nodeData, initialData, onSubmit, onCancel, existingOptio
             } else if (formData.filecontent.length > 50) {
                 newErrors.filecontent = t("variableNameTooLong");
             } else if (
-                existingOptions?.some(opt => opt.file_content === formData.filecontent) &&
-                formData.filecontent !== oldcontentNameRef.current
+                existingOptions?.some(opt => opt.type === 'file'
+                    && opt.file_content === formData.filecontent)
+                && formData.filecontent !== oldcontentNameRef.current
             ) {
                 newErrors.filecontent = t("variableNameExists");
             }
@@ -183,8 +186,9 @@ function Form({ nodeId, nodeData, initialData, onSubmit, onCancel, existingOptio
             } else if (formData.filepath.length > 50) {
                 newErrors.filepath = t("variableNameTooLong");
             } else if (
-                existingOptions?.some(opt => opt.file_path === formData.filepath) &&
-                formData.filepath !== oldPathNameRef.current
+                existingOptions?.some(opt => opt.type === 'file'
+                    && opt.file_path === formData.filepath)
+                && formData.filepath !== oldPathNameRef.current
             ) {
                 newErrors.filepath = t("variableNameExists");
             }
@@ -226,8 +230,9 @@ function Form({ nodeId, nodeData, initialData, onSubmit, onCancel, existingOptio
         }
 
         // 5. 不能重复
-        if (existingOptions?.some(opt => opt.image_file === formData.imageFile) &&
-            formData.imageFile !== oldImageFileRef.current) {
+        if (existingOptions?.some(opt => opt.type === 'file'
+            && opt.image_file === formData.imageFile)
+            && formData.imageFile !== oldImageFileRef.current) {
             return '变量名已存在';
         }
 
@@ -266,6 +271,14 @@ function Form({ nodeId, nodeData, initialData, onSubmit, onCancel, existingOptio
         }
     }
 
+    // var check
+    const checkVarFuncRef = useRef(null);
+    useEffect(() => {
+        if (checkVarFuncRef.current && formData.formType === FormType.Text) {
+            checkVarFuncRef.current();
+        }
+    }, [formData.formType, checkVarFuncRef.current])
+
     // text form
     const InputForm = <div className="space-y-4">
         <div>
@@ -290,6 +303,7 @@ function Form({ nodeId, nodeData, initialData, onSubmit, onCancel, existingOptio
                 value={formData.displayName}
                 placeholder={namePlaceholders[formData.formType]}
                 onChange={(val) => setFormData({ ...formData, displayName: val })}
+                onVarEvent={(func) => checkVarFuncRef.current = func}
             >
             </VarInput>
             {errors.displayName && <p className="text-red-500 text-sm">{errors.displayName}</p>}
@@ -433,10 +447,12 @@ function Form({ nodeId, nodeData, initialData, onSubmit, onCancel, existingOptio
         </div>
         <InputItem
             type='number'
+            char
+            linefeed
             data={
                 {
                     min: 0,
-                    label: "文件内容长度限制(字)",
+                    label: "文件内容长度上限",
                     value: formData.fileContentSize,
                 }
             }
@@ -522,7 +538,7 @@ function Form({ nodeId, nodeData, initialData, onSubmit, onCancel, existingOptio
         </form>
     );
 }
-export default function InputFormItem({ data, nodeId, onChange, onValidate }) {
+export default function InputFormItem({ data, nodeId, onChange, onValidate, onVarEvent }) {
     const { t } = useTranslation('flow'); // 使用国际化
     const [isOpen, setIsOpen] = useState(false);
     const [editKey, setEditKey] = useState(""); // 控制编辑模式
@@ -631,6 +647,27 @@ export default function InputFormItem({ data, nodeId, onChange, onValidate }) {
         return () => onValidate(() => { });
     }, [data.value]);
 
+    const { flow } = useFlowStore();
+    // 校验变量是否可用
+    const validateVarAvailble = () => {
+        const errors = data.value.reduce((acc, value) => {
+            if (value.type === 'text') {
+                value.value.replace(/{{#(.*?)#}}/g, (a, part) => {
+                    console.log('a, part :>> ', a, part);
+                    const _error = isVarInFlow(nodeId, flow.nodes, part, data.varZh?.[part])
+                    _error && acc.push(_error)
+                })
+            }
+            return acc
+        }, [])
+        return Promise.resolve(errors);
+    };
+
+    useEffect(() => {
+        onVarEvent && onVarEvent(validateVarAvailble);
+        return () => onVarEvent && onVarEvent(() => { });
+    }, [data]);
+
     return (
         <div className="node-item mb-4 nodrag" data-key={data.key}>
             {data.value.length > 0 && (
@@ -639,7 +676,7 @@ export default function InputFormItem({ data, nodeId, onChange, onValidate }) {
                     ref={scrollRef}
                     options={data.value.map((el) => ({
                         key: el.key,
-                        text: `${el.value}(${el.key},${el.file_content},${el.file_path})`,
+                        text: el.type === 'file' ? `${el.value}(${el.key},${el.file_content},${el.file_path})` : `${el.value}(${el.key})`,
                         type: el.type,
                     }))}
                     onEditClick={handleEditClick} // 点击编辑时执行的逻辑
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/InputItem.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/InputItem.tsx
index 4b9096b8f..899e6a859 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/InputItem.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/InputItem.tsx
@@ -3,16 +3,19 @@ import { Label } from "@/components/bs-ui/label";
 import { QuestionTooltip } from "@/components/bs-ui/tooltip";
 import { useState } from "react";
 
-export default function InputItem({ type = 'text', char = false, data, onChange }) {
+export default function InputItem({ type = 'text', char = false, linefeed = false, data, onChange }) {
     const [value, setValue] = useState(data.value || '')
 
     // inline style
-    if (char) return <div className='node-item mb-4 flex items-center justify-between' data-key={data.key}>
+    if (char) return <div
+        className={`node-item mb-4 ${!linefeed ? 'flex items-center justify-between' : ''}`}
+        data-key={data.key}
+    >
         <Label className="flex items-center bisheng-label">
             {data.label}
             {data.help && <QuestionTooltip content={data.help} />}
         </Label>
-        <div className="nodrag w-32 flex items-center gap-3">
+        <div className={`nodrag ${char ? 'w-32 flex items-center gap-3' : ''} ${linefeed ? 'mt-2' : ''}`}>
             <Input
                 value={value}
                 type={type}
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/ModelItem.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/ModelItem.tsx
index 4b8690192..b3840fc44 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/ModelItem.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/ModelItem.tsx
@@ -84,7 +84,7 @@ export default function ModelItem({ agent = false, data, onChange, onValidate })
             {data.label}
         </Label>
         <Cascader
-            key={defaultValue[0]?.value}
+            key={options[0]?.value}
             error={error}
             placholder={data.placeholder}
             defaultValue={defaultValue}
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/OutputItem.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/OutputItem.tsx
index 86cc26d92..9b074dd2b 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/OutputItem.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/OutputItem.tsx
@@ -8,7 +8,7 @@ import { CustomHandle } from "..";
 import DragOptions from "./DragOptions";
 import VarInput from "./VarInput";
 
-const OutputItem = ({ nodeId, node, data, onChange, onValidate }) => {
+const OutputItem = ({ nodeId, node, data, onChange, onValidate, onVarEvent }) => {
     const { t } = useTranslation('flow'); // 使用国际化
     const [interactionType, setInteractionType] = useState<string>(data.value.type || "none"); // 交互类型状态
     const options = useMemo(() => {
@@ -19,9 +19,8 @@ const OutputItem = ({ nodeId, node, data, onChange, onValidate }) => {
         }))
     }, [data.options]);
 
-    const nData = useMemo(() => {
-        return { ...data, label: '用户输入内容', required: false }
-    }, [data])
+    data.label = '用户输入内容'
+    data.required = false
 
     // 根据交互类型切换不同的展示
     const renderContent = (error) => {
@@ -62,8 +61,9 @@ const OutputItem = ({ nodeId, node, data, onChange, onValidate }) => {
                             placeholder={t("userInputPlaceholder")}
                             nodeId={nodeId}
                             itemKey={data.key}
-                            flowNode={nData}
+                            flowNode={data}
                             value={data.value.value}
+                            onVarEvent={onVarEvent}
                             onChange={(msg) =>
                                 onChange({ type: interactionType, value: msg })
                             }
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/SelectVar.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/SelectVar.tsx
index c9444bdef..57aa9e664 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/SelectVar.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/SelectVar.tsx
@@ -24,17 +24,19 @@ const isMatch = (obj, expression) => {
 };
 
 // 特殊结构提取变量
-const getSpecialVar = (obj, type) => {
+const getSpecialVar = (obj, type, onlyImg = false) => {
     switch (type) {
         case 'item:form_input':
             return obj.value.reduce((res, item) => {
                 if (item.type === 'file') {
                     // if (item.multiple) return res
                     // res.push({ label: item.key, value: item.key })
-                    res.push({ label: item.file_content, value: item.file_content })
-                    res.push({ label: item.file_path, value: item.file_path })
-                    res.push({ label: item.image_file, value: item.image_file })
-                } else {
+                    if (!onlyImg) {
+                        res.push({ label: item.file_content, value: item.file_content })
+                        res.push({ label: item.file_path, value: item.file_path })
+                    }
+                    item.file_type !== 'file' && res.push({ label: item.image_file, value: item.image_file })
+                } else if (!onlyImg) {
                     res.push({ label: item.key, value: item.key })
                 }
                 return res
@@ -103,7 +105,7 @@ const SelectVar = forwardRef(({
                 // 过滤当前节点的output变量
                 if (nodeId === item.id && param.key.indexOf('output') === 0) return
                 // 不能选自己(相同变量名视为self) param.key
-                if (param.key === itemKey) return
+                if (nodeId === item.id && param.key === itemKey) return
                 if (!param.global) return
                 // 处理code表达式
                 if (param.global.indexOf('code') === 0) {
@@ -118,7 +120,7 @@ const SelectVar = forwardRef(({
                     _vars = [..._vars, ...result]
                     // 特殊变量(getSpecialVar前端策略)
                 } else if (param.global.startsWith('item')) {
-                    const result = getSpecialVar(param, param.global)
+                    const result = getSpecialVar(param, param.global, findInputFile)
                     _vars = [..._vars, ...result]
                 } else if ((param.global === 'key' && nodeId !== item.id)
                     || (param.global === 'self' && nodeId === item.id)) {
@@ -181,6 +183,7 @@ const SelectVar = forwardRef(({
      * 限制findInputFileOnly为true时，过滤其他变量,只返回dialog_image_files文件变量
      */
     function processInputNode(inputNodeData, findInputFileOnly) {
+        if (inputNodeData.tab.value === 'form_input') return inputNodeData;
         const processedData = cloneDeep(inputNodeData);
         let acceptType = 'all';
 
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/index.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/index.tsx
index 9a4170ccd..3741ede43 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/index.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/index.tsx
@@ -301,7 +301,9 @@ const useEventMaster = (node, setNodeError) => {
             if (param.tab && node.tab && node.tab.value !== param.tab) return;
 
             const msg = await validate(config); // 获取验证结果
-            if (msg) errors.push(msg);
+            if (msg) {
+                Array.isArray(msg) ? errors.push(...msg) : errors.push(msg);
+            }
         });
 
         await Promise.all(promises);
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/Header.tsx b/src/frontend/platform/src/pages/BuildPage/flow/Header.tsx
index 769e778af..36b8e098e 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/Header.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/Header.tsx
@@ -17,7 +17,8 @@ import { copyReportTemplate, onlineWorkflow, onlineWorkflowApi, saveWorkflow } f
 import { captureAndAlertRequestErrorHoc } from "@/controllers/request";
 import { AppType } from "@/types/app";
 import { FlowVersionItem } from "@/types/flow";
-import { findParallelNodes } from "@/util/flowUtils";
+import { flowVersionCompatible } from "@/util/flowCompatible";
+import { findParallelNodes, importFlow } from "@/util/flowUtils";
 import { cloneDeep, isEqual } from "lodash-es";
 import { ChevronLeft, EllipsisVertical, PencilLineIcon, Play, ShieldCheck } from "lucide-react";
 import { useContext, useEffect, useMemo, useRef, useState } from "react";
@@ -28,12 +29,12 @@ import { ChatTest } from "./FlowChat/ChatTest";
 import useFlowStore from "./flowStore";
 import Notification from "./Notification";
 
-const Header = ({ flow, nodes, onTabChange, preFlow, onPreFlowChange }) => {
+const Header = ({ flow, nodes, onTabChange, preFlow, onPreFlowChange, onImportFlow }) => {
     const { message } = useToast()
     const { dark } = useContext(darkContext);
     const testRef = useRef(null)
     const updateAppModalRef = useRef(null)
-    const { uploadFlow } = useFlowStore()
+    // const { uploadFlow } = useFlowStore()
     const { t, i18n } = useTranslation('flow')
     const [modelVersionId, setModelVersionId] = useState(0)
 
@@ -131,7 +132,7 @@ const Header = ({ flow, nodes, onTabChange, preFlow, onPreFlowChange }) => {
             variant: 'success',
             description: t('changesSaved')
         })
-        setFlow({ ...flow })
+
         return res
     }
 
@@ -159,10 +160,25 @@ const Header = ({ flow, nodes, onTabChange, preFlow, onPreFlowChange }) => {
         bsConfirm({
             desc: t('confirmImport'),
             onOk(next) {
-                uploadFlow()
+                _importFlow()
                 next()
             }
         })
+
+        const _importFlow = async () => {
+            const flow = await importFlow()
+            const newFlow = flowVersionCompatible(flow)
+            const { nodes, edges, viewport } = newFlow
+            onImportFlow(nodes, edges, viewport)
+            setFitView()
+        }
+    }
+
+    const forceUpdateFlow = (_flow) => {
+        setFlow(null)
+        setTimeout(() => {
+            setFlow(_flow)
+        }, 0);
     }
     // versions
     const [loading, setLoading] = useState(false)
@@ -177,10 +193,8 @@ const Header = ({ flow, nodes, onTabChange, preFlow, onPreFlowChange }) => {
         const res = await getVersionDetails(versionId)
         // console.log('res :>> ', res)
         // 自动触发 page的 clone flow
-        setFlow(null)
-        setTimeout(() => {
-            setFlow({ ...f, ...res.data })
-        }, 0);
+        forceUpdateFlow({ ...f, ...res.data })
+
         message({
             variant: "success",
             title: t('switchToVersion', { versionName: res.name }),
@@ -295,7 +309,10 @@ const Header = ({ flow, nodes, onTabChange, preFlow, onPreFlowChange }) => {
                     <Play className="size-3.5 mr-1" />
                     {t('run')}
                 </Button>
-                <Button variant="outline" size="sm" className={`${!dark && 'bg-[#fff]'} h-8 px-6`} onClick={handleSaveClick}>
+                <Button variant="outline" size="sm" className={`${!dark && 'bg-[#fff]'} h-8 px-6`} onClick={async () => {
+                    await handleSaveClick()
+                    forceUpdateFlow({ ...flow }) // 用于对比差异
+                }}>
                     {t('save')}
                 </Button>
                 {
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/Panne.tsx b/src/frontend/platform/src/pages/BuildPage/flow/Panne.tsx
index c35001baa..b2153c4b2 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/Panne.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/Panne.tsx
@@ -43,7 +43,7 @@ export default function Panne({ flow, preFlow }: { flow: WorkFlow, preFlow: stri
     const {
         reactFlowWrapper, nodes, edges, keyBoardPanneRef,
         setNodes, onNodesChange, onSelectionChange, onEdgesChange,
-        onEdgeSelect, onConnect, onDragOver, onDrop
+        onEdgeSelect, onConnect, onDragOver, onDrop, setEdges, setViewport
     } = useFlow(reactFlowInstance, flow, takeSnapshot)
 
     /**
@@ -97,6 +97,11 @@ export default function Panne({ flow, preFlow }: { flow: WorkFlow, preFlow: stri
             nodes={nodes}
             onTabChange={(type) => setShowApiPage('api' === type)}
             preFlow={preFlow}
+            onImportFlow={(nodes, edges, viewport) => {
+                setNodes(nodes)
+                setEdges(edges)
+                setViewport(viewport)
+            }}
             onPreFlowChange={() => {
                 // 返回上一步前, 更新flow数据再对比
                 const { nodes } = reactFlowInstance.toObject()
@@ -454,7 +459,7 @@ const useFlow = (_reactFlowInstance, data, takeSnapshot) => {
 
     return {
         reactFlowWrapper, nodes, edges, keyBoardPanneRef,
-        onNodesChange, onEdgesChange, onConnect, onDragOver, onDrop, onSelectionChange, onEdgeSelect, setNodes
+        onNodesChange, onEdgesChange, onConnect, setViewport, onDragOver, onDrop, onSelectionChange, onEdgeSelect, setNodes, setEdges
     }
 }
 
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/flowStore.ts b/src/frontend/platform/src/pages/BuildPage/flow/flowStore.ts
index 39d35fb09..aa1733317 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/flowStore.ts
+++ b/src/frontend/platform/src/pages/BuildPage/flow/flowStore.ts
@@ -29,34 +29,7 @@ const useFlowStore = create<State & Actions & { notifications: Notification[]; a
     setFlow: (newFlow) => set({ flow: newFlow }),
     setFitView: () => set((state) => ({ fitView: !state.fitView })),
     uploadFlow(file?: File) { // 导入工作流
-        const input = document.createElement("input");
-        input.type = "file";
-        input.accept = ".json";
-        input.onchange = (e: Event) => {
-            if ((e.target as HTMLInputElement).files[0].type === "application/json") {
-                const currentfile = (e.target as HTMLInputElement).files[0];
-                currentfile.text().then(async (text) => {
-                    let flow = JSON.parse(text);
-
-                    // 使用 Promise.all 等待所有的 copyReportTemplate 完成
-                    await Promise.all(flow.nodes.map(async (node) => {
-                        await copyReportTemplate(node.data);
-                    }));
-
-                    // 所有的异步操作完成后，再执行 set
-                    set((state) => ({
-                        flow: {
-                            ...state.flow,
-                            edges: flow.edges,
-                            nodes: flow.nodes,
-                            viewport: flow.viewport
-                        },
-                        fitView: !state.fitView
-                    }));
-                });
-            }
-        };
-        input.click();
+       
     },
     // 添加消息到队列
     addNotification: (notification) =>
diff --git a/src/frontend/platform/src/pages/BuildPage/skills/l2Edit.tsx b/src/frontend/platform/src/pages/BuildPage/skills/l2Edit.tsx
index b85e972ab..fe6815600 100644
--- a/src/frontend/platform/src/pages/BuildPage/skills/l2Edit.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/skills/l2Edit.tsx
@@ -12,7 +12,7 @@ import { Input, Textarea } from "@/components/bs-ui/input";
 import { Label } from "@/components/bs-ui/label";
 import { TabsContext } from "@/contexts/tabsContext";
 import { userContext } from "@/contexts/userContext";
-import { createCustomFlowApi, getFlowApi } from "@/controllers/API/flow";
+import { createCustomFlowApi, getFlowApi, updateVersion } from "@/controllers/API/flow";
 import { captureAndAlertRequestErrorHoc } from "@/controllers/request";
 import { useHasForm } from "@/util/hook";
 import FormSet from "./FormSet";
@@ -108,6 +108,7 @@ export default function l2Edit() {
         formRef.current?.save()
 
         await saveFlow({ ...flow, name, description, guide_word: guideWords, logo })
+        await updateVersion(vid, { data: flow.data })
         setLoading(false)
         navigate('/skill/' + id, { replace: true })
     }
@@ -118,6 +119,8 @@ export default function l2Edit() {
         formRef.current?.save()
 
         const res = await captureAndAlertRequestErrorHoc(saveFlow({ ...flow, name, description, guide_word: guideWords, logo }))
+        await updateVersion(vid, { data: flow.data })
+        
         setLoading(false)
         if (res) {
             message({
diff --git a/src/frontend/platform/src/pages/ChatAppPage/components/ChatHome.tsx b/src/frontend/platform/src/pages/ChatAppPage/components/ChatHome.tsx
index 44591234a..a459d70ca 100644
--- a/src/frontend/platform/src/pages/ChatAppPage/components/ChatHome.tsx
+++ b/src/frontend/platform/src/pages/ChatAppPage/components/ChatHome.tsx
@@ -81,6 +81,8 @@ export default function HomePage({ onSelect }) {
         if (shouldClose) {
             await fetchCategoryTags()
             setIsLabelModalOpen(false)
+        } else {
+            setIsLabelModalOpen(shouldClose)
         }
     }
 
diff --git a/src/frontend/platform/src/pages/KnowledgePage/components/ParagraphEdit.tsx b/src/frontend/platform/src/pages/KnowledgePage/components/ParagraphEdit.tsx
index 5d9881b1d..1be51e8e0 100644
--- a/src/frontend/platform/src/pages/KnowledgePage/components/ParagraphEdit.tsx
+++ b/src/frontend/platform/src/pages/KnowledgePage/components/ParagraphEdit.tsx
@@ -47,9 +47,13 @@ const ParagraphEdit = ({
         //     arrData.splice(arrData.indexOf(prioritizedItem), 1);
         //     arrData.unshift(prioritizedItem);
         // }
+        // 当前chunk优先排前面
+        const newArrData = arrData.slice();
+        const [element] = newArrData.splice(newArrData.findIndex(item => item.metadata.chunk_index === chunkId), 1);
+        newArrData.unshift(element);
 
         const seenIds = new Set()
-        arrData.forEach(chunk => {
+        newArrData.forEach(chunk => {
             const { bbox, chunk_index } = chunk.metadata
             const labels = bbox && JSON.parse(bbox).chunk_bboxes || []
 
@@ -96,7 +100,7 @@ const ParagraphEdit = ({
         const _value = markDownRef.current.getValue().trim()
         setValue(_value)
         if (!_value) return
-
+        
         const bbox = {
             chunk_bboxes: prevOvergapData.current.reduce((arr, item) => {
                 if (item.active) {
diff --git a/src/frontend/platform/src/pages/ModelPage/manage/CustomForm.tsx b/src/frontend/platform/src/pages/ModelPage/manage/CustomForm.tsx
index eca848c48..99b0de535 100644
--- a/src/frontend/platform/src/pages/ModelPage/manage/CustomForm.tsx
+++ b/src/frontend/platform/src/pages/ModelPage/manage/CustomForm.tsx
@@ -169,6 +169,14 @@ const modelProviders = {
         },
     ],
     spark: [
+        // {
+        //     label: "App ID",
+        //     type: "text",
+        //     placeholder: "",
+        //     default: "",
+        //     required: true,
+        //     key: "appid",
+        // },
         {
             label: "API Key",
             type: "password",
@@ -250,19 +258,19 @@ const modelProviders = {
     ],
     tencent: [
         {
-            label: "Base URL",
-            type: "text",
-            default: "https://api.hunyuan.cloud.tencent.com/v1",
+            label: "SecretId",
+            type: "password",
+            default: "",
             required: true,
-            key: "base_url",
+            key: "hunyuan_secret_id",
         },
         {
-            label: "API Key",
+            label: "SecretKey",
             type: "password",
             placeholder: "",
             default: "",
             required: true,
-            key: "api_key",
+            key: "hunyuan_secret_key",
         },
     ],
     moonshot: [
@@ -283,7 +291,7 @@ const modelProviders = {
             key: "api_key",
         },
     ],
-    "火山引擎": [
+    volcengine: [
         {
             label: "Base URL",
             type: "text",
@@ -368,7 +376,7 @@ const CustomForm = forwardRef(({ showDefault, provider, formData }, ref) => {
         <div className="overflow-hidden">
             {fields.map((field) => (
                 <FormField
-                    key={field.key}
+                    key={provider + field.key}
                     showDefault={showDefault}
                     field={field}
                     value={form[field.key] || ''}
diff --git a/src/frontend/platform/src/pages/ModelPage/manage/ModelConfig.tsx b/src/frontend/platform/src/pages/ModelPage/manage/ModelConfig.tsx
index fa3d652af..3915fb12a 100644
--- a/src/frontend/platform/src/pages/ModelPage/manage/ModelConfig.tsx
+++ b/src/frontend/platform/src/pages/ModelPage/manage/ModelConfig.tsx
@@ -140,9 +140,9 @@ export const modelProvider = [
     { "name": "llamacpp", "value": "llamacpp" },
     { "name": "vllm", "value": "vllm" },
     { "name": "通义千问", "value": "qwen" },
-    { "name": "Deepseek", "value": "deepseek" },
+    { "name": "DeepSeek", "value": "deepseek" },
     { "name": "硅基流动", "value": "silicon" },
-    { "name": "火山引擎", "value": "火山引擎" },
+    { "name": "火山引擎", "value": "volcengine" },
     { "name": "智谱 AI", "value": "zhipu" },
     { "name": "讯飞星火", "value": "spark" },
     { "name": "腾讯云", "value": "tencent" },
@@ -177,7 +177,7 @@ export default function ModelConfig({ id, onGetName, onBack, onReload, onBerforS
 
     const getModelsByType = useSelectModel()
     const handleTypeChange = (val) => {
-        const name = onGetName(val)
+        const name = onGetName(_modelProvider.find(el => el.value === val).name || '')
         // 自动填充模型
         const models = getModelsByType(val)
         setFormData({ ...formData, type: val, name, models })
@@ -311,7 +311,7 @@ export default function ModelConfig({ id, onGetName, onBack, onReload, onBerforS
 
     return <div className="relative size-full py-4">
         <div className="flex ml-6 items-center gap-x-3">
-            <ShadTooltip content={t('back')} side="right">
+            <ShadTooltip content={t('back', { ns: 'bs' })} side="right">
                 <button className="extra-side-bar-buttons w-[36px]" onClick={() => onBack()}>
                     <ArrowLeft strokeWidth={1.5} className="side-bar-button-size" />
                 </button>
diff --git a/src/frontend/platform/src/util/flowCompatible.ts b/src/frontend/platform/src/util/flowCompatible.ts
index 38a238672..3feb27687 100644
--- a/src/frontend/platform/src/util/flowCompatible.ts
+++ b/src/frontend/platform/src/util/flowCompatible.ts
@@ -96,6 +96,17 @@ const comptibleInput = (node) => {
             help: "提取上传文件中的图片文件，当助手或大模型节点使用多模态大模型时，可传入此图片。"
         })
 
+        // 兼容文件类型
+        const formInput = node.group_params[0].params.find(item => item.key === 'form_input')
+        formInput.value = formInput.value.map((item) => {
+            if (item.type === 'file') {
+                item.file_type = 'all'
+                item.file_content_size = 15000
+                item.image_file = 'image_file' + generateUUID(2)
+                return item
+            }
+            return item
+        })
         node.v = 2
     }
 }
diff --git a/src/frontend/platform/src/util/flowUtils.ts b/src/frontend/platform/src/util/flowUtils.ts
index 66473eff0..20c3bdb11 100644
--- a/src/frontend/platform/src/util/flowUtils.ts
+++ b/src/frontend/platform/src/util/flowUtils.ts
@@ -1,3 +1,4 @@
+import { copyReportTemplate } from "@/controllers/API/workflow";
 import { Node } from "@xyflow/react";
 import i18next from "i18next";
 import { cloneDeep } from "lodash-es";
@@ -110,7 +111,10 @@ export function isVarInFlow(nodeId, nodes, varName, varNameCn) {
                 } else if (param.type === 'form') {
                     return param.value.some(item => {
                         // if (item.multiple) return `${node.id}.${item.key}` === varName
-                        return [`${node.id}.${item.key}`, `${node.id}.${item.file_content}`, `${node.id}.${item.file_path}`, `${node.id}.${item.image_file}`].includes(varName)
+                        const vars = [`${node.id}.${item.key}`, `${node.id}.${item.file_content}`, `${node.id}.${item.file_path}`]
+                        // 图片类型追加校验变量
+                        item.file_type !== 'file' && vars.push(`${node.id}.${item.image_file}`)
+                        return vars.includes(varName)
                     })
                 } else if (param.hidden) {
                     return false
@@ -245,4 +249,30 @@ export function filterUselessFlow(nodes, edges) {
         const targetNode = nodes.find(node => node.id === edge.target);
         return sourceNode && targetNode;
     })
+}
+
+// 导入工作流
+export function importFlow() {
+    return new Promise((resolve, reject) => {
+        const input = document.createElement("input");
+        input.type = "file";
+        input.accept = ".json";
+        input.onchange = (e: Event) => {
+            if ((e.target as HTMLInputElement).files[0].type === "application/json") {
+                const currentfile = (e.target as HTMLInputElement).files[0];
+                currentfile.text().then(async (text) => {
+                    let flow = JSON.parse(text);
+
+                    // 使用 Promise.all 等待所有的 copyReportTemplate 完成
+                    await Promise.all(flow.nodes.map(async (node) => {
+                        await copyReportTemplate(node.data);
+                    }));
+
+                    resolve(flow)
+                });
+            }
+        };
+        input.onerror = reject
+        input.click();
+    })
 }
\ No newline at end of file

From bbd4ab17dced0ecab653512693fb97ff6d6729b9 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Fri, 9 May 2025 11:46:42 +0800
Subject: [PATCH 122/186] feat: change sql agent logic

---
 .../gpts/tools/sql_agent/tool.py              | 237 +++---------------
 1 file changed, 39 insertions(+), 198 deletions(-)

diff --git a/src/bisheng-langchain/bisheng_langchain/gpts/tools/sql_agent/tool.py b/src/bisheng-langchain/bisheng_langchain/gpts/tools/sql_agent/tool.py
index 7e4040172..17c09822f 100644
--- a/src/bisheng-langchain/bisheng_langchain/gpts/tools/sql_agent/tool.py
+++ b/src/bisheng-langchain/bisheng_langchain/gpts/tools/sql_agent/tool.py
@@ -1,234 +1,75 @@
-from typing import Type, Optional, TypedDict, Annotated, Any, Literal
+from typing import Type, Optional
 
 from langchain_community.agent_toolkits import SQLDatabaseToolkit
 from langchain_community.utilities import SQLDatabase
 from langchain_core.callbacks import CallbackManagerForToolRun
 from langchain_core.language_models import BaseLanguageModel
-from langchain_core.messages import AnyMessage, AIMessage, ToolMessage
-from langchain_core.prompts import ChatPromptTemplate
-from langchain_core.runnables import RunnableLambda, RunnableWithFallbacks
-from langchain_core.tools import BaseTool, tool
-from langgraph.constants import END, START
-from langgraph.graph import add_messages, StateGraph
-from langgraph.prebuilt import ToolNode
-from pydantic import ConfigDict, BaseModel, Field
+from langchain_core.messages import HumanMessage
+from langchain_core.tools import BaseTool
+from langgraph.graph.graph import CompiledGraph
+from langgraph.prebuilt import create_react_agent
+from pydantic import BaseModel, Field
 
+_agent_system_prompt = """You are an autonomous agent that answers user questions by querying an SQL database through the provided tools.
 
-class State(TypedDict):
-    messages: Annotated[list[AnyMessage], add_messages]
+When a new question arrives, follow the steps *in order*:
 
+1. ALWAYS call `sql_db_list_tables` first.  
+   Purpose: discover what tables are available. Never skip this step.
 
-def handle_tool_error(state) -> dict:
-    error = state.get("error")
-    tool_calls = state["messages"][-1].tool_calls
-    return {
-        "messages": [
-            ToolMessage(
-                content=f"Error: {repr(error)}\n please fix your mistakes.",
-                tool_call_id=tc["id"],
-            )
-            for tc in tool_calls
-        ]
-    }
+2. Choose the table(s) that are probably relevant, then call `sql_db_schema`
+   once for each of those tables to obtain their schemas.
 
+3. Write one syntactically-correct {dialect} SELECT statement.  
+   Guidelines for this query:  
+   - Return no more than 10 rows **unless** the user explicitly requests another limit.  
+   - Select only the columns needed to answer the question; avoid `SELECT *`.  
+   - If helpful, add `ORDER BY` on a meaningful column so the most interesting rows appear first.  
+   - ABSOLUTELY NO data-modification statements (INSERT, UPDATE, DELETE, DROP, …).  
+   - Double-check the SQL before executing.
 
-def create_tool_node_with_fallback(tools: list) -> RunnableWithFallbacks[Any, dict]:
-    """
-    Create a ToolNode with a fallback to handle errors and surface them to the agent.
-    """
-    return ToolNode(tools).with_fallbacks(
-        [RunnableLambda(handle_tool_error)], exception_key="error"
-    )
+4. Execute the query with the execution tool `sql_db_query`.  
+   If execution fails, inspect the error, revise the SQL, and try again.  
+   Repeat until the query runs successfully or you are certain the request
+   cannot be satisfied.
 
+5. Read the resulting rows and craft a concise, direct answer for the user.
+   If the result set is empty, explain that no matching data was found.
 
-class SubmitFinalAnswer(BaseModel):
-    """Submit the final answer to the user based on the query results."""
+6. Include the final SQL query in your answer unless the user asks you not to.
 
-    final_answer: str = Field(..., description="The final answer to the user")
+Remember:  
+- List tables → fetch schemas → write & verify SELECT → execute → answer.  
+- Never skip steps 1 or 2.  
+- Never perform DML.  
+- Keep answers focused on the user's question."""
 
-class QueryDBTool(BaseTool):
-    name: str = "db_query_tool"
-    description: str = """Execute a SQL query against the database and get back the result.
-        If the query is not correct, an error message will be returned.
-        If an error is returned, rewrite the query, check the query, and try again."""
-
-    db: SQLDatabase
-
-    def _run(self, query: str, run_manager: Optional[CallbackManagerForToolRun] = None):
-        result = self.db.run_no_throw(query)
-        if not result:
-            return "Error: Query failed. Please rewrite your query and try again."
-        return result
 
 class SqlAgentAPIWrapper(BaseModel):
     llm: BaseLanguageModel = Field(description="llm to use for sql agent")
     sql_address: str = Field(description="sql database address for SQLDatabase uri")
 
     db: Optional[SQLDatabase] = None
-    list_tables_tool: Optional[BaseTool] = None
-    get_schema_tool: Optional[BaseTool] = None
-    db_query_tool: Optional[BaseTool] = None
-    query_check: Optional[Any] = None
-    query_gen: Optional[Any] = None
-    workflow: Optional[StateGraph] = None
-    app: Optional[Any] = None
-    schema_llm: Optional[Any] = None
-    query_check_llm: Optional[Any] = None
-    query_gen_llm: Optional[Any] = None
-    model_config = ConfigDict(arbitrary_types_allowed=True)
+    agent: Optional[CompiledGraph] = None
 
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
         self.llm = kwargs.get('llm')
-
-        # todo 修改sql agent实现逻辑。此处逻辑只支持bishengLLM组件。原因是因为目前的实现必须实例化多个llm对象，每个llm对象绑定不同的tool
-        self.schema_llm = self.llm.__class__(model_id=self.llm.model_id, model_name=self.llm.model_name)
-        self.query_check_llm = self.llm.__class__(model_id=self.llm.model_id, model_name=self.llm.model_name)
-        self.query_gen_llm = self.llm.__class__(model_id=self.llm.model_id, model_name=self.llm.model_name)
         self.sql_address = kwargs.get('sql_address')
 
         self.db = SQLDatabase.from_uri(self.sql_address)
         toolkit = SQLDatabaseToolkit(db=self.db, llm=self.llm)
         tools = toolkit.get_tools()
-        self.list_tables_tool = next(tool for tool in tools if tool.name == "sql_db_list_tables")
-        self.get_schema_tool = next(tool for tool in tools if tool.name == "sql_db_schema")
-        self.db_query_tool = QueryDBTool(db=self.db)
-
-        self.query_check = self.init_query_check()
-        self.query_gen = self.init_query_gen()
-
-        # Define a new graph
-        self.workflow = StateGraph(State)
-        self.init_workflow()
-        self.app = self.workflow.compile(checkpointer=False, debug=True)
-
-    def init_workflow(self):
-        self.workflow.add_node("first_tool_call", self.first_tool_call)
-        self.workflow.add_node(
-            "list_tables_tool", create_tool_node_with_fallback([self.list_tables_tool])
+        self.agent = create_react_agent(
+            llm,
+            tools,
+            prompt=_agent_system_prompt.format(dialect=self.db.dialect),
+            checkpointer=False,
         )
 
-        self.workflow.add_node("get_schema_tool", create_tool_node_with_fallback([self.get_schema_tool]))
-
-        model_get_schema = self.schema_llm.bind_tools(
-            [self.get_schema_tool]
-        )
-        self.workflow.add_node(
-            "model_get_schema",
-            lambda state: {
-                "messages": [model_get_schema.invoke(state["messages"])],
-            },
-        )
-
-        self.workflow.add_node("query_gen", self.query_gen_node)
-        self.workflow.add_node("correct_query", self.model_check_query)
-
-        self.workflow.add_node("execute_query", create_tool_node_with_fallback([self.db_query_tool]))
-
-        self.workflow.add_edge(START, "first_tool_call")
-        self.workflow.add_edge("first_tool_call", "list_tables_tool")
-        self.workflow.add_edge("list_tables_tool", "model_get_schema")
-        self.workflow.add_edge("model_get_schema", "get_schema_tool")
-        self.workflow.add_edge("get_schema_tool", "query_gen")
-        self.workflow.add_conditional_edges(
-            "query_gen",
-            self.should_continue,
-        )
-        self.workflow.add_edge("correct_query", "execute_query")
-        self.workflow.add_edge("execute_query", "query_gen")
-
-    @staticmethod
-    def should_continue(state: State) -> Literal[END, "correct_query", "query_gen"]:
-        messages = state["messages"]
-        last_message = messages[-1]
-        # If there is a tool call, then we finish
-        if getattr(last_message, "tool_calls", None):
-            return END
-        if last_message.content.startswith("Error:"):
-            return "query_gen"
-        else:
-            return "correct_query"
-
-    def init_query_check(self):
-        query_check_system = """You are a SQL expert with a strong attention to detail.
-        Double check the SQLite query for common mistakes, including:
-        - Using NOT IN with NULL values
-        - Using UNION when UNION ALL should have been used
-        - Using BETWEEN for exclusive ranges
-        - Data type mismatch in predicates
-        - Properly quoting identifiers
-        - Using the correct number of arguments for functions
-        - Casting to the correct data type
-        - Using the proper columns for joins
-
-        If there are any of the above mistakes, rewrite the query. If there are no mistakes, just reproduce the original query.
-
-        You will call the appropriate tool to execute the query after running this check."""
-
-        query_check_prompt = ChatPromptTemplate.from_messages(
-            [("system", query_check_system), ("placeholder", "{messages}")]
-        )
-        query_check = query_check_prompt | self.query_check_llm.bind_tools(
-            [self.db_query_tool]
-        )
-        return query_check
-
-    def first_tool_call(self, state: State) -> dict[str, list[AIMessage]]:
-        return {
-            "messages": [
-                AIMessage(
-                    content="",
-                    tool_calls=[
-                        {
-                            "name": "sql_db_list_tables",
-                            "args": {},
-                            "id": "tool_abcd123",
-                        }
-                    ],
-                )
-            ]
-        }
-
-    def model_check_query(self, state: State) -> dict[str, list[AIMessage]]:
-        """
-        Use this tool to double-check if your query is correct before executing it.
-        """
-        return {"messages": [self.query_check.invoke({"messages": [state["messages"][-1]]})]}
-
-    def init_query_gen(self):
-        # Add a node for a model to generate a query based on the question and schema
-        query_gen_system = """You are a SQL expert with a strong attention to detail.Given an input question, output a syntactically correct SQL query to run, then look at the results of the query and return the answer.DO NOT call any tool besides SubmitFinalAnswer to submit the final answer.When generating the query:Output the SQL query that answers the input question without a tool call.Unless the user specifies a specific number of examples they wish to obtain, always limit your query to at most 10 results.You can order the results by a relevant column to return the most interesting examples in the database.Never query for all the columns from a specific table, only ask for the relevant columns given the question.If you get an error while executing a query, rewrite the query and try again.If you get an empty result set, you should try to rewrite the query to get a non-empty result set. NEVER make stuff up if you don't have enough information to answer the query... just say you don't have enough information.If you have enough information to answer the input question, simply invoke the appropriate tool to submit the final answer to the user.DO NOT make any DML statements (INSERT, UPDATE, DELETE, DROP etc.) to the database."""
-        query_gen_prompt = ChatPromptTemplate.from_messages(
-            [("system", query_gen_system), ("placeholder", "{messages}")]
-        )
-        query_gen = query_gen_prompt | self.query_gen_llm.bind_tools(
-            [SubmitFinalAnswer]
-        )
-        return query_gen
-
-    def query_gen_node(self, state: State) -> Any:
-        message = self.query_gen.invoke(state)
-
-        # Sometimes, the LLM will hallucinate and call the wrong tool. We need to catch this and return an error message.
-        tool_messages = []
-        if message.tool_calls:
-            for tc in message.tool_calls:
-                if tc["name"] != "SubmitFinalAnswer":
-                    tool_messages.append(
-                        ToolMessage(
-                            content=f"Error: The wrong tool was called: {tc['name']}. Please fix your mistakes. Remember to only call SubmitFinalAnswer to submit the final answer. Generated queries should be outputted WITHOUT a tool call.",
-                            tool_call_id=tc["id"],
-                        )
-                    )
-        else:
-            tool_messages = []
-        return {"messages": [message] + tool_messages}
-
     def run(self, query: str) -> str:
-        messages = self.app.invoke({"messages": [("user", query)]}, config={
-            'recursion_limit': 50
-        })
-        return messages["messages"][-1].tool_calls[0]["args"]["final_answer"]
+        messages = self.agent.invoke({"messages": [HumanMessage(content=query)]})
+        return messages["messages"][-1].content
 
     def arun(self, query: str) -> str:
         return self.run(query)

From cb19347aabe3d6cc3fffae665305c92b1e785b03 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Fri, 9 May 2025 16:37:25 +0800
Subject: [PATCH 123/186] fix: remove think tag content

---
 src/backend/bisheng/api/services/knowledge_imp.py | 2 +-
 src/backend/bisheng/chat/utils.py                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/backend/bisheng/api/services/knowledge_imp.py b/src/backend/bisheng/api/services/knowledge_imp.py
index da40da3ca..74b1fe1ec 100644
--- a/src/backend/bisheng/api/services/knowledge_imp.py
+++ b/src/backend/bisheng/api/services/knowledge_imp.py
@@ -484,7 +484,7 @@ def read_chunk_text(input_file, file_name, separator: List[str], separator_rule:
             # 配置了相关llm的话，就对文档做总结
             title = extract_title(llm, one.page_content)
             # remove <think>.*</think> tag content
-            title = re.sub('<think>.*</think>', '', title)
+            title = re.sub('<think>.*</think>', '', title, flags=re.S).strip()
             one.metadata['title'] = title
         logger.info('file_extract_title=success timecost={}', time.time() - t)
 
diff --git a/src/backend/bisheng/chat/utils.py b/src/backend/bisheng/chat/utils.py
index 468a54ba6..0ae1e297d 100644
--- a/src/backend/bisheng/chat/utils.py
+++ b/src/backend/bisheng/chat/utils.py
@@ -83,7 +83,7 @@ def extract_answer_keys(answer, llm):
         llm_chain = LLMChain(llm=llm, prompt=PromptTemplate.from_template(prompt_template))
     try:
         keywords_str = llm_chain.run(answer)
-        keywords_str = re.sub('<think>.*</think>', '', keywords_str)
+        keywords_str = re.sub('<think>.*</think>', '', keywords_str, flags=re.S).strip()
         keywords = ast.literal_eval(keywords_str[9:])
     except Exception:
         import jieba.analyse

From 21b93b30738a307604f63f8c54a1551e8878ff03 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Mon, 12 May 2025 10:56:58 +0800
Subject: [PATCH 124/186] fix: on tool end content change

---
 src/backend/bisheng/api/v1/callback.py                | 6 +++---
 src/backend/bisheng/workflow/callback/llm_callback.py | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/backend/bisheng/api/v1/callback.py b/src/backend/bisheng/api/v1/callback.py
index 5873f7cb1..f98fcdb2c 100644
--- a/src/backend/bisheng/api/v1/callback.py
+++ b/src/backend/bisheng/api/v1/callback.py
@@ -121,7 +121,7 @@ class AsyncStreamingLLMCallbackHandler(AsyncCallbackHandler):
         observation_prefix = kwargs.get('observation_prefix', 'Tool output: ')
         # from langchain.docstore.document import Document # noqa
         # result = eval(output).get('result')
-        result = output
+        result = output if isinstance(output, str) else getattr(output, 'content', output)
 
         # Create a formatted message.
         intermediate_steps = f'{observation_prefix}{result[:100]}'
@@ -333,7 +333,7 @@ class StreamingLLMCallbackHandler(BaseCallbackHandler):
 
         # from langchain.docstore.document import Document # noqa
         # result = eval(output).get('result')
-        result = output
+        result = output if isinstance(output, str) else getattr(output, 'content', output)
         # Create a formatted message.
         intermediate_steps = f'{observation_prefix}{result}'
 
@@ -502,7 +502,7 @@ class AsyncGptsDebugCallbackHandler(AsyncGptsLLMCallbackHandler):
         logger.debug(f'on_tool_end output={output} kwargs={kwargs}')
         observation_prefix = kwargs.get('observation_prefix', 'Tool output: ')
 
-        result = output
+        result = output if isinstance(output, str) else getattr(output, 'content', output)
         # Create a formatted message.
         intermediate_steps = f'{observation_prefix}\n\n{result}'
         tool_name, tool_category = self.parse_tool_category(kwargs.get('name'))
diff --git a/src/backend/bisheng/workflow/callback/llm_callback.py b/src/backend/bisheng/workflow/callback/llm_callback.py
index c78a894c8..6de211a58 100644
--- a/src/backend/bisheng/workflow/callback/llm_callback.py
+++ b/src/backend/bisheng/workflow/callback/llm_callback.py
@@ -52,12 +52,13 @@ class LLMNodeCallbackHandler(BaseCallbackHandler):
     async def on_tool_end(self, output: str, **kwargs: Any) -> Any:
         """Run when tool ends running."""
         logger.debug(f'on_tool_end  output={output} kwargs={kwargs}')
+        result = output if isinstance(output, str) else getattr(output, 'content', output)
         if self.tool_list is not None:
             self.tool_list.append({
                 'type': 'end',
                 'run_id': kwargs.get('run_id').hex,
                 'name': kwargs['name'],
-                'output': output,
+                'output': result,
             })
         if kwargs['name'] == 'sql_agent':
             self.output = True

From d633b5fedd7fd6d196b3eedcd92fc333c9528551 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Mon, 12 May 2025 10:58:38 +0800
Subject: [PATCH 125/186] fix: tencent sdk change to openai

---
 src/backend/bisheng/interface/llms/custom.py | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/backend/bisheng/interface/llms/custom.py b/src/backend/bisheng/interface/llms/custom.py
index 1b7f96644..5b8c70427 100644
--- a/src/backend/bisheng/interface/llms/custom.py
+++ b/src/backend/bisheng/interface/llms/custom.py
@@ -33,10 +33,12 @@ def _get_xinference_params(params: dict, server_config: dict, model_config: dict
         params['api_key'] = 'Empty'
     return params
 
+
 def _get_bisheng_rt_params(params: dict, server_config: dict, model_config: dict) -> dict:
     params.update(server_config)
     return params
 
+
 def _get_openai_params(params: dict, server_config: dict, model_config: dict) -> dict:
     if server_config:
         params.update({
@@ -95,6 +97,7 @@ def _get_zhipu_params(params: dict, server_config: dict, model_config: dict) ->
     params['zhipuai_api_base'] = server_config.get('openai_api_base')
     return params
 
+
 def _get_spark_params(params: dict, server_config: dict, model_config: dict) -> dict:
     params.update({
         'api_key': f'{server_config.get("api_key")}:{server_config.get("api_secret")}',
@@ -102,19 +105,13 @@ def _get_spark_params(params: dict, server_config: dict, model_config: dict) ->
     })
     return params
 
-def _get_tencent_params(params: dict, server_config: dict, model_config: dict) -> dict:
-    params.update({
-        'hunyuan_secret_id': server_config.get('hunyuan_secret_id'),
-        'hunyuan_secret_key': server_config.get('hunyuan_secret_key'),
-    })
-    params['extra_body'] = {'enable_enhancement': model_config.get('enable_web_search', False)}
-    return params
 
 _llm_node_type: Dict = {
     # 开源推理框架
     LLMServerType.OLLAMA.value: {'client': 'ChatOllama', 'params_handler': _get_ollama_params},
-    LLMServerType.XINFERENCE.value: {'client':'ChatOpenAI', 'params_handler': _get_xinference_params},
-    LLMServerType.LLAMACPP.value: {'client': 'ChatOpenAI', 'params_handler': _get_openai_params},  # 此组件是加载本地的模型文件，待确认是否有api服务提供
+    LLMServerType.XINFERENCE.value: {'client': 'ChatOpenAI', 'params_handler': _get_xinference_params},
+    LLMServerType.LLAMACPP.value: {'client': 'ChatOpenAI', 'params_handler': _get_openai_params},
+    # 此组件是加载本地的模型文件，待确认是否有api服务提供
     LLMServerType.VLLM.value: {'client': 'ChatOpenAI', 'params_handler': _get_openai_params},
     LLMServerType.BISHENG_RT.value: {'client': 'HostChatGLM', 'params_handler': _get_bisheng_rt_params},
 
@@ -128,12 +125,13 @@ _llm_node_type: Dict = {
     LLMServerType.ANTHROPIC.value: {'client': 'ChatAnthropic', 'params_handler': _get_anthropic_params},
     LLMServerType.DEEPSEEK.value: {'client': 'ChatDeepSeek', 'params_handler': _get_openai_params},
     LLMServerType.SPARK.value: {'client': 'ChatSparkOpenAI', 'params_handler': _get_spark_params},
-    LLMServerType.TENCENT.value: {'client': 'ChatHunyuan', 'params_handler': _get_tencent_params},
+    LLMServerType.TENCENT.value: {'client': 'ChatSparkOpenAI', 'params_handler': _get_openai_params},
     LLMServerType.MOONSHOT.value: {'client': 'MoonshotChat', 'params_handler': _get_openai_params},
     LLMServerType.VOLCENGINE.value: {'client': 'ChatSparkOpenAI', 'params_handler': _get_openai_params},
     LLMServerType.SILICON.value: {'client': 'ChatOpenAI', 'params_handler': _get_openai_params},
 }
 
+
 class BishengLLM(BaseChatModel):
     """
      Use the llm model that has been launched in model management
@@ -148,7 +146,6 @@ class BishengLLM(BaseChatModel):
 
     llm: Optional[BaseChatModel] = Field(default=None)
 
-
     # bisheng强相关的业务参数
     model_info: Optional[LLMModel] = Field(default=None)
     server_info: Optional[LLMServer] = Field(default=None)

From 5d6ad3885f00b224c53f261cf5bb40519b0cbbce Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Mon, 12 May 2025 16:18:44 +0800
Subject: [PATCH 126/186] fix: agent react model invoke error

---
 src/backend/bisheng/workflow/nodes/agent/agent.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/backend/bisheng/workflow/nodes/agent/agent.py b/src/backend/bisheng/workflow/nodes/agent/agent.py
index e350a2860..1afda559b 100644
--- a/src/backend/bisheng/workflow/nodes/agent/agent.py
+++ b/src/backend/bisheng/workflow/nodes/agent/agent.py
@@ -76,7 +76,7 @@ class AgentNode(BaseNode):
             self._sql_address = f'mysql+pymysql://{self._sql_agent["db_username"]}:{self._sql_agent["db_password"]}@{self._sql_agent["db_address"]}/{self._sql_agent["db_name"]}?charset=utf8mb4'
 
         # agent
-        self._agent_executor_type = 'get_react_agent_executor'
+        self._agent_executor_type = 'React'
         self._agent = None
 
     def _init_agent(self, system_prompt: str):
@@ -359,7 +359,10 @@ class AgentNode(BaseNode):
         logger.debug(f'agent invoke chat_history: {chat_history}')
 
         if self._agent_executor_type == 'ReAct':
-            result = self._agent.invoke(chat_history, config=config)
+            result = self._agent.invoke({
+                'input': chat_history[-1].content,
+                'chat_history': chat_history[:-1],
+            }, config=config)
             output = result['agent_outcome'].return_values['output']
             if isinstance(output, dict):
                 output = list(output.values())[0]

From d50b5c21893890364bb7168c142418a423e0739a Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Mon, 12 May 2025 17:13:39 +0800
Subject: [PATCH 127/186] fix: zhipuai sdk error

---
 src/backend/bisheng/interface/llms/custom.py                 | 2 ++
 .../bisheng_langchain/chat_models/__init__.py                | 5 ++---
 .../bisheng_langchain/gpts/tools/sql_agent/tool.py           | 4 +++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/backend/bisheng/interface/llms/custom.py b/src/backend/bisheng/interface/llms/custom.py
index 5b8c70427..5907276fe 100644
--- a/src/backend/bisheng/interface/llms/custom.py
+++ b/src/backend/bisheng/interface/llms/custom.py
@@ -95,6 +95,8 @@ def _get_anthropic_params(params: dict, server_config: dict, model_config: dict)
 def _get_zhipu_params(params: dict, server_config: dict, model_config: dict) -> dict:
     params['zhipuai_api_key'] = server_config.get('openai_api_key')
     params['zhipuai_api_base'] = server_config.get('openai_api_base')
+    if 'chat/completions' not in params['zhipuai_api_base']:
+        params['zhipuai_api_base'] = f"{params['zhipuai_api_base'].rstrip('/')}/chat/completions"
     return params
 
 
diff --git a/src/bisheng-langchain/bisheng_langchain/chat_models/__init__.py b/src/bisheng-langchain/bisheng_langchain/chat_models/__init__.py
index 4de8343a3..aab038ee0 100644
--- a/src/bisheng-langchain/bisheng_langchain/chat_models/__init__.py
+++ b/src/bisheng-langchain/bisheng_langchain/chat_models/__init__.py
@@ -4,11 +4,10 @@ from .proxy_llm import ProxyChatLLM
 from .qwen import ChatQWen
 from .wenxin import ChatWenxin
 from .xunfeiai import ChatXunfeiAI
-from .zhipuai import ChatZhipuAI
-from .sensetime import SenseChat 
+from .sensetime import SenseChat
 
 __all__ = [
-    'ProxyChatLLM', 'ChatMinimaxAI', 'ChatWenxin', 'ChatZhipuAI', 'ChatXunfeiAI', 'HostChatGLM',
+    'ProxyChatLLM', 'ChatMinimaxAI', 'ChatWenxin', 'ChatXunfeiAI', 'HostChatGLM',
     'HostBaichuanChat', 'HostLlama2Chat', 'HostQwenChat', 'CustomLLMChat', 'ChatQWen', 'SenseChat',
     'HostYuanChat', 'HostYiChat', 'HostQwen1_5Chat'
 ]
diff --git a/src/bisheng-langchain/bisheng_langchain/gpts/tools/sql_agent/tool.py b/src/bisheng-langchain/bisheng_langchain/gpts/tools/sql_agent/tool.py
index 17c09822f..2b1a0855c 100644
--- a/src/bisheng-langchain/bisheng_langchain/gpts/tools/sql_agent/tool.py
+++ b/src/bisheng-langchain/bisheng_langchain/gpts/tools/sql_agent/tool.py
@@ -8,7 +8,7 @@ from langchain_core.messages import HumanMessage
 from langchain_core.tools import BaseTool
 from langgraph.graph.graph import CompiledGraph
 from langgraph.prebuilt import create_react_agent
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, ConfigDict
 
 _agent_system_prompt = """You are an autonomous agent that answers user questions by querying an SQL database through the provided tools.
 
@@ -46,6 +46,8 @@ Remember:
 
 
 class SqlAgentAPIWrapper(BaseModel):
+    model_config = ConfigDict(arbitrary_types_allowed=True)
+
     llm: BaseLanguageModel = Field(description="llm to use for sql agent")
     sql_address: str = Field(description="sql database address for SQLDatabase uri")
 

From f7c3fe6b417a97477234ca09f5965a6df1f745a4 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Mon, 12 May 2025 17:43:26 +0800
Subject: [PATCH 128/186] fix: model limit check msg

---
 src/backend/bisheng/interface/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backend/bisheng/interface/utils.py b/src/backend/bisheng/interface/utils.py
index 57e03166d..e3040d76e 100644
--- a/src/backend/bisheng/interface/utils.py
+++ b/src/backend/bisheng/interface/utils.py
@@ -99,7 +99,7 @@ def bisheng_model_limit_check(self: 'BishengLLM | BishengEmbedding'):
         cache_key = f"model_limit:{now}:{self.server_info.id}"
         use_num = redis_client.incr(cache_key)
         if use_num > self.server_info.limit:
-            raise Exception(f'额度已用完')
+            raise Exception(f'{self.server_info.name}/{self.model_info.model_name} 额度已用完')
 
 
 def wrapper_bisheng_model_limit_check_async(func):

From c07b4032d28afcc0b42e127e764aae33a4cef16e Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Mon, 12 May 2025 17:52:12 +0800
Subject: [PATCH 129/186] fix: silicon max_tokens invalid

---
 src/backend/bisheng/interface/llms/custom.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backend/bisheng/interface/llms/custom.py b/src/backend/bisheng/interface/llms/custom.py
index 5907276fe..26d6a32d8 100644
--- a/src/backend/bisheng/interface/llms/custom.py
+++ b/src/backend/bisheng/interface/llms/custom.py
@@ -130,7 +130,7 @@ _llm_node_type: Dict = {
     LLMServerType.TENCENT.value: {'client': 'ChatSparkOpenAI', 'params_handler': _get_openai_params},
     LLMServerType.MOONSHOT.value: {'client': 'MoonshotChat', 'params_handler': _get_openai_params},
     LLMServerType.VOLCENGINE.value: {'client': 'ChatSparkOpenAI', 'params_handler': _get_openai_params},
-    LLMServerType.SILICON.value: {'client': 'ChatOpenAI', 'params_handler': _get_openai_params},
+    LLMServerType.SILICON.value: {'client': 'ChatSparkOpenAI', 'params_handler': _get_openai_params},
 }
 
 

From 689e992265bd3fcac3ed657998b2f285d573b25a Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Mon, 12 May 2025 17:52:37 +0800
Subject: [PATCH 130/186] fix: workflow api pydantic error

---
 src/backend/bisheng/api/v1/schema/workflow.py | 9 ++++++++-
 src/backend/bisheng/api/v2/workflow.py        | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/backend/bisheng/api/v1/schema/workflow.py b/src/backend/bisheng/api/v1/schema/workflow.py
index 0fe5986c2..dfba061f9 100644
--- a/src/backend/bisheng/api/v1/schema/workflow.py
+++ b/src/backend/bisheng/api/v1/schema/workflow.py
@@ -1,7 +1,7 @@
 from enum import Enum
 from typing import Optional, Any, List
 
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, field_validator
 
 
 class WorkflowEventType(Enum):
@@ -53,6 +53,13 @@ class WorkflowEvent(BaseModel):
     output_schema: Optional[WorkflowOutputSchema] = Field(default=None, description='The output schema')
     input_schema: Optional[WorkflowInputSchema] = Field(default=None, description='The input schema')
 
+    @field_validator('message_id', mode='before')
+    @classmethod
+    def validate_message_id(cls, v: Any) -> Optional[str]:
+        if isinstance(v, str) or v is None:
+            return v
+        return str(v)
+
 
 class WorkflowStream(BaseModel):
     session_id: str = Field(default=None, description='The session id')
diff --git a/src/backend/bisheng/api/v2/workflow.py b/src/backend/bisheng/api/v2/workflow.py
index 2e2db93b1..86fabbdd0 100644
--- a/src/backend/bisheng/api/v2/workflow.py
+++ b/src/backend/bisheng/api/v2/workflow.py
@@ -27,7 +27,7 @@ async def invoke_workflow(request: Request,
                           workflow_id: UUID = Body(..., description='工作流唯一ID'),
                           stream: Optional[bool] = Body(default=True, description='是否流式调用'),
                           user_input: Optional[dict] = Body(default=None, description='用户输入', alias='input'),
-                          message_id: Optional[str] = Body(default=None, description='消息ID'),
+                          message_id: Optional[int] = Body(default=None, description='消息ID'),
                           session_id: Optional[str] = Body(default=None, description='会话ID,一次workflow调用的唯一标识')):
     login_user = get_default_operator()
     workflow_id = workflow_id.hex

From 502bc553a3ffb0e8380b525b5011dc5580d7aa33 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Mon, 12 May 2025 19:32:32 +0800
Subject: [PATCH 131/186] fix: qa knowledge status change

---
 .../bisheng/api/services/knowledge_imp.py        |  8 ++++----
 src/backend/bisheng/api/v1/knowledge.py          |  5 ++---
 .../bisheng/database/models/knowledge_file.py    | 16 ++++++++++++----
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/backend/bisheng/api/services/knowledge_imp.py b/src/backend/bisheng/api/services/knowledge_imp.py
index 74b1fe1ec..ff0cffcc5 100644
--- a/src/backend/bisheng/api/services/knowledge_imp.py
+++ b/src/backend/bisheng/api/services/knowledge_imp.py
@@ -16,7 +16,7 @@ from bisheng.database.base import session_getter
 from bisheng.database.models.knowledge import Knowledge, KnowledgeDao
 from bisheng.database.models.knowledge_file import (KnowledgeFile, KnowledgeFileDao,
                                                     KnowledgeFileStatus, ParseType, QAKnoweldgeDao,
-                                                    QAKnowledge, QAKnowledgeUpsert)
+                                                    QAKnowledge, QAKnowledgeUpsert, QAStatus)
 from bisheng.interface.embeddings.custom import FakeEmbedding
 from bisheng.interface.importing.utils import import_vectorstore
 from bisheng.interface.initialize.loading import instantiate_vectorstore
@@ -671,14 +671,14 @@ def QA_save_knowledge(db_knowledge: Knowledge, QA: QAKnowledge):
         for vectore_client in vectore_client_list:
             vectore_client.add_texts(texts=[t.page_content for t in docs], metadatas=metadata)
 
-        QA.status = 1
+        QA.status = QAStatus.ENABLED.value
         with session_getter() as session:
             session.add(QA)
             session.commit()
             session.refresh(QA)
     except Exception as e:
         logger.error(e)
-        setattr(QA, 'status', 0)
+        setattr(QA, 'status', QAStatus.FAILED.value)
         setattr(QA, 'remark', str(e)[:500])
         with session_getter() as session:
             session.add(QA)
@@ -723,7 +723,7 @@ def qa_status_change(qa_id: int, target_status: int):
         return
 
     db_knowledge = KnowledgeDao.query_by_id(qa_db.knowledge_id)
-    if target_status == 0:
+    if target_status == QAStatus.DISABLED.value:
         delete_vector_data(db_knowledge, [qa_id])
         qa_db.status = target_status
         QAKnoweldgeDao.update(qa_db)
diff --git a/src/backend/bisheng/api/v1/knowledge.py b/src/backend/bisheng/api/v1/knowledge.py
index 0bca49956..93a1ecc53 100644
--- a/src/backend/bisheng/api/v1/knowledge.py
+++ b/src/backend/bisheng/api/v1/knowledge.py
@@ -21,7 +21,7 @@ from bisheng.api.v1.schemas import (KnowledgeFileProcess, PreviewFileChunk, Upda
 from bisheng.cache.utils import save_uploaded_file
 from bisheng.database.models.knowledge import (KnowledgeCreate, KnowledgeDao, KnowledgeTypeEnum, KnowledgeUpdate)
 from bisheng.database.models.knowledge_file import (KnowledgeFileDao, KnowledgeFileStatus,
-                                                    QAKnoweldgeDao, QAKnowledgeUpsert)
+                                                    QAKnoweldgeDao, QAKnowledgeUpsert, QAStatus)
 from bisheng.database.models.role_access import AccessType
 from bisheng.database.models.user import UserDao
 from bisheng.utils.logger import logger
@@ -524,7 +524,6 @@ def post_import_file(*,
             answers=[convert_excel_value(dd['答案'])],
             questions=[convert_excel_value(dd['问题'])],
             source=4,
-            status=1,
             create_time=datetime.now(),
             update_time=datetime.now())
         for key, value in dd.items():
@@ -574,7 +573,7 @@ def post_import_file(*,
                 answers=[dd_answer],
                 questions=[dd_question],
                 source=4,
-                status=0)
+                status=QAStatus.PROCESSING.value)
             tmp_questions.add(QACreate.questions[0])
             for key, value in dd.items():
                 if key.startswith('相似问题'):
diff --git a/src/backend/bisheng/database/models/knowledge_file.py b/src/backend/bisheng/database/models/knowledge_file.py
index 37c1c6c9b..aee6e6712 100644
--- a/src/backend/bisheng/database/models/knowledge_file.py
+++ b/src/backend/bisheng/database/models/knowledge_file.py
@@ -13,9 +13,16 @@ from bisheng.database.models.base import SQLModelSerializable
 
 
 class KnowledgeFileStatus(Enum):
-    PROCESSING = 1
-    SUCCESS = 2
-    FAILED = 3
+    PROCESSING = 1  # 处理中
+    SUCCESS = 2  # 成功
+    FAILED = 3  # 解析失败
+
+
+class QAStatus(Enum):
+    DISABLED = 0  # 用户手动关闭QA
+    ENABLED = 1  # 启用成功
+    PROCESSING = 2  # 处理中
+    FAILED = 3  # QA插入向量库失败
 
 
 class ParseType(Enum):
@@ -51,7 +58,8 @@ class QAKnowledgeBase(SQLModelSerializable):
     questions: List[str] = Field(index=False)
     answers: str = Field(index=False)
     source: Optional[int] = Field(default=0, index=False, description='0: 未知 1: 手动；2: 审计, 3: api, 4: 批量导入')
-    status: Optional[int] = Field(default=1, index=False, description='1: 开启；0: 关闭，未写入到向量库或写入失败；')
+    status: Optional[int] = Field(default=1, index=False,
+                                  description='1: 开启；0: 关闭，用户手动关闭；2: 处理中；3：插入失败')
     extra_meta: Optional[str] = Field(default=None, index=False)
     remark: Optional[str] = Field(default=None, sa_column=Column(String(length=512)))
     create_time: Optional[datetime] = Field(default=None, sa_column=Column(

From 790dc87b017daa5610aeb9e4284752a310fced00 Mon Sep 17 00:00:00 2001
From: lmr <350416710@qq.com>
Date: Mon, 12 May 2025 20:44:55 +0800
Subject: [PATCH 132/186] =?UTF-8?q?bug=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/src/controllers/API/index.ts     |  4 +-
 .../platform/src/pages/KnowledgePage/qas.tsx  | 44 +++++++++++++++----
 .../src/pages/LogPage/useAppLog/index.tsx     |  2 +-
 .../pages/ModelPage/manage/ModelConfig.tsx    | 28 +++++++++---
 4 files changed, 62 insertions(+), 16 deletions(-)

diff --git a/src/frontend/platform/src/controllers/API/index.ts b/src/frontend/platform/src/controllers/API/index.ts
index 4d0c8531a..03be959ea 100644
--- a/src/frontend/platform/src/controllers/API/index.ts
+++ b/src/frontend/platform/src/controllers/API/index.ts
@@ -350,8 +350,8 @@ export async function getQaFilePreview(id, params): Promise<{
  */
 export async function updateQaStatus(id, status) {
   return await axios.post(`/api/v1/knowledge/qa/status_switch`, {
-    id,
-    status
+    id:1461,
+    status:3
   });
 }
 
diff --git a/src/frontend/platform/src/pages/KnowledgePage/qas.tsx b/src/frontend/platform/src/pages/KnowledgePage/qas.tsx
index af3c5d2ed..4965c0926 100644
--- a/src/frontend/platform/src/pages/KnowledgePage/qas.tsx
+++ b/src/frontend/platform/src/pages/KnowledgePage/qas.tsx
@@ -296,12 +296,28 @@ export default function QasPage() {
         });
     };
 
-    const handleStatusClick = async (id, checked) => {
-        const status = checked ? 1 : 0
-        await updateQaStatus(id, status)
-        refreshData((item) => item.id === id, { status })
-    }
-
+    const handleStatusClick = async (id: number, checked: boolean) => {
+        try {
+          // 调用API更新状态
+          const targetStatus = checked ? 1 : 0;
+          const result = await updateQaStatus(id, targetStatus);
+          
+          if (result.success) {
+            refreshData((item) => item.id === id, { status: targetStatus });
+          } else {
+            // 只有尝试开启失败时才设为3（显示"未启用，请重试"）
+            // 关闭失败时保持原状态（不显示提示）
+            refreshData((item) => item.id === id, { 
+              status: targetStatus === 1 ? 3 : 0 
+            });
+          }
+        } catch (error) {
+          // 捕获异常时同样逻辑：只有尝试开启失败才显示提示
+          refreshData((item) => item.id === id, { 
+            status: checked ? 3 : 0 
+          });
+        }
+      };
     return <div className="relative px-2 pt-4 size-full">
         {loading && <div className="absolute w-full h-full top-0 left-0 flex justify-center items-center z-10 bg-[rgba(255,255,255,0.6)] dark:bg-blur-shared">
             <LoadingIcon />
@@ -374,9 +390,21 @@ export default function QasPage() {
                                 <TableCell>{el.update_time.replace('T', ' ')}</TableCell>
                                 <TableCell>{el.user_name}</TableCell>
                                 <TableCell>
-                                    <Switch checked={el.status === 1} onCheckedChange={(bln) => handleStatusClick(el.id, bln)} />
+                                    <div className="flex items-center">
+                                        <Switch
+                                        checked={el.status === 1}
+                                        disabled={ el.status === 0||el.status === 3}
+                                        onCheckedChange={(bln) => handleStatusClick(el.id, bln)}
+                                        />
+                                        {el.status === 2 && (
+                                        <span className="ml-2 text-sm">处理中...</span>
+                                        )}
+                                        {el.status === 3 && (
+                                        <span className="ml-2 text-sm">未启用，请重试</span>
+                                        )}
+                                    </div>
                                 </TableCell>
-                                {hasPermission ? <TableCell className="text-right">
+                                                                {hasPermission ? <TableCell className="text-right">
                                     <Button variant="link" onClick={() => editRef.current.edit(el)} className="ml-4">{t('update')}</Button>
                                     <Button variant="link" onClick={() => handleDelete(el.id)} className="ml-4 text-red-500">{t('delete')}</Button>
                                 </TableCell> : <TableCell className="text-right">
diff --git a/src/frontend/platform/src/pages/LogPage/useAppLog/index.tsx b/src/frontend/platform/src/pages/LogPage/useAppLog/index.tsx
index 4afeea44b..ab0c01ebc 100644
--- a/src/frontend/platform/src/pages/LogPage/useAppLog/index.tsx
+++ b/src/frontend/platform/src/pages/LogPage/useAppLog/index.tsx
@@ -230,7 +230,7 @@ export default function AppUseLog() {
                         msg.liked === 1 ? '是' : '否',
                         msg.liked === 2 ? '是' : '否',
                         msg.copied ? '是' : '否',
-                        msg.sensitive_status ? '是' : '否'
+                        msg.sensitive_status === 1 ? '是' : '否'
                     ])
                 })
             })
diff --git a/src/frontend/platform/src/pages/ModelPage/manage/ModelConfig.tsx b/src/frontend/platform/src/pages/ModelPage/manage/ModelConfig.tsx
index 3915fb12a..07a09ed26 100644
--- a/src/frontend/platform/src/pages/ModelPage/manage/ModelConfig.tsx
+++ b/src/frontend/platform/src/pages/ModelPage/manage/ModelConfig.tsx
@@ -1,5 +1,5 @@
 import { bsConfirm } from "@/components/bs-ui/alertDialog/useConfirm";
-import { Button } from "@/components/bs-ui/button";
+import { Button, LoadButton } from "@/components/bs-ui/button";
 import { Input } from "@/components/bs-ui/input";
 import { Label } from "@/components/bs-ui/label";
 import { Select, SelectContent, SelectGroup, SelectItem, SelectTrigger, SelectValue } from "@/components/bs-ui/select";
@@ -14,6 +14,7 @@ import { useEffect, useMemo, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import CustomForm from "./CustomForm";
 import { LoadingIcon } from "@/components/bs-icons/loading";
+import { set } from "date-fns";
 
 function ModelItem({ data, type, onDelete, onInput, onConfig }) {
     const { t } = useTranslation('model')
@@ -21,6 +22,7 @@ function ModelItem({ data, type, onDelete, onInput, onConfig }) {
     const [error, setError] = useState('')
     const [isWebSearchEnabled, setIsWebSearchEnabled] = useState(data.config?.enable_web_search || false)
     const [maxTokens, setMaxTokens] = useState(data.config?.max_tokens ?? '')
+   
 
     const handleInput = (e) => {
         const value = e.target.value
@@ -220,10 +222,14 @@ export default function ModelConfig({ id, onGetName, onBack, onReload, onBerforS
         setFormData({ ...formData, models })
     }
 
-    // submit 
+    // submit 1
+    
     const { message, toast } = useToast()
     const formRef = useRef(null)
-    const handleSave = () => {
+    const [isLoading, setIsLoading] = useState(false);
+    const handleSave = async() => {
+        setIsLoading(true)
+        try {
         const exists = onBerforSave(formData.id, formData.name)
         if (exists) {
             return message({
@@ -278,12 +284,17 @@ export default function ModelConfig({ id, onGetName, onBack, onReload, onBerforS
                 onBack()
             }))
         } else {
-            captureAndAlertRequestErrorHoc(updateLLmServer({ ...formData, config }).then(res => {
+            await captureAndAlertRequestErrorHoc(updateLLmServer({ ...formData, config }).then(res => {
                 onAfterSave(t('model.updateSuccess'))
                 onBack()
             }))
         }
+    }catch (error) {
+        console.error('Save error:', error);
+    } finally {
+        setIsLoading(false);
     }
+};
 
     const handleModelDel = () => {
         bsConfirm({
@@ -390,7 +401,14 @@ export default function ModelConfig({ id, onGetName, onBack, onReload, onBerforS
         <div className="absolute right-0 bottom-0 p-4 flex gap-4">
             {id !== -1 && <Button className="px-8" variant="destructive" onClick={handleModelDel}>{t('model.delete')}</Button>}
             <Button className="px-8" variant="outline" onClick={() => onBack()}>{t('model.cancel')}</Button>
-            <Button className="px-16" disabled={!formData.type} onClick={handleSave}>{t('model.save')}</Button>
+            <LoadButton 
+                className="px-16" 
+                disabled={!formData.type} 
+                loading={isLoading}
+                onClick={handleSave}
+            >
+                {t('model.save')}
+            </LoadButton>
         </div>
     </div>
 }

From 9b5f942c926dc15e53708f38db3df4f3ca19f65f Mon Sep 17 00:00:00 2001
From: dolphin <shanghang@dataelem.com>
Date: Mon, 12 May 2025 22:31:08 +0800
Subject: [PATCH 133/186] fix: export excle method

---
 .../platform/public/locales/en/bs.json        |   2 -
 .../platform/public/locales/zh/bs.json        |   2 -
 src/frontend/platform/public/models/data.json |   2 +-
 .../platform/src/controllers/request.ts       |   4 -
 .../BuildPage/flow/FlowChat/ChatInput.tsx     |  12 +-
 .../BuildPage/flow/FlowChat/ChatMessages.tsx  |   1 +
 .../BuildPage/flow/FlowChat/ChatPane.tsx      |  24 ++++
 .../BuildPage/flow/FlowChat/messageStore.ts   |  44 +++---
 .../flow/FlowNode/component/InputFormItem.tsx |  27 +++-
 .../src/pages/LogPage/useAppLog/index.tsx     |   7 +-
 .../src/pages/ModelPage/manage/CustomForm.tsx |  12 +-
 .../pages/ModelPage/manage/ModelConfig.tsx    | 136 +++++++++---------
 src/frontend/platform/src/util/utils.ts       |  13 +-
 13 files changed, 166 insertions(+), 120 deletions(-)

diff --git a/src/frontend/platform/public/locales/en/bs.json b/src/frontend/platform/public/locales/en/bs.json
index 2d59301f7..db91ea0ab 100644
--- a/src/frontend/platform/public/locales/en/bs.json
+++ b/src/frontend/platform/public/locales/en/bs.json
@@ -904,8 +904,6 @@
     "10910": "Current knowledge base version does not support segment modification. Please create a new knowledge base to modify segments.",
     "10800": "Service provider name already exists, please modify",
     "10801": "Model cannot be duplicated",
-    "10802": "Failed to add service provider, all models failed to initialize",
-    "10803": "Failed to add service provider, some models failed to initialize",
     "10700": "Tag already exists",
     "10701": "Tag not found",
     "10600": "Incorrect username or password",
diff --git a/src/frontend/platform/public/locales/zh/bs.json b/src/frontend/platform/public/locales/zh/bs.json
index 7ef84aa0b..c2da52388 100644
--- a/src/frontend/platform/public/locales/zh/bs.json
+++ b/src/frontend/platform/public/locales/zh/bs.json
@@ -901,8 +901,6 @@
     "10910": "当前知识库版本不支持修改分段，请创建新知识库后进行分段修改",
     "10800": "模型服务提供方名称重复，请修改",
     "10801": "模型不可重复",
-    "10802": "添加模型服务提供方失败，模型全部初始化失败",
-    "10803": "添加模型服务提供方失败，部分模型初始化失败",
     "10700": "标签已存在",
     "10701": "未找到对应的标签",
     "10600": "账号或密码错误",
diff --git a/src/frontend/platform/public/models/data.json b/src/frontend/platform/public/models/data.json
index 7137be76d..bcbfc93d0 100644
--- a/src/frontend/platform/public/models/data.json
+++ b/src/frontend/platform/public/models/data.json
@@ -84,7 +84,7 @@
         "model_name": "MiniMax-Text-01",
         "model_type": "llm"
     }],
-    "火山引擎": [{
+    "volcengine": [{
             "name": "model 1",
             "model_name": "deepseek-v3",
             "model_type": "llm"
diff --git a/src/frontend/platform/src/controllers/request.ts b/src/frontend/platform/src/controllers/request.ts
index 8b9b3daa0..ad09ffd1f 100644
--- a/src/frontend/platform/src/controllers/request.ts
+++ b/src/frontend/platform/src/controllers/request.ts
@@ -27,10 +27,6 @@ customAxios.interceptors.response.use(function (response) {
     const i18Msg = i18next.t(`errors.${response.data.status_code}`)
     const errorMessage = i18Msg === `errors.${response.data.status_code}` ? response.data.status_message : i18Msg
 
-    // 特殊状态码
-    if ([10802, 10803].includes(response.data.status_code)) {
-        return { ...response.data.data, code: response.data.status_code, msg: errorMessage };
-    }
     // 无权访问
     if (response.data.status_code === 403) {
         location.href = __APP_ENV__.BASE_URL + '/403'
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatInput.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatInput.tsx
index 48edcc6a3..e6f17a8de 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatInput.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatInput.tsx
@@ -8,12 +8,12 @@ import { useContext, useEffect, useMemo, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 // import GuideQuestions from "./GuideQuestions";
 // import { useMessageStore } from "./messageStore";
+import Tip from "@/components/bs-ui/tooltip/tip";
 import { RefreshCw } from "lucide-react";
 import useFlowStore from "../flowStore";
 import ChatFiles from "./ChatFiles";
 import GuideQuestions from "./GuideQuestions";
 import { useMessageStore } from "./messageStore";
-import Tip from "@/components/bs-ui/tooltip/tip";
 
 export const FileTypes = {
     IMAGE: ['.PNG', '.JPEG', '.JPG', '.BMP'],
@@ -305,6 +305,7 @@ export default function ChatInput({ autoRun, clear, form, wsUrl, onBeforSend, on
         } else if (data.category === 'stream_msg') {
             streamWsMsg(data)
         } else if (data.category === 'end_cover') {
+            setInputLock({ locked: true, reason: '' })
             return overWsMsg(data)
         }
 
@@ -318,6 +319,8 @@ export default function ChatInput({ autoRun, clear, form, wsUrl, onBeforSend, on
             }
         } else if (data.type === 'over') {
             createWsMsg(data)
+        } else if (data.type === 'end_cover') {
+            overWsMsg(data)
         }
     }
 
@@ -345,9 +348,12 @@ export default function ChatInput({ autoRun, clear, form, wsUrl, onBeforSend, on
         }
         const handleOutPutEvent = async (e) => {
             const { nodeId, data, message } = e.detail
+            const { flow_id, chat_id } = onBeforSend('flowInfo', {})
             await createWebSocket()
             sendWsMsg({
                 action: 'input',
+                flow_id,
+                chat_id,
                 data: {
                     [nodeId]: {
                         data,
@@ -422,7 +428,9 @@ export default function ChatInput({ autoRun, clear, form, wsUrl, onBeforSend, on
         restartCallBackRef.current[chatId] = () => {
             createWebSocket().then(() => {
                 setRestarted(false)
-                sendWsMsg(onBeforSend('init_data', {}))
+                onBeforSend('refresh_flow', {}).then((data) => {
+                    sendWsMsg(data)
+                })
             })
         }
         // wsRef.current?.close()
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatMessages.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatMessages.tsx
index 86b9df5cf..ab4d91a01 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatMessages.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatMessages.tsx
@@ -127,6 +127,7 @@ export default function ChatMessages({
                     case 'guide_word':
                     case 'output_msg':
                     case 'stream_msg':
+                    case "answer":
                         return <MessageBs
                             debug={debug}
                             mark={mark}
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatPane.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatPane.tsx
index 015f53ca4..87022050e 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatPane.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatPane.tsx
@@ -1,3 +1,4 @@
+import { getFlowApi } from "@/controllers/API/flow";
 import { useEffect } from "react";
 import Chat from "./Chat";
 import { useMessageStore } from "./messageStore";
@@ -10,6 +11,29 @@ export default function ChatPane({ debug = false, autoRun = false, chatId, flow,
     }, [chatId])
 
     const getMessage = (action, { nodeId, msg, category, extra, files, source, message_id }) => {
+        if (action === 'refresh_flow') {
+            return getFlowApi(flow.id, 'v1').then(f => {
+                const { data, ...other } = f
+                const { edges, nodes, viewport } = data
+                return {
+                    action,
+                    chat_id: chatId.startsWith('test') ? undefined : chatId,
+                    flow_id: flow.id,
+                    data: {
+                        ...other,
+                        edges,
+                        nodes,
+                        viewport
+                    }
+                }
+            })
+        }
+        if (action === 'flowInfo') {
+            return {
+                flow_id: flow.id,
+                chat_id: chatId.startsWith('test') ? undefined : chatId,
+            }
+        }
         if (action === 'getInputForm') {
             const node = flow.nodes.find(node => node.id === nodeId)
             if (node.data.tab.value === 'input') return null
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/messageStore.ts b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/messageStore.ts
index 9644efa28..63a9daf50 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/messageStore.ts
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/messageStore.ts
@@ -58,27 +58,29 @@ const handleHistoryMsg = (data: any[]): ChatMessageType[] => {
         .replace(/\t/g, '\\t')                  // 转义制表符
         .replace(/'/g, '"');                    // 将单引号替换为双引号
 
-    return data.filter(item => ["question", "output_with_input_msg", "output_with_choose_msg", "stream_msg", "output_msg", "guide_question", "guide_word", "input", "node_run"].includes(item.category)).map(item => {
-        let { message, files, is_bot, intermediate_steps, category, ...other } = item
-        try {
-            message = message && message[0] === '{' ? JSON.parse(message) : message || ''
-        } catch (e) {
-            // 未考虑的情况暂不处理
-            console.error('消息 to JSON error :>> ', e);
-        }
-        return {
-            ...other,
-            category,
-            chatKey: typeof message === 'string' ? undefined : Object.keys(message)[0],
-            end: true,
-            files: files ? JSON.parse(files) : [],
-            isSend: !is_bot,
-            message,
-            thought: intermediate_steps,
-            reasoning_log: message.reasoning_content || '',
-            noAccess: true
-        }
-    })
+    return data.filter(item =>
+        ["question", "output_with_input_msg", "output_with_choose_msg", "stream_msg", "output_msg", "guide_question", "guide_word", "node_run", "answer"].includes(item.category)
+        && (item.message || item.reasoning_log)).map(item => {
+            let { message, files, is_bot, intermediate_steps, category, ...other } = item
+            try {
+                message = message && message[0] === '{' ? JSON.parse(message) : message || ''
+            } catch (e) {
+                // 未考虑的情况暂不处理
+                console.error('消息 to JSON error :>> ', e);
+            }
+            return {
+                ...other,
+                category,
+                chatKey: typeof message === 'string' ? undefined : Object.keys(message)[0],
+                end: true,
+                files: files ? JSON.parse(files) : [],
+                isSend: !is_bot,
+                message,
+                thought: intermediate_steps,
+                reasoning_log: message.reasoning_content || '',
+                noAccess: true
+            }
+        })
 }
 
 let currentChatId = ''
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/InputFormItem.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/InputFormItem.tsx
index 8576459fc..bdc8ced0a 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/InputFormItem.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/InputFormItem.tsx
@@ -6,13 +6,14 @@ import { Switch } from "@/components/bs-ui/switch";
 import { QuestionTooltip } from "@/components/bs-ui/tooltip";
 import { isVarInFlow } from "@/util/flowUtils";
 import { ChevronsDown, CloudUpload, Type } from "lucide-react";
-import { useEffect, useRef, useState } from "react";
+import { useEffect, useMemo, useRef, useState } from "react";
 import { useTranslation } from "react-i18next"; // 引入国际化
 import useFlowStore from "../../flowStore";
 import DragOptions from "./DragOptions";
 import FileTypeSelect from "./FileTypeSelect";
 import InputItem from "./InputItem";
 import VarInput from "./VarInput";
+import { cloneDeep } from "lodash-es";
 
 const enum FormType {
     Text = "text",
@@ -647,6 +648,24 @@ export default function InputFormItem({ data, nodeId, onChange, onValidate, onVa
         return () => onValidate(() => { });
     }, [data.value]);
 
+    const options = useMemo(() => {
+        const _options = cloneDeep(data.value)
+        return _options.map((el) => {
+            // cn
+            if (el.type === 'text') {
+                el.value = el.value.replace(/{{#(.*?)#}}/g, (a, key) => {
+                    return data.varZh?.[key] || key;
+                })
+            }
+            
+            return {
+                key: el.key,
+                text: el.type === 'file' ? `${el.value}(${el.key},${el.file_content},${el.file_path})` : `${el.value}(${el.key})`,
+                type: el.type,
+            }
+        });
+    }, [data.value])
+
     const { flow } = useFlowStore();
     // 校验变量是否可用
     const validateVarAvailble = () => {
@@ -674,11 +693,7 @@ export default function InputFormItem({ data, nodeId, onChange, onValidate, onVa
                 <DragOptions
                     scroll
                     ref={scrollRef}
-                    options={data.value.map((el) => ({
-                        key: el.key,
-                        text: el.type === 'file' ? `${el.value}(${el.key},${el.file_content},${el.file_path})` : `${el.value}(${el.key})`,
-                        type: el.type,
-                    }))}
+                    options={options}
                     onEditClick={handleEditClick} // 点击编辑时执行的逻辑
                     onChange={handleOptionsChange} // 拖拽排序后的更新
                 />
diff --git a/src/frontend/platform/src/pages/LogPage/useAppLog/index.tsx b/src/frontend/platform/src/pages/LogPage/useAppLog/index.tsx
index ab0c01ebc..8cf1263d9 100644
--- a/src/frontend/platform/src/pages/LogPage/useAppLog/index.tsx
+++ b/src/frontend/platform/src/pages/LogPage/useAppLog/index.tsx
@@ -206,14 +206,14 @@ export default function AppUseLog() {
                 try {
                     msg = msg && msg[0] === '{' ? JSON.parse(msg) : msg || ''
                 } catch (error) {
-                    console.log('error :>> ', `${id} 消息转换失败`);
+                    console.error('error :>> ', `${id} 消息转换失败`);
                 }
                 // output
                 if ('output_with_input_msg' === category) return `${msg.msg} :${msg.hisValue}`
-                if ('output_with_choose_msg' === category) return `${msg.msg} :${msg.options.find(el => el.id === msg.hisValue).label}`
+                if ('output_with_choose_msg' === category) return `${msg.msg} :${msg.options.find(el => el.id === msg.hisValue)?.label}`
                 return typeof msg === 'string' ? msg : (msg.input || msg.msg)
             }
-            
+
             // 数据转换
             res.data.forEach(item => {
                 item.messages.forEach(msg => {
@@ -234,7 +234,6 @@ export default function AppUseLog() {
                     ])
                 })
             })
-
             // 导出excle
             const fileName = generateFileName(start_date, end_date, user.user_name);
             exportCsv(data, fileName)
diff --git a/src/frontend/platform/src/pages/ModelPage/manage/CustomForm.tsx b/src/frontend/platform/src/pages/ModelPage/manage/CustomForm.tsx
index 99b0de535..f15c2f30c 100644
--- a/src/frontend/platform/src/pages/ModelPage/manage/CustomForm.tsx
+++ b/src/frontend/platform/src/pages/ModelPage/manage/CustomForm.tsx
@@ -258,19 +258,19 @@ const modelProviders = {
     ],
     tencent: [
         {
-            label: "SecretId",
-            type: "password",
-            default: "",
+            label: "Base URL",
+            type: "text",
+            default: "https://api.hunyuan.cloud.tencent.com/v1",
             required: true,
-            key: "hunyuan_secret_id",
+            key: "base_url",
         },
         {
-            label: "SecretKey",
+            label: "API Key",
             type: "password",
             placeholder: "",
             default: "",
             required: true,
-            key: "hunyuan_secret_key",
+            key: "api_key",
         },
     ],
     moonshot: [
diff --git a/src/frontend/platform/src/pages/ModelPage/manage/ModelConfig.tsx b/src/frontend/platform/src/pages/ModelPage/manage/ModelConfig.tsx
index 07a09ed26..cc1309357 100644
--- a/src/frontend/platform/src/pages/ModelPage/manage/ModelConfig.tsx
+++ b/src/frontend/platform/src/pages/ModelPage/manage/ModelConfig.tsx
@@ -22,7 +22,7 @@ function ModelItem({ data, type, onDelete, onInput, onConfig }) {
     const [error, setError] = useState('')
     const [isWebSearchEnabled, setIsWebSearchEnabled] = useState(data.config?.enable_web_search || false)
     const [maxTokens, setMaxTokens] = useState(data.config?.max_tokens ?? '')
-   
+
 
     const handleInput = (e) => {
         const value = e.target.value
@@ -223,78 +223,78 @@ export default function ModelConfig({ id, onGetName, onBack, onReload, onBerforS
     }
 
     // submit 1
-    
+
     const { message, toast } = useToast()
     const formRef = useRef(null)
     const [isLoading, setIsLoading] = useState(false);
-    const handleSave = async() => {
+    const handleSave = async () => {
         setIsLoading(true)
         try {
-        const exists = onBerforSave(formData.id, formData.name)
-        if (exists) {
-            return message({
-                variant: 'warning',
-                description: t('model.duplicateServiceProviderName')
-            })
-        }
-        if (!formData.name || formData.name.length > 100) {
-            return message({
-                variant: 'warning',
-                description: t('model.duplicateServiceProviderNameValidation')
-            })
-        }
-        const [config, errorKey] = formRef.current.getData();
-        if (errorKey) {
-            return message({
-                variant: 'warning',
-                description: `${errorKey} ${t('model.notBeEmpty')}`
-            })
-        }
+            const exists = onBerforSave(formData.id, formData.name)
+            if (exists) {
+                return message({
+                    variant: 'warning',
+                    description: t('model.duplicateServiceProviderName')
+                })
+            }
+            if (!formData.name || formData.name.length > 100) {
+                return message({
+                    variant: 'warning',
+                    description: t('model.duplicateServiceProviderNameValidation')
+                })
+            }
+            const [config, errorKey] = formRef.current.getData();
+            if (errorKey) {
+                return message({
+                    variant: 'warning',
+                    description: `${errorKey} ${t('model.notBeEmpty')}`
+                })
+            }
 
-        // 重复检验map
-        const map = {}
-        let repeat = false
-        const error = formData.models.some(model => {
-            if (map[model.model_name]) repeat = true
-            map[model.model_name] = true
-            return !model.model_name || model.model_name.length > 100
-        })
-        if (error) {
-            return message({
-                variant: 'warning',
-                description: t('model.modelNameValidation')
+            // 重复检验map
+            const map = {}
+            let repeat = false
+            const error = formData.models.some(model => {
+                if (map[model.model_name]) repeat = true
+                map[model.model_name] = true
+                return !model.model_name || model.model_name.length > 100
             })
-        }
-        if (repeat) {
-            return message({
-                variant: 'warning',
-                description: t('model.modelDuplicate')
-            })
-        }
+            if (error) {
+                return message({
+                    variant: 'warning',
+                    description: t('model.modelNameValidation')
+                })
+            }
+            if (repeat) {
+                return message({
+                    variant: 'warning',
+                    description: t('model.modelDuplicate')
+                })
+            }
 
-        if (id === -1) {
-            captureAndAlertRequestErrorHoc(addLLmServer({ ...formData, config }).then(res => {
-                if (res.code === 10802) {
-                    return toast({
-                        variant: 'error',
-                        description: res.msg
-                    })
-                }
-                onAfterSave(res.code === 10803 ? res.msg : t('model.addSuccess'))
-                onBack()
-            }))
-        } else {
-            await captureAndAlertRequestErrorHoc(updateLLmServer({ ...formData, config }).then(res => {
-                onAfterSave(t('model.updateSuccess'))
-                onBack()
-            }))
+            if (id === -1) {
+                captureAndAlertRequestErrorHoc(addLLmServer({ ...formData, config }).then(res => {
+                    // if (res.code === 10802) {
+                    //     return toast({
+                    //         variant: 'error',
+                    //         description: res.msg
+                    //     })
+                    // }
+                    onAfterSave(res.code === 10803 ? res.msg : t('model.addSuccess'))
+                    onBack()
+                }))
+            } else {
+                await captureAndAlertRequestErrorHoc(updateLLmServer({ ...formData, config }).then(res => {
+                    onAfterSave(t('model.updateSuccess'))
+                    onBack()
+                }))
+            }
+        } catch (error) {
+            console.error('Save error:', error);
+        } finally {
+            setIsLoading(false);
         }
-    }catch (error) {
-        console.error('Save error:', error);
-    } finally {
-        setIsLoading(false);
-    }
-};
+    };
 
     const handleModelDel = () => {
         bsConfirm({
@@ -401,13 +401,13 @@ export default function ModelConfig({ id, onGetName, onBack, onReload, onBerforS
         <div className="absolute right-0 bottom-0 p-4 flex gap-4">
             {id !== -1 && <Button className="px-8" variant="destructive" onClick={handleModelDel}>{t('model.delete')}</Button>}
             <Button className="px-8" variant="outline" onClick={() => onBack()}>{t('model.cancel')}</Button>
-            <LoadButton 
-                className="px-16" 
-                disabled={!formData.type} 
+            <LoadButton
+                className="px-16"
+                disabled={!formData.type}
                 loading={isLoading}
                 onClick={handleSave}
             >
-                {t('model.save')}
+                {isLoading ? '模型状态检测中' : t('model.save')}
             </LoadButton>
         </div>
     </div>
diff --git a/src/frontend/platform/src/util/utils.ts b/src/frontend/platform/src/util/utils.ts
index e0e329eba..09d7cfb43 100644
--- a/src/frontend/platform/src/util/utils.ts
+++ b/src/frontend/platform/src/util/utils.ts
@@ -150,12 +150,17 @@ export function exportCsv(data: any[], fileName: string = 'test_result.csv') {
     // 将Worksheet转换为CSV字符串
     const csv = XLSX.utils.sheet_to_csv(ws);
 
+    // 处理Unicode字符并转换为Base64
+    const base64String = btoa(unescape(encodeURIComponent(csv)));
+    // 创建Data URL（使用base64编码避免URL编码问题）
+    const csvContent = `data:text/csv;charset=utf-8;base64,${base64String}`;
     // 生成CSV文件
-    const blob = new Blob([csv], { type: 'text/csv;charset=utf-8;' });
+    // const blob = new Blob([csv], { type: 'text/csv;charset=utf-8;' });
     // 创建下载链接
-    const url = URL.createObjectURL(blob);
+    // const url = URL.createObjectURL(blob);
     const a = document.createElement("a");
-    a.href = url;
+    a.href = csvContent;
+    // a.href = url;
     a.download = fileName;
 
     // 模拟点击下载链接
@@ -165,7 +170,7 @@ export function exportCsv(data: any[], fileName: string = 'test_result.csv') {
     // 清理URL对象
     setTimeout(function () {
         document.body.removeChild(a);
-        window.URL.revokeObjectURL(url);
+        // window.URL.revokeObjectURL(url);
     }, 0);
 }
 

From b4830fbe9a3536543a7a5242a0e733d885676990 Mon Sep 17 00:00:00 2001
From: lmr <350416710@qq.com>
Date: Tue, 13 May 2025 14:13:19 +0800
Subject: [PATCH 134/186] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/src/controllers/API/index.ts     |  4 +--
 .../platform/src/pages/KnowledgePage/qas.tsx  | 28 ++++++++-----------
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/src/frontend/platform/src/controllers/API/index.ts b/src/frontend/platform/src/controllers/API/index.ts
index 03be959ea..4d0c8531a 100644
--- a/src/frontend/platform/src/controllers/API/index.ts
+++ b/src/frontend/platform/src/controllers/API/index.ts
@@ -350,8 +350,8 @@ export async function getQaFilePreview(id, params): Promise<{
  */
 export async function updateQaStatus(id, status) {
   return await axios.post(`/api/v1/knowledge/qa/status_switch`, {
-    id:1461,
-    status:3
+    id,
+    status
   });
 }
 
diff --git a/src/frontend/platform/src/pages/KnowledgePage/qas.tsx b/src/frontend/platform/src/pages/KnowledgePage/qas.tsx
index 4965c0926..9966e95c8 100644
--- a/src/frontend/platform/src/pages/KnowledgePage/qas.tsx
+++ b/src/frontend/platform/src/pages/KnowledgePage/qas.tsx
@@ -296,25 +296,19 @@ export default function QasPage() {
         });
     };
 
+
     const handleStatusClick = async (id: number, checked: boolean) => {
+        const targetStatus = checked ? 1 : 0;
+        const isOpening = checked;
         try {
-          // 调用API更新状态
-          const targetStatus = checked ? 1 : 0;
-          const result = await updateQaStatus(id, targetStatus);
-          
-          if (result.success) {
-            refreshData((item) => item.id === id, { status: targetStatus });
-          } else {
-            // 只有尝试开启失败时才设为3（显示"未启用，请重试"）
-            // 关闭失败时保持原状态（不显示提示）
-            refreshData((item) => item.id === id, { 
-              status: targetStatus === 1 ? 3 : 0 
-            });
-          }
+            if (isOpening) {
+                refreshData(item => item.id === id, { status: 2 });
+              }
+            await updateQaStatus(id, targetStatus);
+            refreshData(item => item.id === id, { status: targetStatus });
         } catch (error) {
-          // 捕获异常时同样逻辑：只有尝试开启失败才显示提示
-          refreshData((item) => item.id === id, { 
-            status: checked ? 3 : 0 
+            refreshData(item => item.id === id, {
+            status:3 
           });
         }
       };
@@ -393,7 +387,7 @@ export default function QasPage() {
                                     <div className="flex items-center">
                                         <Switch
                                         checked={el.status === 1}
-                                        disabled={ el.status === 0||el.status === 3}
+                                        disabled={el.status === 3}
                                         onCheckedChange={(bln) => handleStatusClick(el.id, bln)}
                                         />
                                         {el.status === 2 && (

From 338cfd09dab831635cb3a80383435e03a74e4083 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Tue, 13 May 2025 15:04:29 +0800
Subject: [PATCH 135/186] fix: minimax max tokens default 2048

---
 src/backend/bisheng/interface/llms/custom.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/backend/bisheng/interface/llms/custom.py b/src/backend/bisheng/interface/llms/custom.py
index 26d6a32d8..e2e8f666b 100644
--- a/src/backend/bisheng/interface/llms/custom.py
+++ b/src/backend/bisheng/interface/llms/custom.py
@@ -82,6 +82,8 @@ def _get_qianfan_params(params: dict, server_config: dict, model_config: dict) -
 def _get_minimax_params(params: dict, server_config: dict, model_config: dict) -> dict:
     params['minimax_api_key'] = server_config.get('openai_api_key')
     params['base_url'] = server_config.get('openai_api_base')
+    if 'max_tokens' not in params:
+        params['max_tokens'] = 2048
     if '/chat/completions' not in params['base_url']:
         params['base_url'] = f"{params['base_url']}/chat/completions"
     return params

From 1fc631139b5d3bfd34ef48bfef5c4762c18c7095 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Tue, 13 May 2025 15:07:58 +0800
Subject: [PATCH 136/186] fix: input node form file empty error

---
 src/backend/bisheng/workflow/nodes/input/input.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/backend/bisheng/workflow/nodes/input/input.py b/src/backend/bisheng/workflow/nodes/input/input.py
index 9ff2aa2f9..c13418e4c 100644
--- a/src/backend/bisheng/workflow/nodes/input/input.py
+++ b/src/backend/bisheng/workflow/nodes/input/input.py
@@ -210,6 +210,9 @@ class InputNode(BaseNode):
                 file_content_length += len(file_content)
                 all_file_content += f"[file name]: {file_name}\n[file content begin]\n{file_content}\n[file content end]\n"
 
+            if not texts:
+                continue
+
             # 同一个变量对应的文件，放在一个file_id里
             for one in metadatas:
                 one.update({

From c763ef8945fe9c32c7c1e5598889abc418c7ec6e Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Tue, 13 May 2025 16:41:00 +0800
Subject: [PATCH 137/186] fix: sensitive create chat error

---
 src/backend/bisheng/api/v1/chat.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backend/bisheng/api/v1/chat.py b/src/backend/bisheng/api/v1/chat.py
index 9ff0da345..b75f6857d 100644
--- a/src/backend/bisheng/api/v1/chat.py
+++ b/src/backend/bisheng/api/v1/chat.py
@@ -309,7 +309,7 @@ def add_chat_messages(*,
             MessageSessionDao.insert_one(MessageSession(
                 chat_id=chat_id,
                 flow_id=flow_id,
-                flow_type=FlowType.FLOW.value,
+                flow_type=flow_info.flow_type,
                 flow_name=flow_info.name,
                 user_id=login_user.user_id,
                 sensitive_status=SensitiveStatus.VIOLATIONS.value,

From a06b1d493e1460bfb7804f16b7ec6f007c000326 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Tue, 13 May 2025 20:05:50 +0800
Subject: [PATCH 138/186] fix: judge make new session

---
 src/backend/bisheng/api/v1/chat.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/backend/bisheng/api/v1/chat.py b/src/backend/bisheng/api/v1/chat.py
index b75f6857d..0e8b7324e 100644
--- a/src/backend/bisheng/api/v1/chat.py
+++ b/src/backend/bisheng/api/v1/chat.py
@@ -300,8 +300,8 @@ def add_chat_messages(*,
     MessageSessionDao.update_sensitive_status(chat_id, SensitiveStatus.VIOLATIONS)
 
     # 写审计日志, 判断是否是新建会话
-    res = ChatMessageDao.get_messages_by_chat_id(chat_id=chat_id)
-    if len(res) <= 2:
+    session_info = MessageSessionDao.get_session_by_chat_id(chat_id=chat_id)
+    if not session_info:
         # 新建会话
         # 判断下是助手还是技能, 写审计日志
         flow_info = FlowDao.get_flow_by_id(flow_id)

From 12bfd641d2ddb1a9e82bc1a4fac0c9329794b191 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Tue, 13 May 2025 20:06:41 +0800
Subject: [PATCH 139/186] fix: change python version

---
 src/backend/pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backend/pyproject.toml b/src/backend/pyproject.toml
index 96af0f0cb..1e6109a50 100644
--- a/src/backend/pyproject.toml
+++ b/src/backend/pyproject.toml
@@ -18,7 +18,7 @@ include = ["./bisheng/*", "bisheng/**/*"]
 bisheng = "bisheng.__main__:main"
 
 [tool.poetry.dependencies]
-python = ">=3.10,<3.11"
+python = ">=3.10,<4.0"
 bisheng_langchain = "1.2.0.dev1"
 bisheng_pyautogen = "0.3.2"
 langchain = "^0.3.23"

From f8ef49b8c4334de8452b8a5c94fa3b96eef96a50 Mon Sep 17 00:00:00 2001
From: dolphin <shanghang@dataelem.com>
Date: Tue, 13 May 2025 22:56:34 +0800
Subject: [PATCH 140/186] fix: some bugfix

---
 .../platform/src/pages/BuildPage/apps.tsx     |  7 ++++-
 .../BuildPage/flow/FlowChat/ChatInput.tsx     |  9 ++++---
 .../BuildPage/flow/FlowChat/ChatPane.tsx      |  2 +-
 .../flow/FlowNode/component/InputFormItem.tsx | 27 +++++++++++++------
 .../src/pages/BuildPage/flow/Header.tsx       |  5 ++--
 .../src/pages/BuildPage/flow/Notification.tsx |  3 ++-
 .../ChatAppPage/components/MarkLabel.tsx      |  2 +-
 .../components/ParagraphEdit.tsx              | 21 ++++++++++-----
 .../pages/ModelPage/manage/ModelConfig.tsx    |  4 +--
 .../SystemPage/components/EditUserGroup.tsx   | 12 ++++++++-
 .../platform/src/util/flowCompatible.ts       |  4 +--
 src/frontend/platform/src/util/flowUtils.ts   |  3 +++
 12 files changed, 70 insertions(+), 29 deletions(-)

diff --git a/src/frontend/platform/src/pages/BuildPage/apps.tsx b/src/frontend/platform/src/pages/BuildPage/apps.tsx
index 248e41158..66621d9ba 100644
--- a/src/frontend/platform/src/pages/BuildPage/apps.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/apps.tsx
@@ -127,7 +127,11 @@ export default function apps() {
         })
     }
 
+    const { toast } = useToast()
     const handleSetting = (data) => {
+        if (!data.write) {
+            return toast({ variant: 'warning', description: '无编辑权限' })
+        }
         if (data.flow_type === 5) {
             // 上线状态下，助手不能进入编辑
             navigate(`/assistant/${data.id}`)
@@ -215,7 +219,8 @@ export default function apps() {
                                     id={item.id}
                                     logo={item.logo}
                                     type={TypeNames[item.flow_type]}
-                                    edit={item.write}
+                                    edit
+                                    // edit={item.write}
                                     title={item.name}
                                     isAdmin={user.role === 'admin'}
                                     description={item.description}
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatInput.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatInput.tsx
index e6f17a8de..da0dd810a 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatInput.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatInput.tsx
@@ -222,7 +222,7 @@ export default function ChatInput({ autoRun, clear, form, wsUrl, onBeforSend, on
                         }
                         setInputLock({ locked: true, reason: '' })
                     }
-                    addNotification({
+                    event.reason && addNotification({
                         type: 'error',
                         title: '运行异常',
                         description: event.reason
@@ -304,9 +304,10 @@ export default function ChatInput({ autoRun, clear, form, wsUrl, onBeforSend, on
             return questionsRef.current.updateQuestions(data.message.guide_question.filter(q => q))
         } else if (data.category === 'stream_msg') {
             streamWsMsg(data)
-        } else if (data.category === 'end_cover') {
-            setInputLock({ locked: true, reason: '' })
-            return overWsMsg(data)
+        } else if (data.category === 'end_cover' && data.type === 'end') {
+            // setInputLock({ locked: true, reason: '' })
+            overWsMsg(data)
+            return handleRestartClick()
         }
 
         if (data.type === 'close') {
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatPane.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatPane.tsx
index 87022050e..fb41ec21e 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatPane.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatPane.tsx
@@ -16,7 +16,7 @@ export default function ChatPane({ debug = false, autoRun = false, chatId, flow,
                 const { data, ...other } = f
                 const { edges, nodes, viewport } = data
                 return {
-                    action,
+                    action: 'init_data',
                     chat_id: chatId.startsWith('test') ? undefined : chatId,
                     flow_id: flow.id,
                     data: {
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/InputFormItem.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/InputFormItem.tsx
index bdc8ced0a..033daf7f2 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/InputFormItem.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/InputFormItem.tsx
@@ -5,6 +5,7 @@ import { Label } from "@/components/bs-ui/label";
 import { Switch } from "@/components/bs-ui/switch";
 import { QuestionTooltip } from "@/components/bs-ui/tooltip";
 import { isVarInFlow } from "@/util/flowUtils";
+import { cloneDeep } from "lodash-es";
 import { ChevronsDown, CloudUpload, Type } from "lucide-react";
 import { useEffect, useMemo, useRef, useState } from "react";
 import { useTranslation } from "react-i18next"; // 引入国际化
@@ -13,7 +14,6 @@ import DragOptions from "./DragOptions";
 import FileTypeSelect from "./FileTypeSelect";
 import InputItem from "./InputItem";
 import VarInput from "./VarInput";
-import { cloneDeep } from "lodash-es";
 
 const enum FormType {
     Text = "text",
@@ -52,6 +52,12 @@ function Form({ nodeId, nodeData, initialData, onSubmit, onCancel, existingOptio
     const [errors, setErrors] = useState<any>({});
     const editRef = useRef(false); // 编辑状态
     const oldFormTypeRef = useRef('')
+    const displayNameRef = useRef({ // 记忆变量名
+        [FormType.Text]: '',
+        [FormType.Select]: '',
+        [FormType.File]: '',
+    });
+
 
     const oldVarNameRef = useRef("");
     const oldcontentNameRef = useRef("");
@@ -256,10 +262,12 @@ function Form({ nodeId, nodeData, initialData, onSubmit, onCancel, existingOptio
 
     // if the form type hasn't changed, it keeps the variable name as it was. Otherwise, it generates a new unique variable name.
     const handleChangeFormType = (formType) => {
-        setFormData({ ...formData, formType })
+        displayNameRef.current[formData.formType] = formData.displayName;
+        const displayName = displayNameRef.current[formType] || '';
+        setFormData({ ...formData, displayName, formType })
         if (editRef.current) {
             if (oldFormTypeRef.current === formType) {
-                setFormData({ ...formData, formType, variableName: oldVarNameRef.current })
+                setFormData({ ...formData, formType, variableName: oldVarNameRef.current, displayName })
             } else {
                 let counter = 1;
                 let initialVarName = names[formType];
@@ -267,7 +275,7 @@ function Form({ nodeId, nodeData, initialData, onSubmit, onCancel, existingOptio
                     counter += 1;
                     initialVarName = `${names[formType]}${counter}`;
                 }
-                setFormData({ ...formData, formType, variableName: initialVarName })
+                setFormData({ ...formData, formType, variableName: initialVarName, displayName })
             }
         }
     }
@@ -539,6 +547,8 @@ function Form({ nodeId, nodeData, initialData, onSubmit, onCancel, existingOptio
         </form>
     );
 }
+
+// node input form item
 export default function InputFormItem({ data, nodeId, onChange, onValidate, onVarEvent }) {
     const { t } = useTranslation('flow'); // 使用国际化
     const [isOpen, setIsOpen] = useState(false);
@@ -597,7 +607,7 @@ export default function InputFormItem({ data, nodeId, onChange, onValidate, onVa
             );
         } else {
             // 新建模式，添加表单项
-            data.value.push({
+            data.value = [...data.value, {
                 key,
                 type,
                 value,
@@ -609,7 +619,7 @@ export default function InputFormItem({ data, nodeId, onChange, onValidate, onVa
                 options,
                 file_content_size,
                 image_file
-            });
+            }];
             setTimeout(() => {
                 scrollRef.current?.scrollTo(0, scrollRef.current?.scrollHeight); // 滚动到底部
             }, 0);
@@ -657,7 +667,7 @@ export default function InputFormItem({ data, nodeId, onChange, onValidate, onVa
                     return data.varZh?.[key] || key;
                 })
             }
-            
+
             return {
                 key: el.key,
                 text: el.type === 'file' ? `${el.value}(${el.key},${el.file_content},${el.file_path})` : `${el.value}(${el.key})`,
@@ -715,7 +725,7 @@ export default function InputFormItem({ data, nodeId, onChange, onValidate, onVa
                         </DialogTitle>
                     </DialogHeader>
 
-                    <Form
+                    {isOpen && <Form
                         nodeId={nodeId}
                         nodeData={data}
                         initialData={
@@ -727,6 +737,7 @@ export default function InputFormItem({ data, nodeId, onChange, onValidate, onVa
                         onCancel={handleClose} // 取消关闭弹窗
                         existingOptions={data.value} // 传递当前所有 options 以检查重复
                     />
+                    }
                 </DialogContent>
             </Dialog>
         </div>
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/Header.tsx b/src/frontend/platform/src/pages/BuildPage/flow/Header.tsx
index 36b8e098e..228a88523 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/Header.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/Header.tsx
@@ -310,8 +310,9 @@ const Header = ({ flow, nodes, onTabChange, preFlow, onPreFlowChange, onImportFl
                     {t('run')}
                 </Button>
                 <Button variant="outline" size="sm" className={`${!dark && 'bg-[#fff]'} h-8 px-6`} onClick={async () => {
+                    window.flow_version = Number(version.id)
                     await handleSaveClick()
-                    forceUpdateFlow({ ...flow }) // 用于对比差异
+                    forceUpdateFlow({ ...flow }) // 更新flow状态, 用于保存时对比差异
                 }}>
                     {t('save')}
                 </Button>
@@ -438,7 +439,7 @@ const Header = ({ flow, nodes, onTabChange, preFlow, onPreFlowChange, onImportFl
                 <DialogContent className="sm:max-w-[425px]" close={false}>
                     <DialogHeader>
                         <DialogTitle>{t('prompt')}</DialogTitle>
-                        {isOnlineVersion ? t('onlineVersionMessage') : t('unsavedChangesMessage')}
+                        <p className="bisheng-label pt-2">{isOnlineVersion ? t('onlineVersionMessage') : t('unsavedChangesMessage')}</p>
                     </DialogHeader>
                     <DialogFooter>
                         <Button className="leave h-8" onClick={handleSaveAndClose}>
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/Notification.tsx b/src/frontend/platform/src/pages/BuildPage/flow/Notification.tsx
index 32e3d4933..01fcbbd6b 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/Notification.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/Notification.tsx
@@ -19,8 +19,9 @@ export default function Notification() {
     return (
         <Popover open={open} onOpenChange={setOpen}>
             <PopoverTrigger asChild>
-                <Button size="icon" variant="outline" className={`${!dark && 'bg-[#fff]'} size-8`}>
+                <Button size="icon" variant="outline" className={`${!dark && 'bg-[#fff]'} size-8 relative`}>
                     <Bell size={16} />
+                    {notifications.length > 0 && <div className="absolute top-1 right-1 rounded-full bg-status-red size-1.5"></div>}
                 </Button>
             </PopoverTrigger>
             <PopoverContent className="p-2 cursor-pointer w-[400px] h-[500px] pb-10">
diff --git a/src/frontend/platform/src/pages/ChatAppPage/components/MarkLabel.tsx b/src/frontend/platform/src/pages/ChatAppPage/components/MarkLabel.tsx
index 1ac8caf6f..8dd0f5d61 100644
--- a/src/frontend/platform/src/pages/ChatAppPage/components/MarkLabel.tsx
+++ b/src/frontend/platform/src/pages/ChatAppPage/components/MarkLabel.tsx
@@ -48,7 +48,7 @@ export default function MarkLabel({ open, home, onClose }) {
 
     const handleConfirm = async () => {
         await captureAndAlertRequestErrorHoc(updateHomeLabelApi(selected.map(s => s.value)))
-        onClose(false)
+        onClose(true)
     }
 
     const handleSelect = (id) => {
diff --git a/src/frontend/platform/src/pages/KnowledgePage/components/ParagraphEdit.tsx b/src/frontend/platform/src/pages/KnowledgePage/components/ParagraphEdit.tsx
index 1be51e8e0..03a0b15f2 100644
--- a/src/frontend/platform/src/pages/KnowledgePage/components/ParagraphEdit.tsx
+++ b/src/frontend/platform/src/pages/KnowledgePage/components/ParagraphEdit.tsx
@@ -48,19 +48,28 @@ const ParagraphEdit = ({
         //     arrData.unshift(prioritizedItem);
         // }
         // 当前chunk优先排前面
-        const newArrData = arrData.slice();
-        const [element] = newArrData.splice(newArrData.findIndex(item => item.metadata.chunk_index === chunkId), 1);
-        newArrData.unshift(element);
+        // const newArrData = arrData.slice();
+        // const [element] = newArrData.splice(newArrData.findIndex(item => item.metadata.chunk_index === chunkId), 1);
+        // newArrData.unshift(element);
 
         const seenIds = new Set()
-        newArrData.forEach(chunk => {
+        arrData.forEach(chunk => {
             const { bbox, chunk_index } = chunk.metadata
             const labels = bbox && JSON.parse(bbox).chunk_bboxes || []
 
             const active = chunk_index === chunkId
             const resData = labels.reduce((acc, label) => {
                 const id = [label.page, ...label.bbox].join('-');
-                if (!seenIds.has(id)) {
+                if (seenIds.has(id) && active) {
+                    // 优先使用高亮的label
+                    labelsData[labelsData.findIndex(item => item.id === id)] = {
+                        id: id,
+                        page: label.page,
+                        label: label.bbox,
+                        active: active,
+                        txt: chunk.text
+                    }
+                } else if (!seenIds.has(id)) {
                     seenIds.add(id);
                     acc.push({
                         id: id,
@@ -100,7 +109,7 @@ const ParagraphEdit = ({
         const _value = markDownRef.current.getValue().trim()
         setValue(_value)
         if (!_value) return
-        
+
         const bbox = {
             chunk_bboxes: prevOvergapData.current.reduce((arr, item) => {
                 if (item.active) {
diff --git a/src/frontend/platform/src/pages/ModelPage/manage/ModelConfig.tsx b/src/frontend/platform/src/pages/ModelPage/manage/ModelConfig.tsx
index cc1309357..3a401e367 100644
--- a/src/frontend/platform/src/pages/ModelPage/manage/ModelConfig.tsx
+++ b/src/frontend/platform/src/pages/ModelPage/manage/ModelConfig.tsx
@@ -273,7 +273,7 @@ export default function ModelConfig({ id, onGetName, onBack, onReload, onBerforS
             }
 
             if (id === -1) {
-                captureAndAlertRequestErrorHoc(addLLmServer({ ...formData, config }).then(res => {
+                await captureAndAlertRequestErrorHoc(addLLmServer({ ...formData, config }).then(res => {
                     // if (res.code === 10802) {
                     //     return toast({
                     //         variant: 'error',
@@ -382,11 +382,11 @@ export default function ModelConfig({ id, onGetName, onBack, onReload, onBerforS
                     <div className="w-[92%]">
                         {
                             formData.models.map((m, i) => <ModelItem
+                                key={m.name + m.model_name}
                                 data={m}
                                 type={formData.type}
                                 onInput={(name, type) => handleModelChange(name, type, i)}
                                 onConfig={(config) => handleModelConfig(config, i)}
-                                key={m.name}
                                 onDelete={() => handleDelete(i)}
                             />)
                         }
diff --git a/src/frontend/platform/src/pages/SystemPage/components/EditUserGroup.tsx b/src/frontend/platform/src/pages/SystemPage/components/EditUserGroup.tsx
index 1ec7eb1cd..58c5ff445 100644
--- a/src/frontend/platform/src/pages/SystemPage/components/EditUserGroup.tsx
+++ b/src/frontend/platform/src/pages/SystemPage/components/EditUserGroup.tsx
@@ -40,17 +40,21 @@ function FlowRadio({ limit, onChange }) {
     const { t } = useTranslation()
     const [status, setStatus] = useState(LimitType.UNLIMITED)
     const [limitState, setLimitState] = useState<any>(limit)
+    const limitRef = useRef(0)
 
     const handleCommit = (type: LimitType, value: string = '0') => {
+        if (value === '') return
         const valueNum = parseInt(value)
         if (valueNum < 0 || valueNum > 9999) return
         setStatus(type)
         setLimitState(value)
         onChange(Number(value))
+        limitRef.current = Number(value)
     }
     useEffect(() => {
         setStatus(limit ? LimitType.LIMITED : LimitType.UNLIMITED)
         setLimitState(limit)
+        limitRef.current = limit
     }, [limit])
 
     return <div>
@@ -72,7 +76,13 @@ function FlowRadio({ limit, onChange }) {
                     type="number"
                     value={limitState}
                     className="inline h-5 w-[70px] font-medium"
-                    onChange={(e) => handleCommit(LimitType.LIMITED, e.target.value)} />
+                    onChange={(e) => handleCommit(LimitType.LIMITED, e.target.value)}
+                    onBlur={(e) => {
+                        if(e.target.value === '') {
+                            e.target.value = limitRef.current + ''
+                        }
+                    }}
+                />
                 <Label className="whitespace-nowrap">{t('system.perMinute')}</Label>
             </div>}
         </RadioGroup>
diff --git a/src/frontend/platform/src/util/flowCompatible.ts b/src/frontend/platform/src/util/flowCompatible.ts
index 3feb27687..fa4a206f0 100644
--- a/src/frontend/platform/src/util/flowCompatible.ts
+++ b/src/frontend/platform/src/util/flowCompatible.ts
@@ -98,11 +98,11 @@ const comptibleInput = (node) => {
 
         // 兼容文件类型
         const formInput = node.group_params[0].params.find(item => item.key === 'form_input')
-        formInput.value = formInput.value.map((item) => {
+        formInput.value = formInput.value.map((item, index) => {
             if (item.type === 'file') {
                 item.file_type = 'all'
                 item.file_content_size = 15000
-                item.image_file = 'image_file' + generateUUID(2)
+                item.image_file = 'image_file' + (index || '')
                 return item
             }
             return item
diff --git a/src/frontend/platform/src/util/flowUtils.ts b/src/frontend/platform/src/util/flowUtils.ts
index 20c3bdb11..b8e9d0591 100644
--- a/src/frontend/platform/src/util/flowUtils.ts
+++ b/src/frontend/platform/src/util/flowUtils.ts
@@ -110,7 +110,10 @@ export function isVarInFlow(nodeId, nodes, varName, varNameCn) {
                     return false
                 } else if (param.type === 'form') {
                     return param.value.some(item => {
+                        // 文本类型
+                        if (item.type === 'text' && `${node.id}.${item.key}` !== varName) return false
                         // if (item.multiple) return `${node.id}.${item.key}` === varName
+                        // 文件类型
                         const vars = [`${node.id}.${item.key}`, `${node.id}.${item.file_content}`, `${node.id}.${item.file_path}`]
                         // 图片类型追加校验变量
                         item.file_type !== 'file' && vars.push(`${node.id}.${item.image_file}`)

From 6494e9056b2f1d36de262443b47063205f941024 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Wed, 14 May 2025 14:52:24 +0800
Subject: [PATCH 141/186] fix: sql agent tool error

---
 .../bisheng_langchain/gpts/tools/sql_agent/tool.py              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bisheng-langchain/bisheng_langchain/gpts/tools/sql_agent/tool.py b/src/bisheng-langchain/bisheng_langchain/gpts/tools/sql_agent/tool.py
index 2b1a0855c..733aff7bc 100644
--- a/src/bisheng-langchain/bisheng_langchain/gpts/tools/sql_agent/tool.py
+++ b/src/bisheng-langchain/bisheng_langchain/gpts/tools/sql_agent/tool.py
@@ -63,7 +63,7 @@ class SqlAgentAPIWrapper(BaseModel):
         toolkit = SQLDatabaseToolkit(db=self.db, llm=self.llm)
         tools = toolkit.get_tools()
         self.agent = create_react_agent(
-            llm,
+            self.llm,
             tools,
             prompt=_agent_system_prompt.format(dialect=self.db.dialect),
             checkpointer=False,

From 59a7c2f8a539c277c7198d15ffabb557d86da06c Mon Sep 17 00:00:00 2001
From: dolphin <shanghang@dataelem.com>
Date: Wed, 14 May 2025 15:07:48 +0800
Subject: [PATCH 142/186] fix: Chat history is not displayed after deleting the
 app

---
 .../platform/src/pages/ChatAppPage/components/ChatPanne.tsx     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/frontend/platform/src/pages/ChatAppPage/components/ChatPanne.tsx b/src/frontend/platform/src/pages/ChatAppPage/components/ChatPanne.tsx
index 7fca14b3b..5ff17fb27 100644
--- a/src/frontend/platform/src/pages/ChatAppPage/components/ChatPanne.tsx
+++ b/src/frontend/platform/src/pages/ChatAppPage/components/ChatPanne.tsx
@@ -84,7 +84,7 @@ export default function ChatPanne({ customWsHost = '', appendHistory = false, da
             setFlow(null)
             flowRef.current = null
             setWorkflow(null)
-            const _flow = await getFlowApi(id, version)
+            const _flow = { id, data: { nodes: [], edges: [], viewport: {} } } // await getFlowApi(id, version)
 
             if (isV1) {
                 const res = await loadFlowHistoryMsg(_flow.id, chatId, {

From 28a95b2503c37abf2980d9802bc8f2feecf0dd0f Mon Sep 17 00:00:00 2001
From: dolphin <shanghang@dataelem.com>
Date: Wed, 14 May 2025 15:10:02 +0800
Subject: [PATCH 143/186] fix: Chat history is not displayed after deleting the
 app

---
 .../src/pages/ChatAppPage/components/ChatPanne.tsx         | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/frontend/platform/src/pages/ChatAppPage/components/ChatPanne.tsx b/src/frontend/platform/src/pages/ChatAppPage/components/ChatPanne.tsx
index 5ff17fb27..fa6e38b93 100644
--- a/src/frontend/platform/src/pages/ChatAppPage/components/ChatPanne.tsx
+++ b/src/frontend/platform/src/pages/ChatAppPage/components/ChatPanne.tsx
@@ -84,7 +84,12 @@ export default function ChatPanne({ customWsHost = '', appendHistory = false, da
             setFlow(null)
             flowRef.current = null
             setWorkflow(null)
-            const _flow = { id, data: { nodes: [], edges: [], viewport: {} } } // await getFlowApi(id, version)
+            let _flow = { id, data: { nodes: [], edges: [], viewport: {} } } // await getFlowApi(id, version)
+            try {
+                _flow = await getFlowApi(id, version)
+            } catch (e) {
+                console.error('e :>> ', e);
+            }
 
             if (isV1) {
                 const res = await loadFlowHistoryMsg(_flow.id, chatId, {

From 89fcccd697ebf23ffdfe3177d1581f5f6cc77013 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Wed, 14 May 2025 15:15:48 +0800
Subject: [PATCH 144/186] fix: workflow api add some field

---
 src/backend/bisheng/api/services/workflow.py  | 2 ++
 src/backend/bisheng/api/v1/schema/workflow.py | 1 +
 2 files changed, 3 insertions(+)

diff --git a/src/backend/bisheng/api/services/workflow.py b/src/backend/bisheng/api/services/workflow.py
index 952fba832..c68828c16 100644
--- a/src/backend/bisheng/api/services/workflow.py
+++ b/src/backend/bisheng/api/services/workflow.py
@@ -258,6 +258,7 @@ class WorkFlowService(BaseService):
                     key=event_input_schema.get('key'),
                     type='text',
                     required=True,
+                    value=''
                 )
             ]
             for one in event_input_schema.get('value', []):
@@ -267,6 +268,7 @@ class WorkFlowService(BaseService):
                     tmp.value = []
                 elif tmp.key == 'dialog_file_accept':
                     tmp.type = 'dialog_file_accept'
+                input_schema.value.append(tmp)
         workflow_event.input_schema = input_schema
         return workflow_event
 
diff --git a/src/backend/bisheng/api/v1/schema/workflow.py b/src/backend/bisheng/api/v1/schema/workflow.py
index dfba061f9..5d705b5db 100644
--- a/src/backend/bisheng/api/v1/schema/workflow.py
+++ b/src/backend/bisheng/api/v1/schema/workflow.py
@@ -37,6 +37,7 @@ class WorkflowInputItem(BaseModel):
     multiple: bool = Field(default=False, description='The input is multi select')
     required: bool = Field(default=False, description='The input is required')
     options: Optional[Any] = Field(default=None, description='The select type options')
+    file_type: Optional[str] = Field(default=None, description='The allow upload file type')
 
 
 class WorkflowInputSchema(BaseModel):

From 51cf8b43d3134594f9da0199d8e44a78c07a32dd Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Wed, 14 May 2025 16:30:49 +0800
Subject: [PATCH 145/186] Revert "fix: change python version"

This reverts commit 12bfd641d2ddb1a9e82bc1a4fac0c9329794b191.
---
 src/backend/pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backend/pyproject.toml b/src/backend/pyproject.toml
index 1e6109a50..96af0f0cb 100644
--- a/src/backend/pyproject.toml
+++ b/src/backend/pyproject.toml
@@ -18,7 +18,7 @@ include = ["./bisheng/*", "bisheng/**/*"]
 bisheng = "bisheng.__main__:main"
 
 [tool.poetry.dependencies]
-python = ">=3.10,<4.0"
+python = ">=3.10,<3.11"
 bisheng_langchain = "1.2.0.dev1"
 bisheng_pyautogen = "0.3.2"
 langchain = "^0.3.23"

From 213680d15c77bd69680f3187b9d82d389a0f8617 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Wed, 14 May 2025 18:48:48 +0800
Subject: [PATCH 146/186] fix: update model status when exception

---
 src/backend/bisheng/api/services/llm.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/backend/bisheng/api/services/llm.py b/src/backend/bisheng/api/services/llm.py
index 11a438009..fc3abea8a 100644
--- a/src/backend/bisheng/api/services/llm.py
+++ b/src/backend/bisheng/api/services/llm.py
@@ -137,6 +137,7 @@ class LLMService:
                 bisheng_embed = cls.get_bisheng_embedding(model_id=model.id, ignore_online=True, cache=False)
                 bisheng_embed.embed_query('hello')
         except Exception as e:
+            LLMDao.update_model_status(model.id, 1, str(e))
             logger.exception(f'test model status: {model.id} {model.model_name}')
 
     @classmethod

From 1063d86638ed1523416b3861a2a2d1547fe63e1d Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Wed, 14 May 2025 18:53:39 +0800
Subject: [PATCH 147/186] fix: spark support embedding model

---
 src/backend/bisheng/interface/embeddings/custom.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/backend/bisheng/interface/embeddings/custom.py b/src/backend/bisheng/interface/embeddings/custom.py
index 4fed4f82c..c2f6850bb 100644
--- a/src/backend/bisheng/interface/embeddings/custom.py
+++ b/src/backend/bisheng/interface/embeddings/custom.py
@@ -72,6 +72,7 @@ class BishengEmbedding(BaseModel, Embeddings):
         LLMServerType.MINIMAX.value: 'OpenAIEmbeddings',
         LLMServerType.ZHIPU.value: 'OpenAIEmbeddings',
         LLMServerType.TENCENT.value: 'OpenAIEmbeddings',
+        LLMServerType.VOLCENGINE.value: 'OpenAIEmbeddings',
     }
 
     # bisheng强相关的业务参数

From 4b8317ed2471ca6740f6d4434e9d98cab93b9c59 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Wed, 14 May 2025 18:55:26 +0800
Subject: [PATCH 148/186] fix: silicon support embedding model

---
 src/backend/bisheng/interface/embeddings/custom.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/backend/bisheng/interface/embeddings/custom.py b/src/backend/bisheng/interface/embeddings/custom.py
index c2f6850bb..77dba4a58 100644
--- a/src/backend/bisheng/interface/embeddings/custom.py
+++ b/src/backend/bisheng/interface/embeddings/custom.py
@@ -73,6 +73,7 @@ class BishengEmbedding(BaseModel, Embeddings):
         LLMServerType.ZHIPU.value: 'OpenAIEmbeddings',
         LLMServerType.TENCENT.value: 'OpenAIEmbeddings',
         LLMServerType.VOLCENGINE.value: 'OpenAIEmbeddings',
+        LLMServerType.SILICON.value: 'OpenAIEmbeddings',
     }
 
     # bisheng强相关的业务参数

From 9b85656b0e0ab8eaca5aec882a8a4d1dabd0a21a Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Thu, 15 May 2025 10:42:56 +0800
Subject: [PATCH 149/186] fix: get session error

---
 src/backend/bisheng/api/v1/chat.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backend/bisheng/api/v1/chat.py b/src/backend/bisheng/api/v1/chat.py
index 0e8b7324e..63e7c1fd3 100644
--- a/src/backend/bisheng/api/v1/chat.py
+++ b/src/backend/bisheng/api/v1/chat.py
@@ -300,7 +300,7 @@ def add_chat_messages(*,
     MessageSessionDao.update_sensitive_status(chat_id, SensitiveStatus.VIOLATIONS)
 
     # 写审计日志, 判断是否是新建会话
-    session_info = MessageSessionDao.get_session_by_chat_id(chat_id=chat_id)
+    session_info = MessageSessionDao.get_one(chat_id=chat_id)
     if not session_info:
         # 新建会话
         # 判断下是助手还是技能, 写审计日志

From 39532e4797b43f2fa8fd9791b01b343fc895a83d Mon Sep 17 00:00:00 2001
From: dolphin <shanghang@dataelem.com>
Date: Thu, 15 May 2025 12:23:54 +0800
Subject: [PATCH 150/186] =?UTF-8?q?fix:=20=E6=BA=AF=E6=BA=90=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0loading?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/src/controllers/API/pro.ts       |  2 +-
 .../ChatAppPage/components/ResouceModal.tsx   | 19 +++++++++++++++++--
 .../pages/ModelPage/manage/ModelConfig.tsx    | 13 +++++++++----
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/frontend/platform/src/controllers/API/pro.ts b/src/frontend/platform/src/controllers/API/pro.ts
index 9971ee468..53cc7343c 100644
--- a/src/frontend/platform/src/controllers/API/pro.ts
+++ b/src/frontend/platform/src/controllers/API/pro.ts
@@ -68,7 +68,7 @@ export const saveGroupApi = async (data: any): Promise<any> => {
         group_name,
         assistant,
         skill,
-        workFlows
+        work_flows: workFlows
     });
 };
 
diff --git a/src/frontend/platform/src/pages/ChatAppPage/components/ResouceModal.tsx b/src/frontend/platform/src/pages/ChatAppPage/components/ResouceModal.tsx
index 5c1317204..2808b7bef 100644
--- a/src/frontend/platform/src/pages/ChatAppPage/components/ResouceModal.tsx
+++ b/src/frontend/platform/src/pages/ChatAppPage/components/ResouceModal.tsx
@@ -1,4 +1,5 @@
 import { checkSassUrl } from "@/components/bs-comp/FileView";
+import { LoadingIcon } from "@/components/bs-icons/loading";
 import { Dialog, DialogContent } from "@/components/bs-ui/dialog";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/bs-ui/tooltip";
 import Tip from "@/components/bs-ui/tooltip/tip";
@@ -212,12 +213,26 @@ export const ResouceContent = ({ data, setOpen, fullScreen = false }) => {
         setKeywords(keywords.filter((wd, i) => i !== index))
     }
 
-    return <div>
+    const [loading, setLoading] = useState(true)
+    const handleAnwserInit = (words) => {
+        setKeywords(words)
+        if (words.length) {
+            setLoading(false)
+        }
+    }
+
+
+    return <div className="relative">
+        {
+            loading && <div className="absolute w-full h-full top-0 left-0 flex justify-center items-center z-10 bg-[rgba(255,255,255,0.6)] dark:bg-blur-shared">
+                <LoadingIcon />
+            </div>
+        }
         <Anwser
             id={data.messageId}
             fullScreen={fullScreen}
             msg={data.message}
-            onInit={setKeywords}
+            onInit={handleAnwserInit}
             onAdd={handleAddWord}></Anwser>
         <ResultPanne
             words={keywords}
diff --git a/src/frontend/platform/src/pages/ModelPage/manage/ModelConfig.tsx b/src/frontend/platform/src/pages/ModelPage/manage/ModelConfig.tsx
index 3a401e367..60be9c17c 100644
--- a/src/frontend/platform/src/pages/ModelPage/manage/ModelConfig.tsx
+++ b/src/frontend/platform/src/pages/ModelPage/manage/ModelConfig.tsx
@@ -1,3 +1,4 @@
+import { LoadingIcon } from "@/components/bs-icons/loading";
 import { bsConfirm } from "@/components/bs-ui/alertDialog/useConfirm";
 import { Button, LoadButton } from "@/components/bs-ui/button";
 import { Input } from "@/components/bs-ui/input";
@@ -6,6 +7,7 @@ import { Select, SelectContent, SelectGroup, SelectItem, SelectTrigger, SelectVa
 import { Switch } from "@/components/bs-ui/switch";
 import { useToast } from "@/components/bs-ui/toast/use-toast";
 import { QuestionTooltip } from "@/components/bs-ui/tooltip";
+import { generateUUID } from "@/components/bs-ui/utils";
 import ShadTooltip from "@/components/ShadTooltipComponent";
 import { addLLmServer, deleteLLmServer, getLLmServerDetail, updateLLmServer } from "@/controllers/API/finetune";
 import { captureAndAlertRequestErrorHoc } from "@/controllers/request";
@@ -13,8 +15,6 @@ import { ArrowLeft, Plus, Trash2Icon } from "lucide-react";
 import { useEffect, useMemo, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import CustomForm from "./CustomForm";
-import { LoadingIcon } from "@/components/bs-icons/loading";
-import { set } from "date-fns";
 
 function ModelItem({ data, type, onDelete, onInput, onConfig }) {
     const { t } = useTranslation('model')
@@ -190,6 +190,7 @@ export default function ModelConfig({ id, onGetName, onBack, onReload, onBerforS
         const maxIndex = formData.models.reduce((max, el, i) => el.name.match(/model (\d+)/) ? Math.max(max, +el.name.match(/model (\d+)/)[1]) : max, 0)
 
         const model = {
+            id: generateUUID(4),
             name: `model ${maxIndex + 1}`,
             model_name: '',
             model_type: 'llm'
@@ -382,7 +383,7 @@ export default function ModelConfig({ id, onGetName, onBack, onReload, onBerforS
                     <div className="w-[92%]">
                         {
                             formData.models.map((m, i) => <ModelItem
-                                key={m.name + m.model_name}
+                                key={m.id}
                                 data={m}
                                 type={formData.type}
                                 onInput={(name, type) => handleModelChange(name, type, i)}
@@ -437,6 +438,10 @@ const useSelectModel = () => {
     }, [])
 
     return (type) => {
-        return modelsRef.current?.[type] || []
+        return (modelsRef.current?.[type] || [])
+            .map(item => ({
+                ...item,
+                id: generateUUID(4)
+            }))
     }
 }
\ No newline at end of file

From 5c1ed46472915f375e792c3114ce6ce6efab0822 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Thu, 15 May 2025 15:36:19 +0800
Subject: [PATCH 151/186] fix: email tools set default value

---
 .../bisheng_langchain/gpts/tools/message/email.py           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/bisheng-langchain/bisheng_langchain/gpts/tools/message/email.py b/src/bisheng-langchain/bisheng_langchain/gpts/tools/message/email.py
index 39398c58e..70245cfc8 100644
--- a/src/bisheng-langchain/bisheng_langchain/gpts/tools/message/email.py
+++ b/src/bisheng-langchain/bisheng_langchain/gpts/tools/message/email.py
@@ -25,9 +25,9 @@ class EmailMessageTool(BaseModel):
 
     def send_email(
         self,
-        receiver,
-        subject,
-        content,
+        receiver: str = None,
+        subject: str = None,
+        content: str = None,
     ):
         """
         发送电子邮件函数

From e59f9f4a8a20e5b0af53bc7a2b16ec338e283677 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Thu, 15 May 2025 15:53:20 +0800
Subject: [PATCH 152/186] fix: add debug log

---
 src/backend/bisheng/api/v1/chat.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/backend/bisheng/api/v1/chat.py b/src/backend/bisheng/api/v1/chat.py
index 63e7c1fd3..9f27656e6 100644
--- a/src/backend/bisheng/api/v1/chat.py
+++ b/src/backend/bisheng/api/v1/chat.py
@@ -275,6 +275,7 @@ def add_chat_messages(*,
     """
     添加一条完整问答记录， 安全检查写入使用
     """
+    logger.debug(f'gateway add_chat_messages {data}')
     flow_id = data.flow_id
     chat_id = data.chat_id
     if not chat_id or not flow_id:

From 3d0e706030add4f50343e65d8c8fa1fcfac2e9aa Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Thu, 15 May 2025 16:00:49 +0800
Subject: [PATCH 153/186] fix: spilt chunk metadata error

---
 src/backend/bisheng/api/services/knowledge_imp.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/backend/bisheng/api/services/knowledge_imp.py b/src/backend/bisheng/api/services/knowledge_imp.py
index ff0cffcc5..686c30896 100644
--- a/src/backend/bisheng/api/services/knowledge_imp.py
+++ b/src/backend/bisheng/api/services/knowledge_imp.py
@@ -86,8 +86,7 @@ class KnowledgeUtils:
         if not chunk.startswith('{<file_title>'):
             return chunk.split(cls.chunk_split)[-1]
 
-        return chunk.split('</file_abstract>\n<paragraph_content>')[-1].rstrip(
-            '</paragraph_content>}')
+        return re.sub('<paragraph_content>.*</paragraph_content>', '', chunk, flags=re.S).strip()
 
     @classmethod
     def save_preview_cache(cls,

From 45fe490401d255fef9fa0c0ca522b0fc4dccae4a Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Thu, 15 May 2025 16:53:09 +0800
Subject: [PATCH 154/186] fix: sentinel redis password error

---
 src/backend/bisheng/cache/redis.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backend/bisheng/cache/redis.py b/src/backend/bisheng/cache/redis.py
index 6a0dde30a..f7db529e8 100644
--- a/src/backend/bisheng/cache/redis.py
+++ b/src/backend/bisheng/cache/redis.py
@@ -35,7 +35,7 @@ class RedisClient:
             hosts = [eval(x) for x in redis_conf.pop('sentinel_hosts')]
             password = redis_conf.pop('sentinel_password')
             master = redis_conf.pop('sentinel_master')
-            sentinel = Sentinel(sentinels=hosts, socket_timeout=0.1, password=password)
+            sentinel = Sentinel(sentinels=hosts, socket_timeout=0.1, sentinel_kwargs={'password': password})
             # 获取主节点的连接
             self.connection = sentinel.master_for(master, socket_timeout=0.1, **redis_conf)
 

From 955ea42635ec8bb242a59c68a92d14ca72e3f2ef Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Thu, 15 May 2025 16:59:00 +0800
Subject: [PATCH 155/186] fix: workflow status not exists error

---
 src/backend/bisheng/chat/clients/workflow_client.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backend/bisheng/chat/clients/workflow_client.py b/src/backend/bisheng/chat/clients/workflow_client.py
index 55d3ea255..729f9be09 100644
--- a/src/backend/bisheng/chat/clients/workflow_client.py
+++ b/src/backend/bisheng/chat/clients/workflow_client.py
@@ -160,7 +160,7 @@ class WorkflowClient(BaseClient):
             return True
 
         status_info = self.workflow.get_workflow_status()
-        if status_info['status'] in [WorkflowStatus.FAILED.value, WorkflowStatus.SUCCESS.value]:
+        if not status_info or status_info['status'] in [WorkflowStatus.FAILED.value, WorkflowStatus.SUCCESS.value]:
             await self.send_response('processing', 'close', '')
             self.workflow.clear_workflow_status()
             self.workflow = None

From 08b8aea058c2bd36a8f9c7cd6f8f43d276ac9860 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Thu, 15 May 2025 17:17:07 +0800
Subject: [PATCH 156/186] fix: chunk split content error

---
 src/backend/bisheng/api/services/knowledge_imp.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/backend/bisheng/api/services/knowledge_imp.py b/src/backend/bisheng/api/services/knowledge_imp.py
index 686c30896..753c5d632 100644
--- a/src/backend/bisheng/api/services/knowledge_imp.py
+++ b/src/backend/bisheng/api/services/knowledge_imp.py
@@ -86,7 +86,9 @@ class KnowledgeUtils:
         if not chunk.startswith('{<file_title>'):
             return chunk.split(cls.chunk_split)[-1]
 
-        return re.sub('<paragraph_content>.*</paragraph_content>', '', chunk, flags=re.S).strip()
+        chunk = chunk.split('<paragraph_content>')[-1]
+        chunk = chunk.split('</paragraph_content>')[0]
+        return chunk
 
     @classmethod
     def save_preview_cache(cls,

From 72e14c59ee0f15fbc9a34e588b2e75bd369e15ac Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Thu, 15 May 2025 17:47:39 +0800
Subject: [PATCH 157/186] fix: deleted assistant not allow get information

---
 src/backend/bisheng/api/services/assistant.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backend/bisheng/api/services/assistant.py b/src/backend/bisheng/api/services/assistant.py
index 0d49d90e1..c2151fcf4 100644
--- a/src/backend/bisheng/api/services/assistant.py
+++ b/src/backend/bisheng/api/services/assistant.py
@@ -109,7 +109,7 @@ class AssistantService(BaseService, AssistantUtils):
     @classmethod
     def get_assistant_info(cls, assistant_id: str, login_user: UserPayload):
         assistant = AssistantDao.get_one_assistant(assistant_id)
-        if not assistant:
+        if not assistant or assistant.is_delete:
             return AssistantNotExistsError.return_resp()
         # 检查是否有权限获取信息
         if not login_user.access_check(assistant.user_id, assistant.id, AccessType.ASSISTANT_READ):

From 59b8a6b0543f5a39327436882815854346a47404 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Thu, 15 May 2025 20:52:16 +0800
Subject: [PATCH 158/186] fix: mark task prev next error

---
 src/backend/bisheng/api/v1/mark_task.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/backend/bisheng/api/v1/mark_task.py b/src/backend/bisheng/api/v1/mark_task.py
index 4b9f3bd78..9541b3306 100644
--- a/src/backend/bisheng/api/v1/mark_task.py
+++ b/src/backend/bisheng/api/v1/mark_task.py
@@ -190,17 +190,20 @@ async def pre_or_next(chat_id: str, action: str, task_id: int, login_user: UserP
 
     if action == "prev":
         record = MarkRecordDao.get_prev_task(login_user.user_id, task_id)
+        top_queue = deque()
+        bottom_queue = deque()
         if record:
-            queue = deque()
+            queue = top_queue
             for r in record:
                 if r.session_id == chat_id:
+                    queue = bottom_queue
                     continue
                 queue.append(r)
 
-            if len(queue) == 0:
+            if len(top_queue) and len(bottom_queue) == 0:
                 return resp_200()
-            record = queue.pop()
-            logger.info("queue={} record={}", queue, record)
+            record = bottom_queue.pop() or top_queue.pop()
+            logger.info("top_queue={} bottom_queue={} record={}", top_queue, bottom_queue, record)
             chat = MessageSessionDao.get_one(record.session_id)
             result["chat_id"] = chat.chat_id
             result["flow_type"] = chat.flow_type
@@ -219,6 +222,8 @@ async def pre_or_next(chat_id: str, action: str, task_id: int, login_user: UserP
             linked.append(m.chat_id)
 
         cur = linked.find(chat_id)
+        if not k_list:
+            return resp_200()
 
         logger.info("k_list={} cur={}", k_list, cur)
 

From 42e6665f7e2745cba073aa2aaf2a05f680b74d3c Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Thu, 15 May 2025 20:57:20 +0800
Subject: [PATCH 159/186] fix: mark task prev next error

---
 src/backend/bisheng/api/v1/mark_task.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/backend/bisheng/api/v1/mark_task.py b/src/backend/bisheng/api/v1/mark_task.py
index 9541b3306..37f87ff66 100644
--- a/src/backend/bisheng/api/v1/mark_task.py
+++ b/src/backend/bisheng/api/v1/mark_task.py
@@ -202,8 +202,8 @@ async def pre_or_next(chat_id: str, action: str, task_id: int, login_user: UserP
 
             if len(top_queue) and len(bottom_queue) == 0:
                 return resp_200()
-            record = bottom_queue.pop() or top_queue.pop()
-            logger.info("top_queue={} bottom_queue={} record={}", top_queue, bottom_queue, record)
+            logger.info("top_queue={} bottom_queue={}", top_queue, bottom_queue)
+            record = bottom_queue.popleft() if len(bottom_queue) else top_queue.popleft()
             chat = MessageSessionDao.get_one(record.session_id)
             result["chat_id"] = chat.chat_id
             result["flow_type"] = chat.flow_type

From c56a70173b575077c37c2050c7cb6eca41f1aa22 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Thu, 15 May 2025 21:05:58 +0800
Subject: [PATCH 160/186] fix: gateway add message parse workflow input

---
 src/backend/bisheng/api/services/audit_log.py |  5 +++--
 src/backend/bisheng/api/v1/chat.py            | 18 +++++++++++++++---
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/backend/bisheng/api/services/audit_log.py b/src/backend/bisheng/api/services/audit_log.py
index aa897636e..70677876e 100644
--- a/src/backend/bisheng/api/services/audit_log.py
+++ b/src/backend/bisheng/api/services/audit_log.py
@@ -102,12 +102,13 @@ class AuditLogService:
                       flow_id, flow_info.name, ResourceTypeEnum.FLOW)
 
     @classmethod
-    def create_chat_workflow(cls, user: UserPayload, ip_address: str, flow_id: str):
+    def create_chat_workflow(cls, user: UserPayload, ip_address: str, flow_id: str, flow_info=None):
         """
         新建工作流会话的审计日志
         """
         logger.info(f"act=create_chat_workflow user={user.user_name} ip={ip_address} flow={flow_id}")
-        flow_info = FlowDao.get_flow_by_id(flow_id)
+        if not flow_info:
+            flow_info = FlowDao.get_flow_by_id(flow_id)
         cls._chat_log(user, ip_address, EventType.CREATE_CHAT, ObjectType.WORK_FLOW,
                       flow_id, flow_info.name, ResourceTypeEnum.WORK_FLOW)
 
diff --git a/src/backend/bisheng/api/v1/chat.py b/src/backend/bisheng/api/v1/chat.py
index 9f27656e6..68382d48f 100644
--- a/src/backend/bisheng/api/v1/chat.py
+++ b/src/backend/bisheng/api/v1/chat.py
@@ -280,11 +280,21 @@ def add_chat_messages(*,
     chat_id = data.chat_id
     if not chat_id or not flow_id:
         raise HTTPException(status_code=500, detail='chat_id 和 flow_id 必传参数')
+    save_human_message = data.human_message
+    flow_info = FlowDao.get_flow_by_id(flow_id)
+    if flow_info and flow_info.flow_type == FlowType.WORKFLOW.value:
+        # 工作流的输入，需要从输入里解析出来实际的输入内容
+        try:
+            tmp_human_message = json.loads(data.human_message)
+            save_human_message = tmp_human_message.get('message')
+        except:
+            save_human_message = data.human_message
+
     human_message = ChatMessage(flow_id=flow_id,
                                 chat_id=chat_id,
                                 user_id=login_user.user_id,
                                 is_bot=False,
-                                message=data.human_message,
+                                message=save_human_message,
                                 sensitive_status=SensitiveStatus.VIOLATIONS.value,
                                 type='human',
                                 category='question')
@@ -305,7 +315,6 @@ def add_chat_messages(*,
     if not session_info:
         # 新建会话
         # 判断下是助手还是技能, 写审计日志
-        flow_info = FlowDao.get_flow_by_id(flow_id)
         if flow_info:
             MessageSessionDao.insert_one(MessageSession(
                 chat_id=chat_id,
@@ -315,7 +324,10 @@ def add_chat_messages(*,
                 user_id=login_user.user_id,
                 sensitive_status=SensitiveStatus.VIOLATIONS.value,
             ))
-            AuditLogService.create_chat_flow(login_user, get_request_ip(request), flow_id, flow_info)
+            if flow_info.flow_type == FlowType.FLOW.value:
+                AuditLogService.create_chat_flow(login_user, get_request_ip(request), flow_id, flow_info)
+            elif flow_info.flow_type == FlowType.WORKFLOW.value:
+                AuditLogService.create_chat_workflow(login_user, get_request_ip(request), flow_id, flow_info)
         else:
             assistant_info = AssistantDao.get_one_assistant(flow_id)
             if assistant_info:

From 701580609da3560752a2e7b40190d4cd2967e48e Mon Sep 17 00:00:00 2001
From: dolphin <shanghang@dataelem.com>
Date: Thu, 15 May 2025 21:07:26 +0800
Subject: [PATCH 161/186] fix: some bugfix

---
 .../bs-comp/chatComponent/messageStore.ts     | 16 ++++++++++++--
 .../platform/src/controllers/API/finetune.ts  |  7 +++++++
 .../BuildPage/flow/FlowChat/ChatInput.tsx     | 21 ++++++++++++-------
 .../BuildPage/flow/FlowChat/ChatMessages.tsx  |  8 ++++++-
 .../BuildPage/flow/FlowChat/messageStore.ts   |  2 +-
 .../flow/FlowNode/component/InputFormItem.tsx |  5 +++--
 .../flow/FlowNode/component/VarInput.tsx      |  2 ++
 .../ChatAppPage/components/ChatPanne.tsx      | 18 +++++++++++-----
 .../platform/src/pages/KnowledgePage/qas.tsx  | 20 +++++++++---------
 .../src/pages/LogPage/useAppLog/index.tsx     |  2 +-
 10 files changed, 71 insertions(+), 30 deletions(-)

diff --git a/src/frontend/platform/src/components/bs-comp/chatComponent/messageStore.ts b/src/frontend/platform/src/components/bs-comp/chatComponent/messageStore.ts
index 51b69b0b6..24304772b 100644
--- a/src/frontend/platform/src/components/bs-comp/chatComponent/messageStore.ts
+++ b/src/frontend/platform/src/components/bs-comp/chatComponent/messageStore.ts
@@ -183,12 +183,16 @@ export const useMessageStore = create<State & Actions>((set, get) => ({
         // run log类型存在嵌套情况，使用 extra 匹配 currentMessage; 否则取最近
         let currentMessageIndex = 0
         for (let i = messages.length - 1; i >= 0; i--) {
+            if (messages[i].isSend) break;
             if (isRunLog && messages[i].extra === wsdata.extra) {
                 currentMessageIndex = i;
                 break;
             } else if (!isRunLog && !runLogsTypes.includes(messages[i].category)) {
                 currentMessageIndex = i;
                 break;
+            } else if (wsdata.type === 'end_cover' && messages[i].category === 'tool') {
+                currentMessageIndex = i;
+                break;
             }
         }
         const currentMessage = messages[currentMessageIndex]
@@ -203,6 +207,14 @@ export const useMessageStore = create<State & Actions>((set, get) => ({
         } else {
             message = currentMessage.message + (wsdata.message || '')
         }
+
+        // 敏感词特殊处理
+        if (wsdata.type === 'end_cover' && currentMessage.category === 'tool') {
+            messages.forEach((msg) => {
+                msg.end = true // 闭合所有会话
+            })
+            cover = false
+        }
         const newCurrentMessage = {
             ...currentMessage,
             ...wsdata,
@@ -239,8 +251,8 @@ export const useMessageStore = create<State & Actions>((set, get) => ({
                     && prevMessage.message === newCurrentMessage.message
                     && prevMessage.thought === newCurrentMessage.thought)
                     || cover) {
-                        const removedMsg = messages.pop()
-                        prevMessage.message = removedMsg.message
+                    const removedMsg = messages.pop()
+                    prevMessage.message = removedMsg.message
                 }
             } else {
                 if ((prevMessage
diff --git a/src/frontend/platform/src/controllers/API/finetune.ts b/src/frontend/platform/src/controllers/API/finetune.ts
index 894f6d61c..efc0df070 100644
--- a/src/frontend/platform/src/controllers/API/finetune.ts
+++ b/src/frontend/platform/src/controllers/API/finetune.ts
@@ -132,6 +132,13 @@ export const addLLmServer = async (data: any) => {
 
 // 修改模型
 export const updateLLmServer = async (data: any) => {
+    // 删除前端生成的id (id: string )
+    data.models = data.models.map((item) => {
+        const { id, ...other } = item
+        return typeof id === 'string' ? {
+            ...other
+        } : item
+    })
     return await axios.put(`/api/v1/llm`, data)
 }
 
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatInput.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatInput.tsx
index da0dd810a..63313a9bc 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatInput.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatInput.tsx
@@ -182,10 +182,14 @@ export default function ChatInput({ autoRun, clear, form, wsUrl, onBeforSend, on
                 };
                 ws.onmessage = (event) => {
                     const data = JSON.parse(event.data);
+                    // 过滤一些不需要的数据
+                    if ((data.category === 'end_cover' && data.type !== 'end_cover')) {
+                        return
+                    }
 
                     if (data.type === 'begin') {
                         setStop({ show: true, disable: false })
-                    } else if (data.type === 'close') {
+                    } else if (data.type === 'close' && data.category === 'processing') {
                         if (!reRunStateRef.current) {
                             // 重试时阻止关闭stop
                             setStop({ show: false, disable: false })
@@ -304,13 +308,13 @@ export default function ChatInput({ autoRun, clear, form, wsUrl, onBeforSend, on
             return questionsRef.current.updateQuestions(data.message.guide_question.filter(q => q))
         } else if (data.category === 'stream_msg') {
             streamWsMsg(data)
-        } else if (data.category === 'end_cover' && data.type === 'end') {
-            // setInputLock({ locked: true, reason: '' })
-            overWsMsg(data)
-            return handleRestartClick()
+        } else if (data.category === 'end_cover' && data.type === 'end_cover') {
+            setInputLock({ locked: true, reason: '' })
+            return overWsMsg(data)
+            // return handleRestartClick()
         }
 
-        if (data.type === 'close') {
+        if (data.type === 'close' && data.category === 'processing') {
             insetSeparator(t('chat.chatEndMessage'))
             setInputLock({ locked: true, reason: '' })
             // 重启会话按钮,接收close确认后端处理结束后重启会话
@@ -320,8 +324,6 @@ export default function ChatInput({ autoRun, clear, form, wsUrl, onBeforSend, on
             }
         } else if (data.type === 'over') {
             createWsMsg(data)
-        } else if (data.type === 'end_cover') {
-            overWsMsg(data)
         }
     }
 
@@ -373,8 +375,11 @@ export default function ChatInput({ autoRun, clear, form, wsUrl, onBeforSend, on
             setInputForm(null)
             createSendMsg(msg)
             await createWebSocket()
+            const { flow_id, chat_id } = onBeforSend('flowInfo', {})
             sendWsMsg({
                 action: 'input',
+                flow_id,
+                chat_id,
                 data: {
                     [inputNodeIdRef.current]: {
                         data,
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatMessages.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatMessages.tsx
index ab4d91a01..3d0306f9f 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatMessages.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatMessages.tsx
@@ -123,7 +123,13 @@ export default function ChatMessages({
                     case 'input':
                         return null
                     case 'question':
-                        return <MessageUser mark={mark} key={msg.message_id} useName={useName} data={msg} onMarkClick={() => { onMarkClick?.('question', msg.id, findQa(messagesList, index)) }} />;
+                        return <MessageUser
+                            mark={mark}
+                            key={msg.message_id}
+                            useName={useName}
+                            data={msg}
+                            onMarkClick={() => { onMarkClick?.('question', msg.id, findQa(messagesList, index)) }}
+                        />;
                     case 'guide_word':
                     case 'output_msg':
                     case 'stream_msg':
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/messageStore.ts b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/messageStore.ts
index 63a9daf50..cf6db75e3 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/messageStore.ts
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/messageStore.ts
@@ -233,7 +233,7 @@ export const useMessageStore = create<State & Actions>((set, get) => ({
     },
     overWsMsg(data) {
         // 删除所有未结束消息
-        if (data.type === 'end' && data.message) {
+        if (data.type === 'end_cover' && data.message) {
             console.log('触发安全审计,删除所有未结束消息 :>> ');
             data.category = "stream_msg"
             data.type = 'over'
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/InputFormItem.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/InputFormItem.tsx
index 033daf7f2..8e7d038cd 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/InputFormItem.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/InputFormItem.tsx
@@ -265,6 +265,7 @@ function Form({ nodeId, nodeData, initialData, onSubmit, onCancel, existingOptio
         displayNameRef.current[formData.formType] = formData.displayName;
         const displayName = displayNameRef.current[formType] || '';
         setFormData({ ...formData, displayName, formType })
+        setErrors({});
         if (editRef.current) {
             if (oldFormTypeRef.current === formType) {
                 setFormData({ ...formData, formType, variableName: oldVarNameRef.current, displayName })
@@ -283,10 +284,10 @@ function Form({ nodeId, nodeData, initialData, onSubmit, onCancel, existingOptio
     // var check
     const checkVarFuncRef = useRef(null);
     useEffect(() => {
-        if (checkVarFuncRef.current && formData.formType === FormType.Text) {
+        if (initialData && checkVarFuncRef.current && formData.formType === FormType.Text) {
             checkVarFuncRef.current();
         }
-    }, [formData.formType, checkVarFuncRef.current])
+    }, [formData.formType, initialData])
 
     // text form
     const InputForm = <div className="space-y-4">
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/VarInput.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/VarInput.tsx
index ee54231ff..6deea9eaa 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/VarInput.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowNode/component/VarInput.tsx
@@ -76,6 +76,8 @@ export default function VarInput({
     // 校验变量是否可用
     const validateVarAvailble = () => {
         const value = valueRef.current;
+        if (!value.trim()) return Promise.resolve('');
+
         const [html, error] = parseToHTML(value || '', true);
         textareaRef.current.innerHTML = html;
         return Promise.resolve(error);
diff --git a/src/frontend/platform/src/pages/ChatAppPage/components/ChatPanne.tsx b/src/frontend/platform/src/pages/ChatAppPage/components/ChatPanne.tsx
index fa6e38b93..2ca471ddd 100644
--- a/src/frontend/platform/src/pages/ChatAppPage/components/ChatPanne.tsx
+++ b/src/frontend/platform/src/pages/ChatAppPage/components/ChatPanne.tsx
@@ -3,8 +3,6 @@ import { TitleLogo } from "@/components/bs-comp/cardComponent";
 import ChatComponent from "@/components/bs-comp/chatComponent";
 import { useMessageStore } from "@/components/bs-comp/chatComponent/messageStore";
 import { AssistantIcon } from "@/components/bs-icons";
-import { LoadingIcon } from "@/components/bs-icons/loading";
-import { NewApplicationIcon } from "@/components/bs-icons/newApplication";
 import { useToast } from "@/components/bs-ui/toast/use-toast";
 import { locationContext } from "@/contexts/locationContext";
 import ChatPane from "@/pages/BuildPage/flow/FlowChat/ChatPane";
@@ -47,8 +45,13 @@ export default function ChatPanne({ customWsHost = '', appendHistory = false, da
         if (type === AppNumType.SKILL) {
             setAssistant(null)
             setWorkflow(null)
-            const _flow = await getFlowApi(id, version)
-            await build(_flow, chatId)
+            let _flow = { id, data: { nodes: [], edges: [], viewport: {} } } // await getFlowApi(id, version)
+            try {
+                _flow = await getFlowApi(id, version)
+                await build(_flow, chatId)
+            } catch (e) {
+                console.error('e :>> ', e);
+            }
             if (isV1) {
                 loadHistoryMsg(_flow.id, chatId, {
                     appendHistory,
@@ -66,7 +69,12 @@ export default function ChatPanne({ customWsHost = '', appendHistory = false, da
             flowRef.current = null
             setFlow(null)
             setWorkflow(null)
-            const _assistant = await loadAssistantState(id, version)
+            let _assistant = { id }
+            try {
+                _assistant = await loadAssistantState(id, version)
+            } catch (e) {
+                console.error('e :>> ', e);
+            }
 
             if (isV1) {
                 loadHistoryMsg(_assistant.id, chatId, {
diff --git a/src/frontend/platform/src/pages/KnowledgePage/qas.tsx b/src/frontend/platform/src/pages/KnowledgePage/qas.tsx
index 9966e95c8..f7e6f3d15 100644
--- a/src/frontend/platform/src/pages/KnowledgePage/qas.tsx
+++ b/src/frontend/platform/src/pages/KnowledgePage/qas.tsx
@@ -303,15 +303,15 @@ export default function QasPage() {
         try {
             if (isOpening) {
                 refreshData(item => item.id === id, { status: 2 });
-              }
+            }
             await updateQaStatus(id, targetStatus);
             refreshData(item => item.id === id, { status: targetStatus });
         } catch (error) {
             refreshData(item => item.id === id, {
-            status:3 
-          });
+                status: 3
+            });
         }
-      };
+    };
     return <div className="relative px-2 pt-4 size-full">
         {loading && <div className="absolute w-full h-full top-0 left-0 flex justify-center items-center z-10 bg-[rgba(255,255,255,0.6)] dark:bg-blur-shared">
             <LoadingIcon />
@@ -386,19 +386,19 @@ export default function QasPage() {
                                 <TableCell>
                                     <div className="flex items-center">
                                         <Switch
-                                        checked={el.status === 1}
-                                        disabled={el.status === 3}
-                                        onCheckedChange={(bln) => handleStatusClick(el.id, bln)}
+                                            checked={el.status === 1}
+                                            disabled={el.status === 3}
+                                            onCheckedChange={(bln) => handleStatusClick(el.id, bln)}
                                         />
                                         {el.status === 2 && (
-                                        <span className="ml-2 text-sm">处理中...</span>
+                                            <span className="ml-2 text-sm">处理中</span>
                                         )}
                                         {el.status === 3 && (
-                                        <span className="ml-2 text-sm">未启用，请重试</span>
+                                            <span className="ml-2 text-sm">未启用，请重试</span>
                                         )}
                                     </div>
                                 </TableCell>
-                                                                {hasPermission ? <TableCell className="text-right">
+                                {hasPermission ? <TableCell className="text-right">
                                     <Button variant="link" onClick={() => editRef.current.edit(el)} className="ml-4">{t('update')}</Button>
                                     <Button variant="link" onClick={() => handleDelete(el.id)} className="ml-4 text-red-500">{t('delete')}</Button>
                                 </TableCell> : <TableCell className="text-right">
diff --git a/src/frontend/platform/src/pages/LogPage/useAppLog/index.tsx b/src/frontend/platform/src/pages/LogPage/useAppLog/index.tsx
index 8cf1263d9..7edaf2e22 100644
--- a/src/frontend/platform/src/pages/LogPage/useAppLog/index.tsx
+++ b/src/frontend/platform/src/pages/LogPage/useAppLog/index.tsx
@@ -230,7 +230,7 @@ export default function AppUseLog() {
                         msg.liked === 1 ? '是' : '否',
                         msg.liked === 2 ? '是' : '否',
                         msg.copied ? '是' : '否',
-                        msg.sensitive_status === 1 ? '是' : '否'
+                        msg.sensitive_status === 1 ? '通过' : '违规'
                     ])
                 })
             })

From 4d968b5b5bcc5e6f8fd1c69bff568e86dbde24ce Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Thu, 15 May 2025 21:23:12 +0800
Subject: [PATCH 162/186] fix: mark task error

---
 src/backend/bisheng/api/v1/mark_task.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/backend/bisheng/api/v1/mark_task.py b/src/backend/bisheng/api/v1/mark_task.py
index 37f87ff66..43aaf45ae 100644
--- a/src/backend/bisheng/api/v1/mark_task.py
+++ b/src/backend/bisheng/api/v1/mark_task.py
@@ -200,9 +200,9 @@ async def pre_or_next(chat_id: str, action: str, task_id: int, login_user: UserP
                     continue
                 queue.append(r)
 
-            if len(top_queue) and len(bottom_queue) == 0:
-                return resp_200()
             logger.info("top_queue={} bottom_queue={}", top_queue, bottom_queue)
+            if len(top_queue) == 0 and len(bottom_queue) == 0:
+                return resp_200()
             record = bottom_queue.popleft() if len(bottom_queue) else top_queue.popleft()
             chat = MessageSessionDao.get_one(record.session_id)
             result["chat_id"] = chat.chat_id

From ee8c2ebe97c602d7ed36f360c53bbbb7415253ba Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Thu, 15 May 2025 21:45:15 +0800
Subject: [PATCH 163/186] fix: gateway add message parse input message

---
 src/backend/bisheng/api/v1/chat.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/backend/bisheng/api/v1/chat.py b/src/backend/bisheng/api/v1/chat.py
index 68382d48f..866232fb0 100644
--- a/src/backend/bisheng/api/v1/chat.py
+++ b/src/backend/bisheng/api/v1/chat.py
@@ -286,7 +286,8 @@ def add_chat_messages(*,
         # 工作流的输入，需要从输入里解析出来实际的输入内容
         try:
             tmp_human_message = json.loads(data.human_message)
-            save_human_message = tmp_human_message.get('message')
+            for node_id, node_input in tmp_human_message.items():
+                save_human_message = node_input.get('message')
         except:
             save_human_message = data.human_message
 

From b1699555339f7bb29f184e89b929bababbf73218 Mon Sep 17 00:00:00 2001
From: dolphin <shanghang@dataelem.com>
Date: Thu, 15 May 2025 21:52:57 +0800
Subject: [PATCH 164/186] =?UTF-8?q?fix:=20=E8=A7=A6=E5=8F=91=E6=95=8F?=
 =?UTF-8?q?=E6=84=9F=E8=AF=8D=E6=97=B6stop?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/src/pages/BuildPage/flow/FlowChat/ChatInput.tsx    | 1 +
 src/frontend/platform/src/pages/LogPage/useAppLog/index.tsx     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatInput.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatInput.tsx
index 63313a9bc..fe2bcce0e 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatInput.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatInput.tsx
@@ -310,6 +310,7 @@ export default function ChatInput({ autoRun, clear, form, wsUrl, onBeforSend, on
             streamWsMsg(data)
         } else if (data.category === 'end_cover' && data.type === 'end_cover') {
             setInputLock({ locked: true, reason: '' })
+            sendWsMsg({ "action": "stop" });
             return overWsMsg(data)
             // return handleRestartClick()
         }
diff --git a/src/frontend/platform/src/pages/LogPage/useAppLog/index.tsx b/src/frontend/platform/src/pages/LogPage/useAppLog/index.tsx
index 7edaf2e22..e8eb61951 100644
--- a/src/frontend/platform/src/pages/LogPage/useAppLog/index.tsx
+++ b/src/frontend/platform/src/pages/LogPage/useAppLog/index.tsx
@@ -230,7 +230,7 @@ export default function AppUseLog() {
                         msg.liked === 1 ? '是' : '否',
                         msg.liked === 2 ? '是' : '否',
                         msg.copied ? '是' : '否',
-                        msg.sensitive_status === 1 ? '通过' : '违规'
+                        msg.sensitive_status === 1 ? '否' : '是'
                     ])
                 })
             })

From 33c2087443f015a2ecf1108b93086a136e7dfabb Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Fri, 16 May 2025 11:57:20 +0800
Subject: [PATCH 165/186] fix: change graph state

---
 src/backend/bisheng/workflow/graph/graph_engine.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backend/bisheng/workflow/graph/graph_engine.py b/src/backend/bisheng/workflow/graph/graph_engine.py
index 2a0bd0737..24f95b8fe 100644
--- a/src/backend/bisheng/workflow/graph/graph_engine.py
+++ b/src/backend/bisheng/workflow/graph/graph_engine.py
@@ -20,7 +20,7 @@ from typing_extensions import TypedDict
 
 class TempState(TypedDict):
     # not use, only for langgraph state graph
-    flag: Annotated[bool, operator.add]
+    flag: Annotated[bool, operator.and_]
 
 
 class GraphEngine:

From ef088cd67f387ca4c2fd7442aacf1c9d1435e9f8 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Fri, 16 May 2025 15:58:02 +0800
Subject: [PATCH 166/186] fix: change graph state

---
 src/backend/entrypoint.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/backend/entrypoint.sh b/src/backend/entrypoint.sh
index c5a9affca..31357455f 100644
--- a/src/backend/entrypoint.sh
+++ b/src/backend/entrypoint.sh
@@ -1,4 +1,4 @@
 nohup uvicorn bisheng.main:app --host 0.0.0.0 --port 7860 --no-access-log --workers 8 &
 
-# -c 是指定celery的并发数
-celery -A bisheng.worker.main worker -l info -c 16
+# -c 是指定celery的并发数，线程数
+celery -A bisheng.worker.main worker -l info -c 100 -P threads

From ca82ba03ddea2e9ae13039e1716385faae21ebfd Mon Sep 17 00:00:00 2001
From: lmr <350416710@qq.com>
Date: Fri, 16 May 2025 20:56:36 +0800
Subject: [PATCH 167/186] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/frontend/platform/src/CustomNodes/GenericNode/index.tsx | 4 +++-
 .../platform/src/components/bs-ui/tooltip/index.tsx         | 4 ++--
 src/frontend/platform/src/components/bs-ui/tooltip/tip.tsx  | 6 +++---
 src/frontend/platform/src/modals/EditNodeModal/index.tsx    | 5 ++++-
 .../src/pages/BuildPage/flow/FlowChat/ChatInput.tsx         | 2 +-
 .../skills/editSkill/nodeToolbarComponent/index.tsx         | 2 +-
 src/frontend/platform/src/style/applies.css                 | 2 +-
 7 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/frontend/platform/src/CustomNodes/GenericNode/index.tsx b/src/frontend/platform/src/CustomNodes/GenericNode/index.tsx
index 99b9e2bd4..e876b6b19 100644
--- a/src/frontend/platform/src/CustomNodes/GenericNode/index.tsx
+++ b/src/frontend/platform/src/CustomNodes/GenericNode/index.tsx
@@ -76,6 +76,8 @@ export default function GenericNode({ data, positionAbsoluteX, positionAbsoluteY
 
   return (
     <>
+
+    
       <NodeToolbar>
         <NodeToolbarComponent
           position={{ x: positionAbsoluteX, y: positionAbsoluteY }}
@@ -164,7 +166,7 @@ export default function GenericNode({ data, positionAbsoluteX, positionAbsoluteY
         </div >
 
         <div className="generic-node-desc nodrag">
-          <div className="generic-node-desc-text">{data.node.description}</div>
+          <div className="generic-node-desc-text ">{data.node.description}</div>
           <>
             {Object.keys(data.node.template)
               .filter((t) => t.charAt(0) !== "_")
diff --git a/src/frontend/platform/src/components/bs-ui/tooltip/index.tsx b/src/frontend/platform/src/components/bs-ui/tooltip/index.tsx
index da992bd65..ff5eadbbf 100644
--- a/src/frontend/platform/src/components/bs-ui/tooltip/index.tsx
+++ b/src/frontend/platform/src/components/bs-ui/tooltip/index.tsx
@@ -19,7 +19,7 @@ const TooltipContent = React.forwardRef<
         ref={ref}
         sideOffset={sideOffset}
         className={cname(
-            "z-50 overflow-hidden rounded-md bg-primary/80 px-3 py-1.5 text-xs text-primary-foreground animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
+            "z-50 overflow-hidden rounded-md bg-primary/80 px-3 py-1.5 text-xs text-primary-foreground animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2,data-[side=top-right]:slide-in-from-bottom-2 translate-x-4",
             className
         )}
         {...props}
@@ -37,7 +37,7 @@ export const QuestionTooltip = ({ className = '', content }) => (
                 <CircleHelp className="w-3.5 h-3.5" />
             </TooltipTrigger>
             <TooltipContent>
-                <div className="max-w-96 text-left break-all whitespace-normal">{content}</div>
+                <div className=" max-w-96 text-left break-all whitespace-normal">{content}</div>
             </TooltipContent>
         </Tooltip>
     </TooltipProvider>
diff --git a/src/frontend/platform/src/components/bs-ui/tooltip/tip.tsx b/src/frontend/platform/src/components/bs-ui/tooltip/tip.tsx
index b49013811..197e07c9f 100644
--- a/src/frontend/platform/src/components/bs-ui/tooltip/tip.tsx
+++ b/src/frontend/platform/src/components/bs-ui/tooltip/tip.tsx
@@ -9,14 +9,14 @@ export default function Tip({
     delayDuration = 200,
 }: {
     content: string;
-    side: "top" | "right" | "bottom" | "left";
+    side: "top" | "right" | "bottom" | "left"|"top-right";
     asChild?: boolean;
     children: React.ReactNode;
     styleClasses?: string;
     delayDuration?: number
 }): JSX.Element {
     return (
-        <Tooltip delayDuration={delayDuration}>
+        <Tooltip open delayDuration={delayDuration}>
             <TooltipTrigger asChild={asChild}>{children}</TooltipTrigger>
 
             <TooltipContent
@@ -25,7 +25,7 @@ export default function Tip({
                 avoidCollisions={false}
                 sticky="always"
             >
-                <div className="max-w-96 text-left break-all whitespace-normal">{content}</div>
+                <div className=" max-w-96 text-left break-all whitespace-normal">{content}</div>
             </TooltipContent>
         </Tooltip>
     );
diff --git a/src/frontend/platform/src/modals/EditNodeModal/index.tsx b/src/frontend/platform/src/modals/EditNodeModal/index.tsx
index 07dd8aff2..2364b56bf 100644
--- a/src/frontend/platform/src/modals/EditNodeModal/index.tsx
+++ b/src/frontend/platform/src/modals/EditNodeModal/index.tsx
@@ -154,7 +154,10 @@ export default function EditNodeModal({ data }: { data: NodeDataType }) {
           </DialogTitle>
           <DialogDescription asChild>
             <div>
-              {data.node?.description}
+              <p className="sm:max-w-[700px] lg:max-w-[700px] break-words">
+                {data.node?.description}
+              </p>
+              
               <div className="flex pt-3">
                 {/* <Variable className="edit-node-modal-variable "></Variable> */}
                 <span className="edit-node-modal-span">List</span>
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatInput.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatInput.tsx
index fe2bcce0e..90bc5bee7 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatInput.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatInput.tsx
@@ -474,7 +474,7 @@ export default function ChatInput({ autoRun, clear, form, wsUrl, onBeforSend, on
             />
             {/* restart */}
             <div className="flex absolute left-0 top-3 z-10">
-                <Tip side='right' content={"重新运行"}>
+                <Tip side='top-right' content={"重新运行"}>
                     <Button className="rounded-full" disabled={restarted} variant="ghost" size="icon" onClick={handleRestartClick}><RefreshCw size={18} /></Button>
                 </Tip>
             </div>
diff --git a/src/frontend/platform/src/pages/BuildPage/skills/editSkill/nodeToolbarComponent/index.tsx b/src/frontend/platform/src/pages/BuildPage/skills/editSkill/nodeToolbarComponent/index.tsx
index ffd224016..1a53749c6 100644
--- a/src/frontend/platform/src/pages/BuildPage/skills/editSkill/nodeToolbarComponent/index.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/skills/editSkill/nodeToolbarComponent/index.tsx
@@ -158,7 +158,7 @@ const NodeToolbarComponent = ({ data, deleteNode, openPopUp, position }) => {
               </button>
             </ShadTooltip>
           }
-          {/* 编辑 */}
+          {/* 编辑1 */}
           {
             nodeLength > 0 && <ShadTooltip content="edit" side="top">
               <button
diff --git a/src/frontend/platform/src/style/applies.css b/src/frontend/platform/src/style/applies.css
index d5a6eee89..97b085742 100644
--- a/src/frontend/platform/src/style/applies.css
+++ b/src/frontend/platform/src/style/applies.css
@@ -257,7 +257,7 @@
     @apply h-full w-full py-5 text-foreground
   }
   .generic-node-desc-text {
-    @apply w-full px-5 pb-3 text-sm text-muted-foreground
+    @apply w-full px-5 pb-3 text-sm text-muted-foreground break-words
   }
 
   .alert-icon {

From e3e377eb36fdaf19561d5a9418aa59b21203ee26 Mon Sep 17 00:00:00 2001
From: lmr <350416710@qq.com>
Date: Mon, 19 May 2025 10:27:50 +0800
Subject: [PATCH 168/186] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=88bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/backend/bisheng/api/services/knowledge_imp.py               | 2 +-
 .../BuildPage/skills/editSkill/nodeToolbarComponent/index.tsx   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/backend/bisheng/api/services/knowledge_imp.py b/src/backend/bisheng/api/services/knowledge_imp.py
index 753c5d632..d740f5eaa 100644
--- a/src/backend/bisheng/api/services/knowledge_imp.py
+++ b/src/backend/bisheng/api/services/knowledge_imp.py
@@ -371,7 +371,7 @@ def add_file_embedding(vector_client,
                 metadatas.append(val['metadata'])
     for index, one in enumerate(texts):
         if len(one) > 10000:
-            raise ValueError('分段结果超长，请尝试在自定义策略中使用更多切分符（例如 \n）进行切分')
+            raise ValueError('分段结果超长，请尝试在自定义策略中使用更多切分符（例如 \n）进行切分策略')
         # 入库时 拼接文件名和文档摘要
         texts[index] = KnowledgeUtils.aggregate_chunk_metadata(one, metadatas[index])
 
diff --git a/src/frontend/platform/src/pages/BuildPage/skills/editSkill/nodeToolbarComponent/index.tsx b/src/frontend/platform/src/pages/BuildPage/skills/editSkill/nodeToolbarComponent/index.tsx
index 1a53749c6..0f644f32a 100644
--- a/src/frontend/platform/src/pages/BuildPage/skills/editSkill/nodeToolbarComponent/index.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/skills/editSkill/nodeToolbarComponent/index.tsx
@@ -71,7 +71,7 @@ const NodeToolbarComponent = ({ data, deleteNode, openPopUp, position }) => {
             desc: `组件 ${data.node.display_name} 已存在，覆盖原有组件还是继续创新建组件？`,
             showClose: true,
             okTxt: '覆盖',
-            canelTxt: '创建新组建',
+            canelTxt: '创建新组件',
             onOk(next) {
               addSavedComponent(cloneDeep(data), true).then(saveComponentSuccess)
               next()

From 3fe7ab4a8a5b237def8199c90f5088407f8b200e Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Mon, 19 May 2025 11:39:47 +0800
Subject: [PATCH 169/186] fix: reasoning content need to save in db

---
 src/backend/bisheng/chat/client.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/backend/bisheng/chat/client.py b/src/backend/bisheng/chat/client.py
index 7fe5dbd7b..d46fc1c8e 100644
--- a/src/backend/bisheng/chat/client.py
+++ b/src/backend/bisheng/chat/client.py
@@ -233,13 +233,19 @@ class ChatClient:
 
         # 将流式输出的内容写到数据库内
         answer = ''
+        reasoning_answer = ''
         while not self.stream_queue.empty():
             msg = self.stream_queue.get()
             if msg.get('type') == 'answer':
                 answer += msg.get('content', '')
+            elif msg.get('type') == 'reasoning':
+                reasoning_answer += msg.get('content', '')
 
         # 有流式输出内容的话，记录流式输出内容到数据库
-        if answer.strip():
+        if reasoning_answer.split():
+            res = await self.add_message('bot', answer, 'reasoning_answer', 'break_answer')
+            await self.send_response('reasoning_answer', 'end', '', message_id=res.id if res else None)
+        elif answer.strip():
             res = await self.add_message('bot', answer, 'answer', 'break_answer')
             await self.send_response('answer', 'end', '', message_id=res.id if res else None)
         await self.send_response('processing', 'close', '')

From 542789e8d9a18736fab56683cb24de51f374c5b3 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Mon, 19 May 2025 15:00:45 +0800
Subject: [PATCH 170/186] fix: input over status crash

---
 src/backend/bisheng/worker/workflow/redis_callback.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backend/bisheng/worker/workflow/redis_callback.py b/src/backend/bisheng/worker/workflow/redis_callback.py
index 3ac61ed7f..d7c5f2a90 100644
--- a/src/backend/bisheng/worker/workflow/redis_callback.py
+++ b/src/backend/bisheng/worker/workflow/redis_callback.py
@@ -153,7 +153,7 @@ class RedisCallback(BaseCallback):
                         break
                     yield chat_response
                 break
-            elif status_info['status'] == WorkflowStatus.WAITING.value and time.time() - status_info['time'] > 10:
+            elif status_info['status'] in [WorkflowStatus.WAITING.value, WorkflowStatus.INPUT_OVER.value] and time.time() - status_info['time'] > 10:
                 # 10秒内没有收到状态更新，说明workflow没有启动，可能是celery worker线程数已满
                 self.set_workflow_status(WorkflowStatus.FAILED.value, 'workflow task execute busy')
                 yield self.build_chat_response(WorkflowEventType.Error.value, 'over',

From a322c30f596902608aab7eabf70a65d5708181cd Mon Sep 17 00:00:00 2001
From: dolphin <shanghang@dataelem.com>
Date: Mon, 19 May 2025 16:03:05 +0800
Subject: [PATCH 171/186] fix: some bugfix

---
 .../bs-comp/chatComponent/ChatInput.tsx       |  2 +-
 .../bs-comp/chatComponent/messageStore.ts     |  6 ++
 .../src/components/bs-ui/tooltip/tip.tsx      |  2 +-
 .../platform/src/controllers/API/finetune.ts  |  7 ++
 .../platform/src/controllers/request.ts       |  5 +-
 .../BuildPage/flow/FlowChat/ChatInput.tsx     |  3 +-
 .../BuildPage/flow/FlowChat/ChatMessages.tsx  |  4 +-
 .../flow/FlowChat/MessageBsChoose.tsx         | 11 ++-
 .../PersonalComponents.tsx                    |  2 +-
 .../editSkill/nodeToolbarComponent/index.tsx  |  2 +-
 .../pages/DiffFlowPage/components/RunTest.tsx | 32 +------
 .../platform/src/pages/KnowledgePage/qas.tsx  | 21 ++++-
 .../src/pages/LogPage/useAppLog/index.tsx     |  2 +-
 .../platform/src/util/flowCompatible.ts       |  9 +-
 src/frontend/platform/src/util/utils.ts       | 94 ++++++++++++++-----
 15 files changed, 131 insertions(+), 71 deletions(-)

diff --git a/src/frontend/platform/src/components/bs-comp/chatComponent/ChatInput.tsx b/src/frontend/platform/src/components/bs-comp/chatComponent/ChatInput.tsx
index af6a52166..c61340f2c 100644
--- a/src/frontend/platform/src/components/bs-comp/chatComponent/ChatInput.tsx
+++ b/src/frontend/platform/src/components/bs-comp/chatComponent/ChatInput.tsx
@@ -239,7 +239,7 @@ export default function ChatInput({ clear, form, questions, inputForm, wsUrl, on
                 noAccess: false,
                 liked: 0,
                 create_time: formatDate(new Date(), 'yyyy-MM-ddTHH:mm:ss')
-            }, data.type === 'end_cover')
+            }, data.type === 'end_cover' && data.category === 'anwser')
 
             if (!msgClosedRef.current) msgClosedRef.current = true
         } else if (data.type === "close") {
diff --git a/src/frontend/platform/src/components/bs-comp/chatComponent/messageStore.ts b/src/frontend/platform/src/components/bs-comp/chatComponent/messageStore.ts
index 24304772b..8c834ea3c 100644
--- a/src/frontend/platform/src/components/bs-comp/chatComponent/messageStore.ts
+++ b/src/frontend/platform/src/components/bs-comp/chatComponent/messageStore.ts
@@ -245,6 +245,12 @@ export const useMessageStore = create<State & Actions>((set, get) => ({
             // }
             // 删除重复消息
             const prevMessage = messages[currentMessageIndex - 1];
+
+            // hack 
+            if (wsdata.type === 'end_cover' && !prevMessage.isSend) {
+                cover = true
+            }
+
             // 有思考不覆盖 只覆盖message,保留思考
             if (prevMessage?.reasoning_log) {
                 if ((prevMessage
diff --git a/src/frontend/platform/src/components/bs-ui/tooltip/tip.tsx b/src/frontend/platform/src/components/bs-ui/tooltip/tip.tsx
index 197e07c9f..081eaf799 100644
--- a/src/frontend/platform/src/components/bs-ui/tooltip/tip.tsx
+++ b/src/frontend/platform/src/components/bs-ui/tooltip/tip.tsx
@@ -16,7 +16,7 @@ export default function Tip({
     delayDuration?: number
 }): JSX.Element {
     return (
-        <Tooltip open delayDuration={delayDuration}>
+        <Tooltip delayDuration={delayDuration}>
             <TooltipTrigger asChild={asChild}>{children}</TooltipTrigger>
 
             <TooltipContent
diff --git a/src/frontend/platform/src/controllers/API/finetune.ts b/src/frontend/platform/src/controllers/API/finetune.ts
index efc0df070..3fbb1c0ff 100644
--- a/src/frontend/platform/src/controllers/API/finetune.ts
+++ b/src/frontend/platform/src/controllers/API/finetune.ts
@@ -127,6 +127,13 @@ export const getModelListApi = async (): Promise<any> => {
 
 // 添加模型
 export const addLLmServer = async (data: any) => {
+    // 删除前端生成的id (id: string )
+    data.models = data.models.map((item) => {
+        const { id, ...other } = item
+        return typeof id === 'string' ? {
+            ...other
+        } : item
+    })
     return await axios.post(`/api/v1/llm`, data)
 };
 
diff --git a/src/frontend/platform/src/controllers/request.ts b/src/frontend/platform/src/controllers/request.ts
index ad09ffd1f..fa74287fe 100644
--- a/src/frontend/platform/src/controllers/request.ts
+++ b/src/frontend/platform/src/controllers/request.ts
@@ -29,7 +29,10 @@ customAxios.interceptors.response.use(function (response) {
 
     // 无权访问
     if (response.data.status_code === 403) {
-        location.href = __APP_ENV__.BASE_URL + '/403'
+        // 修改不跳转
+        if (response.config.method === 'get') {
+            location.href = __APP_ENV__.BASE_URL + '/403'
+        }
         return Promise.reject(errorMessage);
     }
     // 异地登录
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatInput.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatInput.tsx
index 90bc5bee7..5e8faa248 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatInput.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatInput.tsx
@@ -55,7 +55,7 @@ export default function ChatInput({ autoRun, clear, form, wsUrl, onBeforSend, on
     const continueRef = useRef(false)
     // 停止状态
     const [stop, setStop] = useState({
-        show: false,
+        show: true,
         disable: false
     })
     /**
@@ -430,6 +430,7 @@ export default function ChatInput({ autoRun, clear, form, wsUrl, onBeforSend, on
     const [restarted, setRestarted] = useState(false)
     const handleRestartClick = () => {
         sendWsMsg({ "action": "stop" });
+        setInputForm(null)
         setRestarted(true)
         const chatId = currentChatIdRef.current.startsWith('test') ? '' : currentChatIdRef.current
         restartCallBackRef.current[chatId] = () => {
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatMessages.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatMessages.tsx
index 3d0306f9f..a3f86d92d 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatMessages.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/ChatMessages.tsx
@@ -90,7 +90,7 @@ export default function ChatMessages({
     // 成对的qa msg
     const findQa = (msgs, index) => {
         const item = msgs[index]
-        if (['stream_msg', 'answer'].includes(item.category)) {
+        if (['stream_msg', 'answer', 'output_msg'].includes(item.category)) {
             const a = item.message.msg || item.message
             let q = ''
             while (index > -1) {
@@ -106,7 +106,7 @@ export default function ChatMessages({
             let a = ''
             while (msgs[++index]) {
                 const aItem = msgs[index]
-                if (['stream_msg', 'answer'].includes(aItem.category)) {
+                if (['stream_msg', 'answer', 'output_msg'].includes(aItem.category)) {
                     a = aItem.message.msg || aItem.message
                     break
                 }
diff --git a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/MessageBsChoose.tsx b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/MessageBsChoose.tsx
index aad2da645..757f06c55 100644
--- a/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/MessageBsChoose.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/flow/FlowChat/MessageBsChoose.tsx
@@ -114,6 +114,13 @@ export default function MessageBsChoose({ type = 'choose', logo, data }: { type?
         [data.message]
     )
 
+    const files = useMemo(() => {
+        return typeof data.files === 'string' ? [] : data.files
+    }, [data.files])
+
+    // hack
+    if (typeof data.files === 'string') return null 
+
     return <div className="flex w-full">
         <div className="w-fit group max-w-[90%]">
             <div className="flex justify-between items-center mb-1">
@@ -135,7 +142,7 @@ export default function MessageBsChoose({ type = 'choose', logo, data }: { type?
                         <div>{mkdown}</div>
                         {/* files */}
                         <div>
-                            {data.files?.map((file) => <div
+                            {files.map((file) => <div
                                 className="flex gap-2 w-52 border border-gray-200 shadow-sm bg-gray-50 dark:bg-gray-600 px-4 py-2 rounded-sm cursor-pointer"
                                 onClick={() => handleDownloadFile(file)}
                             >
@@ -155,7 +162,7 @@ export default function MessageBsChoose({ type = 'choose', logo, data }: { type?
                                         className="w-full"
                                         ref={textRef}
                                         disabled={inputSended}
-                                        defaultValue={data.message.input_msg}
+                                        defaultValue={data.message.input_msg || data.message.hisValue}
                                     />
                                     <div className="flex justify-end mt-2">
                                         <Button
diff --git a/src/frontend/platform/src/pages/BuildPage/skills/editSkill/extraSidebarComponent/PersonalComponents.tsx b/src/frontend/platform/src/pages/BuildPage/skills/editSkill/extraSidebarComponent/PersonalComponents.tsx
index ce5a6bf5d..b227a9dfe 100644
--- a/src/frontend/platform/src/pages/BuildPage/skills/editSkill/extraSidebarComponent/PersonalComponents.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/skills/editSkill/extraSidebarComponent/PersonalComponents.tsx
@@ -18,7 +18,7 @@ export default function PersonalComponents({ onDragStart }) {
                 desc: `组件 ${data.node.display_name} 已存在，覆盖原有组件还是继续创新建组件？`,
                 showClose: true,
                 okTxt: '覆盖',
-                canelTxt: '创建新组建',
+                canelTxt: '创建新组件',
                 onOk(next) {
                     addSavedComponent(cloneDeep(data), true)
                     next()
diff --git a/src/frontend/platform/src/pages/BuildPage/skills/editSkill/nodeToolbarComponent/index.tsx b/src/frontend/platform/src/pages/BuildPage/skills/editSkill/nodeToolbarComponent/index.tsx
index 0f644f32a..5bff8aabb 100644
--- a/src/frontend/platform/src/pages/BuildPage/skills/editSkill/nodeToolbarComponent/index.tsx
+++ b/src/frontend/platform/src/pages/BuildPage/skills/editSkill/nodeToolbarComponent/index.tsx
@@ -68,7 +68,7 @@ const NodeToolbarComponent = ({ data, deleteNode, openPopUp, position }) => {
         if (checkComponentsName(data.node.display_name)) {
           bsConfirm({
             title: '组件已存在',
-            desc: `组件 ${data.node.display_name} 已存在，覆盖原有组件还是继续创新建组件？`,
+            desc: `组件 ${data.node.display_name} 已存在，覆盖原有组件还是继续创建新组件？`,
             showClose: true,
             okTxt: '覆盖',
             canelTxt: '创建新组件',
diff --git a/src/frontend/platform/src/pages/DiffFlowPage/components/RunTest.tsx b/src/frontend/platform/src/pages/DiffFlowPage/components/RunTest.tsx
index 0b46a25b0..a17d2e190 100644
--- a/src/frontend/platform/src/pages/DiffFlowPage/components/RunTest.tsx
+++ b/src/frontend/platform/src/pages/DiffFlowPage/components/RunTest.tsx
@@ -9,10 +9,10 @@ import { generateUUID } from "@/components/bs-ui/utils";
 import { postBuildInit } from "@/controllers/API";
 import { useDiffFlowStore } from "@/store/diffFlowStore";
 import { FlowStyleType, FlowType } from "@/types/flow";
+import { exportCsv } from "@/util/utils";
 import { CircleHelp, Download, Play } from "lucide-react";
 import { useMemo, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
-import * as XLSX from 'xlsx';
 import CellWarp from "./Cell";
 import RunForm from "./RunForm";
 
@@ -87,40 +87,18 @@ export default function RunTest({ nodeId }) {
 
     // 导出结果（excle）
     const handleDownExcle = () => {
-        const data = [['测试用例', ...mulitVersionFlow.map(version => version.name)]];
+        const _mulitVersionFlow = mulitVersionFlow.filter(version => version)
+        const data = [['测试用例', ..._mulitVersionFlow.map(version => version.name)]];
 
         questions.forEach((_, index) => {
             const rowData = [_.q]
-            mulitVersionFlow.forEach(version => {
+            _mulitVersionFlow.forEach(version => {
                 rowData.push(cellRefs[`${index}-${version.id}`].current.getData())
             })
             data.push(rowData)
         })
 
-        // 创建Workbook对象
-        const wb = XLSX.utils.book_new();
-        // 添加Worksheet到Workbook中
-        const ws = XLSX.utils.aoa_to_sheet(data);
-        XLSX.utils.book_append_sheet(wb, ws, "Sheet1");
-
-        // 生成Excel文件
-        const wbout = XLSX.write(wb, { bookType: 'xlsx', type: 'array' });
-        const blob = new Blob([wbout], { type: 'application/octet-stream' });
-        // 创建下载链接
-        const url = URL.createObjectURL(blob);
-        const a = document.createElement("a");
-        a.href = url;
-        a.download = "test_result.xlsx";
-
-        // 模拟点击下载链接
-        document.body.appendChild(a);
-        a.click();
-
-        // 清理URL对象
-        setTimeout(function () {
-            document.body.removeChild(a);
-            window.URL.revokeObjectURL(url);
-        }, 0);
+        exportCsv([], "test_result.xlsx")
     }
 
     const notDiffVersion = useMemo(() => !mulitVersionFlow.some((version) => version), [mulitVersionFlow])
diff --git a/src/frontend/platform/src/pages/KnowledgePage/qas.tsx b/src/frontend/platform/src/pages/KnowledgePage/qas.tsx
index f7e6f3d15..710326380 100644
--- a/src/frontend/platform/src/pages/KnowledgePage/qas.tsx
+++ b/src/frontend/platform/src/pages/KnowledgePage/qas.tsx
@@ -239,6 +239,17 @@ export default function QasPage() {
         })
     )
 
+    // 轮询
+    useEffect(() => {
+        const runing = datalist.some(item=> item.status === 2)
+        if (runing) {
+            const timer = setTimeout(() => {
+                reload()
+            }, 5000)
+            return () => clearTimeout(timer)
+        }
+    }, [datalist])
+
     useEffect(() => {
         // @ts-ignore
         const libname = window.libname // 临时记忆
@@ -313,9 +324,9 @@ export default function QasPage() {
         }
     };
     return <div className="relative px-2 pt-4 size-full">
-        {loading && <div className="absolute w-full h-full top-0 left-0 flex justify-center items-center z-10 bg-[rgba(255,255,255,0.6)] dark:bg-blur-shared">
+        {/* {loading && <div className="absolute w-full h-full top-0 left-0 flex justify-center items-center z-10 bg-[rgba(255,255,255,0.6)] dark:bg-blur-shared">
             <LoadingIcon />
-        </div>}
+        </div>} */}
         <div className="h-full bg-background-login">
             <div className="flex justify-between">
                 <div className="flex justify-between items-center mb-4">
@@ -359,7 +370,7 @@ export default function QasPage() {
                             <TableHead>{t('creationTime')}</TableHead>
                             <TableHead>{t('updateTime')}</TableHead>
                             <TableHead className="w-20">{t('creator')}</TableHead>
-                            <TableHead>{t('status')}</TableHead>
+                            <TableHead className="w-[140px]">{t('status')}</TableHead>
                             <TableHead className="text-right pr-6">{t('operations')}</TableHead>
                         </TableRow>
                     </TableHeader>
@@ -385,11 +396,11 @@ export default function QasPage() {
                                 <TableCell>{el.user_name}</TableCell>
                                 <TableCell>
                                     <div className="flex items-center">
-                                        <Switch
+                                        {el.status !== 2 && <Switch
                                             checked={el.status === 1}
                                             disabled={el.status === 3}
                                             onCheckedChange={(bln) => handleStatusClick(el.id, bln)}
-                                        />
+                                        />}
                                         {el.status === 2 && (
                                             <span className="ml-2 text-sm">处理中</span>
                                         )}
diff --git a/src/frontend/platform/src/pages/LogPage/useAppLog/index.tsx b/src/frontend/platform/src/pages/LogPage/useAppLog/index.tsx
index e8eb61951..1980812cc 100644
--- a/src/frontend/platform/src/pages/LogPage/useAppLog/index.tsx
+++ b/src/frontend/platform/src/pages/LogPage/useAppLog/index.tsx
@@ -236,7 +236,7 @@ export default function AppUseLog() {
             })
             // 导出excle
             const fileName = generateFileName(start_date, end_date, user.user_name);
-            exportCsv(data, fileName)
+            exportCsv(data, fileName, true)
 
             // await downloadFile(__APP_ENV__.BASE_URL + res.url, fileName);
             setAuditing(false);
diff --git a/src/frontend/platform/src/util/flowCompatible.ts b/src/frontend/platform/src/util/flowCompatible.ts
index fa4a206f0..d557a7b63 100644
--- a/src/frontend/platform/src/util/flowCompatible.ts
+++ b/src/frontend/platform/src/util/flowCompatible.ts
@@ -113,8 +113,10 @@ const comptibleInput = (node) => {
 
 
 const comptibleAgent = (node) => {
-    if (!node.v && node.group_params[1].params[0].type === 'bisheng_model') {
-        node.group_params[1].params[0].type = 'agent_model'
+    if (!node.v) {
+        if (node.group_params[1].params[0].type === 'bisheng_model') {
+            node.group_params[1].params[0].type = 'agent_model'
+        }
         node.v = 1
     }
 
@@ -133,6 +135,9 @@ const comptibleAgent = (node) => {
 
 
 const comptibleOutput = (node) => {
+    if (!node.v) {
+        node.v = 1
+    }
     if (node.v == 1) {
         node.group_params[0].params[0].key = 'message'
         node.group_params[0].params[0].global = 'key'
diff --git a/src/frontend/platform/src/util/utils.ts b/src/frontend/platform/src/util/utils.ts
index 09d7cfb43..0fd82bda1 100644
--- a/src/frontend/platform/src/util/utils.ts
+++ b/src/frontend/platform/src/util/utils.ts
@@ -1,9 +1,9 @@
 import axios from "axios";
 import clsx, { ClassValue } from "clsx";
 import { twMerge } from "tailwind-merge";
+import * as XLSX from 'xlsx';
 import { APITemplateType } from "../types/api";
 import { checkUpperWords } from "../utils";
-import * as XLSX from 'xlsx';
 
 export function classNames(...classes: Array<string>): string {
     return classes.filter(Boolean).join(" ");
@@ -142,36 +142,78 @@ export function getFieldTitle(
             : toTitleCase(templateField);
 }
 
+/**
+ * 修复字符串中的不完整 Unicode 代理对（如单独的 \ud83d、\ud83c）
+ * @param {string} text - 原始字符串
+ * @returns {string} - 修复后的字符串
+ */
+function fixBrokenEmojis(text) {
+    return text.replace(
+        // 匹配单独的高位代理（\ud800-\udbff）且后面不跟低位代理（\udc00-\udfff）
+        /([\ud800-\udbff])(?![\udc00-\udfff])/g,
+        // 替换为完整的“问号”表情（或其他默认字符）
+        (highSurrogate) => highSurrogate + '\udfff' // 组合成合法但无意义的字符
+    );
+}
 
-// 导出excle
-export function exportCsv(data: any[], fileName: string = 'test_result.csv') {
-    // 创建Worksheet
-    const ws = XLSX.utils.aoa_to_sheet(data);
-    // 将Worksheet转换为CSV字符串
+export function exportCsv(
+    data: any[],
+    fileName: string = 'test_result.csv',
+    useBase64: boolean = false // 默认使用 Blob 方式
+) {
+    // 处理数据
+    const newData = data.map(row =>
+        row.map(cell => typeof cell === 'string' ? fixBrokenEmojis(cell) : cell)
+    );
+
+    // 创建 Worksheet
+    const ws = XLSX.utils.aoa_to_sheet(newData);
     const csv = XLSX.utils.sheet_to_csv(ws);
 
-    // 处理Unicode字符并转换为Base64
-    const base64String = btoa(unescape(encodeURIComponent(csv)));
-    // 创建Data URL（使用base64编码避免URL编码问题）
-    const csvContent = `data:text/csv;charset=utf-8;base64,${base64String}`;
-    // 生成CSV文件
-    // const blob = new Blob([csv], { type: 'text/csv;charset=utf-8;' });
-    // 创建下载链接
-    // const url = URL.createObjectURL(blob);
-    const a = document.createElement("a");
-    a.href = csvContent;
-    // a.href = url;
-    a.download = fileName;
+    if (useBase64) {
+        // 处理Unicode字符并转换为Base64
+        const base64String = btoa(unescape(encodeURIComponent(csv)));
+        // 创建Data URL（使用base64编码避免URL编码问题）
+        const csvContent = `data:text/csv;charset=utf-8;base64,${base64String}`;
 
-    // 模拟点击下载链接
-    document.body.appendChild(a);
-    a.click();
+        const a = document.createElement("a");
+        a.href = csvContent;
+        // a.href = url;
+        a.download = fileName;
 
-    // 清理URL对象
-    setTimeout(function () {
-        document.body.removeChild(a);
-        // window.URL.revokeObjectURL(url);
-    }, 0);
+        // 模拟点击下载链接
+        document.body.appendChild(a);
+        a.click();
+
+        // 清理URL对象
+        setTimeout(function () {
+            document.body.removeChild(a);
+            // window.URL.revokeObjectURL(url);
+        }, 0);
+    } else {
+        // 创建Workbook对象
+        const wb = XLSX.utils.book_new();
+        // 添加Worksheet到Workbook中
+        XLSX.utils.book_append_sheet(wb, ws, "Sheet1");
+        // 生成Excel文件
+        const wbout = XLSX.write(wb, { bookType: 'xlsx', type: 'array' });
+        const blob = new Blob([wbout], { type: 'application/octet-stream' });
+        // 创建下载链接
+        const url = URL.createObjectURL(blob);
+        const a = document.createElement("a");
+        a.href = url;
+        a.download = "test_result.xlsx";
+
+        // 模拟点击下载链接
+        document.body.appendChild(a);
+        a.click();
+
+        // 清理URL对象
+        setTimeout(function () {
+            document.body.removeChild(a);
+            window.URL.revokeObjectURL(url);
+        }, 0);
+    }
 }
 
 // 校验合法json

From f056021942f0a295b47ee183a4f98afdf3dd5079 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Mon, 19 May 2025 16:56:44 +0800
Subject: [PATCH 172/186] fix: chunk over size tips

---
 src/backend/bisheng/api/services/knowledge_imp.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backend/bisheng/api/services/knowledge_imp.py b/src/backend/bisheng/api/services/knowledge_imp.py
index d740f5eaa..ce475fe26 100644
--- a/src/backend/bisheng/api/services/knowledge_imp.py
+++ b/src/backend/bisheng/api/services/knowledge_imp.py
@@ -371,7 +371,7 @@ def add_file_embedding(vector_client,
                 metadatas.append(val['metadata'])
     for index, one in enumerate(texts):
         if len(one) > 10000:
-            raise ValueError('分段结果超长，请尝试在自定义策略中使用更多切分符（例如 \n）进行切分策略')
+            raise ValueError('分段结果超长，请尝试在自定义策略中使用更多切分符（例如 \\n、。、.）进行切分')
         # 入库时 拼接文件名和文档摘要
         texts[index] = KnowledgeUtils.aggregate_chunk_metadata(one, metadatas[index])
 

From 198c2c0187ae4d905aa4f780d7f9551f0e9e7332 Mon Sep 17 00:00:00 2001
From: dolphin <shanghang@dataelem.com>
Date: Mon, 19 May 2025 17:35:40 +0800
Subject: [PATCH 173/186] fix: download excle

---
 .../src/pages/DiffFlowPage/components/RunTest.tsx    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/frontend/platform/src/pages/DiffFlowPage/components/RunTest.tsx b/src/frontend/platform/src/pages/DiffFlowPage/components/RunTest.tsx
index a17d2e190..3c996042b 100644
--- a/src/frontend/platform/src/pages/DiffFlowPage/components/RunTest.tsx
+++ b/src/frontend/platform/src/pages/DiffFlowPage/components/RunTest.tsx
@@ -98,7 +98,7 @@ export default function RunTest({ nodeId }) {
             data.push(rowData)
         })
 
-        exportCsv([], "test_result.xlsx")
+        exportCsv(data, "test_result.xlsx")
     }
 
     const notDiffVersion = useMemo(() => !mulitVersionFlow.some((version) => version), [mulitVersionFlow])
@@ -122,11 +122,11 @@ export default function RunTest({ nodeId }) {
                 {
                     isForm ? <Dialog open={formShow} onOpenChange={setFormShow}>
                         <DialogTrigger asChild>
-                            <Button size="sm" disabled={runningType === 'all' || notDiffVersion}><Play />{t('test.testRun')}</Button>
+                            <Button size="sm" disabled={runningType === 'all' || notDiffVersion}><Play size={14} />{t('test.testRun')}</Button>
                         </DialogTrigger>
                         <RunForm show={formShow} flow={mulitVersionFlow[0]} onChangeShow={setFormShow} onSubmit={handleRunTest} />
                     </Dialog> :
-                        <Button size="sm" disabled={runningType === 'all' || notDiffVersion} onClick={() => handleRunTest()}><Play />{t('test.testRun')}</Button>
+                        <Button size="sm" disabled={runningType === 'all' || notDiffVersion} onClick={() => handleRunTest()}><Play size={14} />{t('test.testRun')}</Button>
                 }
             </div>
             {/* table */}
@@ -145,13 +145,13 @@ export default function RunTest({ nodeId }) {
                                             className="w-6 h-6"
                                             title={t('test.run')}
                                             onClick={() => handleColRunTest(version.id)}
-                                        ><Play /></Button>}
+                                        ><Play size={14} /></Button>}
                                     </div>
                                 </TableHead>
                             )
                         }
                         <TableHead className="text-right min-w-[135px]" style={{ width: 135 }}>
-                            <Button variant="link" disabled={runningType !== '' || !running} onClick={handleDownExcle}><Download className="mr-1" />{t('test.downloadResults')}</Button>
+                            <Button variant="link" disabled={runningType !== '' || !running} onClick={handleDownExcle}><Download className="mr-1" size={18} />{t('test.downloadResults')}</Button>
                         </TableHead>
                     </TableRow>
                 </TableHeader>
@@ -173,7 +173,7 @@ export default function RunTest({ nodeId }) {
                                             className="min-w-6 h-6"
                                             title="运行"
                                             onClick={() => handleRowRunTest(index)}
-                                        ><Play /></Button>}
+                                        ><Play size={14}/></Button>}
                                     </div>
                                 </TableCell>
                                 {/* 版本 */}

From 928c152bcaf968b83fe2a6c2639c449cb27b6026 Mon Sep 17 00:00:00 2001
From: dolphin <shanghang@dataelem.com>
Date: Mon, 19 May 2025 17:38:20 +0800
Subject: [PATCH 174/186] =?UTF-8?q?fix:=20=E8=8A=82=E7=82=B9=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=8D=87=E7=BA=A7=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/frontend/platform/src/util/flowCompatible.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/frontend/platform/src/util/flowCompatible.ts b/src/frontend/platform/src/util/flowCompatible.ts
index d557a7b63..b397362dd 100644
--- a/src/frontend/platform/src/util/flowCompatible.ts
+++ b/src/frontend/platform/src/util/flowCompatible.ts
@@ -148,6 +148,10 @@ const comptibleOutput = (node) => {
 
 
 const comptibleLLM = (node) => {
+    if (!node.v) {
+        node.v = 1
+    }
+    
     if (node.v == 1) {
 
         node.group_params[2].params.push({

From 41f81c7b49fb290f7f24f96223964abe99f790bc Mon Sep 17 00:00:00 2001
From: dolphin <shanghang@dataelem.com>
Date: Mon, 19 May 2025 17:45:29 +0800
Subject: [PATCH 175/186] fix: qa knowlaged switch

---
 src/frontend/platform/src/pages/KnowledgePage/qas.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/frontend/platform/src/pages/KnowledgePage/qas.tsx b/src/frontend/platform/src/pages/KnowledgePage/qas.tsx
index 710326380..f7022ecd7 100644
--- a/src/frontend/platform/src/pages/KnowledgePage/qas.tsx
+++ b/src/frontend/platform/src/pages/KnowledgePage/qas.tsx
@@ -398,7 +398,6 @@ export default function QasPage() {
                                     <div className="flex items-center">
                                         {el.status !== 2 && <Switch
                                             checked={el.status === 1}
-                                            disabled={el.status === 3}
                                             onCheckedChange={(bln) => handleStatusClick(el.id, bln)}
                                         />}
                                         {el.status === 2 && (

From 78696f5e35a7437e2f77091cc3471202b2ae9c23 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Mon, 19 May 2025 17:53:58 +0800
Subject: [PATCH 176/186] fix: qa status default processing

---
 src/backend/bisheng/api/services/knowledge_imp.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backend/bisheng/api/services/knowledge_imp.py b/src/backend/bisheng/api/services/knowledge_imp.py
index ce475fe26..9241ac4d5 100644
--- a/src/backend/bisheng/api/services/knowledge_imp.py
+++ b/src/backend/bisheng/api/services/knowledge_imp.py
@@ -729,7 +729,7 @@ def qa_status_change(qa_id: int, target_status: int):
         qa_db.status = target_status
         QAKnoweldgeDao.update(qa_db)
     else:
-        qa_db.status = target_status
+        qa_db.status = QAStatus.PROCESSING.value
         QAKnoweldgeDao.update(qa_db)
         QA_save_knowledge(db_knowledge, qa_db)
     return qa_db

From 1ca5c83441aaaa148d486a02751a0ac6671f683e Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Mon, 19 May 2025 18:51:57 +0800
Subject: [PATCH 177/186] fix: flow stop send break answer

---
 src/backend/bisheng/chat/client.py   |  2 +-
 src/backend/bisheng/chat/handlers.py | 39 +++++++++++++++++++++-------
 src/backend/bisheng/chat/manager.py  |  2 ++
 3 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/src/backend/bisheng/chat/client.py b/src/backend/bisheng/chat/client.py
index d46fc1c8e..2333dfe16 100644
--- a/src/backend/bisheng/chat/client.py
+++ b/src/backend/bisheng/chat/client.py
@@ -245,7 +245,7 @@ class ChatClient:
         if reasoning_answer.split():
             res = await self.add_message('bot', answer, 'reasoning_answer', 'break_answer')
             await self.send_response('reasoning_answer', 'end', '', message_id=res.id if res else None)
-        elif answer.strip():
+        if answer.strip():
             res = await self.add_message('bot', answer, 'answer', 'break_answer')
             await self.send_response('answer', 'end', '', message_id=res.id if res else None)
         await self.send_response('processing', 'close', '')
diff --git a/src/backend/bisheng/chat/handlers.py b/src/backend/bisheng/chat/handlers.py
index 1cfcd5a66..dfb8d49ad 100644
--- a/src/backend/bisheng/chat/handlers.py
+++ b/src/backend/bisheng/chat/handlers.py
@@ -10,6 +10,7 @@ from bisheng.chat.manager import ChatManager
 from bisheng.chat.utils import judge_source, process_graph, process_source_document
 from bisheng.database.base import session_getter
 from bisheng.database.models.report import Report
+from bisheng.database.models.message import ChatMessage as ChatMessageDB
 from bisheng.interface.importing.utils import import_by_type
 from bisheng.interface.initialize.loading import instantiate_llm
 from bisheng.settings import settings
@@ -75,18 +76,38 @@ class Handler:
                 close = ChatResponse(type='close')
                 await session.send_json(client_id, chat_id, res, add=False)
                 await session.send_json(client_id, chat_id, close, add=False)
+        # 将流式输出的内容写到数据库内
         answer = ''
-        # 记录中止后产生的流式输出内容
+        reasoning_answer = ''
         while not self.stream_queue.empty():
-            answer += self.stream_queue.get()
+            msg = self.stream_queue.get()
+            if msg.get('type') == 'answer':
+                answer += msg.get('content', '')
+            elif msg.get('type') == 'reasoning':
+                reasoning_answer += msg.get('content', '')
+        if reasoning_answer.strip():
+            chat_message = ChatMessageDB(message=reasoning_answer,
+                                         category='answer',
+                                         type='end',
+                                         user_id=user_id,
+                                         remark='break_answer',
+                                         is_bot=True)
+            db_message = session.chat_history.add_message(client_id, chat_id, chat_message)
+            if db_message:
+                await session.send_json(client_id, chat_id, chat_message, add=False)
+
         if answer.strip():
-            chat_message = ChatMessage(message=answer,
-                                       category='answer',
-                                       type='end',
-                                       user_id=user_id,
-                                       remark='break_answer',
-                                       is_bot=True)
-            session.chat_history.add_message(client_id, chat_id, chat_message)
+            chat_message = ChatMessageDB(message=answer,
+                                         category='answer',
+                                         type='end',
+                                         user_id=user_id,
+                                         remark='break_answer',
+                                         is_bot=True)
+            db_message = session.chat_history.add_message(client_id, chat_id, chat_message)
+            if db_message:
+                await session.send_json(client_id, chat_id, db_message, add=False)
+
+
         logger.info('process_stop done')
 
     async def process_report(self,
diff --git a/src/backend/bisheng/chat/manager.py b/src/backend/bisheng/chat/manager.py
index 083385078..62b8e62a0 100644
--- a/src/backend/bisheng/chat/manager.py
+++ b/src/backend/bisheng/chat/manager.py
@@ -51,6 +51,7 @@ class ChatHistory(Subject):
         from bisheng.database.models.message import ChatMessage
         message.flow_id = client_id
         message.chat_id = chat_id
+        db_message = None
         if chat_id and (message.message or message.intermediate_steps
                         or message.files) and message.type != 'stream':
             msg = message.copy()
@@ -67,6 +68,7 @@ class ChatHistory(Subject):
 
         if not isinstance(message, FileResponse):
             self.notify()
+        return db_message
 
     def empty_history(self, client_id: str, chat_id: str):
         """Empty the chat history for a client."""

From 86d7fccb33b28d939fa476af9bdd1a6f68ddb4c0 Mon Sep 17 00:00:00 2001
From: dolphin <shanghang@dataelem.com>
Date: Mon, 19 May 2025 19:44:54 +0800
Subject: [PATCH 178/186] feat: QA retry failed add toast

---
 src/frontend/platform/src/pages/KnowledgePage/qas.tsx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/frontend/platform/src/pages/KnowledgePage/qas.tsx b/src/frontend/platform/src/pages/KnowledgePage/qas.tsx
index f7022ecd7..a8f89b70b 100644
--- a/src/frontend/platform/src/pages/KnowledgePage/qas.tsx
+++ b/src/frontend/platform/src/pages/KnowledgePage/qas.tsx
@@ -241,7 +241,7 @@ export default function QasPage() {
 
     // 轮询
     useEffect(() => {
-        const runing = datalist.some(item=> item.status === 2)
+        const runing = datalist.some(item => item.status === 2)
         if (runing) {
             const timer = setTimeout(() => {
                 reload()
@@ -307,7 +307,9 @@ export default function QasPage() {
         });
     };
 
+    const {toast} = useToast()
 
+    
     const handleStatusClick = async (id: number, checked: boolean) => {
         const targetStatus = checked ? 1 : 0;
         const isOpening = checked;
@@ -318,6 +320,10 @@ export default function QasPage() {
             await updateQaStatus(id, targetStatus);
             refreshData(item => item.id === id, { status: targetStatus });
         } catch (error) {
+            toast({
+                variant: 'error',
+                description: error
+            })
             refreshData(item => item.id === id, {
                 status: 3
             });

From 3bb8d610aa77d3ca40d656670bf296d75be5d071 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Mon, 19 May 2025 20:06:26 +0800
Subject: [PATCH 179/186] fix: change sql agent system prompt

---
 .../bisheng_langchain/gpts/tools/sql_agent/tool.py              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bisheng-langchain/bisheng_langchain/gpts/tools/sql_agent/tool.py b/src/bisheng-langchain/bisheng_langchain/gpts/tools/sql_agent/tool.py
index 733aff7bc..17ee1a081 100644
--- a/src/bisheng-langchain/bisheng_langchain/gpts/tools/sql_agent/tool.py
+++ b/src/bisheng-langchain/bisheng_langchain/gpts/tools/sql_agent/tool.py
@@ -22,7 +22,7 @@ When a new question arrives, follow the steps *in order*:
 
 3. Write one syntactically-correct {dialect} SELECT statement.  
    Guidelines for this query:  
-   - Return no more than 10 rows **unless** the user explicitly requests another limit.  
+   - Return no more than 50 rows **unless** the user explicitly requests another limit.  
    - Select only the columns needed to answer the question; avoid `SELECT *`.  
    - If helpful, add `ORDER BY` on a meaningful column so the most interesting rows appear first.  
    - ABSOLUTELY NO data-modification statements (INSERT, UPDATE, DELETE, DROP, …).  

From f41c2fe3954fba8624d7cf29211454d04bc43677 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Mon, 19 May 2025 20:36:17 +0800
Subject: [PATCH 180/186] fix: flow stop send message

---
 src/backend/bisheng/chat/handlers.py | 65 ++++++++++++++--------------
 1 file changed, 33 insertions(+), 32 deletions(-)

diff --git a/src/backend/bisheng/chat/handlers.py b/src/backend/bisheng/chat/handlers.py
index dfb8d49ad..5da33cae2 100644
--- a/src/backend/bisheng/chat/handlers.py
+++ b/src/backend/bisheng/chat/handlers.py
@@ -10,7 +10,7 @@ from bisheng.chat.manager import ChatManager
 from bisheng.chat.utils import judge_source, process_graph, process_source_document
 from bisheng.database.base import session_getter
 from bisheng.database.models.report import Report
-from bisheng.database.models.message import ChatMessage as ChatMessageDB
+from bisheng.database.models.message import ChatMessage as ChatMessageDB, ChatMessageDao
 from bisheng.interface.importing.utils import import_by_type
 from bisheng.interface.initialize.loading import instantiate_llm
 from bisheng.settings import settings
@@ -68,6 +68,38 @@ class Handler:
             else:
                 logger.error(f'act=auto_gen act={action}')
         else:
+            # 将流式输出的内容写到数据库内
+            answer = ''
+            reasoning_answer = ''
+            while not self.stream_queue.empty():
+                msg = self.stream_queue.get()
+                if msg.get('type') == 'answer':
+                    answer += msg.get('content', '')
+                elif msg.get('type') == 'reasoning':
+                    reasoning_answer += msg.get('content', '')
+            if reasoning_answer.strip():
+                chat_message = ChatMessageDB(flow_id=client_id, chat_id=chat_id,
+                                             message=reasoning_answer,
+                                             category='answer',
+                                             type='end',
+                                             user_id=user_id,
+                                             remark='break_answer',
+                                             is_bot=True)
+                if chat_id:
+                    db_message = ChatMessageDao.insert_one(chat_message)
+                    await session.send_json(client_id, chat_id, db_message, add=False)
+
+            if answer.strip():
+                chat_message = ChatMessageDB(flow_id=client_id, chat_id=chat_id,
+                                             message=answer,
+                                             category='answer',
+                                             type='end',
+                                             user_id=user_id,
+                                             remark='break_answer',
+                                             is_bot=True)
+                if chat_id:
+                    db_message = ChatMessageDao.insert_one(chat_message)
+                    await session.send_json(client_id, chat_id, db_message, add=False)
             # 普通技能的stop
             res = thread_pool.cancel_task([key])  # 将进行中的任务进行cancel
             if res[0]:
@@ -76,37 +108,6 @@ class Handler:
                 close = ChatResponse(type='close')
                 await session.send_json(client_id, chat_id, res, add=False)
                 await session.send_json(client_id, chat_id, close, add=False)
-        # 将流式输出的内容写到数据库内
-        answer = ''
-        reasoning_answer = ''
-        while not self.stream_queue.empty():
-            msg = self.stream_queue.get()
-            if msg.get('type') == 'answer':
-                answer += msg.get('content', '')
-            elif msg.get('type') == 'reasoning':
-                reasoning_answer += msg.get('content', '')
-        if reasoning_answer.strip():
-            chat_message = ChatMessageDB(message=reasoning_answer,
-                                         category='answer',
-                                         type='end',
-                                         user_id=user_id,
-                                         remark='break_answer',
-                                         is_bot=True)
-            db_message = session.chat_history.add_message(client_id, chat_id, chat_message)
-            if db_message:
-                await session.send_json(client_id, chat_id, chat_message, add=False)
-
-        if answer.strip():
-            chat_message = ChatMessageDB(message=answer,
-                                         category='answer',
-                                         type='end',
-                                         user_id=user_id,
-                                         remark='break_answer',
-                                         is_bot=True)
-            db_message = session.chat_history.add_message(client_id, chat_id, chat_message)
-            if db_message:
-                await session.send_json(client_id, chat_id, db_message, add=False)
-
 
         logger.info('process_stop done')
 

From eaf804b66d33c41227edecaff1d911735ac506a2 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Mon, 19 May 2025 20:38:53 +0800
Subject: [PATCH 181/186] fix: chunk over size tips

---
 src/backend/bisheng/api/services/knowledge_imp.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backend/bisheng/api/services/knowledge_imp.py b/src/backend/bisheng/api/services/knowledge_imp.py
index 9241ac4d5..bea816636 100644
--- a/src/backend/bisheng/api/services/knowledge_imp.py
+++ b/src/backend/bisheng/api/services/knowledge_imp.py
@@ -371,7 +371,7 @@ def add_file_embedding(vector_client,
                 metadatas.append(val['metadata'])
     for index, one in enumerate(texts):
         if len(one) > 10000:
-            raise ValueError('分段结果超长，请尝试在自定义策略中使用更多切分符（例如 \\n、。、.）进行切分')
+            raise ValueError('分段结果超长，请尝试在自定义策略中使用更多切分符（例如 \\n、。、\\.）进行切分')
         # 入库时 拼接文件名和文档摘要
         texts[index] = KnowledgeUtils.aggregate_chunk_metadata(one, metadatas[index])
 

From a50207f57bce77cbd117d18a7273e0ba1bf3effc Mon Sep 17 00:00:00 2001
From: dolphin <shanghang@dataelem.com>
Date: Mon, 19 May 2025 20:56:56 +0800
Subject: [PATCH 182/186] feat: knowleged rule submitButton

---
 .../KnowledgePage/components/FileUploadStep2.tsx  | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/frontend/platform/src/pages/KnowledgePage/components/FileUploadStep2.tsx b/src/frontend/platform/src/pages/KnowledgePage/components/FileUploadStep2.tsx
index 319739e3a..805ae4db7 100644
--- a/src/frontend/platform/src/pages/KnowledgePage/components/FileUploadStep2.tsx
+++ b/src/frontend/platform/src/pages/KnowledgePage/components/FileUploadStep2.tsx
@@ -115,6 +115,8 @@ export default function FileUploadStep2({ fileInfo, onPrev, onPreview, onChange
         onPreview(params, fileInfo.files)
     }
 
+    const [tab, setTab] = useState('smart')
+
     return <div className="flex flex-col">
         <div className="flex items-center gap-2 my-6 px-12 text-sm font-bold max-w-96">
             <span>①{t('uploadFile')}</span>
@@ -122,7 +124,10 @@ export default function FileUploadStep2({ fileInfo, onPrev, onPreview, onChange
             <span className="text-primary">②{t('docProcessingStrategy')}</span>
         </div>
 
-        <Tabs defaultValue="smart" className="w-full mt-4 text-center" onValueChange={(val) => chunkType.current = val}>
+        <Tabs defaultValue="smart" className="w-full mt-4 text-center" onValueChange={(val) => {
+            chunkType.current = val
+            setTab(val)
+        }}>
             <TabsList className="a mx-auto">
                 <TabsTrigger value="smart" className="roundedrounded-xl">{t('defaultStrategy')}</TabsTrigger>
                 <TabsTrigger value="chunk">{t('customStrategy')}</TabsTrigger>
@@ -146,10 +151,14 @@ export default function FileUploadStep2({ fileInfo, onPrev, onPreview, onChange
 
         <div className="flex justify-end mt-8 gap-4">
             <Button className="h-8" variant="outline" onClick={onPrev}>{t('previousStep')}</Button>
-            <Button disabled={loading} className="h-8" onClick={handleSubmit}>
+            <Button disabled={loading || (tab === 'chunk' && strategies.length === 0)} className="h-8" onClick={handleSubmit}>
                 {loading && <LoadIcon />} {t('submit')}
             </Button>
-            <Button className="h-8" id={'preview-btn'} onClick={handlePreview}>{t('previewResults')}</Button>
+            <Button
+                disabled={tab === 'chunk' && strategies.length === 0}
+                className="h-8"
+                id={'preview-btn'}
+                onClick={handlePreview}>{t('previewResults')}</Button>
         </div>
 
         {/* 重复文件提醒 */}

From 1f9739a8f6da62eea8282258062314c9d08509a2 Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Mon, 19 May 2025 20:58:26 +0800
Subject: [PATCH 183/186] fix: qa knowledge answer change to text field

---
 src/backend/bisheng/database/models/knowledge_file.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/backend/bisheng/database/models/knowledge_file.py b/src/backend/bisheng/database/models/knowledge_file.py
index aee6e6712..afa3ee406 100644
--- a/src/backend/bisheng/database/models/knowledge_file.py
+++ b/src/backend/bisheng/database/models/knowledge_file.py
@@ -5,7 +5,7 @@ from typing import List, Optional
 
 # if TYPE_CHECKING:
 from pydantic import field_validator
-from sqlalchemy import JSON, Column, DateTime, String, or_, text
+from sqlalchemy import JSON, Column, DateTime, String, or_, text, Text
 from sqlmodel import Field, delete, func, select
 
 from bisheng.database.base import session_getter
@@ -97,7 +97,7 @@ class KnowledgeFile(KnowledgeFileBase, table=True):
 class QAKnowledge(QAKnowledgeBase, table=True):
     id: Optional[int] = Field(default=None, primary_key=True)
     questions: Optional[List[str]] = Field(default=None, sa_column=Column(JSON))
-    answers: Optional[str] = Field(default=None, sa_column=Column(String(length=2048)))
+    answers: Optional[str] = Field(default=None, sa_column=Column(Text))
 
 
 class KnowledgeFileRead(KnowledgeFileBase):

From b9d0ee13d88b444684bd3f4f8c2f8d2455e9e243 Mon Sep 17 00:00:00 2001
From: dolphin <shanghang@dataelem.com>
Date: Mon, 19 May 2025 21:04:17 +0800
Subject: [PATCH 184/186] feat: update QAkonwlaged anser size

---
 src/frontend/platform/public/locales/en/knowledge.json | 2 +-
 src/frontend/platform/public/locales/zh/knowledge.json | 2 +-
 src/frontend/platform/src/pages/KnowledgePage/qas.tsx  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/frontend/platform/public/locales/en/knowledge.json b/src/frontend/platform/public/locales/en/knowledge.json
index 38ca00dc8..60431b334 100644
--- a/src/frontend/platform/public/locales/en/knowledge.json
+++ b/src/frontend/platform/public/locales/en/knowledge.json
@@ -88,7 +88,7 @@
     "pleaseEnterQuestion": "Please enter a question",
     "questionAndAnswerCannotBeEmpty": "Question and answer cannot be empty",
     "max100CharactersForSimilarQuestion": "Max 100 characters for similar question",
-    "max1000CharactersForAnswer": "Max 1000 characters for answer",
+    "max1000CharactersForAnswer": "Max 10000 characters for answer",
     "updateQa": "Update QA",
     "createQa": "Create QA",
     "similarQuestions": "Similar Questions",
diff --git a/src/frontend/platform/public/locales/zh/knowledge.json b/src/frontend/platform/public/locales/zh/knowledge.json
index 2becc74e1..b3d08d413 100644
--- a/src/frontend/platform/public/locales/zh/knowledge.json
+++ b/src/frontend/platform/public/locales/zh/knowledge.json
@@ -88,7 +88,7 @@
     "pleaseEnterQuestion": "请先输入问题",
     "questionAndAnswerCannotBeEmpty": "问题、答案不能为空",
     "max100CharactersForSimilarQuestion": "相似问最多100个字",
-    "max1000CharactersForAnswer": "答案最多1000个字",
+    "max1000CharactersForAnswer": "答案最多10000个字",
     "updateQa": "更新 QA",
     "createQa": "创建 QA",
     "similarQuestions": "相似问题",
diff --git a/src/frontend/platform/src/pages/KnowledgePage/qas.tsx b/src/frontend/platform/src/pages/KnowledgePage/qas.tsx
index a8f89b70b..a3874b6ec 100644
--- a/src/frontend/platform/src/pages/KnowledgePage/qas.tsx
+++ b/src/frontend/platform/src/pages/KnowledgePage/qas.tsx
@@ -130,7 +130,7 @@ const EditQa = forwardRef(function ({ knowlageId, onChange }, ref) {
                 description: t('max100CharactersForSimilarQuestion')
             });
         }
-        if (form.answer.length > 1000) {
+        if (form.answer.length > 10000) {
             return message({
                 variant: 'warning',
                 description: t('max1000CharactersForAnswer')

From b773a4790469f562f7343315e25a5ea3ca2c0f1c Mon Sep 17 00:00:00 2001
From: GuoQing Zhang <zhangguoqing@dataelem.com>
Date: Mon, 19 May 2025 21:36:23 +0800
Subject: [PATCH 185/186] fix: flow stop save message

---
 src/backend/bisheng/api/v1/schemas.py | 2 +-
 src/backend/bisheng/chat/handlers.py  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/backend/bisheng/api/v1/schemas.py b/src/backend/bisheng/api/v1/schemas.py
index 40a4c3c2b..05800ddbe 100644
--- a/src/backend/bisheng/api/v1/schemas.py
+++ b/src/backend/bisheng/api/v1/schemas.py
@@ -147,7 +147,7 @@ class ChatMessage(BaseModel):
     files: Optional[list] = []
     user_id: Optional[int] = None
     message_id: Optional[int | str] = None
-    source: int = 0
+    source: Optional[int] = 0
     sender: Optional[str] = None
     receiver: Optional[dict] = None
     liked: int = 0
diff --git a/src/backend/bisheng/chat/handlers.py b/src/backend/bisheng/chat/handlers.py
index 5da33cae2..a3984dfa3 100644
--- a/src/backend/bisheng/chat/handlers.py
+++ b/src/backend/bisheng/chat/handlers.py
@@ -87,7 +87,7 @@ class Handler:
                                              is_bot=True)
                 if chat_id:
                     db_message = ChatMessageDao.insert_one(chat_message)
-                    await session.send_json(client_id, chat_id, db_message, add=False)
+                    await session.send_json(client_id, chat_id, ChatMessage(**db_message.model_dump(), message_id=db_message.id), add=False)
 
             if answer.strip():
                 chat_message = ChatMessageDB(flow_id=client_id, chat_id=chat_id,
@@ -99,7 +99,7 @@ class Handler:
                                              is_bot=True)
                 if chat_id:
                     db_message = ChatMessageDao.insert_one(chat_message)
-                    await session.send_json(client_id, chat_id, db_message, add=False)
+                    await session.send_json(client_id, chat_id, ChatMessage(**db_message.model_dump(), message_id=db_message.id), add=False)
             # 普通技能的stop
             res = thread_pool.cancel_task([key])  # 将进行中的任务进行cancel
             if res[0]:

From 6faf36da01b0af8cf6c870dd3c2adff4ee00db34 Mon Sep 17 00:00:00 2001
From: dolphin <shanghang@dataelem.com>
Date: Mon, 19 May 2025 21:42:46 +0800
Subject: [PATCH 186/186] feat: update workflow api

---
 .../bs-comp/apiComponent/ApiAccessFlow.tsx           | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/frontend/platform/src/components/bs-comp/apiComponent/ApiAccessFlow.tsx b/src/frontend/platform/src/components/bs-comp/apiComponent/ApiAccessFlow.tsx
index 5920d8746..46799cfb7 100644
--- a/src/frontend/platform/src/components/bs-comp/apiComponent/ApiAccessFlow.tsx
+++ b/src/frontend/platform/src/components/bs-comp/apiComponent/ApiAccessFlow.tsx
@@ -519,7 +519,7 @@ print(response.text)# 输出工作流的响应`
     "message_id": "385140",
     "input": {
         "input_2775b": {  # 这里对应返回事件里的 node_id
-            # input_schme.value中元素的 key 以及对应要传入的值
+            # input_schema.value中元素的 key 以及对应要传入的值
             "user_input": "你好"
         }
     }
@@ -567,9 +567,9 @@ def upload_file(local_path: str):
     "message_id": "385140",
     "input": {
         "input_2775b": {  # 这里对应返回事件里的 node_id
-            # input_schme.value中元素的 key 以及对应要传入的值
+            # input_schema.value中元素的 key 以及对应要传入的值
             "user_input": "你好",
-            # 上传文件后获取到的处理任务ID列表
+            # 上传文件后获取到的文件url列表
             "dialog_files_content": ["minio://127.0.0.1:9000/xxxx"]
         }
     }
@@ -690,7 +690,7 @@ def upload_file(local_path: str):
     "message_id": "xxxxx",
     "input": {
         "input_xxx": {  # 事件里的 node_id
-            # key是input_schme.value中元素的 key 以及对应要传入的值
+            # key是input_schema.value中元素的 key 以及对应要传入的值
             "text_input": "用户输入的内容",
             "file": ["minio://127.0.0.1:9000/xxxx"] # 用户上传文件获取到的文件url, 允许多选就是多个url
             "category": "选项2" # 将选项内容赋值给变量。当允许多选时，多个选项内容通过逗号分隔。
@@ -831,7 +831,7 @@ def upload_file(local_path: str):
     "message_id": "消息的唯一ID",
     "input": {
         "output_123": {  # 事件里的节点ID
-            # key是input_schme.value中元素的key
+            # key是input_schema.value中元素的key
             "output_result": "用户输入的内容"
         }
     }
@@ -929,7 +929,7 @@ def upload_file(local_path: str):
     "message_id": "xxxxxx",
     "input": {
         "output_xxx": {  # 事件里的节点ID
-            # key是input_schme.value中元素的key
+            # key是input_schema.value中元素的key
             "output_result": "e2107f75"  # 用户选择选项对应的id
         }
     }