Merge pull request #1096 from cryptidv/flags-updates

Flags Updates

scripts/config.py

@@ -38,7 +38,9 @@ class Config(metaclass=Singleton):
         self.continuous_mode = False
         self.continuous_limit = 0
         self.speak_mode = False
+        self.skip_reprompt = False
 
+        self.ai_settings_file = os.getenv("AI_SETTINGS_FILE", "ai_settings.yaml")
         self.fast_llm_model = os.getenv("FAST_LLM_MODEL", "gpt-3.5-turbo")
         self.smart_llm_model = os.getenv("SMART_LLM_MODEL", "gpt-4")
         self.fast_token_limit = int(os.getenv("FAST_TOKEN_LIMIT", 4000))

scripts/main.py

@@ -131,8 +131,12 @@ def print_assistant_thoughts(assistant_reply):
 
 def construct_prompt():
     """Construct the prompt for the AI to respond to"""
-    config = AIConfig.load()
-    if config.ai_name:
+    config = AIConfig.load(cfg.ai_settings_file)
+    if cfg.skip_reprompt and config.ai_name:
+        logger.typewriter_log("Name :", Fore.GREEN, config.ai_name)
+        logger.typewriter_log("Role :", Fore.GREEN, config.ai_role)
+        logger.typewriter_log("Goals:", Fore.GREEN, config.ai_goals)
+    elif config.ai_name:
         logger.typewriter_log(
             f"Welcome back! ",
             Fore.GREEN,
@@ -220,13 +224,15 @@ def parse_arguments():
     cfg.set_speak_mode(False)
 
     parser = argparse.ArgumentParser(description='Process arguments.')
-    parser.add_argument('--continuous', action='store_true', help='Enable Continuous Mode')
+    parser.add_argument('--continuous', '-c', action='store_true', help='Enable Continuous Mode')
     parser.add_argument('--continuous-limit', '-l', type=int, dest="continuous_limit", help='Defines the number of times to run in continuous mode')
     parser.add_argument('--speak', action='store_true', help='Enable Speak Mode')
     parser.add_argument('--debug', action='store_true', help='Enable Debug Mode')
     parser.add_argument('--gpt3only', action='store_true', help='Enable GPT3.5 Only Mode')
     parser.add_argument('--gpt4only', action='store_true', help='Enable GPT4 Only Mode')
     parser.add_argument('--use-memory', '-m', dest="memory_type", help='Defines which Memory backend to use')
+    parser.add_argument('--skip-reprompt', '-y', dest='skip_reprompt', action='store_true', help='Skips the re-prompting messages at the beginning of the script')
+    parser.add_argument('--ai-settings', '-C', dest='ai_settings_file', help="Specifies which ai_settings.yaml file to use, will also automatically skip the re-prompt.")
     args = parser.parse_args()
 
     if args.debug:
@@ -273,6 +279,24 @@ def parse_arguments():
         else:
             cfg.memory_backend = chosen
 
+    if args.skip_reprompt:
+        logger.typewriter_log("Skip Re-prompt: ", Fore.GREEN, "ENABLED")
+        cfg.skip_reprompt = True
+
+    if args.ai_settings_file:
+        file = args.ai_settings_file
+
+        # Validate file
+        (validated, message) = utils.validate_yaml_file(file)
+        if not validated:
+            logger.typewriter_log("FAILED FILE VALIDATION", Fore.RED, message)
+            logger.double_check()
+            exit(1)
+
+        logger.typewriter_log("Using AI Settings File:", Fore.GREEN, file)
+        cfg.ai_settings_file = file
+        cfg.skip_reprompt = True
+
 
 def main():
     global ai_name, memory

scripts/memory/__init__.py

@@ -3,7 +3,7 @@ from memory.no_memory import NoMemory
 
 # List of supported memory backends
 # Add a backend to this list if the import attempt is successful
-supported_memory = ['local']
+supported_memory = ['local', 'no_memory']
 
 try:
     from memory.redismem import RedisMemory

scripts/utils.py

@@ -1,3 +1,7 @@
+import yaml
+from colorama import Fore
+
+
 def clean_input(prompt: str=''):
     try:
         return input(prompt)
@@ -6,3 +10,14 @@ def clean_input(prompt: str=''):
         print("Quitting...")
         exit(0)
 
+
+def validate_yaml_file(file: str):
+    try:
+        with open(file) as file:
+            yaml.load(file, Loader=yaml.FullLoader)
+    except FileNotFoundError:
+        return (False, f"The file {Fore.CYAN}`{file}`{Fore.RESET} wasn't found")
+    except yaml.YAMLError as e:
+        return (False, f"There was an issue while trying to read with your AI Settings file: {e}")
+
+    return (True, f"Successfully validated {Fore.CYAN}`{file}`{Fore.RESET}!")