Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
34 changes: 2 additions & 32 deletions router/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import redis.asyncio as redis

from .utils import stream_resp
from .providers import openai, anthropic, google, openrouter, grok, venice

import logging
from logging.handlers import TimedRotatingFileHandler
Expand Down Expand Up @@ -282,38 +283,7 @@ async def forward_to_local_agent(payload: ChatCompletionRequest) -> dict:
async def forward_to_openai(payload: ChatCompletionRequest):
"""Forward request to the OpenAI API."""

if EXTERNAL_OPENAI_KEY is None:
raise HTTPException(status_code=500, detail="OpenAI key not configured")

headers = {"Authorization": f"Bearer {EXTERNAL_OPENAI_KEY}"}
async with httpx.AsyncClient(base_url=OPENAI_BASE_URL) as client:
if payload.stream:
resp = await client.post( # type: ignore[call-arg]
"/v1/chat/completions",
json=payload.dict(),
headers=headers,
stream=True,
)
try:
resp.raise_for_status()
except httpx.HTTPError as exc: # coverage: ignore -- best-effort
raise HTTPException(
status_code=502, detail="External provider error"
) from exc
return StreamingResponse(stream_resp(resp), media_type="text/event-stream")

resp = await client.post(
"/v1/chat/completions",
json=payload.dict(),
headers=headers,
)
try:
resp.raise_for_status()
except httpx.HTTPError as exc: # coverage: ignore -- best-effort
raise HTTPException(
status_code=502, detail="External provider error"
) from exc
return resp.json()
return await openai.forward(payload, OPENAI_BASE_URL, EXTERNAL_OPENAI_KEY)


async def forward_to_llmd(payload: ChatCompletionRequest):
Expand Down
3 changes: 2 additions & 1 deletion router/providers/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from . import anthropic, google, openrouter, grok, venice
from . import anthropic, google, openrouter, grok, venice, openai
from .base import ApiProvider, WeightProvider

__all__ = [
Expand All @@ -9,4 +9,5 @@
"openrouter",
"grok",
"venice",
"openai",
]
50 changes: 50 additions & 0 deletions router/providers/openai.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
from __future__ import annotations

import httpx
from fastapi import HTTPException
from fastapi.responses import StreamingResponse

from ..schemas import ChatCompletionRequest
from ..utils import stream_resp
from .base import ApiProvider


class OpenAIProvider(ApiProvider):
"""Provider wrapper for the OpenAI API."""

async def forward(
self, payload: ChatCompletionRequest, base_url: str, api_key: str | None
):
"""Forward request to OpenAI."""
if api_key is None:
raise HTTPException(status_code=500, detail="OpenAI key not configured")

headers = {"Authorization": f"Bearer {api_key}"}
async with httpx.AsyncClient(base_url=base_url) as client:
path = "/v1/chat/completions"
if payload.stream:
resp = await client.post( # type: ignore[call-arg]
path, json=payload.dict(), headers=headers, stream=True
)
try:
resp.raise_for_status()
except httpx.HTTPError as exc: # coverage: ignore
raise HTTPException(
status_code=502, detail="External provider error"
) from exc
return StreamingResponse(stream_resp(resp), media_type="text/event-stream")

resp = await client.post(path, json=payload.dict(), headers=headers)
try:
resp.raise_for_status()
except httpx.HTTPError as exc: # coverage: ignore
raise HTTPException(
status_code=502, detail="External provider error"
) from exc
return resp.json()


async def forward(payload: ChatCompletionRequest, base_url: str, api_key: str | None):
"""Backward compatible wrapper for ``OpenAIProvider``."""
provider = OpenAIProvider()
return await provider.forward(payload, base_url, api_key)
Loading