teradataml 20.0.0.4__py3-none-any.whl → 20.0.0.5__py3-none-any.whl

teradataml/opensource/_base.py

@@ -89,22 +89,14 @@ class _GenericObjectWrapper:
             else:
                 self._env = UtilFuncs._create_or_get_env("open_source_ml.json")
 
-            # Raise exception when python versions don't match between Lake user environment and local.
-            self._process_python_version_diff_lake()
-
-        else:
-            set_session_param("searchuifdbpath",self._db_name)
-            from teradataml.dbutils.dbutils import db_python_version_diff
-            if len(db_python_version_diff()) > 0:
-                # Raise exception when python versions don't match between Vantage and local.
-                from teradataml.context import context as tdmlctx
-                py_major_vantage_version = tdmlctx.python_version_vantage.rsplit(".", 1)[0]
-                raise TeradataMlException(Messages.get_message(MessageCodes.PYTHON_VERSION_MISMATCH,
-                                                               tdmlctx.python_version_vantage, py_major_vantage_version),
-                                          MessageCodes.PYTHON_VERSION_MISMATCH)
+        # Check if the Python interpreter major versions are consistent between Vantage and local.
+        UtilFuncs._check_python_version_diff(self._env)
             
         # Raise warning when python package versions don't match between Vantage and local.
-        self._process_package_differences()
+        # OPENSOURCE_PACKAGE_NAME is set for each opensource package, but not for the base class.
+        # Add a check to avoid running this function for the base class.
+        if self.OPENSOURCE_PACKAGE_NAME is not None:
+            UtilFuncs._check_package_version_diff(self.OPENSOURCE_PACKAGE_NAME.value, self._pkgs, self._env) 
 
         global _file_installed
         ## Flag to check whether trained model is installed or not.
@@ -121,149 +113,6 @@ class _GenericObjectWrapper:
 
             _file_installed = True
 
