Skip to content

Commit

Permalink
Remove unneeded duplicate check for pydantic v1 since we are already …
Browse files Browse the repository at this point in the history
…checking that in the else block. (#2467)

* Remove unneeded duplicate check for pydantic v1 since we are already in
the else block.

* fix formatting
  • Loading branch information
beyonddream authored Apr 30, 2024
1 parent 5b6ae32 commit ba9ff45
Showing 1 changed file with 21 additions and 21 deletions.
42 changes: 21 additions & 21 deletions autogen/_pydantic.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,27 +64,27 @@ def type2schema(t: Any) -> JsonSchemaValue:
Returns:
JsonSchemaValue: The JSON schema
"""
if PYDANTIC_V1:
if t is None:
return {"type": "null"}
elif get_origin(t) is Union:
return {"anyOf": [type2schema(tt) for tt in get_args(t)]}
elif get_origin(t) in [Tuple, tuple]:
prefixItems = [type2schema(tt) for tt in get_args(t)]
return {
"maxItems": len(prefixItems),
"minItems": len(prefixItems),
"prefixItems": prefixItems,
"type": "array",
}

d = schema_of(t)
if "title" in d:
d.pop("title")
if "description" in d:
d.pop("description")

return d

if t is None:
return {"type": "null"}
elif get_origin(t) is Union:
return {"anyOf": [type2schema(tt) for tt in get_args(t)]}
elif get_origin(t) in [Tuple, tuple]:
prefixItems = [type2schema(tt) for tt in get_args(t)]
return {
"maxItems": len(prefixItems),
"minItems": len(prefixItems),
"prefixItems": prefixItems,
"type": "array",
}
else:
d = schema_of(t)
if "title" in d:
d.pop("title")
if "description" in d:
d.pop("description")

return d

def model_dump(model: BaseModel) -> Dict[str, Any]:
"""Convert a pydantic model to a dict
Expand Down

0 comments on commit ba9ff45

Please sign in to comment.