taskai-cli 1.0.1__tar.gz → 1.1.1__tar.gz

{taskai_cli-1.0.1 → taskai_cli-1.1.1}/.gitignore

@@ -12,4 +12,7 @@ PROMPT.md
 _tmp_database_dir/tmp/
 tmp*/
 .taskai
-*venv
+*venv
+_tmp_database_dir/
+.dev
+.prod

{taskai_cli-1.0.1 → taskai_cli-1.1.1}/DEVLOG.md

@@ -1,3 +1,25 @@
+# 6-25
+
+Alright let's start to think a bit about how I want to handle the pomo service.
+
+task pomo 25 3
+
+
+Let's start with spawning the timer, and then we can worry about logging and shit.
+
+Pomo should spawn a process and write a log to a database. The process
+should continuously monitor that log and see "am I active?"
+  - if so, it keeps running
+  - if not, we prompt the user for what they want to do?
+    - rest/reset/cancel
+do I need this to be serialized even? maybe not if I'm just starting - we can start pomo in another thread (or just the same thread)
+
+Yeah let's honestly not even worry about the multiprocessing part of it right now. 
+
+Let's just enter a loop and count down, while I keep clearing the screen
+
+I need to figure out how to make it play a bell or have a screen pop up (if it's running in the background)
+
 # 6-20
 
 Let's think critically about what i want this API to lookk like. How should be people be
@@ -365,4 +387,4 @@ Pages:
 - Comments
 - Text CLI
 - Dockerize
--  
+-  

{taskai_cli-1.0.1 → taskai_cli-1.1.1}/PKG-INFO

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

taskai_cli-1.1.1/migrations/_001_removing_lists.py

@@ -0,0 +1,50 @@
+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.0.1 → taskai_cli-1.1.1}/pyproject.toml

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

{taskai_cli-1.0.1 → taskai_cli-1.1.1}/taskai/cli.py

@@ -15,6 +15,7 @@ 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
+from taskai.services.pomodoro import pomodoro_service
 from taskai.help_menu import help_menu
 from taskai.config import GlobalConfig
 
@@ -208,13 +209,45 @@ class Controller:
         db.commit()
 
 # utilities
+def _parse_arg_string(arg_string: str) -> list[str]:
+    """parses a string properly before dispatching it to the argument parser"""
+    
+    # scan for quote characters
+    
+    currently_enclosed = False
+    current_quote_char = None
+    quote_chars = ('"',"'")
+    buffer = ""
+    arg_parts = []
+    for c in arg_string:
+        if c == " ":
+            if currently_enclosed:
+                buffer += c
+            else:
+                arg_parts.append(buffer)
+                buffer = ""
+        elif c == current_quote_char:
+            currently_enclosed = False
+            current_quote_char = None
+        
+        elif c in quote_chars and not currently_enclosed:
+            currently_enclosed = True
+            current_quote_char = c
+        else:
+            buffer +=  c
+    if buffer:
+        arg_parts.append(buffer)
+    return arg_parts
+
 def _parse_remaining(remaining_args: list[str]) -> tuple[list, dict]:
 
-    for i, _arg in enumerate(remaining_args):
-        remaining_args[i] = _arg.replace(" ", "+-*/")
-    remaining_args = " ".join(remaining_args).replace("="," ").split(" ")
-    for i, _arg in enumerate(remaining_args):
-        remaining_args[i] = _arg.replace("+-*/", " ")
+    # parse flags
+
+    #for i, _arg in enumerate(remaining_args):
+    #    remaining_args[i] = _arg.replace(" ", "+-*/")
+    #remaining_args = " ".join(remaining_args).replace("="," ").split(" ")
+    #for i, _arg in enumerate(remaining_args):
+    #    remaining_args[i] = _arg.replace("+-*/", " ")
     
     # outputs
     args = []
@@ -223,11 +256,16 @@ def _parse_remaining(remaining_args: list[str]) -> tuple[list, dict]:
     while remaining_args:
         next_arg = remaining_args.pop(0)
         if next_arg.startswith("--"):
