Unexclude _scope_dependent_operation.py file (#34039)

* update

* update after merge from main - 2

Author: CoderKevinZhang

sdk/ml/azure-ai-ml/azure/ai/ml/_ml_client.py

@@ -212,14 +212,14 @@ def __init__(
         if registry_name or registry_reference:
             # get the workspace location here if workspace_reference is provided
             self._ws_operation_scope = OperationScope(
-                subscription_id,
-                resource_group_name,
+                str(subscription_id),
+                str(resource_group_name),
                 workspace_name,
             )
             workspace_reference = kwargs.pop("workspace_reference", None)
             if workspace_reference or registry_reference:
                 ws_ops = WorkspaceOperations(
-                    OperationScope(subscription_id, resource_group_name, workspace_reference),
+                    OperationScope(str(subscription_id), str(resource_group_name), workspace_reference),
                     ServiceClient042023Preview(
                         credential=self._credential,
                         subscription_id=subscription_id,
@@ -246,8 +246,8 @@ def __init__(
                 workspace_name = workspace_reference
 
         self._operation_scope = OperationScope(
-            subscription_id,
-            resource_group_name,
+            str(subscription_id),
+            str(resource_group_name),
             workspace_name,
             registry_name,
             workspace_id,
@@ -426,7 +426,7 @@ def __init__(
             dataplane_client=self._service_client_workspace_dataplane,
             **app_insights_handler_kwargs,
         )
-        self._operation_container.add(AzureMLResourceType.WORKSPACE, self._workspaces)
+        self._operation_container.add(AzureMLResourceType.WORKSPACE, self._workspaces)  # type: ignore[arg-type]
 
         self._workspace_outbound_rules = WorkspaceOutboundRuleOperations(
             self._operation_scope,
@@ -444,7 +444,7 @@ def __init__(
             self._credential,
             **app_insights_handler_kwargs,
         )
-        self._operation_container.add(AzureMLResourceType.REGISTRY, self._registries)
+        self._operation_container.add(AzureMLResourceType.REGISTRY, self._registries)  # type: ignore[arg-type]
 
         self._workspace_connections = WorkspaceConnectionsOperations(
             self._operation_scope,
@@ -604,7 +604,9 @@ def __init__(
                 _service_client_kwargs=kwargs,
                 **ops_kwargs,
             )
-            self._operation_container.add(AzureMLResourceType.VIRTUALCLUSTER, self._virtual_clusters)
+            self._operation_container.add(
+                AzureMLResourceType.VIRTUALCLUSTER, self._virtual_clusters  # type: ignore[arg-type]
+            )
         except Exception as ex:  # pylint: disable=broad-except
             module_logger.debug("Virtual Cluster operations could not be initialized due to %s ", ex)
 
@@ -639,9 +641,9 @@ def __init__(
             self._credential,
             **app_insights_handler_kwargs,
         )
-        self._operation_container.add(AzureMLResourceType.WORKSPACE_HUB, self._workspace_hubs)
+        self._operation_container.add(AzureMLResourceType.WORKSPACE_HUB, self._workspace_hubs)  # type: ignore[arg-type]
 
-        self._operation_container.add(AzureMLResourceType.FEATURE_STORE, self._featurestores)
+        self._operation_container.add(AzureMLResourceType.FEATURE_STORE, self._featurestores)  # type: ignore[arg-type]
         self._operation_container.add(AzureMLResourceType.FEATURE_SET, self._featuresets)
         self._operation_container.add(AzureMLResourceType.FEATURE_STORE_ENTITY, self._featurestoreentities)
 

sdk/ml/azure-ai-ml/azure/ai/ml/_scope_dependent_operations.py

@@ -7,12 +7,7 @@
 import logging
 from typing import Callable, Dict, Optional, TypeVar, cast
 
-from azure.ai.ml.exceptions import (
-    ErrorCategory,
-    ErrorTarget,
-    ValidationErrorType,
-    ValidationException,
-)
+from azure.ai.ml.exceptions import ErrorCategory, ErrorTarget, ValidationErrorType, ValidationException
 
 T = TypeVar("T")
 module_logger = logging.getLogger(__name__)
@@ -77,14 +72,14 @@ def resource_group_name(self) -> str:
     def workspace_name(self) -> Optional[str]:
         return self._workspace_name
 
-    @property
-    def registry_name(self) -> Optional[str]:
-        return self._registry_name
-
     @workspace_name.setter
     def workspace_name(self, value: str) -> None:
         self._workspace_name = value
 
+    @property
+    def registry_name(self) -> Optional[str]:
+        return self._registry_name
+
     @registry_name.setter
     def registry_name(self, value: str) -> None:
         self._registry_name = value
@@ -94,7 +89,7 @@ class _ScopeDependentOperations(object):
     def __init__(self, operation_scope: OperationScope, operation_config: OperationConfig):
         self._operation_scope = operation_scope
         self._operation_config = operation_config
-        self._scope_kwargs = {
+        self._scope_kwargs: Dict = {
             "resource_group_name": self._operation_scope.resource_group_name,
         }
 
@@ -128,7 +123,7 @@ def __init__(self):
         self._all_operations = {}
 
     @property
-    def all_operations(self) -> Dict[str, _ScopeDependentOperations]:
+    def all_operations(self) -> Dict:
         return self._all_operations
 
     def add(self, name: str, operation: _ScopeDependentOperations) -> None:

sdk/ml/azure-ai-ml/azure/ai/ml/entities/_deployment/deployment_collection.py

@@ -54,7 +54,7 @@ def _from_rest_object(cls, rest_obj: RestCollection) -> "DeploymentCollection":
 
     def _to_rest_object(self) -> RestCollection:
         return RestCollection(
-            data_collection_mode="enabled" if self.enabled.lower() == "true" else "disabled",
+            data_collection_mode="enabled" if str(self.enabled).lower() == "true" else "disabled",
             sampling_rate=self.sampling_rate,
             data_id=self.data,
             client_id=self.client_id,

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

@@ -112,7 +112,7 @@ def __init__(
 
     @property
     def _code_operations(self) -> CodeOperations:
-        res: CodeOperations = self._all_operations.get_operation(
+        res: CodeOperations = self._all_operations.get_operation(  # type: ignore[misc]
             AzureMLResourceType.CODE, lambda x: isinstance(x, CodeOperations)
         )
         return res
@@ -121,7 +121,7 @@ def _code_operations(self) -> CodeOperations:
     def _environment_operations(self) -> EnvironmentOperations:
         return cast(
             EnvironmentOperations,
-            self._all_operations.get_operation(
+            self._all_operations.get_operation(  # type: ignore[misc]
                 AzureMLResourceType.ENVIRONMENT,
                 lambda x: isinstance(x, EnvironmentOperations),
             ),
@@ -131,7 +131,7 @@ def _environment_operations(self) -> EnvironmentOperations:
     def _workspace_operations(self) -> WorkspaceOperations:
         return cast(
             WorkspaceOperations,
-            self._all_operations.get_operation(
+            self._all_operations.get_operation(  # type: ignore[misc]
                 AzureMLResourceType.WORKSPACE,
                 lambda x: isinstance(x, WorkspaceOperations),
             ),
@@ -141,7 +141,9 @@ def _workspace_operations(self) -> WorkspaceOperations:
     def _job_operations(self) -> Any:
         from ._job_operations import JobOperations
 
-        return self._all_operations.get_operation(AzureMLResourceType.JOB, lambda x: isinstance(x, JobOperations))
+        return self._all_operations.get_operation(  # type: ignore[misc]
+            AzureMLResourceType.JOB, lambda x: isinstance(x, JobOperations)
+        )
 
     @monitor_with_activity(logger, "Component.List", ActivityType.PUBLICAPI)
     def list(

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

@@ -114,7 +114,7 @@ def __init__(
         service_client: Union[ServiceClient042023_preview, ServiceClient102021Dataplane],
         service_client_012024_preview: ServiceClient012024_preview,
         datastore_operations: DatastoreOperations,
-        **kwargs: Dict,
+        **kwargs: Any,
     ):
         super(DataOperations, self).__init__(operation_scope, operation_config)
         ops_logger.update_info(kwargs)

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

@@ -184,7 +184,7 @@ def __init__(
     def _component_operations(self) -> ComponentOperations:
         return cast(
             ComponentOperations,
-            self._all_operations.get_operation(
+            self._all_operations.get_operation(  # type: ignore[misc]
                 AzureMLResourceType.COMPONENT, lambda x: isinstance(x, ComponentOperations)
             ),
         )
@@ -193,14 +193,16 @@ def _component_operations(self) -> ComponentOperations:
     def _compute_operations(self) -> ComputeOperations:
         return cast(
             ComputeOperations,
-            self._all_operations.get_operation(AzureMLResourceType.COMPUTE, lambda x: isinstance(x, ComputeOperations)),
+            self._all_operations.get_operation(  # type: ignore[misc]
+                AzureMLResourceType.COMPUTE, lambda x: isinstance(x, ComputeOperations)
+            ),
         )
 
     @property
     def _virtual_cluster_operations(self) -> VirtualClusterOperations:
         return cast(
             VirtualClusterOperations,
-            self._all_operations.get_operation(
+            self._all_operations.get_operation(  # type: ignore[misc]
                 AzureMLResourceType.VIRTUALCLUSTER, lambda x: isinstance(x, VirtualClusterOperations)
             ),
         )

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

@@ -101,7 +101,7 @@ def __init__(
         operation_config: OperationConfig,
         service_client: Union[ServiceClient082023Preview, ServiceClient102021Dataplane],
         datastore_operations: DatastoreOperations,
-        all_operations: OperationsContainer = None,
+        all_operations: Optional[OperationsContainer] = None,
         **kwargs: Dict,
     ):
         super(ModelOperations, self).__init__(operation_scope, operation_config)
@@ -631,7 +631,7 @@ def package(self, name: str, version: str, package_request: ModelPackage, **kwar
         is_deployment_flow = kwargs.pop("skip_to_rest", False)
         if not is_deployment_flow:
             orchestrators = OperationOrchestrator(
-                operation_container=self._all_operations,
+                operation_container=self._all_operations,  # type: ignore[arg-type]
                 operation_scope=self._operation_scope,
                 operation_config=self._operation_config,
             )
@@ -681,13 +681,14 @@ def package(self, name: str, version: str, package_request: ModelPackage, **kwar
             if self._operation_scope._workspace_location and self._operation_scope._workspace_id:
                 package_request.target_environment_id = f"azureml://locations/{self._operation_scope._workspace_location}/workspaces/{self._operation_scope._workspace_id}/environments/{package_request.target_environment_id}"
             else:
-                ws = self._all_operations.all_operations.get("workspaces")
-                ws_details = ws.get(self._workspace_name)
-                workspace_location, workspace_id = (
-                    ws_details.location,
-                    ws_details._workspace_id,
-                )
-                package_request.target_environment_id = f"azureml://locations/{workspace_location}/workspaces/{workspace_id}/environments/{package_request.target_environment_id}"
+                if self._all_operations is not None:
+                    ws: Any = self._all_operations.all_operations.get("workspaces")
+                    ws_details = ws.get(self._workspace_name)
+                    workspace_location, workspace_id = (
+                        ws_details.location,
+                        ws_details._workspace_id,
+                    )
+                    package_request.target_environment_id = f"azureml://locations/{workspace_location}/workspaces/{workspace_id}/environments/{package_request.target_environment_id}"
 
             if package_request.environment_version is not None:
                 package_request.target_environment_id = (
@@ -747,7 +748,8 @@ def package(self, name: str, version: str, package_request: ModelPackage, **kwar
                 package_out = Environment._from_rest_object(env_out)
                 self._scope_kwargs["resource_group_name"] = current_rg
             else:
-                environment_operation = self._all_operations.all_operations[AzureMLResourceType.ENVIRONMENT]
-                package_out = environment_operation.get(name=environment_name, version=environment_version)
+                if self._all_operations is not None:
+                    environment_operation = self._all_operations.all_operations[AzureMLResourceType.ENVIRONMENT]
+                    package_out = environment_operation.get(name=environment_name, version=environment_version)
 
         return package_out

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

@@ -276,10 +276,10 @@ def _get_code_asset_arm_id(self, code_asset: Code, register_asset: bool = True)
         try:
             self._validate_datastore_name(code_asset.path)
             if register_asset:
-                code_asset = self._code_assets.create_or_update(code_asset)
+                code_asset = self._code_assets.create_or_update(code_asset)  # type: ignore[attr-defined]
                 return str(code_asset.id)
             sas_info = get_storage_info_for_non_registry_asset(
-                service_client=self._code_assets._service_client,
+                service_client=self._code_assets._service_client,  # type: ignore[attr-defined]
                 workspace_name=self._operation_scope.workspace_name,
                 name=code_asset.name,
                 version=code_asset.version,
@@ -315,7 +315,7 @@ def _get_environment_arm_id(self, environment: Environment, register_asset: bool
         if register_asset:
             if environment.id:
                 return environment.id
-            env_response = self._environments.create_or_update(environment)
+            env_response = self._environments.create_or_update(environment)  # type: ignore[attr-defined]
             return env_response.id
         environment = _check_and_upload_env_build_context(
             environment=environment, operations=self._environments, show_progress=self._operation_config.show_progress
@@ -335,7 +335,7 @@ def _get_model_arm_id(self, model: Model, register_asset: bool = True) -> Union[
             if register_asset:
                 if model.id:
                     return model.id
-                return self._model.create_or_update(model).id
+                return self._model.create_or_update(model).id  # type: ignore[attr-defined]
             uploaded_model, _ = _check_and_upload_path(
                 artifact=model,
                 asset_operations=self._model,
@@ -364,7 +364,7 @@ def _get_data_arm_id(self, data_asset: Data, register_asset: bool = True) -> Uni
         self._validate_datastore_name(data_asset.path)
 
         if register_asset:
-            return self._data.create_or_update(data_asset).id
+            return self._data.create_or_update(data_asset).id  # type: ignore[attr-defined]
         data_asset, _ = _check_and_upload_path(
             artifact=data_asset,
             asset_operations=self._data,
@@ -385,7 +385,7 @@ def _get_component_arm_id(self, component: Component) -> str:
         # If component arm id is already resolved, return the id otherwise get arm id via remote call.
         # Register the component if necessary, and FILL BACK the arm id to component to reduce remote call.
         if not component.id:
-            component._id = self._component.create_or_update(
+            component._id = self._component.create_or_update(  # type: ignore[attr-defined]
                 component, is_anonymous=True, show_progress=self._operation_config.show_progress
             ).id
         return str(component.id)
@@ -396,14 +396,14 @@ def _get_singularity_arm_id_from_full_name(self, singularity: str) -> str:
         resource_group_name = match.group("resource_group_name") if match is not None else ""
         vc_name = match.group("name") if match is not None else ""
         arm_id = SINGULARITY_ID_FORMAT.format(subscription_id, resource_group_name, vc_name)
-        vc = self._virtual_cluster.get(arm_id)
+        vc = self._virtual_cluster.get(arm_id)  # type: ignore[attr-defined]
         return str(vc["id"])
 
     def _get_singularity_arm_id_from_short_name(self, singularity: str) -> str:
         match = re.match(SINGULARITY_SHORT_NAME_REGEX_FORMAT, singularity)
         vc_name = match.group("name") if match is not None else ""
         # below list operation can be time-consuming, may need an optimization on this
-        match_vcs = [vc for vc in self._virtual_cluster.list() if vc["name"] == vc_name]
+        match_vcs = [vc for vc in self._virtual_cluster.list() if vc["name"] == vc_name]  # type: ignore[attr-defined]
         num_match_vc = len(match_vcs)
         if num_match_vc != 1:
             if num_match_vc == 0:
@@ -524,7 +524,7 @@ def _validate_datastore_name(self, datastore_uri: Optional[Union[str, PathLike]]
                 if datastore_name.startswith(ARM_ID_PREFIX):
                     datastore_name = datastore_name[len(ARM_ID_PREFIX) :]
 
-                self._datastore_operation.get(datastore_name)
+                self._datastore_operation.get(datastore_name)  # type: ignore[attr-defined]
             except ResourceNotFoundError as e:
                 msg = "The datastore {} could not be found in this workspace."
                 raise ValidationException(

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

@@ -92,14 +92,16 @@ def __init__(
     def _job_operations(self) -> JobOperations:
         return cast(
             JobOperations,
-            self._all_operations.get_operation(AzureMLResourceType.JOB, lambda x: isinstance(x, JobOperations)),
+            self._all_operations.get_operation(  # type: ignore[misc]
+                AzureMLResourceType.JOB, lambda x: isinstance(x, JobOperations)
+            ),
         )
 
     @property
     def _online_deployment_operations(self) -> OnlineDeploymentOperations:
         return cast(
             OnlineDeploymentOperations,
-            self._all_operations.get_operation(
+            self._all_operations.get_operation(  # type: ignore[misc]
                 AzureMLResourceType.ONLINE_DEPLOYMENT, lambda x: isinstance(x, OnlineDeploymentOperations)
             ),
         )
@@ -108,7 +110,9 @@ def _online_deployment_operations(self) -> OnlineDeploymentOperations:
     def _data_operations(self) -> DataOperations:
         return cast(
             DataOperations,
-            self._all_operations.get_operation(AzureMLResourceType.DATA, lambda x: isinstance(x, DataOperations)),
+            self._all_operations.get_operation(  # type: ignore[misc]
+                AzureMLResourceType.DATA, lambda x: isinstance(x, DataOperations)
+            ),
         )
 
     @distributed_trace

sdk/ml/azure-ai-ml/pyproject.toml

@@ -43,7 +43,6 @@ exclude = [
   "azure/ai/ml/sweep/",
   "azure/ai/ml/_azure_environments.py",
   "azure/ai/ml/exceptions.py",
-  "azure/ai/ml/_scope_dependent_operations.py",
   "azure/ai/ml/_exception_helper.py",
 ]   
 warn_unused_configs = true