zrb 1.0.0a18__tar.gz → 1.0.0a19__tar.gz

{zrb-1.0.0a18 → zrb-1.0.0a19}/PKG-INFO

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

{zrb-1.0.0a18 → zrb-1.0.0a19}/pyproject.toml

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

{zrb-1.0.0a18 → zrb-1.0.0a19}/src/zrb/__init__.py

@@ -27,6 +27,7 @@ from zrb.group.group import Group
 from zrb.input.any_input import AnyInput
 from zrb.input.base_input import BaseInput
 from zrb.input.bool_input import BoolInput
+from zrb.input.float_input import FloatInput
 from zrb.input.int_input import IntInput
 from zrb.input.option_input import OptionInput
 from zrb.input.password_input import PasswordInput
@@ -73,6 +74,7 @@ assert CmdResult
 assert CmdTask
 assert HttpCheck
 assert TcpCheck
+assert FloatInput
 assert IntInput
 assert OptionInput
 assert PasswordInput

{zrb-1.0.0a18 → zrb-1.0.0a19}/src/zrb/input/any_input.py

@@ -32,3 +32,7 @@ class AnyInput(ABC):
     @abstractmethod
     def prompt_cli_str(self, shared_ctx: AnySharedContext) -> str:
         pass
+
+    @abstractmethod
+    def get_default_str(self, shared_ctx: AnySharedContext) -> str:
+        pass

{zrb-1.0.0a18 → zrb-1.0.0a19}/src/zrb/input/base_input.py

@@ -42,14 +42,14 @@ class BaseInput(AnyInput):
     def to_html(self, ctx: AnySharedContext) -> str:
         name = self.name
         description = self.description
-        default = self._get_default_str(ctx)
+        default = self.get_default_str(ctx)
         return f'<input name="{name}" placeholder="{description}" value="{default}" />'
 
     def update_shared_context(
         self, shared_ctx: AnySharedContext, str_value: str | None = None
     ):
         if str_value is None:
-            str_value = self._get_default_str(shared_ctx)
+            str_value = self.get_default_str(shared_ctx)
         value = self._parse_str_value(str_value)
         if self.name in shared_ctx.input:
             raise ValueError(f"Input already defined in the context: {self.name}")
@@ -75,7 +75,7 @@ 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)
+        default_value = self.get_default_str(shared_ctx)
         if default_value != "":
             prompt_message = f"{prompt_message} [{default_value}]"
         print(f"{prompt_message}: ", end="")
@@ -84,7 +84,7 @@ class BaseInput(AnyInput):
             value = default_value
         return value
 
-    def _get_default_str(self, shared_ctx: AnySharedContext) -> str:
+    def get_default_str(self, shared_ctx: AnySharedContext) -> str:
         return get_str_attr(
             shared_ctx, self._default_str, auto_render=self._auto_render
         )

{zrb-1.0.0a18 → zrb-1.0.0a19}/src/zrb/input/bool_input.py

@@ -26,7 +26,7 @@ class BoolInput(BaseInput):
     def to_html(self, ctx: AnySharedContext) -> str:
         name = self.name
         description = self.description
