zrb 1.0.0b6__py3-none-any.whl → 1.0.0b7__py3-none-any.whl

zrb/builtin/__init__.py

@@ -17,6 +17,7 @@ from zrb.builtin.setup.asdf.asdf import setup_asdf
 from zrb.builtin.setup.latex.ubuntu import setup_latex_on_ubuntu
 from zrb.builtin.setup.tmux.tmux import setup_tmux
 from zrb.builtin.setup.ubuntu import setup_ubuntu
+from zrb.builtin.setup.zsh.zsh import setup_zsh
 from zrb.builtin.shell.autocomplete.bash import make_bash_autocomplete
 from zrb.builtin.shell.autocomplete.subcmd import get_shell_subcommands
 from zrb.builtin.shell.autocomplete.zsh import make_zsh_autocomplete
@@ -62,3 +63,4 @@ assert setup_ubuntu
 assert setup_latex_on_ubuntu
 assert setup_asdf
 assert setup_tmux
+assert setup_zsh

zrb/builtin/project/add/fastapp/fastapp_task.py

@@ -20,11 +20,11 @@ from zrb.util.string.name import get_random_name
 
 
 @make_task(
-    name="validate-create-fastapp",
+    name="validate-add-fastapp",
     input=[project_dir_input, app_name_input],
     retries=0,
 )
-async def validate_create_fastapp(ctx: AnyContext):
+async def validate_add_fastapp(ctx: AnyContext):
     project_dir = ctx.input.project_dir
     if not os.path.isdir(project_dir):
         raise ValueError(f"Project directory not exists: {project_dir}")
@@ -39,7 +39,7 @@ scaffold_fastapp = Scaffolder(
         project_dir_input,
         app_name_input,
     ],
-    upstream=validate_create_fastapp,
+    upstream=validate_add_fastapp,
     source_path=os.path.join(os.path.dirname(__file__), "fastapp_template"),
     render_source_path=False,
     destination_path="{ctx.input.project_dir}",

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

@@ -1,14 +1,93 @@
+import os
+
+from my_app_name._zrb.config import 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 (
+    existing_entity_input,
+    new_column_input,
+    new_column_type_input,
+)
+from my_app_name._zrb.util import get_existing_schema_names
+
+from zrb import AnyContext, Task, make_task
+from zrb.util.codemod.prepend_property_to_class import prepend_property_to_class
+from zrb.util.file import read_file, write_file
+from zrb.util.string.conversion import to_pascal_case, to_snake_case
+
+
+@make_task(
+    name="validate-add-my-app-name-column",
+    input=existing_entity_input,
+    retries=0,
+)
+async def validate_add_my_app_name_column(ctx: AnyContext):
+    schema_name = ctx.input.entity
+    if schema_name not in get_existing_schema_names():
+        raise ValueError(f"Schema not exist: {schema_name}")
+
+
+@make_task(
+    name="update-my-app-name-schema",
+    input=[
+        existing_entity_input,
+        new_column_input,
+        new_column_type_input,
+    ],
+    retries=0,
+    upstream=validate_add_my_app_name_column,
+)
+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)
+    schema_file_path = os.path.join(APP_DIR, "schema", f"{snake_entity_name}.py")
+    existing_code = read_file(schema_file_path)
+    snake_column_name = to_snake_case(ctx.input.column)
+    column_type = ctx.input.type
+    # Base
+    new_code = prepend_property_to_class(
+        original_code=existing_code,
+        class_name=f"{pascal_entity_name}Base",
+        property_name=snake_column_name,
+        annotation=column_type,
+        default_value=_get_default_value(column_type),
+    )
+    # Update
+    new_code = prepend_property_to_class(
+        original_code=new_code,
+        class_name=f"{pascal_entity_name}Update",
+        property_name=snake_column_name,
+        annotation=f"{column_type} | None",
+        default_value="None",
+    )
+    # Table
+    new_code = prepend_property_to_class(
+        original_code=new_code,
+        class_name=f"{pascal_entity_name}",
+        property_name=snake_column_name,
+        annotation=f"{column_type} | None",
+        default_value="Field(index=False)",
+    )
+    write_file(schema_file_path, new_code)
 
-from zrb import Task
 
 add_my_app_name_column = app_create_group.add_task(
     Task(
         name="add-my-app-name-column",
         description="📊 Create new column on an entity",
+        upstream=update_my_app_name_schema,
         successor=format_my_app_name_code,
         retries=0,
     ),
     alias="column",
 )
+
+
+def _get_default_value(data_type: str) -> str:
+    if data_type == "str":
+        return '""'
+    if data_type in ("int", "float"):
+        return "0"
+    if data_type == "bool":
+        return "True"
+    return "None"

zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/entity/add_entity_task.py

@@ -48,7 +48,7 @@ from zrb.util.string.conversion import to_snake_case
 
 
 @make_task(
-    name="validate-create-my-app-name-entity",
+    name="validate-add-my-app-name-entity",
     input=[
         existing_module_input,
         new_entity_input,
@@ -57,7 +57,7 @@ from zrb.util.string.conversion import to_snake_case
     ],
     retries=0,
 )
-async def validate_create_my_app_name_entity(ctx: AnyContext):
+async def validate_add_my_app_name_entity(ctx: AnyContext):
     module_name = to_snake_case(ctx.input.module)
     if module_name not in get_existing_module_names():
         raise ValueError(f"Module not exist: {module_name}")
@@ -147,7 +147,7 @@ scaffold_my_app_name_entity = Scaffolder(
         ),
     ],
     retries=0,
