Merge pull request #15 from jmorganca/batch

batch model

ollama/cmd/cli.py

@@ -54,15 +54,18 @@ def list_models(*args, **kwargs):
 def generate(*args, **kwargs):
     if prompt := kwargs.get('prompt'):
         print('>>>', prompt, flush=True)
-        print(flush=True)
         generate_oneshot(*args, **kwargs)
-        print(flush=True)
         return
 
-    return generate_interactive(*args, **kwargs)
+    if sys.stdin.isatty():
+        return generate_interactive(*args, **kwargs)
+
+    return generate_batch(*args, **kwargs)
 
 
 def generate_oneshot(*args, **kwargs):
+    print(flush=True)
+
     for output in engine.generate(*args, **kwargs):
         output = json.loads(output)
         choices = output.get("choices", [])
@@ -70,20 +73,26 @@ def generate_oneshot(*args, **kwargs):
             print(choices[0].get("text", ""), end="", flush=True)
 
     # end with a new line
-    print()
+    print(flush=True)
+    print(flush=True)
 
 
 def generate_interactive(*args, **kwargs):
-    print('>>> ', end='', flush=True)
-    for line in sys.stdin:
-        if not sys.stdin.isatty():
-            print(line, end='')
-
-        print(flush=True)
-        kwargs.update({'prompt': line})
-        generate_oneshot(*args, **kwargs)
-        print(flush=True)
+    while True:
         print('>>> ', end='', flush=True)
+        line = next(sys.stdin)
+        if not line:
+            return
+
+        kwargs.update({"prompt": line})
+        generate_oneshot(*args, **kwargs)
+
+
+def generate_batch(*args, **kwargs):
+    for line in sys.stdin:
+        print('>>> ', line, end='', flush=True)
+        kwargs.update({"prompt": line})
+        generate_oneshot(*args, **kwargs)
 
 
 def add(model, models_home):

ollama/engine.py

@@ -45,7 +45,7 @@ def load(model, models_home=".", llms={}):
 
         if not model_path:
             # try loading this as a path to a model, rather than a model name
-            model_path = model
+            model_path = os.path.abspath(model)
 
         # suppress LLM's output
         with suppress_stderr():