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

zrb/builtin/project/add/fastapp_template/_zrb/venv_task.py

@@ -1,22 +1,19 @@
 import os
 
 from fastapp_template._zrb.config import ACTIVATE_VENV_SCRIPT, APP_DIR
-from fastapp_template._zrb.group import app_group
 
 from zrb import CmdTask
 
 create_venv = CmdTask(
-    name="create-app-name-venv",
+    name="create-my-app-name-venv",
     cwd=APP_DIR,
     cmd="python -m venv .venv",
     execute_condition=lambda _: not os.path.isdir(os.path.join(APP_DIR, ".venv")),
 )
 
 prepare_venv = CmdTask(
-    name="prepare-app-name-venv",
+    name="prepare-my-app-name-venv",
     cmd=[ACTIVATE_VENV_SCRIPT, "pip install -r requirements.txt"],
     cwd=APP_DIR,
 )
 create_venv >> prepare_venv
-
-app_group.add_task(create_venv, alias="prepare")

zrb/builtin/project/add/fastapp_template/common/app.py

@@ -13,6 +13,8 @@ async def lifespan(app: FastAPI):
 
 
 app_title = (
-    "App Name" if APP_MODE == "monolith" else f"App Name - {', '.join(APP_MODULES)}"
+    "My App Name"
+    if APP_MODE == "monolith"
+    else f"My App Name - {', '.join(APP_MODULES)}"
 )
 app = FastAPI(title=app_title, lifespan=lifespan)

zrb/builtin/project/add/fastapp_template/config.py

@@ -2,15 +2,15 @@ import os
 
 APP_PATH = os.path.dirname(__file__)
 
-APP_MODE = os.getenv("APP_NAME_MODE", "monolith")
+APP_MODE = os.getenv("MY_APP_NAME_MODE", "monolith")
 APP_MODULES = [
     module.strip()
-    for module in os.getenv("APP_NAME_MODULES", "").split(",")
+    for module in os.getenv("MY_APP_NAME_MODULES", "").split(",")
     if module.strip() != ""
 ]
-APP_PORT = int(os.getenv("APP_NAME_PORT", "3000"))
+APP_PORT = int(os.getenv("MY_APP_NAME_PORT", "3000"))
 APP_COMMUNICATION = os.getenv(
-    "APP_NAME_COMMUNICATION", "direct" if APP_MODE == "monolith" else "api"
+    "MY_APP_NAME_COMMUNICATION", "direct" if APP_MODE == "monolith" else "api"
 )
 APP_REPOSITORY_TYPE = os.getenv("APP_REPOSITORY_TYPE", "db")
 APP_DB_URL = os.getenv(
@@ -21,9 +21,9 @@ APP_DB_URL = os.getenv(
         else f"sqlite:///{APP_PATH}/{APP_MODULES[0]}_microservices.db"
     ),
 )
-APP_AUTH_SUPER_USER = os.getenv("APP_NAME_AUTH_SUPER_USER", "admin")
+APP_AUTH_SUPER_USER = os.getenv("MY_APP_NAME_AUTH_SUPER_USER", "admin")
 APP_AUTH_SUPER_USER_PASSWORD = os.getenv(
-    "APP_NAME_AUTH_SUPER_USER_PASSWORD", "secure-password"
+    "MY_APP_NAME_AUTH_SUPER_USER_PASSWORD", "my-secure-password"
 )
 
-APP_AUTH_BASE_URL = os.getenv("APP_NAME_AUTH_BASE_URL", "http://localhost:3001")
+APP_AUTH_BASE_URL = os.getenv("MY_APP_NAME_AUTH_BASE_URL", "http://localhost:3001")

zrb/builtin/project/add/fastapp_template/module/auth/client/any_client.py

@@ -0,0 +1,27 @@
+from abc import ABC, abstractmethod
+
+from fastapp_template.schema.user import UserCreate, UserResponse, UserUpdate
+
+
+class BaseClient(ABC):
+    @abstractmethod
+    async def get_user_by_id(self, user_id: str) -> UserResponse:
+        pass
+
+    @abstractmethod
+    async def get_all_users(self) -> list[UserResponse]:
+        pass
+
+    @abstractmethod
+    async def create_user(
+        self, data: UserCreate | list[UserCreate]
+    ) -> UserResponse | list[UserResponse]:
+        pass
+
+    @abstractmethod
+    async def update_user(self, user_id: str, data: UserUpdate) -> UserResponse:
+        pass
+
+    @abstractmethod
+    async def delete_user(self, user_id: str) -> UserResponse:
+        pass

