Salastil/odysseus
1
0
Fork 0
mirror of https://github.com/pewdiepie-archdaemon/odysseus.git synced 2026-06-23 21:25:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(llm): Properly detect remote Ollama bare URLs as native endpoints (fixes #3252) (#3343)

Browse Source
This commit is contained in:
adabarbulescu
2026-06-07 22:19:19 +03:00
committed by GitHub
parent 6c9a16a7a8
commit a8859bb25c
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/llm_core.py
+5 -1
View File
@@ -270,8 +270,10 @@ def _is_ollama_native_url(url: str) -> bool:
path = (parsed.path or "").rstrip("/") path = (parsed.path or "").rstrip("/")
if _host_match(url, "ollama.com"): if _host_match(url, "ollama.com"):
return True return True
if path.startswith("/v1"):
return False
local_ollama_host = host in {"localhost", "127.0.0.1", "0.0.0.0", "::1"} or parsed.port == 11434 local_ollama_host = host in {"localhost", "127.0.0.1", "0.0.0.0", "::1"} or parsed.port == 11434
return local_ollama_host and (path == "/api" or path.startswith("/api/")) return local_ollama_host and (path == "" or path == "/api" or path.startswith("/api/"))
def _ollama_api_root(url: str) -> str: def _ollama_api_root(url: str) -> str:
@@ -287,6 +289,8 @@ def _ollama_api_root(url: str) -> str:
return url[: -len("/generate")] return url[: -len("/generate")]
if path.endswith("/api"): if path.endswith("/api"):
return url return url
if path == "":
return url + "/api"
if _host_match(url, "ollama.com"): if _host_match(url, "ollama.com"):
root = f"{parsed.scheme}://{parsed.netloc}" if parsed.scheme and parsed.netloc else "https://ollama.com" root = f"{parsed.scheme}://{parsed.netloc}" if parsed.scheme and parsed.netloc else "https://ollama.com"
return root.rstrip("/") + "/api" return root.rstrip("/") + "/api"
tests/test_endpoint_resolver.py
+13 -1
View File
@@ -61,7 +61,11 @@ def _detect_provider(url: str) -> str:
parsed = urlparse(url or "") parsed = urlparse(url or "")
host = parsed.hostname or "" host = parsed.hostname or ""
path = (parsed.path or "").rstrip("/") path = (parsed.path or "").rstrip("/")
if host.endswith("ollama.com") or (parsed.port == 11434 and (path == "/api" or path.startswith("/api/"))): if host.endswith("ollama.com"):
return "ollama"
if path.startswith("/v1"):
pass # OpenAI compat
elif (parsed.port == 11434 or host in {"localhost", "127.0.0.1", "0.0.0.0", "::1"}) and (path == "" or path == "/api" or path.startswith("/api/")):
return "ollama" return "ollama"
if "anthropic.com" in (url or ""): if "anthropic.com" in (url or ""):
return "anthropic" return "anthropic"
@@ -75,6 +79,8 @@ def _ollama_api_root(base: str) -> str:
path = (parsed.path or "").rstrip("/") path = (parsed.path or "").rstrip("/")
if path.endswith("/api"): if path.endswith("/api"):
return base return base
if path == "":
return base + "/api"
if host.endswith("ollama.com"): if host.endswith("ollama.com"):
return f"{parsed.scheme}://{parsed.netloc}/api" return f"{parsed.scheme}://{parsed.netloc}/api"
return base return base
@@ -156,6 +162,12 @@ class TestBuildChatUrl:
def test_ollama_cloud_root_adds_api(self): def test_ollama_cloud_root_adds_api(self):
assert build_chat_url("https://ollama.com") == "https://ollama.com/api/chat" assert build_chat_url("https://ollama.com") == "https://ollama.com/api/chat"
def test_ollama_bare_url_adds_api(self):
assert build_chat_url("http://nas:11434") == "http://nas:11434/api/chat"
def test_ollama_v1_preserves_openai_compat(self):
assert build_chat_url("http://nas:11434/v1") == "http://nas:11434/v1/chat/completions"
class TestBuildModelsUrl: class TestBuildModelsUrl:
def test_openai_models(self): def test_openai_models(self):