teradataml 20.0.0.6__py3-none-any.whl → 20.0.0.7__py3-none-any.whl

teradataml/analytics/json_parser/analytic_functions_argument.py

@@ -15,6 +15,7 @@ File implements classes for following:
     * Analytic Function Output Argument
     * Analytic Function Other Argument
 """
+import re
 from teradataml.analytics.json_parser import PartitionKind
 from teradataml.utils.dtypes import _Dtypes
 from teradataml.utils.validators import _Validators
@@ -284,6 +285,79 @@ class _AnlyFuncArgumentBase(object):
         """
         return self.__use_in_r
 
+    @staticmethod
+    def get_regex_sql_name(sql_name, match_name, arg_names):
+        """
+        DESCRIPTION:
+            Get SQL name of the argument by matching the given pattern.
+
+        PARAMETERS:
+            sql_name:
+                Required Argument.
+                Specifies the name of the argument in SQL.
+                Types: str
+
+            match_name:
+                Required Argument.
+                Specifies the match name which will be replaced
+                by the SQL name.
+                Types: str
+
+            arg_names:
+                Required Argument.
+                Specifies the list of python argument name.
+                Types: list
+
+        RETURNS:
+            list
+
+        RAISES:
+            None
+
+        EXAMPLES:
+            # Get the argument name used in SQL Query.
+            from teradataml.analytics.json_parser.argument import _AnlyFuncArgumentBase
+            argument_base = _AnlyFuncArgumentBase("sql_name", True, "SQL Description", "Python Description", "name", True)
+            argument_base.get_regex_sql_name("Abc_*", "const_", ["const_num", "const_min_length"])
+        """
+        sql_names = [key.replace(match_name, sql_name)
+                     for key in arg_names if key.startswith(match_name)]
+
+        return sql_names
+
+    @staticmethod
+    def get_regex_matched_arguments(arg_name, **kwargs):
+        """
+        DESCRIPTION:
+            Get client specific name of the argument by matching given pattern.
+
+        PARAMETERS:
+            arg_name:
+                Required Argument.
+                Specifies the name of the argument.
+                Types: list
+
+            kwargs:
+                Required Argument.
+                Specifies the user provided arguments.
+                Types: dict
+
+        RETURNS:
+            list
+
+        RAISES:
+            None
+
+        EXAMPLES:
+            # Get the argument name, which is exposed to user.
+            from teradataml.analytics.json_parser.argument import _AnlyFuncArgumentBase
+            argument_base = _AnlyFuncArgumentBase("sql_name", True, "SQL Description", "Python Description", "name", True)
+            argument_base.get_regex_matched_arguments("const_*", newdata=DataFrame(df), const_num=2, const_min_length=81)
+        """
+        pattern = re.compile("{}{}".format('^', arg_name))
+        arg_names = [key for key in kwargs if pattern.match(key)]
+
+        return arg_names
 
 class _AnlyFuncInput(_AnlyFuncArgumentBase):
     """
@@ -913,7 +987,9 @@ class _AnlyFuncArgument(_AnlyFuncArgumentBase):
                  allowed_types=None,
                  allowed_type_groups=None,
                  is_output_column=False,
-                 alternate_sql_name=None):
+                 alternate_sql_name=None,
+                 regex_match=False,
+                 match_name=None):
         """
         Constructor for generating an object of Analytic Function Argument from
         JSON for other arguments.
@@ -1079,6 +1155,17 @@ class _AnlyFuncArgument(_AnlyFuncArgumentBase):
                 Optional Argument.
                 Specifies alternate names for the argument.
                 Types: str or list of str
