m

Author: Lucas McDonald

DynamoDbEncryption/runtimes/python/src/aws_dbesdk_dynamodb/encrypted/client.py

@@ -633,6 +633,9 @@ def _client_operation_logic(
         if self._expect_standard_dictionaries:
             dbesdk_response = output_item_to_dict_transform_method(dbesdk_response)
 
+        # Clean up the expression builder for the next operation
+        self._resource_shape_to_client_shape_converter.expression_builder.reset()
+
         return dbesdk_response
 
     @property

DynamoDbEncryption/runtimes/python/src/aws_dbesdk_dynamodb/encrypted/paginator.py

@@ -187,6 +187,9 @@ def _paginate_request(
                 dbesdk_response = output_item_to_dict_transform_method(dbesdk_response)
 
             yield dbesdk_response
+        
+        # Clean up the expression builder for the next operation
+        self._resource_shape_to_client_shape_converter.expression_builder.reset()
 
     @property
     def _boto_client_attr_name(self) -> str:

DynamoDbEncryption/runtimes/python/src/aws_dbesdk_dynamodb/encrypted/resource.py

@@ -297,6 +297,9 @@ def _resource_operation_logic(
         #   (e.g. `ConsumedCapacity`)
         dbesdk_response = self._copy_sdk_response_to_dbesdk_response(sdk_output, dbesdk_response)
 
+        # Clean up the expression builder for the next operation
+        self._resource_shape_to_client_shape_converter.expression_builder.reset()
+
         return dbesdk_response
 
     @property

DynamoDbEncryption/runtimes/python/src/aws_dbesdk_dynamodb/encrypted/table.py

@@ -364,6 +364,9 @@ def _table_operation_logic(
         # Copy any missing fields from the SDK output to the response (e.g. `ConsumedCapacity`)
         dbesdk_response = self._copy_sdk_response_to_dbesdk_response(sdk_output, dbesdk_response)
 
+        # Clean up the expression builder for the next operation
+        self._resource_shape_to_client_shape_converter.expression_builder.reset()
+
         return dbesdk_response
 
     @property