Merge branch 'fix/chore-fix' into dev/plugin-deploy

langgenius · Nov 15, 2024 · 59b7690 · 59b7690
1 parent cc28daf
commit 59b7690
Show file tree

Hide file tree

Showing 12 changed files with 17,307 additions and 15,329 deletions.
diff --git a/api/core/tools/builtin_tool/providers/qrcode/_assets/icon.svg b/api/core/tools/builtin_tool/providers/qrcode/_assets/icon.svg
diff --git a/api/core/tools/builtin_tool/providers/qrcode/qrcode.py b/api/core/tools/builtin_tool/providers/qrcode/qrcode.py
diff --git a/api/core/tools/builtin_tool/providers/qrcode/qrcode.yaml b/api/core/tools/builtin_tool/providers/qrcode/qrcode.yaml
diff --git a/api/core/tools/builtin_tool/providers/qrcode/tools/qrcode_generator.py b/api/core/tools/builtin_tool/providers/qrcode/tools/qrcode_generator.py
diff --git a/api/core/tools/builtin_tool/providers/qrcode/tools/qrcode_generator.yaml b/api/core/tools/builtin_tool/providers/qrcode/tools/qrcode_generator.yaml
diff --git a/api/core/tools/builtin_tool/providers/time/tools/current_time.py b/api/core/tools/builtin_tool/providers/time/tools/current_time.py
@@ -1,5 +1,5 @@
 from datetime import datetime, timezone
-from typing import Any, Union
+from typing import Any, Optional, Union
 
 from pytz import timezone as pytz_timezone
 
@@ -12,6 +12,9 @@ def _invoke(
         self,
         user_id: str,
         tool_parameters: dict[str, Any],
+        conversation_id: Optional[str] = None,
+        app_id: Optional[str] = None,
+        message_id: Optional[str] = None,
     ) -> Union[ToolInvokeMessage, list[ToolInvokeMessage]]:
         """
         invoke tools

diff --git a/api/core/tools/builtin_tool/providers/time/tools/localtime_to_timestamp.py b/api/core/tools/builtin_tool/providers/time/tools/localtime_to_timestamp.py
@@ -1,5 +1,5 @@
 from datetime import datetime
-from typing import Any, Union
+from typing import Any, Optional, Union
 
 import pytz
 
@@ -13,6 +13,9 @@ def _invoke(
         self,
         user_id: str,
         tool_parameters: dict[str, Any],
+        conversation_id: Optional[str] = None,
+        app_id: Optional[str] = None,
+        message_id: Optional[str] = None,
     ) -> Union[ToolInvokeMessage, list[ToolInvokeMessage]]:
         """
         Convert localtime to timestamp

diff --git a/api/core/tools/builtin_tool/providers/time/tools/timestamp_to_localtime.py b/api/core/tools/builtin_tool/providers/time/tools/timestamp_to_localtime.py
@@ -1,5 +1,5 @@
 from datetime import datetime
-from typing import Any, Union
+from typing import Any, Optional, Union
 
 import pytz
 
@@ -13,6 +13,9 @@ def _invoke(
         self,
         user_id: str,
         tool_parameters: dict[str, Any],
+        conversation_id: Optional[str] = None,
+        app_id: Optional[str] = None,
+        message_id: Optional[str] = None,
     ) -> Union[ToolInvokeMessage, list[ToolInvokeMessage]]:
         """
         Convert timestamp to localtime

diff --git a/api/core/tools/builtin_tool/providers/time/tools/timezone_conversion.py b/api/core/tools/builtin_tool/providers/time/tools/timezone_conversion.py
@@ -1,5 +1,5 @@
 from datetime import datetime
-from typing import Any, Union
+from typing import Any, Optional, Union
 
 import pytz
 
@@ -13,6 +13,9 @@ def _invoke(
         self,
         user_id: str,
         tool_parameters: dict[str, Any],
+        conversation_id: Optional[str] = None,
+        app_id: Optional[str] = None,
+        message_id: Optional[str] = None,
     ) -> Union[ToolInvokeMessage, list[ToolInvokeMessage]]:
         """
         Convert time to equivalent time zone

diff --git a/api/core/tools/builtin_tool/providers/time/tools/weekday.py b/api/core/tools/builtin_tool/providers/time/tools/weekday.py
@@ -1,6 +1,6 @@
 import calendar
 from datetime import datetime
-from typing import Any, Union
+from typing import Any, Optional, Union
 
 from core.tools.builtin_tool.tool import BuiltinTool
 from core.tools.entities.tool_entities import ToolInvokeMessage
@@ -11,6 +11,9 @@ def _invoke(
         self,
         user_id: str,
         tool_parameters: dict[str, Any],
+        conversation_id: Optional[str] = None,
+        app_id: Optional[str] = None,
+        message_id: Optional[str] = None,
     ) -> Union[ToolInvokeMessage, list[ToolInvokeMessage]]:
         """
         Calculate the day of the week for a given date

diff --git a/api/core/tools/tool_engine.py b/api/core/tools/tool_engine.py
@@ -90,14 +90,16 @@ def message_callback(
                 conversation_id=message.conversation_id,
             )
 
+            message_list = list(messages)
+
             # extract binary data from tool invoke message
-            binary_files = ToolEngine._extract_tool_response_binary(messages)
+            binary_files = ToolEngine._extract_tool_response_binary_and_text(message_list)
             # create message file
             message_files = ToolEngine._create_message_files(
                 tool_messages=binary_files, agent_message=message, invoke_from=invoke_from, user_id=user_id
             )
 
-            plain_text = ToolEngine._convert_tool_response_to_str(messages)
+            plain_text = ToolEngine._convert_tool_response_to_str(message_list)
 
             meta = invocation_meta_dict["meta"]
 
@@ -219,7 +221,7 @@ def _invoke(
             yield meta
 
     @staticmethod
-    def _convert_tool_response_to_str(tool_response: Generator[ToolInvokeMessage, None, None]) -> str:
+    def _convert_tool_response_to_str(tool_response: list[ToolInvokeMessage]) -> str:
         """
         Handle tool response
         """
@@ -246,8 +248,8 @@ def _convert_tool_response_to_str(tool_response: Generator[ToolInvokeMessage, No
         return result
 
     @staticmethod
-    def _extract_tool_response_binary(
-        tool_response: Generator[ToolInvokeMessage, None, None],
+    def _extract_tool_response_binary_and_text(
+        tool_response: list[ToolInvokeMessage],
     ) -> Generator[ToolInvokeMessageBinary, None, None]:
         """
         Extract tool response binary