flagsmith 5.4.0__tar.gz → 6.0.0__tar.gz

{flagsmith-5.4.0 → flagsmith-6.0.0}/PKG-INFO

@@ -1,22 +1,21 @@
 Metadata-Version: 2.4
 Name: flagsmith
-Version: 5.4.0
+Version: 6.0.0
 Summary: Flagsmith Python SDK
 License: BSD3
 License-File: LICENSE
 Keywords: feature,flag,flagsmith,remote,config
 Author: Flagsmith
 Author-email: support@flagsmith.com
-Requires-Python: >=3.9,<4
+Requires-Python: >=3.10,<4
 Classifier: License :: Other/Proprietary License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
-Requires-Dist: flagsmith-flag-engine (>=10.0.4,<11.0.0)
+Requires-Dist: flagsmith-flag-engine (>=10.2.0,<11.0.0)
 Requires-Dist: iso8601 (>=2.1.0,<3.0.0) ; python_version < "3.11"
 Requires-Dist: requests (>=2.32.3,<3.0.0)
 Requires-Dist: requests-futures (>=1.0.1,<2.0.0)

{flagsmith-5.4.0 → flagsmith-6.0.0}/flagsmith/api/types.py

@@ -39,6 +39,7 @@ class FeatureSegmentModel(typing.TypedDict):
 
 class MultivariateFeatureOptionModel(typing.TypedDict):
     value: str
+    key: NotRequired[typing.Optional[str]]
 
 
 class MultivariateFeatureStateValueModel(typing.TypedDict):

{flagsmith-5.4.0 → flagsmith-6.0.0}/flagsmith/flagsmith.py

