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

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
@@ -45,6 +46,7 @@ def _sync_make_migrations(
         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:
@@ -98,6 +100,7 @@ async def _async_make_migrations(
         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/commands/plugin/command.py

@@ -79,6 +79,8 @@ def plugin_command(
         '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,
     }
@@ -135,12 +137,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/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/utils/schema_repository.py

@@ -52,13 +52,15 @@ 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'
@@ -66,7 +68,7 @@ def build_schema_repository(
             SchemasDirectory(
                 path=_models_path,
                 module_path=settings.USER_MODELS_MODULE,
-                module_type=ModuleType.USER,
+                module_type=target_module_type,
             ),
         )
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amsdal_cli
-Version: 0.5.5
+Version: 0.5.6
 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.dist-info → amsdal_cli-0.5.6.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=EPO0yn5_cRRN4L7o2A8njb26ZvPG7OJ4hIGTxQSuB6o,124
+amsdal_cli/__about__.py,sha256=FVhogeUXIvF04uzQhGOvAB-kHp5Toh3bylNItK77X40,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
@@ -149,7 +149,7 @@ amsdal_cli/commands/migrations/utils.py,sha256=Fvu6NlIFL3OAz0MhLkvnucIsHBZlDDCOZ
 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=5DiSp5j_iv1Mk7eVFRJ_yCVdc1lZGkctmtY-tNbqaTk,6322
+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/new/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 amsdal_cli/commands/new/command.py,sha256=NDuDZNwreyuHsv4tbE-yrNOJViB8wk35IcKvGKQXPXo,3302
@@ -162,7 +162,7 @@ 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=alrKEIjpy2stMIEqb0fUZ1STu9VroaaKDx03fEJKdgA,4588
+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/templates/README.md,sha256=FMwYTXOJ0ZsrhY-wq-c3pH8OeT-oAckjK48s5kh9lW4,1231
 amsdal_cli/commands/plugin/templates/config.yml,sha256=ZEjr5RA0iSG3Nwf_N11WFwpNI8xKbcqoEip_BZgtOtw,635
@@ -171,7 +171,7 @@ amsdal_cli/commands/plugin/templates/src/__about__.py,sha256=IMjkMO3twhQzluVTo8Z
 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=4NZVRuZ2BXM-nREvGbZv7H36EbzQHGSWBGFaTYWc_E4,1293
+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/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -216,15 +216,15 @@ amsdal_cli/utils/cli_config.py,sha256=t1R-U6lh3xzKkBpTgd-Wg7scVeEmf-RAPaL_-DSDaP
 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=RtTXrRxvt7U9jMW8Mt7VWTDIiz8Dkblk_0TLFri04A8,2933
+amsdal_cli/utils/schema_repository.py,sha256=rskAFQEcRIVapmYotWo_QZa57Xd2dXkh6z9kd1xn6yo,3029
 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.5.dist-info/METADATA,sha256=-0tbpUZNEWRSiaJW4Z7hbA3e1IDEI8ASUHFkrrIXhOY,57105
-amsdal_cli-0.5.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-amsdal_cli-0.5.5.dist-info/entry_points.txt,sha256=GC-8LZsD3W--Pd9_gD4W3tw3ZZyPbSvkZ-qWc9Fx0NI,47
-amsdal_cli-0.5.5.dist-info/licenses/LICENSE.txt,sha256=hG-541PFYfNJi9WRZi_hno91UyqNg7YLK8LR3vLblZA,27355
-amsdal_cli-0.5.5.dist-info/RECORD,,
+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,,