amsdal 0.3.5__cp312-cp312-macosx_10_13_universal2.whl → 0.4.0__cp312-cp312-macosx_10_13_universal2.whl

amsdal/contrib/auth/lifecycle/consumer.py

@@ -32,9 +32,9 @@ class CheckAndCreateSuperUserConsumer(LifecycleConsumer):
         in the authentication settings. If the super user does not exist, it creates one
         with the necessary permissions.
         """
+        from amsdal.contrib.auth.models.permission import Permission
+        from amsdal.contrib.auth.models.user import User
         from amsdal.contrib.auth.settings import auth_settings
-        from models.contrib.permission import Permission  # type: ignore[import-not-found]
-        from models.contrib.user import User  # type: ignore[import-not-found]
 
         logger.info('Ensure super user exists')
 
@@ -65,7 +65,7 @@ class CheckAndCreateSuperUserConsumer(LifecycleConsumer):
 
         instance = User(
             email=auth_settings.ADMIN_USER_EMAIL,
-            password=auth_settings.ADMIN_USER_PASSWORD,
+            password=auth_settings.ADMIN_USER_PASSWORD.encode(),
             permissions=[access_all_permission],
         )
         instance.save(force_insert=True)
@@ -80,9 +80,9 @@ class CheckAndCreateSuperUserConsumer(LifecycleConsumer):
         in the authentication settings. If the super user does not exist, it creates one
         with the necessary permissions.
         """
+        from amsdal.contrib.auth.models.permission import Permission  # type: ignore[import-not-found]
+        from amsdal.contrib.auth.models.user import User  # type: ignore[import-not-found]
         from amsdal.contrib.auth.settings import auth_settings
-        from models.contrib.permission import Permission  # type: ignore[import-not-found]
-        from models.contrib.user import User  # type: ignore[import-not-found]
 
         logger.info('Ensure super user exists')
 
@@ -113,7 +113,7 @@ class CheckAndCreateSuperUserConsumer(LifecycleConsumer):
 
         instance = User(
             email=auth_settings.ADMIN_USER_EMAIL,
-            password=auth_settings.ADMIN_USER_PASSWORD,
+            password=auth_settings.ADMIN_USER_PASSWORD.encode(),
             permissions=[access_all_permission],
         )
         await instance.asave(force_insert=True)
@@ -141,8 +141,8 @@ class AuthenticateUserConsumer(LifecycleConsumer):
             auth_header (str): The JWT token from the authorization header.
             authentication_info (Any): The authentication information object to update with the user.
         """
+        from amsdal.contrib.auth.models.user import User  # type: ignore[import-not-found]
         from amsdal.contrib.auth.settings import auth_settings
-        from models.contrib.user import User  # type: ignore[import-not-found]
 
         authentication_info.user = None
         email: str | None
@@ -181,8 +181,8 @@ class AuthenticateUserConsumer(LifecycleConsumer):
             auth_header (str): The JWT token from the authorization header.
             authentication_info (Any): The authentication information object to update with the user.
         """
+        from amsdal.contrib.auth.models.user import User  # type: ignore[import-not-found]
         from amsdal.contrib.auth.settings import auth_settings
-        from models.contrib.user import User  # type: ignore[import-not-found]
 
         authentication_info.user = None
         email: str | None
