Bump botocore dependency specification (#1348)

Author: jakob-keller

CHANGES.rst

@@ -7,6 +7,7 @@ Changes
 * patch ``AioEndpoint.__init__()``
 * patch ``EventStream._parse_event()``, ``ResponseParser`` and subclasses
 * use SPDX license identifier for project metadata
+* bump botocore dependency specification
 
 2.21.1 (2025-03-04)
 ^^^^^^^^^^^^^^^^^^^

aiobotocore/parsers.py

@@ -1,10 +1,13 @@
 from botocore.parsers import (
     LOG,
+    BaseCBORParser,
     BaseEventStreamParser,
     BaseJSONParser,
     BaseRestParser,
+    BaseRpcV2Parser,
     BaseXMLResponseParser,
     EC2QueryParser,
+    EventStreamCBORParser,
     EventStreamJSONParser,
     EventStreamXMLParser,
     JSONParser,
@@ -15,6 +18,7 @@
     ResponseParserFactory,
     RestJSONParser,
     RestXMLParser,
+    RpcV2CBORParser,
     lowercase_dict,
 )
 
@@ -88,6 +92,10 @@ class AioBaseJSONParser(BaseJSONParser, AioResponseParser):
     pass
 
 
+class AioBaseCBORParser(BaseCBORParser, AioResponseParser):
+    pass
+
+
 class AioBaseEventStreamParser(BaseEventStreamParser, AioResponseParser):
     pass
 
@@ -104,6 +112,12 @@ class AioEventStreamXMLParser(
     pass
 
 
+class AioEventStreamCBORParser(
+    EventStreamCBORParser, AioBaseEventStreamParser, AioBaseCBORParser
+):
+    pass
+
+
 class AioJSONParser(JSONParser, AioBaseJSONParser):
     EVENT_STREAM_PARSER_CLS = AioEventStreamJSONParser
 
@@ -137,10 +151,46 @@ class AioBaseRestParser(BaseRestParser, AioResponseParser):
     pass
 
 
+class AioBaseRpcV2Parser(BaseRpcV2Parser, AioResponseParser):
+    async def _do_parse(self, response, shape):
+        parsed = {}
+        if shape is not None:
+            event_stream_name = shape.event_stream_name
+            if event_stream_name:
+                parsed = await self._handle_event_stream(
+                    response, shape, event_stream_name
+                )
+            else:
+                parsed = {}
+                self._parse_payload(response, shape, parsed)
+            parsed['ResponseMetadata'] = self._populate_response_metadata(
+                response
+            )
+        return parsed
+
+
 class AioRestJSONParser(RestJSONParser, AioBaseRestParser, AioBaseJSONParser):
     EVENT_STREAM_PARSER_CLS = AioEventStreamJSONParser
 
 
+class AioRpcV2CBORParser(
+    RpcV2CBORParser, AioBaseRpcV2Parser, AioBaseCBORParser
+):
+    EVENT_STREAM_PARSER_CLS = AioEventStreamCBORParser
+
+    async def _handle_event_stream(self, response, shape, event_name):
+        event_stream_shape = shape.members[event_name]
+        event_stream = self._create_event_stream(response, event_stream_shape)
+        try:
+            event = await event_stream.get_initial_response()
+        except NoInitialResponseError:
+            error_msg = 'First event was not of type initial-response'
+            raise ResponseParserError(error_msg)
+        parsed = self._initial_body_parse(event.payload)
+        parsed[event_name] = event_stream
+        return parsed
+
+
 class AioRestXMLParser(
     RestXMLParser, AioBaseRestParser, AioBaseXMLResponseParser
 ):
@@ -153,4 +203,5 @@ class AioRestXMLParser(
     'json': AioJSONParser,
     'rest-json': AioRestJSONParser,
     'rest-xml': AioRestXMLParser,
+    'smithy-rpc-v2-cbor': AioRpcV2CBORParser,
 }

pyproject.toml

@@ -32,7 +32,7 @@ dynamic = ["version", "readme"]
 dependencies = [
     "aiohttp >= 3.9.2, < 4.0.0",
     "aioitertools >= 0.5.1, < 1.0.0",
-    "botocore >= 1.37.0, < 1.37.2", # NOTE: When updating, always keep `project.optional-dependencies` aligned
+    "botocore >= 1.37.2, < 1.37.4", # NOTE: When updating, always keep `project.optional-dependencies` aligned
     "python-dateutil >= 2.1, < 3.0.0",
     "jmespath >= 0.7.1, < 2.0.0",
     "multidict >= 6.0.0, < 7.0.0",
@@ -41,10 +41,10 @@ dependencies = [
 
 [project.optional-dependencies]
 awscli = [
-    "awscli >= 1.38.0, < 1.38.2",
+    "awscli >= 1.38.2, < 1.38.4",
 ]
 boto3 = [
-    "boto3 >= 1.37.0, < 1.37.2",
+    "boto3 >= 1.37.2, < 1.37.4",
 ]
 
 [project.urls]

tests/test_patches.py

@@ -62,13 +62,15 @@
 from botocore.paginate import PageIterator, ResultKeyIterator
 from botocore.parsers import (
     PROTOCOL_PARSERS,
+    BaseRpcV2Parser,
     EC2QueryParser,
     JSONParser,
     QueryParser,
     ResponseParser,
     ResponseParserFactory,
     RestJSONParser,
     RestXMLParser,
+    RpcV2CBORParser,
     create_parser,
 )
 from botocore.regions import EndpointRulesetResolver
@@ -139,7 +141,14 @@
 # REPLACE = backwards incompatible change
 # APPEND = officially supporting more versions of botocore/aiohttp
 
-_PROTOCOL_PARSER_CONTENT = {'ec2', 'query', 'json', 'rest-json', 'rest-xml'}
+_PROTOCOL_PARSER_CONTENT = {
+    'ec2',
+    'query',
+    'json',
+    'rest-json',
+    'rest-xml',
+    'smithy-rpc-v2-cbor',
+}
 
 
 def test_protocol_parsers():
@@ -839,12 +848,30 @@ def test_protocol_parsers():
                 '3cf7bb1ecff0d72bafd7e7fd6625595b4060abd6',
             },
         ),
+        (
+            BaseRpcV2Parser._do_parse,
+            {
+                'e2d884a116d830f57c5ca41f315d3baac49372eb',
+            },
+        ),
         (
             RestJSONParser._create_event_stream,
             {
                 '0564ba55383a71cc1ba3e5be7110549d7e9992f5',
             },
         ),
+        (
+            RpcV2CBORParser.EVENT_STREAM_PARSER_CLS,
+            {
+                '10c1f773f07e22929ecac791729c1a30a4091bd3',
+            },
+        ),
+        (
+            RpcV2CBORParser._handle_event_stream,
+            {
+                '2aa007aaca55b37c7e327b7ef8c86237f19690cc',
+            },
+        ),
         (
             create_parser,
             {