Merge branch 'main' into issue-1090-merge-allof

Author: eli-bl

.changeset/correctly_resolve_references_to_a_type_that_is_itself_just_a_single_allof_reference.md

@@ -24,6 +24,9 @@ dmypy.json
 # JetBrains
 .idea/
 
+# Visual Studio Code
+.vscode/
+
 test-reports/
 
 /coverage.xml

.gitignore

@@ -13,6 +13,26 @@ Programmatic usage of this project (e.g., importing it as a Python module) and t
 
 The 0.x prefix used in versions for this project is to indicate that breaking changes are expected frequently (several times a year). Breaking changes will increment the minor number, all other changes will increment the patch number. You can track the progress toward 1.0 [here](https://github.com/openapi-generators/openapi-python-client/projects/2).
 
+## 0.21.4 (2024-08-25)
+
+### Fixes
+
+#### Allow OpenAPI 3.1-style `exclusiveMinimum` and `exclusiveMaximum`
+
+Fixed by PR #1092. Thanks @mikkelam!
+
+#### Add missing `cast` import when using `const`
+
+Fixed by PR #1072. Thanks @dorcohe!
+
+#### Correctly resolve references to a type that is itself just a single allOf reference
+
+PR #1103 fixed issue #1091. Thanks @eli-bl!
+
+#### Support `const` booleans and floats
+
+Fixed in PR #1086. Thanks @flxdot!
+
 ## 0.21.3 (2024-08-18)
 
 ### Features

CHANGELOG.md

@@ -27,7 +27,7 @@ class ConstProperty(PropertyProtocol):
     def build(
         cls,
         *,
-        const: str | int,
+        const: str | int | float | bool,
         default: Any,
         name: str,
         python_name: PythonIdentifier,
@@ -115,6 +115,6 @@ def get_imports(self, *, prefix: str) -> set[str]:
         if self.required:
             return {"from typing import Literal"}
         return {
-            "from typing import Literal, Union",
+            "from typing import Literal, Union, cast",
             f"from {prefix}types import UNSET, Unset",
         }

integration-tests/pdm.lock

@@ -1,6 +1,6 @@
 from typing import Any, Dict, List, Optional, Union
 
-from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr, model_validator
+from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictFloat, StrictInt, StrictStr, model_validator
 
 from ..data_type import DataType
 from .discriminator import Discriminator
@@ -23,9 +23,9 @@ class Schema(BaseModel):
     title: Optional[str] = None
     multipleOf: Optional[float] = Field(default=None, gt=0.0)
     maximum: Optional[float] = None
-    exclusiveMaximum: Optional[bool] = None
+    exclusiveMaximum: Optional[Union[bool, float]] = None
     minimum: Optional[float] = None
-    exclusiveMinimum: Optional[bool] = None
+    exclusiveMinimum: Optional[Union[bool, float]] = None
     maxLength: Optional[int] = Field(default=None, ge=0)
     minLength: Optional[int] = Field(default=None, ge=0)
     pattern: Optional[str] = None
@@ -36,7 +36,7 @@ class Schema(BaseModel):
     minProperties: Optional[int] = Field(default=None, ge=0)
     required: Optional[List[str]] = Field(default=None, min_length=1)
     enum: Union[None, List[Any]] = Field(default=None, min_length=1)
-    const: Union[None, StrictStr, StrictInt] = None
+    const: Union[None, StrictStr, StrictInt, StrictFloat, StrictBool] = None
     type: Union[DataType, List[DataType], None] = Field(default=None)
     allOf: List[Union[Reference, "Schema"]] = Field(default_factory=list)
     oneOf: List[Union[Reference, "Schema"]] = Field(default_factory=list)
@@ -160,6 +160,33 @@ class Schema(BaseModel):
         },
     )
 
+    @model_validator(mode="after")
+    def handle_exclusive_min_max(self) -> "Schema":
+        """
+        Convert exclusiveMinimum/exclusiveMaximum between OpenAPI v3.0 (bool) and v3.1 (numeric).
+        """
+        # Handle exclusiveMinimum
+        if isinstance(self.exclusiveMinimum, bool) and self.minimum is not None:
+            if self.exclusiveMinimum:
+                self.exclusiveMinimum = self.minimum
+                self.minimum = None
+            else:
+                self.exclusiveMinimum = None
+        elif isinstance(self.exclusiveMinimum, float):
+            self.minimum = None
+
+        # Handle exclusiveMaximum
+        if isinstance(self.exclusiveMaximum, bool) and self.maximum is not None:
+            if self.exclusiveMaximum:
+                self.exclusiveMaximum = self.maximum
+                self.maximum = None
+            else:
+                self.exclusiveMaximum = None
+        elif isinstance(self.exclusiveMaximum, float):
+            self.maximum = None
+
+        return self
+
     @model_validator(mode="after")
     def handle_nullable(self) -> "Schema":
         """Convert the old 3.0 `nullable` property into the new 3.1 style"""