Address latest comments

Author: KevinFairise2

src/dda/config/constants.py

@@ -22,7 +22,7 @@ class AppEnvVars:
     VERBOSE = "DDA_VERBOSE"
     NO_DYNAMIC_DEPS = "DDA_NO_DYNAMIC_DEPS"
     TELEMETRY_API_KEY = "DDA_TELEMETRY_API_KEY"
-    FEATURE_FLAGS_CLIENT_TOKEN = "DDA_FEATURE_FLAGS_CLIENT_TOKEN"  # noqa: S105 This is not a hardcoded secret but the linter complains on it
+    FEATURE_FLAGS_CLIENT_TOKEN = "DDA_FEATURE_FLAGS_CLIENT_TOKEN"  # noqa: S105i
     TELEMETRY_USER_MACHINE_ID = "DDA_TELEMETRY_USER_MACHINE_ID"
     # https://no-color.org
     NO_COLOR = "NO_COLOR"

src/dda/feature_flags/client.py

@@ -3,11 +3,8 @@
 # SPDX-License-Identifier: MIT
 from __future__ import annotations
 
-import json
 from typing import TYPE_CHECKING, Any
 
-from httpx import HTTPError
-
 from dda._version import __version__
 
 if TYPE_CHECKING:
@@ -49,23 +46,15 @@ def _fetch_flags(
         if not self.__client_token:
             return {}
 
+        from httpx import HTTPError
+
         # Build headers
         headers = {
             "Content-Type": "application/vnd.api+json",
             "dd-client-token": self.__client_token,
+            "dd-application-id": self.__app_id,
         }
 
-        headers["dd-application-id"] = self.__app_id
-
-        # Stringify all targeting attributes
-        stringified_attributes = {}
-        if targeting_attributes:
-            for key, value in targeting_attributes.items():
-                if isinstance(value, str):
-                    stringified_attributes[key] = value
-                else:
-                    stringified_attributes[key] = json.dumps(value)
-
         # Build request payload (following JSON:API format)
         payload = {
             "data": {
@@ -80,7 +69,7 @@ def _fetch_flags(
                     },
                     "subject": {
                         "targeting_key": targeting_key,
-                        "targeting_attributes": stringified_attributes,
+                        "targeting_attributes": targeting_attributes,
                     },
                 },
             },

src/dda/feature_flags/manager.py

@@ -28,17 +28,14 @@ class FeatureFlagManager:
 
     def __init__(self, app: Application) -> None:
         self.__app = app
-
-        self.__client = DatadogFeatureFlag(self.__client_token, self.__app)
-
         # Manually implemented cache to avoid calling several time Feature flag backend on the same flag evaluation.
         # Cache key is a tuple of the flag, entity and scopes, to make it hashable.
         # For example after calling `enabled("test-flag", default=False, scopes={"user": "user1"}),
         # the cache will contain the result for the tuple ("test-flag", "entity", (("user", "user1"),)).
         self.__cache: dict[tuple[str, str, tuple[tuple[str, str], ...]], Any] = {}
 
     @cached_property
-    def __client_token(self) -> str | None:
+    def __client(self) -> str | None:
         if running_in_ci():  # We do not support feature flags token retrieval in the CI yet.
             return None
 
@@ -53,7 +50,7 @@ def __client_token(self) -> str | None:
                 client_token = fetch_client_token()
                 save_client_token(client_token)
 
-        return client_token
+        return DatadogFeatureFlag(client_token, self.__app)
 
     @property
     def __user(self) -> FeatureFlagUser:
@@ -68,8 +65,8 @@ def __get_entity(self) -> str:
         return self.__user.machine_id
 
     def enabled(self, flag: str, *, default: bool = False, scopes: Optional[dict[str, str]] = None) -> bool:
-        if not self.__client_token:
-            self.__app.display_debug("No client token found")
+        if self.__client is None:
+            self.__app.display_debug("Feature flag client not initialized properly")
             return default
 
         entity = self.__get_entity()