zrb 1.0.0a10__py3-none-any.whl → 1.0.0a14__py3-none-any.whl

zrb/input/base_input.py

@@ -14,7 +14,7 @@ class BaseInput(AnyInput):
         prompt: str | None = None,
         default_str: StrAttr = "",
         auto_render: bool = True,
-        allow_empty: bool = True,
+        allow_empty: bool = False,
     ):
         self._name = name
         self._description = description
@@ -66,7 +66,8 @@ class BaseInput(AnyInput):
         default_value = self._get_default_str(shared_ctx)
         if default_value != "":
             prompt_message = f"{prompt_message} [{default_value}]"
-        value = input(f"{prompt_message}: ")
+        print(f"{prompt_message}: ", end="")
+        value = input()
         if value.strip() == "":
             value = default_value
         return value

zrb/input/bool_input.py

@@ -12,7 +12,7 @@ class BoolInput(BaseInput):
         prompt: str | None = None,
         default_str: StrAttr = "False",
         auto_render: bool = True,
-        allow_empty: bool = True,
+        allow_empty: bool = False,
     ):
         super().__init__(
             name=name,

zrb/input/float_input.py

@@ -11,7 +11,7 @@ class FloatInput(BaseInput):
         prompt: str | None = None,
         default_str: StrAttr = "0.0",
         auto_render: bool = True,
-        allow_empty: bool = True,
+        allow_empty: bool = False,
     ):
         super().__init__(
             name=name,

zrb/input/int_input.py

@@ -11,7 +11,7 @@ class IntInput(BaseInput):
         prompt: str | None = None,
         default_str: StrAttr = "0",
         auto_render: bool = True,
-        allow_empty: bool = True,
+        allow_empty: bool = False,
     ):
         super().__init__(
             name=name,

zrb/input/option_input.py

@@ -13,7 +13,7 @@ class OptionInput(BaseInput):
         options: StrListAttr = [],
         default_str: StrAttr = "",
         auto_render: bool = True,
-        allow_empty: bool = True,
+        allow_empty: bool = False,
     ):
         super().__init__(
             name=name,

zrb/input/password_input.py

@@ -13,7 +13,7 @@ class PasswordInput(BaseInput):
         prompt: str | None = None,
         default_str: str | Callable[[AnySharedContext], str] = "",
         auto_render: bool = True,
-        allow_empty: bool = True,
+        allow_empty: bool = False,
     ):
         super().__init__(
             name=name,

zrb/input/text_input.py

@@ -16,7 +16,7 @@ class TextInput(BaseInput):
         prompt: str | None = None,
         default_str: str | Callable[[AnySharedContext], str] = "",
         auto_render: bool = True,
-        allow_empty: bool = True,
+        allow_empty: bool = False,
         editor: str = DEFAULT_EDITOR,
         extension: str = ".txt",
         comment_start: str | None = None,

zrb/runner/cli.py

@@ -82,13 +82,24 @@ class Cli(Group):
         shared_ctx = SharedContext(args=args)
         for task_input in task.inputs:
             if task_input.name in str_kwargs:
-                continue
-            if arg_index < len(args):
+                # 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
-                continue
-            str_value = task_input.prompt_cli_str(shared_ctx)
-            run_kwargs[task_input.name] = str_value
+            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):

zrb/runner/web_app.py

@@ -2,7 +2,7 @@ import asyncio
 import os
 import sys
 from datetime import datetime, timedelta
-from typing import Any, Dict, List
+from typing import Any
 
 from zrb.config import BANNER, WEB_HTTP_PORT
 from zrb.context.shared_context import SharedContext
@@ -23,7 +23,7 @@ from zrb.util.group import extract_node_from_args, get_node_path
 def create_app(root_group: AnyGroup, port: int = WEB_HTTP_PORT):
     from contextlib import asynccontextmanager
 
-    from fastapi import FastAPI, HTTPException, Request
+    from fastapi import FastAPI, HTTPException, Query, Request
     from fastapi.responses import FileResponse, HTMLResponse
     from fastapi.staticfiles import StaticFiles
 
