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

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 []