apache-airflow-providers-sftp 5.3.3__tar.gz → 5.3.4__tar.gz

{apache_airflow_providers_sftp-5.3.3 → apache_airflow_providers_sftp-5.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apache-airflow-providers-sftp
-Version: 5.3.3
+Version: 5.3.4
 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>
@@ -22,13 +22,13 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: System :: Monitoring
 Requires-Dist: apache-airflow>=2.10.0
 Requires-Dist: apache-airflow-providers-ssh>=4.0.0
-Requires-Dist: paramiko>=2.9.0
+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.3.3/changelog.html
-Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-sftp/5.3.3
+Project-URL: Changelog, https://airflow.apache.org/docs/apache-airflow-providers-sftp/5.3.4/changelog.html
+Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-sftp/5.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
@@ -61,7 +61,7 @@ Provides-Extra: openlineage
 
 Package ``apache-airflow-providers-sftp``
 
-Release: ``5.3.3``
+Release: ``5.3.4``
 
 Release Date: ``|PypiReleaseDate|``
 
@@ -75,7 +75,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.3.3/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-sftp/5.3.4/>`_.
 
 Installation
 ------------
@@ -94,7 +94,7 @@ PIP package                       Version required
 ================================  ==================
 ``apache-airflow``                ``>=2.10.0``
 ``apache-airflow-providers-ssh``  ``>=4.0.0``
-``paramiko``                      ``>=2.9.0``
+``paramiko``                      ``>=2.9.0,<4.0.0``
 ``asyncssh``                      ``>=2.12.0``
 ================================  ==================
 
@@ -120,5 +120,5 @@ Dependent package
 ==================================================================================================================  =================
 
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-sftp/5.3.3/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-sftp/5.3.4/changelog.html>`_.
 

{apache_airflow_providers_sftp-5.3.3 → apache_airflow_providers_sftp-5.3.4}/README.rst

@@ -23,7 +23,7 @@
 
 Package ``apache-airflow-providers-sftp``
 
-Release: ``5.3.3``
+Release: ``5.3.4``
 
 Release Date: ``|PypiReleaseDate|``
 
@@ -37,7 +37,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.3.3/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-sftp/5.3.4/>`_.
 
 Installation
 ------------
@@ -56,7 +56,7 @@ PIP package                       Version required
 ================================  ==================
 ``apache-airflow``                ``>=2.10.0``
 ``apache-airflow-providers-ssh``  ``>=4.0.0``
-``paramiko``                      ``>=2.9.0``
+``paramiko``                      ``>=2.9.0,<4.0.0``
 ``asyncssh``                      ``>=2.12.0``
 ================================  ==================
 
@@ -82,4 +82,4 @@ Dependent package
 ==================================================================================================================  =================
 
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-sftp/5.3.3/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-sftp/5.3.4/changelog.html>`_.

{apache_airflow_providers_sftp-5.3.3 → apache_airflow_providers_sftp-5.3.4}/docs/changelog.rst

@@ -27,6 +27,22 @@
 Changelog
 ---------
 
+5.3.4
+.....
+
+Bug Fixes
+~~~~~~~~~
+
+* ``Fix missing prefetch arg to SFTPOperator (#53906)``
+
+Misc
+~~~~
+
+* ``Limit paramiko to '< 4.0.0' till we remove DSS support (#54078)``
+
+.. Below changes are excluded from the changelog. Move them to
+   appropriate section above if needed. Do not delete the lines(!):
+
 5.3.3
 .....
 

{apache_airflow_providers_sftp-5.3.3 → apache_airflow_providers_sftp-5.3.4}/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.3.3
+Release: 5.3.4
 
 Release Date: ``|PypiReleaseDate|``
 
@@ -97,7 +97,7 @@ PIP package                       Version required
 ================================  ==================
 ``apache-airflow``                ``>=2.10.0``
 ``apache-airflow-providers-ssh``  ``>=4.0.0``
-``paramiko``                      ``>=2.9.0``
+``paramiko``                      ``>=2.9.0,<4.0.0``
 ``asyncssh``                      ``>=2.12.0``
 ================================  ==================
 
@@ -128,5 +128,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.3.3 sdist package <https://downloads.apache.org/airflow/providers/apache_airflow_providers_sftp-5.3.3.tar.gz>`_ (`asc <https://downloads.apache.org/airflow/providers/apache_airflow_providers_sftp-5.3.3.tar.gz.asc>`__, `sha512 <https://downloads.apache.org/airflow/providers/apache_airflow_providers_sftp-5.3.3.tar.gz.sha512>`__)
-* `The apache-airflow-providers-sftp 5.3.3 wheel package <https://downloads.apache.org/airflow/providers/apache_airflow_providers_sftp-5.3.3-py3-none-any.whl>`_ (`asc <https://downloads.apache.org/airflow/providers/apache_airflow_providers_sftp-5.3.3-py3-none-any.whl.asc>`__, `sha512 <https://downloads.apache.org/airflow/providers/apache_airflow_providers_sftp-5.3.3-py3-none-any.whl.sha512>`__)
+* `The apache-airflow-providers-sftp 5.3.4 sdist package <https://downloads.apache.org/airflow/providers/apache_airflow_providers_sftp-5.3.4.tar.gz>`_ (`asc <https://downloads.apache.org/airflow/providers/apache_airflow_providers_sftp-5.3.4.tar.gz.asc>`__, `sha512 <https://downloads.apache.org/airflow/providers/apache_airflow_providers_sftp-5.3.4.tar.gz.sha512>`__)
+* `The apache-airflow-providers-sftp 5.3.4 wheel package <https://downloads.apache.org/airflow/providers/apache_airflow_providers_sftp-5.3.4-py3-none-any.whl>`_ (`asc <https://downloads.apache.org/airflow/providers/apache_airflow_providers_sftp-5.3.4-py3-none-any.whl.asc>`__, `sha512 <https://downloads.apache.org/airflow/providers/apache_airflow_providers_sftp-5.3.4-py3-none-any.whl.sha512>`__)

{apache_airflow_providers_sftp-5.3.3 → apache_airflow_providers_sftp-5.3.4}/provider.yaml

@@ -22,12 +22,13 @@ description: |
     `SSH File Transfer Protocol (SFTP) <https://tools.ietf.org/wg/secsh/draft-ietf-secsh-filexfer/>`__
 
 state: ready
-source-date-epoch: 1753691894
+source-date-epoch: 1754503469
 # 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.3.4
   - 5.3.3
   - 5.3.2
   - 5.3.1

{apache_airflow_providers_sftp-5.3.3 → apache_airflow_providers_sftp-5.3.4}/pyproject.toml

@@ -25,7 +25,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "apache-airflow-providers-sftp"
-version = "5.3.3"
+version = "5.3.4"
 description = "Provider package apache-airflow-providers-sftp for Apache Airflow"
 readme = "README.rst"
 authors = [
@@ -59,7 +59,8 @@ requires-python = ">=3.10"
 dependencies = [
     "apache-airflow>=2.10.0",
     "apache-airflow-providers-ssh>=4.0.0",
-    "paramiko>=2.9.0",
+    # 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",
 ]
 
@@ -110,8 +111,8 @@ apache-airflow-providers-common-sql = {workspace = true}
 apache-airflow-providers-standard = {workspace = true}
 
 [project.urls]
-"Documentation" = "https://airflow.apache.org/docs/apache-airflow-providers-sftp/5.3.3"
-"Changelog" = "https://airflow.apache.org/docs/apache-airflow-providers-sftp/5.3.3/changelog.html"
+"Documentation" = "https://airflow.apache.org/docs/apache-airflow-providers-sftp/5.3.4"
+"Changelog" = "https://airflow.apache.org/docs/apache-airflow-providers-sftp/5.3.4/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.3.3 → apache_airflow_providers_sftp-5.3.4}/src/airflow/providers/sftp/__init__.py

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

{apache_airflow_providers_sftp-5.3.3 → apache_airflow_providers_sftp-5.3.4}/src/airflow/providers/sftp/hooks/sftp.py

@@ -358,7 +358,11 @@ class SFTPHook(SSHHook):
                 self.retrieve_file(file_path, new_local_path, prefetch)
 
     def retrieve_directory_concurrently(
-        self, remote_full_path: str, local_full_path: str, workers: int = os.cpu_count() or 2
+        self,
+        remote_full_path: str,
+        local_full_path: str,
+        workers: int = os.cpu_count() or 2,
+        prefetch: bool = True,
     ) -> None:
         """
         Transfer the remote directory to a local location concurrently.
@@ -405,6 +409,7 @@ class SFTPHook(SSHHook):
                         conns[i],
                         local_file_chunks[i],
                         remote_file_chunks[i],
+                        prefetch,
                     )
                     for i in range(workers)
                 ]

{apache_airflow_providers_sftp-5.3.3 → apache_airflow_providers_sftp-5.3.4}/src/airflow/providers/sftp/operators/sftp.py

@@ -76,6 +76,7 @@ class SFTPOperator(BaseOperator):
             )
     :param concurrency: Number of threads when transferring directories. Each thread opens a new SFTP connection.
         This parameter is used only when transferring directories, not individual files. (Default is 1)
+    :param prefetch: controls whether prefetch is performed (default: True)
 
     """
 
@@ -93,6 +94,7 @@ class SFTPOperator(BaseOperator):
         confirm: bool = True,
         create_intermediate_dirs: bool = False,
         concurrency: int = 1,
+        prefetch: bool = True,
         **kwargs,
     ) -> None:
         super().__init__(**kwargs)
@@ -105,6 +107,7 @@ class SFTPOperator(BaseOperator):
         self.local_filepath = local_filepath
         self.remote_filepath = remote_filepath
         self.concurrency = concurrency
+        self.prefetch = prefetch
 
     def execute(self, context: Any) -> str | list[str] | None:
         if self.local_filepath is None:
@@ -173,6 +176,7 @@ class SFTPOperator(BaseOperator):
                                     _remote_filepath,
                                     _local_filepath,
                                     workers=self.concurrency,
+                                    prefetch=self.prefetch,
                                 )
                             elif self.concurrency == 1:
                                 self.sftp_hook.retrieve_directory(_remote_filepath, _local_filepath)

{apache_airflow_providers_sftp-5.3.3 → apache_airflow_providers_sftp-5.3.4}/src/airflow/providers/sftp/triggers/sftp.py

@@ -84,7 +84,7 @@ class SFTPTrigger(BaseTrigger):
           check whether the last modified time is greater, if true return file if false it polls again.
         """
         hook = self._get_async_hook()
-        exc = None
+
         if isinstance(self.newer_than, str):
             self.newer_than = parse_date(self.newer_than)
         _newer_than = convert_to_utc(self.newer_than) if self.newer_than else None

{apache_airflow_providers_sftp-5.3.3 → apache_airflow_providers_sftp-5.3.4}/tests/unit/sftp/operators/test_sftp.py

@@ -96,6 +96,21 @@ class TestSFTPOperator:
         if os.path.exists(self.test_remote_dir):
             os.rmdir(self.test_remote_dir)
 
+    def test_default_args(self):
+        operator = SFTPOperator(
+            task_id="test_default_args",
+            remote_filepath="/tmp/remote_file",
+        )
+        assert operator.operation == SFTPOperation.PUT
+        assert operator.confirm is True
+        assert operator.create_intermediate_dirs is False
+        assert operator.concurrency == 1
+        assert operator.prefetch is True
+        assert operator.local_filepath is None
+        assert operator.sftp_hook is None
+        assert operator.ssh_conn_id is None
+        assert operator.remote_host is None
+
     @pytest.mark.skipif(AIRFLOW_V_3_0_PLUS, reason="Pickle support is removed in Airflow 3")
     @conf_vars({("core", "enable_xcom_pickling"): "True"})
     def test_pickle_file_transfer_put(self, dag_maker):
@@ -442,8 +457,7 @@ class TestSFTPOperator:
             concurrency=2,
         ).execute(None)
         assert mock_get.call_count == 1
-        args, _ = mock_get.call_args_list[0]
-        assert args == (remote_dirpath, local_dirpath)
+        assert mock_get.call_args == mock.call(remote_dirpath, local_dirpath, workers=2, prefetch=True)
 
     @mock.patch("airflow.providers.sftp.operators.sftp.SFTPHook.store_file")
     def test_str_filepaths_put(self, mock_get):