Remove unnecessary region implementation

Author: esrakartalOpt

optimizely/event/event_factory.py

@@ -86,7 +86,6 @@ def create_log_event(
             return None
 
         user_context = first_event.event_context
-        region_value = user_context.region.value if hasattr(user_context.region, 'value') else user_context.region
         event_batch = payload.EventBatch(
             user_context.account_id,
             user_context.project_id,
@@ -95,15 +94,22 @@ def create_log_event(
             user_context.client_version,
             user_context.anonymize_ip,
             True,
-            region_value,
         )
 
         event_batch.visitors = visitors
 
         event_params = event_batch.get_event_params()
 
-        region_str = user_context.region.value if hasattr(user_context.region, 'value') else str(user_context.region)
-        endpoint = cls.EVENT_ENDPOINTS.get(region_str, cls.EVENT_ENDPOINTS['US'])
+        region = user_context.region
+        if hasattr(region, 'value'):
+            region_str = region.value
+        elif region is None:
+            region_str = 'US'  # Default to US
+        else:
+            region_str = str(region)
+        
+        region_key = region_str.upper()
+        endpoint = cls.EVENT_ENDPOINTS.get(region_key, cls.EVENT_ENDPOINTS['US'])
 
         return log_event.LogEvent(endpoint, event_params, cls.HTTP_VERB, cls.HTTP_HEADERS)
 

optimizely/event/payload.py

@@ -33,8 +33,7 @@ def __init__(
         client_version: str,
         anonymize_ip: bool,
         enrich_decisions: bool = True,
-        visitors: Optional[list[Visitor]] = None,
-        region: str = 'US'
+        visitors: Optional[list[Visitor]] = None
     ):
         self.account_id = account_id
         self.project_id = project_id
@@ -44,7 +43,6 @@ def __init__(
         self.anonymize_ip = anonymize_ip
         self.enrich_decisions = enrich_decisions
         self.visitors = visitors or []
-        self.region = region
 
     def __eq__(self, other: object) -> bool:
         batch_obj = self.get_event_params()

optimizely/event_builder.py

@@ -84,6 +84,7 @@ class EventParams:
         CUSTOM: Final = 'custom'
         ANONYMIZE_IP: Final = 'anonymize_ip'
         REVISION: Final = 'revision'
+        REGION: Final = 'region'
 
     def _get_attributes_data(
         self, project_config: ProjectConfig, attributes: UserAttributes
@@ -173,6 +174,7 @@ def _get_common_params(
         common_params[self.EventParams.SOURCE_SDK_VERSION] = version.__version__
         common_params[self.EventParams.ANONYMIZE_IP] = project_config.get_anonymize_ip_value()
         common_params[self.EventParams.REVISION] = project_config.get_revision()
+        common_params[self.EventParams.REGION] = project_config.region.value
 
         return common_params
 
@@ -249,8 +251,7 @@ def _get_required_params_for_conversion(
 
     def create_impression_event(
         self, project_config: ProjectConfig, experiment: Experiment,
-        variation_id: str, user_id: str, attributes: UserAttributes,
-        region: str = 'US'
+        variation_id: str, user_id: str, attributes: UserAttributes
     ) -> Event:
         """ Create impression Event to be sent to the logging endpoint.
 
@@ -270,17 +271,14 @@ def create_impression_event(
 
         params[self.EventParams.USERS][0][self.EventParams.SNAPSHOTS].append(impression_params)
 
-        params['region'] = project_config.region.value
-
-        region = project_config.region or 'US'
+        region =  params.get('region', 'US')
         events_url = self.EVENTS_URLS.get(str(region), self.EVENTS_URLS['US'])
 
         return Event(events_url, params, http_verb=self.HTTP_VERB, headers=self.HTTP_HEADERS)
 
     def create_conversion_event(
         self, project_config: ProjectConfig, event_key: str,
-        user_id: str, attributes: UserAttributes, event_tags: event_tag_utils.EventTags,
-        region: str = 'US'
+        user_id: str, attributes: UserAttributes, event_tags: event_tag_utils.EventTags
     ) -> Event:
         """ Create conversion Event to be sent to the logging endpoint.
 
@@ -300,9 +298,7 @@ def create_conversion_event(
 
         params[self.EventParams.USERS][0][self.EventParams.SNAPSHOTS].append(conversion_params)
 
-        params['region'] = project_config.region.value
-
-        region = project_config.region or 'US'
+        region = params.get('region', 'US')
         events_url = self.EVENTS_URLS.get(str(region), self.EVENTS_URLS['US'])
 
         return Event(events_url, params, http_verb=self.HTTP_VERB, headers=self.HTTP_HEADERS)

tests/base.py

@@ -57,7 +57,6 @@ def fake_server_response(self, status_code: Optional[int] = None,
 
     def setUp(self, config_dict='config_dict'):
         self.config_dict = {
-            'region': 'US',
             'revision': '42',
             'sdkKey': 'basic-test',
             'version': '2',
@@ -151,7 +150,6 @@ def setUp(self, config_dict='config_dict'):
 
         # datafile version 4
         self.config_dict_with_features = {
-            'region': 'US',
             'revision': '1',
             'sdkKey': 'features-test',
             'accountId': '12001',
@@ -555,7 +553,6 @@ def setUp(self, config_dict='config_dict'):
         }
 
         self.config_dict_with_multiple_experiments = {
-            'region': 'US',
             'revision': '42',
             'sdkKey': 'multiple-experiments',
             'version': '2',
@@ -689,7 +686,6 @@ def setUp(self, config_dict='config_dict'):
             'accountId': '10367498574',
             'events': [{'experimentIds': ['10420810910'], 'id': '10404198134', 'key': 'winning'}],
             'revision': '1337',
-            'region': 'US',
         }
 
         self.config_dict_with_typed_audiences = {
@@ -1082,7 +1078,6 @@ def setUp(self, config_dict='config_dict'):
             ],
             'revision': '3',
             'sdkKey': 'typed-audiences',
-            'region': 'US',
         }
 
         self.config_dict_with_audience_segments = {
@@ -1280,7 +1275,6 @@ def setUp(self, config_dict='config_dict'):
             ],
             'revision': '101',
             'sdkKey': 'segments-test',
-            'region': 'US',
         }
 
         config = getattr(self, config_dict)

tests/test_event_builder.py

@@ -37,6 +37,7 @@ class EventBuilderTest(base.BaseTest):
     def setUp(self, *args, **kwargs):
         base.BaseTest.setUp(self, 'config_dict_with_multiple_experiments')
         self.event_builder = self.optimizely.event_builder
+        self.maxDiff = None
 
     def _validate_event_object(self, event_obj, expected_url, expected_params, expected_verb, expected_headers):
         """ Helper method to validate properties of the event object. """
@@ -86,7 +87,6 @@ def test_create_impression_event(self):
             'enrich_decisions': True,
             'anonymize_ip': False,
             'revision': '42',
-            'region': 'US',
         }
 
         with mock.patch('time.time', return_value=42.123), mock.patch(
@@ -142,7 +142,6 @@ def test_create_impression_event__with_attributes(self):
             'enrich_decisions': True,
             'anonymize_ip': False,
             'revision': '42',
-            'region': 'US',
         }
 
         with mock.patch('time.time', return_value=42.123), mock.patch(
@@ -196,7 +195,6 @@ def test_create_impression_event_when_attribute_is_not_in_datafile(self):
             'enrich_decisions': True,
             'anonymize_ip': False,
             'revision': '42',
-            'region': 'US',
         }
 
         with mock.patch('time.time', return_value=42.123), mock.patch(
@@ -207,8 +205,7 @@ def test_create_impression_event_when_attribute_is_not_in_datafile(self):
                 self.project_config.get_experiment_from_key('test_experiment'),
                 '111129',
                 'test_user',
-                {'do_you_know_me': 'test_value'},
-                'US'
+                {'do_you_know_me': 'test_value'}
             )
         self._validate_event_object(
             event_obj,
@@ -254,7 +251,6 @@ def test_create_impression_event_calls_is_attribute_valid(self):
             'enrich_decisions': True,
             'anonymize_ip': False,
             'revision': '42',
-            'region': 'US',
         }
 
         def side_effect(*args, **kwargs):
@@ -280,8 +276,7 @@ def side_effect(*args, **kwargs):
                 self.project_config.get_experiment_from_key('test_experiment'),
                 '111129',
                 'test_user',
-                attributes,
-                'US',
+                attributes
             )
 
         self._validate_event_object(
@@ -334,7 +329,6 @@ def test_create_impression_event__with_user_agent_when_bot_filtering_is_enabled(
             'enrich_decisions': True,
             'anonymize_ip': False,
             'revision': '42',
-            'region': 'US',
         }
 
         with mock.patch('time.time', return_value=42.123), mock.patch(
@@ -347,8 +341,7 @@ def test_create_impression_event__with_user_agent_when_bot_filtering_is_enabled(
                 self.project_config.get_experiment_from_key('test_experiment'),
                 '111129',
                 'test_user',
-                {'$opt_user_agent': 'Edge'},
-                'US'
+                {'$opt_user_agent': 'Edge'}
             )
 
         self._validate_event_object(
@@ -400,7 +393,6 @@ def test_create_impression_event__with_empty_attributes_when_bot_filtering_is_en
             'enrich_decisions': True,
             'anonymize_ip': False,
             'revision': '42',
-            'region': 'US',
         }
 
         with mock.patch('time.time', return_value=42.123), mock.patch(
@@ -413,8 +405,7 @@ def test_create_impression_event__with_empty_attributes_when_bot_filtering_is_en
                 self.project_config.get_experiment_from_key('test_experiment'),
                 '111129',
                 'test_user',
-                None,
-                'US'
+                None
             )
 
         self._validate_event_object(
@@ -472,7 +463,6 @@ def test_create_impression_event__with_user_agent_when_bot_filtering_is_disabled
             'enrich_decisions': True,
             'anonymize_ip': False,
             'revision': '42',
-            'region': 'US',
         }
 
         with mock.patch('time.time', return_value=42.123), mock.patch(
@@ -485,8 +475,7 @@ def test_create_impression_event__with_user_agent_when_bot_filtering_is_disabled
                 self.project_config.get_experiment_from_key('test_experiment'),
                 '111129',
                 'test_user',
-                {'$opt_user_agent': 'Chrome'},
-                'US'
+                {'$opt_user_agent': 'Chrome'}
             )
 
         self._validate_event_object(
@@ -527,14 +516,13 @@ def test_create_conversion_event(self):
             'enrich_decisions': True,
             'anonymize_ip': False,
             'revision': '42',
-            'region': 'US',
         }
 
         with mock.patch('time.time', return_value=42.123), mock.patch(
             'uuid.uuid4', return_value='a68cf1ad-0393-4e18-af87-efe8f01a7c9c'
         ):
             event_obj = self.event_builder.create_conversion_event(
-                self.project_config, 'test_event', 'test_user', None, None, 'US'
+                self.project_config, 'test_event', 'test_user', None, None
             )
         self._validate_event_object(
             event_obj,
@@ -576,14 +564,13 @@ def test_create_conversion_event__with_attributes(self):
             'enrich_decisions': True,
             'anonymize_ip': False,
             'revision': '42',
-            'region': 'US',
         }
 
         with mock.patch('time.time', return_value=42.123), mock.patch(
             'uuid.uuid4', return_value='a68cf1ad-0393-4e18-af87-efe8f01a7c9c'
         ):
             event_obj = self.event_builder.create_conversion_event(
-                self.project_config, 'test_event', 'test_user', {'test_attribute': 'test_value'}, None, 'US'
+                self.project_config, 'test_event', 'test_user', {'test_attribute': 'test_value'}, None
             )
         self._validate_event_object(
             event_obj,
@@ -632,7 +619,6 @@ def test_create_conversion_event__with_user_agent_when_bot_filtering_is_enabled(
             'enrich_decisions': True,
             'anonymize_ip': False,
             'revision': '42',
-            'region': 'US',
         }
 
         with mock.patch('time.time', return_value=42.123), mock.patch(
@@ -641,7 +627,7 @@ def test_create_conversion_event__with_user_agent_when_bot_filtering_is_enabled(
             'optimizely.project_config.ProjectConfig.get_bot_filtering_value', return_value=True,
         ):
             event_obj = self.event_builder.create_conversion_event(
-                self.project_config, 'test_event', 'test_user', {'$opt_user_agent': 'Edge'}, None, 'US'
+                self.project_config, 'test_event', 'test_user', {'$opt_user_agent': 'Edge'}, None
             )
 
         self._validate_event_object(
@@ -696,7 +682,6 @@ def test_create_conversion_event__with_user_agent_when_bot_filtering_is_disabled
             'enrich_decisions': True,
             'anonymize_ip': False,
             'revision': '42',
-            'region': 'US',
         }
 
         with mock.patch('time.time', return_value=42.123), mock.patch(
@@ -705,7 +690,7 @@ def test_create_conversion_event__with_user_agent_when_bot_filtering_is_disabled
             'optimizely.project_config.ProjectConfig.get_bot_filtering_value', return_value=False,
         ):
             event_obj = self.event_builder.create_conversion_event(
-                self.project_config, 'test_event', 'test_user', {'$opt_user_agent': 'Chrome'}, None, 'US'
+                self.project_config, 'test_event', 'test_user', {'$opt_user_agent': 'Chrome'}, None
             )
 
         self._validate_event_object(
@@ -751,7 +736,6 @@ def test_create_conversion_event__with_event_tags(self):
             'enrich_decisions': True,
             'anonymize_ip': False,
             'revision': '42',
-            'region': 'US',
         }
 
         with mock.patch('time.time', return_value=42.123), mock.patch(
@@ -762,8 +746,7 @@ def test_create_conversion_event__with_event_tags(self):
                 'test_event',
                 'test_user',
                 {'test_attribute': 'test_value'},
-                {'revenue': 4200, 'value': 1.234, 'non-revenue': 'abc'},
-                'US'
+                {'revenue': 4200, 'value': 1.234, 'non-revenue': 'abc'}
             )
         self._validate_event_object(
             event_obj,
@@ -806,7 +789,6 @@ def test_create_conversion_event__with_invalid_event_tags(self):
             'enrich_decisions': True,
             'anonymize_ip': False,
             'revision': '42',
-            'region': 'US',
         }
 
         with mock.patch('time.time', return_value=42.123), mock.patch(
@@ -817,8 +799,7 @@ def test_create_conversion_event__with_invalid_event_tags(self):
                 'test_event',
                 'test_user',
                 {'test_attribute': 'test_value'},
-                {'revenue': '4200', 'value': True, 'non-revenue': 'abc'},
-                'US'
+                {'revenue': '4200', 'value': True, 'non-revenue': 'abc'}
             )
         self._validate_event_object(
             event_obj,
@@ -863,7 +844,6 @@ def test_create_conversion_event__when_event_is_used_in_multiple_experiments(sel
             'enrich_decisions': True,
             'anonymize_ip': False,
             'revision': '42',
-            'region': 'US',
         }
 
         with mock.patch('time.time', return_value=42.123), mock.patch(
@@ -874,8 +854,7 @@ def test_create_conversion_event__when_event_is_used_in_multiple_experiments(sel
                 'test_event',
                 'test_user',
                 {'test_attribute': 'test_value'},
-                {'revenue': 4200, 'value': 1.234, 'non-revenue': 'abc'},
-                'US'
+                {'revenue': 4200, 'value': 1.234, 'non-revenue': 'abc'}
             )
         self._validate_event_object(
             event_obj,