zrb/builtin/project/add/fastapp_template/module/auth/client/api_client.py

@@ -1,6 +1,6 @@
 from fastapp_template.config import APP_AUTH_BASE_URL
-from fastapp_template.module.auth.client.base_client import BaseClient
-from fastapp_template.module.auth.service.user.usecase import user_usecase
+from fastapp_template.module.auth.client.any_client import BaseClient
+from fastapp_template.module.auth.service.user.user_usecase import user_usecase
 
 
 class APIClient(user_usecase.as_api_client(base_url=APP_AUTH_BASE_URL), BaseClient):

zrb/builtin/project/add/fastapp_template/module/auth/client/direct_client.py

@@ -1,5 +1,5 @@
-from fastapp_template.module.auth.client.base_client import BaseClient
-from fastapp_template.module.auth.service.user.usecase import user_usecase
+from fastapp_template.module.auth.client.any_client import BaseClient
+from fastapp_template.module.auth.service.user.user_usecase import user_usecase
 
 
 class DirectClient(user_usecase.as_direct_client(), BaseClient):

zrb/builtin/project/add/fastapp_template/module/auth/client/factory.py

@@ -1,6 +1,6 @@
 from fastapp_template.config import APP_COMMUNICATION
+from fastapp_template.module.auth.client.any_client import BaseClient
 from fastapp_template.module.auth.client.api_client import APIClient
-from fastapp_template.module.auth.client.base_client import BaseClient
 from fastapp_template.module.auth.client.direct_client import DirectClient
 
 if APP_COMMUNICATION == "direct":

zrb/builtin/project/add/fastapp_template/module/auth/route.py

@@ -1,7 +1,7 @@
 from fastapp_template.common.app import app
 from fastapp_template.common.schema import BasicResponse
 from fastapp_template.config import APP_MODE, APP_MODULES
-from fastapp_template.module.auth.service.user.usecase import user_usecase
+from fastapp_template.module.auth.service.user.user_usecase import user_usecase
 
 if APP_MODE == "microservices" and "auth" in APP_MODULES:
 

zrb/builtin/project/add/fastapp_template/module/auth/service/user/repository/factory.py

@@ -1,9 +1,9 @@
 from fastapp_template.common.db_engine import engine
 from fastapp_template.config import APP_REPOSITORY_TYPE
-from fastapp_template.module.auth.service.user.repository.db_repository import (
+from fastapp_template.module.auth.service.user.repository.user_db_repository import (
     UserDBRepository,
 )
-from fastapp_template.module.auth.service.user.repository.repository import (
+from fastapp_template.module.auth.service.user.repository.user_repository import (
     UserRepository,
 )
 

zrb/builtin/project/add/fastapp_template/module/auth/service/user/repository/{db_repository.py → user_db_repository.py}

@@ -1,6 +1,6 @@
-from fastapp_template.common.db_repository import BaseDBRepository
+from fastapp_template.common.base_db_repository import BaseDBRepository
 from fastapp_template.common.error import NotFoundError
-from fastapp_template.module.auth.service.user.repository.repository import (
+from fastapp_template.module.auth.service.user.repository.user_repository import (
     UserRepository,
 )
 from fastapp_template.schema.user import User, UserCreate, UserResponse, UserUpdate

zrb/builtin/project/add/fastapp_template/module/auth/service/user/{usecase.py → user_usecase.py}

@@ -1,21 +1,28 @@
-from fastapp_template.common.usecase import BaseUsecase
+from fastapp_template.common.base_usecase import BaseUsecase
 from fastapp_template.module.auth.service.user.repository.factory import user_repository
+from fastapp_template.module.auth.service.user.repository.user_repository import (
+    UserRepository,
+)
 from fastapp_template.schema.user import UserCreate, UserResponse, UserUpdate
 
 
 class UserUsecase(BaseUsecase):
 
+    def __init__(self, user_repository: UserRepository):
+        super().__init__()
+        self.user_repository = user_repository
+
     @BaseUsecase.route(
         "/api/v1/users/{user_id}", methods=["get"], response_model=UserResponse
     )
     async def get_user_by_id(self, user_id: str) -> UserResponse:
-        return await user_repository.get_by_id(user_id)
+        return await self.user_repository.get_by_id(user_id)
 
     @BaseUsecase.route(
         "/api/v1/users", methods=["get"], response_model=list[UserResponse]
     )
     async def get_all_users(self) -> list[UserResponse]:
-        return await user_repository.get_all()
+        return await self.user_repository.get_all()
 
     @BaseUsecase.route(
         "/api/v1/users",
@@ -26,20 +33,20 @@ class UserUsecase(BaseUsecase):
         self, data: UserCreate | list[UserCreate]
     ) -> UserResponse | list[UserResponse]:
         if isinstance(data, UserCreate):
-            return await user_repository.create(data)
-        return await user_repository.create_bulk(data)
+            return await self.user_repository.create(data)
+        return await self.user_repository.create_bulk(data)
 
     @BaseUsecase.route(
         "/api/v1/users/{user_id}", methods=["put"], response_model=UserResponse
     )
     async def update_user(self, user_id: str, data: UserUpdate) -> UserResponse:
-        return await user_repository.update(user_id, data)
+        return await self.user_repository.update(user_id, data)
 
     @BaseUsecase.route(
         "/api/v1/users/{user_id}", methods=["delete"], response_model=UserResponse
     )
     async def delete_user(self, user_id: str) -> UserResponse:
-        return await user_repository.delete(user_id)
+        return await self.user_repository.delete(user_id)
 
 
-user_usecase = UserUsecase()
+user_usecase = UserUsecase(user_repository=user_repository)

zrb/builtin/project/add/fastapp_template/requirements.txt

@@ -1,6 +1,5 @@
-fastapi[standard]==0.115.4
-aiosqlite==0.20.0
-alembic==1.14.0
-sqlmodel==0.0.22
-ulid-py==1.1.0
-passlib==1.7.4
+fastapi[standard]~=0.115.5
+alembic~=1.14.0
+sqlmodel~=0.0.22
+ulid-py~=1.1.0
+passlib~=1.7.4

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

@@ -0,0 +1,31 @@
+import datetime
+
+import ulid
+from sqlmodel import Field, SQLModel
+
+
+class PermissionBase(SQLModel):
+    name: str
+
+
+class PermissionCreate(PermissionBase):
+    description: str
+
+
+class PermissionUpdate(SQLModel):
+    name: str | None = None
+    description: str | None = None
+
+
+class PermissionResponse(PermissionBase):
+    id: str
+
+
+class Permission(SQLModel, table=True):
+    id: str = Field(default_factory=lambda: ulid.new().str, primary_key=True)
+    created_at: datetime.datetime | None
+    created_by: str | None
+    updated_at: datetime.datetime | None
+    updated_by: str | None
+    name: str
+    description: str

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

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

zrb/builtin/project/create/create.py

@@ -18,7 +18,7 @@ scaffold_project = Scaffolder(
             default_str=lambda _: os.getcwd(),
         ),
         StrInput(
-            name="project-name",
+            name="project",
             description="Project name",
             prompt="Project name",
             default_str=lambda ctx: os.path.basename(ctx.input["project-dir"]),
@@ -27,7 +27,7 @@ scaffold_project = Scaffolder(
     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()}"},
+    transform_content={"Project Name": "{ctx.input.project.title()}"},
     retries=0,
 )
 

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

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

zrb/builtin/setup/{dev → 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/builtin/setup/{system/latex → 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/builtin/setup/{dev → 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/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/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",
@@ -40,11 +41,13 @@ from zrb.util.todo import (
             name="project",
             description="Task project",
             prompt="Task project (space separated)",
+            allow_empty=True,
         ),
         StrInput(
             name="context",
             description="Task context",
             prompt="Task context (space separated)",
+            allow_empty=True,
         ),
     ],
     description="➕ Add todo",
@@ -77,20 +80,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 +140,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 +151,45 @@ 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)
+    # Get archived todo list
+    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 the new todo list and add the archived ones
+    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 +223,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")
@@ -173,9 +245,23 @@ def log_todo(ctx: AnyContext):
     log_work.append(
         {"log": ctx.input.log, "duration": ctx.input.duration, "start": ctx.input.start}
     )
+    # save todo with log work
     with open(log_work_file_path, "w") as f:
         f.write(json.dumps(log_work, indent=2))
-    return get_visual_todo_list(todo_list)
+    # get log work list
+    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 "\n".join(
+        [
+            get_visual_todo_list(todo_list, TODO_VISUAL_FILTER),
+            "",
+            get_visual_todo_card(todo_task, log_work_list),
+        ]
+    )
 
 
 def _get_default_start() -> str:
@@ -183,7 +269,7 @@ def _get_default_start() -> str:
 
 
 @make_task(
-    name="todo-edit",
+    name="edit-todo",
     input=[
         TextInput(
             name="text",
@@ -207,7 +293,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:

zrb/config.py

@@ -47,8 +47,7 @@ INIT_SCRIPTS = (
 )
 LOGGING_LEVEL = _get_log_level(os.getenv("ZRB_LOGGING_LEVEL", "WARNING"))
 LOAD_BUILTIN = to_boolean(os.getenv("ZRB_LOAD_BUILTIN", "1"))
-ENV_PREFIX = os.getenv("ZRB_ENV", "")
-SHOW_PROMPT = to_boolean(os.getenv("ZRB_SHOW_PROMPT", "1"))
+SHOW_TIME = to_boolean(os.getenv("ZRB_SHOW_TIME", "1"))
 WARN_UNRECOMMENDED_COMMAND = to_boolean(
     os.getenv("ZRB_WARN_UNRECOMMENDED_COMMAND", "1")
 )
@@ -56,6 +55,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/content_transformer/content_transformer.py

@@ -11,7 +11,10 @@ class ContentTransformer(AnyContentTransformer):
     def __init__(
         self,
         match: list[str] | str | Callable[[AnyContext, str], bool],
-        transform: dict[str, str] | Callable[[AnyContext, str], str],
+        transform: (
+            dict[str, str | Callable[[AnyContext], str]]
+            | Callable[[AnyContext, str], str]
+        ),
         auto_render: bool = True,
     ):
         self._match = match
@@ -34,7 +37,7 @@ class ContentTransformer(AnyContentTransformer):
         if callable(self._transform_file):
             return self._transform_file(ctx, file_path)
         transform_map = {
-            keyword: ctx.render(replacement) if self._auto_render else replacement
+            keyword: self._get_str_replacement(ctx, replacement)
             for keyword, replacement in self._transform_file.items()
         }
         with open(file_path, "r") as f:
@@ -43,3 +46,12 @@ class ContentTransformer(AnyContentTransformer):
             content = content.replace(keyword, replacement)
         with open(file_path, "w") as f:
             f.write(content)
+
+    def _get_str_replacement(
+        self, ctx: AnyContext, replacement: str | Callable[[AnyContext], str]
+    ) -> str:
+        if callable(replacement):
+            return replacement(ctx)
+        if self._auto_render:
+            return ctx.render(replacement)
+        return replacement

zrb/context/context.py

@@ -1,22 +1,23 @@
 import datetime
 import logging
-import re
 import sys
 from typing import Any, TextIO
 
+from zrb.config import SHOW_TIME
 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.cli.style import (
+    remove_style,
+    stylize,
+    stylize_error,
+    stylize_log,
+    stylize_warning,
+)
 from zrb.util.string.conversion import to_boolean
 
 
-def _remove_ansi_escape_sequences(text):
-    ansi_escape = re.compile(r"\x1B[@-_][0-?]*[ -/]*[@-~]")
-    return ansi_escape.sub("", text)
-
-
 class Context(AnyContext):
     def __init__(
         self, shared_ctx: AnySharedContext, task_name: str, color: int, icon: str
@@ -111,10 +112,12 @@ class Context(AnyContext):
         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} {padded_styled_task_name} ⬤ "
+        formatted_time = (
+            now.strftime("%y%m%d %H:%M:%S.%f")[:19] + " " if SHOW_TIME else ""
+        )
+        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}"))
+        self.append_to_shared_log(remove_style(f"{prefix} {message}"))
         stylized_prefix = stylize(prefix, color=color)
         print(f"{stylized_prefix} {message}", sep=sep, end=end, file=file, flush=flush)