apache-airflow-providers-sftp 5.4.0rc1__tar.gz → 5.5.1__tar.gz

apache_airflow_providers_sftp-5.5.1/NOTICE

@@ -0,0 +1,5 @@
+Apache Airflow
+Copyright 2016-2025 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).

{apache_airflow_providers_sftp-5.4.0rc1 → apache_airflow_providers_sftp-5.5.1}/PKG-INFO

@@ -1,12 +1,13 @@
 Metadata-Version: 2.4
 Name: apache-airflow-providers-sftp
-Version: 5.4.0rc1
+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>
 Maintainer-email: Apache Software Foundation <dev@airflow.apache.org>
 Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
+License-Expression: Apache-2.0
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: Environment :: Web Environment
@@ -14,21 +15,23 @@ Classifier: Intended Audience :: Developers
 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.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: System :: Monitoring
-Requires-Dist: apache-airflow>=2.10.0rc1
-Requires-Dist: apache-airflow-providers-ssh>=4.0.0rc1
+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.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.staged.apache.org/docs/apache-airflow-providers-sftp/5.4.0/changelog.html
-Project-URL: Documentation, https://airflow.staged.apache.org/docs/apache-airflow-providers-sftp/5.4.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
@@ -61,7 +64,7 @@ Provides-Extra: openlineage
 
 Package ``apache-airflow-providers-sftp``
 
-Release: ``5.4.0``
+Release: ``5.5.1``
 
 
 `SSH File Transfer Protocol (SFTP) <https://tools.ietf.org/wg/secsh/draft-ietf-secsh-filexfer/>`__
@@ -74,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.4.0/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-sftp/5.5.1/>`_.
 
 Installation
 ------------
@@ -88,14 +91,15 @@ 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-ssh``  ``>=4.0.0``
-``paramiko``                      ``>=2.9.0,<4.0.0``
-``asyncssh``                      ``>=2.12.0``
-================================  ==================
+==========================================  ==================
+PIP package                                 Version required
+==========================================  ==================
+``apache-airflow``                          ``>=2.11.0``
+``apache-airflow-providers-ssh``            ``>=4.0.0``
+``apache-airflow-providers-common-compat``  ``>=1.10.1``
+``paramiko``                                ``>=2.9.0,<4.0.0``
+``asyncssh``                                ``>=2.12.0``
+==========================================  ==================
 
 Cross provider package dependencies
 -----------------------------------
@@ -118,6 +122,16 @@ Dependent package
 `apache-airflow-providers-ssh <https://airflow.apache.org/docs/apache-airflow-providers-ssh>`_                      ``ssh``
 ==================================================================================================================  =================
 
+Optional dependencies
+----------------------
+
+=================  ==========================================
+Extra              Dependencies
+=================  ==========================================
+``common.compat``  ``apache-airflow-providers-common-compat``
+``openlineage``    ``apache-airflow-providers-openlineage``
+=================  ==========================================
+
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-sftp/5.4.0/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-sftp/5.5.1/changelog.html>`_.
 

{apache_airflow_providers_sftp-5.4.0rc1 → apache_airflow_providers_sftp-5.5.1}/README.rst

@@ -23,7 +23,7 @@
 
 Package ``apache-airflow-providers-sftp``
 
-Release: ``5.4.0``
+Release: ``5.5.1``
 
 
 `SSH File Transfer Protocol (SFTP) <https://tools.ietf.org/wg/secsh/draft-ietf-secsh-filexfer/>`__
@@ -36,7 +36,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.4.0/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-sftp/5.5.1/>`_.
 
 Installation
 ------------
@@ -50,14 +50,15 @@ 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-ssh``  ``>=4.0.0``
-``paramiko``                      ``>=2.9.0,<4.0.0``
-``asyncssh``                      ``>=2.12.0``
-================================  ==================
+==========================================  ==================
+PIP package                                 Version required
+==========================================  ==================
+``apache-airflow``                          ``>=2.11.0``
+``apache-airflow-providers-ssh``            ``>=4.0.0``
+``apache-airflow-providers-common-compat``  ``>=1.10.1``
+``paramiko``                                ``>=2.9.0,<4.0.0``
+``asyncssh``                                ``>=2.12.0``
+==========================================  ==================
 
 Cross provider package dependencies
 -----------------------------------
@@ -80,5 +81,15 @@ Dependent package
 `apache-airflow-providers-ssh <https://airflow.apache.org/docs/apache-airflow-providers-ssh>`_                      ``ssh``
 ==================================================================================================================  =================
 
