openapi3-parser 1.1.15__tar.gz → 1.1.17__tar.gz

{openapi3-parser-1.1.15 → openapi3-parser-1.1.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openapi3-parser
-Version: 1.1.15
+Version: 1.1.17
 Summary: OpenAPI v3 parser
 Home-page: https://github.com/manchenkoff/openapi3-parser
 Author: Artem Manchenkov

{openapi3-parser-1.1.15 → openapi3-parser-1.1.17}/src/openapi3_parser.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openapi3-parser
-Version: 1.1.15
+Version: 1.1.17
 Summary: OpenAPI v3 parser
 Home-page: https://github.com/manchenkoff/openapi3-parser
 Author: Artem Manchenkov

{openapi3-parser-1.1.15 → openapi3-parser-1.1.17}/src/openapi_parser/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '1.1.15'
+__version__ = '1.1.17'
 __title__ = 'openapi3-parser'
 __author__ = 'Artem Manchenkov'
 __email__ = 'artem@manchenkoff.me'

{openapi3-parser-1.1.15 → openapi3-parser-1.1.17}/src/openapi_parser/builders/external_doc.py

@@ -1,5 +1,6 @@
 import logging
 
+from .common import extract_extension_attributes
 from ..specification import ExternalDoc
 
 logger = logging.getLogger(__name__)
@@ -12,7 +13,11 @@ class ExternalDocBuilder:
 
         attrs = {
             "url": data['url'],
-            "description": data.get('description')
+            "description": data.get('description'),
+            "extensions": extract_extension_attributes(data),
         }
 
+        if attrs['extensions']:
+            logger.debug(f"Extracted custom properties [{attrs['extensions'].keys()}]")
+
         return ExternalDoc(**attrs)

{openapi3-parser-1.1.15 → openapi3-parser-1.1.17}/src/openapi_parser/builders/header.py

@@ -1,7 +1,7 @@
 import logging
 
 from . import SchemaFactory
-from .common import extract_typed_props, PropertyMeta
+from .common import extract_typed_props, PropertyMeta, extract_extension_attributes
 from ..specification import Header
 
 logger = logging.getLogger(__name__)
@@ -33,5 +33,9 @@ class HeaderBuilder:
         attrs = extract_typed_props(data, attrs_map)
 
         attrs['name'] = name
+        attrs["extensions"] = extract_extension_attributes(data)
+
+        if attrs['extensions']:
+            logger.debug(f"Extracted custom properties [{attrs['extensions'].keys()}]")
 
         return Header(**attrs)

{openapi3-parser-1.1.15 → openapi3-parser-1.1.17}/src/openapi_parser/builders/info.py

@@ -1,6 +1,6 @@
 import logging
 
-from .common import extract_typed_props, PropertyMeta
+from .common import extract_typed_props, PropertyMeta, extract_extension_attributes
 from ..specification import Contact, Info, License
 
 logger = logging.getLogger(__name__)
@@ -20,6 +20,10 @@ class InfoBuilder:
         }
 
         attrs = extract_typed_props(data, attrs_map)
+        attrs["extensions"] = extract_extension_attributes(data)
+
+        if attrs['extensions']:
+            logger.debug(f"Extracted custom properties [{attrs['extensions'].keys()}]")
 
         return Info(**attrs)
 

{openapi3-parser-1.1.15 → openapi3-parser-1.1.17}/src/openapi_parser/builders/oauth_flow.py

@@ -1,7 +1,7 @@
 import logging
 from typing import Dict
 
-from .common import extract_typed_props, PropertyMeta
+from .common import extract_typed_props, PropertyMeta, extract_extension_attributes
 from ..enumeration import OAuthFlowType
 from ..specification import OAuthFlow
 
@@ -22,10 +22,18 @@ class OAuthFlowBuilder:
 
         result_oauth_dict = {
             OAuthFlowType(oauth_type): OAuthFlow(
+                extensions=extract_extension_attributes(oauth_value),
                 **extract_typed_props(oauth_value, attrs_map)
             )
             for oauth_type, oauth_value
             in data.items()
+            if not oauth_type.startswith("x-")
         }
 
+        extensions = extract_extension_attributes(data)
+        if extensions:
+            logger.debug(f"Extracted custom properties [{extensions.keys()}]")
+            for extension in extensions.keys():
+                result_oauth_dict[extension] = extensions[extension]
+
         return result_oauth_dict

{openapi3-parser-1.1.15 → openapi3-parser-1.1.17}/src/openapi_parser/builders/operation.py

