fix mypy errors - 6

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

@@ -125,7 +125,7 @@ def _get(self, name: str, version: Optional[str] = None, **kwargs: Dict) -> Feat
 
     @distributed_trace
     @monitor_with_activity(logger, "FeatureSet.Get", ActivityType.PUBLICAPI)
-    def get(self, name: str, version: str, **kwargs: Dict) -> Optional[FeatureSet]:  # type: ignore
+    def get(self, name: str, version: str, **kwargs: Dict) -> FeatureSet:  # type: ignore
         """Get the specified FeatureSet asset.
 
         :param name: Name of FeatureSet asset.
@@ -139,7 +139,7 @@ def get(self, name: str, version: str, **kwargs: Dict) -> Optional[FeatureSet]:
         """
         try:
             featureset_version_resource = self._get(name, version, **kwargs)
-            return FeatureSet._from_rest_object(featureset_version_resource)
+            return FeatureSet._from_rest_object(featureset_version_resource)  # type: ignore[return-value]
         except (ValidationException, SchemaValidationError) as ex:
             log_and_raise_error(ex)
 
@@ -334,9 +334,7 @@ def list_features(
 
     @distributed_trace
     @monitor_with_activity(logger, "FeatureSet.GetFeature", ActivityType.PUBLICAPI)
-    def get_feature(
-        self, feature_set_name: str, version: str, *, feature_name: str, **kwargs: Dict
-    ) -> Optional["Feature"]:
+    def get_feature(self, feature_set_name: str, version: str, *, feature_name: str, **kwargs: Dict) -> "Feature":
         """Get Feature
 
         :param feature_set_name: Feature set name.
@@ -360,7 +358,7 @@ def get_feature(
             **kwargs,
         )
 
-        return Feature._from_rest_object(feature)
+        return Feature._from_rest_object(feature)  # type: ignore[return-value]
 
     @distributed_trace
     @monitor_with_activity(logger, "FeatureSet.Archive", ActivityType.PUBLICAPI)

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

@@ -113,7 +113,7 @@ def list(self, *, scope: str = Scope.RESOURCE_GROUP, **kwargs: Dict) -> Iterable
     @distributed_trace
     @monitor_with_activity(logger, "FeatureStore.Get", ActivityType.PUBLICAPI)
     # pylint: disable=arguments-renamed
-    def get(self, name: str, **kwargs: Any) -> Optional[FeatureStore]:
+    def get(self, name: str, **kwargs: Any) -> FeatureStore:
         """Get a feature store by name.
 
         :param name: Name of the feature store.
@@ -122,7 +122,7 @@ def get(self, name: str, **kwargs: Any) -> Optional[FeatureStore]:
         :rtype: FeatureStore
         """
 
-        feature_store = None
+        feature_store: Any = None
         resource_group = kwargs.get("resource_group") or self._resource_group_name
         rest_workspace_obj = kwargs.get("rest_workspace_obj", None) or self._operation.get(resource_group, name)
         if rest_workspace_obj and rest_workspace_obj.kind and rest_workspace_obj.kind.lower() == FEATURE_STORE_KIND:

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

@@ -403,10 +403,10 @@ def archive(
 
         :param name: Name of model asset.
         :type name: str
-        :keyword version: Version of model asset.
-        :paramtype version: str
-        :keyword label: Label of the model asset. (mutually exclusive with version)
-        :paramtype label: str
+        :param version: Version of model asset.
+        :type version: str
+        :param label: Label of the model asset. (mutually exclusive with version)
+        :type label: str
 
         .. admonition:: Example:
 
@@ -439,10 +439,10 @@ def restore(
 
         :param name: Name of model asset.
         :type name: str
-        :keyword version: Version of model asset.
-        :paramtype version: str
-        :keyword label: Label of the model asset. (mutually exclusive with version)
-        :paramtype label: str
+        :param version: Version of model asset.
+        :type version: str
+        :param label: Label of the model asset. (mutually exclusive with version)
+        :type label: str
 
         .. admonition:: Example: