apache-airflow-providers-elasticsearch 5.5.0__py3-none-any.whl → 5.5.1__py3-none-any.whl

airflow/providers/elasticsearch/__init__.py

@@ -29,7 +29,7 @@ from airflow import __version__ as airflow_version
 
 __all__ = ["__version__"]
 
-__version__ = "5.5.0"
+__version__ = "5.5.1"
 
 if packaging.version.parse(packaging.version.parse(airflow_version).base_version) < packaging.version.parse(
     "2.8.0"

airflow/providers/elasticsearch/get_provider_info.py

@@ -28,8 +28,9 @@ def get_provider_info():
         "name": "Elasticsearch",
         "description": "`Elasticsearch <https://www.elastic.co/elasticsearch>`__\n",
         "state": "ready",
-        "source-date-epoch": 1723970114,
+        "source-date-epoch": 1726860725,
         "versions": [
+            "5.5.1",
             "5.5.0",
             "5.4.2",
             "5.4.1",
@@ -73,7 +74,7 @@ def get_provider_info():
         ],
         "dependencies": [
             "apache-airflow>=2.8.0",
-            "apache-airflow-providers-common-sql>=1.14.1",
+            "apache-airflow-providers-common-sql>=1.17.0",
             "elasticsearch>=8.10,<9",
         ],
         "integrations": [

airflow/providers/elasticsearch/hooks/elasticsearch.py

@@ -23,7 +23,6 @@ from urllib import parse
 
 from deprecated import deprecated
 from elasticsearch import Elasticsearch
-from elasticsearch.client import SqlClient
 
 from airflow.exceptions import AirflowProviderDeprecationWarning
 from airflow.hooks.base import BaseHook
@@ -70,11 +69,10 @@ class ESConnection:
             self.es = Elasticsearch(self.url, http_auth=(user, password), **self.kwargs)
         else:
             self.es = Elasticsearch(self.url, **self.kwargs)
-        self.es_sql_client = SqlClient(self.es)
 
     def execute_sql(self, query: str) -> ObjectApiResponse:
         sql_query = {"query": query}
-        return self.es_sql_client.query(body=sql_query)
+        return self.es.sql.query(body=sql_query)
 
 
 class ElasticsearchSQLHook(DbApiHook):
@@ -95,12 +93,11 @@ class ElasticsearchSQLHook(DbApiHook):
     def __init__(self, schema: str = "http", connection: AirflowConnection | None = None, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.schema = schema
-        self.connection = connection
+        self._connection = connection
 
     def get_conn(self) -> ESConnection:
         """Return an elasticsearch connection object."""
-        conn_id = self.get_conn_id()
-        conn = self.connection or self.get_connection(conn_id)
+        conn = self.connection
 
         conn_args = {
             "host": conn.host,
@@ -119,8 +116,7 @@ class ElasticsearchSQLHook(DbApiHook):
         return connect(**conn_args)
 
     def get_uri(self) -> str:
-        conn_id = self.get_conn_id()
-        conn = self.connection or self.get_connection(conn_id)
+        conn = self.connection
 
         login = ""
         if conn.login:

airflow/providers/elasticsearch/log/es_task_handler.py

@@ -158,14 +158,14 @@ class ElasticsearchTaskHandler(FileTaskHandler, ExternalLoggingMixin, LoggingMix
         index_patterns_callable: str = conf.get("elasticsearch", "index_patterns_callable", fallback=""),
         es_kwargs: dict | None | Literal["default_es_kwargs"] = "default_es_kwargs",
         *,
-        filename_template: str | None = None,
         log_id_template: str | None = None,
+        **kwargs,
     ):
         es_kwargs = es_kwargs or {}
         if es_kwargs == "default_es_kwargs":
             es_kwargs = get_es_kwargs_from_config()
         host = self.format_url(host)
-        super().__init__(base_log_folder, filename_template)
+        super().__init__(base_log_folder)
         self.closed = False
 
         self.client = elasticsearch.Elasticsearch(host, **es_kwargs)

{apache_airflow_providers_elasticsearch-5.5.0.dist-info → apache_airflow_providers_elasticsearch-5.5.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: apache-airflow-providers-elasticsearch
-Version: 5.5.0
+Version: 5.5.1
 Summary: Provider package apache-airflow-providers-elasticsearch for Apache Airflow
 Keywords: airflow-provider,elasticsearch,airflow,integration
 Author-email: Apache Software Foundation <dev@airflow.apache.org>
@@ -21,13 +21,13 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: System :: Monitoring
-Requires-Dist: apache-airflow-providers-common-sql>=1.14.1
+Requires-Dist: apache-airflow-providers-common-sql>=1.17.0
 Requires-Dist: apache-airflow>=2.8.0
 Requires-Dist: elasticsearch>=8.10,<9
 Requires-Dist: apache-airflow-providers-common-sql ; extra == "common.sql"
 Project-URL: Bug Tracker, https://github.com/apache/airflow/issues
-Project-URL: Changelog, https://airflow.apache.org/docs/apache-airflow-providers-elasticsearch/5.5.0/changelog.html
-Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-elasticsearch/5.5.0
+Project-URL: Changelog, https://airflow.apache.org/docs/apache-airflow-providers-elasticsearch/5.5.1/changelog.html
+Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-elasticsearch/5.5.1
 Project-URL: Slack Chat, https://s.apache.org/airflow-slack
 Project-URL: Source Code, https://github.com/apache/airflow
 Project-URL: Twitter, https://twitter.com/ApacheAirflow
@@ -78,7 +78,7 @@ Provides-Extra: common.sql
 
 Package ``apache-airflow-providers-elasticsearch``
 
-Release: ``5.5.0``
+Release: ``5.5.1``
 
 
 `Elasticsearch <https://www.elastic.co/elasticsearch>`__
@@ -91,7 +91,7 @@ This is a provider package for ``elasticsearch`` provider. All classes for this
 are in ``airflow.providers.elasticsearch`` python package.
 
 You can find package information and changelog for the provider
-in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-elasticsearch/5.5.0/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-elasticsearch/5.5.1/>`_.
 
 Installation
 ------------
@@ -109,7 +109,7 @@ Requirements
 PIP package                              Version required
 =======================================  ==================
 ``apache-airflow``                       ``>=2.8.0``
-``apache-airflow-providers-common-sql``  ``>=1.14.1``
+``apache-airflow-providers-common-sql``  ``>=1.17.0``
 ``elasticsearch``                        ``>=8.10,<9``
 =======================================  ==================
 
@@ -133,4 +133,4 @@ Dependent package
 ============================================================================================================  ==============
 
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-elasticsearch/5.5.0/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-elasticsearch/5.5.1/changelog.html>`_.

apache_airflow_providers_elasticsearch-5.5.1.dist-info/RECORD

@@ -0,0 +1,13 @@
+airflow/providers/elasticsearch/LICENSE,sha256=FFb4jd2AXnOOf7XLP04pQW6jbdhG49TxlGY6fFpCV1Y,13609
+airflow/providers/elasticsearch/__init__.py,sha256=Yw9lh1G0gFbnqycc5s7WzWHqT2yTePc9M-qs4dPbx10,1500
+airflow/providers/elasticsearch/get_provider_info.py,sha256=4XSPMBMY7n3S6airTfKBCkyiRdcm7UBM4XA72FwlYgs,8571
+airflow/providers/elasticsearch/hooks/__init__.py,sha256=mlJxuZLkd5x-iq2SBwD3mvRQpt3YR7wjz_nceyF1IaI,787
+airflow/providers/elasticsearch/hooks/elasticsearch.py,sha256=TPIRIqS0lu7apfofxKKfg9kO7-8Qo2ippdL1uEk7B3g,6393
+airflow/providers/elasticsearch/log/__init__.py,sha256=9hdXHABrVpkbpjZgUft39kOFL2xSGeG4GEua0Hmelus,785
+airflow/providers/elasticsearch/log/es_json_formatter.py,sha256=DwWPDJtZLr_6Mdae1-XVEgmE1XErFIanSzxWovs50ig,1796
+airflow/providers/elasticsearch/log/es_response.py,sha256=tEFz1pAUzIg6Zw43ZjiHFTOB72kNP-czbEwMbymUZ88,6037
+airflow/providers/elasticsearch/log/es_task_handler.py,sha256=6EoPQZrCW6-SwLSDd6iH3Wp02UTeMlQ8CTbwEWdN6Lw,26202
+apache_airflow_providers_elasticsearch-5.5.1.dist-info/entry_points.txt,sha256=jpgAUVmTsdtWQ4nru2FJQKP9JBN4OPHK-ybfYc3_BOs,109
+apache_airflow_providers_elasticsearch-5.5.1.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
+apache_airflow_providers_elasticsearch-5.5.1.dist-info/METADATA,sha256=tIWzBvGjtV9VmuskVpYszLHQaNnec5LDWOfj4AH_DHg,6219
+apache_airflow_providers_elasticsearch-5.5.1.dist-info/RECORD,,

apache_airflow_providers_elasticsearch-5.5.0.dist-info/RECORD

@@ -1,13 +0,0 @@
-airflow/providers/elasticsearch/LICENSE,sha256=FFb4jd2AXnOOf7XLP04pQW6jbdhG49TxlGY6fFpCV1Y,13609
-airflow/providers/elasticsearch/__init__.py,sha256=DUInY8SIk_5Q8021oPu8RuqeryFZXyHXhabyylhpNfg,1500
-airflow/providers/elasticsearch/get_provider_info.py,sha256=x-lrFwkMRUOZEhAQm9fBjBMOLRxOyg0rdsQbMeWgDoE,8550
-airflow/providers/elasticsearch/hooks/__init__.py,sha256=mlJxuZLkd5x-iq2SBwD3mvRQpt3YR7wjz_nceyF1IaI,787
-airflow/providers/elasticsearch/hooks/elasticsearch.py,sha256=iOlHR7X8ZYQ0AS939k7ChWfpojDQCtipZJBwx0aGWfw,6628
-airflow/providers/elasticsearch/log/__init__.py,sha256=9hdXHABrVpkbpjZgUft39kOFL2xSGeG4GEua0Hmelus,785
-airflow/providers/elasticsearch/log/es_json_formatter.py,sha256=DwWPDJtZLr_6Mdae1-XVEgmE1XErFIanSzxWovs50ig,1796
-airflow/providers/elasticsearch/log/es_response.py,sha256=tEFz1pAUzIg6Zw43ZjiHFTOB72kNP-czbEwMbymUZ88,6037
-airflow/providers/elasticsearch/log/es_task_handler.py,sha256=gSbETwbWwv0HvPXZGqqDmyiFoP-keOGuJPPZwJSn5dY,26249
-apache_airflow_providers_elasticsearch-5.5.0.dist-info/entry_points.txt,sha256=jpgAUVmTsdtWQ4nru2FJQKP9JBN4OPHK-ybfYc3_BOs,109
-apache_airflow_providers_elasticsearch-5.5.0.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-apache_airflow_providers_elasticsearch-5.5.0.dist-info/METADATA,sha256=Ft2LxCG1wzAp3idUQhlG1GFyBsk5K3ix80_59Qk54Lw,6219
-apache_airflow_providers_elasticsearch-5.5.0.dist-info/RECORD,,