zrb 1.0.0a17__py3-none-any.whl → 1.0.0a19__py3-none-any.whl

zrb/builtin/todo.py

@@ -4,7 +4,7 @@ import os
 from typing import Any
 
 from zrb.builtin.group import todo_group
-from zrb.config import TODO_DIR, TODO_VISUAL_FILTER
+from zrb.config import TODO_DIR, TODO_RETENTION, TODO_VISUAL_FILTER
 from zrb.context.any_context import AnyContext
 from zrb.input.str_input import StrInput
 from zrb.input.text_input import TextInput
@@ -12,12 +12,13 @@ from zrb.task.make_task import make_task
 from zrb.util.file import read_file, write_file
 from zrb.util.todo import (
     TodoTaskModel,
-    add_durations,
+    add_duration,
     cascade_todo_task,
     get_visual_todo_card,
     get_visual_todo_list,
     line_to_todo_task,
     load_todo_list,
+    parse_duration,
     save_todo_list,
     select_todo_task,
     todo_task_to_line,
@@ -165,11 +166,17 @@ def archive_todo(ctx: AnyContext):
     todo_list: list[TodoTaskModel] = []
     if os.path.isfile(todo_file_path):
         todo_list = load_todo_list(todo_file_path)
-    working_todo_list = [
-        todo_task for todo_task in todo_list if not todo_task.completed
-    ]
+    retention_duration = datetime.timedelta(seconds=parse_duration(TODO_RETENTION))
+    threshold_date = datetime.date.today() - retention_duration
     new_archived_todo_list = [
-        todo_task for todo_task in todo_list if todo_task.completed
+        todo_task
+        for todo_task in todo_list
+        if todo_task.completed
+        and todo_task.completion_date is not None
+        and todo_task.completion_date < threshold_date
+    ]
+    working_todo_list = [
+        todo_task for todo_task in todo_list if todo_task not in new_archived_todo_list
     ]
     if len(new_archived_todo_list) == 0:
         ctx.print("No completed task to archive")
@@ -204,10 +211,10 @@ def archive_todo(ctx: AnyContext):
             default_str="30m",
         ),
         StrInput(
-            name="start",
-            prompt="Working start time (%Y-%m-%d %H:%M:%S)",
-            description="Working start time",
-            default_str=lambda _: _get_default_start(),
+            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(),
         ),
     ],
     description="🕒 Log work todo",
@@ -226,8 +233,10 @@ def log_todo(ctx: AnyContext):
         return get_visual_todo_list(todo_list, TODO_VISUAL_FILTER)
     # Update todo task
     todo_task = cascade_todo_task(todo_task)
-    current_duration = todo_task.keyval.get("duration", "0")
-    todo_task.keyval["duration"] = add_durations(current_duration, ctx.input.duration)
+    current_duration_str = todo_task.keyval.get("duration", "0")
+    todo_task.keyval["duration"] = add_duration(
+        current_duration_str, ctx.input.duration
+    )
     # Save todo list
     save_todo_list(todo_file_path, todo_list)
     # Add log work
@@ -241,8 +250,13 @@ def log_todo(ctx: AnyContext):
     else:
         log_work_json = "[]"
     log_work: list[dict[str, Any]] = json.loads(log_work_json)
+    start_work_time_str = _get_start_work_time_str(ctx.input.stop, ctx.input.duration)
     log_work.append(
-        {"log": ctx.input.log, "duration": ctx.input.duration, "start": ctx.input.start}
+        {
+            "log": ctx.input.log,
+            "duration": ctx.input.duration,
+            "start": start_work_time_str,
+        }
     )
     # save todo with log work
     write_file(log_work_file_path, json.dumps(log_work, indent=2))
@@ -261,7 +275,14 @@ def log_todo(ctx: AnyContext):
     )
 
 
-def _get_default_start() -> str:
+def _get_start_work_time_str(stop_work_time_str: str, work_duration_str: str) -> str:
+    work_duration = parse_duration(work_duration_str)
+    stop_work_time = datetime.datetime.strptime(stop_work_time_str, "%Y-%m-%d %H:%M:%S")
+    start_work_time = stop_work_time - datetime.timedelta(seconds=work_duration)
+    return start_work_time.strftime("%Y-%m-%d %H:%M:%S")
+
+
+def _get_default_stop_work_time_str() -> str:
     return datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
 
 

zrb/callback/callback.py

@@ -8,7 +8,6 @@ from zrb.util.attr import get_str_dict_attr
 
 
 class Callback(AnyCallback):
