apache-airflow-providers-teradata 3.2.1rc1__py3-none-any.whl → 3.2.2rc1__py3-none-any.whl

airflow/providers/teradata/__init__.py

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

airflow/providers/teradata/hooks/bteq.py

@@ -37,6 +37,7 @@ from airflow.providers.teradata.utils.bteq_util import (
     verify_bteq_installed,
     verify_bteq_installed_remote,
 )
+from airflow.providers.teradata.utils.constants import Constants
 from airflow.providers.teradata.utils.encryption_utils import (
     decrypt_remote_file_to_string,
     generate_encrypted_file_with_openssl,
@@ -158,7 +159,7 @@ class BteqHook(TtuHook):
             if self.ssh_hook and self.ssh_hook.get_conn():
                 with self.ssh_hook.get_conn() as ssh_client:
                     if ssh_client is None:
-                        raise AirflowException("Failed to establish SSH connection. `ssh_client` is None.")
+                        raise AirflowException(Constants.BTEQ_REMOTE_ERROR_MSG)
                     verify_bteq_installed_remote(ssh_client)
                     password = generate_random_password()  # Encryption/Decryption password
                     encrypted_file_path = os.path.join(tmp_dir, "bteq_script.enc")
@@ -170,7 +171,6 @@ class BteqHook(TtuHook):
                         )
                     remote_encrypted_path = os.path.join(remote_working_dir or "", "bteq_script.enc")
                     remote_encrypted_path = remote_encrypted_path.replace("/", "\\")
-
                     transfer_file_sftp(ssh_client, encrypted_file_path, remote_encrypted_path)
 
                     bteq_command_str = prepare_bteq_command_for_remote_execution(
@@ -204,24 +204,20 @@ class BteqHook(TtuHook):
                             else [bteq_quit_rc if bteq_quit_rc is not None else 0]
                         )
                     ):
-                        raise AirflowException(f"BTEQ task failed with error: {failure_message}")
+                        raise AirflowException(f"Failed to execute BTEQ script : {failure_message}")
                     if failure_message:
                         self.log.warning(failure_message)
                     return exit_status
             else:
-                raise AirflowException("SSH connection is not established. `ssh_hook` is None or invalid.")
+                raise AirflowException(Constants.BTEQ_REMOTE_ERROR_MSG)
         except (OSError, socket.gaierror):
-            raise AirflowException(
-                "SSH connection timed out. Please check the network or server availability."
-            )
+            raise AirflowException(Constants.BTEQ_REMOTE_ERROR_MSG)
         except SSHException as e:
-            raise AirflowException(f"An unexpected error occurred during SSH connection: {str(e)}")
+            raise AirflowException(f"{Constants.BTEQ_REMOTE_ERROR_MSG}: {str(e)}")
         except AirflowException as e:
             raise e
         except Exception as e:
-            raise AirflowException(
-                f"An unexpected error occurred while executing BTEQ script on remote machine: {str(e)}"
-            )
+            raise AirflowException(f"{Constants.BTEQ_REMOTE_ERROR_MSG}: {str(e)}")
         finally:
             # Remove the local script file
             if encrypted_file_path and os.path.exists(encrypted_file_path):
@@ -276,12 +272,12 @@ class BteqHook(TtuHook):
             process.wait(timeout=timeout + 60)  # Adding 1 minute extra for BTEQ script timeout
         except subprocess.TimeoutExpired:
             self.on_kill()
-            raise AirflowException(f"BTEQ command timed out after {timeout} seconds.")
+            raise AirflowException(Constants.BTEQ_TIMEOUT_ERROR_MSG, timeout)
         conn = self.get_conn()
         conn["sp"] = process  # For `on_kill` support
         failure_message = None
         if stdout_data is None:
-            raise AirflowException("Process stdout is None. Unable to read BTEQ output.")
+            raise AirflowException(Constants.BTEQ_UNEXPECTED_ERROR_MSG)
         decoded_line = ""
         for line in stdout_data.splitlines():
             try:
@@ -302,7 +298,7 @@ class BteqHook(TtuHook):
                 else [bteq_quit_rc if bteq_quit_rc is not None else 0]
             )
         ):
-            raise AirflowException(f"BTEQ task failed with error: {failure_message}")
+            raise AirflowException(f"{Constants.BTEQ_UNEXPECTED_ERROR_MSG}: {failure_message}")
         if failure_message:
             self.log.warning(failure_message)
 
@@ -320,7 +316,7 @@ class BteqHook(TtuHook):
                 self.log.warning("Subprocess did not terminate in time. Forcing kill...")
                 process.kill()
             except Exception as e:
-                self.log.error("Failed to terminate subprocess: %s", str(e))
+                self.log.error("%s : %s", Constants.BTEQ_UNEXPECTED_ERROR_MSG, str(e))
 
     def get_airflow_home_dir(self) -> str:
         """Get the AIRFLOW_HOME directory."""
@@ -331,7 +327,9 @@ class BteqHook(TtuHook):
         try:
             temp_dir = tempfile.gettempdir()
             if not os.path.isdir(temp_dir) or not os.access(temp_dir, os.W_OK):
-                raise OSError("OS temp dir not usable")
+                raise OSError(
+                    f"Failed to execute the BTEQ script due to Temporary directory {temp_dir} is not writable."
+                )
         except Exception:
             temp_dir = self.get_airflow_home_dir()
 

airflow/providers/teradata/hooks/teradata.py

@@ -22,8 +22,8 @@ from __future__ import annotations
 import re
 from typing import TYPE_CHECKING, Any
 
-import sqlalchemy
 import teradatasql
