amsdal 0.0.41__cp311-cp311-macosx_10_9_universal2.whl → 0.1.0__cp311-cp311-macosx_10_9_universal2.whl

amsdal/migration/schemas_loaders.pyi

@@ -0,0 +1,24 @@
+import abc
+from _typeshed import Incomplete
+from abc import ABC, abstractmethod
+from amsdal.configs.constants import CORE_SCHEMAS_PATH as CORE_SCHEMAS_PATH, TYPE_SCHEMAS_PATH as TYPE_SCHEMAS_PATH
+from amsdal.configs.main import settings as settings
+from amsdal.migration.data_classes import ClassSchema as ClassSchema, ModuleTypes as ModuleTypes
+from amsdal_models.schemas.data_models.schema import ObjectSchema
+from amsdal_models.schemas.mixins.enrich_schemas_mixin import EnrichSchemasMixin
+from collections.abc import Iterator
+from pathlib import Path
+
+class BaseClassSchemaLoader(ABC, metaclass=abc.ABCMeta):
+    @abstractmethod
+    def iter_app_schemas(self) -> Iterator[ClassSchema]: ...
+
+class JsonClassSchemaLoader(EnrichSchemasMixin, BaseClassSchemaLoader):
+    schemas_root_path: Incomplete
+    module_type: Incomplete
+    def __init__(self, schemas_root_path: Path, module_type: ModuleTypes = ...) -> None: ...
+    def iter_app_schemas(self) -> Iterator[ClassSchema]: ...
+    def _enriched_user_schemas(self) -> list[ObjectSchema]: ...
+    @staticmethod
+    def _load_schemas(schemas_path: Path) -> list[ObjectSchema]: ...
+    def _load_contrib_schemas(self) -> list[ObjectSchema]: ...

amsdal/migration/utils.pyi

@@ -1,9 +1,12 @@
 from _typeshed import Incomplete
+from amsdal.migration.data_classes import ModuleTypes as ModuleTypes
 from amsdal.schemas.manager import SchemaManager as SchemaManager
 from amsdal_models.classes.model import Model
 from amsdal_models.schemas.data_models.core import DictSchema, LegacyDictSchema, TypeData
 from amsdal_models.schemas.data_models.schema import ObjectSchema, PropertyData
 from amsdal_utils.models.data_models.table_schema import ArraySchemaModel, DictSchemaModel, JsonSchemaModel, NestedSchemaModel, TableColumnSchema, TableSchema
+from amsdal_utils.models.enums import SchemaTypes
+from pathlib import Path
 
 reference_schema: Incomplete
 
@@ -11,3 +14,5 @@ def object_schema_to_table_schema(object_schema: ObjectSchema) -> TableSchema: .
 def _process_properties(properties: dict[str, PropertyData] | None, required: list[str]) -> list[TableColumnSchema]: ...
 def _process_property_type(property_type: str, items: TypeData | DictSchema | LegacyDictSchema | None = None, context: dict[str, type | Model | NestedSchemaModel] | None = None) -> type | NestedSchemaModel | ArraySchemaModel | DictSchemaModel | type[JsonSchemaModel]: ...
 def schema_to_nested_column_schema(schema: ObjectSchema, context: dict[str, type | Model | NestedSchemaModel]) -> NestedSchemaModel | type: ...
+def contrib_to_module_root_path(contrib: str) -> Path: ...
+def map_module_type_to_schema_type(module_type: ModuleTypes) -> SchemaTypes: ...

amsdal/mixins/build_mixin.pyi

@@ -16,6 +16,8 @@ class BuildMixin:
     @staticmethod
     def build_static_files(cli_app_path: Path) -> None: ...
     @staticmethod
+    def build_migrations(cli_app_path: Path) -> None: ...
+    @staticmethod
     def build_fixtures(cli_app_path: Path) -> None: ...
     @staticmethod
     def _reimport_models() -> None:

amsdal/mixins/class_versions_mixin.pyi

@@ -3,7 +3,7 @@ from amsdal_models.classes.model import Model
 
 class ClassVersionsMixin:
     @classmethod
-    def _create_table(cls, schema_object: Model) -> None: ...
+    def _create_table(cls, class_object: Model, *, skip_class_meta: bool = False) -> None: ...
     @classmethod
     def init_class_versions(cls, *, create_tables: bool = False) -> None: ...
     @staticmethod

amsdal/operations/manager.pyi

