Skip to content

Commit 710b8fb

Browse files
authored
Merge pull request #16 from oracle/2.6.x
Release version 2.6.7
2 parents 3fee4c6 + 725e79e commit 710b8fb

File tree

42 files changed

+1269
-542
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+1269
-542
lines changed

ads/ads_version.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"version": "2.6.6"
2+
"version": "2.6.7"
33
}

ads/automl/provider.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
runtime_dependency,
2929
OptionalDependency,
3030
)
31+
from ads.common.decorator.deprecate import deprecated
3132
from ads.dataset.label_encoder import DataFrameLabelEncoder
3233
from ads.dataset.helper import is_text_data
3334

@@ -305,6 +306,10 @@ def decide_estimator(self, **kwargs):
305306

306307
# An installation of oracle labs automl is required only for this class
307308
class OracleAutoMLProvider(AutoMLProvider, ABC):
309+
@deprecated(
310+
"2.6.7",
311+
details="Oracle AutoML is recommended to be directly instantiated by importing automlx package",
312+
)
308313
def __init__(
309314
self, n_jobs=-1, loglevel=None, logger_override=None, model_n_jobs: int = 1
310315
):

ads/common/data_serializer.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,9 @@ def __init__(
6666
pass
6767
else:
6868
raise TypeError(
69-
"The provided data type is not json serializable. "
7069
"The supported data types are Dict, str, list, "
7170
"numpy.ndarray, pd.core.series.Series, "
72-
"pd.core.frame.DataFrame. Please "
71+
"pd.core.frame.DataFrame, bytes. Please "
7372
"convert to the supported data types first. "
7473
)
7574

@@ -106,6 +105,7 @@ def send(self, endpoint: str, dry_run: bool = False, **kwargs):
106105
)
107106
request_kwargs = {"json": self.to_dict()}
108107
request_kwargs["headers"] = headers
108+
109109
if dry_run:
110110
request_kwargs["headers"]["Accept"] = "*/*"
111111
req = requests.Request("POST", endpoint, **request_kwargs).prepare()

ads/common/model_metadata.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ class MetadataCustomKeys(str, metaclass=ExtendedEnumMeta):
142142
VALIDATION_DATASET_NUMBER_OF_ROWS = "ValidationDatasetNumberOfRows"
143143
VALIDATION_DATASET_NUMBER_OF_COLS = "ValidationDataSetNumberOfCols"
144144
CLIENT_LIBRARY = "ClientLibrary"
145+
MODEL_FILE_NAME = "ModelFileName"
145146

146147

147148
class MetadataCustomCategory(str, metaclass=ExtendedEnumMeta):

ads/common/model_metadata_mixin.py

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -173,14 +173,30 @@ def _populate_metadata_custom(self):
173173
category=MetadataCustomCategory.TRAINING_ENV,
174174
)
175175
)
176-
model_metadata_items.append(
177-
ModelCustomMetadataItem(
178-
key=MetadataCustomKeys.MODEL_SERIALIZATION_FORMAT,
179-
value=self.model_file_name.split(".")[-1],
180-
description="The model serialization format.",
181-
category=MetadataCustomCategory.TRAINING_PROFILE,
176+
177+
if self.model_file_name:
178+
model_metadata_items.append(
179+
ModelCustomMetadataItem(
180+
key=MetadataCustomKeys.MODEL_SERIALIZATION_FORMAT,
181+
value=self.model_file_name.split(".")[-1],
182+
description="The model serialization format.",
183+
category=MetadataCustomCategory.TRAINING_PROFILE,
184+
)
182185
)
183-
)
186+
model_metadata_items.append(
187+
ModelCustomMetadataItem(
188+
key=MetadataCustomKeys.MODEL_FILE_NAME,
189+
value=self.model_file_name,
190+
description="The model file name.",
191+
category=MetadataCustomCategory.OTHER,
192+
)
193+
)
194+
else:
195+
logger.warning(
196+
"Unable to extract a model serialization format. "
197+
"The `model_file_name` is not provided."
198+
)
199+
184200
model_metadata_items.append(
185201
ModelCustomMetadataItem(
186202
key=MetadataCustomKeys.CLIENT_LIBRARY,

0 commit comments

Comments
 (0)