Skip to content

Commit d667e25

Browse files
p1c2up1c2u
committed
x-model extension import model class
1 parent 1aece83 commit d667e25

File tree

15 files changed

+180
-185
lines changed

15 files changed

+180
-185
lines changed

‎openapi_core/contrib/django/handlers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def format_openapi_error(cls, error: Exception) -> Dict[str, Any]:
4747
return {
4848
"title": str(error),
4949
"status": cls.OPENAPI_ERROR_STATUS.get(error.__class__, 400),
50-
"class": str(type(error)),
50+
"type": str(type(error)),
5151
}
5252

5353
@classmethod

‎openapi_core/contrib/falcon/handlers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def format_openapi_error(cls, error: Exception) -> Dict[str, Any]:
5353
return {
5454
"title": str(error),
5555
"status": cls.OPENAPI_ERROR_STATUS.get(error.__class__, 400),
56-
"class": str(type(error)),
56+
"type": str(type(error)),
5757
}
5858

5959
@classmethod

‎openapi_core/extensions/models/factories.py

Lines changed: 37 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,51 @@
11
"""OpenAPI X-Model extension factories module"""
2+
from dataclasses import make_dataclass
3+
from pydoc import ErrorDuringImport
4+
from pydoc import locate
25
from typing import Any
36
from typing import Dict
7+
from typing import Iterable
48
from typing import Optional
59
from typing import Type
610

7-
from openapi_core.extensions.models.models import Model
811

12+
class DictFactory:
913

10-
class ModelClassFactory:
11-
12-
base_class = Model
13-
14-
def create(self, name: str) -> Type[Model]:
15-
return type(name, (self.base_class,), {})
14+
base_class = dict
1615

16+
def create(
17+
self, fields: Iterable[str | tuple[str, type] | tuple[str, type, Any]]
18+
) -> Type[Dict[Any, Any]]:
19+
return self.base_class
1720

18-
class ModelFactory:
19-
def __init__(
20-
self, model_class_factory: Optional[ModelClassFactory] = None
21-
):
22-
self.model_class_factory = model_class_factory or ModelClassFactory()
2321

22+
class DataClassFactory(DictFactory):
2423
def create(
25-
self, properties: Optional[Dict[str, Any]], name: Optional[str] = None
26-
) -> Model:
27-
name = name or "Model"
24+
self,
25+
fields: Iterable[str | tuple[str, type] | tuple[str, type, Any]],
26+
name: str = "Model",
27+
) -> Type[Any]:
28+
return make_dataclass(name, fields, frozen=True)
2829

29-
model_class = self._create_class(name)
30-
return model_class(properties)
3130

32-
def _create_class(self, name: str) -> Type[Model]:
33-
return self.model_class_factory.create(name)
31+
class ModelClassImporter(DataClassFactory):
32+
def create(
33+
self,
34+
fields: Iterable[str | tuple[str, type] | tuple[str, type, Any]],
35+
name: str = "Model",
36+
model: Optional[str] = None,
37+
) -> Any:
38+
if model is None:
39+
return super().create(fields, name=name)
40+
41+
model_class = self._get_class(model)
42+
if model_class is not None:
43+
return model_class
44+
45+
return super().create(fields, name=model)
46+
47+
def _get_class(self, model_class_path: str) -> Optional[object]:
48+
try:
49+
return locate(model_class_path)
50+
except ErrorDuringImport:
51+
return None

‎openapi_core/extensions/models/models.py

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎openapi_core/unmarshalling/schemas/unmarshallers.py

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
from typing import TYPE_CHECKING
44
from typing import Any
55
from typing import Dict
6+
from typing import Iterable
67
from typing import List
78
from typing import Optional
89

@@ -16,7 +17,7 @@
1617
from openapi_schema_validator._format import oas30_format_checker
1718
from openapi_schema_validator._types import is_string
1819

