amsdal 0.4.10__cp311-cp311-macosx_10_9_universal2.whl → 0.5.29__cp311-cp311-macosx_10_9_universal2.whl

amsdal/__migrations__/0004_update_class_file.py

@@ -0,0 +1,45 @@
+from amsdal_models.migration import migrations
+from amsdal_utils.models.enums import ModuleType
+
+
+class Migration(migrations.Migration):
+    operations: list[migrations.Operation] = [
+        migrations.UpdateClass(
+            module_type=ModuleType.CORE,
+            class_name="File",
+            old_schema={
+                "title": "File",
+                "required": ["filename"],
+                "properties": {
+                    "filename": {"type": "string", "title": "Filename"},
+                    "data": {"type": "binary", "title": "Data"},
+                    "size": {"type": "number", "title": "Size"},
+                    "storage_address": {"type": "anything", "title": "Storage Reference"},
+                },
+                "custom_code": 'import base64\nimport io\nfrom contextlib import suppress\nfrom pathlib import Path\nfrom typing import IO\nfrom typing import Any\nfrom typing import BinaryIO\n\nfrom amsdal_models.storage.backends.db import DBStorage\nfrom amsdal_models.storage.base import Storage\nfrom pydantic import model_validator\n\n\n@classmethod\ndef data_base64_decode(cls, data: Any) -> bytes:\n    if isinstance(data, str):\n        data = data.encode(\'utf-8\')\n    is_base64: bool = False\n    with suppress(Exception):\n        is_base64 = base64.b64encode(base64.b64decode(data)) == data\n    if is_base64:\n        return base64.b64decode(data)\n    return data\n\n@classmethod\ndef from_bytes(cls, filename: str, data: bytes) -> \'File\':\n    """\n        Creates a `File` object from a byte string.\n\n        Args:\n            filename (str): The filename of the file.\n            data (bytes): The byte string containing the file data.:\n\n        Returns:\n            File: The created `File` object.\n        """\n    obj = cls(filename=filename, data=data, size=len(data))\n    obj._needs_persist = True\n    return obj\n\n@classmethod\ndef from_file(cls, file_or_path: Path | BinaryIO) -> \'File\':\n    """\n        Creates a `File` object from a file path or a binary file object.\n\n        Args:\n            file_or_path (Path | BinaryIO): The file path or binary file object.\n\n        Returns:\n            File: The created `File` object.\n\n        Raises:\n            ValueError: If the provided path is a directory.\n        """\n    f: BinaryIO | io.BufferedReader\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        f = file_or_path.open(\'rb\')\n        filename = file_or_path.name\n        size = file_or_path.stat().st_size\n    else:\n        f = file_or_path\n        filename = Path(getattr(f, \'name\', \'unnamed\')).name\n        try:\n            if f.seekable():\n                f.seek(0, io.SEEK_END)\n                size = f.tell()\n                f.seek(0)\n            else:\n                size = None\n        except (OSError, AttributeError):\n            size = None\n    obj = cls(filename=filename, size=size)\n    obj._source = f\n    obj._needs_persist = True\n    return obj\n\n@model_validator(mode=\'before\')\n@classmethod\ndef validate_model_data(cls, data: Any) -> Any:\n    if isinstance(data, dict):\n        if \'data\' in data:\n            if data[\'data\']:\n                data[\'data\'] = cls.data_base64_decode(data[\'data\'])\n                data[\'size\'] = len(data[\'data\'])\n            else:\n                data[\'size\'] = 0\n    return data\n\n@property\ndef mimetype(self) -> str | None:\n    """\n        Returns the MIME type of the file based on its filename.\n\n        This method uses the `mimetypes` module to guess the MIME type of the file.\n\n        Returns:\n            str | None: The guessed MIME type of the file, or None if it cannot be determined.\n        """\n    import mimetypes\n    return mimetypes.guess_type(self.filename)[0]\n\n@property\ndef storage(self) -> Storage:\n    from amsdal.storages import default_storage\n    if self._storage:\n        return self._storage\n    if self.storage_address:\n        return Storage.from_storage_spec({\'storage_class\': self.storage_address.ref.resource})\n    return default_storage()\n\nasync def aopen(self, mode: str=\'rb\') -> Any:\n    """\n        Async variant of open().\n\n        Uses the resolved storage to call aopen(); if the backend does not implement\n        async, falls back to the sync open().\n        """\n    try:\n        return await self.storage.aopen(self, mode)\n    except NotImplementedError:\n        return self.storage.open(self, mode)\n\nasync def apre_create(self) -> None:\n    if self._needs_persist:\n        from amsdal_models.storage.persistence import apersist_file\n        await apersist_file(self, storage=self.storage)\n\nasync def apre_update(self) -> None:\n    if self._needs_persist:\n        from amsdal_models.storage.persistence import apersist_file\n        await apersist_file(self, storage=self.storage)\n\nasync def aread_bytes(self) -> bytes:\n    async with await self.aopen() as f:\n        return await f.read()\n\nasync def aurl(self) -> str:\n    """\n        Async variant of url().\n\n        Uses the resolved storage to call aurl(); if the backend does not implement\n        async, falls back to the sync url().\n        """\n    try:\n        return await self.storage.aurl(self)\n    except NotImplementedError:\n        return self.storage.url(self)\n\ndef __repr__(self) -> str:\n    return f"File<{self.filename}>({self.size or len(self.data or \'\') or 0} bytes)"\n\ndef __str__(self) -> str:\n    return repr(self)\n\ndef open(self, mode: str=\'rb\') -> IO[Any]:\n    """\n        Open a binary stream for reading (or other modes if supported) using storage_address.\n\n        Raises StateError if storage_address is missing.\n        """\n    return self.storage.open(self, mode)\n\ndef pre_create(self) -> None:\n    if self._needs_persist:\n        from amsdal_models.storage.persistence import persist_file\n        persist_file(self, storage=self.storage)\n\ndef pre_update(self) -> None:\n    if self._needs_persist:\n        from amsdal_models.storage.persistence import persist_file\n        persist_file(self, storage=self.storage)\n\ndef read_bytes(self) -> bytes:\n    with self.open() as f:\n        return f.read()\n\ndef set_data(self, data: bytes | str) -> None:\n    if not isinstance(self.storage, DBStorage):\n        msg = \'Cannot set data on a file that is not stored in a database. Use `File.from_bytes` instead.\'\n        raise ValueError(msg)\n    self.data = self.data_base64_decode(data)\n    self.size = len(self.data)\n    self._needs_persist = True\n\ndef to_file(self, file_or_path: Path | BinaryIO) -> None:\n    """\n        Writes the object\'s data to a file path or a binary file object.\n\n        Args:\n            file_or_path (Path | BinaryIO): The file path or binary file object where the data will be written.\n\n        Returns:\n            None\n\n        Raises:\n            ValueError: If the provided path is a directory.\n        """\n    with self.open() as f:\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(f.read())\n        else:\n            file_or_path.write(f.read())\n            file_or_path.seek(0)\n\ndef url(self) -> str:\n    """\n        Return a URL for this file using its storage_address.\n\n        Raises StateError if storage_address is missing.\n        """\n    return self.storage.url(self)',
+                "storage_metadata": {
+                    "table_name": "File",
+                    "db_fields": {},
+                    "primary_key": ["partition_key"],
+                    "foreign_keys": {},
+                },
+            },
+            new_schema={
+                "title": "File",
+                "required": ["filename"],
+                "properties": {
+                    "filename": {"type": "string", "title": "Filename"},
+                    "data": {"type": "binary", "title": "Data"},
+                    "size": {"type": "number", "title": "Size"},
+                    "storage_address": {"type": "anything", "title": "Storage Reference"},
+                },
+                "custom_code": 'import base64\nimport io\nfrom contextlib import suppress\nfrom pathlib import Path\nfrom typing import IO\nfrom typing import Any\nfrom typing import BinaryIO\n\nfrom amsdal_models.storage.backends.db import AsyncFileWrapper\nfrom amsdal_models.storage.backends.db import DBStorage\nfrom amsdal_models.storage.base import Storage\nfrom pydantic import model_validator\n\n\n@classmethod\ndef data_base64_decode(cls, data: Any) -> bytes:\n    if isinstance(data, str):\n        data = data.encode(\'utf-8\')\n    is_base64: bool = False\n    with suppress(Exception):\n        is_base64 = base64.b64encode(base64.b64decode(data)) == data\n    if is_base64:\n        return base64.b64decode(data)\n    return data\n\n@classmethod\ndef from_bytes(cls, filename: str, data: bytes) -> \'File\':\n    """\n        Creates a `File` object from a byte string.\n\n        Args:\n            filename (str): The filename of the file.\n            data (bytes): The byte string containing the file data.:\n\n        Returns:\n            File: The created `File` object.\n        """\n    obj = cls(filename=filename, data=data, size=len(data))\n    return obj\n\n@classmethod\ndef from_file(cls, file_or_path: Path | BinaryIO) -> \'File\':\n    """\n        Creates a `File` object from a file path or a binary file object.\n\n        Args:\n            file_or_path (Path | BinaryIO): The file path or binary file object.\n\n        Returns:\n            File: The created `File` object.\n\n        Raises:\n            ValueError: If the provided path is a directory.\n        """\n    f: BinaryIO | io.BufferedReader\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        f = file_or_path.open(\'rb\')\n        filename = file_or_path.name\n        size = file_or_path.stat().st_size\n    else:\n        f = file_or_path\n        filename = Path(getattr(f, \'name\', \'unnamed\')).name\n        try:\n            if f.seekable():\n                f.seek(0, io.SEEK_END)\n                size = f.tell()\n                f.seek(0)\n            else:\n                size = None\n        except (OSError, AttributeError):\n            size = None\n    obj = cls(filename=filename, size=size)\n    obj._source = f\n    return obj\n\n@model_validator(mode=\'before\')\n@classmethod\ndef validate_model_data(cls, data: Any) -> Any:\n    if isinstance(data, dict):\n        if \'data\' in data:\n            if data[\'data\']:\n                data[\'data\'] = cls.data_base64_decode(data[\'data\'])\n                data[\'size\'] = len(data[\'data\'])\n            else:\n                data[\'size\'] = 0\n    return data\n\n@property\ndef mimetype(self) -> str | None:\n    """\n        Returns the MIME type of the file based on its filename.\n\n        This method uses the `mimetypes` module to guess the MIME type of the file.\n\n        Returns:\n            str | None: The guessed MIME type of the file, or None if it cannot be determined.\n        """\n    import mimetypes\n    return mimetypes.guess_type(self.filename)[0]\n\n@property\ndef storage(self) -> Storage:\n    from amsdal.storages import default_storage\n    if self._storage:\n        return self._storage\n    if self.storage_address:\n        return Storage.from_storage_spec({\'storage_class\': self.storage_address.ref.resource})\n    return default_storage()\n\nasync def aopen(self, mode: str=\'rb\') -> Any:\n    """\n        Async variant of open().\n\n        Uses the resolved storage to call aopen(); if the backend does not implement\n        async, falls back to the sync open().\n        """\n    try:\n        return await self.storage.aopen(self, mode)\n    except NotImplementedError:\n        return AsyncFileWrapper(self.storage.open(self, mode))\n\nasync def apre_create(self) -> None:\n    from amsdal_models.storage.persistence import apersist_file\n    await apersist_file(self, storage=self.storage)\n\nasync def apre_update(self) -> None:\n    from amsdal_models.storage.persistence import apersist_file\n    await apersist_file(self, storage=self.storage)\n\nasync def aread_bytes(self) -> bytes:\n    async with await self.aopen() as f:\n        return await f.read()\n\nasync def aurl(self) -> str:\n    """\n        Async variant of url().\n\n        Uses the resolved storage to call aurl(); if the backend does not implement\n        async, falls back to the sync url().\n        """\n    try:\n        return await self.storage.aurl(self)\n    except NotImplementedError:\n        return self.storage.url(self)\n\ndef __repr__(self) -> str:\n    return f"File<{self.filename}>({self.size or len(self.data or \'\') or 0} bytes)"\n\ndef __str__(self) -> str:\n    return repr(self)\n\ndef open(self, mode: str=\'rb\') -> IO[Any]:\n    """\n        Open a binary stream for reading (or other modes if supported) using storage_address.\n\n        Raises StateError if storage_address is missing.\n        """\n    return self.storage.open(self, mode)\n\ndef pre_create(self) -> None:\n    from amsdal_models.storage.persistence import persist_file\n    persist_file(self, storage=self.storage)\n\ndef pre_update(self) -> None:\n    from amsdal_models.storage.persistence import persist_file\n    persist_file(self, storage=self.storage)\n\ndef read_bytes(self) -> bytes:\n    with self.open() as f:\n        return f.read()\n\ndef set_data(self, data: bytes | str) -> None:\n    if not isinstance(self.storage, DBStorage):\n        msg = \'Cannot set data on a file that is not stored in a database. Use `File.from_bytes` instead.\'\n        raise ValueError(msg)\n    self.data = self.data_base64_decode(data)\n    self.size = len(self.data)\n\ndef to_file(self, file_or_path: Path | BinaryIO) -> None:\n    """\n        Writes the object\'s data to a file path or a binary file object.\n\n        Args:\n            file_or_path (Path | BinaryIO): The file path or binary file object where the data will be written.\n\n        Returns:\n            None\n\n        Raises:\n            ValueError: If the provided path is a directory.\n        """\n    with self.open() as f:\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(f.read())\n        else:\n            file_or_path.write(f.read())\n            file_or_path.seek(0)\n\ndef url(self) -> str:\n    """\n        Return a URL for this file using its storage_address.\n\n        Raises StateError if storage_address is missing.\n        """\n    return self.storage.url(self)',
+                "storage_metadata": {
+                    "table_name": "File",
+                    "db_fields": {},
+                    "primary_key": ["partition_key"],
+                    "foreign_keys": {},
+                },
+            },
+        ),
+    ]

