amsdal 0.3.6__cp311-cp311-macosx_10_9_universal2.whl → 0.4.1__cp311-cp311-macosx_10_9_universal2.whl

amsdal/__about__.py

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

amsdal/__migrations__/0000_initial.py

@@ -1,12 +1,11 @@
-from amsdal_utils.models.enums import SchemaTypes
-
-from amsdal.migration import migrations
+from amsdal_models.migration import migrations
+from amsdal_utils.models.enums import ModuleType
 
 
 class Migration(migrations.Migration):
     operations: list[migrations.Operation] = [
         migrations.CreateClass(
-            schema_type=SchemaTypes.TYPE,
+            module_type=ModuleType.TYPE,
             class_name='Object',
             new_schema={
                 'title': 'Object',
@@ -31,37 +30,37 @@ class Migration(migrations.Migration):
             },
         ),
         migrations.CreateClass(
-            schema_type=SchemaTypes.TYPE,
+            module_type=ModuleType.TYPE,
             class_name='Binary',
             new_schema={'title': 'Binary', 'properties': {}, 'meta_class': 'TypeMeta'},
         ),
         migrations.CreateClass(
-            schema_type=SchemaTypes.TYPE,
+            module_type=ModuleType.TYPE,
             class_name='Dictionary',
             new_schema={'title': 'Dictionary', 'properties': {}, 'meta_class': 'TypeMeta'},
         ),
         migrations.CreateClass(
-            schema_type=SchemaTypes.TYPE,
+            module_type=ModuleType.TYPE,
             class_name='Anything',
             new_schema={'title': 'Anything', 'properties': {}, 'meta_class': 'TypeMeta'},
         ),
         migrations.CreateClass(
-            schema_type=SchemaTypes.TYPE,
+            module_type=ModuleType.TYPE,
             class_name='String',
             new_schema={'title': 'String', 'default': '', 'properties': {}, 'meta_class': 'TypeMeta'},
         ),
         migrations.CreateClass(
-            schema_type=SchemaTypes.TYPE,
+            module_type=ModuleType.TYPE,
             class_name='Array',
             new_schema={'title': 'Array', 'properties': {}, 'meta_class': 'TypeMeta'},
         ),
         migrations.CreateClass(
-            schema_type=SchemaTypes.TYPE,
+            module_type=ModuleType.TYPE,
             class_name='Number',
             new_schema={'title': 'Number', 'properties': {}, 'meta_class': 'TypeMeta'},
         ),
         migrations.CreateClass(
-            schema_type=SchemaTypes.TYPE,
+            module_type=ModuleType.TYPE,
             class_name='Boolean',
             new_schema={
                 'title': 'Boolean',
@@ -71,7 +70,7 @@ class Migration(migrations.Migration):
             },
         ),
         migrations.CreateClass(
-            schema_type=SchemaTypes.CORE,
+            module_type=ModuleType.CORE,
             class_name='Option',
             new_schema={
                 'title': 'Option',
@@ -84,7 +83,7 @@ class Migration(migrations.Migration):
             },
         ),
         migrations.CreateClass(
-            schema_type=SchemaTypes.CORE,
+            module_type=ModuleType.CORE,
             class_name='Validator',
             new_schema={
                 'title': 'Validator',
@@ -97,7 +96,7 @@ class Migration(migrations.Migration):
             },
         ),
         migrations.CreateClass(
-            schema_type=SchemaTypes.CORE,
+            module_type=ModuleType.CORE,
             class_name='ClassPropertyMeta',
             new_schema={
                 'title': 'ClassPropertyMeta',
@@ -110,7 +109,7 @@ class Migration(migrations.Migration):
             },
         ),
         migrations.CreateClass(
-            schema_type=SchemaTypes.CORE,
+            module_type=ModuleType.CORE,
             class_name='ClassProperty',
             new_schema={
                 'title': 'ClassProperty',
@@ -127,16 +126,28 @@ class Migration(migrations.Migration):
             },
         ),
         migrations.CreateClass(
-            schema_type=SchemaTypes.CORE,
+            module_type=ModuleType.CORE,
             class_name='ClassObject',
             new_schema={
                 'title': 'ClassObject',
                 'properties': {
+                    'table_name': {'type': 'string', 'title': 'Table Name'},
                     'properties': {
                         'type': 'dictionary',
                         'items': {'key': {'type': 'string'}, 'value': {'type': 'ClassProperty'}},
                         'title': 'Properties',
                     },
+                    'primary_key': {
+                        'type': 'dictionary',
+                        'items': {'key': {'type': 'string'}, 'value': {'type': 'array', 'items': {'type': 'string'}}},
+                        'title': 'Primary key fields',
+                    },
+                    'indexed': {'type': 'array', 'items': {'type': 'string'}, 'title': 'Indexed'},
+                    'unique': {
+                        'type': 'array',
+                        'items': {'type': 'array', 'items': {'type': 'string'}},
+                        'title': 'Unique Fields',
+                    },
                     'required': {'type': 'array', 'items': {'type': 'string'}, 'title': 'Required'},
                     'meta_class': {'type': 'string', 'default': 'ClassObject', 'title': 'Meta Class'},
                 },
@@ -144,7 +155,7 @@ class Migration(migrations.Migration):
             },
         ),
         migrations.CreateClass(
-            schema_type=SchemaTypes.CORE,
+            module_type=ModuleType.CORE,
             class_name='ClassObjectMeta',
             new_schema={
                 'title': 'ClassObjectMeta',
@@ -158,18 +169,12 @@ class Migration(migrations.Migration):
                         'items': {'key': {'type': 'string'}, 'value': {'type': 'ClassPropertyMeta'}},
                         'title': 'Properties',
                     },
-                    'indexed': {'type': 'array', 'items': {'type': 'string'}, 'title': 'Indexed'},
-                    'unique': {
-                        'type': 'array',
-                        'items': {'type': 'array', 'items': {'type': 'string'}},
-                        'title': 'Unique Fields',
-                    },
                     'custom_code': {'type': 'string', 'title': 'Custom Code'},
                 },
             },
         ),
         migrations.CreateClass(
-            schema_type=SchemaTypes.CORE,
+            module_type=ModuleType.CORE,
             class_name='Fixture',
             new_schema={
                 'title': 'Fixture',
@@ -183,11 +188,13 @@ class Migration(migrations.Migration):
                         'title': 'Data',
                     },
                 },
