zrb 1.3.0__py3-none-any.whl → 1.3.1__py3-none-any.whl

zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/column/add_column_task.py

@@ -8,7 +8,7 @@ from my_app_name._zrb.column.add_column_util import (
     update_my_app_name_test_update,
     update_my_app_name_ui,
 )
-from my_app_name._zrb.config import APP_DIR
+from my_app_name._zrb.config import ACTIVATE_VENV_SCRIPT, APP_DIR
 from my_app_name._zrb.format_task import format_my_app_name_code
 from my_app_name._zrb.group import app_create_group
 from my_app_name._zrb.input import (
@@ -17,9 +17,16 @@ from my_app_name._zrb.input import (
     new_column_input,
     new_column_type_input,
 )
-from my_app_name._zrb.util import get_existing_module_names, get_existing_schema_names
+from my_app_name._zrb.util import (
+    cd_module_script,
+    get_existing_module_names,
+    get_existing_schema_names,
+    set_create_migration_db_url_env,
+    set_env,
+)
+from my_app_name._zrb.venv_task import prepare_venv
 
-from zrb import AnyContext, Task, make_task
+from zrb import AnyContext, Cmd, CmdTask, EnvFile, Task, make_task
 
 
 @make_task(
@@ -118,6 +125,34 @@ update_my_app_name_test_delete_task = Task(
 )
 
 
+create_my_app_name_entity_migration = CmdTask(
+    name="create-my-app-name-entity-migration",
+    input=[
+        existing_module_input,
+        existing_entity_input,
+        new_column_input,
+    ],
+    env=EnvFile(path=os.path.join(APP_DIR, "template.env")),
+    cwd=APP_DIR,
+    cmd=[
+        ACTIVATE_VENV_SCRIPT,
+        Cmd(lambda ctx: set_create_migration_db_url_env(ctx.input.module)),
+        Cmd(lambda ctx: set_env("MY_APP_NAME_MODULES", ctx.input.module)),
+        Cmd(lambda ctx: cd_module_script(ctx.input.module)),
+        "alembic upgrade head",
+        Cmd(
+            'alembic revision --autogenerate -m "create_{to_snake_case(ctx.input.entity)}_{to_snake_case(ctx.input.column)}_column"',  # noqa
+        ),
+    ],
+    render_cmd=False,
+    retries=0,
+    upstream=[
+        prepare_venv,
+        update_my_app_name_schema_task,
+    ],
+)
+
+
 add_my_app_name_column = app_create_group.add_task(
     Task(
         name="add-my-app-name-column",
@@ -129,6 +164,7 @@ add_my_app_name_column = app_create_group.add_task(
             update_my_app_name_test_read_task,
             update_my_app_name_test_update_task,
             update_my_app_name_test_delete_task,
+            create_my_app_name_entity_migration,
         ],
         successor=format_my_app_name_code,
         retries=0,

zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/entity/template/app_template/module/gateway/view/content/my-module/my-entity.html

@@ -2,13 +2,13 @@
 
 <main id="crud-app" 
     class="container"
-    data-page-size='{{ page_size | tojson }}'
-    data-page='{{ page | tojson }}'
-    data-sort='{{ sort | tojson }}'
-    data-filter='{{ filter | tojson }}'
-    data-allow-create='{{ allow_create | tojson }}'
-    data-allow-update='{{ allow_update | tojson }}'
-    data-allow-delete='{{ allow_delete | tojson }}'>
+    data-page-size='{{ page_size | tojson | safe }}'
+    data-page='{{ page | tojson | safe }}'
+    data-sort='{{ sort | tojson | safe }}'
+    data-filter='{{ filter | tojson | safe }}'
+    data-allow-create='{{ allow_create | tojson | safe }}'
+    data-allow-update='{{ allow_update | tojson | safe }}'
+    data-allow-delete='{{ allow_delete | tojson | safe }}'>
     <article>
         <h1>My Entity</h1>
 
@@ -311,13 +311,13 @@
     document.addEventListener("DOMContentLoaded", () => {
         const app = document.getElementById("crud-app");
         new CrudApp("/api/v1/my-entities", {
-            pageSize: JSON.parse(app.dataset.pageSize),
-            currentPage: JSON.parse(app.dataset.page),
-            sort: JSON.parse(app.dataset.sort),
-            filter: JSON.parse(app.dataset.filter),
-            allowCreate: JSON.parse(app.dataset.allowCreate),
-            allowUpdate: JSON.parse(app.dataset.allowUpdate),
-            allowDelete: JSON.parse(app.dataset.allowDelete),
+            pageSize: UTIL.tryParseJSON(app.dataset.pageSize),
+            currentPage: UTIL.tryParseJSON(app.dataset.page),
+            sort: UTIL.tryParseJSON(app.dataset.sort),
+            filter: UTIL.tryParseJSON(app.dataset.filter),
+            allowCreate: UTIL.tryParseJSON(app.dataset.allowCreate),
+            allowUpdate: UTIL.tryParseJSON(app.dataset.allowUpdate),
+            allowDelete: UTIL.tryParseJSON(app.dataset.allowDelete),
             updatedRowId: null,
             deletedRowId: null,
         });

zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/content/auth/permission.html

@@ -2,13 +2,13 @@
 
 <main id="crud-app" 
       class="container"
-      data-page-size='{{ page_size | tojson }}'
-      data-page='{{ page | tojson }}'
-      data-sort='{{ sort | tojson }}'
-      data-filter='{{ filter | tojson }}'
-      data-allow-create='{{ allow_create | tojson }}'
-      data-allow-update='{{ allow_update | tojson }}'
-      data-allow-delete='{{ allow_delete | tojson }}'>
+      data-page-size='{{ page_size | tojson | safe }}'
+      data-page='{{ page | tojson | safe }}'
+      data-sort='{{ sort | tojson | safe }}'
+      data-filter='{{ filter | tojson | safe }}'
+      data-allow-create='{{ allow_create | tojson | safe }}'
+      data-allow-update='{{ allow_update | tojson | safe }}'
+      data-allow-delete='{{ allow_delete | tojson | safe }}'>
     <article>
         <h1>Permission</h1>
 
@@ -326,13 +326,13 @@
     document.addEventListener("DOMContentLoaded", () => {
         const app = document.getElementById("crud-app");
         new CrudApp("/api/v1/permissions", {
-            pageSize: JSON.parse(app.dataset.pageSize),
-            currentPage: JSON.parse(app.dataset.page),
-            sort: JSON.parse(app.dataset.sort),
-            filter: JSON.parse(app.dataset.filter),
-            allowCreate: JSON.parse(app.dataset.allowCreate),
-            allowUpdate: JSON.parse(app.dataset.allowUpdate),
-            allowDelete: JSON.parse(app.dataset.allowDelete),
+            pageSize: UTIL.tryParseJSON(app.dataset.pageSize),
+            currentPage: UTIL.tryParseJSON(app.dataset.page),
+            sort: UTIL.tryParseJSON(app.dataset.sort),
+            filter: UTIL.tryParseJSON(app.dataset.filter),
+            allowCreate: UTIL.tryParseJSON(app.dataset.allowCreate),
+            allowUpdate: UTIL.tryParseJSON(app.dataset.allowUpdate),
+            allowDelete: UTIL.tryParseJSON(app.dataset.allowDelete),
             updatedRowId: null,
             deletedRowId: null,
         });

zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/content/auth/role.html

@@ -2,13 +2,13 @@
 
 <main id="crud-app" 
     class="container"
-    data-page-size='{{ page_size | tojson }}'
-    data-page='{{ page | tojson }}'
-    data-sort='{{ sort | tojson }}'
-    data-filter='{{ filter | tojson }}'
-    data-allow-create='{{ allow_create | tojson }}'
-    data-allow-update='{{ allow_update | tojson }}'
-    data-allow-delete='{{ allow_delete | tojson }}'>
+    data-page-size='{{ page_size | tojson | safe }}'
+    data-page='{{ page | tojson | safe }}'
+    data-sort='{{ sort | tojson | safe }}'
+    data-filter='{{ filter | tojson | safe }}'
+    data-allow-create='{{ allow_create | tojson | safe }}'
+    data-allow-update='{{ allow_update | tojson | safe }}'
+    data-allow-delete='{{ allow_delete | tojson | safe }}'>
     <article>
         <h1>Role</h1>
 
@@ -251,7 +251,7 @@
             try {
                 const createForm = document.getElementById("crud-create-form");
                 const formData = UTIL.getFormData(createForm);
-                formData.permission_names = JSON.parse(formData.permission_names);
+                formData.permission_names = UTIL.tryParseJSON(formData.permission_names);
                 await UTIL.fetchAPI(this.apiUrl, { method: "POST", body: JSON.stringify(formData) });
                 await this.fetchRows();
                 this.hideCreateForm();
@@ -283,7 +283,7 @@
             try {
                 const updateForm = document.getElementById("crud-update-form");
                 const formData = UTIL.getFormData(updateForm);
-                formData.permission_names = JSON.parse(formData.permission_names);
+                formData.permission_names = UTIL.tryParseJSON(formData.permission_names);
                 await UTIL.fetchAPI(`${this.apiUrl}/${this.state.updatedRowId}`, {
                     method: "PUT",
                     body: JSON.stringify(formData)
@@ -348,13 +348,13 @@
     document.addEventListener("DOMContentLoaded", () => {
         const app = document.getElementById("crud-app");
         new CrudApp("/api/v1/roles", {
-            pageSize: JSON.parse(app.dataset.pageSize),
-            currentPage: JSON.parse(app.dataset.page),
-            sort: JSON.parse(app.dataset.sort),
-            filter: JSON.parse(app.dataset.filter),
-            allowCreate: JSON.parse(app.dataset.allowCreate),
-            allowUpdate: JSON.parse(app.dataset.allowUpdate),
-            allowDelete: JSON.parse(app.dataset.allowDelete),
+            pageSize: UTIL.tryParseJSON(app.dataset.pageSize),
+            currentPage: UTIL.tryParseJSON(app.dataset.page),
+            sort: UTIL.tryParseJSON(app.dataset.sort),
+            filter: UTIL.tryParseJSON(app.dataset.filter),
+            allowCreate: UTIL.tryParseJSON(app.dataset.allowCreate),
+            allowUpdate: UTIL.tryParseJSON(app.dataset.allowUpdate),
+            allowDelete: UTIL.tryParseJSON(app.dataset.allowDelete),
             updatedRowId: null,
             deletedRowId: null,
         });

zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/content/auth/user.html

@@ -2,13 +2,13 @@
 
 <main id="crud-app" 
     class="container"
-    data-page-size='{{ page_size | tojson }}'
-    data-page='{{ page | tojson }}'
-    data-sort='{{ sort | tojson }}'
-    data-filter='{{ filter | tojson }}'
-    data-allow-create='{{ allow_create | tojson }}'
-    data-allow-update='{{ allow_update | tojson }}'
-    data-allow-delete='{{ allow_delete | tojson }}'>
+    data-page-size='{{ page_size | tojson | safe }}'
+    data-page='{{ page | tojson | safe }}'
+    data-sort='{{ sort | tojson | safe }}'
+    data-filter='{{ filter | tojson | safe }}'
+    data-allow-create='{{ allow_create | tojson | safe }}'
+    data-allow-update='{{ allow_update | tojson | safe }}'
+    data-allow-delete='{{ allow_delete | tojson | safe }}'>
     <article>
         <h1>User</h1>
 
@@ -263,7 +263,7 @@
             try {
                 const createForm = document.getElementById("crud-create-form");
                 const formData = UTIL.getFormData(createForm);
-                formData.role_names = JSON.parse(formData.role_names);
+                formData.role_names = UTIL.tryParseJSON(formData.role_names);
                 await UTIL.fetchAPI(this.apiUrl, { method: "POST", body: JSON.stringify(formData) });
                 await this.fetchRows();
                 this.hideCreateForm();
@@ -298,7 +298,7 @@
                 if (!formData.password) {
                     delete formData.password;
                 }
-                formData.role_names = JSON.parse(formData.role_names);
+                formData.role_names = UTIL.tryParseJSON(formData.role_names);
                 await UTIL.fetchAPI(`${this.apiUrl}/${this.state.updatedRowId}`, {
                     method: "PUT",
                     body: JSON.stringify(formData)
@@ -363,13 +363,13 @@
     document.addEventListener("DOMContentLoaded", () => {
         const app = document.getElementById("crud-app");
         new CrudApp("/api/v1/users", {
-            pageSize: JSON.parse(app.dataset.pageSize),
-            currentPage: JSON.parse(app.dataset.page),
-            sort: JSON.parse(app.dataset.sort),
-            filter: JSON.parse(app.dataset.filter),
-            allowCreate: JSON.parse(app.dataset.allowCreate),
-            allowUpdate: JSON.parse(app.dataset.allowUpdate),
-            allowDelete: JSON.parse(app.dataset.allowDelete),
+            pageSize: UTIL.tryParseJSON(app.dataset.pageSize),
+            currentPage: UTIL.tryParseJSON(app.dataset.page),
+            sort: UTIL.tryParseJSON(app.dataset.sort),
+            filter: UTIL.tryParseJSON(app.dataset.filter),
+            allowCreate: UTIL.tryParseJSON(app.dataset.allowCreate),
+            allowUpdate: UTIL.tryParseJSON(app.dataset.allowUpdate),
+            allowDelete: UTIL.tryParseJSON(app.dataset.allowDelete),
             updatedRowId: null,
             deletedRowId: null,
         });

zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/common/util.js

@@ -212,4 +212,12 @@ const UTIL = {
         return data;
     },
 
+    tryParseJSON(value) {
+        try {
+            return JSON.parse(value);
+        } catch {
+            return value;
+        }
+    },
+
 };

{zrb-1.3.0.dist-info → zrb-1.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zrb
-Version: 1.3.0
+Version: 1.3.1
 Summary: Your Automation Powerhouse
 Home-page: https://github.com/state-alchemists/zrb
 License: AGPL-3.0-or-later

{zrb-1.3.0.dist-info → zrb-1.3.1.dist-info}/RECORD

@@ -23,12 +23,12 @@ zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/.flake8,sha256=fgvH
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/.gitignore,sha256=D-ISOzaKlN_VzeZP5f8aznDSJX4p8PCtaK2JWM5yY1c,61
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/README.md,sha256=MAo7ZFbg7LLiAfQbXcippMgjJ2-VXMKtiTDEZ3I4AAg,221
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/column/add_column_task.py,sha256=j24bFnqMCZrYx67HMtOAJMBb2P1-ymvo8_oFjP0uTxg,3726
+zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/column/add_column_task.py,sha256=PxKS3azBnKMTZdStz1OTEr-7sCK_WMeCLiDd1gDoGHA,4819
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/column/add_column_util.py,sha256=GycuEtcvO02OwqULfP-qRxnAnJDDhWx_hdRSmbfx5bo,10952
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/config.py,sha256=uviB4q2iZjoU9_fA1O4VrjpuVAqx2gj5hjospJ0Xzeg,885
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/entity/add_entity_task.py,sha256=W0ziCIhSwUbu8vBABEcTvLrTAegJmRbqui6TzG1xqlo,11183
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/entity/add_entity_util.py,sha256=M7FSCdq-dzXqa22kFO6HwMIJ2XlHMSys-I0-K1_90xE,16683
-zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/entity/template/app_template/module/gateway/view/content/my-module/my-entity.html,sha256=AFriF9Vz5889nfIIZbqaNXREMiShPcEiHBvO3aWs-ao,13240
+zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/entity/template/app_template/module/gateway/view/content/my-module/my-entity.html,sha256=hcF-HZ_7vDyod-Rn_7ODqCjsNOwHvH1ICZC0AMzis5s,13338
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/entity/template/app_template/module/my_module/service/my_entity/my_entity_service.py,sha256=PgwTsHMHRiFS7JQeAe6wWmIHk6s-OfIybx_mJfuT_G4,3918
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/entity/template/app_template/module/my_module/service/my_entity/my_entity_service_factory.py,sha256=lnhhpc_AflWnCQbLkYORrshiqIA5wy4SdxDuUxmn7Ts,372
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/entity/template/app_template/module/my_module/service/my_entity/repository/my_entity_db_repository.py,sha256=GrMxMb98-XD7Rue1v14jBu6HRb8Gy5DywBSKnMhN0iY,770
@@ -125,14 +125,14 @@ zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/sche
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/subroute/auth.py,sha256=KXwia0eexjoxa7OK_VT7NuUL6snxxtOpMIgSjRRbBD0,17678
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/util/auth.py,sha256=zThjspTe-pu0r73vXwNb9Se4vCbX2HquTZKg2h9AMY0,2643
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/util/view.py,sha256=7C0KlvpUwlQ27p_zyFFxVZZNaQnZ9k2i3yit1cNZHoo,3192
-zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/content/auth/permission.html,sha256=l2j1GCDIrSTUn1PY8cLf3sLJdVe8D1gjGUShUG20zUA,13782
-zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/content/auth/role.html,sha256=uVL7ZmbsIuya_RbZLL2qSfc7jJM_FPn2Mg8gten_ZUc,14980
-zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/content/auth/user.html,sha256=CDeYHfcbThjraIzNIaOnnd7Wpk1Y5vz9eTLJCKiiyyk,15502
+zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/content/auth/permission.html,sha256=o0TtDcZ_pDcHFSX3kEU9nninbNQAUbN_O4VqXZ8875s,13880
+zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/content/auth/role.html,sha256=NYS1SIC8hNJyKt1SW3AzIqibr8igAg51-T4XuDkSaRo,15092
+zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/content/auth/user.html,sha256=s6ziDxsoavMIp4IB2bSWFViQZw62SyC4jRsx5uvUy6I,15614
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/content/error.html,sha256=FISZNhjhfIuoBWI0GR-c5XQxLniy0euWOjKgbtnVlt8,239
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/content/homepage.html,sha256=Q8jEwRraYJmn0rJIT1Ct4Dz2NB4S-NWJ1ZrU46oZkkw,126
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/content/login.html,sha256=OanTVSQG5T03AX4eformFN69qeSMh5jiWERNth1EAMw,2301
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/content/logout.html,sha256=HQnUPE_I9l-aF8LqpKuHCp6zsjYplTfbLfKbxn4hdXo,1571
-zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/common/util.js,sha256=-O3c441oaxIu9-6i2Foe6PSvdC5ycK_I3gKmTP4fNq8,8407
+zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/common/util.js,sha256=4wEtVKhNTrKsRGXEQvMkC5gd_GDS_ZuGGAmhJl8AHzQ,8547
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/crud/style.css,sha256=UzmYDiz4dlxKPPKXwTjybK1nrwkk-3DmFEmlpWnnqfo,206
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/crud/util.js,sha256=7TQftOjZGmx6POLCHzmh08m4q-sc01BRtmcZCQQ5JU8,4376
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/view/static/default/pico-style.css,sha256=7VEhpZWXz8pcKtTULorjQlWX1fMs7Bcbn1QBDJiJZfY,233
@@ -340,7 +340,7 @@ zrb/util/string/name.py,sha256=8picJfUBXNpdh64GNaHv3om23QHhUZux7DguFLrXHp8,1163
 zrb/util/todo.py,sha256=1nDdwPc22oFoK_1ZTXyf3638Bg6sqE2yp_U4_-frHoc,16015
 zrb/xcom/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/xcom/xcom.py,sha256=o79rxR9wphnShrcIushA0Qt71d_p3ZTxjNf7x9hJB78,1571
-zrb-1.3.0.dist-info/METADATA,sha256=3wbbvRet-OzX0DonamEcOLlFxXCVclJufAhAhH28m7U,6303
-zrb-1.3.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-zrb-1.3.0.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
-zrb-1.3.0.dist-info/RECORD,,
+zrb-1.3.1.dist-info/METADATA,sha256=xYoLV2fDDSGBjJdgYOjXNy1rfAifx7VsGxIAGHCpBns,6303
+zrb-1.3.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+zrb-1.3.1.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
+zrb-1.3.1.dist-info/RECORD,,