fix(chatgpt): remove image responses env override

This commit is contained in:
CrystalVibe28 2026-05-14 23:07:19 +08:00
parent 4c653a5749
commit 4f42ead4ca
2 changed files with 14 additions and 11 deletions

View file

@ -1,5 +1,4 @@
import json
import os
import re
from typing import TYPE_CHECKING, Any, Dict, List, Optional, Tuple, Union
@ -145,13 +144,11 @@ class ChatGPTImageGenerationConfig(BaseImageGenerationConfig):
self._validate_openai_image_generation_params(model, optional_params)
# Intentionally pinned fallback for ChatGPT image generation through the
# Codex Responses API. Users can override this per request, via
# litellm_params, or with CHATGPT_IMAGE_RESPONSES_MODEL without requiring
# a LiteLLM release.
# Codex Responses API. Users can override this per request or via
# litellm_params.
responses_model = (
optional_params.pop("chatgpt_responses_model", None)
or litellm_params.get("chatgpt_responses_model")
or os.getenv("CHATGPT_IMAGE_RESPONSES_MODEL")
or "gpt-5.5"
)
request: Dict[str, Any] = {

View file

@ -345,11 +345,8 @@ def test_chatgpt_image_generation_extracts_b64_from_sse_completed_response(
assert response._hidden_params["model"] == "gpt-image-2"
def test_chatgpt_image_generation_uses_optional_responses_model_and_env(
monkeypatch, tmp_path
):
def test_chatgpt_image_generation_uses_optional_responses_model(monkeypatch, tmp_path):
monkeypatch.setenv("CHATGPT_TOKEN_DIR", str(tmp_path))
monkeypatch.setenv("CHATGPT_IMAGE_RESPONSES_MODEL", "gpt-env")
config = ChatGPTImageGenerationConfig()
optional_params = {"chatgpt_responses_model": "gpt-override"}
@ -364,14 +361,23 @@ def test_chatgpt_image_generation_uses_optional_responses_model_and_env(
assert request["model"] == "gpt-override"
assert "chatgpt_responses_model" not in optional_params
env_request = config.transform_image_generation_request(
litellm_params_request = config.transform_image_generation_request(
model="gpt-image-2",
prompt="draw a cat",
optional_params={},
litellm_params={"chatgpt_responses_model": "gpt-litellm-param"},
headers={},
)
assert litellm_params_request["model"] == "gpt-litellm-param"
default_request = config.transform_image_generation_request(
model="gpt-image-2",
prompt="draw a cat",
optional_params={},
litellm_params={},
headers={},
)
assert env_request["model"] == "gpt-env"
assert default_request["model"] == "gpt-5.5"
@pytest.mark.parametrize(