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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Schema-First
-Version: 0.16.0
+Version: 0.16.2
 Summary: OpenAPI specification validator and converter to Marshmallow schemas.
 Author-email: Konstantin Fadeev <jredkiy@yandex.ru>
 License-Expression: LGPL-2.1-only
@@ -16,11 +16,11 @@ Provides-Extra: dev
 Requires-Dist: bandit>=1.9.3; extra == "dev"
 Requires-Dist: build>=1.4.0; extra == "dev"
 Requires-Dist: openapi-spec-validator>=0.7.1; extra == "dev"
-Requires-Dist: pre-commit>=4.5.1; extra == "dev"
+Requires-Dist: pre-commit>=4.6.2; extra == "dev"
 Requires-Dist: pytest>=9.1.1; extra == "dev"
 Requires-Dist: pytest-cov>=7.0.0; extra == "dev"
 Requires-Dist: python-dotenv>=1.2.1; extra == "dev"
-Requires-Dist: tox==4.18.0; extra == "dev"
+Requires-Dist: tox==4.59.0; extra == "dev"
 Requires-Dist: twine==6.2.0; extra == "dev"
 
 # Schema-First

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

@@ -20,18 +20,18 @@ license-files = ["LICENSE.txt"]
 name = "Schema-First"
 readme = "README.md"
 requires-python = ">=3.12"
-version = "0.16.0"
+version = "0.16.2"
 
 [project.optional-dependencies]
 dev = [
   "bandit>=1.9.3",
   "build>=1.4.0",
   'openapi-spec-validator>=0.7.1',
-  "pre-commit>=4.5.1",
+  "pre-commit>=4.6.2",
   "pytest>=9.1.1",
   "pytest-cov>=7.0.0",
   "python-dotenv>=1.2.1",
-  "tox==4.18.0",
+  "tox==4.59.0",
   "twine==6.2.0"
 ]
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Schema-First
-Version: 0.16.0
+Version: 0.16.2
 Summary: OpenAPI specification validator and converter to Marshmallow schemas.
 Author-email: Konstantin Fadeev <jredkiy@yandex.ru>
 License-Expression: LGPL-2.1-only
@@ -16,11 +16,11 @@ Provides-Extra: dev
 Requires-Dist: bandit>=1.9.3; extra == "dev"
 Requires-Dist: build>=1.4.0; extra == "dev"
 Requires-Dist: openapi-spec-validator>=0.7.1; extra == "dev"
-Requires-Dist: pre-commit>=4.5.1; extra == "dev"
+Requires-Dist: pre-commit>=4.6.2; extra == "dev"
 Requires-Dist: pytest>=9.1.1; extra == "dev"
 Requires-Dist: pytest-cov>=7.0.0; extra == "dev"
 Requires-Dist: python-dotenv>=1.2.1; extra == "dev"
-Requires-Dist: tox==4.18.0; extra == "dev"
+Requires-Dist: tox==4.59.0; extra == "dev"
 Requires-Dist: twine==6.2.0; extra == "dev"
 
 # Schema-First

{schema_first-0.16.0 → schema_first-0.16.2}/src/Schema_First.egg-info/requires.txt

@@ -5,9 +5,9 @@ PyYAML>=6.0.3
 bandit>=1.9.3
 build>=1.4.0
 openapi-spec-validator>=0.7.1
-pre-commit>=4.5.1
+pre-commit>=4.6.2
 pytest>=9.1.1
 pytest-cov>=7.0.0
 python-dotenv>=1.2.1
-tox==4.18.0
+tox==4.59.0
 twine==6.2.0

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

@@ -1,6 +1,7 @@
 import typing as t
 
 from marshmallow import fields
+from marshmallow import INCLUDE
 from marshmallow import Schema
 from marshmallow import ValidationError
 
@@ -49,10 +50,18 @@ class HTTPQueryValidator:
                 if not params_schema:
                     continue
 
-                request_fields[name_params] = fields.Nested(params_schema)
+                if name_params == 'headers':
+                    request_fields[name_params] = fields.Nested(params_schema, unknown=INCLUDE)
+                else:
+                    request_fields[name_params] = fields.Nested(params_schema)
+
+                if 'headers' not in parameters:
+                    request_fields['headers'] = fields.Raw()
+
+        if not parameters:
+            request_fields['headers'] = fields.Raw()
 
         request_schema = Schema.from_dict(request_fields)
-        request_schema.Meta.unknown = 'raise'
 
         return request_schema
 
@@ -76,6 +85,10 @@ class HTTPQueryValidator:
                 body_schema = content_type.get('schema')
                 if body_schema:
                     response_fields['body'] = fields.Nested(body_schema)
