Azure#37999 - Typing fix for mypy version 1.13 (Azure#39093)

* mypy 1.13 fixes

* mypy 1.13 fixes 2nd iteration

* mypy 1.13 fixes 3nd iteration

* mypy / black, comment fixes

* next-mypy - pylint / black fixes

Author: kshitij-microsoft

sdk/ml/azure-ai-ml/azure/ai/ml/entities/_assets/_artifacts/artifact.py

@@ -17,7 +17,7 @@ def __init__(
         name: str,
         version: str,
         relative_path: str,
-        datastore_arm_id: str,
+        datastore_arm_id: Optional[str],
         container_name: str,
         storage_account_url: Optional[str] = None,
         is_file: Optional[bool] = None,

sdk/ml/azure-ai-ml/azure/ai/ml/entities/_assets/_artifacts/data.py

@@ -231,7 +231,7 @@ def _update_path(self, asset_artifact: ArtifactStorageInfo) -> None:
         if not asset_artifact.datastore_arm_id and asset_artifact.full_storage_path:
             self.path = asset_artifact.full_storage_path
         else:
-            groups = re.search(regex, asset_artifact.datastore_arm_id)
+            groups = re.search(regex, asset_artifact.datastore_arm_id)  # type: ignore
             if groups:
                 datastore_name = groups.group(1)
                 self.path = SHORT_URI_FORMAT.format(datastore_name, asset_artifact.relative_path)

sdk/ml/azure-ai-ml/azure/ai/ml/entities/_compute/_image_metadata.py

@@ -1,6 +1,7 @@
 # ---------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # ---------------------------------------------------------
+from typing import Optional
 
 
 class ImageMetadata:
@@ -24,14 +25,18 @@ class ImageMetadata:
     """
 
     def __init__(
-        self, *, is_latest_os_image_version: bool, current_image_version: str, latest_image_version: str
+        self,
+        *,
+        is_latest_os_image_version: Optional[bool],
+        current_image_version: Optional[str],
+        latest_image_version: Optional[str]
     ) -> None:
         self._is_latest_os_image_version = is_latest_os_image_version
         self._current_image_version = current_image_version
         self._latest_image_version = latest_image_version
 
     @property
-    def is_latest_os_image_version(self) -> bool:
+    def is_latest_os_image_version(self) -> Optional[bool]:
         """Whether or not a compute instance is running on the latest OS image version.
 
         :return: Boolean indicating if the compute instance is running the latest OS image version.
@@ -40,7 +45,7 @@ def is_latest_os_image_version(self) -> bool:
         return self._is_latest_os_image_version
 
     @property
-    def current_image_version(self) -> str:
+    def current_image_version(self) -> Optional[str]:
         """The current OS image version number.
 
         :return: The current OS image version number.
@@ -49,7 +54,7 @@ def current_image_version(self) -> str:
         return self._current_image_version
 
     @property
-    def latest_image_version(self) -> str:
+    def latest_image_version(self) -> Optional[str]:
         """The latest OS image version number.
 
         :return: The latest OS image version number.

sdk/ml/azure-ai-ml/azure/ai/ml/entities/_compute/compute.py

@@ -123,7 +123,7 @@ def _from_rest_object(cls, obj: ComputeResource) -> "Compute":
 
         class_type = cast(
             Optional[Union[AmlCompute, ComputeInstance, VirtualMachineCompute, KubernetesCompute, SynapseSparkCompute]],
-            mapping.get(compute_type, None),
+            mapping.get(compute_type, None),  # type: ignore
         )
         if class_type:
             return class_type._load_from_rest(obj)

sdk/ml/azure-ai-ml/azure/ai/ml/entities/_compute/virtual_machine_compute.py

@@ -45,9 +45,9 @@ class VirtualMachineSshSettings:
     def __init__(
         self,
         *,
-        admin_username: str,
+        admin_username: Optional[str],
         admin_password: Optional[str] = None,
-        ssh_port: int = 22,
+        ssh_port: Optional[int] = 22,
         ssh_private_key_file: Optional[str] = None,
     ) -> None:
         self.admin_username = admin_username

sdk/ml/azure-ai-ml/azure/ai/ml/entities/_credentials.py

@@ -116,7 +116,7 @@ class AccountKeyConfiguration(RestTranslatableMixin, DictMixin):
     def __init__(
         self,
         *,
-        account_key: str,
+        account_key: Optional[str],
     ) -> None:
         self.type = camel_to_snake(CredentialsType.ACCOUNT_KEY)
         self.account_key = account_key
@@ -157,7 +157,7 @@ class SasTokenConfiguration(RestTranslatableMixin, DictMixin):
     def __init__(
         self,
         *,
-        sas_token: str,
+        sas_token: Optional[str],
     ) -> None:
         super().__init__()
         self.type = camel_to_snake(CredentialsType.SAS)
@@ -209,7 +209,7 @@ class PatTokenConfiguration(RestTranslatableMixin, DictMixin):
             :caption: Configuring a personal access token configuration for a WorkspaceConnection.
     """
 
-    def __init__(self, *, pat: str) -> None:
+    def __init__(self, *, pat: Optional[str]) -> None:
         super().__init__()
         self.type = camel_to_snake(ConnectionAuthType.PAT)
         self.pat = pat
@@ -245,8 +245,8 @@ class UsernamePasswordConfiguration(RestTranslatableMixin, DictMixin):
     def __init__(
         self,
         *,
-        username: str,
-        password: str,
+        username: Optional[str],
+        password: Optional[str],
     ) -> None:
         super().__init__()
         self.type = camel_to_snake(ConnectionAuthType.USERNAME_PASSWORD)
@@ -316,8 +316,8 @@ class ServicePrincipalConfiguration(BaseTenantCredentials):
     def __init__(
         self,
         *,
-        client_secret: str,
-        **kwargs: str,
+        client_secret: Optional[str],
+        **kwargs: Any,
     ) -> None:
         super().__init__(**kwargs)
         self.type = camel_to_snake(CredentialsType.SERVICE_PRINCIPAL)
@@ -894,8 +894,8 @@ class AccessKeyConfiguration(RestTranslatableMixin, DictMixin):
     def __init__(
         self,
         *,
-        access_key_id: str,
-        secret_access_key: str,
+        access_key_id: Optional[str],
+        secret_access_key: Optional[str],
     ) -> None:
         super().__init__()
         self.type = camel_to_snake(ConnectionAuthType.ACCESS_KEY)
@@ -936,7 +936,7 @@ class ApiKeyConfiguration(RestTranslatableMixin, DictMixin):
     def __init__(
         self,
         *,
-        key: str,
+        key: Optional[str],
     ):
         super().__init__()
         self.type = camel_to_snake(ConnectionAuthType.API_KEY)

sdk/ml/azure-ai-ml/azure/ai/ml/entities/_datastore/_on_prem_credentials.py

@@ -3,7 +3,7 @@
 # ---------------------------------------------------------
 
 from base64 import b64encode
-from typing import Any
+from typing import Any, Optional
 
 from azure.ai.ml._restclient.v2023_04_01_preview import models as model_preview
 from azure.ai.ml._utils._experimental import experimental
@@ -28,7 +28,7 @@ def __init__(
         kerberos_realm: str,
         kerberos_kdc_address: str,
         kerberos_principal: str,
-        kerberos_keytab: str,
+        kerberos_keytab: Optional[str],
         **kwargs: Any,
     ):
         super().__init__(
@@ -84,7 +84,7 @@ def __init__(
         kerberos_realm: str,
         kerberos_kdc_address: str,
         kerberos_principal: str,
-        kerberos_password: str,
+        kerberos_password: Optional[str],
         **kwargs: Any,
     ):
         super().__init__(

sdk/ml/azure-ai-ml/azure/ai/ml/entities/_job/finetuning/finetuning_vertical.py

@@ -26,7 +26,7 @@ def __init__(
         *,
         task: str,
         model: Input,
-        model_provider: str,
+        model_provider: Optional[str],
         training_data: Input,
         validation_data: Optional[Input] = None,
         **kwargs: Any,
@@ -93,7 +93,7 @@ def model(self, value: Input) -> None:
             )
 
     @property
-    def model_provider(self) -> str:
+    def model_provider(self) -> Optional[str]:
         """The model provider.
         :return: The model provider.
         :rtype: str

sdk/ml/azure-ai-ml/azure/ai/ml/entities/_job/pipeline/_io/base.py

@@ -124,8 +124,8 @@ def __init__(
         )
         # TODO: remove this
         self._attribute_map: Dict = {}
-        self._name: str = ""
-        self._version: str = ""
+        self._name: Optional[str] = ""
+        self._version: Optional[str] = ""
         super(InputOutputBase, self).__init__(**kwargs)
 
     @abstractmethod
@@ -510,8 +510,8 @@ def __init__(
         super().__init__(meta=meta, data=data, **kwargs)
         self._port_name = port_name
         self._owner = owner
-        self._name: str = self._data.name if isinstance(self._data, Output) else None
-        self._version: str = self._data.version if isinstance(self._data, Output) else None
+        self._name: Optional[str] = self._data.name if isinstance(self._data, Output) else None
+        self._version: Optional[str] = self._data.version if isinstance(self._data, Output) else None
 
         self._assert_name_and_version()
 
@@ -528,7 +528,7 @@ def port_name(self) -> str:
         return self._port_name
 
     @property
-    def name(self) -> str:
+    def name(self) -> Optional[str]:
         """Used in registering output data.
 
         :return: The output name
@@ -556,7 +556,7 @@ def name(self, name: str) -> None:
             )
 
     @property
-    def version(self) -> str:
+    def version(self) -> Optional[str]:
         """Used in registering output data.
 
         :return: The output data

sdk/ml/azure-ai-ml/azure/ai/ml/entities/_validate_funcs.py

@@ -19,7 +19,7 @@
 def validate_common(
     cls: Any,
     path: Union[str, PathLike, IO[AnyStr]],
-    validate_func: Callable,
+    validate_func: Optional[Callable],
     params_override: Optional[List[Dict]] = None,
 ) -> ValidationResult:
     params_override = params_override or []