feat: use-feature-type-before-defaulting-to-standard

Author: Zaimwa9

src/edge_proxy/environments.py

@@ -15,7 +15,10 @@
 
 from edge_proxy.cache import BaseEnvironmentsCache, LocalMemEnvironmentsCache
 from edge_proxy.exceptions import FeatureNotFoundError, FlagsmithUnknownKeyError
-from edge_proxy.feature_utils import filter_out_server_key_only_flags
+from edge_proxy.feature_utils import (
+    filter_disabled_flags,
+    filter_out_server_key_only_flags,
+)
 from edge_proxy.mappers import (
     map_flag_result_to_response_data,
     map_flag_results_to_response_data,
@@ -29,14 +32,6 @@
 SERVER_API_KEY_PREFIX = "ser."
 
 
-def _filter_disabled_flags(
-    flags: list[dict[str, Any]], hide_disabled_flags: bool
-) -> list[dict[str, Any]]:
-    if not hide_disabled_flags:
-        return flags
-    return [flag for flag in flags if flag.get("enabled", False)]
-
-
 class EnvironmentService:
     def __init__(
         self,
@@ -88,9 +83,6 @@ def get_flags_response_data(
         server_key_only_feature_ids = environment_document.get("project", {}).get(
             "server_key_only_feature_ids", []
         )
-        hide_disabled_flags = environment_document.get("project", {}).get(
-            "hide_disabled_flags", False
-        )
 
         context = map_environment_document_to_context(environment_document)
         evaluation_result = get_evaluation_result(context)
@@ -118,7 +110,10 @@ def get_flags_response_data(
                     flags, server_key_only_feature_ids
                 )
 
-            flags = _filter_disabled_flags(flags, hide_disabled_flags)
+            hide_disabled_flags = environment_document.get("project", {}).get(
+                "hide_disabled_flags", False
+            )
+            flags = filter_disabled_flags(flags, hide_disabled_flags)
             data = map_flag_results_to_response_data(flags)
 
         return data
@@ -131,13 +126,10 @@ def get_identity_response_data(
         server_key_only_feature_ids = environment_document.get("project", {}).get(
             "server_key_only_feature_ids", []
         )
-        hide_disabled_flags = environment_document.get("project", {}).get(
-            "hide_disabled_flags", False
-        )
 
-        context = map_environment_document_to_context(environment_document)
+        environment_context = map_environment_document_to_context(environment_document)
         context = map_context_and_identity_data_to_context(
-            context=context,
+            context=environment_context,
             identifier=input_data.identifier,
             traits=input_data.traits,
         )
@@ -148,7 +140,10 @@ def get_identity_response_data(
         if not is_server_key:
             flags = filter_out_server_key_only_flags(flags, server_key_only_feature_ids)
 
-        flags = _filter_disabled_flags(flags, hide_disabled_flags)
+        hide_disabled_flags = environment_document.get("project", {}).get(
+            "hide_disabled_flags", False
+        )
+        flags = filter_disabled_flags(flags, hide_disabled_flags)
 
         data = {
             "traits": map_traits_to_response_data(input_data.traits),

src/edge_proxy/feature_utils.py

@@ -20,3 +20,21 @@ def filter_out_server_key_only_flags(
         for flag in flags
         if flag.get("metadata", {}).get("id") not in server_key_only_feature_ids
     ]
+
+
+def filter_disabled_flags(
+    flags: list[dict[str, Any]], hide_disabled: bool
+) -> list[dict[str, Any]]:
+    """
+    Filter out disabled flags if hide_disabled is enabled.
+
+    Args:
+        flags: List of flag results
+        hide_disabled: Whether to filter out disabled flags
+
+    Returns:
+        Filtered list of flags excluding disabled ones if hide_disabled is True
+    """
+    if not hide_disabled:
+        return flags
+    return [flag for flag in flags if flag.get("enabled", False)]

tests/test_models.py

@@ -13,7 +13,7 @@ def test_identity_with_traits_str():
     expected = "identifier:foo|traits:foo=bar,age=21,is_cool=True"
 
     # When
-    identity_with_traits = IdentityWithTraits.parse_obj(
+    identity_with_traits = IdentityWithTraits.model_validate(
         {"identifier": identifier, "traits": traits}
     )
 
@@ -33,7 +33,7 @@ def test_identity_with_traits_hash():
     expected = hash("identifier:foo|traits:foo=bar,age=21,is_cool=True")
 
     # When
-    identity_with_traits = IdentityWithTraits.parse_obj(
+    identity_with_traits = IdentityWithTraits.model_validate(
         {"identifier": identifier, "traits": traits}
     )