Merge branch 'main' into feat/1.3.0

# Conflicts:
#	docker/docker-compose.yml
#	src/backend/bisheng/api/services/base.py
#	src/backend/bisheng/chat/client.py
#	src/backend/bisheng/settings.py
#	src/backend/bisheng/utils/minio_client.py
#	src/backend/bisheng/worker/workflow/redis_callback.py
#	src/bisheng-langchain/bisheng_langchain/gpts/tools/code_interpreter/tool.py

docker/bisheng/config/config.yaml

@@ -50,7 +50,7 @@ object_storage:
     schema: !env ${BS_MINIO_SCHEMA}
     cert_check: !env ${BS_MINIO_CERT_CHECK}
     endpoint: !env ${BS_MINIO_ENDPOINT}
-    sharepoint: !env ${BS_MINIO_SHAREPOIN}
+    sharepoint: !env ${BS_MINIO_SHAREPOINT}
     access_key: !env ${BS_MINIO_ACCESS_KEY}
     secret_key: !env ${BS_MINIO_SECRET_KEY}
     public_bucket: 'bisheng'  # 公共bucket，存储平台上一些需要持久化的文件。会设置为可公开访问

docker/docker-compose.yml

@@ -66,7 +66,7 @@ services:
       BS_MINIO_SCHEMA: 'false'
       BS_MINIO_CERT_CHECK: 'false'
       BS_MINIO_ENDPOINT: 'minio:9000'
-      BS_MINIO_SHAREPOIN: 'minio:9000'
+      BS_MINIO_SHAREPOINT: 'minio:9000'
       BS_MINIO_ACCESS_KEY: 'minioadmin'
       BS_MINIO_SECRET_KEY: 'minioadmin'
     volumes:
@@ -104,7 +104,7 @@ services:
       BS_MINIO_SCHEMA: 'false'
       BS_MINIO_CERT_CHECK: 'false'
       BS_MINIO_ENDPOINT: 'minio:9000'
-      BS_MINIO_SHAREPOIN: 'minio:9000'
+      BS_MINIO_SHAREPOINT: 'minio:9000'
       BS_MINIO_ACCESS_KEY: 'minioadmin'
       BS_MINIO_SECRET_KEY: 'minioadmin'
     volumes:
@@ -157,7 +157,7 @@ services:
     restart: on-failure
 
   etcd:
-    container_name: milvus-etcd
+    container_name: bisheng-milvus-etcd
     image: quay.io/coreos/etcd:v3.5.5
     environment:
       ETCD_AUTO_COMPACTION_MODE: revision
@@ -176,7 +176,7 @@ services:
       retries: 3
 
   minio:
-    container_name: milvus-minio
+    container_name: bisheng-milvus-minio
     image: minio/minio:RELEASE.2023-03-20T20-16-18Z
     environment:
       MINIO_ACCESS_KEY: minioadmin
@@ -196,7 +196,7 @@ services:
       retries: 3
 
   milvus:
-    container_name: milvus-standalone
+    container_name: bisheng-milvus-standalone
     image: milvusdb/milvus:v2.5.10
     command: ["milvus", "run", "standalone"]
     security_opt:

src/backend/bisheng/database/models/gpts_tools.py

@@ -45,7 +45,7 @@ class GptsToolsTypeBase(SQLModelSerializable):
     id: Optional[int] = Field(default=None, index=True, primary_key=True)
     name: str = Field(default='', sa_column=Column(String(length=1024), index=True), description="工具类别名字")
     logo: Optional[str] = Field(default='', description="工具类别的logo文件地址")
-    extra: Optional[str] = Field(default='', sa_column=Column(String(length=2048)),
+    extra: Optional[str] = Field(default='{}', sa_column=Column(String(length=2048)),
                                  description="工具类别的配置信息，用来存储工具类别所需的配置信息")
     description: str = Field(default='', description="工具类别的描述")
     server_host: Optional[str] = Field(default='', description="自定义工具的访问根地址，必须以http或者https开头")

src/backend/bisheng/utils/logger.py

@@ -38,7 +38,7 @@ def configure(logger_conf: LoggerConf):
         'sink':
         RichHandler(console=Console(width=300),
                     markup=True,
-                    log_time_format='[%Y-%m-%d %H:%M:%S.%f]',
+                    log_time_format='',
                     show_path=False,
                     show_level=False),
         'format':

src/backend/bisheng/utils/minio_client.py

@@ -3,6 +3,7 @@ import json
 from typing import BinaryIO
 
 import minio
+from bisheng.settings import settings
 from loguru import logger
 from minio.commonconfig import Filter, CopySource
 from minio.lifecycleconfig import LifecycleConfig, Rule, Expiration
@@ -172,7 +173,7 @@ class MinioClient:
     @classmethod
     def clear_minio_share_host(cls, file_url: str):
         """
-         TODO maybe 合理方案是部署一个支持https的minio配合前端使用
+         TODO 合理方案是部署一个https的minio配合前端使用
          抹去url中的minio share地址， 让前端通过nginx代理去访问资源
         """
         share_host = cls.get_minio_share_host()

src/backend/bisheng/worker/workflow/redis_callback.py

@@ -25,6 +25,7 @@ from bisheng.workflow.callback.event import NodeStartData, NodeEndData, UserInpu
 from bisheng.workflow.common.workflow import WorkflowStatus
 
 
+
 class RedisCallback(BaseCallback):
 
     def __init__(self, unique_id: str, workflow_id: str, chat_id: str, user_id: str):

src/bisheng-langchain/bisheng_langchain/gpts/config/base_scene.yaml

@@ -22,7 +22,7 @@ assistant:
     - type: "bisheng_code_interpreter"
       minio:
         MINIO_ENDPOINT: "110.16.193.170:50061"
-        MINIO_SHAREPOIN: "110.16.193.170:50061"
+        MINIO_SHAREPOINT: "110.16.193.170:50061"
         MINIO_ACCESS_KEY: "minioadmin"
         MINIO_SECRET_KEY: "minioadmin"
         SCHEMA: False