@@ -357,16 +357,17 @@ class Flagsmith:
 
         Skips the exposure event when the resolved flag is a `DefaultFlag`
         (i.e. the feature was not present and was served via the
-        `default_flag_handler`), to keep experimentation data clean.
+        `default_flag_handler`) or when the feature is disabled, to keep
+        experimentation data clean.
         """
         if not self._event_processor:
             raise ValueError("Events must be enabled to use experiment flags.")
         flag = self.get_identity_flags(identifier, traits).get_flag(feature_name)
-        if not flag.is_default:
+        if isinstance(flag, Flag) and flag.enabled:
             self.track_exposure_event(
                 feature_name=feature_name,
                 identifier=identifier,
-                value=flag.value,
+                value=flag.variant if flag.variant is not None else flag.value,
                 traits=traits,
             )
         return flag

{flagsmith-5.4.0 → flagsmith-6.0.0}/flagsmith/mappers.py

@@ -7,6 +7,7 @@ from datetime import datetime, timezone
 import sseclient
 from flag_engine.context.types import (
     FeatureContext,
+    FeatureValue,
     SegmentContext,
     SegmentRule,
     StrValueSegmentCondition,
@@ -245,11 +246,13 @@ def _map_environment_document_feature_states_to_feature_contexts(
         if multivariate_feature_state_values := feature_state.get(
             "multivariate_feature_state_values"
         ):
-            feature_context["variants"] = [
-                {
-                    "value": multivariate_feature_state_value[
-                        "multivariate_feature_option"
-                    ]["value"],
+            variants: list[FeatureValue] = []
+            for multivariate_feature_state_value in multivariate_feature_state_values:
+                multivariate_feature_option = multivariate_feature_state_value[
+                    "multivariate_feature_option"
+                ]
+                variant: FeatureValue = {
+                    "value": multivariate_feature_option["value"],
                     "weight": multivariate_feature_state_value["percentage_allocation"],
                     "priority": (
                         multivariate_feature_state_value.get("id")
@@ -258,8 +261,10 @@ def _map_environment_document_feature_states_to_feature_contexts(
                         ).int
                     ),
                 }
-                for multivariate_feature_state_value in multivariate_feature_state_values
-            ]
+                if (key := multivariate_feature_option.get("key")) is not None:
+                    variant["key"] = key
+                variants.append(variant)
+            feature_context["variants"] = variants
 
         if feature_segment := feature_state.get("feature_segment"):
             feature_context["priority"] = feature_segment["priority"]

{flagsmith-5.4.0 → flagsmith-6.0.0}/flagsmith/models.py

@@ -51,6 +51,7 @@ class DefaultFlag(BaseFlag):
 class Flag(BaseFlag):
     feature_id: int
     feature_name: str
+    variant: typing.Optional[str] = None
     is_default: bool = field(default=False)
 
     @classmethod
@@ -64,6 +65,7 @@ class Flag(BaseFlag):
                 value=flag_result["value"],
                 feature_name=flag_result["name"],
                 feature_id=metadata["id"],
+                variant=flag_result.get("variant"),
             )
         raise ValueError(
             "FlagResult metadata is missing. Cannot create Flag instance. "
@@ -77,6 +79,7 @@ class Flag(BaseFlag):
             value=flag_data["feature_state_value"],
             feature_name=flag_data["feature"]["name"],
             feature_id=flag_data["feature"]["id"],
+            variant=flag_data.get("variant"),
         )
 
 

{flagsmith-5.4.0 → flagsmith-6.0.0}/flagsmith/polling_manager.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 
 import logging
 import threading
-import time
 import typing
 
 if typing.TYPE_CHECKING:
@@ -26,8 +25,11 @@ class EnvironmentDataPollingManager(threading.Thread):
 
     def run(self) -> None:
         while not self._stop_event.is_set():
-            self.main.update_environment()
-            time.sleep(self.refresh_interval_seconds)
+            try:
+                self.main.update_environment()
+            except Exception:
+                logger.exception("Error updating environment")
+            self._stop_event.wait(self.refresh_interval_seconds)
 
     def stop(self) -> None:
         self._stop_event.set()

{flagsmith-5.4.0 → flagsmith-6.0.0}/flagsmith/streaming_manager.py

@@ -40,8 +40,9 @@ class EventStreamManager(threading.Thread):
                     for event in sse_client.events():
                         self.on_event(map_sse_event_to_stream_event(event))
 
-            except (requests.RequestException, ValueError, TypeError):
+            except Exception:
                 logger.exception("Error opening or reading from the event stream")
+                self._stop_event.wait(1)
 
     def stop(self) -> None:
         self._stop_event.set()

{flagsmith-5.4.0 → flagsmith-6.0.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "flagsmith"
-version = "5.4.0"
+version = "6.0.0"
 description = "Flagsmith Python SDK"
 authors = ["Flagsmith <support@flagsmith.com>"]
 license = "BSD3"
@@ -10,9 +10,9 @@ documentation = "https://docs.flagsmith.com"
 packages = [{ include = "flagsmith" }]
 
 [tool.poetry.dependencies]
-flagsmith-flag-engine = "^10.0.4"
+flagsmith-flag-engine = "^10.2.0"
 iso8601 = { version = "^2.1.0", python = "<3.11" }
-python = ">=3.9,<4"
+python = ">=3.10,<4"
 requests = "^2.32.3"
 requests-futures = "^1.0.1"
 sseclient-py = "^1.8.0"
@@ -22,11 +22,11 @@ typing-extensions = "^4.15.0"
 optional = true
 
 [tool.poetry.group.dev.dependencies]
-mypy = { version = "^1.16.1", python = ">=3.9,<4" }
-pytest = "^7.4.0"
+mypy = "^1.16.1"
+pytest = ">=7.4,<10.0"
 pytest-cov = "^4.1.0"
 pytest-mock = "^3.6.1"
-pre-commit = { version = "^4.2.0", python = ">=3.9,<4" }
+pre-commit = "^4.2.0"
 responses = "^0.24.1"
 types-requests = "^2.32"
 pyfakefs = "^5.9.2"
@@ -35,7 +35,7 @@ pyfakefs = "^5.9.2"
 exclude = ["example/*"]
 
 [tool.black]
-target-version = ["py39"]
+target-version = ["py310"]
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]