amsdal_cli 0.5.2__py3-none-any.whl → 0.5.3__py3-none-any.whl

amsdal_cli/commands/migrations/sub_commands/list.py

@@ -7,6 +7,8 @@ from typing import Annotated
 import typer
 from rich import print as rprint
 
+from amsdal_cli.commands.migrations.utils import render_migrations_list
+
 if TYPE_CHECKING:
     from amsdal_models.migration.data_classes import MigrationFile
 
@@ -58,17 +60,16 @@ def list_migrations(
     """
     from amsdal.configs.constants import CORE_MIGRATIONS_PATH
     from amsdal.configs.main import settings
-    from amsdal_models.migration.data_classes import ModuleType
     from amsdal_models.migration.migrations_loader import MigrationsLoader
     from amsdal_models.migration.utils import build_migrations_module_name
     from amsdal_models.migration.utils import contrib_to_module_root_path
     from amsdal_utils.config.manager import AmsdalConfigManager
+    from amsdal_utils.models.enums import ModuleType
 
     from amsdal_cli.commands.build.services.builder import AppBuilder
     from amsdal_cli.commands.migrations.constants import MIGRATIONS_DIR_NAME
     from amsdal_cli.utils.cli_config import CliConfig
     from amsdal_cli.utils.text import rich_info
-    from amsdal_cli.utils.text import rich_success
 
     if ctx.invoked_subcommand is not None:
         return
@@ -130,35 +131,35 @@ def list_migrations(
         ),
     )
 
-    rprint(rich_success('Core:'))
-
-    for _migration in core_loader:
-        _is_migrated = 'x' if _migration.number in _core_applied_numbers else ' '
-        _color = 'green' if _is_migrated == 'x' else 'grey'
-        rprint(rf'[{_color}]  - \[{_is_migrated}] {_migration.path.name}[/{_color}]')
+    all_migrations = list(core_loader)
 
-    rprint(rich_success('Contrib:'))
     for _contrib, _loader in contrib_loaders:
-        _contrib_name = _contrib.rsplit('.', 2)[0]
-        _contrib_module_name = build_migrations_module_name(
-            '.'.join(_contrib.split('.')[:-2]),
-            settings.CONTRIB_MIGRATIONS_DIRECTORY_NAME,
-        )
-        _applied_numbers = _contrib_applied_numbers[_contrib_module_name]
+        all_migrations.extend(list(_loader))
+
+    def _is_migrated(migration: 'MigrationFile') -> bool:
+        if migration.type == ModuleType.CORE:
+            return migration.number in _core_applied_numbers
+
+        if migration.type == ModuleType.CONTRIB:
+            _applied_numbers = _contrib_applied_numbers[migration.module]  # type: ignore[index]
+            return migration.number in _applied_numbers
 
-        for _migration in _loader:
-            _is_migrated = 'x' if _migration.number in _applied_numbers else ' '
-            _color = 'green' if _is_migrated == 'x' else 'grey'
-            rprint(rf'[{_color}]  - \[{_is_migrated}] {_contrib_name}: {_migration.path.name}[/{_color}]')
+        return migration.number in _app_applied_numbers
 
+    def _color(migration: 'MigrationFile') -> str:
+        _applied = 'green'
+        _missing = 'grey'
+
+        return _applied if _is_migrated(migration) else _missing
+
+    render_migrations_list(
+        all_migrations,
+        color=_color,
+        is_migrated=_is_migrated,
+    )
     _app_migration_files = list(app_migrations_loader)
 
     if _app_migration_files:
-        rprint(rich_success('App:'))
-
-        for _migration in _app_migration_files:
-            _is_migrated = 'x' if _migration.number in _app_applied_numbers else ' '
-            _color = 'green' if _is_migrated == 'x' else 'grey'
-            rprint(rf'[{_color}]  - \[{_is_migrated}] {_migration.path.name}[/{_color}]')
+        render_migrations_list(_app_migration_files, _color, is_migrated=_is_migrated)
     else:
         rprint(rich_info("You don't have any migrations in your app"))

amsdal_cli/commands/migrations/utils.py

@@ -0,0 +1,86 @@
+from collections import defaultdict
+from collections.abc import Callable
+from typing import TYPE_CHECKING
+
+from rich import print as rprint
+
+if TYPE_CHECKING:
+    from amsdal_models.migration.data_classes import MigrationFile
+
+
+def render_migrations_list(
+    migrations: list['MigrationFile'],
+    color: str | Callable[['MigrationFile'], str] = 'yellow',
+    *,
+    is_migrated: bool | Callable[['MigrationFile'], bool] = False,
+) -> None:
+    from amsdal_utils.models.enums import ModuleType
+
+    from amsdal_cli.utils.text import rich_success
+
+    migrations_per_type = defaultdict(list)
+
+    for migration in migrations:
+        migrations_per_type[migration.type].append(migration)
+
+    if ModuleType.CORE in migrations_per_type:
+        rprint(rich_success('Core:'))
+
+        for migration in migrations_per_type[ModuleType.CORE]:
+            if callable(color):
+                _color = color(migration)
+            else:
+                _color = color
+
+            if callable(is_migrated):
+                _is_migrated = is_migrated(migration)
+            else:
+                _is_migrated = is_migrated
+
+            rprint(rf'[{_color}]  - \[{_is_migrated_mark(is_migrated=_is_migrated)}] {migration.path.name}[/{_color}]')
+
+    if ModuleType.CONTRIB in migrations_per_type:
+        rprint(rich_success('Contrib:'))
+
+        for migration in migrations_per_type[ModuleType.CONTRIB]:
+            if migration.module:
+                contrib_name = '.'.join(migration.module.split('.')[:-1])
+            else:
+                contrib_name = 'N/A'
+
+            if callable(color):
+                _color = color(migration)
+            else:
+                _color = color
+
+            if callable(is_migrated):
+                _is_migrated = is_migrated(migration)
+            else:
+                _is_migrated = is_migrated
+
+            _mark = _is_migrated_mark(is_migrated=_is_migrated)
+            rprint(
+                rf'[{_color}]  - \[{_mark}] {contrib_name}: {migration.path.name}[/{_color}]',
+            )
+
+    if ModuleType.USER in migrations_per_type:
+        rprint(rich_success('App:'))
+
+        for migration in migrations_per_type[ModuleType.USER]:
+            if callable(color):
+                _color = color(migration)
+            else:
+                _color = color
+
+            if callable(is_migrated):
+                _is_migrated = is_migrated(migration)
+            else:
+                _is_migrated = is_migrated
+
+            rprint(
+                rf'[{_color}]  - \[{_is_migrated_mark(is_migrated=_is_migrated)}] {migration.path.name}[/{_color}]',
+            )
+
+
+def _is_migrated_mark(*, is_migrated: bool) -> str:
+    return 'x' if is_migrated else ' '

amsdal_cli/commands/serve/utils.py

@@ -310,7 +310,7 @@ def _is_migration_applied(
     migration: 'MigrationFile',
     all_applied_migrations: list['MigrationFile'],
 ) -> bool:
-    from amsdal_models.migration.data_classes import ModuleType
+    from amsdal_utils.models.enums import ModuleType
 
     for applied_migration in all_applied_migrations:
         is_applied = migration.type == applied_migration.type and migration.number == applied_migration.number

amsdal_cli/commands/worker/sub_commands/run.py

@@ -84,8 +84,8 @@ async def _async_run(cli_config: 'CliConfig', app_source_path: Path, mode: Worke
 
     try:
         await AsyncBackgroundTransactionManager().connection.run_worker(
-            _init_function,  # type: ignore  # noqa: [arg-type]
-            _shutdown_function,  # type: ignore  # noqa: [arg-type]
+            _init_function,  # type: ignore[arg-type]
+            _shutdown_function,  # type: ignore[arg-type]
             mode=mode,
         )
     except AmsdalInitiationError as e:

amsdal_cli/config/main.py

@@ -20,6 +20,7 @@ class Settings(BaseSettings):
 
     COMMANDS: list[str | ModuleType] = Field(
         default=[
+            'amsdal_cli.commands.api_check',
             'amsdal_cli.commands.new',
             'amsdal_cli.commands.generate',
             'amsdal_cli.commands.verify',

{amsdal_cli-0.5.2.dist-info → amsdal_cli-0.5.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amsdal_cli
-Version: 0.5.2
+Version: 0.5.3
 Summary: CLI for AMSDAL framework
 Project-URL: Documentation, https://pypi.org/project/amsdal_cli/#readme
 Project-URL: Issues, https://pypi.org/project/amsdal_cli/
@@ -125,6 +125,7 @@ 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

{amsdal_cli-0.5.2.dist-info → amsdal_cli-0.5.3.dist-info}/RECORD

@@ -1,11 +1,22 @@
 amsdal_cli/Third-Party Materials - AMSDAL Dependencies - License Notices.md,sha256=uHJlGG0D4tbpUi8cq-497NNO9ltQ67a5448k-T14HTw,68241
-amsdal_cli/__about__.py,sha256=glsk81MrslMVQFReYet26elGhdxBZYmME4LF8nyLdxA,124
+amsdal_cli/__about__.py,sha256=yDzKlxIKnYM7LUEpIPD88OiYiaHBZBoM6qn8o89jslE,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
 amsdal_cli/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 amsdal_cli/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-amsdal_cli/commands/callbacks.py,sha256=MtvIBfz4VzLZTwR0oIdEf1nRAMWkc8h8u3-Qaie9-dM,4160
+amsdal_cli/commands/callbacks.py,sha256=YK7HR-EEQVlpTVz30sIGYJUQ-No_v9kY_dqveQjEcvY,4173
+amsdal_cli/commands/api_check/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+amsdal_cli/commands/api_check/command.py,sha256=dKi37KfkRY6S2PBSeG2kopnZs8OvCkefQCkPx4ud_4Y,4193
+amsdal_cli/commands/api_check/config.py,sha256=X398zfXddxHCJY4v3PBz6IyWsAsTXJRNNt07Nf_0ow8,6711
+amsdal_cli/commands/api_check/data_classes.py,sha256=qohIcWge323oIYIvuo5586BS21jyDw0y3ZPikQfb7Co,220
+amsdal_cli/commands/api_check/operation_log.py,sha256=4E7BTMz74cotS1OAvvd0x6xbXKz9B-PAbjkmTsd_wsI,2620
+amsdal_cli/commands/api_check/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+amsdal_cli/commands/api_check/services/comparison.py,sha256=LFQI6qg6LUcPda72qcJSJGdgVVEcQPjTcrtf9wrh4fM,1493
+amsdal_cli/commands/api_check/services/data_factory.py,sha256=m7bcNw2x0I2M-odYQ7_rHIDAdv6UcQOjHTt2LJZ3hhc,5565
+amsdal_cli/commands/api_check/services/loader.py,sha256=P-uygPa-RsZUiTMxSB_26Pm8I9T62EmclKGyluksEjw,302
+amsdal_cli/commands/api_check/services/runner.py,sha256=hRrjXb5LGDQHHle7Zegg4PHV2bUYZmWXcA5krnnr0VI,18731
+amsdal_cli/commands/api_check/services/storage.py,sha256=Onlp7uR6PWR-sCPZVpzPyKyn7isYc8ppPcg6li2Ss78,514
 amsdal_cli/commands/build/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 amsdal_cli/commands/build/command.py,sha256=1-Thx2Iz-xr9UDulTiBRZYValCdWhg-SgUAnF370N1o,742
 amsdal_cli/commands/build/constants.py,sha256=an5hbofZrKzyFfxTCu4VSmNQGtAMRSrDj1_TnncyZOw,42
@@ -32,7 +43,7 @@ amsdal_cli/commands/build/schemas/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5J
 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=KdjyrB0CaFQWIU9AZ6Z63tmfIEX5ZEo5HKD32KemDMQ,5749
+amsdal_cli/commands/build/services/mixin.py,sha256=8MHkasdQ1nPpBY90S4KHpr1rTHLC9Om2v89golcWE38,5749
 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
@@ -126,7 +137,7 @@ amsdal_cli/commands/generate/utils/tests/async_mode_utils.py,sha256=iub84Pj5TMa3
 amsdal_cli/commands/generate/utils/tests/conftest_utils.py,sha256=8KzHtDh7eQGghhj5aZkY7Mu2rrlkBgM4Khf857iGG1Y,838
 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=PkPmSvLCKOK5wWw1Q9oVMUZ0nUpHEtj6PlBsO7enmzY,9247
+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/templates/async/conftest.py,sha256=9GfoV_HzwuWtglI7uz0fP5_pOsPk2f56elaoinuPa80,1632
 amsdal_cli/commands/generate/utils/tests/templates/sync/conftest.py,sha256=wMmnKQnVTSJsS5MdH25ChRcc-aQevQYqIZhXwLnZl0U,1564
@@ -134,9 +145,10 @@ amsdal_cli/commands/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5
 amsdal_cli/commands/migrations/app.py,sha256=0HsKjZ5D2j9xkOi2Fuvs3VdlhWyQnS8XJ6pKRi9EcFI,312
 amsdal_cli/commands/migrations/command.py,sha256=jlpdYZAc02ZUBxSdzGSzkDxEb1nlHNzoq05FdRCSzus,206
 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=_rWbDyY3DPdN-6vE60djCtHejvSkl6d1e2Z4ScM52bo,976
-amsdal_cli/commands/migrations/sub_commands/apply.py,sha256=FmkdIE5RUrCCkLJVgM3rtLva-4rYkKlzbjanOQqadUQ,9744
-amsdal_cli/commands/migrations/sub_commands/list.py,sha256=cskcdftYy-u-_rH1iPhreTQv_XiGD42bwi3vQCVe8to,6188
+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=5DiSp5j_iv1Mk7eVFRJ_yCVdc1lZGkctmtY-tNbqaTk,6322
 amsdal_cli/commands/new/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 amsdal_cli/commands/new/command.py,sha256=NDuDZNwreyuHsv4tbE-yrNOJViB8wk35IcKvGKQXPXo,3302
@@ -164,7 +176,7 @@ amsdal_cli/commands/restore/command.py,sha256=4ybZ_p5i7t3QHfvz__FUmdO2vaK-4D5YR1
 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=GhUxSdNN2eX8XbzVtl6IdAcMUY_UdozHKkoCVgaTVKs,18613
+amsdal_cli/commands/serve/utils.py,sha256=tb0OjE8uAWfEfpXt_LUJjJG7vWoLKpa152R3Svlan_w,18602
 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
@@ -182,9 +194,9 @@ 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=Bnl__gGl058IR_7JuJ915fOWbctRNH_Vqv3a-PFx8Do,4375
+amsdal_cli/commands/worker/sub_commands/run.py,sha256=gQ5fuQwB4Xouyosau0X2YB38DsomkZyUt2MREXeg7jE,4355
 amsdal_cli/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-amsdal_cli/config/main.py,sha256=A1XPNQmf7usUu2h80DlRiOPpyT8KkGVTjxUeCYHjpaU,2787
+amsdal_cli/config/main.py,sha256=QMLjpFtQJMw97h44MEeymr_qUQiXY4qA7luPtA1i6zk,2832
 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
@@ -199,8 +211,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.2.dist-info/METADATA,sha256=Cw8QNTI-NaKoXG7Ijm3wvb4HXR3rk056YgJT0InZ6eg,57076
-amsdal_cli-0.5.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-amsdal_cli-0.5.2.dist-info/entry_points.txt,sha256=GC-8LZsD3W--Pd9_gD4W3tw3ZZyPbSvkZ-qWc9Fx0NI,47
-amsdal_cli-0.5.2.dist-info/licenses/LICENSE.txt,sha256=hG-541PFYfNJi9WRZi_hno91UyqNg7YLK8LR3vLblZA,27355
-amsdal_cli-0.5.2.dist-info/RECORD,,
+amsdal_cli-0.5.3.dist-info/METADATA,sha256=RvLkQBMaWxiRAow5onI1RUpGsao_ft2BD9S1k4LmsuI,57105
+amsdal_cli-0.5.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+amsdal_cli-0.5.3.dist-info/entry_points.txt,sha256=GC-8LZsD3W--Pd9_gD4W3tw3ZZyPbSvkZ-qWc9Fx0NI,47
+amsdal_cli-0.5.3.dist-info/licenses/LICENSE.txt,sha256=hG-541PFYfNJi9WRZi_hno91UyqNg7YLK8LR3vLblZA,27355
+amsdal_cli-0.5.3.dist-info/RECORD,,