+        else:
+            # If body must be empty.
+            if data.get('content_type'):
+                response_fields['content_type'] = fields.String()
 
         response_schema = Schema.from_dict(response_fields)
         response_schema.Meta.unknown = 'raise'
@@ -119,7 +132,7 @@ class HTTPQueryValidator:
         endpoint: str,
         method: t.Literal['post', 'get', 'update', 'patch', 'delete'],
         status_code: str,
-        content_type: t.Literal['application/json'] or ... = ...,
+        content_type: str or ... = ...,
         body: dict[str, t.Any] or ... = ...,
     ):
         all_kwargs = {

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

@@ -4,6 +4,7 @@ from schema_first.query.exceptions import EndpointValidation
 from schema_first.query.exceptions import QueryValidatorException
 from schema_first.query.exceptions import ResponseValidation
 from schema_first.query.validator import HTTPQueryValidator
+from schema_first.query.validator import RequestValidation
 
 
 def test_query_validators__request(fx_openapi_3_2_0, fx_open_spec):
@@ -67,12 +68,10 @@ def test_query_validators__request__bad_endpoint(fx_openapi_3_2_0, fx_open_spec)
 @pytest.mark.parametrize(
     ('spec', 'data'),
     [
-        ('no_params.yaml', {'headers': {'field': 'value'}}),
         ('only_headers.yaml', {'cookies': {'field': 'value'}}),
         ('only_headers.yaml', {'paths': {'field': 'value'}}),
         ('only_headers.yaml', {'queries': {'field': 'value'}}),
         ('only_headers.yaml', {'content_type': 'application/json', 'body': {'field': 'value'}}),
-        ('only_query.yaml', {'headers': {'field': 'value'}}),
         ('only_headers.yaml', {'body': {'field': 'value'}}),
     ],
 )
@@ -91,6 +90,59 @@ def test_query_validators__request_errors(fx_openapi_3_2_0, fx_open_spec, spec,
         query_validator.request_handler(**request)
 
 
+def test_query_validators__request__headers(fx_openapi_3_2_0, fx_open_spec):
+    file_path = fx_openapi_3_2_0('query_validator/only_headers.yaml')
+    spec = fx_open_spec(file_path)
+    query_validator = HTTPQueryValidator(spec)
+
+    request = {
+        'endpoint': '/endpoint',
+        'method': 'post',
+        'headers': {'header_field': 'value', 'header_field_1': 'value_1'},
+    }
+
+    serialized_request = query_validator.request_handler(**request)
+
+    assert serialized_request == request
+
+
+def test_query_validators__request__headers__errors(fx_openapi_3_2_0, fx_open_spec):
+    file_path = fx_openapi_3_2_0('query_validator/only_headers.yaml')
+    spec = fx_open_spec(file_path)
+    query_validator = HTTPQueryValidator(spec)
+
+    request = {
+        'endpoint': '/endpoint',
+        'method': 'post',
+        'headers': {'header_field': 1, 'header_field_2': 'value_2'},
+    }
+
+    with pytest.raises(RequestValidation) as exc:
+        query_validator.request_handler(**request)
+
+    assert exc.value.args[0] == (
+        "Request <{'endpoint': '/endpoint', 'method': 'post', 'headers': "
+        "{'header_field': 1, 'header_field_2': 'value_2'}}> validation error "
+        "<({'headers': {'header_field': ['Not a valid string.']}},)>."
+    )
+
+
+def test_query_validators__request__headers_not_in_spec(fx_openapi_3_2_0, fx_open_spec):
+    file_path = fx_openapi_3_2_0('query_validator/only_query.yaml')
+    spec = fx_open_spec(file_path)
+    query_validator = HTTPQueryValidator(spec)
+
+    request = {
+        'endpoint': '/endpoint',
+        'method': 'post',
+        'headers': {'header_field_1': 'value_1', 'header_field_2': 'value_2'},
+    }
+
+    serialized_request = query_validator.request_handler(**request)
+
+    assert serialized_request == request
+
+
 def test_query_validators__response(fx_openapi_3_2_0, fx_open_spec):
     file_path = fx_openapi_3_2_0('query_validator/openapi.yaml')
     spec = fx_open_spec(file_path)
@@ -114,7 +166,12 @@ def test_query_validators__response__empty_body_in_spec(fx_openapi_3_2_0, fx_ope
     spec = fx_open_spec(file_path)
     query_validator = HTTPQueryValidator(spec)
 
-    request = {'endpoint': '/endpoint', 'method': 'get', 'status_code': '204'}
+    request = {
+        'endpoint': '/endpoint',
+        'method': 'get',
+        'content_type': 'application/json',
+        'status_code': '204',
+    }
 
     serialized_request = query_validator.response_handler(**request)