fix(tool): 兼容 additionalProperties schema 解析

修复 MCP 与 toolset schema 中 additionalProperties 为对象时的解析失败。\n\n改动前，ToolSchema 只接受布尔类型的 additionalProperties，\n在 list_tools 解析 anyOf/object 场景时会抛出 ValidationError。\n\n改动后，tool 与 toolset 两套 schema 模型都支持\nboolean 或子 schema 形式的 additionalProperties，并在\nto_json_schema 时保持正确回写。\n\n同时补充回归测试，覆盖 OpenAPI schema 解析与\nToolInfo.from_mcp_tool 的真实失败场景。\n\n校验结果：\n- uv run pytest tests/unittests/tool/test_model.py tests/unittests/toolset/test_model.py\n- uv run mypy --config-file mypy.ini .

Change-Id: I791587f292a9c42759a536dbfe5fdc0da669a416

Author: OhYee

agentrun/tool/model.py

@@ -5,7 +5,7 @@
 """
 
 from enum import Enum
-from typing import Any, Dict, List, Optional
+from typing import Any, Dict, List, Optional, Union
 
 from agentrun.utils.model import BaseModel
 
@@ -194,8 +194,8 @@ class ToolSchema(BaseModel):
     required: Optional[List[str]] = None
     """必填字段 / Required fields"""
 
-    additional_properties: Optional[bool] = None
-    """是否允许额外属性 / Whether additional properties are allowed"""
+    additional_properties: Optional[Union[bool, "ToolSchema"]] = None
+    """额外属性约束 / Additional properties constraint"""
 
     items: Optional["ToolSchema"] = None
     """数组元素类型 / Array item type"""
@@ -291,13 +291,20 @@ def from_any_openapi_schema(cls, schema: Any) -> "ToolSchema":
             else None
         )
 
+        additional_properties_raw = pydash_get(schema, "additionalProperties")
+        additional_properties = (
+            cls.from_any_openapi_schema(additional_properties_raw)
+            if isinstance(additional_properties_raw, dict)
+            else additional_properties_raw
+        )
+
         return cls(
             type=pydash_get(schema, "type"),
             description=pydash_get(schema, "description"),
             title=pydash_get(schema, "title"),
             properties=properties,
             required=pydash_get(schema, "required"),
-            additional_properties=pydash_get(schema, "additionalProperties"),
+            additional_properties=additional_properties,
             items=items,
             min_items=pydash_get(schema, "minItems"),
             max_items=pydash_get(schema, "maxItems"),
@@ -334,7 +341,11 @@ def to_json_schema(self) -> Dict[str, Any]:
         if self.required:
             result["required"] = self.required
         if self.additional_properties is not None:
-            result["additionalProperties"] = self.additional_properties
+            result["additionalProperties"] = (
+                self.additional_properties.to_json_schema()
+                if isinstance(self.additional_properties, ToolSchema)
+                else self.additional_properties
+            )
 
         if self.items:
             result["items"] = self.items.to_json_schema()

agentrun/toolset/model.py

@@ -5,7 +5,7 @@
 """
 
 from enum import Enum
-from typing import Any, Dict, List, Optional
+from typing import Any, Dict, List, Optional, Union
 
 from agentrun.utils.model import BaseModel, Field, PageableInput
 
@@ -103,7 +103,7 @@ class ToolSchema(BaseModel):
     # 对象类型字段
     properties: Optional[Dict[str, "ToolSchema"]] = None
     required: Optional[List[str]] = None
-    additional_properties: Optional[bool] = None
+    additional_properties: Optional[Union[bool, "ToolSchema"]] = None
 
     # 数组类型字段
     items: Optional["ToolSchema"] = None
@@ -179,6 +179,13 @@ def from_any_openapi_schema(cls, schema: Any) -> "ToolSchema":
             else None
         )
 
