zrb 1.1.0__py3-none-any.whl → 1.2.0__py3-none-any.whl

zrb/builtin/git.py

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

zrb/builtin/llm/llm_chat.py

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

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

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

zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/input.py

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

zrb/builtin/project/create/project_task.py

@@ -15,13 +15,13 @@ scaffold_project = Scaffolder(
             name="project-dir",
             description="Project directory",
             prompt="Project directory",
-            default_str=lambda _: os.getcwd(),
+            default=lambda _: os.getcwd(),
         ),
         StrInput(
             name="project",
             description="Project name",
             prompt="Project name",
-            default_str=lambda ctx: os.path.basename(ctx.input.project_dir),
+            default=lambda ctx: os.path.basename(ctx.input.project_dir),
         ),
     ],
     source_path=os.path.join(_DIR, "project-template"),

zrb/builtin/random.py

@@ -15,13 +15,13 @@ from zrb.task.make_task import make_task
             name="side",
             description="Number of sides",
             prompt="How many sides (comma separated)",
-            default_str="6",
+            default="6",
         ),
         IntInput(
             name="num-rolls",
             description="Number of rolls",
             prompt="How many rolls",
-            default_str="1",
+            default="1",
         ),
     ],
     retries=0,
@@ -48,7 +48,7 @@ def throw_dice(ctx: AnyContext) -> str:
         name="values",
         description="Value to be shuffled",
         prompt="List of values (comma separated)",
-        default_str="🪙, 🪄, ⚔️, 🍷",
+        default="🪙, 🪄, ⚔️, 🍷",
     ),
     retries=0,
     group=random_group,

zrb/builtin/setup/common_input.py

@@ -6,30 +6,30 @@ package_manager_input = OptionInput(
     description="Your package manager",
     prompt="Your package manager",
     options=["apt", "dnf", "pacman", "zypper", "pkg", "brew", "spack"],
-    default_str="apt",
+    default="apt",
 )
 
 use_sudo_input = BoolInput(
     name="use-sudo",
     description="Use sudo or not",
     prompt="Need sudo",
-    default_str="yes",
+    default=True,
 )
 
 setup_bash_input = BoolInput(
     name="setup-bash",
     description="Setup bash",
     prompt="Setup bash",
-    default_str="yes",
+    default=True,
 )
 
 setup_zsh_input = BoolInput(
-    name="setup-zsh", description="Setup zsh", prompt="Setup zsh", default_str="yes"
+    name="setup-zsh", description="Setup zsh", prompt="Setup zsh", default=True
 )
 
 setup_powershell_input = BoolInput(
     name="setup-powershell",
     description="Setup powershell",
     prompt="Setup powershell",
-    default_str="no",
+    default=False,
 )

zrb/builtin/setup/tmux/tmux.py

@@ -22,7 +22,7 @@ install_tmux = CmdTask(
         name="tmux-config",
         description="Tmux config file",
         prompt="Tmux config file",
-        default_str="~/.tmux.conf",
+        default="~/.tmux.conf",
     ),
     description="📺 Setup `tmux`.",
     group=setup_group,

zrb/builtin/setup/zsh/zsh.py

@@ -34,7 +34,7 @@ install_zinit = CmdTask(
         name="zsh-config",
         description="zsh config file",
         prompt="zsh config file",
-        default_str="~/.zshrc",
+        default="~/.zshrc",
     ),
     upstream=[install_omz, install_zinit],
     description="💻 Setup `zsh`.",

zrb/builtin/todo.py

@@ -37,7 +37,7 @@ from zrb.util.todo import (
             name="priority",
             description="Task priority",
             prompt="Task priority",
-            default_str="E",
+            default="E",
         ),
         StrInput(
             name="project",
@@ -208,13 +208,13 @@ def archive_todo(ctx: AnyContext):
             name="duration",
             prompt="Working duration",
             description="Working duration",
-            default_str="30m",
+            default="30m",
         ),
         StrInput(
             name="stop",
             prompt="Working stop time (%Y-%m-%d %H:%M:%S)",
             description="Working stop time",
-            default_str=lambda _: _get_default_stop_work_time_str(),
+            default=lambda _: _get_default_stop_work_time_str(),
         ),
     ],
     description="🕒 Log work todo",