-    upstream=validate_create_my_app_name_entity,
+    upstream=validate_add_my_app_name_entity,
 )
 
 create_my_app_name_entity_migration = CmdTask(

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

@@ -72,10 +72,8 @@ class MyEntityService(BaseService):
     async def update_my_entity_bulk(
         self, my_entity_ids: list[str], data: MyEntityUpdateWithAudit
     ) -> MyEntityResponse:
-        my_entities = await self.my_entity_repository.update_bulk(my_entity_ids, data)
-        return await self.my_entity_repository.get_by_ids(
-            [my_entity.id for my_entity in my_entities]
-        )
+        await self.my_entity_repository.update_bulk(my_entity_ids, data)
+        return await self.my_entity_repository.get_by_ids(my_entity_ids)
 
     @BaseService.route(
         "/api/v1/my-entities/{my_entity_id}",
@@ -85,21 +83,20 @@ class MyEntityService(BaseService):
     async def update_my_entity(
         self, my_entity_id: str, data: MyEntityUpdateWithAudit
     ) -> MyEntityResponse:
-        my_entity = await self.my_entity_repository.update(my_entity_id, data)
-        return await self.my_entity_repository.get_by_id(my_entity.id)
+        await self.my_entity_repository.update(my_entity_id, data)
+        return await self.my_entity_repository.get_by_id(my_entity_id)
 
     @BaseService.route(
-        "/api/v1/my-entities/{my_entity_id}",
+        "/api/v1/my-entities/bulk",
         methods=["delete"],
         response_model=MyEntityResponse,
     )
     async def delete_my_entity_bulk(
         self, my_entity_ids: list[str], deleted_by: str
     ) -> MyEntityResponse:
-        my_entities = await self.my_entity_repository.delete_bulk(my_entity_ids)
-        return await self.my_entity_repository.get_by_ids(
-            [my_entity.id for my_entity in my_entities]
-        )
+        my_entities = await self.my_entity_repository.get_by_ids(my_entity_ids)
+        await self.my_entity_repository.delete_bulk(my_entity_ids)
+        return my_entities
 
     @BaseService.route(
         "/api/v1/my-entities/{my_entity_id}",
@@ -109,5 +106,6 @@ class MyEntityService(BaseService):
     async def delete_my_entity(
         self, my_entity_id: str, deleted_by: str
     ) -> MyEntityResponse:
-        my_entity = await self.my_entity_repository.delete(my_entity_id)
-        return await self.my_entity_repository.get_by_id(my_entity.id)
+        my_entity = await self.my_entity_repository.get_by_id(my_entity.id)
+        await self.my_entity_repository.delete(my_entity_id)
+        return my_entity

zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/module/add_module_task.py

@@ -24,11 +24,11 @@ from zrb import AnyContext, ContentTransformer, Scaffolder, Task, make_task
 
 
 @make_task(
-    name="validate-create-my-app-name-module",
+    name="validate-add-my-app-name-module",
     input=new_module_input,
     retries=0,
 )
-async def validate_create_my_app_name_module(ctx: AnyContext):
+async def validate_add_my_app_name_module(ctx: AnyContext):
     if ctx.input.module in get_existing_module_names():
         raise ValueError(f"Module already exists: {ctx.input.module}")
 
@@ -93,7 +93,7 @@ scaffold_my_app_name_module = Scaffolder(
         ),
     ],
     retries=0,
-    upstream=validate_create_my_app_name_module,
+    upstream=validate_add_my_app_name_module,
 )
 
 add_my_app_name_module = app_create_group.add_task(

zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/auth/service/permission/permission_service.py

@@ -76,10 +76,8 @@ class PermissionService(BaseService):
     async def update_permission_bulk(
         self, permission_ids: list[str], data: PermissionUpdateWithAudit
     ) -> PermissionResponse:
-        permissions = await self.permission_repository.update_bulk(permission_ids, data)
-        return await self.permission_repository.get_by_ids(
-            [permission.id for permission in permissions]
-        )
+        await self.permission_repository.update_bulk(permission_ids, data)
+        return await self.permission_repository.get_by_ids(permission_ids)
 
     @BaseService.route(
         "/api/v1/permissions/{permission_id}",
@@ -89,21 +87,20 @@ class PermissionService(BaseService):
     async def update_permission(
         self, permission_id: str, data: PermissionUpdateWithAudit
     ) -> PermissionResponse:
-        permission = await self.permission_repository.update(permission_id, data)
-        return await self.permission_repository.get_by_id(permission.id)
+        await self.permission_repository.update(permission_id, data)
+        return await self.permission_repository.get_by_id(permission_id)
 
     @BaseService.route(
-        "/api/v1/permissions/{permission_id}",
+        "/api/v1/permissions/bulk",
         methods=["delete"],
         response_model=PermissionResponse,
     )
     async def delete_permission_bulk(
         self, permission_ids: list[str], deleted_by: str
     ) -> PermissionResponse:
-        permissions = await self.permission_repository.delete_bulk(permission_ids)
-        return await self.permission_repository.get_by_ids(
-            [permission.id for permission in permissions]
-        )
+        permissions = await self.permission_repository.get_by_ids(permission_ids)
+        await self.permission_repository.delete_bulk(permission_ids)
+        return permissions
 
     @BaseService.route(
         "/api/v1/permissions/{permission_id}",
@@ -113,5 +110,6 @@ class PermissionService(BaseService):
     async def delete_permission(
         self, permission_id: str, deleted_by: str
     ) -> PermissionResponse:
-        permission = await self.permission_repository.delete(permission_id)
-        return await self.permission_repository.get_by_id(permission.id)
+        permission = await self.permission_repository.get_by_id(permission_id)
+        await self.permission_repository.delete(permission_id)
+        return permission

zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/auth/service/role/role_service.py

@@ -87,17 +87,15 @@ class RoleService(BaseService):
     ) -> RoleResponse:
         permission_ids = [row.get_permission_ids() for row in data]
         data = [row.get_role_update_with_audit() for row in data]
-        roles = await self.role_repository.update_bulk(role_ids, data)
-        if len(roles) > 0:
-            updated_by = roles[0].updated_by
-            await self.role_repository.remove_all_permissions(
-                [role.id for role in roles]
-            )
+        await self.role_repository.update_bulk(role_ids, data)
+        if len(role_ids) > 0:
+            updated_by = data[0].updated_by
+            await self.role_repository.remove_all_permissions(role_ids)
             await self.role_repository.add_permissions(
-                data={role.id: permission_ids[i] for i, role in enumerate(roles)},
+                data={role_id: permission_ids[i] for i, role_id in enumerate(role_ids)},
                 created_by=updated_by,
             )
-        return await self.role_repository.get_by_ids([role.id for role in roles])
+        return await self.role_repository.get_by_ids(role_ids)
 
     @BaseService.route(
         "/api/v1/roles/{role_id}",
@@ -108,24 +106,26 @@ class RoleService(BaseService):
         self, role_id: str, data: RoleUpdateWithPermissionsAndAudit
     ) -> RoleResponse:
         permission_ids = data.get_permission_ids()
-        data = data.get_role_update_with_audit()
-        role = await self.role_repository.update(role_id, data)
-        await self.role_repository.remove_all_permissions([role.id])
+        role_data = data.get_role_update_with_audit()
+        await self.role_repository.update(role_id, role_data)
+        await self.role_repository.remove_all_permissions([role_id])
         await self.role_repository.add_permissions(
-            data={role.id: permission_ids}, created_by=role.updated_by
+            data={role_id: permission_ids}, created_by=role_data.updated_by
         )
-        return await self.role_repository.get_by_id(role.id)
+        return await self.role_repository.get_by_id(role_id)
 
     @BaseService.route(
-        "/api/v1/roles/{role_id}",
+        "/api/v1/roles/bulk",
         methods=["delete"],
         response_model=RoleResponse,
     )
     async def delete_role_bulk(
         self, role_ids: list[str], deleted_by: str
     ) -> RoleResponse:
-        roles = await self.role_repository.delete_bulk(role_ids)
-        return await self.role_repository.get_by_ids([role.id for role in roles])
+        roles = await self.role_repository.get_by_ids(role_ids)
+        await self.role_repository.delete_bulk(role_ids)
+        await self.role_repository.remove_all_permissions(role_ids)
+        return roles
 
     @BaseService.route(
         "/api/v1/roles/{role_id}",
@@ -133,5 +133,7 @@ class RoleService(BaseService):
         response_model=RoleResponse,
     )
     async def delete_role(self, role_id: str, deleted_by: str) -> RoleResponse:
-        role = await self.role_repository.delete(role_id)
-        return await self.role_repository.get_by_id(role.id)
+        role = await self.role_repository.get_by_id(role_id)
+        await self.role_repository.delete(role_id)
+        await self.role_repository.remove_all_permissions([role_id])
+        return role

zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/auth/service/user/user_service.py

@@ -84,16 +84,16 @@ class UserService(BaseService):
         self, user_ids: list[str], data: UserUpdateWithRolesAndAudit
     ) -> UserResponse:
         role_ids = [row.get_role_ids() for row in data]
-        data = [row.get_user_create_with_audit() for row in data]
-        users = await self.user_repository.update_bulk(user_ids, data)
-        if len(users) > 0:
-            updated_by = users[0].updated_by
-            await self.user_repository.remove_all_roles([user.id for user in users])
+        user_data = [row.get_user_create_with_audit() for row in data]
+        await self.user_repository.update_bulk(user_ids, user_data)
+        if len(user_ids) > 0:
+            updated_by = user_data[0].updated_by
+            await self.user_repository.remove_all_roles(user_ids)
             await self.user_repository.add_roles(
-                data={user.id: role_ids[i] for i, user in enumerate(data)},
+                data={user_id: role_ids[i] for i, user_id in enumerate(user_ids)},
                 updated_by=updated_by,
             )
-        return await self.user_repository.get_by_ids([user.id for user in users])
+        return await self.user_repository.get_by_ids(user_ids)
 
     @BaseService.route(
         "/api/v1/users/{user_id}",
@@ -103,19 +103,27 @@ class UserService(BaseService):
     async def update_user(
         self, user_id: str, data: UserUpdateWithRolesAndAudit
     ) -> UserResponse:
-        user = await self.user_repository.update(user_id, data)
-        return await self.user_repository.get_by_id(user.id)
+        role_ids = data.get_role_ids()
+        user_data = data.get_user_update_with_audit()
+        await self.user_repository.update(user_id, user_data)
+        await self.user_repository.remove_all_roles([user_id])
+        await self.user_repository.add_roles(
+            data={user_id: role_ids}, created_by=user_data.updated_by
+        )
+        return await self.user_repository.get_by_id(user_id)
 
     @BaseService.route(
-        "/api/v1/users/{user_id}",
+        "/api/v1/users/bulk",
         methods=["delete"],
         response_model=UserResponse,
     )
     async def delete_user_bulk(
         self, user_ids: list[str], deleted_by: str
     ) -> UserResponse:
-        users = await self.user_repository.delete_bulk(user_ids)
-        return await self.user_repository.get_by_ids([user.id for user in users])
+        roles = await self.user_repository.get_by_ids(user_ids)
+        await self.user_repository.delete_bulk(user_ids)
+        await self.user_repository.remove_all_roles(user_ids)
+        return roles
 
     @BaseService.route(
         "/api/v1/users/{user_id}",
@@ -123,5 +131,7 @@ class UserService(BaseService):
         response_model=UserResponse,
     )
     async def delete_user(self, user_id: str, deleted_by: str) -> UserResponse:
-        user = await self.user_repository.delete(user_id)
-        return await self.user_repository.get_by_id(user.id)
+        user = await self.user_repository.get_by_id(user_id)
+        await self.user_repository.delete(user_id)
+        await self.user_repository.remove_all_roles([user_id])
+        return user

zrb/builtin/setup/tmux/tmux.py

@@ -24,7 +24,7 @@ install_tmux = CmdTask(
         prompt="Tmux config file",
         default_str="~/.tmux.conf",
     ),
-    description="🖥️ Setup `tmux`.",
+    description="📺 Setup `tmux`.",
     group=setup_group,
     alias="tmux",
 )

zrb/builtin/setup/zsh/zsh.py

@@ -0,0 +1,55 @@
+import os
+
+from zrb.builtin.group import setup_group
+from zrb.builtin.setup.common_input import package_manager_input, use_sudo_input
+from zrb.builtin.setup.zsh.zsh_helper import get_install_zsh_cmd
+from zrb.context.any_context import AnyContext
+from zrb.input.str_input import StrInput
+from zrb.task.cmd_task import CmdTask
+from zrb.task.make_task import make_task
+from zrb.util.file import read_file, write_file
+
+install_zsh = CmdTask(
+    name="install-zsh",
+    input=[package_manager_input, use_sudo_input],
+    cmd=get_install_zsh_cmd,
+)
+
+install_omz = CmdTask(
+    name="install-omz",
+    cmd='sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"',  # noqa
+    upstream=install_zsh,
+)
+
+install_zinit = CmdTask(
+    name="install-zinit",
+    cmd='bash -c "$(curl --fail --show-error --silent --location https://raw.githubusercontent.com/zdharma-continuum/zinit/HEAD/scripts/install.sh)"',  # noqa
+    upstream=install_zsh,
+)
+
+
+@make_task(
+    name="setup-zsh",
+    input=StrInput(
+        name="zsh-config",
+        description="zsh config file",
+        prompt="zsh config file",
+        default_str="~/.zshrc",
+    ),
+    upstream=[install_omz, install_zinit],
+    description="💻 Setup `zsh`.",
+    group=setup_group,
+    alias="zsh",
+)
+def setup_zsh(ctx: AnyContext):
+    zsh_config = read_file(os.path.join(os.path.dirname(__file__), "zsh_config.sh"))
+    zsh_config_file = os.path.expanduser(ctx.input["zsh-config"])
+    # Make sure config file exists
+    if not os.path.isfile(zsh_config_file):
+        write_file(zsh_config_file, "")
+    content = read_file(zsh_config_file)
+    if zsh_config in content:
+        return
+    # Write config
+    write_file(zsh_config_file, [content, zsh_config, ""])
+    ctx.print("Setup complete, restart your terminal to continue")

zrb/builtin/setup/zsh/zsh_config.sh

@@ -0,0 +1,133 @@
+# If you come from bash you might have to change your $PATH.
+# export PATH=$HOME/bin:/usr/local/bin:$PATH
+
+# Path to your oh-my-zsh installation.
+export ZSH="$HOME/.oh-my-zsh"
+
+# Set name of the theme to load --- if set to "random", it will
+# load a random theme each time oh-my-zsh is loaded, in which case,
+# to know which specific one was loaded, run: echo $RANDOM_THEME
+# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes
+ZSH_THEME="candy"
+
+# Set list of themes to pick from when loading at random
+# Setting this variable when ZSH_THEME=random will cause zsh to load
+# a theme from this variable instead of looking in $ZSH/themes/
+# If set to an empty array, this variable will have no effect.
+# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" )
+
+# Uncomment the following line to use case-sensitive completion.
+# CASE_SENSITIVE="true"
+
+# Uncomment the following line to use hyphen-insensitive completion.
+# Case-sensitive completion must be off. _ and - will be interchangeable.
+# HYPHEN_INSENSITIVE="true"
+
+# Uncomment one of the following lines to change the auto-update behavior
+# zstyle ':omz:update' mode disabled  # disable automatic updates
+# zstyle ':omz:update' mode auto      # update automatically without asking
+# zstyle ':omz:update' mode reminder  # just remind me to update when it's time
+
+# Uncomment the following line to change how often to auto-update (in days).
+# zstyle ':omz:update' frequency 13
+
+# Uncomment the following line if pasting URLs and other text is messed up.
+# DISABLE_MAGIC_FUNCTIONS="true"
+
+# Uncomment the following line to disable colors in ls.
+# DISABLE_LS_COLORS="true"
+
+# Uncomment the following line to disable auto-setting terminal title.
+# DISABLE_AUTO_TITLE="true"
+
+# Uncomment the following line to enable command auto-correction.
+# ENABLE_CORRECTION="true"
+
+# Uncomment the following line to display red dots whilst waiting for completion.
+# You can also set it to another string to have that shown instead of the default red dots.
+# e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f"
+# Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765)
+# COMPLETION_WAITING_DOTS="true"
+
+# Uncomment the following line if you want to disable marking untracked files
+# under VCS as dirty. This makes repository status check for large repositories
+# much, much faster.
+# DISABLE_UNTRACKED_FILES_DIRTY="true"
+
+# Uncomment the following line if you want to change the command execution time
+# stamp shown in the history command output.
+# You can set one of the optional three formats:
+# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
+# or set a custom format using the strftime function format specifications,
+# see 'man strftime' for details.
+# HIST_STAMPS="mm/dd/yyyy"
+
+# Would you like to use another custom folder than $ZSH/custom?
+# ZSH_CUSTOM=/path/to/new-custom-folder
+
+# Which plugins would you like to load?
+# Standard plugins can be found in $ZSH/plugins/
+# Custom plugins may be added to $ZSH_CUSTOM/plugins/
+# Example format: plugins=(rails git textmate ruby lighthouse)
+# Add wisely, as too many plugins slow down shell startup.
+plugins=(
+  git
+  kubectl
+)
+
+source $ZSH/oh-my-zsh.sh
+
+# User configuration
+
+# export MANPATH="/usr/local/man:$MANPATH"
+
+# You may need to manually set your language environment
+# export LANG=en_US.UTF-8
+
+# Preferred editor for local and remote sessions
+# if [[ -n $SSH_CONNECTION ]]; then
+#   export EDITOR='vim'
+# else
+#   export EDITOR='mvim'
+# fi
+
+# Compilation flags
+# export ARCHFLAGS="-arch x86_64"
+
+# Set personal aliases, overriding those provided by oh-my-zsh libs,
+# plugins, and themes. Aliases can be placed here, though oh-my-zsh
+# users are encouraged to define aliases within the ZSH_CUSTOM folder.
+# For a full list of active aliases, run `alias`.
+#
+# Example aliases
+# alias zshconfig="mate ~/.zshrc"
+# alias ohmyzsh="mate ~/.oh-my-zsh"
+
+source "$HOME/.local/share/zinit/zinit.git/zinit.zsh"
+autoload -Uz _zinit
+(( ${+_comps} )) && _comps[zinit]=_zinit
+
+# Load a few important annexes, without Turbo
+# (this is currently required for annexes)
+zinit light-mode for \
+    zdharma-continuum/zinit-annex-as-monitor \
+    zdharma-continuum/zinit-annex-bin-gem-node \
+    zdharma-continuum/zinit-annex-patch-dl \
+    zdharma-continuum/zinit-annex-rust
+### End of Zinit's installer chunk
+
+# Plugin history-search-multi-word loaded with investigating.
+zinit load zdharma-continuum/history-search-multi-word
+
+# Two regular plugins loaded without investigating.
+zinit light zsh-users/zsh-autosuggestions
+zinit light zdharma-continuum/fast-syntax-highlighting
+
+zinit light jonmosco/kube-ps1
+KUBE_PS1_SYMBOL_ENABLE=false
+KUBE_PS1_PREFIX=''
+KUBE_PS1_SUFFIX=' '
+KUBE_PS1_CTX_COLOR=cyan
+PROMPT='$(kube_ps1)'$PROMPT
+
+export COLORTERM=truecolor

zrb/builtin/setup/zsh/zsh_helper.py

@@ -0,0 +1,13 @@
+from zrb.context.any_context import AnyContext
+
+
+def get_install_zsh_cmd(ctx: AnyContext) -> str:
+    package_manager: str = ctx.input["package-manager"]
+    if package_manager == "pacman":
+        cmd = f"{package_manager} -S zsh"
+    else:
+        cmd = f"{package_manager} install zsh"
+    use_sudo: bool = ctx.input["use-sudo"]
+    if use_sudo:
+        return f"sudo {cmd}"
+    return cmd

zrb/config.py

@@ -47,7 +47,6 @@ INIT_SCRIPTS = (
 )
 LOGGING_LEVEL = _get_log_level(os.getenv("ZRB_LOGGING_LEVEL", "WARNING"))
 LOAD_BUILTIN = to_boolean(os.getenv("ZRB_LOAD_BUILTIN", "1"))
-SHOW_TIME = to_boolean(os.getenv("ZRB_SHOW_TIME", "1"))
 WARN_UNRECOMMENDED_COMMAND = to_boolean(
     os.getenv("ZRB_WARN_UNRECOMMENDED_COMMAND", "1")
 )

zrb/context/any_context.py

@@ -43,6 +43,7 @@ class AnyContext(AnySharedContext):
         end: str | None = "\n",
         file: TextIO | None = sys.stderr,
         flush: bool = True,
+        plain: bool = False,
     ):
         """Prints values to the specified output stream.
 
@@ -52,6 +53,7 @@ class AnyContext(AnySharedContext):
             end (str, optional): String appended after the last value. Defaults to a newline.
             file (TextIO, optional): The output stream to print to. Defaults to sys.stderr.
             flush (bool, optional): Whether to flush the output stream. Defaults to True.
+            plain (bool, optional): Whether to use plain text. Defaults to False.
         """
         pass
 

zrb/context/context.py

@@ -3,7 +3,6 @@ import logging
 import sys
 from typing import Any, TextIO
 
-from zrb.config import SHOW_TIME
 from zrb.context.any_context import AnyContext
 from zrb.context.any_shared_context import AnySharedContext
 from zrb.dot_dict.dot_dict import DotDict
@@ -101,7 +100,13 @@ class Context(AnyContext):
         end: str | None = "\n",
         file: TextIO | None = sys.stderr,
         flush: bool = True,
+        plain: bool = False,
     ):
