amsdal 0.4.12__cp312-cp312-macosx_10_13_universal2.whl → 0.5.0__cp312-cp312-macosx_10_13_universal2.whl

amsdal/models/core/class_object.py

@@ -9,21 +9,22 @@ from pydantic.fields import Field
 from pydantic.functional_validators import field_validator
 
 from amsdal.models.core.class_property import *  # noqa: F403
+from amsdal.models.core.storage_metadata import *  # noqa: F403
 
 
 class ClassObject(Model):
     __module_type__: ClassVar[ModuleType] = ModuleType.CORE
+    title: str = Field(title='Title')
+    type: str = Field(title='Type')
+    module_type: str = Field(title='Module Type')
     properties: Optional[dict[str, Optional['ClassProperty']]] = Field(None, title='Properties')  # noqa: F405, UP007
-    table_name: Optional[str] = Field(None, title='Table name')  # noqa: UP007
-    primary_key: Optional[list[str]] = Field(None, title='Primary key fields')  # noqa: UP007
-    indexed: Optional[list[str]] = Field(None, title='Indexed')  # noqa: UP007
-    unique: Optional[list[list[str]]] = Field(None, title='Unique Fields')  # noqa: UP007
     required: Optional[list[str]] = Field(None, title='Required')  # noqa: UP007
-    meta_class: Optional[str] = Field('ClassObject', title='Meta Class')  # noqa: UP007
+    custom_code: str | None = Field(None, title='Custom Code')
+    storage_metadata: Optional['StorageMetadata'] = Field(None, title='Storage metadata')  # noqa: F405
 
     @field_validator('properties')
     @classmethod
-    def _non_empty_keys_properties(cls: type, value: Any) -> Any:
+    def _non_empty_keys_properties(cls: type, value: Any) -> Any:  # type: ignore # noqa: A003
         return validate_non_empty_keys(value)
 
     @property

amsdal/models/core/class_object.pyi

@@ -1,17 +1,18 @@
 from amsdal.models.core.class_property import *
+from amsdal.models.core.storage_metadata import *
 from amsdal_models.classes.model import Model
 from amsdal_utils.models.enums import ModuleType
 from typing import Any, ClassVar
 
 class ClassObject(Model):
     __module_type__: ClassVar[ModuleType] = ...
+    title: str = ...
+    type: str = ...
+    module_type: str = ...
     properties: dict[str, ClassProperty | None] | None = ...
-    table_name: str | None = ...
-    primary_key: list[str] | None = ...
-    indexed: list[str] | None = ...
-    unique: list[list[str]] | None = ...
     required: list[str] | None = ...
-    meta_class: str | None = ...
+    custom_code: str | None = ...
+    storage_metadata: StorageMetadata | None = ...
     @classmethod
     def _non_empty_keys_properties(cls, value: Any) -> Any: ...
     @property

amsdal/models/core/class_property.py

@@ -7,12 +7,17 @@ from amsdal_utils.models.enums import ModuleType
 from pydantic.fields import Field
 from pydantic.functional_validators import field_validator
 
+from amsdal.models.core.option import *  # noqa: F403
+
 
 class ClassProperty(TypeModel):
     __module_type__: ClassVar[ModuleType] = ModuleType.CORE
+    title: str | None = Field(None, title='Title')
     type: str = Field(title='Type')
+    default: Any | None = Field(None, title='Default')
+    options: list['Option'] | None = Field(None, title='Options')  # noqa: F405
     items: dict[str, Any | None] | None = Field(None, title='Items')
-    db_field: list[str] | None = Field(None, title='DB Fields')
+    discriminator: str | None = Field(None, title='Discriminator')
 
     @field_validator('items')
     @classmethod

amsdal/models/core/class_property.pyi

@@ -1,11 +1,15 @@
+from amsdal.models.core.option import *
 from amsdal_models.classes.model import TypeModel
 from amsdal_utils.models.enums import ModuleType
 from typing import Any, ClassVar
 
 class ClassProperty(TypeModel):
     __module_type__: ClassVar[ModuleType]
+    title: str | None
     type: str
+    default: Any | None
+    options: list['Option'] | None
     items: dict[str, Any | None] | None
-    db_field: list[str] | None
+    discriminator: str | None
     @classmethod
     def _non_empty_keys_items(cls, value: Any) -> Any: ...

amsdal/models/core/storage_metadata.py

