🐫 CAMEL: The first and the best multi-agent framework. Finding the Scaling Law of Agents. https://www.camel-ai.org
Python agentai-societiesartificial-intelligencecommunicative-aicooperative-aideep-learninglarge-language-modelsmulti-agent-systemsnatural-language-processing
Async support for aws bedwork converse api (#3922)
Xiangyu Shif29f312b56b8
diff --git a/camel/models/aws_bedrock_converse_model.py b/camel/models/aws_bedrock_converse_model.pyindex 6d40cb3ce..3307d0eb8 100644--- a/camel/models/aws_bedrock_converse_model.py+++ b/camel/models/aws_bedrock_converse_model.py@@ -12,6 +12,7 @@# limitations under the License.# ========= Copyright 2023-2026 @ CAMEL-AI.org. All Rights Reserved. =========+import asyncioimport base64import jsonimport os@@ -20,6 +21,7 @@ import timeimport warningsfrom typing import (Any,+ AsyncGenerator,Dict,Generator,List,@@ -75,6 +77,10 @@ class AWSBedrockConverseModel(BaseModelBackend):key. (default: :obj:`None`)aws_session_token (str, optional): Temporary session token for STScredentials. (default: :obj:`None`)+ url (str, optional): Custom endpoint URL for the Bedrock+ Runtime service (e.g. VPC endpoint). Falls back to+ the ``BEDROCK_API_BASE_URL`` environment variable.+ (default: :obj:`None`)token_counter (BaseTokenCounter, optional): Token counter to usefor the model. If not provided, :obj:`OpenAITokenCounter(ModelType.GPT_4O_MINI)` will be used.@@ -106,6 +112,7 @@ class AWSBedrockConverseModel(BaseModelBackend):aws_access_key_id: Optional[str] = None,aws_secret_access_key: Optional[str] = None,aws_session_token: Optional[str] = None,+ url: Optional[str] = None,token_counter: Optional[BaseTokenCounter] = None,timeout: Optional[float] = None,max_retries: int = 3,@@ -132,11 +139,13 @@ class AWSBedrockConverseModel(BaseModelBackend):"Must be either '5m' or '1h'.")+ url = url or os.environ.get("BEDROCK_API_BASE_URL") or None+super().__init__(model_type=model_type,model_config_dict=model_config_dict,api_key=api_key,- url=None,+ url=url,token_counter=token_counter,timeout=timeout or float(os.environ.get("MODEL_TIMEOUT", 180)),max_retries=max_retries,@@ -181,6 +190,9 @@ class AWSBedrockConverseModel(BaseModelBackend):# Otherwise: boto3 default credential chain# (env vars, ~/.aws/credentials, instance profile, etc.)+ if self._url:+ client_kwargs["endpoint_url"] = self._url+import boto3self._bedrock_client = boto3.client(@@ -466,10 +478,64 @@ class AWSBedrockConverseModel(BaseModelBackend):return {"tool": tool_choice["tool"]}return None+ @staticmethod+ def _ensure_additional_properties_false(+ schema: Dict[str, Any],+ ) -> Dict[str, Any]:+ """Recursively set ``additionalProperties: false`` on all object+ types in *schema*. AWS Bedrock requires this or it raises a+ ``ValidationException``."""+ if schema.get("type") == "object":+ schema.setdefault("additionalProperties", False)+ for key in ("properties", "$defs", "definitions"):+ container = schema.get(key)+ if isinstance(container, dict):+ for v in container.values():+ if isinstance(v, dict):+ AWSBedrockConverseModel._ensure_additional_properties_false(+ v+ )+ for key in ("allOf", "anyOf", "oneOf"):+ variants = schema.get(key)+ if isinstance(variants, list):+ for v in variants:+ if isinstance(v, dict):+ AWSBedrockConverseModel._ensure_additional_properties_false(+ v+ )+ items = schema.get("items")+ if isinstance(items, dict):+ AWSBedrockConverseModel._ensure_additional_properties_false(items)+ return schema++ @staticmethod+ def _convert_response_format_to_output_config(+ response_format: Type[BaseModel],+ ) -> Dict[str, Any]:+ schema = response_format.model_json_schema()+ AWSBedrockConverseModel._ensure_additional_properties_false(schema)+ return {+ "textFormat": {+ "type": "json_schema",+ "structure": {+ "jsonSchema": {+ "schema": json.dumps(schema, ensure_ascii=False),+ "name": response_format.__name__,+ "description": schema.get(+ "description",+ "Structured output for "+ f"{response_format.__name__}",+ ),+ }+ },+ }+ }+def _build_converse_request(self,messages: List[OpenAIMessage],tools: Optional[List[Dict[str, Any]]] = None,+ response_format: Optional[Type[BaseModel]] = None,) -> Dict[str, Any]:request: Dict[str, Any] = {"modelId": str(self.model_type)}system_blocks, bedrock_messages = (@@ -525,6 +591,11 @@ class AWSBedrockConverseModel(BaseModelBackend):tool_config["toolChoice"] = converted_choicerequest["toolConfig"] = tool_config+ if response_format is not None:+ request["outputConfig"] = (+ self._convert_response_format_to_output_config(response_format)+ )+return request@staticmethod@@ -764,15 +835,11 @@ class AWSBedrockConverseModel(BaseModelBackend):ChatCompletion,Generator[ChatCompletionChunk, None, None],]:- if response_format is not None:- warnings.warn(- "The 'response_format' parameter is not supported by "- "Bedrock Converse and will be ignored.",- UserWarning,- stacklevel=2,- )-- request = self._build_converse_request(messages, tools=tools)+ request = self._build_converse_request(+ messages,+ tools=tools,+ response_format=response_format,+ )if self.model_config_dict.get("stream", False):stream_resp = self.bedrock_client.converse_stream(**request)return self._converse_stream_to_openai_chunks(@@ -783,15 +850,48 @@ class AWSBedrockConverseModel(BaseModelBackend):response=response, model=str(self.model_type))+ async def _arun_stream(+ self,+ request: Dict[str, Any],+ ) -> AsyncGenerator[ChatCompletionChunk, None]:+ stream_resp = await asyncio.to_thread(+ self.bedrock_client.converse_stream, **request+ )+ # boto3 streams are synchronous iterators; collect in a thread+ # then yield asynchronously. True incremental bridging would+ # require a thread-safe queue, which adds complexity for little+ # gain given that the underlying I/O is already synchronous.+ chunks = await asyncio.to_thread(+ lambda: list(+ self._converse_stream_to_openai_chunks(+ stream_obj=stream_resp,+ model=str(self.model_type),+ )+ )+ )+ for chunk in chunks:+ yield chunk+@observe()async def _arun(self,messages: List[OpenAIMessage],response_format: Optional[Type[BaseModel]] = None,tools: Optional[List[Dict[str, Any]]] = None,- ) -> None:- raise NotImplementedError(- "Async inference is not supported for AWSBedrockConverseModel "- "because boto3 Bedrock Runtime client is synchronous. "- "Use `_run` instead."+ ) -> Union[+ ChatCompletion,+ AsyncGenerator[ChatCompletionChunk, None],+ ]:+ request = self._build_converse_request(+ messages,+ tools=tools,+ response_format=response_format,+ )+ if self.model_config_dict.get("stream", False):+ return self._arun_stream(request)+ response = await asyncio.to_thread(+ self.bedrock_client.converse, **request+ )+ return self._convert_converse_to_openai_response(+ response=response, model=str(self.model_type))diff --git a/pyproject.toml b/pyproject.tomlindex 569dd3cb2..6614b6880 100644--- a/pyproject.toml+++ b/pyproject.toml@@ -199,7 +199,7 @@ model_platforms = ["cohere>=5.11.0,<6","fish-audio-sdk>=1.0.0","ibm-watsonx-ai>=1.3.11",- "boto3>=1.35.3,<2",+ "boto3>=1.42.64",]huggingface = ["transformers>=4,<5",@@ -219,7 +219,7 @@ storage = ["redis>=5.0.6,<6","azure-storage-blob>=12.21.0,<13","google-cloud-storage>=2.18.0,<3",- "boto3>=1.35.3,<2",+ "boto3>=1.42.64","mem0ai>=0.1.73","pyobvector>=0.2.22; python_version < '3.13'","weaviate-client>=4.15.0",@@ -318,6 +318,7 @@ eigent = ["httplib2>=0.31.0","av<16","mistralai>=1.1.0,<2",+ "boto3>=1.42.64",]all = ["numpy>=1.2,<=2.2",@@ -398,7 +399,7 @@ all = ["redis>=5.0.6,<6","azure-storage-blob>=12.21.0,<13","google-cloud-storage>=2.18.0,<3",- "boto3>=1.35.3,<2",+ "boto3>=1.42.64","dappier>=0.3.3,<0.4","mypy>=1.5.1,<2","pre-commit>=3,<4",diff --git a/test/models/test_aws_bedrock_converse_model.py b/test/models/test_aws_bedrock_converse_model.pyindex 35e49f184..01b58b89f 100644--- a/test/models/test_aws_bedrock_converse_model.py+++ b/test/models/test_aws_bedrock_converse_model.py@@ -196,10 +196,76 @@ def test_converse_stream_is_supported():@pytest.mark.model_backend@pytest.mark.asyncio-async def test_converse_async_not_supported():- model = _make_model(bedrock_client=object())- with pytest.raises(NotImplementedError):- await model._arun([{"role": "user", "content": "hi"}])+async def test_converse_async_non_stream():+ class DummyClient:+ def converse(self, **kwargs):+ return {+ "output": {+ "message": {+ "role": "assistant",+ "content": [{"text": "hello async"}],+ }+ },+ "stopReason": "end_turn",+ "usage": {+ "inputTokens": 10,+ "outputTokens": 5,+ },+ "ResponseMetadata": {+ "RequestId": "req-async-123",+ },+ }++ model = _make_model(bedrock_client=DummyClient())+ result = await model._arun(+ [{"role": "user", "content": "hi"}],+ )+ assert result.id == "req-async-123"+ assert result.choices[0].message.content == "hello async"+ assert result.usage.prompt_tokens == 10+ assert result.usage.completion_tokens == 5++[email protected]_backend+async def test_converse_async_stream():+ class DummyEventStream:+ def __init__(self, events):+ self._events = events++ def __iter__(self):+ return iter(self._events)++ class DummyClient:+ def converse_stream(self, **kwargs):+ return {+ "stream": DummyEventStream(+ [+ {"messageStart": {"role": "assistant"}},+ {+ "contentBlockDelta": {+ "delta": {"text": "hi async"},+ }+ },+ {+ "messageStop": {+ "stopReason": "end_turn",+ }+ },+ ]+ )+ }++ model = _make_model(+ BedrockConfig(stream=True).as_dict(),+ bedrock_client=DummyClient(),+ )+ result = await model._arun(+ [{"role": "user", "content": "hi"}],+ )+ chunks = [chunk async for chunk in result]+ assert len(chunks) >= 2+ assert chunks[-1].choices[0].finish_reason == "stop"@pytest.mark.model_backenddiff --git a/uv.lock b/uv.lockindex adc5a1909..1bd803233 100644--- a/uv.lock+++ b/uv.lock@@ -761,30 +761,30 @@ wheels = [[[package]]name = "boto3"-version = "1.42.62"+version = "1.42.65"source = { registry = "https://pypi.org/simple" }dependencies = [{ name = "botocore" },{ name = "jmespath" },{ name = "s3transfer" },]-sdist = { url = "https://files.pythonhosted.org/packages/f7/7e/c952803c8900f14e6f6158fddbd35da5afb2e3fa68bf498a761e6ba2c2ae/boto3-1.42.62.tar.gz", hash = "sha256:6b26ff56c458685caec3d42adde0549f6a55410e557e1f51bebde5c8abcf3037", size = 112848, upload-time = "2026-03-05T21:20:37.755Z" }+sdist = { url = "https://files.pythonhosted.org/packages/1e/c9/8ff8a901cf62374f1289cf36391f855e1702c70f545c28d1b57608a84ff2/boto3-1.42.65.tar.gz", hash = "sha256:c740af6bdaebcc1a00f3827a5729050bf6fc820ee148bf7d06f28db11c80e2a1", size = 112805, upload-time = "2026-03-10T19:44:58.255Z" }wheels = [- { url = "https://files.pythonhosted.org/packages/1f/68/b5e82dedd9c8d53a9542df4e3475d2d3ec331eef4a4a801e9c5fa98b583a/boto3-1.42.62-py3-none-any.whl", hash = "sha256:eef0ee08f30e5ed16d8296719808801a827fa0f3126a3e2a9ef9be9eb5e6a313", size = 140556, upload-time = "2026-03-05T21:20:35.354Z" },+ { url = "https://files.pythonhosted.org/packages/46/bb/ace5921655df51e3c9b787b3f0bd6aa25548e5cf1dabae02e53fa88f2d98/boto3-1.42.65-py3-none-any.whl", hash = "sha256:cc7f2e0aec6c68ee5b10232cf3e01326acf6100bc785a770385b61a0474b31f4", size = 140556, upload-time = "2026-03-10T19:44:55.433Z" },][[package]]name = "botocore"-version = "1.42.62"+version = "1.42.65"source = { registry = "https://pypi.org/simple" }dependencies = [{ name = "jmespath" },{ name = "python-dateutil" },{ name = "urllib3" },]-sdist = { url = "https://files.pythonhosted.org/packages/af/e7/031f2f03f22817f8a8def7ad1caa138979c20ac35062b055274e0a505c3f/botocore-1.42.62.tar.gz", hash = "sha256:c210dc93b0b81bf72cfe745a7b1c8df765d04bd90b4ac6c8707fbb6714141dae", size = 14966114, upload-time = "2026-03-05T21:20:25.518Z" }+sdist = { url = "https://files.pythonhosted.org/packages/2e/81/2c832e2117d24da4fe800861e8ddd19bbaa308623b1198eb2c2cc6fcd3d4/botocore-1.42.65.tar.gz", hash = "sha256:7d52c148df07f70c375eeda58f99b439c7c7836c25df74cccfba3bb6e12444d2", size = 14970239, upload-time = "2026-03-10T19:44:43.686Z" }wheels = [- { url = "https://files.pythonhosted.org/packages/8d/57/9bc5c1aad3a354dd7da54ba52d43ee821badb3deedbea4c5117c4bd05eab/botocore-1.42.62-py3-none-any.whl", hash = "sha256:86d327fded96775268ffe8d8bd6ed96c4a1db86cf24eb64ff85233db12dbc287", size = 14638389, upload-time = "2026-03-05T21:20:22.359Z" },+ { url = "https://files.pythonhosted.org/packages/8e/9e/2ca03a55408c0820d7f0a04ae52bc6dfc7e4fff1f007a90135a68e056c93/botocore-1.42.65-py3-none-any.whl", hash = "sha256:0283c332ce00cbd1b894e86b7bed89dd624a5ca3a4ee62ec4db3898d16652e98", size = 14644794, upload-time = "2026-03-10T19:44:37.442Z" },][[package]]@@ -1097,6 +1097,7 @@ earth-science = [eigent = [{ name = "anthropic" },{ name = "av" },+ { name = "boto3" },{ name = "datasets" },{ name = "docx" },{ name = "exa-py" },@@ -1320,9 +1321,10 @@ requires-dist = [{ name = "beautifulsoup4", marker = "extra == 'document-tools'", specifier = ">=4,<5" },{ name = "beautifulsoup4", marker = "extra == 'owl'", specifier = ">=4,<5" },{ name = "beautifulsoup4", marker = "extra == 'web-tools'", specifier = ">=4,<5" },- { name = "boto3", marker = "extra == 'all'", specifier = ">=1.35.3,<2" },- { name = "boto3", marker = "extra == 'model-platforms'", specifier = ">=1.35.3,<2" },- { name = "boto3", marker = "extra == 'storage'", specifier = ">=1.35.3,<2" },+ { name = "boto3", marker = "extra == 'all'", specifier = ">=1.42.64" },+ { name = "boto3", marker = "extra == 'eigent'", specifier = ">=1.42.64" },+ { name = "boto3", marker = "extra == 'model-platforms'", specifier = ">=1.42.64" },+ { name = "boto3", marker = "extra == 'storage'", specifier = ">=1.42.64" },{ name = "chromadb", marker = "extra == 'all'", specifier = ">=0.6.0,<1.0.0" },{ name = "chromadb", marker = "extra == 'rag'", specifier = ">=0.6.0,<1.0.0" },{ name = "chromadb", marker = "extra == 'storage'", specifier = ">=0.6.0,<1.0.0" },@@ -7474,7 +7476,7 @@ name = "pexpect"version = "4.9.0"source = { registry = "https://pypi.org/simple" }dependencies = [- { name = "ptyprocess" },+ { name = "ptyprocess", marker = "sys_platform != 'win32'" },]sdist = { url = "https://files.pythonhosted.org/packages/42/92/cc564bf6381ff43ce1f4d06852fc19a2f11d180f23dc32d9588bee2f149d/pexpect-4.9.0.tar.gz", hash = "sha256:ee7d41123f3c9911050ea2c2dac107568dc43b2d3b0c7557a33212c398ead30f", size = 166450, upload-time = "2023-11-25T09:07:26.339Z" }wheels = [@@ -8469,7 +8471,7 @@ name = "pyobjc-framework-cocoa"version = "12.1"source = { registry = "https://pypi.org/simple" }dependencies = [- { name = "pyobjc-core", marker = "python_full_version >= '3.13' or sys_platform == 'darwin'" },+ { name = "pyobjc-core", marker = "(python_full_version >= '3.13' and sys_platform != 'win32') or sys_platform == 'darwin'" },]sdist = { url = "https://files.pythonhosted.org/packages/02/a3/16ca9a15e77c061a9250afbae2eae26f2e1579eb8ca9462ae2d2c71e1169/pyobjc_framework_cocoa-12.1.tar.gz", hash = "sha256:5556c87db95711b985d5efdaaf01c917ddd41d148b1e52a0c66b1a2e2c5c1640", size = 2772191, upload-time = "2025-11-14T10:13:02.069Z" }wheels = [@@ -8487,8 +8489,8 @@ name = "pyobjc-framework-quartz"version = "12.1"source = { registry = "https://pypi.org/simple" }dependencies = [- { name = "pyobjc-core", marker = "python_full_version >= '3.13' or sys_platform == 'darwin'" },- { name = "pyobjc-framework-cocoa", marker = "python_full_version >= '3.13' or sys_platform == 'darwin'" },+ { name = "pyobjc-core", marker = "(python_full_version >= '3.13' and sys_platform != 'win32') or sys_platform == 'darwin'" },+ { name = "pyobjc-framework-cocoa", marker = "(python_full_version >= '3.13' and sys_platform != 'win32') or sys_platform == 'darwin'" },]sdist = { url = "https://files.pythonhosted.org/packages/94/18/cc59f3d4355c9456fc945eae7fe8797003c4da99212dd531ad1b0de8a0c6/pyobjc_framework_quartz-12.1.tar.gz", hash = "sha256:27f782f3513ac88ec9b6c82d9767eef95a5cf4175ce88a1e5a65875fee799608", size = 3159099, upload-time = "2025-11-14T10:21:24.31Z" }wheels = [