Updated pr.

Author: lu-ohai

ads/jobs/__init__.py

@@ -23,8 +23,7 @@
     from ads.jobs.builders.infrastructure.dsc_job import (
         DataScienceJob,
         DataScienceJobRun,
-        DSCFileSystem,
-        DSCFileStorage,
+        OCIFileStorage,
     )
     from ads.jobs.builders.infrastructure.dataflow import DataFlow, DataFlowRun
 except AttributeError as e:
@@ -50,6 +49,5 @@
     "DataFlowRun",
     "DataFlowRuntime",
     "DataFlowNotebookRuntime",
-    "DSCFileSystem",
-    "DSCFileStorage",
+    "OCIFileStorage",
 ]

ads/jobs/builders/infrastructure/__init__.py

@@ -3,4 +3,4 @@
 
 # Copyright (c) 2021, 2023 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
-from .dsc_job import DataScienceJob, DSCFileSystem, DSCFileStorage
+from .dsc_job import DataScienceJob, OCIFileStorage

ads/jobs/builders/infrastructure/dsc_file_system.py

@@ -27,16 +27,16 @@ def from_dict(cls, env: dict) -> "DSCFileSystem":
         """Initialize the object from a Python dictionary."""
         return cls(**{utils.camel_to_snake(k): v for k, v in env.items()})
 
-    def _update_to_dsc_model(self, **kwargs) -> dict:
+    def update_to_dsc_model(self, **kwargs) -> dict:
         return self.to_dict()
 
     @classmethod
-    def _update_from_dsc_model(cls, dsc_model: dict) -> "DSCFileSystem":
+    def update_from_dsc_model(cls, dsc_model: dict) -> "DSCFileSystem":
         return cls.from_dict(dsc_model)
 
 
 @dataclass
-class DSCFileStorage(DSCFileSystem):
+class OCIFileStorage(DSCFileSystem):
 
     mount_target: str = None
     mount_target_id: str = None
@@ -60,7 +60,7 @@ def __post_init__(self):
                 "Either parameter `export_path` or `export_id` must be provided to mount file system."
             )
 
-    def _update_to_dsc_model(self, **kwargs) -> dict:
+    def update_to_dsc_model(self, **kwargs) -> dict:
         """Updates arguments to dsc model.
 
         Returns
@@ -128,7 +128,7 @@ def _update_to_dsc_model(self, **kwargs) -> dict:
         return arguments
 
     @classmethod
-    def _update_from_dsc_model(cls, dsc_model: dict) -> DSCFileSystem:
+    def update_from_dsc_model(cls, dsc_model: dict) -> DSCFileSystem:
         """Updates arguments and builds DSCFileSystem object from dsc model.
 
         Parameters

ads/jobs/builders/infrastructure/dsc_job.py

@@ -37,7 +37,7 @@
 from ads.jobs.builders.runtimes.python_runtime import GitPythonRuntime
 
 from ads.jobs.builders.infrastructure.dsc_file_system import (
-    DSCFileStorage,
+    OCIFileStorage,
     DSCFileSystem,
 )
 