-
     def __init__(
         self,
         input_mapping: StrDictAttr,

zrb/config.py

@@ -56,6 +56,7 @@ SESSION_LOG_DIR = os.getenv(
 )
 TODO_DIR = os.getenv("ZRB_TODO_DIR", os.path.expanduser(os.path.join("~", "todo")))
 TODO_VISUAL_FILTER = os.getenv("ZRB_TODO_FILTER", "")
+TODO_RETENTION = os.getenv("ZRB_TODO_RETENTION", "2w")
 VERSION = metadata.version("zrb")
 WEB_HTTP_PORT = int(os.getenv("ZRB_WEB_HTTP_PORT", "21213"))
 LLM_MODEL = os.getenv("ZRB_LLM_MODEL", "ollama_chat/llama3.1")

zrb/content_transformer/content_transformer.py

@@ -8,13 +8,12 @@ from zrb.util.file import read_file, write_file
 
 
 class ContentTransformer(AnyContentTransformer):
-
     def __init__(
         self,
         match: list[str] | str | Callable[[AnyContext, str], bool],
         transform: (
             dict[str, str | Callable[[AnyContext], str]]
-            | Callable[[AnyContext, str], str]
+            | Callable[[AnyContext, str], None]
         ),
         auto_render: bool = True,
     ):
@@ -25,7 +24,10 @@ class ContentTransformer(AnyContentTransformer):
     def match(self, ctx: AnyContext, file_path: str) -> bool:
         if callable(self._match):
             return self._match(ctx, file_path)
-        patterns = [self._match] if isinstance(self._match, str) else self._match
+        if isinstance(self._match, str):
+            patterns = [self._match]
+        else:
+            patterns = self._match
         for pattern in patterns:
             try:
                 if re.fullmatch(pattern, file_path):

zrb/context/any_context.py

@@ -42,7 +42,7 @@ class AnyContext(AnySharedContext):
         sep: str | None = " ",
         end: str | None = "\n",
         file: TextIO | None = sys.stderr,
-        flush: bool = True
+        flush: bool = True,
     ):
         """Prints values to the specified output stream.
 
@@ -62,7 +62,7 @@ class AnyContext(AnySharedContext):
         sep: str | None = " ",
         end: str | None = "\n",
         file: TextIO | None = sys.stderr,
-        flush: bool = True
+        flush: bool = True,
     ):
         """Logs debug-level messages.
 
@@ -82,7 +82,7 @@ class AnyContext(AnySharedContext):
         sep: str | None = " ",
         end: str | None = "\n",
         file: TextIO | None = sys.stderr,
-        flush: bool = True
+        flush: bool = True,
     ):
         """Logs info-level messages.
 
@@ -102,7 +102,7 @@ class AnyContext(AnySharedContext):
         sep: str | None = " ",
         end: str | None = "\n",
         file: TextIO | None = sys.stderr,
-        flush: bool = True
+        flush: bool = True,
     ):
         """Logs warning-level messages.
 
@@ -122,7 +122,7 @@ class AnyContext(AnySharedContext):
         sep: str | None = " ",
         end: str | None = "\n",
         file: TextIO | None = sys.stderr,
-        flush: bool = True
+        flush: bool = True,
     ):
         """Logs error-level messages.
 
@@ -142,7 +142,7 @@ class AnyContext(AnySharedContext):
         sep: str | None = " ",
         end: str | None = "\n",
         file: TextIO | None = sys.stderr,
-        flush: bool = True
+        flush: bool = True,
     ):
         """Logs critical-level messages.
 

zrb/group/group.py

@@ -3,7 +3,6 @@ from zrb.task.any_task import AnyTask
 
 
 class Group(AnyGroup):
-
     def __init__(
         self, name: str, description: str | None = None, banner: str | None = None
     ):

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/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/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/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/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/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/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/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/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
@@ -20,7 +21,6 @@ from zrb.util.string.conversion import double_quote
 
 
 class Cli(Group):
-
     def run(self, args: list[str] = []):
         load_zrb_init()
         kwargs, args = self._extract_kwargs_from_args(args)
@@ -31,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:
@@ -73,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/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/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
@@ -75,10 +76,8 @@ def create_app(root_group: AnyGroup, port: int = WEB_HTTP_PORT):
             return handle_group_info_ui(root_group, node, url)
         raise HTTPException(status_code=404, detail="Not Found")
 
-    @app.post("/api/{path:path}")
-    async def create_new_session(
-        path: str, request: Request = None
-    ) -> NewSessionResponse:
+    @app.post("/api/sessions/{path:path}")
+    async def create_new_session(path: str, request: Request) -> NewSessionResponse:
         """
         Creating new session
         """
@@ -96,7 +95,27 @@ 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/{path:path}", response_model=SessionStateLog | SessionStateLogList)
+    @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,
+    )
     async def get_session(
         path: str,
         min_start_query: str = Query(default=None, alias="from"),