pyopenapi-gen 0.19.0__tar.gz → 0.20.0__tar.gz

{pyopenapi_gen-0.19.0 → pyopenapi_gen-0.20.0}/.gitignore

@@ -199,4 +199,6 @@ agent-plan.json
 
 # Bug reports and analysis documents (keep in _process/ folder)
 *-bug-report.md
-*-analysis.md
+*-analysis.md
+
+coverage.json

{pyopenapi_gen-0.19.0 → pyopenapi_gen-0.20.0}/CHANGELOG.md

@@ -1,6 +1,25 @@
 # CHANGELOG
 
 
+## v0.20.0 (2025-10-19)
+
+### Bug Fixes
+
+- **serializer**: Handle enum instances in DataclassSerializer serialization
+  ([`7eaf8ed`](https://github.com/mindhiveoy/pyopenapi_gen/commit/7eaf8ed07e6b975ecd33ec0c3a6e642f2f23e205))
+
+### Chores
+
+- **release**: Sync __init__.py version [skip ci]
+  ([`53c6163`](https://github.com/mindhiveoy/pyopenapi_gen/commit/53c6163b7c536ee17b6bb3a5fb631ed1900a4520))
+
+### Features
+
+- **tests**: Add comprehensive tests for DataclassSerializer with enum support and nested
+  dataclasses
+  ([`21de6af`](https://github.com/mindhiveoy/pyopenapi_gen/commit/21de6af2fdd33de6212863cc645ed426c6b1cd72))
+
+
 ## v0.19.0 (2025-10-18)
 
 ### Chores

{pyopenapi_gen-0.19.0 → pyopenapi_gen-0.20.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyopenapi-gen
-Version: 0.19.0
+Version: 0.20.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.19.0 → pyopenapi_gen-0.20.0}/coverage.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<coverage version="7.10.7" timestamp="1760800055874" lines-valid="6502" lines-covered="5747" line-rate="0.8839" branches-covered="0" branches-valid="0" branch-rate="0" complexity="0">
+<coverage version="7.10.7" timestamp="1760875420300" lines-valid="6505" lines-covered="5750" line-rate="0.8839" branches-covered="0" branches-valid="0" branch-rate="0" complexity="0">
 	<!-- Generated by coverage.py: https://coverage.readthedocs.io/en/7.10.7 -->
 	<!-- Based on https://raw.githubusercontent.com/cobertura/web/master/htdocs/xml/coverage-04.dtd -->
 	<sources>
@@ -652,7 +652,7 @@
 				</class>
 			</classes>
 		</package>
-		<package name="pyopenapi_gen.core" line-rate="0.8318" branch-rate="0" complexity="0">
+		<package name="pyopenapi_gen.core" line-rate="0.8327" branch-rate="0" complexity="0">
 			<classes>
 				<class name="__init__.py" filename="pyopenapi_gen/core/__init__.py" complexity="0" line-rate="1" branch-rate="0">
 					<methods/>
@@ -1053,7 +1053,7 @@
 						<line number="69" hits="1"/>
 					</lines>
 				</class>
-				<class name="utils.py" filename="pyopenapi_gen/core/utils.py" complexity="0" line-rate="0.9341" branch-rate="0">
+				<class name="utils.py" filename="pyopenapi_gen/core/utils.py" complexity="0" line-rate="0.9353" branch-rate="0">
 					<methods/>
 					<lines>
 						<line number="6" hits="1"/>
@@ -1176,53 +1176,56 @@
 						<line number="339" hits="1"/>
 						<line number="341" hits="1"/>
 						<line number="342" hits="1"/>
-						<line number="346" hits="1"/>
+						<line number="344" hits="1"/>
 						<line number="347" hits="1"/>
-						<line number="350" hits="1"/>
+						<line number="348" hits="1"/>
 						<line number="351" hits="1"/>
-						<line number="353" hits="1"/>
+						<line number="352" hits="1"/>
 						<line number="354" hits="1"/>
-						<line number="355" hits="0"/>
-						<line number="358" hits="1"/>
+						<line number="355" hits="1"/>
+						<line number="356" hits="0"/>
 						<line number="359" hits="1"/>
-						<line number="362" hits="1"/>
+						<line number="360" hits="1"/>
 						<line number="363" hits="1"/>
 						<line number="364" hits="1"/>
-						<line number="365" hits="1"/>
-						<line number="366" hits="1"/>
 						<line number="367" hits="1"/>
+						<line number="368" hits="1"/>
 						<line number="369" hits="1"/>
 						<line number="370" hits="1"/>
 						<line number="371" hits="1"/>
 						<line number="372" hits="1"/>
-						<line number="373" hits="1"/>
+						<line number="374" hits="1"/>
 						<line number="375" hits="1"/>
+						<line number="376" hits="1"/>
+						<line number="377" hits="1"/>
 						<line number="378" hits="1"/>
-						<line number="379" hits="1"/>
-						<line number="382" hits="1"/>
+						<line number="380" hits="1"/>
 						<line number="383" hits="1"/>
 						<line number="384" hits="1"/>
-						<line number="385" hits="1"/>
-						<line number="386" hits="1"/>
 						<line number="387" hits="1"/>
 						<line number="388" hits="1"/>
+						<line number="389" hits="1"/>
+						<line number="390" hits="1"/>
 						<line number="391" hits="1"/>
 						<line number="392" hits="1"/>
-						<line number="395" hits="1"/>
+						<line number="393" hits="1"/>
+						<line number="396" hits="1"/>
 						<line number="397" hits="1"/>
-						<line number="398" hits="1"/>
-						<line number="399" hits="1"/>
 						<line number="400" hits="1"/>
-						<line number="401" hits="1"/>
 						<line number="402" hits="1"/>
 						<line number="403" hits="1"/>
 						<line number="404" hits="1"/>
 						<line number="405" hits="1"/>
 						<line number="406" hits="1"/>
+						<line number="407" hits="1"/>
 						<line number="408" hits="1"/>
-						<line number="411" hits="0"/>
-						<line number="412" hits="0"/>
-						<line number="414" hits="0"/>
+						<line number="409" hits="1"/>
+						<line number="410" hits="1"/>
+						<line number="411" hits="1"/>
+						<line number="413" hits="1"/>
+						<line number="416" hits="0"/>
+						<line number="417" hits="0"/>
+						<line number="419" hits="0"/>
 					</lines>
 				</class>
 				<class name="warning_collector.py" filename="pyopenapi_gen/core/warning_collector.py" complexity="0" line-rate="1" branch-rate="0">

{pyopenapi_gen-0.19.0 → pyopenapi_gen-0.20.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "pyopenapi-gen"
-version = "0.19.0"
+version = "0.20.0"
 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.19.0"
+version = "0.20.0"
 version_files = [
     "pyproject.toml:version",
     "src/pyopenapi_gen/__init__.py:__version__"

{pyopenapi_gen-0.19.0 → pyopenapi_gen-0.20.0}/src/pyopenapi_gen/__init__.py

@@ -50,7 +50,7 @@ __all__ = [
 ]
 
 # Semantic version of the generator core – automatically managed by semantic-release.
-__version__: str = "0.19.0"
+__version__: str = "0.20.0"
 
 # ---------------------------------------------------------------------------
 # Lazy-loading and autocompletion support (This part remains)

{pyopenapi_gen-0.19.0 → pyopenapi_gen-0.20.0}/src/pyopenapi_gen/core/utils.py

@@ -341,6 +341,7 @@ class DataclassSerializer:
     @staticmethod
     def _serialize_with_tracking(obj: Any, visited: Set[int]) -> Any:
         """Internal serialization method with circular reference tracking."""
+        from enum import Enum
 
         # Handle None values by excluding them
         if obj is None:
@@ -358,6 +359,10 @@ class DataclassSerializer:
         if isinstance(obj, datetime):
             return obj.isoformat()
 
+        # Handle enum instances
+        if isinstance(obj, Enum) and not isinstance(obj, type):
+            return obj.value
+
         # Handle dataclass instances
         if dataclasses.is_dataclass(obj) and not isinstance(obj, type):
             visited.add(obj_id)

{pyopenapi_gen-0.19.0 → pyopenapi_gen-0.20.0}/tests/core/test_dataclass_serialization.py

@@ -9,6 +9,7 @@ converted to dictionaries before being sent in HTTP requests.
 
 import dataclasses
 from datetime import datetime
+from enum import Enum
 from typing import Any, List, Optional
 
 import pytest
@@ -53,6 +54,42 @@ class ComplexData:
     optional_field: str | None = None
 
 
+class Status(Enum):
+    """Status enum for testing."""
+
+    PENDING = "pending"
+    ACTIVE = "active"
+    INACTIVE = "inactive"
+    COMPLETED = "completed"
+
+
+class Priority(Enum):
+    """Priority enum with integer values for testing."""
+
+    LOW = 1
+    MEDIUM = 2
+    HIGH = 3
+    CRITICAL = 4
+
+
+@dataclasses.dataclass
+class Task:
+    """Task dataclass with enum fields for testing."""
+
+    title: str
+    status: Status
+    priority: Priority
+
+
+@dataclasses.dataclass
+class Project:
+    """Project dataclass with nested enum-containing dataclass for testing."""
+
+    name: str
+    main_task: Task
+    backup_status: Status | None = None
+
+
 class TestDataclassSerializer:
     """Test the DataclassSerializer utility that should be added to core.utils."""
 
@@ -229,6 +266,163 @@ class TestDataclassSerializer:
         assert result == {}
         assert isinstance(result, dict)
 
+    def test_serialize_enum_string_value__converts_to_value__returns_string(self) -> None:
+        """
+        Scenario: Serialize an enum instance with string value
+        Expected Outcome: Returns the enum's underlying value (string)
+        """
+        # Arrange
+        status = Status.ACTIVE
+
+        # Act
+        result = DataclassSerializer.serialize(status)
+
+        # Assert
+        assert result == "active"
+        assert isinstance(result, str)
+
+    def test_serialize_enum_integer_value__converts_to_value__returns_integer(self) -> None:
+        """
+        Scenario: Serialize an enum instance with integer value
+        Expected Outcome: Returns the enum's underlying value (integer)
+        """
+        # Arrange
+        priority = Priority.HIGH
+
+        # Act
+        result = DataclassSerializer.serialize(priority)
+
+        # Assert
+        assert result == 3
+        assert isinstance(result, int)
+
+    def test_serialize_dataclass_with_enum_fields__converts_enums_to_values__returns_proper_dict(self) -> None:
+        """
+        Scenario: Serialize a dataclass containing enum fields
+        Expected Outcome: Enum fields are converted to their underlying values
+        """
+        # Arrange
+        task = Task(title="Implement feature", status=Status.ACTIVE, priority=Priority.HIGH)
+
+        # Act
+        result = DataclassSerializer.serialize(task)
+
+        # Assert
+        expected = {"title": "Implement feature", "status": "active", "priority": 3}
+        assert result == expected
+
+    def test_serialize_nested_dataclass_with_enums__converts_recursively__returns_proper_structure(self) -> None:
+        """
+        Scenario: Serialize nested dataclasses containing enum fields
+        Expected Outcome: All enum fields at all nesting levels are converted to values
+        """
+        # Arrange
+        task = Task(title="Main task", status=Status.COMPLETED, priority=Priority.CRITICAL)
+        project = Project(name="API Project", main_task=task, backup_status=Status.PENDING)
+
+        # Act
+        result = DataclassSerializer.serialize(project)
+
+        # Assert
+        expected = {
+            "name": "API Project",
+            "main_task": {"title": "Main task", "status": "completed", "priority": 4},
+            "backup_status": "pending",
+        }
+        assert result == expected
+
+    def test_serialize_list_with_enum_values__converts_all_enums__returns_list_of_values(self) -> None:
+        """
+        Scenario: Serialize a list containing enum instances
+        Expected Outcome: Each enum in the list is converted to its underlying value
+        """
+        # Arrange
+        statuses = [Status.PENDING, Status.ACTIVE, Status.COMPLETED]
+
+        # Act
+        result = DataclassSerializer.serialize(statuses)
+
+        # Assert
+        expected = ["pending", "active", "completed"]
+        assert result == expected
+
+    def test_serialize_dict_with_enum_values__converts_enum_values__preserves_keys(self) -> None:
+        """
+        Scenario: Serialize a dictionary with enum values
+        Expected Outcome: Enum values are converted while dictionary keys are preserved
+        """
+        # Arrange
+        status_map = {"current": Status.ACTIVE, "previous": Status.PENDING, "target": Status.COMPLETED}
+
+        # Act
+        result = DataclassSerializer.serialize(status_map)
+
+        # Assert
+        expected = {"current": "active", "previous": "pending", "target": "completed"}
+        assert result == expected
+
+    def test_serialize_dataclass_with_optional_enum_none__excludes_none_value__returns_clean_dict(self) -> None:
+        """
+        Scenario: Serialize a dataclass with optional enum field set to None
+        Expected Outcome: None enum field is excluded from the result
+        """
+        # Arrange
+        task = Task(title="Simple task", status=Status.PENDING, priority=Priority.LOW)
+        project = Project(name="Simple project", main_task=task)  # backup_status is None
+
+        # Act
+        result = DataclassSerializer.serialize(project)
+
+        # Assert
+        expected = {
+            "name": "Simple project",
+            "main_task": {"title": "Simple task", "status": "pending", "priority": 1},
+        }
+        assert result == expected
+        assert "backup_status" not in result
+
+    def test_serialize_mixed_dataclass_with_enums_and_complex_types__handles_all_types__returns_complete_dict(
+        self,
+    ) -> None:
+        """
+        Scenario: Serialize a dataclass containing enums, dates, lists, and nested structures
+        Expected Outcome: All types including enums are properly serialized
+        """
+
+        # Arrange
+        @dataclasses.dataclass
+        class ComplexTask:
+            title: str
+            status: Status
+            priority: Priority
+            created_at: datetime
+            tags: List[str]
+            metadata: dict[str, Any]
+
+        created_at = datetime(2023, 6, 15, 9, 30, 0)
+        task = ComplexTask(
+            title="Complex task",
+            status=Status.ACTIVE,
+            priority=Priority.HIGH,
+            created_at=created_at,
+            tags=["urgent", "api"],
+            metadata={"version": "2.0", "retries": 3},
+        )
+
+        # Act
+        result = DataclassSerializer.serialize(task)
+
+        # Assert
+        expected = {
+            "title": "Complex task",
+            "status": "active",
+            "priority": 3,
+            "created_at": "2023-06-15T09:30:00",
+            "tags": ["urgent", "api"],
+            "metadata": {"version": "2.0", "retries": 3},
+        }
+        assert result == expected
+
 
 class TestGeneratedClientDataclassIntegration:
     """Test that generated client code properly integrates dataclass serialization."""

{pyopenapi_gen-0.19.0 → pyopenapi_gen-0.20.0}/tests/end_to_end/test_dataclass_serialization_e2e.py

@@ -7,11 +7,9 @@ Expected Outcome: Generated endpoint methods include DataclassSerializer calls
 and proper imports for seamless dataclass handling.
 """
 
-from unittest.mock import MagicMock
-
 from pyopenapi_gen.context.render_context import RenderContext
 from pyopenapi_gen.http_types import HTTPMethod
-from pyopenapi_gen.ir import IROperation, IRRequestBody, IRSchema
+from pyopenapi_gen.ir import IROperation, IRRequestBody, IRResponse, IRSchema
 from pyopenapi_gen.visit.endpoint.generators.endpoint_method_generator import EndpointMethodGenerator
 
 
@@ -20,10 +18,15 @@ class TestDataclassSerializationEndToEnd:
 
     def test_generate_endpoint_with_json_body__includes_serializer__complete_method(self) -> None:
         """
-        Scenario: Generate complete endpoint method with JSON body parameter
+        Scenario: Generate complete endpoint method with JSON body parameter using real RenderContext
         Expected Outcome: Generated code includes DataclassSerializer import and usage
         """
-        # Arrange
+        # Arrange - Use real RenderContext instead of mocks
+        context = RenderContext(
+            output_package_name="test_package",
+            core_package_name="test_package.core",
+        )
+
         operation = IROperation(
             operation_id="create_user",
             summary="Create a new user",
@@ -37,27 +40,28 @@ class TestDataclassSerializationEndToEnd:
                 content={"application/json": IRSchema(type="CreateUserRequest", description="User creation data")},
                 required=True,
             ),
-            responses=[],
+            responses=[
+                IRResponse(
+                    status_code="201",
+                    description="User created",
+                    content={"application/json": IRSchema(type="User", description="Created user")},
+                )
+            ],
         )
 
-        # Mock render context
-        context = MagicMock(spec=RenderContext)
-        context.core_package_name = "test_core"
-        context.add_import = MagicMock()
-        context.add_typing_imports_for_type = MagicMock()
-
         # Create generator
         generator = EndpointMethodGenerator()
 
-        # Act
+        # Act - Generate code with real context
         generated_code = generator.generate(operation, context)
 
-        # Assert
-        # Check that the generated code includes DataclassSerializer
-        assert "DataclassSerializer.serialize" in generated_code
+        # Assert - Validate generated code structure
+        assert "DataclassSerializer.serialize" in generated_code, "Should include DataclassSerializer usage"
 
-        # Check that the import was added
-        context.add_import.assert_any_call("test_core.utils", "DataclassSerializer")
+        # Verify import was registered in real context
+        imports = context.import_collector.imports
+        serializer_import_found = "DataclassSerializer" in imports.get("test_package.core.utils", set())
+        assert serializer_import_found, "DataclassSerializer import should be registered"
 
         # Check that the generated code structure is correct
         assert "async def create_user" in generated_code
@@ -75,10 +79,15 @@ class TestDataclassSerializationEndToEnd:
 
     def test_generate_endpoint_without_body__no_serializer__clean_method(self) -> None:
         """
-        Scenario: Generate endpoint method without body parameter (GET request)
+        Scenario: Generate endpoint method without body parameter (GET request) using real RenderContext
         Expected Outcome: Generated code does not include DataclassSerializer
         """
-        # Arrange
+        # Arrange - Use real RenderContext instead of mocks
+        context = RenderContext(
+            output_package_name="test_package",
+            core_package_name="test_package.core",
+        )
+
         operation = IROperation(
             operation_id="get_users",
             summary="Get all users",
@@ -88,31 +97,28 @@ class TestDataclassSerializationEndToEnd:
             tags=["users"],
             parameters=[],
             request_body=None,
-            responses=[],
+            responses=[
+                IRResponse(
+                    status_code="200",
+                    description="Success",
+                    content={"application/json": IRSchema(type="list[User]", description="List of users")},
+                )
+            ],
         )
 
-        # Mock render context
-        context = MagicMock(spec=RenderContext)
-        context.core_package_name = "test_core"
-        context.add_import = MagicMock()
-        context.add_typing_imports_for_type = MagicMock()
-
         # Create generator
         generator = EndpointMethodGenerator()
 
-        # Act
+        # Act - Generate code with real context
         generated_code = generator.generate(operation, context)
 
-        # Assert
-        # Check that the generated code does NOT include DataclassSerializer
-        assert "DataclassSerializer" not in generated_code
+        # Assert - Validate generated code does NOT include serializer
+        assert "DataclassSerializer" not in generated_code, "GET requests should not use DataclassSerializer"
 
-        # Check that the import was NOT added
-        import_calls = context.add_import.call_args_list
-        serializer_imports = [
-            call for call in import_calls if len(call[0]) >= 2 and "DataclassSerializer" in str(call[0][1])
-        ]
-        assert len(serializer_imports) == 0, "DataclassSerializer should not be imported for bodyless requests"
+        # Verify import was NOT registered in real context
+        imports = context.import_collector.imports
+        serializer_import_found = any("DataclassSerializer" in module_imports for module_imports in imports.values())
+        assert not serializer_import_found, "DataclassSerializer should not be imported for bodyless requests"
 
         # Check basic structure
         assert "async def get_users" in generated_code
@@ -120,10 +126,15 @@ class TestDataclassSerializationEndToEnd:
 
     def test_generated_code_formatting__preserves_style__clean_output(self) -> None:
         """
-        Scenario: Verify that generated code with DataclassSerializer maintains proper formatting
+        Scenario: Verify that generated code with DataclassSerializer maintains proper formatting using real RenderContext
         Expected Outcome: Generated code is properly formatted with correct indentation and structure
         """
-        # Arrange
+        # Arrange - Use real RenderContext instead of mocks
+        context = RenderContext(
+            output_package_name="test_package",
+            core_package_name="test_package.core",
+        )
+
         operation = IROperation(
             operation_id="update_user",
             summary="Update a user",
@@ -137,26 +148,26 @@ class TestDataclassSerializationEndToEnd:
                 content={"application/json": IRSchema(type="UpdateUserRequest", description="User update data")},
                 required=True,
             ),
-            responses=[],
+            responses=[
+                IRResponse(
+                    status_code="200",
+                    description="User updated",
+                    content={"application/json": IRSchema(type="User", description="Updated user")},
+                )
+            ],
         )
 
-        context = MagicMock(spec=RenderContext)
-        context.core_package_name = "test_core"
-        context.add_import = MagicMock()
-        context.add_typing_imports_for_type = MagicMock()
-
         generator = EndpointMethodGenerator()
 
-        # Act
+        # Act - Generate code with real context
         generated_code = generator.generate(operation, context)
 
-        # Assert
-        # Check that the code is properly formatted
+        # Assert - Validate code formatting
         lines = generated_code.split("\n")
 
         # Find the json_body assignment line
         json_body_lines = [line for line in lines if "json_body:" in line and "DataclassSerializer" in line]
-        assert len(json_body_lines) == 1
+        assert len(json_body_lines) == 1, f"Expected exactly one json_body assignment, got: {json_body_lines}"
 
         json_body_line = json_body_lines[0]