feat: moved-feature-types-map-to-cache-on-environment-document-update

Author: Zaimwa9

src/edge_proxy/cache.py

@@ -1,6 +1,7 @@
 from abc import ABC
 from collections import defaultdict
 from typing import Any
+from edge_proxy.feature_utils import build_feature_types_lookup
 
 
 class BaseEnvironmentsCache(ABC):
@@ -34,6 +35,9 @@ def _put_environment(
     def get_environment(self, environment_api_key: str) -> dict[str, Any] | None:
         raise NotImplementedError()
 
+    def get_feature_types(self, environment_api_key: str) -> dict[int, str] | None:
+        return None
+
     def get_identity(
         self,
         environment_api_key: str,
@@ -49,6 +53,7 @@ class LocalMemEnvironmentsCache(BaseEnvironmentsCache):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self._environment_cache: _LocalCacheDict = {}
+        self._feature_types_cache: dict[str, dict[int, str]] = {}
         self._identity_override_cache = defaultdict[str, _LocalCacheDict](dict)
 
     def _put_environment(
@@ -57,6 +62,11 @@ def _put_environment(
         environment_document: dict[str, Any],
     ) -> None:
         self._environment_cache[environment_api_key] = environment_document
+
+        self._feature_types_cache[environment_api_key] = build_feature_types_lookup(
+            environment_document
+        )
+
         new_overrides = environment_document.get("identity_overrides") or []
         self._identity_override_cache[environment_api_key] = {
             identifier: identity_document
@@ -70,6 +80,9 @@ def get_environment(
     ) -> dict[str, Any] | None:
         return self._environment_cache.get(environment_api_key)
 
+    def get_feature_types(self, environment_api_key: str) -> dict[int, str] | None:
+        return self._feature_types_cache.get(environment_api_key)
+
     def get_identity(
         self,
         environment_api_key: str,

src/edge_proxy/environments.py

@@ -84,7 +84,11 @@ def get_flags_response_data(
         server_key_only_feature_ids = environment_document.get("project", {}).get(
             "server_key_only_feature_ids", []
         )
-        feature_types = build_feature_types_lookup(environment_document)
+        feature_types = None
+        if hasattr(self.cache, "get_feature_types"):
+            feature_types = self.cache.get_feature_types(environment_key)
+        if feature_types is None:
+            feature_types = build_feature_types_lookup(environment_document)
 
         context = map_environment_document_to_context(environment_document)
         evaluation_result = get_evaluation_result(context)
@@ -134,7 +138,12 @@ def get_identity_response_data(
         server_key_only_feature_ids = environment_document.get("project", {}).get(
             "server_key_only_feature_ids", []
         )
-        feature_types = build_feature_types_lookup(environment_document)
+
+        feature_types = None
+        if hasattr(self.cache, "get_feature_types"):
+            feature_types = self.cache.get_feature_types(environment_key)
+        if feature_types is None:
+            feature_types = build_feature_types_lookup(environment_document)
 
         environment_context = map_environment_document_to_context(environment_document)
         context = map_context_and_identity_data_to_context(

tests/test_server.py

@@ -25,6 +25,7 @@ def test_get_flags(
         "edge_proxy.server.environment_service.cache"
     )
     mocked_environment_cache.get_environment.return_value = environment_1
+    mocked_environment_cache.get_feature_types.return_value = None
     response = client.get(
         "/api/v1/flags", headers={"X-Environment-Key": environment_key}
     )
@@ -42,6 +43,7 @@ def test_get_flags_single_feature(
         "edge_proxy.server.environment_service.cache"
     )
     mocked_environment_cache.get_environment.return_value = environment_1
+    mocked_environment_cache.get_feature_types.return_value = None
     response = client.get(
         "/api/v1/flags",
         headers={"X-Environment-Key": environment_key},
@@ -61,6 +63,7 @@ def test_get_flags_single_feature__server_key_only_feature__return_expected(
         "edge_proxy.server.environment_service.cache"
     )
     mocked_environment_cache.get_environment.return_value = environment_1
+    mocked_environment_cache.get_feature_types.return_value = None
 
     # When
     response = client.get(
@@ -86,6 +89,7 @@ def test_get_flags_unknown_key(
         "edge_proxy.server.environment_service.cache"
     )
     mocked_environment_cache.get_environment.return_value = None
+    mocked_environment_cache.get_feature_types.return_value = None
     response = client.get(
         "/api/v1/flags",
         headers={"X-Environment-Key": environment_key},
@@ -108,6 +112,7 @@ def test_post_identity_with_traits(
         "edge_proxy.server.environment_service.cache"
     )
     mocked_environment_cache.get_environment.return_value = environment_1
+    mocked_environment_cache.get_feature_types.return_value = None
     data = {
         "traits": [{"trait_value": "test", "trait_key": "first_name"}],
         "identifier": "do_it_all_in_one_go_identity",
@@ -165,6 +170,7 @@ def test_post_identity__invalid_trait_data__expected_response(
         "edge_proxy.server.environment_service.cache"
     )
     mocked_environment_cache.get_environment.return_value = environment_1
+    mocked_environment_cache.get_feature_types.return_value = None
     data = {
         "traits": [{"trait_value": "a" * 2001, "trait_key": "first_name"}],
         "identifier": "do_it_all_in_one_go_identity",
@@ -197,6 +203,7 @@ def test_get_identities(
         "edge_proxy.server.environment_service.cache"
     )
     mocked_environment_cache.get_environment.return_value = environment_1
+    mocked_environment_cache.get_feature_types.return_value = None
     mocked_environment_cache.get_identity.return_value = {
         "environment_api_key": x_environment_key,
         "identifier": identifier,
@@ -289,6 +296,7 @@ def test_get_flags__client_key__hide_disabled_flags_enabled__only_returns_enable
     mocked_environment_cache.get_environment.return_value = (
         environment_with_hide_disabled_flags
     )
+    mocked_environment_cache.get_feature_types.return_value = None
 
     # When
     response = client.get(
@@ -313,6 +321,7 @@ def test_get_flags__client_key__hide_disabled_flags_disabled__returns_all_flags(
         "edge_proxy.server.environment_service.cache"
     )
     mocked_environment_cache.get_environment.return_value = environment_1
+    mocked_environment_cache.get_feature_types.return_value = None
 
     # When
     response = client.get(
@@ -338,6 +347,7 @@ def test_get_flags__server_key__hide_disabled_flags_enabled__returns_all_flags(
     mocked_environment_cache.get_environment.return_value = (
         environment_with_hide_disabled_flags
     )
+    mocked_environment_cache.get_feature_types.return_value = None
     mocker.patch(
         "edge_proxy.server.environment_service._get_client_key_from_server_key",
         return_value=client_key,
@@ -364,6 +374,7 @@ def test_get_flags__client_key__hide_disabled_flags_enabled__single_disabled_fea
     mocked_environment_cache.get_environment.return_value = (
         environment_with_hide_disabled_flags
     )
+    mocked_environment_cache.get_feature_types.return_value = None
 
     # When
     response = client.get(
@@ -388,6 +399,7 @@ def test_post_identity__client_key__hide_disabled_flags_enabled__only_returns_en
     mocked_environment_cache.get_environment.return_value = (
         environment_with_hide_disabled_flags
     )
+    mocked_environment_cache.get_feature_types.return_value = None
     data = {
         "identifier": "test_identifier",
         "traits": [],
@@ -419,6 +431,7 @@ def test_post_identity__client_key__hide_disabled_flags_disabled__returns_all_fl
         "edge_proxy.server.environment_service.cache"
     )
     mocked_environment_cache.get_environment.return_value = environment_1
+    mocked_environment_cache.get_feature_types.return_value = None
     data = {
         "identifier": "test_identifier",
         "traits": [],