@@ -293,7 +293,7 @@ def _get_default_stop_work_time_str() -> str:
             name="text",
             description="Todo.txt content",
             prompt="Todo.txt content (will override existing)",
-            default_str=lambda _: _get_todo_txt_content(),
+            default=lambda _: _get_todo_txt_content(),
             allow_positional_parsing=False,
         ),
     ],

zrb/input/base_input.py

@@ -1,9 +1,9 @@
 from typing import Any
 
-from zrb.attr.type import StrAttr
+from zrb.attr.type import AnyAttr
 from zrb.context.any_shared_context import AnySharedContext
 from zrb.input.any_input import AnyInput
-from zrb.util.attr import get_str_attr
+from zrb.util.attr import get_attr
 from zrb.util.string.conversion import to_snake_case
 
 
@@ -13,7 +13,7 @@ class BaseInput(AnyInput):
         name: str,
         description: str | None = None,
         prompt: str | None = None,
-        default_str: StrAttr = "",
+        default: AnyAttr = "",
         auto_render: bool = True,
         allow_empty: bool = False,
         allow_positional_parsing: bool = True,
@@ -21,7 +21,7 @@ class BaseInput(AnyInput):
         self._name = name
         self._description = description
         self._prompt = prompt
-        self._default_str = default_str
+        self._default_value = default
         self._auto_render = auto_render
         self._allow_empty = allow_empty
         self._allow_positional_parsing = allow_positional_parsing
@@ -45,10 +45,10 @@ class BaseInput(AnyInput):
     def allow_positional_parsing(self) -> bool:
         return self._allow_positional_parsing
 
-    def to_html(self, ctx: AnySharedContext) -> str:
+    def to_html(self, shared_ctx: AnySharedContext) -> str:
         name = self.name
         description = self.description
-        default = self.get_default_str(ctx)
+        default = self.get_default_str(shared_ctx)
         return f'<input name="{name}" placeholder="{description}" value="{default}" />'
 
     def update_shared_context(
@@ -74,6 +74,7 @@ class BaseInput(AnyInput):
         return str_value
 
     def prompt_cli_str(self, shared_ctx: AnySharedContext) -> str:
+        """Prompting user to input the value"""
         value = self._prompt_cli_str(shared_ctx)
         while not self._allow_empty and value == "":
             value = self._prompt_cli_str(shared_ctx)
@@ -81,16 +82,20 @@ class BaseInput(AnyInput):
 
     def _prompt_cli_str(self, shared_ctx: AnySharedContext) -> str:
         prompt_message = self.prompt_message
-        default_value = self.get_default_str(shared_ctx)
-        if default_value != "":
-            prompt_message = f"{prompt_message} [{default_value}]"
+        default_str = self.get_default_str(shared_ctx)
+        if default_str != "":
+            prompt_message = f"{prompt_message} [{default_str}]"
         print(f"{prompt_message}: ", end="")
         value = input()
         if value.strip() == "":
-            value = default_value
+            value = default_str
         return value
 
     def get_default_str(self, shared_ctx: AnySharedContext) -> str:
-        return get_str_attr(
-            shared_ctx, self._default_str, auto_render=self._auto_render
+        """Get default value as str"""
+        default_value = get_attr(
+            shared_ctx, self._default_value, default="", auto_render=self._auto_render
         )
+        if not isinstance(default_value, str):
+            return str(default_value)
+        return default_value

zrb/input/bool_input.py

@@ -1,6 +1,7 @@
-from zrb.attr.type import StrAttr
+from zrb.attr.type import BoolAttr
 from zrb.context.any_shared_context import AnySharedContext
 from zrb.input.base_input import BaseInput
+from zrb.util.attr import get_bool_attr
 from zrb.util.string.conversion import to_boolean
 
 
@@ -10,7 +11,7 @@ class BoolInput(BaseInput):
         name: str,
         description: str | None = None,
         prompt: str | None = None,
-        default_str: StrAttr = "False",
+        default: BoolAttr = False,
         auto_render: bool = True,
         allow_empty: bool = False,
         allow_positional_parsing: bool = True,
@@ -19,16 +20,16 @@ class BoolInput(BaseInput):
             name=name,
             description=description,
             prompt=prompt,
-            default_str=default_str,
+            default=default,
             auto_render=auto_render,
             allow_empty=allow_empty,
             allow_positional_parsing=allow_positional_parsing,
         )
 
-    def to_html(self, ctx: AnySharedContext) -> str:
+    def to_html(self, shared_ctx: AnySharedContext) -> str:
         name = self.name
         description = self.description
-        default = to_boolean(self.get_default_str(ctx))
+        default = to_boolean(self.get_default_str(shared_ctx))
         selected_true = "selected" if default else ""
         selected_false = "selected" if not default else ""
         return "\n".join(
@@ -40,5 +41,11 @@ class BoolInput(BaseInput):
             ]
         )
 
