Merge remote-tracking branch 'origin/main' into polish-suppress-in-tests

test/agentchat/test_conversable_agent.py

@@ -23,7 +23,12 @@
 from autogen.agentchat.conversable_agent import register_function
 from autogen.exception_utils import InvalidCarryOverType, SenderRequired
 
-from ..conftest import Credentials, credentials_all_llms, suppress_gemini_resource_exhausted
+from ..conftest import (
+    Credentials,
+    credentials_all_llms,
+    suppress_gemini_resource_exhausted,
+    suppress_json_decoder_error,
+)
 
 here = os.path.abspath(os.path.dirname(__file__))
 
@@ -1614,6 +1619,7 @@ def login(
 
 
 @pytest.mark.deepseek
+@suppress_json_decoder_error
 def test_conversable_agent_with_deepseek_reasoner(
     credentials_deepseek_reasoner: Credentials,
 ) -> None:

test/agentchat/test_groupchat.py

@@ -22,7 +22,7 @@
 from autogen.agentchat.contrib.capabilities import transform_messages, transforms
 from autogen.exception_utils import AgentNameConflict, UndefinedNextAgent
 
-from ..conftest import Credentials
+from ..conftest import Credentials, suppress_json_decoder_error
 
 
 def test_func_call_groupchat():
@@ -2183,6 +2183,7 @@ def test_manager_resume_message_assignment():
 
 
 @pytest.mark.deepseek
+@suppress_json_decoder_error
 def test_groupchat_with_deepseek_reasoner(
     credentials_gpt_4o_mini: Credentials,
     credentials_deepseek_reasoner: Credentials,

test/conftest.py

@@ -10,6 +10,7 @@
 import os
 import re
 import time
+from json.decoder import JSONDecodeError
 from pathlib import Path
 from typing import Any, Callable, Optional, TypeVar
 
@@ -479,3 +480,7 @@ def suppress_gemini_resource_exhausted(func: T) -> T:
         return suppress(ResourceExhausted, retries=2)(func)
 
     return func
+
+
+def suppress_json_decoder_error(func: T) -> T:
+    return suppress(JSONDecodeError)(func)