zrb 1.0.0a10__tar.gz → 1.0.0a12__tar.gz

{zrb-1.0.0a10 → zrb-1.0.0a12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zrb
-Version: 1.0.0a10
+Version: 1.0.0a12
 Summary: Your Automation Powerhouse
 Home-page: https://github.com/state-alchemists/zrb
 License: AGPL-3.0-or-later
@@ -13,7 +13,6 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
 Provides-Extra: rag
 Requires-Dist: autopep8 (>=2.0.4,<3.0.0)
 Requires-Dist: beautifulsoup4 (>=4.12.3,<5.0.0)

{zrb-1.0.0a10 → zrb-1.0.0a12}/pyproject.toml

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

{zrb-1.0.0a10 → zrb-1.0.0a12}/src/zrb/builtin/__init__.py

@@ -12,14 +12,22 @@ from zrb.builtin.md5 import hash_md5, sum_md5
 from zrb.builtin.project.add.fastapp import add_fastapp_to_project
 from zrb.builtin.project.create.create import create_project
 from zrb.builtin.python import format_python_code
-from zrb.builtin.setup.dev.asdf import setup_asdf
-from zrb.builtin.setup.dev.tmux import setup_tmux
-from zrb.builtin.setup.system.latex.ubuntu import setup_latex_on_ubuntu
-from zrb.builtin.setup.system.ubuntu import setup_ubuntu
+from zrb.builtin.setup.asdf.asdf import setup_asdf
+from zrb.builtin.setup.latex.ubuntu import setup_latex_on_ubuntu
+from zrb.builtin.setup.tmux.tmux import setup_tmux
+from zrb.builtin.setup.ubuntu import setup_ubuntu
 from zrb.builtin.shell.autocomplete.bash import make_bash_autocomplete
 from zrb.builtin.shell.autocomplete.subcmd import get_shell_subcommands
 from zrb.builtin.shell.autocomplete.zsh import make_zsh_autocomplete
-from zrb.builtin.todo import add_todo, complete_todo, edit_todo, list_todo, log_todo
+from zrb.builtin.todo import (
+    add_todo,
+    archive_todo,
+    complete_todo,
+    edit_todo,
+    list_todo,
+    log_todo,
+    show_todo,
+)
 
 assert create_project
 assert add_fastapp_to_project
@@ -42,9 +50,11 @@ assert git_pull_subtree
 assert git_push_subtree
 assert list_todo
 assert add_todo
+assert archive_todo
 assert edit_todo
 assert complete_todo
 assert log_todo
+assert show_todo
 assert setup_ubuntu
 assert setup_latex_on_ubuntu
 assert setup_asdf

{zrb-1.0.0a10/src/zrb/builtin/setup/dev → zrb-1.0.0a12/src/zrb/builtin/setup/asdf}/asdf.py

@@ -1,6 +1,12 @@
 import os
 
 from zrb.builtin.group import setup_group
+from zrb.builtin.setup.asdf.asdf_helper import (
+    check_inexist_asdf_dir,
+    get_install_prerequisites_cmd,
+    setup_asdf_ps_config,
+    setup_asdf_sh_config,
+)
 from zrb.builtin.setup.common_input import (
     package_manager_input,
     setup_bash_input,
@@ -8,12 +14,6 @@ from zrb.builtin.setup.common_input import (
     setup_zsh_input,
     use_sudo_input,
 )
-from zrb.builtin.setup.dev.asdf_helper import (
-    check_inexist_asdf_dir,
-    get_install_prerequisites_cmd,
-    setup_asdf_ps_config,
-    setup_asdf_sh_config,
-)
 from zrb.context.any_context import AnyContext
 from zrb.task.cmd_task import CmdTask
 from zrb.task.make_task import make_task

{zrb-1.0.0a10/src/zrb/builtin/setup/system → zrb-1.0.0a12/src/zrb/builtin/setup}/latex/ubuntu.py

@@ -1,5 +1,5 @@
 from zrb.builtin.group import setup_latex_group
-from zrb.builtin.setup.system.ubuntu import setup_ubuntu
+from zrb.builtin.setup.ubuntu import setup_ubuntu
 from zrb.task.cmd_task import CmdTask
 
 setup_latex_on_ubuntu = setup_latex_group.add_task(

{zrb-1.0.0a10/src/zrb/builtin/setup/dev → zrb-1.0.0a12/src/zrb/builtin/setup/tmux}/tmux.py

@@ -2,7 +2,7 @@ import os
 
 from zrb.builtin.group import setup_group
 from zrb.builtin.setup.common_input import package_manager_input, use_sudo_input
-from zrb.builtin.setup.dev.tmux_helper import get_install_tmux_cmd
+from zrb.builtin.setup.tmux.tmux_helper import get_install_tmux_cmd
 from zrb.context.any_context import AnyContext
 from zrb.input.str_input import StrInput
 from zrb.task.cmd_task import CmdTask

zrb-1.0.0a12/src/zrb/builtin/setup/tmux/tmux_config.sh

@@ -0,0 +1,12 @@
+set -g @plugin 'tmux-plugins/tpm'
+set -g @plugin 'tmux-plugins/tmux-sensible'
+run '~/.tmux/plugins/tpm/tpm'
+
+set-option -sg escape-time 10
+set-option -g focus-events On
+set-option -g default-terminal "screen-256color"
+set-option -sa terminal-overrides ',xterm-256color:RGB'
+
+bind c new-window -c "#{pane_current_path}"
+bind '"' split-window -c "#{pane_current_path}"
+bind % split-window -h -c "#{pane_current_path}"

{zrb-1.0.0a10 → zrb-1.0.0a12}/src/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
+from zrb.config import TODO_DIR, TODO_VISUAL_FILTER
 from zrb.context.any_context import AnyContext
 from zrb.input.str_input import StrInput
 from zrb.input.text_input import TextInput
@@ -13,6 +13,7 @@ from zrb.util.todo import (
     TodoTaskModel,
     add_durations,
     cascade_todo_task,
+    get_visual_todo_card,
     get_visual_todo_list,
     line_to_todo_task,
     load_todo_list,
@@ -23,7 +24,7 @@ from zrb.util.todo import (
 
 
 @make_task(
-    name="todo-add",
+    name="add-todo",
     input=[
         StrInput(
             name="description",
@@ -77,20 +78,52 @@ def add_todo(ctx: AnyContext):
         )
     )
     save_todo_list(todo_file_path, todo_list)
-    return get_visual_todo_list(todo_list)
+    return get_visual_todo_list(todo_list, TODO_VISUAL_FILTER)
 
 
-@make_task(name="todo-list", description="📋 List todo", group=todo_group, alias="list")
+@make_task(name="list-todo", description="📋 List todo", group=todo_group, alias="list")
 def list_todo(ctx: AnyContext):
     todo_file_path = os.path.join(TODO_DIR, "todo.txt")
-    todo_tasks: list[TodoTaskModel] = []
+    todo_list: list[TodoTaskModel] = []
     if os.path.isfile(todo_file_path):
-        todo_tasks = load_todo_list(todo_file_path)
-    return get_visual_todo_list(todo_tasks)
+        todo_list = load_todo_list(todo_file_path)
+    return get_visual_todo_list(todo_list, TODO_VISUAL_FILTER)
 
 
 @make_task(
-    name="todo-complete",
+    name="show-todo",
+    input=StrInput(name="keyword", prompt="Task keyword", description="Task Keyword"),
+    description="🔍 Show todo",
+    group=todo_group,
+    alias="show",
+)
+def show_todo(ctx: AnyContext):
+    todo_file_path = os.path.join(TODO_DIR, "todo.txt")
+    todo_list: list[TodoTaskModel] = []
+    todo_list: list[TodoTaskModel] = []
+    if os.path.isfile(todo_file_path):
+        todo_list = load_todo_list(todo_file_path)
+    # Get todo task
+    todo_task = select_todo_task(todo_list, ctx.input.keyword)
+    if todo_task is None:
+        ctx.log_error("Task not found")
+        return
+    if todo_task.completed:
+        ctx.log_error("Task already completed")
+        return
+    # Update todo task
+    todo_task = cascade_todo_task(todo_task)
+    task_id = todo_task.keyval.get("id", "")
+    log_work_path = os.path.join(TODO_DIR, "log-work", f"{task_id}.json")
+    log_work_list = []
+    if os.path.isfile(log_work_path):
+        with open(log_work_path, "r") as f:
+            log_work_list = json.loads(f.read())
+    return get_visual_todo_card(todo_task, log_work_list)
+
+
+@make_task(
+    name="complete-todo",
     input=StrInput(name="keyword", prompt="Task keyword", description="Task Keyword"),
     description="✅ Complete todo",
     group=todo_group,
@@ -105,7 +138,10 @@ def complete_todo(ctx: AnyContext):
     todo_task = select_todo_task(todo_list, ctx.input.keyword)
     if todo_task is None:
         ctx.log_error("Task not found")
-        return get_visual_todo_list(todo_list)
+        return get_visual_todo_list(todo_list, TODO_VISUAL_FILTER)
+    if todo_task.completed:
+        ctx.log_error("Task already completed")
+        return get_visual_todo_list(todo_list, TODO_VISUAL_FILTER)
     # Update todo task
     todo_task = cascade_todo_task(todo_task)
     if todo_task.creation_date is not None:
@@ -113,11 +149,43 @@ def complete_todo(ctx: AnyContext):
     todo_task.completed = True
     # Save todo list
     save_todo_list(todo_file_path, todo_list)
-    return get_visual_todo_list(todo_list)
+    return get_visual_todo_list(todo_list, TODO_VISUAL_FILTER)
 
 
 @make_task(
-    name="todo-log",
+    name="archive-todo",
+    description="📚 Archive todo",
+    group=todo_group,
+    alias="archive",
+)
+def archive_todo(ctx: AnyContext):
+    todo_file_path = os.path.join(TODO_DIR, "todo.txt")
+    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
+    ]
+    new_archived_todo_list = [
+        todo_task for todo_task in todo_list if todo_task.completed
+    ]
+    if len(new_archived_todo_list) == 0:
+        ctx.print("No completed task to archive")
+        return get_visual_todo_list(todo_list, TODO_VISUAL_FILTER)
+    archive_file_path = os.path.join(TODO_DIR, "archive.txt")
+    if not os.path.isdir(TODO_DIR):
+        os.make_dirs(TODO_DIR, exist_ok=True)
+    archived_todo_list = []
+    if os.path.isfile(archive_file_path):
+        archived_todo_list = load_todo_list(archive_file_path)
+    archived_todo_list += new_archived_todo_list
+    save_todo_list(archive_file_path, archived_todo_list)
+    save_todo_list(todo_file_path, working_todo_list)
+    return get_visual_todo_list(todo_list, TODO_VISUAL_FILTER)
+
+
+@make_task(
+    name="log-todo",
     input=[
         StrInput(name="keyword", prompt="Task keyword", description="Task Keyword"),
         StrInput(
@@ -151,7 +219,7 @@ def log_todo(ctx: AnyContext):
     todo_task = select_todo_task(todo_list, ctx.input.keyword)
     if todo_task is None:
         ctx.log_error("Task not found")
-        return get_visual_todo_list(todo_list)
+        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")
@@ -175,7 +243,7 @@ def log_todo(ctx: AnyContext):
     )
     with open(log_work_file_path, "w") as f:
         f.write(json.dumps(log_work, indent=2))
-    return get_visual_todo_list(todo_list)
+    return get_visual_todo_list(todo_list, TODO_VISUAL_FILTER)
 
 
 def _get_default_start() -> str:
@@ -183,7 +251,7 @@ def _get_default_start() -> str:
 
 
 @make_task(
-    name="todo-edit",
+    name="edit-todo",
     input=[
         TextInput(
             name="text",
@@ -207,7 +275,7 @@ def edit_todo(ctx: AnyContext):
     with open(todo_file_path, "w") as f:
         f.write(new_content)
     todo_list = load_todo_list(todo_file_path)
-    return get_visual_todo_list(todo_list)
+    return get_visual_todo_list(todo_list, TODO_VISUAL_FILTER)
 
 
 def _get_todo_txt_content() -> str:
@@ -216,3 +284,4 @@ def _get_todo_txt_content() -> str:
         return ""
     with open(todo_file_path, "r") as f:
         return f.read()
+        return f.read()

{zrb-1.0.0a10 → zrb-1.0.0a12}/src/zrb/config.py

@@ -56,6 +56,7 @@ SESSION_LOG_DIR = os.getenv(
     "ZRB_SESSION_LOG_DIR", os.path.expanduser(os.path.join("~", ".zrb-session"))
 )
 TODO_DIR = os.getenv("ZRB_TODO_DIR", os.path.expanduser(os.path.join("~", "todo")))
+TODO_VISUAL_FILTER = os.getenv("ZRB_TODO_FILTER", "")
 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-1.0.0a10 → zrb-1.0.0a12}/src/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

{zrb-1.0.0a10 → zrb-1.0.0a12}/src/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-1.0.0a10 → zrb-1.0.0a12}/src/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-1.0.0a10 → zrb-1.0.0a12}/src/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-1.0.0a10 → zrb-1.0.0a12}/src/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-1.0.0a10 → zrb-1.0.0a12}/src/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-1.0.0a10 → zrb-1.0.0a12}/src/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-1.0.0a10 → zrb-1.0.0a12}/src/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
 
@@ -97,7 +97,13 @@ 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
         """
@@ -106,24 +112,30 @@ def create_app(root_group: AnyGroup, port: int = WEB_HTTP_PORT):
         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-1.0.0a10 → zrb-1.0.0a12}/src/zrb/util/load.py

@@ -3,6 +3,7 @@ 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]")
@@ -13,7 +14,7 @@ def load_zrb_init(dir_path: str | None = 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)
+        load_file(script_path, -1)
         return
     new_dir_path = os.path.dirname(dir_path)
     if new_dir_path == dir_path:
@@ -21,6 +22,7 @@ def load_zrb_init(dir_path: str | None = None):
     load_zrb_init(new_dir_path)
 
 
+@lru_cache()
 def load_file(script_path: str, sys_path_index: int = 0):
     if not os.path.isfile(script_path):
         return
@@ -45,6 +47,7 @@ def _get_new_python_path(dir_path: str) -> str:
     return ":".join([current_python_path, dir_path])
 
 
+@lru_cache()
 def load_module(module_name: str) -> Any:
     module = importlib.import_module(module_name)
     return module