fix cli setup

Makefile

@@ -4,7 +4,7 @@ tui:
 repl:
 	@ python -m shgpt -l
 
-build:
+build: clean
 	hatch build
 
 clean:

shgpt/__init__.py

@@ -0,0 +1 @@
+from .app import main

shgpt/__main__.py

@@ -1,88 +1,4 @@
-import argparse, sys
-from os import environ, makedirs
-from smartinput import sinput, Shell, Fore
-from .api.ollama import Ollama
-from .version import __version__
-from .utils.conf import *
-from .utils.common import *
-from .tui.app import ShellGPTApp
-from functools import partial
-
-
-def repl_handler(llm, prompt, shell):
-    if prompt != "":
-        try:
-            for r in llm.generate(prompt):
-                print(r, end='')
-            print()
-        except Exception as e:
-            shell.out(f"Error when infer: ${e}")
-
-
-class ShellGPT(object):
-    def __init__(self, url, model, role, timeout):
-        makedirs(CONF_PATH, exist_ok=True)
-        self.llm = Ollama(url, model, role, timeout)
-
-    def tui(self):
-        app = ShellGPTApp(self.llm)
-        app.run()
-
-    def repl(self):
-        print(r'''
-__      __   _                    _         ___ _        _ _  ___ ___ _____
-\ \    / /__| |__ ___ _ __  ___  | |_ ___  / __| |_  ___| | |/ __| _ \_   _|
- \ \/\/ / -_) / _/ _ \ '  \/ -_) |  _/ _ \ \__ \ ' \/ -_) | | (_ |  _/ | |
-  \_/\_/\___|_\__\___/_|_|_\___|  \__\___/ |___/_||_\___|_|_|\___|_|   |_|
-''')
-        shell = Shell(callback=partial(repl_handler, self.llm), intitle="shellgpt> ", outtitle="", alertcolor=Fore.RED, exiton="exit")
-        shell.start()
-        return
-
-    def infer(self, prompt):
-        for r in self.llm.generate(prompt):
-            print(r, end='')
-        print()
-
-
-def main():
-    prog = sys.argv[0]
-    parser = argparse.ArgumentParser(
-        prog=prog,
-        description='Make Shell easy to use with power of LLM!')
-    parser.add_argument('-V', '--version', action='version', version='%(prog)s ' + __version__)
-    parser.add_argument('-s', '--shell', action='store_true', help='Infer shell command')
-    parser.add_argument('-r', '--role', default='default', help='System role message')
-    parser.add_argument('-l', '--repl', action='store_true', help='Start interactive REPL')
-    parser.add_argument('--timeout', type=int, help='Timeout for each inference request', default=INFER_TIMEOUT)
-    parser.add_argument('--ollama-url', default=OLLAMA_URL, help='Ollama URL')
-    parser.add_argument('-m', '--ollama-model', default='llama3', help='Ollama model')
-    parser.add_argument('-v', '--verbose', action='store_true', help='verbose mode')
-    parser.add_argument('prompt', metavar='<prompt>', nargs='*')
-    args = parser.parse_args()
-    set_verbose(args.verbose)
-
-    sin = read_stdin()
-    prompt = ' '.join(args.prompt)
-    if sin is not None:
-        prompt = f'{sin}\n\n{prompt}'
-
-    role = args.role
-    if args.shell:
-        role = 'shell'
-    elif args.repl:
-        pass
-    elif len(prompt) == 0:
-        # tui default to shell role
-        role = 'shell'
-
-    sg = ShellGPT(args.ollama_url, args.ollama_model, role, args.timeout)
-    if args.repl:
-        sg.repl()
-    elif len(prompt) == 0:
-        sg.tui()
-    else:
-        sg.infer(prompt)
+from .app import main
 
 
 if __name__ == '__main__':

shgpt/app.py

@@ -0,0 +1,89 @@
+import argparse, sys
+from os import environ, makedirs
+from smartinput import sinput, Shell, Fore
+from .api.ollama import Ollama
+from .version import __version__
+from .utils.conf import *
+from .utils.common import *
+from .tui.app import ShellGPTApp
+from functools import partial
+
+
+def repl_handler(llm, prompt, shell):
+    if prompt != "":
+        try:
+            for r in llm.generate(prompt):
+                print(r, end='')
+            print()
+        except Exception as e:
+            shell.out(f"Error when infer: ${e}")
+
+
+class ShellGPT(object):
+    def __init__(self, url, model, role, timeout):
+        makedirs(CONF_PATH, exist_ok=True)
+        self.llm = Ollama(url, model, role, timeout)
+
+    def tui(self):
+        app = ShellGPTApp(self.llm)
+        app.run()
+
+    def repl(self):
+        print(r'''
+__      __   _                    _         ___ _        _ _  ___ ___ _____
+\ \    / /__| |__ ___ _ __  ___  | |_ ___  / __| |_  ___| | |/ __| _ \_   _|
+ \ \/\/ / -_) / _/ _ \ '  \/ -_) |  _/ _ \ \__ \ ' \/ -_) | | (_ |  _/ | |
+  \_/\_/\___|_\__\___/_|_|_\___|  \__\___/ |___/_||_\___|_|_|\___|_|   |_|
+''')
+        shell = Shell(callback=partial(repl_handler, self.llm), intitle="shellgpt> ", outtitle="", alertcolor=Fore.RED, exiton="exit")
+        shell.start()
+        return
+
+    def infer(self, prompt):
+        for r in self.llm.generate(prompt):
+            print(r, end='')
+        print()
+
+
+def main():
+    prog = sys.argv[0]
+    parser = argparse.ArgumentParser(
+        prog=prog,
+        description='Make Shell easy to use with power of LLM!')
+    parser.add_argument('-V', '--version', action='version', version='%(prog)s ' + __version__)
+    parser.add_argument('-s', '--shell', action='store_true', help='Infer shell command')
+    parser.add_argument('-r', '--role', default='default', help='System role message')
+    parser.add_argument('-l', '--repl', action='store_true', help='Start interactive REPL')
+    parser.add_argument('--timeout', type=int, help='Timeout for each inference request', default=INFER_TIMEOUT)
+    parser.add_argument('--ollama-url', default=OLLAMA_URL, help='Ollama URL')
+    parser.add_argument('-m', '--ollama-model', default='llama3', help='Ollama model')
+    parser.add_argument('-v', '--verbose', action='store_true', help='verbose mode')
+    parser.add_argument('prompt', metavar='<prompt>', nargs='*')
+    args = parser.parse_args()
+    set_verbose(args.verbose)
+
+    sin = read_stdin()
+    prompt = ' '.join(args.prompt)
+    if sin is not None:
+        prompt = f'{sin}\n\n{prompt}'
+
+    role = args.role
+    if args.shell:
+        role = 'shell'
+    elif args.repl:
+        pass
+    elif len(prompt) == 0:
+        # tui default to shell role
+        role = 'shell'
+
+    sg = ShellGPT(args.ollama_url, args.ollama_model, role, args.timeout)
+    if args.repl:
+        sg.repl()
+    elif len(prompt) == 0:
+        sg.tui()
+    else:
+        sg.infer(prompt)
+
+
+if __name__ == '__main__':
+    main()

shgpt/version.py

@@ -1 +1 @@
-__version__ = "0.2.0"
+__version__ = "0.2.1"