Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Support transient identities and traits #93

Merged
merged 14 commits into from
Jul 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Linting and Tests
name: Run Tests

on:
pull_request:
Expand All @@ -9,7 +9,6 @@ on:
jobs:
test:
runs-on: ubuntu-latest
name: Linting and Tests

strategy:
max-parallel: 4
Expand All @@ -33,14 +32,5 @@ jobs:
pip install poetry
poetry install --with dev

- name: Check Formatting
run: |
poetry run black --check .
poetry run flake8 .
poetry run isort --check .

- name: Check Typing
run: poetry run mypy --strict .

- name: Run Tests
run: poetry run pytest
3 changes: 1 addition & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/pre-commit/mirrors-mypy
rev: v1.5.1
rev: v1.10.1
hooks:
- id: mypy
args: [--strict]
Expand All @@ -14,7 +14,6 @@ repos:
rev: 24.3.0
hooks:
- id: black
language_version: python3
- repo: https://github.com/pycqa/flake8
rev: 6.1.0
hooks:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ For full documentation visit

## Contributing

Please read [CONTRIBUTING.md](CONTRIBUTING.md) for details on our code
of conduct, and the process for submitting pull requests
Please read [CONTRIBUTING.md](CONTRIBUTING.md) for details on our code of conduct, and the process for submitting pull
requests

## Getting Help

Expand Down
57 changes: 34 additions & 23 deletions flagsmith/flagsmith.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,14 @@
from flagsmith.offline_handlers import BaseOfflineHandler
from flagsmith.polling_manager import EnvironmentDataPollingManager
from flagsmith.streaming_manager import EventStreamManager, StreamEvent
from flagsmith.utils.identities import Identity, generate_identities_data
from flagsmith.types import JsonType, TraitConfig, TraitMapping
from flagsmith.utils.identities import generate_identity_data

logger = logging.getLogger(__name__)

DEFAULT_API_URL = "https://edge.api.flagsmith.com/api/v1/"
DEFAULT_REALTIME_API_URL = "https://realtime.flagsmith.com/"

JsonType = typing.Union[
None,
int,
str,
bool,
typing.List["JsonType"],
typing.List[typing.Mapping[str, "JsonType"]],
typing.Dict[str, "JsonType"],
]