+                "primary_key": {"partition_key": ["partition_key"]},
+                "table_name": "Fixture",
                 'unique': [['external_id']],
             },
         ),
         migrations.CreateClass(
-            schema_type=SchemaTypes.CORE,
+            module_type=ModuleType.CORE,
             class_name='File',
             new_schema={
                 'title': 'File',
@@ -197,6 +204,8 @@ class Migration(migrations.Migration):
                     'data': {'type': 'binary', 'title': 'Data'},
                     'size': {'type': 'number', 'title': 'Size'},
                 },
+                "primary_key": {"partition_key": ["partition_key"]},
+                "table_name": "File",
                 'custom_code': "def pre_update(self):  # type: ignore[no-untyped-def]\n    self.size = len(self.data or b'')\n\ndef pre_create(self) -> None:  # type: ignore[no-untyped-def]\n    self.size = len(self.data or b'')\n\nfrom pathlib import Path\nfrom typing import BinaryIO\n\n\ndef to_file(self, file_or_path: Path | BinaryIO) -> None:  # type: ignore[no-untyped-def]\n    if isinstance(file_or_path, Path):\n        if file_or_path.is_dir():\n            file_or_path = file_or_path / self.name\n        file_or_path.write_bytes(self.data)  # type: ignore[union-attr]\n    else:\n        file_or_path.write(self.data)\n        file_or_path.seek(0)\n\nfrom pathlib import Path\nfrom typing import BinaryIO\n\n\n@classmethod  # type: ignore[misc, no-untyped-def]\ndef from_file(\n    cls,\n    file_or_path: Path | BinaryIO,\n) -> 'File':  # type: ignore[name-defined]  # noqa: F821\n    if isinstance(file_or_path, Path):\n        if file_or_path.is_dir():\n            msg = f'{file_or_path} is a directory'\n            raise ValueError(msg)\n\n        data = file_or_path.read_bytes()\n        filename = file_or_path.name\n    else:\n        file_or_path.seek(0)\n        data = file_or_path.read()\n        filename = Path(file_or_path.name).name\n\n    return cls(data=data, filename=filename)\n\nimport base64\n\nfrom pydantic import field_validator\n\n\n@field_validator('data')  # type: ignore[misc]\n@classmethod\ndef data_base64_decode(cls, v: bytes) -> bytes:  # type: ignore[no-untyped-def]  # noqa: ARG001\n    is_base64: bool = False\n\n    try:\n        is_base64 = base64.b64encode(base64.b64decode(v)) == v\n    except Exception:\n        ...\n\n    if is_base64:\n        return base64.b64decode(v)\n\n    return v\n\n@property  # type: ignore[misc]\ndef mimetype(self) -> str | None:  # type: ignore[no-untyped-def]\n    import mimetypes\n\n    return mimetypes.guess_type(self.filename)[0]",
             },
         ),

