amsdal_cli 0.5.6__py3-none-any.whl → 0.5.8__py3-none-any.whl

amsdal_cli/__about__.py

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

amsdal_cli/commands/build/schemas/loaders/base.py

@@ -81,7 +81,17 @@ class ConfigReaderMixin:
         """
         object_config = next(cls.read_configs_from_file(json_file))
 
-        return object_config.type != 'Fixture'
+        # Exclude fixtures
+        if object_config.type == 'Fixture':
+            return False
+
+        # Exclude external models (models with __connection__ attribute)
+        # Check model_extra (Pydantic v2) for extra fields
+        if hasattr(object_config, 'model_extra') and object_config.model_extra:
+            if '__connection__' in object_config.model_extra:
+                return False
+
+        return True
 
     @staticmethod
     def read_configs_from_file(json_file: Path) -> Iterator[ObjectSchema]:

amsdal_cli/commands/build/services/builder.py

@@ -4,7 +4,6 @@ from typing import TYPE_CHECKING
 from rich import print as rprint
 
 from amsdal_cli.commands.build.services.mixin import BuildMixin
-from amsdal_cli.commands.generate.enums import SOURCES_DIR
 
 if TYPE_CHECKING:
     from amsdal_cli.utils.cli_config import CliConfig
@@ -15,7 +14,7 @@ class AppBuilder(BuildMixin):
         from amsdal_models.classes.class_manager import ClassManager
 
         self.cli_config = cli_config
-        self.source_path = cli_config.app_directory / SOURCES_DIR
+        self.source_path = cli_config.app_directory / cli_config.src_dir
         self.config_path = config_path
         self.class_manager = ClassManager()
 
@@ -39,6 +38,12 @@ class AppBuilder(BuildMixin):
             self.build_models(self.cli_config)
         elif (self.source_path / 'models').exists():
             self.copy_class_models(self.source_path / 'models')
+
+        # Copy external models if they exist
+        external_models_path = self.cli_config.app_directory / 'models' / 'external'
+        if external_models_path.exists():
+            self.copy_external_models(external_models_path)
+
         if not is_silent:
             rprint(rich_success('OK!'))
 

amsdal_cli/commands/build/services/mixin.py

@@ -53,6 +53,31 @@ class BuildMixin:
             dirs_exist_ok=True,
         )
 
+    @staticmethod
+    def copy_external_models(external_models_path: Path) -> None:
+        """Copy external models to the build directory.
+
+        Args:
+            external_models_path: Path to the external models directory (e.g., models/external)
+        """
+        from amsdal.configs.main import settings
+
+        if not settings.USER_MODELS_MODULE_PATH:
+            return
+
+        # External models go to USER_MODELS_MODULE_PATH/external
+        target_path = settings.USER_MODELS_MODULE_PATH / 'external'
+
+        # Skip copy if source and target are the same (e.g., when building in place)
+        if external_models_path.resolve() == target_path.resolve():
+            return
+
+        shutil.copytree(
+            external_models_path,
+            target_path,
+            dirs_exist_ok=True,
+        )
+
     @staticmethod
     def build_transactions(cli_app_path: Path) -> None:
         """

amsdal_cli/commands/cloud/deploy/sub_commands/deploy_new.py

