pyopenapi-gen 0.14.1__py3-none-any.whl → 0.14.3__py3-none-any.whl

pyopenapi_gen/context/render_context.py

@@ -153,10 +153,25 @@ class RenderContext:
             self.core_package_name + "."
         )
         if is_target_in_core_pkg_namespace:
+            # For root-level sibling packages (core and output package both at top level),
+            # we MUST use absolute imports because Python doesn't support relative imports
+            # that go beyond the top-level package.
+            #
+            # Example structure that requires absolute imports:
+            #   output/              # NOT a package (no __init__.py)
+            #   ├── core/            # top-level package
+            #   └── businessapi/     # top-level package
+            #
+            # In this case, businessapi/client.py cannot use "from ..core import X"
+            # because that would try to go UP from businessapi to output/, which is not a package.
+            #
+            # Solution: Always use absolute imports for core when it's a root-level sibling.
+
+            # Always use absolute imports for core imports
             if name:
                 self.import_collector.add_import(module=logical_module, name=name)
             else:
-                self.import_collector.add_plain_import(module=logical_module)  # Core plain import
+                self.import_collector.add_plain_import(module=logical_module)
             return
 
         # 3. Stdlib/Builtin?
@@ -628,3 +643,84 @@ class RenderContext:
 
         except ValueError:  # If current_file is not under overall_project_root
             return None
+
+    def get_core_import_path(self, submodule: str) -> str:
+        """
+        Calculate the correct import path to a core package submodule from the current file.
+
+        Handles both sibling core packages (core/, custom_core/) and external packages (api_sdks.my_core).
+
+        Args:
+            submodule: The submodule within core to import from (e.g., "schemas", "http_transport", "exceptions")
+
+        Returns:
+            The correct import path string (e.g., "...core.schemas", "..core.http_transport", "api_sdks.my_core.schemas")
+
+        Examples:
+            From businessapi/models/user.py → core/schemas.py returns "...core.schemas"
+            From businessapi/client.py → core/http_transport.py returns "..core.http_transport"
+            From businessapi/endpoints/auth.py → core/exceptions.py returns "...core.exceptions"
+            External core package (api_sdks.my_core) returns "api_sdks.my_core.schemas"
+        """
+        # 1. Check if core_package_name contains dots or is already a relative import
+        if "." in self.core_package_name and not self.core_package_name.startswith("."):
+            # External package (e.g., "api_sdks.my_core") - use absolute import
+            return f"{self.core_package_name}.{submodule}"
+
+        if self.core_package_name.startswith(".."):
+            # Already a relative import path
+            return f"{self.core_package_name}.{submodule}"
+
+        # 2. Local core package (sibling) - calculate relative path
+        return self._calculate_relative_core_path(submodule)
+
+    def _calculate_relative_core_path(self, submodule: str) -> str:
+        """Calculate relative import path to sibling core package."""
+
+        if not self.current_file or not self.package_root_for_generated_code or not self.overall_project_root:
+            # Fallback to absolute import if context not fully set
+            logger.warning(
+                f"Cannot calculate relative core path: context not fully set. "
+                f"current_file={self.current_file}, package_root={self.package_root_for_generated_code}, "
+                f"project_root={self.overall_project_root}. Using absolute import."
+            )
+            return f"{self.core_package_name}.{submodule}"
+
+        try:
+            # 1. Get current file's directory
+            current_file_abs = Path(self.current_file).resolve()
+            current_dir_abs = current_file_abs.parent
+
+            # 2. Determine core package location (sibling to output package)
+            project_root_abs = Path(self.overall_project_root).resolve()
+
+            # Core is sibling to the output package
+            core_abs = project_root_abs / self.core_package_name
+            target_abs = core_abs / submodule.replace(".", os.sep)
+
+            # 3. Calculate relative path from current directory to target
+            relative_path = os.path.relpath(target_abs, start=current_dir_abs)
+
+            # 4. Convert filesystem path to Python import path
+            # e.g., "../../core/schemas" → "...core.schemas"
+            path_parts = relative_path.split(os.sep)
+
+            dots = 0
+            module_parts = []
+
+            for part in path_parts:
+                if part == "..":
+                    dots += 1
+                elif part != ".":
+                    module_parts.append(part)
+
+            # Prefix with dots (add one more for Python relative imports)
+            prefix = "." * (dots + 1)
+            module_path = ".".join(module_parts)
+
+            return f"{prefix}{module_path}"
+
+        except Exception as e:
+            # Fallback to absolute import on any error
+            logger.warning(f"Failed to calculate relative core path: {e}. Using absolute import.")
+            return f"{self.core_package_name}.{submodule}"