+from sqlalchemy.engine import URL
 from teradatasql import TeradataConnection
 
 from airflow.providers.common.sql.hooks.sql import DbApiHook
@@ -34,6 +34,7 @@ if TYPE_CHECKING:
     except ImportError:
         from airflow.models.connection import Connection  # type: ignore[assignment]
 
+DEFAULT_DB_PORT = 1025
 PARAM_TYPES = {bool, float, int, str}
 
 
@@ -166,7 +167,7 @@ class TeradataHook(DbApiHook):
         conn: Connection = self.get_connection(self.get_conn_id())
         conn_config = {
             "host": conn.host or "localhost",
-            "dbs_port": conn.port or "1025",
+            "dbs_port": conn.port or DEFAULT_DB_PORT,
             "database": conn.schema or "",
             "user": conn.login or "dbc",
             "password": conn.password or "dbc",
@@ -195,12 +196,28 @@ class TeradataHook(DbApiHook):
 
         return conn_config
 
-    def get_sqlalchemy_engine(self, engine_kwargs=None):
-        """Return a connection object using sqlalchemy."""
-        conn: Connection = self.get_connection(self.get_conn_id())
-        link = f"teradatasql://{conn.login}:{conn.password}@{conn.host}"
-        connection = sqlalchemy.create_engine(link)
-        return connection
+    @property
+    def sqlalchemy_url(self) -> URL:
+        """
+         Override to return a Sqlalchemy.engine.URL object from the Teradata connection.
+
+        :return: the extracted sqlalchemy.engine.URL object.
+        """
+        connection = self.get_connection(self.get_conn_id())
+        # Adding only teradatasqlalchemy supported connection parameters.
+        # https://pypi.org/project/teradatasqlalchemy/#ConnectionParameters
+        return URL.create(
+            drivername="teradatasql",
+            username=connection.login,
+            password=connection.password,
+            host=connection.host,
+            port=connection.port,
+            database=connection.schema if connection.schema else None,
+        )
+
+    def get_uri(self) -> str:
+        """Override DbApiHook get_uri method for get_sqlalchemy_engine()."""
+        return self.sqlalchemy_url.render_as_string()
 
     @staticmethod
     def get_ui_field_behaviour() -> dict:

airflow/providers/teradata/hooks/ttu.py

@@ -22,7 +22,7 @@ from abc import ABC
 from typing import Any
 
 from airflow.exceptions import AirflowException
-from airflow.providers.teradata.version_compat import BaseHook
+from airflow.providers.common.compat.sdk import BaseHook
 
 
 class TtuHook(BaseHook, ABC):

airflow/providers/teradata/operators/bteq.py

@@ -27,19 +27,16 @@ from airflow.providers.teradata.utils.bteq_util import (
     prepare_bteq_script_for_remote_execution,
     read_file,
 )
+from airflow.providers.teradata.utils.constants import Constants
 
 if TYPE_CHECKING:
     from paramiko import SSHClient
 
-    try:
-        from airflow.sdk.definitions.context import Context
-    except ImportError:
-        from airflow.utils.context import Context
-
+    from airflow.providers.common.compat.sdk import Context
+from airflow.providers.common.compat.sdk import BaseOperator
 from airflow.providers.ssh.hooks.ssh import SSHHook
 from airflow.providers.teradata.hooks.bteq import BteqHook
 from airflow.providers.teradata.hooks.teradata import TeradataHook
-from airflow.providers.teradata.version_compat import BaseOperator
 
 
 def contains_template(parameter_value):
@@ -114,9 +111,7 @@ class BteqOperator(BaseOperator):
     def execute(self, context: Context) -> int | None:
         """Execute BTEQ code using the BteqHook."""
         if not self.sql and not self.file_path:
-            raise ValueError(
-                "BteqOperator requires either the 'sql' or 'file_path' parameter. Both are missing."
-            )
+            raise ValueError(Constants.BTEQ_MISSED_PARAMS)
         self._hook = BteqHook(teradata_conn_id=self.teradata_conn_id, ssh_conn_id=self.ssh_conn_id)
         self._ssh_hook = SSHHook(ssh_conn_id=self.ssh_conn_id) if self.ssh_conn_id else None
 
@@ -159,15 +154,13 @@ class BteqOperator(BaseOperator):
                 )
             if self.file_path:
                 if not is_valid_file(self.file_path):
-                    raise ValueError(
-                        f"The provided file path '{self.file_path}' is invalid or does not exist."
-                    )
+                    raise ValueError(Constants.BTEQ_INVALID_PATH % self.file_path)
                 try:
                     is_valid_encoding(self.file_path, self.temp_file_read_encoding or "UTF-8")
                 except UnicodeDecodeError as e:
-                    errmsg = f"The provided file '{self.file_path}' encoding is different from BTEQ I/O encoding i.e.'UTF-8'."
+                    errmsg = Constants.BTEQ_INVALID_CHARSET % (self.file_path, "UTF-8")
                     if self.bteq_script_encoding:
-                        errmsg = f"The provided file '{self.file_path}' encoding is different from the specified BTEQ I/O encoding '{self.bteq_script_encoding}'."
+                        errmsg = Constants.BTEQ_INVALID_CHARSET % (self.file_path, self.bteq_script_encoding)
                     raise ValueError(errmsg) from e
                 return self._handle_local_bteq_file(
                     file_path=self.file_path,
@@ -200,13 +193,9 @@ class BteqOperator(BaseOperator):
                             file_path=self.file_path,
                             context=context,
                         )
