wip to forward event

Author: anthony-nhs

packages/slackBotFunction/app/slack/slack_handlers.py

@@ -12,7 +12,7 @@
 import traceback
 from typing import Any, Dict
 from botocore.exceptions import ClientError
-from slack_bolt import Ack, App
+from slack_bolt import Ack, App, BoltRequest
 from slack_sdk import WebClient
 from app.core.config import (
     bot_messages,
@@ -26,6 +26,7 @@
     extract_conversation_context,
     extract_pull_request_id,
     extract_session_pull_request_id,
+    forward_event_to_pull_request_lambda,
     gate_common,
     is_latest_message,
     strip_mentions,
@@ -68,7 +69,7 @@ def respond_to_action(ack: Ack):
     ack()
 
 
-def mention_handler(event: Dict[str, Any], body: Dict[str, Any], client: WebClient) -> None:
+def mention_handler(event: Dict[str, Any], body: Dict[str, Any], client: WebClient, req: BoltRequest) -> None:
     """
     Channel interactions that mention the bot.
     Pulls some details unique to mentions and removes slack user name
@@ -91,10 +92,11 @@ def mention_handler(event: Dict[str, Any], body: Dict[str, Any], client: WebClie
         event=event,
         event_id=event_id,
         post_to_thread=True,
+        req=req,
     )
 
 
-def dm_message_handler(event: Dict[str, Any], event_id: str, client: WebClient) -> None:
+def dm_message_handler(event: Dict[str, Any], event_id: str, client: WebClient, req: BoltRequest) -> None:
     """
     Direct messages:
     Pulls some details unique to direct messages
@@ -105,7 +107,10 @@ def dm_message_handler(event: Dict[str, Any], event_id: str, client: WebClient)
     message_text = (event.get("text") or "").strip()
     user_id = event.get("user", "unknown")
     conversation_key, thread_root = conversation_key_and_root(event=event)
-    logger.info(f"Processing DM from user {user_id}", extra={"event_id": event_id})
+    logger.info(
+        f"Processing DM from user {user_id}",
+        extra={"event_id": event_id, "conversation_key": conversation_key, "thread_root": thread_root},
+    )
     _common_message_handler(
         message_text=message_text,
         conversation_key=conversation_key,
@@ -114,10 +119,11 @@ def dm_message_handler(event: Dict[str, Any], event_id: str, client: WebClient)
         event=event,
         event_id=event_id,
         post_to_thread=True,
+        req=req,
     )
 
 
-def thread_message_handler(event: Dict[str, Any], event_id: str, client: WebClient) -> None:
+def thread_message_handler(event: Dict[str, Any], event_id: str, client: WebClient, req: BoltRequest) -> None:
     """
     Thread messages:
     Pulls some details unique to threads
@@ -155,10 +161,11 @@ def thread_message_handler(event: Dict[str, Any], event_id: str, client: WebClie
         event=event,
         event_id=event_id,
         post_to_thread=True,
+        req=req,
     )
 
 
-def unified_message_handler(event: Dict[str, Any], body: Dict[str, Any], client: WebClient) -> None:
+def unified_message_handler(event: Dict[str, Any], body: Dict[str, Any], client: WebClient, req: BoltRequest) -> None:
     """Handle message events (but not app mentions) - DMs and channel messages"""
     event_id = gate_common(event=event, body=body)
     if not event_id:
@@ -167,13 +174,13 @@ def unified_message_handler(event: Dict[str, Any], body: Dict[str, Any], client:
     # Route to appropriate handler based on message type
     if event.get("channel_type") == constants.CHANNEL_TYPE_IM:
         # DM handling
-        dm_message_handler(event=event, event_id=event_id, client=client)
+        dm_message_handler(event=event, event_id=event_id, client=client, req=req)
     else:
         # Channel message handling
-        thread_message_handler(event=event, event_id=event_id, client=client)
+        thread_message_handler(event=event, event_id=event_id, client=client, req=req)
 
 
-def feedback_handler(body: Dict[str, Any], client: WebClient) -> None:
+def feedback_handler(body: Dict[str, Any], client: WebClient, req: BoltRequest) -> None:
     """Handle feedback button clicks (both positive and negative)."""
     try:
         channel_id = body["channel"]["id"]
@@ -189,6 +196,10 @@ def feedback_handler(body: Dict[str, Any], client: WebClient) -> None:
                 f"Feedback in pull request session {session_pull_request_id}",
                 extra={"session_pull_request_id": session_pull_request_id},
             )
+            forward_event_to_pull_request_lambda(
+                req=req, pull_request_id=session_pull_request_id, forward_type="feedback"
+            )
+            return
 
         if message_ts and not is_latest_message(conversation_key=conversation_key, message_ts=message_ts):
             logger.info(f"Feedback ignored - not latest message: {message_ts}")
@@ -247,6 +258,7 @@ def _common_message_handler(
     event: Dict[str, Any],
     event_id: str,
     post_to_thread: bool,
+    req: BoltRequest,
 ) -> None:
     """
     All messages get processed by this code
@@ -264,6 +276,8 @@ def _common_message_handler(
             f"Message in pull request session {session_pull_request_id} from user {user_id}",
             extra={"session_pull_request_id": session_pull_request_id},
         )
+        forward_event_to_pull_request_lambda(req=req, pull_request_id=session_pull_request_id, forward_type="event")
+        return
     if message_text.lower().startswith(constants.FEEDBACK_PREFIX):
         feedback_text = message_text.split(":", 1)[1].strip() if ":" in message_text else ""
         try:

packages/slackBotFunction/app/utils/handler_utils.py

@@ -7,8 +7,10 @@
 import json
 import traceback
 from typing import Any, Dict, Tuple
+import urllib.parse
 import boto3
 from botocore.exceptions import ClientError
+from slack_bolt import BoltRequest
 from slack_sdk import WebClient
 from mypy_boto3_cloudformation.client import CloudFormationClient
 from mypy_boto3_lambda.client import LambdaClient
@@ -78,6 +80,43 @@ def trigger_pull_request_processing(pull_request_id: str, event: Dict[str, Any],
         raise e
 
 
+def forward_event_to_pull_request_lambda(req: BoltRequest, pull_request_id: str, forward_type: str) -> None:
+    cloudformation_client: CloudFormationClient = boto3.client("cloudformation")
+    lambda_client: LambdaClient = boto3.client("lambda")
+    try:
+        logger.debug("Getting arn for pull request", extra={"pull_request_id": pull_request_id})
+        response = cloudformation_client.describe_stacks(StackName=f"epsam-pr-{pull_request_id}")
+        outputs = {o["OutputKey"]: o["OutputValue"] for o in response["Stacks"][0]["Outputs"]}
+
+        pull_request_lambda_arn = outputs.get("SlackBotLambdaArn")
+        if forward_type == "feedback":
+            forwarded_body = f"payload={urllib.parse.quote_plus(json.dumps(req.body, separators=(',', ':')))}"
+        else:
+            forwarded_body = json.dumps(req.body)
+        forward_req = {
+            "body": forwarded_body,
+            "headers": req.headers,
+            "httpMethod": "POST",
+            "isBase64Encoded": False,
+            "method": "NONE",
+            "path": "/slack/events",
+            "resource": "/slack/events",
+            "stageVariables": None,
+        }
+        logger.debug(
+            "Forwarding request to pull request lambda",
+            extra={"lambda_arn": pull_request_lambda_arn, "forward_req": forward_req},
+        )
+        response = lambda_client.invoke(
+            FunctionName=pull_request_lambda_arn, InvocationType="Event", Payload=json.dumps(forward_req)
+        )
+        logger.info("Triggered pull request lambda", extra={"lambda_arn": pull_request_lambda_arn})
+
+    except Exception as e:
+        logger.error("Failed to forward request to pull request lambda", extra={"error": traceback.format_exc()})
+        raise e
+
+
 def is_latest_message(conversation_key: str, message_ts: str) -> bool:
     """Check if message_ts is the latest bot message using session data"""
     try:
@@ -147,7 +186,7 @@ def conversation_key_and_root(event: Dict[str, Any]) -> Tuple[str, str]:
     channel_id = event["channel"]
     root = event.get("thread_ts") or event.get("ts")
     if event.get("channel_type") == constants.CHANNEL_TYPE_IM:
-        return f"{constants.DM_PREFIX}{channel_id}", root
+        return f"{constants.DM_PREFIX}{channel_id}#{root}", root
     return f"{constants.THREAD_PREFIX}{channel_id}#{root}", root
 
 
@@ -165,10 +204,12 @@ def extract_conversation_context(event: Dict[str, Any]) -> Tuple[str, str, str |
 
 def extract_session_pull_request_id(conversation_key: str) -> str | None:
     """Check if the conversation is associated with a pull request"""
+    logger.debug("Checking for existing pull request session", extra={"conversation_key": conversation_key})
     try:
         response = get_state_information({"pk": conversation_key, "sk": constants.PULL_REQUEST_SK})
         if "Item" in response:
             logger.info("Found existing pull request session", extra={"conversation_key": conversation_key})
+            logger.debug("response", extra={"response": response})
             return response["Item"]["pull_request_id"]
         return None
     except Exception as e: