taskai-cli 0.1.5__tar.gz → 1.0.0__tar.gz

{taskai_cli-0.1.5 → taskai_cli-1.0.0}/DEVLOG.md

@@ -1,3 +1,86 @@
+# 6-20
+
+Let's think critically about what i want this API to lookk like. How should be people be
+using the CLI?
+
+
+task create {name} {**kwargs} -> create an item
+task add {parent_id} ...  -> create an item as a child
+task show all
+task show {id}
+
+
+
+# 6-19
+
+Really this whole thing should just be a tree abstraction, and I should have a root node class
+and just built a tree database with some attrs depending on the type
+
+idk why i'm being a dipshit
+But that's gonna be the next iteration
+
+# 6-18
+
+Everything is fucked up anyways lol so might as qweell make some decisions about
+the best way to do the database
+
+
+
+```python
+class DB:
+
+    def get_item(id: int) -> TodoItem:
+    def get_comment(id: int) -> Comment:
+    def get_config() -> CLIConfig:
+    def create_item(name: str, parent: Optional[TodoItem]=None, ...) -> str:
+    def create_comment(content: str, parent: TodoItem) -> str:
+    def delete_item(name: str) -> bool:
+    def delete_comment(name: str) -> bool:
+    def update_item(id_: int, kwargs) -> bool:
+    def update_comment(id_: int, kwargs) -> bool:
+    def update_config(kwargs) -> bool:
+
+    def connect():
+        pass
+    def commit():
+        pass
+    def validate():
+        pass
+
+``` 
+
+Important factors:
+- do i want to serialize/deserialize every record twice? probably not
+- so let's make sure that everything is read-only
+
+How do i want to handle parentage? 
+i could:
+- do it at the client level i.e. make sure to call (add parent)
+- do it at the db level i.e. on every create, update, and delete method, validate
+
+Let's do it at the db level - i want the database to be responsible for ensuring data
+validation so I don't have to worry about it when I'm writing code downstream
+
+
+# 6-17
+
+Alright I find myself needing to make some design decisions about hierarchical lists.
+
+I could:
+    - differentiate between child items and child lists, and have items only be leaf nodes
+        pros:
+        cons:
+    - treat everything as a single "item" and simply due away with the concept of lists as a
+      separate data point
+    - still distinguish between the two but treat them all as child ids - useful for sorting
+
+Looking at it, i see no good reason to distinguish between items and lists - it complicates the
+code without adding any additional functionality. There is nothing that a list does that an item
+can't do apart from be a container, and there's no reason why an item can't also be a container.
+
+So let's just go ahead and implement that change. 
+
+
 # 6-14
 
 Damn it's been a productive couple of weeks. App is deployed on PyPi and I'm starting to think