@@ -2,7 +2,7 @@ import logging
 from typing import Dict
 
 from . import ExternalDocBuilder, ParameterBuilder, RequestBuilder, ResponseBuilder
-from .common import extract_typed_props, PropertyMeta
+from .common import extract_typed_props, PropertyMeta, extract_extension_attributes
 from ..enumeration import OperationMethod
 from ..specification import Operation, Response
 
@@ -42,6 +42,10 @@ class OperationBuilder:
         }
 
         attrs = extract_typed_props(data, attrs_map)
+        attrs['extensions'] = extract_extension_attributes(data)
+
+        if attrs['extensions']:
+            logger.debug(f"Extracted custom properties [{attrs['extensions'].keys()}]")
 
         attrs['method'] = method
 

{openapi3-parser-1.1.15 → openapi3-parser-1.1.17}/src/openapi_parser/builders/parameter.py

@@ -2,7 +2,7 @@ import logging
 from typing import List
 
 from . import SchemaFactory
-from .common import extract_typed_props, PropertyMeta
+from .common import extract_typed_props, PropertyMeta, extract_extension_attributes
 from ..enumeration import ParameterLocation, HeaderParameterStyle, PathParameterStyle, QueryParameterStyle, \
     CookieParameterStyle
 from ..specification import Parameter
@@ -56,4 +56,9 @@ class ParameterBuilder:
         if not attrs.get("explode") and attrs["style"].value == "form":
             attrs["explode"] = True
 
+        attrs['extensions'] = extract_extension_attributes(data)
+
+        if attrs['extensions']:
+            logger.debug(f"Extracted custom properties [{attrs['extensions'].keys()}]")
+
         return Parameter(**attrs)

{openapi3-parser-1.1.15 → openapi3-parser-1.1.17}/src/openapi_parser/builders/path.py

@@ -2,7 +2,7 @@ import logging
 from typing import Dict
 
 from . import OperationBuilder, ParameterBuilder
-from .common import extract_typed_props, PropertyMeta
+from .common import extract_typed_props, PropertyMeta, extract_extension_attributes
 from ..enumeration import OperationMethod
 from ..specification import Path
 
@@ -42,4 +42,13 @@ class PathBuilder:
             if method.value in data
         ]
 
+        if attrs.get("parameters"):
+            for operation in attrs["operations"]:
+                operation.parameters += attrs["parameters"]
+
+        attrs['extensions'] = extract_extension_attributes(data)
+
+        if attrs['extensions']:
+            logger.debug(f"Extracted custom properties [{attrs['extensions'].keys()}]")
+
         return Path(**attrs)

{openapi3-parser-1.1.15 → openapi3-parser-1.1.17}/src/openapi_parser/builders/security.py

@@ -1,6 +1,6 @@
 import logging
 
-from .common import extract_typed_props, PropertyMeta
+from .common import extract_typed_props, PropertyMeta, extract_extension_attributes
 from .oauth_flow import OAuthFlowBuilder
 from ..enumeration import AuthenticationScheme, BaseLocation, SecurityType
 from ..specification import Security
@@ -29,6 +29,10 @@ class SecurityBuilder:
         }
 
         attrs = extract_typed_props(data, attrs_map)
+        attrs['extensions'] = extract_extension_attributes(data)
+
+        if attrs['extensions']:
+            logger.debug(f"Extracted custom properties [{attrs['extensions'].keys()}]")
 
         return Security(**attrs)
 

{openapi3-parser-1.1.15 → openapi3-parser-1.1.17}/src/openapi_parser/builders/server.py

@@ -1,6 +1,6 @@
 import logging
 
-from .common import extract_typed_props, PropertyMeta
+from .common import extract_typed_props, PropertyMeta, extract_extension_attributes
 from ..specification import Server
 
 logger = logging.getLogger(__name__)
@@ -21,5 +21,9 @@ class ServerBuilder:
         }
 
         attrs = extract_typed_props(data, attrs_map)
+        attrs['extensions'] = extract_extension_attributes(data)
+
+        if attrs['extensions']:
+            logger.debug(f"Extracted custom properties [{attrs['extensions'].keys()}]")
 
         return Server(**attrs)

{openapi3-parser-1.1.15 → openapi3-parser-1.1.17}/src/openapi_parser/enumeration.py

@@ -107,6 +107,13 @@ class ContentType(Enum):
     HTML = 'text/html'
     PDF = 'application/pdf'
     PNG = 'image/png'