amsdal/configs/main.py

@@ -64,13 +64,18 @@ class Settings(BaseSettings):
     SECRET_ACCESS_KEY: str | None = None
     ACCESS_TOKEN: str | None = None
     SANDBOX_ENVIRONMENT: bool | None = None
-    CONTRIBS: list[str] = [
+    CONTRIBS: list[str] | str = [
         'amsdal.contrib.auth.app.AuthAppConfig',
         'amsdal.contrib.frontend_configs.app.FrontendConfigAppConfig',
     ]
     CONTRIB_MODELS_PACKAGE_NAME: str = 'models'
     CONTRIB_MIGRATIONS_DIRECTORY_NAME: str = 'migrations'
 
+    # File Storage
+    MEDIA_ROOT: Path = Path('./media')
+    MEDIA_URL: str = '/media/'
+    DEFAULT_FILE_STORAGE: str = 'amsdal_models.storage.backends.db.DBStorage'
+
     @field_validator('CONTRIBS', mode='after')
     def load_contrib_modules(cls, value: list[str]) -> list[str]:  # noqa: N805
         """
@@ -187,6 +192,17 @@ class Settings(BaseSettings):
 
         return self
 
+    @model_validator(mode='before')
+    @classmethod
+    def normalize_complex_values(cls, data: Any) -> Any:
+        if isinstance(data, dict):
+            if 'CONTRIBS' in data:
+                contribs = data['CONTRIBS']
+
+                if isinstance(contribs, str) and '[' not in contribs:
+                    data['CONTRIBS'] = [item.strip() for item in contribs.split(',')]
+        return data
+
 
 if TYPE_CHECKING:
     base: TypeAlias = Settings

amsdal/configs/main.pyi

@@ -49,9 +49,12 @@ class Settings(BaseSettings):
     SECRET_ACCESS_KEY: str | None
     ACCESS_TOKEN: str | None
     SANDBOX_ENVIRONMENT: bool | None
-    CONTRIBS: list[str]
+    CONTRIBS: list[str] | str
     CONTRIB_MODELS_PACKAGE_NAME: str
     CONTRIB_MIGRATIONS_DIRECTORY_NAME: str
+    MEDIA_ROOT: Path
+    MEDIA_URL: str
+    DEFAULT_FILE_STORAGE: str
     def load_contrib_modules(cls, value: list[str]) -> list[str]:
         """
         Loads and initializes contrib modules.
@@ -130,8 +133,9 @@ class Settings(BaseSettings):
         Returns:
             Settings: The updated settings instance with the `CONFIG_PATH` attribute set.
         """
-
-base: TypeAlias
+    @classmethod
+    def normalize_complex_values(cls, data: Any) -> Any: ...
+base: TypeAlias = Settings
 
 class SettingsProxy(base):
     """

amsdal/contrib/auth/errors.py

@@ -5,3 +5,39 @@ class UserCreationError(AmsdalError): ...
 
 
 class AuthenticationError(AmsdalError): ...
+
+
+class MFARequiredError(AuthenticationError):
+    """Raised when MFA verification is required but not provided."""
+
+    ...
+
+
+class InvalidMFACodeError(AuthenticationError):
+    """Raised when the provided MFA code is invalid."""
+
+    ...
+
+
+class MFADeviceNotFoundError(AmsdalError):
+    """Raised when no valid MFA device is found for the user."""
+
+    ...
+
+
+class MFASetupError(AmsdalError):
+    """Raised when there's an error during MFA device setup."""
+
+    ...
+
+
+class PermissionDeniedError(AmsdalError):
+    """Raised when a user lacks permission for an operation."""
+
+    ...
+
+
+class UserNotFoundError(AmsdalError):
+    """Raised when a target user cannot be found."""
+
+    ...

amsdal/contrib/auth/errors.pyi

@@ -2,3 +2,15 @@ from amsdal_utils.errors import AmsdalError
 
 class UserCreationError(AmsdalError): ...
 class AuthenticationError(AmsdalError): ...
+class MFARequiredError(AuthenticationError):
+    """Raised when MFA verification is required but not provided."""
+class InvalidMFACodeError(AuthenticationError):
+    """Raised when the provided MFA code is invalid."""
+class MFADeviceNotFoundError(AmsdalError):
+    """Raised when no valid MFA device is found for the user."""
+class MFASetupError(AmsdalError):
+    """Raised when there's an error during MFA device setup."""
+class PermissionDeniedError(AmsdalError):
+    """Raised when a user lacks permission for an operation."""
+class UserNotFoundError(AmsdalError):
+    """Raised when a target user cannot be found."""

amsdal/contrib/auth/lifecycle/consumer.py

@@ -63,7 +63,7 @@ class CheckAndCreateSuperUserConsumer(LifecycleConsumer):
             .execute()
         )
 
