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

api/core/tools/builtin_tool/providers/time/tools/current_time.py

@@ -1,4 +1,4 @@
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 from typing import Any, Optional, Union
 
 from pytz import timezone as pytz_timezone
@@ -23,7 +23,7 @@ class CurrentTimeTool(BuiltinTool):
         tz = tool_parameters.get("timezone", "UTC")
         fm = tool_parameters.get("format") or "%Y-%m-%d %H:%M:%S %Z"
         if tz == "UTC":
-            return self.create_text_message(f"{datetime.now(timezone.utc).strftime(fm)}")
+            return self.create_text_message(f"{datetime.now(UTC).strftime(fm)}")
 
         try:
             tz = pytz_timezone(tz)

api/core/tools/entities/tool_entities.py

@@ -1,4 +1,5 @@
 import base64
+import enum
 from enum import Enum
 from typing import Any, Optional, Union
 
@@ -33,7 +34,7 @@ class ToolLabelEnum(Enum):
     OTHER = "other"
 
 
-class ToolProviderType(str, Enum):
+class ToolProviderType(enum.StrEnum):
     """
     Enum class for tool provider
     """
@@ -205,7 +206,7 @@ class ToolParameterOption(BaseModel):
 
 
 class ToolParameter(BaseModel):
-    class ToolParameterType(str, Enum):
+    class ToolParameterType(enum.StrEnum):
         STRING = CommonParameterType.STRING.value
         NUMBER = CommonParameterType.NUMBER.value
         BOOLEAN = CommonParameterType.BOOLEAN.value

api/core/tools/tool_engine.py

@@ -1,7 +1,7 @@
 import json
 from collections.abc import Generator, Iterable
 from copy import deepcopy
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 from mimetypes import guess_type
 from typing import Any, Optional, Union, cast
 
@@ -64,7 +64,12 @@ class ToolEngine:
             if parameters and len(parameters) == 1:
                 tool_parameters = {parameters[0].name: tool_parameters}
             else:
-                raise ValueError(f"tool_parameters should be a dict, but got a string: {tool_parameters}")
+                try:
+                    tool_parameters = json.loads(tool_parameters)
+                except Exception as e:
+                    pass
+                if not isinstance(tool_parameters, dict):
+                    raise ValueError(f"tool_parameters should be a dict, but got a string: {tool_parameters}")
 
         # invoke the tool
         try:
@@ -195,10 +200,7 @@ class ToolEngine:
         """
         Invoke the tool with the given arguments.
         """
-        if not tool.runtime:
-            raise ValueError("missing runtime in tool")
-
-        started_at = datetime.now(timezone.utc)
+        started_at = datetime.now(UTC)
         meta = ToolInvokeMeta(
             time_cost=0.0,
             error=None,
@@ -216,7 +218,7 @@ class ToolEngine:
             meta.error = str(e)
             raise ToolEngineInvokeError(meta)
         finally:
-            ended_at = datetime.now(timezone.utc)
+            ended_at = datetime.now(UTC)
             meta.time_cost = (ended_at - started_at).total_seconds()
             yield meta