more typing

Author: anthony-nhs

packages/slackBotFunction/app/slack/slack_events.py

@@ -7,7 +7,7 @@
 import time
 import traceback
 import json
-from typing import Any, Dict
+from typing import Any, Dict, Tuple
 from botocore.exceptions import ClientError
 from slack_sdk import WebClient
 from app.core.config import (
@@ -34,7 +34,7 @@
 # ================================================================
 
 
-def cleanup_previous_unfeedback_qa(conversation_key, current_message_ts, session_data):
+def cleanup_previous_unfeedback_qa(conversation_key: str, current_message_ts: str, session_data: Dict[str, Any]):
     """Delete previous Q&A pair if no feedback received using atomic operation"""
     try:
         previous_message_ts = session_data.get("latest_message_ts")
@@ -57,7 +57,9 @@ def cleanup_previous_unfeedback_qa(conversation_key, current_message_ts, session
         logger.error("Error cleaning up unfeedback Q&A", extra={"error": traceback.format_exc()})
 
 
-def store_qa_pair(conversation_key, user_query, bot_response, message_ts, session_id, user_id):
+def store_qa_pair(
+    conversation_key: str, user_query: str, bot_response: str, message_ts: str, session_id: str, user_id: str
+):
     """
     Store Q&A pair for feedback correlation
     """
@@ -79,7 +81,7 @@ def store_qa_pair(conversation_key, user_query, bot_response, message_ts, sessio
         logger.error("Failed to store Q&A pair", extra={"error": traceback.format_exc()})
 
 
-def _mark_qa_feedback_received(conversation_key, message_ts):
+def _mark_qa_feedback_received(conversation_key: str, message_ts: str):
     """
     Mark Q&A record as having received feedback to prevent deletion
     """
@@ -98,7 +100,7 @@ def _mark_qa_feedback_received(conversation_key, message_ts):
 # ================================================================
 
 
-def _extract_conversation_context(event: Dict[str, Any]):
+def _extract_conversation_context(event: Dict[str, Any]) -> Tuple[str, str, str | None]:
     """Extract conversation key and thread context from event"""
     channel = event["channel"]
     # Determine conversation context: DM vs channel thread
@@ -110,7 +112,15 @@ def _extract_conversation_context(event: Dict[str, Any]):
 
 
 def _handle_session_management(
-    conversation_key, session_data, session_id, kb_response, user_id, channel, thread_ts, context_type, message_ts
+    conversation_key: str,
+    session_data: Dict[str, Any],
+    session_id: str,
+    kb_response: Dict[str, Any],
+    user_id: str,
+    channel: str,
+    thread_ts: str,
+    context_type: str,
+    message_ts: str,
 ):
     """Handle Bedrock session creation and cleanup"""
     # Handle conversation session management
@@ -131,7 +141,9 @@ def _handle_session_management(
         update_session_latest_message(conversation_key, message_ts)
 
 
-def _create_feedback_blocks(response_text, conversation_key, channel, message_ts, thread_ts):
+def _create_feedback_blocks(
+    response_text: str, conversation_key: str, channel: str, message_ts: str, thread_ts: str
+) -> list[dict[str, Any]]:
     """Create Slack blocks with feedback buttons"""
     # Create compact feedback payload for button actions
     feedback_data = {"ck": conversation_key, "ch": channel, "mt": message_ts}
@@ -281,14 +293,14 @@ def log_query_stats(user_query: str, event: Dict[str, Any], channel: str, client
 
 
 def store_feedback(
-    conversation_key,
-    feedback_type,
-    user_id,
-    channel_id,
+    conversation_key: str,
+    feedback_type: str,
+    user_id: str,
+    channel_id: str,
     client: WebClient,
-    thread_ts=None,
-    message_ts=None,
-    feedback_text=None,
+    thread_ts: str = None,
+    message_ts: str = None,
+    feedback_text: str = None,
 ):
     """
     Store user feedback with reference to Q&A record
@@ -373,15 +385,15 @@ def store_feedback(
 # ================================================================
 
 
-def get_conversation_session(conversation_key):
+def get_conversation_session(conversation_key: str) -> str | None:
     """
     Get existing Bedrock session for this conversation
     """
     session_data = get_conversation_session_data(conversation_key)
     return session_data.get("session_id") if session_data else None
 
 
-def get_conversation_session_data(conversation_key):
+def get_conversation_session_data(conversation_key: str) -> Dict[str, Any]:
     """
     Get full session data for this conversation
     """
@@ -396,7 +408,7 @@ def get_conversation_session_data(conversation_key):
         return None
 
 
-def get_latest_message_ts(conversation_key):
+def get_latest_message_ts(conversation_key: str) -> str:
     """
     Get latest message timestamp from session
     """
@@ -411,7 +423,12 @@ def get_latest_message_ts(conversation_key):
 
 
 def store_conversation_session(
-    conversation_key, session_id, user_id, channel_id, thread_ts=None, latest_message_ts=None
+    conversation_key: str,
+    session_id: str,
+    user_id: str,
+    channel_id: str,
+    thread_ts: str = None,
+    latest_message_ts: str = None,
 ):
     """
     Store new Bedrock session for conversation memory
@@ -440,7 +457,7 @@ def store_conversation_session(
         logger.error("Error storing session", extra={"error": traceback.format_exc()})
 
 
-def update_session_latest_message(conversation_key, message_ts):
+def update_session_latest_message(conversation_key: str, message_ts: str):
     """
     Update session with latest message timestamp
     """

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
+from slack_bolt import Ack, App
 from slack_sdk import WebClient
 from app.core.config import (
     BOT_MESSAGES,
@@ -40,7 +40,7 @@
 
 
 @lru_cache
-def setup_handlers(app):
+def setup_handlers(app: App):
     """Register handlers. Intentionally minimal—no branching here."""
     app.event("app_mention")(mention_handler)
     app.event("message")(unified_message_handler)

packages/slackBotFunction/app/utils/handler_utils.py

@@ -6,7 +6,7 @@
 import time
 import json
 import traceback
-from typing import Any, Dict
+from typing import Any, Dict, Tuple
 import boto3
 from botocore.exceptions import ClientError
 from slack_sdk import WebClient
@@ -23,7 +23,7 @@
 logger = get_logger()
 
 
-def is_duplicate_event(event_id):
+def is_duplicate_event(event_id: str) -> bool:
     """
     Check if we've already processed this event using DynamoDB conditional writes
 
@@ -98,7 +98,7 @@ def trigger_pull_request_processing(pull_request_id: str, event: Dict[str, Any],
         raise e
 
 
-def is_latest_message(conversation_key, message_ts):
+def is_latest_message(conversation_key: str, message_ts: str) -> bool:
     """Check if message_ts is the latest bot message using session data"""
     try:
         response = get_state_information({"pk": conversation_key, "sk": constants.SESSION_SK})
@@ -111,7 +111,7 @@ def is_latest_message(conversation_key, message_ts):
         return False
 
 
-def gate_common(event: Dict[str, Any], body: Dict[str, Any]):
+def gate_common(event: Dict[str, Any], body: Dict[str, Any]) -> str | None:
     """
     Apply common early checks that are shared across handlers.
 
@@ -153,7 +153,7 @@ def extract_pull_request_id(text: str) -> str:
     return pr_number, rest_text
 
 
-def conversation_key_and_root(event: Dict[str, Any]):
+def conversation_key_and_root(event: Dict[str, Any]) -> Tuple[str, str]:
     """
     Build a stable conversation scope and its root timestamp.
 

packages/slackBotFunction/tests/test_query_reformulator.py

@@ -30,7 +30,7 @@ def test_reformulate_query_returns_string(mock_invoke_model: Mock, mock_load_pro
     assert isinstance(result, str)
     assert len(result) > 0
     assert result == "foo"
-    mock_load_prompt.assert_called_once_with(ANY, "test-prompt", "DRAFT")
+    mock_load_prompt.assert_called_once_with("test-prompt", "DRAFT")
     mock_invoke_model.assert_called_once_with(
         prompt="Test reformat. How do I use EPS?", model_id="test-model", client=ANY
     )