+Optional dependencies
+----------------------
+
+=================  ==========================================
+Extra              Dependencies
+=================  ==========================================
+``common.compat``  ``apache-airflow-providers-common-compat``
+``openlineage``    ``apache-airflow-providers-openlineage``
+=================  ==========================================
+
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-sftp/5.4.0/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-sftp/5.5.1/changelog.html>`_.

{apache_airflow_providers_sftp-5.4.0rc1 → apache_airflow_providers_sftp-5.5.1}/docs/changelog.rst

@@ -27,11 +27,73 @@
 Changelog
 ---------
 
-5.4.0
+5.5.1
 .....
 
+Bug Fixes
+~~~~~~~~~
+
+* ``fix(sftp): add default port to SFTPHookAsync (#58945)``
+
+Misc
+~~~~
+
+* ``Add backcompat for exceptions in providers (#58727)``
+
+.. Below changes are excluded from the changelog. Move them to
+   appropriate section above if needed. Do not delete the lines(!):
+
+5.5.0
+.....
+
+.. note::
+    This release of provider is only available for Airflow 2.11+ as explained in the
+    Apache Airflow providers support policy <https://github.com/apache/airflow/blob/main/PROVIDERS.rst#minimum-supported-version-of-airflow-for-community-managed-providers>_.
+
+Misc
+~~~~
+
+* ``Bump minimum Airflow version in providers to Airflow 2.11.0 (#58612)``
+
+.. Below changes are excluded from the changelog. Move them to
+   appropriate section above if needed. Do not delete the lines(!):
+   * ``Updates to release process of providers (#58316)``
+
+5.4.2
+.....
+
+Misc
+~~~~
+
+* ``Convert all airflow distributions to be compliant with ASF requirements (#58138)``
+* ``Migrate sftp provider to 'common.compat' (#57111)``
+
+.. Below changes are excluded from the changelog. Move them to
+   appropriate section above if needed. Do not delete the lines(!):
+   * ``Delete all unnecessary LICENSE Files (#58191)``
+   * ``Enable PT006 rule to sftp Provider test (#57924)``
+   * ``Fix documentation/provider.yaml consistencies (#57283)``
+
+5.4.1
+.....
+
+Bug Fixes
+~~~~~~~~~
+
+* ``Pass required remote_host arg to SSHHook (#55664)``
+
+Doc-only
+~~~~~~~~
+
+* ``Remove placeholder Release Date in changelog and index files (#56056)``
+
+.. Below changes are excluded from the changelog. Move them to
+   appropriate section above if needed. Do not delete the lines(!):
+   * ``Enable PT001 rule to prvoider tests (#55935)``
+
+5.4.0
+.....
 
-Release Date: ``|PypiReleaseDate|``
 
 Features
 ~~~~~~~~
@@ -47,8 +109,6 @@ Bug Fixes
 .. Below changes are excluded from the changelog. Move them to
    appropriate section above if needed. Do not delete the lines(!):
    * ``Switch pre-commit to prek (#54258)``
-
-.. Review and move the new changes to one of the sections above:
    * ``Fix Airflow 2 reference in README/index of providers (#55240)``
 
 5.3.4

{apache_airflow_providers_sftp-5.4.0rc1 → apache_airflow_providers_sftp-5.5.1}/docs/index.rst

@@ -70,7 +70,7 @@ apache-airflow-providers-sftp package
 `SSH File Transfer Protocol (SFTP) <https://tools.ietf.org/wg/secsh/draft-ietf-secsh-filexfer/>`__
 
 
-Release: 5.4.0
+Release: 5.5.1
 
 Provider package
 ----------------
@@ -88,16 +88,17 @@ For the minimum Airflow version supported, see ``Requirements`` below.
 Requirements
 ------------
 
-The minimum Apache Airflow version supported by this provider distribution is ``2.10.0``.
+The minimum Apache Airflow version supported by this provider distribution is ``2.11.0``.
 