+    JPEG = 'image/jpeg'
+    GIF = 'image/gif'
+    SVG = 'image/svg+xml'
+    AVIF = 'image/avif'
+    BMP = 'image/bmp'
+    WEBP = 'image/webp'
+    Image = 'image/*'
     BINARY = 'application/octet-stream'
 
 

{openapi3-parser-1.1.15 → openapi3-parser-1.1.17}/src/openapi_parser/specification.py

@@ -21,6 +21,7 @@ class Contact:
 class License:
     name: str
     url: Optional[str] = None
+    extensions: Optional[dict] = field(default_factory=dict)
 
 
 @dataclass
@@ -31,6 +32,7 @@ class Info:
     terms_of_service: Optional[str] = None
     contact: Optional[Contact] = None
     license: Optional[License] = None
+    extensions: Optional[dict] = field(default_factory=dict)
 
 
 @dataclass
@@ -38,12 +40,14 @@ class Server:
     url: str
     description: Optional[str] = None
     variables: Optional[dict] = field(default_factory=dict)
+    extensions: Optional[dict] = field(default_factory=dict)
 
 
 @dataclass
 class ExternalDoc:
     url: str
     description: Optional[str] = None
+    extensions: Optional[dict] = field(default_factory=dict)
 
 
 @dataclass
@@ -157,6 +161,7 @@ class Parameter:
     deprecated: Optional[bool] = field(default=False)
     style: Optional[str] = None
     explode: Optional[bool] = field(default=False)
+    extensions: Optional[dict] = field(default_factory=dict)
 
 
 @dataclass
@@ -182,6 +187,7 @@ class Header:
     description: Optional[str] = None
     required: Optional[bool] = field(default=False)
     deprecated: Optional[bool] = field(default=False)
+    extensions: Optional[dict] = field(default_factory=dict)
 
 
 @dataclass
@@ -200,6 +206,7 @@ class OAuthFlow:
     authorization_url: Optional[str] = None
     token_url: Optional[str] = None
     scopes: dict[str, str] = field(default_factory=dict)
+    extensions: Optional[dict] = field(default_factory=dict)
 
 
 @dataclass
@@ -212,6 +219,7 @@ class Security:
     bearer_format: Optional[str] = None
     flows: dict[OAuthFlowType, OAuthFlow] = field(default_factory=dict)
     url: Optional[str] = None
+    extensions: Optional[dict] = field(default_factory=dict)
 
 
 @dataclass
@@ -227,6 +235,7 @@ class Operation:
     parameters: list[Parameter] = field(default_factory=list)
     tags: list[str] = field(default_factory=list)
     security: list[dict[str, Any]] = field(default_factory=list)
+    extensions: Optional[dict] = field(default_factory=dict)
     # callbacks: dict[str, Callback] = field(default_factory=dict)  # TODO
 
 
@@ -237,6 +246,7 @@ class Path:
     description: Optional[str] = None
     operations: list[Operation] = field(default_factory=list)
     parameters: list[Parameter] = field(default_factory=list)
+    extensions: Optional[dict] = field(default_factory=dict)
 
 
 @dataclass
@@ -257,3 +267,4 @@ class Specification:
     schemas: dict[str, Schema] = field(default_factory=dict)
     external_docs: Optional[ExternalDoc] = None
     paths: list[Path] = field(default_factory=list)
+    extensions: Optional[dict] = field(default_factory=dict)

{openapi3-parser-1.1.15 → openapi3-parser-1.1.17}/tests/test_enumeration.py

@@ -149,6 +149,13 @@ media_type_provider = (
     ("text/html", ContentType.HTML),
     ("application/pdf", ContentType.PDF),
     ("image/png", ContentType.PNG),
+    ("image/jpeg", ContentType.JPEG),
+    ("image/gif", ContentType.GIF),
+    ("image/svg+xml", ContentType.SVG),
+    ("image/avif", ContentType.AVIF),
+    ("image/bmp", ContentType.BMP),
+    ("image/webp", ContentType.WEBP),
+    ("image/*", ContentType.Image),
     ("application/octet-stream", ContentType.BINARY),
 )
 

{openapi3-parser-1.1.15 → openapi3-parser-1.1.17}/tests/test_runner.py

@@ -13,4 +13,4 @@ def swagger_specification():
 def test_run_parser(swagger_specification: Specification):
     actual_specification = parse('tests/data/swagger.yml')
 
-    assert swagger_specification == actual_specification
+    assert actual_specification == swagger_specification