Fix unit tests

Author: mrDzurb

ads/jobs/builders/infrastructure/dataflow.py

@@ -1148,5 +1148,5 @@ def init(self) -> "DataFlow":
             .with_spark_version(self.spark_version or DEFAULT_SPARK_VERSION)
             .with_num_executors(self.num_executors or DEFAULT_NUM_EXECUTORS)
             .with_driver_shape(self.driver_shape or DEFAULT_SHAPE)
-            .with_executor_shape(self.with_executor_shape or DEFAULT_SHAPE)
+            .with_executor_shape(self.executor_shape or DEFAULT_SHAPE)
         )

ads/jobs/builders/runtimes/container_runtime.py

@@ -136,5 +136,5 @@ def init(self) -> "ContainerRuntime":
         return self.with_image(
             image="iad.ocir.io/namespace/image:tag",
             entrypoint=["bash", "--login", "-c"],
-            cmd="{Container CMD. For the MLflow will be replaced with the Project CMD}",
+            cmd="{Container CMD. For MLFlow, it will be replaced with the Project CMD}",
         )

ads/jobs/builders/runtimes/python_runtime.py

@@ -257,10 +257,10 @@ def init(self) -> "ScriptRuntime":
         super().init()
         return (
             self.with_entrypoint(
-                "{Entrypoint script. For MLFlow, it will be replaced with the CMD}"
+                "{Entrypoint script. For MLflow, it will be replaced with the CMD}"
             )
             .with_script(
-                "{Path to the script. For MLFlow, it will be replaced with the path to the project}"
+                "{Path to the script. For MLflow, it will be replaced with the path to the project}"
             )
             .with_argument(key1="val1")
         )
@@ -447,10 +447,10 @@ def init(self) -> "PythonRuntime":
         return (
             self.with_working_dir("{For MLflow the project folder will be used.}")
             .with_entrypoint(
-                "{Entrypoint script. For MLFlow, it will be replaced with the CMD}"
+                "{Entrypoint script. For MLflow, it will be replaced with the CMD}"
             )
             .with_script(
-                "{Path to the script. For MLFlow, it will be replaced with the path to the project}"
+                "{Path to the script. For MLflow, it will be replaced with the path to the project}"
             )
         )
 
