Skip to content

Replace models.BaseOperator to Task SDK one for SFTP #52435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
potiuk merged 3 commits into from
Jun 29, 2025
Merged

Replace models.BaseOperator to Task SDK one for SFTP #52435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4a32d64
Replace models.BaseOperator to Task SDK one for SFTP
jroachgolf84 Jun 29, 2025
c97fe8b
Merge branch 'main' into issue-52378-sftp
jroachgolf84 Jun 29, 2025
2de419d
Resolve MC, adding PokeReturnValue to version_compat.py
jroachgolf84 Jun 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion providers/sftp/src/airflow/providers/sftp/operators/sftp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
import paramiko

from airflow.exceptions import AirflowException
from airflow.models import BaseOperator
from airflow.providers.sftp.hooks.sftp import SFTPHook
from airflow.providers.sftp.version_compat import BaseOperator


class SFTPOperation:
Expand Down
7 changes: 1 addition & 6 deletions providers/sftp/src/airflow/providers/sftp/sensors/sftp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,9 @@
from airflow.exceptions import AirflowException
from airflow.providers.sftp.hooks.sftp import SFTPHook
from airflow.providers.sftp.triggers.sftp import SFTPTrigger
from airflow.providers.sftp.version_compat import AIRFLOW_V_3_0_PLUS
from airflow.providers.sftp.version_compat import BaseSensorOperator, PokeReturnValue
from airflow.utils.timezone import convert_to_utc, parse

if AIRFLOW_V_3_0_PLUS:
from airflow.sdk import BaseSensorOperator, PokeReturnValue
else:
from airflow.sensors.base import BaseSensorOperator, PokeReturnValue # type: ignore[no-redef]

if TYPE_CHECKING:
try:
from airflow.sdk.definitions.context import Context
Expand Down
8 changes: 8 additions & 0 deletions providers/sftp/src/airflow/providers/sftp/version_compat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,11 @@ 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.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", "BaseOperator", "BaseSensorOperator", "PokeReturnValue"]
Loading