Merge branch 'main' into feat/adjust-to-metadata-toggle

Author: leakonvalinka

.github/workflows/build.yml

@@ -21,17 +21,36 @@ permissions:
   contents: read
 
 jobs:
+  changes:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: read # needed for `dorny/paths-filter`
+    outputs:
+      packages: ${{ steps.filter.outputs.changes }}
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3
+        id: filter
+        with:
+          filters: |
+            hooks/openfeature-hooks-opentelemetry:
+              - 'hooks/openfeature-hooks-opentelemetry/**'
+            providers/openfeature-provider-env-var:
+              - 'providers/openfeature-provider-env-var/**'
+            providers/providers/openfeature-provider-flagd:
+              - 'providers/providers/openfeature-provider-flagd/**'
+            providers/openfeature-provider-flipt:
+              - 'providers/openfeature-provider-flipt/**'
+            providers/openfeature-provider-ofrep:
+              - 'providers/openfeature-provider-ofrep/**'
+
   build:
+    needs: changes
     runs-on: ubuntu-latest
     strategy:
       matrix:
         python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
-        package:
-          - "hooks/openfeature-hooks-opentelemetry"
-          - "providers/openfeature-provider-flagd"
-          - "providers/openfeature-provider-ofrep"
-          - "providers/openfeature-provider-env-var"
-
+        package: ${{ fromJSON(needs.changes.outputs.packages) }}
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
         with:

.pre-commit-config.yaml

@@ -3,7 +3,7 @@ repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
     rev: v0.12.4
     hooks:
-      - id: ruff
+      - id: ruff-check
         args: [--fix]
       - id: ruff-format
 

providers/openfeature-provider-env-var/pyproject.toml

@@ -17,7 +17,6 @@ build-backend = "hatchling.build"
 dev = [
     "pytest>=8.3.5",
     "pytest-cov>=6.1.1",
-    "ruff>=0.11.7",
 ]
 
 [tool.hatch.build.targets.wheel]
@@ -35,6 +34,9 @@ run = "mypy"
 [tool.hatch.envs.mypy]
 dependencies = ["mypy"]
 
+[tool.uv]
+required-version = "~=0.8.0"
+
 [tool.mypy]
 mypy_path = "src"
 files = "src"

providers/openfeature-provider-env-var/uv.lock

@@ -391,7 +391,11 @@ def _convert_context(
         if evaluation_context:
             try:
                 s["targetingKey"] = evaluation_context.targeting_key
-                s.update(evaluation_context.attributes)  # type: ignore[arg-type]
+                s.update(
+                    typing.cast(
+                        "typing.Mapping[str, typing.Any]", evaluation_context.attributes
+                    )
+                )
             except ValueError as exc:
                 message = (
                     "could not serialize evaluation context to google.protobuf.Struct"

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

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import time
 import typing
 
@@ -31,9 +33,11 @@ def targeting(
     if not isinstance(targeting, dict):
         raise ParseError(f"Invalid 'targeting' value in flag: {targeting}")
 
-    json_logic_context = evaluation_context.attributes if evaluation_context else {}
-    json_logic_context["$flagd"] = {"flagKey": key, "timestamp": int(time.time())}  # type: ignore[index]
-    json_logic_context["targetingKey"] = (  # type: ignore[index]
+    json_logic_context: dict[str, typing.Any] = (
+        dict(evaluation_context.attributes) if evaluation_context else {}
+    )
+    json_logic_context["$flagd"] = {"flagKey": key, "timestamp": int(time.time())}
+    json_logic_context["targetingKey"] = (
         evaluation_context.targeting_key if evaluation_context else None
     )
     return jsonLogic(targeting, json_logic_context, OPERATORS)

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

@@ -7,7 +7,7 @@
 from math import floor
 
 import pytest
-from json_logic import builtins, jsonLogic  # type: ignore[import-untyped]
+from json_logic import builtins, jsonLogic
 
 from openfeature.contrib.provider.flagd.resolvers.process.custom_ops import (
     ends_with,

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

@@ -30,7 +30,7 @@ Homepage = "https://github.com/open-feature/python-sdk-contrib"
 [tool.hatch.envs.hatch-test]
 dependencies = [
   "coverage[toml]>=6.5",
-  "pytest",
+  "pytest>=8.0",
   "requests-mock",
 ]