apache-airflow-providers-elasticsearch 6.3.3__py3-none-any.whl → 6.3.4__py3-none-any.whl

airflow/providers/elasticsearch/__init__.py

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

airflow/providers/elasticsearch/hooks/elasticsearch.py

@@ -25,8 +25,8 @@ from urllib import parse
 
 from elasticsearch import Elasticsearch
 
+from airflow.providers.common.compat.sdk import BaseHook
 from airflow.providers.common.sql.hooks.sql import DbApiHook
-from airflow.providers.elasticsearch.version_compat import BaseHook
 
 if TYPE_CHECKING:
     from elastic_transport import ObjectApiResponse

airflow/providers/elasticsearch/log/es_task_handler.py

@@ -41,23 +41,15 @@ from elasticsearch.exceptions import NotFoundError
 from airflow.configuration import conf
 from airflow.exceptions import AirflowException
 from airflow.models.dagrun import DagRun
+from airflow.providers.common.compat.sdk import timezone
 from airflow.providers.elasticsearch.log.es_json_formatter import ElasticsearchJSONFormatter
 from airflow.providers.elasticsearch.log.es_response import ElasticSearchResponse, Hit
-from airflow.providers.elasticsearch.version_compat import (
-    AIRFLOW_V_3_0_PLUS,
-    AIRFLOW_V_3_1_PLUS,
-    EsLogMsgType,
-)
+from airflow.providers.elasticsearch.version_compat import AIRFLOW_V_3_0_PLUS
 from airflow.utils.log.file_task_handler import FileTaskHandler
 from airflow.utils.log.logging_mixin import ExternalLoggingMixin, LoggingMixin
 from airflow.utils.module_loading import import_string
 from airflow.utils.session import create_session
 
-if AIRFLOW_V_3_1_PLUS:
-    from airflow.sdk import timezone
-else:
-    from airflow.utils import timezone  # type: ignore[attr-defined,no-redef]
-
 if TYPE_CHECKING:
     from datetime import datetime
 
@@ -65,6 +57,14 @@ if TYPE_CHECKING:
     from airflow.utils.log.file_task_handler import LogMetadata
 
 
+if AIRFLOW_V_3_0_PLUS:
+    from airflow.utils.log.file_task_handler import StructuredLogMessage
+
+    EsLogMsgType = list[StructuredLogMessage] | str
+else:
+    EsLogMsgType = list[tuple[str, str]]  # type: ignore[assignment,misc]
+
+
 LOG_LINE_DEFAULTS = {"exc_text": "", "stack_info": ""}
 # Elasticsearch hosted log type
 
