zrb 1.1.0__tar.gz → 1.2.1__tar.gz

{zrb-1.1.0 → zrb-1.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zrb
-Version: 1.1.0
+Version: 1.2.1
 Summary: Your Automation Powerhouse
 Home-page: https://github.com/state-alchemists/zrb
 License: AGPL-3.0-or-later
@@ -79,8 +79,7 @@ pip install --pre zrb
 Alternatively, you can also use our installation script to install Zrb along with some prerequisites:
 
 ```bash
-bash -c "$(curl -fsSL https://raw.githubusercontent.com/state-alchemists/zrb/refs/heads/1.0.0/install.sh)"
-# bash -c "$(curl -fsSL https://raw.githubusercontent.com/state-alchemists/zrb/main/install.sh)"
+bash -c "$(curl -fsSL https://raw.githubusercontent.com/state-alchemists/zrb/main/install.sh)"
 ```
 
 # 🐞 Bug Report + Feature Request

{zrb-1.1.0 → zrb-1.2.1}/README.md

@@ -44,8 +44,7 @@ pip install --pre zrb
 Alternatively, you can also use our installation script to install Zrb along with some prerequisites:
 
 ```bash
-bash -c "$(curl -fsSL https://raw.githubusercontent.com/state-alchemists/zrb/refs/heads/1.0.0/install.sh)"
-# bash -c "$(curl -fsSL https://raw.githubusercontent.com/state-alchemists/zrb/main/install.sh)"
+bash -c "$(curl -fsSL https://raw.githubusercontent.com/state-alchemists/zrb/main/install.sh)"
 ```
 
 # 🐞 Bug Report + Feature Request

{zrb-1.1.0 → zrb-1.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "zrb"
-version = "1.1.0"
+version = "1.2.1"
 description = "Your Automation Powerhouse"
 authors = ["Go Frendi Gunawan <gofrendiasgard@gmail.com>"]
 license = "AGPL-3.0-or-later"

{zrb-1.1.0 → zrb-1.2.1}/src/zrb/builtin/git.py

@@ -24,31 +24,31 @@ from zrb.util.git import (
             name="source",
             description="Source branch/tag/commit",
             prompt="Source branch/tag/commit",
-            default_str="main",
+            default="main",
         ),
         StrInput(
             name="current",
             description="Current branch/tag/commit",
             prompt="Current branch/tag/commit",
-            default_str="HEAD",
+            default="HEAD",
         ),
         BoolInput(
             name="created",
             description="Include created files",
             prompt="Include created files",
-            default_str="True",
+            default="True",
         ),
         BoolInput(
             name="removed",
             description="Include removed files",
             prompt="Include removed files",
-            default_str="True",
+            default="True",
         ),
         BoolInput(
             name="updated",
             description="Include updated files",
             prompt="Include updated files",
-            default_str="True",
+            default="True",
         ),
     ],
     description="🔍 Get modified files",
@@ -109,7 +109,7 @@ async def prune_local_branches(ctx: AnyContext):
         name="message",
         description="Commit message",
         prompt="Commit message",
-        default_str="Add feature/fix bug",
+        default="Add feature/fix bug",
     ),
     description="📝 Commit changes",
     group=git_group,
@@ -131,7 +131,7 @@ async def git_commit(ctx: AnyContext):
         name="remote",
         description="Remote name",
         prompt="Remote name",
-        default_str="origin",
+        default="origin",
     ),
     upstream=git_commit,
     group=git_group,
@@ -154,7 +154,7 @@ async def git_pull(ctx: AnyContext):
         name="remote",
         description="Remote name",
         prompt="Remote name",
-        default_str="origin",
+        default="origin",
     ),
     upstream=git_commit,
     group=git_group,

{zrb-1.1.0 → zrb-1.2.1}/src/zrb/builtin/llm/llm_chat.py