class Flagsmith:
"""A Flagsmith client.
Expand Down Expand Up @@ -237,7 +228,9 @@ def get_environment_flags(self) -> Flags:
def get_identity_flags(
self,
identifier: str,
traits: typing.Optional[typing.Mapping[str, TraitValue]] = None,
traits: typing.Optional[TraitMapping] = None,
*,
transient: bool = False,
) -> Flags:
"""
Get all the flags for the current environment for a given identity. Will also
Expand All @@ -247,13 +240,20 @@ def get_identity_flags(
:param identifier: a unique identifier for the identity in the current
environment, e.g. email address, username, uuid
:param traits: a dictionary of traits to add / update on the identity in
Flagsmith, e.g. {"num_orders": 10}
Flagsmith, e.g. `{"num_orders": 10}`. Envelope traits you don't want persisted
in a dictionary with `"transient"` and `"value"` keys, e.g.
`{"num_orders": 10, "color": {"value": "pink", "transient": True}}`.
:param transient: if `True`, the identity won't get persisted
:return: Flags object holding all the flags for the given identity.
"""
traits = traits or {}
if (self.offline_mode or self.enable_local_evaluation) and self._environment:
return self._get_identity_flags_from_document(identifier, traits)
return self._get_identity_flags_from_api(identifier, traits)
return self._get_identity_flags_from_api(
identifier,
traits,
transient=transient,
)

def get_identity_segments(
self,
Expand Down Expand Up @@ -306,7 +306,7 @@ def _get_environment_flags_from_document(self) -> Flags:
)

def _get_identity_flags_from_document(
self, identifier: str, traits: typing.Mapping[str, TraitValue]
self, identifier: str, traits: TraitMapping
) -> Flags:
identity_model = self._get_identity_model(identifier, **traits)
if self._environment is None:
Expand Down Expand Up @@ -339,13 +339,23 @@ def _get_environment_flags_from_api(self) -> Flags:
raise

def _get_identity_flags_from_api(
self, identifier: str, traits: typing.Mapping[str, typing.Any]
self,
identifier: str,
traits: TraitMapping,
*,
transient: bool = False,
) -> Flags:
request_body = generate_identity_data(
identifier,
traits,
transient=transient,
)
try:
data = generate_identities_data(identifier, traits)
json_response: typing.Dict[str, typing.List[typing.Dict[str, JsonType]]] = (
self._get_json_response(
url=self.identities_url, method="POST", body=data
url=self.identities_url,
method="POST",
body=request_body,
)
)
return Flags.from_api_flags(
Expand All @@ -364,9 +374,7 @@ def _get_json_response(
self,
url: str,
method: str,
body: typing.Optional[
typing.Union[Identity, typing.Dict[str, JsonType]]
] = None,
body: typing.Optional[JsonType] = None,
) -> typing.Any:
Comment on lines +377 to 378
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't the return type be JsonType?

Copy link
Member Author

@khvn26 khvn26 Jul 18, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The return type here corresponds to response.json() type, which is typing.Any.
Casting to a specific type is responsibility of the caller, see e.g.

json_response: typing.Dict[str, typing.List[typing.Dict[str, JsonType]]] = (
self._get_json_response(

try:
request_method = getattr(self.session, method.lower())
Expand All @@ -387,15 +395,18 @@ def _get_json_response(
def _get_identity_model(
self,
identifier: str,
**traits: TraitValue,
**traits: typing.Union[TraitValue, TraitConfig],
) -> IdentityModel:
if not self._environment:
raise FlagsmithClientError(
"Unable to build identity model when no local environment present."
)

trait_models = [
TraitModel(trait_key=key, trait_value=value)
TraitModel(
trait_key=key,
trait_value=value["value"] if isinstance(value, dict) else value,
)
for key, value in traits.items()
]

Expand Down
2 changes: 1 addition & 1 deletion flagsmith/streaming_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def __init__(
stream_url: str,
on_event: Callable[[StreamEvent], None],
request_timeout_seconds: Optional[int] = None,
**kwargs: typing.Any
**kwargs: typing.Any,
) -> None:
super().__init__(*args, **kwargs)
self._stop_event = threading.Event()
Expand Down
25 changes: 25 additions & 0 deletions flagsmith/types.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import typing

from flag_engine.identities.traits.types import TraitValue
from typing_extensions import TypeAlias

_JsonScalarType: TypeAlias = typing.Union[
int,
str,
float,
bool,
None,
]
JsonType: TypeAlias = typing.Union[
_JsonScalarType,
typing.Dict[str, "JsonType"],
typing.List["JsonType"],
]


class TraitConfig(typing.TypedDict):
value: TraitValue
transient: bool


TraitMapping: TypeAlias = typing.Mapping[str, typing.Union[TraitValue, TraitConfig]]
39 changes: 22 additions & 17 deletions flagsmith/utils/identities.py
Original file line number Diff line number Diff line change
@@ -1,21 +1,26 @@
import typing

from flag_engine.identities.traits.types import TraitValue
from flagsmith.types import JsonType, TraitMapping

Identity = typing.TypedDict(
"Identity",
{"identifier": str, "traits": typing.List[typing.Mapping[str, TraitValue]]},
)


def generate_identities_data(
identifier: str, traits: typing.Optional[typing.Mapping[str, TraitValue]] = None
) -> Identity:
return {
"identifier": identifier,
"traits": (
[{"trait_key": k, "trait_value": v} for k, v in traits.items()]
if traits
else []
),
}
def generate_identity_data(
identifier: str,
traits: TraitMapping,
*,
transient: bool,
) -> JsonType:
identity_data: typing.Dict[str, JsonType] = {"identifier": identifier}
traits_data: typing.List[JsonType] = []
for trait_key, trait_value in traits.items():
trait_data: typing.Dict[str, JsonType] = {"trait_key": trait_key}
if isinstance(trait_value, dict):
trait_data["trait_value"] = trait_value["value"]
if trait_value.get("transient"):
trait_data["transient"] = True
else:
trait_data["trait_value"] = trait_value
traits_data.append(trait_data)
identity_data["traits"] = traits_data
if transient:
identity_data["transient"] = True
return identity_data
Loading