pyopenapi_gen/core/writers/python_construct_renderer.py

@@ -183,21 +183,8 @@ class PythonConstructRenderer:
         context.add_import("dataclasses", "dataclass")
 
         # Always use self-contained BaseSchema for client independence with automatic field mapping
-        # Use the core package from context - could be relative (..core) or absolute (api_sdks.my_core)
-        if context.core_package_name.startswith(".."):
-            # Already a relative import
-            core_import_path = f"{context.core_package_name}.schemas"
-        elif "." in context.core_package_name:
-            # External core package with dots (e.g., api_sdks.my_core) - use absolute import
-            core_import_path = f"{context.core_package_name}.schemas"
-        elif context.core_package_name == "core":
-            # Default relative core package
-            core_import_path = "..core.schemas"
-        else:
-            # Simple external core package name (e.g., shared_core_pkg) - use absolute import
-            core_import_path = f"{context.core_package_name}.schemas"
-
-        context.add_import(core_import_path, "BaseSchema")
+        # Use absolute core import path - add_import will handle it correctly
+        context.add_import(f"{context.core_package_name}.schemas", "BaseSchema")
 
         # Add __all__ export
         writer.write_line(f'__all__ = ["{class_name}"]')

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/visit/model/dataclass_generator.py

@@ -80,7 +80,8 @@ class DataclassGenerator:
         context.add_import("dataclasses", "dataclass")
         context.add_import("dataclasses", "field")
         context.add_import("typing", "Any")
-        context.add_import("..core.schemas", "BaseSchema")
+        # Use absolute core import path - add_import will handle it correctly
+        context.add_import(f"{context.core_package_name}.schemas", "BaseSchema")
 
         description = schema.description or "Generic JSON value object that preserves arbitrary data."
 

{pyopenapi_gen-0.14.1.dist-info → pyopenapi_gen-0.14.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyopenapi-gen
-Version: 0.14.1
+Version: 0.14.3
 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.dist-info → pyopenapi_gen-0.14.3.dist-info}/RECORD

@@ -7,7 +7,7 @@ pyopenapi_gen/py.typed,sha256=Nqnn8clbgv-5l0PgxcTOldg8mkMKrFn4TvPL-rYUUGg,1
 pyopenapi_gen/context/CLAUDE.md,sha256=eUPvSY2ADQK21i52bWfzyBcDPVvvepErMiQrq6ndwlU,9004
 pyopenapi_gen/context/file_manager.py,sha256=vpbRByO5SH6COdjb6C-pXkdSIRu7QFqrXxi69VLKBnM,1691
 pyopenapi_gen/context/import_collector.py,sha256=5WzQ5fXxARHJFZmYZ_GjPG5YjjzRLZTdN7jO2cbbk88,15225
-pyopenapi_gen/context/render_context.py,sha256=07oINhHWi78qhcf-FNSOtojUrshmw0ZOTEgPpzBptbU,30271
+pyopenapi_gen/context/render_context.py,sha256=fAq0u3rDMZ0_OEHegrRUd98ySxs390XJbdypqQX8bwI,34894
 pyopenapi_gen/core/CLAUDE.md,sha256=bz48K-PSrhxCq5ScmiLiU9kfpVVzSWRKOA9RdKk_pbg,6482
 pyopenapi_gen/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyopenapi_gen/core/exceptions.py,sha256=HYFiYdmzsZUl46vB8M3B6Vpp6m8iqjUcKDWdL4yEKHo,498
@@ -64,14 +64,14 @@ pyopenapi_gen/core/parsing/transformers/inline_object_promoter.py,sha256=d9DZ1CV
 pyopenapi_gen/core/writers/code_writer.py,sha256=5rWMPRdj5dWu3NRER6do4NEJEIa9qL68Hc7zhJ8jSdg,4763
 pyopenapi_gen/core/writers/documentation_writer.py,sha256=ZnXJsRc9y9bUMsQR7g0qoBJZbBo2MCxHH_5KgxrPtyA,8645
 pyopenapi_gen/core/writers/line_writer.py,sha256=-K2FaMtQa6hdzGZLcjQrT2ItEmfE-kquTCrn6R3I_QA,7743
