Feat/0.4.0 (#950)

修复bug

.drone.yml

@@ -15,6 +15,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
       https_proxy:
         from_secret: PROXY
     commands:
+    - git config --global core.compression 0
     - git clone https://github.com/dataelement/bisheng.git .
     - git checkout $DRONE_COMMIT
 
@@ -86,7 +87,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
       https_proxy:
         from_secret: PROXY
       no_proxy: 192.168.106.8
-      version: v0.3.7
+      version: release
       docker_registry: http://192.168.106.8:6082
       docker_repo: 192.168.106.8:6082/dataelement/bisheng-backend
       docker_user:
@@ -114,7 +115,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
       https_proxy:
         from_secret: PROXY
       no_proxy: 192.168.106.8
-      version: v0.3.7
+      version: release
       docker_registry: http://192.168.106.8:6082
       docker_repo: 192.168.106.8:6082/dataelement/bisheng-frontend
       docker_user:

docker/docker-compose.yml

@@ -48,12 +48,13 @@ services:
       JWT_ENABLED: false
     volumes:
       - ${DOCKER_VOLUME_DIRECTORY:-.}/office/bisheng:/var/www/onlyoffice/documentserver/sdkjs-plugins/bisheng
+      - ${DOCKER_VOLUME_DIRECTORY:-.}/office/default.json:/etc/onlyoffice/documentserver/default.json
     command: bash -c "supervisorctl restart all"
     restart: on-failure
 
   backend:
     container_name: bisheng-backend
-    image: dataelement/bisheng-backend:v0.3.7.1
+    image: dataelement/bisheng-backend:v0.4.0.dev1
     ports:
       - "7860:7860"
     environment:
@@ -92,7 +93,7 @@ services:
 
   frontend:
     container_name: bisheng-frontend
-    image: dataelement/bisheng-frontend:v0.3.7.1
+    image: dataelement/bisheng-frontend:v0.4.0.dev1
     ports:
       - "3001:3001"
     environment:

src/backend/Dockerfile

@@ -18,9 +18,9 @@ RUN echo \
 RUN apt-get update && apt-get install gcc g++ curl build-essential postgresql-server-dev-all -y
 RUN apt-get update && apt-get install procps -y
 # Install font
-RUN apt install fonts-wqy-zenhei -y
+RUN apt install vim fonts-wqy-zenhei -y
 # opencv
-RUN apt-get install -y libglib2.0-0 libsm6 libxrender1 libxext6 libgl1
+RUN apt-get update && apt-get install -y libglib2.0-0 libsm6 libxrender1 libxext6 libgl1
 RUN curl -sSL https://install.python-poetry.org | python3 - --version 1.8.2
 # # Add Poetry to PATH
 ENV PATH="${PATH}:/root/.local/bin"

src/backend/bisheng/__init__.py

@@ -6,7 +6,7 @@
 
 try:
     # 通过ci去自动修改
-    __version__ = '0.3.7.1'
+    __version__ = '0.4.0.dev1'
 except metadata.PackageNotFoundError:
     # Case where package metadata is not available.
     __version__ = ''

src/backend/bisheng/api/errcode/flow.py

@@ -26,3 +26,10 @@ class FlowOnlineEditError(BaseErrorCode):
     Code: int = 10521
     Msg: str = '技能已上线，不可编辑'
 
+class WorkFlowOnlineEditError(BaseErrorCode):
+    Code: int = 10525
+    Msg: str = '工作流已上线，不可编辑'
+
+class FlowTemplateNameError(BaseErrorCode):
+    Code: int = 10530
+    Msg: str = '模板名称已存在'

src/backend/bisheng/api/errcode/knowledge.py

@@ -25,3 +25,8 @@ class KnowledgeSimilarError(BaseErrorCode):
 class KnowledgeQAError(BaseErrorCode):
     Code: int = 10930
     Msg: str = '该问题已被标注过'
+
+
+class KnowledgeCPError(BaseErrorCode):
+    Code: int = 10940
+    Msg: str = '当前有文件正在解析，不可复制'

src/backend/bisheng/api/router.py

@@ -1,10 +1,11 @@
 # Router for base api
-from bisheng.api.v1 import (assistant_router, chat_router, component_router, endpoints_router,
-                            finetune_router, flows_router, group_router, knowledge_router,
-                            qa_router, report_router, server_router, skillcenter_router,
-                            user_router, validate_router, variable_router, audit_router, evaluation_router,
-                            tag_router, llm_router,mark_router)
-from bisheng.api.v2 import chat_router_rpc, knowledge_router_rpc, rpc_router_rpc, flow_router, assistant_router_rpc
+from bisheng.api.v1 import (assistant_router, audit_router, chat_router, component_router,
+                            endpoints_router, evaluation_router, finetune_router, flows_router,
+                            group_router, knowledge_router, llm_router, mark_router, qa_router,
+                            report_router, server_router, skillcenter_router, tag_router,
+                            user_router, validate_router, variable_router, workflow_router)
+from bisheng.api.v2 import (assistant_router_rpc, chat_router_rpc, flow_router,
+                            knowledge_router_rpc, rpc_router_rpc)
 from fastapi import APIRouter
 
 router = APIRouter(prefix='/api/v1', )
@@ -27,6 +28,7 @@
 router.include_router(evaluation_router)
 router.include_router(tag_router)
 router.include_router(llm_router)
+router.include_router(workflow_router)
 router.include_router(mark_router)
 
 router_rpc = APIRouter(prefix='/api/v2', )