zrb 1.0.0a12__tar.gz → 1.0.0a13__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zrb
-Version: 1.0.0a12
+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.0a12 → zrb-1.0.0a13}/pyproject.toml

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

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.0a12 → zrb-1.0.0a13}/src/zrb/builtin/todo.py

@@ -175,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)
@@ -241,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:
@@ -284,4 +300,3 @@ def _get_todo_txt_content() -> str:
         return ""
     with open(todo_file_path, "r") as f:
         return f.read()
-        return f.read()

{zrb-1.0.0a12 → zrb-1.0.0a13}/src/zrb/util/todo.py

@@ -315,8 +315,8 @@ def get_visual_todo_card(
         [
             "  ".join(
                 [
-                    log_work.get("duration", "").strip().rjust(12),
-                    log_work.get("start", "").strip().rjust(20),
+                    stylize_magenta(log_work.get("duration", "").strip().rjust(12)),
+                    stylize_cyan(log_work.get("start", "").strip().rjust(20)),
                     log_work.get("log", "").strip(),
                 ]
             )