Refactored getting channel and thread for slack

Author: itisallgood

src/robusta/core/playbooks/internal/ai_integration.py

@@ -112,18 +112,14 @@ def ask_holmes(event: ExecutionBaseEvent, params: AIInvestigateParams):
             finding.add_enrichment(
                 [HolmesResultsBlock(holmes_result=holmes_result)], enrichment_type=EnrichmentType.ai_analysis
             )
-            runner_context = getattr(params, "robusta_context", None) # Safely get the context dict
+            runner_context = getattr(params, "robusta_context", None)
             if runner_context and "thread_ts" in runner_context:
                 original_thread_ts = runner_context.get("thread_ts")
                 original_channel_id = runner_context.get("channel_id")
                 if original_thread_ts:                    
                     finding.robusta_context["thread_ts"] = original_thread_ts
                     finding.robusta_context["channel_id"] = original_channel_id
-                    logging.info(f"Added message_ts={original_thread_ts} to finding {finding.id} annotations.")
-                else:
-                    logging.warning(f"message_ts found in robusta_context for finding {finding.id} but it is empty.")
-            else:
-                 logging.debug(f"No message_ts found in robusta_context for finding {finding.id}. Context: {runner_context}")
+            
             event.add_finding(finding)
 
     except Exception as e:

src/robusta/core/reporting/callbacks.py

@@ -43,7 +43,7 @@ def create_for_func(
             sinks=[sink],
             origin="callback",
         )
-        logging.info(f"Created action request body: {body}")
+
         return ExternalActionRequest(
             body=body,
             signature=sign_action_request(body, signing_key),

src/robusta/integrations/slack/sender.py

@@ -115,7 +115,6 @@ def __get_action_block_for_choices(self, sink: str, choices: Dict[str, CallbackC
                     ).json(),
                 }
             )
-            logging.info(f"Created action block: {buttons}")
 
         return [{"type": "actions", "elements": buttons}]
 
@@ -569,36 +568,48 @@ def send_holmes_analysis(
 
         except Exception:
             logging.exception(f"error sending message to slack. {title}")
+    
+    def _resolve_slack_thread(
+        self,
+        finding: Finding,
+        sink_params: SlackSinkParams,
+        thread_ts: Optional[str] = None,
+    ) -> tuple[str, Optional[str]]:
+        
+        channel = ChannelTransformer.template(
+            sink_params.channel_override,
+            sink_params.slack_channel,
+            self.cluster_name,
+            finding.subject.labels,
+            finding.subject.annotations,
+        )
+
+        ctx = getattr(finding, "robusta_context", {}) or {}
+        thread_override = ctx.get("thread_ts")
+        channel_override = ctx.get("channel_id")
+
+        return (
+            channel_override or channel,
+            thread_override or thread_ts,
+        )
 
     def send_finding_to_slack(
         self,
         finding: Finding,
         sink_params: SlackSinkParams,
         platform_enabled: bool,
-        thread_ts: str = None,
+        thread_ts: Optional[str] = None,
     ) -> str:
         blocks: List[BaseBlock] = []
         attachment_blocks: List[BaseBlock] = []
 
-        slack_channel = ChannelTransformer.template(
-            sink_params.channel_override,
-            sink_params.slack_channel,
-            self.cluster_name,
-            finding.subject.labels,
-            finding.subject.annotations,
+        channel_id, thread_ts = self._resolve_slack_thread(
+            finding, sink_params, thread_ts
         )
-        robusta_context = getattr(finding, "robusta_context", None)
-        effective_thread_ts = thread_ts # Default to the one passed in (e.g., from grouping)
-        effective_channel_id = slack_channel
-        if robusta_context:
-            annotation_ts = robusta_context.get("thread_ts")
-            channel_id = robusta_context.get("channel_id")
-            if annotation_ts: # Make sure it's not None or empty
-                effective_thread_ts = annotation_ts # Prioritize the annotation!
-                effective_channel_id = channel_id
+        
         if finding.finding_type == FindingType.AI_ANALYSIS:
             # holmes analysis message needs special handling
-            self.send_holmes_analysis(finding, effective_channel_id, platform_enabled, effective_thread_ts)
+            self.send_holmes_analysis(finding, channel_id, platform_enabled, thread_ts)
             return ""  # [arik] Looks like the return value here is not used, needs to be removed
 
         status: FindingStatus = (