namespace, bucket, prefix way added again.

Author: YashPandit4u

ads/model/datascience_model.py

@@ -1470,7 +1470,9 @@ def _download_file_description_artifact(self) -> Tuple[Union[str, List[str]], in
 
     def add_artifact(
         self,
-        uri: str,
+        namespace: str,
+        bucket: str,
+        prefix: Optional[str] = None,
         files: Optional[List[str]] = None,
     ):
         """
@@ -1496,11 +1498,11 @@ def add_artifact(
           If `files` is provided, it only retrieves information about objects with matching file names.
         - If no objects are found to add to the model description, a ValueError is raised.
         """
-        object_storage_details = ObjectStorageDetails.from_path(uri)
-        bucket = object_storage_details.bucket
-        namespace = object_storage_details.namespace
-        prefix = None if object_storage_details.filepath == "" else object_storage_details.filepath
 
+        # Check if both prefix and files are provided
+        if prefix is not None and files is not None:
+            raise ValueError("Both 'prefix' and 'files' cannot be provided. Please provide only one.")
+        
         if self.model_file_description == None:
             self.empty_json = {
                 "version": "1.0",
@@ -1513,7 +1515,7 @@ def add_artifact(
         self.object_storage_client = oc.OCIClientFactory(**(self.dsc_model.auth)).object_storage
 
         # Remove if the model already exists
-        self.remove_artifact(uri=uri)
+        self.remove_artifact(namespace=namespace, bucket=bucket, prefix=prefix)
 
         def check_if_file_exists(fileName):
             isExists = False
@@ -1588,7 +1590,7 @@ def list_obj_versions_unpaginated():
         )
         self.set_spec(self.CONST_MODEL_FILE_DESCRIPTION, tmp_model_file_description)
 
-    def remove_artifact(self, uri: str):
+    def remove_artifact(self, namespace: str, bucket: str, prefix: Optional[str] = None):
         """
         Removes information about objects in a specified bucket from the model description JSON.
 
@@ -1604,10 +1606,6 @@ def remove_artifact(self, uri: str):
         ------
         ValueError: If the model description JSON is None.
         """
-        object_storage_details = ObjectStorageDetails.from_path(uri)
-        bucket = object_storage_details.bucket
-        namespace = object_storage_details.namespace
-        prefix = None if object_storage_details.filepath == "" else object_storage_details.filepath
 
         def findModelIdx():
             for idx, model in enumerate(self.model_file_description["models"]):

tests/unitary/default_setup/model/test_datascience_model.py

@@ -1155,7 +1155,8 @@ def test_add_artifact(self, mock_oci_client_factory):
         mock_oci_client_factory.return_value.object_storage = mock_object_storage_client
 
         # self.mock_dsc_model
-        self.mock_dsc_model.add_artifact(uri="oci://bucket@namespace/prefix")
+        # self.mock_dsc_model.add_artifact(uri="oci://bucket@namespace/prefix")
+        self.mock_dsc_model.add_artifact(namespace="namespace", bucket="bucket", prefix="prefix")
         expected_out = {
             'version': '1.0', 
             'type': 'modelOSSReferenceDescription', 
@@ -1175,7 +1176,8 @@ def test_add_artifact(self, mock_oci_client_factory):
             ]
         }
         assert self.mock_dsc_model.model_file_description == expected_out
-        self.mock_dsc_model.remove_artifact(uri="oci://bucket@namespace/prefix")
+        # self.mock_dsc_model.remove_artifact(uri="oci://bucket@namespace/prefix")
+        self.mock_dsc_model.remove_artifact(namespace="namespace", bucket="bucket", prefix="prefix")
         assert self.mock_dsc_model.model_file_description != expected_out
         expected_out = {
             'version': '1.0', 
@@ -1185,13 +1187,16 @@ def test_add_artifact(self, mock_oci_client_factory):
         assert self.mock_dsc_model.model_file_description == expected_out
 
     def test_remove_artifact(self):
-        self.mock_dsc_model.remove_artifact(uri="oci://unzip-multi-model@ociodscdev/model-linear-1")
+        # self.mock_dsc_model.remove_artifact(uri="oci://unzip-multi-model@ociodscdev/model-linear-1")
+        self.mock_dsc_model.remove_artifact(namespace="ociodscdev", bucket="unzip-multi-model", prefix="model-linear-1")
+
         assert self.mock_dsc_model.model_file_description == None
 
         self.mock_dsc_model.set_spec(CONST_MODEL_FILE_DESCRIPTION, deepcopy(MODEL_BY_REF_JSON))
         assert self.mock_dsc_model.model_file_description == MODEL_BY_REF_JSON
 
-        self.mock_dsc_model.remove_artifact(uri="oci://unzip-multi-model@ociodscdev/model-linear-1")
+        # self.mock_dsc_model.remove_artifact(uri="oci://unzip-multi-model@ociodscdev/model-linear-1")
+        self.mock_dsc_model.remove_artifact(namespace="ociodscdev", bucket="unzip-multi-model", prefix="model-linear-1")
         assert self.mock_dsc_model.model_file_description != MODEL_BY_REF_JSON
 
         exptected_json = deepcopy(MODEL_BY_REF_JSON)