fix merge conflicts

Signed-off-by: gruebel <[email protected]>

Author: gruebel

.github/workflows/build.yml

@@ -46,9 +46,10 @@ jobs:
         working-directory: ${{ matrix.package }}
 
       - name: Type checking
-        if: matrix.package == 'providers/openfeature-provider-flagd'
+        # TODO: migrate other packages to use their own 'mypy' setup
+        if: matrix.python-version == '3.11' && matrix.package == 'providers/openfeature-provider-flagd'
         working-directory: ${{ matrix.package }}
-        run: hatch run mypy
+        run: hatch run mypy:run
 
       - name: Test with pytest
         run: hatch test -c

CONTRIBUTING.md

@@ -32,6 +32,10 @@ We use `pytest` for our unit testing, making use of `parametrized` to inject cas
 
 These are planned once the SDK has been stabilized and a Flagd provider implemented. At that point, we will utilize the [gherkin integration tests](https://github.com/open-feature/test-harness/blob/main/features/evaluation.feature) to validate against a live, seeded Flagd instance.
 
+### Type checking
+
+Run `mypy` by entering the package directory and running `hatch run mypy:run`.
+
 ## Pull Request
 
 All contributions to the OpenFeature project are welcome via GitHub pull requests.

providers/openfeature-provider-flagd/pyproject.toml

@@ -40,9 +40,6 @@ dependencies = [
   "testcontainers",
   "asserts",
   "grpcio-health-checking==1.60.0",
-  "mypy[faster-cache]>=1.13.0",
-  "types-protobuf",
-  "types-pyyaml",
 ]
 pre-install-commands = [
   "hatch build",
@@ -62,6 +59,19 @@ cov = [
   "cov-report",
 ]
 
+[tool.hatch.envs.mypy]
+dependencies = [
+  "mypy[faster-cache]>=1.13.0",
+  "types-protobuf",
+  "types-pyyaml",
+]
+pre-install-commands = [
+  "hatch build",
+]
+
+[tool.hatch.envs.mypy.scripts]
+run = "mypy"
+
 [tool.hatch.build.hooks.protobuf]
 generate_pyi = false
 dependencies = [
@@ -93,17 +103,15 @@ packages = ["src/openfeature"]
 [tool.coverage.run]
 omit = [
   # exclude generated files
-  "src/openfeature/contrib/provider/flagd/proto/*",
+  "src/openfeature/schemas/*",
   "tests/**",
 ]
 
 [tool.mypy]
 mypy_path = "src"
 files = "src"
-exclude = [
-  "src/openfeature/contrib/provider/flagd/protobuf"
-]
 
+python_version = "3.8" # should be identical to the minimum supported version
 namespace_packages = true
 explicit_package_bases = true
 local_partial_types = true
@@ -114,12 +122,13 @@ disallow_any_generics = false
 
 [[tool.mypy.overrides]]
 module = [
-    "grpc"
+    "grpc.*",
+    "json_logic.*",
 ]
 ignore_missing_imports = true
 
 [[tool.mypy.overrides]]
 module = [
-    "openfeature.contrib.provider.flagd.protobuf.*"
+    "openfeature.schemas.*"
 ]
-follow_imports = "silent"
+warn_unused_ignores = false

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

@@ -13,14 +13,13 @@
     TypeMismatchError,
 )
 from openfeature.flag_evaluation import FlagResolutionDetails
-from openfeature.schemas.protobuf.flagd.evaluation.v1 import (  # type:ignore[import-not-found]
+from openfeature.schemas.protobuf.flagd.evaluation.v1 import (
     evaluation_pb2,
     evaluation_pb2_grpc,
 )
 
 from ..config import Config
 from ..flag_type import FlagType
-from ..protobuf.flagd.evaluation.v1 import evaluation_pb2, evaluation_pb2_grpc
 
 if typing.TYPE_CHECKING:
     from google.protobuf.message import Message
@@ -35,7 +34,7 @@ def __init__(self, config: Config):
             grpc.secure_channel if self.config.tls else grpc.insecure_channel
         )
         self.channel = channel_factory(f"{self.config.host}:{self.config.port}")
-        self.stub = evaluation_pb2_grpc.ServiceStub(self.channel)  # type: ignore[no-untyped-call]
+        self.stub = evaluation_pb2_grpc.ServiceStub(self.channel)
 
     def shutdown(self) -> None:
         self.channel.close()
@@ -90,15 +89,9 @@ def _resolve(  # noqa: PLR0915
         context = self._convert_context(evaluation_context)
         call_args = {"timeout": self.config.timeout}
         try:
-            request: typing.Union[
-                evaluation_pb2.ResolveBooleanRequest,
-                evaluation_pb2.ResolveIntRequest,
-                evaluation_pb2.ResolveStringRequest,
-                evaluation_pb2.ResolveObjectRequest,
-                evaluation_pb2.ResolveFloatRequest,
-            ]
+            request: Message
             if flag_type == FlagType.BOOLEAN:
-                request: Message = evaluation_pb2.ResolveBooleanRequest(
+                request = evaluation_pb2.ResolveBooleanRequest(
                     flag_key=flag_key, context=context
                 )
                 response = self.stub.ResolveBoolean(request, **call_args)

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

@@ -1,8 +1,8 @@
 import time
 import typing
 
-from json_logic import builtins, jsonLogic  # type: ignore[import-untyped]
-from json_logic.types import JsonValue  # type: ignore[import-untyped]
+from json_logic import builtins, jsonLogic
+from json_logic.types import JsonValue
 
 from openfeature.evaluation_context import EvaluationContext