black and pylint fixes

Author: kshitij-microsoft

sdk/ml/azure-ai-ml/azure/ai/ml/_utils/_endpoint_utils.py

@@ -39,9 +39,7 @@
 initialize_logger_info(module_logger, terminator="")
 
 
-def check_and_log_default_deployment_template(
-    deployment: Deployment, credential: Optional[TokenCredential]
-) -> None:
+def check_default_deployment_template(deployment: Deployment, credential: Optional[TokenCredential]) -> None:
     """Check if a registry model has a default deployment template and log if found.
 
     :param Deployment deployment: Endpoint deployment object.
@@ -231,7 +229,7 @@ def upload_dependencies(
             else None
         )
 
-    check_and_log_default_deployment_template(deployment, credential)
+    check_default_deployment_template(deployment, credential)
 
     if not is_registry_id_for_resource(deployment.model):
         deployment.model = (

sdk/ml/azure-ai-ml/tests/model/unittests/test_model_default_deployment_template.py

@@ -1,4 +1,5 @@
 """Unit tests for Model with default_deployment_template functionality."""
+
 from pathlib import Path
 from unittest.mock import Mock, patch
 
@@ -34,22 +35,20 @@ def test_model_init_with_default_deployment_template_object(self) -> None:
             path="./model.pkl",
             default_deployment_template=template,
         )
-        
+
         assert model.default_deployment_template is not None
         assert model.default_deployment_template.asset_id == template.asset_id
 
     def test_model_init_with_default_deployment_template_dict(self) -> None:
         """Test creating a Model with default_deployment_template as dict."""
-        template_dict = {
-            "asset_id": "azureml://registries/test-registry/deploymenttemplates/template1/versions/1"
-        }
+        template_dict = {"asset_id": "azureml://registries/test-registry/deploymenttemplates/template1/versions/1"}
         model = Model(
             name="test-model",
             version="1",
             path="./model.pkl",
             default_deployment_template=template_dict,  # type: ignore[arg-type]
         )
-        
+
         assert model.default_deployment_template is not None
         assert isinstance(model.default_deployment_template, DefaultDeploymentTemplate)
         assert model.default_deployment_template.asset_id == template_dict["asset_id"]
@@ -61,7 +60,7 @@ def test_model_init_without_default_deployment_template(self) -> None:
             version="1",
             path="./model.pkl",
         )
-        
+
         assert model.default_deployment_template is None
 
     def test_model_to_rest_object_with_default_deployment_template(self) -> None:
@@ -76,9 +75,9 @@ def test_model_to_rest_object_with_default_deployment_template(self) -> None:
             description="Test model",
             default_deployment_template=template,
         )
-        
+
         rest_object = model._to_rest_object()
-        
+
         # Should return ModelVersionData when default_deployment_template is present
         assert isinstance(rest_object, ModelVersionData)
         assert isinstance(rest_object.properties, ModelVersionDetails)
@@ -95,9 +94,9 @@ def test_model_to_rest_object_without_default_deployment_template(self) -> None:
             description="Test model",
             stage="Production",
         )
-        
+
         rest_object = model._to_rest_object()
-        
+
         # Should return ModelVersion when default_deployment_template is not present
         assert isinstance(rest_object, ModelVersion)
         assert isinstance(rest_object.properties, ModelVersionProperties)
@@ -106,7 +105,7 @@ def test_model_to_rest_object_without_default_deployment_template(self) -> None:
     def test_model_from_rest_object_with_default_deployment_template_dict(self) -> None:
         """Test Model._from_rest_object() with default_deployment_template as dict."""
         template_asset_id = "azureml://registries/test-registry/deploymenttemplates/template1/versions/1"
-        
+
         # Create mock REST object
         rest_properties = Mock(spec=ModelVersionDetails)
         rest_properties.description = "Test model"
@@ -120,29 +119,29 @@ def test_model_from_rest_object_with_default_deployment_template_dict(self) -> N
         rest_properties.intellectual_property = None
         rest_properties.system_metadata = None
         rest_properties.default_deployment_template = {"asset_id": template_asset_id}
-        
+
         rest_object = Mock(spec=ModelVersionData)
         rest_object.id = "/subscriptions/sub/resourceGroups/rg/providers/Microsoft.MachineLearningServices/workspaces/ws/models/test-model/versions/1"
         rest_object.properties = rest_properties
-        
+
         # Mock system_data
         mock_system_data = Mock()
         mock_system_data.created_by = "test_user"
         mock_system_data.created_at = None
         mock_system_data.last_modified_by = None
         mock_system_data.last_modified_at = None
         rest_object.system_data = mock_system_data
-        
+
         model = Model._from_rest_object(rest_object)
-        
+
         assert model.default_deployment_template is not None
         assert isinstance(model.default_deployment_template, DefaultDeploymentTemplate)
         assert model.default_deployment_template.asset_id == template_asset_id
 
     def test_model_from_rest_object_with_default_deployment_template_object(self) -> None:
         """Test Model._from_rest_object() with default_deployment_template as object."""
         template_asset_id = "azureml://registries/test-registry/deploymenttemplates/template1/versions/1"
-        
+
         # Create mock REST object
         rest_properties = Mock(spec=ModelVersionDetails)
         rest_properties.description = "Test model"
@@ -155,26 +154,26 @@ def test_model_from_rest_object_with_default_deployment_template_object(self) ->
         rest_properties.job_name = None
         rest_properties.intellectual_property = None
         rest_properties.system_metadata = None
-        
+
         # Create template object with asset_id attribute
         template_obj = Mock()
         template_obj.asset_id = template_asset_id
         rest_properties.default_deployment_template = template_obj
-        
+
         rest_object = Mock(spec=ModelVersionData)
         rest_object.id = "/subscriptions/sub/resourceGroups/rg/providers/Microsoft.MachineLearningServices/workspaces/ws/models/test-model/versions/1"
         rest_object.properties = rest_properties
-        
+
         # Mock system_data
         mock_system_data = Mock()
         mock_system_data.created_by = "test_user"
         mock_system_data.created_at = None
         mock_system_data.last_modified_by = None
         mock_system_data.last_modified_at = None
         rest_object.system_data = mock_system_data
-        
+
         model = Model._from_rest_object(rest_object)
-        
+
         assert model.default_deployment_template is not None
         assert isinstance(model.default_deployment_template, DefaultDeploymentTemplate)
         assert model.default_deployment_template.asset_id == template_asset_id
@@ -192,21 +191,21 @@ def test_model_from_rest_object_without_default_deployment_template(self) -> Non
         rest_properties.stage = "Production"
         rest_properties.job_name = None
         rest_properties.intellectual_property = None
-        
+
         rest_object = Mock(spec=ModelVersion)
         rest_object.id = "/subscriptions/sub/resourceGroups/rg/providers/Microsoft.MachineLearningServices/workspaces/ws/models/test-model/versions/1"
         rest_object.properties = rest_properties
-        
+
         # Mock system_data
         mock_system_data = Mock()
         mock_system_data.created_by = "test_user"
         mock_system_data.created_at = None
         mock_system_data.last_modified_by = None
         mock_system_data.last_modified_at = None
         rest_object.system_data = mock_system_data
-        
+
         model = Model._from_rest_object(rest_object)
-        
+
         assert model.default_deployment_template is None
         assert model.stage == "Production"
 
@@ -222,13 +221,13 @@ def test_model_with_stage_and_default_deployment_template(self) -> None:
             stage="Production",
             default_deployment_template=template,
         )
-        
+
         assert model.stage == "Production"
         assert model.default_deployment_template is not None
-        
+
         # Serialize to REST object
         rest_object = model._to_rest_object()
-        
+
         # Note: When default_deployment_template is present, it uses ModelVersionDetails
         # which doesn't support stage in the v2021_10_01_dataplanepreview API
         # This is expected behavior - stage is only supported in workspace operations
@@ -239,7 +238,7 @@ def test_model_yaml_with_default_deployment_template(self, tmp_path: Path) -> No
         # Create a dummy model file
         model_file = tmp_path / "model.pkl"
         model_file.write_text("dummy model")
-        
+
         yaml_content = f"""
 name: test-model
 version: "1"
