From 63fe24dc251c9bb11a09aa077bdcf05c68a8ff14 Mon Sep 17 00:00:00 2001
From: Li Jiang <bnujli@gmail.com>
Date: Wed, 18 Dec 2024 03:14:28 +0800
Subject: [PATCH 1/2] Avoid httpx breaking change (#4736)
Pin httpx version to avoid a breaking change in version 0.28
---
notebook/agentchat_microsoft_fabric.ipynb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/notebook/agentchat_microsoft_fabric.ipynb b/notebook/agentchat_microsoft_fabric.ipynb
index 225000146786..407a882b7f87 100644
--- a/notebook/agentchat_microsoft_fabric.ipynb
+++ b/notebook/agentchat_microsoft_fabric.ipynb
@@ -226,7 +226,7 @@
"outputs": [],
"source": [
"# autogen-agentchat>0.1.14 supports openai>=1\n",
- "%pip install \"autogen-agentchat~=0.2\" \"openai>1\" -q"
+ "%pip install \"autogen-agentchat~=0.2\" \"openai>1\" \"httpx==0.27.2\" -q"
]
},
{
From 960fbf057150a1b26f51f7dd8f5db0e930a15944 Mon Sep 17 00:00:00 2001
From: Henry Tu <henry.tu@cerebras.net>
Date: Tue, 17 Dec 2024 18:41:11 -0500
Subject: [PATCH 2/2] Replace Cerebras Llama 3.1 70b with Llama 3.3 70b (#4743)
---
autogen/oai/cerebras.py | 2 +-
test/oai/test_cerebras.py | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/autogen/oai/cerebras.py b/autogen/oai/cerebras.py
index e87b048e1366..3d619167c170 100644
--- a/autogen/oai/cerebras.py
+++ b/autogen/oai/cerebras.py
@@ -35,7 +35,7 @@
CEREBRAS_PRICING_1K = {
# Convert pricing per million to per thousand tokens.
"llama3.1-8b": (0.10 / 1000, 0.10 / 1000),
- "llama3.1-70b": (0.60 / 1000, 0.60 / 1000),
+ "llama-3.3-70b": (0.85 / 1000, 1.20 / 1000),
}
diff --git a/test/oai/test_cerebras.py b/test/oai/test_cerebras.py
index 7f84ae3f9d56..3abdafcd21aa 100644
--- a/test/oai/test_cerebras.py
+++ b/test/oai/test_cerebras.py
@@ -136,7 +136,7 @@ def test_cost_calculation(mock_response):
choices=[{"message": "Test message 1"}],
usage={"prompt_tokens": 500, "completion_tokens": 300, "total_tokens": 800},
cost=None,
- model="llama3.1-70b",
+ model="llama-3.3-70b",
)
calculated_cost = calculate_cerebras_cost(
response.usage["prompt_tokens"], response.usage["completion_tokens"], response.model
@@ -160,7 +160,7 @@ def test_create_response(mock_chat, cerebras_client):
MagicMock(finish_reason="stop", message=MagicMock(content="Example Cerebras response", tool_calls=None))
]
mock_cerebras_response.id = "mock_cerebras_response_id"
- mock_cerebras_response.model = "llama3.1-70b"
+ mock_cerebras_response.model = "llama-3.3-70b"
mock_cerebras_response.usage = MagicMock(prompt_tokens=10, completion_tokens=20) # Example token usage
mock_chat.return_value = mock_cerebras_response
@@ -168,7 +168,7 @@ def test_create_response(mock_chat, cerebras_client):
# Test parameters
params = {
"messages": [{"role": "user", "content": "Hello"}, {"role": "assistant", "content": "World"}],
- "model": "llama3.1-70b",
+ "model": "llama-3.3-70b",
}
# Call the create method
@@ -179,7 +179,7 @@ def test_create_response(mock_chat, cerebras_client):
response.choices[0].message.content == "Example Cerebras response"
), "Response content should match expected output"
assert response.id == "mock_cerebras_response_id", "Response ID should match the mocked response ID"
- assert response.model == "llama3.1-70b", "Response model should match the mocked response model"
+ assert response.model == "llama-3.3-70b", "Response model should match the mocked response model"
assert response.usage.prompt_tokens == 10, "Response prompt tokens should match the mocked response usage"
assert response.usage.completion_tokens == 20, "Response completion tokens should match the mocked response usage"
@@ -211,7 +211,7 @@ def test_create_response_with_tool_call(mock_chat, cerebras_client):
)
],
id="mock_cerebras_response_id",
- model="llama3.1-70b",
+ model="llama-3.3-70b",
usage=MagicMock(prompt_tokens=10, completion_tokens=20),
)
@@ -239,7 +239,7 @@ def test_create_response_with_tool_call(mock_chat, cerebras_client):
# Call the create method
response = cerebras_client.create(
- {"messages": cerebras_messages, "tools": converted_functions, "model": "llama3.1-70b"}
+ {"messages": cerebras_messages, "tools": converted_functions, "model": "llama-3.3-70b"}
)
# Assertions to check if the functions and content are included in the response