taskai-cli 1.1.5__tar.gz → 1.2.1__tar.gz

{taskai_cli-1.1.5 → taskai_cli-1.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: taskai-cli
-Version: 1.1.5
+Version: 1.2.1
 Author-email: Alex Paskal <alexcpaskal@gmail.com>
 Requires-Python: >=3.12
 Requires-Dist: google-genai>=2.8

{taskai_cli-1.1.5 → taskai_cli-1.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "taskai-cli"
-version = "1.1.5"
+version = "1.2.1"
 description = ""
 authors = [{name = "Alex Paskal", email = "alexcpaskal@gmail.com"}]
 readme = "README.md"

{taskai_cli-1.1.5 → taskai_cli-1.2.1}/taskai/cli.py

@@ -406,7 +406,11 @@ def execute_commands(*args, **kwargs) -> int:
             # developer use
             case "db":
                 import orjson as json
-                print_json(json.dumps(db.read(args[1]).model_dump()).decode())
+                print_json(json.dumps(db.get_item(int(args[1])).model_dump()).decode())
+
+            case "status":
+                item_id, status_val = args[1:3]
+                Controller.update_item(item_id, status=status_val)
 
             case "exit" | "exit()" | "quit":
                 return 0

{taskai_cli-1.1.5 → taskai_cli-1.2.1}/taskai/models.py

@@ -4,7 +4,7 @@ from typing import Optional
 from datetime import datetime, timedelta
 
 # external
-from pydantic import Field, BaseModel
+from pydantic import Field, BaseModel, field_validator
 
 class Base(BaseModel):
     pass
@@ -46,6 +46,12 @@ class TodoItem(Base):
     recur_keep_incomplete: bool = False
     status: str = ""
 
+    @field_validator("status", mode="before")
+    def coerce_status(cls, value):
+        if not isinstance(value, str):
+            return ""
+        return value
+
 
 class Comment(Base):
     content: str
@@ -61,5 +67,10 @@ class CLIConfig(Base):
     GEMINI_MODEL: str = None
     GEMINI_API_KEY: str = None
 
+    # VIEW
+    DISPLAY_STRING: str = "id name status due_by"
+    DISPLAY_COLORS: str = "_ white dark_orange _"
+
+
 class LLMConfig(Base):
     pass

{taskai_cli-1.1.5 → taskai_cli-1.2.1}/taskai/views.py

@@ -1,6 +1,7 @@
 # local
 from taskai.json_dir_database import JsonDirectoryDatabase
 from taskai.models import TodoItem, Comment
+from taskai.config import config
 
 # external
 from rich import print
@@ -8,19 +9,68 @@ from rich.console import Console
 import rich
 
 
+"""
+Lets give the lists a display string
+
+
+set of valid attributes
+- id
+- name
+- status
+- 
+
+
+"""
+
+
+VALID_ATTRS = {
+    "id",
+    "name",
+    "created_on",
+    "due_by",
+    "priority",
+    "status"
+}
+
+
+@config("DISPLAY_STRING", "display_str")
+@config("DISPLAY_COLORS", "display_colors")
 def view_lists(
         db: JsonDirectoryDatabase, 
         roots: list[int], 
-        show_done=True, 
+        show_done=True,
+        display_str: str = "id name status", 
+        display_colors: str = None
 ):
     """Shows all the lists"""
 
+    attrs = display_str.lower().split(" ")
+
+    if display_colors:
+        colors = display_colors.lower().split(" ")
+        assert len(colors) == len(attrs), "must have a color for every attr"
+
+    for attr in attrs:
+        assert attr in VALID_ATTRS, "invalid attribute in display string {}".format(attr)
+
+    def _render_display_string(item: TodoItem):
+        display_string = ""
+        for i, attr in enumerate(attrs):
+            part = getattr(item, attr)
+            if not part:
+                continue
+            part = str(part)
+            if display_colors and colors[i] != "_":
+                part = _wrap_string(part, f"[{colors[i]}]", f"[/{colors[i]}]")  
+            display_string += f" {part}"
+        display_string = _wrap_string(display_string, "[strike]", "[/strike]", condition=item.completed)
+        return display_string
 
     def _print_item(item: TodoItem, level: int):
         if not show_done and item.completed:
             return
-        display_string = f"{item.id} {item.name}"
-        display_string = _wrap_string(display_string, "[strike]", "[/strike]", condition=item.completed)
+        
+        display_string = _render_display_string(item)
         indent = "\t" * level
         print(indent + display_string)
 
@@ -101,4 +151,4 @@ def _wrap_string(string_, before, after=None, condition=True):
     if condition:
         return f"{before}{string_}{after}"
     else:
-        return string_
+        return string_

taskai_cli-1.1.5/migrations/_001_removing_lists.py

@@ -1,50 +0,0 @@
-import argparse
-import orjson as json
-from taskai.models import TodoItem
-
-def migrate(data):
-    if "TodoList" in data:
-        for k, record in data["TodoList"].items():
-
-            record["child_ids"] = record.pop("item_ids")
-            TodoItem(**record)
-            print(f"Converting {k} to Item")
-            data["TodoItem"][k] = record
-        data.pop("TodoList")
-
-    for k, record in data["TodoItem"].items():
-
-        if "title" in record:
-            print(f"converting title->name for {k}")
-            record["title"] = record["name"]
-            record.pop("title")
-
-        if "parent" in record:
-            print(f"converting parent->parent_id for {k}")
-            record["parent_id"] = record["parent"]
-            record.pop("parent")
-    
-        if "child_ids" not in record:
-            print(f"Adding Child IDs {k}")
-            record["child_ids"] = []
-        
-        try:
-            data["TodoItem"][k] = TodoItem(**record).model_dump()
-        except:
-            print("validation for {} failed".format(k))
-            import sys
-            sys.exit()
-
-
-arg_parser = argparse.ArgumentParser()
-arg_parser.add_argument("path", help="path to taskai root")
-args = arg_parser.parse_args()
-
-with open(args.path, "rb") as f:
-    data = json.loads(f.read())
-
-migrate(data)
-
-
-with open(args.path, "wb") as f:
-    f.write(json.dumps(data))

taskai_cli-1.1.5/migrations/convert_title_to_name.py

@@ -1,30 +0,0 @@
-import argparse
-import orjson as json
-
-
-def convert_name_to_name(path):
-    with open(path, "rb") as f:
-        data = json.loads(f.read())
-
-    for k, record in data["TodoItem"].items():
-
-        if "name" in record:
-            print(f"migrating {k}")
-            record["name"] = record["name"]
-            record.pop("name")
-        elif "name" in record:
-            print(f"validated {k}")
-        else:
-            print(f"{k} is corrupted")
-    
-    with open(path, "wb") as f:
-        f.write(json.dumps(data))
-
-
-arg_parser = argparse.ArgumentParser()
-arg_parser.add_argument("path", help="path to taskai root")
-args = arg_parser.parse_args()
-
-
-convert_name_to_name(args.path)
-