Skip to content

feat: add odp manager #405

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.

Sign up for GitHub

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 20 commits into from
Sep 21, 2022
Merged

feat: add odp manager #405

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
f97f940
bump up py version in gitactions to 3.10
Mat001 Aug 26, 2022
a26e459
merge conflict resolve
Mat001 Aug 29, 2022
d2ed75e
Merge branch 'master' of github.com:optimizely/python-sdk
Mat001 Sep 2, 2022
77dfec4
feat: add first draft of odp_manager
Mat001 Sep 2, 2022
05b0d70
add tests
Mat001 Sep 13, 2022
e1a2de2
use unittest style of asserting exception
Mat001 Sep 13, 2022
2bb6c32
remove import
Mat001 Sep 13, 2022
32167fe
make tests more concise
Mat001 Sep 14, 2022
19492f9
fixed some pr comments
Mat001 Sep 15, 2022
baff0c4
de-indent event manager init
Mat001 Sep 15, 2022
0789c7c
add update config event manager signal
andrewleap-optimizely Sep 15, 2022
4b5989b
Merge branch 'mpirnovar/odp_manager' of github.com:optimizely/python-…
Mat001 Sep 15, 2022
4b0b338
updated tests
Mat001 Sep 16, 2022
ec96869
commit odp_manager updates and cleanup
Mat001 Sep 16, 2022
e53eaa3
addres PR comments
Mat001 Sep 20, 2022
7c7535b
refactored tests for fetch segments
Mat001 Sep 20, 2022
0a2be6d
update cache default timeout
Mat001 Sep 20, 2022
de18508
fix pypy failed test
andrewleap-optimizely Sep 21, 2022
6b7385f
hardcode cache settings
andrewleap-optimizely Sep 21, 2022
18fbf64
assert error log not called
andrewleap-optimizely Sep 21, 2022
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
Prev Previous commit
Next Next commit
make tests more concise
  • Loading branch information
@Mat001
Mat001 committed Sep 14, 2022
commit 32167fef4eb88fca69043eb54fe35d3fc866577c
106 changes: 24 additions & 82 deletions tests/test_odp_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,22 +34,19 @@ class OdpManagerTest(base.BaseTest):
def test_configurations_disable_odp(self):
mock_logger = mock.MagicMock()

manager = OdpManager(disable=True,
cache_size=10,
cache_timeout_in_sec=20,
logger=mock_logger)
manager = OdpManager(True, 10, 20, None, None, mock_logger)
manager.fetch_qualified_segments('user1', [])
mock_logger.debug.assert_called_once_with(Errors.ODP_NOT_ENABLED)

manager.update_odp_config(api_key='valid', api_host='host', segments_to_check=[])
manager.update_odp_config('valid', 'host', [])
self.assertIsNone(manager.odp_config.get_api_key())
self.assertIsNone(manager.odp_config.get_api_host())

# these call should be dropped gracefully with None
manager.identify_user('user1')

self.assertRaisesRegex(optimizely_exception.OdpNotEnabled, Errors.ODP_NOT_ENABLED,
manager.send_event, type='t1', action='a1', identifiers={}, data={})
manager.send_event, 't1', 'a1', {}, {})

self.assertIsNone(manager.event_manager)
self.assertIsNone(manager.segment_manager)
Expand All @@ -59,11 +56,7 @@ def test_fetch_qualified_segments(self):
segment_manager = OdpSegmentManager(OdpConfig(), LRUCache(1000, 1000),
ZaiusGraphQLApiManager(), mock_logger)

manager = OdpManager(disable=False,
cache_size=10,
cache_timeout_in_sec=20,
segment_manager=segment_manager,
logger=mock_logger)
manager = OdpManager(False, 10, 20, segment_manager, None, mock_logger)

with mock.patch.object(segment_manager, 'fetch_qualified_segments') as mock_fetch_qualif_segments:
manager.fetch_qualified_segments('user1', [])
Expand All @@ -76,11 +69,7 @@ def test_identify_user_datafile_not_ready(self):
event_manager = OdpEventManager(OdpConfig(), mock_logger)
event_manager.start()

manager = OdpManager(disable=False,
cache_size=10,
cache_timeout_in_sec=20,
event_manager=event_manager,
logger=mock_logger)
manager = OdpManager(False, 10, 20, None, event_manager, mock_logger)

