mirror of
https://github.com/BerriAI/litellm.git
synced 2026-09-07 08:26:10 +00:00
Merge pull request #27787 from BerriAI/litellm_/serene-goldwasser-8f121e
fix(tests): swap dall-e to gpt-image-1 after openai deprecation
This commit is contained in:
commit
f9c8de2305
9 changed files with 17 additions and 36 deletions
|
|
@ -38,9 +38,9 @@ model_list:
|
|||
model_info:
|
||||
mode: embedding
|
||||
base_model: text-embedding-ada-002
|
||||
- model_name: dall-e-2 # some tests use dall-e-2 which is now deprecated, alias to dall-e-3
|
||||
- model_name: dall-e-2 # dall-e-2 and dall-e-3 were deprecated 2026-05-12; alias to gpt-image-1
|
||||
litellm_params:
|
||||
model: openai/dall-e-3
|
||||
model: openai/gpt-image-1
|
||||
- model_name: openai-dall-e-3
|
||||
litellm_params:
|
||||
model: dall-e-3
|
||||
|
|
|
|||
|
|
@ -133,20 +133,6 @@ class TestOpenAIImageEditGPTImage1(BaseLLMImageEditTest):
|
|||
}
|
||||
|
||||
|
||||
class TestOpenAIImageEditDallE2(BaseLLMImageEditTest):
|
||||
"""
|
||||
Concrete implementation of BaseLLMImageEditTest for OpenAI DALL-E-2 image edits.
|
||||
DALL-E-2 only supports a single image (not an array).
|
||||
"""
|
||||
|
||||
def get_base_image_edit_call_args(self) -> dict:
|
||||
"""Return base call args for OpenAI DALL-E-2 image edit (single image only)"""
|
||||
return {
|
||||
"model": "dall-e-2",
|
||||
"image": SINGLE_TEST_IMAGE,
|
||||
}
|
||||
|
||||
|
||||
class TestAzureAIFlux2ImageEdit(BaseLLMImageEditTest):
|
||||
"""
|
||||
Concrete implementation of BaseLLMImageEditTest for Azure AI FLUX 2 image edits.
|
||||
|
|
|
|||
|
|
@ -163,11 +163,6 @@ class TestBedrockNovaCanvasColorGuidedGeneration(BaseImageGenTest):
|
|||
}
|
||||
|
||||
|
||||
class TestOpenAIDalle3(BaseImageGenTest):
|
||||
def get_base_image_generation_call_args(self) -> dict:
|
||||
return {"model": "dall-e-3"}
|
||||
|
||||
|
||||
class TestOpenAIGPTImage1(BaseImageGenTest):
|
||||
def get_base_image_generation_call_args(self) -> dict:
|
||||
return {"model": "gpt-image-1"}
|
||||
|
|
|
|||
|
|
@ -930,7 +930,7 @@ def test_image_generation_openai():
|
|||
|
||||
response = litellm.image_generation(
|
||||
prompt="A cute baby sea otter",
|
||||
model="openai/dall-e-3",
|
||||
model="openai/gpt-image-1",
|
||||
api_key=os.getenv("OPENAI_API_KEY"),
|
||||
)
|
||||
|
||||
|
|
@ -948,7 +948,7 @@ def test_image_generation_openai():
|
|||
try:
|
||||
response = litellm.image_generation(
|
||||
prompt="A cute baby sea otter",
|
||||
model="dall-e-2",
|
||||
model="gpt-image-1",
|
||||
api_key="my-bad-api-key",
|
||||
)
|
||||
except Exception:
|
||||
|
|
|
|||
|
|
@ -995,15 +995,15 @@ async def test_aimg_gen_on_router():
|
|||
try:
|
||||
model_list = [
|
||||
{
|
||||
"model_name": "dall-e-3",
|
||||
"model_name": "gpt-image-1",
|
||||
"litellm_params": {
|
||||
"model": "dall-e-3",
|
||||
"model": "gpt-image-1",
|
||||
},
|
||||
}
|
||||
]
|
||||
router = Router(model_list=model_list, num_retries=3)
|
||||
response = await router.aimage_generation(
|
||||
model="dall-e-3", prompt="A cute baby sea otter"
|
||||
model="gpt-image-1", prompt="A cute baby sea otter"
|
||||
)
|
||||
print(response)
|
||||
assert len(response.data) > 0
|
||||
|
|
@ -1030,15 +1030,15 @@ def test_img_gen_on_router():
|
|||
try:
|
||||
model_list = [
|
||||
{
|
||||
"model_name": "dall-e-3",
|
||||
"model_name": "gpt-image-1",
|
||||
"litellm_params": {
|
||||
"model": "dall-e-3",
|
||||
"model": "gpt-image-1",
|
||||
},
|
||||
}
|
||||
]
|
||||
router = Router(model_list=model_list)
|
||||
response = router.image_generation(
|
||||
model="dall-e-3", prompt="A cute baby sea otter"
|
||||
model="gpt-image-1", prompt="A cute baby sea otter"
|
||||
)
|
||||
print(response)
|
||||
assert len(response.data) > 0
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ async def generate_key(
|
|||
models=[
|
||||
"gpt-4",
|
||||
"text-embedding-ada-002",
|
||||
"dall-e-2",
|
||||
"gpt-image-1",
|
||||
"fake-openai-endpoint",
|
||||
"mistral-embed",
|
||||
],
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ async def generate_key(session):
|
|||
url = "http://0.0.0.0:4000/key/generate"
|
||||
headers = {"Authorization": "Bearer sk-1234", "Content-Type": "application/json"}
|
||||
data = {
|
||||
"models": ["gpt-4", "text-embedding-ada-002", "dall-e-2"],
|
||||
"models": ["gpt-4", "text-embedding-ada-002", "gpt-image-1"],
|
||||
"duration": None,
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ async def generate_key(
|
|||
i,
|
||||
budget=None,
|
||||
budget_duration=None,
|
||||
models=["azure-models", "gpt-4", "dall-e-3"],
|
||||
models=["azure-models", "gpt-4", "gpt-image-1"],
|
||||
max_parallel_requests: Optional[int] = None,
|
||||
user_id: Optional[str] = None,
|
||||
team_id: Optional[str] = None,
|
||||
|
|
@ -235,7 +235,7 @@ async def chat_completion(session, key, model="gpt-4"):
|
|||
pass
|
||||
|
||||
|
||||
async def image_generation(session, key, model="dall-e-3"):
|
||||
async def image_generation(session, key, model="gpt-image-1"):
|
||||
url = "http://0.0.0.0:4000/v1/images/generations"
|
||||
headers = {
|
||||
"Authorization": f"Bearer {key}",
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ async def generate_key(
|
|||
models=[
|
||||
"gpt-4",
|
||||
"text-embedding-ada-002",
|
||||
"dall-e-2",
|
||||
"gpt-image-1",
|
||||
"fake-openai-endpoint-2",
|
||||
"mistral-embed",
|
||||
],
|
||||
|
|
@ -56,7 +56,7 @@ async def new_user(session):
|
|||
url = "http://0.0.0.0:4000/user/new"
|
||||
headers = {"Authorization": "Bearer sk-1234", "Content-Type": "application/json"}
|
||||
data = {
|
||||
"models": ["gpt-4", "text-embedding-ada-002", "dall-e-2"],
|
||||
"models": ["gpt-4", "text-embedding-ada-002", "gpt-image-1"],
|
||||
"duration": None,
|
||||
}
|
||||
|
||||
|
|
@ -264,7 +264,7 @@ async def image_generation(session, key):
|
|||
"Content-Type": "application/json",
|
||||
}
|
||||
data = {
|
||||
"model": "dall-e-2",
|
||||
"model": "gpt-image-1",
|
||||
"prompt": "A cute baby sea otter",
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue