zrb 1.0.0a2__py3-none-any.whl → 1.0.0a4__py3-none-any.whl

zrb/builtin/project/add/fastapp_template/schema/user.py

@@ -0,0 +1,31 @@
+import datetime
+
+import ulid
+from sqlmodel import Field, SQLModel
+
+
+class UserBase(SQLModel):
+    username: str
+
+
+class UserCreate(UserBase):
+    password: str
+
+
+class UserUpdate(SQLModel):
+    username: str | None = None
+    password: str | None = None
+
+
+class UserResponse(UserBase):
+    id: str
+
+
+class User(SQLModel, table=True):
+    id: str = Field(default_factory=lambda: ulid.new().str, primary_key=True)
+    created_at: datetime.datetime
+    created_by: str
+    updated_at: datetime.datetime
+    updated_by: str
+    username: str
+    password: str

zrb/builtin/project/add/fastapp_template/template.env

@@ -0,0 +1,2 @@
+export APP_NAME_MODE=monolith
+export APP_NAME_PORT=3000

zrb/builtin/project/create/create.py

@@ -0,0 +1,41 @@
+import os
+
+from zrb.builtin.group import project_group
+from zrb.input.str_input import StrInput
+from zrb.task.scaffolder import Scaffolder
+from zrb.task.task import Task
+
+_DIR = os.path.dirname(__file__)
+
+scaffold_project = Scaffolder(
+    name="scaffold-project",
+    description="🌟 Create project",
+    input=[
+        StrInput(
+            name="project-dir",
+            description="Project directory",
+            prompt="Project directory",
+            default_str=lambda _: os.getcwd(),
+        ),
+        StrInput(
+            name="project-name",
+            description="Project name",
+            prompt="Project name",
+            default_str=lambda ctx: os.path.basename(ctx.input["project-dir"]),
+        ),
+    ],
+    source_path=os.path.join(_DIR, "project-template"),
+    render_source_path=False,
+    destination_path="{ctx.input['project-dir']}",
+    transform_content={"Project Name": "{ctx.input['project-name'].title()}"},
+    retries=0,
+)
+
+create_project = project_group.add_task(
+    Task(
+        name="create-project",
+        description="🌟 Create project",
+    ),
+    alias="create",
+)
+scaffold_project >> create_project

zrb/builtin/project/create/project-template/README.md

@@ -0,0 +1,3 @@
+# Project Name
+
+Welcome to Project Name

zrb/builtin/project/create/project-template/zrb_init.py

@@ -0,0 +1,7 @@
+import os
+
+from zrb import load_file
+
+_DIR = os.path.dirname(__file__)
+
+assert load_file

zrb/builtin/python.py

@@ -0,0 +1,11 @@
+from zrb.builtin.group import python_group
+from zrb.task.cmd_task import CmdTask
+
+format_python_code = python_group.add_task(
+    CmdTask(
+        name="format-code",
+        description="✏️ Format Python code",
+        cmd=["isort .", "black ."],
+    ),
+    alias="format",
+)

zrb/builtin/shell/__init__.py

@@ -1,5 +0,0 @@
-from . import autocomplete
-from ._group import shell_group
-
-assert autocomplete
-assert shell_group

zrb/builtin/shell/autocomplete/__init__.py

@@ -1,9 +0,0 @@
-from ._group import shell_autocomplete_group
-from .bash import make_bash_autocomplete
-from .subcmd import get_shell_subcommands
-from .zsh import make_zsh_autocomplete
-
-assert shell_autocomplete_group
-assert make_bash_autocomplete
-assert make_zsh_autocomplete
-assert get_shell_subcommands

zrb/builtin/shell/autocomplete/bash.py