+
+            regex_match:
+                Optional Argument.
+                Specifies whether argument is regular expression or not.
+                Default Value: False
+                Types: bool
+
+            match_name:
+                Optional Argument.
+                Specifies the name to match against the user provided arguments.
+                Types: str
         """
 
         # Call super class constructor to initialize basic parameters.
@@ -1107,6 +1194,8 @@ class _AnlyFuncArgument(_AnlyFuncArgumentBase):
         self.__r_order_num = r_order_num
         self.__is_output_column = is_output_column
         self.__alternate_sql_name = alternate_sql_name
+        self.__regex_match = regex_match
+        self.__match_name = match_name
 
         awu_matrix = []
         awu_matrix.append(["r_order_num", r_order_num, False, int])
@@ -1131,6 +1220,8 @@ class _AnlyFuncArgument(_AnlyFuncArgumentBase):
         awu_matrix.append(["allowed_type_groups", allowed_type_groups, True, (list, str)])
         awu_matrix.append(["is_output_column", is_output_column, True, bool])
         awu_matrix.append(["alternate_sql_name", alternate_sql_name, True, (list, str)])
+        awu_matrix.append(["regex_match", regex_match, True, bool])
+        awu_matrix.append(["match_name", match_name, True, str, True])
 
         # Validate argument types.
         _Validators._validate_function_arguments(awu_matrix)
@@ -1165,6 +1256,8 @@ class _AnlyFuncArgument(_AnlyFuncArgumentBase):
         self.is_output_column = lambda: self.__is_output_column
         self.get_alternate_sql_name = lambda: self.__alternate_sql_name
         self.is_empty_value_allowed = lambda: not self.is_column_argument()
+        self.regex_match = lambda: self.__regex_match
+        self.match_name = lambda: self.__match_name
 
     def get_python_type(self):
         """
@@ -1709,4 +1802,4 @@ class _AnlyFuncArgumentUAF(_AnlyFuncArgumentBaseUAF):
         if self.__allows_lists and (list not in py_types):
             py_types = py_types + (list,)
 
-        return py_types
+        return py_types

teradataml/analytics/json_parser/metadata.py

@@ -322,9 +322,13 @@ class _AnlyFuncMetadata:
 
                 sql_name = self._get_argument_value(argument, self.json_fields.NAME, section)
 
+                regex_match = self._get_argument_value(argument, self.json_fields.REGEX_MATCH, section, False)
+
+                match_name = self._get_argument_value(argument, self.json_fields.MATCH_NAME, section, False)
+
                 lang_name = self._get_argument_value(argument, self.json_fields.LANG_NAME, section, False)
                 lang_name = lang_name if lang_name is not None else self._get_pythonic_name_arg_name(
-                    self._get_argument_value(argument, self.json_fields.R_NAME, section))
+                    self._get_argument_value(argument, self.json_fields.R_NAME, section), is_regex_match=regex_match)
 
                 is_required = self._get_argument_value(argument, self.json_fields.IS_REQUIRED, section)
 
@@ -437,7 +441,9 @@ class _AnlyFuncMetadata:
                                                                   r_order_num=r_order_num,
                                                                   is_output_column=is_output_column,
                                                                   alternate_sql_name=alternate_sql_name,
-                                                                  lang_name=lang_name))
+                                                                  lang_name=lang_name,
+                                                                  regex_match=regex_match,
+                                                                  match_name=match_name))
                 else:
                     self.arguments.append(_AnlyFuncArgument(default_value=default_value,
                                                               permitted_values=permitted_values,
@@ -466,7 +472,10 @@ class _AnlyFuncMetadata:
                                                               allowed_type_groups=allowed_type_groups,
                                                               r_order_num=r_order_num,
                                                               is_output_column=is_output_column,
-                                                              alternate_sql_name=alternate_sql_name))
+                                                              alternate_sql_name=alternate_sql_name,
+                                                              regex_match=regex_match,
+                                                              match_name=match_name))
+
 
     def _parse_input_tables(self):
         """
@@ -1094,7 +1103,7 @@ class _AnlyFuncMetadata:
                                       MessageCodes.DUPLICATE_PARAMETER)
 
     @staticmethod
-    def _get_pythonic_name_arg_name(r_name):
+    def _get_pythonic_name_arg_name(r_name, is_regex_match=False):
         """
         DESCRIPTION:
             Function to get the pythonic name for argument from the name specified
@@ -1111,6 +1120,12 @@ class _AnlyFuncMetadata:
                 Specifies the name of the argument which is mentioned in json file.
                 Types: str
 
