0.3.1 fix (#563)

dataelement · May 17, 2024 · 3374e09 · 3374e09
2 parents 4e8da2c + 9e8001a
commit 3374e09
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 12 deletions.
diff --git a/docker/docker-compose-model.yml b/docker/docker-compose-model.yml
@@ -59,7 +59,7 @@ services:
 
   bisheng-unstructured:
     container_name: bisheng-unstructured
-    image: dataelement/bisheng-unstructured:0.0.3.4
+    image: dataelement/bisheng-unstructured:latest
     ports:
       - "10001:10001"
     environment:

diff --git a/src/backend/bisheng/api/services/flow.py b/src/backend/bisheng/api/services/flow.py
@@ -1,4 +1,5 @@
 import asyncio
+import copy
 from typing import List, Dict, AsyncGenerator
 
 from fastapi.encoders import jsonable_encoder
@@ -243,11 +244,11 @@ async def get_compare_tasks(cls, user: UserPayload, req: FlowCompareReq) -> List
         tasks = []
         for index, question in enumerate(req.question_list):
             question_index = index
-            tmp_inputs = req.inputs.copy()
+            tmp_inputs = copy.deepcopy(req.inputs)
             tmp_inputs, tmp_tweaks = cls.parse_compare_inputs(tmp_inputs, question)
             for version in version_infos:
                 task = asyncio.create_task(cls.exec_flow_node(
-                    tmp_inputs, tmp_tweaks, question_index, [version]))
+                    copy.deepcopy(tmp_inputs), tmp_tweaks, question_index, [version]))
                 tasks.append(task)
         return tasks
 

diff --git a/src/backend/bisheng/database/models/variable_value.py b/src/backend/bisheng/database/models/variable_value.py
@@ -94,9 +94,10 @@ def copy_variables(cls, flow_id: str, old_version_id: int, version_id: int) -> L
             query = select(Variable).where(Variable.flow_id == flow_id, Variable.version_id == old_version_id)
             old_version = session.exec(query).all()
             for one in old_version:
-                one.id = None
-                one.version_id = version_id
-                session.add(one)
+                new_version = Variable.from_orm(one)
+                new_version.id = None
+                new_version.version_id = version_id
+                session.add(new_version)
             session.commit()
             return old_version
 
diff --git a/src/frontend/public/locales/zh/bs.json b/src/frontend/public/locales/zh/bs.json
@@ -473,7 +473,7 @@
     "addTool": "添加工具",
     "search": "搜索",
     "empty": "空空如也",
-    "onlineSA": "Go online skills&assistants",
+    "onlineSA": "上线技能&助手",
     "params": "参数",
     "added": "已添加",
     "add": "添加",

diff --git a/src/frontend/src/pages/DiffFlowPage/components/Component.tsx b/src/frontend/src/pages/DiffFlowPage/components/Component.tsx
@@ -7,7 +7,7 @@ export default function Component({ compId, options, disables, version, classNam
 
     // 保留当前compId和上游组件
     const nodes = useMemo(() => {
-        if (!version) return [];
+        if (!version?.data) return [];
         const showNodes = {}
         const edges = version.data.edges
 

diff --git a/src/frontend/src/pages/DiffFlowPage/components/RunTest.tsx b/src/frontend/src/pages/DiffFlowPage/components/RunTest.tsx
@@ -37,7 +37,7 @@ export default function RunTest({ nodeId }) {
             return cur ? count + 1 : count
         }, 0) + 1 // +1 测试用例列 
 
-        return 100 / (count + 1)
+        return 100 / (count === 2 ? 2 : count + 1) // hack 两个 按 45% 分
     }, [mulitVersionFlow])
 
     const handleUploadTxt = () => {
@@ -173,7 +173,7 @@ export default function RunTest({ nodeId }) {
                                 </TableHead>
                             )
                         }
-                        <TableHead className="text-right max-w-[135px]" style={{ width: '10%' }}>
+                        <TableHead className="text-right min-w-[135px]" style={{ width: 135 }}>
                             <Button variant="link" disabled={runningType !== '' || !running} onClick={handleDownExcle}><DownloadIcon className="mr-1" />{t('test.downloadResults')}</Button>
                         </TableHead>
                     </TableRow>

diff --git a/src/frontend/src/pages/FlowPage/components/Header.tsx b/src/frontend/src/pages/FlowPage/components/Header.tsx
@@ -61,6 +61,7 @@ export default function Header({ flow }) {
         // 更新版本列表
         await refrenshVersions()
         // 切换到最新版本
+
         setVersionId(res.id)
     }
     // 

diff --git a/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx
@@ -40,6 +40,7 @@ import { Badge } from "@/components/bs-ui/badge";
 import { LayersIcon } from "@radix-ui/react-icons";
 import { Button } from "@/components/bs-ui/button";
 import { updateVersion } from "@/controllers/API/flow";
+import { captureAndAlertRequestErrorHoc } from "@/controllers/request";
 
 const nodeTypes = {
   genericNode: GenericNode,
@@ -308,7 +309,7 @@ export default function Page({ flow, preFlow }: { flow: FlowType, preFlow: strin
 
   // 离开并保存
   const handleSaveAndClose = async () => {
-    await updateVersion(version.id, { name: version.name, description: '', data: flow.data })
+    await captureAndAlertRequestErrorHoc(updateVersion(version.id, { name: version.name, description: '', data: flow.data }))
     blocker.proceed?.()
   }
 

diff --git a/src/frontend/src/pages/FlowPage/index.tsx b/src/frontend/src/pages/FlowPage/index.tsx
@@ -15,7 +15,7 @@ export default function FlowPage() {
       getFlowApi(id).then(_flow => setFlow('flow_init', _flow))
     }
 
-    return () => setFlow('destroy', null)
+    // return () => setFlow('destroy', null)
   }, [])
 
   const [copyFlow, preFlow] = useMemo(() => {