Skip to content

Fix ollama client #227

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix ollama client #227

Show file tree
Hide file tree
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
8 changes: 4 additions & 4 deletions operate/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,15 +85,15 @@ def initialize_google(self):
def initialize_ollama(self):
if self.ollama_host:
if self.verbose:
print("[Config][initialize_ollama] using cached ollama host")
print("[Config][initialize_ollama] using ollama host", self.ollama_host)
else:
if self.verbose:
print(
"[Config][initialize_ollama] no cached ollama host. Assuming ollama running locally."
)
self.ollama_host = os.getenv("OLLAMA_HOST", None)
model = Client(host=self.ollama_host)
return model
self.ollama_host = os.getenv("OLLAMA_HOST", "http://localhost:11434")
client = Client(host=self.ollama_host)
return client

def initialize_anthropic(self):
if self.anthropic_api_key:
Expand Down
4 changes: 2 additions & 2 deletions operate/models/apis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,7 @@ def call_ollama_llava(messages):
print("[call_ollama_llava]")
time.sleep(1)
try:
model = config.initialize_ollama()
client = config.initialize_ollama()
screenshots_dir = "screenshots"
if not os.path.exists(screenshots_dir):
os.makedirs(screenshots_dir)
Expand All @@ -590,7 +590,7 @@ def call_ollama_llava(messages):
}
messages.append(vision_message)

response = model.chat(
response = client.chat(
model="llava",
messages=messages,
)
Expand Down