+            is_regex_match:
+                Optional Argument.
+                Specifies whether regex match is set or not.
+                Default Value: False
+                Types: bool
+
         RETURNS:
             str
 
@@ -1120,6 +1135,9 @@ class _AnlyFuncMetadata:
         EXAMPLES:
             _AnlyFuncMetadata(json_data, "/abc/Antiselect.json")._get_pythonic_name_arg_name("abc")
         """
+        # When regex_match is set to True, we consider r_name as a regular expression.
+        if is_regex_match:
+            return r_name.strip()
         return r_name.strip().lower().replace(".", "_").replace("_table", "_data").replace("table_", "data_")
 
     def _get_function_name(self):

teradataml/analytics/sqle/DecisionTreePredict.py

@@ -338,7 +338,8 @@ class DecisionTreePredict:
                 self.__func_other_args, 
                 self.__func_other_arg_json_datatypes, 
                 self.__func_output_args_sql_names, 
-                self.__func_output_args, 
+                self.__func_output_args,
+                skip_config_lookup=True,
                 engine="ENGINE_SQL")
         # Invoke call to SQL-MR generation.
         self.sqlmr_query = self.__aqg_obj._gen_sqlmr_select_stmt_sql()
@@ -348,7 +349,7 @@ class DecisionTreePredict:
             print(self.sqlmr_query)
         
         # Set the algorithm name for Model Cataloging.
-        self._algorithm_name = self.__aqg_obj._get_alias_name_for_function(function_name)
+        self._algorithm_name = function_name
         
     def __execute(self):
         """

teradataml/analytics/sqle/NaiveBayesPredict.py

@@ -287,7 +287,8 @@ class NaiveBayesPredict:
                 self.__func_other_args, 
                 self.__func_other_arg_json_datatypes, 
                 self.__func_output_args_sql_names, 
-                self.__func_output_args, 
+                self.__func_output_args,
+                skip_config_lookup=True,
                 engine="ENGINE_SQL")
         # Invoke call to SQL-MR generation.
         self.sqlmr_query = self.__aqg_obj._gen_sqlmr_select_stmt_sql()
@@ -297,7 +298,7 @@ class NaiveBayesPredict:
             print(self.sqlmr_query)
         
         # Set the algorithm name for Model Cataloging.
-        self._algorithm_name = self.__aqg_obj._get_alias_name_for_function(function_name)
+        self._algorithm_name = function_name
         
     def __execute(self):
         """

teradataml/analytics/sqle/__init__.py

@@ -6,6 +6,9 @@ from teradataml.analytics.meta_class import _common_init, _common_dir
 from teradataml.analytics.json_parser.utils import _get_associated_parent_classes
 
 _sqle_functions = [
+                  'TDAPIVertexAI',
+                  'TDAPISagemaker',
+                  'TDAPIAzureML',
                   'AIAnalyzeSentiment',
                   'AITextTranslate',
                   'AIDetectLanguage',

teradataml/analytics/utils.py

@@ -459,10 +459,13 @@ class FuncSpecialCaseHandler():
                            "Matrix2Image": {"type": self._single_quote_arg,
                                             "colormap": self._single_quote_arg
                                            },
+                           "TDAPIVERTEXAI": {"authorization": self._remove_quotes},
+                           "TDAPISAGEMAKER": {"authorization": self._remove_quotes},
+                           "TDAPIAZUREML": {"authorization": self._remove_quotes},
                            "AIAnalyzeSentiment": {"authorization": self._remove_quotes},
                            "AITextTranslate": {"authorization": self._remove_quotes},
                            "AITextSummarize": {"authorization": self._remove_quotes},
-                           "AI_TextEmbeddings": {"authorization": self._remove_quotes},
+                           "AITextEmbeddings": {"authorization": self._remove_quotes},
                            "AITextClassifier": {"authorization": self._remove_quotes},
                            "AIRecognizePIIEntities": {"authorization": self._remove_quotes},
                            "AIRecognizeEntities": {"authorization": self._remove_quotes},