+        message = sep.join([f"{value}" for value in values])
+        if plain:
+            self.append_to_shared_log(remove_style(message))
+            print(message, sep=sep, end=end, file=file, flush=flush)
+            return
         color = self._color
         icon = self._icon
         max_name_length = max(len(name) + len(icon) for name in self.session.task_names)
@@ -112,11 +117,8 @@ class Context(AnyContext):
         else:
             attempt_status = f"{self._attempt}/{self._max_attempt}".ljust(5)
         now = datetime.datetime.now()
-        formatted_time = (
-            now.strftime("%y%m%d %H:%M:%S.%f")[:19] + " " if SHOW_TIME else ""
-        )
+        formatted_time = now.strftime("%y%m%d %H:%M:%S.%f")[:19] + " "
         prefix = f"{formatted_time}{attempt_status} {padded_styled_task_name} ⬤ "
-        message = sep.join([f"{value}" for value in values])
         self.append_to_shared_log(remove_style(f"{prefix} {message}"))
         stylized_prefix = stylize(prefix, color=color)
         print(f"{stylized_prefix} {message}", sep=sep, end=end, file=file, flush=flush)

zrb/runner/web_route/static/resources/session/current-session.js

@@ -65,14 +65,18 @@ const CURRENT_SESSION = {
     showCurrentSession(allTaskStatus, finished) {
         const taskNames = Object.keys(allTaskStatus);
         const now = Date.now();
+        const barHeight = 30;
+        const gap = 40;
 
         // Set up canvas context
         const canvas = document.getElementById("history-canvas");
-        canvas.height = taskNames.length * 50 + 10;
+        canvas.height = taskNames.length * (barHeight + gap) + 10;
         const ctx = canvas.getContext("2d");
         ctx.clearRect(0, 0, canvas.width, canvas.height);
         ctx.fillStyle = "#EEE";
         ctx.fillRect(0, 0, canvas.width, canvas.height);
+        ctx.textBaseline = "top";
+        ctx.imageSmoothingEnabled = true;
 
         // Calculate start and end times
         let minDateTime = null;
@@ -102,8 +106,6 @@ const CURRENT_SESSION = {
         }
         // Canvas settings
         const chartWidth = canvas.width;
-        const barHeight = 20;
-        const gap = 10;
         const timeScale = (chartWidth - 200) / (maxDateTime - minDateTime);
 
         // Draw labels and bars
@@ -118,13 +120,13 @@ const CURRENT_SESSION = {
             const endDateTime = this.getTaskEndDateTime(allTaskStatus[taskName], now);
             const startX = 100 + (startDateTime - minDateTime) * timeScale;
             const barWidth = (endDateTime - startDateTime) * timeScale;
-            const startY = index * (barHeight + gap + 20) + 5;
+            const startY = index * (barHeight + gap) + 5;
 
             // Draw task label
             ctx.fillStyle = "#000";
-            ctx.font = "12px Arial";
+            ctx.font = "10px Arial";
             ctx.textAlign = "right";
-            ctx.fillText(taskName, 90, startY + barHeight / 1.5);
+            ctx.fillText(taskName, 90, startY + barHeight - 0.5 * barHeight);
 
             // Draw task bar
             ctx.fillStyle = UTIL.getFinalColor(finalStatus);
@@ -145,14 +147,19 @@ const CURRENT_SESSION = {
                 }
             }
             // Draw start and end time below the bar
-            for (let statusStartX in labels) {
+            let sortedStartX = Object.keys(labels).sort((a, b) => a - b);
+            let offsetY = 0;
+            for (let statusStartX of sortedStartX) {
                 const {dateTime, caption} = labels[statusStartX];
-                const [dateStr, timeStr] = dateTime.toISOString().split("T");
+                const timeStr = dateTime.toISOString().split("T")[1].split(".")[0];
                 ctx.font = "10px Arial";
-                ctx.fillText(caption, statusStartX, startY + 10);
-                ctx.font = "8px Arial";
-                ctx.fillText(dateStr, statusStartX, startY + barHeight + 10);
-                ctx.fillText(timeStr, statusStartX, startY + barHeight + 20);
+                ctx.fillText(caption, statusStartX, startY + offsetY);
+                ctx.font = "10px Arial";
+                ctx.fillText(timeStr, statusStartX, startY + barHeight + offsetY);
+                offsetY += 10
+                if (offsetY >= barHeight) {
+                    offsetY = 0;
+                }
             }
         });
     },

