pyopenapi-gen 0.14.1__tar.gz → 0.14.2__tar.gz

{pyopenapi_gen-0.14.1 → pyopenapi_gen-0.14.2}/CHANGELOG.md

@@ -1,6 +1,29 @@
 # CHANGELOG
 
 
+## v0.14.2 (2025-10-10)
+
+### Bug Fixes
+
+- **endpoints**: Prevent _2_2 suffix accumulation in multi-tag operations
+  ([`89e500f`](https://github.com/mindhiveoy/pyopenapi_gen/commit/89e500f9c9963492454bc3177fabf872052baac5))
+
+Operations with multiple tags previously accumulated duplicate suffixes (_2_2, _2_2_2) because the
+  same IROperation object was modified multiple times during per-tag deduplication.
+
+**Root Cause:** When an operation has multiple tags (e.g., ["Users", "Admin", "Internal"]), the SAME
+  IROperation object reference was added to multiple tag group lists. The per-tag deduplication
+  modified the same object repeatedly, causing suffix accumulation.
+
+**Solution:** - Implement global deduplication BEFORE tag grouping - New method:
+  _deduplicate_operation_ids_globally() - Called once before tag splitting - Ensures each operation
+  is renamed at most once - Removed per-tag deduplication call
+
+**Testing:** - Existing test for single-tag duplicates still passes - New test verifies multi-tag
+  operations get consistent naming - Reproduction test confirms fix resolves _2_2 accumulation - All
+  1299 tests pass with 88.16% coverage
+
+
 ## v0.14.1 (2025-10-10)
 
 ### Bug Fixes

{pyopenapi_gen-0.14.1 → pyopenapi_gen-0.14.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyopenapi-gen
-Version: 0.14.1
+Version: 0.14.2
 Summary: Modern, async-first Python client generator for OpenAPI specifications with advanced cycle detection and unified type resolution
 Project-URL: Homepage, https://github.com/your-org/pyopenapi-gen
 Project-URL: Documentation, https://github.com/your-org/pyopenapi-gen/blob/main/README.md

{pyopenapi_gen-0.14.1 → pyopenapi_gen-0.14.2}/coverage.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<coverage version="7.10.6" timestamp="1760114446022" lines-valid="6285" lines-covered="5541" line-rate="0.8816" branches-covered="0" branches-valid="0" branch-rate="0" complexity="0">
+<coverage version="7.10.6" timestamp="1760116700880" lines-valid="6285" lines-covered="5541" line-rate="0.8816" branches-covered="0" branches-valid="0" branch-rate="0" complexity="0">
 	<!-- Generated by coverage.py: https://coverage.readthedocs.io/en/7.10.6 -->
 	<!-- Based on https://raw.githubusercontent.com/cobertura/web/master/htdocs/xml/coverage-04.dtd -->
 	<sources>
@@ -3575,70 +3575,63 @@
 						<line number="108" hits="1"/>
 						<line number="109" hits="1"/>
 						<line number="111" hits="1"/>
-						<line number="118" hits="1"/>
-						<line number="119" hits="1"/>
-						<line number="120" hits="1"/>
-						<line number="121" hits="1"/>
 						<line number="122" hits="1"/>
 						<line number="123" hits="1"/>
 						<line number="124" hits="1"/>
+						<line number="125" hits="1"/>
 						<line number="126" hits="1"/>
+						<line number="127" hits="1"/>
 						<line number="128" hits="1"/>
-						<line number="131" hits="1"/>
+						<line number="130" hits="1"/>
 						<line number="132" hits="1"/>
-						<line number="134" hits="1"/>
-						<line number="137" hits="1"/>
-						<line number="142" hits="1"/>
-						<line number="143" hits="1"/>
-						<line number="144" hits="1"/>
+						<line number="135" hits="1"/>
+						<line number="136" hits="1"/>
+						<line number="138" hits="1"/>
+						<line number="141" hits="1"/>
+						<line number="146" hits="1"/>
+						<line number="147" hits="1"/>
 						<line number="148" hits="1"/>
-						<line number="149" hits="1"/>
-						<line number="150" hits="0"/>
+						<line number="152" hits="1"/>
+						<line number="153" hits="1"/>
 						<line number="154" hits="0"/>
-						<line number="156" hits="1"/>
-						<line number="157" hits="1"/>
-						<line number="159" hits="1"/>
+						<line number="158" hits="0"/>
 						<line number="160" hits="1"/>
 						<line number="161" hits="1"/>
-						<line number="162" hits="1"/>
-						<line number="163" hits="1"/>
-						<line number="164" hits="1"/>
 						<line number="165" hits="1"/>
-						<line number="166" hits="1"/>
+						<line number="167" hits="1"/>
 						<line number="168" hits="1"/>
 						<line number="169" hits="1"/>
+						<line number="170" hits="1"/>
 						<line number="171" hits="1"/>
 						<line number="172" hits="1"/>
 						<line number="173" hits="1"/>
 						<line number="174" hits="1"/>
-						<line number="175" hits="1"/>
 						<line number="176" hits="1"/>
-						<line number="178" hits="1"/>
+						<line number="177" hits="1"/>
 						<line number="179" hits="1"/>
 						<line number="180" hits="1"/>
 						<line number="181" hits="1"/>
 						<line number="182" hits="1"/>
 						<line number="183" hits="1"/>
-						<line number="185" hits="1"/>
+						<line number="184" hits="1"/>
 						<line number="186" hits="1"/>
+						<line number="187" hits="1"/>
 						<line number="188" hits="1"/>
 						<line number="189" hits="1"/>
 						<line number="190" hits="1"/>
 						<line number="191" hits="1"/>
-						<line number="192" hits="1"/>
-						<line number="195" hits="1"/>
+						<line number="193" hits="1"/>
+						<line number="194" hits="1"/>
+						<line number="196" hits="1"/>
 						<line number="197" hits="1"/>
+						<line number="198" hits="1"/>
+						<line number="199" hits="1"/>
 						<line number="200" hits="1"/>
-						<line number="201" hits="0"/>
-						<line number="202" hits="1"/>
 						<line number="203" hits="1"/>
-						<line number="205" hits="1"/>
-						<line number="206" hits="1"/>
-						<line number="207" hits="1"/>
 						<line number="208" hits="1"/>
-						<line number="209" hits="1"/>
+						<line number="209" hits="0"/>
+						<line number="210" hits="1"/>
 						<line number="211" hits="1"/>
-						<line number="212" hits="1"/>
 						<line number="213" hits="1"/>
 						<line number="214" hits="1"/>
 						<line number="215" hits="1"/>
@@ -3648,7 +3641,14 @@
 						<line number="220" hits="1"/>
 						<line number="221" hits="1"/>
 						<line number="222" hits="1"/>
+						<line number="223" hits="1"/>
 						<line number="224" hits="1"/>
+						<line number="225" hits="1"/>
+						<line number="227" hits="1"/>
+						<line number="228" hits="1"/>
+						<line number="229" hits="1"/>
+						<line number="230" hits="1"/>
+						<line number="232" hits="1"/>
 					</lines>
 				</class>
 				<class name="exceptions_emitter.py" filename="pyopenapi_gen/emitters/exceptions_emitter.py" complexity="0" line-rate="0.9429" branch-rate="0">

{pyopenapi_gen-0.14.1 → pyopenapi_gen-0.14.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "pyopenapi-gen"
-version = "0.14.1"
+version = "0.14.2"
 description = "Modern, async-first Python client generator for OpenAPI specifications with advanced cycle detection and unified type resolution"
 authors = [{ name = "Mindhive Oy", email = "contact@mindhive.fi" }]
 maintainers = [{ name = "Ville Venäläinen | Mindhive Oy", email = "ville@mindhive.fi" }]
@@ -140,7 +140,7 @@ pyopenapi-gen = "pyopenapi_gen.cli:app"
 
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "0.14.1"
+version = "0.14.2"
 version_files = [
     "pyproject.toml:version",
     "src/pyopenapi_gen/__init__.py:__version__"

{pyopenapi_gen-0.14.1 → pyopenapi_gen-0.14.2}/src/pyopenapi_gen/emitters/endpoints_emitter.py

@@ -108,12 +108,16 @@ class EndpointsEmitter:
         self.formatter = Formatter()
         self.visitor: EndpointVisitor | None = None
 
-    def _deduplicate_operation_ids(self, operations: List[IROperation]) -> None:
+    def _deduplicate_operation_ids_globally(self, operations: List[IROperation]) -> None:
         """
-        Ensures all operations have unique method names within a tag.
+        Ensures all operations have unique method names globally across all tags.
+
+        This prevents the bug where operations with multiple tags share the same
+        IROperation object reference, causing _deduplicate_operation_ids() to
+        modify the same object multiple times and accumulate _2_2 suffixes.
 
         Args:
-            operations: List of operations for a single tag.
+            operations: List of all operations across all tags.
         """
         seen_methods: dict[str, int] = {}
         for op in operations:
@@ -156,6 +160,10 @@ class EndpointsEmitter:
         if self.visitor is None:
             self.visitor = EndpointVisitor(current_parsed_schemas)  # Pass the (potentially defaulted) dict
 
+        # Deduplicate operation IDs globally BEFORE tag grouping to prevent
+        # multi-tag operations from accumulating _2_2 suffixes
+        self._deduplicate_operation_ids_globally(operations)
+
         tag_key_to_ops: dict[str, List[IROperation]] = {}
         tag_key_to_candidates: dict[str, List[str]] = {}
         for op in operations:
@@ -194,7 +202,7 @@ class EndpointsEmitter:
             # This will set current_file and reset+reinit import_collector's context
             self.context.set_current_file(str(file_path))
 
-            self._deduplicate_operation_ids(ops_for_tag)
+            # Deduplication now done globally before tag grouping (see above)
 
             # EndpointVisitor must exist here due to check above
             if self.visitor is None:

{pyopenapi_gen-0.14.1 → pyopenapi_gen-0.14.2}/tests/emitters/test_duplicate_operations.py

@@ -108,3 +108,92 @@ def test_endpoints_emitter__duplicate_operation_ids__generates_unique_method_nam
     content = client_file.read_text()
     assert "async def get_feedback" in content
     assert "async def get_feedback_2" in content  # Second method should have a suffix
+
+
+def test_endpoints_emitter__multi_tag_duplicate_operation_ids__no_suffix_accumulation(
+    tmp_path: Path, mock_render_context: MagicMock
+) -> None:
+    """
+    Scenario:
+        EndpointsEmitter processes operations with duplicate IDs that have multiple tags.
+        Operations with multiple tags share the same IROperation object reference.
+
+    Expected Outcome:
+        Global deduplication should ensure each operation is renamed only ONCE,
+        preventing _2_2 suffix accumulation that occurred with per-tag deduplication.
+
+        Before fix: Multi-tag operations would get _2_2, _2_2_2 suffixes
+        After fix: Operations get at most _2 suffix, consistent across all tags
+    """
+    # Create two operations with IDs that sanitize to the same name,
+    # both with multiple tags to trigger the bug
+    op1 = IROperation(
+        operation_id="get_user",  # snake_case
+        method=HTTPMethod.GET,
+        path="/user/{id}",
+        parameters=[],
+        responses=[
+            IRResponse(
+                status_code="200",
+                description="Success",
+                content={"application/json": IRSchema(name="User", type="object")},
+            )
+        ],
+        summary="Get user by ID",
+        description="Get user by ID",
+        tags=["Users", "Admin", "Internal"],  # Multiple tags!
+    )
+
+    op2 = IROperation(
+        operation_id="getUser",  # CamelCase - will sanitize to "get_user" (collision!)
+        method=HTTPMethod.GET,
+        path="/user",
+        parameters=[],
+        responses=[
+            IRResponse(
+                status_code="200",
+                description="Success",
+                content={"application/json": IRSchema(name="UserList", type="object")},
+            )
+        ],
+        summary="List users",
+        description="List all users",
+        tags=["Users", "Admin", "Internal"],  # Same tags!
+    )
+
+    # Create spec
+    spec = IRSpec(
+        title="Test API",
+        version="1.0.0",
+        schemas={},
+        operations=[op1, op2],
+        servers=[],
+    )
+
+    # Generate client code
+    out_dir: Path = tmp_path / "out"
+    mock_render_context.parsed_schemas = spec.schemas
+
+    emitter = EndpointsEmitter(context=mock_render_context)
+    emitter.emit(spec.operations, str(out_dir))
+
+    # Verify: After global deduplication, the second operation should be renamed to get_user_2
+    # IMPORTANT: The operation_id should be consistent across ALL tag files
+    assert op2.operation_id == "getUser_2", f"Expected 'getUser_2', got '{op2.operation_id}'"
+
+    # Verify NO _2_2 suffix accumulation (the bug we're fixing)
+    assert "_2_2" not in op2.operation_id, f"Bug still present: {op2.operation_id} contains _2_2 suffix"
+    assert "_3" not in op2.operation_id, f"Bug still present: {op2.operation_id} contains _3 suffix"
+
+    # Check all tag files to ensure consistent naming
+    for tag in ["users", "admin", "internal"]:
+        client_file: Path = out_dir / "endpoints" / f"{tag}.py"
+        assert client_file.exists(), f"Missing file for tag '{tag}'"
+
+        content = client_file.read_text()
+        # Both files should have both methods with the same names
+        assert "async def get_user" in content, f"Missing get_user in {tag}"
+        assert "async def get_user_2" in content, f"Missing get_user_2 in {tag}"
+
+        # Ensure NO _2_2 suffixes appear in ANY file
+        assert "_2_2" not in content, f"File {tag}.py contains _2_2 suffix (bug present)"