@@ -1,6 +1,6 @@
-from ....context.context import Context
-from ....task.make_task import make_task
-from ._group import shell_autocomplete_group
+from zrb.builtin.group import shell_autocomplete_group
+from zrb.context.context import Context
+from zrb.task.make_task import make_task
 
 _COMPLETION_SCRIPT = """
 # Bash dynamic completion script
@@ -33,9 +33,8 @@ complete -F _zrb_complete zrb
 @make_task(
     name="make-bash-autocomplete",
     description="Create Zrb autocomplete script for bash",
+    group=shell_autocomplete_group,
+    alias="bash",
 )
 def make_bash_autocomplete(ctx: Context):
     return _COMPLETION_SCRIPT
-
-
-shell_autocomplete_group.add_task(make_bash_autocomplete, "bash")

zrb/builtin/shell/autocomplete/subcmd.py

@@ -1,13 +1,15 @@
-from ....context.context import Context
-from ....runner.cli import cli
-from ....task.make_task import make_task
-from ....util.cli.subcommand import get_group_subcommands
-from ._group import shell_autocomplete_group
+from zrb.builtin.group import shell_autocomplete_group
+from zrb.context.context import Context
+from zrb.runner.cli import cli
+from zrb.task.make_task import make_task
+from zrb.util.cli.subcommand import get_group_subcommands
 
 
 @make_task(
     name="get-shell-subcommands",
     description="Get subcommand of any Zrb command",
+    group=shell_autocomplete_group,
+    alias="subcmd",
 )
 def get_shell_subcommands(ctx: Context):
     subcommands = get_group_subcommands(cli)
@@ -15,6 +17,3 @@ def get_shell_subcommands(ctx: Context):
         if subcommand.paths == ctx.args:
             return " ".join(subcommand.nexts)
     return ""
-
-
-shell_autocomplete_group.add_task(get_shell_subcommands, "subcmd")

zrb/builtin/shell/autocomplete/zsh.py

@@ -1,6 +1,6 @@
-from ....context.context import Context
-from ....task.make_task import make_task
-from ._group import shell_autocomplete_group
+from zrb.builtin.group import shell_autocomplete_group
+from zrb.context.context import Context
+from zrb.task.make_task import make_task
 
 _COMPLETION_SCRIPT = """
 # Zsh dynamic completion script
@@ -30,9 +30,8 @@ compdef _zrb_complete zrb
 @make_task(
     name="make-zsh-autocomplete",
     description="Create Zrb autocomplete script for zsh",
+    group=shell_autocomplete_group,
+    alias="zsh",
 )
 def make_zsh_autocomplete(ctx: Context):
     return _COMPLETION_SCRIPT
-
-
-shell_autocomplete_group.add_task(make_zsh_autocomplete, "zsh")

zrb/builtin/todo.py