+    def get_default_str(self, shared_ctx: AnySharedContext) -> str:
+        default_value = get_bool_attr(
+            shared_ctx, self._default_value, auto_render=self._auto_render
+        )
+        return f"{default_value}"
+
     def _parse_str_value(self, str_value: str) -> bool:
         return to_boolean(str_value)

zrb/input/float_input.py

@@ -1,6 +1,7 @@
-from zrb.attr.type import StrAttr
+from zrb.attr.type import FloatAttr
 from zrb.context.any_shared_context import AnySharedContext
 from zrb.input.base_input import BaseInput
+from zrb.util.attr import get_float_attr
 
 
 class FloatInput(BaseInput):
@@ -9,7 +10,7 @@ class FloatInput(BaseInput):
         name: str,
         description: str | None = None,
         prompt: str | None = None,
-        default_str: StrAttr = "0.0",
+        default: FloatAttr = 0.0,
         auto_render: bool = True,
         allow_empty: bool = False,
         allow_positional_parsing: bool = True,
@@ -18,17 +19,23 @@ class FloatInput(BaseInput):
             name=name,
             description=description,
             prompt=prompt,
-            default_str=default_str,
+            default=default,
             auto_render=auto_render,
             allow_empty=allow_empty,
             allow_positional_parsing=allow_positional_parsing,
         )
 
-    def to_html(self, ctx: AnySharedContext) -> str:
+    def to_html(self, shared_ctx: AnySharedContext) -> str:
         name = self.name
         description = self.description
-        default = self.get_default_str(ctx)
+        default = self.get_default_str(shared_ctx)
         return f'<input type="number" name="{name}" placeholder="{description}" value="{default}" step="any" />'  # noqa
 
+    def get_default_str(self, shared_ctx: AnySharedContext) -> str:
+        default_value = get_float_attr(
+            shared_ctx, self._default_value, auto_render=self._auto_render
+        )
+        return f"{default_value}"
+
     def _parse_str_value(self, str_value: str) -> float:
         return float(str_value)

zrb/input/int_input.py

@@ -1,6 +1,7 @@
-from zrb.attr.type import StrAttr
+from zrb.attr.type import IntAttr
 from zrb.context.any_shared_context import AnySharedContext
 from zrb.input.base_input import BaseInput
+from zrb.util.attr import get_int_attr
 
 
 class IntInput(BaseInput):
@@ -9,7 +10,7 @@ class IntInput(BaseInput):
         name: str,
         description: str | None = None,
         prompt: str | None = None,
-        default_str: StrAttr = "0",
+        default: IntAttr = 0,
         auto_render: bool = True,
         allow_empty: bool = False,
         allow_positional_parsing: bool = True,
@@ -18,17 +19,23 @@ class IntInput(BaseInput):
             name=name,
             description=description,
             prompt=prompt,
-            default_str=default_str,
+            default=default,
             auto_render=auto_render,
             allow_empty=allow_empty,
             allow_positional_parsing=allow_positional_parsing,
         )
 