-                    raise ValueError(
-                        f"The provided remote file path '{self.file_path}' is invalid or file does not exist on remote machine at given path."
-                    )
+                    raise ValueError(Constants.BTEQ_REMOTE_FILE_PATH_INVALID % self.file_path)
             else:
-                raise ValueError(
-                    "BteqOperator requires either the 'sql' or 'file_path' parameter. Both are missing."
-                )
+                raise ValueError(Constants.BTEQ_MISSED_PARAMS)
         return None
 
     def _handle_remote_bteq_file(
@@ -242,9 +231,7 @@ class BteqOperator(BaseOperator):
                         self.temp_file_read_encoding,
                     )
             return None
-        raise ValueError(
-            "Please provide a valid file path for the BTEQ script to be executed on the remote machine."
-        )
+        raise ValueError(Constants.BTEQ_MISSED_PARAMS)
 
     def _handle_local_bteq_file(
         self,

airflow/providers/teradata/operators/teradata.py

@@ -20,16 +20,12 @@ from __future__ import annotations
 from collections.abc import Sequence
 from typing import TYPE_CHECKING, ClassVar
 
+from airflow.providers.common.compat.sdk import BaseOperator
 from airflow.providers.common.sql.operators.sql import SQLExecuteQueryOperator
 from airflow.providers.teradata.hooks.teradata import TeradataHook
-from airflow.providers.teradata.version_compat import BaseOperator
 
 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 TeradataOperator(SQLExecuteQueryOperator):

airflow/providers/teradata/operators/teradata_compute_cluster.py

@@ -23,16 +23,12 @@ from enum import Enum
 from functools import cached_property
 from typing import TYPE_CHECKING
 
+from airflow.providers.common.compat.sdk import BaseOperator
 from airflow.providers.teradata.hooks.teradata import TeradataHook
 from airflow.providers.teradata.utils.constants import Constants
-from airflow.providers.teradata.version_compat import BaseOperator
 
 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
 
 from collections.abc import Sequence
 from datetime import timedelta
@@ -41,11 +37,7 @@ from typing import TYPE_CHECKING, Any, cast
 from airflow.providers.teradata.triggers.teradata_compute_cluster import TeradataComputeClusterSyncTrigger
 
 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
 
 from airflow.exceptions import AirflowException
 
@@ -125,34 +117,40 @@ class _TeradataComputeClusterOperator(BaseOperator):
         """
         self._compute_cluster_execute_complete(event)
 
-    def _compute_cluster_execute(self):
+    def _compute_cluster_execute(self, operation: str | None = None):
         # Verifies the provided compute profile name.
         if (
             self.compute_profile_name is None
             or self.compute_profile_name == "None"
             or self.compute_profile_name == ""
         ):
-            self.log.info("Invalid compute cluster profile name")
-            raise AirflowException(Constants.CC_OPR_EMPTY_PROFILE_ERROR_MSG)
-        # Verifies if the provided Teradata instance belongs to Vantage Cloud Lake.
-        lake_support_find_sql = "SELECT count(1) from DBC.StorageV WHERE StorageName='TD_OFSSTORAGE'"
-        lake_support_result = self.hook.run(lake_support_find_sql, handler=_single_result_row_handler)
-        if lake_support_result is None:
-            raise AirflowException(Constants.CC_GRP_LAKE_SUPPORT_ONLY_MSG)
+            raise AirflowException(Constants.CC_OPR_EMPTY_PROFILE_ERROR_MSG % operation)
+        try:
+            # Verifies if the provided Teradata instance belongs to Vantage Cloud Lake.
+            lake_support_find_sql = "SELECT count(1) from DBC.StorageV WHERE StorageName='TD_OFSSTORAGE'"
+            lake_support_result = self.hook.run(lake_support_find_sql, handler=_single_result_row_handler)
+            if lake_support_result is None:
+                raise AirflowException(Constants.CC_GRP_LAKE_SUPPORT_ONLY_MSG % operation)
+        except Exception:
+            raise AirflowException(Constants.CC_GRP_LAKE_SUPPORT_ONLY_MSG % operation)
         # Getting teradata db version. Considering teradata instance is Lake when db version is 20 or above
         db_version_get_sql = "SELECT  InfoData AS Version FROM DBC.DBCInfoV WHERE InfoKey = 'VERSION'"
         try:
             db_version_result = self.hook.run(db_version_get_sql, handler=_single_result_row_handler)
             if db_version_result is not None:
-                db_version_result = str(db_version_result)
-                db_version = db_version_result.split(".")[0]
+                # Safely extract the actual version string from the result
+                if isinstance(db_version_result, (list, tuple)) and db_version_result:
+                    # e.g., if it's a tuple like ('17.10',), get the first element
+                    version_str = str(db_version_result[0])
+                else:
+                    version_str = str(db_version_result)  # fallback, should be rare
+                db_version = version_str.split(".")[0]
                 if db_version is not None and int(db_version) < 20:
-                    raise AirflowException(Constants.CC_GRP_LAKE_SUPPORT_ONLY_MSG)
+                    raise AirflowException(Constants.CC_GRP_LAKE_SUPPORT_ONLY_MSG % operation)
             else:
-                raise AirflowException("Error occurred while getting teradata database version")
-        except Exception as ex:
-            self.log.error("Error occurred while getting teradata database version: %s ", str(ex))
-            raise AirflowException("Error occurred while getting teradata database version")
+                raise AirflowException(Constants.CC_ERR_VERSION_GET)
+        except Exception:
+            raise AirflowException(Constants.CC_ERR_VERSION_GET)
 
     def _compute_cluster_execute_complete(self, event: dict[str, Any]) -> None:
         if event["status"] == "success":
@@ -270,8 +268,8 @@ class TeradataComputeClusterProvisionOperator(_TeradataComputeClusterOperator):
         """
         return self._compute_cluster_execute()
 
-    def _compute_cluster_execute(self):
-        super()._compute_cluster_execute()
+    def _compute_cluster_execute(self, operation: str | None = None):
+        super()._compute_cluster_execute("Provision")
         if self.compute_group_name:
             cg_status_query = (
                 "SELECT  count(1) FROM DBC.ComputeGroups WHERE UPPER(ComputeGroupName) = UPPER('"
@@ -300,7 +298,8 @@ class TeradataComputeClusterProvisionOperator(_TeradataComputeClusterOperator):
         cp_status_result = self._hook_run(cp_status_query, handler=_single_result_row_handler)
         if cp_status_result is not None:
             cp_status_result = str(cp_status_result)
-            msg = f"Compute Profile {self.compute_profile_name} is already exists under Compute Group {self.compute_group_name}. Status is {cp_status_result}"
+            msg = f"Compute Profile '{self.compute_profile_name}' already exists under Compute Group '{self.compute_group_name}'. Status: {cp_status_result}."
+
             self.log.info(msg)
             return cp_status_result
         create_cp_query = self._build_ccp_setup_query()
@@ -357,21 +356,22 @@ class TeradataComputeClusterDecommissionOperator(_TeradataComputeClusterOperator
         """
         return self._compute_cluster_execute()
 
-    def _compute_cluster_execute(self):
-        super()._compute_cluster_execute()
+    def _compute_cluster_execute(self, operation: str | None = None):
+        super()._compute_cluster_execute("Decommission")
         cp_drop_query = "DROP COMPUTE PROFILE " + self.compute_profile_name
         if self.compute_group_name:
             cp_drop_query = cp_drop_query + " IN COMPUTE GROUP " + self.compute_group_name
         self._hook_run(cp_drop_query, handler=_single_result_row_handler)
         self.log.info(
-            "Compute Profile %s IN Compute Group %s is successfully dropped",
+            "Compute Profile %s in Compute Group %s is successfully dropped.",
             self.compute_profile_name,
             self.compute_group_name,
         )
-        if self.delete_compute_group:
+
+        if self.delete_compute_group and self.compute_group_name:
             cg_drop_query = "DROP COMPUTE GROUP " + self.compute_group_name
             self._hook_run(cg_drop_query, handler=_single_result_row_handler)
-            self.log.info("Compute Group %s is successfully dropped", self.compute_group_name)
+            self.log.info("Compute Group %s is successfully dropped.", self.compute_group_name)
 
 
 class TeradataComputeClusterResumeOperator(_TeradataComputeClusterOperator):
@@ -417,8 +417,8 @@ class TeradataComputeClusterResumeOperator(_TeradataComputeClusterOperator):
         """
         return self._compute_cluster_execute()
 
-    def _compute_cluster_execute(self):
-        super()._compute_cluster_execute()
+    def _compute_cluster_execute(self, operation: str | None = None):
+        super()._compute_cluster_execute("Resume")
         cc_status_query = (
             "SEL ComputeProfileState FROM DBC.ComputeProfilesVX WHERE UPPER(ComputeProfileName) = UPPER('"
             + self.compute_profile_name
@@ -432,15 +432,16 @@ class TeradataComputeClusterResumeOperator(_TeradataComputeClusterOperator):
         # Generates an error message if the compute cluster does not exist for the specified
         # compute profile and compute group.
         else:
-            self.log.info(Constants.CC_GRP_PRP_NON_EXISTS_MSG)
-            raise AirflowException(Constants.CC_GRP_PRP_NON_EXISTS_MSG)
+            raise AirflowException(Constants.CC_GRP_PRP_NON_EXISTS_MSG % operation)
         if cp_status_result != Constants.CC_RESUME_DB_STATUS:
             cp_resume_query = f"RESUME COMPUTE FOR COMPUTE PROFILE {self.compute_profile_name}"
             if self.compute_group_name:
                 cp_resume_query = f"{cp_resume_query} IN COMPUTE GROUP {self.compute_group_name}"
             return self._handle_cc_status(Constants.CC_RESUME_OPR, cp_resume_query)
         self.log.info(
-            "Compute Cluster %s already %s", self.compute_profile_name, Constants.CC_RESUME_DB_STATUS
+            "Compute Cluster %s is already in '%s' status.",
+            self.compute_profile_name,
+            Constants.CC_RESUME_DB_STATUS,
         )
 
 
@@ -487,8 +488,8 @@ class TeradataComputeClusterSuspendOperator(_TeradataComputeClusterOperator):
         """
         return self._compute_cluster_execute()
 
-    def _compute_cluster_execute(self):
-        super()._compute_cluster_execute()
+    def _compute_cluster_execute(self, operation: str | None = None):
+        super()._compute_cluster_execute("Suspend")
         sql = (
             "SEL ComputeProfileState FROM DBC.ComputeProfilesVX WHERE UPPER(ComputeProfileName) = UPPER('"
             + self.compute_profile_name
@@ -502,13 +503,14 @@ class TeradataComputeClusterSuspendOperator(_TeradataComputeClusterOperator):
         # Generates an error message if the compute cluster does not exist for the specified
         # compute profile and compute group.
         else:
-            self.log.info(Constants.CC_GRP_PRP_NON_EXISTS_MSG)
-            raise AirflowException(Constants.CC_GRP_PRP_NON_EXISTS_MSG)
+            raise AirflowException(Constants.CC_GRP_PRP_NON_EXISTS_MSG % operation)
         if result != Constants.CC_SUSPEND_DB_STATUS:
             sql = f"SUSPEND COMPUTE FOR COMPUTE PROFILE {self.compute_profile_name}"
             if self.compute_group_name:
                 sql = f"{sql} IN COMPUTE GROUP {self.compute_group_name}"
             return self._handle_cc_status(Constants.CC_SUSPEND_OPR, sql)
         self.log.info(
-            "Compute Cluster %s already %s", self.compute_profile_name, Constants.CC_SUSPEND_DB_STATUS
+            "Compute Cluster %s is already in '%s' status.",
+            self.compute_profile_name,
+            Constants.CC_SUSPEND_DB_STATUS,
         )

airflow/providers/teradata/transfers/azure_blob_to_teradata.py

@@ -28,11 +28,11 @@ except ModuleNotFoundError as e:
 
     raise AirflowOptionalProviderFeatureException(e)
 
+from airflow.providers.common.compat.sdk import BaseOperator
 from airflow.providers.teradata.hooks.teradata import TeradataHook
-from airflow.providers.teradata.version_compat import BaseOperator
 
 if TYPE_CHECKING:
-    from airflow.utils.context import Context
+    from airflow.providers.common.compat.sdk import Context
 
 
 class AzureBlobStorageToTeradataOperator(BaseOperator):

airflow/providers/teradata/transfers/s3_to_teradata.py

@@ -27,15 +27,11 @@ except ModuleNotFoundError as e:
     from airflow.exceptions import AirflowOptionalProviderFeatureException
 
     raise AirflowOptionalProviderFeatureException(e)
+from airflow.providers.common.compat.sdk import BaseOperator
 from airflow.providers.teradata.hooks.teradata import TeradataHook
-from airflow.providers.teradata.version_compat import BaseOperator
 
 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 S3ToTeradataOperator(BaseOperator):

airflow/providers/teradata/transfers/teradata_to_teradata.py

@@ -21,15 +21,11 @@ from collections.abc import Sequence
 from functools import cached_property
 from typing import TYPE_CHECKING
 
+from airflow.providers.common.compat.sdk import BaseOperator
 from airflow.providers.teradata.hooks.teradata import TeradataHook
-from airflow.providers.teradata.version_compat import BaseOperator
 
 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 TeradataToTeradataOperator(BaseOperator):

airflow/providers/teradata/triggers/teradata_compute_cluster.py

@@ -73,8 +73,7 @@ class TeradataComputeClusterSyncTrigger(BaseTrigger):
             while True:
                 status = await self.get_status()
                 if status is None or len(status) == 0:
-                    self.log.info(Constants.CC_GRP_PRP_NON_EXISTS_MSG)
-                    raise AirflowException(Constants.CC_GRP_PRP_NON_EXISTS_MSG)
+                    raise AirflowException(Constants.CC_GRP_PRP_NON_EXISTS_MSG % "manage")
                 if (
                     self.operation_type == Constants.CC_SUSPEND_OPR
                     or self.operation_type == Constants.CC_CREATE_SUSPEND_OPR
@@ -108,8 +107,8 @@ class TeradataComputeClusterSyncTrigger(BaseTrigger):
                     yield TriggerEvent(
                         {
                             "status": "error",
-                            "message": Constants.CC_OPR_FAILURE_STATUS_MSG
-                            % (self.compute_profile_name, self.operation_type),
+                            "message": Constants.CC_OPR_TIMEOUT_ERROR
+                            % (self.operation_type, self.compute_profile_name),
                         }
                     )
             elif (
@@ -128,8 +127,8 @@ class TeradataComputeClusterSyncTrigger(BaseTrigger):
                     yield TriggerEvent(
                         {
                             "status": "error",
-                            "message": Constants.CC_OPR_FAILURE_STATUS_MSG
-                            % (self.compute_profile_name, self.operation_type),
+                            "message": Constants.CC_OPR_TIMEOUT_ERROR
+                            % (self.operation_type, self.compute_profile_name),
                         }
                     )
             else:
@@ -137,7 +136,7 @@ class TeradataComputeClusterSyncTrigger(BaseTrigger):
         except Exception as e:
             yield TriggerEvent({"status": "error", "message": str(e)})
         except asyncio.CancelledError:
-            self.log.error(Constants.CC_OPR_TIMEOUT_ERROR, self.operation_type)
+            self.log.error(Constants.CC_OPR_TIMEOUT_ERROR, self.operation_type, self.compute_profile_name)
 
     async def get_status(self) -> str:
         """Return compute cluster SUSPEND/RESUME operation status."""

airflow/providers/teradata/utils/constants.py

@@ -29,18 +29,21 @@ class Constants:
     CC_SUSPEND_DB_STATUS = "Suspended"
     CC_RESUME_DB_STATUS = "Running"
     CC_OPR_SUCCESS_STATUS_MSG = "Compute Cluster %s  %s operation completed successfully."
-    CC_OPR_FAILURE_STATUS_MSG = "Compute Cluster %s  %s operation has failed."
-    CC_OPR_INITIALIZING_STATUS_MSG = "The environment is currently initializing. Please wait."
-    CC_OPR_EMPTY_PROFILE_ERROR_MSG = "Please provide a valid name for the compute cluster profile."
-    CC_GRP_PRP_NON_EXISTS_MSG = "The specified Compute cluster is not present or The user doesn't have permission to access compute cluster."
-    CC_GRP_PRP_UN_AUTHORIZED_MSG = "The %s operation is not authorized for the user."
-    CC_GRP_LAKE_SUPPORT_ONLY_MSG = "Compute Groups is supported only on Vantage Cloud Lake."
-    CC_OPR_TIMEOUT_ERROR = (
-        "There is an issue with the %s operation. Kindly consult the administrator for assistance."
+    CC_OPR_EMPTY_PROFILE_ERROR_MSG = "Failed to %s the Vantage Cloud Lake Compute Cluster Instance due to an invalid compute cluster profile name."
+    CC_GRP_PRP_NON_EXISTS_MSG = "Failed to %s the Vantage Cloud Lake Compute Cluster Instance because the specified compute cluster does not exist or the user lacks the necessary permissions to access the Compute Cluster Instance."
+    CC_GRP_LAKE_SUPPORT_ONLY_MSG = "Failed to %s the Vantage Cloud Lake Compute Cluster Instance  because the Compute Cluster feature is supported only on the Vantage Cloud Lake system."
+    CC_OPR_TIMEOUT_ERROR = "Failed to %s the Vantage Cloud Lake Compute Cluster Instance `%s`. Please contact the administrator for assistance."
+    CC_ERR_VERSION_GET = "Failed to manage the Vantage Cloud Lake Compute Cluster Instance due to an error while getting the Teradata database version."
+    BTEQ_REMOTE_ERROR_MSG = (
+        "Failed to establish a SSH connection to the remote machine for executing the BTEQ script."
     )
-    CC_GRP_PRP_EXISTS_MSG = "The specified Compute cluster is already exists."
-    CC_OPR_EMPTY_COPY_PROFILE_ERROR_MSG = (
-        "Please provide a valid name for the source and target compute profile."
+    BTEQ_UNEXPECTED_ERROR_MSG = "Failure while executing BTEQ script due to unexpected error."
+    BTEQ_TIMEOUT_ERROR_MSG = "Failed to execute BTEQ script due to timeout after %s seconds."
+    BTEQ_MISSED_PARAMS = "Failed to execute BTEQ script due to missing required parameters: either 'sql' or 'file_path' must be provided."
+    BTEQ_INVALID_PATH = (
+        "Failed to execute BTEQ script due to invalid file path: '%s' does not exist or is inaccessible."
     )
+    BTEQ_INVALID_CHARSET = "Failed to execute BTEQ script because the provided file '%s' encoding differs from the specified BTEQ I/O encoding %s"
+    BTEQ_REMOTE_FILE_PATH_INVALID = "Failed to execute BTEQ script due to invalid remote file path: '%s' does not exist or is inaccessible on the remote machine."
     CC_OPR_TIME_OUT = 1200
     CC_POLL_INTERVAL = 60

airflow/providers/teradata/version_compat.py

@@ -35,14 +35,4 @@ 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
-else:
-    from airflow.models import BaseOperator
-
-__all__ = ["AIRFLOW_V_3_0_PLUS", "AIRFLOW_V_3_1_PLUS", "BaseHook", "BaseOperator"]
+__all__ = ["AIRFLOW_V_3_0_PLUS", "AIRFLOW_V_3_1_PLUS"]

{apache_airflow_providers_teradata-3.2.1rc1.dist-info → apache_airflow_providers_teradata-3.2.2rc1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apache-airflow-providers-teradata
-Version: 3.2.1rc1
+Version: 3.2.2rc1
 Summary: Provider package apache-airflow-providers-teradata for Apache Airflow
 Keywords: airflow-provider,teradata,airflow,integration
 Author-email: Apache Software Foundation <dev@airflow.apache.org>
@@ -21,6 +21,7 @@ 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-common-compat>=1.8.0rc1
 Requires-Dist: apache-airflow-providers-common-sql>=1.20.0rc1
 Requires-Dist: teradatasqlalchemy>=17.20.0.0
 Requires-Dist: teradatasql>=17.20.0.28
@@ -28,8 +29,8 @@ Requires-Dist: apache-airflow-providers-amazon ; extra == "amazon"
 Requires-Dist: apache-airflow-providers-microsoft-azure ; extra == "microsoft-azure"
 Requires-Dist: apache-airflow-providers-ssh ; extra == "ssh"
 Project-URL: Bug Tracker, https://github.com/apache/airflow/issues
-Project-URL: Changelog, https://airflow.staged.apache.org/docs/apache-airflow-providers-teradata/3.2.1/changelog.html
-Project-URL: Documentation, https://airflow.staged.apache.org/docs/apache-airflow-providers-teradata/3.2.1
+Project-URL: Changelog, https://airflow.staged.apache.org/docs/apache-airflow-providers-teradata/3.2.2/changelog.html
+Project-URL: Documentation, https://airflow.staged.apache.org/docs/apache-airflow-providers-teradata/3.2.2
 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
@@ -63,9 +64,8 @@ Provides-Extra: ssh
 
 Package ``apache-airflow-providers-teradata``
 
-Release: ``3.2.1``
+Release: ``3.2.2``
 
-Release Date: ``|PypiReleaseDate|``
 
 `Teradata <https://www.teradata.com/>`__
 
@@ -77,12 +77,12 @@ This is a provider package for ``teradata`` provider. All classes for this provi
 are in ``airflow.providers.teradata`` python package.
 
 You can find package information and changelog for the provider
-in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-teradata/3.2.1/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-teradata/3.2.2/>`_.
 
 Installation
 ------------
 
-You can install this package on top of an existing Airflow 2 installation (see ``Requirements`` below
+You can install this package on top of an existing Airflow installation (see ``Requirements`` below
 for the minimum Airflow version supported) via
 ``pip install apache-airflow-providers-teradata``
 
@@ -91,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-common-sql``  ``>=1.20.0``
-``teradatasqlalchemy``                   ``>=17.20.0.0``
-``teradatasql``                          ``>=17.20.0.28``
-=======================================  ==================
+==========================================  ==================
+PIP package                                 Version required
+==========================================  ==================
+``apache-airflow``                          ``>=2.10.0``
+``apache-airflow-providers-common-compat``  ``>=1.8.0``
+``apache-airflow-providers-common-sql``     ``>=1.20.0``
+``teradatasqlalchemy``                      ``>=17.20.0.0``
+``teradatasql``                             ``>=17.20.0.28``
+==========================================  ==================
 
 Cross provider package dependencies
 -----------------------------------
@@ -117,11 +118,23 @@ You can install such cross-provider dependencies when installing from PyPI. For
 Dependent package                                                                                                       Extra
 ======================================================================================================================  ===================
 `apache-airflow-providers-amazon <https://airflow.apache.org/docs/apache-airflow-providers-amazon>`_                    ``amazon``
+`apache-airflow-providers-common-compat <https://airflow.apache.org/docs/apache-airflow-providers-common-compat>`_      ``common.compat``
 `apache-airflow-providers-common-sql <https://airflow.apache.org/docs/apache-airflow-providers-common-sql>`_            ``common.sql``
 `apache-airflow-providers-microsoft-azure <https://airflow.apache.org/docs/apache-airflow-providers-microsoft-azure>`_  ``microsoft.azure``
 `apache-airflow-providers-ssh <https://airflow.apache.org/docs/apache-airflow-providers-ssh>`_                          ``ssh``
 ======================================================================================================================  ===================
 
+Optional dependencies
+----------------------
+
+===================  ============================================
+Extra                Dependencies
+===================  ============================================
+``microsoft.azure``  ``apache-airflow-providers-microsoft-azure``
+``amazon``           ``apache-airflow-providers-amazon``
+``ssh``              ``apache-airflow-providers-ssh``
+===================  ============================================
+
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-teradata/3.2.1/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-teradata/3.2.2/changelog.html>`_.
 

apache_airflow_providers_teradata-3.2.2rc1.dist-info/RECORD

@@ -0,0 +1,26 @@
+airflow/providers/teradata/LICENSE,sha256=gXPVwptPlW1TJ4HSuG5OMPg-a3h43OGMkZRR1rpwfJA,10850
+airflow/providers/teradata/__init__.py,sha256=0OHl3Ob126K4xiRTwrnQ0zEavSikOsWIqL20cDwr05k,1497
+airflow/providers/teradata/get_provider_info.py,sha256=SF-3YIl3CCi6mN6b9EEqLkJNyuMIM35CvY_H91QdELw,4031
+airflow/providers/teradata/version_compat.py,sha256=cmeoGMcTp0kiFa3GKZlQh31_kMk7UX9nOX8sYyGtuFg,1665
+airflow/providers/teradata/hooks/__init__.py,sha256=mlJxuZLkd5x-iq2SBwD3mvRQpt3YR7wjz_nceyF1IaI,787
+airflow/providers/teradata/hooks/bteq.py,sha256=h-_TfOZ4BU7PjTW48Bf7oaVg0voow_SA-mX3FgWOdV0,15005
+airflow/providers/teradata/hooks/teradata.py,sha256=k_u9iJsuwjr7-jdBkEGd_m4yjVfWwDrV0pXrbjUrxPE,11572
+airflow/providers/teradata/hooks/ttu.py,sha256=Mc-CFcF_v6McbkzhP8gMWWMmjNCwFuVduqoDu98_8ow,3689
+airflow/providers/teradata/operators/__init__.py,sha256=mlJxuZLkd5x-iq2SBwD3mvRQpt3YR7wjz_nceyF1IaI,787
+airflow/providers/teradata/operators/bteq.py,sha256=6MZpHoJwK_g_UFWjL0hTgCyei4LLl6PygU15ZZiytqs,12656
+airflow/providers/teradata/operators/teradata.py,sha256=7GIkQZWaxAyMYX7srcD6MT1GvhfGSLaiAZUfYX-BpN0,3719
+airflow/providers/teradata/operators/teradata_compute_cluster.py,sha256=X3j4xI63PnH2rkyxFvO7ebjuRAyc6pxl-RAVec9CVII,22033
+airflow/providers/teradata/transfers/__init__.py,sha256=9hdXHABrVpkbpjZgUft39kOFL2xSGeG4GEua0Hmelus,785
+airflow/providers/teradata/transfers/azure_blob_to_teradata.py,sha256=mwvqDLPLOFH-9R6Uj-MjUdsRJ2lOAFVlCuAvI9u-AZY,5686
+airflow/providers/teradata/transfers/s3_to_teradata.py,sha256=vzxOAjq8_uxMxXqtqCrA3JVy1LlY4a-XkK0qheNZ_to,5546
+airflow/providers/teradata/transfers/teradata_to_teradata.py,sha256=Gf5t90sUf4ZgUVYMMA6qSHk_nob2ZQkWoGNV8oeoVSs,3891
+airflow/providers/teradata/triggers/__init__.py,sha256=9hdXHABrVpkbpjZgUft39kOFL2xSGeG4GEua0Hmelus,785
+airflow/providers/teradata/triggers/teradata_compute_cluster.py,sha256=a8L-S2R5hk4DSmTy1NvMKYx5n27DqMzR6t0kKv1jrBU,6944
+airflow/providers/teradata/utils/__init__.py,sha256=9hdXHABrVpkbpjZgUft39kOFL2xSGeG4GEua0Hmelus,785
+airflow/providers/teradata/utils/bteq_util.py,sha256=GCIPc1PCIOC-YWwxgYHr-N1d7X8ZGPU5Lmax_JZY6rA,7360
+airflow/providers/teradata/utils/constants.py,sha256=daNhA6ixICQi2lqliSXHezBEVcibL_kOBq6hOZTCGdM,3090
+airflow/providers/teradata/utils/encryption_utils.py,sha256=ARGWmgBbvSq6_MQHfTevvfvHjaiBjQI62UXltDcJLJo,2578
+apache_airflow_providers_teradata-3.2.2rc1.dist-info/entry_points.txt,sha256=JbigXoUoKVSNWG-_-029FCCuehMOmAvuSnNGZ9Bz1Kc,104
+apache_airflow_providers_teradata-3.2.2rc1.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+apache_airflow_providers_teradata-3.2.2rc1.dist-info/METADATA,sha256=uyi3T84mw7IolL2jqDkXyxpbdVFW4Ej1LSFeBlS9Kno,6756
+apache_airflow_providers_teradata-3.2.2rc1.dist-info/RECORD,,

apache_airflow_providers_teradata-3.2.1rc1.dist-info/RECORD

@@ -1,26 +0,0 @@
-airflow/providers/teradata/LICENSE,sha256=gXPVwptPlW1TJ4HSuG5OMPg-a3h43OGMkZRR1rpwfJA,10850
-airflow/providers/teradata/__init__.py,sha256=TbCy6Rbt5qrxNqFXgDDD3TeFNMaUWAbjFkJ28gnOVj0,1497
-airflow/providers/teradata/get_provider_info.py,sha256=SF-3YIl3CCi6mN6b9EEqLkJNyuMIM35CvY_H91QdELw,4031
-airflow/providers/teradata/version_compat.py,sha256=rSCzUYsqEbM9-qivzLBYCnll2FFVAvk8LyMZvUi_sNE,1958
-airflow/providers/teradata/hooks/__init__.py,sha256=mlJxuZLkd5x-iq2SBwD3mvRQpt3YR7wjz_nceyF1IaI,787
-airflow/providers/teradata/hooks/bteq.py,sha256=9N9z2NbouKbwYiikCbMkVAobvgpRvHgN4uzChQ5c8GU,15067
-airflow/providers/teradata/hooks/teradata.py,sha256=fOt3ZriM-rB27d-7RWhoEBZJyZcNkHowrSh4hqiNNi8,10964
-airflow/providers/teradata/hooks/ttu.py,sha256=dn8_KFkCg_qTkoCxdyxpZUJM2fEMInhlX6UW_D7dCLY,3695
-airflow/providers/teradata/operators/__init__.py,sha256=mlJxuZLkd5x-iq2SBwD3mvRQpt3YR7wjz_nceyF1IaI,787
-airflow/providers/teradata/operators/bteq.py,sha256=w7CysOA1ioVvTLhPsj_g3paCM8YH0Yh-wUJLKRJsLZk,13223
-airflow/providers/teradata/operators/teradata.py,sha256=G8Vgu2g-lyX7lisdEZOafIFJEx-eeeM9bgNI4fDKnq0,3873
-airflow/providers/teradata/operators/teradata_compute_cluster.py,sha256=30v9PCBDUlkAKVqxsz4ctcai709h-fZGomUW0h8QmXU,21829
-airflow/providers/teradata/transfers/__init__.py,sha256=9hdXHABrVpkbpjZgUft39kOFL2xSGeG4GEua0Hmelus,785
-airflow/providers/teradata/transfers/azure_blob_to_teradata.py,sha256=XnMsQSLS-kQP7aBRer3bLro8qgNohcJ3H63c2YIjYMA,5678
-airflow/providers/teradata/transfers/s3_to_teradata.py,sha256=-YskshSjx-qVniuSIHIQc4qJmfpxvhqiiy2zvXDzewk,5700
-airflow/providers/teradata/transfers/teradata_to_teradata.py,sha256=J6ibOly6vjzS4Vwf0oLOL5pILCoyI8q9wDwpVP9efV4,4045
-airflow/providers/teradata/triggers/__init__.py,sha256=9hdXHABrVpkbpjZgUft39kOFL2xSGeG4GEua0Hmelus,785
-airflow/providers/teradata/triggers/teradata_compute_cluster.py,sha256=hjMTnOpqlbByTtmNdJ9usK7hilEAz4tFXpJoENgFhyo,6987
-airflow/providers/teradata/utils/__init__.py,sha256=9hdXHABrVpkbpjZgUft39kOFL2xSGeG4GEua0Hmelus,785
-airflow/providers/teradata/utils/bteq_util.py,sha256=GCIPc1PCIOC-YWwxgYHr-N1d7X8ZGPU5Lmax_JZY6rA,7360
-airflow/providers/teradata/utils/constants.py,sha256=ro1FVNsAakal8_uX27aN0DTVO0T9FG4fv9HzBIY2I-w,2253
-airflow/providers/teradata/utils/encryption_utils.py,sha256=ARGWmgBbvSq6_MQHfTevvfvHjaiBjQI62UXltDcJLJo,2578
-apache_airflow_providers_teradata-3.2.1rc1.dist-info/entry_points.txt,sha256=JbigXoUoKVSNWG-_-029FCCuehMOmAvuSnNGZ9Bz1Kc,104
-apache_airflow_providers_teradata-3.2.1rc1.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-apache_airflow_providers_teradata-3.2.1rc1.dist-info/METADATA,sha256=MrVA9qbumPrk_c2MRss-EJwFsxl62QKUGxRLJpsw92s,6056
-apache_airflow_providers_teradata-3.2.1rc1.dist-info/RECORD,,