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

amsdal/fixtures/manager.pyi

@@ -1,11 +1,10 @@
 from _typeshed import Incomplete
-from amsdal.schemas.manager import SchemaManager as SchemaManager
-from amsdal_models.classes.manager import ClassManager
-from amsdal_utils.config.manager import AmsdalConfigManager as AmsdalConfigManager
-from amsdal_utils.models.data_models.core import DictSchema, TypeData as TypeData
-from amsdal_utils.models.data_models.schema import PropertyData as PropertyData
+from amsdal.fixtures.utils import process_fixture_value as process_fixture_value
+from amsdal_models.classes.model import Model
+from collections.abc import Generator
 from pathlib import Path
 from pydantic import BaseModel
+from pydantic.fields import FieldInfo as FieldInfo
 from typing import Any
 
 logger: Incomplete
@@ -13,24 +12,16 @@ logger: Incomplete
 class FixtureData(BaseModel):
     class_name: str
     external_id: str
+    order: float
     data: dict[str, Any]
 
-class FixturesManager:
-    """
-    Manager class for handling fixture data.
-
-    This class is responsible for loading, processing, and applying fixture data
-    to the database. It supports nested object construction, data processing,
-    and file fixture handling.
-    """
-    fixtures_path: Incomplete
-    fixtures: Incomplete
-    _created_cache: Incomplete
-    data_to_process: Incomplete
+class BaseFixturesManager:
+    ORDER_MULTIPLIER: int
+    fixtures_paths: Incomplete
+    fixtures: dict[str | int, list[tuple[float, FixtureData]]]
     _class_manager: Incomplete
     _config_manager: Incomplete
-    _schema_manager: Incomplete
-    def __init__(self, fixtures_path: Path, class_manager: ClassManager, config_manager: AmsdalConfigManager, schema_manager: SchemaManager) -> None: ...
+    def __init__(self, fixtures_paths: list[Path]) -> None: ...
     def load_fixtures(self) -> None:
         """
         Loads fixture data from the specified path.
@@ -42,41 +33,45 @@ class FixturesManager:
         Returns:
             None
         """
-    def construct_nested_object(self, external_id: Any) -> Any:
-        """
-        Constructs a nested object reference from the given external ID.
+    def _load_fixtures(self, fixtures_path: Path, order_shift: int = 0) -> None: ...
+    def iter_fixtures(self) -> Generator[FixtureData, None, None]: ...
+    def _process_object_data(self, data: dict[str, Any], model_fields: dict[str, FieldInfo], m2m_fields: dict[str, type[Model]]) -> dict[str, Any]: ...
 
-        This method takes an external ID and constructs a nested object reference
-        dictionary. If the external ID is a dictionary containing an '_object_id' key,
-        it extracts the ID. If the external ID is not a string or integer, it returns
-        the external ID as is.
+class FixturesManager(BaseFixturesManager):
+    """
+    Manager class for handling fixture data.
 
-        Args:
-            external_id (Any): The external ID to construct the nested object reference from.
+    This class is responsible for loading, processing, and applying fixture data
+    to the database. It supports nested object construction, data processing,
+    and file fixture handling.
+    """
+    def apply_file_fixtures(self) -> None:
+        """
+        Applies file fixtures from the specified directory.
+
+        This method processes file fixtures located in the 'files' directory adjacent to the
+        `fixtures_path`. It iterates through each file, reads its content, and processes it
+        as a fixture. If the file fixture already exists in the database, it updates the
+        existing fixture; otherwise, it creates a new one.
 
         Returns:
-            Any: A dictionary representing the nested object reference or the original
-            external ID if it is not a string or integer.
+            None
         """
-    def _process_object_data(self, model_properties: dict[str, PropertyData], data: dict[str, Any]) -> dict[str, Any]: ...
-    def _process_object_value(self, field_configuration: PropertyData | DictSchema | TypeData, value: Any) -> Any: ...
-    def process_fixture_object_data(self, class_name: str, external_id: str, data: dict[str, Any]) -> None:
+    def _apply_file_fixtures(self, file_dir: Path) -> None: ...
+    def _apply_file_fixtures_rec(self, nested_dir: Path, base_dir: Path) -> None: ...
+    def apply_fixtures(self) -> None:
         """
