Merge remote-tracking branch 'upstream/main'

Author: Barry Barrette

.github/workflows/checks.yml

@@ -60,7 +60,7 @@ jobs:
         if: matrix.os == 'ubuntu-latest'
 
       - name: Store coverage report
-        uses: actions/[email protected].1
+        uses: actions/[email protected].2
         if: matrix.os == 'ubuntu-latest'
         with:
           name: coverage-${{ matrix.python }}
@@ -117,7 +117,7 @@ jobs:
         with:
           python-version: "3.12"
       - name: Download coverage reports
-        uses: actions/download-artifact@v4.1.9
+        uses: actions/download-artifact@v4.2.1
         with:
           merge-multiple: true
 
@@ -142,7 +142,7 @@ jobs:
           .venv/bin/python -m coverage report --fail-under=100          
 
       - name: Upload HTML report if check failed.
-        uses: actions/[email protected].1
+        uses: actions/[email protected].2
         with:
           name: html-report
           path: htmlcov

CHANGELOG.md

@@ -13,6 +13,18 @@ Programmatic usage of this project (e.g., importing it as a Python module) and t
 
 The 0.x prefix used in versions for this project is to indicate that breaking changes are expected frequently (several times a year). Breaking changes will increment the minor number, all other changes will increment the patch number. You can track the progress toward 1.0 [here](https://github.com/openapi-generators/openapi-python-client/projects/2).
 
+## 0.24.2 (2025-03-22)
+
+### Fixes
+
+#### Make lists of models and enums work correctly in custom templates
+
+Lists of model and enum classes should be available to custom templates via the Jinja
+variables `openapi.models` and `openapi.enums`, but these were being passed in a way that made
+them always appear empty. This has been fixed so a custom template can now iterate over them.
+
+Closes #1188.
+
 ## 0.24.1 (2025-03-15)
 
 ### Features

end_to_end_tests/custom-templates-golden-record/my_test_api_client/models/__init__.py

@@ -0,0 +1,16 @@
+# Testing that we can access model-related information via Jinja variables.
+
+# To avoid having to update this file in the golden record every time the test specs are changed,
+# we won't include all the classes in this output - we'll just look for one of them.
+
+# Using "alls"
+#   AModel
+
+# Using "imports"
+#   from .a_model import AModel
+
+# Using "openapi.models"
+#   AModel (a_model)
+
+# Using "openapi.enums"
+#   AnEnum (an_enum)

end_to_end_tests/test_custom_templates/models_init.py.jinja

@@ -0,0 +1,33 @@
+
+# Testing that we can access model-related information via Jinja variables.
+
+# To avoid having to update this file in the golden record every time the test specs are changed,
+# we won't include all the classes in this output - we'll just look for one of them.
+
+# Using "alls"
+{% for name in alls %}
+{% if name == "AModel" %}
+#   {{ name }}
+{% endif %}
+{% endfor %}
+
+# Using "imports"
+{% for import in imports %}
+{% if import.endswith("import AModel") %}
+#   {{ import }}
+{% endif %}
+{% endfor %}
+
+# Using "openapi.models"
+{% for model in openapi.models %}
+{% if model.class_info.name == "AModel" %}
+#   {{ model.class_info.name }} ({{ model.class_info.module_name }})
+{% endif %}
+{% endfor %}
+
+# Using "openapi.enums"
+{% for enum in openapi.enums %}
+{% if enum.class_info.name == "AnEnum" %}
+#   {{ enum.class_info.name }} ({{ enum.class_info.module_name }})
+{% endif %}
+{% endfor %}

end_to_end_tests/test_end_to_end.py

@@ -185,13 +185,15 @@ def test_custom_templates():
         {}
     )  # key: path relative to generated directory, value: expected generated content
     api_dir = Path("my_test_api_client").joinpath("api")
+    models_dir = Path("my_test_api_client").joinpath("models")
     golden_tpls_root_dir = Path(__file__).parent.joinpath(
         "custom-templates-golden-record"
     )
 
     expected_difference_paths = [
         Path("README.md"),
         api_dir.joinpath("__init__.py"),
+        models_dir.joinpath("__init__.py"),
     ]
 
     for expected_difference_path in expected_difference_paths:

integration-tests/pdm.lock

@@ -508,10 +508,10 @@ class GeneratorData:
     title: str
     description: Optional[str]
     version: str
-    models: Iterator[ModelProperty]
+    models: list[ModelProperty]
     errors: list[ParseError]
     endpoint_collections_by_tag: dict[utils.PythonIdentifier, EndpointCollection]
-    enums: Iterator[Union[EnumProperty, LiteralEnumProperty]]
+    enums: list[Union[EnumProperty, LiteralEnumProperty]]
 
     @staticmethod
     def from_dict(data: dict[str, Any], *, config: Config) -> Union["GeneratorData", GeneratorError]:
@@ -546,10 +546,10 @@ def from_dict(data: dict[str, Any], *, config: Config) -> Union["GeneratorData",
             config=config,
         )
 
-        enums = (
+        enums = [
             prop for prop in schemas.classes_by_name.values() if isinstance(prop, (EnumProperty, LiteralEnumProperty))
-        )
-        models = (prop for prop in schemas.classes_by_name.values() if isinstance(prop, ModelProperty))
+        ]
+        models = [prop for prop in schemas.classes_by_name.values() if isinstance(prop, ModelProperty)]
 
         return GeneratorData(
             title=openapi.info.title,