Skip to content

Commit cd3d107

Browse files
basketikuncodex
andcommitted
fix: reduce image generation wait time
Co-Authored-By: Codex <noreply@openai.com>
1 parent f43011b commit cd3d107

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

services/chatgpt_service.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ def _encode_images(images: Iterable[tuple[bytes, str, str]]) -> list[str]:
9595
return encoded_images
9696

9797
def list_models(self) -> dict[str, object]:
98-
result = self._new_backend(self._get_text_access_token()).list_models()
98+
result = self._new_backend().list_models()
9999
data = result.get("data")
100100
if not isinstance(data, list):
101101
return result

services/openai_backend_api.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
from PIL import Image
1414

1515
from services.account_service import account_service
16+
from services.config import config
1617
from services.proxy_service import proxy_settings
1718
from utils.helper import build_chat_image_markdown_content, ensure_ok, new_uuid, parse_sse_lines
1819
from utils.log import logger
@@ -607,7 +608,7 @@ def _poll_image_results(self, conversation_id: str, timeout_secs: float = 120.0)
607608
if file_ids:
608609
return file_ids, sediment_ids
609610
if sediment_ids:
610-
last_sediment_ids = sediment_ids
611+
return [], sediment_ids
611612
time.sleep(4)
612613
return [], last_sediment_ids
613614

@@ -748,7 +749,7 @@ def _run_image_task(self, prompt: str, model: str, size: str, images: Optional[l
748749
conversation_id = sse_result["conversation_id"]
749750
file_ids = list(sse_result["file_ids"])
750751
sediment_ids = list(sse_result["sediment_ids"])
751-
if conversation_id:
752+
if conversation_id and not file_ids and not sediment_ids:
752753
polled_file_ids, polled_sediment_ids = self._poll_image_results(conversation_id)
753754
file_ids.extend([item for item in polled_file_ids if item not in file_ids])
754755
sediment_ids.extend([item for item in polled_sediment_ids if item not in sediment_ids])
@@ -1019,7 +1020,7 @@ def stream_image_chat_completions(
10191020
finally:
10201021
sse.close()
10211022

1022-
if conversation_id:
1023+
if conversation_id and not file_ids and not sediment_ids:
10231024
polled_file_ids, polled_sediment_ids = self._poll_image_results(conversation_id)
10241025
self._append_unique(file_ids, polled_file_ids)
10251026
self._append_unique(sediment_ids, polled_sediment_ids)

0 commit comments

Comments
 (0)