Skip to content

add debug and incorporate ollama server integration #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jwschmo wants to merge 1 commit into
base: main
Choose a base branch
from
Open

add debug and incorporate ollama server integration #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
local_models = json.loads(os.environ["LOCAL_MODELS"])
for model_name in local_models:
models.append(model_name)
print(model_name)

# Configure MistralAI
if "MISTRAL_API_KEY" in os.environ:
Expand Down Expand Up @@ -158,8 +159,11 @@ def text_history(history):
return text_history

def llm_proxy(prompt, bot_config, model_type):
print("got here")
if model_type.startswith("local-"):
return llm_local(prompt, model_type, bot_config)
if model_type.startswith("ollama-"):
return llm_local(prompt, model_type, bot_config)
if model_type.startswith("mistral-") or model_type.startswith("ministral-"):
return llm_mistral(prompt, model_type, bot_config)
if model_type.startswith("gpt-") or model_type.startswith("chatgpt-"):
Expand All @@ -177,9 +181,15 @@ def llm_proxy(prompt, bot_config, model_type):

# Query local models
def llm_local(prompt, model_name, bot_config):
client = OpenAI(api_key="doesntmatter", base_url=local_models[model_name])
print(local_models[model_name])
print(model_name)
base_url_mod_temp = local_models[model_name]
base_url_ollama_temp = base_url_mod_temp.replace('ollama-','')
client = OpenAI(api_key="ollama", base_url=base_url_ollama_temp)
messages=[{"role": "system", "content": bot_config["identity"]},{"role": "user", "content": prompt}]
response = client.chat.completions.create(model=model_name, temperature=float(bot_config["temperature"]), messages=messages)
print(messages)
response = client.chat.completions.create(model=model_name.replace('ollama-',''), temperature=float(bot_config["temperature"]), messages=messages)
print(response)
user = bot_config["name"] + " " + model_name
return {"user": user, "text": response.choices[0].message.content}

Expand Down