Merge branch 'main' into main

microsoft · Apr 30, 2024 · 68592e1 · 68592e1
2 parents 98541ae + ba9ff45
commit 68592e1
Showing 1 changed file with 21 additions and 21 deletions.
diff --git a/autogen/_pydantic.py b/autogen/_pydantic.py
@@ -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