Fix function_to_jsonschema()

Author: RussellLuo

coagent/agents/aswarm/util.py

@@ -174,7 +174,7 @@ def greet(
             # The default value is already a Field.
             typ = annotation
             field = default
-        elif default != inspect.Parameter.empty:
+        elif default is not inspect.Parameter.empty:
             # Normal default value
             if typing.get_origin(annotation) == typing.Annotated:
                 # The parameter is annotated with metadata.
@@ -213,7 +213,7 @@ def greet(
 
 def get_type_and_field_from_annotated(
     annotation: typing.Any,
-    default: typing.Any | None = None,
+    default: typing.Any = inspect.Parameter.empty,
 ) -> tuple[typing.Type, Field]:
     # Any additional metadata except the first one is ignored.
     typ, metadata = typing.get_args(annotation)[:2]
@@ -223,7 +223,7 @@ def get_type_and_field_from_annotated(
         case _:
             # Always treat the metadata as a string.
             description = str(metadata)
-    if default is None:
+    if default is inspect.Parameter.empty:
         field = Field(..., description=description)
     else:
         field = Field(default=default, description=description)

tests/agents/test_util.py

@@ -32,7 +32,7 @@ async def test_chat_stream(mock_model_client):
 
 
 def test_function_to_jsonschema_no_description():
-    def func(a: int, b: str = "ok") -> None:
+    def func(a: int, b: str = "ok", c: float = None) -> None:
         """This is a test function."""
         pass
 
@@ -45,6 +45,7 @@ def func(a: int, b: str = "ok") -> None:
                 "properties": {
                     "a": {"title": "A", "type": "integer"},
                     "b": {"default": "ok", "title": "B", "type": "string"},
+                    "c": {"default": None, "title": "C", "type": "number"},
                 },
                 "required": ["a"],
                 "title": "func",
@@ -59,6 +60,7 @@ def test_function_to_jsonschema_annotated_with_string():
     def func(
         a: Annotated[int, "The description for parameter a"],
         b: Annotated[str, "The description for parameter b"] = "ok",
+        c: Annotated[float, "The description for parameter c"] = None,
     ) -> None:
         """This is a test function."""
         pass
@@ -81,6 +83,12 @@ def func(
                         "title": "B",
                         "type": "string",
                     },
+                    "c": {
+                        "default": None,
+                        "description": "The description for parameter c",
+                        "title": "C",
+                        "type": "number",
+                    },
                 },
                 "required": ["a"],
                 "title": "func",
@@ -95,6 +103,9 @@ def test_function_to_jsonschema_annotated_with_pydantic_field():
     def func(
         a: Annotated[int, Field(description="The description for parameter a")],
         b: Annotated[str, Field(description="The description for parameter b")] = "ok",
+        c: Annotated[
+            float, Field(description="The description for parameter c")
+        ] = None,
     ) -> None:
         """This is a test function."""
         pass
@@ -117,6 +128,12 @@ def func(
                         "title": "B",
                         "type": "string",
                     },
+                    "c": {
+                        "default": None,
+                        "description": "The description for parameter c",
+                        "title": "C",
+                        "type": "number",
+                    },
                 },
                 "required": ["a"],
                 "title": "func",