Feat/0.2.0 (#53)

docker/docker-compose.yml

@@ -40,6 +40,9 @@ services:
       - seccomp:unconfined
     command: bash -c "uvicorn bisheng.main:app --host 0.0.0.0 --port 7860 --workers 2" # --workers 表示使用几个进程，提高并发度
     restart: on-failure
+    depends_on:
+      - "mysql"
+      - "redis"
 
   nginx:
     image: dataelement/bisheng-frontend:latest

docker/mysql/conf/my.cnf

@@ -1,13 +1,13 @@
 [client]
-default-character-set=utf8
+default-character-set=utf8mb4
 
 [mysql]
-default-character-set=utf8
+default-character-set=utf8mb4
 
 [mysqld]
-init_connect='SET collation_connection = utf8_unicode_ci'
-init_connect='SET NAMES utf8'
-character-set-server=utf8
-collation-server=utf8_unicode_ci
+init_connect='SET collation_connection = utf8mb4_unicode_ci'
+init_connect='SET NAMES utf8mb4'
+character-set-server=utf8mb4
+collation-server=utf8mb4_unicode_ci
 skip-character-set-client-handshake
 sql_mode=STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION

src/backend/bisheng/chat/manager.py

@@ -331,7 +331,8 @@ async def process_message(self,
             steps = []
             for s in intermediate_steps.split('\n'):
                 if s.startswith("Answer: {'"):
-                    # s = 'Answer: ' + eval(s.split('Answer:')[1]).get('result')
+                    if 'result' in s:
+                        s = 'Answer: ' + eval(s.split('Answer:')[1]).get('result')
                     pass
                 step.append(s)
                 if not s:

src/backend/bisheng/config.yaml

@@ -9,9 +9,9 @@ admin:
   user_name: "admin"
   password: "1234"
 
-bisheng-rt: 
-  name: "RT-Server"
-  server: "127.0.0.1:9001"
+# bisheng-rt: 
+#   name: "RT-Server"
+#   server: "127.0.0.1:9001"
 
 # 为知识库的embedding进行模型撇脂
 knowledges:
@@ -20,6 +20,11 @@ knowledges:
       openai_api_base: "https://api.openai.com/v1"
       openai_proxy: ""
       openai_api_key: ""
+    embedding-host:
+      deployment:
+      embedding_ctx_length:
+      host_base_url:
+      model: 
   vectorstores:
     # Milvus 最低要求cpu 4C 8G 推荐4C 16G
     Milvus: # 如果需要切换其他vectordb，确保其他服务已经启动，然后配置对应参数
@@ -129,8 +134,6 @@ documentloaders:
   PDFWithSemanticLoader:
     documentation: "https://python.langchain.com/docs/modules/data_connection/document_loaders/integrations/git"
 embeddings:
-  OpenAIProxyEmbedding:
-    documentation: ""
   OpenAIEmbeddings:
     documentation: "https://python.langchain.com/docs/modules/data_connection/text_embedding/integrations/openai"
   HuggingFaceEmbeddings:
@@ -314,6 +317,8 @@ utilities:
   WolframAlphaAPIWrapper:
     documentation: ""
 retrievers:
+  MultiVectorRetriever:
+    documentation: ""
   MultiQueryRetriever:
     documentation: "https://python.langchain.com/docs/modules/data_connection/retrievers/how_to/MultiQueryRetriever"
   # https://github.com/supabase-community/supabase-py/issues/482

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

@@ -18,10 +18,13 @@ class MessageBase(SQLModelSerializable):
     user_id: Optional[str] = Field(index=True)
     intermediate_steps: Optional[str] = Field(index=False, sa_column=Column(Text))
     files: Optional[str] = Field(index=False)
-    create_time: Optional[datetime] = Field(
-        sa_column=Column(DateTime, nullable=False, index=True, server_default=text('CURRENT_TIMESTAMP')))
-    update_time: Optional[datetime] = Field(sa_column=Column(
-        DateTime, nullable=False, server_default=text('CURRENT_TIMESTAMP'), onupdate=text('CURRENT_TIMESTAMP')))
+    create_time: Optional[datetime] = Field(sa_column=Column(
+        DateTime, nullable=False, index=True, server_default=text('CURRENT_TIMESTAMP')))
+    update_time: Optional[datetime] = Field(
+        sa_column=Column(DateTime,
+                         nullable=False,
+                         server_default=text('CURRENT_TIMESTAMP'),
+                         onupdate=text('CURRENT_TIMESTAMP')))
 
 
 class ChatMessage(MessageBase, table=True):

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

@@ -10,14 +10,17 @@ class ModelDeployBase(SQLModelSerializable):
     endpoint: str = Field(index=False, unique=False)
     server: str = Field(index=True)
     model: str = Field(index=False)
-    config: Optional[str] = Field(index=False, sa_column=(String(length=1024)))
+    config: Optional[str] = Field(index=False, sa_column=Column(String(length=1024)))
     status: Optional[str] = Field(index=False)
-    remark: Optional[str] = Field(index=False, sa_column=(String(length=4096)))
-
-    create_time: Optional[datetime] = Field(
-        sa_column=Column(DateTime, nullable=False, index=True, server_default=text('CURRENT_TIMESTAMP')))
-    update_time: Optional[datetime] = Field(sa_column=Column(
-        DateTime, nullable=False, server_default=text('CURRENT_TIMESTAMP'), onupdate=text('CURRENT_TIMESTAMP')))
+    remark: Optional[str] = Field(index=False, sa_column=Column(String(length=4096)))
+
+    create_time: Optional[datetime] = Field(sa_column=Column(
+        DateTime, nullable=False, index=True, server_default=text('CURRENT_TIMESTAMP')))
+    update_time: Optional[datetime] = Field(
+        sa_column=Column(DateTime,
+                         nullable=False,
+                         server_default=text('CURRENT_TIMESTAMP'),
+                         onupdate=text('CURRENT_TIMESTAMP')))
 
 
 class ModelDeploy(ModelDeployBase, table=True):

src/backend/bisheng/template/frontend_node/formatter/field_formatters.py

@@ -4,8 +4,7 @@
 from bisheng.template.field.base import TemplateField
 from bisheng.template.frontend_node.constants import FORCE_SHOW_FIELDS
 from bisheng.template.frontend_node.formatter.base import FieldFormatter
-from bisheng.utils.constants import (ANTHROPIC_MODELS, CHAT_OPENAI_MODELS,
-                                     OPENAI_MODELS)
+from bisheng.utils.constants import ANTHROPIC_MODELS, CHAT_OPENAI_MODELS, OPENAI_MODELS
 
 
 class OpenAIAPIKeyFormatter(FieldFormatter):
@@ -97,12 +96,10 @@ class ShowFieldFormatter(FieldFormatter):
     def format(self, field: TemplateField, name: Optional[str] = None) -> None:
         key = field.name
         required = field.required
-        field.show = (
-            (required and key not in ['input_variables'])
-            or key in FORCE_SHOW_FIELDS
-            or 'api' in key
-            or ('key' in key and 'input' not in key and 'output' not in key)
-        )
+        field.show = ((required and
+                       (key not in ['input_variables'] or name == 'SequentialChain')) or
+                      key in FORCE_SHOW_FIELDS or 'api' in key or
+                      ('key' in key and 'input' not in key and 'output' not in key))
 
 
 class PasswordFieldFormatter(FieldFormatter):

src/backend/bisheng/template/frontend_node/input_output.py

@@ -1,5 +1,3 @@
-from typing import Optional
-
 from bisheng.template.field.base import TemplateField
 from bisheng.template.frontend_node.base import FrontendNode
 from bisheng.template.template.base import Template
@@ -27,6 +25,7 @@ class InputNode(FrontendNode):
     def to_dict(self):
         return super().to_dict()
 
+
 class InputFileNode(FrontendNode):
     name: str = 'InputFileNode'
     template: Template = Template(
@@ -46,7 +45,6 @@ class InputFileNode(FrontendNode):
     description: str = """输入节点，用来自动对接输入"""
     base_classes: list[str] = ['fileNode']
 
-
     def to_dict(self):
         return super().to_dict()
 

src/backend/bisheng/template/frontend_node/vectorstores.py

@@ -296,3 +296,6 @@ def format_field(field: TemplateField, name: Optional[str] = None) -> None:
         elif field.name == 'connection_args':
             field.show = True
             field.advanced = False
+
+        elif field.name == 'collection_name' and name == 'Milvus':
+            field.value = ''

src/backend/bisheng/utils/util.py

@@ -241,7 +241,8 @@ def format_dict(d, name: Optional[str] = None):
         value['type'] = 'int' if key in ['max_value_length'] else value['type']
 
         # Show or not field
-        value['show'] = bool((value['required'] and key not in ['input_variables']) or
+        value['show'] = bool((value['required'] and
+                              (key not in ['input_variables'] or name == 'SequentialChain')) or
                              key in FORCE_SHOW_FIELDS or 'api_key' in key)
 
         # Add password field

src/backend/pyproject.toml

@@ -18,7 +18,7 @@ include = ["./bisheng/*", "bisheng/**/*"]
 bisheng = "bisheng.__main__:main"
 
 [tool.poetry.dependencies]
-bisheng_langchain = "^0.1.3"
+bisheng_langchain = "^0.1.4"
 fastapi_jwt_auth = "^0.5.0"
 redis = "^5.0.0"
 jieba = "^0.42.1"

src/bisheng-langchain/version.txt

@@ -1 +1,9 @@
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 v0.1.3
+=======
+v0.1.2
+>>>>>>> Stashed changes
+=======
+v0.1.2
+>>>>>>> Stashed changes