zrb 1.0.0a7__py3-none-any.whl → 1.0.0a9__py3-none-any.whl

zrb/builtin/__init__.py

@@ -12,10 +12,14 @@ from zrb.builtin.md5 import hash_md5, sum_md5
 from zrb.builtin.project.add.fastapp import add_fastapp_to_project
 from zrb.builtin.project.create.create import create_project
 from zrb.builtin.python import format_python_code
+from zrb.builtin.setup.dev.asdf import setup_asdf
+from zrb.builtin.setup.dev.tmux import setup_tmux
+from zrb.builtin.setup.system.latex.ubuntu import setup_latex_on_ubuntu
+from zrb.builtin.setup.system.ubuntu import setup_ubuntu
 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
-from zrb.builtin.todo import todo_add, todo_complete, todo_edit, todo_list, todo_log
+from zrb.builtin.todo import add_todo, complete_todo, edit_todo, list_todo, log_todo
 
 assert create_project
 assert add_fastapp_to_project
@@ -36,8 +40,12 @@ assert git_push
 assert git_add_subtree
 assert git_pull_subtree
 assert git_push_subtree
-assert todo_list
-assert todo_add
-assert todo_edit
-assert todo_complete
-assert todo_log
+assert list_todo
+assert add_todo
+assert edit_todo
+assert complete_todo
+assert log_todo
+assert setup_ubuntu
+assert setup_latex_on_ubuntu
+assert setup_asdf
+assert setup_tmux

zrb/builtin/git.py

@@ -114,10 +114,7 @@ def git_commit(ctx: AnyContext):
     ctx.print("Add changes to staging")
     add(repo_dir)
     ctx.print("Commit changes")