@@ -754,9 +754,9 @@ def init(self) -> "GitPythonRuntime":
         """
         super().init()
         return self.with_source(
-            "{Git URI. For MLFlow, it will be replaced with the Project URI}"
+            "{Git URI. For MLflow, it will be replaced with the Project URI}"
         ).with_entrypoint(
-            "{Entry point script. For MLFlow, it will be replaced with the CMD}"
+            "{Entrypoint script. For MLflow, it will be replaced with the CMD}"
         )
 
 
@@ -979,7 +979,7 @@ def init(self) -> "DataFlowRuntime":
         self._spec.pop(self.CONST_ENV_VAR, None)
         return (
             self.with_script_uri(
-                "{Path to the executable script. For MLFlow, it will be replaced with the CMD}"
+                "{Path to the executable script. For MLflow, it will be replaced with the CMD}"
             )
             .with_script_bucket(
                 "{The object storage bucket to save a script. "

ads/opctl/backend/ads_dataflow.py

@@ -88,17 +88,16 @@ def init(
             job = (
                 Job()
                 .with_name(
-                    "{Job name. For the MLFlow will be auto replaced with the Project name}"
+                    "{Job name. For MLflow, it will be replaced with the Project name}"
                 )
                 .with_infrastructure(
-                    DataFlow(**(self.config.get("infrastructure", {}) or {}))
+                    DataFlow(**(self.config.get("infrastructure", {}) or {})).init()
                 )
                 .with_runtime(
                     DataFlowRuntimeFactory.get_runtime(
                         key=runtime_type or DataFlowRuntime().type
                     ).init()
                 )
-                .build()
             )
 
             note = (

ads/opctl/backend/ads_ml_job.py

@@ -98,7 +98,7 @@ def init(
             job = (
                 Job()
                 .with_name(
-                    "{Job name. For the MLFlow will be auto replaced with the Project name}"
+                    "{Job name. For MLflow, it will be replaced with the Project name}"
                 )
                 .with_infrastructure(
                     DataScienceJob(

tests/unitary/with_extras/opctl/test_files/dataflow_dataFlow.yaml

@@ -1,6 +1,7 @@
 # This YAML specification was auto generated by the `ads opctl init` command.
 # The more details about the jobs YAML specification can be found in the ADS documentation:
-# https://accelerated-data-science.readthedocs.io/en/latest/user_guide/apachespark/dataflow.html 
+# https://accelerated-data-science.readthedocs.io/en/latest/user_guide/apachespark/dataflow.html
+
 
 kind: job
 spec:
@@ -16,7 +17,7 @@ spec:
       scriptBucket: oci://bucket@namespace/prefix
       sparkVersion: 3.2.1
     type: dataFlow
-  name: '{Job name. For the MLFlow will be auto replaced with the Project name}'
+  name: '{Job name. For MLflow, it will be replaced with the Project name}'
   runtime:
     kind: runtime
     spec:
@@ -26,7 +27,7 @@ spec:
       freeformTags:
         tag_name: tag_value
       overwrite: true
-      scriptBucket: oci://<bucket_name>@<tenancy>/<prefix>
-      scriptPathURI: '{Path to the executable script. For the MLFlow will be replaced
+      scriptBucket: '{The object storage bucket to save a script. Example: oci://<bucket_name>@<tenancy>/<prefix>}'
+      scriptPathURI: '{Path to the executable script. For MLflow, it will be replaced
         with the CMD}'
     type: dataFlow

tests/unitary/with_extras/opctl/test_files/dataflow_dataFlowNotebook.yaml

@@ -1,6 +1,7 @@
 # This YAML specification was auto generated by the `ads opctl init` command.
 # The more details about the jobs YAML specification can be found in the ADS documentation:
-# https://accelerated-data-science.readthedocs.io/en/latest/user_guide/apachespark/dataflow.html 
+# https://accelerated-data-science.readthedocs.io/en/latest/user_guide/apachespark/dataflow.html
+
 
 kind: job
 spec:
@@ -16,7 +17,7 @@ spec:
       scriptBucket: oci://bucket@namespace/prefix
       sparkVersion: 3.2.1
     type: dataFlow
-  name: '{Job name. For the MLFlow will be auto replaced with the Project name}'
+  name: '{Job name. For MLflow, it will be replaced with the Project name}'
   runtime:
     kind: runtime
     spec:
@@ -26,7 +27,7 @@ spec:
       freeformTags:
         tag_name: tag_value
       overwrite: true
-      scriptBucket: oci://<bucket_name>@<tenancy>/<prefix>
-      scriptPathURI: '{Path to the executable script. For the MLFlow will be replaced
+      scriptBucket: '{The object storage bucket to save a script. Example: oci://<bucket_name>@<tenancy>/<prefix>}'
+      scriptPathURI: '{Path to the executable script. For MLflow, it will be replaced
         with the CMD}'
     type: dataFlowNotebook

tests/unitary/with_extras/opctl/test_files/job_container.yaml

@@ -1,6 +1,7 @@
 # This YAML specification was auto generated by the `ads opctl init` command.
 # The more details about the jobs YAML specification can be found in the ADS documentation:
-# https://accelerated-data-science.readthedocs.io/en/latest/user_guide/jobs/index.html 
+# https://accelerated-data-science.readthedocs.io/en/latest/user_guide/jobs/index.html
+
 
 kind: job
 spec:
@@ -17,11 +18,11 @@ spec:
       shapeName: VM.Standard2.1
       subnetId: ocid1.subnet.oc1.iad.<unique_id>
     type: dataScienceJob
-  name: '{Job name. For the MLFlow will be auto replaced with the Project name}'
+  name: '{Job name. For MLflow, it will be replaced with the Project name}'
   runtime:
     kind: runtime
     spec:
-      cmd: '{Container CMD. For the MLflow will be replaced with the Project CMD}'
+      cmd: '{Container CMD. For MLFlow, it will be replaced with the Project CMD}'
       entrypoint:
       - bash
       - --login

tests/unitary/with_extras/opctl/test_files/job_gitPython.yaml

@@ -2,6 +2,7 @@
 # The more details about the jobs YAML specification can be found in the ADS documentation:
 # https://accelerated-data-science.readthedocs.io/en/latest/user_guide/jobs/index.html 
 
+
 kind: job
 spec:
   infrastructure:
@@ -17,18 +18,18 @@ spec:
       shapeName: VM.Standard2.1
       subnetId: ocid1.subnet.oc1.iad.<unique_id>
     type: dataScienceJob
-  name: '{Job name. For the MLFlow will be auto replaced with the Project name}'
+  name: '{Job name. For MLflow, it will be replaced with the Project name}'
   runtime:
     kind: runtime
     spec:
       conda:
         type: published
-        uri: oci://your_bucket@namespace/object_name
-      entrypoint: '{Entry point script. For the MLflow will be replaced with the CMD}'
+        uri: '{Path to the custom conda environment. Example: oci://your_bucket@namespace/object_name'
+      entrypoint: '{Entrypoint script. For MLflow, it will be replaced with the CMD}'
       env:
       - name: env_name
         value: env_value
       freeformTags:
         tag_name: tag_value
-      url: '{Git URI. For the MLFlow will be replaced with the Project URI}'
+      url: '{Git URI. For MLflow, it will be replaced with the Project URI}'
     type: gitPython

tests/unitary/with_extras/opctl/test_files/job_notebook.yaml

@@ -2,6 +2,7 @@
 # The more details about the jobs YAML specification can be found in the ADS documentation:
 # https://accelerated-data-science.readthedocs.io/en/latest/user_guide/jobs/index.html 
 
+
 kind: job
 spec:
   infrastructure:
@@ -17,14 +18,14 @@ spec:
       shapeName: VM.Standard2.1
       subnetId: ocid1.subnet.oc1.iad.<unique_id>
     type: dataScienceJob
-  name: '{Job name. For the MLFlow will be auto replaced with the Project name}'
+  name: '{Job name. For MLflow, it will be replaced with the Project name}'
   runtime:
     kind: runtime
     spec:
       conda:
         type: published
-        uri: oci://your_bucket@namespace/object_name
-      entrypoint: '{Entry point notebook. For the MLFlow will be replaced with the
+        uri: '{Path to the custom conda environment. Example: oci://your_bucket@namespace/object_name'
+      entrypoint: '{Entrypoint notebook. For MLflow, it will be replaced with the
         CMD}'
       env:
       - name: env_name
@@ -34,6 +35,6 @@ spec:
       freeformTags:
         tag_name: tag_value
       notebookEncoding: utf-8
-      source: '{Path to the source code directory. For the MLFlow will be replaced
-        with path to the project}'
+      source: '{Path to the source code directory. For MLflow, it will be replaced
+        with the path to the project}'
     type: notebook