COMPUTE-1764_no_selector_extra_args

(feat) dx.py - relaxed exclusivity to allow instance type in runtime to allow cluster spec.

Author: aogorodnikov-dna

src/python/dxpy/scripts/dx.py

@@ -3244,12 +3244,6 @@ def run_body(args, executable, dest_proj, dest_path, preset_inputs=None, input_n
     requested_fpga_driver = cloned_fpga_driver
     requested_nvidia_driver = cloned_nvidia_driver
 
-    # Validate mutual exclusivity: instanceTypeSelector and clusterSpec cannot coexist
-    # Note: instanceType can override instanceTypeSelector, so we only raise error if no instanceType is present
-    # instanceTypeSelector is build-time only and should never be in runtime systemRequirements
-    if cloned_instance_type_selector.as_dict() and requested_cluster_spec.as_dict() and not requested_instance_type.as_dict():
-        raise DXCLIError("Cannot combine clusterSpec with instanceTypeSelector without providing instanceType. "
-                        "instanceTypeSelector and clusterSpec are mutually exclusive.")
 
     # combine the requested instance type, full cluster spec, fpga spec, nvidia spec
     # into the runtime systemRequirements

src/python/test/test_dxclient.py

@@ -3480,10 +3480,15 @@ def test_dx_run_clone_with_instance_type_selector(self):
         cloned_job_id_3 = run(f"dx run --clone {origin_job_id} --instance-count 3 --instance-type mem2_hdd2_x4 --brief -y").strip()
         assert cloned_job_id_3.startswith("job-")
         cloned_job_desc_3 = dxpy.api.job_describe(cloned_job_id_3)
-        # Verify both instanceType and clusterSpec are present
+        # Verify instanceType override is applied
         assert "instanceType" in cloned_job_desc_3["systemRequirements"]["*"]
         assert cloned_job_desc_3["systemRequirements"]["*"]["instanceType"] == "mem2_hdd2_x4"
+        # Verify initialInstanceCount from --instance-count is present
+        # Note: Since the applet uses instanceTypeSelector and doesn't define a full clusterSpec,
+        # only initialInstanceCount will be present in clusterSpec
         assert "clusterSpec" in cloned_job_desc_3["systemRequirements"]["*"]
+        assert "initialInstanceCount" in cloned_job_desc_3["systemRequirements"]["*"]["clusterSpec"]
+        assert cloned_job_desc_3["systemRequirements"]["*"]["clusterSpec"]["initialInstanceCount"] == 3
 
     def test_dx_run_clone(self):
         applet_id = dxpy.api.applet_new({"project": self.project,