Fix variable errors (#1370)

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}
 

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:

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天

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结束, 覆盖之前流式的输出

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,
             }

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):

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,

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

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'),