fix type errors and fmt

Signed-off-by: christian.lutnik <[email protected]>

Author: chrfwow

providers/openfeature-provider-flagd/src/openfeature/contrib/provider/flagd/resolvers/in_process.py

@@ -18,13 +18,13 @@
 
 
 def _merge_metadata(
-    flag_metadata: typing.Mapping[str, typing.Union[float, int, str, bool]],
-    flag_set_metadata: typing.Mapping[str, typing.Union[float, int, str, bool]],
+    flag_metadata: typing.Mapping[str, typing.Union[float, int, str, bool]] | None,
+    flag_set_metadata: typing.Mapping[str, typing.Union[float, int, str, bool]] | None,
 ) -> typing.Mapping[str, typing.Union[float, int, str, bool]]:
     metadata = {}
+
     if flag_set_metadata is not None:
-        for key, value in flag_set_metadata.items():
-            metadata[key] = value
+        metadata = { key: flag_set_metadata[key] for key in flag_set_metadata.keys() }
 
     if flag_metadata is not None:
         for key, value in flag_metadata.items():

providers/openfeature-provider-flagd/src/openfeature/contrib/provider/flagd/resolvers/process/connector/file_watcher.py

@@ -6,15 +6,15 @@
 import typing
 
 import yaml
-from openfeature.evaluation_context import EvaluationContext
-from openfeature.event import ProviderEventDetails
-from openfeature.exception import ParseError, ProviderNotReadyError, ErrorCode
 
 from openfeature.contrib.provider.flagd.config import Config
 from openfeature.contrib.provider.flagd.resolvers.process.connector import (
     FlagStateConnector,
 )
 from openfeature.contrib.provider.flagd.resolvers.process.flags import FlagStore
+from openfeature.evaluation_context import EvaluationContext
+from openfeature.event import ProviderEventDetails
+from openfeature.exception import ParseError, ProviderNotReadyError, ErrorCode
 
 logger = logging.getLogger("openfeature.contrib")
 

providers/openfeature-provider-flagd/src/openfeature/contrib/provider/flagd/resolvers/process/flags.py

@@ -7,7 +7,7 @@
 from openfeature.exception import ParseError
 
 
-def _validate_metadata(key: str, value: typing.Union[float, int, str, bool]):
+def _validate_metadata(key: str, value: typing.Union[float, int, str, bool]) -> None:
     if key is None:
         raise ParseError("Metadata key must be set")
     elif not isinstance(key, str):
@@ -19,11 +19,16 @@ def _validate_metadata(key: str, value: typing.Union[float, int, str, bool]):
         )
     if value is None:
         raise ParseError("Metadata value for key " + str(key) + " must be set")
-    elif not isinstance(value, float | int | str | bool):
+    elif not (
+            isinstance(value, float)
+            or isinstance(value, int)
+            or isinstance(value, str)
+            or isinstance(value, bool)
+    ):
         raise ParseError(
             "Metadata value "
-            + str(value) +
-                         " for key "
+            + str(value)
+            + " for key "
             + str(key)
             + " must be of type float, int, str or bool, but is "
             + str(type(value))

providers/openfeature-provider-flagd/tests/test_file_store.py

@@ -74,6 +74,6 @@ def test_file_load_metadata():
     assert isinstance(flag_set_metadata, dict)
     assert len(flag_set_metadata) == 4
     assert flag_set_metadata["string"] == "a"
-    assert flag_set_metadata["integer"] ==  1
-    assert flag_set_metadata["float"] ==  1.2
+    assert flag_set_metadata["integer"] == 1
+    assert flag_set_metadata["float"] == 1.2
     assert flag_set_metadata["bool"]

providers/openfeature-provider-flagd/tests/test_metadata.py

@@ -3,12 +3,12 @@
 from time import sleep
 
 import pytest
-from openfeature.event import EventDetails, ProviderEvent
-from openfeature.exception import ErrorCode
 
 from openfeature import api
 from openfeature.contrib.provider.flagd import FlagdProvider
 from openfeature.contrib.provider.flagd.config import ResolverType
+from openfeature.event import EventDetails, ProviderEvent
+from openfeature.exception import ErrorCode
 
 
 def create_client(file_name):