Add explicit parameters for AIOHttpConnection and AsyncTransport

elasticsearch/_async/http_aiohttp.py

@@ -77,6 +77,8 @@ def __init__(
         self,
         host="localhost",
         port=None,
+        url_prefix="",
+        timeout=10,
         http_auth=None,
         use_ssl=False,
         verify_certs=VERIFY_CERTS_DEFAULT,
@@ -138,6 +140,8 @@ def __init__(
         super().__init__(
             host=host,
             port=port,
+            url_prefix=url_prefix,
+            timeout=timeout,
             use_ssl=use_ssl,
             headers=headers,
             http_compress=http_compress,

elasticsearch/_async/http_aiohttp.pyi

@@ -41,6 +41,8 @@ class AIOHttpConnection(AsyncConnection):
         self,
         host: str = ...,
         port: Optional[int] = ...,
+        url_prefix: str = ...,
+        timeout: int = ...,
         http_auth: Optional[Any] = ...,
         use_ssl: bool = ...,
         verify_certs: bool = ...,

elasticsearch/_async/transport.py

@@ -20,14 +20,16 @@
 import sys
 from itertools import chain
 
+from ..connection_pool import ConnectionPool
 from ..exceptions import (
     ConnectionError,
     ConnectionTimeout,
     SerializationError,
     TransportError,
     UnsupportedProductError,
 )
-from ..transport import Transport
+from ..serializer import JSONSerializer
+from ..transport import Transport, get_host_info
 from .compat import get_running_loop
 from .http_aiohttp import AIOHttpConnection
 
@@ -44,7 +46,26 @@ class AsyncTransport(Transport):
 
     DEFAULT_CONNECTION_CLASS = AIOHttpConnection
 
-    def __init__(self, hosts, *args, sniff_on_start=False, **kwargs):
+    def __init__(
+        self,
+        hosts,
+        connection_class=None,
+        connection_pool_class=ConnectionPool,
+        host_info_callback=get_host_info,
+        sniff_on_start=False,
+        sniffer_timeout=None,
+        sniff_timeout=0.1,
+        sniff_on_connection_fail=False,
+        serializer=JSONSerializer(),
+        serializers=None,
+        default_mimetype="application/json",
+        max_retries=3,
+        retry_on_status=(502, 503, 504),
+        retry_on_timeout=False,
+        send_get_body_as="GET",
+        meta_header=True,
+        **kwargs
+    ):
         """
         :arg hosts: list of dictionaries, each containing keyword arguments to
             create a `connection_class` instance
@@ -77,6 +98,8 @@ def __init__(self, hosts, *args, sniff_on_start=False, **kwargs):
             don't support passing bodies with GET requests. If you set this to
             'POST' a POST method will be used instead, if to 'source' then the body
             will be serialized and passed as a query parameter `source`.
+        :arg meta_header: If True will send the 'X-Elastic-Client-Meta' HTTP header containing
+            simple client metadata. Setting to False will disable the header. Defaults to True.
 
         Any extra keyword arguments will be passed to the `connection_class`
         when creating and instance unless overridden by that connection's
@@ -88,7 +111,23 @@ def __init__(self, hosts, *args, sniff_on_start=False, **kwargs):
         self._sniff_on_start_event = None  # type: asyncio.Event
 
         super(AsyncTransport, self).__init__(
-            *args, hosts=[], sniff_on_start=False, **kwargs
+            hosts=[],
+            connection_class=connection_class,
+            connection_pool_class=connection_pool_class,
+            host_info_callback=host_info_callback,
+            sniff_on_start=False,
+            sniffer_timeout=sniffer_timeout,
+            sniff_timeout=sniff_timeout,
+            sniff_on_connection_fail=sniff_on_connection_fail,
+            serializer=serializer,
+            serializers=serializers,
+            default_mimetype=default_mimetype,
+            max_retries=max_retries,
+            retry_on_status=retry_on_status,
+            retry_on_timeout=retry_on_timeout,
+            send_get_body_as=send_get_body_as,
+            meta_header=meta_header,
+            **kwargs,
         )
 
         # Don't enable sniffing on Cloud instances.

elasticsearch/_async/transport.pyi

@@ -63,6 +63,7 @@ class AsyncTransport(object):
         retry_on_status: Collection[int] = ...,
         retry_on_timeout: bool = ...,
         send_get_body_as: str = ...,
+        meta_header: bool = ...,
         **kwargs: Any
     ) -> None: ...
     def add_connection(self, host: Any) -> None: ...