mirror of https://github.com/microsoft/autogen.git
Remove unneeded duplicate check for pydantic v1 since we are already checking that in the else block. (#2467)
* Remove unneeded duplicate check for pydantic v1 since we are already in the else block. * fix formatting
This commit is contained in:
parent
5b6ae324e2
commit
ba9ff45adb
|
@ -64,27 +64,27 @@ else: # pragma: no cover
|
||||||
Returns:
|
Returns:
|
||||||
JsonSchemaValue: The JSON schema
|
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 t is None:
|
||||||
if "title" in d:
|
return {"type": "null"}
|
||||||
d.pop("title")
|
elif get_origin(t) is Union:
|
||||||
if "description" in d:
|
return {"anyOf": [type2schema(tt) for tt in get_args(t)]}
|
||||||
d.pop("description")
|
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
|
return d
|
||||||
|
|
||||||
def model_dump(model: BaseModel) -> Dict[str, Any]:
|
def model_dump(model: BaseModel) -> Dict[str, Any]:
|
||||||
"""Convert a pydantic model to a dict
|
"""Convert a pydantic model to a dict
|
||||||
|
|
Loading…
Reference in New Issue