@@ -250,9 +249,9 @@ def test_model_yaml_with_default_deployment_template(self, tmp_path: Path) -> No
 """
         yaml_file = tmp_path / "model_with_template.yml"
         yaml_file.write_text(yaml_content)
-        
+
         model = load_model(source=yaml_file)
-        
+
         assert model.name == "test-model"
         assert model.version == "1"
         assert model.default_deployment_template is not None

sdk/ml/azure-ai-ml/tests/model/unittests/test_model_schema.py

@@ -93,7 +93,7 @@ def test_model_with_default_deployment_template_from_yaml(self, tmp_path: Path)
         # Create a dummy model file
         model_file = tmp_path / "model.pkl"
         model_file.write_text("dummy model")
-        
+
         yaml_content = f"""
 $schema: https://azuremlschemas.azureedge.net/latest/model.schema.json
 name: model_with_default_template
@@ -106,9 +106,9 @@ def test_model_with_default_deployment_template_from_yaml(self, tmp_path: Path)
 """
         yaml_file = tmp_path / "model_with_template.yml"
         yaml_file.write_text(yaml_content)
-        
+
         model = load_model(yaml_file)
-        
+
         assert model.default_deployment_template is not None
         assert model.default_deployment_template.asset_id is not None
         assert "test-registry" in model.default_deployment_template.asset_id
@@ -118,21 +118,21 @@ def test_model_with_default_deployment_template_to_rest_object(self) -> None:
         """Test Model._to_rest_object() with default_deployment_template."""
         from azure.ai.ml.entities._assets.default_deployment_template import DefaultDeploymentTemplate
         from azure.ai.ml._restclient.v2021_10_01_dataplanepreview.models import ModelVersionData
-        
+
         template = DefaultDeploymentTemplate(
             asset_id="azureml://registries/test-registry/deploymenttemplates/template1/versions/1"
         )
-        
+
         model = Model(
             name="test-model",
             version="1",
             path="./model.pkl",
             description="Test model with deployment template",
             default_deployment_template=template,
         )
-        
+
         rest_object = model._to_rest_object()
-        
+
         # Should return ModelVersionData when default_deployment_template is present
         assert isinstance(rest_object, ModelVersionData)
         assert rest_object.properties.default_deployment_template is not None
@@ -159,9 +159,9 @@ def test_model_with_default_deployment_template_from_rest_object(self) -> None:
             },
             "systemData": {},
         }
-        
+
         from_rest_model = Model._from_rest_object(ModelVersionData.deserialize(rest_model_with_template))
-        
+
         assert from_rest_model.default_deployment_template is not None
         assert from_rest_model.default_deployment_template.asset_id is not None
         assert "test-registry" in from_rest_model.default_deployment_template.asset_id
@@ -170,21 +170,21 @@ def test_model_with_default_deployment_template_from_rest_object(self) -> None:
     def test_model_with_default_deployment_template_to_dict(self) -> None:
         """Test Model._to_dict() with default_deployment_template."""
         from azure.ai.ml.entities._assets.default_deployment_template import DefaultDeploymentTemplate
-        
+
         template = DefaultDeploymentTemplate(
             asset_id="azureml://registries/test-registry/deploymenttemplates/template1/versions/1"
         )
-        
+
         model = Model(
             name="test-model",
             version="1",
             path="./model.pkl",
             description="Test model with deployment template",
             default_deployment_template=template,
         )
-        
+
         model_dict = model._to_dict()
-        
+
         assert "default_deployment_template" in model_dict
         assert model_dict["default_deployment_template"] is not None
         assert "asset_id" in model_dict["default_deployment_template"]

sdk/ml/azure-ai-ml/tests/online_services/unittests/test_default_deployment_template.py

@@ -1,4 +1,5 @@
 """Unit tests for default_deployment_template entity."""
+
 import pytest
 
 from azure.ai.ml.entities._assets.default_deployment_template import DefaultDeploymentTemplate
@@ -13,20 +14,20 @@ def test_default_deployment_template_creation_with_asset_id(self) -> None:
         """Test creating a DefaultDeploymentTemplate with asset_id."""
         asset_id = "azureml://registries/test-registry/deploymenttemplates/template1/versions/1"
         template = DefaultDeploymentTemplate(asset_id=asset_id)
-        
+
         assert template.asset_id == asset_id
 
     def test_default_deployment_template_asset_id_none(self) -> None:
         """Test creating a DefaultDeploymentTemplate with None asset_id."""
         template = DefaultDeploymentTemplate(asset_id=None)
-        
+
         assert template.asset_id is None
 
     def test_default_deployment_template_asset_id_property(self) -> None:
         """Test DefaultDeploymentTemplate asset_id property."""
         asset_id = "azureml://registries/my-registry/deploymenttemplates/my-template/versions/2"
         template = DefaultDeploymentTemplate(asset_id=asset_id)
-        
+
         # Verify we can read the property
         assert template.asset_id is not None
         assert "my-registry" in template.asset_id