@@ -64,7 +64,7 @@ def create_app(root_group: AnyGroup, port: int = WEB_HTTP_PORT):
         # Avoid capturing '/ui' itself
         if not path:
             raise HTTPException(status_code=404, detail="Not Found")
-        args = path.split("/")
+        args = path.strip("/").split("/")
         node, node_path, residual_args = extract_node_from_args(root_group, args)
         url = f"/ui/{'/'.join(node_path)}/"
         if isinstance(node, AnyTask):
@@ -82,7 +82,7 @@ def create_app(root_group: AnyGroup, port: int = WEB_HTTP_PORT):
         """
         Creating new session
         """
-        args = path.split("/")
+        args = path.strip("/").split("/")
         node, _, residual_args = extract_node_from_args(root_group, args)
         if isinstance(node, AnyTask):
             session_name = residual_args[0] if residual_args else None
@@ -97,33 +97,45 @@ def create_app(root_group: AnyGroup, port: int = WEB_HTTP_PORT):
         raise HTTPException(status_code=404, detail="Not Found")
 
     @app.get("/api/{path:path}", response_model=SessionStateLog | SessionStateLogList)
-    async def get_session(path: str, query_params: Dict[str, Any] = {}):
+    async def get_session(
+        path: str,
+        min_start_query: str = Query(default=None, alias="from"),
+        max_start_query: str = Query(default=None, alias="to"),
+        page: int = Query(default=0, alias="page"),
+        limit: int = Query(default=10, alias="limit"),
+    ):
         """
         Getting existing session or sessions
         """
-        args = path.split("/")
+        args = path.strip("/").split("/")
         node, _, residual_args = extract_node_from_args(root_group, args)
         if isinstance(node, AnyTask) and residual_args:
             if residual_args[0] == "list":
                 task_path = get_node_path(root_group, node)
-                return list_sessions(task_path, query_params)
+                max_start_time = (
+                    datetime.now()
+                    if max_start_query is None
+                    else datetime.strptime(max_start_query, "%Y-%m-%d %H:%M:%S")
+                )
+                min_start_time = (
+                    max_start_time - timedelta(hours=1)
+                    if min_start_query is None
+                    else datetime.strptime(min_start_query, "%Y-%m-%d %H:%M:%S")
+                )
+                return list_sessions(
+                    task_path, min_start_time, max_start_time, page, limit
+                )
             else:
                 return read_session(residual_args[0])
         raise HTTPException(status_code=404, detail="Not Found")
 
     def list_sessions(
-        task_path: List[str], query_params: Dict[str, Any]
+        task_path: list[str],
+        min_start_time: datetime,
+        max_start_time: datetime,
+        page: int,
+        limit: int,
     ) -> SessionStateLogList:
