Fix kubernets online deployment and scale settings (Azure#30271)

Author: nancy-mejia

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

@@ -32,14 +32,14 @@
 from azure.ai.ml.entities._assets._artifacts.model import Model
 from azure.ai.ml.entities._assets.environment import Environment
 from azure.ai.ml.entities._deployment.code_configuration import CodeConfiguration
+from azure.ai.ml.entities._deployment.data_collector import DataCollector
 from azure.ai.ml.entities._deployment.deployment_settings import OnlineRequestSettings, ProbeSettings
 from azure.ai.ml.entities._deployment.resource_requirements_settings import ResourceRequirementsSettings
 from azure.ai.ml.entities._deployment.scale_settings import (
     DefaultScaleSettings,
     OnlineScaleSettings,
     TargetUtilizationScaleSettings,
 )
-from azure.ai.ml.entities._deployment.data_collector import DataCollector
 from azure.ai.ml.entities._endpoint._endpoint_helpers import validate_endpoint_or_deployment_name
 from azure.ai.ml.entities._util import load_from_dict
 from azure.ai.ml.exceptions import (
@@ -49,6 +49,7 @@
     ValidationErrorType,
     ValidationException,
 )
+
 from .deployment import Deployment
 
 module_logger = logging.getLogger(__name__)
@@ -564,7 +565,7 @@ def _from_rest_object(cls, resource: RestOnlineDeploymentData) -> "KubernetesOnl
             else None
         )
 
-        entity = KubernetesOnlineDeployment(
+        return KubernetesOnlineDeployment(
             id=resource.id,
             name=resource.name,
             tags=resource.tags,
@@ -583,10 +584,11 @@ def _from_rest_object(cls, resource: RestOnlineDeploymentData) -> "KubernetesOnl
             endpoint_name=_parse_endpoint_name_from_deployment_id(resource.id),
             instance_count=resource.sku.capacity if resource.sku else None,
             instance_type=deployment.instance_type,
+            data_collector=DataCollector._from_rest_object(deployment.data_collector)
+            if hasattr(deployment, "data_collector") and deployment.data_collector
+            else None,
         )
 
-        return OnlineDeployment._filter_datastore_from_rest_object(entity=entity, deployment=deployment)
-
 
 class ManagedOnlineDeployment(OnlineDeployment):
     """Managed Online endpoint deployment entity.
@@ -823,7 +825,7 @@ def _from_rest_object(cls, resource: RestOnlineDeploymentData) -> "ManagedOnline
             else None,
             egress_public_network_access=deployment.egress_public_network_access,
             data_collector=DataCollector._from_rest_object(deployment.data_collector)
-            if deployment.data_collector
+            if hasattr(deployment, "data_collector") and deployment.data_collector
             else None,
         )
 

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

@@ -47,9 +47,9 @@ def _merge_with(self, other: "OnlineScaleSettings") -> None:
     def _from_rest_object(  # pylint: disable=arguments-renamed
         cls, settings: RestOnlineScaleSettings
     ) -> "OnlineScaleSettings":
-        if isinstance(settings, RestDefaultScaleSettings):
+        if settings.scale_type == "Default":
             return DefaultScaleSettings._from_rest_object(settings)
-        if isinstance(settings, RestTargetUtilizationScaleSettings):
+        if settings.scale_type == "TargetUtilization":
             return TargetUtilizationScaleSettings._from_rest_object(settings)
 
         msg = f"Unsupported online scale setting type {settings.type}."