Implement comments

Author: esrakartalOpt

optimizely/event/event_factory.py

@@ -100,15 +100,8 @@ def create_log_event(
 
         event_params = event_batch.get_event_params()
 
-        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()
+        region = user_context.region or 'US'  # Default to 'US' if None
+        region_key = str(region).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/user_event.py

@@ -17,7 +17,6 @@
 from sys import version_info
 
 from optimizely import version
-from optimizely.project_config import Region
 
 
 if version_info < (3, 8):
@@ -100,7 +99,7 @@ def __init__(
 class EventContext:
     """ Class respresenting User Event Context. """
 
-    def __init__(self, account_id: str, project_id: str, revision: str, anonymize_ip: bool, region: Region):
+    def __init__(self, account_id: str, project_id: str, revision: str, anonymize_ip: bool, region: str):
         self.account_id = account_id
         self.project_id = project_id
         self.revision = revision

optimizely/event_builder.py

@@ -269,8 +269,9 @@ def create_impression_event(
 
         params[self.EventParams.USERS][0][self.EventParams.SNAPSHOTS].append(impression_params)
 
-        region = project_config.region.value if hasattr(project_config.region, 'value') else 'US'
-        events_url = self.EVENTS_URLS.get(str(region), self.EVENTS_URLS['US'])
+        region = project_config.region or 'US'
+        region_key = str(region).upper()
+        events_url = self.EVENTS_URLS.get(region_key, self.EVENTS_URLS['US'])
 
         return Event(events_url, params, http_verb=self.HTTP_VERB, headers=self.HTTP_HEADERS)
 
@@ -296,7 +297,8 @@ def create_conversion_event(
 
         params[self.EventParams.USERS][0][self.EventParams.SNAPSHOTS].append(conversion_params)
 
-        region = project_config.region.value if hasattr(project_config.region, 'value') else 'US'
-        events_url = self.EVENTS_URLS.get(str(region), self.EVENTS_URLS['US'])
+        region = project_config.region or 'US'
+        region_key = str(region).upper()
+        events_url = self.EVENTS_URLS.get(region_key, self.EVENTS_URLS['US'])
 
         return Event(events_url, params, http_verb=self.HTTP_VERB, headers=self.HTTP_HEADERS)

optimizely/project_config.py

@@ -14,7 +14,6 @@
 import json
 from typing import TYPE_CHECKING, Optional, Type, TypeVar, cast, Any, Iterable, List
 from sys import version_info
-from enum import Enum
 
 from . import entities
 from . import exceptions
@@ -42,12 +41,6 @@
 
 EntityClass = TypeVar('EntityClass')
 
-
-class Region(str, Enum):
-    US = 'US'
-    EU = 'EU'
-
-
 class ProjectConfig:
     """ Representation of the Optimizely project config. """
 
@@ -92,11 +85,7 @@ def __init__(self, datafile: str | bytes, logger: Logger, error_handler: Any):
         self.all_segments: list[str] = []
 
         region_value = config.get('region')
-        self.region: Region
-        if region_value == Region.EU.value:
-            self.region = Region.EU
-        else:
-            self.region = Region.US
+        self.region: str = region_value or 'US'
 
         # Utility maps for quick lookup
         self.group_id_map: dict[str, entities.Group] = self._generate_key_map(self.groups, 'id', entities.Group)

tests/test_config.py

@@ -21,7 +21,7 @@
 from optimizely import logger
 from optimizely import optimizely
 from optimizely.helpers import enums
-from optimizely.project_config import ProjectConfig, Region
+from optimizely.project_config import ProjectConfig
 from . import base
 
 
@@ -159,22 +159,22 @@ def test_region_when_no_region(self):
         config_dict = copy.deepcopy(self.config_dict_with_multiple_experiments)
         opt_obj = optimizely.Optimizely(json.dumps(config_dict))
         project_config = opt_obj.config_manager.get_config()
-        self.assertEqual(project_config.region, Region.US)
+        self.assertEqual(project_config.region, 'US')
 
     def test_region_when_specified_in_datafile(self):
         """ Test that region is set to 'US' when specified in the config. """
         config_dict_us = copy.deepcopy(self.config_dict_with_multiple_experiments)
         config_dict_us['region'] = 'US'
         opt_obj_us = optimizely.Optimizely(json.dumps(config_dict_us))
         project_config_us = opt_obj_us.config_manager.get_config()
-        self.assertEqual(project_config_us.region, Region.US)
+        self.assertEqual(project_config_us.region, 'US')
 
         """ Test that region is set to 'EU' when specified in the config. """
         config_dict_eu = copy.deepcopy(self.config_dict_with_multiple_experiments)
         config_dict_eu['region'] = 'EU'
         opt_obj_eu = optimizely.Optimizely(json.dumps(config_dict_eu))
         project_config_eu = opt_obj_eu.config_manager.get_config()
-        self.assertEqual(project_config_eu.region, Region.EU)
+        self.assertEqual(project_config_eu.region, 'EU')
 
     def test_cmab_field_population(self):
         """ Test that the cmab field is populated correctly in experiments."""

tests/test_event_builder.py

@@ -17,7 +17,6 @@
 
 from optimizely import event_builder
 from optimizely import version
-from optimizely.project_config import Region
 from . import base
 
 
@@ -141,11 +140,14 @@ def test_create_impression_event_with_EU(self):
             'revision': '42',
         }
 
-        with mock.patch.object(self.project_config, 'region', new=Region.EU), mock.patch(
+        self.project_config.region = 'EU'
+
+        with mock.patch.object(self.project_config, 'region', new='EU'), mock.patch(
             'time.time', return_value=42.123
         ), mock.patch(
             'optimizely.bucketer.Bucketer._generate_bucket_value', return_value=5042
         ), mock.patch('uuid.uuid4', return_value='a68cf1ad-0393-4e18-af87-efe8f01a7c9c'):
+            self.project_config.region = 'EU'
             event_obj = self.event_builder.create_impression_event(
                 self.project_config,
                 self.project_config.get_experiment_from_key('test_experiment'),
@@ -618,7 +620,7 @@ def test_create_conversion_event_with_eu(self):
             'revision': '42',
         }
 
-        with mock.patch.object(self.project_config, 'region', new=Region.EU), mock.patch(
+        with mock.patch.object(self.project_config, 'region', new='EU'), mock.patch(
             'time.time', return_value=42.123
         ), mock.patch(
             'uuid.uuid4', return_value='a68cf1ad-0393-4e18-af87-efe8f01a7c9c'
@@ -634,6 +636,54 @@ def test_create_conversion_event_with_eu(self):
             event_builder.EventBuilder.HTTP_HEADERS,
         )
 
+    def test_create_conversion_event_with_invalid_region(self):
+        """ Test that create_conversion_event creates Event object
+    with right params when no attributes are provided. """
+
+        expected_params = {
+            'account_id': '12001',
+            'project_id': '111001',
+            'visitors': [
+                {
+                    'visitor_id': 'test_user',
+                    'attributes': [],
+                    'snapshots': [
+                        {
+                            'events': [
+                                {
+                                    'timestamp': 42123,
+                                    'entity_id': '111095',
+                                    'uuid': 'a68cf1ad-0393-4e18-af87-efe8f01a7c9c',
+                                    'key': 'test_event',
+                                }
+                            ]
+                        }
+                    ],
+                }
+            ],
+            'client_name': 'python-sdk',
+            'client_version': version.__version__,
+            'enrich_decisions': True,
+            'anonymize_ip': False,
+            'revision': '42',
+        }
+
+        with mock.patch.object(self.project_config, 'region', new='ZZ'), 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
+            )
+        self._validate_event_object(
+            event_obj,
+            event_builder.EventBuilder.EVENTS_URLS.get('US'),
+            expected_params,
+            event_builder.EventBuilder.HTTP_VERB,
+            event_builder.EventBuilder.HTTP_HEADERS,
+        )
+
     def test_create_conversion_event__with_attributes(self):
         """ Test that create_conversion_event creates Event object
     with right params when attributes are provided. """