-        max_start_time = datetime.now()
-        if "to" in query_params:
-            max_start_time = datetime.strptime(query_params["to"], "%Y-%m-%d %H:%M:%S")
-        min_start_time = max_start_time - timedelta(hours=1)
-        if "from" in query_params:
-            min_start_time = datetime.strptime(
-                query_params["from"], "%Y-%m-%d %H:%M:%S"
-            )
-        page = int(query_params.get("page", 0))
-        limit = int(query_params.get("limit", 10))
         try:
             return default_session_state_logger.list(
                 task_path,

zrb/runner/web_controller/task_ui/controller.py

@@ -1,5 +1,6 @@
 import os
 
+from zrb.context.shared_context import SharedContext
 from zrb.group.any_group import AnyGroup
 from zrb.session.any_session import AnySession
 from zrb.task.any_task import AnyTask
@@ -45,12 +46,13 @@ def handle_task_ui(
     ui_url_parts = list(api_url_parts)
     ui_url_parts[1] = "ui"
     ui_url = "/".join(ui_url_parts)
-    task_inputs = "\n".join(
-        [
+    # Assemble task inputs
+    input_html_list = []
+    for task_input in task.inputs:
+        task_input.update_shared_context(ctx)
+        input_html_list.append(
             fstring_format(_TASK_INPUT_TEMPLATE, {"task_input": task_input, "ctx": ctx})
-            for task_input in task.inputs
-        ]
-    )
+        )
     session_name = args[0] if len(args) > 0 else ""
     return HTMLResponse(
         fstring_format(
@@ -62,7 +64,7 @@ def handle_task_ui(
                 "root_description": root_group.description,
                 "url": url,
                 "parent_url": parent_url,
-                "task_inputs": task_inputs,
+                "task_inputs": "\n".join(input_html_list),
                 "api_url": api_url,
                 "ui_url": ui_url,
                 "main_script": _MAIN_SCRIPT,

zrb/session/session.py

@@ -28,6 +28,7 @@ from zrb.util.cli.style import (
     ICONS,
     MAGENTA,
     YELLOW,
+    remove_style,
 )
 from zrb.util.group import get_node_path
 from zrb.util.string.name import get_random_name
@@ -165,7 +166,9 @@ class Session(AnySession):
             main_task_name=self._main_task.name,
             path=self.task_path,
             final_result=(
-                f"{self.final_result}" if self.final_result is not None else ""
+                remove_style(f"{self.final_result}")
+                if self.final_result is not None
+                else ""
             ),
             finished=self.is_terminated,
             log=self.shared_ctx.shared_log,

zrb/task/scaffolder.py

@@ -92,8 +92,8 @@ class Scaffolder(BaseTask):
         destination_path = self._get_destination_path(ctx)
         self._copy_path(ctx, source_path, destination_path)
         transformers = self._get_content_transformers()
-        file_paths = self._get_all_file_paths(destination_path)
-        for file_path in file_paths:
+        file_path_list = self._get_all_file_paths(destination_path)
+        for file_path in file_path_list:
             for transformer in transformers:
                 if transformer.match(ctx, file_path):
                     try:
@@ -118,14 +118,10 @@ class Scaffolder(BaseTask):
                         dest_dir, self._transform_path(ctx, file_name)
                     )
                     shutil.copy2(src_file, dest_file)
-                    ctx.log_info(f"Copied and renamed {src_file} to {dest_file}")
+                    ctx.log_info(f"Copied {src_file} to {dest_file}")
         else:
-            dest_file = os.path.join(
-                destination_path,
-                self._transform_path(ctx, os.path.basename(source_path)),
-            )
-            shutil.copy2(source_path, dest_file)
-            ctx.log_info(f"Copied and renamed {source_path} to {dest_file}")
+            shutil.copy2(source_path, destination_path)
+            ctx.log_info(f"Copied {source_path} to {destination_path}")
 
     def _transform_path(self, ctx: AnyContext, file_path: str):
         if callable(self._path_transformer):
@@ -139,6 +135,8 @@ class Scaffolder(BaseTask):
         """
         Returns a list of absolute file paths for all files in the given path, recursively.
         """
+        if os.path.isfile(path):
+            return [os.path.abspath(path)]
         file_paths = []
         for root, _, files in os.walk(path):
             for file in files:

zrb/util/cli/style.py

@@ -1,3 +1,5 @@
+import re
+
 BLACK = 30
 RED = 31
 GREEN = 32
@@ -118,6 +120,11 @@ ICONS = [
 ]
 
 
+def remove_style(text):
+    ansi_escape = re.compile(r"\x1B[@-_][0-?]*[ -/]*[@-~]")
+    return ansi_escape.sub("", text)
+
+
 def stylize(
     text: str,
     color: int | None = None,

zrb/util/codemod/add_code_to_module.py

@@ -0,0 +1,12 @@
+def add_code_to_module(source_code: str, new_code: str) -> str:
+    lines = source_code.splitlines()
+    last_import_index = -1
+    for i, line in enumerate(lines):
+        stripped_line = line.strip()
+        if stripped_line.startswith("import") or stripped_line.startswith("from"):
+            last_import_index = i
+        elif stripped_line and not stripped_line.startswith("#"):
+            break
+    if last_import_index != -1:
+        lines.insert(last_import_index + 1, new_code)
+    return "\n".join(lines)

zrb/util/load.py

@@ -3,37 +3,39 @@ import importlib.util
 import os
 import re
 import sys
+from functools import lru_cache
 from typing import Any
 
 pattern = re.compile("[^a-zA-Z0-9]")
 
 
-def load_zrb_init(dir_path: str | None = None):
+def load_zrb_init(dir_path: str | None = None) -> Any | None:
     if dir_path is None:
         dir_path = os.getcwd()
     script_path = os.path.join(dir_path, "zrb_init.py")
     if os.path.isfile(script_path):
-        load_file(script_path)
-        return
+        return load_file(script_path, -1)
     new_dir_path = os.path.dirname(dir_path)
     if new_dir_path == dir_path:
         return
-    load_zrb_init(new_dir_path)
+    return load_zrb_init(new_dir_path)
 
 
-def load_file(script_path: str, sys_path_index: int = 0):
+@lru_cache
+def load_file(script_path: str, sys_path_index: int = 0) -> Any | None:
     if not os.path.isfile(script_path):
-        return
+        return None
+    module_name = pattern.sub("", script_path)
     # Append script dir path
     script_dir_path = os.path.dirname(script_path)
     if script_dir_path not in sys.path:
         sys.path.insert(sys_path_index, script_dir_path)
     # Add script dir path to Python path
     os.environ["PYTHONPATH"] = _get_new_python_path(script_dir_path)
-    module_name = pattern.sub("", script_path)
     spec = importlib.util.spec_from_file_location(module_name, script_path)
     module = importlib.util.module_from_spec(spec)
     spec.loader.exec_module(module)
+    return module
 
 
 def _get_new_python_path(dir_path: str) -> str:

zrb/util/string/conversion.py

@@ -63,6 +63,58 @@ def to_human_case(text: str | None) -> str:
     )
 
 
+def pluralize(noun: str) -> str:
+    """
+    Pluralize a given noun.
+
+    Args:
+        noun (str): The singular noun.
+
+    Returns:
+        str: The plural form of the noun.
+    """
+    # Irregular plural forms
+    irregulars = {
+        "foot": "feet",
+        "tooth": "teeth",
+        "child": "children",
+        "person": "people",
+        "man": "men",
+        "woman": "women",
+        "mouse": "mice",
+        "goose": "geese",
+        "ox": "oxen",
+        "cactus": "cacti",
+        "focus": "foci",
+        "fungus": "fungi",
+        "nucleus": "nuclei",
+        "syllabus": "syllabi",
+        "analysis": "analyses",
+        "diagnosis": "diagnoses",
+        "thesis": "theses",
+        "crisis": "crises",
+        "phenomenon": "phenomena",
+        "criterion": "criteria",
+    }
+
+    # Handle irregular nouns
+    if noun.lower() in irregulars:
+        return irregulars[noun.lower()]
+    # Handle words ending in 'y' preceded by a consonant
+    if noun.endswith("y") and not re.match(r"[aeiou]y$", noun):
+        return re.sub(r"y$", "ies", noun)
+    # Handle words ending in 's', 'x', 'z', 'ch', or 'sh'
+    if re.search(r"(s|x|z|ch|sh)$", noun):
+        return noun + "es"
+    # Handle words ending in 'f' or 'fe'
+    if re.search(r"f$|fe$", noun):
+        if noun.endswith("fe"):
+            return re.sub(r"fe$", "ves", noun)
+        return re.sub(r"f$", "ves", noun)
+    # Handle general case for regular plurals
+    return noun + "s"
+
+
 def _to_space_separated(text: str | None) -> str:
     text = str(text) if text is not None else ""
     text = text.replace("-", " ").replace("_", " ")

zrb/util/todo.py

@@ -1,11 +1,15 @@
 import datetime
 import re
+import shutil
+from typing import Any
 
 from pydantic import BaseModel, Field, model_validator
 
 from zrb.util.cli.style import (
     stylize_bold_green,
+    stylize_bold_yellow,
     stylize_cyan,
+    stylize_faint,
     stylize_magenta,
     stylize_yellow,
 )
@@ -32,6 +36,16 @@ class TodoTaskModel(BaseModel):
             )
         return values
 
+    def get_additional_info_length(self):
+        results = []
+        for project in self.projects:
+            results.append(f"@{project}")
+        for context in self.contexts:
+            results.append(f"+{context}")
+        for key, val in self.keyval.items():
+            results.append(f"{key}:{val}")
+        return len(", ".join(results))
+
 
 TODO_TXT_PATTERN = re.compile(
     r"^(?P<status>x)?\s*"  # Optional completion mark ('x')
@@ -80,7 +94,8 @@ def load_todo_list(todo_file_path: str) -> list[TodoTaskModel]:
         todo_line = todo_line.strip()
         if todo_line == "":
             continue
-        todo_list.append(line_to_todo_task(todo_line))
+        todo_task = line_to_todo_task(todo_line)
+        todo_list.append(todo_task)
     todo_list.sort(
         key=lambda task: (
             task.completed,
@@ -173,51 +188,154 @@ def todo_task_to_line(task: TodoTaskModel) -> str:
     return " ".join(parts)
 
 
-def get_visual_todo_list(todo_list: list[TodoTaskModel]) -> str:
-    if len(todo_list) == 0:
+def get_visual_todo_list(todo_list: list[TodoTaskModel], filter: str) -> str:
+    todo_filter = line_to_todo_task(filter)
+    filtered_todo_list = []
+    for todo_task in todo_list:
+        filter_description = todo_filter.description.lower().strip()
+        if (
+            filter_description != ""
+            and filter_description not in todo_task.description.lower()
+        ):
+            continue
+        if not all(context in todo_task.contexts for context in todo_filter.contexts):
+            continue
+        if not all(project in todo_task.projects for project in todo_filter.projects):
+            continue
+        if not all(
+            key in todo_task.keyval and todo_task.keyval[key] == val
+            for key, val in todo_filter.keyval.items()
+        ):
+            continue
+        filtered_todo_list.append(todo_task)
+    if len(filtered_todo_list) == 0:
         return "\n".join(["", "  Empty todo list... 🌵🦖", ""])
-    max_desc_name_length = max(len(todo_task.description) for todo_task in todo_list)
-    if max_desc_name_length < len("DESCRIPTION"):
-        max_desc_name_length = len("DESCRIPTION")
+    max_desc_length = max(
+        len(todo_task.description) for todo_task in filtered_todo_list
+    )
+    if max_desc_length < len("DESCRIPTION"):
+        max_desc_length = len("DESCRIPTION")
+    if max_desc_length > 70:
+        max_desc_length = 70
+    max_additional_info_length = max(
+        todo_task.get_additional_info_length() for todo_task in filtered_todo_list
+    )
+    if max_additional_info_length < len("PROJECT/CONTEXT/OTHERS"):
+        max_additional_info_length = len("PROJECT/CONTEXT/OTHERS")
+    terminal_width, _ = shutil.get_terminal_size()
     # Headers
     results = [
-        stylize_bold_green(
-            "  ".join(
-                [
-                    "".ljust(3),  # priority
-                    "".ljust(3),  # completed
-                    "COMPLETED AT".rjust(14),  # completed date
-                    "CREATED AT".rjust(14),  # completed date
-                    "DESCRIPTION".ljust(max_desc_name_length),
-                    "PROJECT/CONTEXT/OTHERS",
-                ]
+        stylize_faint(
+            get_visual_todo_header(
+                terminal_width, max_desc_length, max_additional_info_length
             )
         )
     ]
-    for todo_task in todo_list:
-        completed = "[x]" if todo_task.completed else "[ ]"
-        priority = "   " if todo_task.priority is None else f"({todo_task.priority})"
-        completion_date = stylize_yellow(_date_to_str(todo_task.completion_date))
-        creation_date = stylize_cyan(_date_to_str(todo_task.creation_date))
-        description = todo_task.description.ljust(max_desc_name_length)
-        additions = ", ".join(
-            [stylize_yellow(f"+{project}") for project in todo_task.projects]
-            + [stylize_cyan(f"@{context}") for context in todo_task.contexts]
-            + [stylize_magenta(f"{key}:{val}") for key, val in todo_task.keyval.items()]
-        )
+    for todo_task in filtered_todo_list:
         results.append(
+            get_visual_todo_line(
+                terminal_width, max_desc_length, max_additional_info_length, todo_task
+            )
+        )
+    return "\n".join(results)
+
+
+def get_visual_todo_header(
+    terminal_width: int, max_desc_length: int, max_additional_info_length: int
+) -> str:
+    priority = "".ljust(3)
+    completed = "".ljust(3)
+    completed_at = "COMPLETED AT".rjust(14)
+    created_at = "CREATED_AT".ljust(14)
+    description = "DESCRIPTION".ljust(min(max_desc_length, 70))
+    additional_info = "PROJECT/CONTEXT/OTHERS"
+    if terminal_width <= 14 + max_desc_length + max_additional_info_length:
+        return "  ".join([priority, completed, description])
+    if terminal_width <= 36 + max_desc_length + max_additional_info_length:
+        return "  ".join([priority, completed, description, additional_info])
+    return "  ".join(
+        [priority, completed, completed_at, created_at, description, additional_info]
+    )
+
+
+def get_visual_todo_line(
+    terminal_width: int,
+    max_desc_length: int,
+    max_additional_info_length: int,
+    todo_task: TodoTaskModel,
+) -> str:
+    completed = "[x]" if todo_task.completed else "[ ]"
+    priority = "   " if todo_task.priority is None else f"({todo_task.priority})"
+    completed_at = stylize_yellow(_date_to_str(todo_task.completion_date))
+    created_at = stylize_cyan(_date_to_str(todo_task.creation_date))
+    description = todo_task.description
+    if len(description) > max_desc_length:
+        description = description[: max_desc_length - 4] + " ..."
+    description = description.ljust(max_desc_length)
+    description = description[:max_desc_length]
+    if todo_task.completed:
+        description = stylize_faint(description)
+    elif "duration" in todo_task.keyval:
+        description = stylize_bold_yellow(description)
+    additional_info = ", ".join(
+        [stylize_yellow(f"+{project}") for project in todo_task.projects]
+        + [stylize_cyan(f"@{context}") for context in todo_task.contexts]
+        + [stylize_magenta(f"{key}:{val}") for key, val in todo_task.keyval.items()]
+    )
+    if terminal_width <= 14 + max_desc_length + max_additional_info_length:
+        return "  ".join([priority, completed, description])
+    if terminal_width <= 36 + max_desc_length + max_additional_info_length:
+        return "  ".join([priority, completed, description, additional_info])
+    return "  ".join(
+        [priority, completed, completed_at, created_at, description, additional_info]
+    )
+
+
+def get_visual_todo_card(
+    todo_task: TodoTaskModel, log_work_list: list[dict[str, str]]
+) -> str:
+    description = todo_task.description
+    status = "TODO"
+    if todo_task.completed:
+        status = "DONE"
+    elif "duration" in todo_task.keyval:
+        status = "DOING"
+    priority = todo_task.priority
+    completed_at = (
+        _date_to_str(todo_task.completion_date)
+        if todo_task.completion_date is not None
+        else ""
+    )
+    created_at = (
+        _date_to_str(todo_task.creation_date)
+        if todo_task.creation_date is not None
+        else ""
+    )
+    log_work_str = "\n".join(
+        [
             "  ".join(
                 [
-                    completed,
-                    priority,
-                    completion_date,
-                    creation_date,
-                    description,
-                    additions,
+                    stylize_magenta(log_work.get("duration", "").strip().rjust(12)),
+                    stylize_cyan(log_work.get("start", "").strip().rjust(20)),
+                    log_work.get("log", "").strip(),
                 ]
             )
+            for log_work in log_work_list
+        ]
+    )
+    detail = [
+        f"{'📄 Description'.ljust(16)}: {description}",
+        f"{'🎯 Priority'.ljust(16)}: {priority}",
+        f"{'📊 Status'.ljust(16)}: {status}",
+        f"{'📅 Created at'.ljust(16)}: {created_at}",
+        f"{'✅ Completed at'.ljust(16)}: {completed_at}",
+    ]
+    if log_work_str != "":
+        detail.append(
+            stylize_faint("  ".join(["Time Spent".rjust(12), "Start".rjust(20), "Log"]))
         )
-    return "\n".join(results)
+        detail.append(log_work_str)
+    return "\n".join(detail)
 
 
 def _date_to_str(date: datetime.date | None) -> str: