-
Notifications
You must be signed in to change notification settings - Fork 36
feat: odp segment manager #402
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
Merged
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
dea481c
feat: add odp_segment_manager
Mat001 8065996
feat: add segment manager
Mat001 4766c11
Merge branch 'master' into mpirnovar/odp_segment_manager
Mat001 72057fb
fix pr comments
Mat001 39b0118
Merge branch 'mpirnovar/odp_segment_manager' of github.com:optimizely…
Mat001 1b15581
fix tests
Mat001 6180223
refacored tests
Mat001 92f8792
fix PR comments
Mat001 8cd49a0
refactor logs in tests for cache miss/ignore
Mat001 f312b77
cleanup
Mat001 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,90 @@ | ||
# Copyright 2022, Optimizely | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
from __future__ import annotations | ||
|
||
from typing import Optional | ||
|
||
from optimizely import logger as optimizely_logger | ||
from optimizely.helpers.enums import Errors | ||
from optimizely.odp.optimizely_odp_option import OptimizelyOdpOption | ||
from optimizely.odp.lru_cache import OptimizelySegmentsCache | ||
from optimizely.odp.odp_config import OdpConfig | ||
from optimizely.odp.zaius_graphql_api_manager import ZaiusGraphQLApiManager | ||
|
||
|
||
class OdpSegmentManager: | ||
"""Schedules connections to ODP for audience segmentation and caches the results.""" | ||
|
||
def __init__(self, odp_config: OdpConfig, segments_cache: OptimizelySegmentsCache, | ||
zaius_manager: ZaiusGraphQLApiManager, | ||
logger: Optional[optimizely_logger.Logger] = None) -> None: | ||
|
||
self.odp_config = odp_config | ||
self.segments_cache = segments_cache | ||
self.zaius_manager = zaius_manager | ||
self.logger = logger or optimizely_logger.NoOpLogger() | ||
|
||
def fetch_qualified_segments(self, user_key: str, user_value: str, options: list[str]) -> \ | ||
Optional[list[str]]: | ||
""" | ||
Args: | ||
user_key: The key for identifying the id type. | ||
user_value: The id itself. | ||
options: An array of OptimizelySegmentOptions used to ignore and/or reset the cache. | ||
|
||
Returns: | ||
Qualified segments for the user from the cache or the ODP server if not in the cache. | ||
""" | ||
odp_api_key = self.odp_config.get_api_key() | ||
odp_api_host = self.odp_config.get_api_host() | ||
odp_segments_to_check = self.odp_config.get_segments_to_check() | ||
|
||
if not (odp_api_key and odp_api_host): | ||
self.logger.error(Errors.FETCH_SEGMENTS_FAILED.format('api_key/api_host not defined')) | ||
return None | ||
|
||
if not odp_segments_to_check: | ||
self.logger.debug('No segments are used in the project. Returning empty list.') | ||
return [] | ||
|
||
cache_key = self.make_cache_key(user_key, user_value) | ||
|
||
ignore_cache = OptimizelyOdpOption.IGNORE_CACHE in options | ||
reset_cache = OptimizelyOdpOption.RESET_CACHE in options | ||
|
||
if reset_cache: | ||
self._reset() | ||
|
||
if not ignore_cache and not reset_cache: | ||
segments = self.segments_cache.lookup(cache_key) | ||
if segments: | ||
self.logger.debug('ODP cache hit. Returning segments from cache.') | ||
return segments | ||
self.logger.debug('ODP cache miss.') | ||
|
||
self.logger.debug('Making a call to ODP server.') | ||
|
||
segments = self.zaius_manager.fetch_segments(odp_api_key, odp_api_host, user_key, user_value, | ||
odp_segments_to_check) | ||
|
||
if segments and not ignore_cache: | ||
self.segments_cache.save(cache_key, segments) | ||
|
||
return segments | ||
|
||
def _reset(self) -> None: | ||
self.segments_cache.reset() | ||
|
||
def make_cache_key(self, user_key: str, user_value: str) -> str: | ||
return f'{user_key}-$-{user_value}' |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
# Copyright 2022, Optimizely | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
from sys import version_info | ||
|
||
if version_info < (3, 8): | ||
from typing_extensions import Final | ||
else: | ||
from typing import Final # type: ignore | ||
|
||
|
||
class OptimizelyOdpOption: | ||
"""Options for the OdpSegmentManager.""" | ||
IGNORE_CACHE: Final = 'IGNORE_CACHE' | ||
RESET_CACHE: Final = 'RESET_CACHE' |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,211 @@ | ||
# Copyright 2022, Optimizely | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http:#www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
from __future__ import annotations | ||
|
||
from unittest import mock | ||
from unittest.mock import call | ||
|
||
from requests import exceptions as request_exception | ||
|
||
from optimizely.odp.lru_cache import LRUCache | ||
from optimizely.odp.odp_config import OdpConfig | ||
from optimizely.odp.optimizely_odp_option import OptimizelyOdpOption | ||
from optimizely.odp.odp_segment_manager import OdpSegmentManager | ||
from optimizely.odp.zaius_graphql_api_manager import ZaiusGraphQLApiManager | ||
from tests import base | ||
|
||
|
||
class OdpSegmentManagerTest(base.BaseTest): | ||
api_host = 'host' | ||
api_key = 'valid' | ||
user_key = 'fs_user_id' | ||
user_value = 'test-user-value' | ||
|
||
def test_empty_list_with_no_segments_to_check(self): | ||
odp_config = OdpConfig(self.api_key, self.api_host, []) | ||
mock_logger = mock.MagicMock() | ||
segments_cache = LRUCache(1000, 1000) | ||
api = ZaiusGraphQLApiManager() | ||
segment_manager = OdpSegmentManager(odp_config, segments_cache, api, mock_logger) | ||
|
||
with mock.patch.object(api, 'fetch_segments') as mock_fetch_segments: | ||
segments = segment_manager.fetch_qualified_segments(self.user_key, self.user_value, []) | ||
|
||
self.assertEqual(segments, []) | ||
mock_logger.debug.assert_called_once_with('No segments are used in the project. Returning empty list.') | ||
mock_logger.error.assert_not_called() | ||
mock_fetch_segments.assert_not_called() | ||
|
||
def test_fetch_segments_success_cache_miss(self): | ||
""" | ||
we are fetching user key/value 'fs_user_id'/'test-user-value' | ||
which is different from what we have passed to cache (fs_user_id-$-123/['d']) | ||
---> hence we trigger a cache miss | ||
""" | ||
odp_config = OdpConfig(self.api_key, self.api_host, ["a", "b", "c"]) | ||
mock_logger = mock.MagicMock() | ||
segments_cache = LRUCache(1000, 1000) | ||
api = ZaiusGraphQLApiManager() | ||
|
||
segment_manager = OdpSegmentManager(odp_config, segments_cache, api, mock_logger) | ||
cache_key = segment_manager.make_cache_key(self.user_key, '123') | ||
segment_manager.segments_cache.save(cache_key, ["d"]) | ||
|
||
with mock.patch('requests.post') as mock_request_post: | ||
mock_request_post.return_value = self.fake_server_response(status_code=200, | ||
content=self.good_response_data) | ||
|
||
segments = segment_manager.fetch_qualified_segments(self.user_key, self.user_value, []) | ||
|
||
self.assertEqual(segments, ["a", "b"]) | ||
actual_cache_key = segment_manager.make_cache_key(self.user_key, self.user_value) | ||
self.assertEqual(segment_manager.segments_cache.lookup(actual_cache_key), ["a", "b"]) | ||
|
||
self.assertEqual(mock_logger.debug.call_count, 2) | ||
mock_logger.debug.assert_has_calls([call('ODP cache miss.'), call('Making a call to ODP server.')]) | ||
mock_logger.error.assert_not_called() | ||
|
||
def test_fetch_segments_success_cache_hit(self): | ||
odp_config = OdpConfig() | ||
odp_config.update(self.api_key, self.api_host, ['c']) | ||
mock_logger = mock.MagicMock() | ||
api = ZaiusGraphQLApiManager() | ||
segments_cache = LRUCache(1000, 1000) | ||
|
||
segment_manager = OdpSegmentManager(odp_config, segments_cache, None, mock_logger) | ||
cache_key = segment_manager.make_cache_key(self.user_key, self.user_value) | ||
segment_manager.segments_cache.save(cache_key, ['c']) | ||
|
||
with mock.patch.object(api, 'fetch_segments') as mock_fetch_segments: | ||
segments = segment_manager.fetch_qualified_segments(self.user_key, self.user_value, []) | ||
|
||
self.assertEqual(segments, ['c']) | ||
mock_logger.debug.assert_called_once_with('ODP cache hit. Returning segments from cache.') | ||
mock_logger.error.assert_not_called() | ||
mock_fetch_segments.assert_not_called() | ||
|
||
Mat001 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
def test_fetch_segments_missing_api_host_api_key(self): | ||
with mock.patch('optimizely.logger') as mock_logger: | ||
segment_manager = OdpSegmentManager(OdpConfig(), LRUCache(1000, 1000), None, mock_logger) | ||
segments = segment_manager.fetch_qualified_segments(self.user_key, self.user_value, []) | ||
|
||
self.assertEqual(segments, None) | ||
mock_logger.error.assert_called_once_with('Audience segments fetch failed (api_key/api_host not defined).') | ||
|
||
def test_fetch_segments_network_error(self): | ||
""" | ||
Trigger connection error with mock side_effect. Note that Python's requests don't | ||
have a status code for connection error, that's why we need to trigger the exception | ||
instead of returning a fake server response with status code 500. | ||
The error log should come form the GraphQL API manager, not from ODP Segment Manager. | ||
The active mock logger should be placed as parameter in ZaiusGraphQLApiManager object. | ||
""" | ||
odp_config = OdpConfig(self.api_key, self.api_host, ["a", "b", "c"]) | ||
mock_logger = mock.MagicMock() | ||
segments_cache = LRUCache(1000, 1000) | ||
api = ZaiusGraphQLApiManager(mock_logger) | ||
segment_manager = OdpSegmentManager(odp_config, segments_cache, api, None) | ||
|
||
with mock.patch('requests.post', | ||
side_effect=request_exception.ConnectionError('Connection error')): | ||
segments = segment_manager.fetch_qualified_segments(self.user_key, self.user_value, []) | ||
|
||
self.assertEqual(segments, None) | ||
mock_logger.error.assert_called_once_with('Audience segments fetch failed (network error).') | ||
|
||
def test_options_ignore_cache(self): | ||
odp_config = OdpConfig(self.api_key, self.api_host, ["a", "b", "c"]) | ||
mock_logger = mock.MagicMock() | ||
segments_cache = LRUCache(1000, 1000) | ||
api = ZaiusGraphQLApiManager() | ||
|
||
segment_manager = OdpSegmentManager(odp_config, segments_cache, api, mock_logger) | ||
cache_key = segment_manager.make_cache_key(self.user_key, self.user_value) | ||
segment_manager.segments_cache.save(cache_key, ['d']) | ||
|
||
with mock.patch('requests.post') as mock_request_post: | ||
mock_request_post.return_value = self.fake_server_response(status_code=200, | ||
content=self.good_response_data) | ||
|
||
segments = segment_manager.fetch_qualified_segments(self.user_key, self.user_value, | ||
[OptimizelyOdpOption.IGNORE_CACHE]) | ||
|
||
self.assertEqual(segments, ["a", "b"]) | ||
self.assertEqual(segment_manager.segments_cache.lookup(cache_key), ['d']) | ||
mock_logger.debug.assert_called_once_with('Making a call to ODP server.') | ||
mock_logger.error.assert_not_called() | ||
|
||
def test_options_reset_cache(self): | ||
odp_config = OdpConfig(self.api_key, self.api_host, ["a", "b", "c"]) | ||
mock_logger = mock.MagicMock() | ||
segments_cache = LRUCache(1000, 1000) | ||
api = ZaiusGraphQLApiManager() | ||
|
||
segment_manager = OdpSegmentManager(odp_config, segments_cache, api, mock_logger) | ||
cache_key = segment_manager.make_cache_key(self.user_key, self.user_value) | ||
segment_manager.segments_cache.save(cache_key, ['d']) | ||
segment_manager.segments_cache.save('123', ['c', 'd']) | ||
|
||
with mock.patch('requests.post') as mock_request_post: | ||
mock_request_post.return_value = self.fake_server_response(status_code=200, | ||
content=self.good_response_data) | ||
|
||
segments = segment_manager.fetch_qualified_segments(self.user_key, self.user_value, | ||
[OptimizelyOdpOption.RESET_CACHE]) | ||
|
||
self.assertEqual(segments, ["a", "b"]) | ||
self.assertEqual(segment_manager.segments_cache.lookup(cache_key), ['a', 'b']) | ||
self.assertTrue(len(segment_manager.segments_cache.map) == 1) | ||
mock_logger.debug.assert_called_once_with('Making a call to ODP server.') | ||
mock_logger.error.assert_not_called() | ||
|
||
def test_make_correct_cache_key(self): | ||
segment_manager = OdpSegmentManager(None, None, None, None) | ||
cache_key = segment_manager.make_cache_key(self.user_key, self.user_value) | ||
self.assertEqual(cache_key, 'fs_user_id-$-test-user-value') | ||
|
||
# test json response | ||
good_response_data = """ | ||
{ | ||
"data": { | ||
"customer": { | ||
"audiences": { | ||
"edges": [ | ||
{ | ||
"node": { | ||
"name": "a", | ||
"state": "qualified", | ||
"description": "qualifed sample 1" | ||
} | ||
}, | ||
{ | ||
"node": { | ||
"name": "b", | ||
"state": "qualified", | ||
"description": "qualifed sample 2" | ||
} | ||
}, | ||
{ | ||
"node": { | ||
"name": "c", | ||
"state": "not_qualified", | ||
"description": "not-qualified sample" | ||
} | ||
} | ||
] | ||
} | ||
} | ||
} | ||
} | ||
""" |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.