Skip to content

Commit ebc0678

Browse files
authored
Replace models.BaseOperator to Task SDK one for SFTP (#52435)
* Replace models.BaseOperator to Task SDK one for SFTP * Resolve MC, adding PokeReturnValue to version_compat.py
1 parent 56c4701 commit ebc0678

3 files changed

Lines changed: 10 additions & 7 deletions

File tree

providers/sftp/src/airflow/providers/sftp/operators/sftp.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
import paramiko
2929

3030
from airflow.exceptions import AirflowException
31-
from airflow.models import BaseOperator
3231
from airflow.providers.sftp.hooks.sftp import SFTPHook
32+
from airflow.providers.sftp.version_compat import BaseOperator
3333

3434

3535
class SFTPOperation:

providers/sftp/src/airflow/providers/sftp/sensors/sftp.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,9 @@
3030
from airflow.exceptions import AirflowException
3131
from airflow.providers.sftp.hooks.sftp import SFTPHook
3232
from airflow.providers.sftp.triggers.sftp import SFTPTrigger
33-
from airflow.providers.sftp.version_compat import AIRFLOW_V_3_0_PLUS
33+
from airflow.providers.sftp.version_compat import BaseSensorOperator, PokeReturnValue
3434
from airflow.utils.timezone import convert_to_utc, parse
3535

36-
if AIRFLOW_V_3_0_PLUS:
37-
from airflow.sdk import BaseSensorOperator, PokeReturnValue
38-
else:
39-
from airflow.sensors.base import BaseSensorOperator, PokeReturnValue # type: ignore[no-redef]
40-
4136
if TYPE_CHECKING:
4237
try:
4338
from airflow.sdk.definitions.context import Context

providers/sftp/src/airflow/providers/sftp/version_compat.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,11 @@ def get_base_airflow_version_tuple() -> tuple[int, int, int]:
3333

3434

3535
AIRFLOW_V_3_0_PLUS = get_base_airflow_version_tuple() >= (3, 0, 0)
36+
37+
if AIRFLOW_V_3_0_PLUS:
38+
from airflow.sdk import BaseOperator, BaseSensorOperator, PokeReturnValue
39+
else:
40+
from airflow.models import BaseOperator
41+
from airflow.sensors.base import BaseSensorOperator, PokeReturnValue # type: ignore[no-redef]
42+
43+
__all__ = ["AIRFLOW_V_3_0_PLUS", "BaseOperator", "BaseSensorOperator", "PokeReturnValue"]

0 commit comments

Comments
 (0)