Add directory initialization to CLI

Author: basicthinker

.gitignore

@@ -134,4 +134,5 @@ dmypy.json
 .pyre/
 
 # DevChat
-.chat/store.graphml
+.chat/prompts.graphml
+.chat/prompts.db

devchat/_cli.py

@@ -1,11 +1,11 @@
 """
 This module contains the main function for the DevChat CLI.
 """
-import os
-from typing import Optional
+from contextlib import contextmanager
 import json
+import os
 import sys
-from contextlib import contextmanager
+from typing import Optional, Tuple
 import rich_click as click
 from devchat.store import Store
 from devchat.openai import OpenAIChatConfig, OpenAIChat
@@ -31,7 +31,12 @@ def handle_errors():
         sys.exit(os.EX_SOFTWARE)
 
 
-def load_config_data(chat_dir: str) -> dict:
+def init_dir() -> Tuple[dict, Store]:
+    git_root = find_git_root()
+    chat_dir = os.path.join(git_root, ".chat")
+    if not os.path.exists(chat_dir):
+        os.makedirs(chat_dir)
+
     default_config_data = {
         'llm': 'OpenAI',
         'OpenAI': {
@@ -46,7 +51,9 @@ def load_config_data(chat_dir: str) -> dict:
     except FileNotFoundError:
         config_data = default_config_data
 
-    return config_data
+    store = Store(chat_dir)
+    git_ignore(git_root, store.graph_path, store.db_path)
+    return config_data, store
 
 
 @main.command()
@@ -120,12 +127,7 @@ def prompt(content: Optional[str], parent: Optional[str], reference: Optional[st
     ```
 
     """
-    git_root = find_git_root()
-    chat_dir = os.path.join(git_root, ".chat")
-    if not os.path.exists(chat_dir):
-        os.makedirs(chat_dir)
-
-    config_data = load_config_data(chat_dir)
+    config, store = init_dir()
 
     with handle_errors():
         if content is None:
@@ -137,13 +139,9 @@ def prompt(content: Optional[str], parent: Optional[str], reference: Optional[st
         instruct_contents = parse_files(instruct)
         context_contents = parse_files(context)
 
-        store = Store(chat_dir)
-        git_ignore(git_root, store.graph_path)
-        git_ignore(git_root, store.db_path)
-
-        llm = config_data.get('llm')
+        llm = config.get('llm')
         if llm == 'OpenAI':
-            openai_config = OpenAIChatConfig(**config_data['OpenAI'])
+            openai_config = OpenAIChatConfig(**config['OpenAI'])
             chat = OpenAIChat(openai_config)
 
             openai_asisstant = Assistant(chat, store)
@@ -164,12 +162,8 @@ def log(skip, max_count):
     """
     Show the prompt history.
     """
-    git_root = find_git_root()
-    chat_dir = os.path.join(git_root, ".chat")
-    if not os.path.exists(chat_dir):
-        os.makedirs(chat_dir)
+    _, store = init_dir()
 
-    store = Store(chat_dir)
     recent_prompts = store.select_recent(skip, skip + max_count)
 
     for record in recent_prompts:

devchat/store.py

@@ -7,18 +7,18 @@
 
 
 class Store:
-    def __init__(self, folder: str):
+    def __init__(self, store_dir: str):
         """
         Initializes a Store instance.
 
         Args:
             path (str): The folder to store the files containing the store.
         """
-        folder = os.path.expanduser(folder)
-        if not os.path.isdir(folder):
-            os.makedirs(folder)
-        self._graph_path = os.path.join(folder, 'prompts.graphml')
-        self._db_path = os.path.join(folder, 'prompts.db')
+        store_dir = os.path.expanduser(store_dir)
+        if not os.path.isdir(store_dir):
+            os.makedirs(store_dir)
+        self._graph_path = os.path.join(store_dir, 'prompts.graphml')
+        self._db_path = os.path.join(store_dir, 'prompts.db')
 
         if os.path.isfile(self._graph_path):
             try:

devchat/utils.py

@@ -17,19 +17,30 @@ def find_git_root():
         raise RuntimeError("Not inside a Git repository") from error
 
 
-def git_ignore(git_root_dir, ignore_entry):
+def git_ignore(git_root_dir, *ignore_entries):
     gitignore_path = os.path.join(git_root_dir, '.gitignore')
 
     if os.path.exists(gitignore_path):
         with open(gitignore_path, 'r', encoding='utf-8') as gitignore_file:
             gitignore_content = gitignore_file.read()
 
-        if ignore_entry not in gitignore_content:
+        new_entries = []
+        for entry in ignore_entries:
+            relative_entry = os.path.relpath(entry, git_root_dir)
+            if relative_entry not in gitignore_content:
+                new_entries.append(relative_entry)
+
+        if new_entries:
             with open(gitignore_path, 'a', encoding='utf-8') as gitignore_file:
-                gitignore_file.write(f'\n# DevChat\n{ignore_entry}\n')
+                gitignore_file.write('\n# DevChat\n')
+                for entry in new_entries:
+                    gitignore_file.write(f'{entry}\n')
     else:
         with open(gitignore_path, 'w', encoding='utf-8') as gitignore_file:
-            gitignore_file.write(f'# DevChat\n{ignore_entry}\n')
+            gitignore_file.write('# DevChat\n')
+            for entry in ignore_entries:
+                relative_entry = os.path.relpath(entry, git_root_dir)
+                gitignore_file.write(f'{relative_entry}\n')
 
 
 def unix_to_local_datetime(unix_time) -> datetime.datetime: