Merge remote-tracking branch 'origin/main' into feat/trigger

api/core/tools/__base/tool.py

@@ -1,7 +1,7 @@
 from abc import ABC, abstractmethod
 from collections.abc import Generator
 from copy import deepcopy
-from typing import TYPE_CHECKING, Any, Optional
+from typing import TYPE_CHECKING, Any
 
 if TYPE_CHECKING:
     from models.model import File
@@ -20,7 +20,7 @@ class Tool(ABC):
     The base class of a tool
     """
 
-    def __init__(self, entity: ToolEntity, runtime: ToolRuntime) -> None:
+    def __init__(self, entity: ToolEntity, runtime: ToolRuntime):
         self.entity = entity
         self.runtime = runtime
 
@@ -46,9 +46,9 @@ class Tool(ABC):
         self,
         user_id: str,
         tool_parameters: dict[str, Any],
-        conversation_id: Optional[str] = None,
-        app_id: Optional[str] = None,
-        message_id: Optional[str] = None,
+        conversation_id: str | None = None,
+        app_id: str | None = None,
+        message_id: str | None = None,
     ) -> Generator[ToolInvokeMessage]:
         if self.runtime and self.runtime.runtime_parameters:
             tool_parameters.update(self.runtime.runtime_parameters)
@@ -96,17 +96,17 @@ class Tool(ABC):
         self,
         user_id: str,
         tool_parameters: dict[str, Any],
-        conversation_id: Optional[str] = None,
-        app_id: Optional[str] = None,
-        message_id: Optional[str] = None,
+        conversation_id: str | None = None,
+        app_id: str | None = None,
+        message_id: str | None = None,
     ) -> ToolInvokeMessage | list[ToolInvokeMessage] | Generator[ToolInvokeMessage, None, None]:
         pass
 
     def get_runtime_parameters(
         self,
-        conversation_id: Optional[str] = None,
-        app_id: Optional[str] = None,
-        message_id: Optional[str] = None,
+        conversation_id: str | None = None,
+        app_id: str | None = None,
+        message_id: str | None = None,
     ) -> list[ToolParameter]:
         """
         get the runtime parameters
@@ -119,9 +119,9 @@ class Tool(ABC):
 
     def get_merged_runtime_parameters(
         self,
-        conversation_id: Optional[str] = None,
-        app_id: Optional[str] = None,
-        message_id: Optional[str] = None,
+        conversation_id: str | None = None,
+        app_id: str | None = None,
+        message_id: str | None = None,
     ) -> list[ToolParameter]:
         """
         get merged runtime parameters
@@ -196,7 +196,7 @@ class Tool(ABC):
             message=ToolInvokeMessage.TextMessage(text=text),
         )
 
-    def create_blob_message(self, blob: bytes, meta: Optional[dict] = None) -> ToolInvokeMessage:
+    def create_blob_message(self, blob: bytes, meta: dict | None = None) -> ToolInvokeMessage:
         """
         create a blob message
 

api/core/tools/__base/tool_provider.py

@@ -12,7 +12,7 @@ from core.tools.errors import ToolProviderCredentialValidationError
 
 
 class ToolProviderController(ABC):
-    def __init__(self, entity: ToolProviderEntity) -> None:
+    def __init__(self, entity: ToolProviderEntity):
         self.entity = entity
 
     def get_credentials_schema(self) -> list[ProviderConfig]:
@@ -41,7 +41,7 @@ class ToolProviderController(ABC):
         """
         return ToolProviderType.BUILT_IN
 
-    def validate_credentials_format(self, credentials: dict[str, Any]) -> None:
+    def validate_credentials_format(self, credentials: dict[str, Any]):
         """
         validate the format of the credentials of the provider and set the default value if needed
 

api/core/tools/__base/tool_runtime.py

@@ -1,4 +1,4 @@
-from typing import Any, Optional
+from typing import Any
 
 from openai import BaseModel
 from pydantic import Field
@@ -14,9 +14,9 @@ class ToolRuntime(BaseModel):
     """
 
     tenant_id: str
-    tool_id: Optional[str] = None
-    invoke_from: Optional[InvokeFrom] = None
-    tool_invoke_from: Optional[ToolInvokeFrom] = None
+    tool_id: str | None = None
+    invoke_from: InvokeFrom | None = None
+    tool_invoke_from: ToolInvokeFrom | None = None
     credentials: dict[str, Any] = Field(default_factory=dict)
     credential_type: CredentialType = Field(default=CredentialType.API_KEY)
     runtime_parameters: dict[str, Any] = Field(default_factory=dict)