ref(grouping): Do preliminary typing work for enhancements (#87369)

As a first step towards adding types to the enhancements code, this makes a handful of code changes which will be necessary once types are added to all of the enhancements methods, which will happen in #87370.

Author: lobsterkatie

src/sentry/grouping/api.py

@@ -108,7 +108,7 @@ def _get_enhancements(self, project: Project) -> str:
 
         try:
             enhancements = Enhancements.from_config_string(
-                project_enhancements, bases=[enhancements_base]
+                project_enhancements, bases=[enhancements_base] if enhancements_base else []
             ).dumps()
         except InvalidEnhancerConfig:
             enhancements = get_default_enhancements()
@@ -174,7 +174,7 @@ def get_default_enhancements(config_id: str | None = None) -> str:
     base: str | None = DEFAULT_GROUPING_ENHANCEMENTS_BASE
     if config_id is not None:
         base = CONFIGURATIONS[config_id].enhancements_base
-    return Enhancements.from_config_string("", bases=[base]).dumps()
+    return Enhancements.from_config_string("", bases=[base] if base else []).dumps()
 
 
 def get_projects_default_fingerprinting_bases(

src/sentry/grouping/enhancer/__init__.py

@@ -82,6 +82,7 @@ def parse_rust_enhancements(
         raise InvalidEnhancerConfig(str(e))
 
 
+# TODO: Convert this into a typeddict in ophio
 RustExceptionData = dict[str, bytes | None]
 
 
@@ -97,7 +98,12 @@ def make_rust_exception_data(
     for key, value in e.items():
         if isinstance(value, str):
             e[key] = value.encode("utf-8")
-    return e
+
+    return RustExceptionData(
+        ty=e["ty"],
+        value=e["value"],
+        mechanism=e["mechanism"],
+    )
 
 
 def is_valid_profiling_matcher(matchers: list[str]) -> bool:
@@ -155,7 +161,8 @@ def apply_category_and_updated_in_app_to_frames(
         also be persisted in the saved event, so they can be used in the UI and when determining
         things like suspect commits and suggested assignees.
         """
-        match_frames = [create_match_frame(frame, platform) for frame in frames]
+        # TODO: Fix this type to list[MatchFrame] once it's fixed in ophio
+        match_frames: list[Any] = [create_match_frame(frame, platform) for frame in frames]
 
         category_and_in_app_results = self.rust_enhancements.apply_modifications_to_frames(
             match_frames, make_rust_exception_data(exception_data)
@@ -183,7 +190,8 @@ def assemble_stacktrace_component(
 
         This also handles cases where the entire stacktrace should be discarded.
         """
-        match_frames = [create_match_frame(frame, platform) for frame in frames]
+        # TODO: Fix this type to list[MatchFrame] once it's fixed in ophio
+        match_frames: list[Any] = [create_match_frame(frame, platform) for frame in frames]
 
         rust_frame_components = [RustComponent(contributes=c.contributes) for c in frame_components]
 

src/sentry/grouping/enhancer/actions.py

@@ -63,6 +63,9 @@ def _from_config_structure(cls, val, version: int):
         flag, range_direction = REVERSE_ACTION_FLAGS[val >> ACTION_BITSIZE]
         return FlagAction(ACTIONS[val & 0xF], flag, range_direction)
 
+    def _to_config_structure(self, version: int) -> int | list[str | int]:
+        raise NotImplementedError()
+
 
 class FlagAction(EnhancementAction):
     """

src/sentry/grouping/enhancer/matchers.py

@@ -105,19 +105,28 @@ def create_match_frame(frame_data: dict, platform: str | None) -> dict:
 
 
 class EnhancementMatch:
+    key: str
+    pattern: str
+
     def matches_frame(self, frames, idx, exception_data, cache):
         raise NotImplementedError()
 
+    @property
+    def description(self) -> str:
+        raise NotImplementedError()
+
     def _to_config_structure(self, version):
         raise NotImplementedError()
 
     @staticmethod
     def _from_config_structure(config_structure, version):
         val = config_structure
         if val.startswith("|[") and val.endswith("]"):
-            return CalleeMatch(EnhancementMatch._from_config_structure(val[2:-1], version))
+            frame_match: Any = EnhancementMatch._from_config_structure(val[2:-1], version)
+            return CalleeMatch(frame_match)
         if val.startswith("[") and val.endswith("]|"):
-            return CallerMatch(EnhancementMatch._from_config_structure(val[1:-2], version))
+            frame_match = EnhancementMatch._from_config_structure(val[1:-2], version)
+            return CallerMatch(frame_match)
 
         if val.startswith("!"):
             negated = True
@@ -250,6 +259,9 @@ def __init__(self, key, pattern, negated=False):
         self._encoded_pattern = pattern.lower().encode("utf-8")
 
     def _positive_frame_match(self, match_frame, exception_data, cache):
+        if not self.field:  # Shouldn't happen, but it keeps mypy happy
+            return False
+
         value = match_frame[self.field]
         if value is None:
             return False
@@ -289,6 +301,9 @@ def _positive_frame_match(self, match_frame, exception_data, cache):
 
 class FrameFieldMatch(FrameMatch):
     def _positive_frame_match(self, match_frame, exception_data, cache):
+        if not self.field:  # Shouldn't happen, but it keeps mypy happy
+            return False
+
         value = match_frame[self.field]
         if value is None:
             return False

src/sentry/utils/glob.py

@@ -2,8 +2,8 @@
 
 
 def glob_match(
-    value: str | None,
-    pat: str,
+    value: str | bytes | None,
+    pat: str | bytes,
     doublestar: bool = False,
     ignorecase: bool = False,
     path_normalize: bool = False,