zrb/task/cmd_task.py

@@ -1,4 +1,5 @@
 import os
+from functools import partial
 
 from zrb.attr.type import BoolAttr, IntAttr, StrAttr
 from zrb.cmd.cmd_result import CmdResult
@@ -12,6 +13,7 @@ from zrb.task.base_task import BaseTask
 from zrb.util.attr import get_int_attr, get_str_attr
 from zrb.util.cmd.command import check_unrecommended_commands, run_command
 from zrb.util.cmd.remote import get_remote_cmd_script
+from zrb.xcom.xcom import Xcom
 
 
 class CmdTask(BaseTask):
@@ -42,6 +44,7 @@ class CmdTask(BaseTask):
         render_cmd: bool = True,
         cwd: str | None = None,
         render_cwd: bool = True,
+        plain_print: bool = False,
         warn_unrecommended_command: bool | None = None,
         max_output_line: int = 1000,
         max_error_line: int = 1000,
@@ -99,6 +102,7 @@ class CmdTask(BaseTask):
         self._render_cwd = render_cwd
         self._max_output_line = max_output_line
         self._max_error_line = max_error_line
+        self._should_plain_print = plain_print
         self._should_warn_unrecommended_command = warn_unrecommended_command
 
     async def _exec_action(self, ctx: AnyContext) -> CmdResult:
