feat: Using updated openapi library

Author: MarcoMuellner

poetry.lock

@@ -17,15 +17,15 @@ keywords = ["OpenAPI", "Generator", "Python", "async"]
 Changelog = "https://github.com/MarcoMuellner/openapi-python-generator/releases"
 
 [tool.poetry.dependencies]
-python = "^3.7"
+python = "^3.8"
 httpx = {extras = ["all"], version = "^0.23.0"}
-pydantic = "^1.9.1"
-orjson = "^3.7.2"
-openapi-schema-pydantic = "^1.2.3"
+pydantic = "^2.10.2"
+orjson = "^3.9.15"
 Jinja2 = "^3.1.2"
 click = "^8.1.3"
 black = ">=21.10b0"
 isort = ">=5.10.1"
+openapi-pydantic = "^0.5.0"
 
 [tool.poetry.dev-dependencies]
 Pygments = ">=2.10.0"
@@ -48,7 +48,7 @@ typeguard = ">=2.13.3"
 xdoctest = {extras = ["colors"], version = ">=0.15.10"}
 myst-parser = {version = ">=0.16.1"}
 pytest-cov = "^3.0.0"
-fastapi = "^0.78.0"
+fastapi = "^0.115.5"
 uvicorn = "^0.18.1"
 respx = "^0.20.1"
 aiohttp = "^3.8.3"

pyproject.toml

@@ -10,7 +10,7 @@
 from black import NothingChanged
 from httpx import ConnectError
 from httpx import ConnectTimeout
-from openapi_schema_pydantic import OpenAPI
+from openapi_pydantic.v3.v3_0 import OpenAPI
 from pydantic import ValidationError
 
 from .common import HTTPLibrary
@@ -56,7 +56,8 @@ def get_open_api(source: Union[str, Path]) -> OpenAPI:
             return OpenAPI(**orjson.loads(httpx.get(source).text))
 
         with open(source, "r") as f:
-            return OpenAPI(**orjson.loads(f.read()))
+            file_content = f.read()
+            return OpenAPI(**orjson.loads(file_content))
     except FileNotFoundError:
         click.echo(
             f"File {source} not found. Please make sure to pass the path to the OpenAPI 3.0 specification."

src/openapi_python_generator/generate_data.py

@@ -1,6 +1,6 @@
 from typing import Optional
 
-from openapi_schema_pydantic import OpenAPI
+from openapi_pydantic.v3.v3_0 import OpenAPI
 
 from openapi_python_generator.language_converters.python.jinja_config import (
     API_CONFIG_TEMPLATE,

src/openapi_python_generator/language_converters/python/api_config_generator.py

@@ -1,6 +1,6 @@
 from typing import Optional
 
-from openapi_schema_pydantic import OpenAPI
+from openapi_pydantic.v3.v3_0 import OpenAPI
 
 from openapi_python_generator.language_converters.python import common
 from openapi_python_generator.language_converters.python.api_config_generator import (

src/openapi_python_generator/language_converters/python/generator.py

@@ -4,9 +4,7 @@
 from typing import Optional
 
 import click
-from openapi_schema_pydantic import Components
-from openapi_schema_pydantic import Reference
-from openapi_schema_pydantic import Schema
+from openapi_pydantic.v3.v3_0 import Schema, Reference, Components
 
 from openapi_python_generator.language_converters.python import common
 from openapi_python_generator.language_converters.python.jinja_config import (
@@ -42,7 +40,7 @@ def type_converter(  # noqa: C901
         pre_type = "Optional["
         post_type = "]"
 
-    original_type = schema.type if schema.type is not None else "object"
+    original_type = schema.type.value if schema.type is not None else "object"
     import_types: Optional[List[str]] = None
 
     if schema.allOf is not None:
@@ -156,7 +154,7 @@ def type_converter(  # noqa: C901
             original_type = "array<" + converted_reference.type.original_type + ">"
             retVal += converted_reference.type.converted_type
         elif isinstance(schema.items, Schema):
-            original_type = "array<" + str(schema.items.type) + ">"
+            original_type = "array<" + (str(schema.items.type.value) if schema.items.type is not None else "unknown")+ ">"
             retVal += type_converter(schema.items, True).converted_type
         else:
             original_type = "array<unknown>"
@@ -196,11 +194,17 @@ def _generate_property_from_schema(
         and parent_schema.required is not None
         and name in parent_schema.required
     )
+
+    import_type = None
+    if required:
+        import_type = [] if name == model_name else [name]
+
     return Property(
         name=name,
         type=type_converter(schema, required, model_name),
         required=required,
         default=None if required else "None",
+        import_type=import_type,
     )
 
 

src/openapi_python_generator/language_converters/python/model_generator.py

@@ -7,14 +7,7 @@
 from typing import Union
 
 import click
-from openapi_schema_pydantic import MediaType
-from openapi_schema_pydantic import Operation
-from openapi_schema_pydantic import Parameter
-from openapi_schema_pydantic import PathItem
-from openapi_schema_pydantic import Reference
-from openapi_schema_pydantic import RequestBody
-from openapi_schema_pydantic import Response
-from openapi_schema_pydantic import Schema
+from openapi_pydantic.v3.v3_0 import Reference, Schema, Operation, Parameter, RequestBody, Response, MediaType, PathItem
 
 from openapi_python_generator.language_converters.python import common
 from openapi_python_generator.language_converters.python.common import normalize_symbol

src/openapi_python_generator/language_converters/python/service_generator.py

@@ -1,9 +1,7 @@
 from typing import List
 from typing import Optional
 
-from openapi_schema_pydantic import Operation
-from openapi_schema_pydantic import PathItem
-from openapi_schema_pydantic import Schema
+from openapi_pydantic.v3.v3_0 import Operation, PathItem, Schema
 from pydantic import BaseModel
 
 

src/openapi_python_generator/models.py

@@ -5,8 +5,9 @@
 from typing import Generator
 
 import pytest
-from openapi_schema_pydantic import OpenAPI
-
+from openapi_pydantic.v3.v3_0 import OpenAPI
+from openapi_pydantic.v3.v3_0 import OpenAPI as OpenAPIv3_0
+from pydantic import ValidationError
 
 test_data_folder = Path(__file__).parent / "test_data"
 test_data_path = test_data_folder / "test_api.json"
@@ -21,7 +22,10 @@ def json_data_fixture() -> Generator[Dict, None, None]:
 
 @pytest.fixture(name="model_data", scope="module")
 def model_data_fixture(json_data) -> OpenAPI:  # type: ignore
-    yield OpenAPI(**json_data)
+    try:
+        yield OpenAPI(**json_data)
+    except ValidationError:
+        yield OpenAPIv3_0(**json_data)
 
 
 @pytest.fixture(name="model_data_with_cleanup", scope="module")

tests/conftest.py

@@ -1,4 +1,4 @@
-from openapi_schema_pydantic import OpenAPI
+from openapi_pydantic.v3.v3_0 import OpenAPI
 
 from openapi_python_generator.language_converters.python.api_config_generator import (
     generate_api_config,