@@ -0,0 +1,219 @@
+import datetime
+import json
+import os
+from typing import Any
+
+from zrb.builtin.group import todo_group
+from zrb.config import TODO_DIR
+from zrb.context.any_context import AnyContext
+from zrb.input.str_input import StrInput
+from zrb.input.text_input import TextInput
+from zrb.task.make_task import make_task
+from zrb.util.todo import (
+    TodoTaskModel,
+    add_durations,
+    cascade_todo_task,
+    get_visual_todo_list,
+    line_to_todo_task,
+    load_todo_list,
+    save_todo_list,
+    select_todo_task,
+    todo_task_to_line,
+)
+
+
+@make_task(
+    name="todo-add",
+    input=[
+        StrInput(
+            name="description",
+            description="Task description",
+            prompt="Task description",
+        ),
+        StrInput(
+            name="priority",
+            description="Task priority",
+            prompt="Task priority",
+            default_str="E",
+        ),
+        StrInput(
+            name="project",
+            description="Task project",
+            prompt="Task project (space separated)",
+        ),
+        StrInput(
+            name="context",
+            description="Task context",
+            prompt="Task context (space separated)",
+        ),
+    ],
+    description="➕ Add todo",
+    group=todo_group,
+    alias="add",
+)
+def todo_add(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)
+    else:
+        os.makedirs(TODO_DIR, exist_ok=True)
+    todo_list.append(
+        cascade_todo_task(
+            TodoTaskModel(
+                priority=ctx.input.priority.upper(),
+                description=ctx.input.description,
+                contexts=[
+                    context.strip()
+                    for context in ctx.input.context.split(" ")
+                    if context.strip() != ""
+                ],
+                projects=[
+                    project.strip()
+                    for project in ctx.input.project.split(" ")
+                    if project.strip() != ""
+                ],
+            )
+        )
+    )
+    save_todo_list(todo_file_path, todo_list)
+    return get_visual_todo_list(todo_list)
+
+
+@make_task(name="todo-list", description="📋 List todo", group=todo_group, alias="list")
+def todo_list(ctx: AnyContext):
+    todo_file_path = os.path.join(TODO_DIR, "todo.txt")
+    todo_tasks: list[TodoTaskModel] = []
+    if os.path.isfile(todo_file_path):
+        todo_tasks = load_todo_list(todo_file_path)
+    return get_visual_todo_list(todo_tasks)
+
+
+@make_task(
+    name="todo-complete",
+    input=StrInput(name="keyword", prompt="Task keyword", description="Task Keyword"),
+    description="✅ Complete todo",
+    group=todo_group,
+    alias="complete",
+)
+def todo_complete(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)
+    # 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 get_visual_todo_list(todo_list)
+    # Update todo task
+    todo_task = cascade_todo_task(todo_task)
+    if todo_task.creation_date is not None:
+        todo_task.completion_date = datetime.date.today()
+    todo_task.completed = True
+    # Save todo list
+    save_todo_list(todo_file_path, todo_list)
+    return get_visual_todo_list(todo_list)
+
+
+@make_task(
+    name="todo-log",
+    input=[
+        StrInput(name="keyword", prompt="Task keyword", description="Task Keyword"),
+        StrInput(
+            name="start",
+            prompt="Working start time (%Y-%m-%d %H:%M:%S)",
+            description="Working start time",
+            default_str=lambda _: _get_default_start(),
+        ),
+        StrInput(
+            name="duration",
+            prompt="Working duration",
+            description="Working duration",
+            default_str="30m",
+        ),
+        StrInput(
+            name="log",
+            prompt="Working log",
+            description="Working log",
+        ),
+    ],
+    description="🕒 Log work todo",
+    group=todo_group,
+    alias="log",
+)
+def todo_log(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)
+    # 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 get_visual_todo_list(todo_list)
+    # 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)
+    print(current_duration, todo_task.keyval)
+    # Save todo list
+    save_todo_list(todo_file_path, todo_list)
+    # Add log work
+    log_work_dir = os.path.join(TODO_DIR, "log-work")
+    os.makedirs(log_work_dir, exist_ok=True)
+    log_work_file_path = os.path.join(
+        log_work_dir, f"{todo_task.keyval.get('id')}.json"
+    )
+    if os.path.isfile(log_work_file_path):
+        with open(log_work_file_path, "r") as f:
+            log_work_json = f.read()
+    else:
+        log_work_json = "[]"
+    log_work: list[dict[str, Any]] = json.loads(log_work_json)
+    log_work.append(
+        {"log": ctx.input.log, "duration": ctx.input.duration, "start": ctx.input.start}
+    )
+    with open(log_work_file_path, "w") as f:
+        f.write(json.dumps(log_work, indent=2))
+    return get_visual_todo_list(todo_list)
+
+
+def _get_default_start() -> str:
+    return datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+
+
+@make_task(
+    name="todo-edit",
+    input=[
+        TextInput(
+            name="text",
+            description="Todo.txt content",
+            prompt="Todo.txt content (will override existing)",
+            default_str=lambda _: _get_todo_txt_content(),
+        ),
+    ],
+    description="📝 Edit todo",
+    group=todo_group,
+    alias="edit",
+)
+def todo_edit(ctx: AnyContext):
+    todo_list = [
+        cascade_todo_task(line_to_todo_task(line))
+        for line in ctx.input.text.split("\n")
+        if line.strip() != ""
+    ]
+    new_content = "\n".join(todo_task_to_line(todo_task) for todo_task in todo_list)
+    todo_file_path = os.path.join(TODO_DIR, "todo.txt")
+    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)
+
+
+def _get_todo_txt_content() -> str:
+    todo_file_path = os.path.join(TODO_DIR, "todo.txt")
+    if not os.path.isfile(todo_file_path):
+        return ""
+    with open(todo_file_path, "r") as f:
+        return f.read()

zrb/callback/any_callback.py

@@ -1,7 +1,7 @@
 from abc import ABC, abstractmethod
 from typing import Any
 
-from ..context.any_shared_context import AnySharedContext
+from zrb.context.any_shared_context import AnySharedContext
 
 
 class AnyCallback(ABC):

zrb/callback/callback.py

@@ -1,10 +1,10 @@
 from typing import Any
 
-from ..attr.type import StrDictAttr
-from ..session.any_session import AnySession
-from ..task.any_task import AnyTask
-from ..util.attr import get_str_dict_attr
-from .any_callback import AnyCallback
+from zrb.attr.type import StrDictAttr
+from zrb.callback.any_callback import AnyCallback
+from zrb.session.any_session import AnySession
+from zrb.task.any_task import AnyTask
+from zrb.util.attr import get_str_dict_attr
 
 
 class Callback(AnyCallback):

zrb/cmd/cmd_val.py

