:feat: Added check for references and lists, to properly type self references

Author: MarcoMuellner

poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "openapi-python-generator"
-version = "0.4.0"
+version = "0.4.1"
 description = "Openapi Python Generator"
 authors = ["Marco Müllner <[email protected]>"]
 license = "MIT"

pyproject.toml

@@ -21,7 +21,7 @@
 from openapi_python_generator.models import TypeConversion
 
 
-def type_converter(schema: Schema, model_name: str | None = None, required: bool = False) -> TypeConversion:
+def type_converter(schema: Schema,  required: bool = False, model_name: str | None = None,) -> TypeConversion:
     """
     Converts an OpenAPI type to a Python type.
     :param schema: Schema containing the type to be converted
@@ -131,10 +131,10 @@ def type_converter(schema: Schema, model_name: str | None = None, required: bool
     elif schema.type == "array":
         retVal = pre_type + "List["
         if isinstance(schema.items, Reference):
-            import_type = schema.items.ref.split("/")[-1]
-            import_types = [f"from .{import_type} import {import_type}"]
-            original_type = "array<" + schema.items.ref.split("/")[-1] + ">"
-            retVal += schema.items.ref.split("/")[-1]
+            converted_reference = _generate_property_from_reference(model_name, "", schema.items, schema)
+            import_types = converted_reference.type.import_types
+            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) + ">"
             retVal += type_converter(schema.items, True).converted_type
@@ -176,14 +176,14 @@ def _generate_property_from_schema(
     )
     return Property(
         name=name,
-        type=type_converter(schema, model_name, required),
+        type=type_converter(schema, required, model_name),
         required=required,
         default=None if required else "None",
     )
 
 
 def _generate_property_from_reference(
-    name: str, reference: Reference, parent_schema: Optional[Schema] = None
+        model_name: str, name: str, reference: Reference, parent_schema: Optional[Schema] = None,
 ) -> Property:
     """
     Generates a property from a reference. It takes the name of the reference as the type, and then
@@ -200,11 +200,18 @@ def _generate_property_from_reference(
     )
     import_model = reference.ref.split("/")[-1]
 
-    type_conv = TypeConversion(
-        original_type=reference.ref,
-        converted_type=import_model if required else "Optional[" + import_model + "]",
-        import_types=[f"from .{import_model} import {import_model}"],
-    )
+    if import_model == model_name:
+        type_conv = TypeConversion(
+            original_type=reference.ref,
+            converted_type=import_model if required else 'Optional["' + import_model + '"]',
+            import_types=None
+        )
+    else:
+        type_conv = TypeConversion(
+            original_type=reference.ref,
+            converted_type=import_model if required else "Optional[" + import_model + "]",
+            import_types=[f"from .{import_model} import {import_model}"],
+        )
     return Property(
         name=name,
         type=type_conv,
@@ -261,7 +268,7 @@ def generate_models(components: Components) -> List[Model]:
         for prop_name, property in property_iterator:
             if isinstance(property, Reference):
                 conv_property = _generate_property_from_reference(
-                    prop_name, property, schema_or_reference
+                    name, prop_name, property, schema_or_reference
                 )
             else:
                 conv_property = _generate_property_from_schema(

src/openapi_python_generator/language_converters/python/model_generator.py

@@ -18,5 +18,5 @@ class {{ schema_name }}(BaseModel):
     """
     {% for property in properties %}
 
-    {{ property.name | replace("@","")}} : {{ property.type.converted_type }} = Field(alias="{{ property.name }}" {% if not property.required %}, default = {{ property.default }} {% endif %})
+    {{ property.name | replace("@","")}} : {{ property.type.converted_type | safe }} = Field(alias="{{ property.name }}" {% if not property.required %}, default = {{ property.default }} {% endif %})
     {% endfor %}

src/openapi_python_generator/language_converters/python/templates/models.jinja2

@@ -0,0 +1,39 @@
+import pytest
+from click.testing import CliRunner
+
+from openapi_python_generator.__main__ import main
+from openapi_python_generator.common import HTTPLibrary
+from tests.conftest import test_data_folder
+from tests.conftest import test_result_path
+
+
+@pytest.fixture
+def runner() -> CliRunner:
+    """Fixture for invoking command-line interfaces."""
+    return CliRunner()
+
+@pytest.mark.parametrize(
+    "library",
+    [HTTPLibrary.httpx, HTTPLibrary.requests, HTTPLibrary.aiohttp],
+)
+def test_issue_11(runner: CliRunner, model_data_with_cleanup, library) -> None:
+    """
+    https://github.com/MarcoMuellner/openapi-python-generator/issues/7
+    """
+    result = runner.invoke(
+        main,
+        [
+            str(test_data_folder / "openapi_gitea_converted.json"),
+            str(test_result_path),
+            "--library",
+            library.value,
+        ],
+    )
+    assert result.exit_code == 0
+
+    exec(
+        f"import {test_result_path.name}",
+        globals(),
+        locals(),
+    )
+