forgot to include the check_llm_command for non bash

Author: cagostino

npcsh/npcsh.py

@@ -5,6 +5,7 @@
 import atexit
 from datetime import datetime
 import pandas as pd
+
 # Configure logging
 import sqlite3
 from termcolor import colored
@@ -18,59 +19,63 @@
     enter_spool_mode,
 )
 from .helpers import (
-    log_action, 
+    log_action,
     load_npc_from_file,
-    list_directory, 
-    read_file, 
+    list_directory,
+    read_file,
     ensure_npcshrc_exists,
     setup_npcsh_config,
-    execute_java, 
-    execute_scala, 
-    execute_r, 
-    execute_sql, 
-    execute_python, 
-    BASH_COMMANDS, 
-    TERMINAL_EDITORS, 
-    open_terminal_editor, 
-    get_npc_from_command, 
+    execute_java,
+    execute_scala,
+    execute_r,
+    execute_sql,
+    execute_python,
+    BASH_COMMANDS,
+    TERMINAL_EDITORS,
+    open_terminal_editor,
+    get_npc_from_command,
     is_valid_npc,
-    get_npc_path, 
-    initialize_base_npcs_if_needed, 
+    get_npc_path,
+    initialize_base_npcs_if_needed,
     is_npcsh_initialized,
-    set_npcsh_initialized, 
-    get_valid_npcs
+    set_npcsh_initialized,
+    get_valid_npcs,
 )
 
 from .npc_compiler import NPCCompiler, NPC
 from colorama import Fore, Back, Style
 
 import shlex
 import subprocess
+
+
 def get_file_color(filepath):
     if os.path.isdir(filepath):
         return "blue", ["bold"]
     elif os.access(filepath, os.X_OK):
         return "green", []
-    elif filepath.endswith(('.zip', '.tar', '.gz', '.bz2', '.xz', '.7z')):
+    elif filepath.endswith((".zip", ".tar", ".gz", ".bz2", ".xz", ".7z")):
         return "red", []
-    elif filepath.endswith(('.jpg', '.jpeg', '.png', '.gif', '.bmp', '.tiff')):
+    elif filepath.endswith((".jpg", ".jpeg", ".png", ".gif", ".bmp", ".tiff")):
         return "magenta", []
-    elif filepath.endswith(('.py', '.pyw')):
+    elif filepath.endswith((".py", ".pyw")):
         return "yellow", []
-    elif filepath.endswith(('.sh', '.bash', '.zsh')):
+    elif filepath.endswith((".sh", ".bash", ".zsh")):
         return "green", []
-    elif filepath.endswith(('.c', '.cpp', '.h', '.hpp')):
+    elif filepath.endswith((".c", ".cpp", ".h", ".hpp")):
         return "cyan", []
-    elif filepath.endswith(('.js', '.ts', '.jsx', '.tsx')):
+    elif filepath.endswith((".js", ".ts", ".jsx", ".tsx")):
         return "yellow", []
-    elif filepath.endswith(('.html', '.css', '.scss', '.sass')):
+    elif filepath.endswith((".html", ".css", ".scss", ".sass")):
         return "magenta", []
-    elif filepath.endswith(('.md', '.txt', '.log')):
+    elif filepath.endswith((".md", ".txt", ".log")):
         return "white", []
-    elif filepath.startswith('.'):
+    elif filepath.startswith("."):
         return "cyan", []
     else:
         return "white", []
+
+
 def execute_command(command, command_history, db_path, npc_compiler, current_npc=None):
     subcommands = []
     output = ""