@@ -0,0 +1,15 @@
+from typing import ClassVar
+from typing import Optional
+
+from amsdal_models.classes.model import TypeModel
+from amsdal_utils.models.enums import ModuleType
+from pydantic.fields import Field
+
+
+class StorageMetadata(TypeModel):
+    __module_type__: ClassVar[ModuleType] = ModuleType.CORE
+    table_name: Optional[str] = Field(None, title='Table name')  # noqa: UP007
+    db_fields: dict[str, list[str]] | None = Field(None, title='Database fields')
+    primary_key: Optional[list[str]] = Field(None, title='Primary key fields')  # noqa: UP007
+    indexed: Optional[list[list[str]]] = Field(None, title='Indexed')  # noqa: UP007
+    unique: Optional[list[list[str]]] = Field(None, title='Unique Fields')  # noqa: UP007

amsdal/models/core/storage_metadata.pyi

@@ -0,0 +1,11 @@
+from amsdal_models.classes.model import TypeModel
+from amsdal_utils.models.enums import ModuleType
+from typing import ClassVar
+
+class StorageMetadata(TypeModel):
+    __module_type__: ClassVar[ModuleType]
+    table_name: str | None
+    db_fields: dict[str, list[str]] | None
+    primary_key: list[str] | None
+    indexed: list[list[str]] | None
+    unique: list[list[str]] | None

amsdal/models/types/object.py

@@ -11,12 +11,12 @@ from pydantic.functional_validators import field_validator
 
 class Object(Model):
     __module_type__: ClassVar[ModuleType] = ModuleType.TYPE
-    title: Optional[str] = Field(None, title='Title')  # noqa: UP007
-    type: Optional[str] = Field(None, title='Type')  # noqa: UP007
+    title: str = Field(title='Title')
+    type: str = Field(title='Type')
+    module_type: str = Field(title='Module Type')
     default: Optional[Any] = Field(None, title='Default')  # noqa: UP007
     properties: Optional[dict[str, Optional[Any]]] = Field(None, title='Properties')  # noqa: UP007
     required: Optional[list[str]] = Field(None, title='Required')  # noqa: UP007
-    unique: Optional[list[list[str]]] = Field(None, title='Unique Fields')  # noqa: UP007
     custom_code: Optional[str] = Field(None, title='Custom Code')  # noqa: UP007
     meta_class: Optional[str] = Field(None, title='Meta Class')  # noqa: UP007
 

amsdal/models/types/object.pyi

@@ -4,12 +4,12 @@ from typing import Any, ClassVar
 
 class Object(Model):
     __module_type__: ClassVar[ModuleType] = ...
-    title: str | None = ...
-    type: str | None = ...
+    title: str = ...
+    type: str = ...
+    module_type: str = ...
     default: Any | None = ...
     properties: dict[str, Any | None] | None = ...
     required: list[str] | None = ...
-    unique: list[list[str]] | None = ...
     custom_code: str | None = ...
     meta_class: str | None = ...
     @classmethod

amsdal/schemas/core/class_object/model.json

@@ -2,6 +2,18 @@
   "title": "ClassObject",
   "type": "object",
   "properties": {
+    "title": {
+      "title": "Title",
+      "type": "string"
+    },
+    "type": {
+      "title": "Type",
+      "type": "string"
+    },
+    "module_type": {
+      "title": "Module Type",
+      "type": "string"
+    },
     "properties": {
       "title": "Properties",
       "type": "dictionary",
@@ -21,6 +33,14 @@
         "type": "string"
       }
     },
