Merge remote-tracking branch 'upstream/main' into feat/rag-2

api/core/workflow/nodes/agent/agent_node.py

@@ -1,6 +1,6 @@
 import json
 from collections.abc import Generator, Mapping, Sequence
-from typing import TYPE_CHECKING, Any, Optional, cast
+from typing import TYPE_CHECKING, Any, cast
 
 from packaging.version import Version
 from pydantic import ValidationError
@@ -71,7 +71,7 @@ class AgentNode(Node):
     def init_node_data(self, data: Mapping[str, Any]):
         self._node_data = AgentNodeData.model_validate(data)
 
-    def _get_error_strategy(self) -> Optional[ErrorStrategy]:
+    def _get_error_strategy(self) -> ErrorStrategy | None:
         return self._node_data.error_strategy
 
     def _get_retry_config(self) -> RetryConfig:
@@ -80,7 +80,7 @@ class AgentNode(Node):
     def _get_title(self) -> str:
         return self._node_data.title
 
-    def _get_description(self) -> Optional[str]:
+    def _get_description(self) -> str | None:
         return self._node_data.desc
 
     def _get_default_value_dict(self) -> dict[str, Any]:
@@ -324,7 +324,7 @@ class AgentNode(Node):
                         memory = self._fetch_memory(model_instance)
                         if memory:
                             prompt_messages = memory.get_history_prompt_messages(
-                                message_limit=node_data.memory.window.size if node_data.memory.window.size else None
+                                message_limit=node_data.memory.window.size or None
                             )
                             history_prompt_messages = [
                                 prompt_message.model_dump(mode="json") for prompt_message in prompt_messages
@@ -408,7 +408,7 @@ class AgentNode(Node):
             icon = None
         return icon
 
-    def _fetch_memory(self, model_instance: ModelInstance) -> Optional[TokenBufferMemory]:
+    def _fetch_memory(self, model_instance: ModelInstance) -> TokenBufferMemory | None:
         # get conversation id
         conversation_id_variable = self.graph_runtime_state.variable_pool.get(
             ["sys", SystemVariableKey.CONVERSATION_ID.value]

api/core/workflow/nodes/agent/entities.py

@@ -1,4 +1,4 @@
-from enum import Enum, StrEnum
+from enum import IntEnum, StrEnum, auto
 from typing import Any, Literal, Union
 
 from pydantic import BaseModel
@@ -25,9 +25,9 @@ class AgentNodeData(BaseNodeData):
     agent_parameters: dict[str, AgentInput]
 
 
-class ParamsAutoGenerated(Enum):
-    CLOSE = 0
-    OPEN = 1
+class ParamsAutoGenerated(IntEnum):
+    CLOSE = auto()
+    OPEN = auto()
 
 
 class AgentOldVersionModelFeatures(StrEnum):
@@ -38,8 +38,8 @@ class AgentOldVersionModelFeatures(StrEnum):
     TOOL_CALL = "tool-call"
     MULTI_TOOL_CALL = "multi-tool-call"
     AGENT_THOUGHT = "agent-thought"
-    VISION = "vision"
+    VISION = auto()
     STREAM_TOOL_CALL = "stream-tool-call"
-    DOCUMENT = "document"
-    VIDEO = "video"
-    AUDIO = "audio"
+    DOCUMENT = auto()
+    VIDEO = auto()
+    AUDIO = auto()

api/core/workflow/nodes/agent/exc.py

@@ -1,6 +1,3 @@
-from typing import Optional
-
-
 class AgentNodeError(Exception):
     """Base exception for all agent node errors."""
 
@@ -12,7 +9,7 @@ class AgentNodeError(Exception):
 class AgentStrategyError(AgentNodeError):
     """Exception raised when there's an error with the agent strategy."""
 
-    def __init__(self, message: str, strategy_name: Optional[str] = None, provider_name: Optional[str] = None):
+    def __init__(self, message: str, strategy_name: str | None = None, provider_name: str | None = None):
         self.strategy_name = strategy_name
         self.provider_name = provider_name
         super().__init__(message)
@@ -21,7 +18,7 @@ class AgentStrategyError(AgentNodeError):
 class AgentStrategyNotFoundError(AgentStrategyError):
     """Exception raised when the specified agent strategy is not found."""
 
-    def __init__(self, strategy_name: str, provider_name: Optional[str] = None):
+    def __init__(self, strategy_name: str, provider_name: str | None = None):
         super().__init__(
             f"Agent strategy '{strategy_name}' not found"
             + (f" for provider '{provider_name}'" if provider_name else ""),
@@ -33,7 +30,7 @@ class AgentStrategyNotFoundError(AgentStrategyError):
 class AgentInvocationError(AgentNodeError):
     """Exception raised when there's an error invoking the agent."""
 
-    def __init__(self, message: str, original_error: Optional[Exception] = None):
+    def __init__(self, message: str, original_error: Exception | None = None):
         self.original_error = original_error
         super().__init__(message)
 
@@ -41,7 +38,7 @@ class AgentInvocationError(AgentNodeError):
 class AgentParameterError(AgentNodeError):
     """Exception raised when there's an error with agent parameters."""
 
-    def __init__(self, message: str, parameter_name: Optional[str] = None):
+    def __init__(self, message: str, parameter_name: str | None = None):
         self.parameter_name = parameter_name
         super().__init__(message)
 
@@ -49,7 +46,7 @@ class AgentParameterError(AgentNodeError):
 class AgentVariableError(AgentNodeError):
     """Exception raised when there's an error with variables in the agent node."""
 
-    def __init__(self, message: str, variable_name: Optional[str] = None):
+    def __init__(self, message: str, variable_name: str | None = None):
         self.variable_name = variable_name
         super().__init__(message)
 
@@ -71,7 +68,7 @@ class AgentInputTypeError(AgentNodeError):
 class ToolFileError(AgentNodeError):
     """Exception raised when there's an error with a tool file."""
 
-    def __init__(self, message: str, file_id: Optional[str] = None):
+    def __init__(self, message: str, file_id: str | None = None):
         self.file_id = file_id
         super().__init__(message)
 
@@ -86,7 +83,7 @@ class ToolFileNotFoundError(ToolFileError):
 class AgentMessageTransformError(AgentNodeError):
     """Exception raised when there's an error transforming agent messages."""
 
-    def __init__(self, message: str, original_error: Optional[Exception] = None):
+    def __init__(self, message: str, original_error: Exception | None = None):
         self.original_error = original_error
         super().__init__(message)
 
@@ -94,7 +91,7 @@ class AgentMessageTransformError(AgentNodeError):
 class AgentModelError(AgentNodeError):
     """Exception raised when there's an error with the model used by the agent."""
 
-    def __init__(self, message: str, model_name: Optional[str] = None, provider: Optional[str] = None):
+    def __init__(self, message: str, model_name: str | None = None, provider: str | None = None):
         self.model_name = model_name
         self.provider = provider
         super().__init__(message)
@@ -103,7 +100,7 @@ class AgentModelError(AgentNodeError):
 class AgentMemoryError(AgentNodeError):
     """Exception raised when there's an error with the agent's memory."""
 
-    def __init__(self, message: str, conversation_id: Optional[str] = None):
+    def __init__(self, message: str, conversation_id: str | None = None):
         self.conversation_id = conversation_id
         super().__init__(message)
 
@@ -114,9 +111,9 @@ class AgentVariableTypeError(AgentNodeError):
     def __init__(
         self,
         message: str,
-        variable_name: Optional[str] = None,
-        expected_type: Optional[str] = None,
-        actual_type: Optional[str] = None,
+        variable_name: str | None = None,
+        expected_type: str | None = None,
+        actual_type: str | None = None,
     ):
         self.variable_name = variable_name
         self.expected_type = expected_type