Feat/2.3.0 beta4 (#1861)

Author: zgqgit

docker/docker-compose.yml

@@ -40,7 +40,7 @@ services:
 
   backend:
     container_name: bisheng-backend
-    image: dataelement/bisheng-backend:v2.3.0-beta3
+    image: dataelement/bisheng-backend:v2.3.0-beta4
     ports:
       - "7860:7860"
     environment:
@@ -78,7 +78,7 @@ services:
 
   backend_worker:
     container_name: bisheng-backend-worker
-    image: dataelement/bisheng-backend:v2.3.0-beta3
+    image: dataelement/bisheng-backend:v2.3.0-beta4
     environment:
       TZ: Asia/Shanghai
       BS_MILVUS_CONNECTION_ARGS: '{"host":"milvus","port":"19530","user":"","password":"","secure":false}'
@@ -109,7 +109,7 @@ services:
 
   frontend:
     container_name: bisheng-frontend
-    image: dataelement/bisheng-frontend:v2.3.0-beta3
+    image: dataelement/bisheng-frontend:v2.3.0-beta4
     ports:
       - "3001:3001"
     environment:

src/backend/bisheng/__init__.py

@@ -7,7 +7,7 @@
 
 try:
     # 通过ci去自动修改
-    __version__ = '2.3.0-beta3'
+    __version__ = '2.3.0-beta4'
 except metadata.PackageNotFoundError:
     # Case where package metadata is not available.
     __version__ = ''

src/backend/bisheng/api/v1/linsight.py

@@ -125,6 +125,7 @@ async def linsight_file_download(
             raise UnAuthorizedError()
 
     minio_client = await get_minio_storage()
+    file_url = file_url.lstrip("/")
     if file_url.startswith(minio_client.bucket):
         file_url = file_url[len(minio_client.bucket) + 1:]
     file_share_url = await minio_client.get_share_link(file_url)

src/backend/bisheng/open_endpoints/api/endpoints/workflow.py

@@ -31,6 +31,7 @@
 @router.post('/invoke')
 async def invoke_workflow(request: Request,
                           workflow_id: UUID = Body(..., description='工作流唯一ID'),
+                          override: Optional[dict] = Body(default=None, description='override node params'),
                           stream: Optional[bool] = Body(default=True, description='是否流式调用'),
                           user_input: Optional[dict] = Body(default=None, description='用户输入', alias='input'),
                           message_id: Optional[int] = Body(default=None, description='消息ID'),
@@ -61,7 +62,7 @@ async def invoke_workflow(request: Request,
     status_info = workflow.get_workflow_status()
     if not status_info:
         # 初始化工作流
-        workflow.set_workflow_data(workflow_info.data)
+        workflow.set_workflow_data(workflow_info.data, override=override)
         workflow.set_workflow_status(WorkflowStatus.WAITING.value)
         # 发起异步任务
         execute_workflow.delay(unique_id, workflow_id, chat_id, str(login_user.user_id))

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

@@ -3,7 +3,7 @@
 import os
 import time
 import uuid
-from typing import AsyncIterator, Iterator
+from typing import AsyncIterator, Iterator, Dict, List
 
 from langchain_core.documents import Document
 from loguru import logger
@@ -48,9 +48,33 @@ def __init__(self, unique_id: str, workflow_id: str, chat_id: str, user_id: int)
         self.workflow_stop_key = f'workflow:{unique_id}:stop'
         self.workflow_expire_time = settings.get_workflow_conf().timeout * 60 + 60
 
-    def set_workflow_data(self, data: dict):
+    def set_workflow_data(self, data: Dict, override: Dict = None):
+        data = self.override_nodes_params(data, override)
         self.redis_client.set(self.workflow_data_key, data, expiration=self.workflow_expire_time)
 
+    @staticmethod
+    def override_nodes_params(data: Dict, override: Dict = None) -> Dict:
+        if not override:
+            return data
+
+        def replace_param(one_params: List[Dict], one_node_id: str):
+            for param in one_params:
+                param_key = param.get('key')
+                if param_key not in override[node_id]:
+                    continue
+                param['value'] = override[one_node_id][param_key]
+
+        nodes = data.get('nodes', [])
+        for node in nodes:
+            node_data = node.get('data', {})
+            node_id = node_data.get('id')
+            if node_id not in override:
+                continue
+            group_params = node_data.get('group_params', [])
+            for group_param in group_params:
+                replace_param(group_param.get('params', []), node_id)
+        return data
+
     async def async_set_workflow_data(self, data: dict):
         await self.redis_client.aset(self.workflow_data_key, data, expiration=self.workflow_expire_time)
 

src/backend/bisheng/workflow/graph/graph_state.py

@@ -6,13 +6,13 @@
 
 
 class GraphState(BaseModel):
-    """ 所有节点的 全局状态管理 """
+    """ nodes share state """
 
-    # 存储聊天历史
     history_memory: Optional[ConversationBufferWindowMemory] = None
 
-    # 全局变量池
-    variables_pool: Dict[str, Dict[str, Any]] = Field(default_factory=dict, description='全局变量池: {node_id: {key: value}}')
+    # global variable pool
+    variables_pool: Dict[str, Dict[str, Any]] = Field(default_factory=dict,
+                                                      description='全局变量池: {node_id: {key: value}}')
 
     def get_history_memory(self, count: int) -> str:
         """ 获取聊天历史记录
@@ -31,7 +31,6 @@ def get_history_memory(self, count: int) -> str:
     def get_history_list(self, count: int) -> List[BaseMessage]:
         return self.history_memory.buffer_as_messages[-count:]
 
-
     def save_context(self, content: str, msg_sender: str) -> None:
         """  保存聊天记录
         workflow 特殊情况，过程会有多轮交互，所以不是一条对一条，重制消息结构"""
@@ -101,8 +100,8 @@ def get_all_variables(self) -> Dict[str, Any]:
         for node_id, node_variables in self.variables_pool.items():
             for key, value in node_variables.items():
                 ret[f'{node_id}.{key}'] = self.get_variable(node_id, key)
-                # 特殊处理下 preset_question key
-                if key == 'preset_question':
+                # get preset_question and custom_variables all keys
+                if key in ['preset_question', 'custom_variables']:
                     for k, v in value.items():
                         ret[f'{node_id}.{key}#{k}'] = v
         return ret

src/backend/bisheng/workflow/nodes/start/start.py

@@ -57,16 +57,21 @@ def _run(self, unique_id: str) -> Dict[str, Any]:
         if not self.node_data.v:
             raise IgnoreException(f'{self.name} -- workflow node is update')
 
-        # 预处理preset_question数据为dict
+        # convert preset_question to dict
         new_preset_question = {}
         for one in self.node_params['preset_question']:
             new_preset_question[one['key']] = one['value']
 
+        # convert custom vars to dict
+        custom_vars = {}
+        for one in self.node_params.get('custom_variables', []):
+            custom_vars[one['key']] = one['value']
         return {
             'current_time': self.node_params['current_time'],
             'chat_history': '',
             'preset_question': new_preset_question,
             'user_info': self._user_info,
+            'custom_variables': custom_vars
         }
 
     def parse_log(self, unique_id: str, result: dict) -> Any:

src/backend/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "backend"
-version = "2.3.0-beta3"
+version = "2.3.0-beta4"
 description = "BISHENG backend service"
 readme = "README.md"
 license = "Apache 2.0"

src/frontend/client/src/hooks/Chat/useChatFunctions.ts

@@ -114,7 +114,6 @@ export default function useChatFunctions({
     const search_enabled = searchType && searchType === 'netSearch' || false;
     const knowledge_enabled = searchType && searchType === 'knowledgeSearch' || false;
 
-    debugger
     const use_knowledge_base = {
       personal_knowledge_enabled: knowledge_enabled,
 

src/frontend/client/src/locales/en/translation.json

@@ -466,7 +466,7 @@
   "com_ui_agent_delete_error": "There was an error deleting the agent",
   "com_ui_agent_deleted": "Successfully deleted agent",
   "com_ui_agent_duplicate_error": "There was an error duplicating the agent",
-  "com_ui_agent_duplicated": "Agent duplicated successfully",
+  "com_ui_agent_duplicated": "Agent copied successfully",
   "com_ui_agent_editing_allowed": "Other users can already edit this agent",
   "com_ui_agent_shared_to_all": "something needs to go here. was empty",
   "com_ui_agents": "Agents",
@@ -608,10 +608,10 @@
   "com_ui_dropdown_variables": "Dropdown variables:",
   "com_ui_dropdown_variables_info": "Create custom dropdown menus for your prompts: `{{variable_name:option1|option2|option3}}`",
   "com_ui_duplicate": "Duplicate",
-  "com_ui_duplicated": "Duplicated",
+  "com_ui_duplicated": "Copied",
   "com_ui_duplication_error": "There was an error duplicating the conversation",
   "com_ui_duplication_processing": "Duplicating conversation...",
-  "com_ui_duplication_success": "Successfully duplicated conversation",
+  "com_ui_duplication_success": "Successfully copied conversation",
   "com_app_center_welcome": "Explore BISHENG's Intelligent Agents",
   "com_app_center_description": "You can choose the intelligent agents you need here for production and work~",
   "com_app_frequently_used": "Frequently Used Agents",