@@ -80,21 +80,21 @@ llm_chat: LLMTask = llm_group.add_task(
                 "model",
                 description="LLM Model",
                 prompt="LLM Model",
-                default_str=LLM_MODEL,
+                default=LLM_MODEL,
                 allow_positional_parsing=False,
             ),
             TextInput(
                 "system-prompt",
                 description="System prompt",
                 prompt="System prompt",
-                default_str=LLM_SYSTEM_PROMPT,
+                default=LLM_SYSTEM_PROMPT,
                 allow_positional_parsing=False,
             ),
             BoolInput(
                 "start-new",
                 description="Start new conversation (LLM will forget everything)",
                 prompt="Start new conversation (LLM will forget everything)",
-                default_str="false",
+                default=False,
                 allow_positional_parsing=False,
             ),
             TextInput("message", description="User message", prompt="Your message"),

{zrb-1.1.0 → zrb-1.2.1}/src/zrb/builtin/project/add/fastapp/fastapp_input.py

@@ -6,7 +6,7 @@ project_dir_input = StrInput(
     name="project-dir",
     description="Project directory",
     prompt="Project directory",
-    default_str=lambda _: os.getcwd(),
+    default=lambda _: os.getcwd(),
 )
 
 app_name_input = StrInput(

{zrb-1.1.0 → zrb-1.2.1}/src/zrb/builtin/project/add/fastapp/fastapp_task.py

@@ -62,7 +62,7 @@ scaffold_fastapp = Scaffolder(
         ),
         # Register fastapp's tasks to project's zrb_init (project_dir/zrb_init.py)
         ContentTransformer(
-            name="trasnform-zrb-init",
+            name="transform-zrb-init",
             match=is_project_zrb_init_file,
             transform=update_project_zrb_init_file,
         ),

{zrb-1.1.0 → zrb-1.2.1}/src/zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/column/add_column_task.py

@@ -1,12 +1,12 @@
 import os
 
 from my_app_name._zrb.column.add_column_util import (
-    update_fastapp_schema,
-    update_fastapp_test_create,
-    update_fastapp_test_delete,
-    update_fastapp_test_read,
-    update_fastapp_test_update,
-    update_fastapp_ui,
+    update_my_app_name_schema,
+    update_my_app_name_test_create,
+    update_my_app_name_test_delete,
+    update_my_app_name_test_read,
+    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.format_task import format_my_app_name_code
@@ -23,14 +23,14 @@ from zrb import AnyContext, Task, make_task
 
 
 @make_task(
-    name="validate-add-fastapp-column",
+    name="validate-add-my-app-name-column",
     input=[
         existing_module_input,
         existing_entity_input,
     ],
     retries=0,
 )
-async def validate_add_fastapp_column(ctx: AnyContext):
+async def validate_add_my_app_name_column(ctx: AnyContext):
     module_name = ctx.input.module
     if module_name not in get_existing_module_names():
         raise ValueError(f"Module not exist: {module_name}")
@@ -39,96 +39,96 @@ async def validate_add_fastapp_column(ctx: AnyContext):
         raise ValueError(f"Schema not exist: {schema_name}")
 
 
-update_fastapp_schema_task = Task(
-    name="update-fastapp-schema",
+update_my_app_name_schema_task = Task(
+    name="update-my-app-name-schema",
     input=[
         existing_module_input,
         existing_entity_input,
         new_column_input,
         new_column_type_input,
     ],
-    action=update_fastapp_schema,
+    action=update_my_app_name_schema,
     retries=0,
-    upstream=validate_add_fastapp_column,
+    upstream=validate_add_my_app_name_column,
 )
 
-update_fastapp_ui_task = Task(
-    name="update-fastapp-ui",
+update_my_app_name_ui_task = Task(
+    name="update-my-app-name-ui",
     input=[
         existing_module_input,
         existing_entity_input,
         new_column_input,
         new_column_type_input,
     ],
-    action=update_fastapp_ui,
+    action=update_my_app_name_ui,
     retries=0,
-    upstream=validate_add_fastapp_column,
+    upstream=validate_add_my_app_name_column,
 )
 
-update_fastapp_test_create_task = Task(
-    name="update-fastapp-test-create",
+update_my_app_name_test_create_task = Task(
+    name="update-my-app-name-test-create",
     input=[
         existing_module_input,
         existing_entity_input,
         new_column_input,
         new_column_type_input,
     ],
-    action=update_fastapp_test_create,
+    action=update_my_app_name_test_create,
     retries=0,
-    upstream=validate_add_fastapp_column,
+    upstream=validate_add_my_app_name_column,
 )
 
-update_fastapp_test_read_task = Task(
-    name="update-fastapp-test-read",
+update_my_app_name_test_read_task = Task(
+    name="update-my-app-name-test-read",
     input=[
         existing_module_input,
         existing_entity_input,
         new_column_input,
         new_column_type_input,
     ],
-    action=update_fastapp_test_read,
+    action=update_my_app_name_test_read,
     retries=0,
-    upstream=validate_add_fastapp_column,
+    upstream=validate_add_my_app_name_column,
 )
 
-update_fastapp_test_update_task = Task(
-    name="update-fastapp-test-update",
+update_my_app_name_test_update_task = Task(
+    name="update-my-app-name-test-update",
     input=[
         existing_module_input,
         existing_entity_input,
         new_column_input,
         new_column_type_input,
     ],
-    action=update_fastapp_test_update,
+    action=update_my_app_name_test_update,
     retries=0,
-    upstream=validate_add_fastapp_column,
+    upstream=validate_add_my_app_name_column,
 )
 
-update_fastapp_test_delete_task = Task(
-    name="update-fastapp-test-delete",
+update_my_app_name_test_delete_task = Task(
+    name="update-my-app-name-test-delete",
     input=[
         existing_module_input,
         existing_entity_input,
         new_column_input,
         new_column_type_input,
     ],
-    action=update_fastapp_test_delete,
+    action=update_my_app_name_test_delete,
     retries=0,
-    upstream=validate_add_fastapp_column,
+    upstream=validate_add_my_app_name_column,
 )
 
 
-add_fastapp_column = app_create_group.add_task(
+add_my_app_name_column = app_create_group.add_task(
     Task(
-        name="add-fastapp-column",
+        name="add-my-app-name-column",
         description="📊 Create new column on an entity",
         upstream=[
-            update_fastapp_schema_task,
-            update_fastapp_ui_task,
-            update_fastapp_test_create_task,
-            update_fastapp_test_read_task,
-            update_fastapp_test_update_task,
-            update_fastapp_test_delete_task,
+            update_my_app_name_schema_task,
+            update_my_app_name_ui_task,
+            update_my_app_name_test_create_task,
+            update_my_app_name_test_read_task,
+            update_my_app_name_test_update_task,
+            update_my_app_name_test_delete_task,
         ],
         successor=format_my_app_name_code,
         retries=0,

{zrb-1.1.0 → zrb-1.2.1}/src/zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/column/add_column_util.py

@@ -6,11 +6,7 @@ from bs4 import BeautifulSoup, formatter
 from my_app_name._zrb.config import APP_DIR
 
 from zrb.context.any_context import AnyContext
-from zrb.util.codemod.modify_class import append_code_to_class
-from zrb.util.codemod.modify_class_parent import prepend_parent_class
 from zrb.util.codemod.modify_class_property import append_property_to_class
-from zrb.util.codemod.modify_function import append_code_to_function
-from zrb.util.codemod.modify_module import prepend_code_to_module
 from zrb.util.file import read_file, write_file
 from zrb.util.string.conversion import (
     to_human_case,
@@ -20,7 +16,7 @@ from zrb.util.string.conversion import (
 )
 
 
-def update_fastapp_schema(ctx: AnyContext):
+def update_my_app_name_schema(ctx: AnyContext):
     snake_entity_name = to_snake_case(ctx.input.entity)
     pascal_entity_name = to_pascal_case(ctx.input.entity)
     snake_column_name = to_snake_case(ctx.input.column)
@@ -64,7 +60,7 @@ def _get_default_column_value(data_type: str) -> str:
     return "None"
 
 
-def update_fastapp_ui(ctx: AnyContext):
+def update_my_app_name_ui(ctx: AnyContext):
     kebab_module_name = to_kebab_case(ctx.input.module)
     kebab_entity_name = to_kebab_case(ctx.input.entity)
     snake_column_name = to_snake_case(ctx.input.column)
@@ -237,7 +233,7 @@ def _alter_js_function_returned_array(
     return new_html
 
 
-def update_fastapp_test_create(ctx: AnyContext):
+def update_my_app_name_test_create(ctx: AnyContext):
     snake_module_name = to_snake_case(ctx.input.module)
     snake_entity_name = to_snake_case(ctx.input.entity)
     test_file_path = os.path.join(
@@ -253,7 +249,7 @@ def update_fastapp_test_create(ctx: AnyContext):
     write_file(test_file_path, new_code)
 
 
-def update_fastapp_test_read(ctx: AnyContext):
+def update_my_app_name_test_read(ctx: AnyContext):
     snake_module_name = to_snake_case(ctx.input.module)
     snake_entity_name = to_snake_case(ctx.input.entity)
     test_file_path = os.path.join(
@@ -269,7 +265,7 @@ def update_fastapp_test_read(ctx: AnyContext):
     write_file(test_file_path, new_code)
 
 
-def update_fastapp_test_update(ctx: AnyContext):
+def update_my_app_name_test_update(ctx: AnyContext):
     snake_module_name = to_snake_case(ctx.input.module)
     snake_entity_name = to_snake_case(ctx.input.entity)
     test_file_path = os.path.join(
@@ -285,7 +281,7 @@ def update_fastapp_test_update(ctx: AnyContext):
     write_file(test_file_path, new_code)
 
 
-def update_fastapp_test_delete(ctx: AnyContext):
+def update_my_app_name_test_delete(ctx: AnyContext):
     snake_module_name = to_snake_case(ctx.input.module)
     snake_entity_name = to_snake_case(ctx.input.entity)
     test_file_path = os.path.join(

{zrb-1.1.0 → zrb-1.2.1}/src/zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/entity/add_entity_util.py

@@ -17,8 +17,8 @@ from zrb.util.string.conversion import (
 
 
 def is_gateway_navigation_config_file(ctx: AnyContext, file_path: str) -> bool:
-    return file_path == os.path.join(
-        APP_DIR, "module", "gateway", "config", "navigation.py"
+    return file_path == os.path.abspath(
+        os.path.join(APP_DIR, "module", "gateway", "config", "navigation.py")
     )
 
 
@@ -76,106 +76,126 @@ def get_existing_auth_migration_xcom_key(ctx: AnyContext) -> str:
 
 def is_in_app_schema_dir(ctx: AnyContext, file_path: str) -> bool:
     return file_path.startswith(
-        os.path.join(APP_DIR, "schema", to_snake_case(ctx.input.entity))
+        os.path.abspath(
+            os.path.join(APP_DIR, "schema", to_snake_case(ctx.input.entity))
+        )
     )
 
 
 def is_in_module_entity_test_dir(ctx: AnyContext, file_path: str) -> bool:
     return file_path.startswith(
-        os.path.join(
-            APP_DIR,
-            "test",
-            to_snake_case(ctx.input.module),
-            to_snake_case(ctx.input.entity),
+        os.path.abspath(
+            os.path.join(
+                APP_DIR,
+                "test",
+                to_snake_case(ctx.input.module),
+                to_snake_case(ctx.input.entity),
+            )
         )
     )
 
 
 def is_in_module_entity_dir(ctx: AnyContext, file_path: str) -> bool:
     return file_path.startswith(
-        os.path.join(
-            APP_DIR,
-            "module",
-            to_snake_case(ctx.input.module),
-            "service",
-            to_snake_case(ctx.input.entity),
+        os.path.abspath(
+            os.path.join(
+                APP_DIR,
+                "module",
+                to_snake_case(ctx.input.module),
+                "service",
+                to_snake_case(ctx.input.entity),
+            )
         )
     )
 
 
 def is_module_route_file(ctx: AnyContext, file_path: str) -> bool:
-    module_route_file = os.path.join(
-        APP_DIR,
-        "module",
-        to_snake_case(ctx.input.module),
-        "route.py",
+    module_route_file = os.path.abspath(
+        os.path.join(
+            APP_DIR,
+            "module",
+            to_snake_case(ctx.input.module),
+            "route.py",
+        )
     )
     return file_path == module_route_file
 
 
 def is_module_migration_metadata_file(ctx: AnyContext, file_path: str) -> bool:
-    module_migration_metadata_file = os.path.join(
-        APP_DIR,
-        "module",
-        to_snake_case(ctx.input.module),
-        "migration_metadata.py",
+    module_migration_metadata_file = os.path.abspath(
+        os.path.join(
+            APP_DIR,
+            "module",
+            to_snake_case(ctx.input.module),
+            "migration_metadata.py",
+        )
     )
     return file_path == module_migration_metadata_file
 
 
 def is_module_client_file(ctx: AnyContext, file_path: str) -> bool:
-    module_any_client_file = os.path.join(
-        APP_DIR,
-        "module",
-        to_snake_case(ctx.input.module),
-        "client",
-        f"{to_snake_case(ctx.input.module)}_client.py",
+    module_any_client_file = os.path.abspath(
+        os.path.join(
+            APP_DIR,
+            "module",
+            to_snake_case(ctx.input.module),
+            "client",
+            f"{to_snake_case(ctx.input.module)}_client.py",
+        )
     )
     return file_path == module_any_client_file
 
 
 def is_module_api_client_file(ctx: AnyContext, file_path: str) -> bool:
-    module_api_client_file = os.path.join(
-        APP_DIR,
-        "module",
-        to_snake_case(ctx.input.module),
-        "client",
-        f"{to_snake_case(ctx.input.module)}_api_client.py",
+    module_api_client_file = os.path.abspath(
+        os.path.join(
+            APP_DIR,
+            "module",
+            to_snake_case(ctx.input.module),
+            "client",
+            f"{to_snake_case(ctx.input.module)}_api_client.py",
+        )
     )
     return file_path == module_api_client_file
 
 
 def is_module_direct_client_file(ctx: AnyContext, file_path: str) -> bool:
-    module_direct_client_file = os.path.join(
-        APP_DIR,
-        "module",
-        to_snake_case(ctx.input.module),
-        "client",
-        f"{to_snake_case(ctx.input.module)}_direct_client.py",
+    module_direct_client_file = os.path.abspath(
+        os.path.join(
+            APP_DIR,
+            "module",
+            to_snake_case(ctx.input.module),
+            "client",
+            f"{to_snake_case(ctx.input.module)}_direct_client.py",
+        )
     )
     return file_path == module_direct_client_file
 
 
 def is_module_gateway_subroute_file(ctx: AnyContext, file_path: str) -> bool:
-    module_gateway_subroute_file = os.path.join(
-        APP_DIR,
-        "module",
-        "gateway",
-        "subroute",
-        f"{to_snake_case(ctx.input.module)}.py",
+    module_gateway_subroute_file = os.path.abspath(
+        os.path.join(
+            APP_DIR,
+            "module",
+            "gateway",
+            "subroute",
+            f"{to_snake_case(ctx.input.module)}.py",
+        )
     )
     return file_path == module_gateway_subroute_file
 
 
 def is_module_gateway_subroute_view_file(ctx: AnyContext, file_path: str) -> bool:
-    module_gateway_subroute_file = os.path.join(
-        APP_DIR,
-        "module",
-        "gateway",
-        "view",
-        "content",
-        f"{to_kebab_case(ctx.input.module)}",
-        f"{to_kebab_case(ctx.input.entity)}.html",
+    module_gateway_subroute_file = os.path.abspath(
+        os.path.join(
+            APP_DIR,
+            "module",
+            "gateway",
+            "view",
+            "content",
+            f"{to_kebab_case(ctx.input.module)}",
+            f"{to_kebab_case(ctx.input.entity)}.html",
+        )
     )
     return file_path == module_gateway_subroute_file
 

{zrb-1.1.0 → zrb-1.2.1}/src/zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/input.py

@@ -8,7 +8,7 @@ run_env_input = OptionInput(
     description="Running environment",
     prompt="Running Environment",
     options=["dev", "prod"],
-    default_str="prod",
+    default="prod",
 )
 
 new_module_input = StrInput(
@@ -37,14 +37,14 @@ plural_entity_input = StrInput(
     name="plural",
     description="Plural entity name",
     prompt="Plural entity name",
-    default_str=lambda ctx: pluralize(ctx.input.entity),
+    default=lambda ctx: pluralize(ctx.input.entity),
 )
 
 new_entity_column_input = StrInput(
     name="column",
     description="Entity's column name",
     prompt="New entity's column name",
-    default_str="name",
+    default="name",
 )
 
 new_column_input = StrInput(

{zrb-1.1.0 → zrb-1.2.1}/src/zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/module/add_module_util.py

@@ -16,41 +16,47 @@ from zrb.util.string.conversion import (
 
 
 def is_app_config_file(ctx: AnyContext, file_path: str) -> bool:
-    return file_path == os.path.join(APP_DIR, "config.py")
+    return file_path == os.path.abspath(os.path.join(APP_DIR, "config.py"))
 
 
 def is_app_main_file(ctx: AnyContext, file_path: str) -> bool:
-    return file_path == os.path.join(APP_DIR, "main.py")
+    return file_path == os.path.abspath(os.path.join(APP_DIR, "main.py"))
 
 
 def is_gateway_route_file(ctx: AnyContext, file_path: str) -> bool:
-    return file_path == os.path.join(APP_DIR, "module", "gateway", "route.py")
+    return file_path == os.path.abspath(
+        os.path.join(APP_DIR, "module", "gateway", "route.py")
+    )
 
 
 def is_gateway_navigation_config_file(ctx: AnyContext, file_path: str) -> bool:
-    return file_path == os.path.join(
-        APP_DIR, "module", "gateway", "config", "navigation.py"
+    return file_path == os.path.abspath(
+        os.path.join(APP_DIR, "module", "gateway", "config", "navigation.py")
     )
 
 
 def is_app_zrb_task_file(ctx: AnyContext, file_path: str) -> bool:
-    return file_path == os.path.join(APP_DIR, "_zrb", "task.py")
+    return file_path == os.path.abspath(os.path.join(APP_DIR, "_zrb", "task.py"))
 
 
 def is_app_zrb_config_file(ctx: AnyContext, file_path: str) -> bool:
-    return file_path == os.path.join(APP_DIR, "_zrb", "config.py")
+    return file_path == os.path.abspath(os.path.join(APP_DIR, "_zrb", "config.py"))
 
 
 def is_in_module_dir(ctx: AnyContext, file_path: str) -> bool:
     return file_path.startswith(
-        os.path.join(APP_DIR, "module", to_snake_case(ctx.input.module))
+        os.path.abspath(
+            os.path.join(APP_DIR, "module", to_snake_case(ctx.input.module))
+        )
     )
 
 
 def is_gateway_module_subroute_file(ctx: AnyContext, file_path: str) -> bool:
     module_subroute_file_name = f"{to_snake_case(ctx.input.module)}.py"
-    return file_path == os.path.join(
-        APP_DIR, "module", "gateway", "subroute", module_subroute_file_name
+    return file_path == os.path.abspath(
+        os.path.join(
+            APP_DIR, "module", "gateway", "subroute", module_subroute_file_name
+        )
     )
 
 

{zrb-1.1.0 → zrb-1.2.1}/src/zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/common/logger_factory.py

@@ -7,4 +7,4 @@ logging.basicConfig(
 )
 
 # Create a logger for your application
-logger: logging.Logger = logging.getLogger("fastapp")
+logger: logging.Logger = logging.getLogger("my-app-name")