teradataml 17.20.0.6__py3-none-any.whl → 20.0.0.0__py3-none-any.whl

teradataml/dataframe/sql_function_parameters.py

@@ -15,6 +15,7 @@
 from teradataml.dataframe.sql_interfaces import ColumnExpression
 from collections import OrderedDict
 from teradataml.geospatial.geometry_types import GeometryType
+import datetime as dt
 
 
 # Function to generate Individual parameter structure.
@@ -110,8 +111,6 @@ _percentile_param_structure = [_generate_param_structure("percentile", (int, flo
 
 _expr_param_structure = [_generate_param_structure("expression", (ColumnExpression, int, float))]
 
-_trunc_param_structure = [opt_int_expr_param("expression", 0)]
-
 _widthbucket_param_structure = [_generate_param_structure("min", (float, int)),
                                 _generate_param_structure("max", (float, int)),
                                 _generate_param_structure("numBucket", (float, int))]
@@ -161,6 +160,16 @@ _regexp_replace_param_structure = [__regexp_string, req_str_expr_param("replace_
 _regexp_similar_param_structure = [__regexp_string, __match]
 _regexp_substr_param_structure = [__regexp_string, __position, __occurrence(1), __match]
 
+_expression_calendar_param_structure = [_generate_param_structure("calendar_name", str, default_value="Teradata"),
+                                        _generate_param_structure("expression2", (ColumnExpression), default_value=None)]
+
+_calendar_name_param_structure = [_generate_param_structure("calendar_name", str, default_value="Teradata")]
+
+_day_value_param_structure = [_generate_param_structure("day_value", str)]
+
+_expression_param_structure = [_generate_param_structure("expression", (ColumnExpression))]
+
+_expression_int_param_structure = [_generate_param_structure("expression", (ColumnExpression,int))]
 # Most of the Aggregate functions take first parameter as the column on which the
 # Aggregate function is being applied. However, few functions do not accept
 # first parameter as the corresponding column. All such functions should be
@@ -231,7 +240,6 @@ SQL_FUNCTION_ADDITIONAL_PARAMETERS = {
     "MOD": _expr_param_structure,
     "POWER": _expr_param_structure,
     "ROUND": _expr_param_structure,
-    "TRUNC": _trunc_param_structure,
     "WIDTH_BUCKET": _widthbucket_param_structure,
 
     # Trigonometric function
@@ -270,7 +278,43 @@ SQL_FUNCTION_ADDITIONAL_PARAMETERS = {
     "REGEXP_INSTR": _regexp_instr_param_structure,
     "REGEXP_REPLACE": _regexp_replace_param_structure,
     "REGEXP_SIMILAR": _regexp_similar_param_structure,
-    "REGEXP_SUBSTR": _regexp_substr_param_structure
+    "REGEXP_SUBSTR": _regexp_substr_param_structure,
+
+    # Date Time Functions
+    "td_week_begin": _expression_calendar_param_structure,
+    "td_week_end": _expression_calendar_param_structure,
+    "td_sunday": _expression_calendar_param_structure,
+    "td_monday": _expression_calendar_param_structure,
+    "td_tuesday": _expression_calendar_param_structure,
+    "td_wednesday": _expression_calendar_param_structure,
+    "td_thursday": _expression_calendar_param_structure,
+    "td_friday": _expression_calendar_param_structure,
+    "td_saturday": _expression_calendar_param_structure,
+    "DayNumber_Of_Week": _calendar_name_param_structure,
+    "td_month_begin": _expression_calendar_param_structure,
+    "td_month_end": _expression_calendar_param_structure,
+    "DayNumber_Of_Month": _calendar_name_param_structure,
+    "DayOccurrence_Of_Month": _calendar_name_param_structure,
+    "WeekNumber_Of_Month": _calendar_name_param_structure,
+    "td_year_begin": _expression_calendar_param_structure,
+    "td_year_end": _expression_calendar_param_structure,
+    "DayNumber_Of_Year": _calendar_name_param_structure,
+    "WeekNumber_Of_Year": _calendar_name_param_structure,
+    "MonthNumber_Of_Year": _calendar_name_param_structure,
+    "td_quarter_begin": _expression_calendar_param_structure,
+    "td_quarter_end": _expression_calendar_param_structure,
+    "WeekNumber_Of_Quarter": _calendar_name_param_structure,
+    "MonthNumber_Of_Quarter": _calendar_name_param_structure,
+    "QuarterNumber_Of_Year": _calendar_name_param_structure,
+    "DayNumber_Of_Calendar": _calendar_name_param_structure,
+    "WeekNumber_Of_Calendar": _calendar_name_param_structure,
+    "MonthNumber_Of_Calendar": _calendar_name_param_structure,
+    "QuarterNumber_Of_Calendar": _calendar_name_param_structure,
+    "YearNumber_Of_Calendar": _calendar_name_param_structure,
+    "next_day": _day_value_param_structure,
+    "months_between": _expression_param_structure,
+    "add_months": _expression_int_param_structure,
+    "oadd_months": _expression_int_param_structure
 }
 
 # When the argument for the following function is specified as str,
@@ -279,7 +323,14 @@ SQL_FUNCTION_ADDITIONAL_PARAMETERS = {
 SINGLE_QUOTE_FUNCTIONS = {
     "EDITDISTANCE", "LTRIM", "LOCATE", "RTRIM", "INDEX", "INSTR", "LEFT", "RIGHT",
     "LOCATE", "LPAD", "RPAD", "NGRAM", "NVP", "OREPLACE", "OTRANSLATE",
-    "REGEXP_INSTR", "REGEXP_REPLACE", "REGEXP_SIMILAR", "REGEXP_SUBSTR"
+    "REGEXP_INSTR", "REGEXP_REPLACE", "REGEXP_SIMILAR", "REGEXP_SUBSTR", "td_week_begin",
+    "td_week_end", "td_sunday", "td_monday", "td_tuesday", "td_wednesday", "td_thursday",
+    "td_friday", "td_saturday", "DayNumber_Of_Week", "td_month_begin", "td_month_end", "DayNumber_Of_Month",
+    "DayOccurrence_Of_Month", "WeekNumber_Of_Month", "td_year_begin", "td_year_end",
+    "DayNumber_Of_Year", "WeekNumber_Of_Year", "MonthNumber_Of_Year", "td_quarter_begin",
+    "td_quarter_end", "WeekNumber_Of_Quarter", "MonthNumber_Of_Quarter", "QuarterNumber_Of_Year",
+    "DayNumber_Of_Calendar", "WeekNumber_Of_Calendar", "MonthNumber_Of_Calendar", "QuarterNumber_Of_Calendar",
+    "YearNumber_Of_Calendar", "next_day"
 }
 
 _get_param_struct = lambda x: \

teradataml/dataframe/vantage_function_types.py

@@ -286,6 +286,32 @@ VANTAGE_FUNCTION_TYPE_MAPPER = {
     'POSITION': INTEGER(),
     'SOUNDEX': VARCHAR(),
     'STRING_CS': INTEGER(),
+
+    # DateTime Functions
+    'DAYNUMBER_OF_WEEK': INTEGER(),
+    'DAYNUMBER_OF_MONTH': INTEGER(),
+    'DAYNUMBER_OF_YEAR': INTEGER(),
+    'DAYNUMBER_OF_CALENDAR': INTEGER(),
+    'WEEKNUMBER_OF_MONTH': INTEGER(),
+    'WEEKNUMBER_OF_QUARTER': INTEGER(),
+    'WEEKNUMBER_OF_YEAR': INTEGER(),
+    'WEEKNUMBER_OF_CALENDAR': INTEGER(),
+    'MONTHNUMBER_OF_YEAR': INTEGER(),
+    'MONTHNUMBER_OF_CALENDAR': INTEGER(),
+    'MONTHNUMBER_OF_QUARTER': INTEGER(),
+    'QUARTERNUMBER_OF_YEAR': INTEGER(),
+    'QUARTERNUMBER_OF_CALENDAR': INTEGER(),
+    'YEARNUMBER_OF_CALENDAR': INTEGER(),
+    'DAYOCCURRENCE_OF_MONTH': INTEGER(),
+    'YEAR': INTEGER(),
+    'MONTH': INTEGER(),
+    'HOUR': INTEGER(),
+    'MINUTE': INTEGER(),
+    'SECOND': DECIMAL(8, 2),
+    'WEEK': INTEGER(),
+    'NEXT_DAY': DATE(),
+    'MONTHS_BETWEEN': INTEGER(),
+    'OADD_MONTHS': DATE()
 }
 
 # Few datattype lists useful for our lambda functions to get the output types.
@@ -404,7 +430,25 @@ VANTAGE_FUNCTION_ARGTYPE_DEPENDENT_MAPPER = {
     'LAST': lambda x: x,
     'MAD': lambda x: FLOAT() if not __check_type(x, [DECIMAL(), NUMBER()]) else x,
     'MODE': lambda x: x,
-    'PERCENTILE': lambda x: FLOAT() if not __check_type(x, [DECIMAL(), NUMBER()]) else x
+    'PERCENTILE': lambda x: FLOAT() if not __check_type(x, [DECIMAL(), NUMBER()]) else x,
+
+    # Date Time Functions
+    'TD_SUNDAY': lambda x: x,
+    'TD_MONDAY': lambda x: x,
+    'TD_TUESDAY': lambda x: x,
+    'TD_WEDNESDAY': lambda x: x,
+    'TD_THURSDAY': lambda x: x,
+    'TD_FRIDAY': lambda x: x,
+    'TD_SATURDAY': lambda x: x,
+    'TD_WEEK_BEGIN': lambda x: x,
+    'TD_WEEK_END': lambda x: x,
+    'TD_QUARTER_BEGIN': lambda x: x,
+    'TD_QUARTER_END': lambda x: x,
+    'TD_MONTH_BEGIN': lambda x: x,
+    'TD_MONTH_END': lambda x: x,
+    'TD_YEAR_BEGIN': lambda x: x,
+    'TD_YEAR_END': lambda x: x,
+    'ADD_MONTHS': lambda x: x
 }
 
 # This dictionary maps the SQL Geospatial function name to the

teradataml/dataframe/window.py

@@ -14,7 +14,9 @@ from teradataml.common.messages import Messages
 from teradataml.common.messagecodes import MessageCodes
 from sqlalchemy import desc, nullsfirst, nullslast
 from teradataml.common.exceptions import TeradataMlException
+from teradataml.common.utils import UtilFuncs
 from teradataml.utils.dtypes import _Dtypes
+from teradatasqlalchemy.telemetry.queryband import collect_queryband
 
 
 class Window:
@@ -54,7 +56,7 @@ class Window:
                         of columns.
                         Refer 'DataFrame.tdtypes' to get the types of the
                         columns of a teradataml DataFrame.
-                Types: str OR list of Strings (str)
+                Types: str OR list of Strings (str) OR ColumnExpression OR list of ColumnExpressions
 
             order_columns:
                 Optional Argument.
@@ -66,7 +68,7 @@ class Window:
                     of columns.
                     Refer 'DataFrame.tdtypes' to get the types of the
                     columns of a teradataml DataFrame.
-                Types: str OR list of Strings (str)
+                Types: str OR list of Strings (str) OR ColumnExpression OR list of ColumnExpressions
 
             sort_ascending:
                 Optional Argument.
@@ -183,8 +185,8 @@ class Window:
 
         awu_matrix = []
         awu_matrix.append(["object", object, False, (DataFrame, _SQLColumnExpression)])
-        awu_matrix.append(["partition_columns", partition_columns, True, (str, list), True])
-        awu_matrix.append(["order_columns", order_columns, True, (str, list), True])
+        awu_matrix.append(["partition_columns", partition_columns, True, (str, list, _SQLColumnExpression), True])
+        awu_matrix.append(["order_columns", order_columns, True, (str, list, _SQLColumnExpression), True])
         awu_matrix.append(["sort_ascending", sort_ascending, True, bool])
         awu_matrix.append(["nulls_first", nulls_first, True, (bool, type(None))])
         awu_matrix.append(["window_start_point", window_start_point, True, int])
@@ -383,9 +385,14 @@ class Window:
 
         # sqlalchemy Over clause accepts 3 parameters to frame the SQL query:
         # partition_by, order_by & rows.
+        from teradataml.dataframe.sql import ColumnExpression
         window_properties = {"window_function": func_name,
-                             "partition_by": self.__partition_columns,
-                             "order_by": self.__generate_sqlalchemy_order_by_syntax(),
+                             "partition_by": [col if isinstance(col, str) else col.expression for col
+                                              in UtilFuncs._as_list(self.__partition_columns)
+                                              if col is not None],
+                             "order_by": [col.expression if isinstance(col, ColumnExpression) else col for col
+                                          in UtilFuncs._as_list(self.__generate_sqlalchemy_order_by_syntax())
+                                          if col is not None],
                              "rows": (self.__window_start_point,
                                       self.__window_end_point
                                       ),
@@ -440,40 +447,34 @@ class Window:
             window.__validate_window_columns("Feb", "partition_columns")
             window.__validate_window_columns("Feb", "order_columns")
         """
-
+        from teradataml.common.utils import UtilFuncs
+        window_columns = UtilFuncs._as_list(columns_in_window)
         if self.__is_window_on_tdml_column:
-            _Validators._validate_columnexpression_dataframe_has_columns(columns_in_window,
+            _Validators._validate_columnexpression_dataframe_has_columns(window_columns,
                                                                          window_arg_name,
                                                                          self.__object
                                                                          )
         else:
-            _Validators._validate_dataframe_has_argument_columns(columns_in_window,
+            columns_in_expression = []
+            for col in window_columns:
+                if isinstance(col, str):
+                    columns_in_expression.append(col)
+                else:
+                    columns_in_expression = columns_in_expression + col._all_columns
+            _Validators._validate_dataframe_has_argument_columns(columns_in_expression,
                                                                  window_arg_name,
                                                                  self.__object,
                                                                  'teradataml'
                                                                  )
 
-        from teradataml.common.utils import UtilFuncs
-        window_columns = UtilFuncs._as_list(columns_in_window)
         columns = UtilFuncs._get_all_columns(self.__object,
                                              self.__is_window_on_tdml_column)
-        columns_and_types = {c.name.lower(): type(c.type) for c in columns}
-        invalid_types = ["{}({})".format(column, columns_and_types[column.lower()].__name__)
-                         for column in window_columns if columns_and_types[column.lower()]
-                         in _Dtypes._get_sort_unsupported_data_types()
-                         ]
-
-        if invalid_types:
-            invalid_column_types = (col_type.__name__ for col_type in
-                                    _Dtypes._get_sort_unsupported_data_types())
-            error_message = Messages.get_message(MessageCodes.INVALID_COLUMN_DATATYPE,
-                                                 ", ".join(invalid_types),
-                                                 window_arg_name,
-                                                 "Unsupported",
-                                                 ", ".join(invalid_column_types))
-
-            raise ValueError(error_message)
 
+        # Validate invalid types.
+        _Validators._validate_invalid_column_types(
+            columns, window_arg_name, window_columns, _Dtypes._get_sort_unsupported_data_types())
+
+    @collect_queryband(arg_name="func_name", prefix="DF_WinAgg")
     def __process_dataframe_window_aggregate(self, func_name, *args, **kwargs):
         """
         Description:
@@ -651,10 +652,10 @@ class Window:
             return
 
         from teradataml.common.utils import UtilFuncs
+        from teradataml.dataframe.sql import ColumnExpression
         order_by = UtilFuncs._as_list(self.__order_columns)
-        wrap_order_by = lambda sqlalc_func: [sqlalc_func(ele) for
+        wrap_order_by = lambda sqlalc_func: [sqlalc_func(ele) if not isinstance(ele, ColumnExpression) else ele for
                                              ele in order_by]
-
         if not self.__sort_ascending:
             order_by = wrap_order_by(desc)
 

teradataml/dbutils/dbutils.py

@@ -29,10 +29,12 @@ from teradataml.utils.validators import _Validators
 from teradatasql import OperationalError
 from teradatasqlalchemy.dialect import preparer, dialect as td_dialect
 from teradatasqlalchemy.dialect import TDCreateTablePost as post
+from teradatasqlalchemy.telemetry.queryband import collect_queryband
 from sqlalchemy import Table, Column, MetaData, CheckConstraint, \
     PrimaryKeyConstraint, ForeignKeyConstraint, UniqueConstraint
 
 
+@collect_queryband(queryband='DrpTbl')
 def db_drop_table(table_name, schema_name=None):
     """
     DESCRIPTION:
@@ -88,6 +90,8 @@ def db_drop_table(table_name, schema_name=None):
                                                        table_name),
                                   MessageCodes.DROP_FAILED) from err
 
+
+@collect_queryband(queryband='DrpVw')
 def db_drop_view(view_name, schema_name=None):
     """
     DESCRIPTION:
@@ -144,6 +148,8 @@ def db_drop_view(view_name, schema_name=None):
                                                        view_name),
                                   MessageCodes.DROP_FAILED) from err
 
+
+@collect_queryband(queryband='LstTbls')
 def db_list_tables(schema_name=None, object_name=None, object_type='all'):
     """
     DESCRIPTION:
@@ -251,6 +257,7 @@ def db_list_tables(schema_name=None, object_name=None, object_type='all'):
         raise TeradataMlException(Messages.get_message(MessageCodes.LIST_DB_TABLES_FAILED),
                                   MessageCodes.LIST_DB_TABLES_FAILED) from err
 
+
 def _get_select_table_kind(schema_name, table_name, table_kind):
     """
     Get the list of the table names from the specified schema name.
@@ -336,6 +343,7 @@ def _get_select_table_kind(schema_name, table_name, table_kind):
     except Exception as err:
         return pd.DataFrame()
 
+
 def _execute_transaction(queries):
     """
     Internal function to execute the query or list of queries passed, as one transaction.
@@ -391,6 +399,7 @@ def _execute_transaction(queries):
             # Finally, we must set auto_commit to ON
             cur.execute(auto_commit_on)
 
+
 def _execute_stored_procedure(function_call, fetchWarnings=True, expect_none_result=False):
     """
     DESCRIPTION:
@@ -450,6 +459,7 @@ def _execute_stored_procedure(function_call, fetchWarnings=True, expect_none_res
 
     return UtilFuncs._execute_query(exec_sp_stmt, fetchWarnings, expect_none_result)
 
+
 def _get_function_call_as_string(sqlcFuncObj):
     """
     DESCRIPTION:
@@ -486,6 +496,7 @@ def _get_function_call_as_string(sqlcFuncObj):
 
     return str(sqlcFuncObj.compile(**kw))
 
+
 def _get_quoted_object_name(schema_name, object_name):
     """
     DESCRIPTION:
@@ -524,6 +535,8 @@ def _get_quoted_object_name(schema_name, object_name):
     quoted_object_name = "{0}.{1}".format(schema_name, tdp.quote(object_name))
     return quoted_object_name
 
+
+@collect_queryband(queryband='VwLg')
 def view_log(log_type="script", num_lines=1000, query_id=None, log_dir=None):
     """
     DESCRIPTION:
@@ -703,7 +716,6 @@ def _fetch_url_and_save(url, file_path):
         file.write(resp.content.decode('utf-8'))
 
 
-
 def _check_if_python_packages_installed():
     """
     DESCRIPTION:
@@ -739,6 +751,8 @@ def _check_if_python_packages_installed():
         if "bash: pip3: command not found" not in str(err):
             raise
 
+
+@collect_queryband(queryband='PkgDtls')
 def db_python_package_details(names=None):
     """
     DESCRIPTION:
@@ -999,6 +1013,7 @@ def _create_table(table_name,
         raise TeradataMlException(Messages.get_message(msg_code, "create table", str(err)), msg_code)
 
 
+@collect_queryband(queryband='LstKwrds')
 def list_td_reserved_keywords(key=None, raise_error=False):
     """
     DESCRIPTION:
@@ -1127,6 +1142,8 @@ def _execute_query_and_generate_pandas_df(query, index=None, **kwargs):
     EXAMPLES:
         pdf = _execute_query_and_generate_pandas_df("SELECT * from t1", "col1")
     """
+    # Empty queryband buffer before SQL call.
+    UtilFuncs._set_queryband()
     cur = execute_sql(query)
     columns = kwargs.pop('columns', [col[0] for col in cur.description])
     rows = cur.fetchall()

teradataml/geospatial/geodataframe.py

@@ -22,6 +22,7 @@ from teradataml.geospatial.geodataframecolumn import GeoDataFrameColumn
 from teradataml.plot.plot import _Plot
 from teradataml.utils.validators import _Validators
 from teradatasqlalchemy import (GEOMETRY, MBR, MBB)
+from teradatasqlalchemy.telemetry.queryband import collect_queryband
 
 class GeoDataFrame(DataFrame):
     """
@@ -29,6 +30,8 @@ class GeoDataFrame(DataFrame):
     analysis on tables, views, and queries on Teradata Vantage that contains
     Geospatial data.
     """
+
+    @collect_queryband(queryband="GDF")
     def __init__(self, table_name=None, index=True, index_label=None,
                  query=None, materialize=False):
         """
@@ -115,6 +118,7 @@ class GeoDataFrame(DataFrame):
                 return True
         return False
 
+    @collect_queryband(queryband="GDF_plot")
     def plot(self, x=None, y=None, kind="geometry", **kwargs):
         """
         DESCRIPTION:
@@ -495,6 +499,14 @@ class GeoDataFrame(DataFrame):
                     Applicable only for the wiggle and mesh plots.
                 Types: int OR float
 
+            ignore_nulls:
+                Optional Argument.
+                Specifies whether to delete rows with null values or not present in 'x', 'y' and
+                'scale' params.
+                Default Value: False
+                Types: bool
+
+
         RAISES:
             TeradataMlException
 
@@ -516,6 +528,7 @@ class GeoDataFrame(DataFrame):
                 1010  MULTIPOINT (10.345 20.32 30.6,  MULTILINESTRING ((1 3 6,3 0 6,  MULTIPOLYGON (((0 0 0,0 0 20,0                            None                            None
             >>>
             >>> load_example_data("geodataframe", ["us_population", "us_states_shapes"])
+            >>> us_population = DataFrame("us_population")
             >>> us_population
                        location_type  population_year  population
             state_name
@@ -613,7 +626,7 @@ class GeoDataFrame(DataFrame):
             >>> plot_population = df_1990.plot(y=(df_1990.population, df_1990.state_shape),
             ...                                   cmap='rainbow',
             ...                                   figure=fig,
-            ...                                   ax=axis[0],
+            ...                                   ax=axes[0],
             ...                                   reverse_yaxis=True,
             ...                                   vmin=55036.0,
             ...                                   vmax=39538223.0,
@@ -624,7 +637,7 @@ class GeoDataFrame(DataFrame):
             >>> plot_population = df_2000.plot(y=(df_2000.population, df_2000.state_shape),
             ...                                   cmap='rainbow',
             ...                                   figure=fig,
-            ...                                   ax=axis[1],
+            ...                                   ax=axes[1],
             ...                                   reverse_yaxis=True,
             ...                                   vmin=55036.0,
             ...                                   vmax=39538223.0,
@@ -636,7 +649,7 @@ class GeoDataFrame(DataFrame):
             ...                                y=(df_2010.population, df_2010.state_shape),
             ...                                cmap='rainbow',
             ...                                figure=fig,
-            ...                                ax=axis[2],
+            ...                                ax=axes[2],
             ...                                reverse_yaxis=True,
             ...                                vmin=55036.0,
             ...                                vmax=39538223.0,
@@ -649,7 +662,7 @@ class GeoDataFrame(DataFrame):
             ...                                y=(df_2020.population, df_2020.state_shape),
             ...                                cmap='rainbow',
             ...                                figure=fig,
-            ...                                ax=axis[3],
+            ...                                ax=axes[3],
             ...                                reverse_yaxis=True,
             ...                                vmin=55036.0,
             ...                                vmax=39538223.0,
@@ -736,6 +749,7 @@ class GeoDataFrame(DataFrame):
         # TODO - Raise error or Keep it open ended to accept SQL Function names.
         raise AttributeError("'GeoDataFrame' object has no attribute %s" % name)
 
+    @collect_queryband(arg_name="func_name", prefix="GDF")
     def __process_geometry(self, func_name, *args, **kwargs):
         """
         Function helps to execute the Geospatial function on the column(s)
@@ -1065,7 +1079,6 @@ class GeoDataFrame(DataFrame):
             error_code = MessageCodes.NO_GEOM_COLUMN_EXIST
             raise TeradataMlException(Messages.get_message(error_code), error_code)
 
-
     def _generate_child_metaexpr(self, metaexpr):
         """
         Internal function that generates the metaexpression by converting
@@ -1090,5 +1103,3 @@ class GeoDataFrame(DataFrame):
                       if not isinstance(col, GeoDataFrameColumn) else col
                       for col in metaexpr.c]
         return metaexpr
-
-

teradataml/geospatial/geodataframecolumn.py

@@ -23,6 +23,7 @@ from teradataml.dataframe.vantage_function_types import \
 from teradataml.geospatial.geometry_types import GeometryType
 from teradataml.utils.validators import _Validators
 from teradatasqlalchemy import (GEOMETRY, MBR, MBB, BLOB, CLOB)
+from teradatasqlalchemy.telemetry.queryband import collect_queryband
 
 # Geospatial Function name mappers
 geo_func_as_property = \
@@ -114,6 +115,7 @@ class GeoDataFrameColumn(_SQLColumnExpression):
             return lambda *args, **kwargs: \
                     self.__process_func_with_args(item, *args, **kwargs)
 
+    @collect_queryband(arg_name="func_name", prefix="GDFC")
     def __process_geospatial_function_property(self, func_name):
         """
         DESCRIPTION:
@@ -148,6 +150,7 @@ class GeoDataFrameColumn(_SQLColumnExpression):
             func_name=function_name, col_name=self.name, property=True,
             type_=out_type_)
 
+    @collect_queryband(arg_name="func_name", prefix="GDFC")
     def __process_geospatial_method_with_no_args(self, func_name):
         """
         DESCRIPTION:
@@ -178,6 +181,7 @@ class GeoDataFrameColumn(_SQLColumnExpression):
             func_name=function_name, col_name=self.name, return_func=False,
             type_=out_type_)
 
+    @collect_queryband(arg_name="func_name", prefix="GDFC")
     def __process_func_with_args(self, func_name, *c, **kwargs):
         """
         DESCRIPTION:
@@ -368,6 +372,7 @@ class GeoDataFrameColumn(_SQLColumnExpression):
         """
         return GeoDataFrameColumn(new_expression)
 
+    @collect_queryband(queryband="GDFC_relates")
     def relates(self, geom_column, amatrix):
         """
         Please refer to Function Reference Guide for Teradata Package for Python