Revert "fix(deps): downgrade to Pydantic v1 to support Pyodide WASM execution"

This reverts commit 8f52582.

Author: SamuelMarks

pyproject.toml

@@ -9,7 +9,7 @@ description = "OpenAPI 3.2.0 Python Client"
 readme = "README.md"
 requires-python = ">=3.9,<3.14"
 dependencies = [
-    "pydantic<2.0",
+    "pydantic>=2.0",
     "libcst",
     "urllib3",
     "python-cdd>=0.0.98",

src/openapi_client/classes/emit.py

@@ -20,7 +20,7 @@ def emit_class(name: str, schema: Schema) -> cst.ClassDef:
     if getattr(schema, "properties", None):
         for prop_name, prop_schema in schema.properties.items():  # type: ignore[union-attr]
             if isinstance(prop_schema, Reference):
-                prop_type = "Any"  # Simplification for Reference  # pragma: no cover
+                prop_type = "Any"  # Simplification for Reference
             else:
                 prop_type = "Any"
                 if getattr(prop_schema, "type", None) == "string":

src/openapi_client/cli.py

@@ -154,7 +154,7 @@ def scaffold_package(out_dir: Path):
 name = "generated-client"
 version = "0.0.1"
 dependencies = [
-    "pydantic<2.0",
+    "pydantic>=2.0",
     "urllib3",
 ]
 """,

src/openapi_client/models.py

@@ -3,16 +3,16 @@
 from __future__ import annotations
 
 from typing import Any, Dict, List, Optional, Union
-from pydantic import BaseModel, Field, Extra
+from pydantic import BaseModel, ConfigDict, Field
 
 
 class OpenAPIBase(BaseModel):
     """OpenAPI OpenAPIBase model."""
 
-    class Config:
-        """Pydantic config."""
-        extra = "allow"
-        allow_population_by_field_name = True
+    model_config = ConfigDict(
+        extra="allow",
+        populate_by_name=True,
+    )
 
 
 class Contact(OpenAPIBase):
@@ -346,5 +346,11 @@ class OpenAPI(OpenAPIBase):
 # Rebuild models due to forward references
 for model in list(locals().values()):
     if isinstance(model, type) and issubclass(model, BaseModel) and model != BaseModel:
-        if hasattr(model, "update_forward_refs"):
-            model.update_forward_refs()
+        if hasattr(model, "model_rebuild"):
+            try:
+                model.model_rebuild()
+            except AttributeError:  # pragma: no cover
+                if hasattr(model, "update_forward_refs"):  # pragma: no cover
+                    model.update_forward_refs()  # pragma: no cover
+        elif hasattr(model, "update_forward_refs"):  # pragma: no cover
+            model.update_forward_refs()  # pragma: no cover

src/openapi_client/openapi/emit.py

@@ -10,7 +10,7 @@
 
 def emit_openapi_dict(spec: OpenAPI) -> Dict[str, Any]:
     """Emit an OpenAPI model as a dictionary."""
-    return spec.dict(by_alias=True, exclude_none=True)
+    return spec.model_dump(by_alias=True, exclude_none=True)
 
 
 def emit_openapi_json(spec: OpenAPI, indent: int = 2) -> str: