fixed -q on a base level

navi-shell.py

@@ -42,10 +42,10 @@ def parse_arguments():
         description="Navi shell arguments.", formatter_class=argparse.RawTextHelpFormatter)
 
     # Help and usage strings
-    #q_help = (
-    #    "Quickly query the AI and print the response.\n"
-    #    "Use: navi -q "
-    #)
+    q_help = (
+        "Quickly query the AI and print the response.\n"
+        "Use: navi -q "
+    )
 
     nh_help = (
         "List currently installed Navi custom scripts.\n"
@@ -57,7 +57,8 @@ def parse_arguments():
         "Use: navi -r /<command>"
     )
 
-    #parser.add_argument('-q', type=str, help=q_help)
+    parser.add_argument('-q', type=str, nargs='+', default=None,
+                        help=q_help)
     parser.add_argument('-nh', action='store_true', help=nh_help)
     parser.add_argument('-r', type=str, help=r_help)
 
@@ -67,14 +68,21 @@ def parse_arguments():
 
 def handle_arguments(args):
     """Handle the actions based on the provided arguments."""
+
+    if args.q:
+        responses = query_navi(args.q)
+        for response in responses:
+            tr(response)
+        return True  
+
     if args.r:
         # Handle the -r argument logic here
         if args.r in commands.modules.keys():
             print(
                 f"{mods.breakline}\n{ai_name_rep} [\u2713] - Running command: '{args.r}'\n{mods.breakline}")
             commands.modules[args.r].run()
         return True
-
+    
     if args.nh:
         directory_path = '/opt/Navi/commands'
 
@@ -115,12 +123,6 @@ def handle_arguments(args):
 
     return False  # Indicate that no specific argument actions were handled
 
