adrianSuSE/askollama
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

indenting

Browse Source
This commit is contained in:
Adrian Schröter 2024-07-29 11:18:37 +02:00
parent aa38ad5b3f
commit 1db3402d0c
1 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
askollama/cli.py
View File

@ -3,12 +3,12 @@ import sys
from argparse import ArgumentParser
import ollama
default_model = 'llama3.1'
client_url = os.getenv('OLLAMA_HOST')
if client_url is None:
# lookup config file
if client_url is None:
client_url = '0.0.0.0' # localhost
default_model = 'llama3.1'
parser = ArgumentParser('ollama-ask', description='Ollama CLI options')
parser.add_argument('-m', '--model', default=default_model, help='Specify ollama model')
@ -27,34 +27,29 @@ def cli():
def run(host, model, question):
client = ollama.Client(host=host)
messages = [
{
'role': 'user',
'content': question,
},
]
messages = [{ 'role': 'user', 'content': question }]
try:
for part in client.chat(model=model, messages=messages, stream=True):
print(part['message']['content'], end='', flush=True)
except ollama._types.ResponseError as e:
if e.status_code == 404:
print('Model not available, trying to pull it...', file=sys.stderr)
for progress in client.pull(model, stream=True):
digest = progress.get('digest', '')
if not digest:
print(progress.get('status'))
continue
print("Asking again...", file=sys.stderr)
for part in client.chat(model=model, messages=messages, stream=True):
print(part['message']['content'], end='', flush=True)
print(part['message']['content'], end='', flush=True)
except ollama._types.ResponseError as e:
if e.status_code == 404:
print('Model not available, trying to pull it...', file=sys.stderr)
for progress in client.pull(model, stream=True):
digest = progress.get('digest', '')
if not digest:
print(progress.get('status'))
continue
print("Asking again...", file=sys.stderr)
for part in client.chat(model=model, messages=messages, stream=True):
print(part['message']['content'], end='', flush=True)
print()
if args.debug:
print("Server using: ", args.host)
print("Model using : ", args.model)
print("Question: ", question)
print("Question : ", question)
run(args.host, args.model, question)