Merge branch 'release/azure-ai-ml/1.16.0' of https://github.com/Azure/azure-sdk-for-python into release/azure-ai-ml/1.16.0

Author: ninghu

sdk/ml/azure-ai-ml/assets.json

@@ -2,5 +2,5 @@
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "python",
   "TagPrefix": "python/ml/azure-ai-ml",
-  "Tag": "python/ml/azure-ai-ml_bcde27db64"
+  "Tag": "python/ml/azure-ai-ml_a71be27649"
 }

sdk/ml/azure-ai-ml/azure/ai/ml/operations/_evaluator_operations.py

@@ -63,6 +63,8 @@ class EvaluatorOperations(_ScopeDependentOperations):
     :type datastore_operations: ~azure.ai.ml.operations._datastore_operations.DatastoreOperations
     :param all_operations: All operations classes of an MLClient object.
     :type all_operations: ~azure.ai.ml._scope_dependent_operations.OperationsContainer
+    :param kwargs: A dictionary of additional configuration parameters.
+    :type kwargs: dict
     """
 
     # pylint: disable=unused-argument
@@ -92,7 +94,7 @@ def __init__(
 
     @monitor_with_activity(ops_logger, "Evaluator.CreateOrUpdate", ActivityType.PUBLICAPI)
     def create_or_update(  # type: ignore
-        self, model: Union[Model, WorkspaceAssetReference]
+        self, model: Union[Model, WorkspaceAssetReference], **kwargs: Any
     ) -> Model:  # TODO: Are we going to implement job_name?
         """Returns created or updated model asset.
 
@@ -125,15 +127,15 @@ def _raise_if_not_evaluator(self, properties: Optional[Dict[str, Any]], message:
             )
 
     @monitor_with_activity(ops_logger, "Evaluator.Get", ActivityType.PUBLICAPI)
-    def get(self, name: str, version: Optional[str] = None, label: Optional[str] = None) -> Model:
+    def get(self, name: str, *, version: Optional[str] = None, label: Optional[str] = None, **kwargs) -> Model:
         """Returns information about the specified model asset.
 
         :param name: Name of the model.
         :type name: str
-        :param version: Version of the model.
-        :type version: str
-        :param label: Label of the model. (mutually exclusive with version)
-        :type label: str
+        :keyword version: Version of the model.
+        :paramtype version: str
+        :keyword label: Label of the model. (mutually exclusive with version)
+        :paramtype label: str
         :raises ~azure.ai.ml.exceptions.ValidationException: Raised if Model cannot be successfully validated.
             Details will be provided in the error message.
         :return: Model asset object.
@@ -150,7 +152,7 @@ def get(self, name: str, version: Optional[str] = None, label: Optional[str] = N
         return model
 
     @monitor_with_activity(ops_logger, "Evaluator.Download", ActivityType.PUBLICAPI)
-    def download(self, name: str, version: str, download_path: Union[PathLike, str] = ".") -> None:
+    def download(self, name: str, version: str, download_path: Union[PathLike, str] = ".", **kwargs: Any) -> None:
         """Download files related to a model.
 
         :param name: Name of the model.
@@ -171,6 +173,7 @@ def list(
         stage: Optional[str] = None,
         *,
         list_view_type: ListViewType = ListViewType.ACTIVE_ONLY,
+        **kwargs: Any,
     ) -> Iterable[Model]:
         """List all model assets in workspace.
 

sdk/ml/azure-ai-ml/azure/ai/ml/operations/_index_operations.py

@@ -98,7 +98,7 @@ def _azure_ai_assets(self) -> AzureAiAssetsClient042024:
         return self.__azure_ai_assets_client
 
     @monitor_with_activity(ops_logger, "Index.CreateOrUpdate", ActivityType.PUBLICAPI)
-    def create_or_update(self, index: Index) -> Index:
+    def create_or_update(self, index: Index, **kwargs) -> Index:
         """Returns created or updated index asset.
 
         If not already in storage, asset will be uploaded to the workspace's default datastore.