-        Processes and saves fixture object data to the database.
-
-        This method takes the class name, external ID, and data dictionary of a fixture object,
-        processes the data according to the class schema, and saves the object to the database.
-        If the object already exists, it updates the existing object with the new data.
+        Applies all loaded fixtures to the database.
 
-        Args:
-            class_name (str): The name of the class to which the fixture object belongs.
-            external_id (str): The external ID of the fixture object.
-            data (dict[str, Any]): The data dictionary of the fixture object.
+        This method processes each fixture in the `fixtures` dictionary in the order
+        specified by their 'order' value. It calls the `process_fixture` method for
+        each fixture and then processes the data in the processing queue.
 
         Returns:
             None
         """
-    def process_fixture(self, fixture: dict[str, Any]) -> None:
+    def _process_file_fixture(self, file_path: Path, file_key: str) -> None: ...
+    def _process_fixture(self, fixture: FixtureData) -> FixtureData | None:
         """
         Processes a single fixture and adds it to the processing queue.
 
@@ -91,94 +86,58 @@ class FixturesManager:
         Returns:
             None
         """
-    def apply_fixtures(self) -> None:
+    def _process_fixture_object_data(self, class_name: str, external_id: str, data: dict[str, Any]) -> None:
         """
-        Applies all loaded fixtures to the database.
-
-        This method processes each fixture in the `fixtures` dictionary in the order
-        specified by their 'order' value. It calls the `process_fixture` method for
-        each fixture and then processes the data in the processing queue.
+        Processes and saves fixture object data to the database.
 
-        Returns:
-            None
-        """
-    def _process_data(self) -> None: ...
-    def apply_file_fixtures(self) -> None:
-        """
-        Applies file fixtures from the specified directory.
+        This method takes the class name, external ID, and data dictionary of a fixture object,
+        processes the data according to the class schema, and saves the object to the database.
+        If the object already exists, it updates the existing object with the new data.
 
-        This method processes file fixtures located in the 'files' directory adjacent to the
-        `fixtures_path`. It iterates through each file, reads its content, and processes it
-        as a fixture. If the file fixture already exists in the database, it updates the
-        existing fixture; otherwise, it creates a new one.
+        Args:
+            class_name (str): The name of the class to which the fixture object belongs.
+            external_id (str): The external ID of the fixture object.
+            data (dict[str, Any]): The data dictionary of the fixture object.
 
         Returns:
             None
         """
-    def _process_file_fixture(self, file_path: Path, file_key: str) -> None: ...
 
-class AsyncFixturesManager:
+class AsyncFixturesManager(BaseFixturesManager):
     """
-    Manager class for handling fixture data.
+    Manager class for handling fixture data asynchronously.
 
     This class is responsible for loading, processing, and applying fixture data
     to the database. It supports nested object construction, data processing,
     and file fixture handling.
     """
-    fixtures_path: Incomplete
-    fixtures: Incomplete
-    _created_cache: Incomplete
-    data_to_process: Incomplete
-    _class_manager: Incomplete
-    _config_manager: Incomplete
-    _schema_manager: Incomplete
-    def __init__(self, fixtures_path: Path, class_manager: ClassManager, config_manager: AmsdalConfigManager, schema_manager: SchemaManager) -> None: ...
-    def load_fixtures(self) -> None:
+    async def apply_file_fixtures(self) -> None:
         """
-        Loads fixture data from the specified path.
+        Applies file fixtures from the specified directory.
 
