Merge branch 'main' into patch-1

Author: auvipy

.coveragerc

@@ -9,7 +9,7 @@ omit =
     */python?.?/*
     */site-packages/*
     */pypy/*
-    *kombu/async/http/urllib3_client.py
+    *kombu/async/http/curl.py
     *kombu/five.py
     *kombu/transport/mongodb.py
     *kombu/transport/filesystem.py

.github/workflows/linter.yml

@@ -20,7 +20,7 @@ jobs:
         python-version: ["3.13"]
     steps:
       - name: Install system packages
-        run: sudo apt-get update && sudo apt-get install libssl-dev
+        run: sudo apt-get update && sudo apt-get install libcurl4-openssl-dev libssl-dev
       - name: Check out code from GitHub
         uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}

.github/workflows/python-package.yml

@@ -39,7 +39,7 @@ jobs:
     steps:
     - name: Install apt packages
       if: startsWith(matrix.os, 'blacksmith-4vcpu-ubuntu')
-      run: sudo apt-get update && sudo apt-get install libssl-dev
+      run: sudo apt-get update && sudo apt-get install libcurl4-openssl-dev libssl-dev
     - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
       uses: useblacksmith/setup-python@v6
@@ -104,7 +104,7 @@ jobs:
 
       steps:
           -   name: Install apt packages
-              run: sudo apt-get update && sudo apt-get install libssl-dev
+              run: sudo apt-get update && sudo apt-get install libcurl4-openssl-dev libssl-dev
 
           -   uses: actions/checkout@v4
           -   name: Set up Python ${{ matrix.python-version }}

.gitignore

@@ -39,3 +39,5 @@ env
 .coverage.*
 control/
 .env
+.hypothesis/*
+junit.xml

AUTHORS

@@ -7,6 +7,7 @@ Adam Gaca <[email protected]>
 Adam Nelson <[email protected]>
 Adam Wentz
 Alan Justino <[email protected]>
+Alex Jones
 Alex Koshelev <[email protected]>
 Alexandre Bourget <[email protected]>
 Anastasis Andronidis <[email protected]>

docs/reference/index.rst

@@ -71,7 +71,7 @@ Kombu Asynchronous
     kombu.asynchronous.debug
     kombu.asynchronous.http
     kombu.asynchronous.http.base
-    kombu.asynchronous.http.urllib3_client
+    kombu.asynchronous.http.curl
     kombu.asynchronous.aws
     kombu.asynchronous.aws.connection
     kombu.asynchronous.aws.sqs

docs/reference/kombu.asynchronous.http.urllib3_client.rst

@@ -7,7 +7,7 @@
 
 from vine import promise, transform
 
-from kombu.asynchronous.aws.ext import AWSRequest, get_cert_path, get_response
+from kombu.asynchronous.aws.ext import AWSRequest, get_response
 from kombu.asynchronous.http import Headers, Request, get_client
 
 
@@ -92,8 +92,7 @@ def getrequest(self):
         headers = Headers(self.headers)
         return self.Request(self.path, method=self.method, headers=headers,
                             body=self.body, connect_timeout=self.timeout,
-                            request_timeout=self.timeout,
-                            validate_cert=True, ca_certs=get_cert_path(True))
+                            request_timeout=self.timeout, validate_cert=False)
 
     def getresponse(self, callback=None):
         request = self.getrequest()

kombu/asynchronous/aws/connection.py

@@ -6,7 +6,6 @@
     import boto3
     from botocore import exceptions
     from botocore.awsrequest import AWSRequest
-    from botocore.httpsession import get_cert_path
     from botocore.response import get_response
 except ImportError:
     boto3 = None
@@ -20,9 +19,8 @@ class BotoCoreError(Exception):
     exceptions.BotoCoreError = BotoCoreError
     AWSRequest = _void()
     get_response = _void()
-    get_cert_path = _void()
 
 
 __all__ = (
-    'exceptions', 'AWSRequest', 'get_response', 'get_cert_path',
+    'exceptions', 'AWSRequest', 'get_response'
 )

kombu/asynchronous/aws/ext.py

@@ -20,17 +20,28 @@
 class AsyncSQSConnection(AsyncAWSQueryConnection):
     """Async SQS Connection."""
 
-    def __init__(self, sqs_connection, debug=0, region=None, fetch_message_attributes=None, **kwargs):
+    def __init__(
+        self,
+        sqs_connection,
+        debug=0,
+        region=None,
+        message_system_attribute_names=None,
+        message_attribute_names=None,
+        **kwargs
+    ):
         if boto3 is None:
             raise ImportError('boto3 is not installed')
         super().__init__(
             sqs_connection,
             region_name=region, debug=debug,
             **kwargs
         )
-        self.fetch_message_attributes = (
-            fetch_message_attributes if fetch_message_attributes is not None
-            else ["ApproximateReceiveCount"]
+        self.message_system_attribute_names = (
+            message_system_attribute_names if message_system_attribute_names else ["ApproximateReceiveCount"]
+        )
+        self.message_attribute_names = (
+            [message_attribute_names] if isinstance(message_attribute_names, str)
+            else (message_attribute_names or [])
         )
 
     def _create_query_request(self, operation, params, queue_url, method):
@@ -160,13 +171,17 @@ def receive_message(
     ):
         params = {'MaxNumberOfMessages': number_messages}
         proto_params = {'query': {}, 'json': {}}
-        attrs = attributes if attributes is not None else self.fetch_message_attributes
+        attrs = attributes if attributes is not None else self.message_system_attribute_names
+        msg_attr_names = self.message_attribute_names if self.message_attribute_names else None
 
         if visibility_timeout:
             params['VisibilityTimeout'] = visibility_timeout
         if attrs:
-            proto_params['json'].update({'AttributeNames': list(attrs)})
-            proto_params['query'].update(_query_object_encode({'AttributeName': list(attrs)}))
+            proto_params['json'].update({'MessageSystemAttributeNames': list(attrs)})
+            proto_params['query'].update(_query_object_encode({'MessageSystemAttributeName': list(attrs)}))
+        if msg_attr_names:
+            proto_params['json'].update({'MessageAttributeNames': list(msg_attr_names)})
+            proto_params['query'].update(_query_object_encode({'MessageAttributeNames': list(msg_attr_names)}))
         if wait_time_seconds is not None:
             params['WaitTimeSeconds'] = wait_time_seconds
 

kombu/asynchronous/aws/sqs/connection.py

@@ -1,19 +1,24 @@
 from __future__ import annotations
 
+from typing import TYPE_CHECKING
+
 from kombu.asynchronous import get_event_loop
-from kombu.asynchronous.http.base import BaseClient, Headers, Request, Response
+from kombu.asynchronous.http.base import Headers, Request, Response
 from kombu.asynchronous.hub import Hub
 
-__all__ = ('Client', 'Headers', 'Response', 'Request', 'get_client')
+if TYPE_CHECKING:
+    from kombu.asynchronous.http.curl import CurlClient
+
+__all__ = ('Client', 'Headers', 'Response', 'Request')
 
 
-def Client(hub: Hub | None = None, **kwargs: int) -> BaseClient:
+def Client(hub: Hub | None = None, **kwargs: int) -> CurlClient:
     """Create new HTTP client."""
-    from .urllib3_client import Urllib3Client
-    return Urllib3Client(hub, **kwargs)
+    from .curl import CurlClient
+    return CurlClient(hub, **kwargs)
 
 
-def get_client(hub: Hub | None = None, **kwargs: int) -> BaseClient:
+def get_client(hub: Hub | None = None, **kwargs: int) -> CurlClient:
     """Get or create HTTP client bound to the current event loop."""
     hub = hub or get_event_loop()
     try:

kombu/asynchronous/http/__init__.py

@@ -16,7 +16,7 @@
 if TYPE_CHECKING:
     from types import TracebackType
 
-__all__ = ('Headers', 'Response', 'Request', 'BaseClient')
+__all__ = ('Headers', 'Response', 'Request')
 
 PYPY = hasattr(sys, 'pypy_version_info')
 
@@ -236,12 +236,6 @@ def header_parser(keyt=normalize_header):
 
 
 class BaseClient:
-    """Base class for HTTP clients.
-
-    This class provides the basic structure and functionality for HTTP clients.
-    Subclasses should implement specific HTTP client behavior.
-    """
-
     Headers = Headers
     Request = Request
     Response = Response