feat: Remove implicit scrubbing in display_event function and recursively convert reqd properties to str

Author: KIRA009

openadapt/app/dashboard/api/recordings.py

@@ -73,6 +73,17 @@ async def get_recording_detail(websocket: WebSocket, recording_id: int) -> None:
                     {"type": "num_events", "value": len(action_events)}
                 )
 
+                def convert_to_str(event_dict: dict) -> dict:
+                    if "key" in event_dict:
+                        event_dict["key"] = str(event_dict["key"])
+                    if "canonical_key" in event_dict:
+                        event_dict["canonical_key"] = str(event_dict["canonical_key"])
+                    if "reducer_names" in event_dict:
+                        event_dict["reducer_names"] = list(event_dict["reducer_names"])
+                    if "children" in event_dict:
+                        for child in event_dict["children"]:
+                            convert_to_str(child)
+
                 for action_event in action_events:
                     event_dict = row2dict(action_event)
                     try:
@@ -85,12 +96,7 @@ async def get_recording_detail(websocket: WebSocket, recording_id: int) -> None:
                         width, height = 0, 0
                     event_dict["screenshot"] = image
                     event_dict["dimensions"] = {"width": width, "height": height}
-                    if event_dict["key"]:
-                        event_dict["key"] = str(event_dict["key"])
-                    if event_dict["canonical_key"]:
-                        event_dict["canonical_key"] = str(event_dict["canonical_key"])
-                    if event_dict["reducer_names"]:
-                        event_dict["reducer_names"] = list(event_dict["reducer_names"])
+                    convert_to_str(event_dict)
                     await websocket.send_json(
                         {"type": "action_event", "value": event_dict}
                     )

openadapt/record.py

@@ -1042,8 +1042,9 @@ def record_audio(
     """Record audio narration during the recording and store data in database.
 
     Args:
-        terminate_processing: An event to signal the termination of the process.
         recording_timestamp: The timestamp of the recording.
+        terminate_processing: An event to signal the termination of the process.
+        started_counter: Value to increment once started.
     """
     utils.configure_logging(logger, LOG_LEVEL)
     utils.set_start_time(recording_timestamp)

openadapt/utils.py

@@ -572,24 +572,6 @@ def display_event(
         x = recording.monitor_width * width_ratio / 2
         y = recording.monitor_height * height_ratio / 2
         text = action_event.text
-
-        if config.SCRUB_ENABLED:
-            import spacy
-
-            if spacy.util.is_package(
-                config.SPACY_MODEL_NAME
-            ):  # Check if the model is installed
-                from openadapt.privacy.providers.presidio import (
-                    PresidioScrubbingProvider,
-                )
-
-                text = PresidioScrubbingProvider().scrub_text(text, is_separated=True)
-            else:
-                logger.warning(
-                    f"SpaCy model not installed! {config.SPACY_MODEL_NAME=}. Using"
-                    " original text."
-                )
-
         image = draw_text(x, y, text, image, outline=True)
     else:
         raise Exception("unhandled {action_event.name=}")