feat: use-context-evaluation-with-newest-engine-version (#182)

Author: Zaimwa9

pyproject.toml

@@ -4,7 +4,8 @@ name = "edge-proxy"
 license = { file = "LICENSE" }
 dependencies = [
     "fastapi",
-    "flagsmith-flag-engine>=6,<7",
+    "flagsmith-flag-engine>=10,<11",
+    "flagsmith>=5",
     "httpx",
     "marshmallow",
     "orjson",

requirements-dev.lock

@@ -6,6 +6,8 @@
 #   features: []
 #   all-features: false
 #   with-sources: false
+#   generate-hashes: false
+#   universal: false
 
 -e file:.
 annotated-types==0.6.0
@@ -16,8 +18,11 @@ anyio==4.3.0
 certifi==2024.2.2
     # via httpcore
     # via httpx
+    # via requests
 cfgv==3.4.0
     # via pre-commit
+charset-normalizer==3.4.4
+    # via requests
 classify-imports==4.2.0
     # via reorder-python-imports
 click==8.1.7
@@ -28,8 +33,11 @@ fastapi==0.110.1
     # via edge-proxy
 filelock==3.13.3
     # via virtualenv
-flagsmith-flag-engine==6.1.0
+flagsmith==5.0.3
     # via edge-proxy
+flagsmith-flag-engine==10.0.3
+    # via edge-proxy
+    # via flagsmith
 freezegun==1.4.0
     # via pytest-freezegun
 h11==0.14.0
@@ -44,8 +52,13 @@ identify==2.5.35
 idna==3.6
     # via anyio
     # via httpx
+    # via requests
 iniconfig==2.0.0
     # via pytest
+iregexp-check==0.1.4
+    # via jsonpath-rfc9535
+jsonpath-rfc9535==0.2.0
+    # via flagsmith-flag-engine
 marshmallow==3.21.1
     # via edge-proxy
 nodeenv==1.8.0
@@ -63,11 +76,7 @@ pre-commit==3.7.0
 pydantic==2.7.1
     # via edge-proxy
     # via fastapi
-    # via flagsmith-flag-engine
-    # via pydantic-collections
     # via pydantic-settings
-pydantic-collections==0.5.4
-    # via flagsmith-flag-engine
 pydantic-core==2.18.2
     # via pydantic
 pydantic-settings==2.2.1
@@ -88,8 +97,15 @@ python-dotenv==1.0.1
     # via pydantic-settings
 pyyaml==6.0.1
     # via pre-commit
+regex==2025.11.3
+    # via jsonpath-rfc9535
 reorder-python-imports==3.12.0
-semver==3.0.2
+requests==2.32.5
+    # via flagsmith
+    # via requests-futures
+requests-futures==1.0.2
+    # via flagsmith
+semver==3.0.4
     # via flagsmith-flag-engine
 setuptools==69.2.0
     # via nodeenv
@@ -98,15 +114,20 @@ six==1.16.0
 sniffio==1.3.1
     # via anyio
     # via httpx
+sseclient-py==1.8.0
+    # via flagsmith
 starlette==0.37.2
     # via fastapi
 structlog==24.1.0
     # via edge-proxy
-typing-extensions==4.11.0
+typing-extensions==4.15.0
     # via fastapi
+    # via flagsmith
+    # via flagsmith-flag-engine
     # via pydantic
-    # via pydantic-collections
     # via pydantic-core
+urllib3==2.6.2
+    # via requests
 uvicorn==0.29.0
     # via edge-proxy
 virtualenv==20.25.1

requirements.lock

@@ -6,6 +6,8 @@
 #   features: []
 #   all-features: false
 #   with-sources: false
+#   generate-hashes: false
+#   universal: false
 
 -e file:.
 annotated-types==0.6.0
@@ -16,12 +18,18 @@ anyio==4.3.0
 certifi==2024.2.2
     # via httpcore
     # via httpx
+    # via requests
+charset-normalizer==3.4.4
+    # via requests
 click==8.1.7
     # via uvicorn
 fastapi==0.110.1
     # via edge-proxy
-flagsmith-flag-engine==6.1.0
+flagsmith==5.0.3
     # via edge-proxy
+flagsmith-flag-engine==10.0.3
+    # via edge-proxy
+    # via flagsmith
 h11==0.14.0
     # via httpcore
     # via uvicorn
@@ -32,6 +40,11 @@ httpx==0.27.0
 idna==3.6
     # via anyio
     # via httpx
+    # via requests
+iregexp-check==0.1.4
+    # via jsonpath-rfc9535
+jsonpath-rfc9535==0.2.0
+    # via flagsmith-flag-engine
 marshmallow==3.21.1
     # via edge-proxy
 orjson==3.10.0
@@ -41,11 +54,7 @@ packaging==24.0
 pydantic==2.7.1
     # via edge-proxy
     # via fastapi
-    # via flagsmith-flag-engine
-    # via pydantic-collections
     # via pydantic-settings
-pydantic-collections==0.5.4
-    # via flagsmith-flag-engine
 pydantic-core==2.18.2
     # via pydantic
 pydantic-settings==2.2.1
@@ -55,19 +64,31 @@ python-decouple==3.8
 python-dotenv==1.0.1
     # via edge-proxy
     # via pydantic-settings
-semver==3.0.2
+regex==2025.11.3
+    # via jsonpath-rfc9535
+requests==2.32.5
+    # via flagsmith
+    # via requests-futures
+requests-futures==1.0.2
+    # via flagsmith
+semver==3.0.4
     # via flagsmith-flag-engine
 sniffio==1.3.1
     # via anyio
     # via httpx
+sseclient-py==1.8.0
+    # via flagsmith
 starlette==0.37.2
     # via fastapi
 structlog==24.1.0
     # via edge-proxy
-typing-extensions==4.11.0
+typing-extensions==4.15.0
     # via fastapi
+    # via flagsmith
+    # via flagsmith-flag-engine
     # via pydantic
-    # via pydantic-collections
     # via pydantic-core
+urllib3==2.6.2
+    # via requests
 uvicorn==0.29.0
     # via edge-proxy

src/edge_proxy/cache.py

@@ -1,7 +1,8 @@
-from abc import ABC
-from collections import defaultdict
+from abc import ABC, abstractmethod
 from typing import Any
 
+from edge_proxy.feature_utils import build_feature_types_lookup
+
 
 class BaseEnvironmentsCache(ABC):
     def __init__(self, *args, **kwargs):
@@ -24,22 +25,18 @@ def put_environment(
             return True
         return False
 
+    @abstractmethod
     def _put_environment(
         self,
         environment_api_key: str,
         environment_document: dict[str, Any],
-    ) -> None:
-        raise NotImplementedError()
+    ) -> None: ...
 
-    def get_environment(self, environment_api_key: str) -> dict[str, Any] | None:
-        raise NotImplementedError()
+    @abstractmethod
+    def get_environment(self, environment_api_key: str) -> dict[str, Any] | None: ...
 
-    def get_identity(
-        self,
-        environment_api_key: str,
-        identifier: str,
-    ) -> dict[str, Any]:
-        raise NotImplementedError()
+    @abstractmethod
+    def get_feature_types(self, environment_api_key: str) -> dict[int, str] | None: ...
 
 
 _LocalCacheDict = dict[str, dict[str, Any]]
@@ -49,33 +46,24 @@ class LocalMemEnvironmentsCache(BaseEnvironmentsCache):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self._environment_cache: _LocalCacheDict = {}
-        self._identity_override_cache = defaultdict[str, _LocalCacheDict](dict)
+        self._feature_types_cache: dict[str, dict[int, str]] = {}
 
     def _put_environment(
         self,
         environment_api_key: str,
         environment_document: dict[str, Any],
     ) -> None:
         self._environment_cache[environment_api_key] = environment_document
-        new_overrides = environment_document.get("identity_overrides") or []
-        self._identity_override_cache[environment_api_key] = {
-            identifier: identity_document
-            for identity_document in new_overrides
-            if (identifier := identity_document.get("identifier"))
-        }
+
+        self._feature_types_cache[environment_api_key] = build_feature_types_lookup(
+            environment_document
+        )
 
     def get_environment(
         self,
         environment_api_key: str,
     ) -> dict[str, Any] | None:
         return self._environment_cache.get(environment_api_key)
 
-    def get_identity(
-        self,
-        environment_api_key: str,
-        identifier: str,
-    ) -> dict[str, Any]:
-        return self._identity_override_cache[environment_api_key].get(identifier) or {
-            "environment_api_key": environment_api_key,
-            "identifier": identifier,
-        }
+    def get_feature_types(self, environment_api_key: str) -> dict[int, str] | None:
+        return self._feature_types_cache.get(environment_api_key)