+    "custom_code": {
+      "title": "Custom Code",
+      "type": "string"
+    },
+    "storage_metadata": {
+      "title": "Storage metadata",
+      "type": "StorageMetadata"
+    },
     "meta_class": {
       "title": "Meta Class",
       "type": "string",

amsdal/schemas/core/class_property/model.json

@@ -2,10 +2,25 @@
   "title": "ClassProperty",
   "type": "object",
   "properties": {
+    "title": {
+      "title": "Title",
+      "type": "string"
+    },
     "type": {
       "title": "Type",
       "type": "string"
     },
+    "default": {
+      "title": "Default",
+      "type": "anything"
+    },
+    "options": {
+      "title": "Options",
+      "type": "array",
+      "items": {
+        "type": "Option"
+      }
+    },
     "items": {
       "title": "Items",
       "type": "dictionary",
@@ -13,6 +28,10 @@
         "key": {"type": "string"},
         "value": {"type": "anything"}
       }
+    },
+    "discriminator": {
+      "title": "Discriminator",
+      "type": "string"
     }
   },
   "required": [

amsdal/schemas/core/storage_metadata/model.json

@@ -0,0 +1,52 @@
+{
+  "title": "StorageMetadata",
+  "type": "object",
+  "properties": {
+    "table_name": {
+      "title": "Table name",
+      "type": "string"
+    },
+    "db_fields": {
+      "title": "Database fields",
+      "type": "dictionary",
+      "items": {
+        "key": {"type": "string"},
+        "value": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      }
+    },
+    "primary_key": {
+      "title": "Primary key fields",
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "indexed": {
+      "title": "Indexed",
+      "type": "array",
+      "items": {
+        "type": "array",
+        "items": {
+          "type": "string"
+        }
+      }
+    },
+    "unique": {
+      "title": "Unique Fields",
+      "type": "array",
+      "items": {
+        "type": "array",
+        "items": {
+          "type": "string"
+        }
+      }
+    }
+  },
+  "required": [],
+  "meta_class": "TypeMeta"
+}

amsdal/utils/tests/helpers.py

@@ -20,8 +20,8 @@ from amsdal_data.connections.historical.schema_version_manager import Historical
 from amsdal_models.migration import migrations
 from amsdal_models.migration.executors.default_executor import DefaultAsyncMigrationExecutor
 from amsdal_models.migration.executors.default_executor import DefaultMigrationExecutor
-from amsdal_models.migration.file_migration_executor import FileMigrationExecutorManager
-from amsdal_models.migration.file_migration_generator import FileMigrationGenerator
+from amsdal_models.migration.file_migration_executor import SimpleFileMigrationExecutorManager
+from amsdal_models.migration.file_migration_generator import SimpleFileMigrationGenerator
 from amsdal_models.migration.file_migration_writer import FileMigrationWriter
 from amsdal_models.migration.migrations import MigrateData
 from amsdal_models.migration.migrations import MigrationSchemas
@@ -333,7 +333,7 @@ def migrate() -> None:
     _schemas_map = {_schema.title: _schema for _schema in _schemas}
 
     for object_schema in _schemas:
-        for _operation_data in FileMigrationGenerator.build_operations(
+        for _operation_data in SimpleFileMigrationGenerator.build_operations(
             ModuleType.USER,
             object_schema,
             None,
@@ -348,7 +348,7 @@ def migrate() -> None:
             _operation.forward(executor)
 
     for object_schema in _cycle_schemas:
-        for _operation_data in FileMigrationGenerator.build_operations(
+        for _operation_data in SimpleFileMigrationGenerator.build_operations(
             ModuleType.USER,
             object_schema,
             _schemas_map[object_schema.title],
@@ -367,7 +367,7 @@ def migrate() -> None:
 
 def _migrate_per_loader(executor: DefaultMigrationExecutor, loader: MigrationsLoader) -> None:
     for _migration in loader:
-        migration_class = FileMigrationExecutorManager.get_migration_class(_migration)
+        migration_class = SimpleFileMigrationExecutorManager.get_migration_class(_migration)
         migration_class_instance = migration_class()
 
         for _operation in migration_class_instance.operations:
@@ -413,7 +413,7 @@ async def async_migrate() -> None:
     _schemas_map = {_schema.title: _schema for _schema in _schemas}
 
     for object_schema in _schemas:
-        for _operation_data in FileMigrationGenerator.build_operations(
+        for _operation_data in SimpleFileMigrationGenerator.build_operations(
             ModuleType.USER,
             object_schema,
             None,
@@ -428,7 +428,7 @@ async def async_migrate() -> None:
             _operation.forward(executor)
 
     for object_schema in _cycle_schemas:
-        for _operation_data in FileMigrationGenerator.build_operations(
+        for _operation_data in SimpleFileMigrationGenerator.build_operations(
             ModuleType.USER,
             object_schema,
             _schemas_map[object_schema.title],
@@ -447,7 +447,7 @@ async def async_migrate() -> None:
 
 async def _async_migrate_per_loader(executor: DefaultAsyncMigrationExecutor, loader: MigrationsLoader) -> None:
     for _migration in loader:
-        migration_class = FileMigrationExecutorManager.get_migration_class(_migration)
+        migration_class = SimpleFileMigrationExecutorManager.get_migration_class(_migration)
         migration_class_instance = migration_class()
 
         for _operation in migration_class_instance.operations:

{amsdal-0.4.12.dist-info → amsdal-0.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amsdal
-Version: 0.4.12
+Version: 0.5.0
 Summary: AMSDAL
 License: AMSDAL End User License Agreement
         
@@ -129,9 +129,9 @@ Requires-Dist: cryptography~=42.0
 Requires-Dist: httpx~=0.25
 Requires-Dist: bcrypt~=4.0
 Requires-Dist: black>=24.3.0
-Requires-Dist: amsdal_utils==0.4.*
-Requires-Dist: amsdal_data[postgres-binary]==0.4.*
-Requires-Dist: amsdal_models<0.5,>=0.4.1
+Requires-Dist: amsdal_utils==0.5.*
+Requires-Dist: amsdal_data[postgres-binary]==0.5.*
+Requires-Dist: amsdal_models==0.5.*
 Requires-Dist: pip>=21.3.1
 Provides-Extra: cli
 Requires-Dist: amsdal-cli==0.4.*; extra == "cli"