-================================  ==================
-PIP package                       Version required
-================================  ==================
-``apache-airflow``                ``>=2.10.0``
-``apache-airflow-providers-ssh``  ``>=4.0.0``
-``paramiko``                      ``>=2.9.0,<4.0.0``
-``asyncssh``                      ``>=2.12.0``
-================================  ==================
+==========================================  ==================
+PIP package                                 Version required
+==========================================  ==================
+``apache-airflow``                          ``>=2.11.0``
+``apache-airflow-providers-ssh``            ``>=4.0.0``
+``apache-airflow-providers-common-compat``  ``>=1.10.1``
+``paramiko``                                ``>=2.9.0,<4.0.0``
+``asyncssh``                                ``>=2.12.0``
+==========================================  ==================
 
 Cross provider package dependencies
 -----------------------------------
@@ -126,5 +127,5 @@ Downloading official packages
 You can download officially released packages and verify their checksums and signatures from the
 `Official Apache Download site <https://downloads.apache.org/airflow/providers/>`_
 
-* `The apache-airflow-providers-sftp 5.4.0 sdist package <https://downloads.apache.org/airflow/providers/apache_airflow_providers_sftp-5.4.0.tar.gz>`_ (`asc <https://downloads.apache.org/airflow/providers/apache_airflow_providers_sftp-5.4.0.tar.gz.asc>`__, `sha512 <https://downloads.apache.org/airflow/providers/apache_airflow_providers_sftp-5.4.0.tar.gz.sha512>`__)
-* `The apache-airflow-providers-sftp 5.4.0 wheel package <https://downloads.apache.org/airflow/providers/apache_airflow_providers_sftp-5.4.0-py3-none-any.whl>`_ (`asc <https://downloads.apache.org/airflow/providers/apache_airflow_providers_sftp-5.4.0-py3-none-any.whl.asc>`__, `sha512 <https://downloads.apache.org/airflow/providers/apache_airflow_providers_sftp-5.4.0-py3-none-any.whl.sha512>`__)
+* `The apache-airflow-providers-sftp 5.5.1 sdist package <https://downloads.apache.org/airflow/providers/apache_airflow_providers_sftp-5.5.1.tar.gz>`_ (`asc <https://downloads.apache.org/airflow/providers/apache_airflow_providers_sftp-5.5.1.tar.gz.asc>`__, `sha512 <https://downloads.apache.org/airflow/providers/apache_airflow_providers_sftp-5.5.1.tar.gz.sha512>`__)
+* `The apache-airflow-providers-sftp 5.5.1 wheel package <https://downloads.apache.org/airflow/providers/apache_airflow_providers_sftp-5.5.1-py3-none-any.whl>`_ (`asc <https://downloads.apache.org/airflow/providers/apache_airflow_providers_sftp-5.5.1-py3-none-any.whl.asc>`__, `sha512 <https://downloads.apache.org/airflow/providers/apache_airflow_providers_sftp-5.5.1-py3-none-any.whl.sha512>`__)

{apache_airflow_providers_sftp-5.4.0rc1 → apache_airflow_providers_sftp-5.5.1}/provider.yaml

@@ -22,12 +22,16 @@ description: |
     `SSH File Transfer Protocol (SFTP) <https://tools.ietf.org/wg/secsh/draft-ietf-secsh-filexfer/>`__
 
 state: ready
-source-date-epoch: 1756877505
+source-date-epoch: 1765299399
 # Note that those versions are maintained by release manager - do not update them manually
 # with the exception of case where other provider in sources has >= new provider version.
 # In such case adding >= NEW_VERSION and bumping to NEW_VERSION in a provider have
 # to be done in the same PR
 versions:
+  - 5.5.1
+  - 5.5.0
+  - 5.4.2
+  - 5.4.1
   - 5.4.0
   - 5.3.4
   - 5.3.3
@@ -84,6 +88,8 @@ versions:
 integrations:
   - integration-name: SSH File Transfer Protocol (SFTP)
     external-doc-url: https://tools.ietf.org/wg/secsh/draft-ietf-secsh-filexfer/
+    how-to-guide:
+      - /docs/apache-airflow-providers-sftp/sensors/sftp_sensor.rst
     logo: /docs/integration-logos/SFTP.png
     tags: [protocol]
 

{apache_airflow_providers_sftp-5.4.0rc1 → apache_airflow_providers_sftp-5.5.1}/pyproject.toml

@@ -25,9 +25,11 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "apache-airflow-providers-sftp"
-version = "5.4.0rc1"
+version = "5.5.1"
 description = "Provider package apache-airflow-providers-sftp for Apache Airflow"
 readme = "README.rst"
+license = "Apache-2.0"
+license-files = ['LICENSE', 'NOTICE']
 authors = [
     {name="Apache Software Foundation", email="dev@airflow.apache.org"},
 ]