@@ -80,15 +85,15 @@ def execute_command(command, command_history, db_path, npc_compiler, current_npc
 
     if current_npc is None:
         valid_npcs = get_valid_npcs(db_path)
-        
+
         npc_name = get_npc_from_command(command)
         if npc_name is None:
             npc_name = "base"  # Default NPC
-        #print(npc_name)
+        # print(npc_name)
         npc_path = get_npc_path(npc_name, db_path)
-        npc = load_npc_from_file(npc_path, db_conn)    
+        npc = load_npc_from_file(npc_path, db_conn)
     else:
-        npc = current_npc    
+        npc = current_npc
     if command.startswith("/"):
         command = command[1:]
         log_action("Command Executed", command)
@@ -98,10 +103,10 @@ def execute_command(command, command_history, db_path, npc_compiler, current_npc
         args = command_parts[1:]
         if current_npc is None and command_name in valid_npcs:
             npc_path = get_npc_path(command_name, db_path)
-            npc = load_npc_from_file(npc_path, db_conn)  
-               
+            npc = load_npc_from_file(npc_path, db_conn)
+
         if command_name == "compile" or command_name == "com":
-            try:    
+            try:
                 compiled_script = npc_compiler.compile(npc)
                 output = f"Compiled NPC profile: {compiled_script}"
                 print(output)
@@ -119,12 +124,12 @@ def execute_command(command, command_history, db_path, npc_compiler, current_npc
             # output = enter_observation_mode(command_history, npc=npc)
         elif command_name == "cmd" or command_name == "command":
             output = execute_llm_command(command, command_history, npc=npc)
-        elif command_name == "set":        
+        elif command_name == "set":
             parts = command.split()
             if len(parts) == 3 and parts[1] in ["model", "provider", "db_path"]:
-                output =  execute_set_command(parts[1], parts[2])
+                output = execute_set_command(parts[1], parts[2])
             else:
-                return "Invalid set command. Usage: /set [model|provider|db_path] 'value_in_quotes' "                            
+                return "Invalid set command. Usage: /set [model|provider|db_path] 'value_in_quotes' "
         elif command_name == "sample":
             output = execute_llm_question(command, command_history, npc=npc)
         elif command_name == "spool" or command_name == "sp":
@@ -139,7 +144,7 @@ def execute_command(command, command_history, db_path, npc_compiler, current_npc
 
             output = enter_spool_mode(command_history, inherit_last, npc=npc)
             return output
-    
+
         else:
             output = f"Unknown command: {command_name}"
 
@@ -151,73 +156,81 @@ def execute_command(command, command_history, db_path, npc_compiler, current_npc
         language = command_parts[0].lower()
         code = " ".join(command_parts[1:])
 
-        if language == 'python':
+        if language == "python":
             output = execute_python(code)
-        elif language == 'r':
+        elif language == "r":
             output = execute_r(code)
-        elif language == 'sql':
+        elif language == "sql":
             output = execute_sql(code)
-        elif language == 'scala':
+        elif language == "scala":
             output = execute_scala(code)
-        elif language == 'java':
+        elif language == "java":
             output = execute_java(code)
         else:
             output = check_llm_command(command, command_history, npc=npc)
     else:
         # Check if it's a bash command
-        #print(command)
+        # print(command)
         command_parts = shlex.split(command)
-    
-        if command_parts[0] == 'cd':
+
+        if command_parts[0] == "cd":
             try:
                 if len(command_parts) > 1:
                     new_dir = os.path.expanduser(command_parts[1])
                 else:
-                    new_dir = os.path.expanduser('~')
+                    new_dir = os.path.expanduser("~")
                 os.chdir(new_dir)
                 return f"Changed directory to {os.getcwd()}"
             except FileNotFoundError:
                 return f"Directory not found: {new_dir}"
             except PermissionError:
                 return f"Permission denied: {new_dir}"
-                
+
         elif command_parts[0] in BASH_COMMANDS:
             if command_parts[0] in TERMINAL_EDITORS:
                 return open_terminal_editor(command)
             else:
                 try:
-                    result = subprocess.run(command_parts, capture_output=True, text=True)
+                    result = subprocess.run(
+                        command_parts, capture_output=True, text=True
+                    )
                     output = result.stdout
                     if result.stderr:
                         output += colored(f"\nError: {result.stderr}", "red")
-                    
+
                     # Color code the output
                     colored_output = ""
-                    for line in output.split('\n'):
+                    for line in output.split("\n"):
                         parts = line.split()
                         if parts:
                             filepath = parts[-1]
                             color, attrs = get_file_color(filepath)
                             colored_filepath = colored(filepath, color, attrs=attrs)
-                            colored_line = ' '.join(parts[:-1] + [colored_filepath])
+                            colored_line = " ".join(parts[:-1] + [colored_filepath])
                             colored_output += colored_line + "\n"
                         else:
                             colored_output += line + "\n"
-                    
+
                     output = colored_output.rstrip()
-                    
+
                     if not output and result.returncode == 0:
-                        output = colored(f"Command '{command}' executed successfully (no output).", "green")
+                        output = colored(
+                            f"Command '{command}' executed successfully (no output).",
+                            "green",
+                        )
                 except Exception as e:
                     output = colored(f"Error executing command: {e}", "red")
 
+        else:
+            output = check_llm_command(command, command_history, npc=npc)
+
     # Add command to history
     command_history.add(command, subcommands, output, location)
 
     # Print the output
     if output:
         print(output)
-    
+
     return output
 
 
@@ -227,7 +240,7 @@ def setup_readline():
         readline.read_history_file(history_file)
     except FileNotFoundError:
         pass
-    
+
     readline.set_history_length(1000)
     readline.parse_and_bind("set editing-mode vi")
     readline.parse_and_bind('"\e[A": history-search-backward')
@@ -236,47 +249,52 @@ def setup_readline():
 
     return history_file
 
+
 def save_readline_history():
     readline.write_history_file(os.path.expanduser("~/.npcsh_readline_history"))
 
+
 def orange(text):
     return f"\033[38;2;255;165;0m{text}{Style.RESET_ALL}"
 
+
 def main():
     setup_npcsh_config()
     if "NPCSH_DB_PATH" in os.environ:
         db_path = os.path.expanduser(os.environ["NPCSH_DB_PATH"])
     else:
-        db_path = os.path.expanduser('~/npcsh_history.db')
-    
+        db_path = os.path.expanduser("~/npcsh_history.db")
+
     command_history = CommandHistory(db_path)
-    
+
     os.makedirs("./npc_profiles", exist_ok=True)
     npc_directory = os.path.expanduser("./npc_profiles")
     npc_compiler = NPCCompiler(npc_directory)
-    
+
     if not is_npcsh_initialized():
         print("Initializing NPCSH...")
         initialize_base_npcs_if_needed(db_path)
-        print("NPCSH initialization complete. Please restart your terminal or run 'source ~/.npcshrc' for the changes to take effect.")
+        print(
+            "NPCSH initialization complete. Please restart your terminal or run 'source ~/.npcshrc' for the changes to take effect."
+        )
     history_file = setup_readline()
     atexit.register(readline.write_history_file, history_file)
     atexit.register(command_history.close)
-    
+
     print("Welcome to npcsh!")
-    
+
     current_npc = None
     while True:
         try:
             if current_npc:
                 prompt = f"{colored(os.getcwd(), 'blue')}:{orange(current_npc.name)}> "
             else:
                 prompt = f"{colored(os.getcwd(), 'blue')}:{orange('npcsh')}> "
-            
+
             # After executing the command
-            #print(f"{colored(os.getcwd(), 'blue')}$")
+            # print(f"{colored(os.getcwd(), 'blue')}$")
             user_input = input(prompt).strip()
-            
+
             if user_input.lower() in ["exit", "quit"]:
                 if current_npc:
                     print(f"Exiting {current_npc.name} mode.")
@@ -293,10 +311,14 @@ def main():
                     npc_path = get_npc_path(command_name, db_path)
                     db_conn = sqlite3.connect(db_path)
                     current_npc = load_npc_from_file(npc_path, db_conn)
-                    print(f"Entered {current_npc.name} mode. Type 'exit' to return to main shell.")
+                    print(
+                        f"Entered {current_npc.name} mode. Type 'exit' to return to main shell."
+                    )
                     continue
-            
-            execute_command(user_input, command_history, db_path, npc_compiler, current_npc)
+
+            execute_command(
+                user_input, command_history, db_path, npc_compiler, current_npc
+            )
         except (KeyboardInterrupt, EOFError):
             if current_npc:
                 print(f"\nExiting {current_npc.name} mode.")
@@ -305,5 +327,6 @@ def main():
                 print("\nGoodbye!")
                 break
 
+
 if __name__ == "__main__":
-    main()
+    main()

setup.py

@@ -14,7 +14,7 @@ def package_files(directory):
 
 setup(
     name="npcsh",
-    version="0.1.9",
+    version="0.1.10",
     packages=find_packages(exclude=["tests*"]),
     install_requires=[
         "jinja2",