apache-airflow-providers-elasticsearch 6.3.0__py3-none-any.whl → 6.3.1rc1__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.0"
+__version__ = "6.3.1"
 
 if packaging.version.parse(packaging.version.parse(airflow_version).base_version) < packaging.version.parse(
     "2.10.0"

airflow/providers/elasticsearch/hooks/elasticsearch.py

@@ -20,14 +20,18 @@ from __future__ import annotations
 from collections.abc import Iterable, Mapping
 from copy import deepcopy
 from functools import cached_property
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING, Any, cast
 from urllib import parse
 
 from elasticsearch import Elasticsearch
 
-from airflow.hooks.base import BaseHook
 from airflow.providers.common.sql.hooks.sql import DbApiHook
 
+try:
+    from airflow.sdk import BaseHook
+except ImportError:
+    from airflow.hooks.base import BaseHook  # type: ignore[attr-defined,no-redef]
+
 if TYPE_CHECKING:
     from elastic_transport import ObjectApiResponse
 
@@ -179,8 +183,8 @@ class ElasticsearchSQLHook(DbApiHook):
         conn = self.connection
 
         conn_args = {
-            "host": conn.host,
-            "port": conn.port,
+            "host": cast("str", conn.host),
+            "port": cast("int", conn.port),
             "user": conn.login or None,
             "password": conn.password or None,
             "scheme": conn.schema or "http",
@@ -191,7 +195,7 @@ class ElasticsearchSQLHook(DbApiHook):
         if conn_args.get("http_compress", False):
             conn_args["http_compress"] = bool(conn_args["http_compress"])
 
-        return connect(**conn_args)
+        return connect(**conn_args)  # type: ignore[arg-type]
 
     def get_uri(self) -> str:
         conn = self.connection
@@ -199,7 +203,7 @@ class ElasticsearchSQLHook(DbApiHook):
         login = ""
         if conn.login:
             login = f"{conn.login}:{conn.password}@"
-        host = conn.host
+        host = conn.host or ""
         if conn.port is not None:
             host += f":{conn.port}"
         uri = f"{conn.conn_type}+{conn.schema}://{login}{host}/"

airflow/providers/elasticsearch/log/es_task_handler.py

@@ -27,8 +27,9 @@ import shutil
 import sys
 import time
 from collections import defaultdict
+from collections.abc import Callable
 from operator import attrgetter
-from typing import TYPE_CHECKING, Any, Callable, Literal
+from typing import TYPE_CHECKING, Any, Literal
 from urllib.parse import quote, urlparse
 
 # Using `from elasticsearch import *` would break elasticsearch mocking used in unit test.
@@ -44,7 +45,7 @@ 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
+from airflow.providers.elasticsearch.version_compat import AIRFLOW_V_3_0_PLUS, EsLogMsgType
 from airflow.utils import timezone
 from airflow.utils.log.file_task_handler import FileTaskHandler
 from airflow.utils.log.logging_mixin import ExternalLoggingMixin, LoggingMixin
@@ -56,15 +57,6 @@ if TYPE_CHECKING:
 
     from airflow.models.taskinstance import TaskInstance, TaskInstanceKey
 
-if AIRFLOW_V_3_0_PLUS:
-    from typing import Union
-
-    from airflow.utils.log.file_task_handler import StructuredLogMessage
-
-    EsLogMsgType = Union[list[StructuredLogMessage], str]
-else:
-    EsLogMsgType = list[tuple[str, str]]  # type: ignore[misc]
-
 
 LOG_LINE_DEFAULTS = {"exc_text": "", "stack_info": ""}
 # Elasticsearch hosted log type

airflow/providers/elasticsearch/version_compat.py

@@ -33,3 +33,10 @@ def get_base_airflow_version_tuple() -> tuple[int, int, int]:
 
 
 AIRFLOW_V_3_0_PLUS = get_base_airflow_version_tuple() >= (3, 0, 0)
+
+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[misc]

{apache_airflow_providers_elasticsearch-6.3.0.dist-info → apache_airflow_providers_elasticsearch-6.3.1rc1.dist-info}/METADATA

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: apache-airflow-providers-elasticsearch
-Version: 6.3.0
+Version: 6.3.1rc1
 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>
 Maintainer-email: Apache Software Foundation <dev@airflow.apache.org>
-Requires-Python: ~=3.9
+Requires-Python: ~=3.10
 Description-Content-Type: text/x-rst
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
@@ -15,17 +15,16 @@ Classifier: Intended Audience :: System Administrators
 Classifier: Framework :: Apache Airflow
 Classifier: Framework :: Apache Airflow :: Provider
 Classifier: License :: OSI Approved :: Apache Software License
-Classifier: Programming Language :: Python :: 3.9
 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>=2.10.0
-Requires-Dist: apache-airflow-providers-common-sql>=1.27.0
+Requires-Dist: apache-airflow>=2.10.0rc1
+Requires-Dist: apache-airflow-providers-common-sql>=1.27.0rc1
 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.0/changelog.html
-Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.0
+Project-URL: Changelog, https://airflow.staged.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.1/changelog.html
+Project-URL: Documentation, https://airflow.staged.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.1
 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 +55,7 @@ Project-URL: YouTube, https://www.youtube.com/channel/UCSXwxpWZQ7XZ1WL3wqevChA/
 
 Package ``apache-airflow-providers-elasticsearch``
 
-Release: ``6.3.0``
+Release: ``6.3.1``
 
 
 `Elasticsearch <https://www.elastic.co/elasticsearch>`__
@@ -69,7 +68,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.0/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.1/>`_.
 
 Installation
 ------------
@@ -78,7 +77,7 @@ You can install this package on top of an existing Airflow 2 installation (see `
 for the minimum Airflow version supported) via
 ``pip install apache-airflow-providers-elasticsearch``
 
-The package supports the following python versions: 3.9,3.10,3.11,3.12
+The package supports the following python versions: 3.10,3.11,3.12
 
 Requirements
 ------------
@@ -111,5 +110,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.0/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-elasticsearch/6.3.1/changelog.html>`_.
 

apache_airflow_providers_elasticsearch-6.3.1rc1.dist-info/RECORD

@@ -0,0 +1,14 @@
+airflow/providers/elasticsearch/LICENSE,sha256=gXPVwptPlW1TJ4HSuG5OMPg-a3h43OGMkZRR1rpwfJA,10850
+airflow/providers/elasticsearch/__init__.py,sha256=tQJpEmqy_cj4UtUzW3ZEOYEQzXdrmsVE9FiwNNX7wwk,1502
+airflow/providers/elasticsearch/get_provider_info.py,sha256=473iBNJ4Kiy-DvbOa6CqDOS3pPEs6x7WBwkhR1QTuiw,8106
+airflow/providers/elasticsearch/version_compat.py,sha256=ZwhtGeuktt0--08loaNiOkmkdSO14adQdRFsw64qQdo,1755
+airflow/providers/elasticsearch/hooks/__init__.py,sha256=mlJxuZLkd5x-iq2SBwD3mvRQpt3YR7wjz_nceyF1IaI,787
+airflow/providers/elasticsearch/hooks/elasticsearch.py,sha256=oDYFA-V-VEa-DWWBpuYEUOrYyccbd7Dxftpe6xpHLtM,8661
+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=VdiYogPgpQBnzREFdK95oqYx-MLLOtg0Wr0XD3OI5lg,28299
+apache_airflow_providers_elasticsearch-6.3.1rc1.dist-info/entry_points.txt,sha256=jpgAUVmTsdtWQ4nru2FJQKP9JBN4OPHK-ybfYc3_BOs,109
+apache_airflow_providers_elasticsearch-6.3.1rc1.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+apache_airflow_providers_elasticsearch-6.3.1rc1.dist-info/METADATA,sha256=eWIlkn3SjNhIIWWCtLLIYzD8KW0tpfPTaSGmFe-hqB0,5186
+apache_airflow_providers_elasticsearch-6.3.1rc1.dist-info/RECORD,,

apache_airflow_providers_elasticsearch-6.3.0.dist-info/RECORD

@@ -1,14 +0,0 @@
-airflow/providers/elasticsearch/LICENSE,sha256=gXPVwptPlW1TJ4HSuG5OMPg-a3h43OGMkZRR1rpwfJA,10850
-airflow/providers/elasticsearch/__init__.py,sha256=Mpfzp3sAo0gUllfHUHU13EGd8KvNOdjMR_ffECrwcqY,1502
-airflow/providers/elasticsearch/get_provider_info.py,sha256=473iBNJ4Kiy-DvbOa6CqDOS3pPEs6x7WBwkhR1QTuiw,8106
-airflow/providers/elasticsearch/version_compat.py,sha256=j5PCtXvZ71aBjixu-EFTNtVDPsngzzs7os0ZQDgFVDk,1536
-airflow/providers/elasticsearch/hooks/__init__.py,sha256=mlJxuZLkd5x-iq2SBwD3mvRQpt3YR7wjz_nceyF1IaI,787
-airflow/providers/elasticsearch/hooks/elasticsearch.py,sha256=JYO0BhZmmAmAOPQEJ1Ork3X8MrmoFs7cDwLNhboXUmA,8491
-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=6iGOwh0CsFA5EtsmfCGbyt9mYpBO3IX0fYHlBrsPGN4,28513
-apache_airflow_providers_elasticsearch-6.3.0.dist-info/entry_points.txt,sha256=jpgAUVmTsdtWQ4nru2FJQKP9JBN4OPHK-ybfYc3_BOs,109
-apache_airflow_providers_elasticsearch-6.3.0.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-apache_airflow_providers_elasticsearch-6.3.0.dist-info/METADATA,sha256=odNMpWIhvjpTG17ImimfmY0ofDzIOzYgRqEtkkD7P6Q,5216
-apache_airflow_providers_elasticsearch-6.3.0.dist-info/RECORD,,