-        default = to_boolean(self._get_default_str(ctx))
+        default = to_boolean(self.get_default_str(ctx))
         selected_true = "selected" if default else ""
         selected_false = "selected" if not default else ""
         return "\n".join(

{zrb-1.0.0a18 → zrb-1.0.0a19}/src/zrb/input/float_input.py

@@ -25,8 +25,8 @@ class FloatInput(BaseInput):
     def to_html(self, ctx: AnySharedContext) -> str:
         name = self.name
         description = self.description
-        default = self._get_default_str(ctx)
-        return f'<input type="number" name="{name}" placeholder="{description}" value="{default}" />'  # noqa
+        default = self.get_default_str(ctx)
+        return f'<input type="number" name="{name}" placeholder="{description}" value="{default}" step="any" />'  # noqa
 
     def _parse_str_value(self, str_value: str) -> float:
         return float(str_value)

{zrb-1.0.0a18 → zrb-1.0.0a19}/src/zrb/input/int_input.py

@@ -25,7 +25,7 @@ class IntInput(BaseInput):
     def to_html(self, ctx: AnySharedContext) -> str:
         name = self.name
         description = self.description
-        default = self._get_default_str(ctx)
+        default = self.get_default_str(ctx)
         return f'<input type="number" step="1" name="{name}" placeholder="{description}" value="{default}" />'  # noqa
 
     def _parse_str_value(self, str_value: str) -> int:

{zrb-1.0.0a18 → zrb-1.0.0a19}/src/zrb/input/option_input.py

@@ -28,7 +28,7 @@ class OptionInput(BaseInput):
     def to_html(self, ctx: AnySharedContext) -> str:
         name = self.name
         description = self.description
-        default = self._get_default_str(ctx)
+        default = self.get_default_str(ctx)
         html = [f'<select name="{name}" placeholder="{description}">']
         for value in get_str_list_attr(ctx, self._options, self._auto_render):
             selected = "selected" if value == default else ""
@@ -38,7 +38,7 @@ class OptionInput(BaseInput):
 
     def _prompt_cli_str(self, shared_ctx: AnySharedContext) -> str:
         prompt_message = self.prompt_message
-        default_value = self._get_default_str(shared_ctx)
+        default_value = self.get_default_str(shared_ctx)
         options = get_str_list_attr(shared_ctx, self._options, self._auto_render)
         option_str = ", ".join(options)
         if default_value != "":

{zrb-1.0.0a18 → zrb-1.0.0a19}/src/zrb/input/password_input.py

@@ -28,12 +28,12 @@ class PasswordInput(BaseInput):
     def to_html(self, ctx: AnySharedContext) -> str:
         name = self.name
         description = self.description
-        default = self._get_default_str(ctx)
+        default = self.get_default_str(ctx)
         return f'<input type="password" name="{name}" placeholder="{description}" value="{default}" />'  # noqa
 
     def _prompt_cli_str(self, shared_ctx: AnySharedContext) -> str:
         prompt_message = self.prompt_message
-        default_value = self._get_default_str(shared_ctx)
+        default_value = self.get_default_str(shared_ctx)
         value = getpass.getpass(f"{prompt_message}: ")
         if value.strip() == "":
             value = default_value

{zrb-1.0.0a18 → zrb-1.0.0a19}/src/zrb/input/text_input.py

@@ -57,7 +57,7 @@ class TextInput(BaseInput):
     def to_html(self, ctx: AnySharedContext) -> str:
         name = self.name
         description = self.description
-        default = self._get_default_str(ctx)
+        default = self.get_default_str(ctx)
         return "\n".join(
             [
                 f'<textarea name="{name}" placeholder="{description}">',
@@ -71,7 +71,7 @@ class TextInput(BaseInput):
             f"{self.comment_start}{super().prompt_message}{self.comment_end}"
         )
         prompt_message_eol = f"{prompt_message}\n"
-        default_value = self._get_default_str(shared_ctx)
+        default_value = self.get_default_str(shared_ctx)
         with tempfile.NamedTemporaryFile(
             delete=False, suffix=self._extension
         ) as temp_file:

{zrb-1.0.0a18 → zrb-1.0.0a19}/src/zrb/runner/cli.py

@@ -5,6 +5,7 @@ from zrb.config import BANNER, WEB_HTTP_PORT
 from zrb.context.any_context import AnyContext
 from zrb.context.shared_context import SharedContext
 from zrb.group.group import Group
+from zrb.runner.common_util import get_run_kwargs
 from zrb.runner.web_app import create_app
 from zrb.session.session import Session
 from zrb.task.any_task import AnyTask
@@ -30,7 +31,7 @@ class Cli(Group):
         if "h" in kwargs or "help" in kwargs:
             self._show_task_info(node)
             return
-        run_kwargs = self._get_run_kwargs(node, args, kwargs)
+        run_kwargs = get_run_kwargs(task=node, args=args, kwargs=kwargs, prompt=True)
         try:
             result = self._run_task(node, args, run_kwargs)
             if result is not None:
@@ -72,35 +73,6 @@ class Cli(Group):
                 continue
         return task.run(Session(shared_ctx=shared_ctx, root_group=self))
 
-    def _get_run_kwargs(
-        self, task: AnyTask, args: list[str], kwargs: dict[str, str]
-    ) -> tuple[Any]:
-        arg_index = 0
-        str_kwargs = {key: val for key, val in kwargs.items()}
-        run_kwargs = {**str_kwargs}
-        shared_ctx = SharedContext(args=args)
-        for task_input in task.inputs:
-            if task_input.name in str_kwargs:
-                # Update shared context for next input default value
-                task_input.update_shared_context(
-                    shared_ctx, str_kwargs[task_input.name]
-                )
-            elif arg_index < len(args):
-                run_kwargs[task_input.name] = args[arg_index]
-                # Update shared context for next input default value
-                task_input.update_shared_context(
-                    shared_ctx, run_kwargs[task_input.name]
-                )
-                arg_index += 1
-            else:
-                str_value = task_input.prompt_cli_str(shared_ctx)
-                run_kwargs[task_input.name] = str_value
-                # Update shared context for next input default value
-                task_input.update_shared_context(
-                    shared_ctx, run_kwargs[task_input.name]
-                )
-        return run_kwargs
-
     def _show_task_info(self, task: AnyTask):
         description = task.description
         inputs = task.inputs

zrb-1.0.0a19/src/zrb/runner/common_util.py

@@ -0,0 +1,31 @@
+from typing import Any
+
+from zrb.context.shared_context import SharedContext
+from zrb.task.any_task import AnyTask
+
+
+def get_run_kwargs(
+    task: AnyTask, args: list[str], kwargs: dict[str, str], prompt: bool = True
+) -> tuple[Any]:
+    arg_index = 0
+    str_kwargs = {key: val for key, val in kwargs.items()}
+    run_kwargs = {**str_kwargs}
+    shared_ctx = SharedContext(args=args)
+    for task_input in task.inputs:
+        if task_input.name in str_kwargs:
+            # Update shared context for next input default value
+            task_input.update_shared_context(shared_ctx, str_kwargs[task_input.name])
+        elif arg_index < len(args):
+            run_kwargs[task_input.name] = args[arg_index]
+            # Update shared context for next input default value
+            task_input.update_shared_context(shared_ctx, run_kwargs[task_input.name])
+            arg_index += 1
+        else:
+            if prompt:
+                str_value = task_input.prompt_cli_str(shared_ctx)
+            else:
+                str_value = task_input.get_default_str(shared_ctx)
+            run_kwargs[task_input.name] = str_value
+            # Update shared context for next input default value
+            task_input.update_shared_context(shared_ctx, run_kwargs[task_input.name])
+    return run_kwargs

{zrb-1.0.0a18 → zrb-1.0.0a19}/src/zrb/runner/web_app.py

@@ -1,12 +1,13 @@
 import asyncio
+import json
 import os
 import sys
 from datetime import datetime, timedelta
-from typing import Any
 
 from zrb.config import BANNER, WEB_HTTP_PORT
 from zrb.context.shared_context import SharedContext
 from zrb.group.any_group import AnyGroup
+from zrb.runner.common_util import get_run_kwargs
 from zrb.runner.web_controller.group_info_ui.controller import handle_group_info_ui
 from zrb.runner.web_controller.home_page.controller import handle_home_page
 from zrb.runner.web_controller.task_ui.controller import handle_task_ui
@@ -76,9 +77,7 @@ def create_app(root_group: AnyGroup, port: int = WEB_HTTP_PORT):
         raise HTTPException(status_code=404, detail="Not Found")
 
     @app.post("/api/sessions/{path:path}")
-    async def create_new_session(
-        path: str, request: Request = None
-    ) -> NewSessionResponse:
+    async def create_new_session(path: str, request: Request) -> NewSessionResponse:
         """
         Creating new session
         """
@@ -96,6 +95,23 @@ def create_app(root_group: AnyGroup, port: int = WEB_HTTP_PORT):
                 return NewSessionResponse(session_name=session.name)
         raise HTTPException(status_code=404, detail="Not Found")
 
+    @app.get("/api/inputs/{path:path}", response_model=dict[str, str])
+    async def get_default_inputs(
+        path: str, query: str = Query("{}", description="JSON encoded inputs")
+    ):
+        """
+        Getting input completion for path
+        """
+        args = path.strip("/").split("/")
+        task, _, _ = extract_node_from_args(root_group, args)
+        if isinstance(task, AnyTask):
+            query_dict = json.loads(query)
+            run_kwargs = get_run_kwargs(
+                task=task, args=[], kwargs=query_dict, prompt=False
+            )
+            return run_kwargs
+        raise HTTPException(status_code=404, detail="Not Found")
+
     @app.get(
         "/api/sessions/{path:path}",
         response_model=SessionStateLog | SessionStateLogList,