-    try:
-        commit(repo_dir, ctx.input.message)
-    except Exception as e:
-        ctx.log_error(e)
+    commit(repo_dir, ctx.input.message)
 
 
 @make_task(

zrb/builtin/group.py

@@ -33,11 +33,16 @@ add_fastapp_to_project_group = add_to_project_group.add_group(
     Group(name="fastapp", description="🚀 Add Fastapp resources")
 )
 
-setup_group = cli.add_group(Group(name="setup", description="🛠️ Setup"))
+setup_group = cli.add_group(Group(name="setup", description="🔧 Setup"))
 setup_system_group = setup_group.add_group(
-    Group(name="system", description="🛠️ Setup system")
+    Group(name="system", description="🔧 Setup system")
+)
+setup_latex_group = setup_system_group.add_group(
+    Group(name="latex", description="✍️ Setup LaTeX")
+)
+setup_dev_group = setup_group.add_group(
+    Group(name="dev", description="💻 Setup developer tools")
 )
-setup_dev_group = setup_group.add_group(Group(name="dev", description="🧑‍💻 Setup dev"))
 setup_service_group = setup_group.add_group(
     Group(name="services", description="🌐 Setup services")
 )

zrb/builtin/setup/common_input.py

@@ -0,0 +1,35 @@
+from zrb.input.bool_input import BoolInput
+from zrb.input.option_input import OptionInput
+
+package_manager_input = OptionInput(
+    name="package-manager",
+    description="Your package manager",
+    prompt="Your package manager",
+    options=["apt", "dnf", "pacman", "zypper", "pkg", "brew", "spack"],
+    default_str="apt",
+)
+
+use_sudo_input = BoolInput(
+    name="use-sudo",
+    description="Use sudo or not",
+    prompt="Need sudo",
+    default_str="yes",
+)
+
+setup_bash_input = BoolInput(
+    name="setup-bash",
+    description="Setup bash",
+    prompt="Setup bash",
+    default_str="yes",
+)
+
+setup_zsh_input = BoolInput(
+    name="setup-zsh", description="Setup zsh", prompt="Setup zsh", default_str="yes"
+)
+
+setup_powershell_input = BoolInput(
+    name="setup-powershell",
+    description="Setup powershell",
+    prompt="Setup powershell",
+    default_str="no",
+)

zrb/builtin/setup/dev/asdf.py

@@ -0,0 +1,86 @@
+import os
+
+from zrb.builtin.group import setup_dev_group
+from zrb.builtin.setup.common_input import (
+    package_manager_input,
+    setup_bash_input,
+    setup_powershell_input,
+    setup_zsh_input,
+    use_sudo_input,
+)
+from zrb.builtin.setup.dev.asdf_helper import (
+    check_inexist_asdf_dir,
+    get_install_prerequisites_cmd,
+    setup_asdf_ps_config,
+    setup_asdf_sh_config,
+)
+from zrb.context.any_context import AnyContext
+from zrb.task.cmd_task import CmdTask
+from zrb.task.make_task import make_task
+
+install_asdf_prerequisites = CmdTask(
+    name="install-asdf-prerequisites",
+    input=[package_manager_input, use_sudo_input],
+    cmd=get_install_prerequisites_cmd,
+)
+
+
+download_asdf = CmdTask(
+    name="download-asdf",
+    cmd="git clone https://github.com/asdf-vm/asdf.git ~/.asdf --branch v0.14.1",
+    execute_condition=check_inexist_asdf_dir,
+)
+install_asdf_prerequisites >> download_asdf
+
+
+@make_task(
+    name="setup-asdf-on-bash",
+    input=setup_bash_input,
+    execute_condition='{ctx.input["setup-bash"]}',
+    upstream=download_asdf,
+)
+def setup_asdf_on_bash(ctx: AnyContext):
+    ctx.print("Configure asdf for bash")
+    setup_asdf_sh_config(os.path.expanduser(os.path.join("~", ".bashrc")))
+
+
+@make_task(
+    name="setup-asdf-on-zsh",
+    input=setup_zsh_input,
+    execute_condition='{ctx.input["setup-zsh"]}',
+    upstream=download_asdf,
+)
+def setup_asdf_on_zsh(ctx: AnyContext):
+    ctx.print("Configure asdf for zsh")
+    setup_asdf_sh_config(os.path.expanduser(os.path.join("~", ".zshrc")))
+
+
+@make_task(
+    name="setup-asdf-on-powershell",
+    input=setup_powershell_input,
+    execute_condition='{ctx.input["setup-powershell"]}',
+    upstream=download_asdf,
+)
+def setup_asdf_on_powershell(ctx: AnyContext):
+    ctx.print("Configure asdf for powershell")
+    setup_asdf_ps_config(
+        os.path.expanduser(os.path.join("~", ".config", "powershell", "profile.ps1"))
+    )
+
+
+@make_task(
+    name="setup-asdf",
+    description="🧰 Setup `asdf`.",
+    group=setup_dev_group,
+    alias="asdf",
+)
+def setup_asdf(ctx: AnyContext):
+    ctx.print("Setup complete, restart your terminal to continue")
+    ctx.print("Some useful commands:")
+    ctx.print("- asdf plugin add python")
+    ctx.print("- asdf list all python")
+    ctx.print("- asdf install python 3.12.0")
+    ctx.print("- asdf global python 3.12.0")
+
+
+setup_asdf << [setup_asdf_on_bash, setup_asdf_on_zsh, setup_asdf_on_powershell]

zrb/builtin/setup/dev/asdf_helper.py

@@ -0,0 +1,44 @@
+import os
+
+from zrb.context.any_context import AnyContext
+
+
+def get_install_prerequisites_cmd(ctx: AnyContext) -> str:
+    package_manager: str = ctx.input["package-manager"]
+    if package_manager in ["brew", "spack"]:
+        cmd = f"{package_manager} install coreutils curl git"
+    elif package_manager == "pacman":
+        cmd = f"{package_manager} -S curl git"
+    else:
+        cmd = f"{package_manager} install curl git"
+    use_sudo: bool = ctx.input["use-sudo"]
+    if use_sudo:
+        return f"sudo {cmd}"
+    return cmd
+
+
+def check_inexist_asdf_dir(_: AnyContext):
+    asdf_dir = os.path.expanduser(os.path.join("~", ".asdf"))
+    return not os.path.isdir(asdf_dir)
+
+
+def setup_asdf_sh_config(file_path: str):
+    _setup_asdf_config(file_path, '. "$HOME/.asdf/asdf.sh"')
+
+
+def setup_asdf_ps_config(file_path: str):
+    _setup_asdf_config(file_path, '. "$HOME/.asdf/asdf.ps1"')
+
+
+def _setup_asdf_config(file_path: str, asdf_config: str):
+    dir_path = os.path.dirname(file_path)
+    os.makedirs(dir_path, exist_ok=True)
+    if not os.path.isfile(file_path):
+        with open(file_path, "w") as f:
+            f.write("")
+    with open(file_path, "r") as f:
+        content = f.read()
+    if asdf_config in content:
+        return
+    with open(file_path, "a") as f:
+        f.write(f"\n{asdf_config}\n")

zrb/builtin/setup/dev/tmux.py

@@ -0,0 +1,50 @@
+import os
+
+from zrb.builtin.group import setup_dev_group
+from zrb.builtin.setup.common_input import package_manager_input, use_sudo_input
+from zrb.builtin.setup.dev.tmux_helper import get_install_tmux_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
+
+install_tmux = CmdTask(
+    name="install-tmux",
+    input=[package_manager_input, use_sudo_input],
+    cmd=get_install_tmux_cmd,
+)
+
+
+@make_task(
+    name="setup-tmux",
+    input=StrInput(
+        name="tmux-config",
+        description="Tmux config file",
+        prompt="Tmux config file",
+        default_str="~/.tmux.conf",
+    ),
+    description="🖥️ Setup `tmux`.",
+    group=setup_dev_group,
+    alias="tmux",
+)
+def setup_tmux(ctx: AnyContext):
+    with open(os.path.join(os.path.dirname(__file__), "tmux_config.sh"), "r") as f:
+        tmux_config_template = f.read()
+    tmux_config_file = os.path.expanduser(ctx.input["tmux-config"])
+    tmux_config_dir = os.path.dirname(tmux_config_file)
+    # Make sure config file exists
+    os.makedirs(tmux_config_dir, exist_ok=True)
+    if not os.path.isfile(tmux_config_file):
+        with open(tmux_config_file, "w") as f:
+            f.write("")
+    with open(tmux_config_file, "r") as f:
+        # config file already contain the config
+        if tmux_config_template in f.read():
+            return
+    # Write config
+    with open(tmux_config_file, "a") as f:
+        f.write(f"\n{tmux_config_template}\n")
+    ctx.print("Setup complete, restart your terminal to continue")
+
+
+install_tmux >> setup_tmux

zrb/builtin/setup/dev/tmux_helper.py

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

zrb/builtin/setup/system/latex/ubuntu.py

@@ -0,0 +1,18 @@
+from zrb.builtin.group import setup_latex_group
+from zrb.builtin.setup.system.ubuntu import setup_ubuntu
+from zrb.task.cmd_task import CmdTask
+
+setup_latex_on_ubuntu = setup_latex_group.add_task(
+    CmdTask(
+        name="setup-latex-on-ubuntu",
+        description="🐧 Setup LaTeX on Ubuntu",
+        cmd=[
+            "sudo apt install -y \\",
+            "texlive-full texlive-latex-base texlive-fonts-recommended \\",
+            "texlive-fonts-extra texlive-latex-extra",
+        ],
+        render_cmd=False,
+    ),
+    alias="ubuntu",
+)
+setup_ubuntu >> setup_latex_on_ubuntu

zrb/builtin/setup/system/ubuntu.py

@@ -0,0 +1,28 @@
+from zrb.builtin.group import setup_system_group
+from zrb.task.cmd_task import CmdTask
+
+update_ubuntu = CmdTask(name="update-ubuntu", cmd="sudo apt update", render_cmd=False)
+
+upgrade_todo = CmdTask(
+    name="upgrade-ubuntu", cmd="sudo apt upgrade -y", render_cmd=False
+)
+update_ubuntu >> upgrade_todo
+
+setup_ubuntu = setup_system_group.add_task(
+    CmdTask(
+        name="setup-ubuntu",
+        description="🐧 Setup ubuntu",
+        cmd=[
+            "sudo apt install -y \\",
+            "build-essential python3-distutils libssl-dev zlib1g-dev \\"
+            "libbz2-dev libreadline-dev libsqlite3-dev libpq-dev python3-dev \\",
+            "llvm libncurses5-dev libncursesw5-dev xz-utils tk-dev libffi-dev \\",
+            "liblzma-dev python3-openssl libblas-dev liblapack-dev rustc \\",
+            "golang gfortran fd-find ripgrep wget curl git ncat zip unzip \\",
+            "cmake make tree tmux zsh neovim xdotool xsel",
+        ],
+        render_cmd=False,
+    ),
+    alias="ubuntu",
+)
+upgrade_todo >> setup_ubuntu

zrb/builtin/todo.py

@@ -51,7 +51,7 @@ from zrb.util.todo import (
     group=todo_group,
     alias="add",
 )
-def todo_add(ctx: AnyContext):
+def add_todo(ctx: AnyContext):
     todo_file_path = os.path.join(TODO_DIR, "todo.txt")
     todo_list: list[TodoTaskModel] = []
     if os.path.isfile(todo_file_path):
@@ -81,7 +81,7 @@ def todo_add(ctx: AnyContext):
 
 
 @make_task(name="todo-list", description="📋 List todo", group=todo_group, alias="list")
-def todo_list(ctx: AnyContext):
+def list_todo(ctx: AnyContext):
     todo_file_path = os.path.join(TODO_DIR, "todo.txt")
     todo_tasks: list[TodoTaskModel] = []
     if os.path.isfile(todo_file_path):
@@ -96,7 +96,7 @@ def todo_list(ctx: AnyContext):
     group=todo_group,
     alias="complete",
 )
