0.3.1 fix (#579)

dataelement · May 21, 2024 · 8b93cfd · 8b93cfd
2 parents 7e23083 + c2a5c09
commit 8b93cfd
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 10 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -58,6 +58,12 @@ jobs:
           twine upload --verbose -u ${{ secrets.NEXUS_USER }}  -p ${{ secrets.NEXUS_PASSWORD }} --repository-url $repo  dist/*.whl
           cd ../../
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+
+      - name: set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       # 发布到 私有仓库
       - name: set insecure registry
         run: |
@@ -66,7 +72,6 @@ jobs:
 
       # - name: Set up QEMU
       #   uses: docker/setup-qemu-action@v1
-
       - name: Login Nexus Container Registry
         uses: docker/login-action@v2
         with:
@@ -97,6 +102,7 @@ jobs:
           context: "./src/backend/"
           # 是否 docker push
           push: true
+          platforms: linux/amd64,linux/arm64
           # docker build arg, 注入 APP_NAME/APP_VERSION
           build-args: |
             APP_NAME="bisheng-backend"
@@ -113,6 +119,7 @@ jobs:
           context: "./src/frontend/"
           # 是否 docker push
           push: true
+          platforms: linux/amd64,linux/arm64
           # docker build arg, 注入 APP_NAME/APP_VERSION
           build-args: |
             APP_NAME="bisheng-frontend"

diff --git a/src/backend/bisheng/api/v1/callback.py b/src/backend/bisheng/api/v1/callback.py
@@ -1,4 +1,5 @@
 import asyncio
+import copy
 import json
 from typing import Any, Dict, List, Union
 
@@ -63,8 +64,9 @@ async def on_chain_start(self, serialized: Dict[str, Any], inputs: Dict[str, Any
     async def on_chain_end(self, outputs: Dict[str, Any], **kwargs: Any) -> Any:
         """Run when chain ends running."""
         logger.debug(f'on_chain_end outputs={outputs} kwargs={kwargs}')
-        outputs.pop('source_documents', '')
-        logger.info('k=s act=on_chain_end flow_id={} output_dict={}', self.flow_id, outputs)
+        tmp_output = copy.deepcopy(outputs)
+        tmp_output.pop('source_documents', '')
+        logger.info('k=s act=on_chain_end flow_id={} output_dict={}', self.flow_id, tmp_output)
 
     async def on_chain_error(self, error: Union[Exception, KeyboardInterrupt],
                              **kwargs: Any) -> Any:
@@ -210,9 +212,10 @@ async def on_retriever_end(self, result: List[Document], **kwargs: Any) -> Any:
         # todo 判断技能权限
         logger.debug(f'on_retriever_end result={result} kwargs={kwargs}')
         if result:
-            [doc.metadata.pop('bbox', '') for doc in result]
+            tmp_result = copy.deepcopy(result)
+            [doc.metadata.pop('bbox', '') for doc in tmp_result]
             logger.info('k=s act=on_retriever_end flow_id={} result_without_bbox={}', self.flow_id,
-                        result)
+                        tmp_result)
 
     async def on_chat_model_start(self, serialized: Dict[str, Any],
                                   messages: List[List[BaseMessage]], **kwargs: Any) -> Any:
@@ -319,9 +322,10 @@ def on_retriever_end(self, result: List[Document], **kwargs: Any) -> Any:
         # todo 判断技能权限
         logger.debug(f'retriver_result result={result}')
         if result:
-            [doc.metadata.pop('bbox', '') for doc in result]
+            tmp_result = copy.deepcopy(result)
+            [doc.metadata.pop('bbox', '') for doc in tmp_result]
             logger.info('k=s act=on_retriever_end flow_id={} result_without_bbox={}', self.flow_id,
-                        result)
+                        tmp_result)
 
     def on_chain_start(self, serialized: Dict[str, Any], inputs: Dict[str, Any],
                        **kwargs: Any) -> Any:
@@ -332,8 +336,9 @@ def on_chain_start(self, serialized: Dict[str, Any], inputs: Dict[str, Any],
     def on_chain_end(self, outputs: Dict[str, Any], **kwargs: Any) -> Any:
         """Run when chain ends running."""
         logger.debug(f'on_chain_end outputs={outputs}')
-        outputs.pop('source_documents', '')
-        logger.info('k=s act=on_chain_end flow_id={} output_dict={}', self.flow_id, outputs)
+        tmp_output = copy.deepcopy(outputs)
+        tmp_output.pop('source_documents', '')
+        logger.info('k=s act=on_chain_end flow_id={} output_dict={}', self.flow_id, tmp_output)
 
     def on_chat_model_start(self, serialized: Dict[str, Any], messages: List[List[BaseMessage]],
                             **kwargs: Any) -> Any:
@@ -512,7 +517,7 @@ async def on_tool_error(self, error: Union[Exception, KeyboardInterrupt],
                     is_bot=1,
                     message=json.dumps(output_info),
                     intermediate_steps=f'{input_info["steps"]}\n\nTool output:\n\n  Error: ' +
-                    str(error),
+                                       str(error),
                     category=tool_category,
                     type='end',
                     flow_id=self.flow_id,

diff --git a/src/backend/bisheng/api/v1/knowledge.py b/src/backend/bisheng/api/v1/knowledge.py
@@ -263,6 +263,7 @@ def get_knowledge(*,
         return resp_200({'data': res, 'total': total_count})
 
     except Exception as e:
+        logger.exception("get_knowledge error")
         raise HTTPException(status_code=500, detail=str(e)) from e