@@ -6,12 +6,14 @@ from amsdal_data.operations.enums import OperationType
 from amsdal_data.operations.manager import OperationsManagerBase
 from amsdal_models.classes.model import Model
 from amsdal_utils.models.data_models.address import Address
+from amsdal_utils.models.data_models.metadata import Metadata as Metadata
 from typing import Any
 
 class OperationsManager(OperationsManagerBase):
     def _get_connections(self, obj: Model, using: str | None) -> list[ConnectionBase]: ...
     def _perform_state_operation(self, obj: Model, data_dump: dict[str, Any], operation: OperationType, connection: StateConnectionBase) -> None: ...
-    def _clear_data(self, _value: Any) -> Any: ...
+    @classmethod
+    def clear_data(cls, _value: Any) -> Any: ...
     def _is_reference(self, _value: Any) -> bool: ...
     def _create_references(self, address: Address, data: Any, connection: HistoricalConnectionBase) -> None: ...
     def _perform_historical_operation(self, obj: Model, data_dump: dict[str, Any], operation: OperationType, connection: HistoricalConnectionBase) -> None: ...

amsdal/schemas/core/class_object/model.json

@@ -2,36 +2,6 @@
   "title": "ClassObject",
   "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"
-      }
-    },
-    "options_list_name": {
-      "title": "Options List Name",
-      "type": "string"
-    },
-    "validation": {
-      "title": "Validation",
-      "type": "array",
-      "items": {
-        "type": "Validator"
-      }
-    },
     "properties": {
       "title": "Properties",
       "type": "dictionary",
@@ -51,34 +21,11 @@
         "type": "string"
       }
     },
-    "indexed": {
-      "title": "Indexed",
-      "type": "array",
-      "items": {
-        "type": "string"
-      }
-    },
-    "unique_properties": {
-      "title": "Unique Fields",
-      "type": "array",
-      "items": {
-        "type": "array",
-        "items": {
-          "type": "string"
-        }
-      }
-    },
-    "method_code": {
-      "title": "Method Code",
-      "type": "string"
-    },
-    "class_schema": {
-      "title": "Class Schema",
-      "type": "string"
+    "meta_class": {
+      "title": "Meta Class",
+      "type": "string",
+      "default": "ClassObject"
     }
   },
-  "required": [
-    "title",
-    "type"
-  ]
+  "required": []
 }

amsdal/schemas/core/class_object_meta/model.json

@@ -0,0 +1,55 @@
+{
+  "title": "ClassObjectMeta",
+  "type": "object",
+  "properties": {
+    "title": {
+      "title": "Title",
+      "type": "string"
+    },
+    "type": {
+      "title": "Type",
+      "type": "string"
+    },
+    "default": {
+      "title": "Default",
+      "type": "anything"
+    },
+    "properties": {
+      "title": "Properties",
+      "type": "dictionary",
+      "items": {
+        "key": {
+          "type": "string"
+        },
+        "value": {
+          "type": "ClassPropertyMeta"
+        }
+      }
+    },
+    "indexed": {
+      "title": "Indexed",
+      "type": "array",
+      "items": {
+        "type": "string"
+      }
+    },
+    "unique": {
+      "title": "Unique Fields",
+      "type": "array",
+      "items": {
+        "type": "array",
+        "items": {
+          "type": "string"
+        }
+      }
+    },
+    "custom_code": {
+      "title": "Custom Code",
+      "type": "string"
+    }
+  },
+  "required": [
+    "title",
+    "type"
+  ]
+}

amsdal/schemas/core/class_property/model.json

@@ -2,25 +2,10 @@
   "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",
@@ -28,10 +13,6 @@
         "key": {"type": "string"},
         "value": {"type": "anything"}
       }
-    },
-    "order": {
-      "title": "Order",
-      "type": "number"
     }
   },
   "required": [

amsdal/schemas/core/class_property_meta/model.json

@@ -0,0 +1,23 @@
+{
+  "title": "ClassPropertyMeta",
+  "type": "object",
+  "properties": {
+    "title": {
+      "title": "Title",
+      "type": "string"
+    },
+    "default": {
+      "title": "Default",
+      "type": "anything"
+    },
+    "options": {
+      "title": "Options",
+      "type": "array",
+      "items": {
+        "type": "Option"
+      }
+    }
+  },
+  "required": [],
+  "meta_class": "TypeMeta"
+}

amsdal/schemas/manager.py

@@ -21,14 +21,25 @@ class SchemaManager(metaclass=Singleton):
                 for type_schema in self._schema_manager_handler.type_schemas
                 if type_schema.title == BaseClasses.OBJECT
             ]