-
-def preRun():
-    # Clear the screen
-    os.system('cls' if os.name == 'nt' else 'clear')
-    print(art)
-
 # Navi Script Engine 
 def chip_engine_help():
     print(f"""{helpArt}
@@ -190,7 +192,35 @@ def checkVersion():
     result = check_for_new_release(current_version, repo_owner, repo_name)
     print(result)
 
-def chat_with_navi(): #Keep this just in case. (initial_query=None):
+def preRun():
+    os.system('cls' if os.name == 'nt' else 'clear')
+    print(art)
+
+
+def query_navi(messages):
+    responses = []
+    for user_message in messages:
+        if user_message.lower() in ['/stop', 'quit', 'exit', 'goodbye']:
+            responses.append(f"{ai_name_rep} Thank you for stopping by! {user}")
+            break
+        if user_message.lower() in ['/clear', 'cls']:
+            preRun()
+            responses.append(f"{ai_name_rep} How can I help you {user}")
+            continue
+        if user_message.lower() in ['run', 'chips', 'execute', 'scripts', 'load']:
+            chip_engine()
+            preRun()
+        else:
+            response = client.chat.completions.create(
+                model="gpt-4",
+                messages=[
+                    {"role": "user", "content": f"{user_message}"}
+                ]
+            )
+            responses.append(f"{ai_name_rep}{response.choices[0].message.content}")
+    return responses
+
+def chat_with_navi():
     while True:
         # Get user input
         try:
@@ -212,14 +242,13 @@ def chat_with_navi(): #Keep this just in case. (initial_query=None):
             preRun()
         else:
             response = client.chat.completions.create(
-                model = "gpt-4",
-                messages = [
-                        {"role": "user", "content": f"{user_message}"}
+                model="gpt-4",
+                messages=[
+                    {"role": "user", "content": f"{user_message}"}
                 ]
             )
             tr(f"{ai_name_rep}{response.choices[0].message.content}")
 
-
 def main():
     args = parse_arguments()
     if handle_arguments(args):
@@ -229,6 +258,5 @@ def main():
     tr(f"{ai_name_rep} How can I help you {user}")
     chat_with_navi()
 
-
 if __name__ == "__main__":
     main()

navi-shell.py.bak

@@ -0,0 +1,243 @@
+import requests 
+import os
+import getpass
+import random
+import time 
+import commands
+import argparse 
+import importlib.util
+import openai 
+from mods import mods 
+
+art = mods.art
+helpArt = mods.helpArt
+user = getpass.getuser()
+breakline = mods.breakline
+client = openai.OpenAI()
+ai_name_rep = "Navi> "
+
+def tr(text):
+    for char in text:
+        print(char, end="", flush=True,)
+        # generate a random number between 0 and 1
+        random_num = random.uniform(0, 1)
+        # if the random number is less than .1
+        if random_num < .1:
+            # sleep for 1 second
+            time.sleep(.0)
+        # else if the rando
+        elif random_num < .2:
+            # sleep for .5 seconds
+            time.sleep(.050)
+        # else
+        else:
+            # sleep for .1 seconds
+            time.sleep(.010)
+
+def parse_arguments():
+    """Parse command-line arguments and return the parsed args object."""
+
+    # Custom formatter that retains any whitespace in the description or epilog.
+    parser = argparse.ArgumentParser(
+        description="Navi shell arguments.", formatter_class=argparse.RawTextHelpFormatter)
+
+    # Help and usage strings
+    q_help = (
+        "Quickly query the AI and print the response.\n"
+        "Use: navi -q "
+    )
+
+    nh_help = (
+        "List currently installed Navi custom scripts.\n"
+        "Use: navi -nh"
+    )
+
+    r_help = (
+        "Run a Navi custom script.\n"
+        "Use: navi -r /<command>"
+    )
+
+    parser.add_argument('-q', type=str, nargs='+', default=None,
+                        help='Initial query/messages to start the conversation')
+    parser.add_argument('-nh', action='store_true', help=nh_help)
+    parser.add_argument('-r', type=str, help=r_help)
+
+    # Add other arguments as necessary
+    return parser.parse_args()
+
+
+def handle_arguments(args):
+    """Handle the actions based on the provided arguments."""
+
+    if args.q:
+        responses = chat_with_navi(args.q)
+        for response in responses:
+            tr(response)
+    else:
+        print("No initial query/messages provided.")
+
+    if args.r:
+        # Handle the -r argument logic here
+        if args.r in commands.modules.keys():
+            print(
+                f"{mods.breakline}\n{ai_name_rep} [\u2713] - Running command: '{args.r}'\n{mods.breakline}")
+            commands.modules[args.r].run()
+        return True
+
+    if args.nh:
+        directory_path = '/opt/Navi/commands'
+
+        # Filter for Python files and exclude __init__.py
+        files = [f for f in os.listdir(directory_path) if f.endswith(
+            '.py') and f != '__init__.py']
+
+        commands_and_uses = []
+
+        for file in files:
+            command = file.replace('.py', '')
+
+            # Load the module
+            spec = importlib.util.spec_from_file_location(
+                command, os.path.join(directory_path, file))
+            module = importlib.util.module_from_spec(spec)
+            spec.loader.exec_module(module)
+
+            # Grab the 'use' variable from the module
+            # Default to 'Description not found' if 'use' is not in the script
+            use_desc = getattr(module, 'use', 'Description not found')
+            commands_and_uses.append((command, use_desc))
+
+        # For alignment purposes
+        max_command_length = max([len(cmd) for cmd, _ in commands_and_uses])
+        max_use_length = max([len(use) for _, use in commands_and_uses])
+
+        print("\nCurrently installed Navi custom scripts:\n")
+        print(f"{'Command':<{max_command_length}} \t Description")
+        print('-' * max_command_length + '\t' + '-' *
+              max_use_length)  # Drawing separators
+
+        for command, use_desc in commands_and_uses:
+            print(f"{command:<{max_command_length}} \t {use_desc}")
+
+        print("\nuse navi -r /<command> to run a script")
+        return True
+
+    return False  # Indicate that no specific argument actions were handled
+
+
+def preRun():
+    # Clear the screen
+    os.system('cls' if os.name == 'nt' else 'clear')
+    print(art)
+
+# Navi Script Engine 
+def chip_engine_help():
+    print(f"""{helpArt}
+Navi is a simple to use customizable interface for CLI
+AI models. Built with cybersecurity professionals in mind. 
+
+[!!] - All commands are preceeded by a '/'
+Here is a list of current useable commands 
+
+Command:              Use:
+""")
+    for _, module in commands.modules.items():
+        print(module.command.ljust(21), module.use)
+    print(breakline)
+
+
+def chip_engine():
+    chip_engine_help()
+    message = input(f"{ai_name_rep} What do you want to run:  ")
+    if message[0] == "/":
+        if message in commands.modules.keys():
+            print(
+                f"{mods.breakline}\n{ai_name_rep} [\u2713] - Running command: '{message}'\n{mods.breakline}")
+            commands.modules[message].run()
+        if message == "":
+            print(
+                f"{ai_name_rep} [!!] - I did not catch that. Please try again.")
+
+
+def get_latest_release(repo_owner, repo_name):
+    api_url = f"https://api.github.com/repos/{repo_owner}/{repo_name}/releases/latest"
+    response = requests.get(api_url)
+
+    if response.status_code == 200:
+        data = response.json()
+        tag_name = data.get('tag_name')
+        release_name = data.get('name')
+        html_url = data.get('html_url')
+
+        return {
+            'tag_name': tag_name,
+            'release_name': release_name,
+            'html_url': html_url
+        }
+    else:
+        return None
+
+
+def is_new_release(current_version, latest_version):
+    return current_version < latest_version
+
+
+def check_for_new_release(current_version, repo_owner, repo_name):
+    latest_release = get_latest_release(repo_owner, repo_name)
+
+    if latest_release and is_new_release(current_version, latest_release['tag_name']):
+        return f"{ai_name_rep} - [!!] New release available!!\n{latest_release['release_name']} ({latest_release['tag_name']})\nURL: {latest_release['html_url']}\n"
+    else:
+        return f"{ai_name_rep} - [!!] You are running the latest version"
+
+
+def checkVersion():
+    current_version = "0.1.3"  # Replace with your actual current version
+    repo_owner = "SaintsSec"  # Replace with the actual owner name
+    repo_name = "Navi"  # Replace with the actual repository name
+
+    result = check_for_new_release(current_version, repo_owner, repo_name)
+    print(result)
+
+def chat_with_navi(q=None): #Keep this just in case. (initial_query=None):
+    while True:
+        # Get user input
+        try:
+            user_message = input(f"\n{user}> ")
+        except EOFError:
+            print("Encountered an unexpected end of input.")
+            break
+
+        # Exit loop if the user types 'exit' or 'quit'
+        if user_message.lower() in ['/stop', 'quit', 'exit', 'goodbye']:
+            tr(f"{ai_name_rep} Thank you for stopping by! {user}")
+            break
+        if user_message.lower() in ['/clear', 'cls']:
+            preRun()
+            tr(f"{ai_name_rep} How can I help you {user}")
+            continue
+        if user_message.lower() in ['run', 'chips', 'execute', 'scripts', 'load']:
+            chip_engine()
+            preRun()
+        else:
+            response = client.chat.completions.create(
+                model = "gpt-4",
+                messages = [
+                        {"role": "user", "content": f"{user_message}"}
+                ]
+            )
+            tr(f"{ai_name_rep}{response.choices[0].message.content}")
+
+
+def main():
+    args = parse_arguments()
+    if handle_arguments(args):
+        return 
+    preRun()
+    checkVersion()
+    tr(f"{ai_name_rep} How can I help you {user}")
+    chat_with_navi()
+
+
+if __name__ == "__main__":
+    main()