Feat/2.4.0 beta1 (#1908)

Author: zgqgit

src/backend/bisheng/chat/clients/workflow_client.py

@@ -129,7 +129,7 @@ async def check_status(self, message: dict, is_init: bool = False) -> (bool, str
 
     async def get_execute_worker(self) -> Optional[str]:
         if not self.hash_key:
-            return None
+            self.hash_key = self.chat_id if self.chat_id else generate_uuid()
         return await workflow_stateful_worker.find_task_node(self.hash_key)
 
     async def init_workflow(self, message: dict):
@@ -147,7 +147,6 @@ async def init_workflow(self, message: dict):
             await self.workflow.async_set_workflow_data(workflow_data)
             await self.workflow.async_set_workflow_status(WorkflowStatus.WAITING.value)
             # Start asynchronous task
-            self.hash_key = self.chat_id if self.chat_id else generate_uuid()
 
             execute_workflow.apply_async([unique_id, workflow_id, self.chat_id, self.user_id],
                                          queue=await self.get_execute_worker())

src/backend/bisheng/chat/utils.py

@@ -135,15 +135,15 @@ def sync_judge_source(result, source_document, chat_id, extra: Dict):
         if any(not doc.metadata.get('right', True) for doc in source_document):
             source = SourceType.NO_PERMISSION.value
         elif all(
-                doc.metadata.get('user_metadata') and json.loads(doc.metadata.get('user_metadata', '{}')).get('url')
+                doc.metadata.get('user_metadata') and doc.metadata.get('user_metadata', {}).get('url')
                 for doc in source_document):
             source = SourceType.LINK.value
             repeat_doc = {}
             doc = []
             # The source document should be de-emphasized and the original order cannot be changed.
             for one in source_document:
                 title = one.metadata.get('source') or one.metadata.get('document_name')
-                url = json.loads(one.metadata.get('user_metadata', '{}')).get('url')
+                url = one.metadata.get('user_metadata', {}).get('url')
                 repeat_key = (title, url)
                 # Repeatedly discarded, do not return
                 if repeat_doc.get(repeat_key):

src/frontend/client/src/pages/appChat/useChatHelpers.ts

@@ -273,6 +273,7 @@ export default function useChatHelpers() {
                             create_time: formatDate(new Date(), "yyyy-MM-ddTHH:mm:ss"),
                             source: data.source,
                             end: data.type === "end",
+                            extra: data.extra,
                         }
                         return updatedMessages
                     }

src/frontend/platform/src/contexts/locationContext.tsx

@@ -102,7 +102,7 @@ export function LocationProvider({ children }: { children: ReactNode }) {
             setAppConfig(prev => ({
               ...prev,
               benchMenu: bench?.menuShow ?? true,
-              worksapceIcon: bench?.assistantIcon.image ?? '',
+              worksapceIcon: bench?.assistantIcon?.image ?? '',
             }));
           })
           .catch(error => {