From a221e9e2290d5275f8c34e9a7c78b70605e8d71d Mon Sep 17 00:00:00 2001
From: suluyana <suluyan_sly@163.com>
Date: Mon, 25 Nov 2024 15:02:27 +0800
Subject: [PATCH 01/11] fix bugs

---
 apps/agentfabric/app.py                            |  7 ++++++-
 apps/agentfabric/appBot.py                         |  8 +++++++-
 apps/agentfabric/server.py                         |  4 ++--
 modelscope_agent/agents/multi_role_play.py         |  7 +++----
 .../llm/utils/function_call_with_raw_prompt.py     | 14 ++++++--------
 modelscope_agent/tools/utils/output_wrapper.py     |  2 +-
 6 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/apps/agentfabric/app.py b/apps/agentfabric/app.py
index ccebcf2db..ccb7c9189 100644
--- a/apps/agentfabric/app.py
+++ b/apps/agentfabric/app.py
@@ -621,11 +621,16 @@ def preview_send_message(chatbot, input, _state, uuid_str, _user_token):
 
         # get chat history from memory
         history = user_memory.get_history()
+        # skip
+        filtered_files = [
+            item for item in append_files
+            if not item.lower().endswith(('.jpeg', '.png', '.jpg', '.wav', '.gif', '.mp3'))
+        ]
 
         use_llm = True if len(user_agent.function_list) else False
         ref_doc = user_memory.run(
             query=input.text,
-            url=append_files,
+            url=filtered_files,
             max_token=4000,
             top_k=2,
             checked=True,
diff --git a/apps/agentfabric/appBot.py b/apps/agentfabric/appBot.py
index d1b3b440e..2b3d085bb 100644
--- a/apps/agentfabric/appBot.py
+++ b/apps/agentfabric/appBot.py
@@ -150,9 +150,15 @@ def send_message(chatbot, input, _state, _user_token):
         # get short term memory history
         history = user_memory.get_history()
 
+        # skip
+        filtered_files = [
+            item for item in append_files
+            if not item.lower().endswith(('.jpeg', '.png', '.jpg', '.wav', '.gif', '.mp3'))
+        ]
+
         use_llm = True if len(user_agent.function_list) else False
         ref_doc = user_memory.run(
-            query=input.text, url=append_files, checked=True, use_llm=use_llm)
+            query=input.text, url=filtered_files, checked=True, use_llm=use_llm)
 
         response = ''
         try:
diff --git a/apps/agentfabric/server.py b/apps/agentfabric/server.py
index c75edb24f..b78631bb4 100644
--- a/apps/agentfabric/server.py
+++ b/apps/agentfabric/server.py
@@ -424,10 +424,10 @@ def generate():
                 f'load history method: time consumed {time.time() - start_time}'
             )
 
-            # skip image upsert
+            # skip
             filtered_files = [
                 item for item in file_paths
-                if not item.lower().endswith(('.jpeg', '.png', '.jpg'))
+                if not item.lower().endswith(('.jpeg', '.png', '.jpg', '.wav', '.gif', '.mp3'))
             ]
 
             use_llm = True if len(user_agent.function_list) else False
diff --git a/modelscope_agent/agents/multi_role_play.py b/modelscope_agent/agents/multi_role_play.py
index 1e8d8fca4..12bd751cd 100644
--- a/modelscope_agent/agents/multi_role_play.py
+++ b/modelscope_agent/agents/multi_role_play.py
@@ -30,7 +30,7 @@
 Action: 工具的名称，必须是[{tool_names}]之一
 Action Input: 工具的输入
 Observation: <result>工具返回的结果</result>
