mirror/nanobot
1
0
Fork 0
mirror of https://github.com/HKUDS/nanobot.git synced 2026-05-31 05:51:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(provider): preserve static error helper compatibility

Browse Source
This commit is contained in:
haosenwang1018 2026-04-12 20:53:18 +00:00 committed by Xubin Ren
parent c68b3edb9d
commit 3573109408
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nanobot/providers/openai_compat_provider.py
View File

@ -798,7 +798,13 @@ class OpenAICompatProvider(LLMProvider):
"error_should_retry": should_retry, "error_should_retry": should_retry,
} }
def _handle_error(self, e: Exception) -> LLMResponse: @staticmethod
def _handle_error(
e: Exception,
*,
spec: ProviderSpec | None = None,
api_base: str | None = None,
) -> LLMResponse:
body = ( body = (
getattr(e, "doc", None) getattr(e, "doc", None)
or getattr(e, "body", None) or getattr(e, "body", None)
@ -807,12 +813,11 @@ class OpenAICompatProvider(LLMProvider):
body_text = body if isinstance(body, str) else str(body) if body is not None else "" body_text = body if isinstance(body, str) else str(body) if body is not None else ""
msg = f"Error: {body_text.strip()[:500]}" if body_text.strip() else f"Error calling LLM: {e}" msg = f"Error: {body_text.strip()[:500]}" if body_text.strip() else f"Error calling LLM: {e}"
spec = self._spec
text = f"{body_text} {e}".lower() text = f"{body_text} {e}".lower()
if spec and spec.is_local and ("502" in text or "connection" in text or "refused" in text): if spec and spec.is_local and ("502" in text or "connection" in text or "refused" in text):
msg += ( msg += (
"\nHint: this is a local model endpoint. Check that the local server is reachable at " "\nHint: this is a local model endpoint. Check that the local server is reachable at "
f"{self.api_base or spec.default_api_base}, and if you are using a proxy/tunnel, make sure it " f"{api_base or spec.default_api_base}, and if you are using a proxy/tunnel, make sure it "
"can reach your local Ollama/vLLM service instead of routing localhost through the remote host." "can reach your local Ollama/vLLM service instead of routing localhost through the remote host."
) )
@ -859,7 +864,7 @@ class OpenAICompatProvider(LLMProvider):
) )
return self._parse(await self._client.chat.completions.create(**kwargs)) return self._parse(await self._client.chat.completions.create(**kwargs))
except Exception as e: except Exception as e:
return self._handle_error(e) return self._handle_error(e, spec=self._spec, api_base=self.api_base)
async def chat_stream( async def chat_stream(
self, self,
@ -942,7 +947,7 @@ class OpenAICompatProvider(LLMProvider):
error_kind="timeout", error_kind="timeout",
) )
except Exception as e: except Exception as e:
return self._handle_error(e) return self._handle_error(e, spec=self._spec, api_base=self.api_base)
def get_default_model(self) -> str: def get_default_model(self) -> str:
return self.default_model return self.default_model

6
tests/providers/test_custom_provider.py
View File

@ -61,7 +61,11 @@ def test_local_provider_502_error_includes_reachability_hint() -> None:
with patch("nanobot.providers.openai_compat_provider.AsyncOpenAI"): with patch("nanobot.providers.openai_compat_provider.AsyncOpenAI"):
provider = OpenAICompatProvider(api_base="http://localhost:11434/v1", spec=spec) provider = OpenAICompatProvider(api_base="http://localhost:11434/v1", spec=spec)
result = provider._handle_error(Exception("Error code: 502")) result = provider._handle_error(
Exception("Error code: 502"),
spec=spec,
api_base="http://localhost:11434/v1",
)
assert result.finish_reason == "error" assert result.finish_reason == "error"
assert "local model endpoint" in result.content assert "local model endpoint" in result.content