fix(core): Reorder field_validator and classmethod to fit Pydantic V2. (#5257)

.github/workflows/style.yml

@@ -39,7 +39,7 @@ jobs:
 
       - name: Ruff check
         if: steps.changed-files.outputs.any_changed == 'true'
-        run: poetry run -C api ruff check --preview ./api
+        run: poetry run -C api ruff check ./api
 
       - name: Dotenv check
         if: steps.changed-files.outputs.any_changed == 'true'

api/core/app/entities/queue_entities.py

@@ -77,8 +77,8 @@ class QueueIterationNextEvent(AppQueueEvent):
     node_run_index: int
     output: Optional[Any] = None # output for the current iteration
 
-    @classmethod
     @field_validator('output', mode='before')
+    @classmethod
     def set_output(cls, v):
         """
         Set output

api/core/model_runtime/entities/message_entities.py

@@ -124,6 +124,7 @@ class AssistantPromptMessage(PromptMessage):
         function: ToolCallFunction
 
         @field_validator('id', mode='before')
+        @classmethod
         def transform_id_to_str(cls, value) -> str:
             if not isinstance(value, str):
                 return str(value)

api/core/tools/provider/builtin/twilio/tools/send_message.py

@@ -32,8 +32,8 @@ class TwilioAPIWrapper(BaseModel):
         must be empty.
     """
 
-    @classmethod
     @field_validator('client', mode='before')
+    @classmethod
     def set_validator(cls, values: dict) -> dict:
         """Validate that api key and python package exists in environment."""
         try:

api/core/tools/tool/builtin_tool.py

@@ -66,7 +66,7 @@ class BuiltinTool(Tool):
             tenant_id=self.runtime.tenant_id,
             prompt_messages=prompt_messages
         )
-    
+
     def summary(self, user_id: str, content: str) -> str:
         max_tokens = self.get_max_tokens()
 

api/core/tools/tool/tool.py

@@ -32,8 +32,8 @@ class Tool(BaseModel, ABC):
     # pydantic configs
     model_config = ConfigDict(protected_namespaces=())
 
-    @classmethod
     @field_validator('parameters', mode='before')
+    @classmethod
     def set_parameters(cls, v, validation_info: ValidationInfo) -> list[ToolParameter]:
         return v or []
 

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

@@ -1,7 +1,7 @@
 import os
 from typing import Literal, Optional, Union
 
-from pydantic import BaseModel, field_validator
+from pydantic import BaseModel, ValidationInfo, field_validator
 
 from core.workflow.entities.base_node_data_entities import BaseNodeData
 
@@ -24,13 +24,13 @@ class HttpRequestNodeData(BaseNodeData):
         type: Literal['no-auth', 'api-key']
         config: Optional[Config]
 
-        @classmethod
         @field_validator('config', mode='before')
-        def check_config(cls, v, values):
+        @classmethod
+        def check_config(cls, v: Config, values: ValidationInfo):
             """
             Check config, if type is no-auth, config should be None, otherwise it should be a dict.
             """
-            if values['type'] == 'no-auth':
+            if values.data['type'] == 'no-auth':
                 return None
             else:
                 if not v or not isinstance(v, dict):

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

@@ -25,8 +25,8 @@ class ParameterConfig(BaseModel):
     description: str
     required: bool
 
-    @classmethod
     @field_validator('name', mode='before')
+    @classmethod
     def validate_name(cls, value) -> str:
         if not value:
             raise ValueError('Parameter name is required')
@@ -45,8 +45,8 @@ class ParameterExtractorNodeData(BaseNodeData):
     memory: Optional[MemoryConfig] = None
     reasoning_mode: Literal['function_call', 'prompt']
 
-    @classmethod
     @field_validator('reasoning_mode', mode='before')
+    @classmethod
     def set_reasoning_mode(cls, v) -> str:
         return v or 'function_call'
 

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

@@ -14,9 +14,9 @@ class ToolEntity(BaseModel):
     tool_label: str # redundancy
     tool_configurations: dict[str, Any]
 
-    @classmethod
     @field_validator('tool_configurations', mode='before')
-    def validate_tool_configurations(cls, value, values: ValidationInfo) -> dict[str, Any]:
+    @classmethod
+    def validate_tool_configurations(cls, value, values: ValidationInfo):
         if not isinstance(value, dict):
             raise ValueError('tool_configurations must be a dictionary')
         
@@ -32,8 +32,8 @@ class ToolNodeData(BaseNodeData, ToolEntity):
         value: Union[Any, list[str]]
         type: Literal['mixed', 'variable', 'constant']
 
-        @classmethod
         @field_validator('type', mode='before')
+        @classmethod
         def check_type(cls, value, validation_info: ValidationInfo):
             typ = value
             value = validation_info.data.get('value')

api/pyproject.toml

@@ -7,6 +7,7 @@ exclude = [
 line-length = 120
 
 [tool.ruff.lint]
+preview = true
 select = [
     "B", # flake8-bugbear rules
     "F", # pyflakes rules

dev/reformat

@@ -9,7 +9,7 @@ if ! command -v ruff &> /dev/null; then
 fi
 
 # run ruff linter
-ruff check --fix --preview ./api
+ruff check --fix ./api
 
 # env files linting relies on `dotenv-linter` in path
 if ! command -v dotenv-linter &> /dev/null; then