-            assert remaining_args, "kwarg specified with no value provided"
-            kwargs[next_arg[2:]] = remaining_args.pop(0)
+            if "=" in next_arg:
+                key, value = next_arg.split("=")
+                kwargs[key] = value
+            else:
+                assert remaining_args, "kwarg specified with no value provided"
+                kwargs[next_arg[2:]] = remaining_args.pop(0)
         else:
             args.append(next_arg)
-    
+
+
     return args, kwargs
 
 def _is_int(val: any) -> bool:
@@ -325,7 +363,10 @@ def execute_commands(*args, **kwargs) -> int:
                 match (src_id, dst_id):
                     case _ if _is_int(src_id) and _is_int(dst_id): Controller.add_dependency(src_id, dst_id) 
                     case _: Controller.throw_error("Invalid arrow argument, must be one of (->, <-)")
-            
+        
+            case "pomo":
+                pomodoro_service(int(args[1]), int(args[2]))
+
             # developer use
             case "db":
                 import orjson as json
@@ -349,22 +390,51 @@ def interactive_program():
     # builtins.print = console.print
 
     response = ""
+    last_show_command = [("show", "all"), {}]
+    args = None
+    kwargs = None
+
     _clear_screen()
     while True:
 
         try:
+
+            # render last show command
+            if last_show_command is not None:
+                try:
+                    execute_commands(*last_show_command[0], **last_show_command[1])
+                except Exception as e:
+                    print(e)
+
+            Console().rule()
+            
+            # prompt user input
             response = Prompt.ask("Type your commands:", default=response)
-            _clear_screen()
-            args, kwargs = _parse_remaining(response.split(" "))
+            
+            # parse commands
+            args_remaining = _parse_arg_string(response)
+            args, kwargs = _parse_remaining(args_remaining)
+            print("arg_string:", args_remaining)
+            print("args:", args)
+            print("kwargs:", kwargs)
             if args[0] == "task":
                 args = args[1:]
-            return_code = execute_commands(*args, **kwargs)
+
+            # defer show
+            if args[0] == "show":
+                last_show_command = (args, kwargs)
+                return_code = 1
+            else:
+                return_code = execute_commands(*args, **kwargs)
+            
+            _clear_screen()
             if return_code == 0:
                 break
-            Console().rule()
             
         except KeyboardInterrupt:
            break
+        except Exception as e:
+            print(e)
         
     _clear_screen()
     sys.exit(1)

{taskai_cli-1.0.1 → taskai_cli-1.1.1}/taskai/config.py

@@ -7,9 +7,9 @@ class GlobalConfig:
     _data_store: dict[str, any]
 
     @classmethod
-    def load_dict(cls, d: dict):
+    def load_dict(cls, model):
         """loads values from a configuration"""
-        cls._data_store = d
+        cls._data_store = model.model_dump()
 
     @classmethod
     def get(cls, key: str):

{taskai_cli-1.0.1 → taskai_cli-1.1.1}/taskai/services/ai.py