-        instance = User(
+        instance = User(  # type: ignore[call-arg]
             email=auth_settings.ADMIN_USER_EMAIL,
             password=auth_settings.ADMIN_USER_PASSWORD.encode(),
             permissions=[access_all_permission],
@@ -111,12 +111,12 @@ class CheckAndCreateSuperUserConsumer(LifecycleConsumer):
             .aexecute()
         )
 
-        instance = User(
+        instance = User(  # type: ignore[call-arg]
             email=auth_settings.ADMIN_USER_EMAIL,
             password=auth_settings.ADMIN_USER_PASSWORD.encode(),
             permissions=[access_all_permission],
         )
-        await instance.asave(force_insert=True)
+        await instance.asave(force_insert=True)  # type: ignore[misc]
         logger.info('Super user created successfully')
 
 

amsdal/contrib/auth/lifecycle/consumer.pyi

@@ -1,5 +1,6 @@
 from _typeshed import Incomplete
 from amsdal.contrib.auth.errors import AuthenticationError as AuthenticationError
+from amsdal_data.transactions.decorators import async_transaction, transaction
 from amsdal_models.classes.model import Model
 from amsdal_utils.lifecycle.consumer import LifecycleConsumer
 from typing import Any
@@ -13,6 +14,7 @@ class CheckAndCreateSuperUserConsumer(LifecycleConsumer):
     This consumer checks if a super user exists based on the provided email and password
     in the authentication settings. If the super user does not exist, it creates one.
     """
+    @transaction
     def on_event(self) -> None:
         """
         Checks for the existence of a super user and creates one if necessary.
@@ -21,6 +23,7 @@ class CheckAndCreateSuperUserConsumer(LifecycleConsumer):
         in the authentication settings. If the super user does not exist, it creates one
         with the necessary permissions.
         """
+    @async_transaction
     async def on_event_async(self) -> None:
         """
         Checks for the existence of a super user and creates one if necessary.

amsdal/contrib/auth/migrations/0000_initial.py

@@ -6,79 +6,82 @@ class Migration(migrations.Migration):
     operations: list[migrations.Operation] = [
         migrations.CreateClass(
             module_type=ModuleType.CONTRIB,
-            class_name='Permission',
+            class_name="LoginSession",
             new_schema={
-                'title': 'Permission',
-                'required': ['model', 'action'],
-                'properties': {
-                    'model': {'type': 'string', 'title': 'Model'},
-                    'action': {'type': 'string', 'title': 'Action'},
+                "title": "LoginSession",
+                "required": ["email", "password"],
+                "properties": {
+                    "email": {"type": "string", "title": "Email"},
+                    "password": {"type": "string", "title": "Password (hash)"},
+                    "token": {"type": "string", "title": "Token"},
+                },
+                "custom_code": "from datetime import UTC\nfrom datetime import datetime\nfrom datetime import timedelta\nfrom typing import Any\n\nimport jwt\n\n\n@property\ndef display_name(self) -> str:\n    \"\"\"\n        Returns the display name of the user.\n\n        This method returns the email of the user as their display name.\n\n        Returns:\n            str: The email of the user.\n        \"\"\"\n    return self.email\n\nasync def apre_create(self) -> None:\n    import bcrypt\n\n    from amsdal.contrib.auth.errors import AuthenticationError\n    from amsdal.contrib.auth.models.user import User\n    user = await User.objects.filter(email=self.email).latest().first().aexecute()\n    if not user:\n        msg = 'User not found'\n        raise AuthenticationError(msg)\n    if not bcrypt.checkpw(self.password.encode(), user.password):\n        msg = 'Invalid password'\n        raise AuthenticationError(msg)\n    self.password = 'validated'\n\nasync def apre_update(self) -> None:\n    from amsdal.contrib.auth.errors import AuthenticationError\n    msg = 'Update not allowed'\n    raise AuthenticationError(msg)\n\ndef pre_create(self) -> None:\n    import bcrypt\n\n    from amsdal.contrib.auth.errors import AuthenticationError\n    from amsdal.contrib.auth.models.user import User\n    user = User.objects.filter(email=self.email).latest().first().execute()\n    if not user:\n        msg = 'User not found'\n        raise AuthenticationError(msg)\n    if not bcrypt.checkpw(self.password.encode(), user.password):\n        msg = 'Invalid password'\n        raise AuthenticationError(msg)\n    self.password = 'validated'\n\ndef pre_init(self, *, is_new_object: bool, kwargs: dict[str, Any]) -> None:\n    \"\"\"\n        Pre-initializes a user object by validating email and password, and generating a JWT token.\n\n        This method checks if the object is new and validates the provided email and password.\n        If the email and password are valid, it generates a JWT token and adds it to the kwargs.\n\n        Args:\n            is_new_object (bool): Indicates if the object is new.\n            kwargs (dict[str, Any]): The keyword arguments containing user details.\n\n        Raises:\n            AuthenticationError: If the email or password is invalid.\n        \"\"\"\n    if not is_new_object or '_metadata' in kwargs:\n        return\n    from amsdal.contrib.auth.errors import AuthenticationError\n    from amsdal.contrib.auth.settings import auth_settings\n    email = kwargs.get('email', None)\n    password = kwargs.get('password', None)\n    if not email:\n        msg = \"Email can't be empty\"\n        raise AuthenticationError(msg)\n    if not password:\n        msg = \"Password can't be empty\"\n        raise AuthenticationError(msg)\n    lowercased_email = email.lower()\n    if not auth_settings.AUTH_JWT_KEY:\n        msg = 'JWT key is not set'\n        raise AuthenticationError(msg)\n    expiration_time = datetime.now(tz=UTC) + timedelta(seconds=auth_settings.AUTH_TOKEN_EXPIRATION)\n    token = jwt.encode({'email': lowercased_email, 'exp': expiration_time}, key=auth_settings.AUTH_JWT_KEY, algorithm='HS256')\n    kwargs['token'] = token\n\ndef pre_update(self) -> None:\n    from amsdal.contrib.auth.errors import AuthenticationError\n    msg = 'Update not allowed'\n    raise AuthenticationError(msg)",
+                "storage_metadata": {
+                    "table_name": "LoginSession",
+                    "db_fields": {},
+                    "primary_key": ["partition_key"],
+                    "foreign_keys": {},
                 },
-                "primary_key": ["partition_key"],
-                "table_name": "Permission",
-                'custom_code': "@property  # type: ignore[misc]\ndef display_name(self) -> str:  # type: ignore[no-untyped-def]\n    return f'{self.model}:{self.action}'",
             },
         ),
         migrations.CreateClass(
             module_type=ModuleType.CONTRIB,
-            class_name='User',
+            class_name="Permission",
             new_schema={
-                'title': 'User',
-                'required': ['email', 'password'],
-                'properties': {
-                    'email': {'type': 'string', 'title': 'Email'},
-                    'password': {'type': 'binary', 'title': 'Password (hash)'},
-                    'permissions': {'type': 'array', 'items': {'type': 'Permission'}, 'title': 'Permissions'},
+                "title": "Permission",
+                "required": ["model", "action"],
+                "properties": {
+                    "model": {"type": "string", "title": "Model"},
+                    "action": {"type": "string", "title": "Action"},
+                },
+                "custom_code": '@property\ndef display_name(self) -> str:\n    """\n        Returns the display name of the user.\n\n        This method returns a formatted string combining the model and action of the user.\n\n        Returns:\n            str: The formatted display name in the format \'model:action\'.\n        """\n    return f\'{self.model}:{self.action}\'',
+                "storage_metadata": {
+                    "table_name": "Permission",
+                    "db_fields": {},
+                    "primary_key": ["partition_key"],
+                    "foreign_keys": {},
                 },
-                "primary_key": ["partition_key"],
-                "table_name": "User",
-                'custom_code': "from typing import Any\n\n\ndef pre_init(self, *, is_new_object: bool, kwargs: dict[str, Any]) -> None:  # type: ignore[no-untyped-def]  # noqa: ARG001\n    import bcrypt\n\n    from amsdal.contrib.auth.errors import UserCreationError\n\n    email = kwargs.get('email', None)\n    password = kwargs.get('password', None)\n\n    if email is None or email == '':\n        msg = \"Email can't be empty\"\n        raise UserCreationError(msg)\n\n    if password is None or password == '':\n        msg = \"Password can't be empty\"\n        raise UserCreationError(msg)\n\n    kwargs['email'] = email.lower()\n\n    if is_new_object and '_metadata' not in kwargs:\n        hashed_password = bcrypt.hashpw(password.encode('utf-8'), bcrypt.gensalt())\n        kwargs['password'] = hashed_password\n        kwargs['_object_id'] = email.lower()\n\ndef pre_create(self) -> None:  # type: ignore[no-untyped-def]  # noqa: ARG001\n    pass\n\n@property  # type: ignore[misc]\ndef display_name(self) -> str:  # type: ignore[no-untyped-def]\n    return self.email",
             },
         ),
         migrations.CreateClass(
             module_type=ModuleType.CONTRIB,
-            class_name='UserPermission',
+            class_name="User",
             new_schema={
-                'title': 'UserPermission',
-                'required': ['user', 'permission'],
-                'properties': {
-                    'user': {'type': 'User', 'title': 'User', 'db_field': ['user_partition_key']},
-                    'permission': {
-                        'type': 'Permission',
-                        'title': 'Permission',
-                        'db_field': ['permission_partition_key'],
-                    },
+                "title": "User",
+                "required": ["email", "password"],
+                "properties": {
+                    "email": {"type": "string", "title": "Email"},
+                    "password": {"type": "binary", "title": "Password (hash)"},
+                    "permissions": {"type": "array", "items": {"type": "Permission"}, "title": "Permissions"},
                 },
-                "primary_key": ["user", "permission"],
-                "foreign_keys": {
-                    "user": [
-                        {"user_partition_key": "string"},
-                        "User",
-                        ["partition_key"],
-                    ],
-                    "permission": [
-                        {"permission_partition_key": "string"},
-                        "Permission",
-                        ["partition_key"],
-                    ],
+                "custom_code": "from typing import Any\n\nfrom amsdal.contrib.auth.models.permission import *\n\n\n@property\ndef display_name(self) -> str:\n    \"\"\"\n        Returns the display name of the user.\n\n        This method returns the email of the user as their display name.\n\n        Returns:\n            str: The email of the user.\n        \"\"\"\n    return self.email\n\nasync def apre_update(self) -> None:\n    import bcrypt\n    original_object = await self.arefetch_from_db()\n    password = self.password\n    if original_object.password and password is not None:\n        if isinstance(password, str):\n            password = password.encode('utf-8')\n        try:\n            if not bcrypt.checkpw(password, original_object.password):\n                self.password = password\n        except ValueError:\n            hashed_password = bcrypt.hashpw(password, bcrypt.gensalt())\n            self.password = hashed_password\n\ndef __repr__(self) -> str:\n    return str(self)\n\ndef __str__(self) -> str:\n    return f'User(email={self.email})'\n\ndef post_init(self, *, is_new_object: bool, kwargs: dict[str, Any]) -> None:\n    \"\"\"\n        Post-initializes a user object by validating email and password, and hashing the password.\n\n        This method checks if the email and password are provided and valid. If the object is new,\n        it hashes the password and sets the object ID to the lowercased email.\n\n        Args:\n            is_new_object (bool): Indicates if the object is new.\n            kwargs (dict[str, Any]): The keyword arguments containing user details.\n\n        Raises:\n            UserCreationError: If the email or password is invalid.\n        \"\"\"\n    import bcrypt\n\n    from amsdal.contrib.auth.errors import UserCreationError\n    email = kwargs.get('email', None)\n    password = kwargs.get('password', None)\n    if email is None or email == '':\n        msg = \"Email can't be empty\"\n        raise UserCreationError(msg)\n    if password is None or password == '':\n        msg = \"Password can't be empty\"\n        raise UserCreationError(msg)\n    kwargs['email'] = email.lower()\n    if is_new_object and '_metadata' not in kwargs:\n        if isinstance(password, str):\n            password = password.encode('utf-8')\n        hashed_password = bcrypt.hashpw(password, bcrypt.gensalt())\n        self.password = hashed_password\n        self._object_id = email.lower()\n\ndef pre_create(self) -> None:\n    \"\"\"\n        Pre-creates a user object.\n\n        This method is a placeholder for any pre-creation logic that needs to be executed\n        before a user object is created.\n        \"\"\"\n    pass\n\ndef pre_update(self) -> None:\n    import bcrypt\n    original_object = self.refetch_from_db()\n    password = self.password\n    if original_object.password and password is not None:\n        if isinstance(password, str):\n            password = password.encode('utf-8')\n        try:\n            if not bcrypt.checkpw(password, original_object.password):\n                self.password = password\n        except ValueError:\n            hashed_password = bcrypt.hashpw(password, bcrypt.gensalt())\n            self.password = hashed_password",
+                "storage_metadata": {
+                    "table_name": "User",
+                    "db_fields": {},
+                    "primary_key": ["partition_key"],
+                    "foreign_keys": {},
                 },
-                "table_name": "UserPermission",
             },
         ),
         migrations.CreateClass(
             module_type=ModuleType.CONTRIB,
-            class_name='LoginSession',
+            class_name="UserPermission",
             new_schema={
-                'title': 'LoginSession',
-                'required': ['email', 'password'],
-                'properties': {
-                    'email': {'type': 'string', 'title': 'Email'},
-                    'password': {'type': 'string', 'title': 'Password (hash)'},
-                    'token': {'type': 'string', 'title': 'Token', 'mark_as_read_only': True},
+                "title": "UserPermission",
+                "required": ["user", "permission"],
+                "properties": {
+                    "user": {"type": "User", "title": "User"},
+                    "permission": {"type": "Permission", "title": "Permission"},
+                },
+                "storage_metadata": {
+                    "table_name": "UserPermission",
+                    "db_fields": {"user": ["user_partition_key"], "permission": ["permission_partition_key"]},
+                    "primary_key": ["user", "permission"],
+                    "foreign_keys": {
+                        "user": [{"user_partition_key": "string"}, "User", ["partition_key"]],
+                        "permission": [{"permission_partition_key": "string"}, "Permission", ["partition_key"]],
+                    },
                 },
-                "primary_key": ["partition_key"],
-                "table_name": "LoginSession",
-                'custom_code': "from datetime import datetime\nfrom datetime import timedelta\nfrom datetime import timezone\nfrom typing import Any\n\nimport bcrypt\nimport jwt\nfrom amsdal_utils.models.enums import Versions\n\n\ndef pre_init(self, *, is_new_object: bool, kwargs: dict[str, Any]) -> None:  # type: ignore[no-untyped-def]  # noqa: ARG001\n    if not is_new_object or '_metadata' in kwargs:\n        return\n\n    from amsdal.contrib.auth.errors import AuthenticationError\n    from amsdal.contrib.auth.settings import auth_settings\n\n    email = kwargs.get('email', None)\n    password = kwargs.get('password', None)\n\n    if not email:\n        msg = \"Email can't be empty\"\n        raise AuthenticationError(msg)\n\n    if not password:\n        msg = \"Password can't be empty\"\n        raise AuthenticationError(msg)\n\n    lowercased_email = email.lower()\n\n    from amsdal.contrib.auth.models.user import User  # type: ignore[import-not-found]\n\n    user = User.objects.filter(email=lowercased_email, _address__object_version=Versions.LATEST).get_or_none().execute()\n\n    if not user:\n        msg = 'Invalid email / password'\n        raise AuthenticationError(msg)\n\n    if not bcrypt.checkpw(password.encode('utf-8') if isinstance(password, str) else password, user.password):\n        msg = 'Invalid email / password'\n        raise AuthenticationError(msg)\n\n    kwargs['password'] = 'validated'\n    expiration_time = datetime.now(tz=timezone.utc) + timedelta(seconds=1200)\n    token = jwt.encode(\n        {'email': lowercased_email, 'exp': expiration_time},\n        key=auth_settings.AUTH_JWT_KEY,  # type: ignore[arg-type]\n        algorithm='HS256',\n    )\n\n    kwargs['token'] = token\n\n@property  # type: ignore[misc]\ndef display_name(self) -> str:  # type: ignore[no-untyped-def]\n    return self.email",
             },
         ),
     ]