add a CLI

Author: jwongster2

README.md

@@ -38,3 +38,6 @@ with backticks.
 
 Why not use online LLMs?
 - There are alternative solutions that do this already.
+
+Why not use LiteLLM?
+- I liked the project but unfortunately it seemed a bit too unstable for this.

app/cli.py

@@ -3,6 +3,7 @@
 from app.query_ollama import query_ollama
 from app.extract_bash import extract_bash_commands
 from app.menu import row_based_rich_menu
+from app.config import EXIT_COMMAND
 
 
 def process_query(query: str):
@@ -12,7 +13,8 @@ def process_query(query: str):
         print("No command could be produced")
         return 0
     selected_bash_command = row_based_rich_menu(bash_commands)
-    print(f"Received: {query}")
+    if selected_bash_command == EXIT_COMMAND:
+        return 0
     try:
         result = subprocess.run(selected_bash_command, check=True, shell=True)
         return result

app/config.py

@@ -1 +1,3 @@
-DEFAULT_MODEL = "llama:3.1"
+DEFAULT_MODEL = "llama3.1"
+DEFAULT_URL = "http://localhost:11434/api/generate"
+EXIT_COMMAND = "Leave"

app/extract_bash.py

@@ -20,7 +20,10 @@ def extract_bash_commands(llm_response: str) -> list:
     pattern = re.compile(r"```(?:bash)?(.*?)```", re.DOTALL)
     matches = pattern.findall(llm_response)
     for match in matches:
-        commands.extend(match.strip().split("\n"))
+        com = match.strip().split("\n")
+        if com == "":
+            continue
+        commands.extend(com)
 
     return commands
 

app/menu.py

@@ -2,12 +2,15 @@
 from rich.panel import Panel
 from rich.prompt import Prompt
 from rich.text import Text
+from app.config import EXIT_COMMAND
 
 console = Console()
 
 
 def row_based_rich_menu(options: list) -> str:
 
+    options.append(EXIT_COMMAND)
+
     menu_items = []
     for i, option in enumerate(options, 1):
         item = Text.assemble((f"{i}. ", "bold magenta"), (option, "cyan"))

app/query_ollama.py

@@ -1,9 +1,11 @@
 """Query Ollama model
 """
 
+import os
 import requests
 import json
 import subprocess
+from app.config import DEFAULT_MODEL, DEFAULT_URL
 
 
 def init_ollama():
@@ -16,10 +18,19 @@ def init_ollama():
 
 
 def query_ollama(prompt, stream: bool = True):
-    url = "http://localhost:11434/api/generate"
+    init_ollama()
+    url = os.getenv("HOW_DEFAULT_URL", DEFAULT_URL)
+    model = os.getenv("HOW_DEFAULT_MODEL", DEFAULT_MODEL)
+    history = subprocess.getoutput("history")
+
     data = {
-        "model": "llama3.1",
-        "prompt": f"Convert the following natural language command to a bash command: {prompt}",
+        "model": model,
+        "prompt": f"""Convert the following natural language command to a bash command: {prompt}
+History of CLI commands if it helps:
+<history>
+{history}
+</history>
+""",
         "stream": stream,
     }