pyopenapi-gen 0.10.1__py3-none-any.whl → 0.11.0__py3-none-any.whl

pyopenapi_gen/__init__.py

@@ -43,7 +43,7 @@ __all__ = [
 ]
 
 # Semantic version of the generator core – automatically managed by semantic-release.
-__version__: str = "0.9.0"
+__version__: str = "0.10.2"
 
 
 # ---------------------------------------------------------------------------

pyopenapi_gen/core/exceptions.py

@@ -1,12 +1,7 @@
-from typing import Optional
-
-import httpx
-
-
 class HTTPError(Exception):
     """Base HTTP error with status code and message."""
 
-    def __init__(self, status_code: int, message: str, response: Optional[httpx.Response] = None) -> None:
+    def __init__(self, status_code: int, message: str, response: object | None = None) -> None:
         super().__init__(f"{status_code}: {message}")
         self.status_code = status_code
         self.message = message

pyopenapi_gen/core/loader/loader.py

@@ -87,8 +87,22 @@ class SpecLoader:
                 validate_spec(cast(Mapping[Hashable, Any], self.spec))
             except Exception as e:
                 warning_msg = f"OpenAPI spec validation error: {e}"
+                # Always collect the message
                 warnings_list.append(warning_msg)
-                warnings.warn(warning_msg, UserWarning)
+
+                # Heuristic: if this error originates from jsonschema or
+                # openapi_spec_validator, prefer logging over global warnings
+                # to avoid noisy test output while still surfacing the issue.
+                origin_module = getattr(e.__class__, "__module__", "")
+                if (
+                    isinstance(e, RecursionError)
+                    or origin_module.startswith("jsonschema")
+                    or origin_module.startswith("openapi_spec_validator")
+                ):
+                    logger.warning(warning_msg)
+                else:
+                    # Preserve explicit warning behavior for unexpected failures
+                    warnings.warn(warning_msg, UserWarning)
 
         return warnings_list
 

pyopenapi_gen/core/loader/parameters/parser.py