19-
from openapi_core.extensions.models.factories import ModelFactory
20+
from openapi_core.extensions.models.factories import ModelClassImporter
2021
from openapi_core.schema.schemas import get_all_properties
2122
from openapi_core.schema.schemas import get_all_properties_names
2223
from openapi_core.spec import Spec
@@ -196,8 +197,8 @@ class ObjectUnmarshaller(ComplexUnmarshaller):
196197
}
197198

198199
@property
199-
def model_factory(self) -> ModelFactory:
200-
return ModelFactory()
200+
def object_class_factory(self) -> ModelClassImporter:
201+
return ModelClassImporter()
201202

202203
def unmarshal(self, value: Any) -> Any:
203204
try:
@@ -230,11 +231,11 @@ def _unmarshal_object(self, value: Any) -> Any:
230231
else:
231232
properties = self._unmarshal_properties(value)
232233

233-
if "x-model" in self.schema:
234-
name = self.schema["x-model"]
235-
return self.model_factory.create(properties, name=name)
234+
model = self.schema.getkey("x-model")
235+
fields: Iterable[str] = properties and properties.keys() or []
236+
object_class = self.object_class_factory.create(fields, model=model)
236237

237-
return properties
238+
return object_class(**properties)
238239

239240
def _unmarshal_properties(
240241
self, value: Any, one_of_schema: Optional[Spec] = None
@@ -253,17 +254,18 @@ def _unmarshal_properties(
253254
additional_properties = self.schema.getkey(
254255
"additionalProperties", True
255256
)
256-
if isinstance(additional_properties, dict):
257-
additional_prop_schema = self.schema / "additionalProperties"
257+
if additional_properties is not False:
258+
# free-form object
259+
if additional_properties is True:
260+
additional_prop_schema = Spec.from_dict({})
261+
# defined schema
262+
else:
263+
additional_prop_schema = self.schema / "additionalProperties"
258264
for prop_name in extra_props:
259265
prop_value = value[prop_name]
260266
properties[prop_name] = self.unmarshallers_factory.create(
261267
additional_prop_schema
262268
)(prop_value)
263-
elif additional_properties is True:
264-
for prop_name in extra_props:
265-
prop_value = value[prop_name]
266-
properties[prop_name] = prop_value
267269

268270
for prop_name, prop in list(all_props.items()):
269271
read_only = prop.getkey("readOnly", False)

‎tests/integration/contrib/django/test_django_project.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def test_get_no_required_param(self, client):
5454
expected_data = {
5555
"errors": [
5656
{
57-
"class": (
57+
"type": (
5858
"<class 'openapi_core.validation.exceptions."
5959
"MissingRequiredParameter'>"
6060
),
@@ -101,7 +101,7 @@ def test_post_server_invalid(self, client):
101101
expected_data = {
102102
"errors": [
103103
{
104-
"class": (
104+
"type": (
105105
"<class 'openapi_core.templating.paths.exceptions."
106106
"ServerNotFound'>"
107107
),
@@ -148,7 +148,7 @@ def test_post_required_header_param_missing(self, client):
148148
expected_data = {
149149
"errors": [
150150
{
151-
"class": (
151+
"type": (
152152
"<class 'openapi_core.validation.exceptions."
153153
"MissingRequiredParameter'>"
154154
),
@@ -176,7 +176,7 @@ def test_post_media_type_invalid(self, client):
176176
expected_data = {
177177
"errors": [
178178
{
179-
"class": (
179+
"type": (
180180
"<class 'openapi_core.templating.media_types."
181181
"exceptions.MediaTypeNotFound'>"
182182
),
@@ -213,7 +213,7 @@ def test_post_required_cookie_param_missing(self, client):
213213
expected_data = {
214214
"errors": [
215215
{
216-
"class": (
216+
"type": (
217217
"<class 'openapi_core.validation.exceptions."
218218
"MissingRequiredParameter'>"
219219
),
@@ -267,7 +267,7 @@ def test_get_unauthorized(self, client):
267267
expected_data = {
268268
"errors": [
269269
{
270-
"class": (
270+
"type": (
271271
"<class 'openapi_core.validation.exceptions."
272272
"InvalidSecurity'>"
273273
),
@@ -289,7 +289,7 @@ def test_delete_method_invalid(self, client):
289289
expected_data = {
290290
"errors": [
291291
{
292-
"class": (
292+
"type": (
293293
"<class 'openapi_core.templating.paths.exceptions."
294294
"OperationNotFound'>"
295295
),

‎tests/integration/contrib/falcon/test_falcon_project.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def test_post_server_invalid(self, client):
6565
expected_data = {
6666
"errors": [
6767
{
68-
"class": (
68+
"type": (
6969
"<class 'openapi_core.templating.paths.exceptions."
7070
"ServerNotFound'>"
7171
),
@@ -119,7 +119,7 @@ def test_post_required_header_param_missing(self, client):
119119
expected_data = {
120120
"errors": [
121121
{
122-
"class": (
122+
"type": (
123123
"<class 'openapi_core.validation.exceptions."
124124
"MissingRequiredParameter'>"
125125
),
@@ -155,7 +155,7 @@ def test_post_media_type_invalid(self, client):
155155
expected_data = {
156156
"errors": [
157157
{
158-
"class": (
158+
"type": (
159159
"<class 'openapi_core.templating.media_types."
160160
"exceptions.MediaTypeNotFound'>"
161161
),
@@ -198,7 +198,7 @@ def test_post_required_cookie_param_missing(self, client):
198198
expected_data = {
199199
"errors": [
200200
{
201-
"class": (
201+
"type": (
202202
"<class 'openapi_core.validation.exceptions."
203203
"MissingRequiredParameter'>"
204204
),
@@ -249,7 +249,7 @@ def test_get_server_invalid(self, client):
249249
expected_data = {
250250
"errors": [
251251
{
252-
"class": (
252+
"type": (
253253
"<class 'openapi_core.templating.paths.exceptions."
254254
"ServerNotFound'>"
255255
),
@@ -283,7 +283,7 @@ def test_get_unauthorized(self, client):
283283
expected_data = {
284284
"errors": [
285285
{
286-
"class": (
286+
"type": (
287287
"<class 'openapi_core.validation.exceptions."
288288
"InvalidSecurity'>"
289289
),
@@ -324,7 +324,7 @@ def test_delete_method_invalid(self, client):
324324
expected_data = {
325325
"errors": [
326326
{
327-
"class": (
327+
"type": (
328328
"<class 'openapi_core.templating.paths.exceptions."
329329
"OperationNotFound'>"
330330
),

‎tests/integration/data/v3.0/petstore.yaml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -81,15 +81,7 @@ paths:
8181
content:
8282
application/json:
8383
schema:
84-
type: object
85-
required:
86-
- lat
87-
- lon
88-
properties:
89-
lat:
90-
type: number
91-
lon:
92-
type: number
84+
$ref: "#/components/schemas/Coordinates"
9385
responses:
9486
'200':
9587
$ref: "#/components/responses/PetsResponse"
@@ -240,6 +232,16 @@ paths:
240232
$ref: "#/components/responses/ErrorResponse"
241233
components:
242234
schemas:
235+
Coordinates:
236+
type: object
237+
required:
238+
- lat
239+
- lon
240+
properties:
241+
lat:
242+
type: number
243+
lon:
244+
type: number
243245
Userdata:
244246
type: object
245247
required:
@@ -411,15 +413,15 @@ components:
411413
required:
412414
- title
413415
- status
414-
- class
416+
- type
415417
properties:
416418
title:
417419
type: string
418420
status:
419421
type: integer
420422
format: int32
421423
default: 400
422-
class:
424+
type:
423425
type: string
424426
StandardErrors:
425427
type: object

0 commit comments

Comments
 (0)