amsdal_utils 0.4.5__tar.gz → 0.5.1__tar.gz

{amsdal_utils-0.4.5 → amsdal_utils-0.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amsdal_utils
-Version: 0.4.5
+Version: 0.5.1
 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.4.5 → amsdal_utils-0.5.1}/change-logs.md

@@ -1,3 +1,15 @@
+## [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
+
+- Storage metadata. Support multi-types via `|` separator
+
 ## [v0.4.5](https://pypi.org/project/amsdal_utils/0.4.5/) - 2024-05-16
 
 ### Added

amsdal_utils-0.5.1/latest-changelogs.md

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

{amsdal_utils-0.4.5 → amsdal_utils-0.5.1}/src/amsdal_utils/__about__.py

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

{amsdal_utils-0.4.5 → amsdal_utils-0.5.1}/src/amsdal_utils/models/data_models/core.py

@@ -72,6 +72,24 @@ class LegacyDictSchema(BaseModel):
     value_type: str
 
 
+def process_one_of(data: dict[str, Any]) -> dict[str, Any]:
+    one_of = [
+        ao
+        for ao in data.pop('oneOf')
+        if ao not in [{'type': 'null'}, {'$ref': '#/$defs/Reference'}, {'$ref': '#/$defs/LegacyModel'}]
+    ]
+
+    for _one_of_item in one_of:
+        if not _one_of_item or '$ref' not in _one_of_item:
+            msg = f'Multiple oneOf should contain $ref. Currently: {one_of}'
+            raise ValueError(msg)
+
+    _types = [_one_of_item['$ref'].rsplit('/', 1)[-1] for _one_of_item in one_of]
+    data['type'] = '|'.join(_types)
+
+    return data
+
+
 def process_any_of(data: dict[str, Any], info: ValidationInfo) -> dict[str, Any]:
     _any_of = data.pop('anyOf')
     if _any_of in [[{'$ref': '#/$defs/Reference'}], [{'$ref': '#/$defs/Reference'}, {'type': 'null'}]]:
@@ -85,8 +103,13 @@ def process_any_of(data: dict[str, Any], info: ValidationInfo) -> dict[str, Any]
     ]
 
     if len(any_of) != 1:
-        err_type = 'invalid_data'
-        raise PydanticCustomError(err_type, 'Data must have exactly one non-null type in "anyOf"')
+        for _any_of_item in any_of:
+            if not _any_of_item or '$ref' not in _any_of_item:
+                msg = f'Multiple anyOf should contain $ref. Currently: {any_of}'
+                raise ValueError(msg)
+        _types = [_any_of_item['$ref'].rsplit('/', 1)[-1] for _any_of_item in any_of]
+
+        data['type'] = '|'.join(_types)
 
     _any_of_element = any_of[0]
 
@@ -186,6 +209,15 @@ class TypeData(BaseModel, extra='allow'):
         if 'anyOf' in data:
             data = process_any_of(data, info)
 
+        if 'oneOf' in data:
+            data = process_one_of(data)
+
+        if 'discriminator' in data and isinstance(data['discriminator'], dict):
+            try:
+                data['discriminator'] = data['discriminator']['propertyName']
+            except:
+                raise
+
         if 'type' not in data:
             data['type'] = 'object'
 

{amsdal_utils-0.4.5 → amsdal_utils-0.5.1}/src/amsdal_utils/schemas/schema.py

@@ -30,7 +30,6 @@ class PropertyData(TypeData, extra='allow'):
         field_name (str | None): The name of the field.
         field_id (str | None): The ID of the field.
         is_deleted (bool): Indicates if the property is deleted.
-        db_field (list[str] | None): The database fields.
     """
 
     title: str | None = None
@@ -38,11 +37,10 @@ class PropertyData(TypeData, extra='allow'):
     field_name: str | None = None
     field_id: str | None = None
     is_deleted: bool = False
-    db_field: list[str] | None = None
+    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'
@@ -59,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:
@@ -74,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:
@@ -101,6 +102,14 @@ class PropertyData(TypeData, extra='allow'):
         return self
 
 
+class StorageMetadata(BaseModel, extra='allow'):
+    table_name: str | None = Field(None, title='Table name')
+    db_fields: dict[str, list[str]] | None = Field(None, title='Database property to fields mapping')
+    primary_key: list[str] | None = Field(None, title='Primary key fields')
+    indexed: list[list[str]] | None = Field(None, title='Indexed')
+    unique: list[list[str]] | None = Field(None, title='Unique Fields')
+
+
 class ObjectSchema(BaseModel, extra='allow'):
     r"""
     Schema for an object.
@@ -127,6 +136,7 @@ class ObjectSchema(BaseModel, extra='allow'):
     options: list[OptionItemData] | None = None
     meta_class: str = MetaClasses.CLASS_OBJECT.value
     custom_code: str | None = None
+    storage_metadata: StorageMetadata | None = None
 
     @model_validator(mode='before')
     @classmethod

amsdal_utils-0.4.5/latest-changelogs.md

@@ -1,5 +0,0 @@
-## [v0.4.5](https://pypi.org/project/amsdal_utils/0.4.5/) - 2024-05-16
-
-### Added
-
-- Added support for optional References in models