zrb 1.1.0__tar.gz → 1.2.0__tar.gz

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

@@ -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 → zrb-1.2.0}/pyproject.toml

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

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

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

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

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

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

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

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

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

{zrb-1.1.0 → zrb-1.2.0}/src/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-1.1.0 → zrb-1.2.0}/src/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-1.1.0 → zrb-1.2.0}/src/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-1.1.0 → zrb-1.2.0}/src/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-1.1.0 → zrb-1.2.0}/src/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-1.1.0 → zrb-1.2.0}/src/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-1.1.0 → zrb-1.2.0}/src/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-1.1.0 → zrb-1.2.0}/src/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-1.1.0 → zrb-1.2.0}/src/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-1.1.0 → zrb-1.2.0}/src/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-1.1.0 → zrb-1.2.0}/src/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-1.1.0 → zrb-1.2.0}/src/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-1.1.0 → zrb-1.2.0}/src/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}">',