apache-airflow-providers-teradata 2.4.0rc1__tar.gz → 2.5.0rc1__tar.gz

{apache_airflow_providers_teradata-2.4.0rc1 → apache_airflow_providers_teradata-2.5.0rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: apache-airflow-providers-teradata
-Version: 2.4.0rc1
+Version: 2.5.0rc1
 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,7 +21,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: System :: Monitoring
-Requires-Dist: apache-airflow-providers-common-sql>=1.3.1rc0
+Requires-Dist: apache-airflow-providers-common-sql>=1.14.1rc0
 Requires-Dist: apache-airflow>=2.7.0rc0
 Requires-Dist: teradatasql>=17.20.0.28
 Requires-Dist: teradatasqlalchemy>=17.20.0.0
@@ -29,8 +29,8 @@ Requires-Dist: apache-airflow-providers-amazon ; extra == "amazon"
 Requires-Dist: apache-airflow-providers-common-sql ; extra == "common.sql"
 Requires-Dist: apache-airflow-providers-microsoft-azure ; extra == "microsoft.azure"
 Project-URL: Bug Tracker, https://github.com/apache/airflow/issues
-Project-URL: Changelog, https://airflow.apache.org/docs/apache-airflow-providers-teradata/2.4.0/changelog.html
-Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-teradata/2.4.0
+Project-URL: Changelog, https://airflow.apache.org/docs/apache-airflow-providers-teradata/2.5.0/changelog.html
+Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-teradata/2.5.0
 Project-URL: Slack Chat, https://s.apache.org/airflow-slack
 Project-URL: Source Code, https://github.com/apache/airflow
 Project-URL: Twitter, https://twitter.com/ApacheAirflow
@@ -83,7 +83,7 @@ Provides-Extra: microsoft.azure
 
 Package ``apache-airflow-providers-teradata``
 
-Release: ``2.4.0.rc1``
+Release: ``2.5.0.rc1``
 
 
 `Teradata <https://www.teradata.com/>`__
@@ -96,7 +96,7 @@ 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/2.4.0/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-teradata/2.5.0/>`_.
 
 Installation
 ------------
@@ -114,7 +114,7 @@ Requirements
 PIP package                              Version required
 =======================================  ==================
 ``apache-airflow``                       ``>=2.7.0``
-``apache-airflow-providers-common-sql``  ``>=1.3.1``
+``apache-airflow-providers-common-sql``  ``>=1.14.1``
 ``teradatasqlalchemy``                   ``>=17.20.0.0``
 ``teradatasql``                          ``>=17.20.0.28``
 =======================================  ==================
@@ -141,4 +141,4 @@ Dependent package
 ======================================================================================================================  ===================
 
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-teradata/2.4.0/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-teradata/2.5.0/changelog.html>`_.

{apache_airflow_providers_teradata-2.4.0rc1 → apache_airflow_providers_teradata-2.5.0rc1}/README.rst

@@ -42,7 +42,7 @@
 
 Package ``apache-airflow-providers-teradata``
 
-Release: ``2.4.0.rc1``
+Release: ``2.5.0.rc1``
 
 
 `Teradata <https://www.teradata.com/>`__
@@ -55,7 +55,7 @@ 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/2.4.0/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-teradata/2.5.0/>`_.
 
 Installation
 ------------
@@ -73,7 +73,7 @@ Requirements
 PIP package                              Version required
 =======================================  ==================
 ``apache-airflow``                       ``>=2.7.0``
-``apache-airflow-providers-common-sql``  ``>=1.3.1``
+``apache-airflow-providers-common-sql``  ``>=1.14.1``
 ``teradatasqlalchemy``                   ``>=17.20.0.0``
 ``teradatasql``                          ``>=17.20.0.28``
 =======================================  ==================
@@ -100,4 +100,4 @@ Dependent package
 ======================================================================================================================  ===================
 
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-teradata/2.4.0/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-teradata/2.5.0/changelog.html>`_.

{apache_airflow_providers_teradata-2.4.0rc1 → apache_airflow_providers_teradata-2.5.0rc1}/airflow/providers/teradata/__init__.py

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

{apache_airflow_providers_teradata-2.4.0rc1 → apache_airflow_providers_teradata-2.5.0rc1}/airflow/providers/teradata/get_provider_info.py

@@ -28,11 +28,11 @@ def get_provider_info():
         "name": "Teradata",
         "description": "`Teradata <https://www.teradata.com/>`__\n",
         "state": "ready",
-        "source-date-epoch": 1720423902,
-        "versions": ["2.4.0", "2.3.0", "2.2.0", "2.1.1", "2.1.0", "2.0.0"],
+        "source-date-epoch": 1722664913,
+        "versions": ["2.5.0", "2.4.0", "2.3.0", "2.2.0", "2.1.1", "2.1.0", "2.0.0"],
         "dependencies": [
             "apache-airflow>=2.7.0",
-            "apache-airflow-providers-common-sql>=1.3.1",
+            "apache-airflow-providers-common-sql>=1.14.1",
             "teradatasqlalchemy>=17.20.0.0",
             "teradatasql>=17.20.0.28",
         ],

{apache_airflow_providers_teradata-2.4.0rc1 → apache_airflow_providers_teradata-2.5.0rc1}/airflow/providers/teradata/hooks/teradata.py

@@ -19,6 +19,7 @@
 
 from __future__ import annotations
 
+import re
 import warnings
 from typing import TYPE_CHECKING, Any
 
@@ -44,6 +45,42 @@ def _map_param(value):
     return value
 
 
+def _handle_user_query_band_text(query_band_text) -> str:
+    """Validate given query_band and append if required values missed in query_band."""
+    # Ensures 'appname=airflow' and 'org=teradata-internal-telem' are in query_band_text.
+    if query_band_text is not None:
+        # checking org doesn't exist in query_band, appending 'org=teradata-internal-telem'
+        #  If it exists, user might have set some value of their own, so doing nothing in that case
+        pattern = r"org\s*=\s*([^;]*)"
+        match = re.search(pattern, query_band_text)
+        if not match:
+            if not query_band_text.endswith(";"):
+                query_band_text += ";"
+            query_band_text += "org=teradata-internal-telem;"
+        # Making sure appname in query_band contains 'airflow'
+        pattern = r"appname\s*=\s*([^;]*)"
+        # Search for the pattern in the query_band_text
+        match = re.search(pattern, query_band_text)
+        if match:
+            appname_value = match.group(1).strip()
+            # if appname exists and airflow not exists in appname then appending 'airflow' to existing
+            # appname value
+            if "airflow" not in appname_value.lower():
+                new_appname_value = appname_value + "_airflow"
+                # Optionally, you can replace the original value in the query_band_text
+                updated_query_band_text = re.sub(pattern, f"appname={new_appname_value}", query_band_text)
+                query_band_text = updated_query_band_text
+        else:
+            # if appname doesn't exist in query_band, adding 'appname=airflow'
+            if len(query_band_text.strip()) > 0 and not query_band_text.endswith(";"):
+                query_band_text += ";"
+            query_band_text += "appname=airflow;"
+    else:
+        query_band_text = "org=teradata-internal-telem;appname=airflow;"
+
+    return query_band_text
+
+
 class TeradataHook(DbApiHook):
     """
     General hook for interacting with Teradata SQL Database.
@@ -105,9 +142,24 @@ class TeradataHook(DbApiHook):
         :return: a Teradata connection object
         """
         teradata_conn_config: dict = self._get_conn_config_teradatasql()
+        query_band_text = None
+        if "query_band" in teradata_conn_config:
+            query_band_text = teradata_conn_config.pop("query_band")
         teradata_conn = teradatasql.connect(**teradata_conn_config)
+        # setting query band
+        self.set_query_band(query_band_text, teradata_conn)
         return teradata_conn
 
+    def set_query_band(self, query_band_text, teradata_conn):
+        """Set SESSION Query Band for each connection session."""
+        try:
+            query_band_text = _handle_user_query_band_text(query_band_text)
+            set_query_band_sql = f"SET QUERY_BAND='{query_band_text}' FOR SESSION"
+            with teradata_conn.cursor() as cur:
+                cur.execute(set_query_band_sql)
+        except Exception as ex:
+            self.log.error("Error occurred while setting session query band: %s ", str(ex))
+
     def bulk_insert_rows(
         self,
         table: str,
@@ -144,7 +196,7 @@ class TeradataHook(DbApiHook):
 
     def _get_conn_config_teradatasql(self) -> dict[str, Any]:
         """Return set of config params required for connecting to Teradata DB using teradatasql client."""
-        conn: Connection = self.get_connection(getattr(self, self.conn_name_attr))
+        conn: Connection = self.get_connection(self.get_conn_id())
         conn_config = {
             "host": conn.host or "localhost",
             "dbs_port": conn.port or "1025",
@@ -171,12 +223,14 @@ class TeradataHook(DbApiHook):
             conn_config["sslcrc"] = conn.extra_dejson["sslcrc"]
         if conn.extra_dejson.get("sslprotocol", False):
             conn_config["sslprotocol"] = conn.extra_dejson["sslprotocol"]
+        if conn.extra_dejson.get("query_band", False):
+            conn_config["query_band"] = conn.extra_dejson["query_band"]
 
         return conn_config
 
     def get_sqlalchemy_engine(self, engine_kwargs=None):
         """Return a connection object using sqlalchemy."""
-        conn: Connection = self.get_connection(getattr(self, self.conn_name_attr))
+        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

{apache_airflow_providers_teradata-2.4.0rc1 → apache_airflow_providers_teradata-2.5.0rc1}/pyproject.toml

@@ -28,7 +28,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "apache-airflow-providers-teradata"
-version = "2.4.0.rc1"
+version = "2.5.0.rc1"
 description = "Provider package apache-airflow-providers-teradata for Apache Airflow"
 readme = "README.rst"
 authors = [
@@ -56,15 +56,15 @@ classifiers = [
 ]
 requires-python = "~=3.8"
 dependencies = [
-    "apache-airflow-providers-common-sql>=1.3.1rc0",
+    "apache-airflow-providers-common-sql>=1.14.1rc0",
     "apache-airflow>=2.7.0rc0",
     "teradatasql>=17.20.0.28",
     "teradatasqlalchemy>=17.20.0.0",
 ]
 
 [project.urls]
-"Documentation" = "https://airflow.apache.org/docs/apache-airflow-providers-teradata/2.4.0"
-"Changelog" = "https://airflow.apache.org/docs/apache-airflow-providers-teradata/2.4.0/changelog.html"
+"Documentation" = "https://airflow.apache.org/docs/apache-airflow-providers-teradata/2.5.0"
+"Changelog" = "https://airflow.apache.org/docs/apache-airflow-providers-teradata/2.5.0/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"