chengma/cmhub
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: add image upstream deadline

Browse Source
This commit is contained in:
QiuSW
2026-07-08 20:14:33 +08:00
parent 2042c1a3e7
commit 12717d09e8
16 changed files with 202 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/ai/providers/openai_compatible.py
+19 -8
View File
@@ -20,6 +20,7 @@ from .utils import (
extract_image_from_response,
extract_text_from_response,
extract_titles_from_response,
image_request_timeout,
image_bytes_to_data_url,
normalize_api_url,
request_timeout,
@@ -79,6 +80,16 @@ class BaseHttpProvider:
def _read_timeout(self, model: ResolvedModel, resolution: str) -> int:
return self._timeout(model, resolution)[1]
def _image_timeout(self, model: ResolvedModel, resolution: str) -> tuple[int, int]:
return image_request_timeout(
model.connect_timeout_seconds,
model.timeout_seconds,
resolution,
)
def _image_read_timeout(self, model: ResolvedModel, resolution: str) -> int:
return self._image_timeout(model, resolution)[1]
class ChatCompletionsProvider(BaseHttpProvider):
def capabilities(self) -> set[str]:
@@ -142,14 +153,14 @@ class ChatCompletionsProvider(BaseHttpProvider):
url,
headers=self._headers(model, json=True),
json=payload,
timeout=self._timeout(model, resolution),
timeout=self._image_timeout(model, resolution),
)
response.raise_for_status()
raw = response.json()
image_bytes = extract_image_from_response(
raw,
session=self.session,
timeout=self._read_timeout(model, resolution),
timeout=self._image_read_timeout(model, resolution),
)
if not image_bytes:
raise AiResponseParseError("AI response did not contain an image")
@@ -217,14 +228,14 @@ class GeminiProvider(ChatCompletionsProvider):
url,
headers=self._headers(model, json=True),
json=payload,
timeout=self._timeout(model, resolution),
timeout=self._image_timeout(model, resolution),
)
response.raise_for_status()
raw = response.json()
image_bytes = extract_image_from_response(
raw,
session=self.session,
timeout=self._read_timeout(model, resolution),
timeout=self._image_read_timeout(model, resolution),
)
if not image_bytes:
raise AiResponseParseError("AI response did not contain an image")
@@ -266,14 +277,14 @@ class ImagesGenerationProvider(BaseHttpProvider):
url,
headers=self._headers(model, json=True),
json=payload,
timeout=self._timeout(model, resolution),
timeout=self._image_timeout(model, resolution),
)
response.raise_for_status()
raw = response.json()
image_bytes = extract_image_from_response(
raw,
session=self.session,
timeout=self._read_timeout(model, resolution),
timeout=self._image_read_timeout(model, resolution),
)
if not image_bytes:
raise AiResponseParseError("AI response did not contain an image")
@@ -317,14 +328,14 @@ class ImagesEditsProvider(BaseHttpProvider):
headers=self._headers(model),
data=data,
files=files,
timeout=self._timeout(model, resolution),
timeout=self._image_timeout(model, resolution),
)
response.raise_for_status()
raw = response.json()
image_bytes = extract_image_from_response(
raw,
session=self.session,
timeout=self._read_timeout(model, resolution),
timeout=self._image_read_timeout(model, resolution),
)
if not image_bytes:
raise AiResponseParseError("AI response did not contain an image")