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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Schema-First
-Version: 0.14.0
+Version: 0.14.2
 Summary: OpenAPI specification validator and converter to Marshmallow schemas.
 Author-email: Konstantin Fadeev <jredkiy@yandex.ru>
 License-Expression: LGPL-2.1-only
@@ -8,7 +8,7 @@ Project-URL: changelog, https://github.com/flask-pro/schema-first/blob/master/CH
 Project-URL: repository, https://github.com/flask-pro/schema-first
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Requires-Python: >=3.13
+Requires-Python: >=3.14
 Description-Content-Type: text/markdown
 Requires-Dist: marshmallow>=4.3.0
 Requires-Dist: PyYAML>=6.0.3

{schema_first-0.14.0 → schema_first-0.14.2}/pyproject.toml

@@ -19,8 +19,8 @@ license = "LGPL-2.1-only"
 license-files = ["LICENSE.txt"]
 name = "Schema-First"
 readme = "README.md"
-requires-python = ">=3.13"
-version = "0.14.0"
+requires-python = ">=3.14"
+version = "0.14.2"
 
 [project.optional-dependencies]
 dev = [

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Schema-First
-Version: 0.14.0
+Version: 0.14.2
 Summary: OpenAPI specification validator and converter to Marshmallow schemas.
 Author-email: Konstantin Fadeev <jredkiy@yandex.ru>
 License-Expression: LGPL-2.1-only
@@ -8,7 +8,7 @@ Project-URL: changelog, https://github.com/flask-pro/schema-first/blob/master/CH
 Project-URL: repository, https://github.com/flask-pro/schema-first
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Requires-Python: >=3.13
+Requires-Python: >=3.14
 Description-Content-Type: text/markdown
 Requires-Dist: marshmallow>=4.3.0
 Requires-Dist: PyYAML>=6.0.3

{schema_first-0.14.0 → schema_first-0.14.2}/src/Schema_First.egg-info/SOURCES.txt

@@ -39,5 +39,6 @@ src/schema_first/openapi/schemas/v3_2/server_object_schema.py
 src/schema_first/openapi/schemas/v3_2/server_variable_object_schema.py
 src/schema_first/openapi/schemas/v3_2/tag_object_schema.py
 src/schema_first/specification/__init__.py
+src/schema_first/specification/spilli_api.py
 tests/test_specification.py
 tests/test_validator.py

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

@@ -58,7 +58,7 @@ class YAMLReader:
         else:
             return
 
-    def load(self) -> 'YAMLReader':
+    def load(self) -> YAMLReader:
         root_file = self._yaml_to_dict(self.path)
         self.store[self.root_file_name] = root_file
         self.search_file(root_file)
@@ -130,7 +130,7 @@ class RefResolver:
 
         return obj
 
-    def resolving(self) -> 'RefResolver':
+    def resolving(self) -> RefResolver:
         root_file_path = self.yaml_reader.root_file_name
         root_spec = self.yaml_reader.store[root_file_path]
         self.resolved_spec = self._resolving_all_refs(root_file_path, root_spec)

{schema_first-0.14.0 → schema_first-0.14.2}/src/schema_first/openapi/schemas/fields.py

@@ -2,7 +2,7 @@ from marshmallow import fields
 from marshmallow import validate
 
 ENDPOINT_FIELD = fields.String(
-    required=True, validate=validate.Regexp(r'^[/][0-9a-zA-Z-_{}/?.]*[^/]$')
+    required=True, validate=validate.Regexp(r'^/[.a-zA-Z0-9/{}_-]*[?]{0,1}[a-zA-Z0-9/=&_-]*$')
 )
 HTTP_CODE_FIELD = fields.String(required=True, validate=validate.Regexp(r'^[1-5]{1}\d{2}|default$'))
 SUMMARY_FIELD = fields.String(validate=validate.Length(min=1, max=150))

{schema_first-0.14.0 → schema_first-0.14.2}/src/schema_first/openapi/schemas/v3_2/media_type_object_schema.py

@@ -1,11 +1,10 @@
 from marshmallow import fields
 
 from ..base import BaseSchema
-from .example_object_schema import ExampleObjectSchema
 from .schema_object_schema import SchemaObjectSchema
 
 
 class MediaTypeObjectSchema(BaseSchema):
     schema = fields.Nested(SchemaObjectSchema)
     itemSchema = fields.Nested(SchemaObjectSchema)
-    examples = fields.Dict(keys=fields.String(), values=fields.Nested(ExampleObjectSchema))
+    examples = fields.Dict(keys=fields.String(), values=fields.Raw())

{schema_first-0.14.0 → schema_first-0.14.2}/src/schema_first/openapi/schemas/v3_2/openapi_object_schema.py

@@ -57,7 +57,7 @@ class OpenAPIObjectSchema(BaseSchema):
             if param_names:
                 params_from_components = data['components'].get('parameters')
                 if params_from_components:
-                    param_names_from_components = params_from_components.key()
+                    param_names_from_components = params_from_components.keys()
 
                     if not set(param_names).issubset(set(param_names_from_components)):
                         raise ValidationError(

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

@@ -1,4 +1,3 @@
-from copy import deepcopy
 from pathlib import Path
 from typing import Any
 
@@ -7,8 +6,10 @@ from marshmallow import INCLUDE
 from marshmallow import RAISE
 from marshmallow import Schema
 from marshmallow import validate
+from marshmallow.fields import Field
 
-from ..openapi import OpenAPI
+from schema_first.openapi import OpenAPI
+from schema_first.specification.spilli_api import ConverterOpenAPIToSpilliAPI
 
 FIELDS_VIA_TYPES = {
     'boolean': fields.Boolean,
@@ -34,6 +35,7 @@ FIELDS_VIA_FORMATS = {
 class Specification:
     def __init__(self, spec_file: Path | str):
         self.openapi = OpenAPI(spec_file)
+        self.spilli_api = None
         self.reassembly_spec = None
 
     @staticmethod
@@ -132,13 +134,17 @@ class Specification:
 
         return Schema.from_dict(marshmallow_schema)
 
-    def _convert_array_field(self, open_api_schema: dict) -> type[Schema]:
+    def _convert_array_field(self, open_api_schema: dict) -> Field:
         array_item_schema = open_api_schema['items']
-        array_schema = self._convert_object_field(array_item_schema)
-        array_schema.opts.many = True
-        return array_schema
+        if array_item_schema['type'] == 'object':
+            nested_field = self._convert_object_field(array_item_schema)
+            array_field = fields.Nested(nested_field, many=True)
+        else:
+            nested_field = FIELDS_VIA_TYPES[array_item_schema['type']]()
+            array_field = fields.List(nested_field)
+        return array_field
 
-    def _reassembly_of_schemas(self, obj: Any) -> Any:
+    def _reassembly_of_schemas(self, obj: Any) -> None:
         if isinstance(obj, dict):
             for k, v in obj.items():
                 # Checking for object type is needed to skip already resolved schemes.
@@ -148,10 +154,10 @@ class Specification:
                 else:
                     self._reassembly_of_schemas(v)
 
-    def load(self) -> 'Specification':
+    def load(self) -> Specification:
         self.openapi.load()
-        self.reassembly_spec = deepcopy(self.openapi.raw_spec)
 
+        self.reassembly_spec = ConverterOpenAPIToSpilliAPI(self.openapi.raw_spec).convert()
         self._reassembly_of_schemas(self.reassembly_spec)
 
         return self

schema_first-0.14.2/src/schema_first/specification/spilli_api.py

@@ -0,0 +1,65 @@
+import json
+from typing import Any
+import typing as t
+
+
+class ConverterOpenAPIToSpilliAPI:
+    def __init__(self, open_api_spec: dict) -> None:
+        self.open_api_spec = open_api_spec
+        self.spilli_api_spec = None
+
+    def _convert_params_to_schema(
+        self, params: list[dict], place: t.Literal['header', 'cookie', 'path', 'query']
+    ) -> Any | None:
+        schema = {
+            'type': 'object',
+            'additionalProperties': True,
+        }
+
+        required = []
+        properties = {}
+        for param in params:
+            if param['in'] == place:
+                if param.get('required', False):
+                    required.append(param['name'])
+                properties[param['name']] = param['schema']
+
+        if not properties:
+            return None
+        else:
+            schema['properties'] = properties
+
+        if required:
+            schema['required'] = required
+
+        return schema
+
+    def _params_list_to_dict(self, params: list[dict]) -> dict:
+        params_as_dict = {}
+        if headers := self._convert_params_to_schema(params, 'header'):
+            params_as_dict['headers'] = {'schema': headers}
+        if cookies := self._convert_params_to_schema(params, 'cookie'):
+            params_as_dict['cookies'] = {'schema': cookies}
+        if paths := self._convert_params_to_schema(params, 'path'):
+            params_as_dict['paths'] = {'schema': paths}
+        if queries := self._convert_params_to_schema(params, 'query'):
+            params_as_dict['queries'] = {'schema': queries}
+
+        return params_as_dict
+
+    def _make_to_spilli_api_format(self) -> None:
+        self.spilli_api_spec = json.loads(json.dumps(self.open_api_spec))
+
+        for _, methods in self.spilli_api_spec['paths'].items():
+            common_params = []
+            if 'parameters' in methods:
+                common_params = methods.pop('parameters', [])
+
+            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)
+
+    def convert(self) -> dict:
+        self._make_to_spilli_api_format()
+        return self.spilli_api_spec

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

@@ -7,15 +7,12 @@ from openapi_spec_validator import validate as osv_validate
 from openapi_spec_validator.readers import read_from_filename
 import pytest
 
-from src.schema_first.openapi import OpenAPI
 from src.schema_first.specification import Specification
+from tests.conftest import specs_base_dir
 from tests.conftest import tests_dir_abspath
 from tests.utils import get_schema_from_request
 
-specs_base_dir = Path(tests_dir_abspath, '_contrib', 'specs')
-spec_file_paths = list(Path(specs_base_dir, 'v3.0').iterdir())
-spec_file_paths.extend(list(Path(specs_base_dir, 'v3.1').iterdir()))
-spec_file_paths.extend(list(Path(specs_base_dir, 'v3.2').iterdir()))
+spec_file_paths = list(Path(specs_base_dir, 'v3.2').iterdir())
 
 
 @pytest.mark.parametrize('fx', ['fx_spec_required', 'fx_spec_full'])
@@ -23,7 +20,7 @@ def test_specification(request, fx_spec_as_file, fx):
     spec_file = fx_spec_as_file(request.getfixturevalue(fx))
     spec = Specification(spec_file)
 
-    assert isinstance(spec.openapi, OpenAPI)
+    assert spec.openapi
     assert spec.reassembly_spec is None
 
     spec.load()
@@ -61,7 +58,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', 'multifile', 'openapi', 'openapi.yaml')
+    file_path = Path(tests_dir_abspath, '_contrib', 'specs', 'v3.2', 'multifile', 'openapi.yaml')
     spec_as_dict, base_uri = read_from_filename(file_path)
     osv_validate(spec_as_dict, base_uri=base_uri)