@@ -43,7 +45,6 @@ classifiers = [
     "Intended Audience :: System Administrators",
     "Framework :: Apache Airflow",
     "Framework :: Apache Airflow :: Provider",
-    "License :: OSI Approved :: Apache Software License",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
@@ -57,8 +58,9 @@ requires-python = ">=3.10"
 # Make sure to run ``prek update-providers-dependencies --all-files``
 # After you modify the dependencies, and rebuild your Breeze CI image with ``breeze ci-image build``
 dependencies = [
-    "apache-airflow>=2.10.0rc1",
-    "apache-airflow-providers-ssh>=4.0.0rc1",
+    "apache-airflow>=2.11.0",
+    "apache-airflow-providers-ssh>=4.0.0",
+    "apache-airflow-providers-common-compat>=1.10.1",
     # TODO: Bump to >= 4.0.0 once https://github.com/apache/airflow/issues/54079 is handled
     "paramiko>=2.9.0,<4.0.0",
     "asyncssh>=2.12.0",
@@ -111,8 +113,8 @@ apache-airflow-providers-common-sql = {workspace = true}
 apache-airflow-providers-standard = {workspace = true}
 
 [project.urls]
-"Documentation" = "https://airflow.staged.apache.org/docs/apache-airflow-providers-sftp/5.4.0"
-"Changelog" = "https://airflow.staged.apache.org/docs/apache-airflow-providers-sftp/5.4.0/changelog.html"
+"Documentation" = "https://airflow.apache.org/docs/apache-airflow-providers-sftp/5.5.1"
+"Changelog" = "https://airflow.apache.org/docs/apache-airflow-providers-sftp/5.5.1/changelog.html"
 "Bug Tracker" = "https://github.com/apache/airflow/issues"
 "Source Code" = "https://github.com/apache/airflow"
 "Slack Chat" = "https://s.apache.org/airflow-slack"

{apache_airflow_providers_sftp-5.4.0rc1 → apache_airflow_providers_sftp-5.5.1}/src/airflow/providers/sftp/__init__.py

@@ -29,11 +29,11 @@ from airflow import __version__ as airflow_version
 
 __all__ = ["__version__"]
 
-__version__ = "5.4.0"
+__version__ = "5.5.1"
 
 if packaging.version.parse(packaging.version.parse(airflow_version).base_version) < packaging.version.parse(
-    "2.10.0"
+    "2.11.0"
 ):
     raise RuntimeError(
-        f"The package `apache-airflow-providers-sftp:{__version__}` needs Apache Airflow 2.10.0+"
+        f"The package `apache-airflow-providers-sftp:{__version__}` needs Apache Airflow 2.11.0+"
     )

{apache_airflow_providers_sftp-5.4.0rc1 → apache_airflow_providers_sftp-5.5.1}/src/airflow/providers/sftp/decorators/sensors/sftp.py

@@ -19,16 +19,7 @@ from __future__ import annotations
 
 from collections.abc import Callable, Sequence
 
-from airflow.providers.sftp.version_compat import AIRFLOW_V_3_0_PLUS
-
-if AIRFLOW_V_3_0_PLUS:
-    from airflow.sdk.bases.decorator import TaskDecorator, get_unique_task_id, task_decorator_factory
-else:
-    from airflow.decorators.base import (  # type: ignore[no-redef]
-        TaskDecorator,
-        get_unique_task_id,
-        task_decorator_factory,
-    )
+from airflow.providers.common.compat.sdk import TaskDecorator, get_unique_task_id, task_decorator_factory
 from airflow.providers.sftp.sensors.sftp import SFTPSensor
 
 

{apache_airflow_providers_sftp-5.4.0rc1 → apache_airflow_providers_sftp-5.5.1}/src/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):

{apache_airflow_providers_sftp-5.4.0rc1 → apache_airflow_providers_sftp-5.5.1}/src/airflow/providers/sftp/get_provider_info.py

@@ -30,6 +30,7 @@ def get_provider_info():
             {
                 "integration-name": "SSH File Transfer Protocol (SFTP)",
                 "external-doc-url": "https://tools.ietf.org/wg/secsh/draft-ietf-secsh-filexfer/",
+                "how-to-guide": ["/docs/apache-airflow-providers-sftp/sensors/sftp_sensor.rst"],
                 "logo": "/docs/integration-logos/SFTP.png",
                 "tags": ["protocol"],
             }

{apache_airflow_providers_sftp-5.4.0rc1 → apache_airflow_providers_sftp-5.5.1}/src/airflow/providers/sftp/hooks/sftp.py

@@ -34,13 +34,11 @@ 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.exceptions import AirflowProviderDeprecationWarning
+from airflow.providers.common.compat.sdk import AirflowException, BaseHook, Connection
 from airflow.providers.sftp.exceptions import ConnectionNotOpenedException
-from airflow.providers.sftp.version_compat import BaseHook
 from airflow.providers.ssh.hooks.ssh import SSHHook
 
 if TYPE_CHECKING:
@@ -48,8 +46,6 @@ if TYPE_CHECKING:
     from paramiko.sftp_attr import SFTPAttributes
     from paramiko.sftp_client import SFTPClient
 
-    from airflow.models.connection import Connection
-
 
 def handle_connection_management(func: Callable) -> Callable:
     @functools.wraps(func)
@@ -705,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 = "",
@@ -764,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)

