fix: return git path as Code object (Azure#27195)

Author: zhengfeiwang

sdk/ml/azure-ai-ml/azure/ai/ml/entities/_component/component.py

@@ -511,7 +511,7 @@ def _resolve_local_code(self):
         code = getattr(self, "code")
         # special check for git path code value
         if code is not None and isinstance(code, str) and code.startswith("git+"):
-            yield code
+            yield Code(base_path=self._base_path, path=code)
         elif code is not None and os.path.isfile(code):
             yield Code(base_path=self._base_path, path=code)
         else:

sdk/ml/azure-ai-ml/tests/component/unittests/test_command_component_entity.py

@@ -202,7 +202,7 @@ def test_command_component_code_git_path(self):
         yaml_dict = load_yaml(yaml_path)
         component = load_component(yaml_path)
         with component._resolve_local_code() as code:
-            assert code == yaml_dict["code"]
+            assert code.path == yaml_dict["code"]
 
     @pytest.mark.skipif(
         sys.version_info[1] == 11,

sdk/ml/azure-ai-ml/tests/dsl/e2etests/test_dsl_pipeline.py

@@ -57,12 +57,13 @@
 ]
 
 
-def assert_job_cancel(pipeline, client: MLClient):
-    job = client.jobs.create_or_update(pipeline)
+def assert_job_cancel(pipeline, client: MLClient, experiment_name=None):
+    job = client.jobs.create_or_update(pipeline, experiment_name=experiment_name)
     try:
         cancel_poller = client.jobs.begin_cancel(job.name)
         assert isinstance(cancel_poller, LROPoller)
-        assert cancel_poller.result() is None
+        # skip wait for cancel result to reduce test run duration.
+        # assert cancel_poller.result() is None
     except HttpResponseError:
         pass
     return job
@@ -1595,10 +1596,8 @@ def parallel_in_pipeline(job_data_path, score_model):
             ),
         )
         # submit pipeline job
-        pipeline_job = client.jobs.create_or_update(pipeline, experiment_name="parallel_in_pipeline")
-        cancel_poller = client.jobs.begin_cancel(pipeline_job.name)
-        assert isinstance(cancel_poller, LROPoller)
-        assert cancel_poller.result() is None
+        pipeline_job = assert_job_cancel(pipeline, client, experiment_name="parallel_in_pipeline")
+
         # check required fields in job dict
         job_dict = pipeline_job._to_dict()
         expected_keys = ["status", "properties", "tags", "creation_context"]
@@ -1628,10 +1627,7 @@ def parallel_in_pipeline(job_data_path):
             ),
         )
         # submit pipeline job
-        pipeline_job = client.jobs.create_or_update(pipeline, experiment_name="parallel_in_pipeline")
-        cancel_poller = client.jobs.begin_cancel(pipeline_job.name)
-        assert isinstance(cancel_poller, LROPoller)
-        assert cancel_poller.result() is None
+        pipeline_job = assert_job_cancel(pipeline, client, experiment_name="parallel_in_pipeline")
         # check required fields in job dict
         job_dict = pipeline_job._to_dict()
         expected_keys = ["status", "properties", "tags", "creation_context"]
@@ -1828,13 +1824,7 @@ def parallel_in_pipeline(job_data_path):
             ),
         )
         # submit job to workspace
