zrb 1.0.0a12__py3-none-any.whl → 1.0.0a13__py3-none-any.whl

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/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/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(),
                 ]
             )

{zrb-1.0.0a12.dist-info → zrb-1.0.0a13.dist-info}/METADATA

@@ -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.dist-info → zrb-1.0.0a13.dist-info}/RECORD

@@ -61,6 +61,7 @@ zrb/builtin/project/add/fastapp_template/module/gateway/migration_metadata.py,sh
 zrb/builtin/project/add/fastapp_template/module/gateway/route.py,sha256=pClO2mBmiDMps3PJEk75icnbak-nrPAt6eN-1WlC9QA,1176
 zrb/builtin/project/add/fastapp_template/requirements.txt,sha256=J5qXx0sBagP-u-pdXsDnkPg66Gg-0ty4Mvz0WZXLAZY,108
 zrb/builtin/project/add/fastapp_template/schema/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+zrb/builtin/project/add/fastapp_template/schema/permission.py,sha256=9ZwJrPYHY04yrzFuNQLf3KnO3zMU8MFH3B1pMwoePzE,623
 zrb/builtin/project/add/fastapp_template/schema/role.py,sha256=tbpF67NsX3K7WNsxtx-3b0ClRnOo7pkTxdNs5UEn8oo,581
 zrb/builtin/project/add/fastapp_template/schema/user.py,sha256=5yiBVTuf9FcU7i_nM4sRRFztMhXCg0W1YAjnVlPgVRE,556
 zrb/builtin/project/add/fastapp_template/template.env,sha256=OZeV5cn9I7Wm6yJakyQ4lq5wVqGHuShYc_t3LqQK1Xk,55
@@ -82,7 +83,7 @@ zrb/builtin/shell/autocomplete/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5
 zrb/builtin/shell/autocomplete/bash.py,sha256=-7YDVV7txgJH9mAYSYN0jmvUEeDIzWFvVNY-cY0myF8,1181
 zrb/builtin/shell/autocomplete/subcmd.py,sha256=WZI6cGWJcn80zSyxOHG7sCMO3Ucix3mZf4xm_xyB_Y0,606
 zrb/builtin/shell/autocomplete/zsh.py,sha256=9hlq0Wt3fhRz326mAQTypEd4_4lZdrbBx_3A-Ti3mvw,1022
-zrb/builtin/todo.py,sha256=2JTk0CQKGXyBll3l097CGRLEPCqAZ5f4luR7nL-Ad1o,9480
+zrb/builtin/todo.py,sha256=yW25OZe2ZaEqz5PvGZtrdjBr4mWL98de1ZcsL6ipt08,9993
 zrb/callback/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/callback/any_callback.py,sha256=Yhdv5UWHAZSVzj5K2JdxcVQx8x8VX8aZJEivj3NTfZc,247
 zrb/callback/callback.py,sha256=IQ7r9EnXYHHcNXKBJAk4WFqCqj7WDvflAuCyu5y-27I,849
@@ -198,10 +199,10 @@ zrb/util/string/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/util/string/conversion.py,sha256=utfzaCLS2LTWMr9YbjXt2Z0a_pgzOjq76ZEPUh2UKCc,2876
 zrb/util/string/format.py,sha256=c9dUrsl_DII7jZZPJi9NBTvxKnrzZDPcQuksW6FJ_Lk,611
 zrb/util/string/name.py,sha256=8picJfUBXNpdh64GNaHv3om23QHhUZux7DguFLrXHp8,1163
-zrb/util/todo.py,sha256=DEqBrEqzm2o9aATEyROtPsP4D7dbHIlTFVn4kvqOd4M,13498
+zrb/util/todo.py,sha256=LharTudwr1gTNmt8iDUkQ6u21bGaCqVJh54Txe0bMOk,13529
 zrb/xcom/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 zrb/xcom/xcom.py,sha256=P4aYHdE3FRsTsNrXGyW8N44IWZjw-vG_qys1Ymn3aBg,1572
-zrb-1.0.0a12.dist-info/METADATA,sha256=yAtlpL0LBftuJRrC8zSn5erNKzCCkQAUGFFe6p_i9tg,4106
-zrb-1.0.0a12.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-zrb-1.0.0a12.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
-zrb-1.0.0a12.dist-info/RECORD,,
+zrb-1.0.0a13.dist-info/METADATA,sha256=EGlA61aVAFOuzE0-a6bJpgQRd24PZgGdT9UB7gFW8cw,4106
+zrb-1.0.0a13.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+zrb-1.0.0a13.dist-info/entry_points.txt,sha256=-Pg3ElWPfnaSM-XvXqCxEAa-wfVI6BEgcs386s8C8v8,46
+zrb-1.0.0a13.dist-info/RECORD,,