Feat/0.1.9.3 (#139)

解决setting初始化错误
dataelement · Nov 10, 2023 · 2f787c0 · 2f787c0
2 parents 7cb2127 + fd4a55c
commit 2f787c0
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 128 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,7 +14,9 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build_bisheng_api:
+  build_bisheng_langchain:
+    strategy:
+      fail-fast: false
     runs-on: ubuntu-latest
     #if: startsWith(github.event.ref, 'refs/tags')
     steps:
@@ -43,10 +45,14 @@ jobs:
           pip install twine
           cd ./src/bisheng-langchain
           python setup.py bdist_wheel
+          set +e
           twine upload dist/* -u ${{ secrets.PYPI_USER }} -p ${{ secrets.PYPI_PASSWORD }} --repository pypi
+          set -e
+        
+        
     
   build_bisheng:
-    needs: build_bisheng_api
+    needs: build_bisheng_langchain
     runs-on: ubuntu-latest
     # if: startsWith(github.event.ref, 'refs/tags')
     steps:

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
diff --git a/src/backend/bisheng/api/v2/chat.py b/src/backend/bisheng/api/v2/chat.py
@@ -17,7 +17,6 @@
 chat_manager = ChatManager()
 flow_data_store = redis_client
 expire = 600  # reids 60s 过期
-default_user_id = settings.get_from_db('default_operator')
 
 
 @router.websocket('/ws/{flow_id}')
@@ -60,7 +59,8 @@ async def union_websocket(flow_id: str,
             key_node = get_cache_key(flow_id, chat_id, node.id)
             chat_manager.set_cache(key_node, node._built_object)
             chat_manager.set_cache(get_cache_key(flow_id, chat_id), node._built_object)
-        await chat_manager.handle_websocket(flow_id, chat_id, websocket, default_user_id)
+        await chat_manager.handle_websocket(flow_id, chat_id, websocket,
+                                            settings.get_from_db('default_operator'))
     except Exception as exc:
         logger.error(exc)
         await websocket.close(code=status.WS_1011_INTERNAL_ERROR, reason=str(exc))
diff --git a/src/backend/bisheng/api/v2/filelib.py b/src/backend/bisheng/api/v2/filelib.py
@@ -22,8 +22,6 @@
 # build router
 router = APIRouter(prefix='/filelib')
 
-default_user_id = settings.get_from_db('default_operator')
-
 
 @router.post('/', response_model=KnowledgeRead, status_code=201)
 def create_knowledge(
@@ -35,13 +33,14 @@ def create_knowledge(
     db_knowldge = Knowledge.from_orm(knowledge)
     know = session.exec(
         select(Knowledge).where(Knowledge.name == knowledge.name,
-                                knowledge.user_id == default_user_id)).all()
+                                knowledge.user_id == settings.get_from_db('default_operator'))
+                                ).all()
     if know:
         raise HTTPException(status_code=500, detail='知识库名称重复')
     if not db_knowldge.collection_name:
         # 默认collectionName
         db_knowldge.collection_name = f'col_{int(time.time())}_{str(uuid4())[:8]}'
-    db_knowldge.user_id = default_user_id
+    db_knowldge.user_id = settings.get_from_db('default_operator')
     session.add(db_knowldge)
     session.commit()
     session.refresh(db_knowldge)
@@ -62,7 +61,8 @@ def update_knowledge(
 
     know = session.exec(
         select(Knowledge).where(Knowledge.name == knowledge.name,
-                                knowledge.user_id == default_user_id)).all()
+                                knowledge.user_id == settings.get_from_db('default_operator')
+                                )).all()
     if know:
         raise HTTPException(status_code=500, detail='知识库名称重复')
 
@@ -81,7 +81,7 @@ def get_knowledge(
         page_num: Optional[str],
 ):
     """ 读取所有知识库信息. """
-
+    default_user_id = settings.get_from_db('default_operator')
     try:
         sql = select(Knowledge)
         count_sql = select(func.count(Knowledge.id))