amsdal_cli 0.5.7__py3-none-any.whl → 0.5.9__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.7'
+__version__ = '0.5.9'

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

@@ -38,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_list.py

@@ -92,11 +92,11 @@ async def list_command(
                         deployment.application_name or '-',
                         datetime.datetime.fromtimestamp(
                             deployment.created_at / 1000,
-                            tz=datetime.timezone.utc,
+                            tz=datetime.UTC,
                         ).strftime('%Y-%m-%d %H:%M:%S %Z'),
                         datetime.datetime.fromtimestamp(
                             deployment.last_update_at / 1000,
-                            tz=datetime.timezone.utc,
+                            tz=datetime.UTC,
                         ).strftime('%Y-%m-%d %H:%M:%S %Z'),
                         deployment.application_uuid or '-',
                         deployment.domain_url or '-',
@@ -109,11 +109,11 @@ async def list_command(
                         deployment.application_name or '-',
                         datetime.datetime.fromtimestamp(
                             deployment.created_at / 1000,
-                            tz=datetime.timezone.utc,
+                            tz=datetime.UTC,
                         ).strftime('%Y-%m-%d %H:%M:%S %Z'),
                         datetime.datetime.fromtimestamp(
                             deployment.last_update_at / 1000,
-                            tz=datetime.timezone.utc,
+                            tz=datetime.UTC,
                         ).strftime('%Y-%m-%d %H:%M:%S %Z'),
                     )
 

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

@@ -308,7 +308,7 @@ async def _async_check_missing_generated_migrations(
     if not amsdal_manager.is_authenticated:
         amsdal_manager.authenticate()
 
-    await amsdal_manager.post_setup()  # type: ignore[call-arg, misc]
+    await amsdal_manager.post_setup()  # type: ignore[call-arg]
 
     migrations_dir = app_source_path / MIGRATIONS_DIR_NAME
 

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/utils/tests/type_utils.py

@@ -1,6 +1,6 @@
 import ast
+from datetime import UTC
 from datetime import date
-from datetime import timezone
 from pathlib import Path
 
 import faker
@@ -122,7 +122,7 @@ def _generate_values_for_type(
             return ast.Constant(value='2023-01-01T00:00:00Z')
 
         if test_data_type == TestDataType.RANDOM:
-            dt = FAKER.date_time(tzinfo=timezone.utc).replace(hour=0, minute=0, second=0, microsecond=0)
+            dt = FAKER.date_time(tzinfo=UTC).replace(hour=0, minute=0, second=0, microsecond=0)
             return ast.Constant(value=dt)  # type: ignore[arg-type]
         if test_data_type == TestDataType.DYNAMIC:
             return _faker_call('date_time')
@@ -132,7 +132,7 @@ def _generate_values_for_type(
             return ast.Constant(value=date(2023, 1, 1))  # type: ignore[arg-type]
 
         if test_data_type == TestDataType.RANDOM:
-            dt = FAKER.date_time(tzinfo=timezone.utc).replace(hour=0, minute=0, second=0, microsecond=0)
+            dt = FAKER.date_time(tzinfo=UTC).replace(hour=0, minute=0, second=0, microsecond=0)
             return ast.Constant(value=dt.date())  # type: ignore[arg-type]
 
         if test_data_type == TestDataType.DYNAMIC:

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,
     )
 
@@ -116,7 +116,7 @@ async def _async_sync_apply(
     try:
         amsdal_manager.authenticate()
 
-        await amsdal_manager.post_setup()  # type: ignore[call-arg, misc]
+        await amsdal_manager.post_setup()  # type: ignore[call-arg]
 
         app_migrations_loader = MigrationsLoader(
             migrations_dir=build_dir / MIGRATIONS_DIR_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/list.py

@@ -39,7 +39,7 @@ async def _async_fetch_migrations(app_migrations_path: Path) -> list['MigrationF
 
     try:
         amsdal_manager.authenticate()
-        await amsdal_manager.post_setup()  # type: ignore[call-arg,misc]
+        await amsdal_manager.post_setup()  # type: ignore[call-arg]
 
         store = AsyncFileMigrationStore(app_migrations_path)
         await store.init_migration_table()

amsdal_cli/commands/migrations/sub_commands/make.py

@@ -89,7 +89,7 @@ async def _async_make_migrations(
     if not amsdal_manager.is_setup:
         await amsdal_manager.setup()
     amsdal_manager.authenticate()
-    await amsdal_manager.post_setup()  # type: ignore[call-arg, misc]
+    await amsdal_manager.post_setup()  # type: ignore[call-arg]
 
     schema_repository = build_schema_repository(cli_config=cli_config)
     migrations_dir: Path = cli_config.app_directory / cli_config.src_dir / MIGRATIONS_DIR_NAME

amsdal_cli/commands/migrations/sub_commands/make_contrib.py

@@ -87,7 +87,7 @@ async def _async_make_contrib_migrations(
     if not amsdal_manager.is_setup:
         await amsdal_manager.setup()
     amsdal_manager.authenticate()
-    await amsdal_manager.post_setup()  # type: ignore[call-arg, misc]
+    await amsdal_manager.post_setup()  # type: ignore[call-arg]
 
     schema_repository = build_schema_repository(cli_config=cli_config)
     migrations_dir: Path = cli_config.app_directory / cli_config.src_dir / MIGRATIONS_DIR_NAME

amsdal_cli/commands/new/templates/requirements.txt

@@ -1,2 +1,2 @@
 amsdal[cli]=={{ ctx.amsdal_version }}
-{% if ctx.is_async_mode %}amsdal-glue-connections[async-sqlite]{% endif %}
+{% if ctx.is_async_mode %}amsdal-glue-connections[async-sqlite,postgres-binary]{% endif %}

amsdal_cli/commands/register_connection/utils/initialize.py

@@ -38,4 +38,4 @@ async def _async_init() -> None:
     amsdal_manager = AsyncAmsdalManager()
     await amsdal_manager.setup()
     amsdal_manager.authenticate()
-    await amsdal_manager.post_setup()  # type: ignore[call-arg, misc]
+    await amsdal_manager.post_setup()  # type: ignore[call-arg]

amsdal_cli/commands/register_connection/utils/migrate_models.py

@@ -178,7 +178,7 @@ async def _async_migrate_models(config_path: Path) -> None:
     new_manager = AsyncAmsdalManager()
     if not new_manager.is_setup:
         await new_manager.setup()
-    await new_manager.post_setup()  # type: ignore[call-arg, misc]
+    await new_manager.post_setup()  # type: ignore[call-arg]
 
     schemas = MigrationSchemas()
     executor = DefaultAsyncMigrationExecutor(schemas, use_foreign_keys=True)
@@ -310,7 +310,7 @@ async def _async_migrate_data(new_connection_name: str) -> None:
     origin_manager = AsyncAmsdalManager()
     if not origin_manager.is_setup:
         await origin_manager.setup()
-    await origin_manager.post_setup()  # type: ignore[call-arg, misc]
+    await origin_manager.post_setup()  # type: ignore[call-arg]
 
     model_class_loader = ModelClassLoader(settings.USER_MODELS_MODULE)
     tables_for_connection = _resolve_tables_for_connection(new_connection_name)
@@ -346,7 +346,7 @@ async def _async_migrate_data(new_connection_name: str) -> None:
                         force_insert = True
                         lakehouse_item = model_class(**item.model_dump_refs())
 
-                    await lakehouse_item.asave(  # type: ignore[misc]
+                    await lakehouse_item.asave(
                         force_insert=force_insert,
                         using=LAKEHOUSE_DB_ALIAS,
                     )

amsdal_cli/commands/serve/command.py

@@ -45,7 +45,7 @@ async def _async_serve(
             async def on_event_async(self, *args: Any, **kwargs: Any) -> None:  # noqa: ARG002
                 if not amsdal_manager._is_setup:
                     await amsdal_manager.setup()
-                    await amsdal_manager.post_setup()  # type: ignore[call-arg, misc]
+                    await amsdal_manager.post_setup()  # type: ignore[call-arg]
 
                 if not amsdal_manager.is_authenticated:
                     amsdal_manager.authenticate()

amsdal_cli/commands/serve/utils.py

@@ -397,13 +397,13 @@ async def async_build_app_and_check_migrations(
             if not amsdal_manager.is_setup:
                 await amsdal_manager.setup()
 
-            await amsdal_manager.post_setup()  # type: ignore[call-arg,misc]
+            await amsdal_manager.post_setup()  # type: ignore[call-arg]
             amsdal_manager.init_classes()
 
             if not amsdal_manager.is_authenticated:
                 amsdal_manager.authenticate()
 
-            await amsdal_manager.apply_fixtures()  # type: ignore[call-arg,misc]
+            await amsdal_manager.apply_fixtures()  # type: ignore[call-arg]
             rprint(rich_success('OK!'))
     except Exception:
         if amsdal_manager.is_setup:
@@ -438,7 +438,7 @@ async def async_check_migrations_generated_and_applied(
     if not amsdal_manager.is_authenticated:
         amsdal_manager.authenticate()
 
-    await amsdal_manager.post_setup()  # type: ignore[call-arg,misc]
+    await amsdal_manager.post_setup()  # type: ignore[call-arg]
 
     has_unapplied_migrations = await _async_check_has_unapplied_migrations(build_dir=build_dir)
 

{amsdal_cli-0.5.7.dist-info → amsdal_cli-0.5.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amsdal_cli
-Version: 0.5.7
+Version: 0.5.9
 Summary: CLI for AMSDAL framework
 Project-URL: Documentation, https://pypi.org/project/amsdal_cli/#readme
 Project-URL: Issues, https://pypi.org/project/amsdal_cli/
@@ -118,17 +118,18 @@ Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
-Requires-Python: >=3.11
+Requires-Python: <3.14,>=3.11
 Requires-Dist: amsdal-server==0.5.*
 Requires-Dist: click<8.2.0
 Requires-Dist: faker==27.*
 Requires-Dist: gitpython~=3.1
 Requires-Dist: httpx==0.28.*
 Requires-Dist: jinja2~=3.1
-Requires-Dist: pydantic-settings~=2.2
-Requires-Dist: pydantic~=2.3
+Requires-Dist: pydantic-settings~=2.12
+Requires-Dist: pydantic~=2.12
 Requires-Dist: rich~=14.0
 Requires-Dist: typer~=0.15.3
 Requires-Dist: watchfiles~=0.21

{amsdal_cli-0.5.7.dist-info → amsdal_cli-0.5.9.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=6iW8h6OIk_sNDiVyp7NxCzL_PEkI5J0OHZQ6VEA84jQ,124
+amsdal_cli/__about__.py,sha256=6kYLhdHkt8K7kGaoPcOypmOiRuisFHUqVenu6fa0rn8,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=7g4PoF2zmy9I-XxmSyP2Ved54SHScePtbojNR0I4BK4,3168
-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
@@ -68,8 +68,8 @@ amsdal_cli/commands/cloud/deploy/app.py,sha256=_t2LVD8apbyvBrcWdNv1_nXtubng1hLW9
 amsdal_cli/commands/cloud/deploy/command.py,sha256=LIX07pTU55GUA9KmTiKDtoCj5Ytx9ZDC7XQsVYUYsh8,262
 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=n87MNWad-oOFYXRpQvWqZZtRo0NXaQZSb3GQkMFE0ls,12692
+amsdal_cli/commands/cloud/deploy/sub_commands/deploy_list.py,sha256=rqykOi49C3CHm7GiVOKTgwlrYcN3mSguHx759ZzZJ3k,5498
+amsdal_cli/commands/cloud/deploy/sub_commands/deploy_new.py,sha256=N591T6XKpj1xPx_qGmpAmCqumeWpGrA0RH0e9_SSs-8,12686
 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
@@ -112,7 +112,8 @@ amsdal_cli/commands/generate/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 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=SQ_ZFW6F9RbvM__Ohz5r3Ld54MlKoxid83kqiVqaZwY,3696
-amsdal_cli/commands/generate/sub_commands/__init__.py,sha256=WyZ4kE6IH9O_igOVJ31UQtqE12cCKyATi4E-qgslN3k,941
+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=yjZEfadjDf2zRkXh9z5RWYqnO9vFVu8tzVQzxWZPWY4,5885
@@ -137,7 +138,7 @@ amsdal_cli/commands/generate/utils/tests/async_mode_utils.py,sha256=iub84Pj5TMa3
 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/type_utils.py,sha256=c2eKOrzuioDHbxQieiRAT8reF9TCgTq5CRx7WB3_W-Y,9302
 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
@@ -147,17 +148,17 @@ 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/list.py,sha256=vC-oeTVHjYNzI_HhiylZSNeOsIFvnDZ6TRwrqQ-wpUk,5833
-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/migrations/sub_commands/apply.py,sha256=MrlykOqsdBZoC1gnaHSOa6oGfTREDmxKyTmB7-mBRPU,8742
+amsdal_cli/commands/migrations/sub_commands/list.py,sha256=kZc-qI-lVFrVpWyPV3b21wx1aLUYcFbFX1U1WDq2l0E,5828
+amsdal_cli/commands/migrations/sub_commands/make.py,sha256=6Xh4wZFyZQmxSR8InBc0f_FUuIM_eqyfqO0ynLuDlPY,6423
+amsdal_cli/commands/migrations/sub_commands/make_contrib.py,sha256=G3w5fRKR16-tKrTfOWCGj4Vkuwl22V5aEsRxEhIoD1k,6331
 amsdal_cli/commands/new/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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
 amsdal_cli/commands/new/templates/config.yml,sha256=89BTeSrzPO92JTCRS8N03DXY0kdw-uMWCStLHzNaeRw,640
-amsdal_cli/commands/new/templates/requirements.txt,sha256=SZ3s8KxuCFfat3FHl8-ZF3mrghDNdMXFS4T1QI1YXeo,113
+amsdal_cli/commands/new/templates/requirements.txt,sha256=05SVW1yzgvHwir231NIEgeCguZovGJyJKtHA1uFC3aA,129
 amsdal_cli/commands/new/templates/.amsdal/.dependencies,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 amsdal_cli/commands/new/templates/.amsdal/.environment,sha256=DW5AeeNnA-vTfAByL1iR0osOKBHcEUsSkhUSOtzONgU,4
 amsdal_cli/commands/new/templates/.amsdal/.secrets,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -178,17 +179,17 @@ amsdal_cli/commands/register_connection/utils/__init__.py,sha256=47DEQpj8HBSa-_T
 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
+amsdal_cli/commands/register_connection/utils/initialize.py,sha256=Fjs3ilpnv3TqdzpfkT8UUxtZhWR2GQ8_2-pGvazQu3s,1273
 amsdal_cli/commands/register_connection/utils/meta.py,sha256=PDs2miN0SPW2hCATLY8uGe1WOzDyw-D6my90P-mpcl8,709
-amsdal_cli/commands/register_connection/utils/migrate_models.py,sha256=oU_5oZcwU-qIMImpFIGniXvs7CJXyCyfSJozhFBRYkM,14077
+amsdal_cli/commands/register_connection/utils/migrate_models.py,sha256=vljLYKBDZJn4h2fywbDfNeKd5W4G_KYZ8vKpMhc1oMI,14043
 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=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=rdeS9obphECV6UsGIExVEWUiFL8ntqbNfLiNTMUD4nM,6543
-amsdal_cli/commands/serve/utils.py,sha256=2APwAytxKBuS8PbfGJ0MVLgi_9Q3p-OfBCiZoAMt0bU,18490
+amsdal_cli/commands/serve/command.py,sha256=r27g3mw-P77LfP43ygTk9QbxN7HklWbzrlosjO4hB5c,6537
+amsdal_cli/commands/serve/utils.py,sha256=ErwuQFRJxo32Y7uLgxtUXYdbPlDCYsh8OfAkqWSblrA,18475
 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
@@ -223,8 +224,8 @@ amsdal_cli/utils/vcs/base.py,sha256=jC05ExJZDnyHAsW7_4IDf8gQcYgK4dXq3zNlFIX66T4,
 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.7.dist-info/METADATA,sha256=xT_KeYNRJy5TYkcikn5rrkiklhNpBqgtX-RccqdtT7I,57105
-amsdal_cli-0.5.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-amsdal_cli-0.5.7.dist-info/entry_points.txt,sha256=GC-8LZsD3W--Pd9_gD4W3tw3ZZyPbSvkZ-qWc9Fx0NI,47
-amsdal_cli-0.5.7.dist-info/licenses/LICENSE.txt,sha256=hG-541PFYfNJi9WRZi_hno91UyqNg7YLK8LR3vLblZA,27355
-amsdal_cli-0.5.7.dist-info/RECORD,,
+amsdal_cli-0.5.9.dist-info/METADATA,sha256=uFiVJXIDg30UwS0T47yiyypMaGT7CNKQDO1kr453xxQ,57164
+amsdal_cli-0.5.9.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+amsdal_cli-0.5.9.dist-info/entry_points.txt,sha256=GC-8LZsD3W--Pd9_gD4W3tw3ZZyPbSvkZ-qWc9Fx0NI,47
+amsdal_cli-0.5.9.dist-info/licenses/LICENSE.txt,sha256=hG-541PFYfNJi9WRZi_hno91UyqNg7YLK8LR3vLblZA,27355
+amsdal_cli-0.5.9.dist-info/RECORD,,

{amsdal_cli-0.5.7.dist-info → amsdal_cli-0.5.9.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.27.0
+Generator: hatchling 1.28.0
 Root-Is-Purelib: true
 Tag: py3-none-any