-Answer: 根据Observation总结本次工具调用返回的结果，如果结果中出现url，请使用如下格式展示出来：![图片](url)
+Answer: 根据Observation总结本次工具调用返回的结果
 
 """
 
@@ -59,10 +59,9 @@
 Action: The name of the tool, must be one of [{tool_names}]
 Action Input: Tool input
 Observation: <result>Tool returns result</result>
-Answer: Summarize the results of this tool call based on Observation. If the result contains url, %s
+Answer: Summarize the results of this tool call based on Observation.
 
-""" % ('You can call zero or more times according to your needs:',
-       'please display it in the following format:![Image](URL)')
+""" % ('You can call zero or more times according to your needs:')
 
 PROMPT_TEMPLATE_EN = """{role_prompt}"""
 
diff --git a/modelscope_agent/llm/utils/function_call_with_raw_prompt.py b/modelscope_agent/llm/utils/function_call_with_raw_prompt.py
index d06c46b5d..6dd02ef9c 100644
--- a/modelscope_agent/llm/utils/function_call_with_raw_prompt.py
+++ b/modelscope_agent/llm/utils/function_call_with_raw_prompt.py
@@ -21,7 +21,7 @@
 Action: 工具的名称，必须是[{tool_names}]之一
 Action Input: 工具的输入
 Observation: <result>工具返回的结果</result>
-Answer: 根据Observation总结本次工具调用返回的结果，如果结果中出现url，请使用如下格式展示出来：![图片](url)
+Answer: 根据Observation总结本次工具调用返回的结果
 
 """
 
@@ -47,7 +47,7 @@
 ...
 Observation: <result>工具N返回的结果</result>
 
-Answer: 根据Observation总结本次工具调用返回的结果，如果结果中出现url，请使用如下格式展示出来：![图片](url)
+Answer: 根据Observation总结本次工具调用返回的结果
 
 """
 
@@ -64,10 +64,9 @@
 Action: The name of the tool, must be one of [{tool_names}]
 Action Input: Tool input
 Observation: <result>Tool returns result</result>
-Answer: Summarize the results of this tool call based on Observation. If the result contains url, %s
+Answer: Summarize the results of this tool call based on Observation.
 
-""" % ('You can call zero or more times according to your needs:',
-       'please display it in the following format:![Image](URL)')
+""" % ('You can call zero or more times according to your needs:')
 
 TOOL_TEMPLATE_EN_PARALLEL = """
 # Tools
@@ -90,10 +89,9 @@
 Observation: <result>Tool 1 returns result</result>
 ...
 Observation: <result>Tool N returns result</result>
-Answer: Summarize the results of this tool call based on Observation. If the result contains url, %s
+Answer: Summarize the results of this tool call based on Observation.
 
-""" % ('You can call zero or more times according to your needs:',
-       'please display it in the following format:![Image](URL)')
+""" % ('You can call zero or more times according to your needs:')
 
 TOOL_TEMPLATE = {
     'zh': TOOL_TEMPLATE_ZH,
diff --git a/modelscope_agent/tools/utils/output_wrapper.py b/modelscope_agent/tools/utils/output_wrapper.py
index c809abb5d..ad65d5385 100644
--- a/modelscope_agent/tools/utils/output_wrapper.py
+++ b/modelscope_agent/tools/utils/output_wrapper.py
@@ -178,7 +178,7 @@ def __init__(self, video, **kwargs) -> None:
 
         self._raw_data = video
 
-        if self._path.endswith('.gif'):
+        if self._path.split('?')[0].endswith('.gif'):
             self._repr = f'![IMAGEGEN]({self._path})'
         else:
             self._repr = f'<video src="{self._path}"/>'

From 72a8b12f246df22bda19b1ff2ac0002665ebe52b Mon Sep 17 00:00:00 2001
From: suluyana <suluyan_sly@163.com>
Date: Mon, 25 Nov 2024 15:18:24 +0800
Subject: [PATCH 02/11] fix lint

---
 apps/agentfabric/app.py    | 3 ++-
 apps/agentfabric/appBot.py | 8 ++++++--
 apps/agentfabric/server.py | 3 ++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/apps/agentfabric/app.py b/apps/agentfabric/app.py
index ccb7c9189..92c3c0249 100644
--- a/apps/agentfabric/app.py
+++ b/apps/agentfabric/app.py
@@ -624,7 +624,8 @@ def preview_send_message(chatbot, input, _state, uuid_str, _user_token):
         # skip
         filtered_files = [
             item for item in append_files
-            if not item.lower().endswith(('.jpeg', '.png', '.jpg', '.wav', '.gif', '.mp3'))
+            if not item.lower().endswith(('.jpeg', '.png', '.jpg', '.wav',
+                                          '.gif', '.mp3'))
         ]
 
         use_llm = True if len(user_agent.function_list) else False
diff --git a/apps/agentfabric/appBot.py b/apps/agentfabric/appBot.py
index 2b3d085bb..230a6b942 100644
--- a/apps/agentfabric/appBot.py
+++ b/apps/agentfabric/appBot.py
@@ -153,12 +153,16 @@ def send_message(chatbot, input, _state, _user_token):
         # skip
         filtered_files = [
             item for item in append_files
-            if not item.lower().endswith(('.jpeg', '.png', '.jpg', '.wav', '.gif', '.mp3'))
+            if not item.lower().endswith(('.jpeg', '.png', '.jpg', '.wav',
+                                          '.gif', '.mp3'))
         ]
 
         use_llm = True if len(user_agent.function_list) else False
         ref_doc = user_memory.run(
-            query=input.text, url=filtered_files, checked=True, use_llm=use_llm)
+            query=input.text,
+            url=filtered_files,
+            checked=True,
+            use_llm=use_llm)
 
         response = ''
         try:
