From fadbd16d60206de10c39aa6237f8fd0870152824 Mon Sep 17 00:00:00 2001 From: wlxkzyq Date: Thu, 12 Jun 2025 18:25:44 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix(logger):=20=E4=BF=AE=E5=A4=8D=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E6=89=93=E5=8D=B0=E6=97=B6=EF=BC=8C=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E4=B8=A4=E9=81=8D=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20#000?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/bisheng/utils/logger.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/backend/bisheng/utils/logger.py b/src/backend/bisheng/utils/logger.py index 45bab8035..6d982dc30 100644 --- a/src/backend/bisheng/utils/logger.py +++ b/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': From 29a1f478f0a03425b467fd3b1a84de558397cc06 Mon Sep 17 00:00:00 2001 From: zhangguangchao Date: Mon, 16 Jun 2025 09:20:00 +0800 Subject: [PATCH 2/5] Fix variable errors --- src/backend/bisheng/settings.py | 2 +- src/backend/bisheng/utils/minio_client.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/backend/bisheng/settings.py b/src/backend/bisheng/settings.py index f822a8b76..1c53e0411 100644 --- a/src/backend/bisheng/settings.py +++ b/src/backend/bisheng/settings.py @@ -221,7 +221,7 @@ class Settings(BaseModel): "SCHEMA": self.object_storage.minio.minio_schema, "CERT_CHECK": self.object_storage.minio.cert_check, "MINIO_ENDPOINT": self.object_storage.minio.endpoint, - "MINIO_SHAREPOIN": self.object_storage.minio.sharepoint, # 确保和nginx的代理地址一致。同一个docker-compose启动可以直接使用默认值 + "MINIO_SHAREPOINT": self.object_storage.minio.sharepoint, # 确保和nginx的代理地址一致。同一个docker-compose启动可以直接使用默认值 "MINIO_ACCESS_KEY": self.object_storage.minio.access_key, "MINIO_SECRET_KEY": self.object_storage.minio.secret_key, } diff --git a/src/backend/bisheng/utils/minio_client.py b/src/backend/bisheng/utils/minio_client.py index 82994922d..7718f419e 100644 --- a/src/backend/bisheng/utils/minio_client.py +++ b/src/backend/bisheng/utils/minio_client.py @@ -29,7 +29,7 @@ class MinioClient: secure=settings.get_knowledge().get('minio').get('SCHEMA'), cert_check=settings.get_knowledge().get('minio').get('CERT_CHECK')) self.minio_share = minio.Minio( - endpoint=settings.get_knowledge().get('minio').get('MINIO_SHAREPOIN'), + endpoint=settings.get_knowledge().get('minio').get('MINIO_SHAREPOINT'), access_key=settings.get_knowledge().get('minio').get('MINIO_ACCESS_KEY'), secret_key=settings.get_knowledge().get('minio').get('MINIO_SECRET_KEY'), secure=settings.get_knowledge().get('minio').get('SCHEMA'), @@ -125,7 +125,7 @@ class MinioClient: TODO 合理方案是部署一个https的minio配合前端使用 抹去url中的minio share地址， 让前端通过nginx代理去访问资源 """ - minio_share = settings.get_knowledge().get('minio', {}).get('MINIO_SHAREPOIN', '') + minio_share = settings.get_knowledge().get('minio', {}).get('MINIO_SHAREPOINT', '') return file_url.replace(f'http://{minio_share}', '') def object_exists(self, bucket_name, object_name, **kwargs): From 4508b20726d1f1adb3f3636bde2143757c774bb9 Mon Sep 17 00:00:00 2001 From: zhangguangchao Date: Mon, 16 Jun 2025 12:24:12 +0800 Subject: [PATCH 3/5] Fix variable errors --- docker/bisheng/config/config.yaml | 2 +- docker/docker-compose.yml | 2 +- src/backend/bisheng/api/services/base.py | 2 +- src/backend/bisheng/chat/client.py | 2 +- src/backend/bisheng/worker/workflow/redis_callback.py | 2 +- .../bisheng_langchain/gpts/config/base_scene.yaml | 2 +- .../bisheng_langchain/gpts/tools/code_interpreter/tool.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docker/bisheng/config/config.yaml b/docker/bisheng/config/config.yaml index 843dde5e3..2df5ebaff 100644 --- a/docker/bisheng/config/config.yaml +++ b/docker/bisheng/config/config.yaml @@ -41,7 +41,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} diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index f58d5e69e..246718449 100644 --- a/docker/docker-compose.yml +++ b/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: diff --git a/src/backend/bisheng/api/services/base.py b/src/backend/bisheng/api/services/base.py index a9010ed98..0ad040dbc 100644 --- a/src/backend/bisheng/api/services/base.py +++ b/src/backend/bisheng/api/services/base.py @@ -27,7 +27,7 @@ class BaseService: share_url = minio_client.get_share_link(logo_path) # 去除前缀通过nginx访问，防止访问不到文件 # TODO 去掉此解决方案，改为minio生成的share_link就是可访问的https或者http的 - minio_share = settings.get_knowledge().get('minio', {}).get('MINIO_SHAREPOIN', '') + minio_share = settings.get_knowledge().get('minio', {}).get('MINIO_SHAREPOINT', '') share_url = share_url.replace(f"http://{minio_share}", "") # 缓存5天， 临时链接有效期为7天 diff --git a/src/backend/bisheng/chat/client.py b/src/backend/bisheng/chat/client.py index 2333dfe16..c473a40fc 100644 --- a/src/backend/bisheng/chat/client.py +++ b/src/backend/bisheng/chat/client.py @@ -309,7 +309,7 @@ class ChatClient: # 获取minio的share地址，把share域名去掉, 为毕昇的部署方案特殊处理下 for one in self.gpts_agent.tools: if one.name == "bisheng_code_interpreter": - minio_share = settings.get_knowledge().get('minio', {}).get('MINIO_SHAREPOIN', '') + minio_share = settings.get_knowledge().get('minio', {}).get('MINIO_SHAREPOINT', '') answer = answer.replace(f"http://{minio_share}", "") answer_end_type = 'end' # 如果是流式的llm则用end_cover结束, 覆盖之前流式的输出 diff --git a/src/backend/bisheng/worker/workflow/redis_callback.py b/src/backend/bisheng/worker/workflow/redis_callback.py index d7c5f2a90..76a4f345c 100644 --- a/src/backend/bisheng/worker/workflow/redis_callback.py +++ b/src/backend/bisheng/worker/workflow/redis_callback.py @@ -371,7 +371,7 @@ class RedisCallback(BaseCallback): def on_stream_over(self, data: StreamMsgOverData): logger.debug(f'stream over: {data}') # 替换掉minio的share前缀，通过nginx转发 ugly solve - minio_share = settings.get_knowledge().get('minio', {}).get('MINIO_SHAREPOIN', '') + minio_share = settings.get_knowledge().get('minio', {}).get('MINIO_SHAREPOINT', '') data.msg = data.msg.replace(f"http://{minio_share}", "") chat_response = ChatResponse(message=data.dict(exclude={'source_documents'}), category=WorkflowEventType.StreamMsg.value, diff --git a/src/bisheng-langchain/bisheng_langchain/gpts/config/base_scene.yaml b/src/bisheng-langchain/bisheng_langchain/gpts/config/base_scene.yaml index d71b18723..061139b32 100644 --- a/src/bisheng-langchain/bisheng_langchain/gpts/config/base_scene.yaml +++ b/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 diff --git a/src/bisheng-langchain/bisheng_langchain/gpts/tools/code_interpreter/tool.py b/src/bisheng-langchain/bisheng_langchain/gpts/tools/code_interpreter/tool.py index 1567e2dc5..a2bd2cc82 100644 --- a/src/bisheng-langchain/bisheng_langchain/gpts/tools/code_interpreter/tool.py +++ b/src/bisheng-langchain/bisheng_langchain/gpts/tools/code_interpreter/tool.py @@ -190,7 +190,7 @@ def upload_minio( cert_check=param.get('CERT_CHECK'), ) minio_share = minio.Minio( - endpoint=param.get('MINIO_SHAREPOIN'), + endpoint=param.get('MINIO_SHAREPOINT'), access_key=param.get('MINIO_ACCESS_KEY'), secret_key=param.get('MINIO_SECRET_KEY'), secure=param.get('SCHEMA'), From 2aee67ae2f0f22a6a33f1c69a7a95834732452cf Mon Sep 17 00:00:00 2001 From: v_xx_v Date: Mon, 16 Jun 2025 18:23:24 +0800 Subject: [PATCH 4/5] 1. Reduce container_name naming conflicts; 2. Unify container_name naming conventions --- docker/docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index f58d5e69e..4fb129ec7 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -119,7 +119,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 @@ -138,7 +138,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 @@ -158,7 +158,7 @@ services: retries: 3 milvus: - container_name: milvus-standalone + container_name: bisheng-milvus-standalone image: milvusdb/milvus:v2.3.3 command: ["milvus", "run", "standalone"] security_opt: From 08f3c771dcbf9a67ebd716e6c0b04aab8d3cc323 Mon Sep 17 00:00:00 2001 From: ieayoio Date: Mon, 16 Jun 2025 19:23:14 +0800 Subject: [PATCH 5/5] fix:modify the default value of the extra field MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 改配置为{}更合理，防止为''时造成后续的json解析错误 --- src/backend/bisheng/database/models/gpts_tools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/backend/bisheng/database/models/gpts_tools.py b/src/backend/bisheng/database/models/gpts_tools.py index 794991ac0..b81484f47 100644 --- a/src/backend/bisheng/database/models/gpts_tools.py +++ b/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开头")