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

amsdal_cli/commands/callbacks.py

@@ -94,7 +94,7 @@ def init_app_context(
     try:
         amsdal_config = AmsdalConfigManager().get_config()
     except Exception:
-        AmsdalConfigManager().load_config(Path('./config.yml'))
+        AmsdalConfigManager().load_config(config.config_path)
 
     amsdal_config = AmsdalConfigManager().get_config()
 

amsdal_cli/commands/cloud/dependency/sub_commands/dependency_list.py

@@ -79,7 +79,7 @@ def dependency_list_command(
 
         manager.authenticate()
 
-    AmsdalConfigManager().load_config(Path('./config.yml'))
+    AmsdalConfigManager().load_config(cli_config.config_path)
 
     try:
         list_response = manager.cloud_actions_manager.list_dependencies(

amsdal_cli/commands/cloud/dependency/sub_commands/dependency_new.py

@@ -64,7 +64,7 @@ def dependency_new_command(
 
         manager.authenticate()
 
-    AmsdalConfigManager().load_config(Path('./config.yml'))
+    AmsdalConfigManager().load_config(cli_config.config_path)
 
     try:
         manager.cloud_actions_manager.add_dependency(

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

@@ -47,7 +47,7 @@ async def list_command(
 
         manager.authenticate()
 
-    AmsdalConfigManager().load_config(Path('./config.yml'))
+    AmsdalConfigManager().load_config(cli_config.config_path)
 
     try:
         list_response = manager.cloud_actions_manager.list_deploys(list_all=list_all)

amsdal_cli/commands/generate/sub_commands/generate_model.py

@@ -151,7 +151,7 @@ def generate_model(
             models_package_path=output_path,
             models_module_path=settings.USER_MODELS_MODULE,
             object_schema=ObjectSchema(**json_schema),
-            module_type=ModuleType.USER,
+            module_type=ModuleType.CONTRIB if cli_config.is_plugin else ModuleType.USER,
             dependencies=schema_repository.model_module_info,  # type: ignore[arg-type]
             indent_width=' ' * cli_config.indent,
         )

amsdal_cli/commands/plugin/command.py

@@ -137,11 +137,14 @@ def _create_example_model(output_path: Path, models_format: ModelsFormat, contex
         # Create Python model
         py_content = f"""from amsdal.types import BaseModel
 from amsdal.types import Field
+from amsdal_utils.models.enums import ModuleType
 
 
 class ExampleModel(BaseModel):
     \"\"\"Example model for {context['plugin_name']} plugin.\"\"\"
 
+    __module_type__ = ModuleType.CONTRIB
+
     name: str = Field(..., index=True)
     description: str = Field(default="")
     is_active: bool = Field(default=True)

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

@@ -1,5 +1,5 @@
 {
-    "config_path": "./plugin.yml",
+    "config_path": "./config.yml",
     "http_port": 8080,
     "check_model_exists": true,
     "json_indent": 4,
@@ -7,4 +7,4 @@
     "application_name": "{{ ctx.plugin_name }}",
     "models_format": "{{ ctx.models_format }}",
     "is_plugin": true
-}
+}

amsdal_cli/commands/plugin/templates/README.md

@@ -6,7 +6,8 @@ This plugin provides custom models, properties, transactions, and hooks for the
 
 - `src/models/` - Contains model definitions{% if ctx.models_format == 'json' %} in JSON format{% else %} in Python format{% endif %}
 - `src/transactions/` - Contains transaction definitions
-- `plugin.yml` - Plugin configuration file
+- `pyproject.toml` - Plugin configuration file
+- `config.yml` - Configuration for connections
 
 ## Installing this Plugin
 
@@ -46,4 +47,4 @@ amsdal generate hook --model ModelName on_create
 
 ## Testing
 
-Test your plugin by integrating it with an AMSDAL application and running the application's test suite.
+Test your plugin by integrating it with an AMSDAL application and running the application's test suite.

amsdal_cli/commands/plugin/templates/config.yml

@@ -0,0 +1,20 @@
+application_name: {{ ctx.plugin_name_slugify }}
+async_mode: {{ 'true' if ctx.is_async_mode else 'false' }}
+connections:
+  - name: sqlite_history
+    backend: {{ ctx.historical_backend }}
+    credentials:
+      - db_path: ./warehouse/amsdal_historical.sqlite3
+      - check_same_thread: false
+  - name: sqlite_state
+    backend: {{ ctx.state_backend }}
+    credentials:
+      - db_path: ./warehouse/amsdal_state.sqlite3
+      - check_same_thread: false
+  - name: lock
+    backend: amsdal_data.lock.implementations.thread_lock.ThreadLock
+resources_config:
+  lakehouse: sqlite_history
+  lock: lock
+  repository:
+    default: sqlite_state

amsdal_cli/commands/plugin/templates/pyproject.toml

@@ -0,0 +1,16 @@
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[tool.hatch.build.targets.wheel]
+packages = ["src/"]
+
+[project]
+name = "{{ ctx.plugin_name_slugify }}_amsdal_plugin"
+version = "0.1.0"
+description = "{{ ctx.plugin_name }} plugin for AMSDAL Framework"
+readme = "README.md"
+requires-python = ">=3.11"
+dependencies = [
+    "amsdal[cli]=={{ ctx.amsdal_version }}"
+]

amsdal_cli/commands/plugin/templates/src/__about__.py

@@ -0,0 +1 @@
+__version__ = '0.1.0'

amsdal_cli/utils/cli_config.py

@@ -43,6 +43,7 @@ class CliConfig(BaseModel):
     indent: int = 4
     app_directory: Path = Path('/dev/null')
     verbose: bool = True
+    is_plugin: bool = False
     vcs: VCSOptions | None = None
 
     @model_validator(mode='after')

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amsdal_cli
-Version: 0.5.4
+Version: 0.5.5
 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.4.dist-info → amsdal_cli-0.5.5.dist-info}/RECORD

@@ -1,11 +1,11 @@
 amsdal_cli/Third-Party Materials - AMSDAL Dependencies - License Notices.md,sha256=uHJlGG0D4tbpUi8cq-497NNO9ltQ67a5448k-T14HTw,68241
-amsdal_cli/__about__.py,sha256=Wtwe0oKsI5yPYO-Bi6bO-d5lQqCSshnr9G6Vx7i__Vg,124
+amsdal_cli/__about__.py,sha256=EPO0yn5_cRRN4L7o2A8njb26ZvPG7OJ4hIGTxQSuB6o,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=JZRLdyK3w3yTQp5JiXJ57qFY8HyODofKDmu2Epj-yY4,4183
+amsdal_cli/commands/callbacks.py,sha256=B6SXqOsV7c12c-PCrmk7WYosH4d3Nk-U0IZ0ZJrMyJg,4181
 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
@@ -61,14 +61,14 @@ amsdal_cli/commands/cloud/dependency/app.py,sha256=m2pcB5z3257uU7pKt9XoOdQn7J3PU
 amsdal_cli/commands/cloud/dependency/command.py,sha256=6nri04NBl4fy4FlrZyorY05samMbYU1-2j88m4t2FD4,272
 amsdal_cli/commands/cloud/dependency/sub_commands/__init__.py,sha256=ZH89xFzDRJmV2e7MdCVDgaZ30B7jxRVUKTNzHAgTFeE,419
 amsdal_cli/commands/cloud/dependency/sub_commands/dependency_delete.py,sha256=8IL5JE4-tBIStoHEteiBWo-Onsv8vLriy79ITSg18Hg,2849
-amsdal_cli/commands/cloud/dependency/sub_commands/dependency_list.py,sha256=n49qaetWboVsrsI6DDCZg5KVroXk2p_C0MhWeF4tP-Y,5297
-amsdal_cli/commands/cloud/dependency/sub_commands/dependency_new.py,sha256=FSH7F5Hr15ThY04xQg4IkHOzqr1vWfXiqSCsTnMR0zo,2991
+amsdal_cli/commands/cloud/dependency/sub_commands/dependency_list.py,sha256=2wpRoKLLlOm_BU1NUbitPntCct7MrtsJakxtyXOE-RA,5299
+amsdal_cli/commands/cloud/dependency/sub_commands/dependency_new.py,sha256=BknJ-5151EPVemDuTETBXnTRMMdgwVmOD9dt6698cSE,2993
 amsdal_cli/commands/cloud/deploy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 amsdal_cli/commands/cloud/deploy/app.py,sha256=_t2LVD8apbyvBrcWdNv1_nXtubng1hLW9fIV97_F8VU,222
 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=Nm-uaAmCjLP9UDFNM-E79QLAiqy6_9VQSTd_W8bKoE0,5532
+amsdal_cli/commands/cloud/deploy/sub_commands/deploy_list.py,sha256=ozr7tVbPrTnx_YscyAb1_ZockFfQQSwd6XDijrkZSWk,5534
 amsdal_cli/commands/cloud/deploy/sub_commands/deploy_new.py,sha256=G28mt1cMv8js80FTtzxahCCWV8AVcu7BWe4w7Nqvp04,12748
 amsdal_cli/commands/cloud/environments/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 amsdal_cli/commands/cloud/environments/app.py,sha256=kkzf_kW2jpl3d44qWuIZB5C3uWXzpNpnTIvUpuuPJHE,238
@@ -115,7 +115,7 @@ amsdal_cli/commands/generate/enums.py,sha256=4Nvbe4aJEUOMkFqjNbr2xtnvzqrJEh2qDiw
 amsdal_cli/commands/generate/sub_commands/__init__.py,sha256=WyZ4kE6IH9O_igOVJ31UQtqE12cCKyATi4E-qgslN3k,941
 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=imUNWHS0YgJLC1dNRi_Q6k5FfiUIAHDWf-wMHFk6Ucg,5879
+amsdal_cli/commands/generate/sub_commands/generate_model.py,sha256=nscCBi-PRa_JWdZlMo7ij5Ukg2eEk5tqMhMiLOs1Jv4,5927
 amsdal_cli/commands/generate/sub_commands/generate_modifier.py,sha256=NyN7vMTBGaQv6u815WT1lqAlqI4xP1AmIZWq5edZ-5g,1426
 amsdal_cli/commands/generate/sub_commands/generate_permission.py,sha256=gfRhZsnNnd_m_HxdOCB8C22tbMkopg2FTKo-T68b13s,2824
 amsdal_cli/commands/generate/sub_commands/generate_property.py,sha256=XrCjf48oEzuMPqsTuC5Qsn1WbIQzUVW8BNOmXssfUM8,1599
@@ -162,11 +162,13 @@ 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=slvPYAH18NH_O0xgmAqym5pdRWSI6Kqt2FZ3dHoGXmY,4497
-amsdal_cli/commands/plugin/templates/.amsdal-cli,sha256=8vNUY3kypNLxBc2ZvdK4Gp9PhX4GNIGBMTieENjikpM,288
-amsdal_cli/commands/plugin/templates/README.md,sha256=iLcitbO6UgrsZXXrjUmJAd9LiuZ7XHtrB0xdHUMAOS8,1179
-amsdal_cli/commands/plugin/templates/plugin.yml,sha256=k4On3XnM8Wm8CijE05BcAf_4eXKYWDe01L2cgEx7oSQ,457
-amsdal_cli/commands/plugin/templates/requirements.txt,sha256=Je2tTIrKDioyTKfFj_LCyJQsuZSTNU-_fpl_eCRZSFQ,37
+amsdal_cli/commands/plugin/command.py,sha256=alrKEIjpy2stMIEqb0fUZ1STu9VroaaKDx03fEJKdgA,4588
+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
+amsdal_cli/commands/plugin/templates/pyproject.toml,sha256=fIHM2_nj1Jcw9JqFo_eE22uAazvpuj1fLTcRDr88wpY,387
+amsdal_cli/commands/plugin/templates/src/__about__.py,sha256=IMjkMO3twhQzluVTo8Z6rE7Eg-9U79_LGKMcsWLKBkY,22
+amsdal_cli/commands/plugin/templates/src/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 amsdal_cli/commands/plugin/templates/src/models/__init__.py,sha256=93F5MjA9NayBY6wY_ypyf55KYER3eovgj5K0IM8w3Qs,49
 amsdal_cli/commands/plugin/templates/src/transactions/__init__.py,sha256=NzpIjXV6XKtBiZoteisyuWYjZNebuh3EAZ3tzrkAFvU,55
 amsdal_cli/commands/plugin/templates/src/transactions/example_transaction.py,sha256=4NZVRuZ2BXM-nREvGbZv7H36EbzQHGSWBGFaTYWc_E4,1293
@@ -210,7 +212,7 @@ amsdal_cli/config/main.py,sha256=leYnDJlzhzIAYWOH65QhPLu4zk3ii26ogMBWGYx3uqM,287
 amsdal_cli/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 amsdal_cli/utils/alias_group.py,sha256=v0ninrhZGtZFuJtUH6ZZZ97Irs96nkmIBFm2gY1NdmU,991
 amsdal_cli/utils/check_versions.py,sha256=4Q3GwY_0xgP_RV_ITuFSDigXds-f1QhqCqkUkn-CSMI,1475
-amsdal_cli/utils/cli_config.py,sha256=lSXsXXVxJm9QJvfUExfh-dvINa4yEuq3iF7CcXZauWk,2744
+amsdal_cli/utils/cli_config.py,sha256=t1R-U6lh3xzKkBpTgd-Wg7scVeEmf-RAPaL_-DSDaPU,2772
 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
@@ -221,8 +223,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.4.dist-info/METADATA,sha256=CPl5enVl50buoUzbJW1Qjlqe00XbeWDnRtLFpHZNDac,57105
-amsdal_cli-0.5.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-amsdal_cli-0.5.4.dist-info/entry_points.txt,sha256=GC-8LZsD3W--Pd9_gD4W3tw3ZZyPbSvkZ-qWc9Fx0NI,47
-amsdal_cli-0.5.4.dist-info/licenses/LICENSE.txt,sha256=hG-541PFYfNJi9WRZi_hno91UyqNg7YLK8LR3vLblZA,27355
-amsdal_cli-0.5.4.dist-info/RECORD,,
+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/commands/plugin/templates/plugin.yml

@@ -1,20 +0,0 @@
-plugin_name: {{ ctx.plugin_name_slugify }}
-plugin_type: amsdal_plugin
-version: "1.0.0"
-async_mode: {{ 'true' if ctx.is_async_mode else 'false' }}
-models_format: {{ ctx.models_format }}
-
-description: "{{ ctx.plugin_name }} plugin for AMSDAL Framework"
-
-# Plugin metadata
-author: ""
-license: ""
-homepage: ""
-
-# Dependencies (if any)
-dependencies: []
-
-# Plugin configuration
-config:
-  models_directory: "src/models"
-  transactions_directory: "src/transactions"

amsdal_cli/commands/plugin/templates/requirements.txt

@@ -1 +0,0 @@
-amsdal[cli]=={{ ctx.amsdal_version }}