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

{taskai_cli-1.0.0 → taskai_cli-1.0.2}/.gitignore

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

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

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

taskai_cli-1.0.2/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.0 → taskai_cli-1.0.2}/pyproject.toml

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

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

@@ -208,13 +208,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 +255,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:
@@ -349,22 +386,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.0 → taskai_cli-1.0.2}/taskai/services/user_setup.py

@@ -14,20 +14,20 @@ def user_setup_service(
     db: JsonDirectoryDatabase
 ):
     
-    config = db.config
+    config = db.get_config()
     # setup gemini model
     print("Beginning setup")
     if "GEMINI_API_KEY" not in config:
         api_key = _get_gemini_api_key()
         if api_key:
-            config["GEMINI_API_KEY"] = api_key
+            db.update_config(GEMINI_API_KEY=api_key)
     else:
         print("gemini key already specified")
     
     if "GEMINI_MODEL" not in config:
         model = _select_gemini_model()
         if model:
-            config["GEMINI_MODEL"] = model
+            db.update_config(GEMINI_MODEL=model)
     else:
         print("gemini model already specified")
     print("Setup complete! Use 'task config set|get|list' to interact with your configuration options")
@@ -60,4 +60,4 @@ if __name__ == "__main__":
         ".taskai/task_db", user=os.getenv("USER")
     )
     db.connect()
-    user_setup_service(db)
+    user_setup_service(db)

{taskai_cli-1.0.0 → taskai_cli-1.0.2}/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()