-def todo_complete(ctx: AnyContext):
+def complete_todo(ctx: AnyContext):
     todo_file_path = os.path.join(TODO_DIR, "todo.txt")
     todo_list: list[TodoTaskModel] = []
     if os.path.isfile(todo_file_path):
@@ -142,7 +142,7 @@ def todo_complete(ctx: AnyContext):
     group=todo_group,
     alias="log",
 )
-def todo_log(ctx: AnyContext):
+def log_todo(ctx: AnyContext):
     todo_file_path = os.path.join(TODO_DIR, "todo.txt")
     todo_list: list[TodoTaskModel] = []
     if os.path.isfile(todo_file_path):
@@ -196,7 +196,7 @@ def _get_default_start() -> str:
     group=todo_group,
     alias="edit",
 )
-def todo_edit(ctx: AnyContext):
+def edit_todo(ctx: AnyContext):
     todo_list = [
         cascade_todo_task(line_to_todo_task(line))
         for line in ctx.input.text.split("\n")

zrb/config.py

@@ -49,6 +49,9 @@ LOGGING_LEVEL = _get_log_level(os.getenv("ZRB_LOGGING_LEVEL", "WARNING"))
 LOAD_BUILTIN = to_boolean(os.getenv("ZRB_LOAD_BUILTIN", "1"))
 ENV_PREFIX = os.getenv("ZRB_ENV", "")
 SHOW_PROMPT = to_boolean(os.getenv("ZRB_SHOW_PROMPT", "1"))
+WARN_UNRECOMMENDED_COMMAND = to_boolean(
+    os.getenv("ZRB_WARN_UNRECOMMENDED_COMMAND", "1")
+)
 SESSION_LOG_DIR = os.getenv(
     "ZRB_SESSION_LOG_DIR", os.path.expanduser(os.path.join("~", ".zrb-session"))
 )

zrb/task/cmd_task.py

@@ -5,13 +5,14 @@ import sys
 from zrb.attr.type import BoolAttr, IntAttr, StrAttr
 from zrb.cmd.cmd_result import CmdResult
 from zrb.cmd.cmd_val import AnyCmdVal, CmdVal, SingleCmdVal
-from zrb.config import DEFAULT_SHELL
+from zrb.config import DEFAULT_SHELL, WARN_UNRECOMMENDED_COMMAND
 from zrb.context.any_context import AnyContext
 from zrb.env.any_env import AnyEnv
 from zrb.input.any_input import AnyInput
 from zrb.task.any_task import AnyTask
 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
 from zrb.util.cmd.remote import get_remote_cmd_script
 
 
@@ -32,6 +33,7 @@ class CmdTask(BaseTask):
         remote_host: StrAttr | None = None,
         render_remote_host: bool = True,
         remote_port: IntAttr | None = None,
+        render_remote_port: bool = True,
         remote_user: StrAttr | None = None,
         render_remote_user: bool = True,
         remote_password: StrAttr | None = None,
@@ -42,6 +44,7 @@ class CmdTask(BaseTask):
         render_cmd: bool = True,
         cwd: str | None = None,
         render_cwd: bool = True,
+        warn_unrecommended_command: bool | None = None,
         max_output_line: int = 1000,
         max_error_line: int = 1000,
         execute_condition: BoolAttr = True,
@@ -83,6 +86,7 @@ class CmdTask(BaseTask):
         self._remote_host = remote_host
         self._render_remote_host = render_remote_host
         self._remote_port = remote_port
+        self._render_remote_port = render_remote_port
         self._remote_user = remote_user
         self._render_remote_user = render_remote_user
         self._remote_password = remote_password
@@ -95,6 +99,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_warn_unrecommended_command = warn_unrecommended_command
 
     async def _exec_action(self, ctx: AnyContext) -> CmdResult:
         """Turn _cmd attribute into subprocess.Popen and execute it as task's action.
@@ -105,7 +110,6 @@ class CmdTask(BaseTask):
         Returns:
             Any: The result of the action execution.
         """
-        ctx.log_info("Running script")
         cmd_script = self._get_cmd_script(ctx)
         ctx.log_debug(f"Script: {self.__get_multiline_repr(cmd_script)}")
         shell = self._get_shell(ctx)
@@ -116,7 +120,10 @@ class CmdTask(BaseTask):
         env_map = self.__get_env_map(ctx)
         ctx.log_debug(f"Environment map: {env_map}")
         cmd_process = None
+        if self._get_should_warn_unrecommended_commands():
+            self._check_unrecommended_commands(ctx, shell, cmd_script)
         try:
+            ctx.log_info("Running script")
             cmd_process = await asyncio.create_subprocess_exec(
                 shell,
                 shell_flag,
@@ -150,6 +157,21 @@ class CmdTask(BaseTask):
             if cmd_process is not None and cmd_process.returncode is None:
                 cmd_process.terminate()
 
+    def _get_should_warn_unrecommended_commands(self):
+        if self._should_warn_unrecommended_command is None:
+            return WARN_UNRECOMMENDED_COMMAND
+        return self._should_warn_unrecommended_command
+
+    def _check_unrecommended_commands(
+        self, ctx: AnyContext, shell: str, cmd_script: str
+    ):
+        if shell.endswith("bash") or shell.endswith("zsh"):
+            unrecommended_commands = check_unrecommended_commands(cmd_script)
+            if unrecommended_commands:
+                ctx.log_warning("The script contains unrecommended commands")
+            for command, reason in unrecommended_commands.items():
+                ctx.log_warning(f"- {command}: {reason}")
+
     def __get_env_map(self, ctx: AnyContext) -> dict[str, str]:
         envs = {key: val for key, val in ctx.env.items()}
         envs["_ZRB_SSH_PASSWORD"] = self._get_remote_password(ctx)
@@ -195,7 +217,9 @@ class CmdTask(BaseTask):
         )
 
     def _get_remote_port(self, ctx: AnyContext) -> int:
-        return get_int_attr(ctx, self._remote_port, 22, auto_render=True)
+        return get_int_attr(
+            ctx, self._remote_port, 22, auto_render=self._render_remote_port
+        )
 
     def _get_remote_user(self, ctx: AnyContext) -> str:
         return get_str_attr(

zrb/task/llm_task.py

@@ -108,8 +108,13 @@ class LLMTask(BaseTask):
         )
 
     async def _exec_action(self, ctx: AnyContext) -> Any:
-        from litellm import acompletion
+        from litellm import acompletion, supports_function_calling
 
+        model = self._get_model(ctx)
+        try:
+            allow_function_call = supports_function_calling(model=model)
+        except Exception:
+            allow_function_call = False
         model_kwargs = self._get_model_kwargs(ctx)
         ctx.log_debug("MODEL KWARGS", model_kwargs)
         system_prompt = self._get_system_prompt(ctx)
@@ -121,27 +126,28 @@ class LLMTask(BaseTask):
         messages = history + [user_message]
         available_tools = self._get_tools(ctx)
         available_tools["scratchpad"] = scratchpad
-        tool_schema = [
-            callable_to_tool_schema(tool, name)
-            for name, tool in available_tools.items()
-        ]
-        for additional_tool in self._additional_tools:
-            fn = additional_tool.fn
-            tool_name = additional_tool.name or fn.__name__
-            tool_description = additional_tool.description
-            available_tools[tool_name] = additional_tool.fn
-            tool_schema.append(
-                callable_to_tool_schema(
-                    fn, name=tool_name, description=tool_description
+        if allow_function_call:
+            tool_schema = [
+                callable_to_tool_schema(tool, name)
+                for name, tool in available_tools.items()
+            ]
+            for additional_tool in self._additional_tools:
+                fn = additional_tool.fn
+                tool_name = additional_tool.name or fn.__name__
+                tool_description = additional_tool.description
+                available_tools[tool_name] = additional_tool.fn
+                tool_schema.append(
+                    callable_to_tool_schema(
+                        fn, name=tool_name, description=tool_description
+                    )
                 )
-            )
-        ctx.log_debug("TOOL SCHEMA", tool_schema)
+            model_kwargs["tools"] = tool_schema
+            ctx.log_debug("TOOL SCHEMA", tool_schema)
         history_file = self._get_history_file(ctx)
         while True:
             response = await acompletion(
-                model=self._get_model(ctx),
+                model=model,
                 messages=[{"role": "system", "content": system_prompt}] + messages,
-                tools=tool_schema,
                 **model_kwargs,
             )
             response_message = response.choices[0].message
@@ -189,7 +195,7 @@ class LLMTask(BaseTask):
     def _get_model_kwargs(self, ctx: AnyContext) -> dict[str, Callable]:
         if callable(self._model_kwargs):
             return self._model_kwargs(ctx)
-        return self._model_kwargs
+        return {**self._model_kwargs}
 
     def _get_tools(self, ctx: AnyContext) -> dict[str, Callable]:
         if callable(self._tools):

zrb/task/rsync_task.py

@@ -24,13 +24,13 @@ class RsyncTask(CmdTask):
         remote_host: StrAttr | None = None,
         auto_render_remote_host: bool = True,
         remote_port: IntAttr | None = None,
-        auto_render_remote_port: bool = True,
+        render_remote_port: bool = True,
         remote_user: StrAttr | None = None,
-        auto_render_remote_user: bool = True,
+        render_remote_user: bool = True,
         remote_password: StrAttr | None = None,
-        auto_render_remote_password: bool = True,
+        render_remote_password: bool = True,
         remote_ssh_key: StrAttr | None = None,
-        auto_render_remote_ssh_key: bool = True,
+        render_remote_ssh_key: bool = True,
         remote_source_path: StrAttr | None = None,
         render_remote_source_path: bool = True,
         remote_destination_path: StrAttr | None = None,
@@ -63,13 +63,13 @@ class RsyncTask(CmdTask):
             remote_host=remote_host,
             render_remote_host=auto_render_remote_host,
             remote_port=remote_port,
-            auto_render_remote_port=auto_render_remote_port,
+            auto_render_remote_port=render_remote_port,
             remote_user=remote_user,
-            render_remote_user=auto_render_remote_user,
+            render_remote_user=render_remote_user,
             remote_password=remote_password,
-            render_remote_password=auto_render_remote_password,
+            render_remote_password=render_remote_password,
             remote_ssh_key=remote_ssh_key,
-            render_remote_ssh_key=auto_render_remote_ssh_key,
+            render_remote_ssh_key=render_remote_ssh_key,
             cwd=cwd,
             render_cwd=auto_render_cwd,
             max_output_line=max_output_line,

zrb/util/cmd/command.py

@@ -0,0 +1,33 @@
+import re
+
+
+def check_unrecommended_commands(cmd_script: str) -> dict[str, str]:
+    banned_commands = {
+        "<(": "Process substitution isn't POSIX compliant and causes trouble",
+        "column": "Command isn't included in Ubuntu packages and is not POSIX compliant",
+        "echo": "echo isn't consistent across OS; use printf instead",
+        "eval": "Avoid eval as it can accidentally execute arbitrary strings",
+        "realpath": "Not available by default on OSX",
+        "source": "Not POSIX compliant; use '.' instead",
+        " test": "Use '[' instead for consistency",
+        "which": "Command in not POSIX compliant, use command -v",
+    }
+    banned_commands_regex = {
+        r"grep.* -y": "grep -y does not work on Alpine; use grep -i",
+        r"grep.* -P": "grep -P is not valid on OSX",
+        r"grep[^|]+--\w{2,}": "grep long commands do not work on Alpine",
+        r'readlink.+-.*f.+["$]': "readlink -f behaves differently on OSX",
+        r"sort.*-V": "sort -V is not supported everywhere",
+        r"sort.*--sort-versions": "sort --sort-version is not supported everywhere",
+        r"\bls ": "Avoid using ls; use shell globs or find instead",
+    }
+    violations = {}
+    # Check banned commands
+    for cmd, reason in banned_commands.items():
+        if cmd in cmd_script:
+            violations[cmd] = reason
+    # Check banned regex patterns
+    for pattern, reason in banned_commands_regex.items():
+        if re.search(pattern, cmd_script):
+            violations[pattern] = reason
+    return violations

zrb/util/codemod/add_parent_to_class.py

@@ -0,0 +1,38 @@
+import libcst as cst
+
+
+class ParentClassAdder(cst.CSTTransformer):
+    def __init__(self, class_name: str, parent_class_name: str):
+        self.class_name = class_name
+        self.parent_class_name = parent_class_name
+        self.class_found = False
+
+    def leave_ClassDef(
+        self, original_node: cst.ClassDef, updated_node: cst.ClassDef
+    ) -> cst.ClassDef:
+        # Check if this is the target class
+        if original_node.name.value == self.class_name:
+            self.class_found = True
+            # Add the parent class to the existing bases
+            new_bases = (
+                *updated_node.bases,
+                cst.Arg(value=cst.Name(self.parent_class_name)),
+            )
+            return updated_node.with_changes(bases=new_bases)
+        return updated_node
+
+
+def add_parent_to_class(
+    original_code: str, class_name: str, parent_class_name: str
+) -> str:
+    # Parse the original code into a module
+    module = cst.parse_module(original_code)
+    # Initialize transformer with the class name and parent class name
+    transformer = ParentClassAdder(class_name, parent_class_name)
+    # Apply the transformation
+    modified_module = module.visit(transformer)
+    # Check if the class was found
+    if not transformer.class_found:
+        raise ValueError(f"Class {class_name} not found in the provided code.")
+    # Return the modified code
+    return modified_module.code

zrb/util/git.py

@@ -138,7 +138,11 @@ def commit(repo_dir: str, message: str) -> str:
             check=True,
         )
     except subprocess.CalledProcessError as e:
-        if "nothing to commit, working tree clean" not in e.stderr:
+        ignored_error_message = "nothing to commit, working tree clean"
+        if (
+            ignored_error_message not in e.stderr
+            and ignored_error_message not in e.stdout
+        ):
             raise Exception(e.stderr or e.stdout)
 
 

zrb/util/string/format.py

@@ -1,9 +1,19 @@
+import re
 from typing import Any
 
 
 def fstring_format(template: str, data: dict[str, Any]) -> str:
-    # Safely evaluate the template as a Python expression
+    def replace_expr(match):
+        expr = match.group(1)
+        try:
+            result = eval(expr, {}, data)
+            return str(result)
+        except Exception as e:
+            raise ValueError(f"Failed to evaluate expression: {expr}: {e}")
+
+    # Use regex to find and replace all expressions in curly braces
+    pattern = r"\{([^}]+)\}"
     try:
-        return eval(f'f"""{template}"""', {}, data)
+        return re.sub(pattern, replace_expr, template)
     except Exception as e:
         raise ValueError(f"Failed to parse template: {template}: {e}")

{zrb-1.0.0a7.dist-info → zrb-1.0.0a9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zrb
-Version: 1.0.0a7
+Version: 1.0.0a9
 Summary: Your Automation Powerhouse
 Home-page: https://github.com/state-alchemists/zrb
 License: AGPL-3.0-or-later
@@ -13,6 +13,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Provides-Extra: rag
 Requires-Dist: autopep8 (>=2.0.4,<3.0.0)
 Requires-Dist: beautifulsoup4 (>=4.12.3,<5.0.0)

{zrb-1.0.0a7.dist-info → zrb-1.0.0a9.dist-info}/RECORD

@@ -2,11 +2,11 @@ zrb/__init__.py,sha256=ESskletjBpLO78a6wLigi9wnEGtmhfc3i_rbyMvrSyU,2767
 zrb/__main__.py,sha256=Z3nrDdLh5qz4fHhsxMzo8-ui543uAkeE9PMeREX7DwQ,388
 zrb/attr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/attr/type.py,sha256=4TV5gPYMMrKh5V-yB6iRYKCbsXAH_AvGXMsjxKLHcUs,568
-zrb/builtin/__init__.py,sha256=hBnr175f1UsMFYPeD5GBoyL-uqEUy9jSrtosq87pmkU,1347
+zrb/builtin/__init__.py,sha256=4NvYylBjihEKRkPjTVtKXi4RGpl422ZZAHJFymhfksc,1661
 zrb/builtin/base64.py,sha256=1YnSwASp7OEAvQcsnHZGpJEvYoI1Z2zTIJ1bCDHfcPQ,921
-zrb/builtin/git.py,sha256=PJaDWEkP-Fi-KM63CVp6QZcYKt2OPwCwxNxKCRtTN54,4609
+zrb/builtin/git.py,sha256=ypxGT4JyokYbXMvxdWFG684sEa6x7wht1b4PxpddTMA,4544
 zrb/builtin/git_subtree.py,sha256=M5Fr8NB4LaC3ra997tzZMLeD4H5o84MvvwefrLcWEIk,3016
-zrb/builtin/group.py,sha256=jf7Z_WWBtvNOEJvrYeXFxdXaW_SJySsb6ZSpYJqpVoA,1806
+zrb/builtin/group.py,sha256=zU0dPoUU6Wq1VRzAOXcTWUfac3P2tZE-8K-vnPTN5uE,1921
 zrb/builtin/llm/llm_chat.py,sha256=ATENrihXUMkQ8IoarhacohUe-I_43yb7c0Tl5f69mAI,1397
 zrb/builtin/llm/tool/cli.py,sha256=n8THj513k1vrXUoZrTcxESmdZzhBOP1-L3Dmup5ZW54,225
 zrb/builtin/llm/tool/rag.py,sha256=rpfTMhLpkH9ZEyBcmFqLTz3UB2F6VP6w_Se2mPQVZXM,6845
@@ -69,19 +69,27 @@ zrb/builtin/project/create/create.py,sha256=IUU-4oUlESiw-ZHtnkbhnEA62_thKMDwGdAq
 zrb/builtin/project/create/project-template/README.md,sha256=BHeWF_txdTDzKewWdWfGhO3YOTiW8E3YwTMnd0T1LVA,39
 zrb/builtin/project/create/project-template/zrb_init.py,sha256=cbPl2xZbr1LXBGd296yCvfullzmryG5nTZ8mcBmu_vU,89
 zrb/builtin/python.py,sha256=herHFZl5wHsMFcqHhpisg9Ql3pQXqoCuTTwzNUTXzkw,281
+zrb/builtin/setup/common_input.py,sha256=M8q9Unt7dCfBHTHqV3__Mxk9YC2Pl3DDtxat2BanZCQ,870
+zrb/builtin/setup/dev/asdf.py,sha256=OfurmViEPibjUKF-NcM6dN0EFhqGBXuotW7VVBUQ7JE,2426
+zrb/builtin/setup/dev/asdf_helper.py,sha256=804vfpsDPH3bpOmpAZyGxJdtwcmxNvuj9i0vaIW2qNI,1318
+zrb/builtin/setup/dev/tmux.py,sha256=-MqoRJMPHUxbxHn2yeJCZFitcrT1SZUxbHlZwZHrsAA,1637
+zrb/builtin/setup/dev/tmux_config.sh,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+zrb/builtin/setup/dev/tmux_helper.py,sha256=M03l0wfL25TzGGp6lnVfX40ayT_x7N2lz-nz2chO7PU,396
+zrb/builtin/setup/system/latex/ubuntu.py,sha256=jAyzN-LloT9z6V2Ibm0uO-PaEvVu4Vq5c61LSvxq1Ww,584
+zrb/builtin/setup/system/ubuntu.py,sha256=bDvMhX0LYsFfsrz4siXEy0tBy1xdiVSIGY9rTS_h9GU,1033
 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
 zrb/builtin/shell/autocomplete/subcmd.py,sha256=WZI6cGWJcn80zSyxOHG7sCMO3Ucix3mZf4xm_xyB_Y0,606
 zrb/builtin/shell/autocomplete/zsh.py,sha256=9hlq0Wt3fhRz326mAQTypEd4_4lZdrbBx_3A-Ti3mvw,1022
-zrb/builtin/todo.py,sha256=_mIKFD0Ah37yzDjn5-gbYvdbYLX4g5w4N2LKsz0JV6A,6809
+zrb/builtin/todo.py,sha256=DSSjFTuMDCvM9O_lo60nszw2FvErgI8K0i8xsM4erKQ,6809
 zrb/callback/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/callback/any_callback.py,sha256=Yhdv5UWHAZSVzj5K2JdxcVQx8x8VX8aZJEivj3NTfZc,247
 zrb/callback/callback.py,sha256=IQ7r9EnXYHHcNXKBJAk4WFqCqj7WDvflAuCyu5y-27I,849
 zrb/cmd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/cmd/cmd_result.py,sha256=L8bQJzWCpcYexIxHBNsXj2pT3BtLmWex0iJSMkvimOA,597
 zrb/cmd/cmd_val.py,sha256=LGuE85zQt0KSjpmW7bwIE5dnfIq-ULB8V2CDAiQ-SFk,960
-zrb/config.py,sha256=izpT3RQD2ZJBI1aQyNDmbIJ6HBtFzExOUvWfPOIWd4I,2917
+zrb/config.py,sha256=5SACqVu_-Qsmv9L7cta4NeVdA9Q9DpxgYGGOlaWI2x4,3013
 zrb/content_transformer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/content_transformer/any_content_transformer.py,sha256=3XHM6ZdsJFXxRD7YlUkv0Gn7-mexsH8c8zdHt3C0x8k,741
 zrb/content_transformer/content_transformer.py,sha256=8luyLZZneBIBAMgGZvydy0TTjhI-TWFgEiQbuCxCAbk,1640
@@ -152,11 +160,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=Vn_MTR5aa3jIEWmh5LXpzezh-JwaEXPbjGKptx-Q-U8,19161
 zrb/task/base_trigger.py,sha256=milE5BNeIeq8jGCP38qTfstSvrc0CkSnO2sV-vlhzsM,4491
-zrb/task/cmd_task.py,sha256=3N3pyvz7qZ8lDB9pxGVFvfpubE33hXo48UKSmuZDGc0,10249
+zrb/task/cmd_task.py,sha256=sF4fT-inYhbR831Oht0LDMMuPCjY5TnIx9-rgPghnsI,11446
 zrb/task/http_check.py,sha256=TwQCql3589a4-H2c7hgS1HayyU-NdBAdJ4qQNTvjXHM,2474
-zrb/task/llm_task.py,sha256=5TQPEvuHKex8qj9zhQcgX6TNTFOFU4E27JfR7UxWvNI,8333
+zrb/task/llm_task.py,sha256=-OpLLXl39H1diHlPq1S8uiIwfQk_TY7nN8GHKqL4_m4,8643
 zrb/task/make_task.py,sha256=ldXRfe3rA8utJrEPjWrie-_tg6NM2G8sFnZ0UNqzT08,2179
-zrb/task/rsync_task.py,sha256=rmC2lWEkIrN4ejnV7gNZjN5sB-IbXmSHiTbs-PGh80c,6267
+zrb/task/rsync_task.py,sha256=vENITMBXShKgj-NNgjM8eUK2ujU3wD8MUvyS_69ePEA,6227
 zrb/task/scaffolder.py,sha256=tRSHsy3nXSRNu9QY7hRMZ8ppfjYmFswiWDMRmLlv3VI,6220
 zrb/task/scheduler.py,sha256=kggRClk_RrAa5fAHfkqM6c-e2tUQiFSeyeLuFT26UZ4,3047
 zrb/task/task.py,sha256=KCrCaWYOQQvv1RJsYtHDeo9RBFmlXQ28oKyEFU4Q7pA,73
@@ -169,6 +177,7 @@ zrb/util/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/util/cli/style.py,sha256=Pbqzu_fuhMDYDRjAH6Wl-oUW4-68tEOmv_ugJ3xH8qI,3671
 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=dGihcEASO_5hkQbtpnLhd0FMZMNtdXk6W8X7ZP_2bQY,1545
 zrb/util/cmd/remote.py,sha256=VklVORobTmE7FqdtYsVLq9xkSYTR2W5r2Zou0-soidw,710
 zrb/util/codemod/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/util/codemod/add_code_to_class.py,sha256=jg-ISD3sHCecOJ1CCJGR9quizRgvzddKH9GZ33-IQ1A,1358
@@ -176,9 +185,10 @@ zrb/util/codemod/add_code_to_function.py,sha256=iJT-cDxS_H72j3ec03Lqmm4YPe-6svB2
 zrb/util/codemod/add_code_to_method.py,sha256=TiYj9N0eMi3dutwQw_y4gnu1G6PW_-fZDqHatvZxJDo,2359
 zrb/util/codemod/add_key_to_dict.py,sha256=ROw7Ds73gP5G5vOYlSqcHGUQQmJP_6Vb2jPnV2kZPQM,2110
 zrb/util/codemod/add_param_to_function_call.py,sha256=cNC16uYbkjl33QEZ7i3pYvifGJXSXEoyfyCYx96S8ZI,1567
+zrb/util/codemod/add_parent_to_class.py,sha256=LeJi8AOOOOatOZCpSHIXBNgvw_ytKd-MdEczNs4gXKk,1416
 zrb/util/codemod/add_property_to_class.py,sha256=43ll7b7SUWHPDpIoMp8Zp_I71wG1eAvnW_acp-HVF_4,2075
 zrb/util/cron.py,sha256=9fTGatUMYCRgmDFGg-z6_XerT4U5Vq72nD05NnEVUm4,2852
-zrb/util/git.py,sha256=kG9Gn4aRMUjK6TwzyFaW2UrVKZTQdmeZCtNpkEy5Z68,5019
+zrb/util/git.py,sha256=QNGvJJ9kY1Hy6WNO4d22D_GXyC1l3yGtTOMJ9nXqqpc,5151
 zrb/util/git_subtree.py,sha256=DidHZdKcpylomlJLiUyQJSpPSXaY399e-97H0WbOcvs,2619
 zrb/util/group.py,sha256=Bg7HrSycoK110U5s_Tca6-uUQuZ5CMgb8wxZSrvDQ98,2790
 zrb/util/llm/tool.py,sha256=9ezbPEAyMKLWABgeqAimJ82KBFl7ciWNFVGhtllXg6s,2106
@@ -186,12 +196,12 @@ zrb/util/load.py,sha256=VMScnycP8blLFOGXjFAKShbV-yvPXwRA_J2vt96T-wc,1552
 zrb/util/run.py,sha256=DGHUP9x1Q8V8UF3FbpmjLGuhVVCCLfjTH2teT8qXlNI,207
 zrb/util/string/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/util/string/conversion.py,sha256=utfzaCLS2LTWMr9YbjXt2Z0a_pgzOjq76ZEPUh2UKCc,2876
-zrb/util/string/format.py,sha256=LuKznDICnnbMOjM7_CEY0drlIlpdNqbBL-n6M4yEUVI,306
+zrb/util/string/format.py,sha256=c9dUrsl_DII7jZZPJi9NBTvxKnrzZDPcQuksW6FJ_Lk,611
 zrb/util/string/name.py,sha256=8picJfUBXNpdh64GNaHv3om23QHhUZux7DguFLrXHp8,1163
 zrb/util/todo.py,sha256=Nbe1a-7O5FSkIE7BZxQQt7AhbHFPDbreJJI6C7Rga4o,9171
 zrb/xcom/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/xcom/xcom.py,sha256=P4aYHdE3FRsTsNrXGyW8N44IWZjw-vG_qys1Ymn3aBg,1572
-zrb-1.0.0a7.dist-info/METADATA,sha256=GdHwKrXSDjixmwwY6mmWL1219laRI1EPxDTF9awi0uw,4105
-zrb-1.0.0a7.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-zrb-1.0.0a7.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
-zrb-1.0.0a7.dist-info/RECORD,,
+zrb-1.0.0a9.dist-info/METADATA,sha256=I-IYEhKvXQCh4yoCKZ43xtcHL1A1lksK4mJ7sR8c_Wo,4156
+zrb-1.0.0a9.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+zrb-1.0.0a9.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
+zrb-1.0.0a9.dist-info/RECORD,,

{zrb-1.0.0a7.dist-info → zrb-1.0.0a9.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.0
+Generator: poetry-core 1.9.1
 Root-Is-Purelib: true
 Tag: py3-none-any