apunkt/MetaGPT
1
0
Fork 0
mirror of https://github.com/FoundationAgents/MetaGPT.git synced 2026-06-08 15:05:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1465 from MorpheusI0/feature/support_for_open_webui

Browse source 
feat: add optional authorization header for Ollama to support Open WebUI
This commit is contained in:
Alexander Wu 2024-10-11 17:18:30 +08:00 • committed by GitHub
commit cb8fcb9323
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
metagpt/provider/general_api_requestor.py
View file

@ -81,7 +81,11 @@ class GeneralAPIRequestor(APIRequestor):
self, result: aiohttp.ClientResponse, stream: bool
) -> Tuple[Union[bytes, AsyncGenerator[bytes, None]], bool]:
content_type = result.headers.get("Content-Type", "")
if stream and ("text/event-stream" in content_type or "application/x-ndjson" in content_type):
if stream and (
"text/event-stream" in content_type or
"application/x-ndjson" in content_type or
content_type == ''
):
# the `Content-Type` of ollama stream resp is "application/x-ndjson"
return (
self._interpret_response_line(line, result.status, result.headers, stream=True)

8
metagpt/provider/ollama_api.py
View file

@ -51,9 +51,13 @@ class OllamaLLM(BaseLLM):
return json.loads(chunk)
async def _achat_completion(self, messages: list[dict], timeout: int = USE_CONFIG_TIMEOUT) -> dict:
headers = None if not self.config.api_key or self.config.api_key == "sk-" else {
"Authorization": f"Bearer {self.config.api_key}",
}
resp, _, _ = await self.client.arequest(
method=self.http_method,
url=self.suffix_url,
headers=headers,
params=self._const_kwargs(messages),
request_timeout=self.get_timeout(timeout),
)
@ -66,9 +70,13 @@ class OllamaLLM(BaseLLM):
return await self._achat_completion(messages, timeout=self.get_timeout(timeout))
async def _achat_completion_stream(self, messages: list[dict], timeout: int = USE_CONFIG_TIMEOUT) -> str:
headers = None if not self.config.api_key or self.config.api_key == "sk-" else {
"Authorization": f"Bearer {self.config.api_key}",
}
stream_resp, _, _ = await self.client.arequest(
method=self.http_method,
url=self.suffix_url,
headers=headers,
stream=True,
params=self._const_kwargs(messages, stream=True),
request_timeout=self.get_timeout(timeout),