Skip to content

fix: don't send empty api_key to Ollama #86

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

Merged
ShrihariMahabal merged 2 commits into from
Jul 28, 2026
Merged

fix: don't send empty api_key to Ollama #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b5e2f4
fix: don't send empty api_key to Ollama
rehanrehman389 Jul 26, 2026
d12236f
test: update empty api_key assertions to None
rehanrehman389 Jul 26, 2026
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
2 changes: 1 addition & 1 deletion flow/flow/doctype/flow_model/flow_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ def test_connection(self):
from flow.lib.model import resolve_provider_credentials

provider_creds = resolve_provider_credentials(self.model_id)
api_key = self.get_password("api_key", raise_exception=False) or provider_creds.get("api_key") or ""
api_key = self.get_password("api_key", raise_exception=False) or provider_creds.get("api_key") or None
base_url = self.base_url or provider_creds.get("base_url")

kwargs = {
Expand Down
4 changes: 2 additions & 2 deletions flow/flow/doctype/flow_provider/test_flow_provider.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,11 @@ def test_model_own_key_overrides_provider(self):
def test_disabled_provider_not_used(self):
frappe.get_doc(_provider(api_key="sk-from-provider", enabled=0)).insert()
m = frappe.get_doc(_model()).insert()
self.assertEqual(Model(m.name)._api_key, "")
self.assertIsNone(Model(m.name)._api_key)

def test_no_provider_row_leaves_key_empty(self):
m = frappe.get_doc(_model()).insert()
self.assertEqual(Model(m.name)._api_key, "")
self.assertIsNone(Model(m.name)._api_key)

def test_provider_base_url_used_when_model_has_none(self):
frappe.get_doc(_provider(base_url="http://gateway.local")).insert()
Expand Down
4 changes: 2 additions & 2 deletions flow/lib/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def __init__(
params = {**provider_creds["extra_params"], **(params or {})}

self.model_id = model_id
self._api_key = api_key or ""
self._api_key = api_key or None
Comment thread
rehanrehman389 marked this conversation as resolved.
self.base_url = base_url
self.params = params or {}
self.timeout = timeout
Expand Down Expand Up @@ -129,7 +129,7 @@ def resolve_provider_credentials(model_id: str) -> dict[str, Any]:
return {}

return {
"api_key": doc.get_password("api_key", raise_exception=False) or "",
"api_key": doc.get_password("api_key", raise_exception=False) or None,
"base_url": doc.base_url or None,
"extra_params": json.loads(doc.extra_params) if doc.extra_params else {},
}
Expand Down
2 changes: 1 addition & 1 deletion flow/tests/test_ai_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def test_init_requires_model_id(self):

def test_init_allows_empty_api_key_for_local_providers(self):
m = Model(model_id="ollama/llama3.1", base_url="http://localhost:11434")
self.assertEqual(m._api_key, "")
self.assertIsNone(m._api_key)

def test_init_rejects_name_with_kwargs(self):
with self.assertRaises(ValueError):
Expand Down
Loading