@@ -154,12 +154,12 @@ def create_or_update(self, index: Index) -> Index:
 
         return Index._from_rest_object(
             self._azure_ai_assets.indexes.create_or_update(
-                name=index.name, version=index.version, body=index._to_rest_object()
+                name=index.name, version=index.version, body=index._to_rest_object(), **kwargs
             )
         )
 
     @monitor_with_activity(ops_logger, "Index.Get", ActivityType.PUBLICAPI)
-    def get(self, name: str, *, version: Optional[str] = None, label: Optional[str] = None) -> Index:
+    def get(self, name: str, *, version: Optional[str] = None, label: Optional[str] = None, **kwargs) -> Index:
         """Returns information about the specified index asset.
 
         :param str name: Name of the index asset.
@@ -193,7 +193,7 @@ def get(self, name: str, *, version: Optional[str] = None, label: Optional[str]
                 error_type=ValidationErrorType.MISSING_FIELD,
             )
 
-        index_version_resource = self._azure_ai_assets.indexes.get(name=name, version=version)
+        index_version_resource = self._azure_ai_assets.indexes.get(name=name, version=version, **kwargs)
 
         return Index._from_rest_object(index_version_resource)
 
@@ -202,7 +202,7 @@ def _get_latest_version(self, name: str) -> Index:
 
     @monitor_with_activity(ops_logger, "Index.List", ActivityType.PUBLICAPI)
     def list(
-        self, name: Optional[str] = None, *, list_view_type: ListViewType = ListViewType.ACTIVE_ONLY
+        self, name: Optional[str] = None, *, list_view_type: ListViewType = ListViewType.ACTIVE_ONLY, **kwargs
     ) -> Iterable[Index]:
         """List all Index assets in workspace.
 
@@ -221,6 +221,6 @@ def cls(rest_indexes: Iterable[RestIndex]) -> List[Index]:
             return [Index._from_rest_object(i) for i in rest_indexes]
 
         if name is None:
-            return self._azure_ai_assets.indexes.list_latest(cls=cls)
+            return self._azure_ai_assets.indexes.list_latest(cls=cls, **kwargs)
 
-        return self._azure_ai_assets.indexes.list(name, list_view_type=list_view_type, cls=cls)
+        return self._azure_ai_assets.indexes.list(name, list_view_type=list_view_type, cls=cls, **kwargs)

sdk/ml/azure-ai-ml/tests/evaluator/e2etests/test_evaluator.py

@@ -63,7 +63,7 @@ def test_crud_file(self, client: MLClient, randstr: Callable[[], str]) -> None:
         assert "is-evaluator" in model.properties and model.properties["is-evaluator"] == "true"
         assert re.match(LONG_URI_REGEX_FORMAT, model.path)
 
-        model = client.evaluators.get(model.name, "3")
+        model = client.evaluators.get(name=model.name, version="3")
         assert model.name == model_name
         assert model.version == "3"
         assert model.description == "This is evaluator."
@@ -93,7 +93,7 @@ def test_crud_evaluator_with_stage(self, client: MLClient, randstr: Callable[[],
         assert model.stage == "Production"
         assert re.match(LONG_URI_REGEX_FORMAT, model.path)
 
-        model = client.evaluators.get(model.name, "3")
+        model = client.evaluators.get(name=model.name, version="3")
         assert model.name == model_name
         assert model.version == "3"
         assert model.description == "This is evaluator."
@@ -108,7 +108,7 @@ def test_evaluators_get_latest_label(self, client: MLClient, randstr: Callable[[
         for version in ["1", "2", "3", "4"]:
             model = _load_flow(model_name, version=version)
             client.evaluators.create_or_update(model)
-            assert client.evaluators.get(model_name, label="latest").version == version
+            assert client.evaluators.get(name=model_name, label="latest").version == version
 
     @pytest.mark.skip(
         "Skipping test for archive and restore as we have removed it from interface. "