Feat/0.2.0 (#86)

dataelement · Oct 17, 2023 · 65d0b7f · 65d0b7f
2 parents 517a323 + 7cea779
commit 65d0b7f
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -53,6 +53,12 @@ jobs:
           twine upload dist/* -u ${{ secrets.PYPI_USER }} -p ${{ secrets.PYPI_PASSWORD }} --repository pypi
           
       # 构建 backend 并推送到 Docker hub
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+
+      - name: set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: install poetry
         uses: snok/install-poetry@v1
         with:
@@ -71,6 +77,7 @@ jobs:
           # 是否 docker push
           push: true
           # docker build arg, 注入 APP_NAME/APP_VERSION
+          platforms: linux/amd64,linux/arm64
           build-args: |
             APP_NAME="bisheng-backend"
             APP_VERSION=${{ steps.get_version.outputs.VERSION }}
@@ -88,6 +95,7 @@ jobs:
           # 是否 docker push
           push: true
           # docker build arg, 注入 APP_NAME/APP_VERSION
+          platforms: linux/amd64,linux/arm64
           build-args: |
             APP_NAME="bisheng-frontend"
             APP_VERSION=${{ steps.get_version.outputs.VERSION }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -96,7 +96,6 @@ jobs:
           # 是否 docker push
           push: true
           # docker build arg, 注入 APP_NAME/APP_VERSION
-          platforms: linux/amd64,linux/arm64
           build-args: |
             APP_NAME="bisheng-backend"
             APP_VERSION="release"
@@ -113,7 +112,6 @@ jobs:
           # 是否 docker push
           push: true
           # docker build arg, 注入 APP_NAME/APP_VERSION
-          platforms: linux/amd64,linux/arm64
           build-args: |
             APP_NAME="bisheng-frontend"
             APP_VERSION="release"

diff --git a/src/backend/bisheng/api/v1/knowledge.py b/src/backend/bisheng/api/v1/knowledge.py
@@ -329,6 +329,7 @@ def _read_chunk_text(input_file, file_name, size, chunk_overlap, separator):
         if file_type not in filetype_load_map:
             raise Exception('Unsupport file type')
         loader = filetype_load_map[file_type](file_path=input_file)
+        separator = separator[0] if separator and isinstance(separator, list) else separator
         text_splitter = CharacterTextSplitter(separator=separator,
                                               chunk_size=size,
                                               chunk_overlap=chunk_overlap,

diff --git a/src/backend/bisheng/utils/minio_client.py b/src/backend/bisheng/utils/minio_client.py
@@ -11,6 +11,10 @@ class MinioClient():
     minio_client: minio.Minio
 
     def __init__(self) -> None:
+        if 'minio' not in settings.knowledges:
+            self.minio_client = None
+            self.minio_share = None
+            return
         self.minio_client = minio.Minio(
             endpoint=settings.knowledges.get('minio').get('MINIO_ENDPOINT'),
             access_key=settings.knowledges.get('minio').get('MINIO_ACCESS_KEY'),
@@ -33,10 +37,12 @@ def get_share_link(self, object_name):
         # filepath "/" 开头会有nginx问题
         if object_name[0] == '/':
             object_name = object_name[1:]
-
-        return self.minio_share.presigned_get_object(bucket_name=bucket,
-                                                     object_name=object_name,
-                                                     expires=timedelta(days=7))
+        if self.minio_share:
+            return self.minio_share.presigned_get_object(bucket_name=bucket,
+                                                         object_name=object_name,
+                                                         expires=timedelta(days=7))
+        else:
+            return ''
 
     def delete_minio(self, object_name: str):
         if self.minio_client: