reorder imports/lint

Author: mrlevitas

reddit_decider/__init__.py

@@ -12,12 +12,6 @@
 from typing import Optional
 from typing import Union
 
-import rust_decider  # type: ignore
-from rust_decider import Decider as RustDecider
-from rust_decider import DeciderFeatureNotFoundException
-from rust_decider import DeciderInitException
-from rust_decider import DeciderException
-
 from baseplate import RequestContext
 from baseplate import Span
 from baseplate.clients import ContextFactory
@@ -28,6 +22,11 @@
 from baseplate.lib.file_watcher import T
 from baseplate.lib.file_watcher import WatchedFileNotAvailableError
 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 DeciderInitException
+from rust_decider import make_ctx
 from typing_extensions import Literal
 
 
@@ -189,15 +188,15 @@ def _get_decider(self) -> Optional[T]:
 
     def _get_ctx(self) -> Any:
         context_fields = self._decider_context.to_dict()
-        return rust_decider.make_ctx(context_fields)
+        return make_ctx(context_fields)
 
     def _get_ctx_with_set_identifier(
         self, identifier: str, identifier_type: Literal["user_id", "device_id", "canonical_url"]
     ) -> Dict[str, Any]:
         context_fields = self._decider_context.to_dict()
         context_fields[identifier_type] = identifier
 
-        return rust_decider.make_ctx(context_fields)
+        return make_ctx(context_fields)
 
     def _format_decision(self, decision_dict: Dict[str, str]) -> Dict[str, Any]:
         out = {}
@@ -1005,7 +1004,11 @@ def _prune_extracted_dict(extracted_dict: dict) -> dict:
         return parsed_extracted_fields
 
     def _minimal_decider(
-        self, rs_decider: Optional[RustDecider], name: str, span: Span, parsed_extracted_fields: Optional[Dict] = None
+        self,
+        rs_decider: Optional[RustDecider],
+        name: str,
+        span: Span,
+        parsed_extracted_fields: Optional[Dict] = None,
     ) -> Decider:
         return Decider(
             decider_context=DeciderContext(extracted_fields=parsed_extracted_fields),
@@ -1049,21 +1052,30 @@ 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, name=name, span=span, parsed_extracted_fields=parsed_extracted_fields
+                    rs_decider=rs_decider,
+                    name=name,
+                    span=span,
+                    parsed_extracted_fields=parsed_extracted_fields,
                 )
 
             ec = request.edge_context
 
             if ec is None:
                 return self._minimal_decider(
-                    rs_decider=rs_decider, name=name, span=span, parsed_extracted_fields=parsed_extracted_fields
+                    rs_decider=rs_decider,
+                    name=name,
+                    span=span,
+                    parsed_extracted_fields=parsed_extracted_fields,
                 )
         except Exception as exc:
             logger.info(
                 f"Unable to access `request.edge_context` in `make_object_for_context()`. details: {exc}"
             )
             return self._minimal_decider(
-                rs_decider=rs_decider, name=name, span=span, parsed_extracted_fields=parsed_extracted_fields
+                rs_decider=rs_decider,
+                name=name,
+                span=span,
+                parsed_extracted_fields=parsed_extracted_fields,
             )
 
         # All fields below are derived from `edge_context`

setup.cfg

@@ -24,3 +24,8 @@ warn_unused_ignores = True
 warn_return_any = False
 no_implicit_reexport = True
 strict_equality = True
+
+[mypy-rust_decider]
+# TODO: add stubs to reddit-decider
+# see https://pyo3.rs/v0.16.2/python_typing_hints.html
+ignore_missing_imports = True

tests/decider_tests.py

@@ -58,6 +58,7 @@ def decider_field_extractor(_request: RequestContext):
         "canonical_url": CANONICAL_URL,
     }
 
+
 def setup_decider(file_name, decider_context, mock_span, event_logger):
     try:
         rs_decider = init_decider_parser(file_name)
@@ -73,6 +74,7 @@ def setup_decider(file_name, decider_context, mock_span, event_logger):
         event_logger=event_logger,
     )
 
+
 def first_occurrence_of_key_in(array, dict_key, name):
     return next((v for v in array if v[dict_key] == name), None)
 