@@ -28,7 +111,7 @@ put would be as methods on the objects, i.e. "item.updateList()", etc.
 Alright so how are comments gonna look here:
 
     ```
-    Title:
+    Name:
     Due By:
     Description:
     Depends On:

{taskai_cli-0.1.5 → taskai_cli-1.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: taskai-cli
-Version: 0.1.5
+Version: 1.0.0
 Author-email: Alex Paskal <alexcpaskal@gmail.com>
 Requires-Python: >=3.12
 Requires-Dist: google-genai>=2.8
@@ -15,12 +15,12 @@ Welcome to Task AI - a command-line todo list with some extra ai features.
 
 Here's what you can do:
 
-- `task show all` --> show all of your lists and item titles, with their respective IDs prepended
+- `task show all` --> show all of your lists and item names, with their respective IDs prepended
 - `task show {id or substring}` --> find the list or item matching your identifier and show it using its respective type's show command
-- `task show list {id or substring}` --> show the list and all of its item titles
+- `task show list {id or substring}` --> show the list and all of its item names
 - `task show item {id}` --> show the associated item and all of its specified information
 - `task show items {id1},{id2},...,{idx}` --> show the associated items and all of their specified information
-- `task create item {list id or substring} {title} {**kwargs}` --> Create a new item for the associated list. Can specify kwargs as --optional cli arguments. 
+- `task create item {list id or substring} {name} {**kwargs}` --> Create a new item for the associated list. Can specify kwargs as --optional cli arguments. 
 - `task create list {name}` --> create a new list by that name
 - `task delete {id}` --> deletes the list or item associated with that id
 - `task delete item {id}` --> deletes the item associated with that id

{taskai_cli-0.1.5 → taskai_cli-1.0.0}/README.md

@@ -4,12 +4,12 @@ Welcome to Task AI - a command-line todo list with some extra ai features.
 
 Here's what you can do:
 
-- `task show all` --> show all of your lists and item titles, with their respective IDs prepended
+- `task show all` --> show all of your lists and item names, with their respective IDs prepended
 - `task show {id or substring}` --> find the list or item matching your identifier and show it using its respective type's show command
-- `task show list {id or substring}` --> show the list and all of its item titles
+- `task show list {id or substring}` --> show the list and all of its item names
 - `task show item {id}` --> show the associated item and all of its specified information
 - `task show items {id1},{id2},...,{idx}` --> show the associated items and all of their specified information
-- `task create item {list id or substring} {title} {**kwargs}` --> Create a new item for the associated list. Can specify kwargs as --optional cli arguments. 
+- `task create item {list id or substring} {name} {**kwargs}` --> Create a new item for the associated list. Can specify kwargs as --optional cli arguments. 
 - `task create list {name}` --> create a new list by that name
 - `task delete {id}` --> deletes the list or item associated with that id
 - `task delete item {id}` --> deletes the item associated with that id

taskai_cli-1.0.0/migrations/convert_title_to_name.py

@@ -0,0 +1,30 @@
+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)
+

{taskai_cli-0.1.5 → taskai_cli-1.0.0}/pyproject.toml

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

{taskai_cli-0.1.5 → taskai_cli-1.0.0}/taskai/cli.py

@@ -6,11 +6,12 @@ import builtins
 import fnmatch
 import sys
 import subprocess
+import getpass
 
 # local
 from taskai.json_dir_database import JsonDirectoryDatabase
 from taskai.views import view_lists, view_item, view_items
-from taskai.models import Base, TodoItem, TodoList, Comment
+from taskai.models import TodoItem, Comment
 from taskai.services.ai import ai_headstart_service, ai_natural_language_service
 from taskai.services.user_setup import user_setup_service
 from taskai.services.repair_database import repair_database_service
@@ -25,39 +26,46 @@ from rich.prompt import Prompt
 
 # config
 DB_PATH = ".taskai/task_db"
-USER = os.getenv("USER")
+USER = os.getenv("USER") if sys.platform == "linux" else os.getenv('USERNAME')
 db = JsonDirectoryDatabase(
         DB_PATH,
-        USER
+        USER,
 )
 db.connect()
-GlobalConfig.load_dict(db.config)
-
-og_help = builtins.help
-def new_help(*args, **kwargs):
-    print(f"help: args: {args}, kwargs: {kwargs}")
-    return og_help(*args, **kwargs)
-builtins.help = new_help
+GlobalConfig.load_dict(db.get_config())
 
 class Controller:
 
     # utilities
-    def _find_model_by_stringmatch(attr: str, pattern: str) -> TodoItem|TodoList|Comment|None:
+    def _find_model_by_stringmatch(attr: str, pattern: str) -> TodoItem|Comment|None:
 
         for record_type in [
-            TodoList,
             TodoItem,
             Comment
         ]:
-            batch_attrs = db.read_batch_attr(record_type, attr)
+            batch_attrs = db.get_item_batch_attr(attr)
             inside_out = {v: k for k, v in batch_attrs.items()}  # TODO this is hacky
             results = fnmatch.filter(batch_attrs.values(), pattern)
             if results:
                 id_ = inside_out[results[0]]  # might be duplication
-                return db.read(id_)
-                
+                return db.get_item(id_)
         return None
 
+    def _parse_item_kwargs(kwargs):
+        for k, v in kwargs.copy().items():
+            if v is None:
+                continue
+            match k:
+                case "completed": kwargs["completed"] = bool(v)
+                case "due_by": kwargs["due_by"] = datetime.strptime(v, "%m-%d-%Y")
+                case "depends_on": kwargs["dependency_ids"] = v.split(",")
+        return kwargs
+
+    def _get_root_ids():
+        return [
+            item_id for item_id in db.get_item_ids()
+            if db.get_item_attr(item_id, "parent_id") is None
+        ]
 
     def _debug(args, kwargs):
         print("args:", args)
@@ -65,113 +73,69 @@ class Controller:
 
     # CRUD
     def show_all(show_done=True):
-        view_lists(db, db.lists, show_done=show_done)
-    
-    def show_by_id(id_, show_done=True):
-        if id_ in db.items:
-            Controller.show_item(id_)
-        elif id_ in db.lists:
-            Controller.show_list(id_, show_done=show_done)
-    
-    def show_by_list_name(value: str, show_done=True):
+        view_lists(db, Controller._get_root_ids(), show_done=show_done)
+
+    def show_by_item_name(value: str, show_done=True):
         model = Controller._find_model_by_stringmatch("name", value)
-        if isinstance(model, TodoList):
-            Controller.show_list(model.id, show_done=show_done)
+        if model:
+            Controller.show_item(model.id, show_done=show_done)
         else:
-            print(f"Could not find list matching pattern '{value}'")
-
-    def show_list(list_id: int|str, show_done=True):
-        view_lists(db, [list_id], show_done=show_done)
-    
-    def show_lists():
-        view_lists(db, db.lists.keys(), show_items=False)
+            print(f"Could not find item matching pattern '{value}'")
     
-    def show_item(item_id: int|str):
-        view_item(db, item_id)
+    def show_item(item_id: int, **kwargs):
+        view_item(db, item_id, **kwargs)
 
-    def show_items(item_ids: str):
+    def show_items(item_ids: str, **kwargs):
         item_ids = item_ids.split(",")
-        view_items(db, item_ids)
+        view_items(db, item_ids, **kwargs)
     
     def show_examples():
         ...
         print("Not implemented yet")
 
-    def create_list(name: str):
-        list = TodoList(name=name)
-        list_id = db.create(list)
-        db.commit()
-        print(f"Creating list {list_id} - {list.name}")
-
-    def create_item(list_id: int|str, title: str, **kwargs):
-        try:
-            int(list_id)
-        except ValueError:
-            list_ = Controller._find_model_by_stringmatch("name", list_id)
-            # TODO this should be just lists, not models
-            list_id = list_.id
-
-        item = TodoItem(title=title, list_id=list_id)
-
-        for k, v in kwargs.items():
-            if v is None:
-                continue
-            match k:
-                case "completed": item.completed = bool(v)
-                case "description": item.description = str(v)
-                case "due_by": item.due_by = datetime.strptime(v, "%m-%d-%Y")
-                case "parent": item.parent = str(v)
-                case "priority": item.priority = int(v)
-                case "depends_on": item.dependency_ids.extend(v.split(","))
-                # TODO handle recurrence
-        db.create(item)
+    def create_item(name: str, parent_id=None, **kwargs):
+        if parent_id is not None and not _is_int(parent_id):
+            parent = Controller._find_model_by_stringmatch("name", parent_id)
+            if not parent:
+                Controller.throw_error(f"Could not find parent by id '{parent_id}'")
+                return
+            parent_id = parent.id
+
+        kwargs = Controller._parse_item_kwargs(kwargs)
+        item_id = db.create_item(name=name, parent_id=parent_id, **kwargs)
+        print(f"Created item {item_id} - '{name}'")
         db.commit()
 
     def create_comment(item_id: int|str, content: str):
-        comment = Comment(
-            item_id=item_id,
-            content=content
-        )
-        db.create(comment)
+        comment_id = db.create_comment(content=content, item_id=item_id)
+        print(f"Added comment {comment_id} to item {item_id} - '{content}'")
         db.commit()
             
     def update_item(item_id: int|str, **kwargs):
-        item: TodoItem = db.read(item_id)
-        for k, v in kwargs.items():
-            if v is None:
-                continue
-            match k:
-                case "title": item.title = str(v)
-                case "list_id": item.list_id = str(v)
-                case "completed": item.completed = bool(v)
-                case "description": item.description = str(v)
-                case "due_by": item.due_by = datetime.strptime(v, "%m-%d-%Y")
-                case "parent": item.parent = str(v)
-                case "priority": item.priority = int(v)
-                # TODO handle recurrence
-
-        db.update(item)
+        if not _is_int(item_id):
+            item_id = Controller._find_model_by_stringmatch("name", item_id)
+        db.update_item(item_id, **kwargs)
+        print(f"Updated item {item_id}")
         db.commit()
 
-    def delete(id_: int|str):
-        db.delete(id_)
+    def delete_item(id_: int|str):
+        db.delete_item(id_)
         db.commit()
-        print(f"Deleted {id_}")
+        print(f"Deleted item {id_}")
     
-    def delete_list_by_name(name: str):
-        list_ = Controller._find_model_by_stringmatch("name", name)
-        if list_:
-            db.delete(list_.id)
+    def delete_item_by_name(name: str):
+        item = Controller._find_model_by_stringmatch("name", name)
+        if item:
+            db.delete_item(item.id)
             db.commit()
         else:
             Controller.throw_error("Cannot find list by name")
-
     
     def delete_completed():
-        for item_id in db.items.copy():
-            item: TodoItem = db.read(item_id)
+        for item_id in db.get_item_ids():
+            item: TodoItem = db.get_item(item_id)
             if item.completed:
-                db.delete(item_id)
+                db.delete_item(item_id)
         db.commit()
     
     def ai_headstart(item_id: int|str):
@@ -185,21 +149,23 @@ class Controller:
     
     def throw_error(error_description: str, *args, **kwargs):
         print(f"[red]ERROR: {error_description}[/red]\nargs={args}\nkwargs={kwargs}")
+        import sys
+        sys.exit(-1)
     
     def get_config_value(key: str):
-        print(db.get_config_value(key))
+        print(getattr(db.get_config(), key))
     
     def list_config():
         for k, v in db.get_config().model_dump().items():
             print(f"{k}={v}")
     
     def set_config_value(key: str, value: any):
-        db.set_config_value(key, value)
+        db.update_config(**{key: value})
         db.commit()
         print(f"setting {key}={value}")
     
     def remove_config_value(key: str):
-        db.config.pop(key)
+        db.update_config(**{key: None})
         db.commit()
     
     def run_setup_service():
@@ -208,30 +174,37 @@ class Controller:
     def repair_service():
         repair_database_service(db)
 
-    def move_item(item_id: int|str, list_identifier: int|str):
-
-        if item_id not in db.items:
-            Controller.throw_error(f"Couldn't find items with id {item_id}")
-        item: TodoItem = db.read(item_id)
+    def move_item(item_id: int|str, parent_identifier: int|str):
         
-        if _is_int(list_identifier):
-            new_list_: TodoList = db.read(list_identifier)
+        if _is_int(item_id):
+            item = db.get_item(item_id)
         else:
-            new_list_: TodoList = Controller._find_model_by_stringmatch("name", list_identifier)
-        if not new_list_:
-            Controller.throw_error(f"Couldn't locate list by identifier {list_identifier}")
+            item = Controller._find_model_by_stringmatch("name", item_id)
         
-        # update item
-        item.list_id = new_list_.id
-        db.update(item)
+        # remove from old parent
+        if item.parent_id is not None:
+            db.remove_child_from_parent(item.id, item.parent_id)
         
-        db.commit()
+        # add to new parent
+        if _is_int(parent_identifier):
+            new_parent_id = parent_identifier
+        elif not parent_identifier:  # anything evaluating to false
+            new_parent_id=None
+        else:
+            new_parent_id = Controller._find_model_by_stringmatch("name", parent_identifier).id
+        
+        db.update_item(item.id, parent_id=new_parent_id)
+        if new_parent_id is not None:
+            db.add_child_to_parent(item.id, new_parent_id)
+
+        
+        db.commit()     
     
     def add_dependency(src_id: int|str, dst_id: int|str):
         """Adds a depedency src -> dst, meaning src depends on dst"""
-        src: TodoItem = db.read(src_id)
-        src.dependency_ids.append(dst_id)
-        db.update(src)
+        dependency_ids = db.get_item_attr(src_id, "dependency_ids")
+        dependency_ids.append(dst_id)
+        db.update_item(src_id, dependency_ids=dependency_ids)
         db.commit()
 
 # utilities
@@ -289,33 +262,21 @@ def execute_commands(*args, **kwargs) -> int:
             case "show":
                 match args[1]:
                     case "all": Controller.show_all(*args[2:], **kwargs)
-                    case "list": Controller.show_list(*args[2:], **kwargs)
-                    case "lists": Controller.show_lists() 
-                    case "item": Controller.show_item(*args[2:], **kwargs)
-                    case "items": Controller.show_item(*args[2:], **kwargs)
                     case "examples": Controller.show_examples()
-                    case _ if _is_int(args[1]): Controller.show_by_id(*args[1:], **kwargs)
-                    case _: Controller.show_by_list_name(args[1], **kwargs)
+                    case _ if _is_int(args[1]): Controller.show_item(*args[1:], **kwargs)
+                    case _: Controller.show_by_item_name(args[1], **kwargs)
 
             case "create":
-                match args[1]:
-                    case "item": Controller.create_item(*args[2:], **kwargs)
-                    case "list": Controller.create_list(*args[2:], **kwargs)
-                    case "comment": Controller.create_comment(*args[2:], **kwargs)
-                    case _: Controller.throw_error("uncrecognized create command", *args, **kwargs)
+                Controller.create_item(args[1], **kwargs)
             
             case "update":
-                match args[1]:
-                    case _ if _is_int(args[1]): Controller.update_item(args[1], **kwargs)
-                    case _: Controller.throw_error("uncregnozed update command", *args, **kwargs)
-
+                Controller.update_item(args[1], **kwargs)
+                
             case "delete" | "remove":
                 match args[1]:
-                    case _ if _is_int(args[1]): Controller.delete(args[1])
-                    case "item": Controller.delete(args[2])
-                    case "list": Controller.delete(args[2])
+                    case _ if _is_int(args[1]): Controller.delete_item(args[1])
                     case "completed" | "done": Controller.delete_completed()
-                    case _: Controller.delete_list_by_name(args[1])
+                    case _: Controller.delete_item_by_name(args[1])
 
             case "comment":
                 match args[1]:
@@ -338,7 +299,9 @@ def execute_commands(*args, **kwargs) -> int:
                 db.remove()
             
             case "add":
-                Controller.create_item(*args[1:], **kwargs)
+                parent_identifier = args[1]
+                item_name = args[2]
+                Controller.create_item(item_name, parent_identifier, **kwargs)
 
             case "complete" | "done":
                 match args[1]:
@@ -355,10 +318,8 @@ def execute_commands(*args, **kwargs) -> int:
                 Controller.delete_completed()
 
             case "move":
-                match args[1]:
-                    case _ if _is_int(args[1]): Controller.move_item(args[1], args[2])
-                    case _: Controller.throw_error("Unrecognized arguments", *args, **kwargs)
-            
+                Controller.move_item(args[1], args[2])
+                
             case "depend":
                 src_id, dst_id = args[1:3]
                 match (src_id, dst_id):
@@ -377,6 +338,7 @@ def execute_commands(*args, **kwargs) -> int:
 
 
     except Exception as e: 
+        raise e
         Controller.throw_error(f"encountered exception '{e}'", *args, **kwargs)
 
     return 1

{taskai_cli-0.1.5 → taskai_cli-1.0.0}/taskai/help_menu.py

@@ -5,12 +5,12 @@ help_general = """
 
 Welcome to Task! Here's what you can do:
 
-'task show all' --> show all of your lists and item titles, with their respective IDs prepended
+'task show all' --> show all of your lists and item names, with their respective IDs prepended
 'task show {id or substring}' --> find the list or item matching your identifier and show it using its respective type's show command
-'task show list {id or substring}' --> show the list and all of its item titles
+'task show list {id or substring}' --> show the list and all of its item names
 'task show item {id}' --> show the associated item and all of its specified information
 'task show items {id1},{id2},...,{idx}' --> show the associated items and all of their specified information
-'task create item {list id or substring} {title} {**kwargs}' --> Create a new item for the associated list. Can specify kwargs as --optional cli arguments. 
+'task create item {list id or substring} {name} {**kwargs}' --> Create a new item for the associated list. Can specify kwargs as --optional cli arguments. 
 'task create list {name}' --> create a new list by that name
 'task delete {id}' --> deletes the list or item associated with that id
 'task delete item {id}' --> deletes the item associated with that id