@@ -1,8 +1,8 @@
 from abc import ABC, abstractmethod
 from collections.abc import Callable
 
-from ..attr.type import fstring
-from ..context.context import Context
+from zrb.attr.type import fstring
+from zrb.context.context import Context
 
 
 class AnyCmdVal(ABC):

zrb/config.py

@@ -3,7 +3,7 @@ import logging
 import os
 import platform
 
-from .util.string.conversion import to_boolean
+from zrb.util.string.conversion import to_boolean
 
 
 def _get_current_shell() -> str:
@@ -46,15 +46,28 @@ INIT_SCRIPTS = (
     else []
 )
 LOGGING_LEVEL = _get_log_level(os.getenv("ZRB_LOGGING_LEVEL", "WARNING"))
-SHOULD_LOAD_BUILTIN = to_boolean(os.getenv("ZRB_SHOULD_LOAD_BUILTIN", "1"))
+LOAD_BUILTIN = to_boolean(os.getenv("ZRB_LOAD_BUILTIN", "1"))
 ENV_PREFIX = os.getenv("ZRB_ENV", "")
-SHOW_ADVERTISEMENT = to_boolean(os.getenv("ZRB_SHOW_ADVERTISEMENT", "1"))
 SHOW_PROMPT = to_boolean(os.getenv("ZRB_SHOW_PROMPT", "1"))
 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")))
 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")