{apache_airflow_providers_sftp-5.4.0rc1 → apache_airflow_providers_sftp-5.5.1}/src/airflow/providers/sftp/operators/sftp.py

@@ -27,9 +27,8 @@ from typing import Any
 
 import paramiko
 
-from airflow.exceptions import AirflowException
+from airflow.providers.common.compat.sdk import AirflowException, BaseOperator
 from airflow.providers.sftp.hooks.sftp import SFTPHook
-from airflow.providers.sftp.version_compat import BaseOperator
 
 
 class SFTPOperation:
@@ -144,24 +143,25 @@ class SFTPOperator(BaseOperator):
 
         file_msg = None
         try:
+            if self.remote_host is not None:
+                self.log.info(
+                    "remote_host is provided explicitly. "
+                    "It will replace the remote_host which was defined "
+                    "in sftp_hook or predefined in connection of ssh_conn_id."
+                )
+
             if self.ssh_conn_id:
                 if self.sftp_hook and isinstance(self.sftp_hook, SFTPHook):
                     self.log.info("ssh_conn_id is ignored when sftp_hook is provided.")
                 else:
                     self.log.info("sftp_hook not provided or invalid. Trying ssh_conn_id to create SFTPHook.")
-                    self.sftp_hook = SFTPHook(ssh_conn_id=self.ssh_conn_id)
+                    self.sftp_hook = SFTPHook(
+                        ssh_conn_id=self.ssh_conn_id, remote_host=self.remote_host or ""
+                    )
 
             if not self.sftp_hook:
                 raise AirflowException("Cannot operate without sftp_hook or ssh_conn_id.")
 
-            if self.remote_host is not None:
-                self.log.info(
-                    "remote_host is provided explicitly. "
-                    "It will replace the remote_host which was defined "
-                    "in sftp_hook or predefined in connection of ssh_conn_id."
-                )
-                self.sftp_hook.remote_host = self.remote_host
-
             if self.operation.lower() in (SFTPOperation.GET, SFTPOperation.PUT):
                 for _local_filepath, _remote_filepath in zip(local_filepath_array, remote_filepath_array):
                     if self.operation.lower() == SFTPOperation.GET:

{apache_airflow_providers_sftp-5.4.0rc1 → apache_airflow_providers_sftp-5.5.1}/src/airflow/providers/sftp/sensors/sftp.py

@@ -27,18 +27,13 @@ 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 AirflowException, BaseSensorOperator, PokeReturnValue
 from airflow.providers.sftp.hooks.sftp import SFTPHook
 from airflow.providers.sftp.triggers.sftp import SFTPTrigger
-from airflow.providers.sftp.version_compat import BaseSensorOperator, PokeReturnValue
 from airflow.utils.timezone import convert_to_utc, parse
 
 if TYPE_CHECKING:
-    try:
-        from airflow.sdk.definitions.context import Context
-    except ImportError:
-        # TODO: Remove once provider drops support for Airflow 2
-        from airflow.utils.context import Context
+    from airflow.providers.common.compat.sdk import Context
 
 
 class SFTPSensor(BaseSensorOperator):

{apache_airflow_providers_sftp-5.4.0rc1 → apache_airflow_providers_sftp-5.5.1}/src/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.4.0rc1 → apache_airflow_providers_sftp-5.5.1}/src/airflow/providers/sftp/version_compat.py

