done

adap · Jan 19, 2024 · a996409 · a996409
1 parent 8f68938
commit a996409
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/py/flwr/common/metricsrecord.py b/src/py/flwr/common/metricsrecord.py
@@ -70,7 +70,9 @@ def set_metrics(
 
         def is_valid(value: MetricsScalar) -> None:
             """Check if value is of expected type."""
-            if not isinstance(value, get_args(MetricsScalar)):
+            if not isinstance(value, get_args(MetricsScalar)) or isinstance(
+                value, bool
+            ):
                 raise TypeError(
                     "Not all values are of valid type."
                     f" Expected {MetricsRecordValues} but you passed {type(value)}."

diff --git a/src/py/flwr/common/recordset_test.py b/src/py/flwr/common/recordset_test.py
@@ -189,6 +189,7 @@ def test_set_metrics_to_metricsrecord_with_correct_types(
     "key_type, value_fn",
     [
         (str, lambda x: str(x.flatten()[0])),  # str: str  (supported: unsupported)
+        (str, lambda x: bool(x.flatten()[0])),  # str: bool  (supported: unsupported)
         (
             str,
             lambda x: x.flatten().astype("str").tolist(),
@@ -213,7 +214,7 @@ def test_set_metrics_to_metricsrecord_with_correct_types(
     ],
 )
 def test_set_metrics_to_metricsrecord_with_incorrect_types(
-    key_type: Type[Union[str, int, float]],
+    key_type: Type[Union[str, int, float, bool]],
     value_fn: Callable[[NDArray], Union[NDArray, Dict[str, NDArray], List[float]]],
 ) -> None:
     """Test adding metrics of various unsupported types to a MetricsRecord."""
@@ -270,10 +271,12 @@ def test_set_metrics_to_metricsrecord_with_and_without_keeping_input(
         (str, lambda x: str(x.flatten()[0])),  # str: str
         (str, lambda x: int(x.flatten()[0])),  # str: int
         (str, lambda x: float(x.flatten()[0])),  # str: float
+        (str, lambda x: bool(x.flatten()[0])),  # str: bool
         (str, lambda x: x.flatten().tobytes()),  # str: bytes
         (str, lambda x: x.flatten().astype("str").tolist()),  # str: List[str]
         (str, lambda x: x.flatten().astype("int").tolist()),  # str: List[int]
         (str, lambda x: x.flatten().astype("float").tolist()),  # str: List[float]
+        (str, lambda x: x.flatten().astype("bool").tolist()),  # str: List[bool]
         (str, lambda x: [x.flatten().tobytes()]),  # str: List[bytes]
     ],
 )

diff --git a/src/py/flwr/common/typing.py b/src/py/flwr/common/typing.py
@@ -50,8 +50,8 @@
 MetricsScalarList = Union[List[int], List[float]]
 MetricsRecordValues = Union[MetricsScalar, MetricsScalarList]
 # Value types for common.ConfigsRecord
-ConfigsScalar = Union[MetricsScalar, str, bytes]
-ConfigsScalarList = Union[MetricsScalarList, List[str], List[bytes]]
+ConfigsScalar = Union[MetricsScalar, str, bytes, bool]
+ConfigsScalarList = Union[MetricsScalarList, List[str], List[bytes], List[bool]]
 ConfigsRecordValues = Union[ConfigsScalar, ConfigsScalarList]
 
 Metrics = Dict[str, Scalar]