@@ -219,8 +219,8 @@ class CheckPermissionConsumer(LifecycleConsumer):
     """
 
     def _prepopulate_default_permissions(self, object_class: type[Model], permissions_info: Any) -> None:
+        from amsdal.contrib.auth.models.permission import Permission
         from amsdal.contrib.auth.settings import auth_settings
-        from models.contrib.permission import Permission  # type: ignore[import-not-found]
 
         permissions_info.has_read_permission = not auth_settings.REQUIRE_DEFAULT_AUTHORIZATION
         permissions_info.has_create_permission = (
@@ -245,8 +245,8 @@ class CheckPermissionConsumer(LifecycleConsumer):
                 permissions_info.has_delete_permission = False
 
     async def _async_prepopulate_default_permissions(self, object_class: type[Model], permissions_info: Any) -> None:
+        from amsdal.contrib.auth.models.permission import Permission  # type: ignore[import-not-found]
         from amsdal.contrib.auth.settings import auth_settings
-        from models.contrib.permission import Permission  # type: ignore[import-not-found]
 
         permissions_info.has_read_permission = not auth_settings.REQUIRE_DEFAULT_AUTHORIZATION
         permissions_info.has_create_permission = (

amsdal/contrib/auth/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.CONTRIB,
+            module_type=ModuleType.CONTRIB,
             class_name='Permission',
             new_schema={
                 'title': 'Permission',
@@ -15,11 +14,13 @@ class Migration(migrations.Migration):
                     'model': {'type': 'string', 'title': 'Model'},
                     'action': {'type': 'string', 'title': 'Action'},
                 },
+                "primary_key": {"partition_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(
-            schema_type=SchemaTypes.CONTRIB,
+            module_type=ModuleType.CONTRIB,
             class_name='User',
             new_schema={
                 'title': 'User',
@@ -29,11 +30,42 @@ class Migration(migrations.Migration):
                     'password': {'type': 'binary', 'title': 'Password (hash)'},
                     'permissions': {'type': 'array', 'items': {'type': 'Permission'}, 'title': 'Permissions'},
                 },
+                "primary_key": {"partition_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(
-            schema_type=SchemaTypes.CONTRIB,
+            module_type=ModuleType.CONTRIB,
+            class_name='UserPermission',
+            new_schema={
+                'title': 'UserPermission',
+                'required': ['user', 'permission'],
+                'properties': {
+                    'user': {'type': 'User', 'title': 'User'},
+                    'permission': {'type': 'Permission', 'title': 'Permission'},
+                },
+                "primary_key": {
+                    "user": ["user_partition_key"],
+                    "permission": ["permission_partition_key"],
+                },
+                "foreign_keys": {
+                    "user": [
+                        {"user_partition_key": "string"},
+                        "User",
+                        ["partition_key"],
+                    ],
+                    "permission": [
+                        {"permission_partition_key": "string"},
+                        "Permission",
+                        ["partition_key"],
+                    ],
+                },
+                "table_name": "UserPermission",
+            },
+        ),
+        migrations.CreateClass(
+            module_type=ModuleType.CONTRIB,
             class_name='LoginSession',
             new_schema={
                 'title': 'LoginSession',
@@ -43,7 +75,9 @@ class Migration(migrations.Migration):
                     'password': {'type': 'string', 'title': 'Password (hash)'},
                     'token': {'type': 'string', 'title': 'Token', 'mark_as_read_only': True},
                 },
-                '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 models.contrib.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",
+                "primary_key": {"partition_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",
             },
         ),
     ]

amsdal/contrib/auth/models/login_session.py

@@ -0,0 +1,66 @@
+from datetime import UTC
+from datetime import datetime
+from datetime import timedelta
+from typing import Any
+from typing import ClassVar
+
+import jwt
+from amsdal_models.classes.model import Model
+from amsdal_utils.models.enums import ModuleType
+from pydantic.fields import Field
+
+
+class LoginSession(Model):
+    __module_type__: ClassVar[ModuleType] = ModuleType.CONTRIB
+    email: str = Field(title='Email')
+    password: str = Field(title='Password (hash)')
+    token: str | None = Field(None, title='Token')
+
+    @property
+    def display_name(self) -> str:
+        """
+        Returns the display name of the user.
+
+        This method returns the email of the user as their display name.
+
+        Returns:
+            str: The email of the user.
+        """
+        return self.email
+
+    def pre_init(self, *, is_new_object: bool, kwargs: dict[str, Any]) -> None:
+        """
+        Pre-initializes a user object by validating email and password, and generating a JWT token.
+
+        This method checks if the object is new and validates the provided email and password.
+        If the email and password are valid, it generates a JWT token and adds it to the kwargs.
+
+        Args:
+            is_new_object (bool): Indicates if the object is new.
+            kwargs (dict[str, Any]): The keyword arguments containing user details.
+
+        Raises:
+            AuthenticationError: If the email or password is invalid.
+        """
+        if not is_new_object or '_metadata' in kwargs:
+            return
+        from amsdal.contrib.auth.errors import AuthenticationError
+        from amsdal.contrib.auth.settings import auth_settings
+
+        email = kwargs.get('email', None)
+        password = kwargs.get('password', None)
+        if not email:
+            msg = "Email can't be empty"
+            raise AuthenticationError(msg)
+        if not password:
+            msg = "Password can't be empty"
+            raise AuthenticationError(msg)
+        lowercased_email = email.lower()
+        kwargs['password'] = 'validated'
+        expiration_time = datetime.now(tz=UTC) + timedelta(seconds=auth_settings.AUTH_TOKEN_EXPIRATION)
+        token = jwt.encode(
+            {'email': lowercased_email, 'exp': expiration_time},
+            key=auth_settings.AUTH_JWT_KEY,  # type: ignore[arg-type]
+            algorithm='HS256',
+        )
+        kwargs['token'] = token

amsdal/contrib/auth/models/login_session.pyi

@@ -0,0 +1,33 @@
+from amsdal_models.classes.model import Model
+from amsdal_utils.models.enums import ModuleType
+from typing import Any, ClassVar
+
+class LoginSession(Model):
+    __module_type__: ClassVar[ModuleType] = ...
+    email: str = ...
+    password: str = ...
+    token: str | None = ...
+    @property
+    def display_name(self) -> str:
+        """
+        Returns the display name of the user.
+
+        This method returns the email of the user as their display name.
+
+        Returns:
+            str: The email of the user.
+        """
+    def pre_init(self, *, is_new_object: bool, kwargs: dict[str, Any]) -> None:
+        """
+        Pre-initializes a user object by validating email and password, and generating a JWT token.
+
+        This method checks if the object is new and validates the provided email and password.
+        If the email and password are valid, it generates a JWT token and adds it to the kwargs.
+
+        Args:
+            is_new_object (bool): Indicates if the object is new.
+            kwargs (dict[str, Any]): The keyword arguments containing user details.
+
+        Raises:
+            AuthenticationError: If the email or password is invalid.
+        """

amsdal/contrib/auth/models/permission.py

@@ -0,0 +1,23 @@
+from typing import ClassVar
+
+from amsdal_models.classes.model import Model
+from amsdal_utils.models.enums import ModuleType
+from pydantic.fields import Field
+
+
+class Permission(Model):
+    __module_type__: ClassVar[ModuleType] = ModuleType.CONTRIB
+    model: str = Field(title='Model')
+    action: str = Field(title='Action')
+
+    @property
+    def display_name(self) -> str:
+        """
+        Returns the display name of the user.
+
+        This method returns a formatted string combining the model and action of the user.
+
+        Returns:
+            str: The formatted display name in the format 'model:action'.
+        """
+        return f'{self.model}:{self.action}'

amsdal/contrib/auth/models/permission.pyi

@@ -0,0 +1,18 @@
+from amsdal_models.classes.model import Model
+from amsdal_utils.models.enums import ModuleType
+from typing import ClassVar
+
+class Permission(Model):
+    __module_type__: ClassVar[ModuleType] = ...
+    model: str = ...
+    action: str = ...
+    @property
+    def display_name(self) -> str:
+        """
+        Returns the display name of the user.
+
+        This method returns a formatted string combining the model and action of the user.
+
+        Returns:
+            str: The formatted display name in the format 'model:action'.
+        """

amsdal/contrib/auth/models/user.py

@@ -0,0 +1,106 @@
+from typing import Any
+from typing import ClassVar
+
+from amsdal_models.classes.model import Model
+from amsdal_utils.models.enums import ModuleType
+from pydantic.fields import Field
+
+from amsdal.contrib.auth.models.permission import *  # noqa: F403
+
+
+class User(Model):
+    __module_type__: ClassVar[ModuleType] = ModuleType.CONTRIB
+    email: str = Field(title='Email')
+    password: bytes = Field(title='Password (hash)')
+    permissions: list['Permission'] | None = Field(None, title='Permissions')  # noqa: F405
+
+    def __repr__(self) -> str:
+        return str(self)
+
+    def __str__(self) -> str:
+        return f'User(email={self.email})'
+
+    async def apre_update(self) -> None:
+        import bcrypt
+
+        original_object = await self.arefetch_from_db()
+        password = self.password
+        if original_object.password and password is not None:
+            if isinstance(password, str):
+                password = password.encode('utf-8')
+            try:
+                if not bcrypt.checkpw(password, original_object.password):
+                    self.password = password
+            except ValueError:
+                hashed_password = bcrypt.hashpw(password, bcrypt.gensalt())
+                self.password = hashed_password
+
+    @property
+    def display_name(self) -> str:
+        """
+        Returns the display name of the user.
+
+        This method returns the email of the user as their display name.
+
+        Returns:
+            str: The email of the user.
+        """
+        return self.email
+
+    def post_init(self, *, is_new_object: bool, kwargs: dict[str, Any]) -> None:
+        """
+        Post-initializes a user object by validating email and password, and hashing the password.
+
+        This method checks if the email and password are provided and valid. If the object is new,
+        it hashes the password and sets the object ID to the lowercased email.
+
+        Args:
+            is_new_object (bool): Indicates if the object is new.
+            kwargs (dict[str, Any]): The keyword arguments containing user details.
+
+        Raises:
+            UserCreationError: If the email or password is invalid.
+        """
+        import bcrypt
+
+        from amsdal.contrib.auth.errors import UserCreationError
+
+        email = kwargs.get('email', None)
+        password = kwargs.get('password', None)
+        if email is None or email == '':
+            msg = "Email can't be empty"
+            raise UserCreationError(msg)
+        if password is None or password == '':
+            msg = "Password can't be empty"
+            raise UserCreationError(msg)
+        kwargs['email'] = email.lower()
+        if is_new_object and '_metadata' not in kwargs:
+            if isinstance(password, str):
+                password = password.encode('utf-8')
+            hashed_password = bcrypt.hashpw(password, bcrypt.gensalt())
+            self.password = hashed_password
+            self._object_id = email.lower()
+
+    def pre_create(self) -> None:
+        """
+        Pre-creates a user object.
+
+        This method is a placeholder for any pre-creation logic that needs to be executed
+        before a user object is created.
+        """
+        pass
+
+    def pre_update(self) -> None:
+        import bcrypt
+
+        original_object = self.refetch_from_db()
+        password = self.password
+        if original_object.password and password is not None:
+            if isinstance(password, str):
+                password = password.encode('utf-8')
+            try:
+                if not bcrypt.checkpw(password, original_object.password):
+                    self.password = password
+            except ValueError:
+                hashed_password = bcrypt.hashpw(password, bcrypt.gensalt())
+                self.password = hashed_password

amsdal/contrib/auth/models/user.pyi

@@ -0,0 +1,46 @@
+from amsdal.contrib.auth.models.permission import *
+from amsdal_models.classes.model import Model
+from amsdal_utils.models.enums import ModuleType
+from typing import Any, ClassVar
+
+class User(Model):
+    __module_type__: ClassVar[ModuleType] = ...
+    email: str = ...
+    password: bytes = ...
+    permissions: list['Permission'] | None = ...
+    def __repr__(self) -> str: ...
+    def __str__(self) -> str: ...
+    async def apre_update(self) -> None: ...
+    @property
+    def display_name(self) -> str:
+        """
+        Returns the display name of the user.
+
+        This method returns the email of the user as their display name.
+
+        Returns:
+            str: The email of the user.
+        """
+    _object_id = ...
+    def post_init(self, *, is_new_object: bool, kwargs: dict[str, Any]) -> None:
+        """
+        Post-initializes a user object by validating email and password, and hashing the password.
+
+        This method checks if the email and password are provided and valid. If the object is new,
+        it hashes the password and sets the object ID to the lowercased email.
+
+        Args:
+            is_new_object (bool): Indicates if the object is new.
+            kwargs (dict[str, Any]): The keyword arguments containing user details.
+
+        Raises:
+            UserCreationError: If the email or password is invalid.
+        """
+    def pre_create(self) -> None:
+        """
+        Pre-creates a user object.
+
+        This method is a placeholder for any pre-creation logic that needs to be executed
+        before a user object is created.
+        """
+    def pre_update(self) -> None: ...

amsdal/contrib/frontend_configs/conversion/convert.py

@@ -1,3 +1,4 @@
+from contextlib import suppress
 from datetime import date
 from datetime import datetime
 from enum import Enum
@@ -9,15 +10,20 @@ from typing import Any
 from typing import ClassVar
 from typing import ForwardRef
 from typing import Union
+from typing import get_args
+from typing import get_origin
 
-from amsdal_models.classes.manager import ClassManager
+from amsdal_models.classes.class_manager import ClassManager
 from amsdal_models.classes.model import LegacyModel
 from amsdal_models.classes.model import Model
+from amsdal_models.classes.model import TypeModel
+from amsdal_models.classes.relationships.constants import MANY_TO_MANY_FIELDS
+from amsdal_models.schemas.object_schema import model_to_object_schema
 from amsdal_utils.models.data_models.reference import Reference
 from pydantic import BaseModel
 from pydantic_core import PydanticUndefined
 
-from amsdal.schemas.manager import SchemaManager
+# from amsdal.schemas.manager import SchemaManager
 
 default_types_map = {
     int: 'number',
@@ -32,11 +38,19 @@ default_types_map = {
 
 def _process_union(value: UnionType, *, is_transaction: bool = False) -> dict[str, Any]:
     arg_type = {'required': True}
-    for arg in value.__args__:
+
+    for arg in get_args(value):
         if arg is type(None):
             arg_type['required'] = False
             continue
 
+        if not is_transaction:
+            with suppress(TypeError):
+                if issubclass(arg, Model):
+                    arg_type['type'] = 'object_latest'  # type: ignore[assignment]
+                    arg_type['entityType'] = arg.__name__
+                    continue
+
         control = convert_to_frontend_config(arg, is_transaction=is_transaction)
         if control:
             arg_type.update(control)
@@ -59,9 +73,10 @@ def convert_to_frontend_config(value: Any, *, is_transaction: bool = False) -> d
     Returns:
         dict[str, Any]: A dictionary representing the frontend configuration for the given value.
     """