@@ -122,11 +126,17 @@ class CmdTask(BaseTask):
         if self._get_should_warn_unrecommended_commands():
             self._check_unrecommended_commands(ctx, shell, cmd_script)
         ctx.log_info("Running script")
+        log_method = (
+            partial(ctx.print, plain=True) if self._should_plain_print else ctx.print
+        )
+        xcom_pid_key = f"{self.name}-pid"
+        ctx.xcom[xcom_pid_key] = Xcom([])
         cmd_result, return_code = await run_command(
             cmd=[shell, shell_flag, cmd_script],
             cwd=cwd,
             env_map=env_map,
-            log_method=ctx.print,
+            print_method=log_method,
+            register_pid_method=lambda pid: ctx.xcom.get(xcom_pid_key).push(pid),
             max_output_line=self._max_output_line,
             max_error_line=self._max_error_line,
         )

zrb/task/rsync_task.py

@@ -22,7 +22,7 @@ class RsyncTask(CmdTask):
         shell: StrAttr | None = None,
         auto_render_shell: bool = True,
         remote_host: StrAttr | None = None,
-        auto_render_remote_host: bool = True,
+        render_remote_host: bool = True,
         remote_port: IntAttr | None = None,
         render_remote_port: bool = True,
         remote_user: StrAttr | None = None,
@@ -40,7 +40,8 @@ class RsyncTask(CmdTask):
         local_destination_path: StrAttr | None = None,
         render_local_destination_path: bool = True,
         cwd: str | None = None,
-        auto_render_cwd: bool = True,
+        render_cwd: bool = True,
+        plain_print: bool = False,
         max_output_line: int = 1000,
         max_error_line: int = 1000,
         execute_condition: bool | str | Callable[[AnyContext], bool] = True,
@@ -62,7 +63,7 @@ class RsyncTask(CmdTask):
             shell=shell,
             render_shell=auto_render_shell,
             remote_host=remote_host,
-            render_remote_host=auto_render_remote_host,
+            render_remote_host=render_remote_host,
             remote_port=remote_port,
             auto_render_remote_port=render_remote_port,
             remote_user=remote_user,
@@ -72,7 +73,8 @@ class RsyncTask(CmdTask):
             remote_ssh_key=remote_ssh_key,
             render_remote_ssh_key=render_remote_ssh_key,
             cwd=cwd,
-            render_cwd=auto_render_cwd,
+            render_cwd=render_cwd,
+            plain_print=plain_print,
             max_output_line=max_output_line,
             max_error_line=max_error_line,
             execute_condition=execute_condition,

zrb/util/cmd/command.py

@@ -1,11 +1,27 @@
 import asyncio
 import os
 import re
+import signal
 import sys
 from collections.abc import Callable
 
 from zrb.cmd.cmd_result import CmdResult
 
