➕ Migrate to openapi-pydantic.

Author: rafalkrupinski

poetry.lock

@@ -40,6 +40,7 @@ pydantic = "^2.5.2"
 python-mimeparse = ">=1.6,<3.0"
 ruamel-yaml = "^0.18.6"
 rybak = { version = "^0.4", extras = ['jinja'] }
+openapi-pydantic = "^0.4.1"
 
 [tool.poetry.scripts]
 lapidary = "lapidary.render:app"
@@ -70,6 +71,9 @@ extend-ignore = [
 [tool.ruff.format]
 quote-style = "single"
 
+[tool.ruff.lint.isort]
+combine-as-imports = true
+
 [tool.mypy]
 mypy_path = "src"
 namespace_packages = true

pyproject.toml

@@ -157,7 +157,7 @@ async def dump_model(project_root: anyio.Path, process: bool, output: TextIO):
 
 
 def prepare_python_model(oa_doc: Mapping, config: Config) -> python.ClientModel:
-    oa_model = openapi.OpenApiModel.model_validate(oa_doc)
+    oa_model = openapi.OpenAPI.model_validate(oa_doc)
     with click.progressbar(
         length=len(oa_model.paths.paths),
         label='Processing paths',

src/lapidary/render/main.py

@@ -1,5 +1,9 @@
-# ignore: F401
+from openapi_pydantic.v3.v3_0_3 import (
+    Components as Components,
+    DataType as DataType,
+    OAuthFlow as OAuthFlow,
+    SecurityRequirement as SecurityRequirement,
+    Server as Server,
+)
 
 from .model import *
-
-type SchemaOrRef = Schema | Reference