@@ -485,7 +487,9 @@ def test_none_returned_on_variant_call_with_bad_id(self):
         }
         with create_temp_config_file(config) as f:
             with self.assertLogs() as captured:
-                decider = setup_decider(f, self.minimal_decider_context, self.mock_span, self.event_logger)
+                decider = setup_decider(
+                    f, self.minimal_decider_context, self.mock_span, self.event_logger
+                )
                 variant = decider.get_variant("test")
 
                 self.assertEqual(variant, None)
@@ -510,15 +514,19 @@ def test_none_returned_on_get_variant_call_with_no_experiment_data(self):
             }
         }
         with create_temp_config_file(config) as f:
-            decider = setup_decider(f, self.minimal_decider_context, self.mock_span, self.event_logger)
+            decider = setup_decider(
+                f, self.minimal_decider_context, self.mock_span, self.event_logger
+            )
 
             self.assertEqual(self.event_logger.log.call_count, 0)
             variant = decider.get_variant("test")
             self.assertEqual(variant, None)
 
     def test_none_returned_on_get_variant_call_with_experiment_not_found(self):
         with create_temp_config_file({}) as f:
-            decider = setup_decider(f, self.minimal_decider_context, self.mock_span, self.event_logger)
+            decider = setup_decider(
+                f, self.minimal_decider_context, self.mock_span, self.event_logger
+            )
 
             self.assertEqual(self.event_logger.log.call_count, 0)
             with warnings.catch_warnings(record=True) as captured:
@@ -527,11 +535,7 @@ def test_none_returned_on_get_variant_call_with_experiment_not_found(self):
                 # can't test warning log only shows up only once if `decider.get_variant("anything")`
                 # is called again due to bug in `catch_warnings` contextmanager
                 # see https://github.com/python/cpython/issues/73858
-                assert any(
-                    'Feature "anything" not found.'
-                    in str(x.message)
-                    for x in captured
-                )
+                assert any('Feature "anything" not found.' in str(x.message) for x in captured)
             self.assertEqual(variant, None)
 
             # no exposures should be triggered
@@ -571,7 +575,9 @@ def test_get_variant_without_expose_for_holdout_exposure(self):
 
     def test_none_returned_on_get_variant_without_expose_call_with_experiment_not_found(self):
         with create_temp_config_file({}) as f:
-            decider = setup_decider(f, self.minimal_decider_context, self.mock_span, self.event_logger)
+            decider = setup_decider(
+                f, self.minimal_decider_context, self.mock_span, self.event_logger
+            )
 
             self.assertEqual(self.event_logger.log.call_count, 0)
             with warnings.catch_warnings(record=True) as captured:
@@ -580,11 +586,7 @@ def test_none_returned_on_get_variant_without_expose_call_with_experiment_not_fo
                 # can't test warning log only shows up only once if `decider.get_variant("anything")`
                 # is called again due to bug in `catch_warnings` contextmanager
                 # see https://github.com/python/cpython/issues/73858
-                assert any(
-                    'Feature "anything" not found.'
-                    in str(x.message)
-                    for x in captured
-                )
+                assert any('Feature "anything" not found.' in str(x.message) for x in captured)
             self.assertEqual(variant, None)
 
             # no exposures should be triggered
@@ -703,7 +705,9 @@ def test_get_variant_for_identifier_bogus_identifier_type(self):
         identifier_type = "blah"
 
         with create_temp_config_file(self.exp_base_config) as f:
-            decider = setup_decider(f, self.minimal_decider_context, self.mock_span, self.event_logger)
+            decider = setup_decider(
+                f, self.minimal_decider_context, self.mock_span, self.event_logger
+            )
 
             self.assertEqual(self.event_logger.log.call_count, 0)
             with self.assertLogs() as captured:
@@ -977,7 +981,9 @@ def test_get_all_variants_for_identifier_without_expose_user_id_wrong_bucket(sel
         self.exp_base_config["exp_1"]["experiment"].update({"bucket_val": "device_id"})
 
         with create_temp_config_file(self.exp_base_config) as f:
-            decider = setup_decider(f, self.minimal_decider_context, self.mock_span, self.event_logger)
+            decider = setup_decider(
+                f, self.minimal_decider_context, self.mock_span, self.event_logger
+            )
 
             self.assertEqual(self.event_logger.log.call_count, 0)