amsdal_utils 0.5.0__tar.gz → 0.5.2__tar.gz

{amsdal_utils-0.5.0 → amsdal_utils-0.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amsdal_utils
-Version: 0.5.0
+Version: 0.5.2
 Summary: Utils for AMSDAL data framework
 Project-URL: Documentation, https://pypi.org/project/amsdal_utils/#readme
 Project-URL: Issues, https://pypi.org/project/amsdal_utils/#issues

{amsdal_utils-0.5.0 → amsdal_utils-0.5.2}/change-logs.md

@@ -1,3 +1,15 @@
+## [v0.5.2](https://pypi.org/project/amsdal_utils/0.5.2/) - 2024-05-30
+
+### Fixed
+
+- Fix for optional nested lists in dict types
+
+## [v0.5.1](https://pypi.org/project/amsdal_utils/0.5.1/) - 2024-05-30
+
+### Fixed
+
+- Fix for nested lists in dict types
+
 ## [v0.5.0](https://pypi.org/project/amsdal_utils/0.5.0/) - 2024-05-19
 
 ### Added

amsdal_utils-0.5.2/latest-changelogs.md

@@ -0,0 +1,5 @@
+## [v0.5.2](https://pypi.org/project/amsdal_utils/0.5.2/) - 2024-05-30
+
+### Fixed
+
+- Fix for optional nested lists in dict types

{amsdal_utils-0.5.0 → amsdal_utils-0.5.2}/src/amsdal_utils/__about__.py

@@ -1,4 +1,4 @@
 # SPDX-FileCopyrightText: 2023-present
 #
 # SPDX-License-Identifier: AMSDAL End User License Agreement
-__version__ = '0.5.0'
+__version__ = '0.5.2'

{amsdal_utils-0.5.0 → amsdal_utils-0.5.2}/src/amsdal_utils/models/data_models/core.py

@@ -91,6 +91,8 @@ def process_one_of(data: dict[str, Any]) -> dict[str, Any]:
 
 
 def process_any_of(data: dict[str, Any], info: ValidationInfo) -> dict[str, Any]:
+    from amsdal_utils.schemas.schema import PropertyData
+
     _any_of = data.pop('anyOf')
     if _any_of in [[{'$ref': '#/$defs/Reference'}], [{'$ref': '#/$defs/Reference'}, {'type': 'null'}]]:
         data['type'] = 'object'
@@ -138,7 +140,7 @@ def process_any_of(data: dict[str, Any], info: ValidationInfo) -> dict[str, Any]
         if 'items' not in data:
             data['items'] = DictSchema(
                 key=TypeData(type='string'),
-                value=TypeData(type=CLASS_OPENAPI_PARAMETERS_MAPPER.get(_type, _type)),
+                value=TypeData(**PropertyData._format_openapi_parameters(_add_props, info)),
             )
 
         if _any_of_element['type'] == 'object':

{amsdal_utils-0.5.0 → amsdal_utils-0.5.2}/src/amsdal_utils/schemas/schema.py

@@ -39,9 +39,8 @@ class PropertyData(TypeData, extra='allow'):
     is_deleted: bool = False
     discriminator: str | None = None
 
-    @model_validator(mode='before')
     @classmethod
-    def format_openapi_parameters(cls, data: dict[str, Any], info: ValidationInfo) -> dict[str, Any]:
+    def _format_openapi_parameters(cls, data: dict[str, Any], info: ValidationInfo) -> dict[str, Any]:
         if '$ref' in data:
             if not info.context:
                 msg = 'Context is required to resolve $ref'
@@ -58,11 +57,9 @@ class PropertyData(TypeData, extra='allow'):
             if 'anyOf' in _add_props:
                 _add_props = process_any_of(_add_props, info)
 
-            _type = _add_props.get('type', 'object')
-
             items = DictSchema(
                 key=TypeData(type='string'),
-                value=TypeData(type=CLASS_OPENAPI_PARAMETERS_MAPPER.get(_type, _type)),
+                value=TypeData(**cls._format_openapi_parameters(_add_props, info)),
             )
 
             if 'items' not in data:
@@ -73,6 +70,11 @@ class PropertyData(TypeData, extra='allow'):
 
         return {CLASS_OPENAPI_PARAMETERS_MAPPER.get(k, k): v for k, v in data.items()}
 
+    @model_validator(mode='before')
+    @classmethod
+    def format_openapi_parameters(cls, data: dict[str, Any], info: ValidationInfo) -> dict[str, Any]:
+        return cls._format_openapi_parameters(data, info)
+
     @model_validator(mode='after')
     def validate_options(self) -> 'PropertyData':
         if isinstance(getattr(self, 'enum', None), list) and not self.options:

amsdal_utils-0.5.0/latest-changelogs.md

@@ -1,5 +0,0 @@
-## [v0.5.0](https://pypi.org/project/amsdal_utils/0.5.0/) - 2024-05-19
-
-### Added
-
-- Storage metadata. Support multi-types via `|` separator