-        This method reads fixture data from a JSON file located at the `fixtures_path`.
-        It populates the `fixtures` dictionary with the loaded data, where each fixture
-        is indexed by its external ID.
+        This method processes file fixtures located in the 'files' directory adjacent to the
+        `fixtures_path`. It iterates through each file, reads its content, and processes it
+        as a fixture. If the file fixture already exists in the database, it updates the
+        existing fixture; otherwise, it creates a new one.
 
         Returns:
             None
         """
-    def construct_nested_object(self, external_id: Any) -> Any:
-        """
-        Constructs a nested object reference from the given external ID.
-
-        This method takes an external ID and constructs a nested object reference
-        dictionary. If the external ID is a dictionary containing an '_object_id' key,
-        it extracts the ID. If the external ID is not a string or integer, it returns
-        the external ID as is.
-
-        Args:
-            external_id (Any): The external ID to construct the nested object reference from.
-
-        Returns:
-            Any: A dictionary representing the nested object reference or the original
-            external ID if it is not a string or integer.
-        """
-    def _process_object_data(self, model_properties: dict[str, PropertyData], data: dict[str, Any]) -> dict[str, Any]: ...
-    def _process_object_value(self, field_configuration: PropertyData | DictSchema | TypeData, value: Any) -> Any: ...
-    async def process_fixture_object_data(self, class_name: str, external_id: str, data: dict[str, Any]) -> None:
+    async def _apply_file_fixtures(self, file_dir: Path) -> None: ...
+    async def _apply_file_fixtures_rec(self, nested_dir: Path, base_dir: Path) -> None: ...
+    async def apply_fixtures(self) -> None:
         """
-        Processes and saves fixture object data to the database.
-
-        This method takes the class name, external ID, and data dictionary of a fixture object,
-        processes the data according to the class schema, and saves the object to the database.
-        If the object already exists, it updates the existing object with the new data.
+        Applies all loaded fixtures to the database.
 
-        Args:
-            class_name (str): The name of the class to which the fixture object belongs.
-            external_id (str): The external ID of the fixture object.
-            data (dict[str, Any]): The data dictionary of the fixture object.
+        This method processes each fixture in the `fixtures` dictionary in the order
+        specified by their 'order' value. It calls the `process_fixture` method for
+        each fixture and then processes the data in the processing queue.
 
         Returns:
             None
         """
-    async def process_fixture(self, fixture: dict[str, Any]) -> None:
+    async def _process_file_fixture(self, file_path: Path, file_key: str) -> None: ...
+    async def _process_fixture(self, fixture: FixtureData) -> FixtureData | None:
         """
         Processes a single fixture and adds it to the processing queue.
 
@@ -193,28 +152,19 @@ class AsyncFixturesManager:
         Returns:
             None
         """
-    async def apply_fixtures(self) -> None:
+    async def _process_fixture_object_data(self, class_name: str, external_id: str, data: dict[str, Any]) -> None:
         """
-        Applies all loaded fixtures to the database.
-
-        This method processes each fixture in the `fixtures` dictionary in the order
-        specified by their 'order' value. It calls the `process_fixture` method for
-        each fixture and then processes the data in the processing queue.
+        Processes and saves fixture object data to the database.
 
-        Returns:
-            None
-        """
-    async def _process_data(self) -> None: ...
-    async def apply_file_fixtures(self) -> None:
-        """
-        Applies file fixtures from the specified directory.
+        This method takes the class name, external ID, and data dictionary of a fixture object,
+        processes the data according to the class schema, and saves the object to the database.
+        If the object already exists, it updates the existing object with the new data.
 