-        pipeline_job = client.jobs.create_or_update(
-            pipeline,
-            experiment_name="parallel_in_pipeline",
-        )
-        cancel_poller = client.jobs.begin_cancel(pipeline_job.name)
-        assert isinstance(cancel_poller, LROPoller)
-        assert cancel_poller.result() is None
+        pipeline_job = assert_job_cancel(pipeline, client, experiment_name="parallel_in_pipeline")
         omit_fields = [
             "jobs.parallel_node.task.code",
             "jobs.parallel_node.task.environment",
@@ -1919,10 +1909,7 @@ def parallel_in_pipeline(job_data_path):
         pipeline.outputs.job_out_data.mode = "upload"
 
         # submit pipeline job
-        pipeline_job = client.jobs.create_or_update(pipeline, experiment_name="parallel_in_pipeline")
-        cancel_poller = client.jobs.begin_cancel(pipeline_job.name)
-        assert isinstance(cancel_poller, LROPoller)
-        assert cancel_poller.result() is None
+        pipeline_job = assert_job_cancel(pipeline, client, experiment_name="parallel_in_pipeline")
 
         omit_fields = [
             "jobs.*.task.code",
@@ -2361,10 +2348,7 @@ def spark_pipeline_from_yaml(iris_data):
         pipeline.outputs.output.type = "uri_file"
 
         # submit pipeline job
-        pipeline_job = client.jobs.create_or_update(pipeline, experiment_name="spark_in_pipeline")
-        cancel_poller = client.jobs.begin_cancel(pipeline_job.name)
-        assert isinstance(cancel_poller, LROPoller)
-        assert cancel_poller.result() is None
+        pipeline_job = assert_job_cancel(pipeline, client, experiment_name="spark_in_pipeline")
         # check required fields in job dict
         job_dict = pipeline_job._to_dict()
         expected_keys = ["status", "properties", "tags", "creation_context"]

sdk/ml/azure-ai-ml/tests/dsl/e2etests/test_dsl_pipeline_on_registry.py

@@ -13,6 +13,18 @@
 from devtools_testutils import AzureRecordedTestCase
 
 
+def assert_job_cancel(pipeline, client: MLClient, experiment_name=None):
+    job = client.jobs.create_or_update(pipeline, experiment_name=experiment_name)
+    try:
+        cancel_poller = client.jobs.begin_cancel(job.name)
+        assert isinstance(cancel_poller, LROPoller)
+        # skip wait for cancel result to reduce test run duration.
+        # assert cancel_poller.result() is None
+    except HttpResponseError:
+        pass
+    return job
+
+
 @pytest.mark.usefixtures("enable_pipeline_private_preview_features", "recorded_test")
 @pytest.mark.timeout(timeout=_DSL_TIMEOUT_SECOND, method=_PYTEST_TIMEOUT_METHOD)
 @pytest.mark.e2etest
@@ -65,9 +77,7 @@ def score_pipeline_with_registry_model(model_input, test_data):
             test_data=test_data
         )
         pipeline_job.settings.default_compute = "cpu-cluster"
-        pipeline_job = client.jobs.create_or_update(pipeline_job)
-        cancel_poller = client.jobs.begin_cancel(pipeline_job.name)
-        assert isinstance(cancel_poller, LROPoller)
+        assert_job_cancel(pipeline_job, client)
 
     @pytest.mark.skip(reason="request body still exits when re-record and will raise error "
                              "'Unable to find a record for the request' in playback mode")
@@ -101,9 +111,7 @@ def score_pipeline_with_registry_model(model_input, test_data):
             model_input=pipeline_score_model, test_data=test_data
         )
         pipeline_job.settings.default_compute = "cpu-cluster"
-        pipeline_job = client.jobs.create_or_update(pipeline_job)
-        cancel_poller = client.jobs.begin_cancel(pipeline_job.name)
-        assert isinstance(cancel_poller, LROPoller)
+        assert_job_cancel(pipeline_job, client)
 
     @pytest.mark.skip(reason="request body still exits when re-record and will raise error "
                              "'Unable to find a record for the request' in playback mode")
@@ -136,6 +144,4 @@ def score_pipeline_with_registry_model(model_input, test_data):
             test_data=test_data
         )
         pipeline_job.settings.default_compute = "cpu-cluster"
-        pipeline_job = client.jobs.create_or_update(pipeline_job)
-        cancel_poller = client.jobs.begin_cancel(pipeline_job.name)
-        assert isinstance(cancel_poller, LROPoller)
+        assert_job_cancel(pipeline_job, client)