+        additional_properties_raw = pg(schema, "additionalProperties")
+        additional_properties = (
+            cls.from_any_openapi_schema(additional_properties_raw)
+            if isinstance(additional_properties_raw, dict)
+            else additional_properties_raw
+        )
+
         return cls(
             # 基本字段
             type=pg(schema, "type"),
@@ -187,7 +194,7 @@ def from_any_openapi_schema(cls, schema: Any) -> "ToolSchema":
             # 对象类型
             properties=properties,
             required=pg(schema, "required"),
-            additional_properties=pg(schema, "additionalProperties"),
+            additional_properties=additional_properties,
             # 数组类型
             items=items,
             min_items=pg(schema, "minItems"),
@@ -231,7 +238,11 @@ def to_json_schema(self) -> Dict[str, Any]:
         if self.required:
             result["required"] = self.required
         if self.additional_properties is not None:
-            result["additionalProperties"] = self.additional_properties
+            result["additionalProperties"] = (
+                self.additional_properties.to_json_schema()
+                if isinstance(self.additional_properties, ToolSchema)
+                else self.additional_properties
+            )
 
         # 数组类型
         if self.items:

tests/unittests/tool/test_model.py

@@ -335,6 +335,48 @@ def test_from_any_openapi_schema_allof(self):
         assert schema.all_of[0].type == "object"
         assert schema.all_of[1].type == "object"
 
+    def test_from_any_openapi_schema_additional_properties_schema(self):
+        """测试 additionalProperties 为 schema 对象时的解析"""
+        openapi_schema = {
+            "type": "object",
+            "properties": {
+                "filters": {
+                    "type": "object",
+                    "additionalProperties": {
+                        "anyOf": [
+                            {"type": "string"},
+                            {"type": "integer"},
+                        ]
+                    },
+                }
+            },
+        }
+
+        schema = ToolSchema.from_any_openapi_schema(openapi_schema)
+
+        assert schema.properties is not None
+        assert "filters" in schema.properties
+        filters_schema = schema.properties["filters"]
+        assert filters_schema.additional_properties is not None
+        assert filters_schema.additional_properties.any_of is not None
+        assert len(filters_schema.additional_properties.any_of) == 2
+        assert filters_schema.additional_properties.any_of[0].type == "string"
+        assert filters_schema.additional_properties.any_of[1].type == "integer"
+
+        json_schema = schema.to_json_schema()
+        assert (
+            json_schema["properties"]["filters"]["additionalProperties"][
+                "anyOf"
+            ][0]["type"]
+            == "string"
+        )
+        assert (
+            json_schema["properties"]["filters"]["additionalProperties"][
+                "anyOf"
+            ][1]["type"]
+            == "integer"
+        )
+
     def test_to_json_schema_simple(self):
         """测试转换为 JSON Schema - 简单情况"""
         schema = ToolSchema(
@@ -659,3 +701,38 @@ def model_dump(self):
         assert "param1" in info.parameters.properties
         assert "param2" in info.parameters.properties
         assert info.parameters.required == ["param1"]
+
+    def test_from_mcp_tool_with_schema_additional_properties(self):
+        """测试 MCP tool schema 中 additionalProperties 为对象时的解析"""
+        mcp_tool = {
+            "name": "get_news_by_date",
+            "description": "A tool with MCP schema-style date_range",
+            "inputSchema": {
+                "type": "object",
+                "properties": {
+                    "date_range": {
+                        "anyOf": [
+                            {"type": "string"},
+                            {
+                                "type": "object",
+                                "additionalProperties": {"type": "string"},
+                            },
+                            {"type": "null"},
+                        ]
+                    }
+                },
+            },
+        }
+
+        info = ToolInfo.from_mcp_tool(mcp_tool)
+
+        assert info.name == "get_news_by_date"
+        assert info.parameters is not None
+        assert info.parameters.properties is not None
+        date_range_schema = info.parameters.properties["date_range"]
+        assert date_range_schema.any_of is not None
+        assert date_range_schema.any_of[1].type == "object"
+        assert date_range_schema.any_of[1].additional_properties is not None
+        assert (
+            date_range_schema.any_of[1].additional_properties.type == "string"
+        )

tests/unittests/toolset/test_model.py

@@ -448,6 +448,45 @@ def test_from_any_openapi_schema_with_properties(self):
         assert schema.required == ["name"]
         assert schema.additional_properties is False
 
+    def test_from_any_openapi_schema_with_schema_additional_properties(self):
+        """测试 additionalProperties 为 schema 对象时的解析"""
+        openapi_schema = {
+            "type": "object",
+            "properties": {
+                "filters": {
+                    "type": "object",
+                    "additionalProperties": {
+                        "anyOf": [
+                            {"type": "string"},
+                            {"type": "integer"},
+                        ]
+                    },
+                }
+            },
+        }
+
+        schema = ToolSchema.from_any_openapi_schema(openapi_schema)
+
+        assert schema.properties is not None
+        filters_schema = schema.properties["filters"]
+        assert filters_schema.additional_properties is not None
+        assert filters_schema.additional_properties.any_of is not None
+        assert len(filters_schema.additional_properties.any_of) == 2
+
+        json_schema = schema.to_json_schema()
+        assert (
+            json_schema["properties"]["filters"]["additionalProperties"][
+                "anyOf"
+            ][0]["type"]
+            == "string"
+        )
+        assert (
+            json_schema["properties"]["filters"]["additionalProperties"][
+                "anyOf"
+            ][1]["type"]
+            == "integer"
+        )
+
     def test_from_any_openapi_schema_with_items(self):
         """测试从带 items 的数组 schema 创建"""
         openapi_schema = {