-        This method processes file fixtures located in the 'files' directory adjacent to the
-        `fixtures_path`. It iterates through each file, reads its content, and processes it
-        as a fixture. If the file fixture already exists in the database, it updates the
-        existing fixture; otherwise, it creates a new one.
+        Args:
+            class_name (str): The name of the class to which the fixture object belongs.
+            external_id (str): The external ID of the fixture object.
+            data (dict[str, Any]): The data dictionary of the fixture object.
 
         Returns:
             None
         """
-    async def _process_file_fixture(self, file_path: Path, file_key: str) -> None: ...

amsdal/fixtures/utils.pyi

@@ -0,0 +1,9 @@
+from amsdal_utils.models.data_models.reference import Reference
+from types import GenericAlias
+from typing import Any
+
+def process_fixture_value(annotation: Any, value: Any) -> Any: ...
+def _cast_value_to_type(value_type: type | GenericAlias, value: Any) -> Any: ...
+def _is_optional(annotation: Any) -> bool: ...
+def _resolve_type_from_optional(annotation: Any) -> Any: ...
+def _construct_reference_value(class_name: str, object_id: Any) -> Reference: ...

amsdal/manager.pyi

@@ -1,19 +1,16 @@
 from _typeshed import Incomplete
 from amsdal.cloud.services.actions.manager import CloudActionsManager as CloudActionsManager
-from amsdal.cloud.services.auth.manager import AuthManager as AuthManager
 from amsdal.cloud.services.auth.signup_service import SignupService as SignupService
 from amsdal.configs.main import settings as settings
 from amsdal.errors import AmsdalAuthenticationError as AmsdalAuthenticationError, AmsdalMissingCredentialsError as AmsdalMissingCredentialsError, AmsdalRuntimeError as AmsdalRuntimeError, AmsdalSignupError as AmsdalSignupError
 from amsdal.fixtures.manager import AsyncFixturesManager as AsyncFixturesManager, FixturesManager as FixturesManager
-from amsdal.mixins.build_mixin import BuildMixin as BuildMixin
 from amsdal.mixins.class_versions_mixin import ClassVersionsMixin as ClassVersionsMixin
-from amsdal.schemas.manager import SchemaManager as SchemaManager
-from amsdal_models.classes.manager import ClassManager
+from amsdal_data.transactions.decorators import async_transaction, transaction
+from amsdal_models.classes.class_manager import ClassManager
 from amsdal_utils.config.data_models.amsdal_config import AmsdalConfig as AmsdalConfig
 from amsdal_utils.utils.singleton import Singleton
-from pathlib import Path
 
-class AmsdalManager(BuildMixin, ClassVersionsMixin, metaclass=Singleton):
+class AmsdalManager(ClassVersionsMixin, metaclass=Singleton):
     """
     Manages the AMSDAL framework components and operations.
 
@@ -27,7 +24,6 @@ class AmsdalManager(BuildMixin, ClassVersionsMixin, metaclass=Singleton):
     _data_application: Incomplete
     _is_setup: bool
     __is_authenticated: bool
-    _schema_manager: Incomplete
     _metadata_manager: Incomplete
     _auth_manager: Incomplete
     def __init__(self, *, raise_on_new_signup: bool = False) -> None:
@@ -54,7 +50,7 @@ class AmsdalManager(BuildMixin, ClassVersionsMixin, metaclass=Singleton):
         """
         Initiates models root path and adds it into sys.path.
 
-        This method initializes the class manager and sets up the models root path
+        This method initializes the class manager models modules and sets up the models root path
         as specified in the settings. It ensures that the models root path is added
         to the system path for proper module resolution.
 
@@ -74,53 +70,11 @@ class AmsdalManager(BuildMixin, ClassVersionsMixin, metaclass=Singleton):
         Returns:
             None
         """
+    @transaction
     def post_setup(self) -> None:
         """
         Registers internal classes and prepares connections (creates internal tables).
         """
-    def build(self, source_models_path: Path, source_transactions_path: Path, source_static_files_path: Path, source_fixtures_path: Path, source_migrations_path: Path) -> None:
-        """
-        Builds the necessary components for the Amsdal framework.
-
-        This method is used to build the necessary components for the Amsdal framework.
-        It takes five parameters which are all of type `Path`.
-        These parameters represent the paths to the directories where the corresponding components are located.
-
-        Args:
-            source_models_path (Path): Path to the directory where the source models are located.
-            source_transactions_path (Path): Path to the directory where the source transactions are located.
-            source_static_files_path (Path): Path to the directory where the source static files are located.
-            source_fixtures_path (Path): Path to the directory where the source fixtures are located.
-            source_migrations_path (Path): Path to the directory where the source migrations are located.
-
-        Returns:
-            None
-
-        The method performs the following build steps in order:
-        - Builds the models from the `source_models_path` by calling the `build_models` method.
-        - Builds the transactions from the `source_transactions_path` by calling the `build_transactions` method.
-        - Builds the static files from the `source_static_files_path` by calling the `build_static_files` method.
-        - Builds the fixtures from the `source_fixtures_path` by calling the `build_fixtures` method.
-
-        Note:
-            This method is part of the `AmsdalManager` class which includes mixins for `BuildMixin`
-            and `ClassVersionsMixin`. It is intended to be used in the Amsdal framework for managing
-            and building components.
-        """
-    def migrate(self) -> None:
-        """
-        DEPRECATED: Check changes in the models and apply them to the database.
-
-        This method is deprecated and should not be used. It checks for changes in the models
-        and applies them to the database. Use `amsdal.migration.file_migration_generator.FileMigrationGenerator`
-            instead.
-
-        Raises:
-            DeprecationWarning: Always raised to indicate that this method is deprecated.
-
-        Returns:
-            None
-        """
     def _check_auth(self) -> None: ...
     @property
     def cloud_actions_manager(self) -> CloudActionsManager:
