Release version 2.6.3

Author: mrDzurb

ads/__init__.py

@@ -57,15 +57,16 @@ def set_auth(
     global oci_config_path
     global oci_key_profile
     oci_key_profile = profile
-    if os.path.exists(os.path.expanduser(oci_config_location)):
-        oci_config_path = oci_config_location
-    else:
-        logging.warning(
-            f"{oci_config_location} file not exists, default value oci.config.DEFAULT_LOCATION used instead"
-        )
-        oci_config_path = oci.config.DEFAULT_LOCATION
+
     if auth == "api_key":
         resource_principal_mode = False
+        if os.path.exists(os.path.expanduser(oci_config_location)):
+            oci_config_path = oci_config_location
+        else:
+            logging.warning(
+                f"{oci_config_location} file not exists, default value oci.config.DEFAULT_LOCATION used instead"
+            )
+            oci_config_path = oci.config.DEFAULT_LOCATION
     elif auth == "resource_principal":
         resource_principal_mode = True
 

ads/ads_version.json

@@ -1,3 +1,3 @@
 {
-  "version": "2.6.2"
+  "version": "2.6.3"
 }

ads/common/model_export_util.py

@@ -148,7 +148,7 @@ def prepare_generic_model(
     >>>
     >>> ads.set_auth('api_key', oci_config_location=oci.config.DEFAULT_LOCATION, profile='DEFAULT')
     >>> model_artifact_location = os.path.expanduser('~/myusecase/model/')
-    >>> inference_conda_env="oci://my-bucket@namespace/conda_environments/cpu/Data Exploration and Manipulation for CPU Python 3.7/2.0/dataexpl_p37_cpu_v2"
+    >>> inference_conda_env="oci://my-bucket@namespace/conda_environments/cpu/Data_Exploration_and_Manipulation_for_CPU_Python_3.7/2.0/dataexpl_p37_cpu_v2"
     >>> inference_python_version = "3.7"
     >>> if not os.path.exists(model_artifact_location):
     ...     os.makedirs(model_artifact_location)

ads/common/model_introspect.py

@@ -260,7 +260,13 @@ def _prepare_result(self) -> List[PrintItem]:
         for key, item in self._result.items():
             error_msg = (
                 item.get(_TEST_COLUMNS.ERROR_MSG)
-                if item.get(_TEST_COLUMNS.SUCCESS) == False
+                if (
+                    item.get(_TEST_COLUMNS.SUCCESS) == False
+                    or (
+                        item.get(_TEST_COLUMNS.SUCCESS) == None
+                        and "WARNING" in item.get(_TEST_COLUMNS.ERROR_MSG, "")
+                    )
+                )
                 else ""
             )
             result.append(

ads/common/utils.py

@@ -92,13 +92,11 @@ class FileOverwriteError(Exception):
     pass
 
 
-# get number of core count
-@runtime_dependency(module="psutil", install_from=OptionalDependency.VIZ)
 def get_cpu_count():
     """
     Returns the number of CPUs available on this machine
     """
-    return psutil.cpu_count()
+    return os.cpu_count()
 
 
 @deprecated(
@@ -1119,13 +1117,12 @@ def _serialize_input_helper(
         data = data.tolist()
     elif isinstance(data, pd.core.frame.DataFrame):
         data = data.to_json()
-    elif isinstance(data, bytes):
-        data = base64.b64encode(data).decode("utf-8")
     elif (
         isinstance(data, dict)
         or isinstance(data, str)
         or isinstance(data, list)
         or isinstance(data, tuple)
+        or isinstance(data, bytes)
     ):
         pass
     else:

ads/dataflow/dataflow.py

@@ -25,6 +25,7 @@
     runtime_dependency,
     OptionalDependency,
 )
+from ads.common.decorator.deprecate import deprecated
 
 from oci.data_flow.models import (
     CreateApplicationDetails,
@@ -60,6 +61,7 @@ class SPARK_VERSION(str):
 
 
 class DataFlow:
+    @deprecated("2.6.3")
     def __init__(
         self,
         compartment_id=None,
@@ -947,6 +949,7 @@ def load_app(
 
 
 class DataFlowApp(DataFlow):
+    @deprecated("2.6.3")
     def __init__(self, app_config, app_response, app_dir, oci_link, **kwargs):
         super().__init__(compartment_id=app_config["compartment_id"], **kwargs)
         self._config = app_config
@@ -1386,6 +1389,7 @@ def get_run(self, run_id: str):
 
 
 class RunObserver:
+    @deprecated("2.6.3")
     def __init__(self, app, run_config, save_log_to_local):
         self.app = app
         self._config = run_config
@@ -1571,6 +1575,7 @@ def oci_link(self) -> object:
 class DataFlowRun(DataFlow):
     LOG_OUTPUTS = ["stdout", "stderr"]
 
+    @deprecated("2.6.3")
     def __init__(
         self, run_config, run_response, save_log_to_local, local_dir, **kwargs
     ):
@@ -1739,6 +1744,7 @@ def _repr_html_(self):
 
 
 class DataFlowLog:
+    @deprecated("2.6.3")
     def __init__(self, text, oci_path, log_local_dir):
         self.text = str(text)
         self._oci_path = oci_path

ads/dataflow/dataflowsummary.py

@@ -12,9 +12,11 @@
 from pandas import DataFrame
 import pandas as pd
 from abc import ABCMeta
+from ads.common.decorator.deprecate import deprecated
 
 
 class SummaryList(list, metaclass=ABCMeta):
+    @deprecated("2.6.3")
     def __init__(self, entity_list, datetime_format=utils.date_format):
         if isinstance(entity_list, filter):
             entity_list = list(entity_list)

ads/hpo/search_cv.py

@@ -8,6 +8,7 @@
 import multiprocessing
 import os
 import uuid
+import psutil
 from enum import Enum, auto
 from time import time, sleep
 
@@ -614,7 +615,6 @@ def _init_data(self, X, y):
                 self.X = X
                 self.y = y
 
-    @runtime_dependency(module="psutil", install_from=OptionalDependency.VIZ)
     def halt(self):
         """
         Halt the current running tuning process.
@@ -656,7 +656,6 @@ def halt(self):
                 "No running process found. Do you need to call tune()?"
             )
 
-    @runtime_dependency(module="psutil", install_from=OptionalDependency.VIZ)
     def resume(self):
         """
         Resume the current halted tuning process.

ads/jobs/builders/base.py

@@ -9,6 +9,9 @@
 
 
 class Builder(Serializable):
+
+    attribute_map = {}
+
     def __init__(self, spec: Dict = None, **kwargs) -> None:
         """Initialize the object with specifications.
 
@@ -25,9 +28,20 @@ def __init__(self, spec: Dict = None, **kwargs) -> None:
         super().__init__()
         if spec is None:
             spec = {}
+        spec = self._standardize_spec(spec)
+        kwargs = self._standardize_spec(kwargs)
         spec.update(kwargs)
         self._spec = spec
 
+    def _standardize_spec(self, spec):
+        if not spec:
+            return {}
+        snake_to_camel_map = {v: k for k, v in self.attribute_map.items()}
+        for key in list(spec.keys()):
+            if key not in self.attribute_map and key in snake_to_camel_map:
+                spec[snake_to_camel_map[key]] = spec.pop(key)
+        return spec
+
     def set_spec(self, k: str, v: Any):
         """Sets a specification property for the object.