Fix lint

Author: pquentin

elasticsearch/_async/client/__init__.py

@@ -451,7 +451,7 @@ def options(
             new_headers.update(resolved_headers)
             client._base_client._headers = new_headers
         else:
-            client._base_client._headers = self._headers.copy()
+            client._base_client._headers = self._base_client._headers.copy()
 
         if request_timeout is not DEFAULT:
             client._base_client._request_timeout = request_timeout

elasticsearch/_async/client/_base.py

@@ -218,6 +218,7 @@ def __init__(self, _transport: AsyncTransport, headers: HttpHeaders) -> None:
         self._ignore_status: Union[DefaultType, Collection[int]] = DEFAULT
         self._max_retries: Union[DefaultType, int] = DEFAULT
         self._retry_on_status: Union[DefaultType, Collection[int]] = DEFAULT
+        self._retry_on_timeout: Union[DefaultType, bool] = DEFAULT
         self._verified_elasticsearch = False
         self._otel = OpenTelemetry()
 

elasticsearch/_async/helpers.py

@@ -216,7 +216,7 @@ async def async_streaming_bulk(
     """
 
     client = client.options()
-    client._client_meta = (("h", "bp"),)
+    client._base_client._client_meta = (("h", "bp"),)
 
     if isinstance(retry_on_status, int):
         retry_on_status = (retry_on_status,)
@@ -429,7 +429,7 @@ def pop_transport_kwargs(kw: MutableMapping[str, Any]) -> MutableMapping[str, An
     client = client.options(
         request_timeout=request_timeout, **pop_transport_kwargs(kwargs)
     )
-    client._client_meta = (("h", "s"),)
+    client._base_client._client_meta = (("h", "s"),)
 
     # Setting query={"from": ...} would make 'from' be used
     # as a keyword argument instead of 'from_'. We handle that here.

elasticsearch/_sync/client/__init__.py

@@ -451,7 +451,7 @@ def options(
             new_headers.update(resolved_headers)
             client._base_client._headers = new_headers
         else:
-            client._base_client._headers = self._headers.copy()
+            client._base_client._headers = self._base_client._headers.copy()
 
         if request_timeout is not DEFAULT:
             client._base_client._request_timeout = request_timeout

elasticsearch/_sync/client/_base.py

@@ -218,6 +218,7 @@ def __init__(self, _transport: Transport, headers: HttpHeaders) -> None:
         self._ignore_status: Union[DefaultType, Collection[int]] = DEFAULT
         self._max_retries: Union[DefaultType, int] = DEFAULT
         self._retry_on_status: Union[DefaultType, Collection[int]] = DEFAULT
+        self._retry_on_timeout: Union[DefaultType, bool] = DEFAULT
         self._verified_elasticsearch = False
         self._otel = OpenTelemetry()
 

elasticsearch/helpers/actions.py

@@ -334,7 +334,7 @@ def _process_bulk_chunk(
     """
     Send a bulk request to elasticsearch and process the output.
     """
-    with client._otel.use_span(otel_span):
+    with client._base_client._otel.use_span(otel_span):
         if isinstance(ignore_status, int):
             ignore_status = (ignore_status,)
 
@@ -416,9 +416,9 @@ def streaming_bulk(
     :arg yield_ok: if set to False will skip successful documents in the output
     :arg ignore_status: list of HTTP status code that you want to ignore
     """
-    with client._otel.helpers_span(span_name) as otel_span:
+    with client._base_client._otel.helpers_span(span_name) as otel_span:
         client = client.options()
-        client._client_meta = (("h", "bp"),)
+        client._base_client._client_meta = (("h", "bp"),)
 
         if isinstance(retry_on_status, int):
             retry_on_status = (retry_on_status,)
@@ -608,7 +608,7 @@ def _setup_queues(self) -> None:
             ] = Queue(max(queue_size, thread_count))
             self._quick_put = self._inqueue.put
 
-    with client._otel.helpers_span("helpers.parallel_bulk") as otel_span:
+    with client._base_client._otel.helpers_span("helpers.parallel_bulk") as otel_span:
         pool = BlockingPool(thread_count)
 
         try:
@@ -711,7 +711,7 @@ def pop_transport_kwargs(kw: MutableMapping[str, Any]) -> Dict[str, Any]:
     client = client.options(
         request_timeout=request_timeout, **pop_transport_kwargs(kwargs)
     )
-    client._client_meta = (("h", "s"),)
+    client._base_client._client_meta = (("h", "s"),)
 
     # Setting query={"from": ...} would make 'from' be used
     # as a keyword argument instead of 'from_'. We handle that here.