Schema-First 0.14.2__tar.gz → 0.14.4__tar.gz

{schema_first-0.14.2 → schema_first-0.14.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Schema-First
-Version: 0.14.2
+Version: 0.14.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.14.2 → schema_first-0.14.4}/pyproject.toml

@@ -20,7 +20,7 @@ license-files = ["LICENSE.txt"]
 name = "Schema-First"
 readme = "README.md"
 requires-python = ">=3.14"
-version = "0.14.2"
+version = "0.14.4"
 
 [project.optional-dependencies]
 dev = [
@@ -38,6 +38,9 @@ dev = [
 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"]
+
 [tool.black]
 extend-exclude = '''
 # A regex preceded with ^/ will apply only to files and directories

{schema_first-0.14.2 → schema_first-0.14.4}/src/Schema_First.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Schema-First
-Version: 0.14.2
+Version: 0.14.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.14.4/src/schema_first/__init__.py

@@ -0,0 +1,3 @@
+from schema_first.specification import Specification
+
+__all__ = ['Specification']

schema_first-0.14.4/src/schema_first/loaders/__init__.py

@@ -0,0 +1,3 @@
+from schema_first.loaders.yaml_loader import load_from_yaml
+
+__all__ = ['load_from_yaml']

{schema_first-0.14.2 → schema_first-0.14.4}/src/schema_first/loaders/exc.py

@@ -1,4 +1,4 @@
-from ..exceptions import SchemaFirstException
+from schema_first.exceptions import SchemaFirstException
 
 
 class YAMLReaderError(SchemaFirstException):

{schema_first-0.14.2 → schema_first-0.14.4}/src/schema_first/loaders/yaml_loader.py

@@ -6,8 +6,8 @@ from typing import Any
 
 import yaml
 
-from .exc import ResolverError
-from .exc import YAMLReaderError
+from schema_first.loaders.exc import ResolverError
+from schema_first.loaders.exc import YAMLReaderError
 
 
 class YAMLReader:

{schema_first-0.14.2 → schema_first-0.14.4}/src/schema_first/openapi/__init__.py

@@ -3,9 +3,9 @@ from pprint import pformat
 
 from marshmallow import ValidationError
 
-from ..loaders.yaml_loader import load_from_yaml
-from .exc import OpenAPIValidationError
-from .schemas.v3_2.openapi_object_schema import OpenAPIObjectSchema
+from schema_first.loaders.yaml_loader import load_from_yaml
+from schema_first.openapi.exc import OpenAPIValidationError
+from schema_first.openapi.schemas.v3_2.openapi_object_schema import OpenAPIObjectSchema
 
 
 class OpenAPI:

{schema_first-0.14.2 → schema_first-0.14.4}/src/schema_first/openapi/exc.py

@@ -1,4 +1,4 @@
-from ..exceptions import SchemaFirstException
+from schema_first.exceptions import SchemaFirstException
 
 
 class OpenAPIValidationError(SchemaFirstException):

{schema_first-0.14.2 → schema_first-0.14.4}/src/schema_first/openapi/schemas/base.py

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

{schema_first-0.14.2 → schema_first-0.14.4}/src/schema_first/openapi/schemas/v3_2/contact_object_schema.py

@@ -1,6 +1,6 @@
 from marshmallow import fields
 
-from ..base import BaseSchema
+from schema_first.openapi.schemas.base import BaseSchema
 
 
 class ContactObjectSchema(BaseSchema):

{schema_first-0.14.2 → schema_first-0.14.4}/src/schema_first/openapi/schemas/v3_2/example_object_schema.py

@@ -3,9 +3,9 @@ from marshmallow import validate
 from marshmallow import validates_schema
 from marshmallow import ValidationError
 
-from ..base import BaseSchema
-from ..base import DocStringFields
-from .schema_object_schema import SchemaObjectSchema
+from schema_first.openapi.schemas.base import BaseSchema
+from schema_first.openapi.schemas.base import DocStringFields
+from schema_first.openapi.schemas.v3_2.schema_object_schema import SchemaObjectSchema
 
 
 class ExampleObjectSchema(DocStringFields, BaseSchema):

{schema_first-0.14.2 → schema_first-0.14.4}/src/schema_first/specification/__init__.py

@@ -1,3 +1,4 @@
+from copy import deepcopy
 from pathlib import Path
 from typing import Any
 
@@ -157,7 +158,8 @@ class Specification:
     def load(self) -> Specification:
         self.openapi.load()
 
-        self.reassembly_spec = ConverterOpenAPIToSpilliAPI(self.openapi.raw_spec).convert()
+        self.spilli_api = ConverterOpenAPIToSpilliAPI(self.openapi.raw_spec).convert()
+        self.reassembly_spec = deepcopy(self.spilli_api)
         self._reassembly_of_schemas(self.reassembly_spec)
 
         return self

{schema_first-0.14.2 → schema_first-0.14.4}/src/schema_first/specification/spilli_api.py

@@ -11,10 +11,7 @@ class ConverterOpenAPIToSpilliAPI:
     def _convert_params_to_schema(
         self, params: list[dict], place: t.Literal['header', 'cookie', 'path', 'query']
     ) -> Any | None:
-        schema = {
-            'type': 'object',
-            'additionalProperties': True,
-        }
+        schema = {'type': 'object', 'additionalProperties': True}
 
         required = []
         properties = {}
@@ -47,18 +44,22 @@ class ConverterOpenAPIToSpilliAPI:
 
         return params_as_dict
 
-    def _make_to_spilli_api_format(self) -> None:
-        self.spilli_api_spec = json.loads(json.dumps(self.open_api_spec))
-
+    def _convert_method_params(self) -> None:
         for _, methods in self.spilli_api_spec['paths'].items():
-            common_params = []
-            if 'parameters' in methods:
-                common_params = methods.pop('parameters', [])
+            common_params = methods.pop('parameters', [])
+
+            for method, operation_obj in methods.items():
+                if method in ('summary', 'description', 'servers'):
+                    continue
 
-            for _, operation_obj in methods.items():
-                if 'parameters' in operation_obj:
-                    method_params = common_params + operation_obj.pop('parameters', [])
-                    operation_obj['parameters'] = self._params_list_to_dict(method_params)
+                method_params = operation_obj.get('parameters', [])
+                all_method_params = common_params + method_params
+                if all_method_params:
+                    operation_obj['parameters'] = self._params_list_to_dict(all_method_params)
+
+    def _make_to_spilli_api_format(self) -> None:
+        self.spilli_api_spec = json.loads(json.dumps(self.open_api_spec))
+        self._convert_method_params()
 
     def convert(self) -> dict:
         self._make_to_spilli_api_format()

{schema_first-0.14.2 → schema_first-0.14.4}/tests/test_specification.py

@@ -21,10 +21,14 @@ def test_specification(request, fx_spec_as_file, fx):
     spec = Specification(spec_file)
 
     assert spec.openapi
+    assert spec.spilli_api is None
     assert spec.reassembly_spec is None
 
     spec.load()
 
+    assert isinstance(spec.spilli_api, dict)
+    assert isinstance(spec.reassembly_spec, dict)
+
     request_schema = get_schema_from_request(spec.reassembly_spec, '/required-endpoint', '200')
     assert isinstance(request_schema(), Schema)
     assert isinstance(request_schema().fields['message'], fields.String)

schema_first-0.14.2/src/schema_first/__init__.py

@@ -1,3 +0,0 @@
-from .specification import Specification
-
-__all__ = ['Specification']

schema_first-0.14.2/src/schema_first/loaders/__init__.py

@@ -1,3 +0,0 @@
-from .yaml_loader import load_from_yaml
-
-__all__ = ['load_from_yaml']