with mock.patch.object(event_manager, 'identify_user') as mock_identify_user:
manager.identify_user('user1')
Expand All @@ -92,13 +81,8 @@ def test_identify_user_odp_integrated(self):
event_manager = OdpEventManager(OdpConfig(), mock_logger, ZaiusRestApiManager())
event_manager.start()

manager = OdpManager(disable=False,
cache_size=10,
cache_timeout_in_sec=20,
event_manager=event_manager,
logger=mock_logger)

manager.update_odp_config(api_key='key1', api_host='host1', segments_to_check=[])
manager = OdpManager(False, 10, 20, None, event_manager, mock_logger)
manager.update_odp_config('key1', 'host1', [])

with mock.patch.object(event_manager, 'dispatch') as mock_dispatch_event:
manager.identify_user('user1')
Expand All @@ -117,13 +101,8 @@ def test_identify_user_odp_not_integrated(self):
event_manager = OdpEventManager(OdpConfig(), mock_logger, ZaiusRestApiManager())
event_manager.start()

manager = OdpManager(disable=False,
cache_size=10,
cache_timeout_in_sec=20,
event_manager=event_manager,
logger=mock_logger)

manager.update_odp_config(api_key=None, api_host=None, segments_to_check=[])
manager = OdpManager(False, 10, 20, None, event_manager, mock_logger)
manager.update_odp_config(None, None, [])

with mock.patch.object(event_manager, 'dispatch') as mock_dispatch_event:
manager.identify_user('user1')
Expand All @@ -136,12 +115,7 @@ def test_identify_user_odp_disabled(self):
event_manager = OdpEventManager(OdpConfig(), mock_logger, ZaiusRestApiManager())
event_manager.start()

manager = OdpManager(disable=False,
cache_size=10,
cache_timeout_in_sec=20,
event_manager=event_manager,
logger=mock_logger)

manager = OdpManager(False, 10, 20, None, event_manager, mock_logger)
manager.enabled = False

with mock.patch.object(event_manager, 'identify_user') as mock_identify_user:
Expand All @@ -155,11 +129,7 @@ def test_send_event_datafile_not_ready(self):
event_manager = OdpEventManager(OdpConfig(), mock_logger, ZaiusRestApiManager())
event_manager.start()

manager = OdpManager(disable=False,
cache_size=10,
cache_timeout_in_sec=20,
event_manager=event_manager,
logger=mock_logger)
manager = OdpManager(False, 10, 20, None, event_manager, mock_logger)

with mock.patch.object(event_manager, 'dispatch') as mock_dispatch_event:
manager.send_event('t1', 'a1', {'id-key1': 'id-val-1'}, {'key1': 'val1'})
Expand All @@ -172,13 +142,8 @@ def test_send_event_odp_integrated(self):
event_manager = OdpEventManager(OdpConfig(), mock_logger, ZaiusRestApiManager())
event_manager.start()

manager = OdpManager(disable=False,
cache_size=10,
cache_timeout_in_sec=20,
event_manager=event_manager,
logger=mock_logger)

manager.update_odp_config(api_key='key1', api_host='host1', segments_to_check=[])
manager = OdpManager(False, 10, 20, None, event_manager, mock_logger)
manager.update_odp_config('key1', 'host1', [])

with mock.patch.object(event_manager, 'dispatch') as mock_dispatch_event:
manager.send_event('t1', 'a1', {'id-key1': 'id-val-1'}, {'key1': 'val1'})
Expand All @@ -199,13 +164,9 @@ def test_send_event_odp_not_integrated(self):
event_manager = OdpEventManager(OdpConfig(), mock_logger, ZaiusRestApiManager())
event_manager.start()

manager = OdpManager(disable=False,
cache_size=10,
cache_timeout_in_sec=20,
event_manager=event_manager,
logger=mock_logger)
manager = OdpManager(False, 10, 20, None, event_manager, mock_logger)

manager.update_odp_config(api_key=None, api_host=None, segments_to_check=[])
manager.update_odp_config(None, None, [])

