From 21ecdc25389ca9ba770062f1cc9b84091a2bc6db Mon Sep 17 00:00:00 2001
From: flu0r1ne <flu0r1ne@flu0r1ne.net>
Date: Fri, 5 May 2023 03:00:02 -0500
Subject: Refactor command structure, add validation for interactive sessions

---
 src/gpt_chat_cli/gcli.py | 40 ++++++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 16 deletions(-)

(limited to 'src/gpt_chat_cli/gcli.py')

diff --git a/src/gpt_chat_cli/gcli.py b/src/gpt_chat_cli/gcli.py
index a9d36e4..2d40cf2 100644
--- a/src/gpt_chat_cli/gcli.py
+++ b/src/gpt_chat_cli/gcli.py
@@ -132,22 +132,21 @@ def print_streamed_response(
             else:
                 print(end='\n', flush=True)
 
-def main():
-    args = parse_args()
-
-    if args.version:
-        print(f'version {VERSION}')
-        sys.exit(0)
+def cmd_version():
+    print(f'version {VERSION}')
 
-    if args.list_models:
+def cmd_list_models():
+    for model in list_models():
+        print(model)
 
-        for model in list_models():
-            print(model)
+def cmd_interactive(args : Arguments):
+    COLOR_CODE = get_color_codes(no_color = not args.display_args.color)
 
-        sys.exit(0)
+    print(f'GPT Chat CLI {VERSION}')
+    print(f'[{COLOR_CODE.WHITE}#{COLOR_CODE.RESET}]', end=' ', flush=True)
 
+def cmd_singleton(args: Arguments):
     completion_args = args.completion_args
-    COLOR_CODE = get_color_codes(no_color = not args.display_args.color)
 
     debug_args : DebugArguments = args.debug_args
 
@@ -157,11 +156,7 @@ def main():
     elif debug_args.load_response_from_file:
         completion_args, completion = load_response_and_arguments(args)
     else:
-        if args.completion_args.message is None:
-            if sys.stdin.isatty():
-                print(f'GPT Chat CLI {VERSION}')
-                print(f'[{COLOR_CODE.WHITE}#{COLOR_CODE.RESET}]', end=' ', flush=True)
-
+        if completion_args.message is None:
             completion_args.message = sys.stdin.read()
 
         completion = create_chat_completion_from_args(completion_args)
@@ -172,5 +167,18 @@ def main():
         completion_args.n_completions
     )
 
+
+def main():
+    args = parse_args()
+
+    if args.version:
+        cmd_version()
+    elif args.list_models:
+        cmd_list_models()
+    elif args.interactive:
+        cmd_interactive(args)
+    else:
+        cmd_singleton(args)
+
 if __name__ == "__main__":
     main()
-- 
cgit v1.2.3