@@ -146,6 +100,7 @@ class AmsdalManager(BuildMixin, ClassVersionsMixin, metaclass=Singleton):
         Returns:
             None
         """
+    @transaction
     def apply_fixtures(self) -> None:
         """
         Loads and applies fixtures defined in your application.
@@ -182,7 +137,7 @@ class AmsdalManager(BuildMixin, ClassVersionsMixin, metaclass=Singleton):
             None
         """
 
-class AsyncAmsdalManager(BuildMixin, ClassVersionsMixin, metaclass=Singleton):
+class AsyncAmsdalManager(ClassVersionsMixin, metaclass=Singleton):
     """
     Manages the AMSDAL framework components and operations.
 
@@ -196,7 +151,6 @@ class AsyncAmsdalManager(BuildMixin, ClassVersionsMixin, metaclass=Singleton):
     _data_application: Incomplete
     _is_setup: bool
     __is_authenticated: bool
-    _schema_manager: Incomplete
     _metadata_manager: Incomplete
     _auth_manager: Incomplete
     def __init__(self, *, raise_on_new_signup: bool = False) -> None:
@@ -243,53 +197,11 @@ class AsyncAmsdalManager(BuildMixin, ClassVersionsMixin, metaclass=Singleton):
         Returns:
             None
         """
+    @async_transaction
     async def post_setup(self) -> None:
         """
         Registers internal classes and prepares connections (creates internal tables).
         """
-    def build(self, source_models_path: Path, source_transactions_path: Path, source_static_files_path: Path, source_fixtures_path: Path, source_migrations_path: Path) -> None:
-        """
-        Builds the necessary components for the Amsdal framework.
-
-        This method is used to build the necessary components for the Amsdal framework.
-        It takes five parameters which are all of type `Path`.
-        These parameters represent the paths to the directories where the corresponding components are located.
-
-        Args:
-            source_models_path (Path): Path to the directory where the source models are located.
-            source_transactions_path (Path): Path to the directory where the source transactions are located.
-            source_static_files_path (Path): Path to the directory where the source static files are located.
-            source_fixtures_path (Path): Path to the directory where the source fixtures are located.
-            source_migrations_path (Path): Path to the directory where the source migrations are located.
-
-        Returns:
-            None
-
-        The method performs the following build steps in order:
-        - Builds the models from the `source_models_path` by calling the `build_models` method.
-        - Builds the transactions from the `source_transactions_path` by calling the `build_transactions` method.
-        - Builds the static files from the `source_static_files_path` by calling the `build_static_files` method.
-        - Builds the fixtures from the `source_fixtures_path` by calling the `build_fixtures` method.
-
-        Note:
-            This method is part of the `AmsdalManager` class which includes mixins for `BuildMixin`
-            and `ClassVersionsMixin`. It is intended to be used in the Amsdal framework for managing
-            and building components.
-        """
-    def migrate(self) -> None:
-        """
-        DEPRECATED: Check changes in the models and apply them to the database.
-
-        This method is deprecated and should not be used. It checks for changes in the models
-        and applies them to the database. Use `amsdal.migration.file_migration_generator.FileMigrationGenerator`
-            instead.
-
-        Raises:
-            DeprecationWarning: Always raised to indicate that this method is deprecated.
-
-        Returns:
-            None
-        """
     def _check_auth(self) -> None: ...
     @property
     def cloud_actions_manager(self) -> CloudActionsManager:
@@ -315,6 +227,7 @@ class AsyncAmsdalManager(BuildMixin, ClassVersionsMixin, metaclass=Singleton):
         Returns:
             None
         """