@@ -844,7 +844,7 @@ class DataScienceJob(Infrastructure):
             .with_block_storage_size(50)
             # A list of file systems to be mounted
             .with_storage_mount(
-                DSCFileStorage(
+                OCIFileStorage(
                     destination_directory_name="test_mount",
                     mount_target="test_mount_target",
                     export_path="test_export_path"
@@ -907,7 +907,7 @@ class DataScienceJob(Infrastructure):
         v.split(".", maxsplit=1)[-1]: k for k, v in payload_attribute_map.items()
     }
 
-    storage_mount_type_dict = {FILE_STORAGE_TYPE: DSCFileStorage}
+    storage_mount_type_dict = {FILE_STORAGE_TYPE: OCIFileStorage}
 
     @staticmethod
     def standardize_spec(spec):
@@ -1385,7 +1385,7 @@ def _update_storage_mount_from_dsc_model(
             storage_mount = [
                 self.storage_mount_type_dict[
                     file_system["storageType"]
-                ]._update_from_dsc_model(file_system)
+                ].update_from_dsc_model(file_system)
                 for file_system in storage_mount_list
                 if file_system["storageType"] in self.storage_mount_type_dict
             ]
@@ -1436,7 +1436,7 @@ def _update_job_infra(self, dsc_job: DSCJob) -> DataScienceJob:
                     "Storage mount hasn't been supported in the current OCI SDK installed."
                 )
             dsc_job.job_storage_mount_configuration_details_list = [
-                file_system._update_to_dsc_model(compartment_id=dsc_job.compartment_id)
+                file_system.update_to_dsc_model(compartment_id=dsc_job.compartment_id)
                 for file_system in self.storage_mount
             ]
         return self

tests/unitary/default_setup/jobs/test_jobs_mount_file_system.py

@@ -10,7 +10,7 @@
 import pytest
 
 from ads.jobs.ads_job import Job
-from ads.jobs.builders.infrastructure import DSCFileStorage, DataScienceJob
+from ads.jobs.builders.infrastructure import OCIFileStorage, DataScienceJob
 from ads.jobs.builders.runtimes.python_runtime import PythonRuntime
 
 try:
@@ -71,7 +71,7 @@
         .with_shape_config_details(memory_in_gbs=16, ocpus=1)
         .with_block_storage_size(50)
         .with_storage_mount(
-            DSCFileStorage(
+            OCIFileStorage(
                 destination_directory_name="test_mount_one",
                 mount_target="test_mount_target_one",
                 export_path="test_export_path_one",
@@ -134,14 +134,14 @@ class TestDataScienceJobMountFileSystem(unittest.TestCase):
     def test_data_science_job_initialize(self):
         assert isinstance(job.infrastructure.storage_mount, list)
         dsc_file_storage_one = job.infrastructure.storage_mount[0]
-        assert isinstance(dsc_file_storage_one, DSCFileStorage)
+        assert isinstance(dsc_file_storage_one, OCIFileStorage)
         assert dsc_file_storage_one.storage_type == "FILE_STORAGE"
         assert dsc_file_storage_one.destination_directory_name == "test_mount_one"
         assert dsc_file_storage_one.mount_target == "test_mount_target_one"
         assert dsc_file_storage_one.export_path == "test_export_path_one"
 
         dsc_file_storage_two = job.infrastructure.storage_mount[1]
-        assert isinstance(dsc_file_storage_two, DSCFileStorage)
+        assert isinstance(dsc_file_storage_two, OCIFileStorage)
         assert dsc_file_storage_two.storage_type == "FILE_STORAGE"
         assert dsc_file_storage_two.destination_directory_name == "test_mount_two"
         assert dsc_file_storage_two.mount_target == "test_mount_target_two"
@@ -152,14 +152,14 @@ def test_data_science_job_from_yaml(self):
 
         assert isinstance(job_from_yaml.infrastructure.storage_mount, list)
         dsc_file_storage_one = job_from_yaml.infrastructure.storage_mount[0]
-        assert isinstance(dsc_file_storage_one, DSCFileStorage)
+        assert isinstance(dsc_file_storage_one, OCIFileStorage)
         assert dsc_file_storage_one.storage_type == "FILE_STORAGE"
         assert dsc_file_storage_one.destination_directory_name == "test_mount_one"
         assert dsc_file_storage_one.mount_target == "test_mount_target_one"
         assert dsc_file_storage_one.export_path == "test_export_path_one"
 
         dsc_file_storage_two = job.infrastructure.storage_mount[1]
-        assert isinstance(dsc_file_storage_two, DSCFileStorage)
+        assert isinstance(dsc_file_storage_two, OCIFileStorage)
         assert dsc_file_storage_two.storage_type == "FILE_STORAGE"
         assert dsc_file_storage_two.destination_directory_name == "test_mount_two"
         assert dsc_file_storage_two.mount_target == "test_mount_target_two"
@@ -214,7 +214,7 @@ def test_mount_file_system_failed(self):
             ValueError,
             match="Either parameter `export_path` or `export_id` must be provided to mount file system.",
         ):
-            DSCFileStorage(
+            OCIFileStorage(
                 destination_directory_name="test_mount",
                 mount_target_id="ocid1.mounttarget.oc1.iad.xxxx",
             )
@@ -223,7 +223,7 @@ def test_mount_file_system_failed(self):
             ValueError,
             match="Either parameter `mount_target` or `mount_target_id` must be provided to mount file system.",
         ):
-            DSCFileStorage(
+            OCIFileStorage(
                 destination_directory_name="test_mount",
                 export_id="ocid1.export.oc1.iad.xxxx",
             )
@@ -232,13 +232,13 @@ def test_mount_file_system_failed(self):
             ValueError,
             match="Parameter `destination_directory_name` must be provided to mount file system.",
         ):
-            DSCFileStorage(
+            OCIFileStorage(
                 mount_target_id="ocid1.mounttarget.oc1.iad.xxxx",
                 export_id="ocid1.export.oc1.iad.xxxx",
             )
 
         job_copy = copy.deepcopy(job)
-        dsc_file_storage = DSCFileStorage(
+        dsc_file_storage = OCIFileStorage(
             destination_directory_name="test_mount",
             mount_target="test_mount_target",
             export_id="ocid1.export.oc1.iad.xxxx",
@@ -305,8 +305,8 @@ def test_update_storage_mount_from_dsc_model(
         infrastructure._update_from_dsc_model(dsc_job_payload)
 
         assert len(infrastructure.storage_mount) == 2
-        assert isinstance(infrastructure.storage_mount[0], DSCFileStorage)
-        assert isinstance(infrastructure.storage_mount[1], DSCFileStorage)
+        assert isinstance(infrastructure.storage_mount[0], OCIFileStorage)
+        assert isinstance(infrastructure.storage_mount[1], OCIFileStorage)
         assert infrastructure.storage_mount[0].to_dict() == {
             "destinationDirectoryName": "test_destination_directory_name_from_dsc",
             "exportId": "export_id_from_dsc",