Schema-First 0.16.2__tar.gz → 0.16.4__tar.gz

{schema_first-0.16.2 → schema_first-0.16.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Schema-First
-Version: 0.16.2
+Version: 0.16.4
 Summary: OpenAPI specification validator and converter to Marshmallow schemas.
 Author-email: Konstantin Fadeev <jredkiy@yandex.ru>
 License-Expression: LGPL-2.1-only

{schema_first-0.16.2 → schema_first-0.16.4}/pyproject.toml

@@ -20,7 +20,7 @@ license-files = ["LICENSE.txt"]
 name = "Schema-First"
 readme = "README.md"
 requires-python = ">=3.12"
-version = "0.16.2"
+version = "0.16.4"
 
 [project.optional-dependencies]
 dev = [
@@ -40,7 +40,7 @@ changelog = "https://github.com/flask-pro/schema-first/blob/master/CHANGES.md"
 repository = "https://github.com/flask-pro/schema-first"
 
 [tool.bandit]
-exclude_dirs = ["tests"]
+exclude_dirs = ["tests", "venv"]
 
 [tool.black]
 extend-exclude = '''
@@ -51,7 +51,7 @@ extend-exclude = '''
 include = '\.pyi?$'
 line-length = 100
 skip-string-normalization = true
-target-version = ['py313']
+target-version = ['py312']
 
 [tool.isort]
 include_trailing_comma = true

{schema_first-0.16.2 → schema_first-0.16.4}/src/Schema_First.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Schema-First
-Version: 0.16.2
+Version: 0.16.4
 Summary: OpenAPI specification validator and converter to Marshmallow schemas.
 Author-email: Konstantin Fadeev <jredkiy@yandex.ru>
 License-Expression: LGPL-2.1-only

schema_first-0.16.4/src/schema_first/openapi/schemas/base.py

@@ -0,0 +1,15 @@
+from marshmallow import RAISE
+from marshmallow import Schema
+
+from schema_first.openapi.schemas.fields import DESCRIPTION_FIELD
+from schema_first.openapi.schemas.fields import SUMMARY_FIELD
+
+
+class BaseSchema(Schema):
+    class Meta:
+        unknown = RAISE
+
+
+class DocStringFields(Schema):
+    summary = SUMMARY_FIELD
+    description = DESCRIPTION_FIELD

{schema_first-0.16.2 → schema_first-0.16.4}/src/schema_first/openapi/schemas/v3_2/info_object_schema.py

@@ -1,11 +1,11 @@
 from marshmallow import fields
 from marshmallow import validate
 
-from ..base import BaseSchema
-from ..base import DocStringFields
-from ..constants import RE_VERSION
-from .contact_object_schema import ContactObjectSchema
-from .license_object_schema import LicenseObjectSchema
+from schema_first.openapi.schemas.base import BaseSchema
+from schema_first.openapi.schemas.base import DocStringFields
+from schema_first.openapi.schemas.constants import RE_VERSION
+from schema_first.openapi.schemas.v3_2.contact_object_schema import ContactObjectSchema
+from schema_first.openapi.schemas.v3_2.license_object_schema import LicenseObjectSchema
 
 
 class InfoObjectSchema(DocStringFields, BaseSchema):

{schema_first-0.16.2 → schema_first-0.16.4}/src/schema_first/query/validator.py

@@ -85,6 +85,12 @@ class HTTPQueryValidator:
                 body_schema = content_type.get('schema')
                 if body_schema:
                     response_fields['body'] = fields.Nested(body_schema)
+            elif 'application/octet-stream' in content:
+                response_fields['content_type'] = fields.String()
+                response_fields['body'] = fields.Raw()
+            else:
+                raise NotImplementedError
+
         else:
             # If body must be empty.
             if data.get('content_type'):

{schema_first-0.16.2 → schema_first-0.16.4}/src/schema_first/specification/__init__.py

@@ -8,6 +8,7 @@ from marshmallow import RAISE
 from marshmallow import Schema
 from marshmallow import validate
 from marshmallow.fields import Field
+from marshmallow.fields import Nested
 
 from schema_first.openapi import OpenAPI
 from schema_first.specification.spilli_api import ConverterOpenAPIToSpilliAPI
@@ -103,8 +104,8 @@ class Specification:
         initialized_schema.required = field_schema.get('required', False)
         return initialized_schema
 
-    def _convert_field_any_type(self, field_schema: dict):
-        field_schema_converters = {
+    def _convert_field_any_type(self, field_schema: dict, as_schema: bool = False):
+        _converters = {
             'string': self._convert_string_field,
             'boolean': self._convert_boolean_field,
             'number': self._convert_number_field,
@@ -112,8 +113,14 @@ class Specification:
             'object': self._convert_object_field,
             'array': self._convert_array_field,
         }
+
+        field_type = field_schema['type']
+
         try:
-            converted_field_schema = field_schema_converters[field_schema['type']](field_schema)
+            if field_type in ['object']:
+                converted_field_schema = _converters[field_type](field_schema, as_schema=as_schema)
+            else:
+                converted_field_schema = _converters[field_type](field_schema)
         except KeyError:
             raise NotImplementedError(
                 f'Schema <{field_schema}> for type <{field_schema["type"]}> not be converted.'
@@ -121,7 +128,9 @@ class Specification:
 
         return converted_field_schema
 
-    def _convert_object_field(self, open_api_schema: dict) -> type[Schema]:
+    def _convert_object_field(
+        self, open_api_schema: dict, many: bool = False, as_schema: bool = False
+    ) -> type[Schema] | Nested:
         marshmallow_schema = {}
         required_fields = open_api_schema.get('required', [])
         for field_name, field_schema in open_api_schema['properties'].items():
@@ -136,13 +145,15 @@ class Specification:
         else:
             marshmallow_schema['unknown'] = INCLUDE
 
-        return Schema.from_dict(marshmallow_schema)
+        if as_schema:
+            return Schema.from_dict(marshmallow_schema)
+
+        return fields.Nested(Schema.from_dict(marshmallow_schema), many=many)
 
     def _convert_array_field(self, open_api_schema: dict) -> Field:
         array_item_schema = open_api_schema['items']
         if array_item_schema['type'] == 'object':
-            nested_field = self._convert_object_field(array_item_schema)
-            array_field = fields.Nested(nested_field, many=True)
+            array_field = self._convert_object_field(array_item_schema, many=True)
         else:
             nested_field = FIELDS_VIA_TYPES[array_item_schema['type']]()
             array_field = fields.List(nested_field)
@@ -154,7 +165,7 @@ class Specification:
                 # Checking for object type is needed to skip already resolved schemes.
                 # This is necessary because of passing variables by reference in Python.
                 if k == 'schema' and isinstance(v, dict):
-                    obj[k] = self._convert_field_any_type(v)
+                    obj[k] = self._convert_field_any_type(v, as_schema=True)
                 else:
                     self._reassembly_of_schemas(v)
 

{schema_first-0.16.2 → schema_first-0.16.4}/tests/test_query_validators.py

@@ -178,6 +178,24 @@ def test_query_validators__response__empty_body_in_spec(fx_openapi_3_2_0, fx_ope
     assert serialized_request == request
 
 
+def test_query_validators__binary_response(fx_openapi_3_2_0, fx_open_spec):
+    file_path = fx_openapi_3_2_0('query_validator/binary_response.yaml')
+    spec = fx_open_spec(file_path)
+    query_validator = HTTPQueryValidator(spec)
+
+    request = {
+        'endpoint': '/endpoint',
+        'method': 'get',
+        'content_type': 'multipart/form-data',
+        'status_code': '200',
+        'body': b'content',
+    }
+
+    serialized_request = query_validator.response_handler(**request)
+
+    assert serialized_request == request
+
+
 def test_query_validators__response__empty_body_in_spec_error(fx_openapi_3_2_0, fx_open_spec):
     file_path = fx_openapi_3_2_0('query_validator/empty_body.yaml')
     spec = fx_open_spec(file_path)

{schema_first-0.16.2 → schema_first-0.16.4}/tests/test_specification.py

@@ -62,7 +62,7 @@ def test_specification__multifile_required(fx_spec_as_file, fx_spec_required):
 
 @pytest.mark.xfail(reason='Schema specification not fully realisation.')
 def test_specification__multifile():
-    file_path = Path(tests_dir_abspath, '_contrib', 'specs', 'v3.2', 'multifile', 'openapi.yaml')
+    file_path = Path(tests_dir_abspath, 'specs', 'openapi', 'v3.2', 'multifile', 'openapi.yaml')
     spec_as_dict, base_uri = read_from_filename(file_path)
     osv_validate(spec_as_dict, base_uri=base_uri)
 

schema_first-0.16.2/src/schema_first/openapi/schemas/base.py

@@ -1,28 +0,0 @@
-from marshmallow import RAISE
-from marshmallow import Schema
-from marshmallow import validates_schema
-from marshmallow import ValidationError
-
-from schema_first.openapi.schemas.fields import DESCRIPTION_FIELD
-from schema_first.openapi.schemas.fields import SUMMARY_FIELD
-
-
-class BaseSchema(Schema):
-    class Meta:
-        unknown = RAISE
-
-    @validates_schema
-    def validate_ref(self, data, **kwargs) -> None:
-        if 'ref' in data:
-            ALLOWED_FIELDS = {'ref', 'description', 'summary'}
-            ALL_FIELDS = set(data)
-            if ALL_FIELDS.difference(ALLOWED_FIELDS):
-                raise ValidationError(
-                    f"If there is a <'ref'> field, then only <{ALLOWED_FIELDS}>,"
-                    f" but set <{ALL_FIELDS}>"
-                )
-
-
-class DocStringFields(Schema):
-    summary = SUMMARY_FIELD
-    description = DESCRIPTION_FIELD