-    def to_html(self, ctx: AnySharedContext) -> str:
+    def to_html(self, shared_ctx: AnySharedContext) -> str:
         name = self.name
         description = self.description
-        default = self.get_default_str(ctx)
+        default = self.get_default_str(shared_ctx)
         return f'<input type="number" step="1" name="{name}" placeholder="{description}" value="{default}" />'  # noqa
 
     def _parse_str_value(self, str_value: str) -> int:
         return int(str_value)
+
+    def get_default_str(self, shared_ctx: AnySharedContext) -> str:
+        default_value = get_int_attr(
+            shared_ctx, self._default_value, auto_render=self._auto_render
+        )
+        return f"{default_value}"

zrb/input/option_input.py

@@ -11,7 +11,7 @@ class OptionInput(BaseInput):
         description: str | None = None,
         prompt: str | None = None,
         options: StrListAttr = [],
-        default_str: StrAttr = "",
+        default: StrAttr = "",
         auto_render: bool = True,
         allow_empty: bool = False,
         allow_positional_parsing: bool = True,
@@ -20,19 +20,19 @@ class OptionInput(BaseInput):
             name=name,
             description=description,
             prompt=prompt,
-            default_str=default_str,
+            default=default,
             auto_render=auto_render,
             allow_empty=allow_empty,
             allow_positional_parsing=allow_positional_parsing,
         )
         self._options = options
 
-    def to_html(self, ctx: AnySharedContext) -> str:
+    def to_html(self, shared_ctx: AnySharedContext) -> str:
         name = self.name
         description = self.description
-        default = self.get_default_str(ctx)
+        default = self.get_default_str(shared_ctx)
         html = [f'<select name="{name}" placeholder="{description}">']
-        for value in get_str_list_attr(ctx, self._options, self._auto_render):
+        for value in get_str_list_attr(shared_ctx, self._options, self._auto_render):
             selected = "selected" if value == default else ""
             html.append(f'<option value="{value}" {selected}>{value}</option>')
         html.append("</select>")

zrb/input/password_input.py

@@ -1,6 +1,6 @@
 import getpass
-from collections.abc import Callable
 
+from zrb.attr.type import StrAttr
 from zrb.context.any_shared_context import AnySharedContext
 from zrb.input.base_input import BaseInput
 
@@ -11,7 +11,7 @@ class PasswordInput(BaseInput):
         name: str,
         description: str | None = None,
         prompt: str | None = None,
-        default_str: str | Callable[[AnySharedContext], str] = "",
+        default: StrAttr = "",
         auto_render: bool = True,
         allow_empty: bool = False,
         allow_positional_parsing: bool = True,
@@ -20,17 +20,17 @@ class PasswordInput(BaseInput):
             name=name,
             description=description,
             prompt=prompt,
-            default_str=default_str,
+            default=default,
             auto_render=auto_render,
             allow_empty=allow_empty,
             allow_positional_parsing=allow_positional_parsing,
         )
         self._is_secret = True
 
-    def to_html(self, ctx: AnySharedContext) -> str:
+    def to_html(self, shared_ctx: AnySharedContext) -> str:
         name = self.name
         description = self.description
-        default = self.get_default_str(ctx)
+        default = self.get_default_str(shared_ctx)
         return f'<input type="password" name="{name}" placeholder="{description}" value="{default}" />'  # noqa
 
     def _prompt_cli_str(self, shared_ctx: AnySharedContext) -> str:

zrb/input/text_input.py

@@ -15,7 +15,7 @@ class TextInput(BaseInput):
         name: str,
         description: str | None = None,
         prompt: str | None = None,
-        default_str: str | Callable[[AnySharedContext], str] = "",
+        default: str | Callable[[AnySharedContext], str] = "",
         auto_render: bool = True,
         allow_empty: bool = False,
         allow_positional_parsing: bool = True,
@@ -28,7 +28,7 @@ class TextInput(BaseInput):
             name=name,
             description=description,
             prompt=prompt,
