taskai-cli 1.2.0__tar.gz → 1.3.0__tar.gz

{taskai_cli-1.2.0 → taskai_cli-1.3.0}/PKG-INFO

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

{taskai_cli-1.2.0 → taskai_cli-1.3.0}/pyproject.toml

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

{taskai_cli-1.2.0 → taskai_cli-1.3.0}/taskai/cli.py

@@ -52,6 +52,12 @@ class Controller:
                 return db.get_item(id_)
         return None
 
+    def _find_item_by_identifier(identifier: str|int) -> TodoItem:
+        if _is_int(identifier):
+            return db.get_item(identifier)
+        else:
+            return Controller._find_model_by_stringmatch("name", identifier)
+
     def _parse_item_kwargs(kwargs):
         for k, v in kwargs.copy().items():
             if v is None:
@@ -240,6 +246,15 @@ class Controller:
         db.update_item(parent.id, child_ids=new_child_ids)
         db.commit()
 
+    def add_link(parent_id: int|str, child_id: int|str):
+        parent: TodoItem = Controller._find_item_by_identifier(parent_id)
+        child: TodoItem = Controller._find_item_by_identifier(child_id)
+
+        if child.id not in parent.linked_ids:
+            parent.linked_ids.append(child_id)
+        db.update_item(parent.id, linked_ids=parent.linked_ids)
+        db.commit()
+
 
 # utilities
 def _parse_arg_string(arg_string: str) -> list[str]:
@@ -376,6 +391,11 @@ def execute_commands(*args, **kwargs) -> int:
                 parent_identifier = args[1]
                 item_name = args[2]
                 Controller.create_item(item_name, parent_identifier, **kwargs)
+            
+            case "link":
+                parent_identifier = args[1]
+                item_identifier = args[2]
+                Controller.add_link(parent_identifier, item_identifier)
 
             case "complete" | "done":
                 match args[1]:
@@ -406,7 +426,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.2.0 → taskai_cli-1.3.0}/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
@@ -39,6 +39,7 @@ class TodoItem(Base):
     due_by: Optional[datetime] = None
     comment_ids: list[int] = Field(default_factory=list)
     dependency_ids: list[int] = Field(default_factory=list)
+    linked_ids: list[int] = Field(default_factory=list)
     child_ids: list[int] = Field(default_factory=list)
     priority: int = 0
     recurs_every: Optional[list[timedelta]] = None
@@ -46,6 +47,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

{taskai_cli-1.2.0 → taskai_cli-1.3.0}/taskai/views.py

@@ -1,5 +1,5 @@
 # local
-from taskai.json_dir_database import JsonDirectoryDatabase
+from taskai.json_dir_database import JsonDirectoryDatabase, DatabaseError
 from taskai.models import TodoItem, Comment
 from taskai.config import config
 
@@ -66,20 +66,27 @@ def view_lists(
         display_string = _wrap_string(display_string, "[strike]", "[/strike]", condition=item.completed)
         return display_string
 
-    def _print_item(item: TodoItem, level: int):
+    def _print_item(item: TodoItem, level: int, prefix=""):
         if not show_done and item.completed:
             return
         
         display_string = _render_display_string(item)
         indent = "\t" * level
-        print(indent + display_string)
+        print(indent + prefix + display_string)
 
     def _recursive_print(item_id: int, level: int):
         item = db.get_item(item_id)
         _print_item(item, level)
+        for linked_id in item.linked_ids:
+            try:
+                linked_item = db.get_item(linked_id)
+            except DatabaseError:
+                continue
+            _print_item(linked_item, level+1, prefix="-->")
         for child_id in item.child_ids:
             _recursive_print(child_id, level+1)
 
+
     for root in roots:
         _recursive_print(root, 0)
             

taskai_cli-1.2.0/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.2.0/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)
-