diff --git a/apps/agentfabric/server.py b/apps/agentfabric/server.py
index b78631bb4..c416bc3db 100644
--- a/apps/agentfabric/server.py
+++ b/apps/agentfabric/server.py
@@ -427,7 +427,8 @@ def generate():
             # skip
             filtered_files = [
                 item for item in file_paths
-                if not item.lower().endswith(('.jpeg', '.png', '.jpg', '.wav', '.gif', '.mp3'))
+                if not item.lower().endswith(('.jpeg', '.png', '.jpg', '.wav',
+                                              '.gif', '.mp3'))
             ]
 
             use_llm = True if len(user_agent.function_list) else False

From 00ace00a152fa98a11946756e5de5e2b9bd807e6 Mon Sep 17 00:00:00 2001
From: yrk111222 <2493404415@qq.com>
Date: Wed, 27 Nov 2024 15:51:27 +0800
Subject: [PATCH 03/11] Fix the issue with the tool being uncallable. (#606)

---
 modelscope_agent/agent.py                     | 23 ++++++++++++++++---
 modelscope_agent/tools/base.py                |  9 ++++++++
 modelscope_agent/tools/utils/openapi_utils.py |  9 ++++----
 3 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/modelscope_agent/agent.py b/modelscope_agent/agent.py
index 0815fa2ca..67f22780d 100644
--- a/modelscope_agent/agent.py
+++ b/modelscope_agent/agent.py
@@ -193,11 +193,28 @@ def _register_tool(self,
         Returns:
 
         """
-        tool_name = tool
+        tool_name = None
         tool_cfg = {}
+
+        # # Check if the tool is a dictionary and extract the tool name and configuration from it.
         if isinstance(tool, dict):
-            tool_name = next(iter(tool))
-            tool_cfg = tool[tool_name]
+            try:
+                tool_name = next(iter(tool))
+                tool_cfg = tool[tool_name]
+            except StopIteration:
+                # If the tool is an empty dictionary, proceed to register the next tool.
+                print("Empty tool dictionary provided, skipping the registration of the current tool")
+                return
+
+        # If the tool is a string, assign it directly to tool_name.
+        elif isinstance(tool, str):
+            tool_name = tool
+
+        # If the tool_name is empty, skip the registration of the current tool.
+        if not tool_name:
+            print("No tool name provided, skipping the registration of the current tool")
+            return
+
         if tool_name not in TOOL_REGISTRY and not self.use_tool_api:
             raise NotImplementedError
         if tool_name not in self.function_list:
diff --git a/modelscope_agent/tools/base.py b/modelscope_agent/tools/base.py
index 8ad6e67aa..6ea85d3d6 100644
--- a/modelscope_agent/tools/base.py
+++ b/modelscope_agent/tools/base.py
@@ -335,6 +335,10 @@ def __init__(self,
         self.tenant_id = tenant_id
         self._register_tool()
 
+        if not self.tool_name:
+            print("Skipping tool registration and status check because 'tool_name' is not defined or empty.")
+            return  # When tool_name is an empty string, skip registration and status check.
+
         max_retry = 10
         while max_retry > 0:
             status = self._check_tool_status()
@@ -368,6 +372,11 @@ def parse_service_response(response):
 
     def _register_tool(self):
         try:
+            # Check if `tool_name` is defined and not empty.
+            if not self.tool_name:
+                print("Skipping tool registration because 'tool_name' is not defined or empty.")
+                return  # Return directly, skipping registration.
+
             service_token = os.getenv('TOOL_MANAGER_AUTH', '')
             headers = {
                 'Content-Type': 'application/json',
diff --git a/modelscope_agent/tools/utils/openapi_utils.py b/modelscope_agent/tools/utils/openapi_utils.py
index 29b956bd1..e3e2bc3ec 100644
--- a/modelscope_agent/tools/utils/openapi_utils.py
+++ b/modelscope_agent/tools/utils/openapi_utils.py
@@ -189,13 +189,14 @@ def swagger_to_openapi(swagger_data):
 
 def openapi_schema_convert(schema: dict, auth: dict = {}):
     config_data = {}
-    host = schema.get('host', '')
+    host = schema.get('host', '') if schema else ''  # Check if schema is None
+
     if host:
-        schema = swagger_to_openapi(schema)
+        schema = swagger_to_openapi(schema) if schema else {}  # Call only if schema is not None
 
-    schema = jsonref.replace_refs(schema)
+    schema = jsonref.replace_refs(schema) if schema else {}  # Call only if schema is not None
 
-    servers = schema.get('servers', [])
+    servers = schema.get('servers', []) if schema else []  # Check if schema is None
 
     if servers:
         servers_url = servers[0].get('url')

From dd6fe566fb3c3402e74f3fce2ea32d5e4bc4b4f0 Mon Sep 17 00:00:00 2001
From: suluyan <suluyan.sly@alibaba-inc.com>
Date: Mon, 2 Dec 2024 12:37:27 +0800
Subject: [PATCH 04/11]  catch in agentfabric

---
 apps/agentfabric/server.py     | 10 +++++++++-
 modelscope_agent/tools/base.py | 12 +++++++++---
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/apps/agentfabric/server.py b/apps/agentfabric/server.py
index c416bc3db..86daa2b25 100644
--- a/apps/agentfabric/server.py
+++ b/apps/agentfabric/server.py
@@ -496,7 +496,15 @@ def generate():
             stack_trace = stack_trace.replace('\n', '\\n')
             logger.error(
                 f'preview_chat_generate_error: {str(e)}, {stack_trace}')
-            raise e
+            error_info = f'data: Please check your configuration and try again. Error: {str(e)}, {stack_trace}\n\n'
+            res = json.dumps(
+                {
+                    'data': error_info,
+                    'is_final': True,
+                    'request_id': request_id_var.get('')
+                },
+                ensure_ascii=False)
+            yield f'data: {res}\n\n'
 
     return Response(generate(), mimetype='text/event-stream')
 
diff --git a/modelscope_agent/tools/base.py b/modelscope_agent/tools/base.py
index 6ea85d3d6..ad04f6aea 100644
--- a/modelscope_agent/tools/base.py
+++ b/modelscope_agent/tools/base.py
@@ -1,5 +1,6 @@
 import os
 import time
+import traceback
 from abc import ABC, abstractmethod
 from copy import deepcopy
 from typing import Dict, List, Optional, Union
@@ -431,7 +432,7 @@ def _check_tool_status(self):
             return result['status']
         except Exception as e:
             raise RuntimeError(
-                f'Get error during checking status from tool manager service with detail {e}'
+                f'Get error during checking status from tool manager service: {self.tool_name} {self.tenant_id}. detail {e}, {traceback.format_exc()}'
             )
 
     def _get_tool_info(self):
@@ -451,10 +452,15 @@ def _get_tool_info(self):
                 },
                 headers=headers)
             response.raise_for_status()
-            return ToolServiceProxy.parse_service_response(response)
+            tool_info = ToolServiceProxy.parse_service_response(response)
+            # check required params
+            name = tool_info['name']
+            description = tool_info['description']
+            parameters = tool_info['parameters']
+            return tool_info
         except Exception as e:
             raise RuntimeError(
-                f'Get error during getting tool info from tool manager service with detail {e}'
+                f'Get error during getting tool info from tool manager, {self.tool_name} {self.tenant_id}. detail {e}, {traceback.format_exc()}'
             )
 
     def call(self, params: str, **kwargs):

From ad6e2da859809414c44a5e05f5836eee8d8ba8fa Mon Sep 17 00:00:00 2001
From: suluyan <suluyan.sly@alibaba-inc.com>
Date: Mon, 2 Dec 2024 13:02:03 +0800
Subject: [PATCH 05/11] fix prompt

---
 modelscope_agent/agents/multi_role_play.py                  | 2 +-
 modelscope_agent/llm/utils/function_call_with_raw_prompt.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modelscope_agent/agents/multi_role_play.py b/modelscope_agent/agents/multi_role_play.py
index 12bd751cd..8d19776bc 100644
--- a/modelscope_agent/agents/multi_role_play.py
+++ b/modelscope_agent/agents/multi_role_play.py
@@ -30,7 +30,7 @@
 Action: 工具的名称，必须是[{tool_names}]之一
 Action Input: 工具的输入
 Observation: <result>工具返回的结果</result>
-Answer: 根据Observation总结本次工具调用返回的结果
+Answer: 根据Observation总结本次工具调用返回的结果。如果结果中出现url，请严格遵循Observation中url的格式进行展示。
 
 """
 
diff --git a/modelscope_agent/llm/utils/function_call_with_raw_prompt.py b/modelscope_agent/llm/utils/function_call_with_raw_prompt.py
index 6dd02ef9c..ec7b5dbba 100644
--- a/modelscope_agent/llm/utils/function_call_with_raw_prompt.py
+++ b/modelscope_agent/llm/utils/function_call_with_raw_prompt.py
@@ -21,7 +21,7 @@
 Action: 工具的名称，必须是[{tool_names}]之一
 Action Input: 工具的输入
 Observation: <result>工具返回的结果</result>
-Answer: 根据Observation总结本次工具调用返回的结果
+Answer: 根据Observation总结本次工具调用返回的结果。如果结果中出现url，请严格遵循Observation中url的格式进行展示。
 
 """
 

From f038a091d2bd5bb0cfc6672fdda7c4031d0572f1 Mon Sep 17 00:00:00 2001
From: suluyana <suluyan_sly@163.com>
Date: Wed, 4 Dec 2024 15:33:48 +0800
Subject: [PATCH 06/11] bump version v0.7.2

---
 modelscope_agent/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modelscope_agent/version.py b/modelscope_agent/version.py
index f0788a87a..fb9b668fb 100644
--- a/modelscope_agent/version.py
+++ b/modelscope_agent/version.py
@@ -1 +1 @@
-__version__ = '0.7.1'
+__version__ = '0.7.2'

From a20662482111991d692e147aa0ebb7cd0432f75f Mon Sep 17 00:00:00 2001
From: suluyana <suluyan_sly@163.com>
Date: Wed, 4 Dec 2024 15:56:38 +0800
Subject: [PATCH 07/11] update agentfabric requirement & fix lint

---
 apps/agentfabric/requirements.txt             |  2 +-
 modelscope_agent/agent.py                     |  8 +++++--
 modelscope_agent/tools/base.py                | 21 ++++++++++++-------
 modelscope_agent/tools/utils/openapi_utils.py |  9 +++++---
 4 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/apps/agentfabric/requirements.txt b/apps/agentfabric/requirements.txt
index 51731629b..b2389dc58 100644
--- a/apps/agentfabric/requirements.txt
+++ b/apps/agentfabric/requirements.txt
@@ -1,7 +1,7 @@
 gradio==4.36.1
 markdown-cjk-spacing
 mdx_truly_sane_lists
-modelscope-agent>=0.6.6
+modelscope-agent>=0.7.2
 modelscope_studio>=0.4.0
 moviepy
 pymdown-extensions
diff --git a/modelscope_agent/agent.py b/modelscope_agent/agent.py
index 67f22780d..f15577e54 100644
--- a/modelscope_agent/agent.py
+++ b/modelscope_agent/agent.py
@@ -203,7 +203,9 @@ def _register_tool(self,
                 tool_cfg = tool[tool_name]
             except StopIteration:
                 # If the tool is an empty dictionary, proceed to register the next tool.
-                print("Empty tool dictionary provided, skipping the registration of the current tool")
+                print(
+                    'Empty tool dictionary provided, skipping the registration of the current tool'
+                )
                 return
 
         # If the tool is a string, assign it directly to tool_name.
@@ -212,7 +214,9 @@ def _register_tool(self,
 
         # If the tool_name is empty, skip the registration of the current tool.
         if not tool_name:
-            print("No tool name provided, skipping the registration of the current tool")
+            print(
+                'No tool name provided, skipping the registration of the current tool'
+            )
             return
 
         if tool_name not in TOOL_REGISTRY and not self.use_tool_api:
diff --git a/modelscope_agent/tools/base.py b/modelscope_agent/tools/base.py
index ad04f6aea..28570d55b 100644
--- a/modelscope_agent/tools/base.py
+++ b/modelscope_agent/tools/base.py
@@ -337,7 +337,9 @@ def __init__(self,
         self._register_tool()
 
         if not self.tool_name:
-            print("Skipping tool registration and status check because 'tool_name' is not defined or empty.")
+            print(
+                "Skipping tool registration and status check because 'tool_name' is not defined or empty."
+            )
             return  # When tool_name is an empty string, skip registration and status check.
 
         max_retry = 10
@@ -375,7 +377,9 @@ def _register_tool(self):
         try:
             # Check if `tool_name` is defined and not empty.
             if not self.tool_name:
-                print("Skipping tool registration because 'tool_name' is not defined or empty.")
+                print(
+                    "Skipping tool registration because 'tool_name' is not defined or empty."
+                )
                 return  # Return directly, skipping registration.
 
             service_token = os.getenv('TOOL_MANAGER_AUTH', '')
@@ -432,8 +436,8 @@ def _check_tool_status(self):
             return result['status']
         except Exception as e:
             raise RuntimeError(
-                f'Get error during checking status from tool manager service: {self.tool_name} {self.tenant_id}. detail {e}, {traceback.format_exc()}'
-            )
+                f'Get error during checking status from tool manager service: {self.tool_name} '
+                f'{self.tenant_id}. detail {e}, {traceback.format_exc()}')
 
     def _get_tool_info(self):
         try:
@@ -454,13 +458,14 @@ def _get_tool_info(self):
             response.raise_for_status()
             tool_info = ToolServiceProxy.parse_service_response(response)
             # check required params
-            name = tool_info['name']
-            description = tool_info['description']
-            parameters = tool_info['parameters']
+            _ = tool_info['name']
+            _ = tool_info['description']
+            _ = tool_info['parameters']
             return tool_info
         except Exception as e:
             raise RuntimeError(
-                f'Get error during getting tool info from tool manager, {self.tool_name} {self.tenant_id}. detail {e}, {traceback.format_exc()}'
+                f'Get error during getting tool info from tool manager, '
+                f'{self.tool_name} {self.tenant_id}. detail {e}, {traceback.format_exc()}'
             )
 
     def call(self, params: str, **kwargs):
diff --git a/modelscope_agent/tools/utils/openapi_utils.py b/modelscope_agent/tools/utils/openapi_utils.py
index e3e2bc3ec..650960c97 100644
--- a/modelscope_agent/tools/utils/openapi_utils.py
+++ b/modelscope_agent/tools/utils/openapi_utils.py
@@ -192,11 +192,14 @@ def openapi_schema_convert(schema: dict, auth: dict = {}):
     host = schema.get('host', '') if schema else ''  # Check if schema is None
 
     if host:
-        schema = swagger_to_openapi(schema) if schema else {}  # Call only if schema is not None
+        schema = swagger_to_openapi(schema) if schema else {
+        }  # Call only if schema is not None
 
-    schema = jsonref.replace_refs(schema) if schema else {}  # Call only if schema is not None
+    schema = jsonref.replace_refs(schema) if schema else {
+    }  # Call only if schema is not None
 
-    servers = schema.get('servers', []) if schema else []  # Check if schema is None
+    servers = schema.get('servers', []) if schema else [
+    ]  # Check if schema is None
 
     if servers:
         servers_url = servers[0].get('url')

From 141461ba8c30430aa8104d5f7bea92b2f997ac66 Mon Sep 17 00:00:00 2001
From: suluyana <suluyan_sly@163.com>
Date: Fri, 3 Jan 2025 15:26:56 +0800
Subject: [PATCH 08/11] debug

---
 apps/agentfabric/server.py       |  2 +-
 apps/agentfabric/server_utils.py | 20 ++++++++++++++++++--
 apps/agentfabric/user_core.py    |  5 +++++
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/apps/agentfabric/server.py b/apps/agentfabric/server.py
index 86daa2b25..d7bf50fd7 100644
--- a/apps/agentfabric/server.py
+++ b/apps/agentfabric/server.py
@@ -353,7 +353,7 @@ def save_builder_config(uuid_str):
                 error=str(e),
                 details={'error_traceback': traceback.format_exc()})
     save_builder_configuration(builder_cfg=builder_config, uuid_str=uuid_str)
-    # app.session_manager.clear_user_bot(uuid_str)
+    app.session_manager.renew_user_bot(uuid_str)
 
     return jsonify({'success': True, 'request_id': request_id_var.get('')})
 
diff --git a/apps/agentfabric/server_utils.py b/apps/agentfabric/server_utils.py
index 4f31bf171..c71e40949 100644
--- a/apps/agentfabric/server_utils.py
+++ b/apps/agentfabric/server_utils.py
@@ -120,6 +120,8 @@ def get_builder_bot(
             builder_id,
             renew=False) -> Tuple[AgentBuilder, MemoryWithRetrievalKnowledge]:
         builder_agent = self.builder_bots[builder_id]
+        print(f'builder_id: {builder_id}')
+        print(f'builder_bots: {self.builder_bots.keys()}')
         if renew or builder_agent is None:
             logger.info(f'init_builder_chatbot_agent: {builder_id} ')
             builder_agent = init_builder_chatbot_agent(builder_id)
@@ -137,17 +139,31 @@ def get_user_bot(
             self,
             builder_id,
             session,
-            renew=False,
             user_token=None) -> Tuple[RolePlay, MemoryWithRetrievalKnowledge]:
         unique_id = builder_id + '_' + session
+        print(f'unique_id: {unique_id}')
         user_agent = self.user_bots[unique_id]
-        if renew or user_agent is None:
+        print(f'self.user_bots: {self.user_bots}')
+        print(f'user_agent: {user_agent}')
+        if user_agent is None:
             logger.info(f'init_user_chatbot_agent: {builder_id} {session}')
             user_agent = init_user_chatbot_agent(
                 builder_id, session, use_tool_api=True, user_token=user_token)
             self.user_bots[unique_id] = user_agent
         return user_agent
 
+    def renew_user_bot(
+            self,
+            builder_id,
+            session='default',
+            user_token=None):
+        self.clear_user_bot(builder_id, session)
+        unique_id = builder_id + '_' + session
+        logger.info(f'reinit_user_chatbot_agent: {builder_id} {session}')
+        user_agent = init_user_chatbot_agent(
+            builder_id, session, use_tool_api=True, user_token=user_token)
+        self.user_bots[unique_id] = user_agent
+
     def clear_user_bot(self, builder_id, session):
         unique_id = builder_id + '_' + session
         user_agent = self.user_bots[unique_id]
diff --git a/apps/agentfabric/user_core.py b/apps/agentfabric/user_core.py
index 32e245a2e..ec031090c 100644
--- a/apps/agentfabric/user_core.py
+++ b/apps/agentfabric/user_core.py
@@ -54,6 +54,11 @@ def init_user_chatbot_agent(uuid_str='',
         user_token=user_token,
         openapi_list=openapi_plugin_list)
 
+    logger.query_info(
+        uuid=uuid_str,
+        message=
+        f'init {builder_cfg.name} chatbot end.')
+
     # build memory
     preview_history_dir = get_user_preview_history_dir(uuid_str, session)
     storage_path = preview_history_dir

From 5b55b4028a84c9553f8046f9fc6082ee1c77a8ef Mon Sep 17 00:00:00 2001
From: suluyan <suluyan.sly@alibaba-inc.com>
Date: Mon, 6 Jan 2025 18:01:40 +0800
Subject: [PATCH 09/11] fix documents

---
 modelscope_agent/memory/memory_with_rag.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modelscope_agent/memory/memory_with_rag.py b/modelscope_agent/memory/memory_with_rag.py
index d61a2e332..1203395ec 100644
--- a/modelscope_agent/memory/memory_with_rag.py
+++ b/modelscope_agent/memory/memory_with_rag.py
@@ -38,6 +38,7 @@ def __init__(self,
             llm=llm,
             cache_dir=storage_path,
             use_cache=use_knowledge_cache,
+            documents=[],
             **kwargs)
 
     @enable_rag_callback

From a77c2c1392a8e3e109cd35720a6a98a0ab6962c3 Mon Sep 17 00:00:00 2001
From: suluyan <suluyan.sly@alibaba-inc.com>
Date: Wed, 8 Jan 2025 11:17:42 +0800
Subject: [PATCH 10/11] fix renew user bot

---
 apps/agentfabric/server.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/agentfabric/server.py b/apps/agentfabric/server.py
index d7bf50fd7..e92871a4a 100644
--- a/apps/agentfabric/server.py
+++ b/apps/agentfabric/server.py
@@ -125,7 +125,7 @@ def generate():
                         assert isinstance(exec_result, Config)
                         builder_cfg = exec_result.to_dict()
                         save_builder_configuration(builder_cfg, uuid_str)
-                        # app.session_manager.clear_user_bot(uuid_str)
+                        app.session_manager.renew_user_bot(uuid_str)
                         res = json.dumps(
                             {
                                 'data': response,

From 37f1480b28993dbcd91c050941ffd16a80a30b90 Mon Sep 17 00:00:00 2001
From: suluyan <suluyan.sly@alibaba-inc.com>
Date: Wed, 8 Jan 2025 15:01:20 +0800
Subject: [PATCH 11/11] fix user_token

---
 apps/agentfabric/server.py       | 4 ++--
 apps/agentfabric/server_utils.py | 8 ++------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/apps/agentfabric/server.py b/apps/agentfabric/server.py
index e92871a4a..a07ba868a 100644
--- a/apps/agentfabric/server.py
+++ b/apps/agentfabric/server.py
@@ -125,7 +125,7 @@ def generate():
                         assert isinstance(exec_result, Config)
                         builder_cfg = exec_result.to_dict()
                         save_builder_configuration(builder_cfg, uuid_str)
-                        app.session_manager.renew_user_bot(uuid_str)
+                        app.session_manager.clear_user_bot(uuid_str)
                         res = json.dumps(
                             {
                                 'data': response,
@@ -353,7 +353,7 @@ def save_builder_config(uuid_str):
                 error=str(e),
                 details={'error_traceback': traceback.format_exc()})
     save_builder_configuration(builder_cfg=builder_config, uuid_str=uuid_str)
-    app.session_manager.renew_user_bot(uuid_str)
+    app.session_manager.clear_user_bot(uuid_str)
 
     return jsonify({'success': True, 'request_id': request_id_var.get('')})
 
diff --git a/apps/agentfabric/server_utils.py b/apps/agentfabric/server_utils.py
index c71e40949..d04b38e6a 100644
--- a/apps/agentfabric/server_utils.py
+++ b/apps/agentfabric/server_utils.py
@@ -120,8 +120,6 @@ def get_builder_bot(
             builder_id,
             renew=False) -> Tuple[AgentBuilder, MemoryWithRetrievalKnowledge]:
         builder_agent = self.builder_bots[builder_id]
-        print(f'builder_id: {builder_id}')
-        print(f'builder_bots: {self.builder_bots.keys()}')
         if renew or builder_agent is None:
             logger.info(f'init_builder_chatbot_agent: {builder_id} ')
             builder_agent = init_builder_chatbot_agent(builder_id)
@@ -141,10 +139,7 @@ def get_user_bot(
             session,
             user_token=None) -> Tuple[RolePlay, MemoryWithRetrievalKnowledge]:
         unique_id = builder_id + '_' + session
-        print(f'unique_id: {unique_id}')
         user_agent = self.user_bots[unique_id]
-        print(f'self.user_bots: {self.user_bots}')
-        print(f'user_agent: {user_agent}')
         if user_agent is None:
             logger.info(f'init_user_chatbot_agent: {builder_id} {session}')
             user_agent = init_user_chatbot_agent(
@@ -164,9 +159,10 @@ def renew_user_bot(
             builder_id, session, use_tool_api=True, user_token=user_token)
         self.user_bots[unique_id] = user_agent
 
-    def clear_user_bot(self, builder_id, session):
+    def clear_user_bot(self, builder_id, session='default'):
         unique_id = builder_id + '_' + session
         user_agent = self.user_bots[unique_id]
+        logger.info(f'clear_user_chatbot_agent: {builder_id} {session}')
         if user_agent is not None:
             self.user_bots.delete_key(unique_id)
         shutil.rmtree(