with mock.patch.object(event_manager, 'dispatch') as mock_dispatch_event:
manager.send_event('t1', 'a1', {'id-key1': 'id-val-1'}, {'key1': 'val1'})
Expand All @@ -218,12 +179,7 @@ def test_send_event_odp_disabled(self):
event_manager = OdpEventManager(OdpConfig(), mock_logger, ZaiusRestApiManager())
event_manager.start()

manager = OdpManager(disable=False,
cache_size=10,
cache_timeout_in_sec=20,
event_manager=event_manager,
logger=mock_logger)

manager = OdpManager(False, 10, 20, None, event_manager, mock_logger)
manager.enabled = False

with mock.patch.object(event_manager, 'dispatch') as mock_dispatch_event:
Expand All @@ -242,12 +198,7 @@ def test_update_odp_config__reset_called(self):
event_manager = OdpEventManager(OdpConfig(), mock_logger, ZaiusRestApiManager())
event_manager.start()

manager = OdpManager(disable=False,
cache_size=10,
cache_timeout_in_sec=20,
event_manager=event_manager,
segment_manager=segment_manager,
logger=mock_logger)
manager = OdpManager(False, 10, 20, segment_manager, event_manager, mock_logger)

with mock.patch.object(segment_manager, 'reset') as mock_reset:
manager.update_odp_config('key1', 'host1', [])
Expand Down Expand Up @@ -288,15 +239,11 @@ def test_update_odp_config__flush_called(self):
event_manager = OdpEventManager(OdpConfig(), mock_logger, ZaiusRestApiManager())
event_manager.start()

manager = OdpManager(disable=False,
cache_size=10,
cache_timeout_in_sec=20,
event_manager=event_manager,
logger=mock_logger)
manager = OdpManager(False, 10, 20, None, event_manager, mock_logger)

with mock.patch.object(event_manager, 'flush') as mock_flush:
first_api_key = manager.odp_config.get_api_key()
manager.update_odp_config(api_key='key1', api_host='host1', segments_to_check=[])
manager.update_odp_config('key1', 'host1', [])
second_api_key = manager.odp_config.get_api_key()

self.assertEqual(mock_flush.call_count, 2)
Expand All @@ -305,7 +252,7 @@ def test_update_odp_config__flush_called(self):

with mock.patch.object(event_manager, 'flush') as mock_flush:
first_api_key = manager.odp_config.get_api_key()
manager.update_odp_config(api_key='key2', api_host='host1', segments_to_check=[])
manager.update_odp_config('key2', 'host1', [])
second_api_key = manager.odp_config.get_api_key()

self.assertEqual(mock_flush.call_count, 2)
Expand All @@ -314,7 +261,7 @@ def test_update_odp_config__flush_called(self):

with mock.patch.object(event_manager, 'flush') as mock_flush:
first_api_key = manager.odp_config.get_api_key()
manager.update_odp_config(api_key='key2', api_host='host1', segments_to_check=[])
manager.update_odp_config('key2', 'host1', [])
second_api_key = manager.odp_config.get_api_key()

self.assertEqual(mock_flush.call_count, 1)
Expand All @@ -323,7 +270,7 @@ def test_update_odp_config__flush_called(self):

with mock.patch.object(event_manager, 'flush') as mock_flush:
first_api_key = manager.odp_config.get_api_key()
manager.update_odp_config(api_key=None, api_host=None, segments_to_check=[])
manager.update_odp_config(None, None, [])
second_api_key = manager.odp_config.get_api_key()

self.assertEqual(mock_flush.call_count, 2)
Expand All @@ -335,13 +282,8 @@ def test_update_odp_config__odp_config_propagated_properly(self):
event_manager = OdpEventManager(OdpConfig(), mock_logger, ZaiusRestApiManager())
event_manager.start()

manager = OdpManager(disable=False,
cache_size=10,
cache_timeout_in_sec=20,
event_manager=event_manager,
logger=mock_logger)

manager.update_odp_config(api_key='key1', api_host='host1', segments_to_check=[])
manager = OdpManager(False, 10, 20, None, event_manager, mock_logger)
manager.update_odp_config('key1', 'host1', [])

self.assertEqual(manager.segment_manager.odp_config.get_api_key(), 'key1')
self.assertEqual(manager.segment_manager.odp_config.get_api_host(), 'host1')
Expand Down