Address comments

ji-yaqi · ji-yaqi · commit 335de3882bed · 2021-06-30T15:56:26.000-07:00
diff --git a/google/cloud/aiplatform/explain/metadata/tf/v2/saved_model_metadata_builder.py b/google/cloud/aiplatform/explain/metadata/tf/v2/saved_model_metadata_builder.py
@@ -30,7 +30,7 @@ def __init__(
         self,
         model_path: str,
         signature_name: Optional[str] = None,
-        outputs_to_explain: Optional[List[str]] = (),
+        outputs_to_explain: Optional[List[str]] = None,
         **kwargs
     ) -> None:
         """Initializes a SavedModelMetadataBuilder object.
@@ -93,26 +93,18 @@ def _infer_metadata_entries_from_model(
               Inferred input metadata and output metadata from the model.
 
         Raises:
-            ValueError if specified name is not found in signature outputs.
+              ValueError if specified name is not found in signature outputs.
         """
 
         loaded_sig = self._loaded_model.signatures[signature_name]
         _, input_sig = loaded_sig.structured_input_signature
         output_sig = loaded_sig.structured_outputs
         input_mds = {}
         for name, tensor_spec in input_sig.items():
-            if tensor_spec.dtype.is_floating:
-                input_mds[
-                    name
-                ] = explanation_metadata.ExplanationMetadata.InputMetadata(
-                    input_tensor_name=name
-                )
-            else:
-                input_mds[
-                    name
-                ] = explanation_metadata.ExplanationMetadata.InputMetadata(
-                    input_tensor_name=name, modality="categorical",
-                )
+            input_mds[name] = explanation_metadata.ExplanationMetadata.InputMetadata(
+                input_tensor_name=name,
+                modality=None if tensor_spec.dtype.is_floating else "categorical",
+            )
 
         output_mds = {}
         for name in output_sig:
diff --git a/setup.py b/setup.py
@@ -36,8 +36,8 @@
 ]
 metadata_extra_require = ["pandas >= 1.0.0"]
 xai_extra_require = ["tensorflow-cpu>=2.3.0, <=2.5.0"]
-full_extra_require = (
-    tensorboard_extra_require + metadata_extra_require + xai_extra_require
+full_extra_require = list(
+    set(tensorboard_extra_require + metadata_extra_require + xai_extra_require)
 )
 testing_extra_require = full_extra_require + ["grpcio-testing ~= 1.34.0"]
 

Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,8 @@`
`36`	`36`	`]`
`37`	`37`	`metadata_extra_require = ["pandas >= 1.0.0"]`
`38`	`38`	`xai_extra_require = ["tensorflow-cpu>=2.3.0, <=2.5.0"]`
`39`		`-full_extra_require = (`
`40`		`- tensorboard_extra_require + metadata_extra_require + xai_extra_require`
	`39`	`+full_extra_require = list(`
	`40`	`+ set(tensorboard_extra_require + metadata_extra_require + xai_extra_require)`
`41`	`41`	`)`
`42`	`42`	`testing_extra_require = full_extra_require + ["grpcio-testing ~= 1.34.0"]`
`43`	`43`