Fix/2.0.2 (#1563)

docker/docker-compose.yml

@@ -53,7 +53,7 @@ services:
 
   backend:
     container_name: bisheng-backend
-    image: dataelement/bisheng-backend:v2.0.0
+    image: dataelement/bisheng-backend:v2.0.2
     ports:
       - "7860:7860"
     environment:
@@ -93,7 +93,7 @@ services:
   
   backend_worker:
     container_name: bisheng-backend-worker
-    image: dataelement/bisheng-backend:v2.0.0
+    image: dataelement/bisheng-backend:v2.0.2
     environment:
       TZ: Asia/Shanghai
       BS_MILVUS_CONNECTION_ARGS: '{"host":"milvus","port":"19530","user":"","password":"","secure":false}'
@@ -125,7 +125,7 @@ services:
 
   frontend:
     container_name: bisheng-frontend
-    image: dataelement/bisheng-frontend:v2.0.0
+    image: dataelement/bisheng-frontend:v2.0.2
     ports:
       - "3001:3001"
     environment:

src/backend/bisheng/__init__.py

@@ -6,7 +6,7 @@ from bisheng.processing.process import load_flow_from_json  # noqa: E402
 
 try:
     # 通过ci去自动修改
-    __version__ = '2.0.0'
+    __version__ = '2.0.2'
 except metadata.PackageNotFoundError:
     # Case where package metadata is not available.
     __version__ = ''

src/backend/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "bisheng"
-version = "2.0.0"
+version = "2.0.2"
 description = "A Python package with a built-in web application"
 authors = ["Dataelement <hanfeng@dataelem.com>"]
 maintainers = [

src/frontend/platform/src/pages/BuildPage/bench/LingSiWork.tsx

@@ -364,7 +364,7 @@ export default function index({ formData: parentFormData, setFormData: parentSet
                     config = parentFormData;
                 }
 
-                if (config) {
+                if (config && 'menuShow' in config) {
                     setFormData({
                         ...defaultFormValues,
                         ...config,
@@ -383,6 +383,11 @@ export default function index({ formData: parentFormData, setFormData: parentSet
                     if (tools?.length > 0) {
                         setSelectedTools(tools);
                     }
+                } else {
+                    setFormData((prev) => ({
+                        ...prev,
+                        ...config
+                    }))
                 }
             } catch (error) {
                 toast({ variant: 'error', description: '初始化数据加载失败' });
@@ -1026,7 +1031,7 @@ export default function index({ formData: parentFormData, setFormData: parentSet
                             {...getLocalFileRootProps()}
                             className="group h-40 border border-dashed rounded-md flex flex-col justify-center items-center cursor-pointer gap-3 hover:border-primary"
                         >
-                            <input {...getLocalFileInputProps()}/>
+                            <input {...getLocalFileInputProps()} />
                             <UploadIcon className="group-hover:text-primary size-5" />
                             <p className="text-sm">{t('code.clickOrDragHere')}</p>
 

src/frontend/platform/src/pages/BuildPage/bench/index.tsx

@@ -151,8 +151,10 @@ export default function index({ formData: parentFormData, setFormData: parentSet
             console.log("parentFormData is null", parentFormData);
 
             getWorkstationConfigApi().then(res => {
-                setWebSearchData(res.webSearch)
-                setFormData(res)
+                res.webSearch && setWebSearchData(res.webSearch)
+                setFormData((prev) => {
+                    return 'menuShow' in res ? res : { ...prev, ...res }
+                })
             })
         }
 
@@ -523,7 +525,9 @@ const useChatConfig = (refs: UseChatConfigProps, parentFormData, parentSetFormDa
                 //     api_key: '',
                 //     base_url: 'https://api.bing.microsoft.com/v7.0/search'
                 // }
-                res && setFormData(res);
+                setFormData((prev) => {
+                    return 'menuShow' in res ? res : { ...prev, ...res }
+                })
             })
         }
 

update.sh

@@ -1,7 +1,7 @@
 #! /bin/bash
 
-old_version="1.3.1"
-new_version="2.0.0"
+old_version="2.0.0"
+new_version="2.0.2"
 sed -i.bak "s/$old_version/$new_version/g" ./docker/docker-compose.yml
 sed -i.bak "s/$old_version/$new_version/g" ./src/backend/pyproject.toml
 sed -i.bak "s/$old_version/$new_version/g" ./src/backend/bisheng/__init__.py