mirror of
https://github.com/BerriAI/litellm.git
synced 2025-12-06 11:33:26 +08:00
fix img URL for tests
This commit is contained in:
2
cookbook/LiteLLM_HuggingFace.ipynb
vendored
2
cookbook/LiteLLM_HuggingFace.ipynb
vendored
@@ -131,7 +131,7 @@
|
||||
" {\n",
|
||||
" \"type\": \"image_url\",\n",
|
||||
" \"image_url\": {\n",
|
||||
" \"url\": \"https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/Gfp-wisconsin-madison-the-nature-boardwalk.jpg/2560px-Gfp-wisconsin-madison-the-nature-boardwalk.jpg\",\n",
|
||||
" \"url\": \"https://awsmp-logos.s3.amazonaws.com/seller-xw5kijmvmzasy/c233c9ade2ccb5491072ae232c814942.png\",\n",
|
||||
" },\n",
|
||||
" },\n",
|
||||
" ],\n",
|
||||
|
||||
@@ -31,7 +31,7 @@ response = completion(
|
||||
{
|
||||
"type": "image_url",
|
||||
"image_url": {
|
||||
"url": "https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/Gfp-wisconsin-madison-the-nature-boardwalk.jpg/2560px-Gfp-wisconsin-madison-the-nature-boardwalk.jpg"
|
||||
"url": "https://awsmp-logos.s3.amazonaws.com/seller-xw5kijmvmzasy/c233c9ade2ccb5491072ae232c814942.png"
|
||||
}
|
||||
}
|
||||
]
|
||||
@@ -92,7 +92,7 @@ response = client.chat.completions.create(
|
||||
{
|
||||
"type": "image_url",
|
||||
"image_url": {
|
||||
"url": "https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/Gfp-wisconsin-madison-the-nature-boardwalk.jpg/2560px-Gfp-wisconsin-madison-the-nature-boardwalk.jpg"
|
||||
"url": "https://awsmp-logos.s3.amazonaws.com/seller-xw5kijmvmzasy/c233c9ade2ccb5491072ae232c814942.png"
|
||||
}
|
||||
}
|
||||
]
|
||||
@@ -230,7 +230,7 @@ response = completion(
|
||||
{
|
||||
"type": "image_url",
|
||||
"image_url": {
|
||||
"url": "https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/Gfp-wisconsin-madison-the-nature-boardwalk.jpg/2560px-Gfp-wisconsin-madison-the-nature-boardwalk.jpg",
|
||||
"url": "https://awsmp-logos.s3.amazonaws.com/seller-xw5kijmvmzasy/c233c9ade2ccb5491072ae232c814942.png",
|
||||
"format": "image/jpeg"
|
||||
}
|
||||
}
|
||||
@@ -292,7 +292,7 @@ response = client.chat.completions.create(
|
||||
{
|
||||
"type": "image_url",
|
||||
"image_url": {
|
||||
"url": "https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/Gfp-wisconsin-madison-the-nature-boardwalk.jpg/2560px-Gfp-wisconsin-madison-the-nature-boardwalk.jpg",
|
||||
"url": "https://awsmp-logos.s3.amazonaws.com/seller-xw5kijmvmzasy/c233c9ade2ccb5491072ae232c814942.png",
|
||||
"format": "image/jpeg"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -251,7 +251,7 @@ response = completion(
|
||||
{
|
||||
"type": "image_url",
|
||||
"image_url": {
|
||||
"url": "https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/Gfp-wisconsin-madison-the-nature-boardwalk.jpg/2560px-Gfp-wisconsin-madison-the-nature-boardwalk.jpg"
|
||||
"url": "https://awsmp-logos.s3.amazonaws.com/seller-xw5kijmvmzasy/c233c9ade2ccb5491072ae232c814942.png"
|
||||
}
|
||||
}
|
||||
]
|
||||
|
||||
@@ -290,7 +290,7 @@ response = completion(
|
||||
{
|
||||
"type": "image_url",
|
||||
"image_url": {
|
||||
"url": "https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/Gfp-wisconsin-madison-the-nature-boardwalk.jpg/2560px-Gfp-wisconsin-madison-the-nature-boardwalk.jpg"
|
||||
"url": "https://awsmp-logos.s3.amazonaws.com/seller-xw5kijmvmzasy/c233c9ade2ccb5491072ae232c814942.png"
|
||||
}
|
||||
}
|
||||
]
|
||||
@@ -342,7 +342,7 @@ response = client.chat.completions.create(
|
||||
{
|
||||
"type": "image_url",
|
||||
"image_url": {
|
||||
"url": "https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/Gfp-wisconsin-madison-the-nature-boardwalk.jpg/2560px-Gfp-wisconsin-madison-the-nature-boardwalk.jpg"
|
||||
"url": "https://awsmp-logos.s3.amazonaws.com/seller-xw5kijmvmzasy/c233c9ade2ccb5491072ae232c814942.png"
|
||||
}
|
||||
}
|
||||
]
|
||||
|
||||
@@ -130,7 +130,7 @@ messages=[
|
||||
{
|
||||
"type": "image_url",
|
||||
"image_url": {
|
||||
"url": "https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/Gfp-wisconsin-madison-the-nature-boardwalk.jpg/2560px-Gfp-wisconsin-madison-the-nature-boardwalk.jpg",
|
||||
"url": "https://awsmp-logos.s3.amazonaws.com/seller-xw5kijmvmzasy/c233c9ade2ccb5491072ae232c814942.png",
|
||||
}
|
||||
},
|
||||
],
|
||||
@@ -250,7 +250,7 @@ messages=[
|
||||
{
|
||||
"type": "image_url",
|
||||
"image_url": {
|
||||
"url": "https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/Gfp-wisconsin-madison-the-nature-boardwalk.jpg/2560px-Gfp-wisconsin-madison-the-nature-boardwalk.jpg",
|
||||
"url": "https://awsmp-logos.s3.amazonaws.com/seller-xw5kijmvmzasy/c233c9ade2ccb5491072ae232c814942.png",
|
||||
}
|
||||
},
|
||||
],
|
||||
|
||||
@@ -252,7 +252,7 @@ response = completion(
|
||||
{
|
||||
"type": "image_url",
|
||||
"image_url": {
|
||||
"url": "https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/Gfp-wisconsin-madison-the-nature-boardwalk.jpg/2560px-Gfp-wisconsin-madison-the-nature-boardwalk.jpg"
|
||||
"url": "https://awsmp-logos.s3.amazonaws.com/seller-xw5kijmvmzasy/c233c9ade2ccb5491072ae232c814942.png"
|
||||
}
|
||||
}
|
||||
]
|
||||
|
||||
@@ -1741,7 +1741,7 @@ response = litellm.completion(
|
||||
{
|
||||
"type": "image_url",
|
||||
"image_url": {
|
||||
"url": "https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/Gfp-wisconsin-madison-the-nature-boardwalk.jpg/2560px-Gfp-wisconsin-madison-the-nature-boardwalk.jpg"
|
||||
"url": "https://awsmp-logos.s3.amazonaws.com/seller-xw5kijmvmzasy/c233c9ade2ccb5491072ae232c814942.png"
|
||||
}
|
||||
}
|
||||
]
|
||||
|
||||
@@ -96,7 +96,7 @@ async def test_aiohttp(urls: list[str], iterations: int = 3) -> list[float]:
|
||||
|
||||
async def run_comparison():
|
||||
urls = [
|
||||
"https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/Gfp-wisconsin-madison-the-nature-boardwalk.jpg/2560px-Gfp-wisconsin-madison-the-nature-boardwalk.jpg"
|
||||
"https://awsmp-logos.s3.amazonaws.com/seller-xw5kijmvmzasy/c233c9ade2ccb5491072ae232c814942.png"
|
||||
] * 150
|
||||
|
||||
print("Testing asyncified version...")
|
||||
|
||||
@@ -854,7 +854,7 @@ class BaseLLMChatTest(ABC):
|
||||
"image_url",
|
||||
[
|
||||
"http://img1.etsystatic.com/260/0/7813604/il_fullxfull.4226713999_q86e.jpg",
|
||||
"https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/Gfp-wisconsin-madison-the-nature-boardwalk.jpg/2560px-Gfp-wisconsin-madison-the-nature-boardwalk.jpg",
|
||||
"https://awsmp-logos.s3.amazonaws.com/seller-xw5kijmvmzasy/c233c9ade2ccb5491072ae232c814942.png",
|
||||
],
|
||||
)
|
||||
@pytest.mark.flaky(retries=4, delay=2)
|
||||
@@ -920,7 +920,7 @@ class BaseLLMChatTest(ABC):
|
||||
os.environ["LITELLM_LOCAL_MODEL_COST_MAP"] = "True"
|
||||
litellm.model_cost = litellm.get_model_cost_map(url="")
|
||||
|
||||
image_url = "https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/Gfp-wisconsin-madison-the-nature-boardwalk.jpg/2560px-Gfp-wisconsin-madison-the-nature-boardwalk.jpg"
|
||||
image_url = "https://awsmp-logos.s3.amazonaws.com/seller-xw5kijmvmzasy/c233c9ade2ccb5491072ae232c814942.png"
|
||||
|
||||
base_completion_call_args = self.get_base_completion_call_args()
|
||||
if not supports_vision(base_completion_call_args["model"], None):
|
||||
|
||||
@@ -2582,7 +2582,7 @@ async def test_bedrock_image_url_sync_client():
|
||||
{
|
||||
"type": "image_url",
|
||||
"image_url": {
|
||||
"url": "https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/Gfp-wisconsin-madison-the-nature-boardwalk.jpg/2560px-Gfp-wisconsin-madison-the-nature-boardwalk.jpg"
|
||||
"url": "https://awsmp-logos.s3.amazonaws.com/seller-xw5kijmvmzasy/c233c9ade2ccb5491072ae232c814942.png"
|
||||
},
|
||||
},
|
||||
],
|
||||
|
||||
@@ -218,7 +218,7 @@ def test_global_disable_flag_with_transform_messages_helper(monkeypatch):
|
||||
{
|
||||
"type": "image_url",
|
||||
"image_url": {
|
||||
"url": "https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/Gfp-wisconsin-madison-the-nature-boardwalk.jpg/2560px-Gfp-wisconsin-madison-the-nature-boardwalk.jpg"
|
||||
"url": "https://awsmp-logos.s3.amazonaws.com/seller-xw5kijmvmzasy/c233c9ade2ccb5491072ae232c814942.png"
|
||||
},
|
||||
},
|
||||
],
|
||||
|
||||
@@ -981,7 +981,7 @@ def test_completion_gpt4_vision():
|
||||
{
|
||||
"type": "image_url",
|
||||
"image_url": {
|
||||
"url": "https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/Gfp-wisconsin-madison-the-nature-boardwalk.jpg/2560px-Gfp-wisconsin-madison-the-nature-boardwalk.jpg"
|
||||
"url": "https://awsmp-logos.s3.amazonaws.com/seller-xw5kijmvmzasy/c233c9ade2ccb5491072ae232c814942.png"
|
||||
},
|
||||
},
|
||||
],
|
||||
|
||||
@@ -829,12 +829,26 @@ def test_fireworks_embeddings():
|
||||
pytest.fail(f"Error occurred: {e}")
|
||||
|
||||
|
||||
def test_watsonx_embeddings():
|
||||
def test_watsonx_embeddings(monkeypatch):
|
||||
from litellm.llms.custom_httpx.http_handler import HTTPHandler
|
||||
|
||||
# Mock the IAM token generation to avoid actual API calls
|
||||
monkeypatch.setenv("WATSONX_API_KEY", "mock-api-key")
|
||||
monkeypatch.setenv("WATSONX_TOKEN", "mock-watsonx-token")
|
||||
monkeypatch.setenv("WATSONX_API_BASE", "https://us-south.ml.cloud.ibm.com")
|
||||
monkeypatch.setenv("WATSONX_PROJECT_ID", "mock-project-id")
|
||||
|
||||
client = HTTPHandler()
|
||||
|
||||
# Track the actual request made
|
||||
captured_request = {}
|
||||
|
||||
def mock_wx_embed_request(url: str, **kwargs):
|
||||
# Capture request details for verification
|
||||
captured_request["url"] = url
|
||||
captured_request["headers"] = kwargs.get("headers", {})
|
||||
captured_request["data"] = kwargs.get("data")
|
||||
|
||||
mock_response = MagicMock()
|
||||
mock_response.status_code = 200
|
||||
mock_response.headers = {"Content-Type": "application/json"}
|
||||
@@ -852,12 +866,16 @@ def test_watsonx_embeddings():
|
||||
response = litellm.embedding(
|
||||
model="watsonx/ibm/slate-30m-english-rtrvr",
|
||||
input=["good morning from litellm"],
|
||||
token="secret-token",
|
||||
client=client,
|
||||
)
|
||||
|
||||
print(f"response: {response}")
|
||||
assert isinstance(response.usage, litellm.Usage)
|
||||
|
||||
# Verify the request was made correctly
|
||||
assert "Authorization" in captured_request["headers"]
|
||||
assert captured_request["headers"]["Authorization"] == "Bearer mock-watsonx-token"
|
||||
assert "us-south.ml.cloud.ibm.com" in captured_request["url"]
|
||||
except litellm.RateLimitError as e:
|
||||
pass
|
||||
except Exception as e:
|
||||
@@ -865,9 +883,15 @@ def test_watsonx_embeddings():
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_watsonx_aembeddings():
|
||||
async def test_watsonx_aembeddings(monkeypatch):
|
||||
from litellm.llms.custom_httpx.http_handler import AsyncHTTPHandler
|
||||
|
||||
# Mock the IAM token generation to avoid actual API calls
|
||||
monkeypatch.setenv("WATSONX_API_KEY", "mock-api-key")
|
||||
monkeypatch.setenv("WATSONX_TOKEN", "mock-watsonx-token")
|
||||
monkeypatch.setenv("WATSONX_API_BASE", "https://us-south.ml.cloud.ibm.com")
|
||||
monkeypatch.setenv("WATSONX_PROJECT_ID", "mock-project-id")
|
||||
|
||||
client = AsyncHTTPHandler()
|
||||
|
||||
def mock_async_client(*args, **kwargs):
|
||||
@@ -897,7 +921,6 @@ async def test_watsonx_aembeddings():
|
||||
response = await litellm.aembedding(
|
||||
model="watsonx/ibm/slate-30m-english-rtrvr",
|
||||
input=["good morning from litellm"],
|
||||
token="secret-token",
|
||||
client=client,
|
||||
)
|
||||
mock_client.assert_called_once()
|
||||
|
||||
@@ -707,11 +707,17 @@ def test_passing_tool_result_as_list(model):
|
||||
@pytest.mark.parametrize("sync_mode", [True, False])
|
||||
@pytest.mark.asyncio
|
||||
@pytest.mark.flaky(retries=6, delay=1)
|
||||
async def test_watsonx_tool_choice(sync_mode):
|
||||
async def test_watsonx_tool_choice(sync_mode, monkeypatch):
|
||||
from litellm.llms.custom_httpx.http_handler import HTTPHandler, AsyncHTTPHandler
|
||||
import json
|
||||
from litellm import acompletion, completion
|
||||
|
||||
# Mock the IAM token generation to avoid actual API calls
|
||||
monkeypatch.setenv("WATSONX_API_KEY", "mock-api-key")
|
||||
monkeypatch.setenv("WATSONX_TOKEN", "mock-watsonx-token")
|
||||
monkeypatch.setenv("WATSONX_API_BASE", "https://us-south.ml.cloud.ibm.com")
|
||||
monkeypatch.setenv("WATSONX_PROJECT_ID", "mock-project-id")
|
||||
|
||||
litellm.set_verbose = True
|
||||
tools = [
|
||||
{
|
||||
@@ -761,7 +767,7 @@ async def test_watsonx_tool_choice(sync_mode):
|
||||
mock_completion.assert_called_once()
|
||||
print(mock_completion.call_args.kwargs)
|
||||
json_data = json.loads(mock_completion.call_args.kwargs["data"])
|
||||
json_data["tool_choice_option"] == "auto"
|
||||
assert json_data["tool_choice_option"] == "auto"
|
||||
except Exception as e:
|
||||
print(e)
|
||||
if "The read operation timed out" in str(e):
|
||||
|
||||
@@ -270,7 +270,7 @@ def test_gpt_vision_token_counting():
|
||||
{"type": "text", "text": "What’s in this image?"},
|
||||
{
|
||||
"type": "image_url",
|
||||
"image_url": "https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/Gfp-wisconsin-madison-the-nature-boardwalk.jpg/2560px-Gfp-wisconsin-madison-the-nature-boardwalk.jpg",
|
||||
"image_url": "https://awsmp-logos.s3.amazonaws.com/seller-xw5kijmvmzasy/c233c9ade2ccb5491072ae232c814942.png",
|
||||
},
|
||||
],
|
||||
}
|
||||
|
||||
@@ -160,7 +160,7 @@ async def test_url_with_format_param(model, sync_mode, monkeypatch):
|
||||
{
|
||||
"type": "image_url",
|
||||
"image_url": {
|
||||
"url": "https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/Gfp-wisconsin-madison-the-nature-boardwalk.jpg/2560px-Gfp-wisconsin-madison-the-nature-boardwalk.jpg",
|
||||
"url": "https://awsmp-logos.s3.amazonaws.com/seller-xw5kijmvmzasy/c233c9ade2ccb5491072ae232c814942.png",
|
||||
"format": "image/png",
|
||||
},
|
||||
},
|
||||
@@ -243,7 +243,7 @@ async def test_url_with_format_param_openai(model, sync_mode):
|
||||
{
|
||||
"type": "image_url",
|
||||
"image_url": {
|
||||
"url": "https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/Gfp-wisconsin-madison-the-nature-boardwalk.jpg/2560px-Gfp-wisconsin-madison-the-nature-boardwalk.jpg",
|
||||
"url": "https://awsmp-logos.s3.amazonaws.com/seller-xw5kijmvmzasy/c233c9ade2ccb5491072ae232c814942.png",
|
||||
"format": "image/png",
|
||||
},
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user