-            default_str=default_str,
+            default=default,
             auto_render=auto_render,
             allow_empty=allow_empty,
             allow_positional_parsing=allow_positional_parsing,
@@ -56,10 +56,10 @@ class TextInput(BaseInput):
             return " -->"
         return ""
 
-    def to_html(self, ctx: AnySharedContext) -> str:
+    def to_html(self, shared_ctx: AnySharedContext) -> str:
         name = self.name
         description = self.description
-        default = self.get_default_str(ctx)
+        default = self.get_default_str(shared_ctx)
         return "\n".join(
             [
                 f'<textarea name="{name}" placeholder="{description}">',

{zrb-1.1.0.dist-info → zrb-1.2.0.dist-info}/METADATA

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

{zrb-1.1.0.dist-info → zrb-1.2.0.dist-info}/RECORD

@@ -4,10 +4,10 @@ zrb/attr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/attr/type.py,sha256=4TV5gPYMMrKh5V-yB6iRYKCbsXAH_AvGXMsjxKLHcUs,568
 zrb/builtin/__init__.py,sha256=oXG4Zm_rIp3G81Y7hiSe38jeS2sGZAnADoP_yxxhYEc,1926
 zrb/builtin/base64.py,sha256=1YnSwASp7OEAvQcsnHZGpJEvYoI1Z2zTIJ1bCDHfcPQ,921
-zrb/builtin/git.py,sha256=PhkTcW36aY5vnL3dnJexyO9OLjoajfzdszh57iVqUyk,5493
+zrb/builtin/git.py,sha256=8_qVE_2lVQEVXQ9vhiw8Tn4Prj1VZB78ZjEJJS5Ab3M,5461
 zrb/builtin/git_subtree.py,sha256=7BKwOkVTWDrR0DXXQ4iJyHqeR6sV5VYRt8y_rEB0EHg,3505
 zrb/builtin/group.py,sha256=-phJfVpTX3_gUwS1u8-RbZUHe-X41kxDBSmrVh4rq8E,1682
-zrb/builtin/llm/llm_chat.py,sha256=vUUchYKJuHr-N_HarpKRFsV0EdQDAFZzAfbK4C0vx88,4508
+zrb/builtin/llm/llm_chat.py,sha256=UVhfJR0APXRC3tEv5i5vYbEANWqi04QD_WsAiARJ7j4,4494
 zrb/builtin/llm/previous-session.js,sha256=xMKZvJoAbrwiyHS0OoPrWuaKxWYLoyR5sguePIoCjTY,816
 zrb/builtin/llm/tool/api.py,sha256=yQ3XV8O7Fx7hHssLSOcmiHDnevPhz9ktWi44HK7zTls,801
 zrb/builtin/llm/tool/cli.py,sha256=to_IjkfrMGs6eLfG0cpVN9oyADWYsJQCtyluUhUdBww,253
@@ -15,7 +15,7 @@ zrb/builtin/llm/tool/rag.py,sha256=PawaLZL-ThctxtBtsQuP3XsgTxQKyCGFqrudCANPJKk,5
 zrb/builtin/llm/tool/web.py,sha256=N2HYuXbKPUpjVAq_UnQMbUrTIE8u0Ut3TeQadZ7_NJc,2217
 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_input.py,sha256=MKlWR_LxWhM_DcULCtLfL_IjTxpDnDBkn9KIqNmajFs,310
 zrb/builtin/project/add/fastapp/fastapp_task.py,sha256=mUMZjC413DhZSKqA6donPTxVbd_DnDFqSV_ZTqQnSHs,2697
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/.coveragerc,sha256=MsTf0Vlt_pxV-j4mNh-TxSo7sTI_GaVS_oM4tksIykE,181
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/.flake8,sha256=fgvHmuskgYiCvHZHaFtiyOWW0zasVrs0P-sFHOq3W5U,56
@@ -43,7 +43,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/entity/template/navigation_config_file.py,sha256=8dYj8GyvhTIr0lny_3aZec2BTHMBFTVRGLLH4OoWvCo,186
 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=NBy_9xwvbFvKWt2bHRyzNQr4zUrP4lUGd6L7k_eA5do,1523
+zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/input.py,sha256=_LagLs2R9Eao4xJ1d2i_Yj1ELu7uZGNJnK90ruvY0O8,1511
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/module/add_module_task.py,sha256=_1sJd91bViSfEbpxNgqeCE7gBHP7yH9i7uJbPu9OvtY,4058
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/module/add_module_util.py,sha256=NtQX3F9vVGJAPkzt6VffXGru8ULh4gYWeDxNk1Qepek,8293
 zrb/builtin/project/add/fastapp/fastapp_template/my_app_name/_zrb/module/template/app_template/module/gateway/subroute/my_module.py,sha256=_5EgmEeATL5ZSX5MSJixkDgRQKGNTPG6watEuzv3eQI,418
@@ -181,18 +181,18 @@ zrb/builtin/project/add/fastapp/fastapp_util.py,sha256=UVzKfljUDLvlassnKy8pKH4hB
 zrb/builtin/project/create/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/builtin/project/create/project-template/README.md,sha256=BHeWF_txdTDzKewWdWfGhO3YOTiW8E3YwTMnd0T1LVA,39
 zrb/builtin/project/create/project-template/zrb_init.py,sha256=kY0x5MrkIVl3l1GtN2ROrYGNpsfN2dgRT84LCcSrGUs,44
-zrb/builtin/project/create/project_task.py,sha256=B6ao8sd26mtLAkxwqjqiHy47PuACslYQtwAGcutgq7I,1140
+zrb/builtin/project/create/project_task.py,sha256=az-yd2FRDmGZ_7qxslmW11ryTeI3yttRmXtlFnZhF00,1132
 zrb/builtin/python.py,sha256=e-yyVWovwlxCBLyXGsd9Ek3IAL_X-Q_hpNNOPoRjOgk,349
-zrb/builtin/random.py,sha256=R2RfSwiGudWa4zNvv-p7iQ027QGRr3r0QfwnDqQtwkY,1805
+zrb/builtin/random.py,sha256=p9kCvosSiSJyuGQrlrXuIQT8TRDGxXhfiUbsm3GFPd0,1793
 zrb/builtin/setup/asdf/asdf.py,sha256=n_dWoyYa7vZ9tBCy8hgxmSWZ-XHltC1R70mIVZQhnXY,2419
 zrb/builtin/setup/asdf/asdf_helper.py,sha256=6jARtyIAE1H82HKVQ84D25RrMAsAip_gD28X9ZlaTCk,1205
-zrb/builtin/setup/common_input.py,sha256=M8q9Unt7dCfBHTHqV3__Mxk9YC2Pl3DDtxat2BanZCQ,870
+zrb/builtin/setup/common_input.py,sha256=zIVVsZsNlSoV2Fw8kyt7g5B8XAU8cWBsT865NPoddwo,848
 zrb/builtin/setup/latex/ubuntu.py,sha256=er9wJAT4CpmghIaiIPFb3FvgqAn1aqU5UgX7GHL3FjA,577
-zrb/builtin/setup/tmux/tmux.py,sha256=r7XdEx-AcHiF63uhOqgDuhSq0DR1IK52fHj3ZMtUrZg,1407
+zrb/builtin/setup/tmux/tmux.py,sha256=YaiZKQODsBDip2ya5pA02c2-lfLDU8VKGbeHwFWI43s,1403
 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.py,sha256=b9_UDSJpOT246RiL5BNr6N1jqNHzoUQircZ_u6dkU5g,1820
 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
@@ -200,7 +200,7 @@ zrb/builtin/shell/autocomplete/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5
 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=8swb5i9KWqaLfKKcKSQhu5K1QtW3RAYR1vFqsBjw-GY,10840
+zrb/builtin/todo.py,sha256=zlMJhnlnhKhJ2v9arrakEfbqVrMsAPW3vMwiBKEeoZk,10824
 zrb/callback/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/callback/any_callback.py,sha256=Yhdv5UWHAZSVzj5K2JdxcVQx8x8VX8aZJEivj3NTfZc,247
 zrb/callback/callback.py,sha256=hKefB_Jd1XGjPSLQdMKDsGLHPzEGO2dqrIArLl_EmD0,848
@@ -228,14 +228,14 @@ zrb/group/any_group.py,sha256=1rNcsi5eu_86JAx_6Jy46SK4BTeppcb89MORynJd-4o,1115
 zrb/group/group.py,sha256=JFmWVEQ9PVy2WCf5pUG74iwL2xcGxXaAjT-NArAeloM,1861
 zrb/input/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/input/any_input.py,sha256=tvls3uJBVPLW5Oawxof9qWCX-lH1h_RErxjYNu1bwtY,899
-zrb/input/base_input.py,sha256=uHOZeU4OyO05e-kMXDo5MLC76ZWJXzhdhB6akaBzhtU,3383
-zrb/input/bool_input.py,sha256=mqD1c7RT683Aui2IsdJUoNiSo7iU3iYrm53e2SjaOrQ,1493
-zrb/input/float_input.py,sha256=8HhVWZsyqw1WaN3CysIgvGXkHfVsuLChUEggHODxOTk,1125
-zrb/input/int_input.py,sha256=e5F049nwe_Iaiymuh41dZtBOY-DG1AhVP-8gF0IO0n4,1115
-zrb/input/option_input.py,sha256=8K0fn5joYeiAA8GevckVrGghbrIcD9GPShDfhAU67cw,2049
-zrb/input/password_input.py,sha256=6TW3J7K3ilcstv681PIXL_Mgd6pkNDTCMH8exlqDOiM,1421
+zrb/input/base_input.py,sha256=J1lvo96YieaceFeReNoon2N4bOgRK7lBrDfRoINLu9g,3599
+zrb/input/bool_input.py,sha256=bxX2-T8XTlz5zq4gkk3LMHX8S93gdvTUsZ0I6DH56VU,1762
+zrb/input/float_input.py,sha256=Mfl8CygKMkRFv1l6jM28FqQ6SIIB2ZpbaYoM-JMNyXU,1398
+zrb/input/int_input.py,sha256=w5ewSxstUYv5LBAzvX_E0jIueXXdmnY2ehoQMTtg-EA,1380
+zrb/input/option_input.py,sha256=IrpF0XvFbH5G-IEAnoQ4QOvq7gn2wyT4jKwAdMKwV0s,2058
+zrb/input/password_input.py,sha256=Tu8TZx95717YsHICZ0zBzTUPKPf-K9vGlvRyaOTrFEM,1388
 zrb/input/str_input.py,sha256=NevZHX9rf1g8eMatPyy-kUX3DglrVAQpzvVpKAzf7bA,81
-zrb/input/text_input.py,sha256=cVmuNBTFl7oulwG6VVWI-QTECLSdP_0xwIaCZpkkaM8,3143
+zrb/input/text_input.py,sha256=wSNiYAx2xYPtl09Dfh_uHws9WG2dRqkS0Jnlm9HvD3s,3145
 zrb/runner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/runner/cli.py,sha256=G_ILZCFzpV-kRE3dm1kq6BorB51TLJ34Qmhgy5SIMlU,6734
 zrb/runner/common_util.py,sha256=mjEBSmfdY2Sun2U5-8y8gGwF82OiRM8sgiYDOdW9NA4,1338
@@ -330,7 +330,6 @@ zrb/util/file.py,sha256=mgNobIKCr0eIQUlg6W2Yg1fvg943VyuOUF8WMFpJA5A,859
 zrb/util/git.py,sha256=TShnMxPAk20Tglp25d_XPVZX-q0mvKeqdprVMeXQ5f0,4787
 zrb/util/git_subtree.py,sha256=zyWl0aUEZJyUJKjfw1uglozB4R1kF9pWtfKjhu8DN44,2658
 zrb/util/group.py,sha256=Bg7HrSycoK110U5s_Tca6-uUQuZ5CMgb8wxZSrvDQ98,2790
-zrb/util/llm/tool.py,sha256=NkENrUlGxcqqU7jzHAH7DBXNcm_ndEo2dFnJ5nhvWmk,2991
 zrb/util/load.py,sha256=m0e5DVLV7_RON6AZdjkquPym6BBrvYBbDMrllV44Y_k,1993
 zrb/util/run.py,sha256=DGHUP9x1Q8V8UF3FbpmjLGuhVVCCLfjTH2teT8qXlNI,207
 zrb/util/string/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -340,7 +339,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.1.0.dist-info/METADATA,sha256=ToQqd9WUQX9-PEmYoYDjynW5RG2gdnRO2Rv0c0lxIoU,4307
-zrb-1.1.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-zrb-1.1.0.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
-zrb-1.1.0.dist-info/RECORD,,
+zrb-1.2.0.dist-info/METADATA,sha256=DlgVxKkUzjjMmqfdqv1h2jqlZGprsQGYraHstWCkEU4,4307
+zrb-1.2.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+zrb-1.2.0.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
+zrb-1.2.0.dist-info/RECORD,,

zrb/util/llm/tool.py

@@ -1,87 +0,0 @@
-import inspect
-from collections.abc import Callable
-from typing import Annotated, Any, Literal, get_type_hints
-
-
-def callable_to_tool_schema(callable_obj: Callable) -> dict[str, Any]:
-    """
-    Convert a callable into a tool schema dictionary by deriving the parameter schema.
-
-    :param callable_obj: The callable object (e.g., a function).
-    :return: A dictionary representing the tool schema.
-    """
-    if not callable(callable_obj):
-        raise ValueError("Provided object is not callable")
-    # Derive name and description
-    name = callable_obj.__name__
-    description = (callable_obj.__doc__ or "").strip()
-    # Get function signature
-    sig = inspect.signature(callable_obj)
-    hints = get_type_hints(callable_obj)
-    # Build parameter schema
-    param_schema = {"type": "object", "properties": {}, "required": []}
-    for param_name, param in sig.parameters.items():
-        # Get the type hint or default to str
-        param_type = hints.get(param_name, str)
-
-        # Handle annotated types (e.g., Annotated[str, "description"])
-        json_type, param_metadata = _process_type_annotation(param_type)
-        param_schema["properties"][param_name] = param_metadata
-
-        # Mark required parameters
-        if param.default is inspect.Parameter.empty:
-            param_schema["required"].append(param_name)
-    return {
-        "type": "function",
-        "function": {
-            "name": name,
-            "description": description,
-            "parameters": param_schema,
-        },
-    }
-
-
-def _process_type_annotation(py_type: Any) -> tuple[str, dict]:
-    """
-    Process type annotations and return the JSON Schema type and metadata.
-
-    :param py_type: The type annotation.
-    :return: A tuple of (JSON type, parameter metadata).
-    """
-    if hasattr(py_type, "__origin__") and py_type.__origin__ is Literal:
-        # Handle Literal (enum)
-        enum_values = list(py_type.__args__)
-        return "string", {"type": "string", "enum": enum_values}
-
-    if hasattr(py_type, "__origin__") and py_type.__origin__ is Annotated:
-        # Handle Annotated types
-        base_type = py_type.__args__[0]
-        description = py_type.__args__[1]
-        json_type = _python_type_to_json_type(base_type)
-        return json_type, {"type": json_type, "description": description}
-
-    # Fallback to basic type conversion
-    json_type = _python_type_to_json_type(py_type)
-    return json_type, {"type": json_type}
-
-
-def _python_type_to_json_type(py_type):
-    """
-    Map Python types to JSON Schema types.
-    """
-    if py_type is str:
-        return "string"
-    elif py_type is int:
-        return "integer"
-    elif py_type is float:
-        return "number"
-    elif py_type is bool:
-        return "boolean"
-    elif py_type is list:
-        return "array"
-    elif py_type is dict:
-        return "object"
-    elif py_type in {None, type(None)}:
-        return "null"
-    else:
-        return "string"  # Default to string for unsupported types