Skip to content

Commit f847ca3

Browse files
kumar-shivam-ranjankumar-shivam-ranjan
committed
Updating has_artifact field in ADS
1 parent f917ee7 commit f847ca3

File tree

11 files changed

+27
-25
lines changed

11 files changed

+27
-25
lines changed

‎ads/aqua/app.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,9 @@
2121
is_valid_ocid,
2222
load_config,
2323
)
24-
2524
from ads.common import oci_client as oc
2625
from ads.common.auth import default_signer
27-
from ads.common.utils import extract_region, is_path_exists , UNKNOWN
26+
from ads.common.utils import UNKNOWN, extract_region, is_path_exists
2827
from ads.config import (
2928
AQUA_TELEMETRY_BUCKET,
3029
AQUA_TELEMETRY_BUCKET_NS,

‎ads/aqua/common/utils.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
from string import Template
2020
from typing import List, Union
2121

22-
import fsspec
2322
import oci
2423
from cachetools import TTLCache, cached
2524
from huggingface_hub.constants import HF_HUB_CACHE
@@ -61,16 +60,19 @@
6160
UNKNOWN_JSON_STR,
6261
VLLM_INFERENCE_RESTRICTED_PARAMS,
6362
)
64-
65-
from ads.common.utils import UNKNOWN
66-
6763
from ads.aqua.data import AquaResourceIdentifier
6864
from ads.common.auth import AuthState, default_signer
6965
from ads.common.decorator.threaded import threaded
7066
from ads.common.extended_enum import ExtendedEnum
7167
from ads.common.object_storage_details import ObjectStorageDetails
7268
from ads.common.oci_resource import SEARCH_TYPE, OCIResource
73-
from ads.common.utils import copy_file, get_console_link, upload_to_os, read_file
69+
from ads.common.utils import (
70+
UNKNOWN,
71+
copy_file,
72+
get_console_link,
73+
read_file,
74+
upload_to_os,
75+
)
7476
from ads.config import (
7577
AQUA_MODEL_DEPLOYMENT_FOLDER,
7678
AQUA_SERVICE_MODELS_BUCKET,

‎ads/aqua/constants.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
44
"""This module defines constants used in ads.aqua module."""
55

6-
76
UNKNOWN_VALUE = ""
87
READY_TO_IMPORT_STATUS = "TRUE"
98
UNKNOWN_DICT = {}

‎ads/aqua/evaluation/evaluation.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
EVALUATION_REPORT_MD,
5353
JOB_INFRASTRUCTURE_TYPE_DEFAULT_NETWORKING,
5454
LIFECYCLE_DETAILS_MISSING_JOBRUN,
55-
NB_SESSION_IDENTIFIER
55+
NB_SESSION_IDENTIFIER,
5656
)
5757
from ads.aqua.evaluation.constants import (
5858
EVAL_TERMINATION_STATE,
@@ -77,7 +77,7 @@
7777
from ads.aqua.ui import AquaContainerConfig
7878
from ads.common.auth import default_signer
7979
from ads.common.object_storage_details import ObjectStorageDetails
80-
from ads.common.utils import get_console_link, get_files, get_log_links , UNKNOWN
80+
from ads.common.utils import UNKNOWN, get_console_link, get_files, get_log_links
8181
from ads.config import (
8282
AQUA_JOB_SUBNET_ID,
8383
COMPARTMENT_OCID,

‎ads/aqua/finetuning/finetuning.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
)
4545
from ads.common.auth import default_signer
4646
from ads.common.object_storage_details import ObjectStorageDetails
47-
from ads.common.utils import get_console_link , UNKNOWN
47+
from ads.common.utils import UNKNOWN, get_console_link
4848
from ads.config import (
4949
AQUA_FINETUNING_CONTAINER_OVERRIDE_FLAG_METADATA_NAME,
5050
AQUA_JOB_SUBNET_ID,

‎ads/aqua/model/model.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
from ads.aqua.ui import AquaContainerConfig, AquaContainerConfigItem
7979
from ads.common.auth import default_signer
8080
from ads.common.oci_resource import SEARCH_TYPE, OCIResource
81-
from ads.common.utils import get_console_link , UNKNOWN
81+
from ads.common.utils import UNKNOWN, get_console_link
8282
from ads.config import (
8383
AQUA_DEPLOYMENT_CONTAINER_CMD_VAR_METADATA_NAME,
8484
AQUA_DEPLOYMENT_CONTAINER_METADATA_NAME,

‎ads/aqua/modeldeployment/deployment.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
)
4242
from ads.aqua.ui import ModelFormat
4343
from ads.common.object_storage_details import ObjectStorageDetails
44-
from ads.common.utils import get_log_links , UNKNOWN
44+
from ads.common.utils import UNKNOWN, get_log_links
4545
from ads.config import (
4646
AQUA_DEPLOYMENT_CONTAINER_CMD_VAR_METADATA_NAME,
4747
AQUA_DEPLOYMENT_CONTAINER_METADATA_NAME,

‎ads/aqua/modeldeployment/entities.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
)
1212

1313
from ads.aqua.common.enums import Tags
14-
from ads.aqua.constants import UNKNOWN_DICT
14+
from ads.aqua.constants import UNKNOWN_DICT
1515
from ads.aqua.data import AquaResourceIdentifier
1616
from ads.common.serializer import DataClassSerializable
17-
from ads.common.utils import get_console_link , UNKNOWN
17+
from ads.common.utils import UNKNOWN, get_console_link
1818

1919

2020
@dataclass

‎ads/common/utils.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,7 @@ def random_valid_ocid(prefix="ocid1.dataflowapplication.oc1.iad"):
238238
fake = "".join([random.choice(string.ascii_lowercase) for i in range(60)])
239239
return f"{left}.{fake}"
240240

241+
241242
def read_file(file_path: str, **kwargs) -> str:
242243
try:
243244
with fsspec.open(file_path, "r", **kwargs.get("auth", {})) as f:
@@ -246,6 +247,7 @@ def read_file(file_path: str, **kwargs) -> str:
246247
logger.debug(f"Failed to read file {file_path}. {e}")
247248
return UNKNOWN
248249

250+
249251
def get_dataframe_styles(max_width=75):
250252
"""Styles used for dataframe, example usage:
251253

‎ads/model/model_metadata.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -341,22 +341,22 @@ def _to_oci_metadata(self):
341341
def _from_oci_metadata(cls, oci_metadata_item) -> "ModelMetadataItem":
342342
"""Creates a new metadata item from the OCI metadata item."""
343343
oci_metadata_item = to_dict(oci_metadata_item)
344-
print("oci_metadata_item: ",oci_metadata_item)
344+
print("oci_metadata_item: ", oci_metadata_item)
345345
key_value_map = {field: oci_metadata_item.get(field) for field in cls._FIELDS}
346-
print("key_value_map['value'] type: ",type(key_value_map["value"]))
346+
print("key_value_map['value'] type: ", type(key_value_map["value"]))
347347
if isinstance(key_value_map["value"], str):
348348
try:
349-
print("type of oci_metadata_item: ",type(oci_metadata_item))
349+
print("type of oci_metadata_item: ", type(oci_metadata_item))
350350
key_value_map["value"] = json.loads(oci_metadata_item.get("value"))
351351
try:
352352
key_value_map["has_artifact"] = json.loads(
353353
oci_metadata_item.get("has_artifact")
354354
)
355355
except Exception:
356-
key_value_map["has_artifact"]=False
356+
key_value_map["has_artifact"] = False
357357
except Exception:
358358
pass
359-
print("key value map: ",key_value_map)
359+
print("key value map: ", key_value_map)
360360
return cls(**key_value_map)
361361

362362
def __hash__(self):
@@ -692,7 +692,7 @@ def _to_oci_metadata(self):
692692
if not oci_metadata_item.category:
693693
oci_metadata_item.category = MetadataCustomCategory.OTHER
694694
if not oci_metadata_item.has_artifact:
695-
oci_metadata_item.has_artifact=False
695+
oci_metadata_item.has_artifact = False
696696
return oci_metadata_item
697697

698698
def validate(self) -> bool:
@@ -1548,9 +1548,9 @@ def _from_oci_metadata(cls, metadata_list):
15481548
"""
15491549
metadata = cls()
15501550
for oci_item in metadata_list:
1551-
print("oci_item: ",oci_item)
1551+
print("oci_item: ", oci_item)
15521552
item = ModelTaxonomyMetadataItem._from_oci_metadata(oci_item)
1553-
print("item: ",item)
1553+
print("item: ", item)
15541554
if item.key in metadata.keys:
15551555
metadata[item.key].update(value=item.value)
15561556
else:

0 commit comments

Comments
 (0)