@@ -252,15 +252,11 @@ class ElasticsearchTaskHandler(FileTaskHandler, ExternalLoggingMixin, LoggingMix
             data_interval_end = self._clean_date(dag_run.data_interval_end)
             logical_date = self._clean_date(dag_run.logical_date)
         else:
-            if dag_run.data_interval_start:
-                data_interval_start = dag_run.data_interval_start.isoformat()
-            else:
-                data_interval_start = ""
-            if dag_run.data_interval_end:
-                data_interval_end = dag_run.data_interval_end.isoformat()
-            else:
-                data_interval_end = ""
-            logical_date = dag_run.logical_date.isoformat()
+            data_interval_start = (
+                dag_run.data_interval_start.isoformat() if dag_run.data_interval_start else ""
+            )
+            data_interval_end = dag_run.data_interval_end.isoformat() if dag_run.data_interval_end else ""
+            logical_date = dag_run.logical_date.isoformat() if dag_run.logical_date else ""
 
         return log_id_template.format(
             dag_id=ti.dag_id,

airflow/providers/elasticsearch/version_compat.py

@@ -35,16 +35,4 @@ def get_base_airflow_version_tuple() -> tuple[int, int, int]:
 AIRFLOW_V_3_0_PLUS = get_base_airflow_version_tuple() >= (3, 0, 0)
 AIRFLOW_V_3_1_PLUS: bool = get_base_airflow_version_tuple() >= (3, 1, 0)
 
-if AIRFLOW_V_3_1_PLUS:
-    from airflow.sdk import BaseHook
-else:
-    from airflow.hooks.base import BaseHook  # type: ignore[attr-defined,no-redef]
-
-if AIRFLOW_V_3_0_PLUS:
-    from airflow.utils.log.file_task_handler import StructuredLogMessage
-
-    EsLogMsgType = list[StructuredLogMessage] | str
-else:
-    EsLogMsgType = list[tuple[str, str]]  # type: ignore[assignment,misc]
-
-__all__ = ["AIRFLOW_V_3_0_PLUS", "AIRFLOW_V_3_1_PLUS", "BaseHook", "EsLogMsgType"]
+__all__ = ["AIRFLOW_V_3_0_PLUS", "AIRFLOW_V_3_1_PLUS"]

{apache_airflow_providers_elasticsearch-6.3.3.dist-info → apache_airflow_providers_elasticsearch-6.3.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apache-airflow-providers-elasticsearch
-Version: 6.3.3
+Version: 6.3.4
 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,11 +21,12 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: System :: Monitoring
 Requires-Dist: apache-airflow>=2.10.0
+Requires-Dist: apache-airflow-providers-common-compat>=1.8.0
 Requires-Dist: apache-airflow-providers-common-sql>=1.27.0
 Requires-Dist: elasticsearch>=8.10,<9
 Project-URL: Bug Tracker, https://github.com/apache/airflow/issues
-Project-URL: Changelog, https://airflow.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.3/changelog.html
-Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.3
+Project-URL: Changelog, https://airflow.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.4/changelog.html
+Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.4
 Project-URL: Mastodon, https://fosstodon.org/@airflow
 Project-URL: Slack Chat, https://s.apache.org/airflow-slack
 Project-URL: Source Code, https://github.com/apache/airflow
@@ -56,7 +57,7 @@ Project-URL: YouTube, https://www.youtube.com/channel/UCSXwxpWZQ7XZ1WL3wqevChA/
 
 Package ``apache-airflow-providers-elasticsearch``
 
-Release: ``6.3.3``
+Release: ``6.3.4``
 
 
 `Elasticsearch <https://www.elastic.co/elasticsearch>`__
@@ -69,7 +70,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/6.3.3/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.4/>`_.
 
 Installation
 ------------
@@ -83,13 +84,14 @@ The package supports the following python versions: 3.10,3.11,3.12,3.13
 Requirements
 ------------
 
-=======================================  ==================
-PIP package                              Version required
-=======================================  ==================
-``apache-airflow``                       ``>=2.10.0``
-``apache-airflow-providers-common-sql``  ``>=1.27.0``
-``elasticsearch``                        ``>=8.10,<9``
-=======================================  ==================
+==========================================  ==================
+PIP package                                 Version required
+==========================================  ==================
+``apache-airflow``                          ``>=2.10.0``
+``apache-airflow-providers-common-compat``  ``>=1.7.4``
+``apache-airflow-providers-common-sql``     ``>=1.27.0``
+``elasticsearch``                           ``>=8.10,<9``
+==========================================  ==================
 
 Cross provider package dependencies
 -----------------------------------
@@ -111,5 +113,5 @@ Dependent package
 ============================================================================================================  ==============
 
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.3/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.4/changelog.html>`_.
 

{apache_airflow_providers_elasticsearch-6.3.3.dist-info → apache_airflow_providers_elasticsearch-6.3.4.dist-info}/RECORD

@@ -1,14 +1,14 @@
 airflow/providers/elasticsearch/LICENSE,sha256=gXPVwptPlW1TJ4HSuG5OMPg-a3h43OGMkZRR1rpwfJA,10850
-airflow/providers/elasticsearch/__init__.py,sha256=x495Pa_35IYEeA-WPMUxKf5d-7YDI0SyFMbc4pnQSFE,1502
+airflow/providers/elasticsearch/__init__.py,sha256=sevl5qW60k4JYPsYg2kclopN0eeicQZD5tsQbWQZ64s,1502
 airflow/providers/elasticsearch/get_provider_info.py,sha256=473iBNJ4Kiy-DvbOa6CqDOS3pPEs6x7WBwkhR1QTuiw,8106
-airflow/providers/elasticsearch/version_compat.py,sha256=VoYY99deuWiC8ya1zauXtFNSb6MBplEtBvc6zAgb6oM,2073
+airflow/providers/elasticsearch/version_compat.py,sha256=cmeoGMcTp0kiFa3GKZlQh31_kMk7UX9nOX8sYyGtuFg,1665
 airflow/providers/elasticsearch/hooks/__init__.py,sha256=mlJxuZLkd5x-iq2SBwD3mvRQpt3YR7wjz_nceyF1IaI,787
-airflow/providers/elasticsearch/hooks/elasticsearch.py,sha256=hHbNKnsy8bNHjV-ufZYBXSOw2dj5JmicOub7VTohy7A,8583
+airflow/providers/elasticsearch/hooks/elasticsearch.py,sha256=q82oo6n3WKxzsKUByHmXoyenjU8gtarK7fyMCYBHhvU,8572
 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=LdMBuVBTydaC42HooYSttAjTK-CpPA4r_KHl38msMnk,6046
-airflow/providers/elasticsearch/log/es_task_handler.py,sha256=wGc0M4SVOKtfI22I_CCfKT56K2eE-qDV22MgKe7vbZs,28901
-apache_airflow_providers_elasticsearch-6.3.3.dist-info/entry_points.txt,sha256=jpgAUVmTsdtWQ4nru2FJQKP9JBN4OPHK-ybfYc3_BOs,109
-apache_airflow_providers_elasticsearch-6.3.3.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-apache_airflow_providers_elasticsearch-6.3.3.dist-info/METADATA,sha256=_hqjCuuyX-a4MDF8lq5dAJQuZgiw9cY1X1cmMEFIRBs,5217
-apache_airflow_providers_elasticsearch-6.3.3.dist-info/RECORD,,
+airflow/providers/elasticsearch/log/es_task_handler.py,sha256=I3EzLhwyu3K8P4fnLU4YHmLR9nqpgivlEZMGbVeNnbw,28923
+apache_airflow_providers_elasticsearch-6.3.4.dist-info/entry_points.txt,sha256=jpgAUVmTsdtWQ4nru2FJQKP9JBN4OPHK-ybfYc3_BOs,109
+apache_airflow_providers_elasticsearch-6.3.4.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+apache_airflow_providers_elasticsearch-6.3.4.dist-info/METADATA,sha256=ZuX6xrlIW6Mti0VJRmA9CWNpApauiMXTg18UjsISHyU,5355
+apache_airflow_providers_elasticsearch-6.3.4.dist-info/RECORD,,