@@ -35,15 +35,5 @@ 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.sdk import BaseOperator, BaseSensorOperator, PokeReturnValue
-else:
-    from airflow.models import BaseOperator
-    from airflow.sensors.base import BaseSensorOperator, PokeReturnValue  # type: ignore[no-redef]
-
-__all__ = ["AIRFLOW_V_3_0_PLUS", "BaseHook", "BaseOperator", "BaseSensorOperator", "PokeReturnValue"]
+
+__all__ = ["AIRFLOW_V_3_0_PLUS", "AIRFLOW_V_3_1_PLUS"]

{apache_airflow_providers_sftp-5.4.0rc1 → apache_airflow_providers_sftp-5.5.1}/tests/unit/sftp/hooks/test_sftp.py

@@ -31,8 +31,8 @@ from asyncssh.sftp import SFTPName
 from paramiko.client import SSHClient
 from paramiko.sftp_client import SFTPClient
 
-from airflow.exceptions import AirflowException
 from airflow.models import Connection
+from airflow.providers.common.compat.sdk import AirflowException
 from airflow.providers.sftp.hooks.sftp import SFTPHook, SFTPHookAsync
 
 
@@ -442,7 +442,7 @@ class TestSFTPHook:
         assert hook.key_file == TEST_KEY_FILE
 
     @pytest.mark.parametrize(
-        "path, exists",
+        ("path", "exists"),
         [
             (TMP_DIR_FOR_TESTS, True),
             (TMP_FILE_FOR_TESTS, True),
@@ -456,7 +456,7 @@ class TestSFTPHook:
         assert result == exists
 
     @pytest.mark.parametrize(
-        "path, prefix, delimiter, match",
+        ("path", "prefix", "delimiter", "match"),
         [
             ("test/path/file.bin", None, None, True),
             ("test/path/file.bin", "test", None, True),
@@ -762,7 +762,7 @@ class TestSFTPHookAsync:
         mock_connect.assert_called_with(**expected_connection_details)
 
     @pytest.mark.parametrize(
-        "mock_port, mock_host_key",
+        ("mock_port", "mock_host_key"),
         [
             (22, "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFe8P8lk5HFfL/rMlcCMHQhw1cg+uZtlK5rXQk2C4pOY"),
             (2222, "AAAAC3NzaC1lZDI1NTE5AAAAIFe8P8lk5HFfL/rMlcCMHQhw1cg+uZtlK5rXQk2C4pOY"),
@@ -814,11 +814,9 @@ class TestSFTPHookAsync:
         )
 
         hook = SFTPHookAsync()
-        with pytest.raises(ValueError) as exc:
+        with pytest.raises(ValueError, match="Host key check was skipped, but `host_key` value was given"):
             await hook._get_conn()
 
-        assert str(exc.value) == "Host key check was skipped, but `host_key` value was given"
-
     @patch("paramiko.SSHClient.connect")
     @patch("asyncssh.import_private_key")
     @patch("asyncssh.connect", new_callable=AsyncMock)
@@ -888,6 +886,67 @@ class TestSFTPHookAsync:
 
         mock_connect.assert_called_with(**expected_connection_details)
 
+    @pytest.mark.asyncio
+    @patch("asyncssh.connect", new_callable=AsyncMock)
+    @patch("airflow.providers.sftp.hooks.sftp.SFTPHookAsync.get_connection")
+    async def test_connection_port_default_to_22(self, mock_get_connection, mock_connect):
+        from unittest.mock import Mock, call
+
+        mock_get_connection.return_value = Mock(
+            host="localhost",
+            port=None,
+            login="username",
+            password="password",
+            extra="{}",
+            extra_dejson={},
+        )
+
+        hook = SFTPHookAsync()
+        await hook._get_conn()
+        assert mock_connect.mock_calls == [
+            call(
+                host="localhost",
+                # Even if the port is not specified in conn_config, it should still default to 22.
+                # This behavior is consistent with STPHook.
+                port=22,
+                username="username",
+                password="password",
+                known_hosts=None,
+            ),
+        ]
+
+    @pytest.mark.asyncio
+    @patch("asyncssh.connect", new_callable=AsyncMock)
+    @patch("airflow.providers.sftp.hooks.sftp.SFTPHookAsync.get_connection")
+    async def test_init_argument_not_ignored(self, mock_get_connection, mock_connect):
+        from unittest.mock import Mock, call
+
+        mock_get_connection.return_value = Mock(
+            host="localhost",
+            port=None,
+            login="username",
+            password="password",
+            extra="{}",
+            extra_dejson={},
+        )
+
+        hook = SFTPHookAsync(
+            host="localhost-from-init",
+            port=25,
+            username="username-from-init",
+            password="password-from-init",
+        )
+        await hook._get_conn()
+        assert mock_connect.mock_calls == [
+            call(
+                host="localhost-from-init",
+                port=25,
+                username="username-from-init",
+                password="password-from-init",
+                known_hosts=None,
+            ),
+        ]
+
     @patch("airflow.providers.sftp.hooks.sftp.SFTPHookAsync._get_conn")
     @pytest.mark.asyncio
     async def test_list_directory_path_does_not_exist(self, mock_hook_get_conn):

{apache_airflow_providers_sftp-5.4.0rc1 → apache_airflow_providers_sftp-5.5.1}/tests/unit/sftp/operators/test_sftp.py

@@ -26,9 +26,9 @@ from unittest import mock
 import paramiko
 import pytest
 
-from airflow.exceptions import AirflowException
 from airflow.models import DAG, Connection
 from airflow.providers.common.compat.openlineage.facet import Dataset
+from airflow.providers.common.compat.sdk import AirflowException
 from airflow.providers.sftp.hooks.sftp import SFTPHook
 from airflow.providers.sftp.operators.sftp import SFTPOperation, SFTPOperator
 from airflow.providers.ssh.hooks.ssh import SSHHook
@@ -389,7 +389,7 @@ class TestSFTPOperator:
         assert task_3.sftp_hook.remote_host == "remotehost"
 
     def test_unequal_local_remote_file_paths(self):
-        with pytest.raises(ValueError):
+        with pytest.raises(ValueError, match="1 paths in local_filepath != 2 paths in remote_filepath"):
             SFTPOperator(
                 task_id="test_sftp_unequal_paths",
                 local_filepath="/tmp/test",
@@ -593,7 +593,7 @@ class TestSFTPOperator:
             ).execute(None)
 
     @pytest.mark.parametrize(
-        "operation, expected",
+        ("operation", "expected"),
         TEST_GET_PUT_PARAMS,
     )
     @mock.patch("airflow.providers.ssh.hooks.ssh.SSHHook.get_conn", spec=paramiko.SSHClient)
@@ -624,7 +624,7 @@ class TestSFTPOperator:
         assert lineage.outputs == expected[1]
 
     @pytest.mark.parametrize(
-        "operation, expected",
+        ("operation", "expected"),
         TEST_GET_PUT_PARAMS,
     )
     @mock.patch("airflow.providers.ssh.hooks.ssh.SSHHook.get_conn", spec=paramiko.SSHClient)

{apache_airflow_providers_sftp-5.4.0rc1 → apache_airflow_providers_sftp-5.5.1}/tests/unit/sftp/sensors/test_sftp.py

@@ -25,7 +25,7 @@ import pytest
 from paramiko.sftp import SFTP_FAILURE
 from pendulum import datetime as pendulum_datetime, timezone
 
-from airflow.exceptions import AirflowException
+from airflow.providers.common.compat.sdk import AirflowException
 from airflow.providers.sftp.sensors.sftp import SFTPSensor
 from airflow.sensors.base import PokeReturnValue
 
@@ -242,7 +242,7 @@ class TestSFTPSensor:
         assert not output
 
     @pytest.mark.parametrize(
-        "op_args, op_kwargs,",
+        ("op_args", "op_kwargs"),
         [
             pytest.param(("op_arg_1",), {"key": "value"}),
             pytest.param((), {}),
@@ -274,7 +274,7 @@ class TestSFTPSensor:
         }
 
     @pytest.mark.parametrize(
-        "op_args, op_kwargs,",
+        ("op_args", "op_kwargs"),
         [
             pytest.param(("op_arg_1",), {"key": "value"}),
             pytest.param((), {}),

{apache_airflow_providers_sftp-5.4.0rc1 → apache_airflow_providers_sftp-5.5.1}/tests/unit/sftp/triggers/test_sftp.py

@@ -24,7 +24,7 @@ from unittest import mock
 import pytest
 from asyncssh.sftp import SFTPAttrs, SFTPName
 
-from airflow.exceptions import AirflowException
+from airflow.providers.common.compat.sdk import AirflowException
 from airflow.providers.sftp.triggers.sftp import SFTPTrigger
 from airflow.triggers.base import TriggerEvent