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

airflow/providers/sftp/__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.11.0"

airflow/providers/sftp/exceptions.py

@@ -16,7 +16,7 @@
 # under the License.
 from __future__ import annotations
 
-from airflow.exceptions import AirflowException
+from airflow.providers.common.compat.sdk import AirflowException
 
 
 class ConnectionNotOpenedException(AirflowException):

airflow/providers/sftp/hooks/sftp.py

@@ -34,12 +34,10 @@ from typing import IO, TYPE_CHECKING, Any, cast
 
 import asyncssh
 from asgiref.sync import sync_to_async
+from paramiko.config import SSH_PORT
 
-from airflow.exceptions import (
-    AirflowException,
-    AirflowProviderDeprecationWarning,
-)
-from airflow.providers.common.compat.sdk import BaseHook, Connection
+from airflow.exceptions import AirflowProviderDeprecationWarning
+from airflow.providers.common.compat.sdk import AirflowException, BaseHook, Connection
 from airflow.providers.sftp.exceptions import ConnectionNotOpenedException
 from airflow.providers.ssh.hooks.ssh import SSHHook
 
@@ -703,10 +701,10 @@ class SFTPHookAsync(BaseHook):
     def __init__(  # nosec: B107
         self,
         sftp_conn_id: str = default_conn_name,
-        host: str = "",
-        port: int = 22,
-        username: str = "",
-        password: str = "",
+        host: str | None = None,
+        port: int | None = None,
+        username: str | None = None,
+        password: str | None = None,
         known_hosts: str = default_known_hosts,
         key_file: str = "",
         passphrase: str = "",
@@ -762,11 +760,19 @@ class SFTPHookAsync(BaseHook):
         if conn.extra is not None:
             self._parse_extras(conn)  # type: ignore[arg-type]
 
-        conn_config: dict[str, Any] = {
-            "host": conn.host,
-            "port": conn.port,
-            "username": conn.login,
-            "password": conn.password,
+        def _get_value(self_val, conn_val, default=None):
+            """Return the first non-None value among self, conn, default."""
+            if self_val is not None:
+                return self_val
+            if conn_val is not None:
+                return conn_val
+            return default
+
+        conn_config = {
+            "host": _get_value(self.host, conn.host),
+            "port": _get_value(self.port, conn.port, SSH_PORT),
+            "username": _get_value(self.username, conn.login),
+            "password": _get_value(self.password, conn.password),
         }
         if self.key_file:
             conn_config.update(client_keys=self.key_file)

airflow/providers/sftp/operators/sftp.py

@@ -27,8 +27,7 @@ from typing import Any
 
 import paramiko
 
-from airflow.exceptions import AirflowException
-from airflow.providers.common.compat.sdk import BaseOperator
+from airflow.providers.common.compat.sdk import AirflowException, BaseOperator
 from airflow.providers.sftp.hooks.sftp import SFTPHook
 
 

airflow/providers/sftp/sensors/sftp.py

@@ -27,8 +27,7 @@ from typing import TYPE_CHECKING, Any
 from paramiko.sftp import SFTP_NO_SUCH_FILE
 
 from airflow.configuration import conf
-from airflow.exceptions import AirflowException
-from airflow.providers.common.compat.sdk import BaseSensorOperator, PokeReturnValue
+from airflow.providers.common.compat.sdk import AirflowException, BaseSensorOperator, PokeReturnValue
 from airflow.providers.sftp.hooks.sftp import SFTPHook
 from airflow.providers.sftp.triggers.sftp import SFTPTrigger
 from airflow.utils.timezone import convert_to_utc, parse

airflow/providers/sftp/triggers/sftp.py

@@ -24,7 +24,7 @@ from typing import Any
 
 from dateutil.parser import parse as parse_date
 
-from airflow.exceptions import AirflowException
+from airflow.providers.common.compat.sdk import AirflowException
 from airflow.providers.sftp.hooks.sftp import SFTPHookAsync
 from airflow.triggers.base import BaseTrigger, TriggerEvent
 from airflow.utils.timezone import convert_to_utc

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apache-airflow-providers-sftp
-Version: 5.5.0
+Version: 5.5.1
 Summary: Provider package apache-airflow-providers-sftp for Apache Airflow
 Keywords: airflow-provider,sftp,airflow,integration
 Author-email: Apache Software Foundation <dev@airflow.apache.org>
@@ -24,14 +24,14 @@ License-File: LICENSE
 License-File: NOTICE
 Requires-Dist: apache-airflow>=2.11.0
 Requires-Dist: apache-airflow-providers-ssh>=4.0.0
-Requires-Dist: apache-airflow-providers-common-compat>=1.8.0
+Requires-Dist: apache-airflow-providers-common-compat>=1.10.1
 Requires-Dist: paramiko>=2.9.0,<4.0.0
 Requires-Dist: asyncssh>=2.12.0
 Requires-Dist: apache-airflow-providers-common-compat ; extra == "common-compat"
 Requires-Dist: apache-airflow-providers-openlineage ; extra == "openlineage"
 Project-URL: Bug Tracker, https://github.com/apache/airflow/issues
-Project-URL: Changelog, https://airflow.apache.org/docs/apache-airflow-providers-sftp/5.5.0/changelog.html
-Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-sftp/5.5.0
+Project-URL: Changelog, https://airflow.apache.org/docs/apache-airflow-providers-sftp/5.5.1/changelog.html
+Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-sftp/5.5.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
@@ -64,7 +64,7 @@ Provides-Extra: openlineage
 
 Package ``apache-airflow-providers-sftp``
 
-Release: ``5.5.0``
+Release: ``5.5.1``
 
 
 `SSH File Transfer Protocol (SFTP) <https://tools.ietf.org/wg/secsh/draft-ietf-secsh-filexfer/>`__
@@ -77,7 +77,7 @@ This is a provider package for ``sftp`` provider. All classes for this provider
 are in ``airflow.providers.sftp`` python package.
 
 You can find package information and changelog for the provider
-in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-sftp/5.5.0/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-sftp/5.5.1/>`_.
 
 Installation
 ------------
@@ -96,7 +96,7 @@ PIP package                                 Version required
 ==========================================  ==================
 ``apache-airflow``                          ``>=2.11.0``
 ``apache-airflow-providers-ssh``            ``>=4.0.0``
-``apache-airflow-providers-common-compat``  ``>=1.8.0``
+``apache-airflow-providers-common-compat``  ``>=1.10.1``
 ``paramiko``                                ``>=2.9.0,<4.0.0``
 ``asyncssh``                                ``>=2.12.0``
 ==========================================  ==================
@@ -133,5 +133,5 @@ Extra              Dependencies
 =================  ==========================================
 
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-sftp/5.5.0/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-sftp/5.5.1/changelog.html>`_.
 

{apache_airflow_providers_sftp-5.5.0.dist-info → apache_airflow_providers_sftp-5.5.1.dist-info}/RECORD

@@ -1,21 +1,21 @@
-airflow/providers/sftp/__init__.py,sha256=0lEZa-04EGS9xzkrUgUrF_UrIfI7xniRpBmrcBzUVMw,1493
-airflow/providers/sftp/exceptions.py,sha256=Gz4mk1YkBUFE1ridk-C7dcu9Y3JPdkp5MUyQOwWOWyY,1011
+airflow/providers/sftp/__init__.py,sha256=j9k_DCYrh_IiEgd2Ru0DeWgl8IcOxf5stXEcaCoY_f8,1493
+airflow/providers/sftp/exceptions.py,sha256=DYy0hHoCuM5YzY-6c1oNwxeIZYINwzF6bW2tuJmhOj8,1028
 airflow/providers/sftp/get_provider_info.py,sha256=qjHxUHBGnbyHCwXgKYbTNGNvKtc7l213wrVy7yjHf_c,3002
 airflow/providers/sftp/version_compat.py,sha256=2mExLgLL122lERfq14OjfiylWzp1FJVdoTwov_DdyJA,1666
 airflow/providers/sftp/decorators/__init__.py,sha256=9hdXHABrVpkbpjZgUft39kOFL2xSGeG4GEua0Hmelus,785
 airflow/providers/sftp/decorators/sensors/__init__.py,sha256=9hdXHABrVpkbpjZgUft39kOFL2xSGeG4GEua0Hmelus,785
 airflow/providers/sftp/decorators/sensors/sftp.py,sha256=3Zy1TUqoUuw0I3c8fQXH2DrQR5p4rk4X1GG17afE_lE,2882
 airflow/providers/sftp/hooks/__init__.py,sha256=9hdXHABrVpkbpjZgUft39kOFL2xSGeG4GEua0Hmelus,785
-airflow/providers/sftp/hooks/sftp.py,sha256=_aF4J8Daw-fvXeFijGFFmNMzecgEHQwrX_zw0vswFns,34199
+airflow/providers/sftp/hooks/sftp.py,sha256=m1ZG50G-W8kkxwpTc_JVdXntajK_AMBZOhS3ZqmEDiA,34654
 airflow/providers/sftp/operators/__init__.py,sha256=9hdXHABrVpkbpjZgUft39kOFL2xSGeG4GEua0Hmelus,785
-airflow/providers/sftp/operators/sftp.py,sha256=i3DsNYdZjv7E03chU58VKfkm2PxJqmU5WHWvRhBxCpA,13181
+airflow/providers/sftp/operators/sftp.py,sha256=vsfdKjaFAuE1AGA5tiHfG6ISfaVF8mpTt4XaPxTrZtc,13151
 airflow/providers/sftp/sensors/__init__.py,sha256=9hdXHABrVpkbpjZgUft39kOFL2xSGeG4GEua0Hmelus,785
-airflow/providers/sftp/sensors/sftp.py,sha256=fRxp3Ap--sjjUbfnRrsXWPzDt1xCKu49ZClzSi9cvDw,8890
+airflow/providers/sftp/sensors/sftp.py,sha256=WhNNBKrfevbC5YaXpo4DhSlDBrU6jV5iVzAF-ifSlXI,8860
 airflow/providers/sftp/triggers/__init__.py,sha256=9hdXHABrVpkbpjZgUft39kOFL2xSGeG4GEua0Hmelus,785
-airflow/providers/sftp/triggers/sftp.py,sha256=e_zdgyg2Y9T2bvCP57a2GZN0rBLW_R_t0V6kquvV2GY,6164
-apache_airflow_providers_sftp-5.5.0.dist-info/entry_points.txt,sha256=Fa1IkUHV6qnIuwLd0U7tKoklbLXXVrbB2hhG6N7Q-zo,100
-apache_airflow_providers_sftp-5.5.0.dist-info/licenses/LICENSE,sha256=gXPVwptPlW1TJ4HSuG5OMPg-a3h43OGMkZRR1rpwfJA,10850
-apache_airflow_providers_sftp-5.5.0.dist-info/licenses/NOTICE,sha256=E3-_E02gwwSEFzeeWPKmnIjOoos3hW28CLISV6sYrbQ,168
-apache_airflow_providers_sftp-5.5.0.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-apache_airflow_providers_sftp-5.5.0.dist-info/METADATA,sha256=Ocl4UEMGMZsw2t2OJej_XL2rUUrZTq5ucqEy0gis7K4,6289
-apache_airflow_providers_sftp-5.5.0.dist-info/RECORD,,
+airflow/providers/sftp/triggers/sftp.py,sha256=-FHAwWfuHHIhuB9M6q7ZqqIEOyoTodSU1dnpD5gchfg,6181
+apache_airflow_providers_sftp-5.5.1.dist-info/entry_points.txt,sha256=Fa1IkUHV6qnIuwLd0U7tKoklbLXXVrbB2hhG6N7Q-zo,100
+apache_airflow_providers_sftp-5.5.1.dist-info/licenses/LICENSE,sha256=gXPVwptPlW1TJ4HSuG5OMPg-a3h43OGMkZRR1rpwfJA,10850
+apache_airflow_providers_sftp-5.5.1.dist-info/licenses/NOTICE,sha256=E3-_E02gwwSEFzeeWPKmnIjOoos3hW28CLISV6sYrbQ,168
+apache_airflow_providers_sftp-5.5.1.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+apache_airflow_providers_sftp-5.5.1.dist-info/METADATA,sha256=WPtw-xXKxkQHXpFdND8WYFC6iSZm6i7nZrxoGZPgAmQ,6291
+apache_airflow_providers_sftp-5.5.1.dist-info/RECORD,,