@@ -30,8 +30,7 @@ def ai_headstart_service(
     - Parse and return its response
     """
 
-
-    item:TodoItem = db.read(item_id)
+    item:TodoItem = db.get_item(item_id)
 
     
     from google import genai
@@ -67,11 +66,8 @@ task name: {item.name}
 
         prompt += f"\ntask comments:"
         for comment_id in item.comment_ids:
-            comment: Comment = db.read(comment_id)
+            comment: Comment = db.get_comment(comment_id)
             prompt += f"\n\t- {comment.content}"
-
-    # return "Survey says go fuck yourself"
-
     # query model
     client = genai.Client(api_key=api_key)
     response = client.models.generate_content(
@@ -101,7 +97,7 @@ def ai_natural_language_service(
     _visited_set = {}
 
     def _add_info(item_id, level=0):
-        item: TodoItem = db.read(id_)
+        item: TodoItem = db.get_item(id_)
         user_info.append("  "*level + f"{item.id} {item.name}")
         _visited_set.add(item_id)
         if item.child_ids:
@@ -109,7 +105,7 @@ def ai_natural_language_service(
                 _add_info(child_id, level+1)
 
 
-    for id_ in db.items: 
+    for id_ in db.get_item_ids(): 
         if id_ not in _visited_set:
             _add_info(id_)
 

taskai_cli-1.1.1/taskai/services/pomodoro.py

@@ -0,0 +1,65 @@
+from taskai.json_dir_database import JsonDirectoryDatabase
+import datetime
+import time
+from rich import print
+from rich.console import Console
+
+def pomodoro_service(
+    minutes_on: int,
+    minutes_off: int
+):
+    
+    # STATES
+    end_time = datetime.datetime.now()
+
+    try:
+        
+        state = "ready" 
+        history = []
+        console = Console()
+        while True:
+            if state == "ready":
+                prompt = "Press enter to begin ..."
+                input(prompt)
+                history.append(f"Starting Pomo for {minutes_on} minutes")
+                now = datetime.datetime.now()
+                end_time = now + datetime.timedelta(minutes=minutes_on)
+                #end_time = now + datetime.timedelta(seconds=5)
+                state = "running"
+            elif state == "running":
+                now = datetime.datetime.now()
+                if now < end_time:
+                    diff = end_time - now
+                    message = f"{diff.seconds // 60}:{str(diff.seconds % 60).zfill(2)} to go"
+                    if history[-1].endswith("to go"):
+                        history.pop()
+                    history.append(message)
+                    time.sleep(0.995)
+                else:
+                    state = "done"
+            if state == "done":
+                history.append("All Finished! Taking rest now")
+                state = "resting"
+                end_time = datetime.datetime.now() + datetime.timedelta(minutes=minutes_off)
+                #end_time = now + datetime.timedelta(seconds=5)
+            if state == "resting":
+                now = datetime.datetime.now()
+                if now < end_time:
+                    diff = end_time - now
+                    message = f"{diff.seconds // 60}:{str(diff.seconds % 60).zfill(2)} to go"
+                    if history[-1].endswith("to go"):
+                        history.pop()
+                    history.append(message)
+                    time.sleep(0.995)
+                else:
+                    state = "ready"
+
+            console.clear()
+            for val in history:
+                console.print(val)
+    except KeyboardInterrupt:
+        return
+            
+
+               
+            

{taskai_cli-1.0.1 → taskai_cli-1.1.1}/test/test_cli.py

@@ -1,4 +1,5 @@
 from taskai.json_dir_database import JsonDirectoryDatabase
+from taskai.cli import _parse_arg_string
 import os
 import shutil
 
@@ -53,6 +54,23 @@ def test_run_commands():
     finally:
         _cleanup_db()
 
+def test_args_parser():
+    
+    def _assert_list_equal(l1, l2):
+        assert len(l1) == len(l2), f"{l1} length not equal to {l2} length"
+        assert all([thing1==thing2 for thing1, thing2 in zip(l1, l2)]), f"{l1} not equal to {l2}"
+    
+    dataset = [
+        ("show thing 1", ["show", "thing", "1"]),
+        ("show 'this is a string' 2", ["show", "this is a string", "2"]),
+        ("show https://url.com/thing?arg=1 hello there", ["show", "https://url.com/thing?arg=1", "hello", "there"])
+    ]
+
+    for input, label in dataset:
+        output = _parse_arg_string(input)
+        _assert_list_equal(label, output)
+
+    
 
 def _cleanup_db():
     os.chdir(CWD)
@@ -60,5 +78,5 @@ def _cleanup_db():
         shutil.rmtree(TESTING_DIR)
 
 if __name__ == "__main__":
-
-    test_run_commands()
+    test_args_parser()
+    # test_run_commands()