'rs_decider' -> 'internal', bump decider

Author: mrlevitas

reddit_decider/__init__.py

@@ -24,7 +24,7 @@
 from reddit_edgecontext import ValidatedAuthenticationToken
 from rust_decider import Decider as RustDecider
 from rust_decider import DeciderException
-from rust_decider import DeciderFeatureNotFoundException
+from rust_decider import FeatureNotFoundException
 from rust_decider import DeciderInitException
 from rust_decider import make_ctx
 from typing_extensions import Literal
@@ -166,13 +166,13 @@ class Decider:
     def __init__(
         self,
         decider_context: DeciderContext,
-        rs_decider: Optional[RustDecider],
+        internal: Optional[RustDecider],
         server_span: Span,
         context_name: str,
         event_logger: Optional[EventLogger] = None,
     ):
         self._decider_context = decider_context
-        self._rs_decider = rs_decider
+        self._internal = internal
         self._span = server_span
         self._context_name = context_name
         if event_logger:
@@ -181,8 +181,8 @@ def __init__(
             self._event_logger = DebugLogger()
 
     def _get_decider(self) -> Optional[T]:
-        if self._rs_decider is not None:
-            return self._rs_decider.get_decider()
+        if self._internal is not None:
+            return self._internal.get_decider()
 
         return None
 
@@ -339,15 +339,15 @@ def get_variant(
 
         :return: Variant name if a variant is assigned, :code:`None` otherwise.
         """
-        if self._rs_decider is None:
-            logger.error("rs_decider is None--did not initialize.")
+        if self._internal is None:
+            logger.error("RustDecider is None--did not initialize.")
             return None
 
         ctx = self._decider_context.to_dict()
 
         try:
-            decision = self._rs_decider.choose(experiment_name, ctx)
-        except DeciderFeatureNotFoundException as exc:
+            decision = self._internal.choose(experiment_name, ctx)
+        except FeatureNotFoundException as exc:
             warnings.warn(exc)
             return None
         except DeciderException as exc:
@@ -377,15 +377,15 @@ def get_variant_without_expose(self, experiment_name: str) -> Optional[str]:
 
         :return: Variant name if a variant is assigned, None otherwise.
         """
-        if self._rs_decider is None:
-            logger.error("rs_decider is None--did not initialize.")
+        if self._internal is None:
+            logger.error("RustDecider is None--did not initialize.")
             return None
 
         ctx = self._decider_context.to_dict()
 
         try:
-            decision = self._rs_decider.choose(experiment_name, ctx)
-        except DeciderFeatureNotFoundException as exc:
+            decision = self._internal.choose(experiment_name, ctx)
+        except FeatureNotFoundException as exc:
             warnings.warn(exc)
             return None
         except DeciderException as exc:
@@ -1005,14 +1005,14 @@ def _prune_extracted_dict(extracted_dict: dict) -> dict:
 
     def _minimal_decider(
         self,
-        rs_decider: Optional[RustDecider],
+        internal: Optional[RustDecider],
         name: str,
         span: Span,
         parsed_extracted_fields: Optional[Dict] = None,
     ) -> Decider:
         return Decider(
             decider_context=DeciderContext(extracted_fields=parsed_extracted_fields),
-            rs_decider=rs_decider,
+            internal=internal,
             server_span=span,
             context_name=name,
             event_logger=self._event_logger,
@@ -1024,12 +1024,10 @@ def make_object_for_context(self, name: str, span: Span) -> Decider:
             rs_decider = self._filewatcher.get_data()
         except WatchedFileNotAvailableError as exc:
             logger.error(f"Experiment config file unavailable: {exc}")
-        except DeciderInitException as exc:
-            logger.error(f"Could not load experiment config: {exc}")
 
         if span is None:
             logger.debug("`span` is `None` in reddit_decider `make_object_for_context()`.")
-            return self._minimal_decider(rs_decider=rs_decider, name=name, span=span)
+            return self._minimal_decider(internal=rs_decider, name=name, span=span)
 
         request = None
         parsed_extracted_fields = None
@@ -1052,7 +1050,7 @@ def make_object_for_context(self, name: str, span: Span) -> Decider:
             # if `edge_context` is inaccessible, bail early
             if request is None:
                 return self._minimal_decider(
-                    rs_decider=rs_decider,
+                    internal=rs_decider,
                     name=name,
                     span=span,
                     parsed_extracted_fields=parsed_extracted_fields,
@@ -1062,7 +1060,7 @@ def make_object_for_context(self, name: str, span: Span) -> Decider:
 
             if ec is None:
                 return self._minimal_decider(
-                    rs_decider=rs_decider,
+                    internal=rs_decider,
                     name=name,
                     span=span,
                     parsed_extracted_fields=parsed_extracted_fields,
@@ -1072,7 +1070,7 @@ def make_object_for_context(self, name: str, span: Span) -> Decider:
                 f"Unable to access `request.edge_context` in `make_object_for_context()`. details: {exc}"
             )
             return self._minimal_decider(
-                rs_decider=rs_decider,
+                internal=rs_decider,
                 name=name,
                 span=span,
                 parsed_extracted_fields=parsed_extracted_fields,
@@ -1178,7 +1176,7 @@ def make_object_for_context(self, name: str, span: Span) -> Decider:
 
         return Decider(
             decider_context=decider_context,
-            rs_decider=rs_decider,
+            internal=rs_decider,
             server_span=span,
             context_name=name,
             event_logger=self._event_logger,

requirements.txt

@@ -1,7 +1,7 @@
 -r requirements-transitive.txt
 baseplate==2.0.0a1
 black==21.4b2
-reddit-decider==1.2.25
+reddit-decider==1.2.26
 flake8==3.9.1
 mypy==0.790
 pyramid==2.0   # required for `from baseplate.frameworks.pyramid import BaseplateRequest` which calls `import pyramid.events`

setup.py

@@ -19,7 +19,7 @@
     install_requires=[
         "baseplate>=2.0.0a1,<3.0",
         "reddit-edgecontext>=1.0.0a3,<2.0",
-        "reddit-decider~=1.2.25",
+        "reddit-decider~=1.2.26",
         "typing_extensions>=3.10.0.0,<5.0",
     ],
     package_data={"reddit_experiments": ["py.typed"]},

tests/decider_tests.py

@@ -68,7 +68,7 @@ def setup_decider(file_name, decider_context, mock_span, event_logger):
 
     return Decider(
         decider_context=decider_context,
-        rs_decider=rs_decider,
+        internal=rs_decider,
         server_span=mock_span,
         context_name="test",
         event_logger=event_logger,
@@ -496,7 +496,7 @@ def test_none_returned_on_variant_call_with_bad_id(self):
                 self.assertEqual(self.event_logger.log.call_count, 0)
 
                 assert any(
-                    'rust_decider.init() has error: Decider initialization failed: Json error: "invalid type: string \\"1\\", expected u32".'
+                    'rust_decider.init() has error: Decider initialization failed: Partially loaded decider: 1 features failed to load.'
                     in x.getMessage()
                     for x in captured.records
                 )
@@ -695,7 +695,7 @@ def test_get_variant_for_identifier_wrong_bucket_val(self):
                 self.assertEqual(self.event_logger.log.call_count, 0)
 
                 assert any(
-                    'Requested identifier_type: "canonical_url" is incompatible with experiment\'s bucket_val = device_id.'
+                    'Encountered error in decider.choose(): Requested identifier_type "canonical_url" is incompatible with experiment\'s bucket_val = device_id'
                     in x.getMessage()
                     for x in captured.records
                 )
@@ -806,7 +806,7 @@ def test_get_variant_for_identifier_without_expose_for_holdout_exposure_wrong_bu
                 self.assertEqual(variant, None)
 
                 assert any(
-                    'Encountered error in decider.choose(): Requested identifier_type: "canonical_url" is incompatible with experiment\'s bucket_val = device_id.'
+                    'Encountered error in decider.choose(): Requested identifier_type "canonical_url" is incompatible with experiment\'s bucket_val = device_id'
                     in x.getMessage()
                     for x in captured.records
                 )

tests/range_variant_tests/range_variant_parity_tests.py

@@ -85,7 +85,7 @@ def test_range_variant_bucketing_with_cfg_data(self):
 
                 decider = Decider(
                     decider_context=decider_context,
-                    rs_decider=rs_decider,
+                    internal=rs_decider,
                     server_span=self.mock_span,
                     context_name="test",
                     event_logger=self.event_logger,