@@ -70,7 +70,6 @@ async def _deploy(
 
     from amsdal_cli.commands.build.services.builder import AppBuilder
     from amsdal_cli.commands.cloud.environments.utils import get_current_env
-    from amsdal_cli.commands.generate.enums import SOURCES_DIR
     from amsdal_cli.utils.cli_config import CliConfig
     from amsdal_cli.utils.text import CustomConfirm
     from amsdal_cli.utils.text import rich_error
@@ -79,7 +78,7 @@ async def _deploy(
     from amsdal_cli.utils.text import rich_warning
 
     cli_config: CliConfig = ctx.meta['config']
-    app_source_path = cli_config.app_directory / SOURCES_DIR
+    app_source_path = cli_config.app_directory / cli_config.src_dir
     env_name = env_name or get_current_env(cli_config)
 
     if cli_config.verbose:

amsdal_cli/commands/generate/enums.py

@@ -1,6 +1,5 @@
 from enum import Enum
 
-SOURCES_DIR = 'src'
 MODEL_JSON_FILE = 'model.json'
 MODEL_PY_FILE = 'model.py'
 FIXTURES_JSON_FILE = 'fixtures.json'

amsdal_cli/commands/generate/sub_commands/__init__.py

@@ -1,3 +1,4 @@
+from amsdal_cli.commands.generate.sub_commands.generate_external_models import generate_external_models
 from amsdal_cli.commands.generate.sub_commands.generate_frontend_config import generate_frontend_config
 from amsdal_cli.commands.generate.sub_commands.generate_hook import generate_hook
 from amsdal_cli.commands.generate.sub_commands.generate_model import generate_model
@@ -8,6 +9,7 @@ from amsdal_cli.commands.generate.sub_commands.generate_tests import generate_te
 from amsdal_cli.commands.generate.sub_commands.generate_transaction import generate_transaction
 
 __all__ = [
+    'generate_external_models',
     'generate_frontend_config',
     'generate_hook',
     'generate_model',

amsdal_cli/commands/generate/sub_commands/generate_external_models.py

@@ -0,0 +1,365 @@
+"""Generate ExternalModel classes from external database connections."""
+
+from pathlib import Path
+from typing import TYPE_CHECKING
+from typing import Any
+
+import typer
+
+from amsdal_cli.commands.generate.app import sub_app
+
+if TYPE_CHECKING:
+    from amsdal_cli.utils.cli_config import CliConfig
+
+
+@sub_app.command(name='external-models, ext-models, em')
+def generate_external_models(
+    ctx: typer.Context,
+    connection_name: str = typer.Argument(
+        ...,
+        help='The name of the external connection configured in config',
+    ),
+    output_dir: Path = typer.Option(  # noqa: B008
+        None,
+        '--output',
+        '-o',
+        help='Output directory for generated models (defaults to models/external/)',
+    ),
+    tables: list[str] = typer.Option(  # noqa: B008
+        None,
+        '--table',
+        '-t',
+        help='Specific table names to generate models for (generates all if not specified)',
+    ),
+    format_type: str = typer.Option(  # noqa: B008
+        'python',
+        '--format',
+        '-f',
+        help='Output format: "python" or "json"',
+    ),
+    schema: str | None = typer.Option(  # noqa: B008, ARG001
+        None,
+        '--schema',
+        '-s',
+        help='Database schema name (for databases that support schemas like PostgreSQL)',
+    ),
+) -> None:
+    """Generate ExternalModel classes from external database connections.
+
+    This command introspects an external database connection and generates
+    ExternalModel classes for the tables. The generated models can be used
+    immediately to query the external database.
+
+    **Examples:**
+
+    Generate models for all tables in an external connection:
+
+    ```bash
+    amsdal generate external-models my_external_db
+    ```
+
+    Generate models for specific tables only:
+
+    ```bash
+    amsdal generate external-models my_external_db -t users -t posts -t comments
+    ```
+
+    Generate models in JSON format:
+
+    ```bash
+    amsdal generate external-models my_external_db --format json
+    ```
+
+    Specify custom output directory:
+
+    ```bash
+    amsdal generate external-models my_external_db -o src/external_models
+    ```
+
+    Generate models for a specific PostgreSQL schema:
+
+    ```bash
+    amsdal generate external-models pg_db --schema public
+    ```
+
+    **Prerequisites:**
+
+    1. The external connection must be configured in your AMSDAL config
+    2. The connection must support schema introspection (SQLite, PostgreSQL)
+    3. The ExternalConnectionManager must be properly set up
+
+    **Generated Output:**
+
+    For Python format:
+    - Creates a module for each model: `models/external/{table_name}.py`
+    - Each module contains an ExternalModel class ready to use
+
+    For JSON format:
+    - Creates JSON schema files: `models/external/{table_name}/model.json`
+    - Can be loaded dynamically by AMSDAL framework
+    """
+    from amsdal.services.external_connections import ExternalConnectionManager
+    from amsdal.services.external_model_generator import ExternalModelGenerator
+    from amsdal_data.application import DataApplication
+    from amsdal_utils.config.manager import AmsdalConfigManager
+    from amsdal_utils.utils.text import to_snake_case
+
+    from amsdal_cli.utils.cli_config import CliConfig
+
+    cli_config: CliConfig = ctx.meta['config']
+
+    # Validate format
+    if format_type not in ('python', 'json'):
+        typer.echo(f"Error: Invalid format '{format_type}'. Must be 'python' or 'json'.", err=True)
+        raise typer.Exit(1)
+
+    # Set default output directory
+    if output_dir is None:
+        output_dir = Path.cwd() / 'models' / 'external'
+
+    # Ensure output directory exists
+    output_dir.mkdir(parents=True, exist_ok=True)
+
+    # Initialize AMSDAL components
+    config_manager = AmsdalConfigManager()
+    config = config_manager.get_config()
+
+    # Verify connection exists in config
+    if connection_name not in config.connections:
+        typer.echo(
+            f"Error: Connection '{connection_name}' not found in configuration.\n"
+            f'Available connections: {", ".join(config.connections.keys())}',
+            err=True,
+        )
+        raise typer.Exit(1)
+
+    # Initialize DataApplication
+    app = DataApplication()
+    app.setup(config)
+
+    # Initialize ExternalConnectionManager
+    manager = ExternalConnectionManager()
+    manager.setup(data_application=app)
+
+    # Initialize ExternalModelGenerator
+    generator = ExternalModelGenerator()
+
+    try:
+        # Generate models
+        typer.echo(f"Generating external models from connection '{connection_name}'...")
+
+        if tables:
+            typer.echo(f'Tables: {", ".join(tables)}')
+        else:
+            typer.echo('Generating models for all tables...')
+
+        models_dict = generator.generate_models_for_connection(
+            connection_name=connection_name,
+            table_names=tables if tables else None,
+        )
+
+        if not models_dict:
+            typer.echo('No tables found or no models generated.', err=True)
+            raise typer.Exit(1)
+
+        typer.echo(f'Successfully generated {len(models_dict)} model(s)')
+
+        # Write models to files
+        if format_type == 'python':
+            _write_python_models(models_dict, output_dir, cli_config)
+        else:
+            _write_json_models(models_dict, output_dir, cli_config, connection_name)
+
+        typer.echo(f'\nGenerated models written to: {output_dir}')
+        typer.echo('\nYou can now import and use these models:')
+        typer.echo('```python')
+        first_model = next(iter(models_dict.keys()))
+        typer.echo(f'from models.external.{to_snake_case(first_model)} import {first_model}')
+        typer.echo(f'{first_model}.objects.all().execute()')
+        typer.echo('```')
+
+    except ValueError as e:
+        typer.echo(f'Error: {e}', err=True)
+        raise typer.Exit(1) from e
+    except ConnectionError as e:
+        typer.echo(f'Connection error: {e}', err=True)
+        raise typer.Exit(1) from e
+    except Exception as e:
+        typer.echo(f'Unexpected error: {e}', err=True)
+        raise typer.Exit(1) from e
+    finally:
+        # Clean up
+        app.teardown()
+        ExternalConnectionManager.invalidate()
+        AmsdalConfigManager.invalidate()
+        DataApplication.invalidate()
+
+
+def _write_python_models(
+    models_dict: dict[str, type],
+    output_dir: Path,
+    cli_config: 'CliConfig',  # noqa: F821
+) -> None:
+    """Write generated models as Python files."""
+    from amsdal_utils.utils.text import to_snake_case
+
+    # Create __init__.py for the package
+    init_file = output_dir / '__init__.py'
+    init_file.touch(exist_ok=True)
+
+    # Write each model to a separate file
+    for model_name, model_class in models_dict.items():
+        module_name = to_snake_case(model_name)
+        file_path = output_dir / f'{module_name}.py'
+
+        # Generate the model file content
+        content = _generate_python_model_content(model_class, cli_config)
+
+        # Write to file
+        file_path.write_text(content)
+        typer.echo(f'  ✓ {module_name}.py')
+
+
+def _generate_python_model_content(model_class: type, cli_config: 'CliConfig') -> str:  # noqa: F821
+    """Generate Python code for an ExternalModel class."""
+    model_name = model_class.__name__
+    table_name = model_class.__table_name__  # type: ignore[attr-defined]
+    connection = model_class.__connection__  # type: ignore[attr-defined]
+
+    # Get annotations
+    annotations = getattr(model_class, '__annotations__', {})
+
+    # Build imports
+    imports = {'from amsdal_models.classes.external_model import ExternalModel'}
+
+    # Build field definitions
+    field_lines = []
+    indent = ' ' * cli_config.indent
+
+    for field_name, field_type in annotations.items():
+        type_str = _get_type_annotation(field_type)
+        field_lines.append(f'{indent}{field_name}: {type_str}')
+
+    # Build class definition
+    lines = [
+        '"""',
+        f'External model for {table_name} table.',
+        '',
+        f'Generated from external connection: {connection}',
+        '"""',
+        '',
+        *sorted(imports),
+        '',
+        '',
+        f'class {model_name}(ExternalModel):',
+        f'{indent}"""External model for {table_name}."""',
+        '',
+        f"{indent}__table_name__ = '{table_name}'",
+        f"{indent}__connection__ = '{connection}'",
+    ]
+
+    # Add primary key if present
+    if hasattr(model_class, '__primary_key__'):
+        pk = model_class.__primary_key__
+        if isinstance(pk, list):
+            lines.append(f'{indent}__primary_key__ = {pk!r}')
+        else:
+            lines.append(f"{indent}__primary_key__ = '{pk}'")
+
+    # Add field definitions
+    if field_lines:
+        lines.append('')
+        lines.extend(field_lines)
+
+    return '\n'.join(lines) + '\n'
+
+
+def _get_type_annotation(python_type: type) -> str:
+    """Convert Python type to string annotation."""
+    type_mapping = {
+        str: 'str',
+        int: 'int',
+        float: 'float',
+        bool: 'bool',
+        bytes: 'bytes',
+        list: 'list',
+        dict: 'dict',
+    }
+
+    return type_mapping.get(python_type, 'str')
+
+
+def _write_json_models(
+    models_dict: dict[str, type],
+    output_dir: Path,
+    cli_config: 'CliConfig',  # noqa: F821
+    connection_name: str,
+) -> None:
+    """Write generated models as JSON schema files."""
+    import json
+
+    from amsdal_utils.utils.text import to_snake_case
+
+    for model_name, model_class in models_dict.items():
+        module_name = to_snake_case(model_name)
+        model_dir = output_dir / module_name
+        model_dir.mkdir(exist_ok=True, parents=True)
+
+        json_file = model_dir / 'model.json'
+
+        # Build JSON schema
+        schema = _generate_json_schema(model_class, connection_name)
+
+        # Write to file
+        json_file.write_text(json.dumps(schema, indent=cli_config.indent, ensure_ascii=False))
+        typer.echo(f'  ✓ {module_name}/model.json')
+
+
+def _generate_json_schema(model_class: type, connection_name: str) -> dict[str, Any]:
+    """Generate JSON schema for an ExternalModel class."""
+    model_name = model_class.__name__
+    table_name = model_class.__table_name__  # type: ignore[attr-defined]
+    annotations = getattr(model_class, '__annotations__', {})
+
+    # Build properties
+    properties = {}
+    for field_name, field_type in annotations.items():
+        properties[field_name] = {
+            'type': _python_type_to_json_type(field_type),
+            'title': field_name,
+        }
+
+    schema: dict[str, Any] = {
+        'title': model_name,
+        'type': 'object',
+        'properties': properties,
+        '__table_name__': table_name,
+        '__connection__': connection_name,
+    }
+
+    # Add primary key if present
+    if hasattr(model_class, '__primary_key__'):
+        pk = model_class.__primary_key__
+        if isinstance(pk, str):
+            schema['__primary_key__'] = [pk]
+        else:
+            schema['__primary_key__'] = list(pk)
+
+    return schema
+
+
+def _python_type_to_json_type(python_type: type) -> str:
+    """Convert Python type to JSON schema type string."""
+    from amsdal_utils.models.data_models.enums import CoreTypes
+
+    type_mapping = {
+        str: CoreTypes.STRING.value,
+        int: CoreTypes.INTEGER.value,
+        float: CoreTypes.NUMBER.value,
+        bool: CoreTypes.BOOLEAN.value,
+        bytes: CoreTypes.BINARY.value,
+        list: CoreTypes.ARRAY.value,
+        dict: CoreTypes.DICTIONARY.value,
+    }
+
+    return type_mapping.get(python_type, CoreTypes.STRING.value)

amsdal_cli/commands/generate/sub_commands/generate_model.py

@@ -75,7 +75,6 @@ def generate_model(
     from amsdal_utils.utils.text import to_snake_case
 
     from amsdal_cli.commands.generate.enums import MODEL_JSON_FILE
-    from amsdal_cli.commands.generate.enums import SOURCES_DIR
     from amsdal_cli.commands.generate.utils.model_attributes import parse_attributes
     from amsdal_cli.utils.cli_config import CliConfig
     from amsdal_cli.utils.cli_config import ModelsFormat
@@ -122,7 +121,7 @@ def generate_model(
         json_schema['properties'][attr.name] = property_info
 
     if cli_config.models_format == ModelsFormat.JSON:
-        output_path = cli_config.app_directory / SOURCES_DIR / 'models' / name
+        output_path = cli_config.app_directory / cli_config.src_dir / 'models' / name
 
         write_file(
             json.dumps(json_schema, indent=cli_config.indent),
@@ -138,11 +137,11 @@ def generate_model(
 
         from amsdal_cli.utils.schema_repository import build_schema_repository
 
-        output_path = cli_config.app_directory / SOURCES_DIR / 'models'
+        output_path = cli_config.app_directory / cli_config.src_dir / 'models'
         output_path.mkdir(exist_ok=True, parents=True)
         (output_path / '__init__.py').touch(exist_ok=True)
 
-        sys.path.insert(0, str((cli_config.app_directory / SOURCES_DIR).absolute()))
+        sys.path.insert(0, str((cli_config.app_directory / cli_config.src_dir).absolute()))
 
         schema_repository = build_schema_repository(cli_config=cli_config)
         class_builder = ClassBuilder()

amsdal_cli/commands/generate/sub_commands/generate_permission.py

@@ -24,7 +24,6 @@ def generate_permission(
     from amsdal_utils.utils.text import to_snake_case
 
     from amsdal_cli.commands.generate.enums import FIXTURES
-    from amsdal_cli.commands.generate.enums import SOURCES_DIR
     from amsdal_cli.utils.cli_config import CliConfig
     from amsdal_cli.utils.copier import write_file
 
@@ -57,7 +56,7 @@ def generate_permission(
                 }
             )
 
-    base_path = cli_config.app_directory / SOURCES_DIR
+    base_path = cli_config.app_directory / cli_config.src_dir
     (base_path / FIXTURES).mkdir(parents=True, exist_ok=True)
     permissions_file = base_path / FIXTURES / f'{model_snake_case}_permissions.json'
 

amsdal_cli/commands/generate/sub_commands/generate_tests.py

@@ -68,7 +68,6 @@ async def _generate_tests(
     from amsdal.manager import AmsdalManager
     from amsdal.manager import AsyncAmsdalManager
 
-    from amsdal_cli.commands.generate.enums import SOURCES_DIR
     from amsdal_cli.commands.generate.utils.tests.conftest_utils import create_conftest_if_not_exist
     from amsdal_cli.commands.generate.utils.tests.unit import generate_and_save_unit_tests
     from amsdal_cli.commands.serve.utils import async_build_app_and_check_migrations
@@ -88,7 +87,7 @@ async def _generate_tests(
     config_manager.load_config(config_path)
 
     create_conftest_if_not_exist(cli_config)
-    app_source_path = cli_config.app_directory / SOURCES_DIR
+    app_source_path = cli_config.app_directory / cli_config.src_dir
 
     manager: AmsdalManager | AsyncAmsdalManager
     if config_manager.get_config().async_mode:

amsdal_cli/commands/generate/sub_commands/generate_transaction.py

@@ -21,14 +21,13 @@ def generate_transaction(
     from amsdal_utils.utils.text import classify
     from amsdal_utils.utils.text import to_snake_case
 
-    from amsdal_cli.commands.generate.enums import SOURCES_DIR
     from amsdal_cli.utils.cli_config import CliConfig
     from amsdal_cli.utils.copier import copy_blueprint
 
     cli_config: CliConfig = ctx.meta['config']
     config_path = cli_config.config_path
     name = to_snake_case(transaction_name)
-    output_path = cli_config.app_directory / SOURCES_DIR / 'transactions'
+    output_path = cli_config.app_directory / cli_config.src_dir / 'transactions'
     config_manager = AmsdalConfigManager()
     config_manager.load_config(config_path)
 

amsdal_cli/commands/generate/utils/build_base_path.py

@@ -3,7 +3,6 @@ from pathlib import Path
 import typer
 from rich import print as rprint
 
-from amsdal_cli.commands.generate.enums import SOURCES_DIR
 from amsdal_cli.utils.cli_config import CliConfig
 from amsdal_cli.utils.text import rich_error
 
@@ -23,7 +22,7 @@ def build_model_base_path(ctx: typer.Context, model_name: str) -> Path:
 
     cli_config: CliConfig = ctx.meta['config']
     model = to_snake_case(model_name)
-    model_path = cli_config.app_directory / SOURCES_DIR / 'models' / model
+    model_path = cli_config.app_directory / cli_config.src_dir / 'models' / model
 
     if cli_config.check_model_exists and not (
         (model_path / 'model.json').exists() or (model_path / 'model.py').exists()

amsdal_cli/commands/generate/utils/tests/conftest_utils.py

@@ -2,14 +2,13 @@ from pathlib import Path
 
 from amsdal_utils.config.manager import AmsdalConfigManager
 
-from amsdal_cli.commands.generate.enums import SOURCES_DIR
 from amsdal_cli.utils.cli_config import CliConfig
 
 CURRENT_DIR = Path(__file__).parent
 
 
 def create_conftest_if_not_exist(cli_config: CliConfig) -> None:
-    test_dir = cli_config.app_directory / SOURCES_DIR / 'tests'
+    test_dir = cli_config.app_directory / cli_config.src_dir / 'tests'
     test_dir.mkdir(parents=True, exist_ok=True)
     conftest_file_path = test_dir / 'conftest.py'
 

amsdal_cli/commands/generate/utils/tests/unit.py

@@ -11,7 +11,6 @@ from amsdal_utils.utils.text import classify
 from amsdal_utils.utils.text import to_snake_case
 from black.mode import TargetVersion
 
-from amsdal_cli.commands.generate.enums import SOURCES_DIR
 from amsdal_cli.commands.generate.enums import TestDataType
 from amsdal_cli.commands.generate.utils.tests.async_mode_utils import maybe_await
 from amsdal_cli.commands.generate.utils.tests.function_utils import test_function_arguments
@@ -581,7 +580,7 @@ def generate_unit_tests(
     cli_config: CliConfig,
     test_data_type: TestDataType,
 ) -> str:
-    models_dir = cli_config.app_directory / SOURCES_DIR / 'models'
+    models_dir = cli_config.app_directory / cli_config.src_dir / 'models'
 
     object_schema = get_class_schema(models_dir, model_name, cli_config)
 
@@ -661,7 +660,7 @@ def generate_and_save_unit_tests(
     model_name = classify(model_name)
     model_name_snake_case = to_snake_case(model_name)
 
-    unit_test_dir = cli_config.app_directory / SOURCES_DIR / 'tests' / 'unit'
+    unit_test_dir = cli_config.app_directory / cli_config.src_dir / 'tests' / 'unit'
     unit_test_dir.mkdir(parents=True, exist_ok=True)
 
     filename = f'test_{model_name_snake_case}.py'

amsdal_cli/commands/migrations/sub_commands/apply.py

@@ -55,7 +55,7 @@ def _sync_apply(
         core_migrations_path=CORE_MIGRATIONS_PATH,
         app_migrations_loader=app_migrations_loader,
         executor=DefaultMigrationExecutor(schemas),
-        contrib=settings.CONTRIBS,
+        contrib=settings.CONTRIBS,  # type: ignore[arg-type]
         contrib_migrations_directory_name=settings.CONTRIB_MIGRATIONS_DIRECTORY_NAME,
     )
 
@@ -132,7 +132,7 @@ async def _async_sync_apply(
             core_migrations_path=CORE_MIGRATIONS_PATH,
             app_migrations_loader=app_migrations_loader,
             executor=DefaultAsyncMigrationExecutor(schemas),
-            contrib=settings.CONTRIBS,
+            contrib=settings.CONTRIBS,  # type: ignore[arg-type]
             contrib_migrations_directory_name=settings.CONTRIB_MIGRATIONS_DIRECTORY_NAME,
         )
 

amsdal_cli/commands/migrations/sub_commands/make.py

@@ -27,7 +27,6 @@ def _sync_make_migrations(
     from amsdal_models.migration.file_migration_generator import FileMigrationGenerator
     from amsdal_utils.utils.text import to_snake_case
 
-    from amsdal_cli.commands.generate.enums import SOURCES_DIR
     from amsdal_cli.commands.migrations.constants import MIGRATIONS_DIR_NAME
     from amsdal_cli.utils.schema_repository import build_schema_repository
     from amsdal_cli.utils.text import rich_info
@@ -40,7 +39,7 @@ def _sync_make_migrations(
     amsdal_manager.post_setup()  # type: ignore[call-arg]
 
     schema_repository = build_schema_repository(cli_config=cli_config)
-    migrations_dir: Path = cli_config.app_directory / SOURCES_DIR / MIGRATIONS_DIR_NAME
+    migrations_dir: Path = cli_config.app_directory / cli_config.src_dir / MIGRATIONS_DIR_NAME
 
     generator = FileMigrationGenerator(
         core_migrations_path=CORE_MIGRATIONS_PATH,
@@ -81,7 +80,6 @@ async def _async_make_migrations(
     from amsdal_models.migration.file_migration_generator import AsyncFileMigrationGenerator
     from amsdal_utils.utils.text import to_snake_case
 
-    from amsdal_cli.commands.generate.enums import SOURCES_DIR
     from amsdal_cli.commands.migrations.constants import MIGRATIONS_DIR_NAME
     from amsdal_cli.utils.schema_repository import build_schema_repository
     from amsdal_cli.utils.text import rich_info
@@ -94,7 +92,7 @@ async def _async_make_migrations(
     await amsdal_manager.post_setup()  # type: ignore[call-arg, misc]
 
     schema_repository = build_schema_repository(cli_config=cli_config)
-    migrations_dir: Path = cli_config.app_directory / SOURCES_DIR / MIGRATIONS_DIR_NAME
+    migrations_dir: Path = cli_config.app_directory / cli_config.src_dir / MIGRATIONS_DIR_NAME
 
     generator = AsyncFileMigrationGenerator(
         core_migrations_path=CORE_MIGRATIONS_PATH,

amsdal_cli/commands/migrations/sub_commands/make_contrib.py

@@ -26,7 +26,6 @@ def _sync_make_contrib_migrations(
     from amsdal_models.migration.file_migration_generator import FileMigrationGenerator
     from amsdal_utils.utils.text import to_snake_case
 
-    from amsdal_cli.commands.generate.enums import SOURCES_DIR
     from amsdal_cli.commands.migrations.constants import MIGRATIONS_DIR_NAME
     from amsdal_cli.utils.schema_repository import build_schema_repository
     from amsdal_cli.utils.text import rich_info
@@ -39,7 +38,7 @@ def _sync_make_contrib_migrations(
     amsdal_manager.post_setup()  # type: ignore[call-arg]
 
     schema_repository = build_schema_repository(cli_config=cli_config)
-    migrations_dir: Path = cli_config.app_directory / SOURCES_DIR / MIGRATIONS_DIR_NAME
+    migrations_dir: Path = cli_config.app_directory / cli_config.src_dir / MIGRATIONS_DIR_NAME
 
     generator = FileMigrationGenerator(
         core_migrations_path=CORE_MIGRATIONS_PATH,
@@ -79,7 +78,6 @@ async def _async_make_contrib_migrations(
     from amsdal_models.migration.file_migration_generator import AsyncFileMigrationGenerator
     from amsdal_utils.utils.text import to_snake_case
 
-    from amsdal_cli.commands.generate.enums import SOURCES_DIR
     from amsdal_cli.commands.migrations.constants import MIGRATIONS_DIR_NAME
     from amsdal_cli.utils.schema_repository import build_schema_repository
     from amsdal_cli.utils.text import rich_info
@@ -92,7 +90,7 @@ async def _async_make_contrib_migrations(
     await amsdal_manager.post_setup()  # type: ignore[call-arg, misc]
 
     schema_repository = build_schema_repository(cli_config=cli_config)
-    migrations_dir: Path = cli_config.app_directory / SOURCES_DIR / MIGRATIONS_DIR_NAME
+    migrations_dir: Path = cli_config.app_directory / cli_config.src_dir / MIGRATIONS_DIR_NAME
 
     generator = AsyncFileMigrationGenerator(
         core_migrations_path=CORE_MIGRATIONS_PATH,

amsdal_cli/commands/new/command.py

@@ -50,7 +50,6 @@ def new_command(
     from amsdal_utils.utils.text import slugify
     from amsdal_utils.utils.text import to_snake_case
 
-    from amsdal_cli.commands.generate.enums import SOURCES_DIR
     from amsdal_cli.utils.copier import copy_blueprints_from_directory
     from amsdal_cli.utils.text import rich_error
     from amsdal_cli.utils.text import rich_success
@@ -90,6 +89,6 @@ def new_command(
             'state_backend': SQLITE_ASYNC_ALIAS if is_async_mode else SQLITE_STATE_ALIAS,
         },
     )
-    (output_path / SOURCES_DIR).mkdir(exist_ok=True)
+    (output_path / 'src').mkdir(exist_ok=True)
 
     rprint(rich_success(f'The application is successfully created in {output_path.resolve()}'))

amsdal_cli/commands/plugin/command.py

@@ -1,4 +1,5 @@
 import random
+import shutil
 import string
 import uuid
 from pathlib import Path
@@ -47,7 +48,6 @@ def plugin_command(
     from amsdal_utils.utils.text import slugify
     from amsdal_utils.utils.text import to_snake_case
 
-    from amsdal_cli.commands.generate.enums import SOURCES_DIR
     from amsdal_cli.utils.copier import copy_blueprints_from_directory
     from amsdal_cli.utils.text import rich_error
     from amsdal_cli.utils.text import rich_success
@@ -73,7 +73,9 @@ def plugin_command(
 
     application_uuid = (random.choice(string.ascii_lowercase) + uuid.uuid4().hex[:31]).lower()  # noqa: S311
 
+    src_dir = plugin_name.strip().lower().replace(' ', '_').replace('-', '_')
     context = {
+        'src_dir': src_dir,
         'application_uuid': application_uuid,
         'plugin_name': plugin_name,
         'plugin_name_slugify': slugify(plugin_name),
@@ -90,19 +92,26 @@ def plugin_command(
         destination_path=output_path,
         context=context,
     )
-    (output_path / SOURCES_DIR).mkdir(exist_ok=True)
+    # move src to src_dir
+    shutil.move(str(output_path / 'src'), str(output_path / src_dir))
+    (output_path / src_dir).mkdir(exist_ok=True)
 
     # Create example model based on format
-    _create_example_model(output_path, models_format, context)
+    _create_example_model(output_path, models_format, context, src_dir=src_dir)
 
     rprint(rich_success(f'The plugin is successfully created in {output_path.resolve()}'))
 
 
-def _create_example_model(output_path: Path, models_format: ModelsFormat, context: dict[str, Any]) -> None:
+def _create_example_model(
+    output_path: Path,
+    models_format: ModelsFormat,
+    context: dict[str, Any],
+    src_dir: str,
+) -> None:
     """Create an example model based on the specified format."""
     from amsdal_cli.utils.copier import write_file
 
-    models_dir = output_path / 'src' / 'models'
+    models_dir = output_path / src_dir / 'models'
 
     if models_format == ModelsFormat.JSON:
         # Create JSON model

amsdal_cli/commands/plugin/templates/.amsdal-cli

@@ -1,4 +1,5 @@
 {
+    "src_dir": "{{ ctx.src_dir }}",
     "config_path": "./config.yml",
     "http_port": 8080,
     "check_model_exists": true,

amsdal_cli/commands/plugin/templates/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["hatchling"]
 build-backend = "hatchling.build"
 
 [tool.hatch.build.targets.wheel]
-packages = ["src/"]
+packages = ["{{ ctx.src_dir }}"]
 
 [project]
 name = "{{ ctx.plugin_name_slugify }}_amsdal_plugin"

amsdal_cli/commands/register_connection/command.py

@@ -7,7 +7,6 @@ import typer
 
 from amsdal_cli.app import app
 from amsdal_cli.commands.cloud.enums import DBType
-from amsdal_cli.commands.generate.enums import SOURCES_DIR
 from amsdal_cli.commands.register_connection.utils.config_updater import ConfigUpdater
 from amsdal_cli.commands.register_connection.utils.credentials import process_credentials
 from amsdal_cli.commands.register_connection.utils.meta import process_meta
@@ -135,7 +134,7 @@ async def _register_connection_command(
     generator = ModelGenerator(
         config_path=_config,
         meta=_meta,
-        output_dir=cli_config.app_directory / SOURCES_DIR / 'models',
+        output_dir=cli_config.app_directory / cli_config.src_dir / 'models',
         models_format=cli_config.models_format,
     )
 

amsdal_cli/commands/register_connection/utils/build.py

@@ -1,6 +1,5 @@
 from pathlib import Path
 
-from amsdal_cli.commands.generate.enums import SOURCES_DIR
 from amsdal_cli.utils.cli_config import CliConfig
 from amsdal_cli.utils.cli_config import ModelsFormat
 
@@ -12,7 +11,7 @@ def build_models(
 ) -> None:
     from amsdal_cli.commands.build.services.builder import AppBuilder
 
-    source_path = cli_config.app_directory / SOURCES_DIR
+    source_path = cli_config.app_directory / cli_config.src_dir
     app_builder = AppBuilder(
         cli_config=cli_config,
         config_path=config_path,

amsdal_cli/commands/restore/command.py

@@ -58,9 +58,8 @@ def _restore_models(cli_config: 'CliConfig', config: Path | None) -> None:
     from amsdal_utils.config.manager import AmsdalConfigManager
 
     from amsdal_cli.commands.build.services.builder import AppBuilder
-    from amsdal_cli.commands.generate.enums import SOURCES_DIR
 
-    app_source_path = cli_config.app_directory / SOURCES_DIR
+    app_source_path = cli_config.app_directory / cli_config.src_dir
     app_source_path.mkdir(exist_ok=True)
 
     app_builder = AppBuilder(

amsdal_cli/commands/serve/command.py

@@ -97,14 +97,13 @@ def serve_command(
     from amsdal_utils.lifecycle.enum import LifecycleEvent
     from amsdal_utils.lifecycle.producer import LifecycleProducer
 
-    from amsdal_cli.commands.generate.enums import SOURCES_DIR
     from amsdal_cli.commands.serve.services.supervisor import Supervisor
     from amsdal_cli.commands.serve.utils import build_app_and_check_migrations
     from amsdal_cli.commands.serve.utils import cleanup_app
     from amsdal_cli.utils.cli_config import CliConfig
 
     cli_config: CliConfig = ctx.meta['config']
-    app_source_path = cli_config.app_directory / SOURCES_DIR
+    app_source_path = cli_config.app_directory / cli_config.src_dir
     server_port = port or cli_config.http_port
 
     try:

amsdal_cli/commands/serve/utils.py

@@ -176,13 +176,12 @@ def _check_migrations_generated_and_applied(
     from amsdal.configs.main import settings
     from amsdal_models.migration.file_migration_generator import FileMigrationGenerator
 
-    from amsdal_cli.commands.generate.enums import SOURCES_DIR
     from amsdal_cli.commands.migrations.constants import MIGRATIONS_DIR_NAME
     from amsdal_cli.utils.cli_config import ModelsFormat
     from amsdal_cli.utils.schema_repository import build_schema_repository
     from amsdal_cli.utils.text import rich_warning
 
-    app_source_path = app_path / SOURCES_DIR
+    app_source_path = app_path / cli_config.src_dir
     migrations_dir = app_source_path / MIGRATIONS_DIR_NAME
 
     cli_config.models_format = ModelsFormat.PY
@@ -517,13 +516,12 @@ async def _async_check_migrations_generated_and_applied(
     from amsdal.configs.main import settings
     from amsdal_models.migration.file_migration_generator import AsyncFileMigrationGenerator
 
-    from amsdal_cli.commands.generate.enums import SOURCES_DIR
     from amsdal_cli.commands.migrations.constants import MIGRATIONS_DIR_NAME
     from amsdal_cli.utils.cli_config import ModelsFormat
     from amsdal_cli.utils.schema_repository import build_schema_repository
     from amsdal_cli.utils.text import rich_warning
 
-    app_source_path = app_path / SOURCES_DIR
+    app_source_path = app_path / cli_config.src_dir
     migrations_dir = app_source_path / MIGRATIONS_DIR_NAME
 
     cli_config.models_format = ModelsFormat.PY

amsdal_cli/commands/tests/command.py

@@ -90,14 +90,13 @@ def run_tests(
 
     from amsdal_utils.config.manager import AmsdalConfigManager
 
-    from amsdal_cli.commands.generate.enums import SOURCES_DIR
     from amsdal_cli.utils.cli_config import CliConfig
 
     cli_config: CliConfig = ctx.meta['config']
     config_manager = AmsdalConfigManager()
     config_manager.load_config(cli_config.config_path)
     config_path = cli_config.config_path
-    app_source_path = cli_config.app_directory / SOURCES_DIR
+    app_source_path = cli_config.app_directory / cli_config.src_dir
 
     if AmsdalConfigManager().get_config().async_mode:
         asyncio.run(_async_init(cli_config=cli_config, app_source_path=app_source_path, config_path=config_path))
@@ -109,7 +108,7 @@ def run_tests(
     with Popen(  # noqa: S603
         [
             PYTEST_COMMAND,
-            'src',
+            cli_config.src_dir,
             '--color=yes',
             '--db_execution_type',
             db_execution_type,

amsdal_cli/commands/verify/command.py

@@ -20,7 +20,6 @@ def verify_command(
 
     from amsdal_cli.commands.build.services.builder import AppBuilder
     from amsdal_cli.commands.generate.enums import MODEL_JSON_FILE
-    from amsdal_cli.commands.generate.enums import SOURCES_DIR
     from amsdal_cli.commands.verify.utils.verify_json_model import verify_json_model
     from amsdal_cli.commands.verify.utils.verify_python_file import verify_python_file
     from amsdal_cli.utils.cli_config import CliConfig
@@ -34,7 +33,7 @@ def verify_command(
 
     rprint(rich_info('Syntax checking...'), end=' ')
 
-    for file_item in walk(cli_config.app_directory / SOURCES_DIR):
+    for file_item in walk(cli_config.app_directory / cli_config.src_dir):
         if file_item.name == MODEL_JSON_FILE:
             errors.extend(verify_json_model(file_item))
         elif file_item.name.endswith('.py'):

amsdal_cli/commands/worker/sub_commands/run.py

@@ -103,11 +103,10 @@ def run_worker(
     """
     from amsdal_utils.config.manager import AmsdalConfigManager
 
-    from amsdal_cli.commands.generate.enums import SOURCES_DIR
     from amsdal_cli.utils.cli_config import CliConfig
 
     cli_config: CliConfig = ctx.meta['config']
-    app_source_path = cli_config.app_directory / SOURCES_DIR
+    app_source_path = cli_config.app_directory / cli_config.src_dir
     config_path = cli_config.config_path
     config_manager = AmsdalConfigManager()
     config_manager.load_config(config_path)

amsdal_cli/utils/cli_config.py

@@ -45,6 +45,7 @@ class CliConfig(BaseModel):
     verbose: bool = True
     is_plugin: bool = False
     vcs: VCSOptions | None = None
+    src_dir: str = 'src'
 
     @model_validator(mode='after')
     def validate_config_path(self) -> 'CliConfig':

amsdal_cli/utils/schema_repository.py

@@ -36,7 +36,6 @@ def build_schema_repository(
 
     from amsdal_cli.commands.build.schemas.data_models.schemas_directory import SchemasDirectory
     from amsdal_cli.commands.build.schemas.schema_json_loader import SchemaJsonLoader
-    from amsdal_cli.commands.generate.enums import SOURCES_DIR
     from amsdal_cli.utils.cli_config import ModelsFormat
 
     _contrib_modules_paths: list[str] = []
@@ -63,7 +62,7 @@ def build_schema_repository(
                 class_filter=lambda cls: cls.__module_type__ == target_module_type,
             )  # type: ignore[assignment]
     else:
-        _models_path = cli_config.app_directory / SOURCES_DIR / 'models'
+        _models_path = cli_config.app_directory / cli_config.src_dir / 'models'
         user_schema_loader = SchemaJsonLoader(  # type: ignore[assignment]
             SchemasDirectory(
                 path=_models_path,

{amsdal_cli-0.5.6.dist-info → amsdal_cli-0.5.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amsdal_cli
-Version: 0.5.6
+Version: 0.5.8
 Summary: CLI for AMSDAL framework
 Project-URL: Documentation, https://pypi.org/project/amsdal_cli/#readme
 Project-URL: Issues, https://pypi.org/project/amsdal_cli/

{amsdal_cli-0.5.6.dist-info → amsdal_cli-0.5.8.dist-info}/RECORD

@@ -1,5 +1,5 @@
 amsdal_cli/Third-Party Materials - AMSDAL Dependencies - License Notices.md,sha256=uHJlGG0D4tbpUi8cq-497NNO9ltQ67a5448k-T14HTw,68241
-amsdal_cli/__about__.py,sha256=FVhogeUXIvF04uzQhGOvAB-kHp5Toh3bylNItK77X40,124
+amsdal_cli/__about__.py,sha256=JGF3XlJObn428GEyZLeDPPWqGJueIxTc_Bg3msQ3gts,124
 amsdal_cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 amsdal_cli/app.py,sha256=_ucuLT5ospf1ifFKEG0IMfVnxKjnvPUQ4iMhkvOfCrc,466
 amsdal_cli/main.py,sha256=LtH-BD1eJrAUecjKzC8Gx7kYFUstOMH1erdeJUVqFB8,144
@@ -30,7 +30,7 @@ amsdal_cli/commands/build/schemas/extenders/__init__.py,sha256=47DEQpj8HBSa-_TIm
 amsdal_cli/commands/build/schemas/extenders/custom_code_extender.py,sha256=wE3jvJkaanPWFiafLWDiIry70WMLxeF6_GEppT1jgvw,1586
 amsdal_cli/commands/build/schemas/extenders/options_extender.py,sha256=WInuTtkOwPXA9tPvRy4pWFaNFziDdX24U7WGjvIeR94,2007
 amsdal_cli/commands/build/schemas/loaders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-amsdal_cli/commands/build/schemas/loaders/base.py,sha256=-naxukn7WM218i9u92JeESEMCVMcuBpM0KW8S06-8mY,2565
+amsdal_cli/commands/build/schemas/loaders/base.py,sha256=Jk5PRTTv4wNz5WeX6SVrjVYliaoVFOP9vVyUYaZ3W9k,2939
 amsdal_cli/commands/build/schemas/loaders/cli_custom_code_loader.py,sha256=gbcS0JdfeS6XNWA-Q6O4MCqmV2V1RkQWLWpCtShUFFo,4611
 amsdal_cli/commands/build/schemas/loaders/cli_loader.py,sha256=LpqmrR5iVpHqur-bHAHi-E2EyhlLK0RD0xgn_Pu9Kks,2259
 amsdal_cli/commands/build/schemas/loaders/cli_options_loader.py,sha256=RusYssXNPY_FDO942PqZ2Y7OPiEMvMLq9N9C8311fdE,2822
@@ -42,8 +42,8 @@ amsdal_cli/commands/build/schemas/mixins/enrich_schemas_mixin.py,sha256=4TvvIuev
 amsdal_cli/commands/build/schemas/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 amsdal_cli/commands/build/schemas/utils/merger.py,sha256=8dlSV3qgGAGNbOtGGx8zQ7yC99dihxg8JwPHMDboU2w,2229
 amsdal_cli/commands/build/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-amsdal_cli/commands/build/services/builder.py,sha256=vdR5rqJvjJjfrAAqkFNfnF6MUr4Nai5K_gxyvCQa8mw,3220
-amsdal_cli/commands/build/services/mixin.py,sha256=8MHkasdQ1nPpBY90S4KHpr1rTHLC9Om2v89golcWE38,5749
+amsdal_cli/commands/build/services/builder.py,sha256=MR3wQ0CEv7FOQDQboTtUHUHJ1pqt7kjdNKfJ8BN9mp0,3402
+amsdal_cli/commands/build/services/mixin.py,sha256=1hC2nYEgoTIrxJaC1oa4srIARCCWwbAkpGnAdvOBbOY,6565
 amsdal_cli/commands/build/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 amsdal_cli/commands/build/utils/build_config_file.py,sha256=65s3rP_nnr5FJLQlYStGF2JNYxExq5tWZvIU_h8Ae7I,2009
 amsdal_cli/commands/ci_cd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -69,7 +69,7 @@ amsdal_cli/commands/cloud/deploy/command.py,sha256=LIX07pTU55GUA9KmTiKDtoCj5Ytx9
 amsdal_cli/commands/cloud/deploy/sub_commands/__init__.py,sha256=I7MJEyceCIgCXP7JpX06nLvEA6HUkjj9LSDAb7VfTGo,353
 amsdal_cli/commands/cloud/deploy/sub_commands/deploy_delete.py,sha256=pRLumeigF4e_Nod32p6XkgJsYxbB9H3WSxbv0IwA5Eo,3221
 amsdal_cli/commands/cloud/deploy/sub_commands/deploy_list.py,sha256=ozr7tVbPrTnx_YscyAb1_ZockFfQQSwd6XDijrkZSWk,5534
-amsdal_cli/commands/cloud/deploy/sub_commands/deploy_new.py,sha256=G28mt1cMv8js80FTtzxahCCWV8AVcu7BWe4w7Nqvp04,12748
+amsdal_cli/commands/cloud/deploy/sub_commands/deploy_new.py,sha256=n87MNWad-oOFYXRpQvWqZZtRo0NXaQZSb3GQkMFE0ls,12692
 amsdal_cli/commands/cloud/environments/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 amsdal_cli/commands/cloud/environments/app.py,sha256=kkzf_kW2jpl3d44qWuIZB5C3uWXzpNpnTIvUpuuPJHE,238
 amsdal_cli/commands/cloud/environments/command.py,sha256=roeg2tpa53W1qzCa_3-zEn5z2xiVS4STWB9M7P5BVKA,283
@@ -111,16 +111,17 @@ amsdal_cli/commands/cloud/sub_commands/sync_db.py,sha256=o5yaqcanCDffaAj73jvk7vX
 amsdal_cli/commands/generate/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 amsdal_cli/commands/generate/app.py,sha256=-wEccTR0MhZyj3Y1R2VMyO9RzyGiBSrdWNPQc4ACHqc,201
 amsdal_cli/commands/generate/command.py,sha256=j6CGiZ_7st-A6qpMTA8XYl15UeONopauQALObVWB2xc,197
-amsdal_cli/commands/generate/enums.py,sha256=4Nvbe4aJEUOMkFqjNbr2xtnvzqrJEh2qDiwBn9Humpg,3716
-amsdal_cli/commands/generate/sub_commands/__init__.py,sha256=WyZ4kE6IH9O_igOVJ31UQtqE12cCKyATi4E-qgslN3k,941
+amsdal_cli/commands/generate/enums.py,sha256=SQ_ZFW6F9RbvM__Ohz5r3Ld54MlKoxid83kqiVqaZwY,3696
+amsdal_cli/commands/generate/sub_commands/__init__.py,sha256=afAyY3hWNb6a4e3lapQX-GsR1SB6EHZi9hwtsWzrPKY,1077
+amsdal_cli/commands/generate/sub_commands/generate_external_models.py,sha256=QH54RuiRyzFzmiEQsw7mbLk1d_vSbLAPqp4F-oJGwD8,11515
 amsdal_cli/commands/generate/sub_commands/generate_frontend_config.py,sha256=SkEzx7-mWgrPINwPXGRmYO1SVA0RZojOd6BZFQRmG0Q,2574
 amsdal_cli/commands/generate/sub_commands/generate_hook.py,sha256=C0Oy5VokM3BXPq33Kknjvtjwd7hdfSxQFKxJcHu_bgg,1738
-amsdal_cli/commands/generate/sub_commands/generate_model.py,sha256=nscCBi-PRa_JWdZlMo7ij5Ukg2eEk5tqMhMiLOs1Jv4,5927
+amsdal_cli/commands/generate/sub_commands/generate_model.py,sha256=yjZEfadjDf2zRkXh9z5RWYqnO9vFVu8tzVQzxWZPWY4,5885
 amsdal_cli/commands/generate/sub_commands/generate_modifier.py,sha256=NyN7vMTBGaQv6u815WT1lqAlqI4xP1AmIZWq5edZ-5g,1426
-amsdal_cli/commands/generate/sub_commands/generate_permission.py,sha256=gfRhZsnNnd_m_HxdOCB8C22tbMkopg2FTKo-T68b13s,2824
+amsdal_cli/commands/generate/sub_commands/generate_permission.py,sha256=7vnweAhPlJpX0Ji40baPXXAbE5wuGsleQD3ty4Ul3FI,2768
 amsdal_cli/commands/generate/sub_commands/generate_property.py,sha256=XrCjf48oEzuMPqsTuC5Qsn1WbIQzUVW8BNOmXssfUM8,1599
-amsdal_cli/commands/generate/sub_commands/generate_tests.py,sha256=9n237ZMWzxp9Bq-QooFeynG_jDmjA42EBJkRt4S3AsE,4618
-amsdal_cli/commands/generate/sub_commands/generate_transaction.py,sha256=hBHceRNqqxVVqIBmMkMOcRG5AM_PB3Pc7ABdm5oeytE,1640
+amsdal_cli/commands/generate/sub_commands/generate_tests.py,sha256=BYCuaj36sg0SBhkku3fz0xCIL9Ww4F8Q1BqXZXByQPs,4562
+amsdal_cli/commands/generate/sub_commands/generate_transaction.py,sha256=IS1vr8N09f0r93kk-k8E-_fmjWPcW0xCgzEN-FEM5d8,1584
 amsdal_cli/commands/generate/templates/async_transaction.pyt,sha256=HDnJpIzSuf5h0lYLXDYv_w4LqjJNEl6FMybeT9A19uI,173
 amsdal_cli/commands/generate/templates/hook.pyt,sha256=nqToFKu6GIxrXWlpg5IN9rK8nkZ07F4sH-aZEQaTfpY,261
 amsdal_cli/commands/generate/templates/property.pyt,sha256=ApOdptmK_KchBhMR_XgG249AK76th6ChfBdeMjyio4s,85
@@ -129,16 +130,16 @@ amsdal_cli/commands/generate/templates/modifier/constructor.pyt,sha256=ue_cMby-9
 amsdal_cli/commands/generate/templates/modifier/display_name.pyt,sha256=YN_LT4aBnkwqzAK-UVkHP1znSHYZhAETzLi-3hHl5Jk,81
 amsdal_cli/commands/generate/templates/modifier/version_name.pyt,sha256=Gt53bNJnKAgQl9cZGsNQmUt_rydZYTcsOdZztY4QnrA,81
 amsdal_cli/commands/generate/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-amsdal_cli/commands/generate/utils/build_base_path.py,sha256=yBDkEVWJcvcUSyCd92RjPKrctJ4uH-1amH0tfZo8IlE,1022
+amsdal_cli/commands/generate/utils/build_base_path.py,sha256=bFB1TpNcF9YpRR1a1FKDEoucBqKjthz2z8H7wQI8je4,970
 amsdal_cli/commands/generate/utils/cast_to_attribute_type.py,sha256=mptQHTUFWDCo463ZjV8GjPKeGGOdORL_v1szA1pFZaQ,850
 amsdal_cli/commands/generate/utils/model_attributes.py,sha256=IPfONQAgRpaoEJhIvB15QDILOztCSVOUZdBctC_AWlk,7511
 amsdal_cli/commands/generate/utils/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 amsdal_cli/commands/generate/utils/tests/async_mode_utils.py,sha256=iub84Pj5TMa38W90Pr5HgkFQLXpUdbmcm9HOx98Oh6o,309
-amsdal_cli/commands/generate/utils/tests/conftest_utils.py,sha256=8KzHtDh7eQGghhj5aZkY7Mu2rrlkBgM4Khf857iGG1Y,838
+amsdal_cli/commands/generate/utils/tests/conftest_utils.py,sha256=Ma0yRcrwzGwN_IdnAoYgVnYVjgLy0CgQveqXHuhn5RA,786
 amsdal_cli/commands/generate/utils/tests/function_utils.py,sha256=Bkk9JDbANX2aSreNRr1Bste5rPwVKc2HV5xLFg2dQK4,496
 amsdal_cli/commands/generate/utils/tests/model_utils.py,sha256=CBfR9AcL6Q1boEejjmOD16F0kgJFdIjYYWNE3vQMkfE,4051
 amsdal_cli/commands/generate/utils/tests/type_utils.py,sha256=yglZHcvAQ0m6JnwQEBxHdcWxlkHY65P-Cp81fCrC3q8,9325
-amsdal_cli/commands/generate/utils/tests/unit.py,sha256=KRqBhk_jy_1vp0RZub7HdYxfhn3Bra2v0heDNNPldeE,27741
+amsdal_cli/commands/generate/utils/tests/unit.py,sha256=XEoTmgZP-8dSmFqA6lPk5U8k3AfDbDom92CviXgzFtw,27696
 amsdal_cli/commands/generate/utils/tests/templates/async/conftest.py,sha256=9GfoV_HzwuWtglI7uz0fP5_pOsPk2f56elaoinuPa80,1632
 amsdal_cli/commands/generate/utils/tests/templates/sync/conftest.py,sha256=wMmnKQnVTSJsS5MdH25ChRcc-aQevQYqIZhXwLnZl0U,1564
 amsdal_cli/commands/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -147,12 +148,12 @@ amsdal_cli/commands/migrations/command.py,sha256=jlpdYZAc02ZUBxSdzGSzkDxEb1nlHNz
 amsdal_cli/commands/migrations/constants.py,sha256=846-DQ-Iqcxw2akd5aBAmbnXHDmRFqEKu6vai2ZFBkU,35
 amsdal_cli/commands/migrations/utils.py,sha256=Fvu6NlIFL3OAz0MhLkvnucIsHBZlDDCOZZ38VhNahws,2700
 amsdal_cli/commands/migrations/sub_commands/__init__.py,sha256=HHxiJxcbJUQLv6QOLwcvcSjTYJTixiRJ89IUb1H7sRo,1100
-amsdal_cli/commands/migrations/sub_commands/apply.py,sha256=4MyO_gP7r4PBRz_agi2xnoMTHcLlvxlo4335mmLrpYQ,8696
+amsdal_cli/commands/migrations/sub_commands/apply.py,sha256=n4-BzBlAjjmt69iD0QQjMyy_A_4YxeIgU7y_P7eBr5k,8748
 amsdal_cli/commands/migrations/sub_commands/list.py,sha256=vC-oeTVHjYNzI_HhiylZSNeOsIFvnDZ6TRwrqQ-wpUk,5833
-amsdal_cli/commands/migrations/sub_commands/make.py,sha256=fWfsH3bRKDlYQp1SfbP4WNT7rOW7D5aCXUDkfjK2iLU,6541
-amsdal_cli/commands/migrations/sub_commands/make_contrib.py,sha256=KbB19I95Uh3dy00Peg9dDc09rcxI2c8FrTIazSaTVw8,6449
+amsdal_cli/commands/migrations/sub_commands/make.py,sha256=Qh3_4djVgdT67oRZ46AF2dqSyUDEiipOOkW5_-n4DOY,6429
+amsdal_cli/commands/migrations/sub_commands/make_contrib.py,sha256=JdlD8hGjNMrbWFIqSw5eXRSxUd1hW6D2UcxWR6-6uTg,6337
 amsdal_cli/commands/new/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-amsdal_cli/commands/new/command.py,sha256=NDuDZNwreyuHsv4tbE-yrNOJViB8wk35IcKvGKQXPXo,3302
+amsdal_cli/commands/new/command.py,sha256=B-chjS_TAEzH4CIr_vBtxFWn7Y4xWm8vpUetCf1lwKo,3233
 amsdal_cli/commands/new/templates/.amsdal-cli,sha256=PdXPovcT8AfPhqwDLI_4EWFYAS6e3J5JcsHVityBdF8,304
 amsdal_cli/commands/new/templates/.gitignore,sha256=u7cZFs8VyeZahreeYtkoRnAQduko23Lz4SoGCyMSOQc,153
 amsdal_cli/commands/new/templates/README.md,sha256=SM_MPq4HNWIxo2B4HJmfM1kfJYawW4YneuZxFqZnDo4,21552
@@ -162,20 +163,20 @@ amsdal_cli/commands/new/templates/.amsdal/.dependencies,sha256=47DEQpj8HBSa-_TIm
 amsdal_cli/commands/new/templates/.amsdal/.environment,sha256=DW5AeeNnA-vTfAByL1iR0osOKBHcEUsSkhUSOtzONgU,4
 amsdal_cli/commands/new/templates/.amsdal/.secrets,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 amsdal_cli/commands/plugin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-amsdal_cli/commands/plugin/command.py,sha256=xNjqRr2npAobhsPJTzDD_W2gNpreCGxc5z7I2YBRGn8,4781
-amsdal_cli/commands/plugin/templates/.amsdal-cli,sha256=fhvckKLvaFEzt6ePdgre01vFkr-_AmWHVfJlD6rZZaQ,289
+amsdal_cli/commands/plugin/command.py,sha256=yiqf7lOKlOlTha1pVlEE0B3yYrREbAQUxa2ehDaMsk0,4982
+amsdal_cli/commands/plugin/templates/.amsdal-cli,sha256=HkC4Dh_3zm3NYdk_sNgiWKzsXyBRt8Tctr3bLMONTqM,325
 amsdal_cli/commands/plugin/templates/README.md,sha256=FMwYTXOJ0ZsrhY-wq-c3pH8OeT-oAckjK48s5kh9lW4,1231
 amsdal_cli/commands/plugin/templates/config.yml,sha256=ZEjr5RA0iSG3Nwf_N11WFwpNI8xKbcqoEip_BZgtOtw,635
-amsdal_cli/commands/plugin/templates/pyproject.toml,sha256=fIHM2_nj1Jcw9JqFo_eE22uAazvpuj1fLTcRDr88wpY,387
+amsdal_cli/commands/plugin/templates/pyproject.toml,sha256=DNwO1JotsNRbCf1U-NtuY1Bt149pMkJCxpnEWaH_D-k,400
 amsdal_cli/commands/plugin/templates/src/__about__.py,sha256=IMjkMO3twhQzluVTo8Z6rE7Eg-9U79_LGKMcsWLKBkY,22
 amsdal_cli/commands/plugin/templates/src/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 amsdal_cli/commands/plugin/templates/src/models/__init__.py,sha256=93F5MjA9NayBY6wY_ypyf55KYER3eovgj5K0IM8w3Qs,49
 amsdal_cli/commands/plugin/templates/src/transactions/__init__.py,sha256=NzpIjXV6XKtBiZoteisyuWYjZNebuh3EAZ3tzrkAFvU,55
 amsdal_cli/commands/plugin/templates/src/transactions/example_transaction.py,sha256=UFSXw7UbYtTSAFuKji0E6c-XTIVASjduOLFAvQJmqVE,1328
 amsdal_cli/commands/register_connection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-amsdal_cli/commands/register_connection/command.py,sha256=MdW8j1Q4TfufMl3Z4JVECX_OXIVya0tQ-vJj0Zc5Bdk,5145
+amsdal_cli/commands/register_connection/command.py,sha256=yOeggn7aYwqWbmOEpu2M2_u9h3ilVaSyKhpoNmy5S60,5093
 amsdal_cli/commands/register_connection/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-amsdal_cli/commands/register_connection/utils/build.py,sha256=7aE9AqUyhGM10fOtgbHdCKo6JG5f4xrM1NnjbXTBxWA,762
+amsdal_cli/commands/register_connection/utils/build.py,sha256=nsx2EeN-KhZHg1IwICeRSTfUJS1ajNy1LrP33lXoD4s,710
 amsdal_cli/commands/register_connection/utils/config_updater.py,sha256=CDsaCuli5tCsHoNrzfeWoVDPlyOTWvi8TPdbM4Fzo4o,4204
 amsdal_cli/commands/register_connection/utils/credentials.py,sha256=iaAF5STbKJNIoT8vL30DafTn4uzYnrjumtM3XNHuOS8,1066
 amsdal_cli/commands/register_connection/utils/initialize.py,sha256=9NvfAWOvWQVrSfVNZnGBqeKcQ7bxpTf56oj8239jgc8,1279
@@ -184,20 +185,20 @@ amsdal_cli/commands/register_connection/utils/migrate_models.py,sha256=oU_5oZcwU
 amsdal_cli/commands/register_connection/utils/model_generator.py,sha256=w0vz-i-tMdimcQYmFbtfpOZJF8heTTRIzu1yTdbKBpc,10853
 amsdal_cli/commands/register_connection/utils/tables.py,sha256=FOwbWOpEw485Leoqe8LXCVY5osGKTKlMqWD9oqosapk,474
 amsdal_cli/commands/restore/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-amsdal_cli/commands/restore/command.py,sha256=4ybZ_p5i7t3QHfvz__FUmdO2vaK-4D5YR1XDOjhoSgc,36032
+amsdal_cli/commands/restore/command.py,sha256=yrtF0y3HHmv6RXrMKQCnUIDhEQecDWY7THI_erh6WtA,35976
 amsdal_cli/commands/restore/enums.py,sha256=6SiKMRGlSjiLyepfbfQFXGAYqlM6Bkoeko2KscntTUQ,307
 amsdal_cli/commands/serve/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-amsdal_cli/commands/serve/command.py,sha256=x1_8gZDhRCUQt2-8v1K7__2uPjIlte_tY1ctJxVbl4k,6599
-amsdal_cli/commands/serve/utils.py,sha256=tb0OjE8uAWfEfpXt_LUJjJG7vWoLKpa152R3Svlan_w,18602
+amsdal_cli/commands/serve/command.py,sha256=rdeS9obphECV6UsGIExVEWUiFL8ntqbNfLiNTMUD4nM,6543
+amsdal_cli/commands/serve/utils.py,sha256=2APwAytxKBuS8PbfGJ0MVLgi_9Q3p-OfBCiZoAMt0bU,18490
 amsdal_cli/commands/serve/filters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 amsdal_cli/commands/serve/filters/models_watch_filter.py,sha256=cnoAjrn-PYDAFq5MtgbQ6QeCvJJmcNisVNlA8QtFv4A,170
 amsdal_cli/commands/serve/filters/static_files_watch_filter.py,sha256=jKAF5RHq1au2v0kcOrqaAHP1x5IUjt_KgZURJLm29Tw,552
 amsdal_cli/commands/serve/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 amsdal_cli/commands/serve/services/supervisor.py,sha256=YAt8pT8qev5DN_u8zpiEsDvAKJpPdoqczxAwSSlSJpU,15216
 amsdal_cli/commands/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-amsdal_cli/commands/tests/command.py,sha256=26fOKdCRzQ54NsrY2pSbqr8g6_J89jCg1f5Rey_UgP0,3843
+amsdal_cli/commands/tests/command.py,sha256=_UYFGYgd9VDJMjLRSPSudTh2DQuZLV3yk1fZekPlJE0,3800
 amsdal_cli/commands/verify/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-amsdal_cli/commands/verify/command.py,sha256=Dgg0brt1pBqyI4ZMM02NgBg7GC5oKAwvv298teIUT0I,2242
+amsdal_cli/commands/verify/command.py,sha256=WVLHI3q1g0Zx09wktM6PWsu6jUsP9AuOA7FGzmzYg7c,2186
 amsdal_cli/commands/verify/models.py,sha256=u9kvoRqNv0wbp0hDUi1GvgWbk417RifFmRvT6AVr2NE,444
 amsdal_cli/commands/verify/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 amsdal_cli/commands/verify/utils/verify_json_model.py,sha256=95BC1kE2URW4gFaRNlccJ8wOvoumDKC7fxu68b84_VA,1110
@@ -206,25 +207,25 @@ amsdal_cli/commands/worker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 amsdal_cli/commands/worker/app.py,sha256=X0irXtvo7Gq2g-tsRTPxi9KkgM38DsIvtDMaeGnqZJY,148
 amsdal_cli/commands/worker/command.py,sha256=e3uL38VYCp71-XsVYvE1xlt2FqhP54ujlhVFhK7_9Jw,186
 amsdal_cli/commands/worker/sub_commands/__init__.py,sha256=5AVFexW1UpfPpfNfYoioA6Pix1uiRSEjVEa-_wP89j4,100
-amsdal_cli/commands/worker/sub_commands/run.py,sha256=gQ5fuQwB4Xouyosau0X2YB38DsomkZyUt2MREXeg7jE,4355
+amsdal_cli/commands/worker/sub_commands/run.py,sha256=lOqH_1VWdF1fmzE5-KHIvaxLTnPaGxs6qBDlY9ezh3Q,4299
 amsdal_cli/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 amsdal_cli/config/main.py,sha256=leYnDJlzhzIAYWOH65QhPLu4zk3ii26ogMBWGYx3uqM,2874
 amsdal_cli/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 amsdal_cli/utils/alias_group.py,sha256=v0ninrhZGtZFuJtUH6ZZZ97Irs96nkmIBFm2gY1NdmU,991
 amsdal_cli/utils/check_versions.py,sha256=4Q3GwY_0xgP_RV_ITuFSDigXds-f1QhqCqkUkn-CSMI,1475
-amsdal_cli/utils/cli_config.py,sha256=t1R-U6lh3xzKkBpTgd-Wg7scVeEmf-RAPaL_-DSDaPU,2772
+amsdal_cli/utils/cli_config.py,sha256=4trzdWfbvR0jc9rgyahgl7sKGlodRJMEa7NvZAzENRM,2797
 amsdal_cli/utils/copier.py,sha256=nKo0-P1AhWIb7IjbndYr3Vnvd_avCa566iIbXLK_5a0,5122
 amsdal_cli/utils/markdown_patch.py,sha256=RW58pJhRoUYW1fhId70hw8MD2DF-UqXTYfv7JrSGz5I,1816
 amsdal_cli/utils/render_template.py,sha256=wVjw6K4JZDKz0VElC76Dkgme8di4yfhHIb6hVju9el4,645
-amsdal_cli/utils/schema_repository.py,sha256=rskAFQEcRIVapmYotWo_QZa57Xd2dXkh6z9kd1xn6yo,3029
+amsdal_cli/utils/schema_repository.py,sha256=nq3PUYyghTAapzBYeRpbrEkaOHh6dkUqVsOgj0JwtAk,2973
 amsdal_cli/utils/text.py,sha256=oAC6H6nhuH_jSdKqbC3vRKpgzs2Qot7DluojWOwh9GU,2489
 amsdal_cli/utils/vcs/__init__.py,sha256=WWxqfpYP5AK9zGj6_KzKfbQCX6H1FCLqHfQyVnRof9E,513
 amsdal_cli/utils/vcs/base.py,sha256=jC05ExJZDnyHAsW7_4IDf8gQcYgK4dXq3zNlFIX66T4,422
 amsdal_cli/utils/vcs/dummy.py,sha256=Lk8MT-b0YlHHUsiXsq5cvmPwcl4jTYdo8piN5_C8ORA,434
 amsdal_cli/utils/vcs/enums.py,sha256=tYR9LN1IOr8BZFbSeX_vDlhn8fPl4IU-Yakii8lRDYs,69
 amsdal_cli/utils/vcs/git.py,sha256=xHynbZcV6p2D3RFCwu1MGGpV9D7eK-pGUtO8kVexTQM,1269
-amsdal_cli-0.5.6.dist-info/METADATA,sha256=9fe080hVYqf7OMsJ-5nd7slBMVaKoyBssakkFiUdMvs,57105
-amsdal_cli-0.5.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-amsdal_cli-0.5.6.dist-info/entry_points.txt,sha256=GC-8LZsD3W--Pd9_gD4W3tw3ZZyPbSvkZ-qWc9Fx0NI,47
-amsdal_cli-0.5.6.dist-info/licenses/LICENSE.txt,sha256=hG-541PFYfNJi9WRZi_hno91UyqNg7YLK8LR3vLblZA,27355
-amsdal_cli-0.5.6.dist-info/RECORD,,
+amsdal_cli-0.5.8.dist-info/METADATA,sha256=z4h-NRFwmwAl9Qef3vSadlk0_s2-CU5MgOsdg_tsnAc,57105
+amsdal_cli-0.5.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+amsdal_cli-0.5.8.dist-info/entry_points.txt,sha256=GC-8LZsD3W--Pd9_gD4W3tw3ZZyPbSvkZ-qWc9Fx0NI,47
+amsdal_cli-0.5.8.dist-info/licenses/LICENSE.txt,sha256=hG-541PFYfNJi9WRZi_hno91UyqNg7YLK8LR3vLblZA,27355
+amsdal_cli-0.5.8.dist-info/RECORD,,