-pyopenapi_gen/core/writers/python_construct_renderer.py,sha256=aRLSiqUkf5Cp72BbJP7nVTmwPPrYlk8W66175joKAg0,12766
+pyopenapi_gen/core/writers/python_construct_renderer.py,sha256=mJ8iCDQAJWg32ZaDI4U7eWRzym3bwzOrJ2VKAXOZds0,12066
 pyopenapi_gen/core_package_template/README.md,sha256=8YP-MS0KxphRbCGBf7kV3dYIFLU9piOJ3IMm3K_0hcI,1488
 pyopenapi_gen/emit/models_emitter.py,sha256=MBRq71UjtlZHrpf9QhDN0wXk_X-oGeGd6TAq3RKG7ko,7180
 pyopenapi_gen/emitters/CLAUDE.md,sha256=iZYEZq1a1h033rxuh97cMpsKUElv72ysvTm3-QQUvrs,9323
 pyopenapi_gen/emitters/client_emitter.py,sha256=kmMVnG-wAOJm7TUm0xOQ5YnSJfYxz1SwtpiyoUCbcCA,1939
 pyopenapi_gen/emitters/core_emitter.py,sha256=YSuqDlYv3P687TsVT_Z9n7a6GZepGAvv3-N1Q2kK6Zg,7975
 pyopenapi_gen/emitters/docs_emitter.py,sha256=aouKqhRdtVvYfGVsye_uqM80nONRy0SqN06cr1l3OgA,1137
-pyopenapi_gen/emitters/endpoints_emitter.py,sha256=iAEGYf5uIo6STY0Pr2ZFvR3ncYNiCF4pHMWmfV9bWRQ,9558
+pyopenapi_gen/emitters/endpoints_emitter.py,sha256=0DXOXu2Yb3DRTic_k63q2L-yKS6ZFdhbcBCK3DPZU3Y,10040
 pyopenapi_gen/emitters/exceptions_emitter.py,sha256=PfbDQX7dfgg2htvxEh40t7FR7b3BrK8jeRd5INu_kjk,7547
 pyopenapi_gen/emitters/models_emitter.py,sha256=wJwtvCGEmhy5yhojfoUW2CXNOQytGlN4J8-GcwoYIMY,22221
 pyopenapi_gen/generator/CLAUDE.md,sha256=BS9KkmLvk2WD-Io-_apoWjGNeMU4q4LKy4UOxYF9WxM,10870
@@ -122,11 +122,11 @@ pyopenapi_gen/visit/endpoint/processors/import_analyzer.py,sha256=ou5pl3S6PXvHrh
 pyopenapi_gen/visit/endpoint/processors/parameter_processor.py,sha256=E0VoygkhU8iCsvH0U-tA6ZZg2Nm3rfr4e17vxqQLH7c,7666
 pyopenapi_gen/visit/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyopenapi_gen/visit/model/alias_generator.py,sha256=wEMHipPA1_CFxvQ6CS9j4qgXK93seI1bI_tFJvIrb70,3563
-pyopenapi_gen/visit/model/dataclass_generator.py,sha256=z0kKH_V2PJyiI9snmryDpAzRiOsQJtk1jrijCnEQQwg,14326
+pyopenapi_gen/visit/model/dataclass_generator.py,sha256=L794s2yyYUO__akGd120NJMV7g2xqiPfQyZo8CduIVM,14426
 pyopenapi_gen/visit/model/enum_generator.py,sha256=AXqKUFuWUUjUF_6_HqBKY8vB5GYu35Pb2C2WPFrOw1k,10061
 pyopenapi_gen/visit/model/model_visitor.py,sha256=TC6pbxpQiy5FWhmQpfllLuXA3ImTYNMcrazkOFZCIyo,9470
-pyopenapi_gen-0.14.1.dist-info/METADATA,sha256=nrkOgt8QTl8I0Mb8NDX5q16pkVmJy90JFF3HY6vdxsg,14025
-pyopenapi_gen-0.14.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pyopenapi_gen-0.14.1.dist-info/entry_points.txt,sha256=gxSlNiwom50T3OEZnlocA6qRjGdV0bn6hN_Xr-Ub5wA,56
-pyopenapi_gen-0.14.1.dist-info/licenses/LICENSE,sha256=UFAyTWKa4w10-QerlJaHJeep7G2gcwpf-JmvI2dS2Gc,1088
-pyopenapi_gen-0.14.1.dist-info/RECORD,,
+pyopenapi_gen-0.14.3.dist-info/METADATA,sha256=sKA5cB3FHhSkY7wbQs8AlGg9GJc21uitec8EjIXbWtE,14025
+pyopenapi_gen-0.14.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+pyopenapi_gen-0.14.3.dist-info/entry_points.txt,sha256=gxSlNiwom50T3OEZnlocA6qRjGdV0bn6hN_Xr-Ub5wA,56
+pyopenapi_gen-0.14.3.dist-info/licenses/LICENSE,sha256=UFAyTWKa4w10-QerlJaHJeep7G2gcwpf-JmvI2dS2Gc,1088
+pyopenapi_gen-0.14.3.dist-info/RECORD,,