Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix multiple issues with converting type hints to JSON Schema #2379

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+17 −24
Open

Fix multiple issues with converting type hints to JSON Schema #2379

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
814ba8f
Fix multiple issues with converting type hints to JSON Schema
kepler Mar 12, 2025
e93d024
Fix formatting
kepler Mar 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 17 additions & 24 deletions libs/agno/agno/utils/json_schema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@
from agno.utils.log import logger


def is_origin_union_type(origin: Any) -> bool:
import sys

if sys.version_info.minor >= 10:
from types import UnionType

return origin in [Union, UnionType]

return origin is Union


def get_json_type_for_py_type(arg: str) -> str:
"""
Get the JSON schema type for a given type.
Expand Down Expand Up @@ -43,16 +54,14 @@ def get_json_schema_for_arg(t: Any) -> Optional[Dict[str, Any]]:
key_schema = get_json_schema_for_arg(type_args[0]) if type_args else {"type": "string"}
value_schema = get_json_schema_for_arg(type_args[1]) if len(type_args) > 1 else {"type": "string"}
return {"type": "object", "propertyNames": key_schema, "additionalProperties": value_schema}
elif type_origin is Union:
elif is_origin_union_type(type_origin):
types = []
for arg in type_args:
if arg is not type(None):
try:
schema = get_json_schema_for_arg(arg)
if schema:
types.append(schema)
except Exception:
continue
try:
schema = get_json_schema_for_arg(arg)
types.append(schema)
except Exception:
continue
return {"anyOf": types} if types else None

return {"type": get_json_type_for_py_type(t.__name__)}
Expand All @@ -74,29 +83,13 @@ def get_json_schema(
continue

try:
# Check if type is Optional (Union with NoneType)
type_origin = get_origin(v)
type_args = get_args(v)
is_optional = type_origin is Union and len(type_args) == 2 and any(arg is type(None) for arg in type_args)

# Get the actual type if it's Optional
if is_optional:
v = next(arg for arg in type_args if arg is not type(None))

# Handle cases with no type hint
if v:
arg_json_schema = get_json_schema_for_arg(v)
else:
arg_json_schema = {}

if arg_json_schema is not None:
if is_optional:
# Handle null type for optional fields
if isinstance(arg_json_schema["type"], list):
arg_json_schema["type"].append("null")
else:
arg_json_schema["type"] = [arg_json_schema["type"], "null"]

# Add description
if param_descriptions and k in param_descriptions and param_descriptions[k]:
arg_json_schema["description"] = param_descriptions[k]
Expand Down
Loading