-    if hasattr(value, '__origin__'):
-        origin_class = value.__origin__
+    schema = None
+    origin_class = get_origin(value)
 
+    if origin_class:
         if origin_class in [ClassVar]:
             return {}
 
@@ -100,7 +115,7 @@ def convert_to_frontend_config(value: Any, *, is_transaction: bool = False) -> d
 
     if isinstance(value, ForwardRef):
         class_name = value.__forward_arg__
-        _class = ClassManager().import_class(class_name, ClassManager().resolve_schema_type(class_name))
+        _class = ClassManager().import_class(class_name)
 
         if issubclass(_class, Model):
             return {
@@ -163,7 +178,8 @@ def convert_to_frontend_config(value: Any, *, is_transaction: bool = False) -> d
                 control['value'] = _param.default
                 control['required'] = False
 
-            function_controls.append(control)
+            if not control['name'].startswith('_'):
+                function_controls.append(control)
 
         return {
             'type': 'group',
@@ -194,23 +210,26 @@ def convert_to_frontend_config(value: Any, *, is_transaction: bool = False) -> d
         model_controls = []
 
         try:
-            schema = SchemaManager().get_schema_by_name(value.__name__)
+            if issubclass(value, Model | TypeModel):
+                schema = model_to_object_schema(value)
         except FileNotFoundError:
             schema = None
 
-        for field_name, field in value.__annotations__.items():
-            control = convert_to_frontend_config(field, is_transaction=is_transaction)
+        if value.__name__ == 'File':
+            return {
+                'type': 'file',
+            }
+
+        for field_name, field in value.model_fields.items():
+            control = convert_to_frontend_config(field.annotation, is_transaction=is_transaction)
 
             if not control:
                 continue
 
             control.setdefault('required', True)
 
-            if field_name in value.model_fields:
-                _field = value.model_fields[field_name]
-
-                if _field.default is not PydanticUndefined:
-                    control['value'] = _field.default
+            if field.default is not PydanticUndefined:
+                control['value'] = field.default
 
             control['name'] = field_name
             control['label'] = field_name
@@ -232,6 +251,19 @@ def convert_to_frontend_config(value: Any, *, is_transaction: bool = False) -> d
                 if schema_property.title:
                     control['label'] = schema_property.title
 
+            if not control['name'].startswith('_'):
+                model_controls.append(control)
+
+        for m2m, (m2m_ref, _, _, field_info) in (getattr(value, MANY_TO_MANY_FIELDS, None) or {}).items():
+            pass
+            control = convert_to_frontend_config(list[Reference | m2m_ref], is_transaction=is_transaction)  # type: ignore[valid-type]
+
+            if getattr(field_info, 'default', PydanticUndefined) is not PydanticUndefined:
+                control['value'] = field_info.default
+
+            control['name'] = m2m
+            control['label'] = m2m
+            control['required'] = False
             model_controls.append(control)
 
         return {

amsdal/contrib/frontend_configs/conversion/convert.pyi

@@ -1,5 +1,4 @@
 from _typeshed import Incomplete
-from amsdal.schemas.manager import SchemaManager as SchemaManager
 from types import UnionType
 from typing import Any