+_RUNNING_PROCESSES = []
+
+
+def _cleanup_processes():
+    """Terminate all running subprocesses on exit."""
+    for process in _RUNNING_PROCESSES:
+        if process.returncode is None:
+            process.terminate()
+            process.kill()
+
+
+# Register a single cleanup function once
+signal.signal(signal.SIGINT, lambda sig, frame: _cleanup_processes())
+signal.signal(signal.SIGTERM, lambda sig, frame: _cleanup_processes())
+
 
 def check_unrecommended_commands(cmd_script: str) -> dict[str, str]:
     banned_commands = {
@@ -43,7 +59,8 @@ async def run_command(
     cmd: list[str],
     cwd: str | None = None,
     env_map: dict[str, str] | None = None,
-    log_method: Callable[..., None] = print,
+    print_method: Callable[..., None] | None = None,
+    register_pid_method: Callable[[int], None] | None = None,
     max_output_line: int = 1000,
     max_error_line: int = 1000,
 ) -> tuple[CmdResult, int]:
@@ -62,6 +79,7 @@ async def run_command(
             log_method(line)
         return "\n".join(lines)
 
+    actual_print_method = print_method if print_method is not None else print
     cmd_process = None
     try:
         if cwd is None:
@@ -77,11 +95,13 @@ async def run_command(
             env=env_map,
             bufsize=0,
         )
+        if register_pid_method is not None:
+            register_pid_method(cmd_process.pid)
         stdout_task = asyncio.create_task(
-            __read_stream(cmd_process.stdout, log_method, max_output_line)
+            __read_stream(cmd_process.stdout, actual_print_method, max_output_line)
         )
         stderr_task = asyncio.create_task(
-            __read_stream(cmd_process.stderr, log_method, max_error_line)
+            __read_stream(cmd_process.stderr, actual_print_method, max_error_line)
         )
         # Wait for process to complete and gather stdout/stderr
         return_code = await cmd_process.wait()
@@ -89,5 +109,7 @@ async def run_command(
         stderr = await stderr_task
         return CmdResult(stdout, stderr), return_code
     finally:
+        if cmd_process in _RUNNING_PROCESSES:
+            _RUNNING_PROCESSES.remove(cmd_process)
         if cmd_process is not None and cmd_process.returncode is None:
             cmd_process.terminate()

zrb/util/git.py

@@ -22,7 +22,7 @@ async def get_diff(
     cmd_result, exit_code = await run_command(
         cmd=["git", "diff", source_commit, current_commit],
         cwd=repo_dir,
-        log_method=log_method,
+        print_method=log_method,
     )
     if exit_code != 0:
         raise Exception(f"Non zero exit code: {exit_code}")
@@ -57,7 +57,7 @@ async def get_diff(
 async def get_repo_dir(log_method: Callable[..., Any] = print) -> str:
     cmd_result, exit_code = await run_command(
         cmd=["git", "rev-parse", "--show-toplevel"],
-        log_method=log_method,
+        print_method=log_method,
     )
     if exit_code != 0:
         raise Exception(f"Non zero exit code: {exit_code}")
@@ -70,7 +70,7 @@ async def get_current_branch(
     cmd_result, exit_code = await run_command(
         cmd=["git", "rev-parse", "--abbrev-ref", "HEAD"],
         cwd=repo_dir,
-        log_method=log_method,
+        print_method=log_method,
     )
     if exit_code != 0:
         raise Exception(f"Non zero exit code: {exit_code}")
@@ -83,7 +83,7 @@ async def get_branches(
     cmd_result, exit_code = await run_command(
         cmd=["git", "rev-parse", "--abbrev-ref", "HEAD"],
         cwd=repo_dir,
-        log_method=log_method,
+        print_method=log_method,
     )
     if exit_code != 0:
         raise Exception(f"Non zero exit code: {exit_code}")
@@ -98,7 +98,7 @@ async def delete_branch(
     cmd_result, exit_code = await run_command(
         cmd=["git", "branch", "-D", branch_name],
         cwd=repo_dir,
-        log_method=log_method,
+        print_method=log_method,
     )
     if exit_code != 0:
         raise Exception(f"Non zero exit code: {exit_code}")
@@ -109,7 +109,7 @@ async def add(repo_dir: str, log_method: Callable[..., Any] = print):
     _, exit_code = await run_command(
         cmd=["git", "add", ".", "-A"],
         cwd=repo_dir,
-        log_method=log_method,
+        print_method=log_method,
     )
     if exit_code != 0:
         raise Exception(f"Non zero exit code: {exit_code}")
@@ -121,7 +121,7 @@ async def commit(
     cmd_result, exit_code = await run_command(
         cmd=["git", "commit", "-m", message],
         cwd=repo_dir,
-        log_method=log_method,
+        print_method=log_method,
     )
     if exit_code != 0:
         ignored_error_message = "nothing to commit, working tree clean"
@@ -138,7 +138,7 @@ async def pull(
     _, exit_code = await run_command(
         cmd=["git", "pull", remote, branch],
         cwd=repo_dir,
-        log_method=log_method,
+        print_method=log_method,
     )
     if exit_code != 0:
         raise Exception(f"Non zero exit code: {exit_code}")
@@ -150,7 +150,7 @@ async def push(
     _, exit_code = await run_command(
         cmd=["git", "push", "-u", remote, branch],
         cwd=repo_dir,
-        log_method=log_method,
+        print_method=log_method,
     )
     if exit_code != 0:
         raise Exception(f"Non zero exit code: {exit_code}")

zrb/util/git_subtree.py

@@ -54,7 +54,7 @@ async def add_subtree(
             branch,
         ],
         cwd=repo_dir,
-        log_method=log_method,
+        print_method=log_method,
     )
     if exit_code != 0:
         raise Exception(f"Non zero exit code: {exit_code}")
@@ -82,7 +82,7 @@ async def pull_subtree(
             branch,
         ],
         cwd=repo_dir,
-        log_method=log_method,
+        print_method=log_method,
     )
     if exit_code != 0:
         raise Exception(f"Non zero exit code: {exit_code}")
@@ -106,7 +106,7 @@ async def push_subtree(
             branch,
         ],
         cwd=repo_dir,
-        log_method=log_method,
+        print_method=log_method,
     )
     if exit_code != 0:
         raise Exception(f"Non zero exit code: {exit_code}")

{zrb-1.0.0b6.dist-info → zrb-1.0.0b7.dist-info}/METADATA

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

{zrb-1.0.0b6.dist-info → zrb-1.0.0b7.dist-info}/RECORD

@@ -2,7 +2,7 @@ zrb/__init__.py,sha256=JYLyBeSv-FP2iVKgsXJH8Ae-Cmjp5nmmIiwqayhCOEE,2964
 zrb/__main__.py,sha256=TnWp9Z3uuNb_6uf5FT1fcwh6BLZwGCAJB4R9NxnFLNs,748
 zrb/attr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/attr/type.py,sha256=4TV5gPYMMrKh5V-yB6iRYKCbsXAH_AvGXMsjxKLHcUs,568
-zrb/builtin/__init__.py,sha256=m8Cw6v8v5ANEoIlQXaeMKAHqg_J1LyhzovANRd9UbD8,1861
+zrb/builtin/__init__.py,sha256=oXG4Zm_rIp3G81Y7hiSe38jeS2sGZAnADoP_yxxhYEc,1926
 zrb/builtin/base64.py,sha256=1YnSwASp7OEAvQcsnHZGpJEvYoI1Z2zTIJ1bCDHfcPQ,921
 zrb/builtin/git.py,sha256=xHzg0srhp1uOSXWvwA--Fo8idkt0G9010iJ8uIndzg4,5463
 zrb/builtin/git_subtree.py,sha256=GwI8befmvXEoX1xyZ4jkeG8nsyCkuRG1lzPiGss3yqw,3493
@@ -16,16 +16,16 @@ zrb/builtin/llm/tool/web.py,sha256=N2HYuXbKPUpjVAq_UnQMbUrTIE8u0Ut3TeQadZ7_NJc,2
 zrb/builtin/md5.py,sha256=0pNlrfZA0wlZlHvFHLgyqN0JZJWGKQIF5oXxO44_OJk,949
 zrb/builtin/project/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/builtin/project/add/fastapp/fastapp_input.py,sha256=fYD6n8-PlrTyz1Kq5GYAt0PQsyUp2qsPKRJ68hINSXE,314
-zrb/builtin/project/add/fastapp/fastapp_task.py,sha256=XuyQVuaaNRPQftisSpWMFmKFXpEi4HngKW62aRgz3KQ,2644
+zrb/builtin/project/add/fastapp/fastapp_task.py,sha256=m48ENwROECcAVzmianijcI2Ct4t9BhPyPjfxTbS3Zy0,2635
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/.flake8,sha256=fgvHmuskgYiCvHZHaFtiyOWW0zasVrs0P-sFHOq3W5U,56
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/.gitignore,sha256=1BMFpr_M5OyTs-weCZZlVlf85sWikzdbvmKu86YD7G0,28
 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=0sPR_pe_oYUevWu0FvMvxTu6lwefsw4YH01vkCBBZsg,391
+zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/column/add_column_task.py,sha256=x7igeeJl8M0vKw9v0VG6zIFk7qAZD2NIH3_uG-VJimY,2868
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/config.py,sha256=rllXYH4LRyt-vXAoMLENx1T-01nxjN6CpWf76b_-ppw,580
-zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/entity/add_entity_task.py,sha256=483e-dMm6URApCm62d-PD6Z-3NONBRT9X6uRsrNLFDo,6265
+zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/entity/add_entity_task.py,sha256=l7RAPWZZBHY3Uv6TmbPDuEvF0IwJ_lx3vHz6Cq4tgus,6256
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/entity/add_entity_util.py,sha256=gtWMWdc0QC4vbMtzUJi_ZDlY5dZJCTWdJBCPGn0vkso,11962
-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=04H7NWh-xQ6yIBNmoVSNboaE5DGQrDfVX9SMiLJwQus,3996
+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=Z8yzVRx_Eew2cnyB82nQMpJfFdvd2LlKv-KZ53a0R1E,3894
 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
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/entity/template/app_template/module/my_module/service/my_entity/repository/my_entity_repository.py,sha256=QJmQmeXvkuhpnAFWkATJk7zvr-GY1RSyb5U9bSslFn4,1644
@@ -36,7 +36,7 @@ zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/entity/templat
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/format_task.py,sha256=8YykCthDgjXT8MFvTrPSWYUXsfhafmoSMG9LH2ZiaD0,431
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/group.py,sha256=S0sKnnABSGy3YzaExH40xJjm4UsEX6AyDE1u94ewk6A,648
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/input.py,sha256=PYbPwO5odaQDzRIgKkLmLEKOOYs9gQw3q7L-Fakw90Q,1349
-zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/module/add_module_task.py,sha256=Ow_l3hDtR8WZLy4cC8NUi9Cdu6zqpfsap81ux_QtD2g,3699
+zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/module/add_module_task.py,sha256=mGD3iHocO3TcmFgrBRHEoOgci3qXmwaSmEpVe7jGjvE,3690
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/module/add_module_util.py,sha256=2totrFEzt0sEA4U0HHMy5GAsNM-X6uLv9eq8rsrA9XU,7145
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/module/template/app_template/module/gateway/subroute/my_module.py,sha256=Ks-TtmuhzFy1H5BGQt7FU09ZHBTWwsSVhHFzOXpnSQg,120
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/module/template/app_template/module/my_module/alembic.ini,sha256=mgQyBAIwdkZZJWLu_FQWPx1FkyaARCNp6-rLqSVvMbA,3723
@@ -85,7 +85,7 @@ zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/auth/migrati
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/auth/route.py,sha256=oLKVOCRvupnGmguEO10b7ZE5pXbhTBV8OSZmp_nOkfc,1255
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/auth/service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/auth/service/permission/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/auth/service/permission/permission_service.py,sha256=Mn9i-h74F30V3MmYkBWXaO2BXuVJYEBYSsfP7xle6Ok,4137
+zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/auth/service/permission/permission_service.py,sha256=ro3LOvHNh9VnZwoeOg4T2n1mvXWoiAmOsk15vxvH_2o,4032
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/auth/service/permission/permission_service_factory.py,sha256=PhAhpLtk9Qz96DsHTMTeHeWilv_L7SVOU-Wfpmg741Y,380
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/auth/service/permission/repository/permission_db_repository.py,sha256=dldy05Jx6hJzWJz6YHIXUVUX7LrPrZLSpQQjZ8C_fTQ,728
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/auth/service/permission/repository/permission_repository.py,sha256=qpzSQg_opkq0U2bGjShxS8cGX26zncqNPoZsqqHnRfk,1699
@@ -94,13 +94,13 @@ zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/auth/service
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/auth/service/role/repository/role_db_repository.py,sha256=CLjMEGE4sJyT4VpURYfqO6nh_lRWmYupfE86pbVDMBE,3152
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/auth/service/role/repository/role_repository.py,sha256=LWPNu6kURF3xU2n8mVn4Kfq12rFsZq2vxnh-mgT9SDY,1791
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/auth/service/role/repository/role_repository_factory.py,sha256=iTEoSP3kKnhpGEFW3veA3lnGb3CfmQJslnneUJ8ktJs,463
-zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/auth/service/role/role_service.py,sha256=rOUP9gSYt39a8-jeeyv9uEzh1bheTxu54fRBDJoKTIk,4977
+zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/auth/service/role/role_service.py,sha256=gCoWt-N10Sg_sSnSx5AS4m_eDboFlKc8beys28hUkWE,5057
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/auth/service/role/role_service_factory.py,sha256=TqQfx0jXGZmBDR1UYPyys8-I6tDKhqr1yjWpp-ezkDA,305
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/auth/service/user/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/auth/service/user/repository/user_db_repository.py,sha256=pcR9gFa2_deordx6jvSWNnz4hih3cyMJrJ-gWRTW6UU,8444
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/auth/service/user/repository/user_repository.py,sha256=_mP1VN0TW0TFvzHN6k7uBZt5GST5ueK4G5T6EwXiEsI,2563
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/auth/service/user/repository/user_repository_factory.py,sha256=Ea9ykNhzYiWu_IEhfpWsg1OIWeQ9pOTCzbZF9rrsZqU,463
-zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/auth/service/user/user_service.py,sha256=FL-_fz3smPZUKbWYELFfPCjrVv4Xpqi8V4baZJ3zAas,4515
+zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/auth/service/user/user_service.py,sha256=KgfHIBHvEVY5V7CNm0Y8BnNQ6sd5UJB_wFq6WMnrBvg,4901
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/auth/service/user/user_service_factory.py,sha256=vyJv-gK4Myo1GH3ZwJm4b2lws35gW04VFW5K8Nw-iCw,305
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/alembic.ini,sha256=mgQyBAIwdkZZJWLu_FQWPx1FkyaARCNp6-rLqSVvMbA,3723
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/module/gateway/migration/README,sha256=MVlc9TYmr57RbhXET6QxgyCcwWP7w-vLkEsirENqiIQ,38
@@ -155,10 +155,13 @@ zrb/builtin/setup/asdf/asdf.py,sha256=n_dWoyYa7vZ9tBCy8hgxmSWZ-XHltC1R70mIVZQhnX
 zrb/builtin/setup/asdf/asdf_helper.py,sha256=6jARtyIAE1H82HKVQ84D25RrMAsAip_gD28X9ZlaTCk,1205
 zrb/builtin/setup/common_input.py,sha256=M8q9Unt7dCfBHTHqV3__Mxk9YC2Pl3DDtxat2BanZCQ,870
 zrb/builtin/setup/latex/ubuntu.py,sha256=er9wJAT4CpmghIaiIPFb3FvgqAn1aqU5UgX7GHL3FjA,577
-zrb/builtin/setup/tmux/tmux.py,sha256=4CswI40w3W6vsNckO7oEYnI7ySAeGhA80FsYzoq6HWQ,1410
+zrb/builtin/setup/tmux/tmux.py,sha256=r7XdEx-AcHiF63uhOqgDuhSq0DR1IK52fHj3ZMtUrZg,1407
 zrb/builtin/setup/tmux/tmux_config.sh,sha256=wQCb4Q-mNkxIPOcvpN84X9RUWkGY16u3Vd-pOhVidgg,416
 zrb/builtin/setup/tmux/tmux_helper.py,sha256=M03l0wfL25TzGGp6lnVfX40ayT_x7N2lz-nz2chO7PU,396
 zrb/builtin/setup/ubuntu.py,sha256=oOSN7Eq7arEpY2i0vWHPR2owio6dqqOvceteYrgmbYw,1019
+zrb/builtin/setup/zsh/zsh.py,sha256=quz3OegZBNNBm_K8IH2DUt9G0Q6XZ6cKsDs_WzHGqjg,1824
+zrb/builtin/setup/zsh/zsh_config.sh,sha256=SRkcXvVT3tdfS1UDT0-dSj2PKXPLohhyakY6tUEQPjc,4764
+zrb/builtin/setup/zsh/zsh_helper.py,sha256=1zF1FH0oEPVAVhMA20tsdk1H0RPMCkLusYX8twsTbGI,393
 zrb/builtin/shell/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/builtin/shell/autocomplete/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/builtin/shell/autocomplete/bash.py,sha256=-7YDVV7txgJH9mAYSYN0jmvUEeDIzWFvVNY-cY0myF8,1181
@@ -171,14 +174,14 @@ zrb/callback/callback.py,sha256=hKefB_Jd1XGjPSLQdMKDsGLHPzEGO2dqrIArLl_EmD0,848
 zrb/cmd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/cmd/cmd_result.py,sha256=L8bQJzWCpcYexIxHBNsXj2pT3BtLmWex0iJSMkvimOA,597
 zrb/cmd/cmd_val.py,sha256=7Doowyg6BK3ISSGBLt-PmlhzaEkBjWWm51cED6fAUOQ,1014
-zrb/config.py,sha256=RB0ikM82RnCDZaarJOEBfD7GeYPfcq6jLb6F359il1s,4677
+zrb/config.py,sha256=Kb-GOsUS4poSCds4Wqg9LkscpS7BHXSy3dQmqvsFm2Q,4621
 zrb/content_transformer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/content_transformer/any_content_transformer.py,sha256=v8ZUbcix1GGeDQwB6OKX_1TjpY__ksxWVeqibwa_iZA,850
 zrb/content_transformer/content_transformer.py,sha256=YU6Xr3G_IaCWKQGsf9z9YlCclbiwcJ7ytQv3wKpPIiI,2125
 zrb/context/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-zrb/context/any_context.py,sha256=itd_lCyaPbZvcB_8XDEbvde9yQ7YPRHlOQCxE4hniB4,6251
+zrb/context/any_context.py,sha256=2hgVKbbDwmwrEl1h1L1FaTUjuUYaDd_b7YRGkaorW6Q,6362
 zrb/context/any_shared_context.py,sha256=p1i9af_CUDz5Mf1h1kBZMAa2AEhf17I3O5IgAcjRLoY,1768
-zrb/context/context.py,sha256=RWjluPpNBAZ_qjfza5fP-ScnEsZk2pD5rroYWQSfjAE,6201
+zrb/context/context.py,sha256=qVMqt2tkLEFSI81mLYb_OSD615KH5jP685aUmHEm3XQ,6319
 zrb/context/shared_context.py,sha256=47Tnnor1ttpwpe_N07rMNM1jgIYPY9abMe1Q5igkMtE,2735
 zrb/dot_dict/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/dot_dict/dot_dict.py,sha256=ubw_x8I7AOJ59xxtFVJ00VGmq_IYdZP3mUhNlO4nEK0,556
@@ -234,7 +237,7 @@ zrb/runner/web_route/static/resources/login/event.js,sha256=1-NxaUwU-X7Tu2RAwVkz
 zrb/runner/web_route/static/resources/logout/event.js,sha256=MfZxrTa2yL49Lbh7cCZDdqsIcf9e1q3W8-WjmZXV5pA,692
 zrb/runner/web_route/static/resources/pico.min.css,sha256=_Esfkjs_U_igYn-tXBUaK3AEKb7d4l9DlmaOiw9bXfI,82214
 zrb/runner/web_route/static/resources/session/common-util.js,sha256=t7_s5DXgMyZlT8L8LYZTkzOT6vWVeZvmCKjt-bflQY0,2117
-zrb/runner/web_route/static/resources/session/current-session.js,sha256=GlRBLwItCwITqVR_hUQFr6W1myD9WRl8R_TTbrzCovw,6739
+zrb/runner/web_route/static/resources/session/current-session.js,sha256=kAYHoSVjtQ4XA5yfXocKFVjOmYihQoIHTW0pHx22sPg,7010
 zrb/runner/web_route/static/resources/session/event.js,sha256=X5OlSHefK0SDB9VkFCRyBKE_Pb7mqM319mW9jRGoDOk,4716
 zrb/runner/web_route/static/resources/session/past-session.js,sha256=RwGJYKSp75K8NZ-iZP58XppWgdzkiKFaiC5wgcMLxDo,5470
 zrb/runner/web_route/static/static_route.py,sha256=7x069VfACZLkLykY0vLL5t13jIQPgkeEJtkpbfNQfLg,1540
@@ -260,11 +263,11 @@ zrb/task/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/task/any_task.py,sha256=9rCdKe-Sayr34Han9AsbhRxFpkbk6Rteg1DOyETulwQ,4917
 zrb/task/base_task.py,sha256=ImA0ReyB6neVUfY4nKLnL0h2EMGIJ9wvvNvIAN92-RE,21194
 zrb/task/base_trigger.py,sha256=jC722rDvodaBLeNaFghkTyv1u0QXrK6BLZUUqcmBJ7Q,4581
-zrb/task/cmd_task.py,sha256=JpClYoEmJTqKSxhuCErXd2kHLS3Hk2zXeYnl7entNeU,10378
+zrb/task/cmd_task.py,sha256=lg9Dkb0wwjo-F1F6gsH-RqNdndfQAwLkd7SOW5DdpGc,10809
 zrb/task/http_check.py,sha256=Gf5rOB2Se2EdizuN9rp65HpGmfZkGc-clIAlHmPVehs,2565
 zrb/task/llm_task.py,sha256=ptXC3x9Dwn7-4JrGQyEtzOXZ4dNQATDgCeowkvwAu9U,7723
 zrb/task/make_task.py,sha256=PD3b_aYazthS8LHeJsLAhwKDEgdurQZpymJDKeN60u0,2265
-zrb/task/rsync_task.py,sha256=pVVslZ46qgcpU_EKhyTQEQie8kUOMuTsVQdbQG2L-yk,6318
+zrb/task/rsync_task.py,sha256=GSL9144bmp6F0EckT6m-2a1xG25AzrrWYzH4k3SVUKM,6370
 zrb/task/scaffolder.py,sha256=rME18w1HJUHXgi9eTYXx_T2G4JdqDYzBoNOkdOOo5-o,6806
 zrb/task/scheduler.py,sha256=aSDF_WtDbmwrYXaVo3BesCG8w21UNV8XLtn-5x9GWzY,3137
 zrb/task/task.py,sha256=KCrCaWYOQQvv1RJsYtHDeo9RBFmlXQ28oKyEFU4Q7pA,73
@@ -277,7 +280,7 @@ zrb/util/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/util/cli/style.py,sha256=wxdtE18d4Q3GV7aojinD-XN9iWvazfvLs9MTJPlCNQU,3805
 zrb/util/cli/subcommand.py,sha256=gYr-CzVeKFQhY43s_FDstPwn8r-ypUz1Q2Rv_l2r-ck,1027
 zrb/util/cmd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-zrb/util/cmd/command.py,sha256=hllMoHh2gUSNip3kgEJwKz1JxFC--bCoFyyT1quJgnE,3455
+zrb/util/cmd/command.py,sha256=g6MNfBFSfeabwbevCeXn2puVsOxo8N3pi8k_Olv2zxQ,4254
 zrb/util/cmd/remote.py,sha256=VklVORobTmE7FqdtYsVLq9xkSYTR2W5r2Zou0-soidw,710
 zrb/util/codemod/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/util/codemod/append_code_to_class.py,sha256=5PiGzFqB-q8XQnGnDqWBn4OA4ydSmQWpKQzSr3l6wws,1361
@@ -290,8 +293,8 @@ zrb/util/codemod/prepend_parent_to_class.py,sha256=xOcDHv1cXXV_VqLHVifr6jvDoWk_i
 zrb/util/codemod/prepend_property_to_class.py,sha256=9L11WaYIUF53Kn_ZMT51ylhm7xTxttNjPp83Mnm9iUQ,2079
 zrb/util/cron.py,sha256=9fTGatUMYCRgmDFGg-z6_XerT4U5Vq72nD05NnEVUm4,2852
 zrb/util/file.py,sha256=cBPkIonfcWytoqtG3ScJd6FFK7HVYeCIuLmfAFO1HIQ,791
-zrb/util/git.py,sha256=o_kLF1fySv5uQdLlhY-ztc-z0zLOdcDf0IpuPAl2ciA,4733
-zrb/util/git_subtree.py,sha256=US8oCHUOKgt14Ie6SaEelwTs__jLGLPsDQZvI-1P4KY,2640
+zrb/util/git.py,sha256=qTc6rHJd_HyJktiOC_kZGKc75qLx_6X899TG0DrXC04,4751
+zrb/util/git_subtree.py,sha256=8oLaMBy2giMQcZnLZ31Tu0W5xicSEKrm5xiHfd1worA,2646
 zrb/util/group.py,sha256=Bg7HrSycoK110U5s_Tca6-uUQuZ5CMgb8wxZSrvDQ98,2790
 zrb/util/llm/tool.py,sha256=NkENrUlGxcqqU7jzHAH7DBXNcm_ndEo2dFnJ5nhvWmk,2991
 zrb/util/load.py,sha256=i8_83ApWJXlZlbFMNfEptrOzfXdvtaIhAErsd6tU9y8,1649
@@ -303,7 +306,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.0.0b6.dist-info/METADATA,sha256=ZGOBMXjA82fN6lsJ3yNmJTGqwoZWJcNEKCxXtTouk68,4270
-zrb-1.0.0b6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-zrb-1.0.0b6.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
-zrb-1.0.0b6.dist-info/RECORD,,
+zrb-1.0.0b7.dist-info/METADATA,sha256=nw9wiAEB0ViBOiqQGH0SQXPz-3YulrupirW9Rw3EZFY,4270
+zrb-1.0.0b7.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+zrb-1.0.0b7.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
+zrb-1.0.0b7.dist-info/RECORD,,