amsdal/__migrations__/0001_datetime_type.py

@@ -1,17 +1,17 @@
-from amsdal_utils.models.enums import SchemaTypes
+from amsdal_utils.models.enums import ModuleType
 
-from amsdal.migration import migrations
+from amsdal_models.migration import migrations
 
 
 class Migration(migrations.Migration):
     operations: list[migrations.Operation] = [
         migrations.CreateClass(
-            schema_type=SchemaTypes.TYPE,
+            module_type=ModuleType.TYPE,
             class_name='Date',
             new_schema={'title': 'Date', 'properties': {}, 'meta_class': 'TypeMeta'},
         ),
         migrations.CreateClass(
-            schema_type=SchemaTypes.TYPE,
+            module_type=ModuleType.TYPE,
             class_name='Datetime',
             new_schema={'title': 'Datetime', 'properties': {}, 'meta_class': 'TypeMeta'},
         ),

amsdal/__migrations__/0002_fixture_order.py

@@ -1,11 +1,11 @@
-from amsdal.migration import migrations
-from amsdal_utils.models.enums import SchemaTypes
+from amsdal_models.migration import migrations
+from amsdal_utils.models.enums import ModuleType
 
 
 class Migration(migrations.Migration):
     operations: list[migrations.Operation] = [
         migrations.UpdateClass(
-            schema_type=SchemaTypes.CORE,
+            module_type=ModuleType.CORE,
             class_name='Fixture',
             old_schema={
                 'title': 'Fixture',
@@ -19,6 +19,8 @@ class Migration(migrations.Migration):
                         'title': 'Data',
                     },
                 },
+                "primary_key": {"partition_key": ["partition_key"]},
+                "table_name": "Fixture",
                 'unique': [['external_id']],
             },
             new_schema={
@@ -34,6 +36,8 @@ class Migration(migrations.Migration):
                         'title': 'Data',
                     },
                 },
+                "primary_key": {"partition_key": ["partition_key"]},
+                "table_name": "Fixture",
                 'unique': [['external_id']],
             },
         ),

amsdal/__migrations__/0003_schema_type_in_class_meta.py

