diff --git a/proxy_server_config.yaml b/proxy_server_config.yaml index 5d3d810926a..d9838c852a2 100644 --- a/proxy_server_config.yaml +++ b/proxy_server_config.yaml @@ -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 diff --git a/tests/image_gen_tests/test_image_edits.py b/tests/image_gen_tests/test_image_edits.py index dcb04c597e2..6900bacdb90 100644 --- a/tests/image_gen_tests/test_image_edits.py +++ b/tests/image_gen_tests/test_image_edits.py @@ -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. diff --git a/tests/image_gen_tests/test_image_generation.py b/tests/image_gen_tests/test_image_generation.py index 5152e3e0129..873777189c9 100644 --- a/tests/image_gen_tests/test_image_generation.py +++ b/tests/image_gen_tests/test_image_generation.py @@ -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"} diff --git a/tests/local_testing/test_custom_callback_input.py b/tests/local_testing/test_custom_callback_input.py index 15a2975becc..545039e60ba 100644 --- a/tests/local_testing/test_custom_callback_input.py +++ b/tests/local_testing/test_custom_callback_input.py @@ -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: diff --git a/tests/local_testing/test_router.py b/tests/local_testing/test_router.py index f7885fb8a03..d6b239c79cc 100644 --- a/tests/local_testing/test_router.py +++ b/tests/local_testing/test_router.py @@ -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 diff --git a/tests/otel_tests/test_otel.py b/tests/otel_tests/test_otel.py index a0f58dd5b85..9ded859eb9d 100644 --- a/tests/otel_tests/test_otel.py +++ b/tests/otel_tests/test_otel.py @@ -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", ], diff --git a/tests/test_health.py b/tests/test_health.py index 15dc2330ffb..cc551fd9380 100644 --- a/tests/test_health.py +++ b/tests/test_health.py @@ -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, } diff --git a/tests/test_keys.py b/tests/test_keys.py index 6d4c24aa80d..e6bda59c2cc 100644 --- a/tests/test_keys.py +++ b/tests/test_keys.py @@ -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}", diff --git a/tests/test_openai_endpoints.py b/tests/test_openai_endpoints.py index 8a3f9361ba1..e898b88a556 100644 --- a/tests/test_openai_endpoints.py +++ b/tests/test_openai_endpoints.py @@ -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", }