zrb 1.0.0a11__tar.gz → 1.0.0a13__tar.gz

{zrb-1.0.0a11 → zrb-1.0.0a13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zrb
-Version: 1.0.0a11
+Version: 1.0.0a13
 Summary: Your Automation Powerhouse
 Home-page: https://github.com/state-alchemists/zrb
 License: AGPL-3.0-or-later

{zrb-1.0.0a11 → zrb-1.0.0a13}/pyproject.toml

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

{zrb-1.0.0a11 → zrb-1.0.0a13}/src/zrb/builtin/__init__.py

@@ -26,6 +26,7 @@ from zrb.builtin.todo import (
     edit_todo,
     list_todo,
     log_todo,
+    show_todo,
 )
 
 assert create_project
@@ -53,6 +54,7 @@ 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.0a13/src/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-1.0.0a11 → zrb-1.0.0a13}/src/zrb/builtin/todo.py

@@ -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,
@@ -89,6 +90,38 @@ def list_todo(ctx: AnyContext):
     return get_visual_todo_list(todo_list, TODO_VISUAL_FILTER)
 
 
+@make_task(
+    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"),
@@ -142,10 +175,12 @@ def archive_todo(ctx: AnyContext):
     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)
@@ -208,9 +243,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, TODO_VISUAL_FILTER)
+    # 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:

{zrb-1.0.0a11 → zrb-1.0.0a13}/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.0a11 → zrb-1.0.0a13}/src/zrb/util/todo.py

@@ -1,12 +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,
 )
@@ -222,7 +225,7 @@ def get_visual_todo_list(todo_list: list[TodoTaskModel], filter: str) -> str:
     terminal_width, _ = shutil.get_terminal_size()
     # Headers
     results = [
-        stylize_bold_green(
+        stylize_faint(
             get_visual_todo_header(
                 terminal_width, max_desc_length, max_additional_info_length
             )
@@ -265,10 +268,15 @@ def get_visual_todo_line(
     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.ljust(max_desc_length)
+    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]
@@ -283,6 +291,53 @@ def get_visual_todo_line(
     )
 
 
+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(
+                [
+                    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"]))
+        )
+        detail.append(log_work_str)
+    return "\n".join(detail)
+
+
 def _date_to_str(date: datetime.date | None) -> str:
     if date is None:
         return "".ljust(14)