@@ -1,11 +1,11 @@
-from amsdal.migration import migrations
-from amsdal_utils.models.enums import SchemaTypes
+from amsdal_models.migration import migrations
+from amsdal_utils.models.enums import ModuleType
 
 
 class Migration(migrations.Migration):
     operations: list[migrations.Operation] = [
         migrations.UpdateClass(
-            schema_type=SchemaTypes.CORE,
+            module_type=ModuleType.CORE,
             class_name='ClassObjectMeta',
             old_schema={
                 "title": "ClassObjectMeta",
@@ -19,12 +19,6 @@ class Migration(migrations.Migration):
                         "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"],
@@ -42,12 +36,6 @@ class Migration(migrations.Migration):
                         "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/cloud/services/auth/credentials.pyi

@@ -6,7 +6,6 @@ from amsdal.cloud.services.actions.create_session import CreateSessionAction as
 from amsdal.cloud.services.auth.base import AuthHandlerBase as AuthHandlerBase
 from amsdal.cloud.services.auth.token import TokenAuthHandler as TokenAuthHandler
 from amsdal.errors import AmsdalAuthenticationError as AmsdalAuthenticationError
-from amsdal.schemas.manager import SchemaManager as SchemaManager
 
 class CredentialsAuthHandler(AuthHandlerBase):
     """

amsdal/cloud/services/auth/token.pyi

@@ -2,7 +2,6 @@ from _typeshed import Incomplete
 from amsdal.cloud.constants import JWT_PUBLIC_KEY as JWT_PUBLIC_KEY
 from amsdal.cloud.services.auth.base import AuthHandlerBase as AuthHandlerBase
 from amsdal.errors import AmsdalAuthenticationError as AmsdalAuthenticationError
-from amsdal.schemas.manager import SchemaManager as SchemaManager
 
 HMAC_KEY: bytes
 

amsdal/configs/main.py

@@ -48,11 +48,17 @@ class Settings(BaseSettings):
 
     APP_PATH: Path = Path('.')
     CONFIG_PATH: Path | None = None
-    MODELS_MODULE_NAME: str = 'models'
-    SCHEMAS_MODULE_NAME: str = 'schemas'
+    TYPE_MODELS_MODULE: str = 'amsdal.models.types'
+    CORE_MODELS_MODULE: str = 'amsdal.models.core'
+    USER_MODELS_MODULE_PATH: Path | None = None
+    USER_MODELS_MODULE: str = 'models'
+    FIXTURES_MODULE_PATH: Path | None = None
     FIXTURES_MODULE_NAME: str = 'fixtures'
+    STATIC_MODULE_PATH: Path | None = None
     STATIC_MODULE_NAME: str = 'static'
+    TRANSACTIONS_MODULE_PATH: Path | None = None
     TRANSACTIONS_MODULE_NAME: str = 'transactions'
+    MIGRATIONS_MODULE_PATH: Path | None = None
     MIGRATIONS_DIRECTORY_NAME: str = 'migrations'
     ACCESS_KEY_ID: str | None = None
     SECRET_ACCESS_KEY: str | None = None
@@ -62,6 +68,8 @@ class Settings(BaseSettings):
         'amsdal.contrib.auth.app.AuthAppConfig',
         'amsdal.contrib.frontend_configs.app.FrontendConfigAppConfig',
     ]
+    CONTRIB_MODELS_PACKAGE_NAME: str = 'models'
+    CONTRIB_MIGRATIONS_DIRECTORY_NAME: str = 'migrations'
 
     @field_validator('CONTRIBS', mode='after')
     def load_contrib_modules(cls, value: list[str]) -> list[str]:  # noqa: N805
@@ -88,7 +96,7 @@ class Settings(BaseSettings):
         return value
 
     @property
-    def models_root_path(self) -> Path:
+    def user_models_path(self) -> Path:
         """
         Returns the root path for models.
 
@@ -98,20 +106,16 @@ class Settings(BaseSettings):
         Returns:
             Path: The root path for the models directory.
         """
-        return self.APP_PATH / self.MODELS_MODULE_NAME
+        if self.USER_MODELS_MODULE_PATH:
+            return self.USER_MODELS_MODULE_PATH
 
-    @property
-    def schemas_root_path(self) -> Path:
-        """
-        Returns the root path for schemas.
+        if '.' in self.USER_MODELS_MODULE:
+            _package, _ = self.USER_MODELS_MODULE.split('.', 1)
+            _module = importlib.import_module(_package)
 
-        This property constructs and returns the path to the schemas directory
-        based on the `APP_PATH` and `SCHEMAS_MODULE_NAME` attributes.
+            return Path(_module.__path__[0])
 
-        Returns:
-            Path: The root path for the schemas directory.
-        """
-        return self.APP_PATH / self.SCHEMAS_MODULE_NAME
+        return self.APP_PATH / self.USER_MODELS_MODULE
 
     @property
     def fixtures_root_path(self) -> Path:
@@ -124,7 +128,7 @@ class Settings(BaseSettings):
         Returns:
             Path: The root path for the fixtures directory.
         """
-        return self.APP_PATH / self.FIXTURES_MODULE_NAME
+        return self.FIXTURES_MODULE_PATH or self.APP_PATH / self.FIXTURES_MODULE_NAME
 
     @property
     def static_root_path(self) -> Path:
@@ -137,7 +141,7 @@ class Settings(BaseSettings):
         Returns:
             Path: The root path for the static files directory.
         """
-        return self.APP_PATH / self.STATIC_MODULE_NAME
+        return self.STATIC_MODULE_PATH or self.APP_PATH / self.STATIC_MODULE_NAME
 
     @property
     def transactions_root_path(self) -> Path:
@@ -150,7 +154,7 @@ class Settings(BaseSettings):
         Returns:
             Path: The root path for the transactions directory.
         """
-        return self.models_root_path / self.TRANSACTIONS_MODULE_NAME
+        return self.TRANSACTIONS_MODULE_PATH or self.APP_PATH / self.TRANSACTIONS_MODULE_NAME
 
     @property
     def migrations_root_path(self) -> Path:
@@ -163,10 +167,10 @@ class Settings(BaseSettings):
         Returns:
             Path: The root path for the migrations directory.
         """
-        return self.models_root_path / self.MIGRATIONS_DIRECTORY_NAME
+        return self.MIGRATIONS_MODULE_PATH or self.APP_PATH / self.MIGRATIONS_DIRECTORY_NAME
 
     @model_validator(mode='after')
-    def check_passwords_match(self) -> 'Settings':
+    def check_config_path_set(self) -> 'Settings':
         """
         Ensures the configuration path is set.
 

amsdal/configs/main.pyi

@@ -33,17 +33,25 @@ class Settings(BaseSettings):
     model_config: Incomplete
     APP_PATH: Path
     CONFIG_PATH: Path | None
-    MODELS_MODULE_NAME: str
-    SCHEMAS_MODULE_NAME: str
+    TYPE_MODELS_MODULE: str
+    CORE_MODELS_MODULE: str
+    USER_MODELS_MODULE_PATH: Path | None
+    USER_MODELS_MODULE: str
+    FIXTURES_MODULE_PATH: Path | None
     FIXTURES_MODULE_NAME: str
+    STATIC_MODULE_PATH: Path | None
     STATIC_MODULE_NAME: str
+    TRANSACTIONS_MODULE_PATH: Path | None
     TRANSACTIONS_MODULE_NAME: str
+    MIGRATIONS_MODULE_PATH: Path | None
     MIGRATIONS_DIRECTORY_NAME: str
     ACCESS_KEY_ID: str | None
     SECRET_ACCESS_KEY: str | None
     ACCESS_TOKEN: str | None
     SANDBOX_ENVIRONMENT: bool | None
     CONTRIBS: list[str]
+    CONTRIB_MODELS_PACKAGE_NAME: str
+    CONTRIB_MIGRATIONS_DIRECTORY_NAME: str
     def load_contrib_modules(cls, value: list[str]) -> list[str]:
         """
         Loads and initializes contrib modules.
@@ -58,7 +66,7 @@ class Settings(BaseSettings):
             list[str]: The same list of contrib module paths after loading and initializing the modules.
         """
     @property
-    def models_root_path(self) -> Path:
+    def user_models_path(self) -> Path:
         """
         Returns the root path for models.
 
@@ -69,17 +77,6 @@ class Settings(BaseSettings):
             Path: The root path for the models directory.
         """
     @property
-    def schemas_root_path(self) -> Path:
-        """
-        Returns the root path for schemas.
-
-        This property constructs and returns the path to the schemas directory
-        based on the `APP_PATH` and `SCHEMAS_MODULE_NAME` attributes.
-
-        Returns:
-            Path: The root path for the schemas directory.
-        """
-    @property
     def fixtures_root_path(self) -> Path:
         """
         Returns the root path for fixtures.
@@ -123,7 +120,7 @@ class Settings(BaseSettings):
         Returns:
             Path: The root path for the migrations directory.
         """
-    def check_passwords_match(self) -> Settings:
+    def check_config_path_set(self) -> Settings:
         """
         Ensures the configuration path is set.
 

amsdal/contrib/auth/fixtures/basic_permissions.json

@@ -0,0 +1,64 @@
+{
+    "Permission": [
+        {
+            "_external_id": "user_delete",
+            "model": "User",
+            "action": "delete"
+        },
+        {
+            "_external_id": "user_read",
+            "model": "User",
+            "action": "read"
+        },
+        {
+            "_external_id": "user_update",
+            "model": "User",
+            "action": "update"
+        },
+        {
+            "_external_id": "user_all_actions",
+            "model": "User",
+            "action": "*"
+        },
+        {
+            "_external_id": "all_models_all_actions",
+            "model": "*",
+            "action": "*"
+        },
+        {
+            "_external_id": "login_session_delete",
+            "model": "LoginSession",
+            "action": "delete"
+        },
+        {
+            "_external_id": "login_session_read",
+            "model": "LoginSession",
+            "action": "read"
+        },
+        {
+            "_external_id": "login_session_update",
+            "model": "LoginSession",
+            "action": "update"
+        },
+        {
+            "_external_id": "permission_delete",
+            "model": "Permission",
+            "action": "delete"
+        },
+        {
+            "_external_id": "permission_read",
+            "model": "Permission",
+            "action": "read"
+        },
+        {
+            "_external_id": "permission_update",
+            "model": "Permission",
+            "action": "update"
+        },
+        {
+            "_external_id": "permission_create",
+            "model": "Permission",
+            "action": "create"
+        }
+    ]
+}