+LLM_SYSTEM_PROMPT = os.getenv("ZRB_LLM_SYSTEM_PROMPT", "You are a helpful assistant")
+LLM_HISTORY_FILE = os.getenv(
+    "ZRB_LLM_HISTORY_FILE",
+    os.path.expanduser(os.path.join("~", ".zrb-llm-history.json")),
+)
+LLM_ALLOW_ACCESS_SHELL = to_boolean(os.getenv("ZRB_LLM_ACCESS_FILE", "1"))
+LLM_ALLOW_ACCESS_WEB = to_boolean(os.getenv("ZRB_LLM_ACCESS_WEB", "1"))
+RAG_EMBEDDING_MODEL = os.getenv("ZRB_RAG_EMBEDDING_MODEL", "ollama/nomic-embed-text")
+RAG_CHUNK_SIZE = int(os.getenv("ZRB_RAG_CHUNK_SIZE", "1024"))
+RAG_OVERLAP = int(os.getenv("ZRB_RAG_OVERLAP", "128"))
+RAG_MAX_RESULT_COUNT = int(os.getenv("ZRB_RAG_MAX_RESULT_COUNT", "5"))
+
 
 BANNER = f"""
                 bb

zrb/content_transformer/any_content_transformer.py

@@ -1,6 +1,6 @@
 from abc import ABC, abstractmethod
 
-from ..context.any_context import AnyContext
+from zrb.context.any_context import AnyContext
 
 
 class AnyContentTransformer(ABC):

zrb/content_transformer/content_transformer.py

@@ -2,8 +2,8 @@ import fnmatch
 import re
 from collections.abc import Callable
 
-from ..context.any_context import AnyContext
-from .any_content_transformer import AnyContentTransformer
+from zrb.content_transformer.any_content_transformer import AnyContentTransformer
+from zrb.context.any_context import AnyContext
 
 
 class ContentTransformer(AnyContentTransformer):

zrb/context/any_context.py

@@ -2,7 +2,7 @@ import sys
 from abc import abstractmethod
 from typing import TextIO
 
-from .any_shared_context import AnySharedContext
+from zrb.context.any_shared_context import AnySharedContext
 
 
 class AnyContext(AnySharedContext):

zrb/context/any_shared_context.py

@@ -3,11 +3,11 @@ from __future__ import annotations  # Enables forward references
 from abc import ABC, abstractmethod
 from typing import TYPE_CHECKING, Any
 
-from ..dot_dict.dot_dict import DotDict
-from ..xcom.xcom import Xcom
+from zrb.dot_dict.dot_dict import DotDict
+from zrb.xcom.xcom import Xcom
 
 if TYPE_CHECKING:
-    from ..session import any_session
+    from zrb.session import any_session
 
 
 class AnySharedContext(ABC):

zrb/context/context.py

@@ -4,12 +4,12 @@ import re
 import sys
 from typing import Any, TextIO
 
-from ..dot_dict.dot_dict import DotDict
-from ..session.any_session import AnySession
-from ..util.cli.style import stylize, stylize_error, stylize_log, stylize_warning
-from ..util.string.conversion import to_boolean
-from .any_context import AnyContext
-from .any_shared_context import AnySharedContext
+from zrb.context.any_context import AnyContext
+from zrb.context.any_shared_context import AnySharedContext
+from zrb.dot_dict.dot_dict import DotDict
+from zrb.session.any_session import AnySession
+from zrb.util.cli.style import stylize, stylize_error, stylize_log, stylize_warning
+from zrb.util.string.conversion import to_boolean
 
 
 def _remove_ansi_escape_sequences(text):
@@ -103,14 +103,16 @@ class Context(AnyContext):
     ):
         color = self._color
         icon = self._icon
-        task_name = self._task_name.rjust(15)
+        max_name_length = max(len(name) + len(icon) for name in self.session.task_names)
+        styled_task_name = f"{icon} {self._task_name}"
+        padded_styled_task_name = styled_task_name.rjust(max_name_length + 1)
         if self._attempt == 0:
             attempt_status = "".ljust(5)
         else:
             attempt_status = f"{self._attempt}/{self._max_attempt}".ljust(5)
         now = datetime.datetime.now()
         formatted_time = now.strftime("%y%m%d %H:%M:%S.%f")[:19]
-        prefix = f"{formatted_time} {attempt_status} {icon} {task_name} ⬤ "
+        prefix = f"{formatted_time} {attempt_status} {padded_styled_task_name} ⬤ "
         message = sep.join([f"{value}" for value in values])
         self.append_to_shared_log(_remove_ansi_escape_sequences(f"{prefix} {message}"))
         stylized_prefix = stylize(prefix, color=color)

zrb/context/shared_context.py

@@ -1,10 +1,12 @@
 import datetime
 from typing import Any
 
-from ..config import LOGGING_LEVEL
-from ..dot_dict.dot_dict import DotDict
-from ..session.any_session import AnySession
-from ..util.string.conversion import (
+from zrb.config import LOGGING_LEVEL
+from zrb.context.any_shared_context import AnySharedContext
+from zrb.dot_dict.dot_dict import DotDict
+from zrb.session.any_session import AnySession
+from zrb.util.string.conversion import (
+    double_quote,
     to_boolean,
     to_camel_case,
     to_human_case,
@@ -12,9 +14,8 @@ from ..util.string.conversion import (
     to_pascal_case,
     to_snake_case,
 )
-from ..util.string.format import fstring_format
-from ..xcom.xcom import Xcom
-from .any_shared_context import AnySharedContext
+from zrb.util.string.format import fstring_format
+from zrb.xcom.xcom import Xcom
 
 
 class SharedContext(AnySharedContext):
@@ -86,12 +87,12 @@ class SharedContext(AnySharedContext):
             data={
                 "ctx": self,
                 "datetime": datetime,
-                "Xcom": Xcom,
                 "to_boolean": to_boolean,
                 "to_camel_case": to_camel_case,
                 "to_human_case": to_human_case,
                 "to_kebab_case": to_kebab_case,
                 "to_pascal_case": to_pascal_case,
                 "to_snake_case": to_snake_case,
+                "double_quote": double_quote,
             },
         )

zrb/env/__init__.py

@@ -1,3 +0,0 @@
-from .env import Env
-
-assert Env

zrb/env/any_env.py

@@ -1,6 +1,6 @@
 from abc import ABC, abstractmethod
 
-from ..context.any_shared_context import AnySharedContext
+from zrb.context.any_shared_context import AnySharedContext
 
 
 class AnyEnv(ABC):

zrb/env/env.py

@@ -1,10 +1,9 @@
 import os
 
+from zrb.attr.type import StrAttr
 from zrb.context.any_shared_context import AnySharedContext
-
-from ..attr.type import StrAttr
-from ..util.attr import get_str_attr
-from .any_env import AnyEnv
+from zrb.env.any_env import AnyEnv
+from zrb.util.attr import get_str_attr
 
 
 class Env(AnyEnv):

zrb/env/env_file.py

@@ -1,9 +1,9 @@
 from dotenv import dotenv_values
 
-from ..attr.type import StrAttr
-from ..context.shared_context import SharedContext
-from ..util.attr import get_str_attr
-from .env_map import EnvMap
+from zrb.attr.type import StrAttr
+from zrb.context.shared_context import SharedContext
+from zrb.env.env_map import EnvMap
+from zrb.util.attr import get_str_attr
 
 
 class EnvFile(EnvMap):