Merge remote-tracking branch 'origin/main' into swarmhandoffv2

ag2ai · Dec 17, 2024 · 06efb38 · 06efb38
2 parents 1786c54 + 2d996c0
commit 06efb38
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/setup.py b/setup.py
@@ -91,7 +91,7 @@
         "pre-commit",
         "pytest-cov>=5",
         "pytest-asyncio",
-        "pytest>=6.1.1,<8",
+        "pytest>=8,<9",
         "pandas",
     ],
     "blendsearch": ["flaml[blendsearch]"],

diff --git a/test/agentchat/contrib/capabilities/test_image_generation_capability.py b/test/agentchat/contrib/capabilities/test_image_generation_capability.py
@@ -34,11 +34,11 @@
 
 filter_dict = {"model": ["gpt-4o-mini"]}
 
-RESOLUTIONS = ["256x256", "512x512", "1024x1024"]
+RESOLUTIONS = ["1024x1024", "1792x1024", "1024x1792"]
 QUALITIES = ["standard", "hd"]
 PROMPTS = [
-    "Generate an image of a robot holding a 'I Love Autogen' sign",
-    "Generate an image of a dog holding a 'I Love Autogen' sign",
+    "Generate an image of a robot holding a 'I Love AG2' sign",
+    "Generate an image of a dog holding a 'I Love AG2' sign",
 ]
 
 
@@ -228,5 +228,5 @@ def test_image_generation_capability_cache(monkeypatch):
 
 if __name__ == "__main__":
     test_dalle_image_generator(
-        dalle_config={"config_list": openai_utils.config_list_from_models(model_list=["dall-e-2"], exclude="aoai")}
+        dalle_config={"config_list": openai_utils.config_list_from_models(model_list=["dall-e-3"], exclude="aoai")}
     )
diff --git a/test/test_browser_utils.py b/test/test_browser_utils.py
@@ -156,7 +156,7 @@ def test_simple_text_browser():
 
 
 @pytest.mark.skipif(
-    skip_bing,
+    skip_all or skip_bing,
     reason="do not run bing tests if key is missing",
 )
 def test_bing_search():

diff --git a/website/docs/topics/swarm.ipynb b/website/docs/topics/swarm.ipynb
@@ -48,7 +48,7 @@
     "    return agent_2\n",
     "\n",
     "def transfer_to_agent_3():\n",
-    "    \"\"\"condition_1\"\"\"\n",
+    "    \"\"\"condition_2\"\"\"\n",
     "    return agent_3\n",
     "    \n",
     "agent_1 = SwarmAgent(..., functions=[transfer_to_agent_2, transfer_to_agent_3])\n",