endoint __init__ template / factorize propagated vars

Author: p1-ra

Diff for: end_to_end_tests/test_custom_templates/api_init.py.jinja

@@ -1,12 +1,12 @@
 """ Contains methods for accessing the API """
 
 from typing import Type
-{% for tag, collection in endpoint_collections_by_tag %}
+{% for tag in endpoint_collections_by_tag.keys() %}
 from {{ package_name }}.api.{{ tag }} import {{ utils.pascal_case(tag) }}Endpoints
 {% endfor %}
 
 class {{ utils.pascal_case(package_name) }}Api:
-{% for tag, collection in endpoint_collections_by_tag %}
+{% for tag in endpoint_collections_by_tag.keys() %}
     @classmethod
     def {{ tag }}(cls) -> Type[{{ utils.pascal_case(tag) }}Endpoints]:
         return {{ utils.pascal_case(tag) }}Endpoints

Diff for: end_to_end_tests/test_custom_templates/endpoint_init.py.jinja

@@ -1,13 +1,13 @@
 """ Contains methods for accessing the API Endpoints """
 
 import types
-{% for endpoint in endpoints %}
-from {{ package_name }}.api.{{ tag }} import {{ utils.snake_case(endpoint.name) }}
+{% for endpoint in endpoint_collection.endpoints %}
+from {{ package_name }}.api.{{ endpoint_collection.tag }} import {{ utils.snake_case(endpoint.name) }}
 {% endfor %}
 
-class {{ utils.pascal_case(tag) }}Endpoints:
+class {{ utils.pascal_case(endpoint_collection.tag) }}Endpoints:
 
-{% for endpoint in endpoints %}
+{% for endpoint in endpoint_collection.endpoints %}
 
     @classmethod
     def {{ utils.snake_case(endpoint.name) }}(cls) -> types.ModuleType:

Diff for: openapi_python_client/__init__.py

@@ -240,7 +240,7 @@ def _build_api(self) -> None:
         client_path.write_text(client_template.render(), encoding=self.file_encoding)
 
         # Generate endpoints
-        endpoint_collections_by_tag = self.openapi.endpoint_collections_by_tag.items()
+        endpoint_collections_by_tag = self.openapi.endpoint_collections_by_tag
         api_dir = self.package_dir / "api"
         api_dir.mkdir()
         api_init_path = api_dir / "__init__.py"
@@ -254,14 +254,14 @@ def _build_api(self) -> None:
         )
 
         endpoint_template = self.env.get_template("endpoint_module.py.jinja")
-        for tag, collection in endpoint_collections_by_tag:
+        for tag, collection in endpoint_collections_by_tag.items():
             tag_dir = api_dir / tag
             tag_dir.mkdir()
 
             endpoint_init_path = tag_dir / "__init__.py"
             endpoint_init_template = self.env.get_template("endpoint_init.py.jinja")
             endpoint_init_path.write_text(
-                endpoint_init_template.render(package_name=self.package_name, tag=tag, endpoints=collection.endpoints),
+                endpoint_init_template.render(package_name=self.package_name, endpoint_collection=collection),
                 encoding=self.file_encoding,
             )
             (tag_dir / "__init__.py").touch()