-            + sorted(
-                [(core_schema, SchemaTypes.CORE) for core_schema in self._schema_manager_handler.core_schemas],
-                key=lambda x: int(x[0].title != BaseClasses.CLASS_OBJECT),
-            )
+            + [
+                (core_schema, SchemaTypes.CORE)
+                for core_schema in sorted(self._schema_manager_handler.core_schemas, key=self._sort_key_for_schema)
+            ]
             + [(user_schema, SchemaTypes.USER) for user_schema in self._schema_manager_handler.user_schemas]
             + [(contrib_schema, SchemaTypes.CONTRIB) for contrib_schema in self._schema_manager_handler.contrib_schemas]
         )
 
+    @staticmethod
+    def _sort_key_for_schema(schema: ObjectSchema) -> int:
+        # We need to register ClassObject first, coz ClassObjectMeta has a reference to it.
+        # All other classes have reference to ClassObject
+        if schema.title == BaseClasses.CLASS_OBJECT:
+            return 0
+        elif schema.title == BaseClasses.CLASS_OBJECT_META:
+            return 1
+        else:
+            return 2
+
     def get_schema_by_name(self, title: str, schema_type: SchemaTypes | None = None) -> ObjectSchema | None:
         _schemas = self.get_schemas(schema_type)
 

amsdal/schemas/manager.pyi

@@ -9,5 +9,7 @@ class SchemaManager(metaclass=Singleton):
     def __init__(self) -> None: ...
     def invalidate_user_schemas(self) -> None: ...
     def class_schemas(self) -> list[tuple[ObjectSchema, SchemaTypes]]: ...
+    @staticmethod
+    def _sort_key_for_schema(schema: ObjectSchema) -> int: ...
     def get_schema_by_name(self, title: str, schema_type: SchemaTypes | None = None) -> ObjectSchema | None: ...
     def get_schemas(self, schema_type: SchemaTypes | None = None) -> list[ObjectSchema]: ...

amsdal/schemas/types/object/model.json

@@ -30,8 +30,18 @@
         "type": "string"
       }
     },
-    "class_schema": {
-      "title": "Class Schema",
+    "unique": {
+      "title": "Unique Fields",
+      "type": "array",
+      "items": {
+        "type": "array",
+        "items": {
+          "type": "string"
+        }
+      }
+    },
+    "custom_code": {
+      "title": "Custom Code",
       "type": "string"
     },
     "meta_class": {

{amsdal-0.0.41.dist-info → amsdal-0.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: amsdal
-Version: 0.0.41
+Version: 0.1.0
 Summary: AMSDAL
 License: AMSDAL End User License Agreement
         
@@ -122,22 +122,22 @@ Classifier: Programming Language :: Python :: Implementation :: PyPy
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: pydantic ==2.3.0
-Requires-Dist: pydantic-settings ==2.0.3
-Requires-Dist: PyJWT ==2.8.0
-Requires-Dist: cryptography ==40.0.2
-Requires-Dist: httpx ==0.25.2
-Requires-Dist: bcrypt ==4.0.1
-Requires-Dist: black >=24.1.1
-Requires-Dist: amsdal-utils ==0.0.*
-Requires-Dist: amsdal-data[iceberg-lakehouse,postgres] ==0.0.*
-Requires-Dist: amsdal-models ==0.0.*
+Requires-Dist: pydantic ~=2.3
+Requires-Dist: pydantic-settings ~=2.0
+Requires-Dist: PyJWT ~=2.8
+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.1.*
+Requires-Dist: amsdal-data[iceberg-lakehouse,postgres] ==0.1.*
+Requires-Dist: amsdal-models ==0.1.*
 Provides-Extra: cli
-Requires-Dist: amsdal-cli ==0.0.* ; extra == 'cli'
+Requires-Dist: amsdal-cli ==0.1.* ; extra == 'cli'
 Provides-Extra: redis-lock
-Requires-Dist: amsdal-data[redis-lock] ==0.0.* ; extra == 'redis-lock'
+Requires-Dist: amsdal-data[redis-lock] ==0.1.* ; extra == 'redis-lock'
 Provides-Extra: server
-Requires-Dist: amsdal-server ==0.0.* ; extra == 'server'
+Requires-Dist: amsdal-server ==0.1.* ; extra == 'server'
 
 # AMSDAL