-    def _process_python_version_diff_lake(self):
-        """
-        DESCRIPTION:
-            Internal function to process Python interpreter version differences between Lake user environment and local.
-            Note:
-                * Raises an exception if the Python interpreter major versions are not consistent between 
-                  Lake user environment and local.
-
-        PARAMETERS:
-            None
-
-        RETURNS:
-            None
-
-        RAISES:
-            TeradataMlException
-        
-        EXAMPLES:
-            self._process_python_version_diff_lake()
-        """
-        # Get the Python interpreter version of the user environment.
-        env_list = list_user_envs()
-        user_env_name = self._env.env_name
-        env_base_version = env_list[env_list['env_name'] == user_env_name].base_env_name.values[0]
-        python_env = env_base_version.split("_")[1]
-
-        # Get the Python interpreter version of the local environment.
-        from teradataml.context import context as tdmlctx
-        python_local = tdmlctx.python_version_local.rsplit(".", 1)[0]
-        # Check if the Python interpreter major versions are consistent between Lake user environment and local.
-        # If not, raise an exception.
-        if python_env != python_local:
-            raise TeradataMlException(Messages.get_message(MessageCodes.PYTHON_VERSION_MISMATCH_OAF,
-                                                            python_env, python_local),
-                                        MessageCodes.PYTHON_VERSION_MISMATCH_OAF)
-            
-    def _process_package_differences(self):
-        """
-        DESCRIPTION:
-            Internal function to process package differences between Vantage and local.
-            Note:
-                * Raises a warning if the versions of certain Python packages are not consistent between Vantage and local.
-
-        PARAMETERS:
-            None
-
-        RETURNS:
-            None
-
-        RAISES:
-            PackageNotFoundError: If the package is not found in the local environment for OAF.
-
-        EXAMPLES:
-            self._process_package_differences()
-        """
-        # OPENSOURCE_PACKAGE_NAME is set for each opensource package, but not for the base class.
-        # Add a check to avoid running this function for the base class.
-        if self.OPENSOURCE_PACKAGE_NAME is None:
-            return
-        _is_packages_verfied_in_vantage = _packages_verified_in_vantage.get(
-            self.OPENSOURCE_PACKAGE_NAME.value, None)
-        if _is_packages_verfied_in_vantage:
-            return
-        
-        if self._is_lake_system:
-            env_pkg_df = self._env.libs
-            pkgs_dict = dict(zip(env_pkg_df['name'], env_pkg_df['version']))
-
-            i = 0
-            from importlib.metadata import version
-            warning_raised = False
-            for pkg in self._pkgs:
-                env_version = pkgs_dict.get(pkg)
-                try:
-                    local_version = version(pkg)
-                except Exception as e:
-                    raise
-                if env_version != local_version:
-                    warning_raised = True
-                    if i == 0:
-                        strr = f"{pkg}=={local_version}\n"
-                        i += 1
-                    else:
-                        strr += f"{pkg}=={local_version}\n"
-
-            # If there are differences in package versions, display a warning message to the user.
-            # about the package differences and the requirements file created for the user to install the packages
-            if warning_raised:
-                file_name = f"requirements_{self.OPENSOURCE_PACKAGE_NAME.value}.txt"
-                req_file = os.path.join(self._tdml_tmp_dir, file_name)
-                with open(req_file, "w") as f:
-                    f.write(strr)
-                _pkgs = "', '".join(self._pkgs[:-1]) + "' and '" + self._pkgs[-1]
-                warning_msg = "The versions of certain Python packages are not consistent between "\
-                    "Lake user environment and local. OpenSourceML compares the versions of '{}' "\
-                    f"(and also matches the patterns of these packages) used by 'td_{self.OPENSOURCE_PACKAGE_NAME.value}'. "\
-                    "Teradata recommends same versions for all the Python packages between Lake "\
-                    "user environment and local."
-                req = f"\nA requirements file listing all '{self.OPENSOURCE_PACKAGE_NAME.value}' " + \
-                    f"related packages and their versions has been written to '{req_file}'. "+ \
-                    "Update the Lake user environment with the required packages.\n"
-                
-                warning_msg += req
-                warnings.warn(warning_msg.format(_pkgs), category=OneTimeUserWarning)
-
-        else:
-            # Check if the versions of Python packages are consistent between Vantage and local.
-            from teradataml.dbutils.dbutils import _db_python_package_version_diff
-            all_package_versions = _db_python_package_version_diff(self._pkgs, only_diff=False)
-            package_difference = \
-                all_package_versions[all_package_versions.vantage != all_package_versions.local]
-            # If there are differences in package versions, raise a warning.
-            if package_difference.shape[0] > 0:
-                _pkgs = "', '".join(self._pkgs[:-1]) + "' and '" + self._pkgs[-1]
-                warning_msg = "The versions of certain Python packages are not consistent between "\
-                    "Vantage and local. User can identify them using db_python_package_version_diff() "\
-                    "function. OpenSourceML compares the versions of '{}' (and also matches the "\
-                    f"patterns of these packages) used by 'td_{self.OPENSOURCE_PACKAGE_NAME.value}'. Teradata "\
-                    "recommends to maintain same versions for all the Python packages between Vantage "\
-                    "and local."
-                i = 0
-                # Write the requirements file listing all the related packages and their versions.
-                for rec in all_package_versions.to_records():
-                    if i == 0:
-                        strr = f"{rec[1]}=={rec[2]}\n"
-                        i += 1
-                    else:
-                        strr += f"{rec[1]}=={rec[2]}\n"
-                file_name = f"requirements_{self.OPENSOURCE_PACKAGE_NAME.value}.txt"
-                req_file = os.path.join(self._tdml_tmp_dir, file_name)
-                with open(req_file, "w") as f:
-                    f.write(strr)
-
-                # Display a warning message to the user about the package differences
-                # and the requirements file created for the user to install the packages.
-                req = f"\nA requirements file listing all '{self.OPENSOURCE_PACKAGE_NAME.value}' " + \
-                    f"related packages and their versions has been written to '{req_file}'.\n"
-                
-                warning_msg += req
-                warnings.warn(warning_msg.format(_pkgs), category=OneTimeUserWarning)
-
-        _packages_verified_in_vantage[self.OPENSOURCE_PACKAGE_NAME.value] = True
-
     def _get_columns_as_list(self, cols):
         """
         Internal function to get columns as list of strings.

teradataml/options/configure.py

@@ -244,9 +244,9 @@ class _Configure(_ConfigureSuper):
         super().__setattr__('ues_url', None)
         # base URL in Vector Store REST calls
         super().__setattr__('_vector_store_base_url', None)
-        # Whether tenant is CCP enabled or not.
-        # By default, it is set to False, as it can be Enterprise or NON-CCP.
-        super().__setattr__('_ccp_enabled', False)
+        # Internal parameter, which is used to specify whether SSL verification is to be done or not.
+        # By default, it is set to True.
+        super().__setattr__('_ssl_verify', True)
         # Internal parameter, that is used to specify the certificate file in a secured HTTP request.
         super().__setattr__('certificate_file', False)
         # Internal parameter, that is used for specify the maximum size of the file
@@ -330,7 +330,7 @@ class _Configure(_ConfigureSuper):
                                                                    "greater than or equal to"),
                                               MessageCodes.TDMLDF_POSITIVE_INT)
             elif name in ['column_casesensitive_handler', '_validate_metaexpression',
-                          '_validate_gc', 'inline_plot', '_oauth', '_ccp_enabled']:
+                          '_validate_gc', 'inline_plot', '_oauth', '_ssl_verify']:
 
                 if not isinstance(value, bool):
                     raise TeradataMlException(Messages.get_message(MessageCodes.UNSUPPORTED_DATATYPE, name,
@@ -387,7 +387,6 @@ class _Configure(_ConfigureSuper):
                             MessageCodes.PATH_NOT_FOUND)
 
             elif name in {'ues_url', '_oauth_end_point', '_oauth_client_id', '_vector_store_base_url'}:
-
                 if not isinstance(value, str):
                     raise TypeError(Messages.get_message(MessageCodes.UNSUPPORTED_DATATYPE, name, 'str'))