+    @async_transaction
     async def apply_fixtures(self) -> None:
         """
         Loads and applies fixtures defined in your application.

amsdal/models/__init__.py

@@ -0,0 +1,19 @@
+from amsdal_models.builder.validators.dict_validators import validate_non_empty_keys
+from amsdal_models.builder.validators.options_validators import validate_options
+from amsdal_models.classes.data_models.constraints import UniqueConstraint
+from amsdal_models.classes.data_models.indexes import IndexInfo
+from amsdal_models.classes.model import Model
+from amsdal_models.classes.model import TypeModel
+from amsdal_models.classes.relationships.many_reference_field import ManyReferenceField
+from amsdal_models.classes.relationships.reference_field import ReferenceField
+
+__all__ = [
+    'IndexInfo',
+    'ManyReferenceField',
+    'Model',
+    'ReferenceField',
+    'TypeModel',
+    'UniqueConstraint',
+    'validate_non_empty_keys',
+    'validate_options',
+]

amsdal/models/core/class_object.py

@@ -0,0 +1,38 @@
+from typing import Any
+from typing import ClassVar
+from typing import Optional
+
+from amsdal_models.builder.validators.dict_validators import validate_non_empty_keys
+from amsdal_models.classes.model import Model
+from amsdal_utils.models.enums import ModuleType
+from pydantic.fields import Field
+from pydantic.functional_validators import field_validator
+
+from amsdal.models.core.class_property import *  # noqa: F403
+from amsdal.models.core.storage_metadata import *  # noqa: F403
+
+
+class ClassObject(Model):
+    __module_type__: ClassVar[ModuleType] = ModuleType.CORE
+    title: str = Field(title='Title')
+    type: str = Field(title='Type')
+    module_type: str = Field(title='Module Type')
+    properties: Optional[dict[str, Optional['ClassProperty']]] = Field(None, title='Properties')  # noqa: F405, UP007
+    required: Optional[list[str]] = Field(None, title='Required')  # noqa: UP007
+    custom_code: str | None = Field(None, title='Custom Code')
+    storage_metadata: Optional['StorageMetadata'] = Field(None, title='Storage metadata')  # noqa: F405
+
+    @field_validator('properties')
+    @classmethod
+    def _non_empty_keys_properties(cls: type, value: Any) -> Any:  # type: ignore # noqa: A003
+        return validate_non_empty_keys(value)
+
+    @property
+    def display_name(self) -> str:
+        """
+        Returns the display name of the object.
+
+        Returns:
+            str: The display name, which is the title of the object.
+        """
+        return self.title

amsdal/models/core/class_property.py

@@ -0,0 +1,26 @@
+from typing import Any
+from typing import ClassVar
+
+from amsdal_models.builder.validators.dict_validators import validate_non_empty_keys
+from amsdal_models.classes.model import TypeModel
+from amsdal_utils.models.enums import ModuleType
+from pydantic.fields import Field
+from pydantic.functional_validators import field_validator
+
+from amsdal.models.core.option import *  # noqa: F403
+
+
+class ClassProperty(TypeModel):
+    __module_type__: ClassVar[ModuleType] = ModuleType.CORE
+    title: str | None = Field(None, title='Title')
+    type: str = Field(title='Type')
+    default: Any | None = Field(None, title='Default')
+    options: list['Option'] | None = Field(None, title='Options')  # noqa: F405
+    items: dict[str, Any | None] | None = Field(None, title='Items')
+    discriminator: str | None = Field(None, title='Discriminator')
+    extra: dict[str, Any | None] = Field(default_factory=dict, title='Extra')
+
+    @field_validator('items')
+    @classmethod
+    def _non_empty_keys_items(cls: type, value: Any) -> Any:  # type: ignore # noqa: A003
+        return validate_non_empty_keys(value)