amsdal_cli 0.5.5__tar.gz → 0.5.7__tar.gz

{amsdal_cli-0.5.5 → amsdal_cli-0.5.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amsdal_cli
-Version: 0.5.5
+Version: 0.5.7
 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.5 → amsdal_cli-0.5.7}/change-logs.md

@@ -1,3 +1,15 @@
+## [v0.5.7](https://pypi.org/project/amsdal_cli/0.5.7/) - 2025-09-02
+
+### Changed
+
+- Allow to specify source directory
+
+## [v0.5.6](https://pypi.org/project/amsdal_cli/0.5.6/) - 2025-08-15
+
+### Changed
+
+- Allow to generate migrations for plugins
+
 ## [v0.5.5](https://pypi.org/project/amsdal_cli/0.5.5/) - 2025-08-14
 
 ### Changed

amsdal_cli-0.5.7/latest-changelogs.md

@@ -0,0 +1,5 @@
+## [v0.5.7](https://pypi.org/project/amsdal_cli/0.5.7/) - 2025-09-02
+
+### Changed
+
+- Allow to specify source directory

{amsdal_cli-0.5.5 → amsdal_cli-0.5.7}/src/amsdal_cli/__about__.py

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

{amsdal_cli-0.5.5 → amsdal_cli-0.5.7}/src/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()
 

{amsdal_cli-0.5.5 → amsdal_cli-0.5.7}/src/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-0.5.5 → amsdal_cli-0.5.7}/src/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-0.5.5 → amsdal_cli-0.5.7}/src/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-0.5.5 → amsdal_cli-0.5.7}/src/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-0.5.5 → amsdal_cli-0.5.7}/src/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-0.5.5 → amsdal_cli-0.5.7}/src/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-0.5.5 → amsdal_cli-0.5.7}/src/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-0.5.5 → amsdal_cli-0.5.7}/src/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-0.5.5 → amsdal_cli-0.5.7}/src/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-0.5.5 → amsdal_cli-0.5.7}/src/amsdal_cli/commands/migrations/sub_commands/make.py

@@ -4,6 +4,7 @@ from typing import TYPE_CHECKING
 from typing import Annotated
 
 import typer
+from amsdal_utils.models.enums import ModuleType
 from rich import print as rprint
 
 from amsdal_cli.commands.migrations.app import sub_app
@@ -26,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
@@ -39,12 +39,13 @@ 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,
         app_migrations_path=migrations_dir,
         contrib_migrations_directory_name=settings.CONTRIB_MIGRATIONS_DIRECTORY_NAME,
+        module_type=ModuleType.CONTRIB if cli_config.is_plugin else ModuleType.USER,
     )
 
     try:
@@ -79,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
@@ -92,12 +92,13 @@ 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,
         app_migrations_path=migrations_dir,
         contrib_migrations_directory_name=settings.CONTRIB_MODELS_PACKAGE_NAME,
+        module_type=ModuleType.CONTRIB if cli_config.is_plugin else ModuleType.USER,
     )
 
     try:

{amsdal_cli-0.5.5 → amsdal_cli-0.5.7}/src/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-0.5.5 → amsdal_cli-0.5.7}/src/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-0.5.5 → amsdal_cli-0.5.7}/src/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,12 +73,16 @@ 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),
         'plugin_name_snake': to_snake_case(plugin_name),
         'amsdal_version': amsdal_version,
+        'state_backend': 'sqlite-state-async' if is_async_mode else 'sqlite-state',
+        'historical_backend': 'sqlite-historical-async' if is_async_mode else 'sqlite-historical',
         'models_format': models_format.value,
         'is_async_mode': is_async_mode,
     }
@@ -88,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
@@ -135,12 +146,12 @@ def _create_example_model(output_path: Path, models_format: ModelsFormat, contex
         write_file(json_content, model_dir / 'model.json', confirm_overwriting=False)
     else:
         # Create Python model
-        py_content = f"""from amsdal.types import BaseModel
-from amsdal.types import Field
+        py_content = f"""from amsdal_models.classes.model import Model
 from amsdal_utils.models.enums import ModuleType
+from pydantic.fields import Field
 
 
-class ExampleModel(BaseModel):
+class ExampleModel(Model):
     \"\"\"Example model for {context['plugin_name']} plugin.\"\"\"
 
     __module_type__ = ModuleType.CONTRIB

{amsdal_cli-0.5.5 → amsdal_cli-0.5.7}/src/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-0.5.5 → amsdal_cli-0.5.7}/src/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-0.5.5 → amsdal_cli-0.5.7}/src/amsdal_cli/commands/plugin/templates/src/transactions/example_transaction.py

@@ -1,7 +1,7 @@
-{% if ctx.is_async_mode %}from amsdal.core.classes.base import transaction
+{% if ctx.is_async_mode %}from amsdal_data.transactions.decorators import async_transaction
 
 
-@transaction(name='ExampleTransaction')
+@async_transaction(name='ExampleTransaction')
 async def example_transaction(name: str, description: str = "") -> None:
     """
     Example transaction for {{ ctx.plugin_name }} plugin.
@@ -21,7 +21,7 @@ async def example_transaction(name: str, description: str = "") -> None:
     # )
     # await new_model.async_save()
     pass
-{% else %}from amsdal.core.classes.base import transaction
+{% else %}from amsdal_data.transactions.decorators import transaction
 
 
 @transaction(name='ExampleTransaction')
@@ -44,4 +44,4 @@ def example_transaction(name: str, description: str = "") -> None:
     # )
     # new_model.save()
     pass
-{% endif %}
+{% endif %}

{amsdal_cli-0.5.5 → amsdal_cli-0.5.7}/src/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-0.5.5 → amsdal_cli-0.5.7}/src/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-0.5.5 → amsdal_cli-0.5.7}/src/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-0.5.5 → amsdal_cli-0.5.7}/src/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-0.5.5 → amsdal_cli-0.5.7}/src/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-0.5.5 → amsdal_cli-0.5.7}/src/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-0.5.5 → amsdal_cli-0.5.7}/src/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-0.5.5 → amsdal_cli-0.5.7}/src/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-0.5.5 → amsdal_cli-0.5.7}/src/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-0.5.5 → amsdal_cli-0.5.7}/src/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] = []
@@ -52,21 +51,23 @@ def build_schema_repository(
 
         _contrib_modules_paths.append(contrib_models_module_path)
 
+    target_module_type = ModuleType.CONTRIB if cli_config.is_plugin else ModuleType.USER
+
     if cli_config.models_format == ModelsFormat.PY:
         if skip_user_models:
             user_schema_loader = DummySchemaLoader()
         else:
             user_schema_loader = ClassSchemaLoader(
                 settings.USER_MODELS_MODULE,
-                class_filter=lambda cls: cls.__module_type__ == ModuleType.USER,
+                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,
                 module_path=settings.USER_MODELS_MODULE,
-                module_type=ModuleType.USER,
+                module_type=target_module_type,
             ),
         )