@@ -79,6 +79,29 @@ def parse_parameter(
         base_param_promo_name = f"{operation_id_for_promo}Param" if operation_id_for_promo else ""
         name_for_inline_param_schema = f"{base_param_promo_name}{NameSanitizer.sanitize_class_name(param_name)}"
 
+    # General rule: if a parameter is defined inline but a components parameter exists with the
+    # same name and location, prefer the components schema (often richer: arrays/enums/refs).
+    try:
+        if isinstance(context, ParsingContext):
+            components_params = context.raw_spec_components.get("parameters", {})
+            if isinstance(components_params, Mapping):
+                for comp_key, comp_param in components_params.items():
+                    if not isinstance(comp_param, Mapping):
+                        continue
+                    if comp_param.get("name") == param_name and comp_param.get("in") == node.get("in"):
+                        comp_schema = comp_param.get("schema")
+                        if isinstance(comp_schema, Mapping):
+                            # Prefer component schema if inline is missing or clearly less specific
+                            inline_is_specific = isinstance(sch, Mapping) and (
+                                sch.get("type") in {"array", "object"} or "$ref" in sch or "enum" in sch
+                            )
+                            if not inline_is_specific:
+                                sch = comp_schema
+                        break
+    except Exception:
+        # Be conservative on any unexpected structure
+        pass
+
     # For parameters, we want to avoid creating complex schemas for simple enum arrays
     # Check if this is a simple enum array and handle it specially
     if (

pyopenapi_gen/core/loader/schemas/extractor.py

@@ -128,6 +128,8 @@ def extract_inline_array_items(schemas: Dict[str, IRSchema]) -> Dict[str, IRSche
 def extract_inline_enums(schemas: Dict[str, IRSchema]) -> Dict[str, IRSchema]:
     """Extract inline property enums as unique schemas and update property references.
 
+    Also ensures top-level enum schemas are properly marked for generation.
+
     Contracts:
         Preconditions:
             - schemas is a dict of IRSchema objects
@@ -136,6 +138,7 @@ def extract_inline_enums(schemas: Dict[str, IRSchema]) -> Dict[str, IRSchema]:
             - All property schemas with enums have proper names
             - All array item schemas have proper names
             - No duplicate schema names are created
+            - Top-level enum schemas have generation_name set
     """
     assert isinstance(schemas, dict), "schemas must be a dict"
     assert all(isinstance(s, IRSchema) for s in schemas.values()), "all values must be IRSchema objects"
@@ -149,6 +152,19 @@ def extract_inline_enums(schemas: Dict[str, IRSchema]) -> Dict[str, IRSchema]:
 
     new_enums = {}
     for schema_name, schema in list(schemas.items()):
+        # Handle top-level enum schemas (those defined directly in components/schemas)
+        # These are already enums but need generation_name set
+        if schema.enum and schema.type in ["string", "integer", "number"]:
+            # This is a top-level enum schema
+            # Ensure it has generation_name set (will be properly set by emitter later,
+            # but we can set it here to avoid the warning)
+            if not hasattr(schema, "generation_name") or not schema.generation_name:
+                schema.generation_name = schema.name
+            # Mark this as a properly processed enum by ensuring generation_name is set
+            # This serves as the marker that this enum was properly processed
+            logger.debug(f"Marked top-level enum schema: {schema_name}")
+
+        # Extract inline enums from properties
         for prop_name, prop_schema in list(schema.properties.items()):
             if prop_schema.enum and not prop_schema.name:
                 enum_name = (
@@ -167,6 +183,7 @@ def extract_inline_enums(schemas: Dict[str, IRSchema]) -> Dict[str, IRSchema]:
                     enum=copy.deepcopy(prop_schema.enum),
                     description=prop_schema.description or f"Enum for {schema_name}.{prop_name}",
                 )
+                enum_schema.generation_name = enum_name  # Set generation_name for extracted enums
                 new_enums[enum_name] = enum_schema
 
                 # Update the original property to reference the extracted enum

pyopenapi_gen/generator/client_generator.py

@@ -77,9 +77,10 @@ class ClientGenerator:
         else:
             log_msg = f"{timestamp} ({elapsed:.2f}s) {message}"
 
-        # logger.info(log_msg) # Keep commented out to ensure test_gen_nonexistent_spec_path passes
-        # Also print to stdout for CLI users
-        # print(log_msg) # Keep commented out
+        logger.info(log_msg)
+        # Also print to stdout for CLI users when verbose mode is enabled
+        if self.verbose:
+            print(log_msg)
 
     def generate(
         self,
@@ -523,9 +524,23 @@ class ClientGenerator:
         """
         spec_path_obj = Path(path_or_url)
         if spec_path_obj.exists() and spec_path_obj.is_file():  # Added is_file() check
-            import yaml
+            text = spec_path_obj.read_text()
+            # Prefer JSON for .json files to avoid optional PyYAML dependency in tests
+            if spec_path_obj.suffix.lower() == ".json":
+                import json
+
+                data = json.loads(text)
+            else:
+                try:
+                    import yaml
+
+                    data = yaml.safe_load(text)
+                except ModuleNotFoundError:
+                    # Fallback: attempt JSON parsing if YAML is unavailable
+                    import json
+
+                    data = json.loads(text)
 
-            data = yaml.safe_load(spec_path_obj.read_text())
             if not isinstance(data, dict):
                 raise GenerationError("Loaded spec is not a dictionary.")
             return data

pyopenapi_gen/types/resolvers/schema_resolver.py

@@ -172,10 +172,18 @@ class OpenAPISchemaResolver(SchemaTypeResolver):
 
     def _resolve_string(self, schema: IRSchema, context: TypeContext, required: bool) -> ResolvedType:
         """Resolve string type, handling enums and formats."""
+        # Check if this is a properly processed enum (has generation_name)
         if hasattr(schema, "enum") and schema.enum:
-            # This is an enum - should be promoted to named type
-            logger.warning("Found inline enum in string schema - should be promoted")
-            return ResolvedType(python_type="str", is_optional=not required)
+            # Check if this enum was properly processed (has generation_name)
+            if hasattr(schema, "generation_name") and schema.generation_name:
+                # This is a properly processed enum, it should have been handled earlier
+                # by _resolve_named_schema. If we're here, it might be during initial processing.
+                # Return the enum type name
+                return ResolvedType(python_type=schema.generation_name, is_optional=not required)
+            else:
+                # This is an unprocessed inline enum - log warning but continue
+                logger.warning(f"Found inline enum in string schema that wasn't promoted: {schema.name or 'unnamed'}")
+                return ResolvedType(python_type="str", is_optional=not required)
 
         # Handle string formats
         format_type = getattr(schema, "format", None)

pyopenapi_gen/visit/endpoint/generators/signature_generator.py

@@ -68,17 +68,9 @@ class EndpointMethodSignatureGenerator:
             p = p_orig.copy()  # Work with a copy
             arg_str = f"{NameSanitizer.sanitize_method_name(p['name'])}: {p['type']}"  # Ensure param name is sanitized
             if not p.get("required", False):
-                # Default value handling: if default is None, it should be ' = None'
-                # If default is a string, it should be ' = "default_value"'
-                # Otherwise, ' = default_value'
-                default_val = p.get("default")
-                if default_val is None and not p.get("required", False):  # Explicitly check for None for Optional types
-                    arg_str += f" = None"
-                elif default_val is not None:  # Only add if default is not None
-                    if isinstance(default_val, str):
-                        arg_str += f' = "{default_val}"'
-                    else:
-                        arg_str += f" = {default_val}"
+                # For optional parameters, always default to None to avoid type mismatches
+                # (e.g., enum-typed params with string defaults)
+                arg_str += " = None"
             args.append(arg_str)
 
         actual_return_type = return_type

{pyopenapi_gen-0.10.1.dist-info → pyopenapi_gen-0.11.0.dist-info}/METADATA

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

@@ -1,4 +1,4 @@
-pyopenapi_gen/__init__.py,sha256=9DJOZ8R4qQ3tHN0XxuSOK0PWXBtbpjaNEJAgzfUVTeE,3016
+pyopenapi_gen/__init__.py,sha256=jU5GYbWa4MBDeDzOzwUHl_8eLGtotxRGLj42d2yskUo,3017
 pyopenapi_gen/__main__.py,sha256=4-SCaCNhBd7rtyRK58uoDbdl93J0KhUeajP_b0CPpLE,110
 pyopenapi_gen/cli.py,sha256=_ewksNDaA5st3TJJMZJWgCZdBGOQp__tkMVqr_6U3vs,2339
 pyopenapi_gen/http_types.py,sha256=EMMYZBt8PNVZKPFu77TQija-JI-nOKyXvpiQP9-VSWE,467
@@ -10,7 +10,7 @@ pyopenapi_gen/context/import_collector.py,sha256=rnOgR5-GsHs_oS1iUVbOF3tagcH5nam
 pyopenapi_gen/context/render_context.py,sha256=AS08ha9WVjgRUsM1LFPjMCgrsHbczHH7c60Z5PbojhY,30320
 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=KemyLDXl8pBgzxxV6ZhsGi7WjwKGooKU6Idy63eC2ko,553
+pyopenapi_gen/core/exceptions.py,sha256=HYFiYdmzsZUl46vB8M3B6Vpp6m8iqjUcKDWdL4yEKHo,498
 pyopenapi_gen/core/http_transport.py,sha256=77ZOTyl0_CLuDtSCOVDQoxHDQBnclJgz6f3Hs6cy7hY,9675
 pyopenapi_gen/core/pagination.py,sha256=aeDOKo-Lu8mcSDqv0TlPXV9Ul-Nca76ZuKhQHKlsMUs,2301
 pyopenapi_gen/core/postprocess_manager.py,sha256=ky27ijbq6zEo43aqe-odz9CR3vFD_3XHhQR35XgMZo0,6879
@@ -22,17 +22,17 @@ pyopenapi_gen/core/warning_collector.py,sha256=DYl9D7eZYs04mDU84KeonS-5-d0aM7hNq
 pyopenapi_gen/core/auth/base.py,sha256=E2KUerA_mYv9D7xulUm-lenIxqZHqanjA4oRKpof2ZE,792
 pyopenapi_gen/core/auth/plugins.py,sha256=bDWx4MTRFsCKp1i__BsQtZEvQPGU-NKI137-zoxmrgs,3465
 pyopenapi_gen/core/loader/__init__.py,sha256=bt-MQ35fbq-f1YnCcopPg53TuXCI9_7wcMzQZoWVpjU,391
-pyopenapi_gen/core/loader/loader.py,sha256=bogAgDr2XvJWmMAFE006b3K_5AmC8eg2uj_TpYtLAfg,5591
+pyopenapi_gen/core/loader/loader.py,sha256=aehmWhOwWzv2af4Q0XxuOwP9AoAozG36o4-yMVMO0hE,6318
 pyopenapi_gen/core/loader/operations/__init__.py,sha256=7se21D-BOy7Qw6C9auJ9v6D3NCuRiDpRlhqxGq11fJs,366
 pyopenapi_gen/core/loader/operations/parser.py,sha256=ai5iZZA2nicouC77iEvo8jKGXbHKbX_NcTy44lkwOVQ,6896
 pyopenapi_gen/core/loader/operations/post_processor.py,sha256=3FZ5o59J2bSpZP-tNIec0A2hw095cC27GKqkhGrgHZA,2437
 pyopenapi_gen/core/loader/operations/request_body.py,sha256=qz-wh014ejb1SGTuVRNODSXc95_iOLAjw05aDRhbXoo,3099
 pyopenapi_gen/core/loader/parameters/__init__.py,sha256=p13oSibCRC5RCfsP6w7yD9MYs5TXcdI4WwPv7oGUYKk,284
-pyopenapi_gen/core/loader/parameters/parser.py,sha256=4-p9s8VRm2hukXvvMF8zkd2YqSZsB18NYccVS3rwqIg,4773
+pyopenapi_gen/core/loader/parameters/parser.py,sha256=ohyi0Ay7vterM8ho_kscWzzNXuwKISDGjgpArByeFSw,6089
 pyopenapi_gen/core/loader/responses/__init__.py,sha256=6APWoH3IdNkgVmI0KsgZoZ6knDaG-S-pnUCa6gkzT8E,216
 pyopenapi_gen/core/loader/responses/parser.py,sha256=T0QXH_3c-Y6_S6DvveKHPfV_tID7qhBoX0nFtdLCa0A,3896
 pyopenapi_gen/core/loader/schemas/__init__.py,sha256=rlhujYfw_IzWgzhVhYMJ3eIhE6C5Vi1Ylba-BHEVqOg,296
-pyopenapi_gen/core/loader/schemas/extractor.py,sha256=7-lpDhs9W9wVhG1OCASdyft_V1kUH7NdP8D4x-raGjk,8364
+pyopenapi_gen/core/loader/schemas/extractor.py,sha256=TlLflugYrkQg-Fe7p-C4ppT8rRC9OKvK4nubEUR58tY,9445
 pyopenapi_gen/core/parsing/__init__.py,sha256=RJsIR6cHaNoI4tBcpMlAa0JsY64vsHb9sPxPg6rd8FQ,486
 pyopenapi_gen/core/parsing/context.py,sha256=crn5oTkzEvnSzYdPuHBA_s72kmq0RKzXpyaqNh67k68,7947
 pyopenapi_gen/core/parsing/cycle_helpers.py,sha256=nG5ysNavL_6lpnHWFUZR9qraBxqOzuNfI6NgSEa8a5M,5939
@@ -74,7 +74,7 @@ pyopenapi_gen/emitters/endpoints_emitter.py,sha256=2VuJJF0hpzyN-TqY9XVLQtTJ-Qged
 pyopenapi_gen/emitters/exceptions_emitter.py,sha256=qPTIPXDyqSUtpmBIp-V4ap1uMHUPmYziCSN62t7qcAE,1918
 pyopenapi_gen/emitters/models_emitter.py,sha256=I3IKwtKVocD3UVrI7cINXI8NjLwUZqHuGgvS3hjWUJ8,22192
 pyopenapi_gen/generator/CLAUDE.md,sha256=BS9KkmLvk2WD-Io-_apoWjGNeMU4q4LKy4UOxYF9WxM,10870
-pyopenapi_gen/generator/client_generator.py,sha256=avYz5GCp7t6vRAFJCvXw0ipLQGX2QfgWtfOwr3QlOqY,28880
+pyopenapi_gen/generator/client_generator.py,sha256=MULKJY9SdRuYjt_R4XCXh3vJSW-92rsxOu-MVpIklho,29333
 pyopenapi_gen/helpers/CLAUDE.md,sha256=GyIJ0grp4SkD3plAUzyycW4nTUZf9ewtvvsdAGkmIZw,10609
 pyopenapi_gen/helpers/__init__.py,sha256=m4jSQ1sDH6CesIcqIl_kox4LcDFabGxBpSIWVwbHK0M,39
 pyopenapi_gen/helpers/endpoint_utils.py,sha256=bkRu6YddIPQQD3rZLbB8L5WYzG-2Bd_JgMbxMUYY2wY,22198
@@ -97,7 +97,7 @@ pyopenapi_gen/types/contracts/types.py,sha256=-Qvbx3N_14AaN-1BeyocrvsjiwXPn_eWQh
 pyopenapi_gen/types/resolvers/__init__.py,sha256=_5kA49RvyOTyXgt0GbbOfHJcdQw2zHxvU9af8GGyNWc,295
 pyopenapi_gen/types/resolvers/reference_resolver.py,sha256=qnaZeLmtyh4_NBMcKib58s6o5ycUJaattYt8F38_qIo,2053
 pyopenapi_gen/types/resolvers/response_resolver.py,sha256=Kb1a2803lyoukoZy06ztPBlUw-A1lHiZ6NlJmsixxA8,6500
-pyopenapi_gen/types/resolvers/schema_resolver.py,sha256=R0N03MDLVzaFBQcrFOOTre1zqIg6APiWdHAT96ldgQ0,16898
+pyopenapi_gen/types/resolvers/schema_resolver.py,sha256=6cgJPgRsEyMNrEnaR_ONExvMNWjWWBuWa69D7gKTsSY,17528
 pyopenapi_gen/types/services/__init__.py,sha256=inSUKmY_Vnuym6tC-AhvjCTj16GbkfxCGLESRr_uQPE,123
 pyopenapi_gen/types/services/type_service.py,sha256=-LQj7oSx1mxb10Zi6DpawS8uyoUrUbnYhmUA0GuKZTc,4402
 pyopenapi_gen/types/strategies/__init__.py,sha256=bju8_KEPNIow1-woMO-zJCgK_E0M6JnFq0NFsK1R4Ss,171
@@ -114,7 +114,7 @@ pyopenapi_gen/visit/endpoint/generators/docstring_generator.py,sha256=U02qvuYtFE
 pyopenapi_gen/visit/endpoint/generators/endpoint_method_generator.py,sha256=wUJ4_gaA1gRrFCHYFCObBIankxGQu0MNqiOSoZOZmoA,4352
 pyopenapi_gen/visit/endpoint/generators/request_generator.py,sha256=OnkrkRk39_BrK9ZDvyWqJYLz1mocD2zY7j70yIpS0J4,5374
 pyopenapi_gen/visit/endpoint/generators/response_handler_generator.py,sha256=VuyYpUUQ3hIOwM0X_hrMk9qmQTC0P6xRQdC2HTTIyQw,22828
-pyopenapi_gen/visit/endpoint/generators/signature_generator.py,sha256=VC9Q_exZMpUh46hn1JXaDRlgVm3Gb-D2v36h9SDF10k,4390
+pyopenapi_gen/visit/endpoint/generators/signature_generator.py,sha256=CYtfsPMlTZN95g2WxrdnTloGx2RmqeNQRiyP9fOkUEQ,3892
 pyopenapi_gen/visit/endpoint/generators/url_args_generator.py,sha256=EsmNuVSkGfUqrmV7-1GiLPzdN86V5UqLfs1SVY0jsf0,9590
 pyopenapi_gen/visit/endpoint/processors/__init__.py,sha256=_6RqpOdDuDheArqDBi3ykhsaetACny88WUuuAJvr_ME,29
 pyopenapi_gen/visit/endpoint/processors/import_analyzer.py,sha256=tNmhgWwt-CjLE774TC8sPVH1-yaTKKm6JmfgBT2-iRk,3386
@@ -124,8 +124,8 @@ pyopenapi_gen/visit/model/alias_generator.py,sha256=3iPFDjCXU0Vm59Hfp64jTDfHoUL8
 pyopenapi_gen/visit/model/dataclass_generator.py,sha256=WtcQNx6l2sxVyTlH1MdQ-UFYWVMsxQk5nyJr1Mk02iM,9999
 pyopenapi_gen/visit/model/enum_generator.py,sha256=QWsD-IAxGOxKQuC6LLNUvbT8Ot3NWrLFsaYT0DI16DU,9670
 pyopenapi_gen/visit/model/model_visitor.py,sha256=PZeQd7-dlxZf5gY10BW-DhswmAGF903NccV6L56mjoE,9439
-pyopenapi_gen-0.10.1.dist-info/METADATA,sha256=dmrKeU6KlcuRSdXhM2caLE5mbVqlcdt6y2SYbJcNpBI,14040
-pyopenapi_gen-0.10.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pyopenapi_gen-0.10.1.dist-info/entry_points.txt,sha256=gxSlNiwom50T3OEZnlocA6qRjGdV0bn6hN_Xr-Ub5wA,56
-pyopenapi_gen-0.10.1.dist-info/licenses/LICENSE,sha256=UFAyTWKa4w10-QerlJaHJeep7G2gcwpf-JmvI2dS2Gc,1088
-pyopenapi_gen-0.10.1.dist-info/RECORD,,
+pyopenapi_gen-0.11.0.dist-info/METADATA,sha256=gv2QjmQpa6Oj87vq7sE14_6MqXO3YEmQsZS6-4NQsNQ,14040
+pyopenapi_gen-0.11.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+pyopenapi_gen-0.11.0.dist-info/entry_points.txt,sha256=gxSlNiwom50T3OEZnlocA6qRjGdV0bn6hN_Xr-Ub5wA,56
+pyopenapi_gen-0.11.0.dist-info/licenses/LICENSE,sha256=UFAyTWKa4w10-QerlJaHJeep7G2gcwpf-JmvI2dS2Gc,1088
+pyopenapi_gen-0.11.0.dist-info/RECORD,,