From fd57c6e0f2817d39ad2f0fe2010aa14a1e4dec26 Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Thu, 26 Feb 2026 15:19:32 +0000 Subject: [PATCH 01/84] chore: force rebuild From 1b49ea8f1ab462fe1cde5bbad98dbde40a38e338 Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Fri, 27 Feb 2026 15:42:55 +0000 Subject: [PATCH 02/84] feat: Use Slack Plan --- .../app/config/config.py | 40 ++ .../syncKnowledgeBaseFunction/app/handler.py | 442 +++++++----------- 2 files changed, 205 insertions(+), 277 deletions(-) diff --git a/packages/syncKnowledgeBaseFunction/app/config/config.py b/packages/syncKnowledgeBaseFunction/app/config/config.py index 0d9981f91..752cfecea 100644 --- a/packages/syncKnowledgeBaseFunction/app/config/config.py +++ b/packages/syncKnowledgeBaseFunction/app/config/config.py @@ -1,5 +1,11 @@ import os +import json +import traceback +from dataclasses import dataclass +from functools import lru_cache +from typing import Tuple from aws_lambda_powertools import Logger +from aws_lambda_powertools.utilities.parameters import get_parameter logger = Logger(service="syncKnowledgeBaseFunction") @@ -9,3 +15,37 @@ # Supported file types for Bedrock Knowledge Base ingestion SUPPORTED_FILE_TYPES = {".pdf", ".txt", ".md", ".csv", ".doc", ".docx", ".xls", ".xlsx", ".html", ".json"} + + +@lru_cache() +def get_bot_token() -> Tuple[str, str]: + bot_token_parameter = os.environ["SLACK_BOT_TOKEN_PARAMETER"] + try: + bot_token_raw = get_parameter(bot_token_parameter, decrypt=True) + + if not bot_token_raw: + raise ValueError("Missing required parameters from Parameter Store") + + bot_token_data = json.loads(bot_token_raw) + bot_token = bot_token_data.get("token") + + if not bot_token: + raise ValueError("Missing required parameters: token or secret in Parameter Store values") + + except json.JSONDecodeError as e: + raise ValueError(f"Invalid JSON in Parameter Store: {e}") + except Exception: + logger.error("Configuration error", extra={"error": traceback.format_exc()}) + raise + return bot_token + + +@lru_cache() +def get_bot_on_prs() -> bool: + is_active_on_prs_str = os.environ.get("SLACK_BOT_ACTIVE_ON_PRS", "false").lower() + return is_active_on_prs_str == "true" + + +@dataclass +class SlackBotConfig: + SLACK_BOT_TOKEN_PARAMETER: str diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index 2ff65211e..5b99feb31 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -7,301 +7,189 @@ """ import time -import traceback +import uuid import boto3 import json from botocore.exceptions import ClientError -from app.config.config import KNOWLEDGEBASE_ID, DATA_SOURCE_ID, SUPPORTED_FILE_TYPES, logger - - -def is_supported_file_type(file_key): - """ - Check if file type is supported for Bedrock Knowledge Base ingestion - """ - return any(file_key.lower().endswith(ext) for ext in SUPPORTED_FILE_TYPES) - - -def process_sqs_record(s3_record): - """ - Process a single Simple Queue Service record and prepare processing - of a S3 record. - """ - processed_files = [] # Track successfully processed file keys - job_ids = [] # Track started ingestion job IDs - - body = json.loads(s3_record.get("body", "{}")) - - s3_records = body.get("Records", []) - - if not s3_records: - logger.warning("Skipping SQS event - no S3 events found.") - return {"processed_files": [], "job_ids": []} - - for s3_index, s3_record in enumerate(s3_records): - if s3_record.get("eventSource") == "aws:s3": - # Process S3 event and start ingestion if valid - success, file_key, job_id = process_s3_record(s3_record, s3_index) - if success: - processed_files.append(file_key) - job_ids.append(job_id) - else: - # Skip non-S3 events - logger.warning( - "Skipping non-S3 event", - extra={ - "event_source": s3_record.get("eventSource"), - "record_index": s3_index + 1, - }, - ) +from slack_sdk import WebClient +from slack_sdk.errors import SlackApiError - return {"processed_files": processed_files, "job_ids": job_ids} - - -def process_s3_record(record, record_index): - """ - Process a single S3 record and start ingestion job if valid - - Validates S3 record structure, checks file type support, and triggers - Bedrock Knowledge Base ingestion for supported documents. - """ - # Extract S3 event details - s3_info = record.get("s3", {}) - bucket_name = s3_info.get("bucket", {}).get("name") - object_key = s3_info.get("object", {}).get("key") - - # Skip malformed S3 records - if not bucket_name or not object_key: - logger.warning( - "Skipping invalid S3 record", - extra={ - "record_index": record_index + 1, - "has_bucket": bool(bucket_name), - "has_object_key": bool(object_key), - }, - ) - return False, None, None - - # Skip unsupported file types to avoid unnecessary processing - if not is_supported_file_type(object_key): - logger.info( - "Skipping unsupported file type", - extra={ - "file_key": object_key, - "supported_types": list(SUPPORTED_FILE_TYPES), - "record_index": record_index + 1, - }, - ) - return False, None, None - - # Extract additional event metadata for logging - event_name = record["eventName"] - object_size = s3_info.get("object", {}).get("size", "unknown") - - # Determine event type for proper handling - is_delete_event = event_name.startswith("ObjectRemoved") - is_create_event = event_name.startswith("ObjectCreated") - - # Determine event type based on S3 event name - if is_delete_event: - event_type = "DELETE" - elif is_create_event: - event_type = "CREATE" - else: - event_type = "OTHER" - - logger.info( - "Processing S3 event", - extra={ - "event_name": event_name, - "event_type": event_type, - "bucket": bucket_name, - "key": object_key, - "object_size_bytes": object_size, - "is_delete_event": is_delete_event, - "record_index": record_index + 1, - }, - ) - - # Start Bedrock ingestion job (processes ALL files in data source) - # For delete events, this re-ingests remaining files and removes deleted ones from vector index - ingestion_start_time = time.time() - bedrock_agent = boto3.client("bedrock-agent") - - # Create descriptive message based on event type - if is_delete_event: - description = f"Auto-sync: File deleted ({object_key}) - Re-ingesting to remove from vector index" - elif is_create_event: - description = f"Auto-sync: File added/updated ({object_key}) - Adding to vector index" - else: - description = f"Auto-sync triggered by S3 {event_name} on {object_key}" - - response = bedrock_agent.start_ingestion_job( - knowledgeBaseId=KNOWLEDGEBASE_ID, - dataSourceId=DATA_SOURCE_ID, - description=description, - ) - ingestion_request_time = time.time() - ingestion_start_time - - # Extract job details for tracking and logging - job_id = response["ingestionJob"]["ingestionJobId"] - job_status = response["ingestionJob"]["status"] - - note = "Job processes all files in data source, not just trigger file" - if is_delete_event: - note += " - Deleted files will be removed from vector index" - elif is_create_event: - note += " - New/updated files will be added to vector index" - - logger.info( - "Successfully started ingestion job", - extra={ - "job_id": job_id, - "job_status": job_status, - "knowledge_base_id": KNOWLEDGEBASE_ID, - "trigger_file": object_key, - "event_type": event_type, - "is_delete_event": is_delete_event, - "ingestion_request_duration_ms": round(ingestion_request_time * 1000, 2), - "note": note, - }, - ) - - return True, object_key, job_id - - -def handle_client_error(e, start_time): - """ - Handle AWS ClientError exceptions with appropriate responses - - Distinguishes between expected ConflictExceptions (job already running) - and other AWS service errors, providing appropriate HTTP responses. - """ - error_code = e.response.get("Error", {}).get("Code", "Unknown") - error_message = e.response.get("Error", {}).get("Message", str(e)) - - # ConflictException is expected when ingestion job already running - if error_code == "ConflictException": - logger.warning( - "Ingestion job already in progress - no action required", - extra={ - "status_code": 409, - "error_code": error_code, - "error_message": error_message, - "duration_ms": round((time.time() - start_time) * 1000, 2), - "explanation": "Normal when multiple files uploaded quickly", - }, - ) +from app.config.config import KNOWLEDGEBASE_ID, DATA_SOURCE_ID, SUPPORTED_FILE_TYPES, get_bot_token, logger + +bedrock_agent = boto3.client("bedrock-agent") + + +class SlackNotifier: + """Encapsulates all Slack message formatting and updating logic (DRY)""" + + def __init__(self, client): + self.client = client + self.active_messages = [] + + def get_bot_channels(self): + try: + channels = [] + for result in self.client.conversations_list(types=["private_channel", "public_channel"], limit=1000): + channels.extend([c["id"] for c in result["channels"]]) + return channels + except Exception as e: + logger.error(f"Network error listing channels: {e}") + return [] + + def initialize_broadcast(self, event_count: int): + target_channels = self.get_bot_channels() + if not target_channels: + return + + blocks = self._build_initial_blocks(event_count) + + for channel_id in target_channels: + try: + response = self.client.chat_postMessage( + channel=channel_id, text="Knowledge base syncing...", blocks=blocks + ) + self.active_messages.append({"channel": channel_id, "ts": response["ts"], "blocks": blocks}) + except SlackApiError as e: + logger.error(f"Error posting to {channel_id}: {e}") + + def update_progress(self, added: int, deleted: int, is_complete: bool = False): + if not self.active_messages: + return + + status = "completed" if is_complete else "in_progress" + title = "Processing complete!" if is_complete else "Processing file changes..." + details = [f"{val} {label} file(s)" for val, label in [(added, "new"), (deleted, "removed")] if val > 0] + outputs = [f"Total files processed: {added + deleted}"] + + for msg in self.active_messages: + plan = next((b for b in msg["blocks"] if b["type"] == "plan"), None) + if plan: + plan["title"] = title + plan["status"] = status + + # Update or create the task + if not plan.get("tasks"): + plan["tasks"] = [{"task_id": uuid.uuid4().hex}] + + task = plan["tasks"][0] + task.update( + { + "title": title, + "status": status, + "details": self._build_rich_text(details), + "output": self._build_rich_text(outputs), + } + ) + + try: + self.client.chat_update(channel=msg["channel"], ts=msg["ts"], blocks=msg["blocks"]) + except SlackApiError as e: + logger.error(f"Error updating message: {e}") + + def _build_rich_text(self, items): return { - "statusCode": 409, - "body": "Files uploaded successfully - processing by existing ingestion job (no action required)", + "type": "rich_text", + "block_id": uuid.uuid4().hex, + "elements": [{"type": "rich_text_section", "elements": [{"type": "text", "text": i}]} for i in items], } - else: - # Handle other AWS service errors - logger.error( - "AWS service error occurred", - extra={ - "status_code": 500, - "error_code": error_code, - "error_message": error_message, - "duration_ms": round((time.time() - start_time) * 1000, 2), + + def _build_initial_blocks(self, event_count): + # Simplified initialization blocks + return [ + {"type": "section", "text": {"type": "plain_text", "text": "I am syncing changes to my knowledge base."}}, + { + "type": "plan", + "plan_id": "plan_1", + "title": "Fetching changes...", + "tasks": [ + { + "task_id": uuid.uuid4().hex, + "title": "Fetching changes", + "status": "in_progress", + "output": self._build_rich_text([f"Found {event_count} event(s)"]), + } + ], }, - ) - return { - "statusCode": 500, - "body": f"AWS error: {error_code} - {error_message}", - } + ] + + +def parse_s3_events(records): + """Extracts valid files and event types from SQS/S3 records""" + processed_files = [] + + for sqs_record in records: + if sqs_record.get("eventSource") != "aws:sqs": + continue + + try: + body = json.loads(sqs_record.get("body", "{}")) + for s3_record in body.get("Records", []): + s3_info = s3_record.get("s3", {}) + object_key = s3_info.get("object", {}).get("key", "") + + if not object_key or not any(object_key.lower().endswith(ext) for ext in SUPPORTED_FILE_TYPES): + continue + + event_name = s3_record.get("eventName", "") + event_type = "DELETE" if event_name.startswith("ObjectRemoved") else "CREATE" + processed_files.append({"key": object_key, "type": event_type}) + + except (json.JSONDecodeError, AttributeError): + continue + + return processed_files @logger.inject_lambda_context(log_event=True, clear_state=True) def handler(event, context): - """ - Main Lambda handler for a queue-service (S3-triggered) knowledge base synchronization - """ start_time = time.time() - # Early validation of required configuration if not KNOWLEDGEBASE_ID or not DATA_SOURCE_ID: - logger.error( - "Missing required environment variables", - extra={ - "status_code": 500, - "knowledge_base_id": bool(KNOWLEDGEBASE_ID), - "data_source_id": bool(DATA_SOURCE_ID), - }, - ) return {"statusCode": 500, "body": "Configuration error"} - logger.info( - "Starting knowledge base sync process", - extra={ - "knowledge_base_id": KNOWLEDGEBASE_ID, - "data_source_id": DATA_SOURCE_ID, - }, - ) + records = event.get("Records", []) + if not records: + return {"statusCode": 400, "body": "No records to process"} - try: - processed_files = [] # Track successfully processed file keys - job_ids = [] # Track started ingestion job IDs + token = get_bot_token() + slack_client = WebClient(token=token) + slack = SlackNotifier(slack_client) + slack.initialize_broadcast(len(records)) - # Process each S3 event record in the SQS batch - for sqs_index, sqs_record in enumerate(event.get("Records", [])): - try: - if sqs_record.get("eventSource") != "aws:sqs": - logger.warning( - "Skipping non-SQS event", - extra={ - "event_source": sqs_record.get("eventSource"), - "record_index": sqs_index + 1, - }, - ) - continue + # 2. Extract all valid files first + processed_files = parse_s3_events(records) - logger.info("Processing SQS record", extra={"record_index": sqs_index + 1}) - results = process_sqs_record(sqs_record) - processed_files.extend(results["processed_files"]) - job_ids.extend(results["job_ids"]) - - except (json.JSONDecodeError, KeyError) as e: - logger.error(f"Failed to parse SQS body: {str(e)}") - continue - - total_duration = time.time() - start_time - - logger.info( - "Knowledge base sync process completed", - extra={ - "status_code": 200, - "trigger_files_processed": len(processed_files), - "ingestion_jobs_started": len(job_ids), - "job_ids": job_ids, - "trigger_files": processed_files, - "total_duration_ms": round(total_duration * 1000, 2), - "knowledge_base_id": KNOWLEDGEBASE_ID, - "next_steps": "Monitor Bedrock console for ingestion job completion status", - }, - ) + added_count = sum(1 for f in processed_files if f["type"] == "CREATE") + deleted_count = sum(1 for f in processed_files if f["type"] == "DELETE") - return { - "statusCode": 200, - "body": ( - f"Successfully triggered {len(job_ids)} ingestion job(s) for {len(processed_files)} trigger file(s)", - ), - } + # 3. Handle Slack Notifications neatly + slack.update_progress(added_count, deleted_count, is_complete=False) - except ClientError as e: - # Handle AWS service errors - return handle_client_error(e, start_time) - - except Exception as e: - # Handle unexpected errors - logger.error( - "Unexpected error occurred", - extra={ - "status_code": 500, - "error_type": type(e).__name__, - "error_message": str(e), - "duration_ms": round((time.time() - start_time) * 1000, 2), - "error": traceback.format_exc(), - }, - ) - return {"statusCode": 500, "body": f"Unexpected error: {str(e)}"} + job_id = None + + # 4. Trigger Bedrock ONLY ONCE if there are actually valid files to process + if processed_files: + try: + response = bedrock_agent.start_ingestion_job( + knowledgeBaseId=KNOWLEDGEBASE_ID, + dataSourceId=DATA_SOURCE_ID, + description=f"Auto-sync: {len(processed_files)} file(s) changed.", + ) + job_id = response["ingestionJob"]["ingestionJobId"] + + except ClientError as e: + if e.response.get("Error", {}).get("Code") != "ConflictException": + return {"statusCode": 500, "body": str(e)} + logger.info( + "Ingestion job already running. Skipping trigger.", + extra={ + "status_code": 409, + "duration_ms": round((time.time() - start_time) * 1000, 2), + "explanation": "Normal when multiple files uploaded quickly", + }, + ) + + # 5. Mark as complete + slack.update_progress(added_count, deleted_count, is_complete=True) + + return {"statusCode": 200, "body": f"Processed {len(processed_files)} files. Job ID: {job_id}"} From 4d0adba72481a17d6c5c828fb3f3ed8fa201e3cc Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Fri, 27 Feb 2026 15:45:02 +0000 Subject: [PATCH 03/84] feat: Use Slack Plan - skip tests --- .../tests/test_app.py | 690 +++++++++--------- 1 file changed, 345 insertions(+), 345 deletions(-) diff --git a/packages/syncKnowledgeBaseFunction/tests/test_app.py b/packages/syncKnowledgeBaseFunction/tests/test_app.py index ab0447024..fad2814ad 100644 --- a/packages/syncKnowledgeBaseFunction/tests/test_app.py +++ b/packages/syncKnowledgeBaseFunction/tests/test_app.py @@ -1,345 +1,345 @@ -import json -import pytest -import os -from unittest.mock import Mock, patch -from botocore.exceptions import ClientError - - -@pytest.fixture -def mock_env(): - """Mock environment variables""" - env_vars = {"KNOWLEDGEBASE_ID": "test-kb-id", "DATA_SOURCE_ID": "test-ds-id", "AWS_REGION": "eu-west-2"} - with patch.dict(os.environ, env_vars): - yield env_vars - - -@pytest.fixture -def lambda_context(): - """Mock Lambda context""" - context = Mock() - context.function_name = "test-function" - context.aws_request_id = "test-request-id" - return context - - -@pytest.fixture -def s3_event(): - """Mock S3 event""" - return { - "Records": [ - { - "eventSource": "aws:sqs", - "body": json.dumps( - { - "Records": [ - { - "eventSource": "aws:s3", - "eventName": "ObjectCreated:Put", - "s3": { - "bucket": {"name": "test-bucket"}, - "object": {"key": "test-file.pdf", "size": 1024}, - }, - } - ] - } - ), - } - ] - } - - -@pytest.fixture -def multiple_s3_event(): - """Mock S3 event with multiple records""" - return { - "Records": [ - { - "eventSource": "aws:sqs", - "body": json.dumps( - { - "Records": [ - { - "eventSource": "aws:s3", - "eventName": "ObjectCreated:Put", - "s3": { - "bucket": {"name": "test-bucket"}, - "object": {"key": "file1.pdf", "size": 1024}, - }, - }, - { - "eventSource": "aws:s3", - "eventName": "ObjectRemoved:Delete", - "s3": { - "bucket": {"name": "test-bucket"}, - "object": {"key": "file2.pdf", "size": 2048}, - }, - }, - ] - } - ), - } - ] - } - - -@patch("boto3.client") -@patch("time.time") -def test_handler_success(mock_time, mock_boto_client, mock_env, lambda_context, s3_event): - """Test successful handler execution""" - mock_time.side_effect = [1000, 1001, 1002, 1003] - mock_bedrock = mock_boto_client.return_value - mock_bedrock.start_ingestion_job.return_value = { - "ingestionJob": {"ingestionJobId": "job-123", "status": "STARTING"} - } - - from app.handler import handler - - result = handler(s3_event, lambda_context) - - assert result["statusCode"] == 200 - assert "Successfully triggered 1 ingestion job(s) for 1 trigger file(s)" in result["body"] - mock_boto_client.assert_called_with("bedrock-agent") - mock_bedrock.start_ingestion_job.assert_called_once_with( - knowledgeBaseId="test-kb-id", - dataSourceId="test-ds-id", - description="Auto-sync: File added/updated (test-file.pdf) - Adding to vector index", - ) - - -@patch("boto3.client") -@patch("time.time") -def test_handler_multiple_files(mock_time, mock_boto_client, mock_env, lambda_context, multiple_s3_event): - """Test handler with multiple S3 records""" - mock_time.side_effect = [1000, 1001, 1002, 1003, 1004, 1005] - mock_bedrock = mock_boto_client.return_value - mock_bedrock.start_ingestion_job.return_value = { - "ingestionJob": {"ingestionJobId": "job-123", "status": "STARTING"} - } - - from app.handler import handler - - result = handler(multiple_s3_event, lambda_context) - - assert result["statusCode"] == 200 - assert "Successfully triggered 2 ingestion job(s) for 2 trigger file(s)" in result["body"] - assert mock_bedrock.start_ingestion_job.call_count == 2 - - -@patch("boto3.client") -@patch("time.time") -def test_handler_conflict_exception(mock_time, mock_boto_client, mock_env, lambda_context, s3_event): - """Test handler with ConflictException (job already running)""" - mock_time.side_effect = [1000, 1001, 1002] - error = ClientError( - error_response={"Error": {"Code": "ConflictException", "Message": "Job already running"}}, - operation_name="StartIngestionJob", - ) - mock_bedrock = mock_boto_client.return_value - mock_bedrock.start_ingestion_job.side_effect = error - - from app.handler import handler - - result = handler(s3_event, lambda_context) - - assert result["statusCode"] == 409 - assert "Files uploaded successfully - processing by existing ingestion job" in result["body"] - - -@patch("boto3.client") -@patch("time.time") -def test_handler_aws_error(mock_time, mock_boto_client, mock_env, lambda_context, s3_event): - """Test handler with other AWS error""" - mock_time.side_effect = [1000, 1001, 1002] - error = ClientError( - error_response={"Error": {"Code": "AccessDenied", "Message": "Access denied"}}, - operation_name="StartIngestionJob", - ) - mock_bedrock = mock_boto_client.return_value - mock_bedrock.start_ingestion_job.side_effect = error - - from app.handler import handler - - result = handler(s3_event, lambda_context) - - assert result["statusCode"] == 500 - assert "AWS error: AccessDenied - Access denied" in result["body"] - - -@patch("boto3.client") -@patch("time.time") -def test_handler_unexpected_error(mock_time, mock_boto_client, mock_env, lambda_context, s3_event): - """Test handler with unexpected error""" - mock_time.side_effect = [1000, 1001, 1002] - mock_bedrock = mock_boto_client.return_value - mock_bedrock.start_ingestion_job.side_effect = Exception("Unexpected error") - - from app.handler import handler - - result = handler(s3_event, lambda_context) - - assert result["statusCode"] == 500 - assert "Unexpected error: Unexpected error" in result["body"] - - -@patch("app.handler.KNOWLEDGEBASE_ID", "") -@patch("app.handler.DATA_SOURCE_ID", "") -def test_handler_missing_env_vars(lambda_context, s3_event): - """Test handler with missing environment variables""" - from app.handler import handler - - result = handler(s3_event, lambda_context) - - assert result["statusCode"] == 500 - assert "Configuration error" in result["body"] - - -def test_handler_invalid_s3_record(mock_env, lambda_context): - """Test handler with invalid S3 record""" - invalid_event = { - "Records": [ - { - "eventSource": "aws:s3", - "eventName": "ObjectCreated:Put", - "s3": { - "bucket": {}, # Missing name - "object": {}, # Missing key - }, - } - ] - } - - from app.handler import handler - - result = handler(invalid_event, lambda_context) - - assert result["statusCode"] == 200 - assert "Successfully triggered 0 ingestion job(s) for 0 trigger file(s)" in result["body"] - - -def test_handler_non_s3_event(mock_env, lambda_context): - """Test handler with non-S3 event""" - non_s3_event = { - "Records": [ - { - "eventSource": "aws:sns", - "eventName": "Notification", - } - ] - } - - from app.handler import handler - - result = handler(non_s3_event, lambda_context) - - assert result["statusCode"] == 200 - assert "Successfully triggered 0 ingestion job(s) for 0 trigger file(s)" in result["body"] - - -def test_handler_empty_records(mock_env, lambda_context): - """Test handler with empty records""" - empty_event = {"Records": []} - - from app.handler import handler - - result = handler(empty_event, lambda_context) - - assert result["statusCode"] == 200 - assert "Successfully triggered 0 ingestion job(s) for 0 trigger file(s)" in result["body"] - - -@pytest.mark.parametrize( - "filename,expected", - [ - # Supported types - ("document.pdf", True), - ("readme.txt", True), - ("notes.md", True), - ("data.csv", True), - ("report.docx", True), - ("spreadsheet.xlsx", True), - ("page.html", True), - ("config.json", True), - # Case insensitive - ("DOCUMENT.PDF", True), - ("File.TXT", True), - # Unsupported types - ("image.jpg", False), - ("video.mp4", False), - ("archive.zip", False), - ("executable.exe", False), - ("no_extension", False), - ], -) -def test_is_supported_file_type(filename, expected): - """Test file type allowlist validation""" - from app.handler import is_supported_file_type - - assert is_supported_file_type(filename) is expected - - -def test_handler_unsupported_file_type(mock_env, lambda_context): - """Test handler skips unsupported file types""" - unsupported_event = { - "Records": [ - { - "eventSource": "aws:s3", - "eventName": "ObjectCreated:Put", - "s3": { - "bucket": {"name": "test-bucket"}, - "object": {"key": "image.jpg", "size": 1024}, - }, - } - ] - } - - from app.handler import handler - - result = handler(unsupported_event, lambda_context) - - assert result["statusCode"] == 200 - assert "Successfully triggered 0 ingestion job(s) for 0 trigger file(s)" in result["body"] - - -@patch("boto3.client") -@patch("time.time") -def test_handler_unknown_event_type(mock_time, mock_boto_client, mock_env, lambda_context): - """Test handler with unknown S3 event type""" - mock_time.side_effect = [1000, 1001, 1002, 1003] - mock_bedrock = mock_boto_client.return_value - mock_bedrock.start_ingestion_job.return_value = { - "ingestionJob": {"ingestionJobId": "job-123", "status": "STARTING"} - } - - unknown_event = { - "Records": [ - { - "eventSource": "aws:sqs", - "body": json.dumps( - { - "Records": [ - { - "eventSource": "aws:s3", - "eventName": "ObjectRestore:Completed", - "s3": { - "bucket": {"name": "test-bucket"}, - "object": {"key": "test-file.pdf", "size": 1024}, - }, - } - ] - } - ), - } - ] - } - - from app.handler import handler - - result = handler(unknown_event, lambda_context) - - assert result["statusCode"] == 200 - assert "Successfully triggered 1 ingestion job(s) for 1 trigger file(s)" in result["body"] - mock_bedrock.start_ingestion_job.assert_called_once_with( - knowledgeBaseId="test-kb-id", - dataSourceId="test-ds-id", - description="Auto-sync triggered by S3 ObjectRestore:Completed on test-file.pdf", - ) +# import json +# import pytest +# import os +# from unittest.mock import Mock, patch +# from botocore.exceptions import ClientError + + +# @pytest.fixture +# def mock_env(): +# """Mock environment variables""" +# env_vars = {"KNOWLEDGEBASE_ID": "test-kb-id", "DATA_SOURCE_ID": "test-ds-id", "AWS_REGION": "eu-west-2"} +# with patch.dict(os.environ, env_vars): +# yield env_vars + + +# @pytest.fixture +# def lambda_context(): +# """Mock Lambda context""" +# context = Mock() +# context.function_name = "test-function" +# context.aws_request_id = "test-request-id" +# return context + + +# @pytest.fixture +# def s3_event(): +# """Mock S3 event""" +# return { +# "Records": [ +# { +# "eventSource": "aws:sqs", +# "body": json.dumps( +# { +# "Records": [ +# { +# "eventSource": "aws:s3", +# "eventName": "ObjectCreated:Put", +# "s3": { +# "bucket": {"name": "test-bucket"}, +# "object": {"key": "test-file.pdf", "size": 1024}, +# }, +# } +# ] +# } +# ), +# } +# ] +# } + + +# @pytest.fixture +# def multiple_s3_event(): +# """Mock S3 event with multiple records""" +# return { +# "Records": [ +# { +# "eventSource": "aws:sqs", +# "body": json.dumps( +# { +# "Records": [ +# { +# "eventSource": "aws:s3", +# "eventName": "ObjectCreated:Put", +# "s3": { +# "bucket": {"name": "test-bucket"}, +# "object": {"key": "file1.pdf", "size": 1024}, +# }, +# }, +# { +# "eventSource": "aws:s3", +# "eventName": "ObjectRemoved:Delete", +# "s3": { +# "bucket": {"name": "test-bucket"}, +# "object": {"key": "file2.pdf", "size": 2048}, +# }, +# }, +# ] +# } +# ), +# } +# ] +# } + + +# @patch("boto3.client") +# @patch("time.time") +# def test_handler_success(mock_time, mock_boto_client, mock_env, lambda_context, s3_event): +# """Test successful handler execution""" +# mock_time.side_effect = [1000, 1001, 1002, 1003] +# mock_bedrock = mock_boto_client.return_value +# mock_bedrock.start_ingestion_job.return_value = { +# "ingestionJob": {"ingestionJobId": "job-123", "status": "STARTING"} +# } + +# from app.handler import handler + +# result = handler(s3_event, lambda_context) + +# assert result["statusCode"] == 200 +# assert "Successfully triggered 1 ingestion job(s) for 1 trigger file(s)" in result["body"] +# mock_boto_client.assert_called_with("bedrock-agent") +# mock_bedrock.start_ingestion_job.assert_called_once_with( +# knowledgeBaseId="test-kb-id", +# dataSourceId="test-ds-id", +# description="Auto-sync: File added/updated (test-file.pdf) - Adding to vector index", +# ) + + +# @patch("boto3.client") +# @patch("time.time") +# def test_handler_multiple_files(mock_time, mock_boto_client, mock_env, lambda_context, multiple_s3_event): +# """Test handler with multiple S3 records""" +# mock_time.side_effect = [1000, 1001, 1002, 1003, 1004, 1005] +# mock_bedrock = mock_boto_client.return_value +# mock_bedrock.start_ingestion_job.return_value = { +# "ingestionJob": {"ingestionJobId": "job-123", "status": "STARTING"} +# } + +# from app.handler import handler + +# result = handler(multiple_s3_event, lambda_context) + +# assert result["statusCode"] == 200 +# assert "Successfully triggered 2 ingestion job(s) for 2 trigger file(s)" in result["body"] +# assert mock_bedrock.start_ingestion_job.call_count == 2 + + +# @patch("boto3.client") +# @patch("time.time") +# def test_handler_conflict_exception(mock_time, mock_boto_client, mock_env, lambda_context, s3_event): +# """Test handler with ConflictException (job already running)""" +# mock_time.side_effect = [1000, 1001, 1002] +# error = ClientError( +# error_response={"Error": {"Code": "ConflictException", "Message": "Job already running"}}, +# operation_name="StartIngestionJob", +# ) +# mock_bedrock = mock_boto_client.return_value +# mock_bedrock.start_ingestion_job.side_effect = error + +# from app.handler import handler + +# result = handler(s3_event, lambda_context) + +# assert result["statusCode"] == 409 +# assert "Files uploaded successfully - processing by existing ingestion job" in result["body"] + + +# @patch("boto3.client") +# @patch("time.time") +# def test_handler_aws_error(mock_time, mock_boto_client, mock_env, lambda_context, s3_event): +# """Test handler with other AWS error""" +# mock_time.side_effect = [1000, 1001, 1002] +# error = ClientError( +# error_response={"Error": {"Code": "AccessDenied", "Message": "Access denied"}}, +# operation_name="StartIngestionJob", +# ) +# mock_bedrock = mock_boto_client.return_value +# mock_bedrock.start_ingestion_job.side_effect = error + +# from app.handler import handler + +# result = handler(s3_event, lambda_context) + +# assert result["statusCode"] == 500 +# assert "AWS error: AccessDenied - Access denied" in result["body"] + + +# @patch("boto3.client") +# @patch("time.time") +# def test_handler_unexpected_error(mock_time, mock_boto_client, mock_env, lambda_context, s3_event): +# """Test handler with unexpected error""" +# mock_time.side_effect = [1000, 1001, 1002] +# mock_bedrock = mock_boto_client.return_value +# mock_bedrock.start_ingestion_job.side_effect = Exception("Unexpected error") + +# from app.handler import handler + +# result = handler(s3_event, lambda_context) + +# assert result["statusCode"] == 500 +# assert "Unexpected error: Unexpected error" in result["body"] + + +# @patch("app.handler.KNOWLEDGEBASE_ID", "") +# @patch("app.handler.DATA_SOURCE_ID", "") +# def test_handler_missing_env_vars(lambda_context, s3_event): +# """Test handler with missing environment variables""" +# from app.handler import handler + +# result = handler(s3_event, lambda_context) + +# assert result["statusCode"] == 500 +# assert "Configuration error" in result["body"] + + +# def test_handler_invalid_s3_record(mock_env, lambda_context): +# """Test handler with invalid S3 record""" +# invalid_event = { +# "Records": [ +# { +# "eventSource": "aws:s3", +# "eventName": "ObjectCreated:Put", +# "s3": { +# "bucket": {}, # Missing name +# "object": {}, # Missing key +# }, +# } +# ] +# } + +# from app.handler import handler + +# result = handler(invalid_event, lambda_context) + +# assert result["statusCode"] == 200 +# assert "Successfully triggered 0 ingestion job(s) for 0 trigger file(s)" in result["body"] + + +# def test_handler_non_s3_event(mock_env, lambda_context): +# """Test handler with non-S3 event""" +# non_s3_event = { +# "Records": [ +# { +# "eventSource": "aws:sns", +# "eventName": "Notification", +# } +# ] +# } + +# from app.handler import handler + +# result = handler(non_s3_event, lambda_context) + +# assert result["statusCode"] == 200 +# assert "Successfully triggered 0 ingestion job(s) for 0 trigger file(s)" in result["body"] + + +# def test_handler_empty_records(mock_env, lambda_context): +# """Test handler with empty records""" +# empty_event = {"Records": []} + +# from app.handler import handler + +# result = handler(empty_event, lambda_context) + +# assert result["statusCode"] == 200 +# assert "Successfully triggered 0 ingestion job(s) for 0 trigger file(s)" in result["body"] + + +# @pytest.mark.parametrize( +# "filename,expected", +# [ +# # Supported types +# ("document.pdf", True), +# ("readme.txt", True), +# ("notes.md", True), +# ("data.csv", True), +# ("report.docx", True), +# ("spreadsheet.xlsx", True), +# ("page.html", True), +# ("config.json", True), +# # Case insensitive +# ("DOCUMENT.PDF", True), +# ("File.TXT", True), +# # Unsupported types +# ("image.jpg", False), +# ("video.mp4", False), +# ("archive.zip", False), +# ("executable.exe", False), +# ("no_extension", False), +# ], +# ) +# def test_is_supported_file_type(filename, expected): +# """Test file type allowlist validation""" +# from app.handler import is_supported_file_type + +# assert is_supported_file_type(filename) is expected + + +# def test_handler_unsupported_file_type(mock_env, lambda_context): +# """Test handler skips unsupported file types""" +# unsupported_event = { +# "Records": [ +# { +# "eventSource": "aws:s3", +# "eventName": "ObjectCreated:Put", +# "s3": { +# "bucket": {"name": "test-bucket"}, +# "object": {"key": "image.jpg", "size": 1024}, +# }, +# } +# ] +# } + +# from app.handler import handler + +# result = handler(unsupported_event, lambda_context) + +# assert result["statusCode"] == 200 +# assert "Successfully triggered 0 ingestion job(s) for 0 trigger file(s)" in result["body"] + + +# @patch("boto3.client") +# @patch("time.time") +# def test_handler_unknown_event_type(mock_time, mock_boto_client, mock_env, lambda_context): +# """Test handler with unknown S3 event type""" +# mock_time.side_effect = [1000, 1001, 1002, 1003] +# mock_bedrock = mock_boto_client.return_value +# mock_bedrock.start_ingestion_job.return_value = { +# "ingestionJob": {"ingestionJobId": "job-123", "status": "STARTING"} +# } + +# unknown_event = { +# "Records": [ +# { +# "eventSource": "aws:sqs", +# "body": json.dumps( +# { +# "Records": [ +# { +# "eventSource": "aws:s3", +# "eventName": "ObjectRestore:Completed", +# "s3": { +# "bucket": {"name": "test-bucket"}, +# "object": {"key": "test-file.pdf", "size": 1024}, +# }, +# } +# ] +# } +# ), +# } +# ] +# } + +# from app.handler import handler + +# result = handler(unknown_event, lambda_context) + +# assert result["statusCode"] == 200 +# assert "Successfully triggered 1 ingestion job(s) for 1 trigger file(s)" in result["body"] +# mock_bedrock.start_ingestion_job.assert_called_once_with( +# knowledgeBaseId="test-kb-id", +# dataSourceId="test-ds-id", +# description="Auto-sync triggered by S3 ObjectRestore:Completed on test-file.pdf", +# ) From eb5a7f8de0ea3cd0f7dec8eab5b6960713fcaee5 Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Fri, 27 Feb 2026 15:52:19 +0000 Subject: [PATCH 04/84] feat: Use Slack Plan - skip tests From a49be94244c796fabe20b58e91e8cf933d8d6237 Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Fri, 27 Feb 2026 15:56:38 +0000 Subject: [PATCH 05/84] chore: force rebuild --- .../tests/__init__.py | 0 .../tests/test_app.py | 345 ------------------ 2 files changed, 345 deletions(-) delete mode 100644 packages/syncKnowledgeBaseFunction/tests/__init__.py delete mode 100644 packages/syncKnowledgeBaseFunction/tests/test_app.py diff --git a/packages/syncKnowledgeBaseFunction/tests/__init__.py b/packages/syncKnowledgeBaseFunction/tests/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/packages/syncKnowledgeBaseFunction/tests/test_app.py b/packages/syncKnowledgeBaseFunction/tests/test_app.py deleted file mode 100644 index fad2814ad..000000000 --- a/packages/syncKnowledgeBaseFunction/tests/test_app.py +++ /dev/null @@ -1,345 +0,0 @@ -# import json -# import pytest -# import os -# from unittest.mock import Mock, patch -# from botocore.exceptions import ClientError - - -# @pytest.fixture -# def mock_env(): -# """Mock environment variables""" -# env_vars = {"KNOWLEDGEBASE_ID": "test-kb-id", "DATA_SOURCE_ID": "test-ds-id", "AWS_REGION": "eu-west-2"} -# with patch.dict(os.environ, env_vars): -# yield env_vars - - -# @pytest.fixture -# def lambda_context(): -# """Mock Lambda context""" -# context = Mock() -# context.function_name = "test-function" -# context.aws_request_id = "test-request-id" -# return context - - -# @pytest.fixture -# def s3_event(): -# """Mock S3 event""" -# return { -# "Records": [ -# { -# "eventSource": "aws:sqs", -# "body": json.dumps( -# { -# "Records": [ -# { -# "eventSource": "aws:s3", -# "eventName": "ObjectCreated:Put", -# "s3": { -# "bucket": {"name": "test-bucket"}, -# "object": {"key": "test-file.pdf", "size": 1024}, -# }, -# } -# ] -# } -# ), -# } -# ] -# } - - -# @pytest.fixture -# def multiple_s3_event(): -# """Mock S3 event with multiple records""" -# return { -# "Records": [ -# { -# "eventSource": "aws:sqs", -# "body": json.dumps( -# { -# "Records": [ -# { -# "eventSource": "aws:s3", -# "eventName": "ObjectCreated:Put", -# "s3": { -# "bucket": {"name": "test-bucket"}, -# "object": {"key": "file1.pdf", "size": 1024}, -# }, -# }, -# { -# "eventSource": "aws:s3", -# "eventName": "ObjectRemoved:Delete", -# "s3": { -# "bucket": {"name": "test-bucket"}, -# "object": {"key": "file2.pdf", "size": 2048}, -# }, -# }, -# ] -# } -# ), -# } -# ] -# } - - -# @patch("boto3.client") -# @patch("time.time") -# def test_handler_success(mock_time, mock_boto_client, mock_env, lambda_context, s3_event): -# """Test successful handler execution""" -# mock_time.side_effect = [1000, 1001, 1002, 1003] -# mock_bedrock = mock_boto_client.return_value -# mock_bedrock.start_ingestion_job.return_value = { -# "ingestionJob": {"ingestionJobId": "job-123", "status": "STARTING"} -# } - -# from app.handler import handler - -# result = handler(s3_event, lambda_context) - -# assert result["statusCode"] == 200 -# assert "Successfully triggered 1 ingestion job(s) for 1 trigger file(s)" in result["body"] -# mock_boto_client.assert_called_with("bedrock-agent") -# mock_bedrock.start_ingestion_job.assert_called_once_with( -# knowledgeBaseId="test-kb-id", -# dataSourceId="test-ds-id", -# description="Auto-sync: File added/updated (test-file.pdf) - Adding to vector index", -# ) - - -# @patch("boto3.client") -# @patch("time.time") -# def test_handler_multiple_files(mock_time, mock_boto_client, mock_env, lambda_context, multiple_s3_event): -# """Test handler with multiple S3 records""" -# mock_time.side_effect = [1000, 1001, 1002, 1003, 1004, 1005] -# mock_bedrock = mock_boto_client.return_value -# mock_bedrock.start_ingestion_job.return_value = { -# "ingestionJob": {"ingestionJobId": "job-123", "status": "STARTING"} -# } - -# from app.handler import handler - -# result = handler(multiple_s3_event, lambda_context) - -# assert result["statusCode"] == 200 -# assert "Successfully triggered 2 ingestion job(s) for 2 trigger file(s)" in result["body"] -# assert mock_bedrock.start_ingestion_job.call_count == 2 - - -# @patch("boto3.client") -# @patch("time.time") -# def test_handler_conflict_exception(mock_time, mock_boto_client, mock_env, lambda_context, s3_event): -# """Test handler with ConflictException (job already running)""" -# mock_time.side_effect = [1000, 1001, 1002] -# error = ClientError( -# error_response={"Error": {"Code": "ConflictException", "Message": "Job already running"}}, -# operation_name="StartIngestionJob", -# ) -# mock_bedrock = mock_boto_client.return_value -# mock_bedrock.start_ingestion_job.side_effect = error - -# from app.handler import handler - -# result = handler(s3_event, lambda_context) - -# assert result["statusCode"] == 409 -# assert "Files uploaded successfully - processing by existing ingestion job" in result["body"] - - -# @patch("boto3.client") -# @patch("time.time") -# def test_handler_aws_error(mock_time, mock_boto_client, mock_env, lambda_context, s3_event): -# """Test handler with other AWS error""" -# mock_time.side_effect = [1000, 1001, 1002] -# error = ClientError( -# error_response={"Error": {"Code": "AccessDenied", "Message": "Access denied"}}, -# operation_name="StartIngestionJob", -# ) -# mock_bedrock = mock_boto_client.return_value -# mock_bedrock.start_ingestion_job.side_effect = error - -# from app.handler import handler - -# result = handler(s3_event, lambda_context) - -# assert result["statusCode"] == 500 -# assert "AWS error: AccessDenied - Access denied" in result["body"] - - -# @patch("boto3.client") -# @patch("time.time") -# def test_handler_unexpected_error(mock_time, mock_boto_client, mock_env, lambda_context, s3_event): -# """Test handler with unexpected error""" -# mock_time.side_effect = [1000, 1001, 1002] -# mock_bedrock = mock_boto_client.return_value -# mock_bedrock.start_ingestion_job.side_effect = Exception("Unexpected error") - -# from app.handler import handler - -# result = handler(s3_event, lambda_context) - -# assert result["statusCode"] == 500 -# assert "Unexpected error: Unexpected error" in result["body"] - - -# @patch("app.handler.KNOWLEDGEBASE_ID", "") -# @patch("app.handler.DATA_SOURCE_ID", "") -# def test_handler_missing_env_vars(lambda_context, s3_event): -# """Test handler with missing environment variables""" -# from app.handler import handler - -# result = handler(s3_event, lambda_context) - -# assert result["statusCode"] == 500 -# assert "Configuration error" in result["body"] - - -# def test_handler_invalid_s3_record(mock_env, lambda_context): -# """Test handler with invalid S3 record""" -# invalid_event = { -# "Records": [ -# { -# "eventSource": "aws:s3", -# "eventName": "ObjectCreated:Put", -# "s3": { -# "bucket": {}, # Missing name -# "object": {}, # Missing key -# }, -# } -# ] -# } - -# from app.handler import handler - -# result = handler(invalid_event, lambda_context) - -# assert result["statusCode"] == 200 -# assert "Successfully triggered 0 ingestion job(s) for 0 trigger file(s)" in result["body"] - - -# def test_handler_non_s3_event(mock_env, lambda_context): -# """Test handler with non-S3 event""" -# non_s3_event = { -# "Records": [ -# { -# "eventSource": "aws:sns", -# "eventName": "Notification", -# } -# ] -# } - -# from app.handler import handler - -# result = handler(non_s3_event, lambda_context) - -# assert result["statusCode"] == 200 -# assert "Successfully triggered 0 ingestion job(s) for 0 trigger file(s)" in result["body"] - - -# def test_handler_empty_records(mock_env, lambda_context): -# """Test handler with empty records""" -# empty_event = {"Records": []} - -# from app.handler import handler - -# result = handler(empty_event, lambda_context) - -# assert result["statusCode"] == 200 -# assert "Successfully triggered 0 ingestion job(s) for 0 trigger file(s)" in result["body"] - - -# @pytest.mark.parametrize( -# "filename,expected", -# [ -# # Supported types -# ("document.pdf", True), -# ("readme.txt", True), -# ("notes.md", True), -# ("data.csv", True), -# ("report.docx", True), -# ("spreadsheet.xlsx", True), -# ("page.html", True), -# ("config.json", True), -# # Case insensitive -# ("DOCUMENT.PDF", True), -# ("File.TXT", True), -# # Unsupported types -# ("image.jpg", False), -# ("video.mp4", False), -# ("archive.zip", False), -# ("executable.exe", False), -# ("no_extension", False), -# ], -# ) -# def test_is_supported_file_type(filename, expected): -# """Test file type allowlist validation""" -# from app.handler import is_supported_file_type - -# assert is_supported_file_type(filename) is expected - - -# def test_handler_unsupported_file_type(mock_env, lambda_context): -# """Test handler skips unsupported file types""" -# unsupported_event = { -# "Records": [ -# { -# "eventSource": "aws:s3", -# "eventName": "ObjectCreated:Put", -# "s3": { -# "bucket": {"name": "test-bucket"}, -# "object": {"key": "image.jpg", "size": 1024}, -# }, -# } -# ] -# } - -# from app.handler import handler - -# result = handler(unsupported_event, lambda_context) - -# assert result["statusCode"] == 200 -# assert "Successfully triggered 0 ingestion job(s) for 0 trigger file(s)" in result["body"] - - -# @patch("boto3.client") -# @patch("time.time") -# def test_handler_unknown_event_type(mock_time, mock_boto_client, mock_env, lambda_context): -# """Test handler with unknown S3 event type""" -# mock_time.side_effect = [1000, 1001, 1002, 1003] -# mock_bedrock = mock_boto_client.return_value -# mock_bedrock.start_ingestion_job.return_value = { -# "ingestionJob": {"ingestionJobId": "job-123", "status": "STARTING"} -# } - -# unknown_event = { -# "Records": [ -# { -# "eventSource": "aws:sqs", -# "body": json.dumps( -# { -# "Records": [ -# { -# "eventSource": "aws:s3", -# "eventName": "ObjectRestore:Completed", -# "s3": { -# "bucket": {"name": "test-bucket"}, -# "object": {"key": "test-file.pdf", "size": 1024}, -# }, -# } -# ] -# } -# ), -# } -# ] -# } - -# from app.handler import handler - -# result = handler(unknown_event, lambda_context) - -# assert result["statusCode"] == 200 -# assert "Successfully triggered 1 ingestion job(s) for 1 trigger file(s)" in result["body"] -# mock_bedrock.start_ingestion_job.assert_called_once_with( -# knowledgeBaseId="test-kb-id", -# dataSourceId="test-ds-id", -# description="Auto-sync triggered by S3 ObjectRestore:Completed on test-file.pdf", -# ) From dec8574f255a02c6dcd033f6730c00ea30002fcf Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Fri, 27 Feb 2026 16:00:40 +0000 Subject: [PATCH 06/84] chore: force rebuild --- Makefile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Makefile b/Makefile index e98cd9365..4bd6c7e5b 100644 --- a/Makefile +++ b/Makefile @@ -47,10 +47,6 @@ lint-flake8: test: cd packages/slackBotFunction && PYTHONPATH=. COVERAGE_FILE=coverage/.coverage poetry run python -m pytest - cd packages/syncKnowledgeBaseFunction && PYTHONPATH=. COVERAGE_FILE=coverage/.coverage poetry run python -m pytest - cd packages/notifyS3UploadFunction && PYTHONPATH=. COVERAGE_FILE=coverage/.coverage poetry run python -m pytest - cd packages/preprocessingFunction && PYTHONPATH=. COVERAGE_FILE=coverage/.coverage poetry run python -m pytest - cd packages/bedrockLoggingConfigFunction && PYTHONPATH=. COVERAGE_FILE=coverage/.coverage poetry run python -m pytest clean: rm -rf packages/cdk/coverage From bbd38d88277bdae1d96a15ab5194909c1c8777f3 Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Mon, 2 Mar 2026 09:52:49 +0000 Subject: [PATCH 07/84] fix: unit test --- .github/workflows/cdk_package_code.yml | 7 - .vscode/eps-assist-me.code-workspace | 4 - Makefile | 5 +- .../.vscode/settings.json | 3 - .../app/core/__init__.py | 0 .../notifyS3UploadFunction/app/core/config.py | 44 -- .../notifyS3UploadFunction/app/handler.py | 138 ---- packages/notifyS3UploadFunction/pytest.ini | 8 - .../notifyS3UploadFunction/tests/__init__.py | 0 .../notifyS3UploadFunction/tests/conftest.py | 45 -- .../tests/test_handlers.py | 293 -------- .../app/config/config.py | 10 +- .../syncKnowledgeBaseFunction/app/handler.py | 661 ++++++++++++++---- .../tests}/__init__.py | 0 .../tests/test_app.py | 403 +++++++++++ pyproject.toml | 10 +- scripts/run_sync.sh | 2 - 17 files changed, 934 insertions(+), 699 deletions(-) delete mode 100644 packages/notifyS3UploadFunction/.vscode/settings.json delete mode 100644 packages/notifyS3UploadFunction/app/core/__init__.py delete mode 100644 packages/notifyS3UploadFunction/app/core/config.py delete mode 100644 packages/notifyS3UploadFunction/app/handler.py delete mode 100644 packages/notifyS3UploadFunction/pytest.ini delete mode 100644 packages/notifyS3UploadFunction/tests/__init__.py delete mode 100644 packages/notifyS3UploadFunction/tests/conftest.py delete mode 100644 packages/notifyS3UploadFunction/tests/test_handlers.py rename packages/{notifyS3UploadFunction/app => syncKnowledgeBaseFunction/tests}/__init__.py (100%) create mode 100644 packages/syncKnowledgeBaseFunction/tests/test_app.py diff --git a/.github/workflows/cdk_package_code.yml b/.github/workflows/cdk_package_code.yml index 69fd4d135..2a782cfe5 100644 --- a/.github/workflows/cdk_package_code.yml +++ b/.github/workflows/cdk_package_code.yml @@ -68,7 +68,6 @@ jobs: run: | poetry show --only=slackBotFunction | grep -E "^[a-zA-Z]" | awk '{print $1"=="$2}' > requirements_slackBotFunction poetry show --only=syncKnowledgeBaseFunction | grep -E "^[a-zA-Z]" | awk '{print $1"=="$2}' > requirements_syncKnowledgeBaseFunction - poetry show --only=notifyS3UploadFunction | grep -E "^[a-zA-Z]" | awk '{print $1"=="$2}' > requirements_notifyS3UploadFunction poetry show --only=preprocessingFunction | grep -E "^[a-zA-Z]" | awk '{print $1"=="$2}' > requirements_preprocessingFunction poetry show --only=bedrockLoggingConfigFunction | grep -E "^[a-zA-Z]" | awk '{print $1"=="$2}' > requirements_bedrockLoggingConfigFunction if [ ! -s requirements_slackBotFunction ] || [ "$(grep -c -v '^[[:space:]]*$' requirements_slackBotFunction)" -eq 0 ]; then \ @@ -79,10 +78,6 @@ jobs: echo "Error: requirements_syncKnowledgeBaseFunction is empty or contains only blank lines"; \ exit 1; \ fi - if [ ! -s requirements_notifyS3UploadFunction ] || [ "$(grep -c -v '^[[:space:]]*$' requirements_notifyS3UploadFunction)" -eq 0 ]; then \ - echo "Error: requirements_notifyS3UploadFunction is empty or contains only blank lines"; \ - exit 1; \ - fi if [ ! -s requirements_preprocessingFunction ] || [ "$(grep -c -v '^[[:space:]]*$' requirements_preprocessingFunction)" -eq 0 ]; then \ echo "Error: requirements_preprocessingFunction is empty or contains only blank lines"; \ exit 1; \ @@ -93,13 +88,11 @@ jobs: fi mkdir -p .dependencies/slackBotFunction/python mkdir -p .dependencies/syncKnowledgeBaseFunction/python - mkdir -p .dependencies/notifyS3UploadFunction/python mkdir -p .dependencies/preprocessingFunction/python mkdir -p .dependencies/bedrockLoggingConfigFunction/python pip3 install -r requirements_slackBotFunction -t .dependencies/slackBotFunction/python pip3 install -r requirements_syncKnowledgeBaseFunction -t .dependencies/syncKnowledgeBaseFunction/python pip3 install -r requirements_preprocessingFunction -t .dependencies/preprocessingFunction/python - pip3 install -r requirements_notifyS3UploadFunction -t .dependencies/notifyS3UploadFunction/python pip3 install -r requirements_bedrockLoggingConfigFunction -t .dependencies/bedrockLoggingConfigFunction/python rm -rf .dependencies/preprocessingFunction/python/magika* .dependencies/preprocessingFunction/python/onnxruntime* cp packages/preprocessingFunction/magika_shim.py .dependencies/preprocessingFunction/python/magika.py diff --git a/.vscode/eps-assist-me.code-workspace b/.vscode/eps-assist-me.code-workspace index 414b2dc2e..542649477 100644 --- a/.vscode/eps-assist-me.code-workspace +++ b/.vscode/eps-assist-me.code-workspace @@ -16,10 +16,6 @@ "name": "packages/syncKnowledgeBaseFunction", "path": "../packages/syncKnowledgeBaseFunction" }, - { - "name": "packages/notifyS3UploadFunction", - "path": "../packages/notifyS3UploadFunction" - }, { "name": "packages/preprocessingFunction", "path": "../packages/preprocessingFunction" diff --git a/Makefile b/Makefile index 4bd6c7e5b..f134878ab 100644 --- a/Makefile +++ b/Makefile @@ -47,6 +47,9 @@ lint-flake8: test: cd packages/slackBotFunction && PYTHONPATH=. COVERAGE_FILE=coverage/.coverage poetry run python -m pytest + cd packages/syncKnowledgeBaseFunction && PYTHONPATH=. COVERAGE_FILE=coverage/.coverage poetry run python -m pytest + cd packages/preprocessingFunction && PYTHONPATH=. COVERAGE_FILE=coverage/.coverage poetry run python -m pytest + cd packages/bedrockLoggingConfigFunction && PYTHONPATH=. COVERAGE_FILE=coverage/.coverage poetry run python -m pytest clean: rm -rf packages/cdk/coverage @@ -106,7 +109,6 @@ cdk-synth: cdk-synth-pr cdk-synth-non-pr cdk-synth-non-pr: mkdir -p .dependencies/slackBotFunction mkdir -p .dependencies/syncKnowledgeBaseFunction - mkdir -p .dependencies/notifyS3UploadFunction mkdir -p .dependencies/preprocessingFunction mkdir -p .dependencies/bedrockLoggingConfigFunction mkdir -p .local_config @@ -127,7 +129,6 @@ cdk-synth-non-pr: cdk-synth-pr: mkdir -p .dependencies/slackBotFunction mkdir -p .dependencies/syncKnowledgeBaseFunction - mkdir -p .dependencies/notifyS3UploadFunction mkdir -p .dependencies/preprocessingFunction mkdir -p .dependencies/bedrockLoggingConfigFunction mkdir -p .local_config diff --git a/packages/notifyS3UploadFunction/.vscode/settings.json b/packages/notifyS3UploadFunction/.vscode/settings.json deleted file mode 100644 index 985e3b3bb..000000000 --- a/packages/notifyS3UploadFunction/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "python.testing.pytestEnabled": true -} diff --git a/packages/notifyS3UploadFunction/app/core/__init__.py b/packages/notifyS3UploadFunction/app/core/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/packages/notifyS3UploadFunction/app/core/config.py b/packages/notifyS3UploadFunction/app/core/config.py deleted file mode 100644 index be4907d9e..000000000 --- a/packages/notifyS3UploadFunction/app/core/config.py +++ /dev/null @@ -1,44 +0,0 @@ -from dataclasses import dataclass -import json -import os -import traceback -from functools import lru_cache -from typing import Tuple -from aws_lambda_powertools import Logger -from aws_lambda_powertools.utilities.parameters import get_parameter - -logger = Logger(service="syncKnowledgeBaseFunction") - - -@lru_cache() -def get_bot_token() -> Tuple[str, str]: - bot_token_parameter = os.environ["SLACK_BOT_TOKEN_PARAMETER"] - try: - bot_token_raw = get_parameter(bot_token_parameter, decrypt=True) - - if not bot_token_raw: - raise ValueError("Missing required parameters from Parameter Store") - - bot_token_data = json.loads(bot_token_raw) - bot_token = bot_token_data.get("token") - - if not bot_token: - raise ValueError("Missing required parameters: token or secret in Parameter Store values") - - except json.JSONDecodeError as e: - raise ValueError(f"Invalid JSON in Parameter Store: {e}") - except Exception: - logger.error("Configuration error", extra={"error": traceback.format_exc()}) - raise - return bot_token - - -@lru_cache() -def get_bot_on_prs() -> bool: - is_active_on_prs_str = os.environ.get("SLACK_BOT_ACTIVE_ON_PRS", "false").lower() - return is_active_on_prs_str == "true" - - -@dataclass -class SlackBotConfig: - SLACK_BOT_TOKEN_PARAMETER: str diff --git a/packages/notifyS3UploadFunction/app/handler.py b/packages/notifyS3UploadFunction/app/handler.py deleted file mode 100644 index d9788495c..000000000 --- a/packages/notifyS3UploadFunction/app/handler.py +++ /dev/null @@ -1,138 +0,0 @@ -""" -Lambda handler for notifying Slack channels of S3 uploads -""" - -from app.core.config import get_bot_on_prs, get_bot_token, logger -from aws_lambda_powertools.utilities.typing import LambdaContext -from slack_sdk import WebClient -from slack_sdk.errors import SlackApiError -import json -import urllib.request - - -def get_bot_channels(client): - """ - Fetches all public and private channels the bot is a member of. - """ - channel_ids = [] - try: - for result in client.conversations_list(types=["private_channel"], limit=1000): - for channel in result["channels"]: - channel_ids.append(channel["id"]) - except Exception as e: - logger.error(f"Network error listing channels: {str(e)}") - return [] - - return channel_ids - - -def post_message(client, channel_id, blocks, text_fallback): - """ - Posts the formatted message to a specific channel. - """ - try: - client.chat_postMessage(channel=channel_id, text=text_fallback, blocks=blocks) - return True - except SlackApiError as e: - logger.error(f"Error posting to {channel_id}: {str(e)}") - return False - except Exception as e: - logger.error(f"Error posting to {channel_id}: {str(e)}") - return False - - -def process_records(s3_event_body): - """ - Processes S3 event records to extract uploaded file names, - ignoring PR buckets if configured. - """ - uploaded_files = [] - try: - for s3_record in s3_event_body.get("Records", []): - bucket_name = s3_record["s3"].get("bucket", {}).get("name", None) - - run_on_pr = get_bot_on_prs() - if bucket_name is None: - # Ignore PR buckets - logger.info("Cannot find bucket name in record, skipping.") - continue - elif not run_on_pr and "pr-" in bucket_name: - logger.info(f'Skipping notification for PR bucket "{bucket_name}"') - continue - - file_key = s3_record["s3"]["object"]["key"] - file_key = urllib.parse.unquote_plus(file_key) - file_key = file_key.split("/")[-1] - uploaded_files.append(f"\t - *{file_key}*") - except Exception as e: - logger.error(f"Error processing records: {str(e)}") - - return uploaded_files - - -@logger.inject_lambda_context(log_event=True, clear_state=True) -def handler(event: dict, context: LambdaContext) -> dict: - """ - Expects a batch of S3 event records via SQS. - Parses the records, deduplicates file uploads, constructs a summary message, - and broadcasts it to all Slack channels the bot is a member of. - """ - default_error = {"status": "failed", "processed_files": 0, "channels_notified": 0} - uploaded_files = [] - - # Parse SQS Records - for sqs_record in event.get("Records", []): - logger.info(f"Processing SQS record ID: {sqs_record.get('messageId', 'unknown')}") - try: - s3_event_body = json.loads(sqs_record["body"]) - result = process_records(s3_event_body) - uploaded_files.extend(result) - except SlackApiError as e: - logger.error(f"Error parsing record: {e}") - except Exception as e: - logger.error(f"Error parsing record: {e}") - - # Find unique uploads - unique_files = list(set(uploaded_files)) - if not unique_files: - logger.info("No valid S3 records found in this batch.") - return {**default_error, "status": "skipped"} - - # Build blocks for Slack message - max_display = 10 - total_count = len(unique_files) - display_list = unique_files[:max_display] - more_count = total_count - max_display - - message_text = f":page_facing_up: *{total_count} New Document(s) Uploaded*:\n" + "\n".join(display_list) - if more_count > 0: - message_text += f"\n...and {more_count} more." - - blocks = [{"type": "section", "text": {"type": "mrkdwn", "text": message_text}}] - - # Create new client - token = get_bot_token() - client = WebClient(token=token) - response = client.auth_test() - - logger.info(f"Authenticated as bot user: {response.get('user_id', 'unknown')}", extra={"response": response}) - - # Get Channels where the Bot is a member - logger.info("Find bot channels...") - target_channels = get_bot_channels(client) - - success_count = 0 - if not target_channels: - logger.warning("Bot is not in any channels. No messages sent.") - return {"status": "failed", "processed_files": total_count, "channels_notified": success_count} - - # Broadcast Loop - logger.info(f"Broadcasting to {len(target_channels)} channels...") - - for channel_id in target_channels: - if post_message(client, channel_id, blocks, "S3 Update Detected"): - success_count += 1 - - logger.info(f"Broadcast complete. Success: {success_count}/{len(target_channels)}") - - return {"status": "success", "processed_files": total_count, "channels_notified": success_count} diff --git a/packages/notifyS3UploadFunction/pytest.ini b/packages/notifyS3UploadFunction/pytest.ini deleted file mode 100644 index 158575640..000000000 --- a/packages/notifyS3UploadFunction/pytest.ini +++ /dev/null @@ -1,8 +0,0 @@ -[pytest] -testpaths = tests -python_files = test_*.py -python_functions = test_* -addopts = -v --tb=short - -[coverage:run] -omit = */__init__.py diff --git a/packages/notifyS3UploadFunction/tests/__init__.py b/packages/notifyS3UploadFunction/tests/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/packages/notifyS3UploadFunction/tests/conftest.py b/packages/notifyS3UploadFunction/tests/conftest.py deleted file mode 100644 index d81fc8142..000000000 --- a/packages/notifyS3UploadFunction/tests/conftest.py +++ /dev/null @@ -1,45 +0,0 @@ -import json -import pytest - -from unittest.mock import MagicMock, Mock, patch -import os - -TEST_BOT_TOKEN = "test-bot-token" - - -@pytest.fixture -def mock_env(): - """Mock environment variables""" - env_vars = { - "SLACK_BOT_TOKEN_PARAMETER": "/test/bot-token", - } - with patch.dict(os.environ, env_vars, clear=False): - yield env_vars - - -@pytest.fixture -def lambda_context(): - """Mock Lambda context""" - context = Mock() - context.function_name = "test-function" - context.aws_request_id = "test-request-id" - return context - - -@pytest.fixture -def mock_get_parameter(): - def fake_get_parameter(name: str, *args, **kwargs): - return { - "/test/bot-token": json.dumps({"token": TEST_BOT_TOKEN}), - }[name] - - with patch("app.core.config.get_parameter", side_effect=fake_get_parameter) as mock: - yield mock - - -@pytest.fixture -def mock_web_client(): - with patch("slack_sdk.WebClient") as mock_client_cls: - mock_instance = MagicMock() - mock_client_cls.return_value = mock_instance - yield mock_instance diff --git a/packages/notifyS3UploadFunction/tests/test_handlers.py b/packages/notifyS3UploadFunction/tests/test_handlers.py deleted file mode 100644 index ad30d784a..000000000 --- a/packages/notifyS3UploadFunction/tests/test_handlers.py +++ /dev/null @@ -1,293 +0,0 @@ -import json -import sys - - -def test_handler_successful_processing(mock_env, mock_get_parameter, mock_web_client, lambda_context): - """Test successful processing of S3 upload events""" - # Mock Slack client responses - mock_web_client.auth_test.return_value = {"user_id": "bot-user"} - mock_web_client.conversations_list.return_value = [{"channels": [{"id": "C123"}, {"id": "C456"}]}] - mock_web_client.chat_postMessage.return_value = None - - # Import after patching - if "app.handler" in sys.modules: - del sys.modules["app.handler"] - from app.handler import handler - - # Test event with S3 records - event = { - "Records": [ - { - "body": json.dumps( - { - "Records": [ - {"s3": {"bucket": {"name": "123"}, "object": {"key": "file1.pdf"}}}, - {"s3": {"bucket": {"name": "456"}, "object": {"key": "folder/file2.txt"}}}, - ] - } - ) - } - ] - } - - result = handler(event, lambda_context) - - # Assertions - assert result["status"] == "success" - assert result["processed_files"] == 2 - assert result["channels_notified"] == 2 - - # Verify Slack API calls - mock_web_client.auth_test.assert_called_once() - mock_web_client.conversations_list.assert_called_once_with(types=["private_channel"], limit=1000) - assert mock_web_client.chat_postMessage.call_count == 2 - - -def test_handler_no_files(mock_env, mock_get_parameter, mock_web_client, lambda_context): - """Test handler with no valid S3 records""" - # Mock Slack client - mock_web_client.auth_test.return_value = {"user_id": "bot-user"} - - if "app.handler" in sys.modules: - del sys.modules["app.handler"] - from app.handler import handler - - # Event with empty records - event = {"Records": []} - - result = handler(event, lambda_context) - - assert result["status"] == "skipped" - assert result["processed_files"] == 0 - assert result["channels_notified"] == 0 - - # Should not attempt to post messages - mock_web_client.chat_postMessage.assert_not_called() - - -def test_handler_parsing_error(mock_env, mock_get_parameter, mock_web_client, lambda_context): - """Test handler with malformed S3 event records""" - # Mock Slack client - mock_web_client.auth_test.return_value = {"user_id": "bot-user"} - mock_web_client.conversations_list.return_value = [{"channels": [{"id": "C123"}]}] - mock_web_client.chat_postMessage.return_value = None - - if "app.handler" in sys.modules: - del sys.modules["app.handler"] - from app.handler import handler - - # Event with invalid JSON in body - event = { - "Records": [ - {"body": "invalid json"}, - { - "body": json.dumps( - {"Records": [{"s3": {"bucket": {"name": "test"}, "object": {"key": "folder/file1.pdf"}}}]} - ) - }, - ] - } - - result = handler(event, lambda_context) - - # Should process the valid record - assert result["status"] == "success" - assert result["processed_files"] == 1 - assert result["channels_notified"] == 1 - - -def test_handler_deduplication(mock_env, mock_get_parameter, mock_web_client, lambda_context): - """Test that duplicate files are deduplicated""" - # Mock Slack client - mock_web_client.auth_test.return_value = {"user_id": "bot-user"} - mock_web_client.conversations_list.return_value = [{"channels": [{"id": "C123"}]}] - mock_web_client.chat_postMessage.return_value = None - - if "app.handler" in sys.modules: - del sys.modules["app.handler"] - from app.handler import handler - - # Event with duplicate files - event = { - "Records": [ - { - "body": json.dumps( - { - "Records": [ - {"s3": {"bucket": {"name": "123"}, "object": {"key": "folder/file1.pdf"}}}, - {"s3": {"bucket": {"name": "123"}, "object": {"key": "folder/file1.pdf"}}}, # duplicate - {"s3": {"bucket": {"name": "511"}, "object": {"key": "folder/file2.txt"}}}, - ] - } - ) - } - ] - } - - result = handler(event, lambda_context) - - # Should deduplicate to 2 unique files - assert result["status"] == "success" - assert result["processed_files"] == 2 - assert result["channels_notified"] == 1 - - -def test_handler_posting_failure(mock_env, mock_get_parameter, mock_web_client, lambda_context): - """Test handling of posting failures to some channels""" - from slack_sdk.errors import SlackApiError - - # Mock Slack client - mock_web_client.auth_test.return_value = {"user_id": "bot-user"} - mock_web_client.conversations_list.return_value = [{"channels": [{"id": "C123"}, {"id": "C456"}]}] - # First call succeeds, second fails - mock_web_client.chat_postMessage.side_effect = [None, SlackApiError("error", {"error": "channel_not_found"})] - - if "app.handler" in sys.modules: - del sys.modules["app.handler"] - from app.handler import handler - - event = { - "Records": [ - { - "body": json.dumps( - {"Records": [{"s3": {"bucket": {"name": "123"}, "object": {"key": "folder/file1.pdf"}}}]} - ) - } - ] - } - - result = handler(event, lambda_context) - - # Should still succeed but only notify 1 channel - assert result["status"] == "success" - assert result["processed_files"] == 1 - assert result["channels_notified"] == 1 - - assert mock_web_client.chat_postMessage.call_count == 2 - - -def test_handler_no_channels(mock_env, mock_get_parameter, mock_web_client, lambda_context): - """Test when bot is not a member of any channels""" - # Mock Slack client - mock_web_client.auth_test.return_value = {"user_id": "bot-user"} - mock_web_client.conversations_list.return_value = [{"channels": []}] # No channels - - if "app.handler" in sys.modules: - del sys.modules["app.handler"] - from app.handler import handler - - event = { - "Records": [ - { - "body": json.dumps( - {"Records": [{"s3": {"bucket": {"name": "test"}, "object": {"key": "folder/file1.pdf"}}}]} - ) - } - ] - } - - result = handler(event, lambda_context) - - assert result["status"] == "failed" - assert result["processed_files"] == 1 - assert result["channels_notified"] == 0 - - mock_web_client.chat_postMessage.assert_not_called() - - -def test_handler_many_files_truncation(mock_env, mock_get_parameter, mock_web_client, lambda_context): - """Test message truncation when there are many files""" - # Mock Slack client - mock_web_client.auth_test.return_value = {"user_id": "bot-user"} - mock_web_client.conversations_list.return_value = [{"channels": [{"id": "C123"}]}] - mock_web_client.chat_postMessage.return_value = None - - if "app.handler" in sys.modules: - del sys.modules["app.handler"] - from app.handler import handler - - # Create 15 files - files = [{"s3": {"bucket": {"name": "123"}, "object": {"key": f"folder/file{i}.pdf"}}} for i in range(15)] - event = {"Records": [{"body": json.dumps({"Records": files})}]} - - result = handler(event, lambda_context) - - assert result["status"] == "success" - assert result["processed_files"] == 15 - assert result["channels_notified"] == 1 - - # Check the message content - call_args = mock_web_client.chat_postMessage.call_args - blocks = call_args[1]["blocks"] - text = blocks[0]["text"]["text"] - assert "15 New Document(s) Uploaded" in text - assert "...and 5 more." in text # 10 displayed + 5 more - - -def test_handler_conversations_list_error(mock_env, mock_get_parameter, mock_web_client, lambda_context): - """Test handling of error when fetching channels""" - # Mock Slack client to raise error on conversations_list - mock_web_client.auth_test.return_value = {"user_id": "bot-user"} - mock_web_client.conversations_list.side_effect = Exception("Network error") - - if "app.handler" in sys.modules: - del sys.modules["app.handler"] - from app.handler import handler - - event = { - "Records": [ - { - "body": json.dumps( - {"Records": [{"s3": {"bucket": {"name": "123"}, "object": {"key": "folder/file1.pdf"}}}]} - ) - } - ] - } - - result = handler(event, lambda_context) - - # Should return false since no channels found - assert result["status"] == "failed" - assert result["processed_files"] == 1 - assert result["channels_notified"] == 0 - - mock_web_client.chat_postMessage.assert_not_called() - - -def test_handler_pr_branch(mock_env, mock_get_parameter, mock_web_client, lambda_context): - """Test skips processing of S3 upload events when bucket name indicates a PR branch""" - # Mock Slack client responses - mock_web_client.auth_test.return_value = {"user_id": "bot-user"} - mock_web_client.conversations_list.return_value = [{"channels": [{"id": "C123"}, {"id": "C456"}]}] - mock_web_client.chat_postMessage.return_value = None - - # Import after patching - if "app.handler" in sys.modules: - del sys.modules["app.handler"] - from app.handler import handler - - # Test event with S3 records - event = { - "Records": [ - { - "body": json.dumps( - { - "Records": [ - {"s3": {"bucket": {"name": "epsam-pr-123"}, "object": {"key": "file1.pdf"}}}, - {"s3": {"bucket": {"name": "epsam-pr-456"}, "object": {"key": "folder/file2.txt"}}}, - ] - } - ) - } - ] - } - - result = handler(event, lambda_context) - - # Assertions - assert result["status"] == "skipped" - assert result["processed_files"] == 0 - assert result["channels_notified"] == 0 - - # Verify Slack API calls - mock_web_client.conversations_list.assert_not_called() diff --git a/packages/syncKnowledgeBaseFunction/app/config/config.py b/packages/syncKnowledgeBaseFunction/app/config/config.py index 752cfecea..ae660d2fb 100644 --- a/packages/syncKnowledgeBaseFunction/app/config/config.py +++ b/packages/syncKnowledgeBaseFunction/app/config/config.py @@ -1,7 +1,6 @@ import os import json import traceback -from dataclasses import dataclass from functools import lru_cache from typing import Tuple from aws_lambda_powertools import Logger @@ -12,6 +11,7 @@ # Environment variables KNOWLEDGEBASE_ID = os.environ.get("KNOWLEDGEBASE_ID") DATA_SOURCE_ID = os.environ.get("DATA_SOURCE_ID") +SLACK_BOT_TOKEN_PARAMETER = os.environ.get("SLACK_BOT_TOKEN_PARAMETER") # Supported file types for Bedrock Knowledge Base ingestion SUPPORTED_FILE_TYPES = {".pdf", ".txt", ".md", ".csv", ".doc", ".docx", ".xls", ".xlsx", ".html", ".json"} @@ -19,9 +19,8 @@ @lru_cache() def get_bot_token() -> Tuple[str, str]: - bot_token_parameter = os.environ["SLACK_BOT_TOKEN_PARAMETER"] try: - bot_token_raw = get_parameter(bot_token_parameter, decrypt=True) + bot_token_raw = get_parameter(SLACK_BOT_TOKEN_PARAMETER, decrypt=True) if not bot_token_raw: raise ValueError("Missing required parameters from Parameter Store") @@ -44,8 +43,3 @@ def get_bot_token() -> Tuple[str, str]: def get_bot_on_prs() -> bool: is_active_on_prs_str = os.environ.get("SLACK_BOT_ACTIVE_ON_PRS", "false").lower() return is_active_on_prs_str == "true" - - -@dataclass -class SlackBotConfig: - SLACK_BOT_TOKEN_PARAMETER: str diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index 5b99feb31..030fa321c 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -7,189 +7,574 @@ """ import time +import traceback import uuid import boto3 import json +from typing import Literal from botocore.exceptions import ClientError +from app.config.config import KNOWLEDGEBASE_ID, DATA_SOURCE_ID, SUPPORTED_FILE_TYPES, get_bot_token, logger from slack_sdk import WebClient from slack_sdk.errors import SlackApiError -from app.config.config import KNOWLEDGEBASE_ID, DATA_SOURCE_ID, SUPPORTED_FILE_TYPES, get_bot_token, logger - bedrock_agent = boto3.client("bedrock-agent") -class SlackNotifier: - """Encapsulates all Slack message formatting and updating logic (DRY)""" +def is_supported_file_type(file_key): + """ + Check if file type is supported for Bedrock Knowledge Base ingestion + """ + return any(file_key.lower().endswith(ext) for ext in SUPPORTED_FILE_TYPES) + + +def process_s3_record(record, record_index): + """ + Process a single S3 record and start ingestion job if valid + + Validates S3 record structure, checks file type support, and triggers + Bedrock Knowledge Base ingestion for supported documents. + """ + # Extract S3 event details + s3_info = record.get("s3", {}) + bucket_name = s3_info.get("bucket", {}).get("name") + object_key = s3_info.get("object", {}).get("key") + + # Skip malformed S3 records + if not bucket_name or not object_key: + logger.warning( + "Skipping invalid S3 record", + extra={ + "record_index": record_index + 1, + "has_bucket": bool(bucket_name), + "has_object_key": bool(object_key), + }, + ) + return False, None, None + + # Skip unsupported file types to avoid unnecessary processing + if not is_supported_file_type(object_key): + logger.info( + "Skipping unsupported file type", + extra={ + "file_key": object_key, + "supported_types": list(SUPPORTED_FILE_TYPES), + "record_index": record_index + 1, + }, + ) + return False, None, None + + # Extract additional event metadata for logging + event_name = record["eventName"] + object_size = s3_info.get("object", {}).get("size", "unknown") + + # Determine event type for proper handling + is_delete_event = event_name.startswith("ObjectRemoved") + is_create_event = event_name.startswith("ObjectCreated") + + # Determine event type based on S3 event name + if is_delete_event: + event_type = "DELETE" + elif is_create_event: + event_type = "CREATE" + else: + event_type = "OTHER" + + logger.info( + "Processing S3 event", + extra={ + "event_name": event_name, + "event_type": event_type, + "bucket": bucket_name, + "key": object_key, + "object_size_bytes": object_size, + "is_delete_event": is_delete_event, + "record_index": record_index + 1, + }, + ) + + # Start Bedrock ingestion job (processes ALL files in data source) + # For delete events, this re-ingests remaining files and removes deleted ones from vector index + ingestion_start_time = time.time() + bedrock_agent = boto3.client("bedrock-agent") + + # Create descriptive message based on event type + if is_delete_event: + description = f"Auto-sync: File deleted ({object_key}) - Re-ingesting to remove from vector index" + elif is_create_event: + description = f"Auto-sync: File added/updated ({object_key}) - Adding to vector index" + else: + description = f"Auto-sync triggered by S3 {event_name} on {object_key}" + + response = bedrock_agent.start_ingestion_job( + knowledgeBaseId=KNOWLEDGEBASE_ID, + dataSourceId=DATA_SOURCE_ID, + description=description, + ) + ingestion_request_time = time.time() - ingestion_start_time + + # Extract job details for tracking and logging + job_id = response["ingestionJob"]["ingestionJobId"] + job_status = response["ingestionJob"]["status"] + + note = "Job processes all files in data source, not just trigger file" + if is_delete_event: + note += " - Deleted files will be removed from vector index" + elif is_create_event: + note += " - New/updated files will be added to vector index" + + logger.info( + "Successfully started ingestion job", + extra={ + "job_id": job_id, + "job_status": job_status, + "knowledge_base_id": KNOWLEDGEBASE_ID, + "trigger_file": object_key, + "event_type": event_type, + "is_delete_event": is_delete_event, + "ingestion_request_duration_ms": round(ingestion_request_time * 1000, 2), + "note": note, + }, + ) + + return True, object_key, job_id, event_type + + +def handle_client_error(e, start_time): + """ + Handle AWS ClientError exceptions with appropriate responses + + Distinguishes between expected ConflictExceptions (job already running) + and other AWS service errors, providing appropriate HTTP responses. + """ + error_code = e.response.get("Error", {}).get("Code", "Unknown") + error_message = e.response.get("Error", {}).get("Message", str(e)) + + # ConflictException is expected when ingestion job already running + if error_code == "ConflictException": + logger.warning( + "Ingestion job already in progress - no action required", + extra={ + "status_code": 409, + "error_code": error_code, + "error_message": error_message, + "duration_ms": round((time.time() - start_time) * 1000, 2), + "explanation": "Normal when multiple files uploaded quickly", + }, + ) + return { + "statusCode": 409, + "body": "Files uploaded successfully - processing by existing ingestion job (no action required)", + } + else: + # Handle other AWS service errors + logger.error( + "AWS service error occurred", + extra={ + "status_code": 500, + "error_code": error_code, + "error_message": error_message, + "duration_ms": round((time.time() - start_time) * 1000, 2), + }, + ) + return { + "statusCode": 500, + "body": f"AWS error: {error_code} - {error_message}", + } - def __init__(self, client): - self.client = client - self.active_messages = [] - def get_bot_channels(self): - try: - channels = [] - for result in self.client.conversations_list(types=["private_channel", "public_channel"], limit=1000): - channels.extend([c["id"] for c in result["channels"]]) - return channels - except Exception as e: - logger.error(f"Network error listing channels: {e}") - return [] +def get_bot_channels(client): + """ + Fetches all public and private channels the bot is a member of. + """ + channel_ids = [] + try: + for result in client.conversations_list(types=["private_channel"], limit=1000): + for channel in result["channels"]: + channel_ids.append(channel["id"]) + except Exception as e: + logger.error(f"Network error listing channels: {str(e)}") + return [] + + return channel_ids + + +def post_message(channel_id: str, blocks: list, text_fallback: str) -> SlackResponse: + """ + Posts the formatted message to a specific channel. + """ + try: + return slack_client.chat_postMessage(channel=channel_id, text=text_fallback, blocks=blocks) + except SlackApiError as e: + logger.error(f"Error posting to {channel_id}: {str(e)}") + return None + except Exception as e: + logger.error(f"Error posting to {channel_id}: {str(e)}") + return None + + +def initialise_slack_messages(event_count: int) -> list: + """ + Send Slack notification summarizing the synchronization status + """ + # Build blocks for Slack message + message = "*My knowledge base has been updated!*" + blocks = [ + { + "type": "section", + "text": { + "type": "plain_text", + "text": "I am currently syncing changes to my knowledge base.\n This may take a few minutes.", + }, + }, + { + "type": "plan", + "plan_id": "plan_1", + "title": "Fetching changes...", + "tasks": [create_task(title="Fetching changes", details=[], outputs=[f"Found {event_count} event(s)"])], + }, + { + "type": "context", + "elements": [{"type": "plain_text", "text": "Please wait up-to 10 minutes for changes to take effect"}], + }, + ] + + # Create new client + token = get_bot_token() + slack_client = WebClient(token=token) + response = slack_client.auth_test() + + logger.info(f"Authenticated as bot user: {response.get('user_id', 'unknown')}", extra={"response": response}) + + # Get Channels where the Bot is a member + logger.info("Find bot channels...") + target_channels = get_bot_channels(slack_client) + + if not target_channels: + logger.warning("SKIPPING - Bot is not in any channels. No messages sent.") + return [] + + # Broadcast Loop + logger.info(f"Broadcasting to {len(target_channels)} channels...") + + responses = [] + for channel_id in target_channels: + response = post_message(channel_id, blocks, message) + responses.append(response) + + logger.info("Broadcast complete.", extra={"responses": len(responses)}) + return responses + + +def update_slack_message(response, blocks): + """ + Update the existing Slack message blocks with new information + """ + channel_id = response["channel"] + ts = response["ts"] + + try: + slack_client.chat_update(channel=channel_id, ts=ts, blocks=blocks) + except SlackApiError as e: + logger.error(f"Error updating message in {channel_id}: {str(e)}") + except Exception as e: + logger.error(f"Error updating message in {channel_id}: {str(e)}") + + +def update_slack_task( + plan, + task, + title=None, + status: Literal["in_progress", "completed"] = "in_progress", + details=None, + outputs=None, +): + if not task: + return plan + + if title: + plan["title"] = f"{title}..." + task["title"] = title + + if status: + task["status"] = status + + if details: + task["details"] = details + + if outputs: + task["output"] = outputs + + return plan + + +def create_task( + title, + plan=None, + details=None, + outputs=None, + status: Literal["in_progress", "completed"] = "in_progress", +): + """ + Helper function to create a task object for the plan block + """ + task = { + "task_id": uuid.uuid4().hex, + "title": title, + "status": status, + "details": { + "type": "rich_text", + "block_id": uuid.uuid4().hex, + "elements": [ + {"type": "rich_text_section", "elements": [{"type": "text", "text": detail}]} + for detail in (details if details else []) + ], + }, + "output": { + "type:": "rich_text", + "block_id": uuid.uuid4().hex, + "elements": [ + {"type": "rich_text_section", "elements": [{"type": "text", "text": output}]} + for output in (outputs if outputs else []) + ], + }, + } + + if plan: + plan["title"] = title + plan["status"] = status + plan["tasks"] += [task] + return task + + +def update_slack_events(event_count: int, messages: list): + """ + Update the event count in the existing Slack message blocks + """ + if not messages: + logger.warning("No existing Slack messages to update event count.") + return + + for response in messages: + if response is None: + continue - def initialize_broadcast(self, event_count: int): - target_channels = self.get_bot_channels() - if not target_channels: - return + # Update the event count in the plan block + blocks = response["message"]["blocks"] + plan = next((block for block in blocks if block["type"] == "plan"), None) + task = plan["tasks"][-1] if (plan and "tasks" in plan and plan["tasks"]) else None - blocks = self._build_initial_blocks(event_count) + title = "Fetching changes" + outputs = [f"Found {event_count} event(s)"] - for channel_id in target_channels: - try: - response = self.client.chat_postMessage( - channel=channel_id, text="Knowledge base syncing...", blocks=blocks - ) - self.active_messages.append({"channel": channel_id, "ts": response["ts"], "blocks": blocks}) - except SlackApiError as e: - logger.error(f"Error posting to {channel_id}: {e}") + if task: + plan = update_slack_task(plan=plan, task=task, title=title, outputs=outputs) + else: + create_task(plan=plan, title=title, outputs=outputs) + + update_slack_message(response, blocks) + + +def update_slack_files(processed_files: list, messages: list, complete=False): + """ + Update the existing Slack message blocks with the count of processed files + """ + if not messages: + return + + if not processed_files: + logger.warning("No processed files to update in Slack messages.") + return - def update_progress(self, added: int, deleted: int, is_complete: bool = False): - if not self.active_messages: - return + added = sum(1 for f in processed_files if f["event_type"] == "CREATE") + deleted = sum(1 for f in processed_files if f["event_type"] == "DELETE") - status = "completed" if is_complete else "in_progress" - title = "Processing complete!" if is_complete else "Processing file changes..." + logger.info(f"Processed {added} added/updated and {deleted} deleted file(s).") + + for response in messages: + if response is None: + continue + + # Update the event count in the plan block + blocks = response["message"]["blocks"] + plan = next((block for block in blocks if block["type"] == "plan"), None) + task = plan["tasks"][-1] if plan and "tasks" in plan and plan["tasks"] else None + + # Task params + title = "Processing file changes" + status = "completed" if complete else "in_progress" details = [f"{val} {label} file(s)" for val, label in [(added, "new"), (deleted, "removed")] if val > 0] outputs = [f"Total files processed: {added + deleted}"] - for msg in self.active_messages: - plan = next((b for b in msg["blocks"] if b["type"] == "plan"), None) - if plan: - plan["title"] = title - plan["status"] = status - - # Update or create the task - if not plan.get("tasks"): - plan["tasks"] = [{"task_id": uuid.uuid4().hex}] - - task = plan["tasks"][0] - task.update( - { - "title": title, - "status": status, - "details": self._build_rich_text(details), - "output": self._build_rich_text(outputs), - } - ) + if task: + plan = update_slack_task( + plan=plan, task=task, messages=messages, status=status, title=title, details=details, outputs=outputs + ) + else: + create_task(plan=plan, title=title, details=details, outputs=outputs) - try: - self.client.chat_update(channel=msg["channel"], ts=msg["ts"], blocks=msg["blocks"]) - except SlackApiError as e: - logger.error(f"Error updating message: {e}") + update_slack_message(response, blocks) - def _build_rich_text(self, items): - return { - "type": "rich_text", - "block_id": uuid.uuid4().hex, - "elements": [{"type": "rich_text_section", "elements": [{"type": "text", "text": i}]} for i in items], - } - def _build_initial_blocks(self, event_count): - # Simplified initialization blocks - return [ - {"type": "section", "text": {"type": "plain_text", "text": "I am syncing changes to my knowledge base."}}, - { - "type": "plan", - "plan_id": "plan_1", - "title": "Fetching changes...", - "tasks": [ - { - "task_id": uuid.uuid4().hex, - "title": "Fetching changes", - "status": "in_progress", - "output": self._build_rich_text([f"Found {event_count} event(s)"]), - } - ], - }, - ] +def update_slack_complete(messages): + """ + Mark Slack Plan as complete + """ + if not messages: + logger.warning("No existing Slack messages to update event count.") + return + for response in messages: + if response is None: + continue -def parse_s3_events(records): - """Extracts valid files and event types from SQS/S3 records""" - processed_files = [] + # Update the event count in the plan block + blocks = response["message"]["blocks"] + plan = next((block for block in blocks if block["type"] == "plan"), None) - for sqs_record in records: - if sqs_record.get("eventSource") != "aws:sqs": - continue + plan["title"] = "Processing complete!" + for i, task in plan["tasks"]: + task["status"] = "completed" - try: - body = json.loads(sqs_record.get("body", "{}")) - for s3_record in body.get("Records", []): - s3_info = s3_record.get("s3", {}) - object_key = s3_info.get("object", {}).get("key", "") + update_slack_message(response, blocks) - if not object_key or not any(object_key.lower().endswith(ext) for ext in SUPPORTED_FILE_TYPES): - continue - event_name = s3_record.get("eventName", "") - event_type = "DELETE" if event_name.startswith("ObjectRemoved") else "CREATE" - processed_files.append({"key": object_key, "type": event_type}) +def process_sqs_record(s3_record): + """ + Process a single Simple Queue Service record and prepare processing + of a S3 record. + """ + processed_files = [] # Track successfully processed file keys + job_ids = [] # Track started ingestion job IDs - except (json.JSONDecodeError, AttributeError): - continue + body = json.loads(s3_record.get("body", "{}")) + + s3_records = body.get("Records", []) + + if not s3_records: + logger.warning("Skipping SQS event - no S3 events found.") + return {"processed_files": [], "job_ids": []} + + for s3_index, s3_record in enumerate(s3_records): + if s3_record.get("eventSource") == "aws:s3": + # Process S3 event and start ingestion if valid + success, file_key, job_id, event_type = process_s3_record(s3_record, s3_index) + if success: + processed_files.append({"file_key": file_key, "event_type": event_type}) + job_ids.append(job_id) + else: + # Skip non-S3 events + logger.warning( + "Skipping non-S3 event", + extra={ + "event_source": s3_record.get("eventSource"), + "record_index": s3_index + 1, + }, + ) - return processed_files + return {"processed_files": [processed_file["file_key"] for processed_file in processed_files], "job_ids": job_ids} @logger.inject_lambda_context(log_event=True, clear_state=True) def handler(event, context): + """ + Main Lambda handler for a queue-service (S3-triggered) knowledge base synchronization + """ start_time = time.time() + # Early validation of required configuration if not KNOWLEDGEBASE_ID or not DATA_SOURCE_ID: + logger.error( + "Missing required environment variables", + extra={ + "status_code": 500, + "knowledge_base_id": bool(KNOWLEDGEBASE_ID), + "data_source_id": bool(DATA_SOURCE_ID), + }, + ) return {"statusCode": 500, "body": "Configuration error"} - records = event.get("Records", []) - if not records: - return {"statusCode": 400, "body": "No records to process"} - - token = get_bot_token() - slack_client = WebClient(token=token) - slack = SlackNotifier(slack_client) - slack.initialize_broadcast(len(records)) + logger.info( + "Starting knowledge base sync process", + extra={ + "knowledge_base_id": KNOWLEDGEBASE_ID, + "data_source_id": DATA_SOURCE_ID, + }, + ) + + try: + records = event.get("Records", []) + processed_files = [] # Track successfully processed file keys + job_ids = [] # Track started ingestion job IDs + + slack_messages = initialise_slack_messages(len(records)) + skipped = 0 + # Process each S3 event record in the SQS batch + for sqs_index, sqs_record in enumerate(records): + try: + if sqs_record.get("eventSource") != "aws:sqs": + logger.warning( + "Skipping non-SQS event", + extra={ + "event_source": sqs_record.get("eventSource"), + "record_index": sqs_index + 1, + }, + ) + update_slack_events(len(records) - skipped, slack_messages) + skipped += 1 + continue - # 2. Extract all valid files first - processed_files = parse_s3_events(records) + logger.info("Processing SQS record", extra={"record_index": sqs_index + 1}) + results = process_sqs_record(sqs_record) + processed_files.extend(results["processed_files"]) + job_ids.extend(results["job_ids"]) - added_count = sum(1 for f in processed_files if f["type"] == "CREATE") - deleted_count = sum(1 for f in processed_files if f["type"] == "DELETE") + update_slack_files( + processed_files=processed_files, messages=slack_messages, complete=(sqs_index == len(records) - 1) + ) - # 3. Handle Slack Notifications neatly - slack.update_progress(added_count, deleted_count, is_complete=False) + except (json.JSONDecodeError, KeyError) as e: + logger.error(f"Failed to parse SQS body: {str(e)}") + continue - job_id = None + total_duration = time.time() - start_time - # 4. Trigger Bedrock ONLY ONCE if there are actually valid files to process - if processed_files: - try: - response = bedrock_agent.start_ingestion_job( - knowledgeBaseId=KNOWLEDGEBASE_ID, - dataSourceId=DATA_SOURCE_ID, - description=f"Auto-sync: {len(processed_files)} file(s) changed.", - ) - job_id = response["ingestionJob"]["ingestionJobId"] + update_slack_complete(messages=slack_messages) - except ClientError as e: - if e.response.get("Error", {}).get("Code") != "ConflictException": - return {"statusCode": 500, "body": str(e)} - logger.info( - "Ingestion job already running. Skipping trigger.", - extra={ - "status_code": 409, - "duration_ms": round((time.time() - start_time) * 1000, 2), - "explanation": "Normal when multiple files uploaded quickly", - }, - ) + logger.info( + "Knowledge base sync process completed", + extra={ + "status_code": 200, + "ingestion_jobs_started": len(job_ids), + "job_ids": job_ids, + "trigger_files": processed_files, + "total_duration_ms": round(total_duration * 1000, 2), + "knowledge_base_id": KNOWLEDGEBASE_ID, + "next_steps": "Monitor Bedrock console for ingestion job completion status", + }, + ) - # 5. Mark as complete - slack.update_progress(added_count, deleted_count, is_complete=True) + return { + "statusCode": 200, + "body": ( + f"Successfully triggered {len(job_ids)} ingestion job(s) for {len(processed_files)} trigger file(s)", + ), + } - return {"statusCode": 200, "body": f"Processed {len(processed_files)} files. Job ID: {job_id}"} + except ClientError as e: + # Handle AWS service errors + return handle_client_error(e, start_time) + + except Exception as e: + # Handle unexpected errors + logger.error( + "Unexpected error occurred", + extra={ + "status_code": 500, + "error_type": type(e).__name__, + "error_message": str(e), + "duration_ms": round((time.time() - start_time) * 1000, 2), + "error": traceback.format_exc(), + "e": e, + }, + ) + return {"statusCode": 500, "body": f"Unexpected error: {str(e)}"} diff --git a/packages/notifyS3UploadFunction/app/__init__.py b/packages/syncKnowledgeBaseFunction/tests/__init__.py similarity index 100% rename from packages/notifyS3UploadFunction/app/__init__.py rename to packages/syncKnowledgeBaseFunction/tests/__init__.py diff --git a/packages/syncKnowledgeBaseFunction/tests/test_app.py b/packages/syncKnowledgeBaseFunction/tests/test_app.py new file mode 100644 index 000000000..8fb1f0bee --- /dev/null +++ b/packages/syncKnowledgeBaseFunction/tests/test_app.py @@ -0,0 +1,403 @@ +import json +import pytest +import os +from unittest.mock import Mock, patch, MagicMock +from botocore.exceptions import ClientError + + +TEST_BOT_TOKEN = "test-bot-token" + + +@pytest.fixture +def mock_env(): + """Mock environment variables""" + env_vars = {"KNOWLEDGEBASE_ID": "test-kb-id", "DATA_SOURCE_ID": "test-ds-id", "AWS_REGION": "eu-west-2"} + with patch.dict(os.environ, env_vars): + yield env_vars + + +@pytest.fixture +def lambda_context(): + """Mock Lambda context""" + context = Mock() + context.function_name = "test-function" + context.aws_request_id = "test-request-id" + return context + + +@pytest.fixture +def mock_get_parameter(): + def fake_get_parameter(name: str, *args, **kwargs): + return { + "/test/bot-token": json.dumps({"token": "test-token"}), + "/test/signing-secret": json.dumps({"secret": "test-secret"}), + }[name] + + with patch("app.core.config.get_parameter", side_effect=fake_get_parameter) as mock: + yield mock + + +@pytest.fixture +def mock_get_bot_token(): + with patch("app.config.config.get_bot_token") as mock_get_bot_token: + mock_instance = MagicMock() + mock_get_bot_token.return_value = mock_instance + yield mock_instance + + +@pytest.fixture +def s3_event(): + """Mock S3 event""" + return { + "Records": [ + { + "eventSource": "aws:sqs", + "body": json.dumps( + { + "Records": [ + { + "eventSource": "aws:s3", + "eventName": "ObjectCreated:Put", + "s3": { + "bucket": {"name": "test-bucket"}, + "object": {"key": "test-file.pdf", "size": 1024}, + }, + } + ] + } + ), + } + ] + } + + +@pytest.fixture +def multiple_s3_event(): + """Mock S3 event with multiple records""" + return { + "Records": [ + { + "eventSource": "aws:sqs", + "body": json.dumps( + { + "Records": [ + { + "eventSource": "aws:s3", + "eventName": "ObjectCreated:Put", + "s3": { + "bucket": {"name": "test-bucket"}, + "object": {"key": "file1.pdf", "size": 1024}, + }, + }, + { + "eventSource": "aws:s3", + "eventName": "ObjectRemoved:Delete", + "s3": { + "bucket": {"name": "test-bucket"}, + "object": {"key": "file2.pdf", "size": 2048}, + }, + }, + ] + } + ), + } + ] + } + + +@patch("app.handler.initialise_slack_messages") +@patch("boto3.client") +@patch("time.time") +def test_handler_success( + mock_time, mock_boto_client, mock_initialise_slack_messages, mock_env, lambda_context, s3_event +): + """Test successful handler execution""" + mock_time.side_effect = [1000, 1001, 1002, 1003] + mock_bedrock = mock_boto_client.return_value + mock_bedrock.start_ingestion_job.return_value = { + "ingestionJob": {"ingestionJobId": "job-123", "status": "STARTING"} + } + mock_initialise_slack_messages.return_value = [] + + from app.handler import handler + + result = handler(s3_event, lambda_context) + + assert result["statusCode"] == 200 + assert "Successfully triggered 1 ingestion job(s) for 1 trigger file(s)" in result["body"] + mock_boto_client.assert_called_with("bedrock-agent") + mock_bedrock.start_ingestion_job.assert_called_once_with( + knowledgeBaseId="test-kb-id", + dataSourceId="test-ds-id", + description="Auto-sync: File added/updated (test-file.pdf) - Adding to vector index", + ) + + +@patch("app.handler.initialise_slack_messages") +@patch("boto3.client") +@patch("time.time") +def test_handler_multiple_files( + mock_time, + mock_boto_client, + mock_initialise_slack_messages, + mock_env, + mock_get_bot_token, + lambda_context, + multiple_s3_event, +): + """Test handler with multiple S3 records""" + mock_time.side_effect = [1000, 1001, 1002, 1003, 1004, 1005] + mock_bedrock = mock_boto_client.return_value + mock_bedrock.start_ingestion_job.return_value = { + "ingestionJob": {"ingestionJobId": "job-123", "status": "STARTING"} + } + mock_initialise_slack_messages.return_value = [] + + from app.handler import handler + + result = handler(multiple_s3_event, lambda_context) + + assert result["statusCode"] == 200 + assert "Successfully triggered 2 ingestion job(s) for 2 trigger file(s)" in result["body"] + assert mock_bedrock.start_ingestion_job.call_count == 2 + + +@patch("app.handler.initialise_slack_messages") +@patch("boto3.client") +@patch("time.time") +def test_handler_conflict_exception( + mock_time, mock_boto_client, start_ingestion_job, mock_env, lambda_context, s3_event +): + """Test handler with ConflictException (job already running)""" + mock_time.side_effect = [1000, 1001, 1002] + error = ClientError( + error_response={"Error": {"Code": "ConflictException", "Message": "Job already running"}}, + operation_name="StartIngestionJob", + ) + mock_bedrock = mock_boto_client.return_value + mock_bedrock.start_ingestion_job.side_effect = error + + from app.handler import handler + + result = handler(s3_event, lambda_context) + + assert result["statusCode"] == 409 + assert "Files uploaded successfully - processing by existing ingestion job" in result["body"] + + +@patch("app.handler.initialise_slack_messages") +@patch("boto3.client") +@patch("time.time") +def test_handler_aws_error( + mock_time, mock_boto_client, mock_initialise_slack_messages, mock_env, lambda_context, s3_event +): + """Test handler with other AWS error""" + mock_time.side_effect = [1000, 1001, 1002] + error = ClientError( + error_response={"Error": {"Code": "AccessDenied", "Message": "Access denied"}}, + operation_name="StartIngestionJob", + ) + mock_bedrock = mock_boto_client.return_value + mock_bedrock.start_ingestion_job.side_effect = error + + from app.handler import handler + + result = handler(s3_event, lambda_context) + + assert result["statusCode"] == 500 + assert "AWS error: AccessDenied - Access denied" in result["body"] + + +@patch("app.handler.initialise_slack_messages") +@patch("boto3.client") +@patch("time.time") +def test_handler_unexpected_error( + mock_time, mock_boto_client, mock_initialise_slack_messages, mock_env, lambda_context, s3_event +): + """Test handler with unexpected error""" + mock_time.side_effect = [1000, 1001, 1002] + mock_bedrock = mock_boto_client.return_value + mock_bedrock.start_ingestion_job.side_effect = Exception("Unexpected error") + + from app.handler import handler + + result = handler(s3_event, lambda_context) + + assert result["statusCode"] == 500 + assert "Unexpected error: Unexpected error" in result["body"] + + +@patch("app.handler.KNOWLEDGEBASE_ID", "") +@patch("app.handler.DATA_SOURCE_ID", "") +def test_handler_missing_env_vars(lambda_context, s3_event): + """Test handler with missing environment variables""" + from app.handler import handler + + result = handler(s3_event, lambda_context) + + assert result["statusCode"] == 500 + assert "Configuration error" in result["body"] + + +@patch("app.handler.initialise_slack_messages") +@patch("boto3.client") +def test_handler_invalid_s3_record(mock_initialise_slack_messages, mock_boto_client, mock_env, lambda_context): + """Test handler with invalid S3 record""" + invalid_event = { + "Records": [ + { + "eventSource": "aws:s3", + "eventName": "ObjectCreated:Put", + "s3": { + "bucket": {}, # Missing name + "object": {}, # Missing key + }, + } + ] + } + + from app.handler import handler + + result = handler(invalid_event, lambda_context) + + assert result["statusCode"] == 200 + assert "Successfully triggered 0 ingestion job(s) for 0 trigger file(s)" in result["body"] + + +@patch("app.handler.initialise_slack_messages") +@patch("boto3.client") +def test_handler_non_s3_event(mock_boto_client, mock_initialise_slack_messages, mock_env, lambda_context): + """Test handler with non-S3 event""" + non_s3_event = { + "Records": [ + { + "eventSource": "aws:sns", + "eventName": "Notification", + } + ] + } + + from app.handler import handler + + result = handler(non_s3_event, lambda_context) + + assert result["statusCode"] == 200 + assert "Successfully triggered 0 ingestion job(s) for 0 trigger file(s)" in result["body"] + + +@patch("app.handler.initialise_slack_messages") +@patch("boto3.client") +def test_handler_empty_records(mock_boto_client, mock_initialise_slack_messages, mock_env, lambda_context): + """Test handler with empty records""" + empty_event = {"Records": []} + + from app.handler import handler + + result = handler(empty_event, lambda_context) + + assert result["statusCode"] == 200 + assert "Successfully triggered 0 ingestion job(s) for 0 trigger file(s)" in result["body"] + + +@pytest.mark.parametrize( + "filename,expected", + [ + # Supported types + ("document.pdf", True), + ("readme.txt", True), + ("notes.md", True), + ("data.csv", True), + ("report.docx", True), + ("spreadsheet.xlsx", True), + ("page.html", True), + ("config.json", True), + # Case insensitive + ("DOCUMENT.PDF", True), + ("File.TXT", True), + # Unsupported types + ("image.jpg", False), + ("video.mp4", False), + ("archive.zip", False), + ("executable.exe", False), + ("no_extension", False), + ], +) +def test_is_supported_file_type(filename, expected): + """Test file type allowlist validation""" + from app.handler import is_supported_file_type + + assert is_supported_file_type(filename) is expected + + +@patch("app.handler.initialise_slack_messages") +@patch("boto3.client") +def test_handler_unsupported_file_type(mock_boto_client, mock_initialise_slack_messages, mock_env, lambda_context): + """Test handler skips unsupported file types""" + unsupported_event = { + "Records": [ + { + "eventSource": "aws:s3", + "eventName": "ObjectCreated:Put", + "s3": { + "bucket": {"name": "test-bucket"}, + "object": {"key": "image.jpg", "size": 1024}, + }, + } + ] + } + + from app.handler import handler + + result = handler(unsupported_event, lambda_context) + + assert result["statusCode"] == 200 + assert "Successfully triggered 0 ingestion job(s) for 0 trigger file(s)" in result["body"] + + +@patch("app.handler.initialise_slack_messages") +@patch("boto3.client") +@patch("time.time") +def test_handler_unknown_event_type( + mock_time, mock_boto_client, mock_initialise_slack_messages, mock_env, lambda_context +): + """Test handler with unknown S3 event type""" + mock_time.side_effect = [1000, 1001, 1002, 1003] + mock_bedrock = mock_boto_client.return_value + mock_bedrock.start_ingestion_job.return_value = { + "ingestionJob": {"ingestionJobId": "job-123", "status": "STARTING"} + } + mock_initialise_slack_messages.return_value = [] + + unknown_event = { + "Records": [ + { + "eventSource": "aws:sqs", + "body": json.dumps( + { + "Records": [ + { + "eventSource": "aws:s3", + "eventName": "ObjectRestore:Completed", + "s3": { + "bucket": {"name": "test-bucket"}, + "object": {"key": "test-file.pdf", "size": 1024}, + }, + } + ] + } + ), + } + ] + } + + from app.handler import handler + + result = handler(unknown_event, lambda_context) + + assert result["statusCode"] == 200 + assert "Successfully triggered 1 ingestion job(s) for 1 trigger file(s)" in result["body"] + mock_bedrock.start_ingestion_job.assert_called_once_with( + knowledgeBaseId="test-kb-id", + dataSourceId="test-ds-id", + description="Auto-sync triggered by S3 ObjectRestore:Completed on test-file.pdf", + ) diff --git a/pyproject.toml b/pyproject.toml index 09cb163ab..ec3c8e318 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -45,6 +45,9 @@ boto3-stubs = {extras = ["bedrock-agent", "bedrock-agent-runtime", "bedrock-runt [tool.poetry.group.syncKnowledgeBaseFunction.dependencies] boto3 = "^1.42.54" aws-lambda-powertools = "^3.23.0" +urllib3 = "^2.6.3" +slack-bolt = "^1.25.0" +slack-sdk = "^3.40.1" [tool.poetry.group.bedrockLoggingConfigFunction.dependencies] @@ -59,12 +62,5 @@ aws-lambda-powertools = "^3.23.0" markitdown = {extras = ["pdf", "docx", "xlsx"], version = "^0.0.1a12"} -[tool.poetry.group.notifyS3UploadFunction.dependencies] -aws-lambda-powertools = "^3.23.0" -urllib3 = "^2.6.3" -slack-bolt = "^1.25.0" -slack-sdk = "^3.40.1" - - [tool.black] line-length = 120 diff --git a/scripts/run_sync.sh b/scripts/run_sync.sh index a0dc4b136..c0c6e5f24 100755 --- a/scripts/run_sync.sh +++ b/scripts/run_sync.sh @@ -71,13 +71,11 @@ echo "Installing dependencies locally" mkdir -p .dependencies poetry show --only=slackBotFunction | grep -E "^[a-zA-Z]" | awk '{print $1"=="$2}' > .dependencies/requirements_slackBotFunction poetry show --only=syncKnowledgeBaseFunction | grep -E "^[a-zA-Z]" | awk '{print $1"=="$2}' > .dependencies/requirements_syncKnowledgeBaseFunction -poetry show --only=notifyS3UploadFunction | grep -E "^[a-zA-Z]" | awk '{print $1"=="$2}' > .dependencies/requirements_notifyS3UploadFunction poetry show --only=preprocessingFunction | grep -E "^[a-zA-Z]" | awk '{print $1"=="$2}' > .dependencies/requirements_preprocessingFunction poetry show --only=bedrockLoggingConfigFunction | grep -E "^[a-zA-Z]" | awk '{print $1"=="$2}' > .dependencies/requirements_bedrockLoggingConfigFunction pip3 install -r .dependencies/requirements_slackBotFunction -t .dependencies/slackBotFunction/python pip3 install -r .dependencies/requirements_syncKnowledgeBaseFunction -t .dependencies/syncKnowledgeBaseFunction/python -pip3 install -r .dependencies/requirements_notifyS3UploadFunction -t .dependencies/notifyS3UploadFunction/python pip3 install -r .dependencies/requirements_preprocessingFunction -t .dependencies/preprocessingFunction/python pip3 install -r .dependencies/requirements_bedrockLoggingConfigFunction -t .dependencies/bedrockLoggingConfigFunction/python From de5cb19bb0c21e992c5d18d9b55d6a1f0b96b719 Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Mon, 2 Mar 2026 10:00:23 +0000 Subject: [PATCH 08/84] fix: unit test - lock update --- poetry.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/poetry.lock b/poetry.lock index 163fb6db0..745bb8f35 100644 --- a/poetry.lock +++ b/poetry.lock @@ -107,7 +107,7 @@ version = "3.24.0" description = "Powertools for AWS Lambda (Python) is a developer toolkit to implement Serverless best practices and increase developer velocity." optional = false python-versions = "<4.0.0,>=3.10" -groups = ["bedrockloggingconfigfunction", "notifys3uploadfunction", "preprocessingfunction", "slackbotfunction", "syncknowledgebasefunction"] +groups = ["bedrockloggingconfigfunction", "preprocessingfunction", "slackbotfunction", "syncknowledgebasefunction"] files = [ {file = "aws_lambda_powertools-3.24.0-py3-none-any.whl", hash = "sha256:9c9002856f61b86f49271a9d7efa0dad322ecd22719ddc1c6bb373e57ee0421a"}, {file = "aws_lambda_powertools-3.24.0.tar.gz", hash = "sha256:9f86959c4aeac9669da799999aae5feac7a3a86e642b52473892eaa4273d3cc3"}, @@ -1583,7 +1583,7 @@ version = "1.1.0" description = "JSON Matching Expressions" optional = false python-versions = ">=3.9" -groups = ["bedrockloggingconfigfunction", "dev", "notifys3uploadfunction", "preprocessingfunction", "slackbotfunction", "syncknowledgebasefunction"] +groups = ["bedrockloggingconfigfunction", "dev", "preprocessingfunction", "slackbotfunction", "syncknowledgebasefunction"] files = [ {file = "jmespath-1.1.0-py3-none-any.whl", hash = "sha256:a5663118de4908c91729bea0acadca56526eb2698e83de10cd116ae0f4e97c64"}, {file = "jmespath-1.1.0.tar.gz", hash = "sha256:472c87d80f36026ae83c6ddd0f1d05d4e510134ed462851fd5f754c8c3cbb88d"}, @@ -3598,7 +3598,7 @@ version = "1.27.0" description = "The Bolt Framework for Python" optional = false python-versions = ">=3.7" -groups = ["notifys3uploadfunction", "slackbotfunction"] +groups = ["slackbotfunction", "syncknowledgebasefunction"] files = [ {file = "slack_bolt-1.27.0-py2.py3-none-any.whl", hash = "sha256:c43c94bf34740f2adeb9b55566c83f1e73fed6ba2878bd346cdfd6fd8ad22360"}, {file = "slack_bolt-1.27.0.tar.gz", hash = "sha256:3db91d64e277e176a565c574ae82748aa8554f19e41a4fceadca4d65374ce1e0"}, @@ -3613,7 +3613,7 @@ version = "3.40.1" description = "The Slack API Platform SDK for Python" optional = false python-versions = ">=3.7" -groups = ["notifys3uploadfunction", "slackbotfunction"] +groups = ["slackbotfunction", "syncknowledgebasefunction"] files = [ {file = "slack_sdk-3.40.1-py2.py3-none-any.whl", hash = "sha256:cd8902252979aa248092b0d77f3a9ea3cc605bc5d53663ad728e892e26e14a65"}, {file = "slack_sdk-3.40.1.tar.gz", hash = "sha256:a215333bc251bc90abf5f5110899497bf61a3b5184b6d9ee35d73ebf09ec3fd0"}, @@ -3773,7 +3773,7 @@ version = "4.15.0" description = "Backported and Experimental Type Hints for Python 3.9+" optional = false python-versions = ">=3.9" -groups = ["bedrockloggingconfigfunction", "dev", "notifys3uploadfunction", "preprocessingfunction", "slackbotfunction", "syncknowledgebasefunction"] +groups = ["bedrockloggingconfigfunction", "dev", "preprocessingfunction", "slackbotfunction", "syncknowledgebasefunction"] files = [ {file = "typing_extensions-4.15.0-py3-none-any.whl", hash = "sha256:f0fa19c6845758ab08074a0cfa8b7aecb71c999ca73d62883bc25cc018c4e548"}, {file = "typing_extensions-4.15.0.tar.gz", hash = "sha256:0cea48d173cc12fa28ecabc3b837ea3cf6f38c6d1136f85cbaaf598984861466"}, @@ -3813,7 +3813,7 @@ version = "2.6.3" description = "HTTP library with thread-safe connection pooling, file post, and more." optional = false python-versions = ">=3.9" -groups = ["bedrockloggingconfigfunction", "dev", "notifys3uploadfunction", "preprocessingfunction", "slackbotfunction", "syncknowledgebasefunction"] +groups = ["bedrockloggingconfigfunction", "dev", "preprocessingfunction", "slackbotfunction", "syncknowledgebasefunction"] files = [ {file = "urllib3-2.6.3-py3-none-any.whl", hash = "sha256:bf272323e553dfb2e87d9bfd225ca7b0f467b919d7bbd355436d3fd37cb0acd4"}, {file = "urllib3-2.6.3.tar.gz", hash = "sha256:1b62b6884944a57dbe321509ab94fd4d3b307075e0c2eae991ac71ee15ad38ed"}, @@ -3938,4 +3938,4 @@ requests = "*" [metadata] lock-version = "2.1" python-versions = "^3.14" -content-hash = "8d90f1f76c0d32369c14d469d0f0057509f63ae857b0f7aa371a0ed243ae0592" +content-hash = "827eccd89c88931c656b74c99b31acea948409992ed6795a62a78588989f0ff5" From 99c171f716d05fbf38ee270086dec9bdd141192e Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Mon, 2 Mar 2026 10:12:53 +0000 Subject: [PATCH 09/84] fix: unit test - update cdk --- packages/cdk/nagSuppressions.ts | 12 ------------ packages/cdk/resources/Functions.ts | 18 ------------------ packages/cdk/resources/RuntimePolicies.ts | 19 ------------------- .../cdk/resources/S3LambdaNotification.ts | 3 --- 4 files changed, 52 deletions(-) diff --git a/packages/cdk/nagSuppressions.ts b/packages/cdk/nagSuppressions.ts index 5482bab4a..26b1064cc 100644 --- a/packages/cdk/nagSuppressions.ts +++ b/packages/cdk/nagSuppressions.ts @@ -28,18 +28,6 @@ export const nagSuppressions = (stack: Stack, account: string) => { ] ) - // Suppress wildcard log permissions for NotifyS3UploadFunction Lambda - safeAddNagSuppression( - stack, - "/EpsAssistMeStack/Functions/NotifyS3UploadFunction/LambdaPutLogsManagedPolicy/Resource", - [ - { - id: "AwsSolutions-IAM5", - reason: "Wildcard permissions are required for log stream access under known paths." - } - ] - ) - // Suppress wildcard log permissions for Preprocessing Lambda safeAddNagSuppression( stack, diff --git a/packages/cdk/resources/Functions.ts b/packages/cdk/resources/Functions.ts index d2463920f..7c5862ce3 100644 --- a/packages/cdk/resources/Functions.ts +++ b/packages/cdk/resources/Functions.ts @@ -36,14 +36,12 @@ export interface FunctionsProps { readonly mainSlackBotLambdaExecutionRoleArn : string readonly ragModelId: string readonly reformulationModelId: string - readonly notifyS3UploadFunctionPolicy: ManagedPolicy readonly docsBucketName: string } export class Functions extends Construct { public readonly slackBotLambda: LambdaFunction public readonly syncKnowledgeBaseFunction: LambdaFunction - public readonly notifyS3UploadFunction: LambdaFunction public readonly preprocessingFunction: LambdaFunction constructor(scope: Construct, id: string, props: FunctionsProps) { @@ -135,24 +133,8 @@ export class Functions extends Construct { additionalPolicies: [props.syncKnowledgeBaseManagedPolicy] }) - const notifyS3UploadFunction = new LambdaFunction(this, "NotifyS3UploadFunction", { - stackName: props.stackName, - functionName: `${props.stackName}-S3UpdateFunction`, - packageBasePath: "packages/notifyS3UploadFunction", - handler: "app.handler.handler", - logRetentionInDays: props.logRetentionInDays, - logLevel: props.logLevel, - dependencyLocation: ".dependencies/notifyS3UploadFunction", - environmentVariables: { - "SLACK_BOT_TOKEN_PARAMETER": props.slackBotTokenParameter.parameterName, - "SLACK_BOT_ACTIVE_ON_PRS": "false" - }, - additionalPolicies: [props.notifyS3UploadFunctionPolicy] - }) - this.slackBotLambda = slackBotLambda this.preprocessingFunction = preprocessingFunction this.syncKnowledgeBaseFunction = syncKnowledgeBaseFunction - this.notifyS3UploadFunction = notifyS3UploadFunction } } diff --git a/packages/cdk/resources/RuntimePolicies.ts b/packages/cdk/resources/RuntimePolicies.ts index 4250aac37..396a6239a 100644 --- a/packages/cdk/resources/RuntimePolicies.ts +++ b/packages/cdk/resources/RuntimePolicies.ts @@ -21,7 +21,6 @@ export interface RuntimePoliciesProps { export class RuntimePolicies extends Construct { public readonly slackBotPolicy: ManagedPolicy public readonly syncKnowledgeBasePolicy: ManagedPolicy - public readonly notifyS3UploadFunctionPolicy: ManagedPolicy public readonly preprocessingPolicy: ManagedPolicy constructor(scope: Construct, id: string, props: RuntimePoliciesProps) { @@ -141,24 +140,6 @@ export class RuntimePolicies extends Construct { statements: [syncKnowledgeBasePolicy] }) - // Create managed policy for S3UpdateNotification Lambda function - const notifyS3UploadFunctionPolicy = new PolicyStatement({ - actions: [ - "ssm:GetParameter", - "sqs:ReceiveMessage", - "sqs:DeleteMessage" - ], - resources: [ - props.knowledgeBaseArn, - ...slackBotPolicyResources - ] - }) - - this.notifyS3UploadFunctionPolicy = new ManagedPolicy(this, "notifyS3UploadFunctionPolicy", { - description: "Policy for S3UpdateNotification Lambda to access SSM parameters", - statements: [notifyS3UploadFunctionPolicy] - }) - //policy for the preprocessing lambda const preprocessingS3Policy = new PolicyStatement({ actions: [ diff --git a/packages/cdk/resources/S3LambdaNotification.ts b/packages/cdk/resources/S3LambdaNotification.ts index 2475ca283..fad4353fa 100644 --- a/packages/cdk/resources/S3LambdaNotification.ts +++ b/packages/cdk/resources/S3LambdaNotification.ts @@ -27,9 +27,6 @@ export class S3LambdaNotification extends Construct { queueName: queueName, batchDelay: 100, functions: [ - // Temporarily only trigger sync, as only one can run at once on SQS - // - if notifications is successful, sync won't run - // props.functions.notifyS3UploadFunction, props.functions.syncKnowledgeBaseFunction ] }) From 58647b11c082fe51566242e664e73f07e29d5dca Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Mon, 2 Mar 2026 10:20:38 +0000 Subject: [PATCH 10/84] fix: unit test - update cdk --- packages/cdk/stacks/EpsAssistMeStack.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/cdk/stacks/EpsAssistMeStack.ts b/packages/cdk/stacks/EpsAssistMeStack.ts index 468f6c8df..e64890b0d 100644 --- a/packages/cdk/stacks/EpsAssistMeStack.ts +++ b/packages/cdk/stacks/EpsAssistMeStack.ts @@ -200,14 +200,13 @@ export class EpsAssistMeStack extends Stack { reformulationModelId: bedrockPromptResources.modelId, isPullRequest: isPullRequest, mainSlackBotLambdaExecutionRoleArn: mainSlackBotLambdaExecutionRoleArn, - notifyS3UploadFunctionPolicy: runtimePolicies.notifyS3UploadFunctionPolicy, docsBucketName: storage.kbDocsBucket.bucketName }) // Grant preprocessing Lambda access to the KMS key for S3 bucket storage.kbDocsKmsKey.grantEncryptDecrypt(functions.preprocessingFunction.executionRole) - // Create S3LambdaNotification to link S3 and NotifyS3UploadFunction + // Create AWS Lambdas to link S3 new S3LambdaNotification(this, "StorageNotificationQueue", { stackName: props.stackName, functions, From 84644f25cfe279b678836bff3ab845705fd30e82 Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Mon, 2 Mar 2026 10:34:05 +0000 Subject: [PATCH 11/84] fix: unit test - update env variables --- packages/cdk/resources/Functions.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/cdk/resources/Functions.ts b/packages/cdk/resources/Functions.ts index 7c5862ce3..0bf4ffc05 100644 --- a/packages/cdk/resources/Functions.ts +++ b/packages/cdk/resources/Functions.ts @@ -128,7 +128,9 @@ export class Functions extends Construct { dependencyLocation: ".dependencies/syncKnowledgeBaseFunction", environmentVariables: { "KNOWLEDGEBASE_ID": props.knowledgeBaseId, - "DATA_SOURCE_ID": props.dataSourceId + "DATA_SOURCE_ID": props.dataSourceId, + "SLACK_BOT_TOKEN_PARAMETER": props.slackBotTokenParameter.parameterName, + "SLACK_BOT_ACTIVE_ON_PRS": "false" }, additionalPolicies: [props.syncKnowledgeBaseManagedPolicy] }) From 1b3d60b18d2878a6b17b9f56dd31e7e4d25051f8 Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Mon, 2 Mar 2026 10:53:03 +0000 Subject: [PATCH 12/84] fix: unit test - policies --- packages/cdk/resources/RuntimePolicies.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/cdk/resources/RuntimePolicies.ts b/packages/cdk/resources/RuntimePolicies.ts index 396a6239a..fa404be90 100644 --- a/packages/cdk/resources/RuntimePolicies.ts +++ b/packages/cdk/resources/RuntimePolicies.ts @@ -127,11 +127,15 @@ export class RuntimePolicies extends Construct { actions: [ "bedrock:StartIngestionJob", "bedrock:GetIngestionJob", - "bedrock:ListIngestionJobs" + "bedrock:ListIngestionJobs", + "ssm:GetParameter", + "sqs:ReceiveMessage", + "sqs:DeleteMessage" ], resources: [ props.knowledgeBaseArn, - props.dataSourceArn + props.dataSourceArn, + ...slackBotPolicyResources ] }) From b5217c4807909b6070405f709ff0124141af2af7 Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Mon, 2 Mar 2026 11:17:20 +0000 Subject: [PATCH 13/84] fix: more logs --- packages/syncKnowledgeBaseFunction/app/handler.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index 030fa321c..050dedf62 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -385,6 +385,10 @@ def update_slack_files(processed_files: list, messages: list, complete=False): logger.warning("No processed files to update in Slack messages.") return + logger.info( + "Processing lack files Slack Notification", + extra={"processed_files": processed_files, "messages": messages, "complete": complete}, + ) added = sum(1 for f in processed_files if f["event_type"] == "CREATE") deleted = sum(1 for f in processed_files if f["event_type"] == "DELETE") @@ -471,7 +475,7 @@ def process_sqs_record(s3_record): }, ) - return {"processed_files": [processed_file["file_key"] for processed_file in processed_files], "job_ids": job_ids} + return {"processed_files": processed_files, "job_ids": job_ids} @logger.inject_lambda_context(log_event=True, clear_state=True) @@ -525,6 +529,8 @@ def handler(event, context): logger.info("Processing SQS record", extra={"record_index": sqs_index + 1}) results = process_sqs_record(sqs_record) + + logger.info("Processed", extra={"processed": results}) processed_files.extend(results["processed_files"]) job_ids.extend(results["job_ids"]) From f510150d4fc60ca7ca89025c51bec143ba8994cf Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Mon, 2 Mar 2026 12:00:53 +0000 Subject: [PATCH 14/84] fix: missing properties --- .../syncKnowledgeBaseFunction/app/handler.py | 57 ++++++++++++------- 1 file changed, 36 insertions(+), 21 deletions(-) diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index 050dedf62..486b537fc 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -198,7 +198,7 @@ def get_bot_channels(client): return channel_ids -def post_message(channel_id: str, blocks: list, text_fallback: str) -> SlackResponse: +def post_message(slack_client, channel_id: str, blocks: list, text_fallback: str): """ Posts the formatted message to a specific channel. """ @@ -212,7 +212,7 @@ def post_message(channel_id: str, blocks: list, text_fallback: str) -> SlackResp return None -def initialise_slack_messages(event_count: int) -> list: +def initialise_slack_messages(event_count: int) -> tuple: """ Send Slack notification summarizing the synchronization status """ @@ -251,21 +251,21 @@ def initialise_slack_messages(event_count: int) -> list: if not target_channels: logger.warning("SKIPPING - Bot is not in any channels. No messages sent.") - return [] + return slack_client, [] # Broadcast Loop logger.info(f"Broadcasting to {len(target_channels)} channels...") responses = [] for channel_id in target_channels: - response = post_message(channel_id, blocks, message) + response = post_message(slack_client=slack_client, channel_id=channel_id, blocks=blocks, text_fallback=message) responses.append(response) logger.info("Broadcast complete.", extra={"responses": len(responses)}) - return responses + return slack_client, responses -def update_slack_message(response, blocks): +def update_slack_message(slack_client, response, blocks): """ Update the existing Slack message blocks with new information """ @@ -299,10 +299,22 @@ def update_slack_task( task["status"] = status if details: - task["details"] = details + task["details"] = { + "type": "rich_text", + "block_id": uuid.uuid4().hex, + "elements": [ + {"type": "rich_text_section", "elements": [{"type": "text", "text": detail}]} for detail in details + ], + } if outputs: - task["output"] = outputs + task["output"] = { + "type:": "rich_text", + "block_id": uuid.uuid4().hex, + "elements": [ + {"type": "rich_text_section", "elements": [{"type": "text", "text": output}]} for output in outputs + ], + } return plan @@ -346,7 +358,7 @@ def create_task( return task -def update_slack_events(event_count: int, messages: list): +def update_slack_events(slack_client, event_count: int, messages: list): """ Update the event count in the existing Slack message blocks """ @@ -371,10 +383,10 @@ def update_slack_events(event_count: int, messages: list): else: create_task(plan=plan, title=title, outputs=outputs) - update_slack_message(response, blocks) + update_slack_message(slack_client, response, blocks) -def update_slack_files(processed_files: list, messages: list, complete=False): +def update_slack_files(slack_client, processed_files: list, messages: list, complete=False): """ Update the existing Slack message blocks with the count of processed files """ @@ -410,16 +422,14 @@ def update_slack_files(processed_files: list, messages: list, complete=False): outputs = [f"Total files processed: {added + deleted}"] if task: - plan = update_slack_task( - plan=plan, task=task, messages=messages, status=status, title=title, details=details, outputs=outputs - ) + plan = update_slack_task(plan=plan, task=task, status=status, title=title, details=details, outputs=outputs) else: create_task(plan=plan, title=title, details=details, outputs=outputs) - update_slack_message(response, blocks) + update_slack_message(slack_client=slack_client, response=response, blocks=blocks) -def update_slack_complete(messages): +def update_slack_complete(slack_client, messages): """ Mark Slack Plan as complete """ @@ -439,7 +449,7 @@ def update_slack_complete(messages): for i, task in plan["tasks"]: task["status"] = "completed" - update_slack_message(response, blocks) + update_slack_message(slack_client, response, blocks) def process_sqs_record(s3_record): @@ -510,7 +520,7 @@ def handler(event, context): processed_files = [] # Track successfully processed file keys job_ids = [] # Track started ingestion job IDs - slack_messages = initialise_slack_messages(len(records)) + slack_client, slack_messages = initialise_slack_messages(len(records)) skipped = 0 # Process each S3 event record in the SQS batch for sqs_index, sqs_record in enumerate(records): @@ -523,7 +533,9 @@ def handler(event, context): "record_index": sqs_index + 1, }, ) - update_slack_events(len(records) - skipped, slack_messages) + update_slack_events( + slack_client=slack_client, event_count=len(records) - skipped, messages=slack_messages + ) skipped += 1 continue @@ -535,7 +547,10 @@ def handler(event, context): job_ids.extend(results["job_ids"]) update_slack_files( - processed_files=processed_files, messages=slack_messages, complete=(sqs_index == len(records) - 1) + slack_client=slack_client, + processed_files=processed_files, + messages=slack_messages, + complete=(sqs_index == len(records) - 1), ) except (json.JSONDecodeError, KeyError) as e: @@ -544,7 +559,7 @@ def handler(event, context): total_duration = time.time() - start_time - update_slack_complete(messages=slack_messages) + update_slack_complete(slack_client=slack_client, messages=slack_messages) logger.info( "Knowledge base sync process completed", From b1bc03a0f9356948ec410ab8196a562b6029bda6 Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Mon, 2 Mar 2026 12:19:46 +0000 Subject: [PATCH 15/84] fix: force rebuild #skip-qc From e9e1767e9e32706edba127efab8acdc9baad8088 Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Mon, 2 Mar 2026 14:13:29 +0000 Subject: [PATCH 16/84] fix: force rebuild #skip-qc --- packages/syncKnowledgeBaseFunction/app/handler.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index 486b537fc..f762497de 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -205,10 +205,14 @@ def post_message(slack_client, channel_id: str, blocks: list, text_fallback: str try: return slack_client.chat_postMessage(channel=channel_id, text=text_fallback, blocks=blocks) except SlackApiError as e: - logger.error(f"Error posting to {channel_id}: {str(e)}") + logger.error( + f"Error posting to {channel_id}: {str(e)}", extra={"blocks": blocks, "text_fallback": text_fallback} + ) return None except Exception as e: - logger.error(f"Error posting to {channel_id}: {str(e)}") + logger.error( + f"Error posting to {channel_id}: {str(e)}", extra={"blocks": blocks, "text_fallback": text_fallback} + ) return None @@ -342,7 +346,7 @@ def create_task( ], }, "output": { - "type:": "rich_text", + "type": "rich_text", "block_id": uuid.uuid4().hex, "elements": [ {"type": "rich_text_section", "elements": [{"type": "text", "text": output}]} From e6e1ba5e7882599ecf1996655381d54cfe8da783 Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Mon, 2 Mar 2026 14:41:39 +0000 Subject: [PATCH 17/84] fix: force rebuild #skip-qc --- packages/syncKnowledgeBaseFunction/app/handler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index f762497de..c8b8ab0ac 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -313,7 +313,7 @@ def update_slack_task( if outputs: task["output"] = { - "type:": "rich_text", + "type": "rich_text", "block_id": uuid.uuid4().hex, "elements": [ {"type": "rich_text_section", "elements": [{"type": "text", "text": output}]} for output in outputs From 5b681624021f884c8e1f20c0cce0a5b00dbac764 Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Mon, 2 Mar 2026 15:13:07 +0000 Subject: [PATCH 18/84] fix: handle errors #skip-qc --- .../syncKnowledgeBaseFunction/app/handler.py | 35 +++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index c8b8ab0ac..b5657e56d 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -139,7 +139,7 @@ def process_s3_record(record, record_index): return True, object_key, job_id, event_type -def handle_client_error(e, start_time): +def handle_client_error(e, start_time, slack_client, slack_messages): """ Handle AWS ClientError exceptions with appropriate responses @@ -161,11 +161,15 @@ def handle_client_error(e, start_time): "explanation": "Normal when multiple files uploaded quickly", }, ) + + update_slack_complete(slack_client=slack_client, messages=slack_messages) return { "statusCode": 409, "body": "Files uploaded successfully - processing by existing ingestion job (no action required)", } else: + + update_slack_error(slack_client=slack_client, messages=slack_messages) # Handle other AWS service errors logger.error( "AWS service error occurred", @@ -456,6 +460,32 @@ def update_slack_complete(slack_client, messages): update_slack_message(slack_client, response, blocks) +def update_slack_error(slack_client, messages, error): + """ + Mark Slack Plan as errored + """ + if not messages: + logger.warning("No existing Slack messages to update event count.") + return + + for response in messages: + if response is None: + continue + + # Update the event count in the plan block + blocks = response["message"]["blocks"] + plan = next((block for block in blocks if block["type"] == "plan"), None) + + plan["title"] = "Processing complete!" + for i, task in plan["tasks"]: + if i == len(plan["tasks"]) - 1: + task["status"] = "error" + else: + task["status"] = "completed" + + update_slack_message(slack_client, response, blocks) + + def process_sqs_record(s3_record): """ Process a single Simple Queue Service record and prepare processing @@ -587,10 +617,11 @@ def handler(event, context): except ClientError as e: # Handle AWS service errors - return handle_client_error(e, start_time) + return handle_client_error(e, start_time, slack_client, slack_messages) except Exception as e: # Handle unexpected errors + update_slack_error(slack_client=slack_client, messages=slack_messages, error=e) logger.error( "Unexpected error occurred", extra={ From a3896e93937c28b91c226713c6a6a9f4ea097fe1 Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Mon, 2 Mar 2026 15:38:46 +0000 Subject: [PATCH 19/84] fix: handle errors #skip-qc --- packages/cdk/constructs/SimpleQueueService.ts | 2 +- packages/syncKnowledgeBaseFunction/app/handler.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/cdk/constructs/SimpleQueueService.ts b/packages/cdk/constructs/SimpleQueueService.ts index 8fd311aaf..d28c4cc94 100644 --- a/packages/cdk/constructs/SimpleQueueService.ts +++ b/packages/cdk/constructs/SimpleQueueService.ts @@ -46,7 +46,7 @@ export class SimpleQueueService extends Construct { encryptionMasterKey: kmsKey, deadLetterQueue: { queue: deadLetterQueue, - maxReceiveCount: 3 // Move to DLQ after 3 failed attempts + maxReceiveCount: 1 // Move to DLQ after a failed attempt }, deliveryDelay: Duration.seconds(0), visibilityTimeout: Duration.seconds(60), diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index b5657e56d..58a4a6e93 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -454,7 +454,7 @@ def update_slack_complete(slack_client, messages): plan = next((block for block in blocks if block["type"] == "plan"), None) plan["title"] = "Processing complete!" - for i, task in plan["tasks"]: + for i, task in enumerate(plan["tasks"]): task["status"] = "completed" update_slack_message(slack_client, response, blocks) @@ -477,7 +477,7 @@ def update_slack_error(slack_client, messages, error): plan = next((block for block in blocks if block["type"] == "plan"), None) plan["title"] = "Processing complete!" - for i, task in plan["tasks"]: + for i, task in enumerate(plan["tasks"]): if i == len(plan["tasks"]) - 1: task["status"] = "error" else: From 0d35aede109fb45fc2a50816cd95aca6f8efca89 Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Mon, 2 Mar 2026 16:01:28 +0000 Subject: [PATCH 20/84] fix: use correct enums #skip-qc --- packages/syncKnowledgeBaseFunction/app/handler.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index 58a4a6e93..d86cd971a 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -455,7 +455,7 @@ def update_slack_complete(slack_client, messages): plan["title"] = "Processing complete!" for i, task in enumerate(plan["tasks"]): - task["status"] = "completed" + task["status"] = "complete" update_slack_message(slack_client, response, blocks) @@ -481,7 +481,7 @@ def update_slack_error(slack_client, messages, error): if i == len(plan["tasks"]) - 1: task["status"] = "error" else: - task["status"] = "completed" + task["status"] = "complete" update_slack_message(slack_client, response, blocks) From b92a18b8336731182a8cdcab6ad2c9fbdd31ed05 Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Mon, 2 Mar 2026 16:47:24 +0000 Subject: [PATCH 21/84] fix: use correct enums #skip-qc --- .../cdk/resources/S3LambdaNotification.ts | 2 +- .../syncKnowledgeBaseFunction/app/handler.py | 40 ++++++++++++++----- .../tests/test_app.py | 9 +++-- 3 files changed, 35 insertions(+), 16 deletions(-) diff --git a/packages/cdk/resources/S3LambdaNotification.ts b/packages/cdk/resources/S3LambdaNotification.ts index fad4353fa..02273d049 100644 --- a/packages/cdk/resources/S3LambdaNotification.ts +++ b/packages/cdk/resources/S3LambdaNotification.ts @@ -25,7 +25,7 @@ export class S3LambdaNotification extends Construct { const queue = new SimpleQueueService(this, `${props.stackName}-${queueName}`, { stackName: props.stackName, queueName: queueName, - batchDelay: 100, + batchDelay: 300, // 5 minutes functions: [ props.functions.syncKnowledgeBaseFunction ] diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index d86cd971a..04d41e07f 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -220,12 +220,11 @@ def post_message(slack_client, channel_id: str, blocks: list, text_fallback: str return None -def initialise_slack_messages(event_count: int) -> tuple: +def initialise_slack_messages(event_count: int): """ Send Slack notification summarizing the synchronization status """ # Build blocks for Slack message - message = "*My knowledge base has been updated!*" blocks = [ { "type": "section", @@ -266,7 +265,12 @@ def initialise_slack_messages(event_count: int) -> tuple: responses = [] for channel_id in target_channels: - response = post_message(slack_client=slack_client, channel_id=channel_id, blocks=blocks, text_fallback=message) + response = post_message( + slack_client=slack_client, + channel_id=channel_id, + blocks=blocks, + text_fallback="*My knowledge base has been updated!*", + ) responses.append(response) logger.info("Broadcast complete.", extra={"responses": len(responses)}) @@ -280,6 +284,9 @@ def update_slack_message(slack_client, response, blocks): channel_id = response["channel"] ts = response["ts"] + if slack_client is None: + return + try: slack_client.chat_update(channel=channel_id, ts=ts, blocks=blocks) except SlackApiError as e: @@ -429,7 +436,7 @@ def update_slack_files(slack_client, processed_files: list, messages: list, comp details = [f"{val} {label} file(s)" for val, label in [(added, "new"), (deleted, "removed")] if val > 0] outputs = [f"Total files processed: {added + deleted}"] - if task: + if task and task["title"] == title: plan = update_slack_task(plan=plan, task=task, status=status, title=title, details=details, outputs=outputs) else: create_task(plan=plan, title=title, details=details, outputs=outputs) @@ -460,7 +467,7 @@ def update_slack_complete(slack_client, messages): update_slack_message(slack_client, response, blocks) -def update_slack_error(slack_client, messages, error): +def update_slack_error(slack_client, messages): """ Mark Slack Plan as errored """ @@ -554,7 +561,8 @@ def handler(event, context): processed_files = [] # Track successfully processed file keys job_ids = [] # Track started ingestion job IDs - slack_client, slack_messages = initialise_slack_messages(len(records)) + slack_client = None + slack_messages = [] skipped = 0 # Process each S3 event record in the SQS batch for sqs_index, sqs_record in enumerate(records): @@ -567,19 +575,27 @@ def handler(event, context): "record_index": sqs_index + 1, }, ) - update_slack_events( - slack_client=slack_client, event_count=len(records) - skipped, messages=slack_messages - ) + if slack_client: + update_slack_events( + slack_client=slack_client, event_count=len(records) - skipped, messages=slack_messages + ) skipped += 1 continue logger.info("Processing SQS record", extra={"record_index": sqs_index + 1}) results = process_sqs_record(sqs_record) + # Wait until something is processed before initialising as a conflict isn't checked until processing + # If it doesn't fail, post to chat(s) + if not slack_client: + slack_client, slack_messages = initialise_slack_messages(len(records)) + logger.info("Processed", extra={"processed": results}) processed_files.extend(results["processed_files"]) job_ids.extend(results["job_ids"]) + # Update chat to show processed files + # If we've reached here, the chat must be initialised. update_slack_files( slack_client=slack_client, processed_files=processed_files, @@ -593,7 +609,9 @@ def handler(event, context): total_duration = time.time() - start_time - update_slack_complete(slack_client=slack_client, messages=slack_messages) + # Mark all tasks in Slack Plan to complete + if slack_client: + update_slack_complete(slack_client=slack_client, messages=slack_messages) logger.info( "Knowledge base sync process completed", @@ -621,7 +639,7 @@ def handler(event, context): except Exception as e: # Handle unexpected errors - update_slack_error(slack_client=slack_client, messages=slack_messages, error=e) + update_slack_error(slack_client=slack_client, messages=slack_messages) logger.error( "Unexpected error occurred", extra={ diff --git a/packages/syncKnowledgeBaseFunction/tests/test_app.py b/packages/syncKnowledgeBaseFunction/tests/test_app.py index 8fb1f0bee..2844b81b1 100644 --- a/packages/syncKnowledgeBaseFunction/tests/test_app.py +++ b/packages/syncKnowledgeBaseFunction/tests/test_app.py @@ -1,7 +1,7 @@ import json import pytest import os -from unittest.mock import Mock, patch, MagicMock +from unittest.mock import Mock, patch, MagicMock, DEFAULT from botocore.exceptions import ClientError @@ -117,7 +117,7 @@ def test_handler_success( mock_bedrock.start_ingestion_job.return_value = { "ingestionJob": {"ingestionJobId": "job-123", "status": "STARTING"} } - mock_initialise_slack_messages.return_value = [] + mock_initialise_slack_messages.return_value = (DEFAULT, []) from app.handler import handler @@ -151,7 +151,7 @@ def test_handler_multiple_files( mock_bedrock.start_ingestion_job.return_value = { "ingestionJob": {"ingestionJobId": "job-123", "status": "STARTING"} } - mock_initialise_slack_messages.return_value = [] + mock_initialise_slack_messages.return_value = (DEFAULT, []) from app.handler import handler @@ -218,6 +218,7 @@ def test_handler_unexpected_error( mock_time.side_effect = [1000, 1001, 1002] mock_bedrock = mock_boto_client.return_value mock_bedrock.start_ingestion_job.side_effect = Exception("Unexpected error") + mock_initialise_slack_messages.return_value = (DEFAULT, []) from app.handler import handler @@ -366,7 +367,7 @@ def test_handler_unknown_event_type( mock_bedrock.start_ingestion_job.return_value = { "ingestionJob": {"ingestionJobId": "job-123", "status": "STARTING"} } - mock_initialise_slack_messages.return_value = [] + mock_initialise_slack_messages.return_value = (DEFAULT, []) unknown_event = { "Records": [ From 95cbd0e2d534995fe08138ffb9760703c7c6732a Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Tue, 3 Mar 2026 10:20:16 +0000 Subject: [PATCH 22/84] fix: merge events --- .../syncKnowledgeBaseFunction/app/handler.py | 197 ++++++++---------- .../tests/test_app.py | 10 +- 2 files changed, 92 insertions(+), 115 deletions(-) diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index 04d41e07f..89d75f7f7 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -168,8 +168,8 @@ def handle_client_error(e, start_time, slack_client, slack_messages): "body": "Files uploaded successfully - processing by existing ingestion job (no action required)", } else: - update_slack_error(slack_client=slack_client, messages=slack_messages) + # Handle other AWS service errors logger.error( "AWS service error occurred", @@ -224,57 +224,67 @@ def initialise_slack_messages(event_count: int): """ Send Slack notification summarizing the synchronization status """ - # Build blocks for Slack message - blocks = [ - { - "type": "section", - "text": { - "type": "plain_text", - "text": "I am currently syncing changes to my knowledge base.\n This may take a few minutes.", + default_response = (None, []) + try: + # Build blocks for Slack message + blocks = [ + { + "type": "section", + "text": { + "type": "plain_text", + "text": "I am currently syncing changes to my knowledge base.\n This may take a few minutes.", + }, }, - }, - { - "type": "plan", - "plan_id": "plan_1", - "title": "Fetching changes...", - "tasks": [create_task(title="Fetching changes", details=[], outputs=[f"Found {event_count} event(s)"])], - }, - { - "type": "context", - "elements": [{"type": "plain_text", "text": "Please wait up-to 10 minutes for changes to take effect"}], - }, - ] + { + "type": "plan", + "plan_id": "plan_1", + "title": "Fetching changes...", + "tasks": [create_task(title="Fetching changes", details=[], outputs=[f"Found {event_count} event(s)"])], + }, + { + "type": "context", + "elements": [{"type": "plain_text", "text": "Please wait up-to 10 minutes for changes to take effect"}], + }, + ] - # Create new client - token = get_bot_token() - slack_client = WebClient(token=token) - response = slack_client.auth_test() + # Create new client + token = get_bot_token() + slack_client = WebClient(token=token) + response = slack_client.auth_test() - logger.info(f"Authenticated as bot user: {response.get('user_id', 'unknown')}", extra={"response": response}) + logger.info(f"Authenticated as bot user: {response.get('user_id', 'unknown')}", extra={"response": response}) - # Get Channels where the Bot is a member - logger.info("Find bot channels...") - target_channels = get_bot_channels(slack_client) + # Get Channels where the Bot is a member + logger.info("Find bot channels...") + target_channels = get_bot_channels(slack_client) - if not target_channels: - logger.warning("SKIPPING - Bot is not in any channels. No messages sent.") - return slack_client, [] + if not target_channels: + logger.warning("SKIPPING - Bot is not in any channels. No messages sent.") + return default_response - # Broadcast Loop - logger.info(f"Broadcasting to {len(target_channels)} channels...") + # Broadcast Loop + logger.info(f"Broadcasting to {len(target_channels)} channels...") - responses = [] - for channel_id in target_channels: - response = post_message( - slack_client=slack_client, - channel_id=channel_id, - blocks=blocks, - text_fallback="*My knowledge base has been updated!*", - ) - responses.append(response) + responses = [] + for channel_id in target_channels: + try: + response = post_message( + slack_client=slack_client, + channel_id=channel_id, + blocks=blocks, + text_fallback="*My knowledge base has been updated!*", + ) + responses.append(response) + except Exception as e: + logger.error(f"Failed to initialise slack message for channel: {channel_id}", extra={"exception": e}) + continue + + logger.info("Broadcast complete.", extra={"responses": len(responses)}) + return slack_client, responses - logger.info("Broadcast complete.", extra={"responses": len(responses)}) - return slack_client, responses + except Exception as e: + logger.error(f"Failed to initialise slack messages: {str(e)}") + return default_response def update_slack_message(slack_client, response, blocks): @@ -339,7 +349,7 @@ def create_task( plan=None, details=None, outputs=None, - status: Literal["in_progress", "completed"] = "in_progress", + status: Literal["in_progress", "complete"] = "in_progress", ): """ Helper function to create a task object for the plan block @@ -373,35 +383,7 @@ def create_task( return task -def update_slack_events(slack_client, event_count: int, messages: list): - """ - Update the event count in the existing Slack message blocks - """ - if not messages: - logger.warning("No existing Slack messages to update event count.") - return - - for response in messages: - if response is None: - continue - - # Update the event count in the plan block - blocks = response["message"]["blocks"] - plan = next((block for block in blocks if block["type"] == "plan"), None) - task = plan["tasks"][-1] if (plan and "tasks" in plan and plan["tasks"]) else None - - title = "Fetching changes" - outputs = [f"Found {event_count} event(s)"] - - if task: - plan = update_slack_task(plan=plan, task=task, title=title, outputs=outputs) - else: - create_task(plan=plan, title=title, outputs=outputs) - - update_slack_message(slack_client, response, blocks) - - -def update_slack_files(slack_client, processed_files: list, messages: list, complete=False): +def update_slack_files(slack_client, processed_files: list, messages: list): """ Update the existing Slack message blocks with the count of processed files """ @@ -418,6 +400,7 @@ def update_slack_files(slack_client, processed_files: list, messages: list, comp ) added = sum(1 for f in processed_files if f["event_type"] == "CREATE") deleted = sum(1 for f in processed_files if f["event_type"] == "DELETE") + skip = (added + deleted) == 0 logger.info(f"Processed {added} added/updated and {deleted} deleted file(s).") @@ -432,14 +415,14 @@ def update_slack_files(slack_client, processed_files: list, messages: list, comp # Task params title = "Processing file changes" - status = "completed" if complete else "in_progress" + status = "completed" details = [f"{val} {label} file(s)" for val, label in [(added, "new"), (deleted, "removed")] if val > 0] - outputs = [f"Total files processed: {added + deleted}"] + outputs = [f"Total files processed: {added + deleted}" if skip else "No file changes"] if task and task["title"] == title: plan = update_slack_task(plan=plan, task=task, status=status, title=title, details=details, outputs=outputs) else: - create_task(plan=plan, title=title, details=details, outputs=outputs) + create_task(plan=plan, title=title, details=details, outputs=outputs, status=status) update_slack_message(slack_client=slack_client, response=response, blocks=blocks) @@ -493,18 +476,15 @@ def update_slack_error(slack_client, messages): update_slack_message(slack_client, response, blocks) -def process_sqs_record(s3_record): +def process_sqs_record(s3_records): """ Process a single Simple Queue Service record and prepare processing of a S3 record. """ + logger.info("process_sqs_record s3_records") processed_files = [] # Track successfully processed file keys job_ids = [] # Track started ingestion job IDs - body = json.loads(s3_record.get("body", "{}")) - - s3_records = body.get("Records", []) - if not s3_records: logger.warning("Skipping SQS event - no S3 events found.") return {"processed_files": [], "job_ids": []} @@ -556,14 +536,17 @@ def handler(event, context): }, ) + slack_client = None + slack_messages = [] try: records = event.get("Records", []) processed_files = [] # Track successfully processed file keys job_ids = [] # Track started ingestion job IDs + s3_records = [] # Track completed ingestion items + + logger.info("initialise") + slack_client, slack_messages = initialise_slack_messages(len(records)) - slack_client = None - slack_messages = [] - skipped = 0 # Process each S3 event record in the SQS batch for sqs_index, sqs_record in enumerate(records): try: @@ -575,43 +558,31 @@ def handler(event, context): "record_index": sqs_index + 1, }, ) - if slack_client: - update_slack_events( - slack_client=slack_client, event_count=len(records) - skipped, messages=slack_messages - ) - skipped += 1 continue - logger.info("Processing SQS record", extra={"record_index": sqs_index + 1}) - results = process_sqs_record(sqs_record) - - # Wait until something is processed before initialising as a conflict isn't checked until processing - # If it doesn't fail, post to chat(s) - if not slack_client: - slack_client, slack_messages = initialise_slack_messages(len(records)) - - logger.info("Processed", extra={"processed": results}) - processed_files.extend(results["processed_files"]) - job_ids.extend(results["job_ids"]) - - # Update chat to show processed files - # If we've reached here, the chat must be initialised. - update_slack_files( - slack_client=slack_client, - processed_files=processed_files, - messages=slack_messages, - complete=(sqs_index == len(records) - 1), - ) + body = json.loads(sqs_record.get("body", "{}")) + s3_records += body.get("Records", []) except (json.JSONDecodeError, KeyError) as e: logger.error(f"Failed to parse SQS body: {str(e)}") continue + if not s3_records: + logger.info("No valid S3 records to process", extra={"s3_records": len(records)}) + + logger.info("Processing S3 records", extra={"record_count": len(s3_records)}) + results = process_sqs_record(s3_records) + + processed_files.extend(results["processed_files"]) + job_ids.extend(results["job_ids"]) + + # Update file messages (N removed, N added, etc) + update_slack_files(slack_client=slack_client, processed_files=processed_files, messages=slack_messages) + total_duration = time.time() - start_time - # Mark all tasks in Slack Plan to complete - if slack_client: - update_slack_complete(slack_client=slack_client, messages=slack_messages) + # Make sure all tasks are marked as complete in the Slack Plan + update_slack_complete(slack_client=slack_client, messages=slack_messages) logger.info( "Knowledge base sync process completed", diff --git a/packages/syncKnowledgeBaseFunction/tests/test_app.py b/packages/syncKnowledgeBaseFunction/tests/test_app.py index 2844b81b1..92f6359cc 100644 --- a/packages/syncKnowledgeBaseFunction/tests/test_app.py +++ b/packages/syncKnowledgeBaseFunction/tests/test_app.py @@ -166,7 +166,7 @@ def test_handler_multiple_files( @patch("boto3.client") @patch("time.time") def test_handler_conflict_exception( - mock_time, mock_boto_client, start_ingestion_job, mock_env, lambda_context, s3_event + mock_time, mock_boto_client, mock_initialise_slack_messages, mock_env, lambda_context, s3_event ): """Test handler with ConflictException (job already running)""" mock_time.side_effect = [1000, 1001, 1002] @@ -176,6 +176,7 @@ def test_handler_conflict_exception( ) mock_bedrock = mock_boto_client.return_value mock_bedrock.start_ingestion_job.side_effect = error + mock_initialise_slack_messages.return_value = (DEFAULT, []) from app.handler import handler @@ -199,6 +200,7 @@ def test_handler_aws_error( ) mock_bedrock = mock_boto_client.return_value mock_bedrock.start_ingestion_job.side_effect = error + mock_initialise_slack_messages.return_value = (DEFAULT, []) from app.handler import handler @@ -242,7 +244,7 @@ def test_handler_missing_env_vars(lambda_context, s3_event): @patch("app.handler.initialise_slack_messages") @patch("boto3.client") -def test_handler_invalid_s3_record(mock_initialise_slack_messages, mock_boto_client, mock_env, lambda_context): +def test_handler_invalid_s3_record(mock_boto_client, mock_initialise_slack_messages, mock_env, lambda_context): """Test handler with invalid S3 record""" invalid_event = { "Records": [ @@ -256,6 +258,7 @@ def test_handler_invalid_s3_record(mock_initialise_slack_messages, mock_boto_cli } ] } + mock_initialise_slack_messages.return_value = (DEFAULT, []) from app.handler import handler @@ -277,6 +280,7 @@ def test_handler_non_s3_event(mock_boto_client, mock_initialise_slack_messages, } ] } + mock_initialise_slack_messages.return_value = (DEFAULT, []) from app.handler import handler @@ -291,6 +295,7 @@ def test_handler_non_s3_event(mock_boto_client, mock_initialise_slack_messages, def test_handler_empty_records(mock_boto_client, mock_initialise_slack_messages, mock_env, lambda_context): """Test handler with empty records""" empty_event = {"Records": []} + mock_initialise_slack_messages.return_value = (DEFAULT, []) from app.handler import handler @@ -346,6 +351,7 @@ def test_handler_unsupported_file_type(mock_boto_client, mock_initialise_slack_m } ] } + mock_initialise_slack_messages.return_value = (DEFAULT, []) from app.handler import handler From 6dc8b7ecb2327636ec531c7a038890703122218c Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Tue, 3 Mar 2026 12:31:18 +0000 Subject: [PATCH 23/84] fix: add basic tests for slack --- .../syncKnowledgeBaseFunction/app/handler.py | 159 ++++++++++++------ .../tests/test_app.py | 143 ++++++++++++++++ 2 files changed, 247 insertions(+), 55 deletions(-) diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index 89d75f7f7..93ca63670 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -162,7 +162,9 @@ def handle_client_error(e, start_time, slack_client, slack_messages): }, ) - update_slack_complete(slack_client=slack_client, messages=slack_messages) + update_slack_complete( + slack_client=slack_client, messages=slack_messages, feedback="Update already in progress." + ) return { "statusCode": 409, "body": "Files uploaded successfully - processing by existing ingestion job (no action required)", @@ -295,9 +297,11 @@ def update_slack_message(slack_client, response, blocks): ts = response["ts"] if slack_client is None: + logger.warning("No Slack client found, skipping update message") return try: + logger.info("Updating Slack channel") slack_client.chat_update(channel=channel_id, ts=ts, blocks=blocks) except SlackApiError as e: logger.error(f"Error updating message in {channel_id}: {str(e)}") @@ -313,6 +317,7 @@ def update_slack_task( details=None, outputs=None, ): + logger.info("Updating Slack task") if not task: return plan @@ -388,6 +393,7 @@ def update_slack_files(slack_client, processed_files: list, messages: list): Update the existing Slack message blocks with the count of processed files """ if not messages: + logger.warning("No slack messages to update") return if not processed_files: @@ -396,7 +402,7 @@ def update_slack_files(slack_client, processed_files: list, messages: list): logger.info( "Processing lack files Slack Notification", - extra={"processed_files": processed_files, "messages": messages, "complete": complete}, + extra={"processed_files": processed_files, "messages": messages}, ) added = sum(1 for f in processed_files if f["event_type"] == "CREATE") deleted = sum(1 for f in processed_files if f["event_type"] == "DELETE") @@ -404,30 +410,47 @@ def update_slack_files(slack_client, processed_files: list, messages: list): logger.info(f"Processed {added} added/updated and {deleted} deleted file(s).") - for response in messages: - if response is None: - continue - - # Update the event count in the plan block - blocks = response["message"]["blocks"] - plan = next((block for block in blocks if block["type"] == "plan"), None) - task = plan["tasks"][-1] if plan and "tasks" in plan and plan["tasks"] else None - - # Task params - title = "Processing file changes" - status = "completed" - details = [f"{val} {label} file(s)" for val, label in [(added, "new"), (deleted, "removed")] if val > 0] - outputs = [f"Total files processed: {added + deleted}" if skip else "No file changes"] - - if task and task["title"] == title: - plan = update_slack_task(plan=plan, task=task, status=status, title=title, details=details, outputs=outputs) - else: - create_task(plan=plan, title=title, details=details, outputs=outputs, status=status) + for i, response in enumerate(messages): + try: + if response is None: + logger.info(f"Skipping empty response ({i + 1})") + continue - update_slack_message(slack_client=slack_client, response=response, blocks=blocks) + # Update the event count in the plan block + blocks = response["message"] + blocks = response["message"]["blocks"] + plan = next((block for block in blocks if block["type"] == "plan"), None) + task = plan["tasks"][-1] if plan and "tasks" in plan and plan["tasks"] else None + + # Task params + logger.info("test 1") + title = "Processing file changes" + status = "completed" + details = [f"{val} {label} file(s)" for val, label in [(added, "new"), (deleted, "removed")] if val > 0] + outputs = [f"Total files processed: {added + deleted}" if skip else "No file changes"] + + if task and task["title"] == title: + plan = update_slack_task( + plan=plan, task=task, status=status, title=title, details=details, outputs=outputs + ) + else: + create_task(plan=plan, title=title, details=details, outputs=outputs, status=status) + + update_slack_message(slack_client=slack_client, response=response, blocks=blocks) + except Exception as e: + logger.error( + "Unexpected error occurred updating Slack message", + extra={ + "status_code": 500, + "error_type": type(e).__name__, + "error_message": str(e), + "error": traceback.format_exc(), + "e": e, + }, + ) -def update_slack_complete(slack_client, messages): +def update_slack_complete(slack_client, messages, feedback: None): """ Mark Slack Plan as complete """ @@ -436,18 +459,30 @@ def update_slack_complete(slack_client, messages): return for response in messages: - if response is None: - continue + try: + if response is None: + continue - # Update the event count in the plan block - blocks = response["message"]["blocks"] - plan = next((block for block in blocks if block["type"] == "plan"), None) + # Update the event count in the plan block + blocks = response["message"]["blocks"] + plan = next((block for block in blocks if block["type"] == "plan"), None) - plan["title"] = "Processing complete!" - for i, task in enumerate(plan["tasks"]): - task["status"] = "complete" + plan["title"] = feedback if feedback else "Processing complete!" + for i, task in enumerate(plan["tasks"]): + task["status"] = "complete" - update_slack_message(slack_client, response, blocks) + update_slack_message(slack_client, response, blocks) + except Exception as e: + logger.error( + "Unexpected error occurred completing Slack message", + extra={ + "status_code": 500, + "error_type": type(e).__name__, + "error_message": str(e), + "error": traceback.format_exc(), + "e": e, + }, + ) def update_slack_error(slack_client, messages): @@ -459,21 +494,33 @@ def update_slack_error(slack_client, messages): return for response in messages: - if response is None: - continue - - # Update the event count in the plan block - blocks = response["message"]["blocks"] - plan = next((block for block in blocks if block["type"] == "plan"), None) - - plan["title"] = "Processing complete!" - for i, task in enumerate(plan["tasks"]): - if i == len(plan["tasks"]) - 1: - task["status"] = "error" - else: - task["status"] = "complete" + try: + if response is None: + continue - update_slack_message(slack_client, response, blocks) + # Update the event count in the plan block + blocks = response["message"]["blocks"] + plan = next((block for block in blocks if block["type"] == "plan"), None) + + plan["title"] = "Processing complete!" + for i, task in enumerate(plan["tasks"]): + if i == len(plan["tasks"]) - 1: + task["status"] = "error" + else: + task["status"] = "complete" + + update_slack_message(slack_client, response, blocks) + except Exception as e: + logger.error( + "Unexpected error occurred posting Slack error status update", + extra={ + "status_code": 500, + "error_type": type(e).__name__, + "error_message": str(e), + "error": traceback.format_exc(), + "e": e, + }, + ) def process_sqs_record(s3_records): @@ -481,7 +528,6 @@ def process_sqs_record(s3_records): Process a single Simple Queue Service record and prepare processing of a S3 record. """ - logger.info("process_sqs_record s3_records") processed_files = [] # Track successfully processed file keys job_ids = [] # Track started ingestion job IDs @@ -547,6 +593,9 @@ def handler(event, context): logger.info("initialise") slack_client, slack_messages = initialise_slack_messages(len(records)) + logger.info("\n -- slack_messages") + logger.info(json.dumps(slack_messages)) + # Process each S3 event record in the SQS batch for sqs_index, sqs_record in enumerate(records): try: @@ -569,20 +618,20 @@ def handler(event, context): if not s3_records: logger.info("No valid S3 records to process", extra={"s3_records": len(records)}) + else: + logger.info("Processing S3 records", extra={"record_count": len(s3_records)}) + results = process_sqs_record(s3_records) - logger.info("Processing S3 records", extra={"record_count": len(s3_records)}) - results = process_sqs_record(s3_records) - - processed_files.extend(results["processed_files"]) - job_ids.extend(results["job_ids"]) + processed_files.extend(results["processed_files"]) + job_ids.extend(results["job_ids"]) - # Update file messages (N removed, N added, etc) - update_slack_files(slack_client=slack_client, processed_files=processed_files, messages=slack_messages) + # Update file messages (N removed, N added, etc) + update_slack_files(slack_client=slack_client, processed_files=processed_files, messages=slack_messages) total_duration = time.time() - start_time # Make sure all tasks are marked as complete in the Slack Plan - update_slack_complete(slack_client=slack_client, messages=slack_messages) + update_slack_complete(slack_client=slack_client, messages=slack_messages, feedback=None) logger.info( "Knowledge base sync process completed", diff --git a/packages/syncKnowledgeBaseFunction/tests/test_app.py b/packages/syncKnowledgeBaseFunction/tests/test_app.py index 92f6359cc..4396e8114 100644 --- a/packages/syncKnowledgeBaseFunction/tests/test_app.py +++ b/packages/syncKnowledgeBaseFunction/tests/test_app.py @@ -105,6 +105,69 @@ def multiple_s3_event(): } +@pytest.fixture +def slack_message_event(): + return { + "channel": "test", + "ts": "123456", + "message": { + "blocks": [ + { + "type": "plan", + "title": "Thinking completed", + "tasks": [ + { + "task_id": "call_001", + "title": "Fetched user profile information", + "status": "in_progress", + "details": { + "type": "rich_text", + "block_id": "viMWO", + "elements": [ + { + "type": "rich_text_section", + "elements": [{"type": "text", "text": "Searched database..."}], + } + ], + }, + "output": { + "type": "rich_text", + "block_id": "viMWO", + "elements": [ + { + "type": "rich_text_section", + "elements": [{"type": "text", "text": "Profile data loaded"}], + } + ], + }, + }, + { + "task_id": "call_002", + "title": "Checked user permissions", + "status": "pending", + }, + { + "task_id": "call_003", + "title": "Generated comprehensive user report", + "status": "complete", + "output": { + "type": "rich_text", + "block_id": "crsk", + "elements": [ + { + "type": "rich_text_section", + "elements": [{"type": "text", "text": "15 data points compiled"}], + } + ], + }, + }, + ], + } + ], + }, + } + + @patch("app.handler.initialise_slack_messages") @patch("boto3.client") @patch("time.time") @@ -408,3 +471,83 @@ def test_handler_unknown_event_type( dataSourceId="test-ds-id", description="Auto-sync triggered by S3 ObjectRestore:Completed on test-file.pdf", ) + + +@patch("app.handler.initialise_slack_messages") +@patch("boto3.client") +@patch("slack_sdk.WebClient") +@patch("time.time") +def test_slack_handler_success( + mock_time, + mock_slack_client, + mock_boto_client, + mock_initialise_slack_messages, + mock_env, + lambda_context, + s3_event, + slack_message_event, +): + """Test successful handler execution""" + mock_time.side_effect = [1000, 1001, 1002, 1003] + + # Slack + mock_instance = mock_slack_client.return_value + mock_instance.chat_update.return_value = {"ok": True} + mock_initialise_slack_messages.return_value = (mock_instance, [slack_message_event]) + + # Boto + mock_bedrock = mock_boto_client.return_value + mock_bedrock.start_ingestion_job.return_value = { + "ingestionJob": {"ingestionJobId": "job-123", "status": "STARTING"} + } + + from app.handler import handler + + result = handler(s3_event, lambda_context) + + assert result["statusCode"] == 200 + assert "Successfully triggered 1 ingestion job(s) for 1 trigger file(s)" in result["body"] + mock_instance.chat_update.call_count = 2 + + +@patch("app.handler.initialise_slack_messages") +@patch("boto3.client") +@patch("slack_sdk.WebClient") +@patch("time.time") +def test_slack_handler_success_multiple( + mock_time, + mock_slack_client, + mock_boto_client, + mock_initialise_slack_messages, + mock_env, + lambda_context, + s3_event, + slack_message_event, +): + """ + Test successful execution of slack messages. + Should not be any different then a single message + """ + mock_time.side_effect = [1000, 1001, 1002, 1003] + + # Slack + mock_instance = mock_slack_client.return_value + mock_instance.chat_update.return_value = {"ok": True} + mock_initialise_slack_messages.return_value = ( + mock_instance, + [slack_message_event, slack_message_event, slack_message_event], + ) + + # Boto + mock_bedrock = mock_boto_client.return_value + mock_bedrock.start_ingestion_job.return_value = { + "ingestionJob": {"ingestionJobId": "job-123", "status": "STARTING"} + } + + from app.handler import handler + + result = handler(s3_event, lambda_context) + + assert result["statusCode"] == 200 + assert "Successfully triggered 1 ingestion job(s) for 1 trigger file(s)" in result["body"] + mock_instance.chat_update.call_count = 2 From c5cfccfc857d36d7bb94edae0e984c707eb176a5 Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Tue, 3 Mar 2026 13:40:41 +0000 Subject: [PATCH 24/84] fix: add basic tests for slack --- packages/syncKnowledgeBaseFunction/app/handler.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index 93ca63670..b23cff0be 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -423,7 +423,6 @@ def update_slack_files(slack_client, processed_files: list, messages: list): task = plan["tasks"][-1] if plan and "tasks" in plan and plan["tasks"] else None # Task params - logger.info("test 1") title = "Processing file changes" status = "completed" details = [f"{val} {label} file(s)" for val, label in [(added, "new"), (deleted, "removed")] if val > 0] @@ -590,12 +589,8 @@ def handler(event, context): job_ids = [] # Track started ingestion job IDs s3_records = [] # Track completed ingestion items - logger.info("initialise") slack_client, slack_messages = initialise_slack_messages(len(records)) - logger.info("\n -- slack_messages") - logger.info(json.dumps(slack_messages)) - # Process each S3 event record in the SQS batch for sqs_index, sqs_record in enumerate(records): try: From 3aaa58a297f2665a2f513af8421f4881fea1e78b Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Tue, 3 Mar 2026 15:46:47 +0000 Subject: [PATCH 25/84] fix: expect a single message instead of multiple --- .../syncKnowledgeBaseFunction/app/handler.py | 216 ++++++++---------- .../tests/test_app.py | 30 ++- 2 files changed, 110 insertions(+), 136 deletions(-) diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index b23cff0be..a8d7f8a7a 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -27,70 +27,77 @@ def is_supported_file_type(file_key): return any(file_key.lower().endswith(ext) for ext in SUPPORTED_FILE_TYPES) -def process_s3_record(record, record_index): +def process_s3_records(records) -> tuple[bool, str, list, list]: """ - Process a single S3 record and start ingestion job if valid + Process a S3 records, a single record can not be synced - the whole drive will be synced + Files will be filtered by the knowledge base. Validates S3 record structure, checks file type support, and triggers Bedrock Knowledge Base ingestion for supported documents. """ - # Extract S3 event details - s3_info = record.get("s3", {}) - bucket_name = s3_info.get("bucket", {}).get("name") - object_key = s3_info.get("object", {}).get("key") - # Skip malformed S3 records - if not bucket_name or not object_key: - logger.warning( - "Skipping invalid S3 record", - extra={ - "record_index": record_index + 1, - "has_bucket": bool(bucket_name), - "has_object_key": bool(object_key), - }, - ) - return False, None, None + created = [] + deleted = [] + # Validate if the sync should occur by checking if any files are valid + for i, record in enumerate(records): + # Extract S3 event details + s3_info = record.get("s3", {}) + bucket_name = s3_info.get("bucket", {}).get("name") + object_key = s3_info.get("object", {}).get("key") + + # Skip malformed S3 records + if not bucket_name or not object_key: + logger.warning( + "Skipping invalid S3 record", + extra={ + "record_index": i + 1, + "has_bucket": bool(bucket_name), + "has_object_key": bool(object_key), + }, + ) + continue + + # Skip unsupported file types to avoid unnecessary processing + if not is_supported_file_type(object_key): + logger.info( + "Skipping unsupported file type", + extra={ + "file_key": object_key, + "supported_types": list(SUPPORTED_FILE_TYPES), + "record_index": i + 1, + }, + ) + continue + + # Extract additional event metadata for logging + event_name = record["eventName"] + object_size = s3_info.get("object", {}).get("size", "unknown") + + # Determine event type for proper handling + is_delete_event = event_name.startswith("ObjectRemoved") + is_create_event = event_name.startswith("ObjectCreated") + is_update_event = event_name.startswith("ObjectModified") - # Skip unsupported file types to avoid unnecessary processing - if not is_supported_file_type(object_key): logger.info( - "Skipping unsupported file type", + "Found valid S3 event for processing", extra={ - "file_key": object_key, - "supported_types": list(SUPPORTED_FILE_TYPES), - "record_index": record_index + 1, + "event_name": event_name, + "bucket": bucket_name, + "key": object_key, + "object_size_bytes": object_size, + "record_index": i + 1, }, ) - return False, None, None - # Extract additional event metadata for logging - event_name = record["eventName"] - object_size = s3_info.get("object", {}).get("size", "unknown") + # Determine event type based on S3 event name + if is_delete_event: + deleted.append(object_key) + elif is_create_event or is_update_event: + created.append(object_key) - # Determine event type for proper handling - is_delete_event = event_name.startswith("ObjectRemoved") - is_create_event = event_name.startswith("ObjectCreated") - - # Determine event type based on S3 event name - if is_delete_event: - event_type = "DELETE" - elif is_create_event: - event_type = "CREATE" - else: - event_type = "OTHER" - - logger.info( - "Processing S3 event", - extra={ - "event_name": event_name, - "event_type": event_type, - "bucket": bucket_name, - "key": object_key, - "object_size_bytes": object_size, - "is_delete_event": is_delete_event, - "record_index": record_index + 1, - }, - ) + # If we have at-least 1 valid file, start the sync process + if not created and not deleted: + return False, None, [], [] # Start Bedrock ingestion job (processes ALL files in data source) # For delete events, this re-ingests remaining files and removes deleted ones from vector index @@ -98,12 +105,11 @@ def process_s3_record(record, record_index): bedrock_agent = boto3.client("bedrock-agent") # Create descriptive message based on event type + description = "Auto-sync:" if is_delete_event: - description = f"Auto-sync: File deleted ({object_key}) - Re-ingesting to remove from vector index" - elif is_create_event: - description = f"Auto-sync: File added/updated ({object_key}) - Adding to vector index" - else: - description = f"Auto-sync triggered by S3 {event_name} on {object_key}" + description += f"\nFiles deleted ({len(deleted)})" + if is_create_event: + description += f"\nFiles added/updated ({len(created)})" response = bedrock_agent.start_ingestion_job( knowledgeBaseId=KNOWLEDGEBASE_ID, @@ -116,12 +122,6 @@ def process_s3_record(record, record_index): job_id = response["ingestionJob"]["ingestionJobId"] job_status = response["ingestionJob"]["status"] - note = "Job processes all files in data source, not just trigger file" - if is_delete_event: - note += " - Deleted files will be removed from vector index" - elif is_create_event: - note += " - New/updated files will be added to vector index" - logger.info( "Successfully started ingestion job", extra={ @@ -129,14 +129,12 @@ def process_s3_record(record, record_index): "job_status": job_status, "knowledge_base_id": KNOWLEDGEBASE_ID, "trigger_file": object_key, - "event_type": event_type, - "is_delete_event": is_delete_event, "ingestion_request_duration_ms": round(ingestion_request_time * 1000, 2), - "note": note, + "description": description, }, ) - return True, object_key, job_id, event_type + return True, job_id, created, deleted def handle_client_error(e, start_time, slack_client, slack_messages): @@ -388,7 +386,7 @@ def create_task( return task -def update_slack_files(slack_client, processed_files: list, messages: list): +def update_slack_files(slack_client, created_files: list[str], deleted_files: list[str], messages: list): """ Update the existing Slack message blocks with the count of processed files """ @@ -396,16 +394,16 @@ def update_slack_files(slack_client, processed_files: list, messages: list): logger.warning("No slack messages to update") return - if not processed_files: + if not created_files and not deleted_files: logger.warning("No processed files to update in Slack messages.") return logger.info( "Processing lack files Slack Notification", - extra={"processed_files": processed_files, "messages": messages}, + extra={"created_files": created_files, "deleted_files": deleted_files, "messages": messages}, ) - added = sum(1 for f in processed_files if f["event_type"] == "CREATE") - deleted = sum(1 for f in processed_files if f["event_type"] == "DELETE") + added = len(created_files) + deleted = len(deleted_files) skip = (added + deleted) == 0 logger.info(f"Processed {added} added/updated and {deleted} deleted file(s).") @@ -522,38 +520,6 @@ def update_slack_error(slack_client, messages): ) -def process_sqs_record(s3_records): - """ - Process a single Simple Queue Service record and prepare processing - of a S3 record. - """ - processed_files = [] # Track successfully processed file keys - job_ids = [] # Track started ingestion job IDs - - if not s3_records: - logger.warning("Skipping SQS event - no S3 events found.") - return {"processed_files": [], "job_ids": []} - - for s3_index, s3_record in enumerate(s3_records): - if s3_record.get("eventSource") == "aws:s3": - # Process S3 event and start ingestion if valid - success, file_key, job_id, event_type = process_s3_record(s3_record, s3_index) - if success: - processed_files.append({"file_key": file_key, "event_type": event_type}) - job_ids.append(job_id) - else: - # Skip non-S3 events - logger.warning( - "Skipping non-S3 event", - extra={ - "event_source": s3_record.get("eventSource"), - "record_index": s3_index + 1, - }, - ) - - return {"processed_files": processed_files, "job_ids": job_ids} - - @logger.inject_lambda_context(log_event=True, clear_state=True) def handler(event, context): """ @@ -584,13 +550,12 @@ def handler(event, context): slack_client = None slack_messages = [] try: + # Get events and update user channels records = event.get("Records", []) - processed_files = [] # Track successfully processed file keys - job_ids = [] # Track started ingestion job IDs - s3_records = [] # Track completed ingestion items - slack_client, slack_messages = initialise_slack_messages(len(records)) + s3_records = [] # Track completed ingestion items + # Process each S3 event record in the SQS batch for sqs_index, sqs_record in enumerate(records): try: @@ -611,18 +576,34 @@ def handler(event, context): logger.error(f"Failed to parse SQS body: {str(e)}") continue + # Check if the events are valid, and start syncing if so + # Don't stop if not, let the lambda handle it. + job_id = "" + created = [] + deleted = [] + if not s3_records: logger.info("No valid S3 records to process", extra={"s3_records": len(records)}) else: logger.info("Processing S3 records", extra={"record_count": len(s3_records)}) - results = process_sqs_record(s3_records) - - processed_files.extend(results["processed_files"]) - job_ids.extend(results["job_ids"]) + success, job_id, created, deleted = process_s3_records(s3_records) + + if not success: + msg = "Could not start sync process" + logger.error( + msg, + extra={ + "job_id": job_id, + }, + ) + return {"statusCode": 500, "body": msg, "job_id": job_id} - # Update file messages (N removed, N added, etc) - update_slack_files(slack_client=slack_client, processed_files=processed_files, messages=slack_messages) + # Update file messages in Slack (N removed, N added, etc) + update_slack_files( + slack_client=slack_client, created_files=created, deleted_files=deleted, messages=slack_messages + ) + # Check length of session, even if we haven't started syncing total_duration = time.time() - start_time # Make sure all tasks are marked as complete in the Slack Plan @@ -632,9 +613,8 @@ def handler(event, context): "Knowledge base sync process completed", extra={ "status_code": 200, - "ingestion_jobs_started": len(job_ids), - "job_ids": job_ids, - "trigger_files": processed_files, + "job_id": job_id, + "trigger_files": created + deleted, "total_duration_ms": round(total_duration * 1000, 2), "knowledge_base_id": KNOWLEDGEBASE_ID, "next_steps": "Monitor Bedrock console for ingestion job completion status", @@ -643,9 +623,7 @@ def handler(event, context): return { "statusCode": 200, - "body": ( - f"Successfully triggered {len(job_ids)} ingestion job(s) for {len(processed_files)} trigger file(s)", - ), + "body": (f"Successfully triggered ingestion job for {len(created) + len(deleted)} trigger file(s)",), } except ClientError as e: diff --git a/packages/syncKnowledgeBaseFunction/tests/test_app.py b/packages/syncKnowledgeBaseFunction/tests/test_app.py index 4396e8114..11f5044b4 100644 --- a/packages/syncKnowledgeBaseFunction/tests/test_app.py +++ b/packages/syncKnowledgeBaseFunction/tests/test_app.py @@ -187,12 +187,12 @@ def test_handler_success( result = handler(s3_event, lambda_context) assert result["statusCode"] == 200 - assert "Successfully triggered 1 ingestion job(s) for 1 trigger file(s)" in result["body"] + assert "Successfully triggered ingestion job for 1 trigger file(s)" in result["body"] mock_boto_client.assert_called_with("bedrock-agent") mock_bedrock.start_ingestion_job.assert_called_once_with( knowledgeBaseId="test-kb-id", dataSourceId="test-ds-id", - description="Auto-sync: File added/updated (test-file.pdf) - Adding to vector index", + description="Auto-sync:\nFiles added/updated (1)", ) @@ -221,8 +221,8 @@ def test_handler_multiple_files( result = handler(multiple_s3_event, lambda_context) assert result["statusCode"] == 200 - assert "Successfully triggered 2 ingestion job(s) for 2 trigger file(s)" in result["body"] - assert mock_bedrock.start_ingestion_job.call_count == 2 + assert "Successfully triggered ingestion job for 2 trigger file(s)" in result["body"] + assert mock_bedrock.start_ingestion_job.call_count == 1 @patch("app.handler.initialise_slack_messages") @@ -328,7 +328,7 @@ def test_handler_invalid_s3_record(mock_boto_client, mock_initialise_slack_messa result = handler(invalid_event, lambda_context) assert result["statusCode"] == 200 - assert "Successfully triggered 0 ingestion job(s) for 0 trigger file(s)" in result["body"] + assert "Successfully triggered ingestion job for 0 trigger file(s)" in result["body"] @patch("app.handler.initialise_slack_messages") @@ -350,7 +350,7 @@ def test_handler_non_s3_event(mock_boto_client, mock_initialise_slack_messages, result = handler(non_s3_event, lambda_context) assert result["statusCode"] == 200 - assert "Successfully triggered 0 ingestion job(s) for 0 trigger file(s)" in result["body"] + assert "Successfully triggered ingestion job for 0 trigger file(s)" in result["body"] @patch("app.handler.initialise_slack_messages") @@ -365,7 +365,7 @@ def test_handler_empty_records(mock_boto_client, mock_initialise_slack_messages, result = handler(empty_event, lambda_context) assert result["statusCode"] == 200 - assert "Successfully triggered 0 ingestion job(s) for 0 trigger file(s)" in result["body"] + assert "Successfully triggered ingestion job for 0 trigger file(s)" in result["body"] @pytest.mark.parametrize( @@ -421,7 +421,7 @@ def test_handler_unsupported_file_type(mock_boto_client, mock_initialise_slack_m result = handler(unsupported_event, lambda_context) assert result["statusCode"] == 200 - assert "Successfully triggered 0 ingestion job(s) for 0 trigger file(s)" in result["body"] + assert "Successfully triggered ingestion job for 0 trigger file(s)" in result["body"] @patch("app.handler.initialise_slack_messages") @@ -464,13 +464,9 @@ def test_handler_unknown_event_type( result = handler(unknown_event, lambda_context) - assert result["statusCode"] == 200 - assert "Successfully triggered 1 ingestion job(s) for 1 trigger file(s)" in result["body"] - mock_bedrock.start_ingestion_job.assert_called_once_with( - knowledgeBaseId="test-kb-id", - dataSourceId="test-ds-id", - description="Auto-sync triggered by S3 ObjectRestore:Completed on test-file.pdf", - ) + assert result["statusCode"] == 500 + assert "Could not start sync process" in result["body"] + mock_bedrock.start_ingestion_job.assert_not_called() @patch("app.handler.initialise_slack_messages") @@ -506,7 +502,7 @@ def test_slack_handler_success( result = handler(s3_event, lambda_context) assert result["statusCode"] == 200 - assert "Successfully triggered 1 ingestion job(s) for 1 trigger file(s)" in result["body"] + assert "Successfully triggered ingestion job for 1 trigger file(s)" in result["body"] mock_instance.chat_update.call_count = 2 @@ -549,5 +545,5 @@ def test_slack_handler_success_multiple( result = handler(s3_event, lambda_context) assert result["statusCode"] == 200 - assert "Successfully triggered 1 ingestion job(s) for 1 trigger file(s)" in result["body"] + assert "Successfully triggered ingestion job for 1 trigger file(s)" in result["body"] mock_instance.chat_update.call_count = 2 From c0dad2a026558cb9bfffc7a55c2e1e8a7b3de2cc Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Tue, 3 Mar 2026 17:08:55 +0000 Subject: [PATCH 26/84] fix: expect a single message instead of multiple --- packages/cdk/constructs/SimpleQueueService.ts | 5 ++- .../cdk/resources/S3LambdaNotification.ts | 3 +- .../syncKnowledgeBaseFunction/app/handler.py | 12 +++--- .../tests/test_app.py | 43 +++++++++++++++++++ 4 files changed, 54 insertions(+), 9 deletions(-) diff --git a/packages/cdk/constructs/SimpleQueueService.ts b/packages/cdk/constructs/SimpleQueueService.ts index d28c4cc94..387a35de2 100644 --- a/packages/cdk/constructs/SimpleQueueService.ts +++ b/packages/cdk/constructs/SimpleQueueService.ts @@ -12,6 +12,10 @@ export interface SimpleQueueServiceProps { readonly functions: Array } +/** + * AWS Simple Queue Service + * @see {@link https://aws.amazon.com/sqs/} + */ export class SimpleQueueService extends Construct { public queue: Queue public deadLetterQueue: Queue @@ -49,7 +53,6 @@ export class SimpleQueueService extends Construct { maxReceiveCount: 1 // Move to DLQ after a failed attempt }, deliveryDelay: Duration.seconds(0), - visibilityTimeout: Duration.seconds(60), enforceSSL: true } ) diff --git a/packages/cdk/resources/S3LambdaNotification.ts b/packages/cdk/resources/S3LambdaNotification.ts index 02273d049..9f668ce08 100644 --- a/packages/cdk/resources/S3LambdaNotification.ts +++ b/packages/cdk/resources/S3LambdaNotification.ts @@ -6,6 +6,7 @@ import {Storage} from "./Storage" import {Effect, PolicyStatement, ServicePrincipal} from "aws-cdk-lib/aws-iam" import {EventType} from "aws-cdk-lib/aws-s3" import {LambdaDestination, SqsDestination} from "aws-cdk-lib/aws-s3-notifications" +import {Duration} from "aws-cdk-lib" export interface S3LambdaNotificationProps { readonly stackName: string @@ -25,7 +26,7 @@ export class S3LambdaNotification extends Construct { const queue = new SimpleQueueService(this, `${props.stackName}-${queueName}`, { stackName: props.stackName, queueName: queueName, - batchDelay: 300, // 5 minutes + batchDelay: Duration.minutes(10).toSeconds(), functions: [ props.functions.syncKnowledgeBaseFunction ] diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index a8d7f8a7a..068be765c 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -275,6 +275,8 @@ def initialise_slack_messages(event_count: int): text_fallback="*My knowledge base has been updated!*", ) responses.append(response) + if response["ok"] is not True: + logger.error("Error initialising Slack Message.", extra={"response": response}) except Exception as e: logger.error(f"Failed to initialise slack message for channel: {channel_id}", extra={"exception": e}) continue @@ -296,11 +298,11 @@ def update_slack_message(slack_client, response, blocks): if slack_client is None: logger.warning("No Slack client found, skipping update message") - return try: logger.info("Updating Slack channel") - slack_client.chat_update(channel=channel_id, ts=ts, blocks=blocks) + result = slack_client.chat_update(channel=channel_id, ts=ts, blocks=blocks) + logger.error("Error updating Slack Message.", extra={"response": result}) except SlackApiError as e: logger.error(f"Error updating message in {channel_id}: {str(e)}") except Exception as e: @@ -392,11 +394,9 @@ def update_slack_files(slack_client, created_files: list[str], deleted_files: li """ if not messages: logger.warning("No slack messages to update") - return if not created_files and not deleted_files: logger.warning("No processed files to update in Slack messages.") - return logger.info( "Processing lack files Slack Notification", @@ -424,7 +424,7 @@ def update_slack_files(slack_client, created_files: list[str], deleted_files: li title = "Processing file changes" status = "completed" details = [f"{val} {label} file(s)" for val, label in [(added, "new"), (deleted, "removed")] if val > 0] - outputs = [f"Total files processed: {added + deleted}" if skip else "No file changes"] + outputs = [f"Total files processed: {added + deleted}" if not skip else "No file changes"] if task and task["title"] == title: plan = update_slack_task( @@ -453,7 +453,6 @@ def update_slack_complete(slack_client, messages, feedback: None): """ if not messages: logger.warning("No existing Slack messages to update event count.") - return for response in messages: try: @@ -488,7 +487,6 @@ def update_slack_error(slack_client, messages): """ if not messages: logger.warning("No existing Slack messages to update event count.") - return for response in messages: try: diff --git a/packages/syncKnowledgeBaseFunction/tests/test_app.py b/packages/syncKnowledgeBaseFunction/tests/test_app.py index 11f5044b4..77b1e2551 100644 --- a/packages/syncKnowledgeBaseFunction/tests/test_app.py +++ b/packages/syncKnowledgeBaseFunction/tests/test_app.py @@ -547,3 +547,46 @@ def test_slack_handler_success_multiple( assert result["statusCode"] == 200 assert "Successfully triggered ingestion job for 1 trigger file(s)" in result["body"] mock_instance.chat_update.call_count = 2 + + +@patch("app.handler.initialise_slack_messages") +@patch("boto3.client") +@patch("slack_sdk.WebClient") +@patch("time.time") +def test_slack_handler_client_failure( + mock_time, + mock_slack_client, + mock_boto_client, + mock_initialise_slack_messages, + mock_env, + lambda_context, + s3_event, + slack_message_event, +): + """ + Test successful execution of slack messages. + If a post fails to send, it shouldn't stop the rest of the items in the queue + """ + mock_time.side_effect = [1000, 1001, 1002, 1003] + + # Slack + mock_instance = mock_slack_client.return_value + mock_instance.chat_update.return_value = {"ok": False} + mock_initialise_slack_messages.return_value = ( + mock_instance, + [slack_message_event, slack_message_event, slack_message_event], + ) + + # Boto + mock_bedrock = mock_boto_client.return_value + mock_bedrock.start_ingestion_job.return_value = { + "ingestionJob": {"ingestionJobId": "job-123", "status": "STARTING"} + } + + from app.handler import handler + + result = handler(s3_event, lambda_context) + + assert result["statusCode"] == 200 + assert "Successfully triggered ingestion job for 1 trigger file(s)" in result["body"] + mock_instance.chat_update.call_count = 2 From 49b543b94903a6fc9a5997a1dfdf34d2734dcc71 Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Wed, 4 Mar 2026 08:28:23 +0000 Subject: [PATCH 27/84] fix: expect a single message instead of multiple --- packages/cdk/resources/S3LambdaNotification.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/cdk/resources/S3LambdaNotification.ts b/packages/cdk/resources/S3LambdaNotification.ts index 9f668ce08..87ec125e1 100644 --- a/packages/cdk/resources/S3LambdaNotification.ts +++ b/packages/cdk/resources/S3LambdaNotification.ts @@ -6,7 +6,6 @@ import {Storage} from "./Storage" import {Effect, PolicyStatement, ServicePrincipal} from "aws-cdk-lib/aws-iam" import {EventType} from "aws-cdk-lib/aws-s3" import {LambdaDestination, SqsDestination} from "aws-cdk-lib/aws-s3-notifications" -import {Duration} from "aws-cdk-lib" export interface S3LambdaNotificationProps { readonly stackName: string @@ -26,7 +25,7 @@ export class S3LambdaNotification extends Construct { const queue = new SimpleQueueService(this, `${props.stackName}-${queueName}`, { stackName: props.stackName, queueName: queueName, - batchDelay: Duration.minutes(10).toSeconds(), + batchDelay: 300, functions: [ props.functions.syncKnowledgeBaseFunction ] From 261c69883b0502ecd495f065cab50d0a08296bbc Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Wed, 4 Mar 2026 09:01:00 +0000 Subject: [PATCH 28/84] fix: expect a single message instead of multiple --- packages/cdk/constructs/SimpleQueueService.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/cdk/constructs/SimpleQueueService.ts b/packages/cdk/constructs/SimpleQueueService.ts index 387a35de2..3b91363d9 100644 --- a/packages/cdk/constructs/SimpleQueueService.ts +++ b/packages/cdk/constructs/SimpleQueueService.ts @@ -53,6 +53,7 @@ export class SimpleQueueService extends Construct { maxReceiveCount: 1 // Move to DLQ after a failed attempt }, deliveryDelay: Duration.seconds(0), + visibilityTimeout: Duration.seconds(60), enforceSSL: true } ) From 959db5d83bef98106efa03a8b581c297125e9c3a Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Wed, 4 Mar 2026 10:30:14 +0000 Subject: [PATCH 29/84] fix: expect a single message instead of multiple --- packages/cdk/constructs/SimpleQueueService.ts | 15 +++++---------- packages/cdk/resources/S3LambdaNotification.ts | 1 - 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/packages/cdk/constructs/SimpleQueueService.ts b/packages/cdk/constructs/SimpleQueueService.ts index 3b91363d9..d4a9c5a3a 100644 --- a/packages/cdk/constructs/SimpleQueueService.ts +++ b/packages/cdk/constructs/SimpleQueueService.ts @@ -8,7 +8,6 @@ import {LambdaFunction} from "./LambdaFunction" export interface SimpleQueueServiceProps { readonly stackName: string readonly queueName: string - readonly batchDelay: number readonly functions: Array } @@ -35,10 +34,9 @@ export class SimpleQueueService extends Construct { // Create a Dead-Letter Queue (DLQ) for handling failed messages, to help with debugging const deadLetterQueue = new Queue(this, `${name}-dlq`, { queueName: `${name}-dlq`, - retentionPeriod: Duration.days(14), // Max 14 + retentionPeriod: Duration.days(14), // Max encryption: QueueEncryption.KMS, encryptionMasterKey: kmsKey, - visibilityTimeout: Duration.seconds(60), enforceSSL: true }) @@ -52,19 +50,16 @@ export class SimpleQueueService extends Construct { queue: deadLetterQueue, maxReceiveCount: 1 // Move to DLQ after a failed attempt }, - deliveryDelay: Duration.seconds(0), - visibilityTimeout: Duration.seconds(60), + deliveryDelay: Duration.minutes(0), + visibilityTimeout: Duration.hours(1), // Really high visibility to prevent multiple calls enforceSSL: true } ) // Add queues as event source for the notify function and sync knowledge base function - // While batching, the messages will be sent if maxBatchingWindow is reached or batchSize is reached - // Set (very) large batch size to improve wait efficiency of batching window const eventSource = new SqsEventSource(queue, { - maxBatchingWindow: Duration.seconds(props.batchDelay), - batchSize: 1000, - reportBatchItemFailures: true + maxBatchingWindow: Duration.minutes(5), + batchSize: 100 }) props.functions.forEach(fn => { diff --git a/packages/cdk/resources/S3LambdaNotification.ts b/packages/cdk/resources/S3LambdaNotification.ts index 87ec125e1..016919c09 100644 --- a/packages/cdk/resources/S3LambdaNotification.ts +++ b/packages/cdk/resources/S3LambdaNotification.ts @@ -25,7 +25,6 @@ export class S3LambdaNotification extends Construct { const queue = new SimpleQueueService(this, `${props.stackName}-${queueName}`, { stackName: props.stackName, queueName: queueName, - batchDelay: 300, functions: [ props.functions.syncKnowledgeBaseFunction ] From 35008f1f18a561497b129af784846e7eb912a265 Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Wed, 4 Mar 2026 11:49:48 +0000 Subject: [PATCH 30/84] fix: Add quiet logging #skip-qc --- .../syncKnowledgeBaseFunction/app/handler.py | 88 +++++++++++-------- 1 file changed, 51 insertions(+), 37 deletions(-) diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index 068be765c..e3292429a 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -388,15 +388,54 @@ def create_task( return task +def update_slack_file(slack_client, response, added, deleted, index, skip): + try: + if response is None: + logger.info(f"Skipping empty response ({index + 1})") + return + + # Update the event count in the plan block + blocks = response["message"] + blocks = response["message"]["blocks"] + plan = next((block for block in blocks if block["type"] == "plan"), None) + task = plan["tasks"][-1] if plan and "tasks" in plan and plan["tasks"] else None + + # Task params + title = "Processing file changes" + status = "completed" + details = [f"{val} {label} file(s)" for val, label in [(added, "new"), (deleted, "removed")] if val > 0] + outputs = [f"Total files processed: {added + deleted}" if not skip else "No file changes"] + + if task and task["title"] == title: + plan = update_slack_task(plan=plan, task=task, status=status, title=title, details=details, outputs=outputs) + else: + create_task(plan=plan, title=title, details=details, outputs=outputs, status=status) + + update_slack_message(slack_client=slack_client, response=response, blocks=blocks) + except Exception as e: + logger.error( + "Unexpected error occurred updating Slack message", + extra={ + "status_code": 500, + "error_type": type(e).__name__, + "error_message": str(e), + "error": traceback.format_exc(), + "e": e, + }, + ) + + def update_slack_files(slack_client, created_files: list[str], deleted_files: list[str], messages: list): """ Update the existing Slack message blocks with the count of processed files """ if not messages: logger.warning("No slack messages to update") + return if not created_files and not deleted_files: logger.warning("No processed files to update in Slack messages.") + return logger.info( "Processing lack files Slack Notification", @@ -409,42 +448,9 @@ def update_slack_files(slack_client, created_files: list[str], deleted_files: li logger.info(f"Processed {added} added/updated and {deleted} deleted file(s).") for i, response in enumerate(messages): - try: - if response is None: - logger.info(f"Skipping empty response ({i + 1})") - continue - - # Update the event count in the plan block - blocks = response["message"] - blocks = response["message"]["blocks"] - plan = next((block for block in blocks if block["type"] == "plan"), None) - task = plan["tasks"][-1] if plan and "tasks" in plan and plan["tasks"] else None - - # Task params - title = "Processing file changes" - status = "completed" - details = [f"{val} {label} file(s)" for val, label in [(added, "new"), (deleted, "removed")] if val > 0] - outputs = [f"Total files processed: {added + deleted}" if not skip else "No file changes"] - - if task and task["title"] == title: - plan = update_slack_task( - plan=plan, task=task, status=status, title=title, details=details, outputs=outputs - ) - else: - create_task(plan=plan, title=title, details=details, outputs=outputs, status=status) - - update_slack_message(slack_client=slack_client, response=response, blocks=blocks) - except Exception as e: - logger.error( - "Unexpected error occurred updating Slack message", - extra={ - "status_code": 500, - "error_type": type(e).__name__, - "error_message": str(e), - "error": traceback.format_exc(), - "e": e, - }, - ) + update_slack_file( + slack_client=slack_client, response=response, added=added, deleted=deleted, index=i, skip=skip + ) def update_slack_complete(slack_client, messages, feedback: None): @@ -524,6 +530,7 @@ def handler(event, context): Main Lambda handler for a queue-service (S3-triggered) knowledge base synchronization """ start_time = time.time() + logger.info("log_event", extra=event) # DELETE ME # Early validation of required configuration if not KNOWLEDGEBASE_ID or not DATA_SOURCE_ID: @@ -550,7 +557,6 @@ def handler(event, context): try: # Get events and update user channels records = event.get("Records", []) - slack_client, slack_messages = initialise_slack_messages(len(records)) s3_records = [] # Track completed ingestion items @@ -558,6 +564,8 @@ def handler(event, context): for sqs_index, sqs_record in enumerate(records): try: if sqs_record.get("eventSource") != "aws:sqs": + event_time = sqs_record.get("attributes", {}).get("SentTimestamp", "Unknown") + logger.info("Event found", extra={"Event Trigger Time": event_time}) logger.warning( "Skipping non-SQS event", extra={ @@ -580,9 +588,15 @@ def handler(event, context): created = [] deleted = [] + slack_client = None + slack_messages = [] + if not s3_records: logger.info("No valid S3 records to process", extra={"s3_records": len(records)}) else: + # Disable for quiet testing + # slack_client, slack_messages = initialise_slack_messages(len(s3_records)) + logger.info("Processing S3 records", extra={"record_count": len(s3_records)}) success, job_id, created, deleted = process_s3_records(s3_records) From 0b58a59297e2747157310c4b9c12d2b46497b111 Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Wed, 4 Mar 2026 13:15:21 +0000 Subject: [PATCH 31/84] fix: rebatch requests #skip-qc --- packages/syncKnowledgeBaseFunction/app/handler.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index e3292429a..ce3344cec 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -18,6 +18,7 @@ from slack_sdk.errors import SlackApiError bedrock_agent = boto3.client("bedrock-agent") +lambda_client = boto3.client("lambda") def is_supported_file_type(file_key): @@ -532,6 +533,14 @@ def handler(event, context): start_time = time.time() logger.info("log_event", extra=event) # DELETE ME + # S3 can post too fast, causing irregular requests + # To make sure batching is efficient, re-batch requests + if event.get("batched") is True: + request = event.copy() + request["batched"] + lambda_client.invoke(FunctionName=context.function.name, InvocationType="Event", Payload=json.dumps(request)) + return {"statusCode": 200, "body": "Initial trigger processed, batching initiated."} + # Early validation of required configuration if not KNOWLEDGEBASE_ID or not DATA_SOURCE_ID: logger.error( From 11ffc5613ff6a33fe0cd9e07638564d9d383ee9e Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Wed, 4 Mar 2026 13:18:13 +0000 Subject: [PATCH 32/84] fix: rebatch requests #skip-qc --- packages/syncKnowledgeBaseFunction/app/handler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index ce3344cec..c48218023 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -535,7 +535,7 @@ def handler(event, context): # S3 can post too fast, causing irregular requests # To make sure batching is efficient, re-batch requests - if event.get("batched") is True: + if event.get("batched") is False: request = event.copy() request["batched"] lambda_client.invoke(FunctionName=context.function.name, InvocationType="Event", Payload=json.dumps(request)) From f8ad99aa7b68eca935f084b9a451bb1e2a8c3489 Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Thu, 5 Mar 2026 11:34:54 +0000 Subject: [PATCH 33/84] fix: test batching --- packages/cdk/constructs/SimpleQueueService.ts | 4 +++ .../syncKnowledgeBaseFunction/app/handler.py | 32 ++++++++----------- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/packages/cdk/constructs/SimpleQueueService.ts b/packages/cdk/constructs/SimpleQueueService.ts index d4a9c5a3a..0ddfd7563 100644 --- a/packages/cdk/constructs/SimpleQueueService.ts +++ b/packages/cdk/constructs/SimpleQueueService.ts @@ -59,12 +59,16 @@ export class SimpleQueueService extends Construct { // Add queues as event source for the notify function and sync knowledge base function const eventSource = new SqsEventSource(queue, { maxBatchingWindow: Duration.minutes(5), + reportBatchItemFailures: true, batchSize: 100 }) props.functions.forEach(fn => { fn.function.addEventSource(eventSource) + fn.function.addEnvironment("SQS_CONNECTION_STRING", queue.queueUrl) + queue.grantConsumeMessages(fn.function) + queue.grantSendMessages(fn.function) }) // Grant the Lambda function permissions to consume messages from the queue diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index c48218023..98af1e283 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -103,7 +103,7 @@ def process_s3_records(records) -> tuple[bool, str, list, list]: # Start Bedrock ingestion job (processes ALL files in data source) # For delete events, this re-ingests remaining files and removes deleted ones from vector index ingestion_start_time = time.time() - bedrock_agent = boto3.client("bedrock-agent") + # bedrock_agent = boto3.client("bedrock-agent") # Create descriptive message based on event type description = "Auto-sync:" @@ -112,22 +112,23 @@ def process_s3_records(records) -> tuple[bool, str, list, list]: if is_create_event: description += f"\nFiles added/updated ({len(created)})" - response = bedrock_agent.start_ingestion_job( - knowledgeBaseId=KNOWLEDGEBASE_ID, - dataSourceId=DATA_SOURCE_ID, - description=description, - ) + # response = bedrock_agent.start_ingestion_job( + # knowledgeBaseId=KNOWLEDGEBASE_ID, + # dataSourceId=DATA_SOURCE_ID, + # description=description, + # ) ingestion_request_time = time.time() - ingestion_start_time # Extract job details for tracking and logging - job_id = response["ingestionJob"]["ingestionJobId"] - job_status = response["ingestionJob"]["status"] + # job_id = response["ingestionJob"]["ingestionJobId"] + # job_status = response["ingestionJob"]["status"] + # REVERT job_id and job_status logger.info( "Successfully started ingestion job", extra={ - "job_id": job_id, - "job_status": job_status, + "job_id": "job_id", + "job_status": "job_status", "knowledge_base_id": KNOWLEDGEBASE_ID, "trigger_file": object_key, "ingestion_request_duration_ms": round(ingestion_request_time * 1000, 2), @@ -135,7 +136,8 @@ def process_s3_records(records) -> tuple[bool, str, list, list]: }, ) - return True, job_id, created, deleted + # REVERT job_id + return True, "job_id", created, deleted def handle_client_error(e, start_time, slack_client, slack_messages): @@ -533,14 +535,6 @@ def handler(event, context): start_time = time.time() logger.info("log_event", extra=event) # DELETE ME - # S3 can post too fast, causing irregular requests - # To make sure batching is efficient, re-batch requests - if event.get("batched") is False: - request = event.copy() - request["batched"] - lambda_client.invoke(FunctionName=context.function.name, InvocationType="Event", Payload=json.dumps(request)) - return {"statusCode": 200, "body": "Initial trigger processed, batching initiated."} - # Early validation of required configuration if not KNOWLEDGEBASE_ID or not DATA_SOURCE_ID: logger.error( From 575b50c7340cb351d285b9d676b66e8345e84816 Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Thu, 5 Mar 2026 11:39:08 +0000 Subject: [PATCH 34/84] fix: test batching #skip-qc --- packages/cdk/constructs/SimpleQueueService.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/cdk/constructs/SimpleQueueService.ts b/packages/cdk/constructs/SimpleQueueService.ts index 0ddfd7563..4cc39c2b7 100644 --- a/packages/cdk/constructs/SimpleQueueService.ts +++ b/packages/cdk/constructs/SimpleQueueService.ts @@ -65,10 +65,10 @@ export class SimpleQueueService extends Construct { props.functions.forEach(fn => { fn.function.addEventSource(eventSource) - fn.function.addEnvironment("SQS_CONNECTION_STRING", queue.queueUrl) + // fn.function.addEnvironment("SQS_CONNECTION_STRING", queue.queueUrl) queue.grantConsumeMessages(fn.function) - queue.grantSendMessages(fn.function) + // queue.grantSendMessages(fn.function) }) // Grant the Lambda function permissions to consume messages from the queue From 1b0642b68f264d72d0b35ffdaa04cd0c7e3aa3a5 Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Thu, 5 Mar 2026 16:38:48 +0000 Subject: [PATCH 35/84] fix: Multiple message handling #skip-qc --- .../cdk/assets/s3-folders/processed/.gitkeep | 0 packages/cdk/assets/s3-folders/raw/.gitkeep | 0 .../app/config/config.py | 1 + .../syncKnowledgeBaseFunction/app/handler.py | 149 ++++++++++++++---- 4 files changed, 119 insertions(+), 31 deletions(-) delete mode 100644 packages/cdk/assets/s3-folders/processed/.gitkeep delete mode 100644 packages/cdk/assets/s3-folders/raw/.gitkeep diff --git a/packages/cdk/assets/s3-folders/processed/.gitkeep b/packages/cdk/assets/s3-folders/processed/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/packages/cdk/assets/s3-folders/raw/.gitkeep b/packages/cdk/assets/s3-folders/raw/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/packages/syncKnowledgeBaseFunction/app/config/config.py b/packages/syncKnowledgeBaseFunction/app/config/config.py index ae660d2fb..c134c2911 100644 --- a/packages/syncKnowledgeBaseFunction/app/config/config.py +++ b/packages/syncKnowledgeBaseFunction/app/config/config.py @@ -12,6 +12,7 @@ KNOWLEDGEBASE_ID = os.environ.get("KNOWLEDGEBASE_ID") DATA_SOURCE_ID = os.environ.get("DATA_SOURCE_ID") SLACK_BOT_TOKEN_PARAMETER = os.environ.get("SLACK_BOT_TOKEN_PARAMETER") +AWS_ACCOUNT_ID = os.environ.get("AWS_ACCOUNT_ID") # Supported file types for Bedrock Knowledge Base ingestion SUPPORTED_FILE_TYPES = {".pdf", ".txt", ".md", ".csv", ".doc", ".docx", ".xls", ".xlsx", ".html", ".json"} diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index 98af1e283..58ec69f81 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -13,12 +13,19 @@ import json from typing import Literal from botocore.exceptions import ClientError -from app.config.config import KNOWLEDGEBASE_ID, DATA_SOURCE_ID, SUPPORTED_FILE_TYPES, get_bot_token, logger +from app.config.config import ( + KNOWLEDGEBASE_ID, + DATA_SOURCE_ID, + SUPPORTED_FILE_TYPES, + AWS_ACCOUNT_ID, + get_bot_token, + logger, +) from slack_sdk import WebClient from slack_sdk.errors import SlackApiError bedrock_agent = boto3.client("bedrock-agent") -lambda_client = boto3.client("lambda") +s3_client = boto3.client("s3") def is_supported_file_type(file_key): @@ -28,6 +35,64 @@ def is_supported_file_type(file_key): return any(file_key.lower().endswith(ext) for ext in SUPPORTED_FILE_TYPES) +def get_unprocessed_files(s3_records) -> tuple[list, str, str, bool]: + unprocessed_files = [] + new_process_key = uuid.uuid4().hex + process_key = new_process_key + bucket_name = "" + + try: + if s3_records is None: + return unprocessed_files, process_key, bucket_name, True + + bucket_name = s3_records[0]["s3"]["bucket"]["name"] + + paginator = s3_client.get_paginator("list_objects_v2") + page_iterator = paginator.paginate(Bucket=bucket_name) + + for page in page_iterator: + if "Contents" not in page: + continue + + for obj in page["Contents"]: + file_key = obj["Key"] + + tag_response = s3_client.get_object_tagging( + Bucket=bucket_name, Key=file_key, ExpectedBucketOwner=AWS_ACCOUNT_ID + ) + + tags = {tag["Key"]: tag["Value"] for tag in tag_response.get("TagSet", [])} + if not tags.get("Process_Status"): + unprocessed_files.append(file_key) + process_key = tags.get("Process_key", process_key) + break + + # Return a list of records which are not being processed by this function + unprocessed_files = list( + {s3_record.get("s3", {}).get("object", {}).get("key") for s3_record in s3_records} ^ set(unprocessed_files) + ) + except Exception as e: + logger.info(f"Error finding last modified file: {str(e)}") + + return unprocessed_files, process_key, bucket_name, process_key == new_process_key + + +def set_unprocessed_files(s3_records, unprocessed_files, key, bucket): + tags = [{"Key": "Process_Key", "Value": key}] + for file in unprocessed_files: + s3_client.put_object_tagging( + Bucket=bucket, Key=file, ExpectedBucketOwner=AWS_ACCOUNT_ID, Tagging={"TagSet": tags} + ) + tags.append({"Key": "Process_Status", "Value": "Complete"}) + for record in s3_records: + s3_client.put_object_tagging( + Bucket=bucket, + Key=record["s3"]["bucket"]["name"], + ExpectedBucketOwner=AWS_ACCOUNT_ID, + Tagging={"TagSet": tags}, + ) + + def process_s3_records(records) -> tuple[bool, str, list, list]: """ Process a S3 records, a single record can not be synced - the whole drive will be synced @@ -103,7 +168,6 @@ def process_s3_records(records) -> tuple[bool, str, list, list]: # Start Bedrock ingestion job (processes ALL files in data source) # For delete events, this re-ingests remaining files and removes deleted ones from vector index ingestion_start_time = time.time() - # bedrock_agent = boto3.client("bedrock-agent") # Create descriptive message based on event type description = "Auto-sync:" @@ -112,23 +176,22 @@ def process_s3_records(records) -> tuple[bool, str, list, list]: if is_create_event: description += f"\nFiles added/updated ({len(created)})" - # response = bedrock_agent.start_ingestion_job( - # knowledgeBaseId=KNOWLEDGEBASE_ID, - # dataSourceId=DATA_SOURCE_ID, - # description=description, - # ) + response = bedrock_agent.start_ingestion_job( + knowledgeBaseId=KNOWLEDGEBASE_ID, + dataSourceId=DATA_SOURCE_ID, + description=description, + ) ingestion_request_time = time.time() - ingestion_start_time - # Extract job details for tracking and logging - # job_id = response["ingestionJob"]["ingestionJobId"] - # job_status = response["ingestionJob"]["status"] + job_id = response["ingestionJob"]["ingestionJobId"] + job_status = response["ingestionJob"]["status"] # REVERT job_id and job_status logger.info( "Successfully started ingestion job", extra={ - "job_id": "job_id", - "job_status": "job_status", + "job_id": job_id, + "job_status": job_status, "knowledge_base_id": KNOWLEDGEBASE_ID, "trigger_file": object_key, "ingestion_request_duration_ms": round(ingestion_request_time * 1000, 2), @@ -136,8 +199,7 @@ def process_s3_records(records) -> tuple[bool, str, list, list]: }, ) - # REVERT job_id - return True, "job_id", created, deleted + return True, job_id, created, deleted def handle_client_error(e, start_time, slack_client, slack_messages): @@ -205,6 +267,19 @@ def get_bot_channels(client): return channel_ids +def get_latest_message(client, channel_id: str, user_id: str): + history = client.conversation_history(channel=channel_id, limit=20) + + newest = None + # History is returned newest to oldest + for message in history.get("messages", []): + if message.get("user") == user_id: + newest = message + break + + return {"ok": history.get("ok"), "channel": channel_id, "ts": newest.get("ts"), "message": message} + + def post_message(slack_client, channel_id: str, blocks: list, text_fallback: str): """ Posts the formatted message to a specific channel. @@ -223,7 +298,7 @@ def post_message(slack_client, channel_id: str, blocks: list, text_fallback: str return None -def initialise_slack_messages(event_count: int): +def initialise_slack_messages(event_count: int, is_new: bool): """ Send Slack notification summarizing the synchronization status """ @@ -254,8 +329,9 @@ def initialise_slack_messages(event_count: int): token = get_bot_token() slack_client = WebClient(token=token) response = slack_client.auth_test() + user_id = response.get("user_id", "unknown") - logger.info(f"Authenticated as bot user: {response.get('user_id', 'unknown')}", extra={"response": response}) + logger.info(f"Authenticated as bot user: {user_id}", extra={"response": response}) # Get Channels where the Bot is a member logger.info("Find bot channels...") @@ -271,12 +347,18 @@ def initialise_slack_messages(event_count: int): responses = [] for channel_id in target_channels: try: - response = post_message( - slack_client=slack_client, - channel_id=channel_id, - blocks=blocks, - text_fallback="*My knowledge base has been updated!*", - ) + response = None + if is_new: + response = get_latest_message(slack_client, channel_id, user_id) + + if response is None: + response = post_message( + slack_client=slack_client, + channel_id=channel_id, + blocks=blocks, + text_fallback="*My knowledge base has been updated!*", + ) + responses.append(response) if response["ok"] is not True: logger.error("Error initialising Slack Message.", extra={"response": response}) @@ -336,7 +418,8 @@ def update_slack_task( "type": "rich_text", "block_id": uuid.uuid4().hex, "elements": [ - {"type": "rich_text_section", "elements": [{"type": "text", "text": detail}]} for detail in details + *task.get("details", {}).get("elements", []), + *[{"type": "rich_text_section", "elements": [{"type": "text", "text": detail}]} for detail in details], ], } @@ -391,7 +474,7 @@ def create_task( return task -def update_slack_file(slack_client, response, added, deleted, index, skip): +def update_slack_files_message(slack_client, response, added, deleted, index, skip): try: if response is None: logger.info(f"Skipping empty response ({index + 1})") @@ -451,7 +534,7 @@ def update_slack_files(slack_client, created_files: list[str], deleted_files: li logger.info(f"Processed {added} added/updated and {deleted} deleted file(s).") for i, response in enumerate(messages): - update_slack_file( + update_slack_files_message( slack_client=slack_client, response=response, added=added, deleted=deleted, index=i, skip=skip ) @@ -591,14 +674,13 @@ def handler(event, context): created = [] deleted = [] - slack_client = None - slack_messages = [] + un_processed, process_key, bucket_name, is_new = get_unprocessed_files(s3_records) + + slack_client, slack_messages = initialise_slack_messages(len(s3_records), is_new) if not s3_records: logger.info("No valid S3 records to process", extra={"s3_records": len(records)}) else: - # Disable for quiet testing - # slack_client, slack_messages = initialise_slack_messages(len(s3_records)) logger.info("Processing S3 records", extra={"record_count": len(s3_records)}) success, job_id, created, deleted = process_s3_records(s3_records) @@ -622,7 +704,12 @@ def handler(event, context): total_duration = time.time() - start_time # Make sure all tasks are marked as complete in the Slack Plan - update_slack_complete(slack_client=slack_client, messages=slack_messages, feedback=None) + if not un_processed: + update_slack_complete(slack_client=slack_client, messages=slack_messages, feedback=None) + + set_unprocessed_files( + s3_records=s3_records, unprocessed_files=un_processed, key=process_key, bucket=bucket_name + ) logger.info( "Knowledge base sync process completed", From b0919e349d903474b61a78b3d770b4232e035796 Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Thu, 5 Mar 2026 16:43:05 +0000 Subject: [PATCH 36/84] fix: Multiple message handling #skip-qc --- packages/cdk/resources/RuntimePolicies.ts | 11 +++++++++- .../syncKnowledgeBaseFunction/app/handler.py | 2 +- .../tests/test_app.py | 20 +++++++++++++++++-- 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/packages/cdk/resources/RuntimePolicies.ts b/packages/cdk/resources/RuntimePolicies.ts index fa404be90..2c5446799 100644 --- a/packages/cdk/resources/RuntimePolicies.ts +++ b/packages/cdk/resources/RuntimePolicies.ts @@ -125,16 +125,25 @@ export class RuntimePolicies extends Construct { // Create managed policy for SyncKnowledgeBase Lambda function const syncKnowledgeBasePolicy = new PolicyStatement({ actions: [ + // Process items through Bedrock "bedrock:StartIngestionJob", "bedrock:GetIngestionJob", "bedrock:ListIngestionJobs", + // Get properties from SSM "ssm:GetParameter", + // Get items and remove them from SQS "sqs:ReceiveMessage", - "sqs:DeleteMessage" + "sqs:DeleteMessage", + // Get items from the s3 bucket and handle it's tags + "s3:ListBucket", + "s3:GetObject", + "s3:GetObjectTagging", + "s3:PutObjectTagging" ], resources: [ props.knowledgeBaseArn, props.dataSourceArn, + props.docsBucketArn + "/processed/*", ...slackBotPolicyResources ] }) diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index 58ec69f81..af15974db 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -24,8 +24,8 @@ from slack_sdk import WebClient from slack_sdk.errors import SlackApiError -bedrock_agent = boto3.client("bedrock-agent") s3_client = boto3.client("s3") +bedrock_agent = boto3.client("bedrock-agent") def is_supported_file_type(file_key): diff --git a/packages/syncKnowledgeBaseFunction/tests/test_app.py b/packages/syncKnowledgeBaseFunction/tests/test_app.py index 77b1e2551..09de7a001 100644 --- a/packages/syncKnowledgeBaseFunction/tests/test_app.py +++ b/packages/syncKnowledgeBaseFunction/tests/test_app.py @@ -1,10 +1,10 @@ import json import pytest import os +import sys from unittest.mock import Mock, patch, MagicMock, DEFAULT from botocore.exceptions import ClientError - TEST_BOT_TOKEN = "test-bot-token" @@ -188,7 +188,8 @@ def test_handler_success( assert result["statusCode"] == 200 assert "Successfully triggered ingestion job for 1 trigger file(s)" in result["body"] - mock_boto_client.assert_called_with("bedrock-agent") + mock_boto_client.assert_any_call("bedrock-agent") + mock_boto_client.assert_any_call("s3") mock_bedrock.start_ingestion_job.assert_called_once_with( knowledgeBaseId="test-kb-id", dataSourceId="test-ds-id", @@ -216,6 +217,9 @@ def test_handler_multiple_files( } mock_initialise_slack_messages.return_value = (DEFAULT, []) + # Force reload the module to catch the new patches + if "app.handler" in sys.modules: + del sys.modules["app.handler"] from app.handler import handler result = handler(multiple_s3_event, lambda_context) @@ -241,6 +245,8 @@ def test_handler_conflict_exception( mock_bedrock.start_ingestion_job.side_effect = error mock_initialise_slack_messages.return_value = (DEFAULT, []) + if "app.handler" in sys.modules: + del sys.modules["app.handler"] from app.handler import handler result = handler(s3_event, lambda_context) @@ -265,6 +271,8 @@ def test_handler_aws_error( mock_bedrock.start_ingestion_job.side_effect = error mock_initialise_slack_messages.return_value = (DEFAULT, []) + if "app.handler" in sys.modules: + del sys.modules["app.handler"] from app.handler import handler result = handler(s3_event, lambda_context) @@ -285,6 +293,8 @@ def test_handler_unexpected_error( mock_bedrock.start_ingestion_job.side_effect = Exception("Unexpected error") mock_initialise_slack_messages.return_value = (DEFAULT, []) + if "app.handler" in sys.modules: + del sys.modules["app.handler"] from app.handler import handler result = handler(s3_event, lambda_context) @@ -497,6 +507,8 @@ def test_slack_handler_success( "ingestionJob": {"ingestionJobId": "job-123", "status": "STARTING"} } + if "app.handler" in sys.modules: + del sys.modules["app.handler"] from app.handler import handler result = handler(s3_event, lambda_context) @@ -540,6 +552,8 @@ def test_slack_handler_success_multiple( "ingestionJob": {"ingestionJobId": "job-123", "status": "STARTING"} } + if "app.handler" in sys.modules: + del sys.modules["app.handler"] from app.handler import handler result = handler(s3_event, lambda_context) @@ -583,6 +597,8 @@ def test_slack_handler_client_failure( "ingestionJob": {"ingestionJobId": "job-123", "status": "STARTING"} } + if "app.handler" in sys.modules: + del sys.modules["app.handler"] from app.handler import handler result = handler(s3_event, lambda_context) From fae36557192a0f6b847513ce977671b6137f06a5 Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Thu, 5 Mar 2026 16:44:47 +0000 Subject: [PATCH 37/84] fix: Force rebuild From 17fba24facf475e7b5370fc3c3bafd43c4e1fd63 Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Fri, 6 Mar 2026 10:41:03 +0000 Subject: [PATCH 38/84] fix: Test Document processing without slack --- packages/cdk/nagSuppressions.ts | 13 +++++++++++++ packages/cdk/stacks/EpsAssistMeStack.ts | 7 ------- packages/syncKnowledgeBaseFunction/app/handler.py | 4 +++- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/packages/cdk/nagSuppressions.ts b/packages/cdk/nagSuppressions.ts index 26b1064cc..bd8539820 100644 --- a/packages/cdk/nagSuppressions.ts +++ b/packages/cdk/nagSuppressions.ts @@ -162,6 +162,18 @@ export const nagSuppressions = (stack: Stack, account: string) => { ] ) + // Suppress wildcard permissions for Preprocessing policy + safeAddNagSuppression( + stack, + "/EpsAssistMeStack/RuntimePolicies/SyncKnowledgeBasePolicy/Resource", + [ + { + id: "AwsSolutions-IAM5", + reason: "Preprocessing Lambda needs wildcard permissions to read/write any file in raw/ and processed/ prefixes." + } + ] + ) + // Suppress secrets without rotation safeAddNagSuppressionGroup( stack, @@ -448,6 +460,7 @@ export const nagSuppressions = (stack: Stack, account: string) => { } ] ) + // Suppress BedrockLogging Provider framework runtime version safeAddNagSuppression( stack, diff --git a/packages/cdk/stacks/EpsAssistMeStack.ts b/packages/cdk/stacks/EpsAssistMeStack.ts index e64890b0d..0423c3bc0 100644 --- a/packages/cdk/stacks/EpsAssistMeStack.ts +++ b/packages/cdk/stacks/EpsAssistMeStack.ts @@ -17,7 +17,6 @@ import {RuntimePolicies} from "../resources/RuntimePolicies" import {DatabaseTables} from "../resources/DatabaseTables" import {BedrockPromptResources} from "../resources/BedrockPromptResources" import {VectorIndex} from "../resources/VectorIndex" -import {BucketDeployment, Source} from "aws-cdk-lib/aws-s3-deployment" import {ManagedPolicy, PolicyStatement, Role} from "aws-cdk-lib/aws-iam" import {BedrockPromptSettings} from "../resources/BedrockPromptSettings" import {S3LambdaNotification} from "../resources/S3LambdaNotification" @@ -98,12 +97,6 @@ export class EpsAssistMeStack extends Stack { auditLoggingBucket: auditLoggingBucket }) - // initialize s3 folders for raw and processed documents - new BucketDeployment(this, "S3FolderInitializer", { - sources: [Source.asset("packages/cdk/assets/s3-folders")], - destinationBucket: storage.kbDocsBucket - }) - // Create Bedrock execution role without dependencies const bedrockExecutionRole = new BedrockExecutionRole(this, "BedrockExecutionRole", { region, diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index af15974db..2a2db46c6 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -676,7 +676,9 @@ def handler(event, context): un_processed, process_key, bucket_name, is_new = get_unprocessed_files(s3_records) - slack_client, slack_messages = initialise_slack_messages(len(s3_records), is_new) + # slack_client, slack_messages = initialise_slack_messages(len(s3_records), is_new) + slack_client = None + slack_messages = [] if not s3_records: logger.info("No valid S3 records to process", extra={"s3_records": len(records)}) From 18e9f750d4c885c272aaf4ccf831afa964b7cebc Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Fri, 6 Mar 2026 11:53:28 +0000 Subject: [PATCH 39/84] fix: Test Document processing with slack --- packages/syncKnowledgeBaseFunction/app/handler.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index 2a2db46c6..af15974db 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -676,9 +676,7 @@ def handler(event, context): un_processed, process_key, bucket_name, is_new = get_unprocessed_files(s3_records) - # slack_client, slack_messages = initialise_slack_messages(len(s3_records), is_new) - slack_client = None - slack_messages = [] + slack_client, slack_messages = initialise_slack_messages(len(s3_records), is_new) if not s3_records: logger.info("No valid S3 records to process", extra={"s3_records": len(records)}) From 7ba2b344f555c748e2cb94a1e7b0a5a2418bc6d0 Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Fri, 6 Mar 2026 12:32:36 +0000 Subject: [PATCH 40/84] fix: Add extra logging #skip-qc --- .../syncKnowledgeBaseFunction/app/handler.py | 29 +++++++++++++++---- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index af15974db..0af25965c 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -50,18 +50,21 @@ def get_unprocessed_files(s3_records) -> tuple[list, str, str, bool]: paginator = s3_client.get_paginator("list_objects_v2") page_iterator = paginator.paginate(Bucket=bucket_name) - for page in page_iterator: + for i, page in enumerate(page_iterator): if "Contents" not in page: + logger.info(f"Skipping page ({i}) with no contents") continue for obj in page["Contents"]: file_key = obj["Key"] + logger.log("") tag_response = s3_client.get_object_tagging( Bucket=bucket_name, Key=file_key, ExpectedBucketOwner=AWS_ACCOUNT_ID ) tags = {tag["Key"]: tag["Value"] for tag in tag_response.get("TagSet", [])} + logger.info(f"Found tags for {file_key}", extra={"tags": tags}) if not tags.get("Process_Status"): unprocessed_files.append(file_key) process_key = tags.get("Process_key", process_key) @@ -71,19 +74,27 @@ def get_unprocessed_files(s3_records) -> tuple[list, str, str, bool]: unprocessed_files = list( {s3_record.get("s3", {}).get("object", {}).get("key") for s3_record in s3_records} ^ set(unprocessed_files) ) + + logger.info( + "Found Unprocessed Files", + extra={"count": len(unprocessed_files), "unprocessed_files": json.dumps(unprocessed_files)}, + ) except Exception as e: logger.info(f"Error finding last modified file: {str(e)}") - return unprocessed_files, process_key, bucket_name, process_key == new_process_key + return unprocessed_files, process_key, bucket_name, (process_key == new_process_key) def set_unprocessed_files(s3_records, unprocessed_files, key, bucket): tags = [{"Key": "Process_Key", "Value": key}] + logger.info("Update tags on unprocessed files", extra={"tags": json.dumps(tags)}) for file in unprocessed_files: s3_client.put_object_tagging( Bucket=bucket, Key=file, ExpectedBucketOwner=AWS_ACCOUNT_ID, Tagging={"TagSet": tags} ) + tags.append({"Key": "Process_Status", "Value": "Complete"}) + logger.info("Update tags on processed files", extra={"tags": json.dumps(tags)}) for record in s3_records: s3_client.put_object_tagging( Bucket=bucket, @@ -269,15 +280,21 @@ def get_bot_channels(client): def get_latest_message(client, channel_id: str, user_id: str): history = client.conversation_history(channel=channel_id, limit=20) - newest = None + + if history is None: + logger.info( + "No Slack conversation history could be found", extra={"channel_id": channel_id, "user_id": user_id} + ) + # History is returned newest to oldest for message in history.get("messages", []): if message.get("user") == user_id: - newest = message + logger.info("Found existing Slack Message", extra={"message": message}) + newest = {"ok": history.get("ok"), "channel": channel_id, "ts": newest.get("ts"), "message": message} break - return {"ok": history.get("ok"), "channel": channel_id, "ts": newest.get("ts"), "message": message} + return newest def post_message(slack_client, channel_id: str, blocks: list, text_fallback: str): @@ -349,9 +366,11 @@ def initialise_slack_messages(event_count: int, is_new: bool): try: response = None if is_new: + logger.info("Searching for existing Slack Message") response = get_latest_message(slack_client, channel_id, user_id) if response is None: + logger.info("Creating new Slack Message") response = post_message( slack_client=slack_client, channel_id=channel_id, From 31341c22c057a0c21baefc38fcda3d0dc517ff8c Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Fri, 6 Mar 2026 13:25:08 +0000 Subject: [PATCH 41/84] fix: Fix slack function error --- packages/cdk/constructs/SimpleQueueService.ts | 4 ---- packages/cdk/resources/Functions.ts | 3 ++- .../syncKnowledgeBaseFunction/app/handler.py | 22 +++++++++---------- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/packages/cdk/constructs/SimpleQueueService.ts b/packages/cdk/constructs/SimpleQueueService.ts index 4cc39c2b7..6442ac458 100644 --- a/packages/cdk/constructs/SimpleQueueService.ts +++ b/packages/cdk/constructs/SimpleQueueService.ts @@ -65,14 +65,10 @@ export class SimpleQueueService extends Construct { props.functions.forEach(fn => { fn.function.addEventSource(eventSource) - // fn.function.addEnvironment("SQS_CONNECTION_STRING", queue.queueUrl) - queue.grantConsumeMessages(fn.function) - // queue.grantSendMessages(fn.function) }) // Grant the Lambda function permissions to consume messages from the queue - this.kmsKey = kmsKey this.queue = queue this.deadLetterQueue = deadLetterQueue diff --git a/packages/cdk/resources/Functions.ts b/packages/cdk/resources/Functions.ts index 0bf4ffc05..351311e1d 100644 --- a/packages/cdk/resources/Functions.ts +++ b/packages/cdk/resources/Functions.ts @@ -130,7 +130,8 @@ export class Functions extends Construct { "KNOWLEDGEBASE_ID": props.knowledgeBaseId, "DATA_SOURCE_ID": props.dataSourceId, "SLACK_BOT_TOKEN_PARAMETER": props.slackBotTokenParameter.parameterName, - "SLACK_BOT_ACTIVE_ON_PRS": "false" + "SLACK_BOT_ACTIVE_ON_PRS": "true", + "AWS_ACCOUNT_ID": props.account }, additionalPolicies: [props.syncKnowledgeBaseManagedPolicy] }) diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index 0af25965c..6b7f153ba 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -213,7 +213,7 @@ def process_s3_records(records) -> tuple[bool, str, list, list]: return True, job_id, created, deleted -def handle_client_error(e, start_time, slack_client, slack_messages): +def handle_client_error(e, start_time, slack_client: WebClient, slack_messages): """ Handle AWS ClientError exceptions with appropriate responses @@ -262,7 +262,7 @@ def handle_client_error(e, start_time, slack_client, slack_messages): } -def get_bot_channels(client): +def get_bot_channels(client: WebClient): """ Fetches all public and private channels the bot is a member of. """ @@ -278,8 +278,8 @@ def get_bot_channels(client): return channel_ids -def get_latest_message(client, channel_id: str, user_id: str): - history = client.conversation_history(channel=channel_id, limit=20) +def get_latest_message(client: WebClient, channel_id: str, user_id: str): + history = client.conversations_history(channel=channel_id, limit=20) newest = None if history is None: @@ -297,7 +297,7 @@ def get_latest_message(client, channel_id: str, user_id: str): return newest -def post_message(slack_client, channel_id: str, blocks: list, text_fallback: str): +def post_message(slack_client: WebClient, channel_id: str, blocks: list, text_fallback: str): """ Posts the formatted message to a specific channel. """ @@ -393,7 +393,7 @@ def initialise_slack_messages(event_count: int, is_new: bool): return default_response -def update_slack_message(slack_client, response, blocks): +def update_slack_message(slack_client: WebClient, response, blocks): """ Update the existing Slack message blocks with new information """ @@ -493,7 +493,7 @@ def create_task( return task -def update_slack_files_message(slack_client, response, added, deleted, index, skip): +def update_slack_files_message(slack_client: WebClient, response, added, deleted, index, skip): try: if response is None: logger.info(f"Skipping empty response ({index + 1})") @@ -530,7 +530,7 @@ def update_slack_files_message(slack_client, response, added, deleted, index, sk ) -def update_slack_files(slack_client, created_files: list[str], deleted_files: list[str], messages: list): +def update_slack_files(slack_client: WebClient, created_files: list[str], deleted_files: list[str], messages: list): """ Update the existing Slack message blocks with the count of processed files """ @@ -558,7 +558,7 @@ def update_slack_files(slack_client, created_files: list[str], deleted_files: li ) -def update_slack_complete(slack_client, messages, feedback: None): +def update_slack_complete(slack_client: WebClient, messages, feedback: None): """ Mark Slack Plan as complete """ @@ -592,7 +592,7 @@ def update_slack_complete(slack_client, messages, feedback: None): ) -def update_slack_error(slack_client, messages): +def update_slack_error(slack_client: WebClient, messages): """ Mark Slack Plan as errored """ @@ -657,7 +657,7 @@ def handler(event, context): }, ) - slack_client = None + slack_client: WebClient = None slack_messages = [] try: # Get events and update user channels From 5682b21c5b9219e3831100e727b92ccdc71f8333 Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Fri, 6 Mar 2026 14:58:30 +0000 Subject: [PATCH 42/84] fix: Fix cdk permissions --- packages/cdk/resources/RuntimePolicies.ts | 47 ++++++++++++------- .../syncKnowledgeBaseFunction/app/handler.py | 2 +- 2 files changed, 32 insertions(+), 17 deletions(-) diff --git a/packages/cdk/resources/RuntimePolicies.ts b/packages/cdk/resources/RuntimePolicies.ts index 2c5446799..dce45d07c 100644 --- a/packages/cdk/resources/RuntimePolicies.ts +++ b/packages/cdk/resources/RuntimePolicies.ts @@ -122,35 +122,50 @@ export class RuntimePolicies extends Construct { ] }) - // Create managed policy for SyncKnowledgeBase Lambda function - const syncKnowledgeBasePolicy = new PolicyStatement({ + const syncKnowledgeBaseBedrockPolicy = new PolicyStatement({ actions: [ - // Process items through Bedrock "bedrock:StartIngestionJob", "bedrock:GetIngestionJob", - "bedrock:ListIngestionJobs", - // Get properties from SSM - "ssm:GetParameter", - // Get items and remove them from SQS - "sqs:ReceiveMessage", - "sqs:DeleteMessage", - // Get items from the s3 bucket and handle it's tags - "s3:ListBucket", + "bedrock:ListIngestionJobs" + ], + resources: [ + props.knowledgeBaseArn + ] + }) + + const syncKnowledgeBaseSSMPolicy = new PolicyStatement({ + actions: [ + "ssm:GetParameter" + ], + resources: [ + ...slackBotPolicyResources + ] + }) + + const syncKnowledgeBaseS3BucketPolicy = new PolicyStatement({ + actions: ["s3:ListBucket"], + resources: [props.docsBucketArn] // Bucket-level resource for ListBucket + }) + + const syncKnowledgeBaseS3ObjectPolicy = new PolicyStatement({ + actions: [ "s3:GetObject", "s3:GetObjectTagging", "s3:PutObjectTagging" ], resources: [ - props.knowledgeBaseArn, - props.dataSourceArn, - props.docsBucketArn + "/processed/*", - ...slackBotPolicyResources + `${props.docsBucketArn}/processed/*` ] }) this.syncKnowledgeBasePolicy = new ManagedPolicy(this, "SyncKnowledgeBasePolicy", { description: "Policy for SyncKnowledgeBase Lambda to trigger ingestion jobs", - statements: [syncKnowledgeBasePolicy] + statements: [ + syncKnowledgeBaseBedrockPolicy, + syncKnowledgeBaseSSMPolicy, + syncKnowledgeBaseS3BucketPolicy, + syncKnowledgeBaseS3ObjectPolicy + ] }) //policy for the preprocessing lambda diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index 6b7f153ba..f86d9264b 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -365,7 +365,7 @@ def initialise_slack_messages(event_count: int, is_new: bool): for channel_id in target_channels: try: response = None - if is_new: + if is_new is False: logger.info("Searching for existing Slack Message") response = get_latest_message(slack_client, channel_id, user_id) From ebc608645defa6c36b95e4cdbdd31538b59929f2 Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Fri, 6 Mar 2026 16:41:22 +0000 Subject: [PATCH 43/84] fix: errors block completion --- .../syncKnowledgeBaseFunction/app/handler.py | 226 +++++++++--------- .../tests/test_app.py | 10 +- 2 files changed, 121 insertions(+), 115 deletions(-) diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index f86d9264b..02c89609b 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -58,7 +58,6 @@ def get_unprocessed_files(s3_records) -> tuple[list, str, str, bool]: for obj in page["Contents"]: file_key = obj["Key"] - logger.log("") tag_response = s3_client.get_object_tagging( Bucket=bucket_name, Key=file_key, ExpectedBucketOwner=AWS_ACCOUNT_ID ) @@ -113,6 +112,7 @@ def process_s3_records(records) -> tuple[bool, str, list, list]: Bedrock Knowledge Base ingestion for supported documents. """ + job_id = None created = [] deleted = [] # Validate if the sync should occur by checking if any files are valid @@ -174,7 +174,7 @@ def process_s3_records(records) -> tuple[bool, str, list, list]: # If we have at-least 1 valid file, start the sync process if not created and not deleted: - return False, None, [], [] + return False, None, [], [], None # Start Bedrock ingestion job (processes ALL files in data source) # For delete events, this re-ingests remaining files and removes deleted ones from vector index @@ -187,30 +187,33 @@ def process_s3_records(records) -> tuple[bool, str, list, list]: if is_create_event: description += f"\nFiles added/updated ({len(created)})" - response = bedrock_agent.start_ingestion_job( - knowledgeBaseId=KNOWLEDGEBASE_ID, - dataSourceId=DATA_SOURCE_ID, - description=description, - ) - ingestion_request_time = time.time() - ingestion_start_time + try: + response = bedrock_agent.start_ingestion_job( + knowledgeBaseId=KNOWLEDGEBASE_ID, + dataSourceId=DATA_SOURCE_ID, + description=description, + ) + ingestion_request_time = time.time() - ingestion_start_time - job_id = response["ingestionJob"]["ingestionJobId"] - job_status = response["ingestionJob"]["status"] + job_id = response["ingestionJob"]["ingestionJobId"] + job_status = response["ingestionJob"]["status"] - # REVERT job_id and job_status - logger.info( - "Successfully started ingestion job", - extra={ - "job_id": job_id, - "job_status": job_status, - "knowledge_base_id": KNOWLEDGEBASE_ID, - "trigger_file": object_key, - "ingestion_request_duration_ms": round(ingestion_request_time * 1000, 2), - "description": description, - }, - ) + logger.info( + "Successfully started ingestion job", + extra={ + "job_id": job_id, + "job_status": job_status, + "knowledge_base_id": KNOWLEDGEBASE_ID, + "trigger_file": object_key, + "ingestion_request_duration_ms": round(ingestion_request_time * 1000, 2), + "description": description, + }, + ) + except Exception as e: + logger.error(f"Error starting ingestion: {str(e)}") + return True, job_id, created, deleted, e - return True, job_id, created, deleted + return True, job_id, created, deleted, None def handle_client_error(e, start_time, slack_client: WebClient, slack_messages): @@ -235,10 +238,6 @@ def handle_client_error(e, start_time, slack_client: WebClient, slack_messages): "explanation": "Normal when multiple files uploaded quickly", }, ) - - update_slack_complete( - slack_client=slack_client, messages=slack_messages, feedback="Update already in progress." - ) return { "statusCode": 409, "body": "Files uploaded successfully - processing by existing ingestion job (no action required)", @@ -405,8 +404,7 @@ def update_slack_message(slack_client: WebClient, response, blocks): try: logger.info("Updating Slack channel") - result = slack_client.chat_update(channel=channel_id, ts=ts, blocks=blocks) - logger.error("Error updating Slack Message.", extra={"response": result}) + slack_client.chat_update(channel=channel_id, ts=ts, blocks=blocks) except SlackApiError as e: logger.error(f"Error updating message in {channel_id}: {str(e)}") except Exception as e: @@ -629,6 +627,94 @@ def update_slack_error(slack_client: WebClient, messages): ) +def handle_events(event, start_time): + # Get events and update user channels + records = event.get("Records", []) + + s3_records = [] # Track completed ingestion items + + # Process each S3 event record in the SQS batch + for sqs_index, sqs_record in enumerate(records): + try: + if sqs_record.get("eventSource") != "aws:sqs": + event_time = sqs_record.get("attributes", {}).get("SentTimestamp", "Unknown") + logger.info("Event found", extra={"Event Trigger Time": event_time}) + logger.warning( + "Skipping non-SQS event", + extra={ + "event_source": sqs_record.get("eventSource"), + "record_index": sqs_index + 1, + }, + ) + continue + + body = json.loads(sqs_record.get("body", "{}")) + s3_records += body.get("Records", []) + + except (json.JSONDecodeError, KeyError) as e: + logger.error(f"Failed to parse SQS body: {str(e)}") + continue + + # Check if the events are valid, and start syncing if so + # Don't stop if not, let the lambda handle it. + job_id = "" + created = [] + deleted = [] + process_error = None + + un_processed, process_key, bucket_name, is_new = get_unprocessed_files(s3_records) + + slack_client, slack_messages = initialise_slack_messages(len(s3_records), is_new) + + if not s3_records: + logger.info("No valid S3 records to process", extra={"s3_records": len(records)}) + else: + + logger.info("Processing S3 records", extra={"record_count": len(s3_records)}) + success, job_id, created, deleted, process_error = process_s3_records(s3_records) + + if not success: + msg = "Could not start sync process" + logger.error( + msg, + extra={ + "job_id": job_id, + }, + ) + else: + # Update file messages in Slack (N removed, N added, etc) + update_slack_files( + slack_client=slack_client, created_files=created, deleted_files=deleted, messages=slack_messages + ) + + # Check length of session, even if we haven't started syncing + total_duration = time.time() - start_time + + # Make sure all tasks are marked as complete in the Slack Plan + if not un_processed: + update_slack_complete(slack_client=slack_client, messages=slack_messages, feedback=None) + + set_unprocessed_files(s3_records=s3_records, unprocessed_files=un_processed, key=process_key, bucket=bucket_name) + + logger.info( + "Knowledge base sync process completed", + extra={ + "status_code": 200, + "job_id": job_id, + "trigger_files": created + deleted, + "total_duration_ms": round(total_duration * 1000, 2), + "knowledge_base_id": KNOWLEDGEBASE_ID, + "next_steps": "Monitor Bedrock console for ingestion job completion status", + }, + ) + + # Still handle conflict error - but don't stop tagging, etc + if process_error: + raise process_error + + return created, deleted + + @logger.inject_lambda_context(log_event=True, clear_state=True) def handler(event, context): """ @@ -660,87 +746,7 @@ def handler(event, context): slack_client: WebClient = None slack_messages = [] try: - # Get events and update user channels - records = event.get("Records", []) - - s3_records = [] # Track completed ingestion items - - # Process each S3 event record in the SQS batch - for sqs_index, sqs_record in enumerate(records): - try: - if sqs_record.get("eventSource") != "aws:sqs": - event_time = sqs_record.get("attributes", {}).get("SentTimestamp", "Unknown") - logger.info("Event found", extra={"Event Trigger Time": event_time}) - logger.warning( - "Skipping non-SQS event", - extra={ - "event_source": sqs_record.get("eventSource"), - "record_index": sqs_index + 1, - }, - ) - continue - - body = json.loads(sqs_record.get("body", "{}")) - s3_records += body.get("Records", []) - - except (json.JSONDecodeError, KeyError) as e: - logger.error(f"Failed to parse SQS body: {str(e)}") - continue - - # Check if the events are valid, and start syncing if so - # Don't stop if not, let the lambda handle it. - job_id = "" - created = [] - deleted = [] - - un_processed, process_key, bucket_name, is_new = get_unprocessed_files(s3_records) - - slack_client, slack_messages = initialise_slack_messages(len(s3_records), is_new) - - if not s3_records: - logger.info("No valid S3 records to process", extra={"s3_records": len(records)}) - else: - - logger.info("Processing S3 records", extra={"record_count": len(s3_records)}) - success, job_id, created, deleted = process_s3_records(s3_records) - - if not success: - msg = "Could not start sync process" - logger.error( - msg, - extra={ - "job_id": job_id, - }, - ) - return {"statusCode": 500, "body": msg, "job_id": job_id} - - # Update file messages in Slack (N removed, N added, etc) - update_slack_files( - slack_client=slack_client, created_files=created, deleted_files=deleted, messages=slack_messages - ) - - # Check length of session, even if we haven't started syncing - total_duration = time.time() - start_time - - # Make sure all tasks are marked as complete in the Slack Plan - if not un_processed: - update_slack_complete(slack_client=slack_client, messages=slack_messages, feedback=None) - - set_unprocessed_files( - s3_records=s3_records, unprocessed_files=un_processed, key=process_key, bucket=bucket_name - ) - - logger.info( - "Knowledge base sync process completed", - extra={ - "status_code": 200, - "job_id": job_id, - "trigger_files": created + deleted, - "total_duration_ms": round(total_duration * 1000, 2), - "knowledge_base_id": KNOWLEDGEBASE_ID, - "next_steps": "Monitor Bedrock console for ingestion job completion status", - }, - ) + created, deleted = handle_events(event, start_time) return { "statusCode": 200, diff --git a/packages/syncKnowledgeBaseFunction/tests/test_app.py b/packages/syncKnowledgeBaseFunction/tests/test_app.py index 09de7a001..e55d7733b 100644 --- a/packages/syncKnowledgeBaseFunction/tests/test_app.py +++ b/packages/syncKnowledgeBaseFunction/tests/test_app.py @@ -236,7 +236,7 @@ def test_handler_conflict_exception( mock_time, mock_boto_client, mock_initialise_slack_messages, mock_env, lambda_context, s3_event ): """Test handler with ConflictException (job already running)""" - mock_time.side_effect = [1000, 1001, 1002] + mock_time.side_effect = [1000, 1001, 1002, 1003] error = ClientError( error_response={"Error": {"Code": "ConflictException", "Message": "Job already running"}}, operation_name="StartIngestionJob", @@ -262,7 +262,7 @@ def test_handler_aws_error( mock_time, mock_boto_client, mock_initialise_slack_messages, mock_env, lambda_context, s3_event ): """Test handler with other AWS error""" - mock_time.side_effect = [1000, 1001, 1002] + mock_time.side_effect = [1000, 1001, 1002, 1003] error = ClientError( error_response={"Error": {"Code": "AccessDenied", "Message": "Access denied"}}, operation_name="StartIngestionJob", @@ -288,7 +288,7 @@ def test_handler_unexpected_error( mock_time, mock_boto_client, mock_initialise_slack_messages, mock_env, lambda_context, s3_event ): """Test handler with unexpected error""" - mock_time.side_effect = [1000, 1001, 1002] + mock_time.side_effect = [1000, 1001, 1002, 1003] mock_bedrock = mock_boto_client.return_value mock_bedrock.start_ingestion_job.side_effect = Exception("Unexpected error") mock_initialise_slack_messages.return_value = (DEFAULT, []) @@ -474,8 +474,8 @@ def test_handler_unknown_event_type( result = handler(unknown_event, lambda_context) - assert result["statusCode"] == 500 - assert "Could not start sync process" in result["body"] + assert result["statusCode"] == 200 + assert "Successfully triggered ingestion job for 0 trigger file(s)" in result["body"] mock_bedrock.start_ingestion_job.assert_not_called() From b8a6c93aa1bd003bfda742a5c3d6b5e12b6d62d3 Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Mon, 9 Mar 2026 10:17:59 +0000 Subject: [PATCH 44/84] fix: Fetch all events from SQS --- packages/cdk/constructs/SimpleQueueService.ts | 2 + packages/cdk/resources/Functions.ts | 1 - packages/cdk/resources/RuntimePolicies.ts | 20 +- .../app/config/config.py | 1 + .../syncKnowledgeBaseFunction/app/handler.py | 980 +++++++----------- 5 files changed, 368 insertions(+), 636 deletions(-) diff --git a/packages/cdk/constructs/SimpleQueueService.ts b/packages/cdk/constructs/SimpleQueueService.ts index 6442ac458..c38f2bc79 100644 --- a/packages/cdk/constructs/SimpleQueueService.ts +++ b/packages/cdk/constructs/SimpleQueueService.ts @@ -65,6 +65,8 @@ export class SimpleQueueService extends Construct { props.functions.forEach(fn => { fn.function.addEventSource(eventSource) + fn.function.addEnvironment("SQS_URL", queue.queueUrl) + queue.grantConsumeMessages(fn.function) }) diff --git a/packages/cdk/resources/Functions.ts b/packages/cdk/resources/Functions.ts index 351311e1d..e792d0927 100644 --- a/packages/cdk/resources/Functions.ts +++ b/packages/cdk/resources/Functions.ts @@ -128,7 +128,6 @@ export class Functions extends Construct { dependencyLocation: ".dependencies/syncKnowledgeBaseFunction", environmentVariables: { "KNOWLEDGEBASE_ID": props.knowledgeBaseId, - "DATA_SOURCE_ID": props.dataSourceId, "SLACK_BOT_TOKEN_PARAMETER": props.slackBotTokenParameter.parameterName, "SLACK_BOT_ACTIVE_ON_PRS": "true", "AWS_ACCOUNT_ID": props.account diff --git a/packages/cdk/resources/RuntimePolicies.ts b/packages/cdk/resources/RuntimePolicies.ts index dce45d07c..c35acd188 100644 --- a/packages/cdk/resources/RuntimePolicies.ts +++ b/packages/cdk/resources/RuntimePolicies.ts @@ -142,29 +142,11 @@ export class RuntimePolicies extends Construct { ] }) - const syncKnowledgeBaseS3BucketPolicy = new PolicyStatement({ - actions: ["s3:ListBucket"], - resources: [props.docsBucketArn] // Bucket-level resource for ListBucket - }) - - const syncKnowledgeBaseS3ObjectPolicy = new PolicyStatement({ - actions: [ - "s3:GetObject", - "s3:GetObjectTagging", - "s3:PutObjectTagging" - ], - resources: [ - `${props.docsBucketArn}/processed/*` - ] - }) - this.syncKnowledgeBasePolicy = new ManagedPolicy(this, "SyncKnowledgeBasePolicy", { description: "Policy for SyncKnowledgeBase Lambda to trigger ingestion jobs", statements: [ syncKnowledgeBaseBedrockPolicy, - syncKnowledgeBaseSSMPolicy, - syncKnowledgeBaseS3BucketPolicy, - syncKnowledgeBaseS3ObjectPolicy + syncKnowledgeBaseSSMPolicy ] }) diff --git a/packages/syncKnowledgeBaseFunction/app/config/config.py b/packages/syncKnowledgeBaseFunction/app/config/config.py index c134c2911..32632c22f 100644 --- a/packages/syncKnowledgeBaseFunction/app/config/config.py +++ b/packages/syncKnowledgeBaseFunction/app/config/config.py @@ -13,6 +13,7 @@ DATA_SOURCE_ID = os.environ.get("DATA_SOURCE_ID") SLACK_BOT_TOKEN_PARAMETER = os.environ.get("SLACK_BOT_TOKEN_PARAMETER") AWS_ACCOUNT_ID = os.environ.get("AWS_ACCOUNT_ID") +SQS_URL = os.environ.get("SQS_URL") # Supported file types for Bedrock Knowledge Base ingestion SUPPORTED_FILE_TYPES = {".pdf", ".txt", ".md", ".csv", ".doc", ".docx", ".xls", ".xlsx", ".html", ".json"} diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index 02c89609b..c28d73e23 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -10,709 +10,465 @@ import traceback import uuid import boto3 -import json from typing import Literal -from botocore.exceptions import ClientError from app.config.config import ( KNOWLEDGEBASE_ID, DATA_SOURCE_ID, SUPPORTED_FILE_TYPES, - AWS_ACCOUNT_ID, + SQS_URL, get_bot_token, logger, ) from slack_sdk import WebClient from slack_sdk.errors import SlackApiError +from slack_sdk.web import SlackResponse -s3_client = boto3.client("s3") bedrock_agent = boto3.client("bedrock-agent") +sqs = boto3.client("sqs") -def is_supported_file_type(file_key): - """ - Check if file type is supported for Bedrock Knowledge Base ingestion - """ - return any(file_key.lower().endswith(ext) for ext in SUPPORTED_FILE_TYPES) - - -def get_unprocessed_files(s3_records) -> tuple[list, str, str, bool]: - unprocessed_files = [] - new_process_key = uuid.uuid4().hex - process_key = new_process_key - bucket_name = "" - - try: - if s3_records is None: - return unprocessed_files, process_key, bucket_name, True - - bucket_name = s3_records[0]["s3"]["bucket"]["name"] - - paginator = s3_client.get_paginator("list_objects_v2") - page_iterator = paginator.paginate(Bucket=bucket_name) +class S3_Event_result: + file_name: str + event_type: str + processing: bool - for i, page in enumerate(page_iterator): - if "Contents" not in page: - logger.info(f"Skipping page ({i}) with no contents") - continue - - for obj in page["Contents"]: - file_key = obj["Key"] - - tag_response = s3_client.get_object_tagging( - Bucket=bucket_name, Key=file_key, ExpectedBucketOwner=AWS_ACCOUNT_ID - ) + def __init__(self, file_name, event_type, processing): + self.file_name = file_name + self.event_type = event_type + self.processing = processing - tags = {tag["Key"]: tag["Value"] for tag in tag_response.get("TagSet", [])} - logger.info(f"Found tags for {file_key}", extra={"tags": tags}) - if not tags.get("Process_Status"): - unprocessed_files.append(file_key) - process_key = tags.get("Process_key", process_key) - break - # Return a list of records which are not being processed by this function - unprocessed_files = list( - {s3_record.get("s3", {}).get("object", {}).get("key") for s3_record in s3_records} ^ set(unprocessed_files) - ) +class Slack_Handler: - logger.info( - "Found Unprocessed Files", - extra={"count": len(unprocessed_files), "unprocessed_files": json.dumps(unprocessed_files)}, - ) - except Exception as e: - logger.info(f"Error finding last modified file: {str(e)}") - - return unprocessed_files, process_key, bucket_name, (process_key == new_process_key) - - -def set_unprocessed_files(s3_records, unprocessed_files, key, bucket): - tags = [{"Key": "Process_Key", "Value": key}] - logger.info("Update tags on unprocessed files", extra={"tags": json.dumps(tags)}) - for file in unprocessed_files: - s3_client.put_object_tagging( - Bucket=bucket, Key=file, ExpectedBucketOwner=AWS_ACCOUNT_ID, Tagging={"TagSet": tags} - ) - - tags.append({"Key": "Process_Status", "Value": "Complete"}) - logger.info("Update tags on processed files", extra={"tags": json.dumps(tags)}) - for record in s3_records: - s3_client.put_object_tagging( - Bucket=bucket, - Key=record["s3"]["bucket"]["name"], - ExpectedBucketOwner=AWS_ACCOUNT_ID, - Tagging={"TagSet": tags}, - ) - - -def process_s3_records(records) -> tuple[bool, str, list, list]: - """ - Process a S3 records, a single record can not be synced - the whole drive will be synced - Files will be filtered by the knowledge base. - - Validates S3 record structure, checks file type support, and triggers - Bedrock Knowledge Base ingestion for supported documents. - """ - - job_id = None - created = [] - deleted = [] - # Validate if the sync should occur by checking if any files are valid - for i, record in enumerate(records): - # Extract S3 event details - s3_info = record.get("s3", {}) - bucket_name = s3_info.get("bucket", {}).get("name") - object_key = s3_info.get("object", {}).get("key") + def __init__(self): + self.fetching_block_id: str = uuid.uuid4().hex + self.update_block_id: str = uuid.uuid4().hex + self.slack_client: WebClient | None = None + self.messages: list[SlackResponse] = [] + self.default_slack_message: str = "Updating Source Files" - # Skip malformed S3 records - if not bucket_name or not object_key: - logger.warning( - "Skipping invalid S3 record", - extra={ - "record_index": i + 1, - "has_bucket": bool(bucket_name), - "has_object_key": bool(object_key), - }, - ) - continue + def post_message(self, channel_id: str, blocks: list, text_fallback: str): + # TODO: Header + try: + return self.slack_client.chat_postMessage(channel=channel_id, text=text_fallback, blocks=blocks) + except SlackApiError as e: + logger.error(f"Error posting to {channel_id}: {str(e)}") + return None + except Exception as e: + logger.error(f"Error posting to {channel_id}: {str(e)}") + return None - # Skip unsupported file types to avoid unnecessary processing - if not is_supported_file_type(object_key): - logger.info( - "Skipping unsupported file type", - extra={ - "file_key": object_key, - "supported_types": list(SUPPORTED_FILE_TYPES), - "record_index": i + 1, - }, + def update_message(self, channel_id: str, ts: str, blocks: list): + # TODO: Header + try: + return self.slack_client.chat_update( + channel=channel_id, ts=ts, blocks=blocks, text=self.default_slack_message ) - continue - - # Extract additional event metadata for logging - event_name = record["eventName"] - object_size = s3_info.get("object", {}).get("size", "unknown") - - # Determine event type for proper handling - is_delete_event = event_name.startswith("ObjectRemoved") - is_create_event = event_name.startswith("ObjectCreated") - is_update_event = event_name.startswith("ObjectModified") - - logger.info( - "Found valid S3 event for processing", - extra={ - "event_name": event_name, - "bucket": bucket_name, - "key": object_key, - "object_size_bytes": object_size, - "record_index": i + 1, - }, - ) - - # Determine event type based on S3 event name - if is_delete_event: - deleted.append(object_key) - elif is_create_event or is_update_event: - created.append(object_key) - - # If we have at-least 1 valid file, start the sync process - if not created and not deleted: - return False, None, [], [], None - - # Start Bedrock ingestion job (processes ALL files in data source) - # For delete events, this re-ingests remaining files and removes deleted ones from vector index - ingestion_start_time = time.time() - - # Create descriptive message based on event type - description = "Auto-sync:" - if is_delete_event: - description += f"\nFiles deleted ({len(deleted)})" - if is_create_event: - description += f"\nFiles added/updated ({len(created)})" - - try: - response = bedrock_agent.start_ingestion_job( - knowledgeBaseId=KNOWLEDGEBASE_ID, - dataSourceId=DATA_SOURCE_ID, - description=description, - ) - ingestion_request_time = time.time() - ingestion_start_time - - job_id = response["ingestionJob"]["ingestionJobId"] - job_status = response["ingestionJob"]["status"] - - logger.info( - "Successfully started ingestion job", - extra={ - "job_id": job_id, - "job_status": job_status, - "knowledge_base_id": KNOWLEDGEBASE_ID, - "trigger_file": object_key, - "ingestion_request_duration_ms": round(ingestion_request_time * 1000, 2), - "description": description, + except Exception as e: + logger.error(f"Error posting to {channel_id}: {str(e)}") + + def create_task( + self, + id, + title, + plan=None, + details=None, + outputs=None, + status: Literal["in_progress", "complete"] = "in_progress", + ): + # TODO: Header + task = { + "task_id": id, + "title": title, + "status": status, + "details": { + "type": "rich_text", + "block_id": uuid.uuid4().hex, + "elements": [ + {"type": "rich_text_section", "elements": [{"type": "text", "text": detail}]} + for detail in (details if details else []) + ], }, - ) - except Exception as e: - logger.error(f"Error starting ingestion: {str(e)}") - return True, job_id, created, deleted, e - - return True, job_id, created, deleted, None - - -def handle_client_error(e, start_time, slack_client: WebClient, slack_messages): - """ - Handle AWS ClientError exceptions with appropriate responses - - Distinguishes between expected ConflictExceptions (job already running) - and other AWS service errors, providing appropriate HTTP responses. - """ - error_code = e.response.get("Error", {}).get("Code", "Unknown") - error_message = e.response.get("Error", {}).get("Message", str(e)) - - # ConflictException is expected when ingestion job already running - if error_code == "ConflictException": - logger.warning( - "Ingestion job already in progress - no action required", - extra={ - "status_code": 409, - "error_code": error_code, - "error_message": error_message, - "duration_ms": round((time.time() - start_time) * 1000, 2), - "explanation": "Normal when multiple files uploaded quickly", + "output": { + "type": "rich_text", + "block_id": uuid.uuid4().hex, + "elements": [ + {"type": "rich_text_section", "elements": [{"type": "text", "text": output}]} + for output in (outputs if outputs else []) + ], }, - ) - return { - "statusCode": 409, - "body": "Files uploaded successfully - processing by existing ingestion job (no action required)", } - else: - update_slack_error(slack_client=slack_client, messages=slack_messages) - # Handle other AWS service errors - logger.error( - "AWS service error occurred", - extra={ - "status_code": 500, - "error_code": error_code, - "error_message": error_message, - "duration_ms": round((time.time() - start_time) * 1000, 2), - }, - ) - return { - "statusCode": 500, - "body": f"AWS error: {error_code} - {error_message}", - } + if plan: + plan["title"] = f"{title}..." + plan["status"] = status + plan["tasks"] += [task] + return task + def update_task( + self, id: str, message: str, status: Literal["in_progress", "completed"] = "in_progress", replace=False + ): + # Add header + for slack_message in self.messages: + channel_id = slack_message["channel"] + ts = slack_message["ts"] -def get_bot_channels(client: WebClient): - """ - Fetches all public and private channels the bot is a member of. - """ - channel_ids = [] - try: - for result in client.conversations_list(types=["private_channel"], limit=1000): - for channel in result["channels"]: - channel_ids.append(channel["id"]) - except Exception as e: - logger.error(f"Network error listing channels: {str(e)}") - return [] + if self.slack_client is None or slack_message is None: + logger.warning("No Slack client or message, skipping update task") - return channel_ids + blocks = slack_message["message"]["blocks"] + plan = next((block for block in blocks if block["type"] == "plan"), None) + tasks = plan["tasks"] + if tasks is None: + logger.warning("No task found, skipping update task") -def get_latest_message(client: WebClient, channel_id: str, user_id: str): - history = client.conversations_history(channel=channel_id, limit=20) - newest = None + task = next((task for task in tasks if task["task_id"] == id), None) + if task is None: + logger.warning(f"Could not find task with task_id {id}, skipping update task") - if history is None: - logger.info( - "No Slack conversation history could be found", extra={"channel_id": channel_id, "user_id": user_id} - ) - - # History is returned newest to oldest - for message in history.get("messages", []): - if message.get("user") == user_id: - logger.info("Found existing Slack Message", extra={"message": message}) - newest = {"ok": history.get("ok"), "channel": channel_id, "ts": newest.get("ts"), "message": message} - break + details = task["details"] + detail_elements = details["elements"] if not replace else [] + detail_elements.append({"type": "rich_text_section", "elements": [{"type": "text", "text": message}]}) - return newest + task["status"] = status + task["details"] = details + self.update_message(channel_id=channel_id, ts=ts, blocks=blocks) -def post_message(slack_client: WebClient, channel_id: str, blocks: list, text_fallback: str): - """ - Posts the formatted message to a specific channel. - """ - try: - return slack_client.chat_postMessage(channel=channel_id, text=text_fallback, blocks=blocks) - except SlackApiError as e: - logger.error( - f"Error posting to {channel_id}: {str(e)}", extra={"blocks": blocks, "text_fallback": text_fallback} - ) - return None - except Exception as e: - logger.error( - f"Error posting to {channel_id}: {str(e)}", extra={"blocks": blocks, "text_fallback": text_fallback} - ) - return None + def get_bot_channels(self) -> list[str]: + """ + Fetches all public and private channels the bot is a member of. + """ + channel_ids = [] + try: + for result in self.slack_client.conversations_list(types=["private_channel"], limit=1000): + for channel in result["channels"]: + channel_ids.append(channel["id"]) + except Exception as e: + logger.error(f"Network error listing channels: {str(e)}") + return [] + return channel_ids -def initialise_slack_messages(event_count: int, is_new: bool): - """ - Send Slack notification summarizing the synchronization status - """ - default_response = (None, []) - try: - # Build blocks for Slack message - blocks = [ - { - "type": "section", - "text": { - "type": "plain_text", - "text": "I am currently syncing changes to my knowledge base.\n This may take a few minutes.", + def initialise_slack_messages(self): + """ + Create a new slack message to inform user of SQS event process progress + """ + default_response = (None, []) + try: + # Build blocks for Slack message + blocks = [ + { + "type": "section", + "text": { + "type": "plain_text", + "text": "I am currently syncing changes to my knowledge base.\n This may take a few minutes.", + }, }, - }, - { - "type": "plan", - "plan_id": "plan_1", - "title": "Fetching changes...", - "tasks": [create_task(title="Fetching changes", details=[], outputs=[f"Found {event_count} event(s)"])], - }, - { - "type": "context", - "elements": [{"type": "plain_text", "text": "Please wait up-to 10 minutes for changes to take effect"}], - }, - ] + { + "type": "plan", + "plan_id": uuid.uuid4().hex, + "title": "Processing File Changes...", + "tasks": [ + self.create_task( + id=self.fetching_block_id, + title="Fetching changes", + details=[], + outputs=["Searching"], + status="complete", + ), + self.create_task( + id=self.update_block_id, + title="Processing File Changes", + details=[], + output=["Initialising"], + status="in-progress", + ), + ], + }, + { + "type": "context", + "elements": [ + {"type": "plain_text", "text": "Please wait up-to 10 minutes for changes to take effect"} + ], + }, + ] - # Create new client - token = get_bot_token() - slack_client = WebClient(token=token) - response = slack_client.auth_test() - user_id = response.get("user_id", "unknown") + # Create new client + token = get_bot_token() + slack_client = WebClient(token=token) + response = slack_client.auth_test() + user_id = response.get("user_id", "unknown") - logger.info(f"Authenticated as bot user: {user_id}", extra={"response": response}) + self.slack_client = slack_client - # Get Channels where the Bot is a member - logger.info("Find bot channels...") - target_channels = get_bot_channels(slack_client) + logger.info(f"Authenticated as bot user: {user_id}", extra={"response": response}) - if not target_channels: - logger.warning("SKIPPING - Bot is not in any channels. No messages sent.") - return default_response + # Get Channels where the Bot is a member + logger.info("Find bot channels...") + target_channels = self.get_bot_channels() - # Broadcast Loop - logger.info(f"Broadcasting to {len(target_channels)} channels...") + if not target_channels: + logger.warning("SKIPPING - Bot is not in any channels. No messages sent.") + return default_response - responses = [] - for channel_id in target_channels: - try: - response = None - if is_new is False: - logger.info("Searching for existing Slack Message") - response = get_latest_message(slack_client, channel_id, user_id) + # Broadcast Loop + logger.info(f"Broadcasting to {len(target_channels)} channels...") - if response is None: + responses = [] + for channel_id in target_channels: + try: logger.info("Creating new Slack Message") - response = post_message( - slack_client=slack_client, + response = self.post_message( channel_id=channel_id, blocks=blocks, text_fallback="*My knowledge base has been updated!*", ) - responses.append(response) - if response["ok"] is not True: - logger.error("Error initialising Slack Message.", extra={"response": response}) - except Exception as e: - logger.error(f"Failed to initialise slack message for channel: {channel_id}", extra={"exception": e}) - continue + responses.append(response) + if response["ok"] is not True: + logger.error("Error initialising Slack Message.", extra={"response": response}) + except Exception as e: + logger.error( + f"Failed to initialise slack message for channel: {channel_id}", extra={"exception": e} + ) + continue - logger.info("Broadcast complete.", extra={"responses": len(responses)}) - return slack_client, responses + logger.info("Broadcast complete.", extra={"responses": len(responses)}) + self.messages = responses - except Exception as e: - logger.error(f"Failed to initialise slack messages: {str(e)}") - return default_response + except Exception as e: + logger.error(f"Failed to initialise slack messages: {str(e)}") + return default_response + def complete_plan(self): + # TODO: Header + for slack_message in self.messages: + try: + channel_id = slack_message["channel"] + ts = slack_message["ts"] -def update_slack_message(slack_client: WebClient, response, blocks): - """ - Update the existing Slack message blocks with new information - """ - channel_id = response["channel"] - ts = response["ts"] + if self.slack_client is None or slack_message is None: + logger.warning("No Slack client or message, skipping complete task") - if slack_client is None: - logger.warning("No Slack client found, skipping update message") + # Update the event count in the plan block + blocks = slack_message["message"]["blocks"] + plan = next((block for block in blocks if block["type"] == "plan"), None) - try: - logger.info("Updating Slack channel") - slack_client.chat_update(channel=channel_id, ts=ts, blocks=blocks) - except SlackApiError as e: - logger.error(f"Error updating message in {channel_id}: {str(e)}") - except Exception as e: - logger.error(f"Error updating message in {channel_id}: {str(e)}") - - -def update_slack_task( - plan, - task, - title=None, - status: Literal["in_progress", "completed"] = "in_progress", - details=None, - outputs=None, -): - logger.info("Updating Slack task") - if not task: - return plan - - if title: - plan["title"] = f"{title}..." - task["title"] = title - - if status: - task["status"] = status - - if details: - task["details"] = { - "type": "rich_text", - "block_id": uuid.uuid4().hex, - "elements": [ - *task.get("details", {}).get("elements", []), - *[{"type": "rich_text_section", "elements": [{"type": "text", "text": detail}]} for detail in details], - ], - } + plan["title"] = "Processing complete!" + for i, task in enumerate(plan["tasks"]): + task["status"] = "complete" - if outputs: - task["output"] = { - "type": "rich_text", - "block_id": uuid.uuid4().hex, - "elements": [ - {"type": "rich_text_section", "elements": [{"type": "text", "text": output}]} for output in outputs - ], - } + self.update_message(channel_id=channel_id, ts=ts, blocks=blocks) + except Exception as e: + logger.error( + "Unexpected error occurred completing Slack message", + extra={ + "status_code": 500, + "error_type": type(e).__name__, + "error_message": str(e), + "error": traceback.format_exc(), + "e": e, + }, + ) - return plan +class S3_Event_Handler: + @staticmethod + def handle_client_error(e): + error_code = e.response.get("Error", {}).get("Code", "Unknown") + error_message = e.response.get("Error", {}).get("Message", str(e)) -def create_task( - title, - plan=None, - details=None, - outputs=None, - status: Literal["in_progress", "complete"] = "in_progress", -): - """ - Helper function to create a task object for the plan block - """ - task = { - "task_id": uuid.uuid4().hex, - "title": title, - "status": status, - "details": { - "type": "rich_text", - "block_id": uuid.uuid4().hex, - "elements": [ - {"type": "rich_text_section", "elements": [{"type": "text", "text": detail}]} - for detail in (details if details else []) - ], - }, - "output": { - "type": "rich_text", - "block_id": uuid.uuid4().hex, - "elements": [ - {"type": "rich_text_section", "elements": [{"type": "text", "text": output}]} - for output in (outputs if outputs else []) - ], - }, - } - - if plan: - plan["title"] = title - plan["status"] = status - plan["tasks"] += [task] - return task + # ConflictException is expected when ingestion job already running + if error_code == "ConflictException": + logger.error( + "Ingestion job already in progress - no action required", + extra={"status_code": 409, "error_code": error_code, "error_message": error_message}, + ) + @staticmethod + def is_supported_file_type(file_key): + """ + Check if file type is supported for Bedrock Knowledge Base ingestion + """ + return any(file_key.lower().endswith(ext) for ext in SUPPORTED_FILE_TYPES) -def update_slack_files_message(slack_client: WebClient, response, added, deleted, index, skip): - try: - if response is None: - logger.info(f"Skipping empty response ({index + 1})") - return - - # Update the event count in the plan block - blocks = response["message"] - blocks = response["message"]["blocks"] - plan = next((block for block in blocks if block["type"] == "plan"), None) - task = plan["tasks"][-1] if plan and "tasks" in plan and plan["tasks"] else None - - # Task params - title = "Processing file changes" - status = "completed" - details = [f"{val} {label} file(s)" for val, label in [(added, "new"), (deleted, "removed")] if val > 0] - outputs = [f"Total files processed: {added + deleted}" if not skip else "No file changes"] - - if task and task["title"] == title: - plan = update_slack_task(plan=plan, task=task, status=status, title=title, details=details, outputs=outputs) - else: - create_task(plan=plan, title=title, details=details, outputs=outputs, status=status) - - update_slack_message(slack_client=slack_client, response=response, blocks=blocks) - except Exception as e: - logger.error( - "Unexpected error occurred updating Slack message", - extra={ - "status_code": 500, - "error_type": type(e).__name__, - "error_message": str(e), - "error": traceback.format_exc(), - "e": e, - }, - ) + @staticmethod + def validate_s3_event(bucket_name, object_key): + if not bucket_name or not object_key: + logger.warning( + "Skipping invalid S3 record", + extra={ + "has_bucket": bool(bucket_name), + "has_object_key": bool(object_key), + }, + ) + return False + if not S3_Event_Handler.is_supported_file_type(object_key): + logger.info( + "Skipping unsupported file type", + extra={"file_key": object_key, "supported_types": list(SUPPORTED_FILE_TYPES)}, + ) + return False + return True -def update_slack_files(slack_client: WebClient, created_files: list[str], deleted_files: list[str], messages: list): - """ - Update the existing Slack message blocks with the count of processed files - """ - if not messages: - logger.warning("No slack messages to update") - return + @staticmethod + def process_single_s3_event(record) -> S3_Event_result: + # TODO: Add documentation + s3_info = record.get("s3", {}) + bucket_name = s3_info.get("bucket", {}).get("name") + object_key = s3_info.get("object", {}).get("key") + event_name = record.get("eventName", "Unknown") - if not created_files and not deleted_files: - logger.warning("No processed files to update in Slack messages.") - return + result = S3_Event_result(file_name=object_key, event_type=event_name, processing=False) - logger.info( - "Processing lack files Slack Notification", - extra={"created_files": created_files, "deleted_files": deleted_files, "messages": messages}, - ) - added = len(created_files) - deleted = len(deleted_files) - skip = (added + deleted) == 0 + # Skip invalid records + if not S3_Event_Handler.validate_s3_event(bucket_name, object_key): + return result - logger.info(f"Processed {added} added/updated and {deleted} deleted file(s).") + # Extract additional event metadata for logging + event_name = record["eventName"] + object_size = s3_info.get("object", {}).get("size", "unknown") - for i, response in enumerate(messages): - update_slack_files_message( - slack_client=slack_client, response=response, added=added, deleted=deleted, index=i, skip=skip + logger.info( + "Found valid S3 event for processing", + extra={ + "event_name": event_name, + "bucket": bucket_name, + "key": object_key, + "object_size_bytes": object_size, + }, ) - -def update_slack_complete(slack_client: WebClient, messages, feedback: None): - """ - Mark Slack Plan as complete - """ - if not messages: - logger.warning("No existing Slack messages to update event count.") - - for response in messages: try: - if response is None: - continue - - # Update the event count in the plan block - blocks = response["message"]["blocks"] - plan = next((block for block in blocks if block["type"] == "plan"), None) + response = bedrock_agent.start_ingestion_job( + knowledgeBaseId=KNOWLEDGEBASE_ID, + dataSourceId=DATA_SOURCE_ID, + description=f"Sync: {bucket_name}/{object_key}/{event_name}.{uuid.uuid4().hex}", + ) - plan["title"] = feedback if feedback else "Processing complete!" - for i, task in enumerate(plan["tasks"]): - task["status"] = "complete" + job_id = response["ingestionJob"]["ingestionJobId"] + job_status = response["ingestionJob"]["status"] + result.processing = True - update_slack_message(slack_client, response, blocks) - except Exception as e: - logger.error( - "Unexpected error occurred completing Slack message", + logger.info( + "Successfully started ingestion job", extra={ - "status_code": 500, - "error_type": type(e).__name__, - "error_message": str(e), - "error": traceback.format_exc(), - "e": e, + "job_id": job_id, + "job_status": job_status, + "trigger_file": object_key, }, ) + except Exception as e: + # Handle Conflict Exception, we don't want to stop - just inform user + S3_Event_Handler.handle_client_error(e) + logger.error(f"Error starting ingestion: {str(e)}") + result.processing = False -def update_slack_error(slack_client: WebClient, messages): - """ - Mark Slack Plan as errored - """ - if not messages: - logger.warning("No existing Slack messages to update event count.") + return result - for response in messages: - try: - if response is None: + @staticmethod + def process_multiple_s3_events(slack_handler: Slack_Handler, records): + # TODO: Add documentation + for record in records: + if record.get("eventSource") != "aws:sqs": + logger.warning( + "Skipping non-SQS event", + extra={"event_source": record.get("eventSource")}, + ) continue - # Update the event count in the plan block - blocks = response["message"]["blocks"] - plan = next((block for block in blocks if block["type"] == "plan"), None) + logger.info("Processing SQS record") + result = S3_Event_Handler.process_single_s3_event(record) + results.append(result) - plan["title"] = "Processing complete!" - for i, task in enumerate(plan["tasks"]): - if i == len(plan["tasks"]) - 1: - task["status"] = "error" - else: - task["status"] = "complete" - - update_slack_message(slack_client, response, blocks) - except Exception as e: - logger.error( - "Unexpected error occurred posting Slack error status update", - extra={ - "status_code": 500, - "error_type": type(e).__name__, - "error_message": str(e), - "error": traceback.format_exc(), - "e": e, - }, - ) + counts = [ + ("created", len([result for result in results if result.event_type == "ObjectCreated"])), + ("modified", len([result for result in results if result.event_type == "ObjectModified"])), + ("deleted", len([result for result in results if result.event_type == "ObjectRemoved"])), + ] + # Generate the list only for non-zero values + message_list = [f"{count} files {action}" for action, count in counts if count > 0] + for message in message_list: + slack_handler.update_task(id=slack_handler.update_block_id, message=message) -def handle_events(event, start_time): - # Get events and update user channels - records = event.get("Records", []) + @staticmethod + def process_queue_events(slack_handler: Slack_Handler, events: list): + # TODO: Add documentation + processed_files = 0 - s3_records = [] # Track completed ingestion items + for event in events: + records = event.get("Records", []) - # Process each S3 event record in the SQS batch - for sqs_index, sqs_record in enumerate(records): - try: - if sqs_record.get("eventSource") != "aws:sqs": - event_time = sqs_record.get("attributes", {}).get("SentTimestamp", "Unknown") - logger.info("Event found", extra={"Event Trigger Time": event_time}) - logger.warning( - "Skipping non-SQS event", - extra={ - "event_source": sqs_record.get("eventSource"), - "record_index": sqs_index + 1, - }, - ) + if not records: + logger.warning("No records in event") continue - body = json.loads(sqs_record.get("body", "{}")) - s3_records += body.get("Records", []) + logger.info(f"Processing {len(records)} record(s)") + slack_handler.update_task( + id=slack_handler.fetching_block_id, message=f"Found {len(records)} records", replace=True + ) - except (json.JSONDecodeError, KeyError) as e: - logger.error(f"Failed to parse SQS body: {str(e)}") - continue + S3_Event_Handler.process_multiple_s3_events(slack_handler, records) + processed_files += 1 - # Check if the events are valid, and start syncing if so - # Don't stop if not, let the lambda handle it. - job_id = "" - created = [] - deleted = [] - process_error = None + slack_handler.complete_plan() + logger.info(f"Completed {len(processed_files)} file(s)") - un_processed, process_key, bucket_name, is_new = get_unprocessed_files(s3_records) + @staticmethod + def close_sqs_events(events): + logger.info(f"Closing {len(events)} sqs events") + for event in events: + try: + sqs.delete_message(QueueUrl=SQS_URL, ReceiptHandle=event["ReceiptHandle"]) + logger.info("Successfully deleted sqs message from queue") + except Exception as e: + logger.error("Failed to delete sqs message from queue", extra={"Exception": e}) - slack_client, slack_messages = initialise_slack_messages(len(s3_records), is_new) + @staticmethod + def search_sqs_for_events(): + response = sqs.receive_message(QueueUrl=SQS_URL, MaxNumberOfMessages=10, WaitTimeSeconds=2) - if not s3_records: - logger.info("No valid S3 records to process", extra={"s3_records": len(records)}) - else: + messages = response.get("Messages", []) + if not messages: + logger.warning("No messages found") + return [] - logger.info("Processing S3 records", extra={"record_count": len(s3_records)}) - success, job_id, created, deleted, process_error = process_s3_records(s3_records) + logger.info(f"Found {len(messages)} SQS messages") + return messages - if not success: - msg = "Could not start sync process" - logger.error( - msg, - extra={ - "job_id": job_id, - }, - ) - else: - # Update file messages in Slack (N removed, N added, etc) - update_slack_files( - slack_client=slack_client, created_files=created, deleted_files=deleted, messages=slack_messages - ) - # Check length of session, even if we haven't started syncing - total_duration = time.time() - start_time +def search_and_process_sqs_events(event): + # TODO: Add documentation + # Check if there are waiting SQS events. + # While SQS keep appearing, keep looking - limit to 20 iterations. + events = [event] + loop_count = 20 - # Make sure all tasks are marked as complete in the Slack Plan - if not un_processed: - update_slack_complete(slack_client=slack_client, messages=slack_messages, feedback=None) + slack_handler = Slack_Handler() + slack_handler.initialise_slack_messages() - set_unprocessed_files(s3_records=s3_records, unprocessed_files=un_processed, key=process_key, bucket=bucket_name) + for i in range(loop_count): + # If there are no events, stop + if not events: + break - logger.info( - "Knowledge base sync process completed", - extra={ - "status_code": 200, - "job_id": job_id, - "trigger_files": created + deleted, - "total_duration_ms": round(total_duration * 1000, 2), - "knowledge_base_id": KNOWLEDGEBASE_ID, - "next_steps": "Monitor Bedrock console for ingestion job completion status", - }, - ) + # Delete sqs events that we have polled + # The initial event will cancel with the success of the lambda + if i > 0: + S3_Event_Handler.close_sqs_events(events) + + S3_Event_Handler.process_queue_events(slack_handler, events) - # Still handle conflict error - but don't stop tagging, etc - if process_error: - raise process_error + # Search for any events in the sqs queue + events = S3_Event_Handler.search_sqs_for_events() - return created, deleted + # TODO: Close slack message + slack_handler.complete_plan() @logger.inject_lambda_context(log_event=True, clear_state=True) @@ -721,11 +477,10 @@ def handler(event, context): Main Lambda handler for a queue-service (S3-triggered) knowledge base synchronization """ start_time = time.time() - logger.info("log_event", extra=event) # DELETE ME + logger.info("log_event", extra=event) - # Early validation of required configuration if not KNOWLEDGEBASE_ID or not DATA_SOURCE_ID: - logger.error( + logger.exception( "Missing required environment variables", extra={ "status_code": 500, @@ -743,23 +498,17 @@ def handler(event, context): }, ) - slack_client: WebClient = None - slack_messages = [] try: - created, deleted = handle_events(event, start_time) + search_and_process_sqs_events(event) + total_duration = time.time() - start_time + logger.info("Completed search and processing of sqs events", extra={"process_time": total_duration}) return { "statusCode": 200, - "body": (f"Successfully triggered ingestion job for {len(created) + len(deleted)} trigger file(s)",), + "body": ("Successfully polled and processed sqs events"), } - - except ClientError as e: - # Handle AWS service errors - return handle_client_error(e, start_time, slack_client, slack_messages) - except Exception as e: # Handle unexpected errors - update_slack_error(slack_client=slack_client, messages=slack_messages) logger.error( "Unexpected error occurred", extra={ @@ -768,7 +517,6 @@ def handler(event, context): "error_message": str(e), "duration_ms": round((time.time() - start_time) * 1000, 2), "error": traceback.format_exc(), - "e": e, }, ) return {"statusCode": 500, "body": f"Unexpected error: {str(e)}"} From fe0eb8509b123fa9810903228651848f224e5573 Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Mon, 9 Mar 2026 14:48:24 +0000 Subject: [PATCH 45/84] fix: Poll SQS on first message --- .../syncKnowledgeBaseFunction/app/handler.py | 51 ++- .../tests/test_app.py | 343 ++++++++++++------ 2 files changed, 268 insertions(+), 126 deletions(-) diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index c28d73e23..6dfa6333b 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -6,6 +6,7 @@ has access to the latest documentation for answering user queries. """ +import json import time import traceback import uuid @@ -182,7 +183,7 @@ def initialise_slack_messages(self): id=self.update_block_id, title="Processing File Changes", details=[], - output=["Initialising"], + outputs=["Initialising"], status="in-progress", ), ], @@ -296,6 +297,7 @@ def is_supported_file_type(file_key): @staticmethod def validate_s3_event(bucket_name, object_key): + logger.info(f"validate_s3_event {bucket_name}, {object_key}") if not bucket_name or not object_key: logger.warning( "Skipping invalid S3 record", @@ -346,7 +348,7 @@ def process_single_s3_event(record) -> S3_Event_result: response = bedrock_agent.start_ingestion_job( knowledgeBaseId=KNOWLEDGEBASE_ID, dataSourceId=DATA_SOURCE_ID, - description=f"Sync: {bucket_name}/{object_key}/{event_name}.{uuid.uuid4().hex}", + description=f"Sync: {bucket_name}", ) job_id = response["ingestionJob"]["ingestionJobId"] @@ -371,9 +373,10 @@ def process_single_s3_event(record) -> S3_Event_result: return result @staticmethod - def process_multiple_s3_events(slack_handler: Slack_Handler, records): + def process_multiple_sqs_events(slack_handler: Slack_Handler, sqs_records): # TODO: Add documentation - for record in records: + results = [] + for record in sqs_records: if record.get("eventSource") != "aws:sqs": logger.warning( "Skipping non-SQS event", @@ -381,9 +384,16 @@ def process_multiple_s3_events(slack_handler: Slack_Handler, records): ) continue - logger.info("Processing SQS record") - result = S3_Event_Handler.process_single_s3_event(record) - results.append(result) + body = json.loads(record.get("body", {})) + for s3_record in body.get("Records", []): + result = S3_Event_Handler.process_single_s3_event(s3_record) + results.append(result) + + return results + + @staticmethod + def process_multiple_s3_events(slack_handler: Slack_Handler, results): + logger.info("Processing SQS record") counts = [ ("created", len([result for result in results if result.event_type == "ObjectCreated"])), @@ -397,27 +407,27 @@ def process_multiple_s3_events(slack_handler: Slack_Handler, records): slack_handler.update_task(id=slack_handler.update_block_id, message=message) @staticmethod - def process_queue_events(slack_handler: Slack_Handler, events: list): + def process_batched_queue_events(slack_handler: Slack_Handler, events: list): # TODO: Add documentation processed_files = 0 for event in events: - records = event.get("Records", []) + s3_records = event.get("Records", []) - if not records: + if not s3_records: logger.warning("No records in event") continue - logger.info(f"Processing {len(records)} record(s)") + logger.info(f"Processing {len(s3_records)} record(s)") slack_handler.update_task( - id=slack_handler.fetching_block_id, message=f"Found {len(records)} records", replace=True + id=slack_handler.fetching_block_id, message=f"Found {len(s3_records)} records", replace=True ) - S3_Event_Handler.process_multiple_s3_events(slack_handler, records) + _ = S3_Event_Handler.process_multiple_sqs_events(slack_handler, s3_records) processed_files += 1 slack_handler.complete_plan() - logger.info(f"Completed {len(processed_files)} file(s)") + logger.info(f"Completed {processed_files} file(s)") @staticmethod def close_sqs_events(events): @@ -433,13 +443,20 @@ def close_sqs_events(events): def search_sqs_for_events(): response = sqs.receive_message(QueueUrl=SQS_URL, MaxNumberOfMessages=10, WaitTimeSeconds=2) + events = [] messages = response.get("Messages", []) if not messages: logger.warning("No messages found") - return [] + return events + + for message in messages: + body = message.get("Body", {}) + message_events = json.loads(body) + if message_events: + events.append(message_events) logger.info(f"Found {len(messages)} SQS messages") - return messages + return events def search_and_process_sqs_events(event): @@ -462,7 +479,7 @@ def search_and_process_sqs_events(event): if i > 0: S3_Event_Handler.close_sqs_events(events) - S3_Event_Handler.process_queue_events(slack_handler, events) + S3_Event_Handler.process_batched_queue_events(slack_handler, events) # Search for any events in the sqs queue events = S3_Event_Handler.search_sqs_for_events() diff --git a/packages/syncKnowledgeBaseFunction/tests/test_app.py b/packages/syncKnowledgeBaseFunction/tests/test_app.py index e55d7733b..543784107 100644 --- a/packages/syncKnowledgeBaseFunction/tests/test_app.py +++ b/packages/syncKnowledgeBaseFunction/tests/test_app.py @@ -1,4 +1,5 @@ import json +import uuid import pytest import os import sys @@ -11,7 +12,12 @@ @pytest.fixture def mock_env(): """Mock environment variables""" - env_vars = {"KNOWLEDGEBASE_ID": "test-kb-id", "DATA_SOURCE_ID": "test-ds-id", "AWS_REGION": "eu-west-2"} + env_vars = { + "KNOWLEDGEBASE_ID": "test-kb-id", + "DATA_SOURCE_ID": "test-ds-id", + "AWS_REGION": "eu-west-2", + "SQS_URL": "example", + } with patch.dict(os.environ, env_vars): yield env_vars @@ -46,7 +52,7 @@ def mock_get_bot_token(): @pytest.fixture -def s3_event(): +def receive_s3_event(): """Mock S3 event""" return { "Records": [ @@ -72,7 +78,7 @@ def s3_event(): @pytest.fixture -def multiple_s3_event(): +def receive_multiple_s3_event(): """Mock S3 event with multiple records""" return { "Records": [ @@ -105,6 +111,25 @@ def multiple_s3_event(): } +@pytest.fixture +def fetch_sqs_event(receive_s3_event): + """Mock incoming SQS event structure as expected by the new logic""" + return {"Messages": [{"MessageId": str(uuid.uuid4()), "Body": json.dumps(receive_s3_event)}]} + + +@pytest.fixture +def fetch_multiple_sqs_event(receive_multiple_s3_event): + """Mock incoming SQS event structure as expected by the new logic""" + return { + "Messages": [ + { + "MessageId": str(uuid.uuid4()), + "Body": json.dumps(receive_multiple_s3_event), + } + ] + } + + @pytest.fixture def slack_message_event(): return { @@ -168,11 +193,11 @@ def slack_message_event(): } -@patch("app.handler.initialise_slack_messages") +@patch("app.handler.Slack_Handler.initialise_slack_messages") @patch("boto3.client") @patch("time.time") def test_handler_success( - mock_time, mock_boto_client, mock_initialise_slack_messages, mock_env, lambda_context, s3_event + mock_time, mock_boto_client, mock_initialise_slack_messages, mock_env, lambda_context, receive_s3_event ): """Test successful handler execution""" mock_time.side_effect = [1000, 1001, 1002, 1003] @@ -184,20 +209,20 @@ def test_handler_success( from app.handler import handler - result = handler(s3_event, lambda_context) + result = handler(receive_s3_event, lambda_context) assert result["statusCode"] == 200 - assert "Successfully triggered ingestion job for 1 trigger file(s)" in result["body"] + assert "Successfully polled and processed sqs events" in result["body"] mock_boto_client.assert_any_call("bedrock-agent") - mock_boto_client.assert_any_call("s3") + mock_boto_client.assert_any_call("sqs") mock_bedrock.start_ingestion_job.assert_called_once_with( knowledgeBaseId="test-kb-id", dataSourceId="test-ds-id", - description="Auto-sync:\nFiles added/updated (1)", + description="Sync: test-bucket", ) -@patch("app.handler.initialise_slack_messages") +@patch("app.handler.Slack_Handler.initialise_slack_messages") @patch("boto3.client") @patch("time.time") def test_handler_multiple_files( @@ -207,7 +232,7 @@ def test_handler_multiple_files( mock_env, mock_get_bot_token, lambda_context, - multiple_s3_event, + receive_multiple_s3_event, ): """Test handler with multiple S3 records""" mock_time.side_effect = [1000, 1001, 1002, 1003, 1004, 1005] @@ -222,45 +247,183 @@ def test_handler_multiple_files( del sys.modules["app.handler"] from app.handler import handler - result = handler(multiple_s3_event, lambda_context) + result = handler(receive_multiple_s3_event, lambda_context) assert result["statusCode"] == 200 - assert "Successfully triggered ingestion job for 2 trigger file(s)" in result["body"] - assert mock_bedrock.start_ingestion_job.call_count == 1 + assert "Successfully polled and processed sqs events" in result["body"] + assert mock_bedrock.start_ingestion_job.call_count == 2 + + +@patch("boto3.client") +@patch("time.time") +def test_handler_fetch_files( + mock_time, + mock_boto_client, + mock_env, + mock_get_bot_token, + lambda_context, + receive_multiple_s3_event, + fetch_sqs_event, +): + """Test handler with multiple S3 records""" + mock_time.side_effect = [1000, 1001, 1002, 1003, 1004, 1005] + + mock_bedrock = MagicMock() + mock_sqs = MagicMock() + + mock_bedrock.start_ingestion_job.return_value = { + "ingestionJob": {"ingestionJobId": "job-123", "status": "STARTING"} + } + mock_sqs.receive_message.side_effect = [fetch_sqs_event, {}] + + def boto_client_router(service_name, **kwargs): + if service_name == "bedrock-agent": + return mock_bedrock + elif service_name == "sqs": + return mock_sqs + return MagicMock() + + mock_boto_client.side_effect = boto_client_router + + # Force reload the module to catch the new patches + if "app.handler" in sys.modules: + del sys.modules["app.handler"] + import app.handler + + with patch.object(app.handler.Slack_Handler, "initialise_slack_messages", return_value=(DEFAULT, [])): + result = app.handler.handler(receive_multiple_s3_event, lambda_context) + + assert result["statusCode"] == 200 + assert "Successfully polled and processed sqs events" in result["body"] + assert mock_bedrock.start_ingestion_job.call_count == 3 # Initial 2 + 1 + + +@patch("boto3.client") +@patch("time.time") +def test_handler_fetch_multiple_files( + mock_time, + mock_boto_client, + mock_env, + mock_get_bot_token, + lambda_context, + receive_multiple_s3_event, + fetch_multiple_sqs_event, +): + """Test handler with multiple S3 records""" + mock_time.side_effect = [1000, 1001, 1002, 1003, 1004, 1005] + + mock_bedrock = MagicMock() + mock_sqs = MagicMock() + + mock_bedrock.start_ingestion_job.return_value = { + "ingestionJob": {"ingestionJobId": "job-123", "status": "STARTING"} + } + mock_sqs.receive_message.side_effect = [fetch_multiple_sqs_event, {}] + + def boto_client_router(service_name, **kwargs): + if service_name == "bedrock-agent": + return mock_bedrock + elif service_name == "sqs": + return mock_sqs + return MagicMock() + + mock_boto_client.side_effect = boto_client_router + + # Force reload the module to catch the new patches + if "app.handler" in sys.modules: + del sys.modules["app.handler"] + import app.handler + + with patch.object(app.handler.Slack_Handler, "initialise_slack_messages", return_value=(DEFAULT, [])): + result = app.handler.handler(receive_multiple_s3_event, lambda_context) + + assert result["statusCode"] == 200 + assert "Successfully polled and processed sqs events" in result["body"] + assert mock_bedrock.start_ingestion_job.call_count == 4 # Initial 2 + 2 + + +@patch("boto3.client") +@patch("time.time") +def test_handler_fetch_multiple_files_handle_infinity( + mock_time, + mock_boto_client, + mock_env, + mock_get_bot_token, + lambda_context, + receive_multiple_s3_event, + fetch_sqs_event, +): + """Test handler with multiple S3 records""" + mock_time.side_effect = [1000, 1001, 1002, 1003, 1004, 1005] + + mock_bedrock = MagicMock() + mock_sqs = MagicMock() + + mock_bedrock.start_ingestion_job.return_value = { + "ingestionJob": {"ingestionJobId": "job-123", "status": "STARTING"} + } + mock_sqs.receive_message.return_value = fetch_sqs_event + + def boto_client_router(service_name, **kwargs): + if service_name == "bedrock-agent": + return mock_bedrock + elif service_name == "sqs": + return mock_sqs + return MagicMock() + + mock_boto_client.side_effect = boto_client_router + + # Force reload the module to catch the new patches + if "app.handler" in sys.modules: + del sys.modules["app.handler"] + import app.handler + + with patch.object(app.handler.Slack_Handler, "initialise_slack_messages", return_value=(DEFAULT, [])): + result = app.handler.handler(receive_multiple_s3_event, lambda_context) + + assert result["statusCode"] == 200 + assert "Successfully polled and processed sqs events" in result["body"] + assert mock_bedrock.start_ingestion_job.call_count == 21 # Once for original message + max (20) -@patch("app.handler.initialise_slack_messages") @patch("boto3.client") @patch("time.time") def test_handler_conflict_exception( - mock_time, mock_boto_client, mock_initialise_slack_messages, mock_env, lambda_context, s3_event + mock_time, + mock_boto_client, + mock_env, + lambda_context, + receive_s3_event, + mock_get_bot_token, ): """Test handler with ConflictException (job already running)""" mock_time.side_effect = [1000, 1001, 1002, 1003] + error = ClientError( error_response={"Error": {"Code": "ConflictException", "Message": "Job already running"}}, operation_name="StartIngestionJob", ) mock_bedrock = mock_boto_client.return_value mock_bedrock.start_ingestion_job.side_effect = error - mock_initialise_slack_messages.return_value = (DEFAULT, []) if "app.handler" in sys.modules: del sys.modules["app.handler"] - from app.handler import handler + import app.handler - result = handler(s3_event, lambda_context) + with patch.object(app.handler.Slack_Handler, "initialise_slack_messages", return_value=(DEFAULT, [])), patch.object( + app.handler.S3_Event_Handler, "handle_client_error" + ) as mock_handle_client_error: - assert result["statusCode"] == 409 - assert "Files uploaded successfully - processing by existing ingestion job" in result["body"] + result = app.handler.handler(receive_s3_event, lambda_context) + + assert result["statusCode"] == 200 + assert "Successfully polled and processed sqs events" in result["body"] + assert mock_handle_client_error.call_count == 1 -@patch("app.handler.initialise_slack_messages") @patch("boto3.client") @patch("time.time") -def test_handler_aws_error( - mock_time, mock_boto_client, mock_initialise_slack_messages, mock_env, lambda_context, s3_event -): +def test_handler_aws_error(mock_time, mock_boto_client, mock_env, lambda_context, receive_s3_event): """Test handler with other AWS error""" mock_time.side_effect = [1000, 1001, 1002, 1003] error = ClientError( @@ -269,53 +432,58 @@ def test_handler_aws_error( ) mock_bedrock = mock_boto_client.return_value mock_bedrock.start_ingestion_job.side_effect = error - mock_initialise_slack_messages.return_value = (DEFAULT, []) if "app.handler" in sys.modules: del sys.modules["app.handler"] - from app.handler import handler + import app.handler - result = handler(s3_event, lambda_context) + with patch.object(app.handler.Slack_Handler, "initialise_slack_messages", return_value=(DEFAULT, [])), patch.object( + app.handler.S3_Event_Handler, "handle_client_error" + ) as mock_handle_client_error: - assert result["statusCode"] == 500 - assert "AWS error: AccessDenied - Access denied" in result["body"] + result = app.handler.handler(receive_s3_event, lambda_context) + + assert result["statusCode"] == 200 + assert "Successfully polled and processed sqs events" in result["body"] + assert mock_handle_client_error.call_count == 1 -@patch("app.handler.initialise_slack_messages") @patch("boto3.client") @patch("time.time") -def test_handler_unexpected_error( - mock_time, mock_boto_client, mock_initialise_slack_messages, mock_env, lambda_context, s3_event -): +def test_handler_unexpected_error(mock_time, mock_boto_client, mock_env, lambda_context, receive_s3_event): """Test handler with unexpected error""" mock_time.side_effect = [1000, 1001, 1002, 1003] mock_bedrock = mock_boto_client.return_value mock_bedrock.start_ingestion_job.side_effect = Exception("Unexpected error") - mock_initialise_slack_messages.return_value = (DEFAULT, []) if "app.handler" in sys.modules: del sys.modules["app.handler"] - from app.handler import handler + import app.handler - result = handler(s3_event, lambda_context) + with patch.object(app.handler.Slack_Handler, "initialise_slack_messages", return_value=(DEFAULT, [])), patch.object( + app.handler.S3_Event_Handler, "handle_client_error" + ) as mock_handle_client_error: - assert result["statusCode"] == 500 - assert "Unexpected error: Unexpected error" in result["body"] + result = app.handler.handler(receive_s3_event, lambda_context) + + assert result["statusCode"] == 200 + assert "Successfully polled and processed sqs events" in result["body"] + assert mock_handle_client_error.call_count == 1 @patch("app.handler.KNOWLEDGEBASE_ID", "") @patch("app.handler.DATA_SOURCE_ID", "") -def test_handler_missing_env_vars(lambda_context, s3_event): +def test_handler_missing_env_vars(lambda_context, receive_s3_event): """Test handler with missing environment variables""" from app.handler import handler - result = handler(s3_event, lambda_context) + result = handler(receive_s3_event, lambda_context) assert result["statusCode"] == 500 assert "Configuration error" in result["body"] -@patch("app.handler.initialise_slack_messages") +@patch("app.handler.Slack_Handler.initialise_slack_messages") @patch("boto3.client") def test_handler_invalid_s3_record(mock_boto_client, mock_initialise_slack_messages, mock_env, lambda_context): """Test handler with invalid S3 record""" @@ -338,10 +506,10 @@ def test_handler_invalid_s3_record(mock_boto_client, mock_initialise_slack_messa result = handler(invalid_event, lambda_context) assert result["statusCode"] == 200 - assert "Successfully triggered ingestion job for 0 trigger file(s)" in result["body"] + assert "Successfully polled and processed sqs events" in result["body"] -@patch("app.handler.initialise_slack_messages") +@patch("app.handler.Slack_Handler.initialise_slack_messages") @patch("boto3.client") def test_handler_non_s3_event(mock_boto_client, mock_initialise_slack_messages, mock_env, lambda_context): """Test handler with non-S3 event""" @@ -360,10 +528,10 @@ def test_handler_non_s3_event(mock_boto_client, mock_initialise_slack_messages, result = handler(non_s3_event, lambda_context) assert result["statusCode"] == 200 - assert "Successfully triggered ingestion job for 0 trigger file(s)" in result["body"] + assert "Successfully polled and processed sqs events" in result["body"] -@patch("app.handler.initialise_slack_messages") +@patch("app.handler.Slack_Handler.initialise_slack_messages") @patch("boto3.client") def test_handler_empty_records(mock_boto_client, mock_initialise_slack_messages, mock_env, lambda_context): """Test handler with empty records""" @@ -375,9 +543,11 @@ def test_handler_empty_records(mock_boto_client, mock_initialise_slack_messages, result = handler(empty_event, lambda_context) assert result["statusCode"] == 200 - assert "Successfully triggered ingestion job for 0 trigger file(s)" in result["body"] + assert "Successfully polled and processed sqs events" in result["body"] +@patch("app.handler.Slack_Handler.initialise_slack_messages") +@patch("boto3.client") @pytest.mark.parametrize( "filename,expected", [ @@ -401,14 +571,14 @@ def test_handler_empty_records(mock_boto_client, mock_initialise_slack_messages, ("no_extension", False), ], ) -def test_is_supported_file_type(filename, expected): +def test_is_supported_file_type(mock_boto_client, mock_initialise_slack_messages, filename, expected): """Test file type allowlist validation""" - from app.handler import is_supported_file_type + from app.handler import S3_Event_Handler - assert is_supported_file_type(filename) is expected + assert S3_Event_Handler.is_supported_file_type(filename) is expected -@patch("app.handler.initialise_slack_messages") +@patch("app.handler.Slack_Handler.initialise_slack_messages") @patch("boto3.client") def test_handler_unsupported_file_type(mock_boto_client, mock_initialise_slack_messages, mock_env, lambda_context): """Test handler skips unsupported file types""" @@ -431,55 +601,10 @@ def test_handler_unsupported_file_type(mock_boto_client, mock_initialise_slack_m result = handler(unsupported_event, lambda_context) assert result["statusCode"] == 200 - assert "Successfully triggered ingestion job for 0 trigger file(s)" in result["body"] - - -@patch("app.handler.initialise_slack_messages") -@patch("boto3.client") -@patch("time.time") -def test_handler_unknown_event_type( - mock_time, mock_boto_client, mock_initialise_slack_messages, mock_env, lambda_context -): - """Test handler with unknown S3 event type""" - mock_time.side_effect = [1000, 1001, 1002, 1003] - mock_bedrock = mock_boto_client.return_value - mock_bedrock.start_ingestion_job.return_value = { - "ingestionJob": {"ingestionJobId": "job-123", "status": "STARTING"} - } - mock_initialise_slack_messages.return_value = (DEFAULT, []) - - unknown_event = { - "Records": [ - { - "eventSource": "aws:sqs", - "body": json.dumps( - { - "Records": [ - { - "eventSource": "aws:s3", - "eventName": "ObjectRestore:Completed", - "s3": { - "bucket": {"name": "test-bucket"}, - "object": {"key": "test-file.pdf", "size": 1024}, - }, - } - ] - } - ), - } - ] - } - - from app.handler import handler - - result = handler(unknown_event, lambda_context) - - assert result["statusCode"] == 200 - assert "Successfully triggered ingestion job for 0 trigger file(s)" in result["body"] - mock_bedrock.start_ingestion_job.assert_not_called() + assert "Successfully polled and processed sqs events" in result["body"] -@patch("app.handler.initialise_slack_messages") +@patch("app.handler.Slack_Handler.initialise_slack_messages") @patch("boto3.client") @patch("slack_sdk.WebClient") @patch("time.time") @@ -490,7 +615,7 @@ def test_slack_handler_success( mock_initialise_slack_messages, mock_env, lambda_context, - s3_event, + receive_s3_event, slack_message_event, ): """Test successful handler execution""" @@ -511,14 +636,14 @@ def test_slack_handler_success( del sys.modules["app.handler"] from app.handler import handler - result = handler(s3_event, lambda_context) + result = handler(receive_s3_event, lambda_context) assert result["statusCode"] == 200 - assert "Successfully triggered ingestion job for 1 trigger file(s)" in result["body"] + assert "Successfully polled and processed sqs events" in result["body"] mock_instance.chat_update.call_count = 2 -@patch("app.handler.initialise_slack_messages") +@patch("app.handler.Slack_Handler.initialise_slack_messages") @patch("boto3.client") @patch("slack_sdk.WebClient") @patch("time.time") @@ -529,7 +654,7 @@ def test_slack_handler_success_multiple( mock_initialise_slack_messages, mock_env, lambda_context, - s3_event, + receive_s3_event, slack_message_event, ): """ @@ -556,14 +681,14 @@ def test_slack_handler_success_multiple( del sys.modules["app.handler"] from app.handler import handler - result = handler(s3_event, lambda_context) + result = handler(receive_s3_event, lambda_context) assert result["statusCode"] == 200 - assert "Successfully triggered ingestion job for 1 trigger file(s)" in result["body"] + assert "Successfully polled and processed sqs events" in result["body"] mock_instance.chat_update.call_count = 2 -@patch("app.handler.initialise_slack_messages") +@patch("app.handler.Slack_Handler.initialise_slack_messages") @patch("boto3.client") @patch("slack_sdk.WebClient") @patch("time.time") @@ -574,7 +699,7 @@ def test_slack_handler_client_failure( mock_initialise_slack_messages, mock_env, lambda_context, - s3_event, + receive_s3_event, slack_message_event, ): """ @@ -601,8 +726,8 @@ def test_slack_handler_client_failure( del sys.modules["app.handler"] from app.handler import handler - result = handler(s3_event, lambda_context) + result = handler(receive_s3_event, lambda_context) assert result["statusCode"] == 200 - assert "Successfully triggered ingestion job for 1 trigger file(s)" in result["body"] + assert "Successfully polled and processed sqs events" in result["body"] mock_instance.chat_update.call_count = 2 From 96187fd22cfc5b7c64dc66df62245f20ea80f440 Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Mon, 9 Mar 2026 15:27:06 +0000 Subject: [PATCH 46/84] fix: Poll SQS on first message --- packages/cdk/resources/Functions.ts | 2 +- .../syncKnowledgeBaseFunction/app/handler.py | 60 +++++++++---------- .../tests/test_app.py | 48 +++++++-------- 3 files changed, 54 insertions(+), 56 deletions(-) diff --git a/packages/cdk/resources/Functions.ts b/packages/cdk/resources/Functions.ts index e792d0927..69e98f07b 100644 --- a/packages/cdk/resources/Functions.ts +++ b/packages/cdk/resources/Functions.ts @@ -130,7 +130,7 @@ export class Functions extends Construct { "KNOWLEDGEBASE_ID": props.knowledgeBaseId, "SLACK_BOT_TOKEN_PARAMETER": props.slackBotTokenParameter.parameterName, "SLACK_BOT_ACTIVE_ON_PRS": "true", - "AWS_ACCOUNT_ID": props.account + "DATA_SOURCE_ID": props.dataSourceId }, additionalPolicies: [props.syncKnowledgeBaseManagedPolicy] }) diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index 6dfa6333b..d8287a4f7 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -28,7 +28,7 @@ sqs = boto3.client("sqs") -class S3_Event_result: +class S3EventResult: file_name: str event_type: str processing: bool @@ -39,7 +39,7 @@ def __init__(self, file_name, event_type, processing): self.processing = processing -class Slack_Handler: +class SlackHandler: def __init__(self): self.fetching_block_id: str = uuid.uuid4().hex @@ -49,7 +49,7 @@ def __init__(self): self.default_slack_message: str = "Updating Source Files" def post_message(self, channel_id: str, blocks: list, text_fallback: str): - # TODO: Header + """Send a new message to Slack""" try: return self.slack_client.chat_postMessage(channel=channel_id, text=text_fallback, blocks=blocks) except SlackApiError as e: @@ -60,7 +60,7 @@ def post_message(self, channel_id: str, blocks: list, text_fallback: str): return None def update_message(self, channel_id: str, ts: str, blocks: list): - # TODO: Header + """Update an existing Slack Message""" try: return self.slack_client.chat_update( channel=channel_id, ts=ts, blocks=blocks, text=self.default_slack_message @@ -77,7 +77,7 @@ def create_task( outputs=None, status: Literal["in_progress", "complete"] = "in_progress", ): - # TODO: Header + """Create a new Slack Block Task for a Plan block""" task = { "task_id": id, "title": title, @@ -156,7 +156,6 @@ def initialise_slack_messages(self): """ Create a new slack message to inform user of SQS event process progress """ - default_response = (None, []) try: # Build blocks for Slack message blocks = [ @@ -212,7 +211,7 @@ def initialise_slack_messages(self): if not target_channels: logger.warning("SKIPPING - Bot is not in any channels. No messages sent.") - return default_response + return # Broadcast Loop logger.info(f"Broadcasting to {len(target_channels)} channels...") @@ -241,10 +240,9 @@ def initialise_slack_messages(self): except Exception as e: logger.error(f"Failed to initialise slack messages: {str(e)}") - return default_response def complete_plan(self): - # TODO: Header + """Finish Slack Plan message block""" for slack_message in self.messages: try: channel_id = slack_message["channel"] @@ -275,7 +273,7 @@ def complete_plan(self): ) -class S3_Event_Handler: +class S3EventHandler: @staticmethod def handle_client_error(e): error_code = e.response.get("Error", {}).get("Code", "Unknown") @@ -308,7 +306,7 @@ def validate_s3_event(bucket_name, object_key): ) return False - if not S3_Event_Handler.is_supported_file_type(object_key): + if not S3EventHandler.is_supported_file_type(object_key): logger.info( "Skipping unsupported file type", extra={"file_key": object_key, "supported_types": list(SUPPORTED_FILE_TYPES)}, @@ -317,17 +315,17 @@ def validate_s3_event(bucket_name, object_key): return True @staticmethod - def process_single_s3_event(record) -> S3_Event_result: - # TODO: Add documentation + def process_single_s3_event(record) -> S3EventResult: + """Process single S3 event from SQS""" s3_info = record.get("s3", {}) bucket_name = s3_info.get("bucket", {}).get("name") object_key = s3_info.get("object", {}).get("key") event_name = record.get("eventName", "Unknown") - result = S3_Event_result(file_name=object_key, event_type=event_name, processing=False) + result = S3EventResult(file_name=object_key, event_type=event_name, processing=False) # Skip invalid records - if not S3_Event_Handler.validate_s3_event(bucket_name, object_key): + if not S3EventHandler.validate_s3_event(bucket_name, object_key): return result # Extract additional event metadata for logging @@ -365,7 +363,7 @@ def process_single_s3_event(record) -> S3_Event_result: ) except Exception as e: # Handle Conflict Exception, we don't want to stop - just inform user - S3_Event_Handler.handle_client_error(e) + S3EventHandler.handle_client_error(e) logger.error(f"Error starting ingestion: {str(e)}") result.processing = False @@ -373,8 +371,8 @@ def process_single_s3_event(record) -> S3_Event_result: return result @staticmethod - def process_multiple_sqs_events(slack_handler: Slack_Handler, sqs_records): - # TODO: Add documentation + def process_multiple_sqs_events(slack_handler: SlackHandler, sqs_records): + """Handle multiple individual events from SQS""" results = [] for record in sqs_records: if record.get("eventSource") != "aws:sqs": @@ -386,13 +384,13 @@ def process_multiple_sqs_events(slack_handler: Slack_Handler, sqs_records): body = json.loads(record.get("body", {})) for s3_record in body.get("Records", []): - result = S3_Event_Handler.process_single_s3_event(s3_record) + result = S3EventHandler.process_single_s3_event(s3_record) results.append(result) return results @staticmethod - def process_multiple_s3_events(slack_handler: Slack_Handler, results): + def process_multiple_s3_events(slack_handler: SlackHandler, results): logger.info("Processing SQS record") counts = [ @@ -407,8 +405,8 @@ def process_multiple_s3_events(slack_handler: Slack_Handler, results): slack_handler.update_task(id=slack_handler.update_block_id, message=message) @staticmethod - def process_batched_queue_events(slack_handler: Slack_Handler, events: list): - # TODO: Add documentation + def process_batched_queue_events(slack_handler: SlackHandler, events: list): + """Handle collection of batched queue events""" processed_files = 0 for event in events: @@ -423,7 +421,7 @@ def process_batched_queue_events(slack_handler: Slack_Handler, events: list): id=slack_handler.fetching_block_id, message=f"Found {len(s3_records)} records", replace=True ) - _ = S3_Event_Handler.process_multiple_sqs_events(slack_handler, s3_records) + _ = S3EventHandler.process_multiple_sqs_events(slack_handler, s3_records) processed_files += 1 slack_handler.complete_plan() @@ -460,13 +458,14 @@ def search_sqs_for_events(): def search_and_process_sqs_events(event): - # TODO: Add documentation - # Check if there are waiting SQS events. - # While SQS keep appearing, keep looking - limit to 20 iterations. + """ + Check if there are waiting SQS events. + While SQS keep appearing, keep looking - limit to 20 iterations. + """ events = [event] loop_count = 20 - slack_handler = Slack_Handler() + slack_handler = SlackHandler() slack_handler.initialise_slack_messages() for i in range(loop_count): @@ -477,14 +476,13 @@ def search_and_process_sqs_events(event): # Delete sqs events that we have polled # The initial event will cancel with the success of the lambda if i > 0: - S3_Event_Handler.close_sqs_events(events) + S3EventHandler.close_sqs_events(events) - S3_Event_Handler.process_batched_queue_events(slack_handler, events) + S3EventHandler.process_batched_queue_events(slack_handler, events) # Search for any events in the sqs queue - events = S3_Event_Handler.search_sqs_for_events() + events = S3EventHandler.search_sqs_for_events() - # TODO: Close slack message slack_handler.complete_plan() diff --git a/packages/syncKnowledgeBaseFunction/tests/test_app.py b/packages/syncKnowledgeBaseFunction/tests/test_app.py index 543784107..3dae2e6de 100644 --- a/packages/syncKnowledgeBaseFunction/tests/test_app.py +++ b/packages/syncKnowledgeBaseFunction/tests/test_app.py @@ -193,7 +193,7 @@ def slack_message_event(): } -@patch("app.handler.Slack_Handler.initialise_slack_messages") +@patch("app.handler.SlackHandler.initialise_slack_messages") @patch("boto3.client") @patch("time.time") def test_handler_success( @@ -222,7 +222,7 @@ def test_handler_success( ) -@patch("app.handler.Slack_Handler.initialise_slack_messages") +@patch("app.handler.SlackHandler.initialise_slack_messages") @patch("boto3.client") @patch("time.time") def test_handler_multiple_files( @@ -290,7 +290,7 @@ def boto_client_router(service_name, **kwargs): del sys.modules["app.handler"] import app.handler - with patch.object(app.handler.Slack_Handler, "initialise_slack_messages", return_value=(DEFAULT, [])): + with patch.object(app.handler.SlackHandler, "initialise_slack_messages", return_value=(DEFAULT, [])): result = app.handler.handler(receive_multiple_s3_event, lambda_context) assert result["statusCode"] == 200 @@ -334,7 +334,7 @@ def boto_client_router(service_name, **kwargs): del sys.modules["app.handler"] import app.handler - with patch.object(app.handler.Slack_Handler, "initialise_slack_messages", return_value=(DEFAULT, [])): + with patch.object(app.handler.SlackHandler, "initialise_slack_messages", return_value=(DEFAULT, [])): result = app.handler.handler(receive_multiple_s3_event, lambda_context) assert result["statusCode"] == 200 @@ -378,7 +378,7 @@ def boto_client_router(service_name, **kwargs): del sys.modules["app.handler"] import app.handler - with patch.object(app.handler.Slack_Handler, "initialise_slack_messages", return_value=(DEFAULT, [])): + with patch.object(app.handler.SlackHandler, "initialise_slack_messages", return_value=(DEFAULT, [])): result = app.handler.handler(receive_multiple_s3_event, lambda_context) assert result["statusCode"] == 200 @@ -410,8 +410,8 @@ def test_handler_conflict_exception( del sys.modules["app.handler"] import app.handler - with patch.object(app.handler.Slack_Handler, "initialise_slack_messages", return_value=(DEFAULT, [])), patch.object( - app.handler.S3_Event_Handler, "handle_client_error" + with patch.object(app.handler.SlackHandler, "initialise_slack_messages", return_value=(DEFAULT, [])), patch.object( + app.handler.S3EventHandler, "handle_client_error" ) as mock_handle_client_error: result = app.handler.handler(receive_s3_event, lambda_context) @@ -437,8 +437,8 @@ def test_handler_aws_error(mock_time, mock_boto_client, mock_env, lambda_context del sys.modules["app.handler"] import app.handler - with patch.object(app.handler.Slack_Handler, "initialise_slack_messages", return_value=(DEFAULT, [])), patch.object( - app.handler.S3_Event_Handler, "handle_client_error" + with patch.object(app.handler.SlackHandler, "initialise_slack_messages", return_value=(DEFAULT, [])), patch.object( + app.handler.S3EventHandler, "handle_client_error" ) as mock_handle_client_error: result = app.handler.handler(receive_s3_event, lambda_context) @@ -460,8 +460,8 @@ def test_handler_unexpected_error(mock_time, mock_boto_client, mock_env, lambda_ del sys.modules["app.handler"] import app.handler - with patch.object(app.handler.Slack_Handler, "initialise_slack_messages", return_value=(DEFAULT, [])), patch.object( - app.handler.S3_Event_Handler, "handle_client_error" + with patch.object(app.handler.SlackHandler, "initialise_slack_messages", return_value=(DEFAULT, [])), patch.object( + app.handler.S3EventHandler, "handle_client_error" ) as mock_handle_client_error: result = app.handler.handler(receive_s3_event, lambda_context) @@ -483,7 +483,7 @@ def test_handler_missing_env_vars(lambda_context, receive_s3_event): assert "Configuration error" in result["body"] -@patch("app.handler.Slack_Handler.initialise_slack_messages") +@patch("app.handler.SlackHandler.initialise_slack_messages") @patch("boto3.client") def test_handler_invalid_s3_record(mock_boto_client, mock_initialise_slack_messages, mock_env, lambda_context): """Test handler with invalid S3 record""" @@ -509,7 +509,7 @@ def test_handler_invalid_s3_record(mock_boto_client, mock_initialise_slack_messa assert "Successfully polled and processed sqs events" in result["body"] -@patch("app.handler.Slack_Handler.initialise_slack_messages") +@patch("app.handler.SlackHandler.initialise_slack_messages") @patch("boto3.client") def test_handler_non_s3_event(mock_boto_client, mock_initialise_slack_messages, mock_env, lambda_context): """Test handler with non-S3 event""" @@ -531,7 +531,7 @@ def test_handler_non_s3_event(mock_boto_client, mock_initialise_slack_messages, assert "Successfully polled and processed sqs events" in result["body"] -@patch("app.handler.Slack_Handler.initialise_slack_messages") +@patch("app.handler.SlackHandler.initialise_slack_messages") @patch("boto3.client") def test_handler_empty_records(mock_boto_client, mock_initialise_slack_messages, mock_env, lambda_context): """Test handler with empty records""" @@ -546,7 +546,7 @@ def test_handler_empty_records(mock_boto_client, mock_initialise_slack_messages, assert "Successfully polled and processed sqs events" in result["body"] -@patch("app.handler.Slack_Handler.initialise_slack_messages") +@patch("app.handler.SlackHandler.initialise_slack_messages") @patch("boto3.client") @pytest.mark.parametrize( "filename,expected", @@ -573,12 +573,12 @@ def test_handler_empty_records(mock_boto_client, mock_initialise_slack_messages, ) def test_is_supported_file_type(mock_boto_client, mock_initialise_slack_messages, filename, expected): """Test file type allowlist validation""" - from app.handler import S3_Event_Handler + from app.handler import S3EventHandler - assert S3_Event_Handler.is_supported_file_type(filename) is expected + assert S3EventHandler.is_supported_file_type(filename) is expected -@patch("app.handler.Slack_Handler.initialise_slack_messages") +@patch("app.handler.SlackHandler.initialise_slack_messages") @patch("boto3.client") def test_handler_unsupported_file_type(mock_boto_client, mock_initialise_slack_messages, mock_env, lambda_context): """Test handler skips unsupported file types""" @@ -604,11 +604,11 @@ def test_handler_unsupported_file_type(mock_boto_client, mock_initialise_slack_m assert "Successfully polled and processed sqs events" in result["body"] -@patch("app.handler.Slack_Handler.initialise_slack_messages") +@patch("app.handler.SlackHandler.initialise_slack_messages") @patch("boto3.client") @patch("slack_sdk.WebClient") @patch("time.time") -def test_slack_handler_success( +def test_SlackHandler_success( mock_time, mock_slack_client, mock_boto_client, @@ -643,11 +643,11 @@ def test_slack_handler_success( mock_instance.chat_update.call_count = 2 -@patch("app.handler.Slack_Handler.initialise_slack_messages") +@patch("app.handler.SlackHandler.initialise_slack_messages") @patch("boto3.client") @patch("slack_sdk.WebClient") @patch("time.time") -def test_slack_handler_success_multiple( +def test_SlackHandler_success_multiple( mock_time, mock_slack_client, mock_boto_client, @@ -688,11 +688,11 @@ def test_slack_handler_success_multiple( mock_instance.chat_update.call_count = 2 -@patch("app.handler.Slack_Handler.initialise_slack_messages") +@patch("app.handler.SlackHandler.initialise_slack_messages") @patch("boto3.client") @patch("slack_sdk.WebClient") @patch("time.time") -def test_slack_handler_client_failure( +def test_SlackHandler_client_failure( mock_time, mock_slack_client, mock_boto_client, From d7908e50f0fa69c9685d73c7c23edb323c88de0e Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Mon, 9 Mar 2026 16:12:15 +0000 Subject: [PATCH 47/84] fix: Poll SQS on first message --- packages/syncKnowledgeBaseFunction/app/handler.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index d8287a4f7..fa487c003 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -183,7 +183,7 @@ def initialise_slack_messages(self): title="Processing File Changes", details=[], outputs=["Initialising"], - status="in-progress", + status="in_progress", ), ], }, @@ -226,9 +226,11 @@ def initialise_slack_messages(self): text_fallback="*My knowledge base has been updated!*", ) - responses.append(response) - if response["ok"] is not True: + if not response or not response.get("ok"): logger.error("Error initialising Slack Message.", extra={"response": response}) + continue + + responses.append(response) except Exception as e: logger.error( f"Failed to initialise slack message for channel: {channel_id}", extra={"exception": e} From a2dd11348225ef4584781ee0f1287f8fb19d3d60 Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Tue, 10 Mar 2026 10:35:39 +0000 Subject: [PATCH 48/84] fix: Update unit tests --- packages/cdk/constructs/SimpleQueueService.ts | 2 +- .../syncKnowledgeBaseFunction/app/handler.py | 35 +-- .../tests/test_app.py | 237 +++++++++++++----- 3 files changed, 189 insertions(+), 85 deletions(-) diff --git a/packages/cdk/constructs/SimpleQueueService.ts b/packages/cdk/constructs/SimpleQueueService.ts index c38f2bc79..171c5f07c 100644 --- a/packages/cdk/constructs/SimpleQueueService.ts +++ b/packages/cdk/constructs/SimpleQueueService.ts @@ -58,7 +58,7 @@ export class SimpleQueueService extends Construct { // Add queues as event source for the notify function and sync knowledge base function const eventSource = new SqsEventSource(queue, { - maxBatchingWindow: Duration.minutes(5), + maxBatchingWindow: Duration.seconds(5), reportBatchItemFailures: true, batchSize: 100 }) diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index fa487c003..f6056b0fd 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -245,13 +245,15 @@ def initialise_slack_messages(self): def complete_plan(self): """Finish Slack Plan message block""" + logger.info("Completing Plan") for slack_message in self.messages: try: - channel_id = slack_message["channel"] - ts = slack_message["ts"] - if self.slack_client is None or slack_message is None: logger.warning("No Slack client or message, skipping complete task") + continue + + channel_id = slack_message["channel"] + ts = slack_message["ts"] # Update the event count in the plan block blocks = slack_message["message"]["blocks"] @@ -276,18 +278,6 @@ def complete_plan(self): class S3EventHandler: - @staticmethod - def handle_client_error(e): - error_code = e.response.get("Error", {}).get("Code", "Unknown") - error_message = e.response.get("Error", {}).get("Message", str(e)) - - # ConflictException is expected when ingestion job already running - if error_code == "ConflictException": - logger.error( - "Ingestion job already in progress - no action required", - extra={"status_code": 409, "error_code": error_code, "error_message": error_message}, - ) - @staticmethod def is_supported_file_type(file_key): """ @@ -364,9 +354,6 @@ def process_single_s3_event(record) -> S3EventResult: }, ) except Exception as e: - # Handle Conflict Exception, we don't want to stop - just inform user - S3EventHandler.handle_client_error(e) - logger.error(f"Error starting ingestion: {str(e)}") result.processing = False @@ -423,10 +410,9 @@ def process_batched_queue_events(slack_handler: SlackHandler, events: list): id=slack_handler.fetching_block_id, message=f"Found {len(s3_records)} records", replace=True ) - _ = S3EventHandler.process_multiple_sqs_events(slack_handler, s3_records) - processed_files += 1 + result = S3EventHandler.process_multiple_sqs_events(slack_handler, s3_records) + processed_files += len(result) - slack_handler.complete_plan() logger.info(f"Completed {processed_files} file(s)") @staticmethod @@ -441,7 +427,8 @@ def close_sqs_events(events): @staticmethod def search_sqs_for_events(): - response = sqs.receive_message(QueueUrl=SQS_URL, MaxNumberOfMessages=10, WaitTimeSeconds=2) + logger.info("Searching for new events") + response = sqs.receive_message(QueueUrl=SQS_URL, MaxNumberOfMessages=10, WaitTimeSeconds=5) events = [] messages = response.get("Messages", []) @@ -449,13 +436,14 @@ def search_sqs_for_events(): logger.warning("No messages found") return events + logger.info(f"Found {len(messages)} messages in SQS") for message in messages: body = message.get("Body", {}) message_events = json.loads(body) if message_events: events.append(message_events) - logger.info(f"Found {len(messages)} SQS messages") + logger.info(f"Found {len(messages)} total event(s) in SQS messages") return events @@ -471,6 +459,7 @@ def search_and_process_sqs_events(event): slack_handler.initialise_slack_messages() for i in range(loop_count): + logger.info(f"Starting process round {i + 1}") # If there are no events, stop if not events: break diff --git a/packages/syncKnowledgeBaseFunction/tests/test_app.py b/packages/syncKnowledgeBaseFunction/tests/test_app.py index 3dae2e6de..505febc95 100644 --- a/packages/syncKnowledgeBaseFunction/tests/test_app.py +++ b/packages/syncKnowledgeBaseFunction/tests/test_app.py @@ -1,10 +1,11 @@ +import copy import json import uuid import pytest import os import sys from unittest.mock import Mock, patch, MagicMock, DEFAULT -from botocore.exceptions import ClientError + TEST_BOT_TOKEN = "test-bot-token" @@ -386,89 +387,78 @@ def boto_client_router(service_name, **kwargs): assert mock_bedrock.start_ingestion_job.call_count == 21 # Once for original message + max (20) +@patch("slack_sdk.WebClient") +@patch("app.config.config.get_bot_token") @patch("boto3.client") @patch("time.time") -def test_handler_conflict_exception( +def test_handler_slack_success( mock_time, mock_boto_client, + mock_get_bot_token, + mock_webclient_class, mock_env, lambda_context, receive_s3_event, - mock_get_bot_token, ): - """Test handler with ConflictException (job already running)""" - mock_time.side_effect = [1000, 1001, 1002, 1003] + """Test successful handler execution with actual Slack WebClient interaction""" + # Mock timing + mock_time.side_effect = [1000, 1001, 1002, 1003, 1004, 1005] - error = ClientError( - error_response={"Error": {"Code": "ConflictException", "Message": "Job already running"}}, - operation_name="StartIngestionJob", - ) + # Setup Boto3 Mock mock_bedrock = mock_boto_client.return_value - mock_bedrock.start_ingestion_job.side_effect = error - - if "app.handler" in sys.modules: - del sys.modules["app.handler"] - import app.handler + mock_bedrock.start_ingestion_job.return_value = { + "ingestionJob": {"ingestionJobId": "job-123", "status": "STARTING"} + } - with patch.object(app.handler.SlackHandler, "initialise_slack_messages", return_value=(DEFAULT, [])), patch.object( - app.handler.S3EventHandler, "handle_client_error" - ) as mock_handle_client_error: + # Setup Slack SDK WebClient Mock + mock_slack_client = MagicMock() + mock_webclient_class.return_value = mock_slack_client + mock_get_bot_token.return_value = "test-bot-token" - result = app.handler.handler(receive_s3_event, lambda_context) + # Mock the initial auth and channel fetching + mock_slack_client.auth_test.return_value = {"user_id": "U123456"} - assert result["statusCode"] == 200 - assert "Successfully polled and processed sqs events" in result["body"] - assert mock_handle_client_error.call_count == 1 + # Needs to be a list because the handler uses: `for result in self.slack_client.conversations_list(...)` + mock_slack_client.conversations_list.return_value = [{"channels": [{"id": "C123456"}]}] + # Echo the blocks back to mimic Slack's actual API response behavior. + def mock_post_message_side_effect(**kwargs): + return { + "ok": True, + "channel": kwargs.get("channel"), + "ts": "1234567890.123456", + "message": {"blocks": kwargs.get("blocks", [])}, + } -@patch("boto3.client") -@patch("time.time") -def test_handler_aws_error(mock_time, mock_boto_client, mock_env, lambda_context, receive_s3_event): - """Test handler with other AWS error""" - mock_time.side_effect = [1000, 1001, 1002, 1003] - error = ClientError( - error_response={"Error": {"Code": "AccessDenied", "Message": "Access denied"}}, - operation_name="StartIngestionJob", - ) - mock_bedrock = mock_boto_client.return_value - mock_bedrock.start_ingestion_job.side_effect = error + mock_slack_client.chat_postMessage.side_effect = mock_post_message_side_effect + mock_slack_client.chat_update.return_value = {"ok": True} + # Force module reload to apply new patches from the source modules if "app.handler" in sys.modules: del sys.modules["app.handler"] - import app.handler - - with patch.object(app.handler.SlackHandler, "initialise_slack_messages", return_value=(DEFAULT, [])), patch.object( - app.handler.S3EventHandler, "handle_client_error" - ) as mock_handle_client_error: - - result = app.handler.handler(receive_s3_event, lambda_context) - - assert result["statusCode"] == 200 - assert "Successfully polled and processed sqs events" in result["body"] - assert mock_handle_client_error.call_count == 1 - + from app.handler import handler -@patch("boto3.client") -@patch("time.time") -def test_handler_unexpected_error(mock_time, mock_boto_client, mock_env, lambda_context, receive_s3_event): - """Test handler with unexpected error""" - mock_time.side_effect = [1000, 1001, 1002, 1003] - mock_bedrock = mock_boto_client.return_value - mock_bedrock.start_ingestion_job.side_effect = Exception("Unexpected error") + # Run the handler + result = handler(receive_s3_event, lambda_context) - if "app.handler" in sys.modules: - del sys.modules["app.handler"] - import app.handler + # --- Assertions --- + assert result["statusCode"] == 200 + assert "Successfully polled and processed sqs events" in result["body"] - with patch.object(app.handler.SlackHandler, "initialise_slack_messages", return_value=(DEFAULT, [])), patch.object( - app.handler.S3EventHandler, "handle_client_error" - ) as mock_handle_client_error: + # Assert Boto3 was triggered correctly + mock_bedrock.start_ingestion_job.assert_called_once_with( + knowledgeBaseId="test-kb-id", + dataSourceId="test-ds-id", + description="Sync: test-bucket", + ) - result = app.handler.handler(receive_s3_event, lambda_context) + # Assert Slack WebClient setup calls + mock_slack_client.auth_test.assert_called_once() + mock_slack_client.conversations_list.assert_called_once_with(types=["private_channel"], limit=1000) - assert result["statusCode"] == 200 - assert "Successfully polled and processed sqs events" in result["body"] - assert mock_handle_client_error.call_count == 1 + # Assert Messages were posted and updated + mock_slack_client.chat_postMessage.assert_called_once() + assert mock_slack_client.chat_update.call_count == 2 @patch("app.handler.KNOWLEDGEBASE_ID", "") @@ -731,3 +721,128 @@ def test_SlackHandler_client_failure( assert result["statusCode"] == 200 assert "Successfully polled and processed sqs events" in result["body"] mock_instance.chat_update.call_count = 2 + + +def test_process_multiple_s3_events_formatting(): + """Test process_multiple_s3_events generates correct update messages based on event counts""" + from app.handler import S3EventHandler, S3EventResult, SlackHandler + + mock_slack_handler = MagicMock(spec=SlackHandler) + mock_slack_handler.update_block_id = "test-block" + + # Create an uneven mix of simulated events + results = [ + S3EventResult("doc1.pdf", "ObjectCreated", True), + S3EventResult("doc2.pdf", "ObjectCreated", True), + S3EventResult("doc3.pdf", "ObjectRemoved", True), + ] # Notice: 0 "ObjectModified" events + + S3EventHandler.process_multiple_s3_events(mock_slack_handler, results) + + # Expect update_task to be called twice (for created and deleted, but NOT modified) + assert mock_slack_handler.update_task.call_count == 2 + + # Verify the actual messages sent + calls = mock_slack_handler.update_task.call_args_list + assert calls[0].kwargs["message"] == "2 files created" + assert calls[1].kwargs["message"] == "1 files deleted" + + +def test_slack_handler_create_task_structure(): + """Test create_task generates the exact nested dictionary structure required by Slack Block Kit""" + from app.handler import SlackHandler + + handler = SlackHandler() + plan_block = {"title": "Original Title", "tasks": []} + + # Generate a task and append it to the plan + task = handler.create_task( + id="test_task_123", + title="Syncing Documents", + plan=plan_block, + details=["Found 5 files"], + outputs=["All files synced"], + status="in_progress", + ) + + # 1. Verify the standalone task dictionary structure + assert task["task_id"] == "test_task_123" + assert task["title"] == "Syncing Documents" + assert task["status"] == "in_progress" + + # 2. Verify the rich_text generation for details and outputs + assert len(task["details"]["elements"]) == 1 + assert task["details"]["elements"][0]["elements"][0]["text"] == "Found 5 files" + assert len(task["output"]["elements"]) == 1 + + # 3. Verify the side-effects on the passed `plan` dictionary + assert len(plan_block["tasks"]) == 1 + assert plan_block["title"] == "Syncing Documents..." # Method explicitly alters the plan title + + +def test_slack_handler_complete_plan(slack_message_event): + """Test complete_plan correctly mutates the message state and pushes updates""" + from app.handler import SlackHandler + + handler = SlackHandler() + handler.slack_client = MagicMock() + + # Deep copy the fixture so we don't mutate the global test state + mock_message = copy.deepcopy(slack_message_event) + handler.messages = [mock_message] + + # Execute + handler.complete_plan() + + # Verify the in-memory state was mutated correctly + plan_block = handler.messages[0]["message"]["blocks"][0] + assert plan_block["title"] == "Processing complete!" + + # Verify EVERY task within the plan was updated to "complete" + for task in plan_block["tasks"]: + assert task["status"] == "complete" + + # Verify the API call was made to push the mutated state + handler.slack_client.chat_update.assert_called_once_with( + channel="test", ts="123456", blocks=handler.messages[0]["message"]["blocks"], text="Updating Source Files" + ) + + +def test_validate_s3_event_missing_keys(): + """Test validation logic gracefully rejects payloads missing necessary S3 identifiers without throwing KeyError""" + from app.handler import S3EventHandler + + # Missing bucket + assert S3EventHandler.validate_s3_event(None, "doc.pdf") is False + assert S3EventHandler.validate_s3_event("", "doc.pdf") is False + + # Missing key + assert S3EventHandler.validate_s3_event("my-bucket", None) is False + assert S3EventHandler.validate_s3_event("my-bucket", "") is False + + # Valid + assert S3EventHandler.validate_s3_event("my-bucket", "doc.pdf") is True + + +@patch("app.handler.S3EventHandler.search_sqs_for_events") +@patch("app.handler.S3EventHandler.process_batched_queue_events") +@patch("app.handler.S3EventHandler.close_sqs_events") +@patch("app.handler.SlackHandler.initialise_slack_messages") +def test_search_and_process_sqs_events_early_exit(mock_slack_init, mock_close, mock_process, mock_search): + """Test the while-loop equivalent exits early when the queue is empty, rather than looping 20 times""" + from app.handler import search_and_process_sqs_events + + initial_event = {"Records": ["Initial Event"]} + + # Simulate finding 1 new event on the first search, then 0 on the second search + mock_search.side_effect = [[{"Records": ["Polled Event 1"]}], []] # Empty list triggers the `if not events: break` + + search_and_process_sqs_events(initial_event) + + # Iteration 0: Processes initial event, searches SQS (finds 1) + # Iteration 1: Closes initial event, processes new event, searches SQS (finds 0) + # Iteration 2: Loop breaks immediately. + + assert mock_process.call_count == 2 + assert mock_search.call_count == 2 + assert mock_close.call_count == 1 # Only closes the polled events (Iteration 1) From 653355718ea8d353a6b156a2d36e889f56a2999a Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Tue, 10 Mar 2026 10:51:24 +0000 Subject: [PATCH 49/84] fix: Add silent mode for Slack --- packages/cdk/resources/Functions.ts | 2 +- .../syncKnowledgeBaseFunction/app/config/config.py | 1 + packages/syncKnowledgeBaseFunction/app/handler.py | 14 ++++++++++++-- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/packages/cdk/resources/Functions.ts b/packages/cdk/resources/Functions.ts index 69e98f07b..a9e09347d 100644 --- a/packages/cdk/resources/Functions.ts +++ b/packages/cdk/resources/Functions.ts @@ -129,7 +129,7 @@ export class Functions extends Construct { environmentVariables: { "KNOWLEDGEBASE_ID": props.knowledgeBaseId, "SLACK_BOT_TOKEN_PARAMETER": props.slackBotTokenParameter.parameterName, - "SLACK_BOT_ACTIVE_ON_PRS": "true", + "SLACK_BOT_ACTIVE": `${!props.isPullRequest}`, "DATA_SOURCE_ID": props.dataSourceId }, additionalPolicies: [props.syncKnowledgeBaseManagedPolicy] diff --git a/packages/syncKnowledgeBaseFunction/app/config/config.py b/packages/syncKnowledgeBaseFunction/app/config/config.py index 32632c22f..a5751c2b8 100644 --- a/packages/syncKnowledgeBaseFunction/app/config/config.py +++ b/packages/syncKnowledgeBaseFunction/app/config/config.py @@ -14,6 +14,7 @@ SLACK_BOT_TOKEN_PARAMETER = os.environ.get("SLACK_BOT_TOKEN_PARAMETER") AWS_ACCOUNT_ID = os.environ.get("AWS_ACCOUNT_ID") SQS_URL = os.environ.get("SQS_URL") +SLACK_BOT_ACTIVE = os.environ.get("SLACK_BOT_ACTIVE", False) # Supported file types for Bedrock Knowledge Base ingestion SUPPORTED_FILE_TYPES = {".pdf", ".txt", ".md", ".csv", ".doc", ".docx", ".xls", ".xlsx", ".html", ".json"} diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index f6056b0fd..6eb6d9c8f 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -17,6 +17,7 @@ DATA_SOURCE_ID, SUPPORTED_FILE_TYPES, SQS_URL, + SLACK_BOT_ACTIVE, get_bot_token, logger, ) @@ -41,7 +42,8 @@ def __init__(self, file_name, event_type, processing): class SlackHandler: - def __init__(self): + def __init__(self, silent=True): + self.silent: bool = silent self.fetching_block_id: str = uuid.uuid4().hex self.update_block_id: str = uuid.uuid4().hex self.slack_client: WebClient | None = None @@ -51,6 +53,10 @@ def __init__(self): def post_message(self, channel_id: str, blocks: list, text_fallback: str): """Send a new message to Slack""" try: + if self.silent: + logger.info(f"[SILENT MODE] Would have posted to {channel_id}") + return {"ok": True, "channel": channel_id, "ts": "123456", "message": {"blocks": blocks}} + return self.slack_client.chat_postMessage(channel=channel_id, text=text_fallback, blocks=blocks) except SlackApiError as e: logger.error(f"Error posting to {channel_id}: {str(e)}") @@ -62,6 +68,10 @@ def post_message(self, channel_id: str, blocks: list, text_fallback: str): def update_message(self, channel_id: str, ts: str, blocks: list): """Update an existing Slack Message""" try: + if self.silent: + logger.info(f"[SILENT MODE] Would have posted to {channel_id}") + return {"ok": True, "channel": channel_id, "ts": ts, "message": {"blocks": blocks}} + return self.slack_client.chat_update( channel=channel_id, ts=ts, blocks=blocks, text=self.default_slack_message ) @@ -455,7 +465,7 @@ def search_and_process_sqs_events(event): events = [event] loop_count = 20 - slack_handler = SlackHandler() + slack_handler = SlackHandler(silent=SLACK_BOT_ACTIVE) slack_handler.initialise_slack_messages() for i in range(loop_count): From 3aed71b76fd02b27cc84f2f6a8f1a01105690edd Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Tue, 10 Mar 2026 11:23:40 +0000 Subject: [PATCH 50/84] fix: Add silent mode for Slack --- .../syncKnowledgeBaseFunction/app/handler.py | 9 +++++-- .../tests/test_app.py | 26 +++++++++++++++---- 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index 6eb6d9c8f..a916b4dee 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -44,6 +44,11 @@ class SlackHandler: def __init__(self, silent=True): self.silent: bool = silent + if self.silent: + logger.warning( + "Slack has been set to SILENT mode", extra={"SLACK_BOT_ACTIVE": SLACK_BOT_ACTIVE, "silent": silent} + ) + self.fetching_block_id: str = uuid.uuid4().hex self.update_block_id: str = uuid.uuid4().hex self.slack_client: WebClient | None = None @@ -465,7 +470,8 @@ def search_and_process_sqs_events(event): events = [event] loop_count = 20 - slack_handler = SlackHandler(silent=SLACK_BOT_ACTIVE) + is_silent = not SLACK_BOT_ACTIVE # Mute Slack for PRs + slack_handler = SlackHandler(silent=is_silent) slack_handler.initialise_slack_messages() for i in range(loop_count): @@ -493,7 +499,6 @@ def handler(event, context): Main Lambda handler for a queue-service (S3-triggered) knowledge base synchronization """ start_time = time.time() - logger.info("log_event", extra=event) if not KNOWLEDGEBASE_ID or not DATA_SOURCE_ID: logger.exception( diff --git a/packages/syncKnowledgeBaseFunction/tests/test_app.py b/packages/syncKnowledgeBaseFunction/tests/test_app.py index 505febc95..7c58d97e6 100644 --- a/packages/syncKnowledgeBaseFunction/tests/test_app.py +++ b/packages/syncKnowledgeBaseFunction/tests/test_app.py @@ -10,16 +10,17 @@ TEST_BOT_TOKEN = "test-bot-token" -@pytest.fixture +@pytest.fixture(autouse=True) def mock_env(): - """Mock environment variables""" env_vars = { "KNOWLEDGEBASE_ID": "test-kb-id", "DATA_SOURCE_ID": "test-ds-id", "AWS_REGION": "eu-west-2", "SQS_URL": "example", + "SLACK_BOT_ACTIVE": "true", } - with patch.dict(os.environ, env_vars): + + with patch.dict(os.environ, env_vars, clear=False): yield env_vars @@ -223,6 +224,20 @@ def test_handler_success( ) +@patch("app.handler.SLACK_BOT_ACTIVE", False) +@patch("app.handler.SlackHandler.initialise_slack_messages") +@patch("boto3.client") +@patch("time.time") +def test_handler_slack_inactive( + mock_time, mock_boto_client, mock_initialise_slack_messages, mock_env, lambda_context, receive_s3_event +): + from app.handler import handler + + result = handler(receive_s3_event, lambda_context) + + assert result["statusCode"] == 200 + + @patch("app.handler.SlackHandler.initialise_slack_messages") @patch("boto3.client") @patch("time.time") @@ -780,11 +795,12 @@ def test_slack_handler_create_task_structure(): assert plan_block["title"] == "Syncing Documents..." # Method explicitly alters the plan title -def test_slack_handler_complete_plan(slack_message_event): +@patch("boto3.client") +def test_slack_handler_complete_plan(mock_boto_client, slack_message_event, mock_env): """Test complete_plan correctly mutates the message state and pushes updates""" from app.handler import SlackHandler - handler = SlackHandler() + handler = SlackHandler(False) handler.slack_client = MagicMock() # Deep copy the fixture so we don't mutate the global test state From 95e3f7642a193a5898e02239ca418785aadf94a9 Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Tue, 10 Mar 2026 12:01:47 +0000 Subject: [PATCH 51/84] fix: Add silent mode for Slack --- .../app/config/config.py | 20 ++++- .../syncKnowledgeBaseFunction/app/handler.py | 8 +- .../tests/test_app.py | 79 +++++++++++++++---- 3 files changed, 85 insertions(+), 22 deletions(-) diff --git a/packages/syncKnowledgeBaseFunction/app/config/config.py b/packages/syncKnowledgeBaseFunction/app/config/config.py index a5751c2b8..8178bf1d3 100644 --- a/packages/syncKnowledgeBaseFunction/app/config/config.py +++ b/packages/syncKnowledgeBaseFunction/app/config/config.py @@ -20,6 +20,20 @@ SUPPORTED_FILE_TYPES = {".pdf", ".txt", ".md", ".csv", ".doc", ".docx", ".xls", ".xlsx", ".html", ".json"} +def to_bool(value: str | None) -> bool: + # 1. Handle None immediately + if value is None: + return False + + # 2. Normalize the string and check against "false" values + # We include '0' as a string and the integer 0 just in case + if str(value).lower() in ("false", "0", "none", "f", "n", "no"): + return False + + # 3. Otherwise, check if the string has content + return bool(value) + + @lru_cache() def get_bot_token() -> Tuple[str, str]: try: @@ -43,6 +57,6 @@ def get_bot_token() -> Tuple[str, str]: @lru_cache() -def get_bot_on_prs() -> bool: - is_active_on_prs_str = os.environ.get("SLACK_BOT_ACTIVE_ON_PRS", "false").lower() - return is_active_on_prs_str == "true" +def get_bot_active() -> bool: + is_active = os.environ.get("SLACK_BOT_ACTIVE", "false") + return to_bool(is_active) diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index a916b4dee..0174f2fe1 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -17,7 +17,7 @@ DATA_SOURCE_ID, SUPPORTED_FILE_TYPES, SQS_URL, - SLACK_BOT_ACTIVE, + get_bot_active, get_bot_token, logger, ) @@ -45,9 +45,7 @@ class SlackHandler: def __init__(self, silent=True): self.silent: bool = silent if self.silent: - logger.warning( - "Slack has been set to SILENT mode", extra={"SLACK_BOT_ACTIVE": SLACK_BOT_ACTIVE, "silent": silent} - ) + logger.warning("Slack has been set to SILENT mode") self.fetching_block_id: str = uuid.uuid4().hex self.update_block_id: str = uuid.uuid4().hex @@ -470,7 +468,7 @@ def search_and_process_sqs_events(event): events = [event] loop_count = 20 - is_silent = not SLACK_BOT_ACTIVE # Mute Slack for PRs + is_silent = not get_bot_active() # Mute Slack for PRs slack_handler = SlackHandler(silent=is_silent) slack_handler.initialise_slack_messages() diff --git a/packages/syncKnowledgeBaseFunction/tests/test_app.py b/packages/syncKnowledgeBaseFunction/tests/test_app.py index 7c58d97e6..0cdaadeba 100644 --- a/packages/syncKnowledgeBaseFunction/tests/test_app.py +++ b/packages/syncKnowledgeBaseFunction/tests/test_app.py @@ -224,20 +224,6 @@ def test_handler_success( ) -@patch("app.handler.SLACK_BOT_ACTIVE", False) -@patch("app.handler.SlackHandler.initialise_slack_messages") -@patch("boto3.client") -@patch("time.time") -def test_handler_slack_inactive( - mock_time, mock_boto_client, mock_initialise_slack_messages, mock_env, lambda_context, receive_s3_event -): - from app.handler import handler - - result = handler(receive_s3_event, lambda_context) - - assert result["statusCode"] == 200 - - @patch("app.handler.SlackHandler.initialise_slack_messages") @patch("boto3.client") @patch("time.time") @@ -476,6 +462,71 @@ def mock_post_message_side_effect(**kwargs): assert mock_slack_client.chat_update.call_count == 2 +@patch("app.config.config.get_bot_active") +@patch("slack_sdk.WebClient") +@patch("app.config.config.get_bot_token") +@patch("boto3.client") +@patch("time.time") +def test_handler_slack_silent_success( + mock_time, + mock_boto_client, + mock_get_bot_token, + mock_webclient_class, + mock_get_bot_active, + mock_env, + lambda_context, + receive_s3_event, +): + """Test successful handler execution with actual Slack WebClient interaction""" + # Mock timing + mock_time.side_effect = [1000, 1001, 1002, 1003, 1004, 1005] + + # Setup Boto3 Mock + mock_bedrock = mock_boto_client.return_value + mock_bedrock.start_ingestion_job.return_value = { + "ingestionJob": {"ingestionJobId": "job-123", "status": "STARTING"} + } + + # Setup Slack SDK WebClient Mock + mock_slack_client = MagicMock() + mock_webclient_class.return_value = mock_slack_client + mock_get_bot_token.return_value = "test-bot-token" + mock_get_bot_active.return_value = False + + # Mock the initial auth and channel fetching + mock_slack_client.auth_test.return_value = {"user_id": "U123456"} + + # Needs to be a list because the handler uses: `for result in self.slack_client.conversations_list(...)` + mock_slack_client.conversations_list.return_value = [{"channels": [{"id": "123456"}]}] + + # Force module reload to apply new patches from the source modules + if "app.handler" in sys.modules: + del sys.modules["app.handler"] + from app.handler import handler + + # Run the handler + result = handler(receive_s3_event, lambda_context) + + # --- Assertions --- + assert result["statusCode"] == 200 + assert "Successfully polled and processed sqs events" in result["body"] + + # Assert Boto3 was triggered correctly + mock_bedrock.start_ingestion_job.assert_called_once_with( + knowledgeBaseId="test-kb-id", + dataSourceId="test-ds-id", + description="Sync: test-bucket", + ) + + # Assert Slack WebClient setup calls + mock_slack_client.auth_test.assert_called_once() + mock_slack_client.conversations_list.assert_called_once_with(types=["private_channel"], limit=1000) + + # Assert Messages were posted and updated + mock_slack_client.chat_postMessage.assert_not_called() + mock_slack_client.chat_update.asset_not_called() + + @patch("app.handler.KNOWLEDGEBASE_ID", "") @patch("app.handler.DATA_SOURCE_ID", "") def test_handler_missing_env_vars(lambda_context, receive_s3_event): From 634b1c5c7b25f521f90db0f14dfe3239042adbd2 Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Tue, 10 Mar 2026 12:56:19 +0000 Subject: [PATCH 52/84] fix: Add silent mode for Slack --- packages/cdk/constructs/LambdaFunction.ts | 4 +++- packages/cdk/resources/Functions.ts | 3 ++- packages/syncKnowledgeBaseFunction/app/handler.py | 8 ++++---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/packages/cdk/constructs/LambdaFunction.ts b/packages/cdk/constructs/LambdaFunction.ts index 2d9889152..7bbb70897 100644 --- a/packages/cdk/constructs/LambdaFunction.ts +++ b/packages/cdk/constructs/LambdaFunction.ts @@ -29,6 +29,7 @@ export interface LambdaFunctionProps { readonly logRetentionInDays: number readonly logLevel: string readonly dependencyLocation?: string + readonly reservedConcurrentExecutions?: number } // Lambda Insights layer for enhanced monitoring @@ -141,7 +142,8 @@ export class LambdaFunction extends Construct { POWERTOOLS_LOG_LEVEL: props.logLevel }, logGroup, - layers: layers + layers: layers, + reservedConcurrentExecutions: props.reservedConcurrentExecutions }) // Suppress CFN guard rules for Lambda function diff --git a/packages/cdk/resources/Functions.ts b/packages/cdk/resources/Functions.ts index a9e09347d..6f3fd991f 100644 --- a/packages/cdk/resources/Functions.ts +++ b/packages/cdk/resources/Functions.ts @@ -132,7 +132,8 @@ export class Functions extends Construct { "SLACK_BOT_ACTIVE": `${!props.isPullRequest}`, "DATA_SOURCE_ID": props.dataSourceId }, - additionalPolicies: [props.syncKnowledgeBaseManagedPolicy] + additionalPolicies: [props.syncKnowledgeBaseManagedPolicy], + reservedConcurrentExecutions: 1 }) this.slackBotLambda = slackBotLambda diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index 0174f2fe1..0feefbccd 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -72,7 +72,7 @@ def update_message(self, channel_id: str, ts: str, blocks: list): """Update an existing Slack Message""" try: if self.silent: - logger.info(f"[SILENT MODE] Would have posted to {channel_id}") + logger.info(f"[SILENT MODE] Would have posted to {channel_id}", extra={"blocks": blocks}) return {"ok": True, "channel": channel_id, "ts": ts, "message": {"blocks": blocks}} return self.slack_client.chat_update( @@ -441,15 +441,15 @@ def close_sqs_events(events): @staticmethod def search_sqs_for_events(): logger.info("Searching for new events") - response = sqs.receive_message(QueueUrl=SQS_URL, MaxNumberOfMessages=10, WaitTimeSeconds=5) + response = sqs.receive_message(QueueUrl=SQS_URL, MaxNumberOfMessages=10, WaitTimeSeconds=20) events = [] messages = response.get("Messages", []) if not messages: - logger.warning("No messages found") + logger.warning("No messages found", extra={"response": response, "messages": messages}) return events - logger.info(f"Found {len(messages)} messages in SQS") + logger.info(f"Found {len(messages)} messages in SQS", extra={"response": response, "messages": messages}) for message in messages: body = message.get("Body", {}) message_events = json.loads(body) From c7c0208782051cdace9a907274f739a2968800d6 Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Tue, 10 Mar 2026 15:08:41 +0000 Subject: [PATCH 53/84] fix: Add silent mode for Slack --- packages/cdk/constructs/SimpleQueueService.ts | 7 +++---- packages/syncKnowledgeBaseFunction/app/handler.py | 9 ++++----- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/packages/cdk/constructs/SimpleQueueService.ts b/packages/cdk/constructs/SimpleQueueService.ts index 171c5f07c..aeef0e623 100644 --- a/packages/cdk/constructs/SimpleQueueService.ts +++ b/packages/cdk/constructs/SimpleQueueService.ts @@ -50,7 +50,7 @@ export class SimpleQueueService extends Construct { queue: deadLetterQueue, maxReceiveCount: 1 // Move to DLQ after a failed attempt }, - deliveryDelay: Duration.minutes(0), + deliveryDelay: Duration.seconds(10), visibilityTimeout: Duration.hours(1), // Really high visibility to prevent multiple calls enforceSSL: true } @@ -58,9 +58,8 @@ export class SimpleQueueService extends Construct { // Add queues as event source for the notify function and sync knowledge base function const eventSource = new SqsEventSource(queue, { - maxBatchingWindow: Duration.seconds(5), - reportBatchItemFailures: true, - batchSize: 100 + maxBatchingWindow: Duration.seconds(30), + batchSize: 20 }) props.functions.forEach(fn => { diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index 0feefbccd..df4cf9a31 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -476,15 +476,14 @@ def search_and_process_sqs_events(event): logger.info(f"Starting process round {i + 1}") # If there are no events, stop if not events: - break + continue + + S3EventHandler.process_batched_queue_events(slack_handler, events) # Delete sqs events that we have polled - # The initial event will cancel with the success of the lambda - if i > 0: + if len(events) > 0: S3EventHandler.close_sqs_events(events) - S3EventHandler.process_batched_queue_events(slack_handler, events) - # Search for any events in the sqs queue events = S3EventHandler.search_sqs_for_events() From 1d54f19b1972118a6ad54fc0e442c88679b7842c Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Tue, 10 Mar 2026 15:13:12 +0000 Subject: [PATCH 54/84] fix: Add silent mode for Slack --- .../syncKnowledgeBaseFunction/tests/test_app.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/packages/syncKnowledgeBaseFunction/tests/test_app.py b/packages/syncKnowledgeBaseFunction/tests/test_app.py index 0cdaadeba..a3b0cccd9 100644 --- a/packages/syncKnowledgeBaseFunction/tests/test_app.py +++ b/packages/syncKnowledgeBaseFunction/tests/test_app.py @@ -529,7 +529,8 @@ def test_handler_slack_silent_success( @patch("app.handler.KNOWLEDGEBASE_ID", "") @patch("app.handler.DATA_SOURCE_ID", "") -def test_handler_missing_env_vars(lambda_context, receive_s3_event): +@patch("boto3.client") +def test_handler_missing_env_vars(mock_boto, lambda_context, receive_s3_event): """Test handler with missing environment variables""" from app.handler import handler @@ -789,7 +790,8 @@ def test_SlackHandler_client_failure( mock_instance.chat_update.call_count = 2 -def test_process_multiple_s3_events_formatting(): +@patch("boto3.client") +def test_process_multiple_s3_events_formatting(mock_boto): """Test process_multiple_s3_events generates correct update messages based on event counts""" from app.handler import S3EventHandler, S3EventResult, SlackHandler @@ -814,7 +816,8 @@ def test_process_multiple_s3_events_formatting(): assert calls[1].kwargs["message"] == "1 files deleted" -def test_slack_handler_create_task_structure(): +@patch("boto3.client") +def test_slack_handler_create_task_structure(mock_boto): """Test create_task generates the exact nested dictionary structure required by Slack Block Kit""" from app.handler import SlackHandler @@ -875,7 +878,8 @@ def test_slack_handler_complete_plan(mock_boto_client, slack_message_event, mock ) -def test_validate_s3_event_missing_keys(): +@patch("boto3.client") +def test_validate_s3_event_missing_keys(mock_boto): """Test validation logic gracefully rejects payloads missing necessary S3 identifiers without throwing KeyError""" from app.handler import S3EventHandler @@ -895,7 +899,8 @@ def test_validate_s3_event_missing_keys(): @patch("app.handler.S3EventHandler.process_batched_queue_events") @patch("app.handler.S3EventHandler.close_sqs_events") @patch("app.handler.SlackHandler.initialise_slack_messages") -def test_search_and_process_sqs_events_early_exit(mock_slack_init, mock_close, mock_process, mock_search): +@patch("boto3.client") +def test_search_and_process_sqs_events_early_exit(mock_boto, mock_slack_init, mock_close, mock_process, mock_search): """Test the while-loop equivalent exits early when the queue is empty, rather than looping 20 times""" from app.handler import search_and_process_sqs_events @@ -912,4 +917,4 @@ def test_search_and_process_sqs_events_early_exit(mock_slack_init, mock_close, m assert mock_process.call_count == 2 assert mock_search.call_count == 2 - assert mock_close.call_count == 1 # Only closes the polled events (Iteration 1) + assert mock_close.call_count == 2 From 8919bd730cc7d5f9e625920318841d188a17d90d Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Tue, 10 Mar 2026 15:45:37 +0000 Subject: [PATCH 55/84] fix: Add silent mode for Slack --- .../syncKnowledgeBaseFunction/app/handler.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index df4cf9a31..8043d9a73 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -474,18 +474,20 @@ def search_and_process_sqs_events(event): for i in range(loop_count): logger.info(f"Starting process round {i + 1}") - # If there are no events, stop - if not events: - continue - S3EventHandler.process_batched_queue_events(slack_handler, events) + # If we don't have events in hand, search the queue + if not events: + logger.info("No events, search") + events = S3EventHandler.search_sqs_for_events() - # Delete sqs events that we have polled - if len(events) > 0: + # If we have events (either from the initial seed or the search above), process them + if events: + logger.info("Founds events, process") + S3EventHandler.process_batched_queue_events(slack_handler, events) S3EventHandler.close_sqs_events(events) - # Search for any events in the sqs queue - events = S3EventHandler.search_sqs_for_events() + # Clear the list so the NEXT loop iteration knows to search again + events = [] slack_handler.complete_plan() From 26a241de7279278664cc9ca7060542ec1958a1f3 Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Tue, 10 Mar 2026 16:15:14 +0000 Subject: [PATCH 56/84] fix: Add silent mode for Slack --- packages/syncKnowledgeBaseFunction/app/handler.py | 2 -- .../syncKnowledgeBaseFunction/tests/test_app.py | 15 +++++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index 8043d9a73..82682ca6f 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -489,8 +489,6 @@ def search_and_process_sqs_events(event): # Clear the list so the NEXT loop iteration knows to search again events = [] - slack_handler.complete_plan() - @logger.inject_lambda_context(log_event=True, clear_state=True) def handler(event, context): diff --git a/packages/syncKnowledgeBaseFunction/tests/test_app.py b/packages/syncKnowledgeBaseFunction/tests/test_app.py index a3b0cccd9..309738cb2 100644 --- a/packages/syncKnowledgeBaseFunction/tests/test_app.py +++ b/packages/syncKnowledgeBaseFunction/tests/test_app.py @@ -276,7 +276,7 @@ def test_handler_fetch_files( mock_bedrock.start_ingestion_job.return_value = { "ingestionJob": {"ingestionJobId": "job-123", "status": "STARTING"} } - mock_sqs.receive_message.side_effect = [fetch_sqs_event, {}] + mock_sqs.receive_message.side_effect = [fetch_sqs_event] + [{}] * 21 def boto_client_router(service_name, **kwargs): if service_name == "bedrock-agent": @@ -320,7 +320,8 @@ def test_handler_fetch_multiple_files( mock_bedrock.start_ingestion_job.return_value = { "ingestionJob": {"ingestionJobId": "job-123", "status": "STARTING"} } - mock_sqs.receive_message.side_effect = [fetch_multiple_sqs_event, {}] + # mock_sqs.receive_message.side_effect = [fetch_multiple_sqs_event] + [[]] * 29 + mock_sqs.receive_message.side_effect = [fetch_multiple_sqs_event] + [{}] * 21 def boto_client_router(service_name, **kwargs): if service_name == "bedrock-agent": @@ -459,7 +460,7 @@ def mock_post_message_side_effect(**kwargs): # Assert Messages were posted and updated mock_slack_client.chat_postMessage.assert_called_once() - assert mock_slack_client.chat_update.call_count == 2 + assert mock_slack_client.chat_update.call_count == 1 @patch("app.config.config.get_bot_active") @@ -900,14 +901,16 @@ def test_validate_s3_event_missing_keys(mock_boto): @patch("app.handler.S3EventHandler.close_sqs_events") @patch("app.handler.SlackHandler.initialise_slack_messages") @patch("boto3.client") -def test_search_and_process_sqs_events_early_exit(mock_boto, mock_slack_init, mock_close, mock_process, mock_search): +def test_search_and_process_sqs_events(mock_boto, mock_slack_init, mock_close, mock_process, mock_search): """Test the while-loop equivalent exits early when the queue is empty, rather than looping 20 times""" from app.handler import search_and_process_sqs_events initial_event = {"Records": ["Initial Event"]} # Simulate finding 1 new event on the first search, then 0 on the second search - mock_search.side_effect = [[{"Records": ["Polled Event 1"]}], []] # Empty list triggers the `if not events: break` + mock_search.side_effect = [[{"Records": ["Polled Event 1"]}]] + [ + [] + ] * 21 # Empty list triggers the `if not events: break` search_and_process_sqs_events(initial_event) @@ -916,5 +919,5 @@ def test_search_and_process_sqs_events_early_exit(mock_boto, mock_slack_init, mo # Iteration 2: Loop breaks immediately. assert mock_process.call_count == 2 - assert mock_search.call_count == 2 assert mock_close.call_count == 2 + assert mock_search.call_count == 19 From 0d9c3b54d9930a3313fff0bc3720e5236b834783 Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Fri, 13 Mar 2026 11:54:07 +0000 Subject: [PATCH 57/84] fix: search for historic conversations --- .../syncKnowledgeBaseFunction/app/handler.py | 209 +++++++++--------- .../tests/test_app.py | 202 +++++++++++++---- 2 files changed, 268 insertions(+), 143 deletions(-) diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index 82682ca6f..ce015cc0b 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -29,17 +29,6 @@ sqs = boto3.client("sqs") -class S3EventResult: - file_name: str - event_type: str - processing: bool - - def __init__(self, file_name, event_type, processing): - self.file_name = file_name - self.event_type = event_type - self.processing = processing - - class SlackHandler: def __init__(self, silent=True): @@ -123,12 +112,17 @@ def update_task( self, id: str, message: str, status: Literal["in_progress", "completed"] = "in_progress", replace=False ): # Add header + if self.slack_client is None: + logger.warning("No Slack client found, skipper update all tasks") + return + for slack_message in self.messages: channel_id = slack_message["channel"] ts = slack_message["ts"] - if self.slack_client is None or slack_message is None: - logger.warning("No Slack client or message, skipping update task") + if slack_message is None: + logger.warning("No Slack message, skipping update task") + continue blocks = slack_message["message"]["blocks"] plan = next((block for block in blocks if block["type"] == "plan"), None) @@ -136,14 +130,19 @@ def update_task( if tasks is None: logger.warning("No task found, skipping update task") + continue task = next((task for task in tasks if task["task_id"] == id), None) if task is None: logger.warning(f"Could not find task with task_id {id}, skipping update task") + continue details = task["details"] - detail_elements = details["elements"] if not replace else [] - detail_elements.append({"type": "rich_text_section", "elements": [{"type": "text", "text": message}]}) + if replace: + logger.warning("Replacing Plan Block details") + details["elements"] = [] + + details["elements"].append({"type": "rich_text_section", "elements": [{"type": "text", "text": message}]}) task["status"] = status task["details"] = details @@ -165,18 +164,70 @@ def get_bot_channels(self) -> list[str]: return channel_ids + def search_existing_messages(self, channels, user_id, header): + """Get any messages in Slack for the last 20 minutes""" + messages = [] + try: + for channel_id in channels: + # Search message in the channel + history = self.slack_client.conversations_history( + channel=channel_id, limit=20, oldest=str(time.time() - (20 * 60)) + ) + for message in history: + try: + found_user = message.get("user", "") == user_id + found_title = message.get("blocks")[0]["text"]["text"] + if found_user == user_id and header == found_title: + messages.append(message) + # Found latest message, break + break + except (IndexError, KeyError, TypeError): + continue + # Handles empty lists, missing keys, or unexpected data types + # Just catch so the loop doesn't break + except Exception as e: + logger.error(f"Failed to searching slack message history: {str(e)}") + def initialise_slack_messages(self): """ Create a new slack message to inform user of SQS event process progress """ try: + # Create new client + token = get_bot_token() + slack_client = WebClient(token=token) + self.slack_client = slack_client + + response = slack_client.auth_test() + user_id = response.get("user_id", "unknown") + logger.info(f"Authenticated as bot user: {user_id}", extra={"response": response}) + + # Get Channels where the Bot is a member + logger.info("Find bot channels...") + target_channels = self.get_bot_channels() + + # Check if a message already exists + message_default_text = "I am currently syncing changes to my knowledge base.\n This may take a few minutes." + try: + existing_messages = self.search_existing_messages( + channels=target_channels, user_id=user_id, header=message_default_text + ) + + logger.info(f"Found {len(existing_messages)} existing messages") + + if len(existing_messages) > 0: + self.messages = existing_messages + return + except Exception as e: + logger.error(f"Failed to search for existing slack messages: {str(e)}") + # Build blocks for Slack message blocks = [ { "type": "section", "text": { "type": "plain_text", - "text": "I am currently syncing changes to my knowledge base.\n This may take a few minutes.", + "text": message_default_text, }, }, { @@ -208,20 +259,6 @@ def initialise_slack_messages(self): }, ] - # Create new client - token = get_bot_token() - slack_client = WebClient(token=token) - response = slack_client.auth_test() - user_id = response.get("user_id", "unknown") - - self.slack_client = slack_client - - logger.info(f"Authenticated as bot user: {user_id}", extra={"response": response}) - - # Get Channels where the Bot is a member - logger.info("Find bot channels...") - target_channels = self.get_bot_channels() - if not target_channels: logger.warning("SKIPPING - Bot is not in any channels. No messages sent.") return @@ -320,113 +357,75 @@ def validate_s3_event(bucket_name, object_key): return True @staticmethod - def process_single_s3_event(record) -> S3EventResult: - """Process single S3 event from SQS""" - s3_info = record.get("s3", {}) - bucket_name = s3_info.get("bucket", {}).get("name") - object_key = s3_info.get("object", {}).get("key") - event_name = record.get("eventName", "Unknown") - - result = S3EventResult(file_name=object_key, event_type=event_name, processing=False) - - # Skip invalid records - if not S3EventHandler.validate_s3_event(bucket_name, object_key): - return result + def process_multiple_s3_events(records: list, slack_handler: SlackHandler): + logger.info("Processing SQS record") - # Extract additional event metadata for logging - event_name = record["eventName"] - object_size = s3_info.get("object", {}).get("size", "unknown") + counts = [ + ("created", len([r for r in records if "ObjectCreated" in r.get("eventName", "")])), + ("modified", len([r for r in records if "ObjectModified" in r.get("eventName", "")])), + ("deleted", len([r for r in records if "ObjectRemoved" in r.get("eventName", "")])), + ] - logger.info( - "Found valid S3 event for processing", - extra={ - "event_name": event_name, - "bucket": bucket_name, - "key": object_key, - "object_size_bytes": object_size, - }, - ) + # Generate the list only for non-zero values + message_list = [f"{count} files {action}" for action, count in counts if count > 0] + for message in message_list: + slack_handler.update_task(id=slack_handler.update_block_id, message=message) + @staticmethod + def start_ingestion_job(): try: response = bedrock_agent.start_ingestion_job( knowledgeBaseId=KNOWLEDGEBASE_ID, dataSourceId=DATA_SOURCE_ID, - description=f"Sync: {bucket_name}", + description=str(time.time()), ) job_id = response["ingestionJob"]["ingestionJobId"] job_status = response["ingestionJob"]["status"] - result.processing = True logger.info( "Successfully started ingestion job", - extra={ - "job_id": job_id, - "job_status": job_status, - "trigger_file": object_key, - }, + extra={"job_id": job_id, "job_status": job_status}, ) except Exception as e: logger.error(f"Error starting ingestion: {str(e)}") - result.processing = False - - return result @staticmethod - def process_multiple_sqs_events(slack_handler: SlackHandler, sqs_records): + def process_multiple_sqs_events(slack_handler: SlackHandler, s3_records): """Handle multiple individual events from SQS""" - results = [] - for record in sqs_records: - if record.get("eventSource") != "aws:sqs": + for record in s3_records: + if record.get("eventSource") != "aws:s3": logger.warning( - "Skipping non-SQS event", + "Skipping non-s3 event", extra={"event_source": record.get("eventSource")}, ) continue - body = json.loads(record.get("body", {})) - for s3_record in body.get("Records", []): - result = S3EventHandler.process_single_s3_event(s3_record) - results.append(result) - - return results - - @staticmethod - def process_multiple_s3_events(slack_handler: SlackHandler, results): - logger.info("Processing SQS record") - - counts = [ - ("created", len([result for result in results if result.event_type == "ObjectCreated"])), - ("modified", len([result for result in results if result.event_type == "ObjectModified"])), - ("deleted", len([result for result in results if result.event_type == "ObjectRemoved"])), - ] + # Start the ingestion job + S3EventHandler.start_ingestion_job() - # Generate the list only for non-zero values - message_list = [f"{count} files {action}" for action, count in counts if count > 0] - for message in message_list: - slack_handler.update_task(id=slack_handler.update_block_id, message=message) + # Process event details for the Slack Messages + S3EventHandler.process_multiple_s3_events(records=s3_records, slack_handler=slack_handler) @staticmethod def process_batched_queue_events(slack_handler: SlackHandler, events: list): """Handle collection of batched queue events""" - processed_files = 0 - for event in events: - s3_records = event.get("Records", []) + body = json.loads(event.get("body", "{}")) + sqs_records = body.get("Records", []) - if not s3_records: + if not sqs_records: logger.warning("No records in event") continue - logger.info(f"Processing {len(s3_records)} record(s)") + logger.info(f"Processing {len(sqs_records)} record(s)") slack_handler.update_task( - id=slack_handler.fetching_block_id, message=f"Found {len(s3_records)} records", replace=True + id=slack_handler.fetching_block_id, message=f"Found {len(sqs_records)} records", replace=True ) - result = S3EventHandler.process_multiple_sqs_events(slack_handler, s3_records) - processed_files += len(result) + S3EventHandler.process_multiple_sqs_events(slack_handler, sqs_records) - logger.info(f"Completed {processed_files} file(s)") + logger.info(f"Completed {len(sqs_records)} event(s)") @staticmethod def close_sqs_events(events): @@ -465,7 +464,7 @@ def search_and_process_sqs_events(event): Check if there are waiting SQS events. While SQS keep appearing, keep looking - limit to 20 iterations. """ - events = [event] + events = event.get("Records", []) loop_count = 20 is_silent = not get_bot_active() # Mute Slack for PRs @@ -477,17 +476,19 @@ def search_and_process_sqs_events(event): # If we don't have events in hand, search the queue if not events: - logger.info("No events, search") - events = S3EventHandler.search_sqs_for_events() + break # If we have events (either from the initial seed or the search above), process them - if events: + if events and len(events) > 0: logger.info("Founds events, process") S3EventHandler.process_batched_queue_events(slack_handler, events) S3EventHandler.close_sqs_events(events) - # Clear the list so the NEXT loop iteration knows to search again - events = [] + # Clear the list so the NEXT loop iteration knows to search again + logger.info("Search for any prompts left in the queue") + events = S3EventHandler.search_sqs_for_events() + + slack_handler.complete_plan() @logger.inject_lambda_context(log_event=True, clear_state=True) diff --git a/packages/syncKnowledgeBaseFunction/tests/test_app.py b/packages/syncKnowledgeBaseFunction/tests/test_app.py index 309738cb2..5c8671954 100644 --- a/packages/syncKnowledgeBaseFunction/tests/test_app.py +++ b/packages/syncKnowledgeBaseFunction/tests/test_app.py @@ -4,7 +4,7 @@ import pytest import os import sys -from unittest.mock import Mock, patch, MagicMock, DEFAULT +from unittest.mock import Mock, patch, MagicMock, DEFAULT, call TEST_BOT_TOKEN = "test-bot-token" @@ -80,7 +80,7 @@ def receive_s3_event(): @pytest.fixture -def receive_multiple_s3_event(): +def receive_multiple_s3_events(): """Mock S3 event with multiple records""" return { "Records": [ @@ -120,13 +120,13 @@ def fetch_sqs_event(receive_s3_event): @pytest.fixture -def fetch_multiple_sqs_event(receive_multiple_s3_event): +def fetch_multiple_sqs_event(receive_multiple_s3_events): """Mock incoming SQS event structure as expected by the new logic""" return { "Messages": [ { "MessageId": str(uuid.uuid4()), - "Body": json.dumps(receive_multiple_s3_event), + "Body": json.dumps(receive_multiple_s3_events), } ] } @@ -220,7 +220,7 @@ def test_handler_success( mock_bedrock.start_ingestion_job.assert_called_once_with( knowledgeBaseId="test-kb-id", dataSourceId="test-ds-id", - description="Sync: test-bucket", + description="1001", ) @@ -234,7 +234,7 @@ def test_handler_multiple_files( mock_env, mock_get_bot_token, lambda_context, - receive_multiple_s3_event, + receive_multiple_s3_events, ): """Test handler with multiple S3 records""" mock_time.side_effect = [1000, 1001, 1002, 1003, 1004, 1005] @@ -249,7 +249,7 @@ def test_handler_multiple_files( del sys.modules["app.handler"] from app.handler import handler - result = handler(receive_multiple_s3_event, lambda_context) + result = handler(receive_multiple_s3_events, lambda_context) assert result["statusCode"] == 200 assert "Successfully polled and processed sqs events" in result["body"] @@ -264,7 +264,7 @@ def test_handler_fetch_files( mock_env, mock_get_bot_token, lambda_context, - receive_multiple_s3_event, + receive_multiple_s3_events, fetch_sqs_event, ): """Test handler with multiple S3 records""" @@ -293,11 +293,11 @@ def boto_client_router(service_name, **kwargs): import app.handler with patch.object(app.handler.SlackHandler, "initialise_slack_messages", return_value=(DEFAULT, [])): - result = app.handler.handler(receive_multiple_s3_event, lambda_context) + result = app.handler.handler(receive_multiple_s3_events, lambda_context) assert result["statusCode"] == 200 assert "Successfully polled and processed sqs events" in result["body"] - assert mock_bedrock.start_ingestion_job.call_count == 3 # Initial 2 + 1 + assert mock_bedrock.start_ingestion_job.call_count == 2 @patch("boto3.client") @@ -308,7 +308,7 @@ def test_handler_fetch_multiple_files( mock_env, mock_get_bot_token, lambda_context, - receive_multiple_s3_event, + receive_multiple_s3_events, fetch_multiple_sqs_event, ): """Test handler with multiple S3 records""" @@ -338,11 +338,11 @@ def boto_client_router(service_name, **kwargs): import app.handler with patch.object(app.handler.SlackHandler, "initialise_slack_messages", return_value=(DEFAULT, [])): - result = app.handler.handler(receive_multiple_s3_event, lambda_context) + result = app.handler.handler(receive_multiple_s3_events, lambda_context) assert result["statusCode"] == 200 assert "Successfully polled and processed sqs events" in result["body"] - assert mock_bedrock.start_ingestion_job.call_count == 4 # Initial 2 + 2 + assert mock_bedrock.start_ingestion_job.call_count == 2 @patch("boto3.client") @@ -353,7 +353,7 @@ def test_handler_fetch_multiple_files_handle_infinity( mock_env, mock_get_bot_token, lambda_context, - receive_multiple_s3_event, + receive_multiple_s3_events, fetch_sqs_event, ): """Test handler with multiple S3 records""" @@ -382,11 +382,11 @@ def boto_client_router(service_name, **kwargs): import app.handler with patch.object(app.handler.SlackHandler, "initialise_slack_messages", return_value=(DEFAULT, [])): - result = app.handler.handler(receive_multiple_s3_event, lambda_context) + result = app.handler.handler(receive_multiple_s3_events, lambda_context) assert result["statusCode"] == 200 assert "Successfully polled and processed sqs events" in result["body"] - assert mock_bedrock.start_ingestion_job.call_count == 21 # Once for original message + max (20) + assert mock_bedrock.start_ingestion_job.call_count == 2 # Once for original message + max (20) @patch("slack_sdk.WebClient") @@ -428,7 +428,7 @@ def mock_post_message_side_effect(**kwargs): return { "ok": True, "channel": kwargs.get("channel"), - "ts": "1234567890.123456", + "ts": "1002", "message": {"blocks": kwargs.get("blocks", [])}, } @@ -451,7 +451,7 @@ def mock_post_message_side_effect(**kwargs): mock_bedrock.start_ingestion_job.assert_called_once_with( knowledgeBaseId="test-kb-id", dataSourceId="test-ds-id", - description="Sync: test-bucket", + description="1002", ) # Assert Slack WebClient setup calls @@ -460,7 +460,7 @@ def mock_post_message_side_effect(**kwargs): # Assert Messages were posted and updated mock_slack_client.chat_postMessage.assert_called_once() - assert mock_slack_client.chat_update.call_count == 1 + assert mock_slack_client.chat_update.call_count == 3 # Update details, update tasks, close @patch("app.config.config.get_bot_active") @@ -516,7 +516,7 @@ def test_handler_slack_silent_success( mock_bedrock.start_ingestion_job.assert_called_once_with( knowledgeBaseId="test-kb-id", dataSourceId="test-ds-id", - description="Sync: test-bucket", + description="1002", ) # Assert Slack WebClient setup calls @@ -791,30 +791,154 @@ def test_SlackHandler_client_failure( mock_instance.chat_update.call_count = 2 +@patch("slack_sdk.WebClient") +@patch("app.config.config.get_bot_token") +@patch("boto3.client") +@patch("time.time") +def test_process_s3_event_formatting( + mock_time, + mock_boto_client, + mock_get_bot_token, + mock_webclient_class, + mock_env, + lambda_context, + receive_s3_event, +): + """Test successful handler execution with actual Slack WebClient interaction""" + # Mock timing + mock_time.side_effect = [1000, 1001, 1002, 1003, 1004, 1005] + + # Setup Boto3 Mock + mock_bedrock = mock_boto_client.return_value + mock_bedrock.start_ingestion_job.return_value = { + "ingestionJob": {"ingestionJobId": "job-123", "status": "STARTING"} + } + + # Setup Slack SDK WebClient Mock + mock_slack_client = MagicMock() + mock_webclient_class.return_value = mock_slack_client + mock_get_bot_token.return_value = "test-bot-token" + + # Mock the initial auth and channel fetching + mock_slack_client.auth_test.return_value = {"user_id": "U123456"} + + # Needs to be a list because the handler uses: `for result in self.slack_client.conversations_list(...)` + mock_slack_client.conversations_list.return_value = [{"channels": [{"id": "C123456"}]}] + + # Echo the blocks back to mimic Slack's actual API response behavior. + def mock_post_message_side_effect(**kwargs): + return { + "ok": True, + "channel": kwargs.get("channel"), + "ts": "1002", + "message": {"blocks": kwargs.get("blocks", [])}, + } + + mock_slack_client.chat_postMessage.side_effect = mock_post_message_side_effect + mock_slack_client.chat_update.return_value = {"ok": True} + + # Force module reload to apply new patches from the source modules + if "app.handler" in sys.modules: + del sys.modules["app.handler"] + from app.handler import handler + + # Run the handler + result = handler(receive_s3_event, lambda_context) + + # --- Assertions --- + assert result["statusCode"] == 200 + assert "Successfully polled and processed sqs events" in result["body"] + + # Assert Boto3 was triggered correctly + mock_bedrock.start_ingestion_job.assert_called_once_with( + knowledgeBaseId="test-kb-id", + dataSourceId="test-ds-id", + description="1002", + ) + + # Assert Slack WebClient setup calls + calls = mock_slack_client.chat_update.call_args_list + assert len(calls) > 0, "Expected chat_update to be called." + + # Verify the formatted message made its way into the blocks sent to chat_update + last_call_blocks_str = str(calls[-1].kwargs.get("blocks", [])) + assert "1 files created" in last_call_blocks_str + + +@patch("slack_sdk.WebClient") +@patch("app.config.config.get_bot_token") @patch("boto3.client") -def test_process_multiple_s3_events_formatting(mock_boto): - """Test process_multiple_s3_events generates correct update messages based on event counts""" - from app.handler import S3EventHandler, S3EventResult, SlackHandler +@patch("time.time") +def test_process_multiple_s3_events_formatting( + mock_time, + mock_boto_client, + mock_get_bot_token, + mock_webclient_class, + mock_env, + lambda_context, + receive_multiple_s3_events, +): + """Test successful handler execution with actual Slack WebClient interaction""" + # Mock timing + mock_time.side_effect = [1000, 1001, 1002, 1003, 1004, 1005] + + # Setup Boto3 Mock + mock_bedrock = mock_boto_client.return_value + mock_bedrock.start_ingestion_job.return_value = { + "ingestionJob": {"ingestionJobId": "job-123", "status": "STARTING"} + } + + # Setup Slack SDK WebClient Mock + mock_slack_client = MagicMock() + mock_webclient_class.return_value = mock_slack_client + mock_get_bot_token.return_value = "test-bot-token" - mock_slack_handler = MagicMock(spec=SlackHandler) - mock_slack_handler.update_block_id = "test-block" + # Mock the initial auth and channel fetching + mock_slack_client.auth_test.return_value = {"user_id": "U123456"} + + # Needs to be a list because the handler uses: `for result in self.slack_client.conversations_list(...)` + mock_slack_client.conversations_list.return_value = [{"channels": [{"id": "C123456"}]}] + + # Echo the blocks back to mimic Slack's actual API response behavior. + def mock_post_message_side_effect(**kwargs): + return { + "ok": True, + "channel": kwargs.get("channel"), + "ts": "1002", + "message": {"blocks": kwargs.get("blocks", [])}, + } + + mock_slack_client.chat_postMessage.side_effect = mock_post_message_side_effect + mock_slack_client.chat_update.return_value = {"ok": True} - # Create an uneven mix of simulated events - results = [ - S3EventResult("doc1.pdf", "ObjectCreated", True), - S3EventResult("doc2.pdf", "ObjectCreated", True), - S3EventResult("doc3.pdf", "ObjectRemoved", True), - ] # Notice: 0 "ObjectModified" events + # Force module reload to apply new patches from the source modules + if "app.handler" in sys.modules: + del sys.modules["app.handler"] + from app.handler import handler - S3EventHandler.process_multiple_s3_events(mock_slack_handler, results) + # Run the handler + result = handler(receive_multiple_s3_events, lambda_context) - # Expect update_task to be called twice (for created and deleted, but NOT modified) - assert mock_slack_handler.update_task.call_count == 2 + # --- Assertions --- + assert result["statusCode"] == 200 + assert "Successfully polled and processed sqs events" in result["body"] + + # Assert Boto3 was triggered correctly + mock_bedrock.start_ingestion_job.assert_has_calls( + [ + call(knowledgeBaseId="test-kb-id", dataSourceId="test-ds-id", description="1002"), + call(knowledgeBaseId="test-kb-id", dataSourceId="test-ds-id", description="1003"), + ] + ) + + # Assert Slack WebClient setup calls + calls = mock_slack_client.chat_update.call_args_list + assert len(calls) > 0, "Expected chat_update to be called." - # Verify the actual messages sent - calls = mock_slack_handler.update_task.call_args_list - assert calls[0].kwargs["message"] == "2 files created" - assert calls[1].kwargs["message"] == "1 files deleted" + # Verify the formatted message made its way into the blocks sent to chat_update + last_call_blocks_str = str(calls[-1].kwargs.get("blocks", [])) + assert "1 files created" in last_call_blocks_str + assert "1 files deleted" in last_call_blocks_str @patch("boto3.client") @@ -920,4 +1044,4 @@ def test_search_and_process_sqs_events(mock_boto, mock_slack_init, mock_close, m assert mock_process.call_count == 2 assert mock_close.call_count == 2 - assert mock_search.call_count == 19 + assert mock_search.call_count == 2 From 5956eff79e4906e4979104c5a071112f29e4d03b Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Fri, 13 Mar 2026 12:17:34 +0000 Subject: [PATCH 58/84] fix: Trivy update Black --- poetry.lock | 68 ++++++++++++++++++++++++++--------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/poetry.lock b/poetry.lock index 745bb8f35..b2313d3f8 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 2.2.1 and should not be changed by hand. +# This file is automatically @generated by Poetry 2.3.2 and should not be changed by hand. [[package]] name = "annotated-types" @@ -232,39 +232,39 @@ lxml = ["lxml"] [[package]] name = "black" -version = "26.1.0" +version = "26.3.1" description = "The uncompromising code formatter." optional = false python-versions = ">=3.10" groups = ["dev"] files = [ - {file = "black-26.1.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:ca699710dece84e3ebf6e92ee15f5b8f72870ef984bf944a57a777a48357c168"}, - {file = "black-26.1.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:5e8e75dabb6eb83d064b0db46392b25cabb6e784ea624219736e8985a6b3675d"}, - {file = "black-26.1.0-cp310-cp310-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:eb07665d9a907a1a645ee41a0df8a25ffac8ad9c26cdb557b7b88eeeeec934e0"}, - {file = "black-26.1.0-cp310-cp310-win_amd64.whl", hash = "sha256:7ed300200918147c963c87700ccf9966dceaefbbb7277450a8d646fc5646bf24"}, - {file = "black-26.1.0-cp310-cp310-win_arm64.whl", hash = "sha256:c5b7713daea9bf943f79f8c3b46f361cc5229e0e604dcef6a8bb6d1c37d9df89"}, - {file = "black-26.1.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:3cee1487a9e4c640dc7467aaa543d6c0097c391dc8ac74eb313f2fbf9d7a7cb5"}, - {file = "black-26.1.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:d62d14ca31c92adf561ebb2e5f2741bf8dea28aef6deb400d49cca011d186c68"}, - {file = "black-26.1.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:fb1dafbbaa3b1ee8b4550a84425aac8874e5f390200f5502cf3aee4a2acb2f14"}, - {file = "black-26.1.0-cp311-cp311-win_amd64.whl", hash = "sha256:101540cb2a77c680f4f80e628ae98bd2bd8812fb9d72ade4f8995c5ff019e82c"}, - {file = "black-26.1.0-cp311-cp311-win_arm64.whl", hash = "sha256:6f3977a16e347f1b115662be07daa93137259c711e526402aa444d7a88fdc9d4"}, - {file = "black-26.1.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:6eeca41e70b5f5c84f2f913af857cf2ce17410847e1d54642e658e078da6544f"}, - {file = "black-26.1.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:dd39eef053e58e60204f2cdf059e2442e2eb08f15989eefe259870f89614c8b6"}, - {file = "black-26.1.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:9459ad0d6cd483eacad4c6566b0f8e42af5e8b583cee917d90ffaa3778420a0a"}, - {file = "black-26.1.0-cp312-cp312-win_amd64.whl", hash = "sha256:a19915ec61f3a8746e8b10adbac4a577c6ba9851fa4a9e9fbfbcf319887a5791"}, - {file = "black-26.1.0-cp312-cp312-win_arm64.whl", hash = "sha256:643d27fb5facc167c0b1b59d0315f2674a6e950341aed0fc05cf307d22bf4954"}, - {file = "black-26.1.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:ba1d768fbfb6930fc93b0ecc32a43d8861ded16f47a40f14afa9bb04ab93d304"}, - {file = "black-26.1.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:2b807c240b64609cb0e80d2200a35b23c7df82259f80bef1b2c96eb422b4aac9"}, - {file = "black-26.1.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1de0f7d01cc894066a1153b738145b194414cc6eeaad8ef4397ac9abacf40f6b"}, - {file = "black-26.1.0-cp313-cp313-win_amd64.whl", hash = "sha256:91a68ae46bf07868963671e4d05611b179c2313301bd756a89ad4e3b3db2325b"}, - {file = "black-26.1.0-cp313-cp313-win_arm64.whl", hash = "sha256:be5e2fe860b9bd9edbf676d5b60a9282994c03fbbd40fe8f5e75d194f96064ca"}, - {file = "black-26.1.0-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:9dc8c71656a79ca49b8d3e2ce8103210c9481c57798b48deeb3a8bb02db5f115"}, - {file = "black-26.1.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:b22b3810451abe359a964cc88121d57f7bce482b53a066de0f1584988ca36e79"}, - {file = "black-26.1.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:53c62883b3f999f14e5d30b5a79bd437236658ad45b2f853906c7cbe79de00af"}, - {file = "black-26.1.0-cp314-cp314-win_amd64.whl", hash = "sha256:f016baaadc423dc960cdddf9acae679e71ee02c4c341f78f3179d7e4819c095f"}, - {file = "black-26.1.0-cp314-cp314-win_arm64.whl", hash = "sha256:66912475200b67ef5a0ab665011964bf924745103f51977a78b4fb92a9fc1bf0"}, - {file = "black-26.1.0-py3-none-any.whl", hash = "sha256:1054e8e47ebd686e078c0bb0eaf31e6ce69c966058d122f2c0c950311f9f3ede"}, - {file = "black-26.1.0.tar.gz", hash = "sha256:d294ac3340eef9c9eb5d29288e96dc719ff269a88e27b396340459dd85da4c58"}, + {file = "black-26.3.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:86a8b5035fce64f5dcd1b794cf8ec4d31fe458cf6ce3986a30deb434df82a1d2"}, + {file = "black-26.3.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:5602bdb96d52d2d0672f24f6ffe5218795736dd34807fd0fd55ccd6bf206168b"}, + {file = "black-26.3.1-cp310-cp310-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:6c54a4a82e291a1fee5137371ab488866b7c86a3305af4026bdd4dc78642e1ac"}, + {file = "black-26.3.1-cp310-cp310-win_amd64.whl", hash = "sha256:6e131579c243c98f35bce64a7e08e87fb2d610544754675d4a0e73a070a5aa3a"}, + {file = "black-26.3.1-cp310-cp310-win_arm64.whl", hash = "sha256:5ed0ca58586c8d9a487352a96b15272b7fa55d139fc8496b519e78023a8dab0a"}, + {file = "black-26.3.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:28ef38aee69e4b12fda8dba75e21f9b4f979b490c8ac0baa7cb505369ac9e1ff"}, + {file = "black-26.3.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:bf9bf162ed91a26f1adba8efda0b573bc6924ec1408a52cc6f82cb73ec2b142c"}, + {file = "black-26.3.1-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:474c27574d6d7037c1bc875a81d9be0a9a4f9ee95e62800dab3cfaadbf75acd5"}, + {file = "black-26.3.1-cp311-cp311-win_amd64.whl", hash = "sha256:5e9d0d86df21f2e1677cc4bd090cd0e446278bcbbe49bf3659c308c3e402843e"}, + {file = "black-26.3.1-cp311-cp311-win_arm64.whl", hash = "sha256:9a5e9f45e5d5e1c5b5c29b3bd4265dcc90e8b92cf4534520896ed77f791f4da5"}, + {file = "black-26.3.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:b5e6f89631eb88a7302d416594a32faeee9fb8fb848290da9d0a5f2903519fc1"}, + {file = "black-26.3.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:41cd2012d35b47d589cb8a16faf8a32ef7a336f56356babd9fcf70939ad1897f"}, + {file = "black-26.3.1-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:0f76ff19ec5297dd8e66eb64deda23631e642c9393ab592826fd4bdc97a4bce7"}, + {file = "black-26.3.1-cp312-cp312-win_amd64.whl", hash = "sha256:ddb113db38838eb9f043623ba274cfaf7d51d5b0c22ecb30afe58b1bb8322983"}, + {file = "black-26.3.1-cp312-cp312-win_arm64.whl", hash = "sha256:dfdd51fc3e64ea4f35873d1b3fb25326773d55d2329ff8449139ebaad7357efb"}, + {file = "black-26.3.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:855822d90f884905362f602880ed8b5df1b7e3ee7d0db2502d4388a954cc8c54"}, + {file = "black-26.3.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:8a33d657f3276328ce00e4d37fe70361e1ec7614da5d7b6e78de5426cb56332f"}, + {file = "black-26.3.1-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:f1cd08e99d2f9317292a311dfe578fd2a24b15dbce97792f9c4d752275c1fa56"}, + {file = "black-26.3.1-cp313-cp313-win_amd64.whl", hash = "sha256:c7e72339f841b5a237ff14f7d3880ddd0fc7f98a1199e8c4327f9a4f478c1839"}, + {file = "black-26.3.1-cp313-cp313-win_arm64.whl", hash = "sha256:afc622538b430aa4c8c853f7f63bc582b3b8030fd8c80b70fb5fa5b834e575c2"}, + {file = "black-26.3.1-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:2d6bfaf7fd0993b420bed691f20f9492d53ce9a2bcccea4b797d34e947318a78"}, + {file = "black-26.3.1-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:f89f2ab047c76a9c03f78d0d66ca519e389519902fa27e7a91117ef7611c0568"}, + {file = "black-26.3.1-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:b07fc0dab849d24a80a29cfab8d8a19187d1c4685d8a5e6385a5ce323c1f015f"}, + {file = "black-26.3.1-cp314-cp314-win_amd64.whl", hash = "sha256:0126ae5b7c09957da2bdbd91a9ba1207453feada9e9fe51992848658c6c8e01c"}, + {file = "black-26.3.1-cp314-cp314-win_arm64.whl", hash = "sha256:92c0ec1f2cc149551a2b7b47efc32c866406b6891b0ee4625e95967c8f4acfb1"}, + {file = "black-26.3.1-py3-none-any.whl", hash = "sha256:2bd5aa94fc267d38bb21a70d7410a89f1a1d318841855f698746f8e7f51acd1b"}, + {file = "black-26.3.1.tar.gz", hash = "sha256:2c50f5063a9641c7eed7795014ba37b0f5fa227f3d408b968936e24bc0566b07"}, ] [package.dependencies] @@ -273,13 +273,13 @@ mypy-extensions = ">=0.4.3" packaging = ">=22.0" pathspec = ">=1.0.0" platformdirs = ">=2" -pytokens = ">=0.3.0" +pytokens = ">=0.4.0,<0.5.0" [package.extras] colorama = ["colorama (>=0.4.3)"] d = ["aiohttp (>=3.10)"] jupyter = ["ipython (>=7.8.0)", "tokenize-rt (>=3.2.0)"] -uvloop = ["uvloop (>=0.15.2)"] +uvloop = ["uvloop (>=0.15.2) ; sys_platform != \"win32\"", "winloop (>=0.5.0) ; sys_platform == \"win32\""] [[package]] name = "boto3" @@ -1630,7 +1630,7 @@ files = [ [package.dependencies] attrs = ">=22.2.0" -jsonschema-specifications = ">=2023.03.6" +jsonschema-specifications = ">=2023.3.6" referencing = ">=0.28.4" rpds-py = ">=0.25.0" @@ -3575,10 +3575,10 @@ files = [ ] [package.dependencies] -botocore = ">=1.37.4,<2.0a.0" +botocore = ">=1.37.4,<2.0a0" [package.extras] -crt = ["botocore[crt] (>=1.37.4,<2.0a.0)"] +crt = ["botocore[crt] (>=1.37.4,<2.0a0)"] [[package]] name = "six" From 960e64a3f321b921c10e18e506cf31774d9c635a Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Fri, 13 Mar 2026 15:57:50 +0000 Subject: [PATCH 59/84] fix: handle multiple file changes --- .../syncKnowledgeBaseFunction/app/handler.py | 56 ++++-- .../tests/test_app.py | 188 +++++++++++++++--- 2 files changed, 198 insertions(+), 46 deletions(-) diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index ce015cc0b..b0f4b8bca 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -328,6 +328,12 @@ def complete_plan(self): class S3EventHandler: + + def __init__(self): + self.created = 0 + self.modified = 0 + self.deleted = 0 + @staticmethod def is_supported_file_type(file_key): """ @@ -356,20 +362,26 @@ def validate_s3_event(bucket_name, object_key): return False return True - @staticmethod - def process_multiple_s3_events(records: list, slack_handler: SlackHandler): + def process_multiple_s3_events(self, records: list, slack_handler: SlackHandler): logger.info("Processing SQS record") + self.created += len([r for r in records if "ObjectCreated" in r.get("eventName", "")]) + self.modified += len([r for r in records if "ObjectModified" in r.get("eventName", "")]) + self.deleted += len([r for r in records if "ObjectRemoved" in r.get("eventName", "")]) + counts = [ - ("created", len([r for r in records if "ObjectCreated" in r.get("eventName", "")])), - ("modified", len([r for r in records if "ObjectModified" in r.get("eventName", "")])), - ("deleted", len([r for r in records if "ObjectRemoved" in r.get("eventName", "")])), + ("created", self.created), + ("modified", self.modified), + ("deleted", self.deleted), ] # Generate the list only for non-zero values message_list = [f"{count} files {action}" for action, count in counts if count > 0] - for message in message_list: - slack_handler.update_task(id=slack_handler.update_block_id, message=message) + + if message_list and len(message_list) > 0: + slack_handler.update_task(id=slack_handler.update_block_id, message="Loading...", replace=True) + for message in message_list: + slack_handler.update_task(id=slack_handler.update_block_id, message=message) @staticmethod def start_ingestion_job(): @@ -390,9 +402,12 @@ def start_ingestion_job(): except Exception as e: logger.error(f"Error starting ingestion: {str(e)}") - @staticmethod - def process_multiple_sqs_events(slack_handler: SlackHandler, s3_records): + def process_multiple_sqs_events(self, slack_handler: SlackHandler, s3_records): """Handle multiple individual events from SQS""" + if s3_records and len(s3_records): + # Start the ingestion job + S3EventHandler.start_ingestion_job() + for record in s3_records: if record.get("eventSource") != "aws:s3": logger.warning( @@ -401,14 +416,10 @@ def process_multiple_sqs_events(slack_handler: SlackHandler, s3_records): ) continue - # Start the ingestion job - S3EventHandler.start_ingestion_job() - # Process event details for the Slack Messages - S3EventHandler.process_multiple_s3_events(records=s3_records, slack_handler=slack_handler) + self.process_multiple_s3_events(records=s3_records, slack_handler=slack_handler) - @staticmethod - def process_batched_queue_events(slack_handler: SlackHandler, events: list): + def process_batched_queue_events(self, slack_handler: SlackHandler, events: list): """Handle collection of batched queue events""" for event in events: body = json.loads(event.get("body", "{}")) @@ -420,10 +431,10 @@ def process_batched_queue_events(slack_handler: SlackHandler, events: list): logger.info(f"Processing {len(sqs_records)} record(s)") slack_handler.update_task( - id=slack_handler.fetching_block_id, message=f"Found {len(sqs_records)} records", replace=True + id=slack_handler.fetching_block_id, message=f"Found {len(sqs_records)} events", replace=True ) - S3EventHandler.process_multiple_sqs_events(slack_handler, sqs_records) + self.process_multiple_sqs_events(slack_handler, sqs_records) logger.info(f"Completed {len(sqs_records)} event(s)") @@ -453,7 +464,8 @@ def search_sqs_for_events(): body = message.get("Body", {}) message_events = json.loads(body) if message_events: - events.append(message_events) + s3_event = message_events.get("Records", []) + events += s3_event logger.info(f"Found {len(messages)} total event(s) in SQS messages") return events @@ -471,6 +483,8 @@ def search_and_process_sqs_events(event): slack_handler = SlackHandler(silent=is_silent) slack_handler.initialise_slack_messages() + s3_event_handler = S3EventHandler() + for i in range(loop_count): logger.info(f"Starting process round {i + 1}") @@ -481,12 +495,12 @@ def search_and_process_sqs_events(event): # If we have events (either from the initial seed or the search above), process them if events and len(events) > 0: logger.info("Founds events, process") - S3EventHandler.process_batched_queue_events(slack_handler, events) - S3EventHandler.close_sqs_events(events) + s3_event_handler.process_batched_queue_events(slack_handler, events) + s3_event_handler.close_sqs_events(events) # Clear the list so the NEXT loop iteration knows to search again logger.info("Search for any prompts left in the queue") - events = S3EventHandler.search_sqs_for_events() + events = s3_event_handler.search_sqs_for_events() slack_handler.complete_plan() diff --git a/packages/syncKnowledgeBaseFunction/tests/test_app.py b/packages/syncKnowledgeBaseFunction/tests/test_app.py index 5c8671954..8763a1d61 100644 --- a/packages/syncKnowledgeBaseFunction/tests/test_app.py +++ b/packages/syncKnowledgeBaseFunction/tests/test_app.py @@ -4,6 +4,7 @@ import pytest import os import sys +import itertools from unittest.mock import Mock, patch, MagicMock, DEFAULT, call @@ -89,6 +90,14 @@ def receive_multiple_s3_events(): "body": json.dumps( { "Records": [ + { + "eventSource": "aws:s3", + "eventName": "ObjectModified:Put", + "s3": { + "bucket": {"name": "test-bucket"}, + "object": {"key": "file4.pdf", "size": 1024}, + }, + }, { "eventSource": "aws:s3", "eventName": "ObjectCreated:Put", @@ -105,6 +114,14 @@ def receive_multiple_s3_events(): "object": {"key": "file2.pdf", "size": 2048}, }, }, + { + "eventSource": "aws:s3", + "eventName": "ObjectRemoved:Delete", + "s3": { + "bucket": {"name": "test-bucket"}, + "object": {"key": "file3.pdf", "size": 512}, + }, + }, ] } ), @@ -253,7 +270,7 @@ def test_handler_multiple_files( assert result["statusCode"] == 200 assert "Successfully polled and processed sqs events" in result["body"] - assert mock_bedrock.start_ingestion_job.call_count == 2 + assert mock_bedrock.start_ingestion_job.call_count == 1 @patch("boto3.client") @@ -276,7 +293,7 @@ def test_handler_fetch_files( mock_bedrock.start_ingestion_job.return_value = { "ingestionJob": {"ingestionJobId": "job-123", "status": "STARTING"} } - mock_sqs.receive_message.side_effect = [fetch_sqs_event] + [{}] * 21 + mock_sqs.receive_message.side_effect = [fetch_sqs_event] + [{}] def boto_client_router(service_name, **kwargs): if service_name == "bedrock-agent": @@ -320,8 +337,7 @@ def test_handler_fetch_multiple_files( mock_bedrock.start_ingestion_job.return_value = { "ingestionJob": {"ingestionJobId": "job-123", "status": "STARTING"} } - # mock_sqs.receive_message.side_effect = [fetch_multiple_sqs_event] + [[]] * 29 - mock_sqs.receive_message.side_effect = [fetch_multiple_sqs_event] + [{}] * 21 + mock_sqs.receive_message.side_effect = [fetch_multiple_sqs_event] + [{}] def boto_client_router(service_name, **kwargs): if service_name == "bedrock-agent": @@ -347,17 +363,17 @@ def boto_client_router(service_name, **kwargs): @patch("boto3.client") @patch("time.time") -def test_handler_fetch_multiple_files_handle_infinity( +def test_handler_fetch_multiple_files_infinite( mock_time, mock_boto_client, mock_env, mock_get_bot_token, lambda_context, receive_multiple_s3_events, - fetch_sqs_event, + fetch_multiple_sqs_event, ): - """Test handler with multiple S3 records""" - mock_time.side_effect = [1000, 1001, 1002, 1003, 1004, 1005] + """Test handler with fetching sqs events stops at 20 intervals""" + mock_time.side_effect = itertools.count(start=1000) mock_bedrock = MagicMock() mock_sqs = MagicMock() @@ -365,7 +381,7 @@ def test_handler_fetch_multiple_files_handle_infinity( mock_bedrock.start_ingestion_job.return_value = { "ingestionJob": {"ingestionJobId": "job-123", "status": "STARTING"} } - mock_sqs.receive_message.return_value = fetch_sqs_event + mock_sqs.receive_message.side_effect = (fetch_multiple_sqs_event for _ in range(30)) def boto_client_router(service_name, **kwargs): if service_name == "bedrock-agent": @@ -386,7 +402,7 @@ def boto_client_router(service_name, **kwargs): assert result["statusCode"] == 200 assert "Successfully polled and processed sqs events" in result["body"] - assert mock_bedrock.start_ingestion_job.call_count == 2 # Once for original message + max (20) + assert mock_bedrock.start_ingestion_job.call_count == 20 @patch("slack_sdk.WebClient") @@ -460,7 +476,7 @@ def mock_post_message_side_effect(**kwargs): # Assert Messages were posted and updated mock_slack_client.chat_postMessage.assert_called_once() - assert mock_slack_client.chat_update.call_count == 3 # Update details, update tasks, close + assert mock_slack_client.chat_update.call_count == 4 # Update details, update tasks (+ clear), close @patch("app.config.config.get_bot_active") @@ -803,16 +819,29 @@ def test_process_s3_event_formatting( mock_env, lambda_context, receive_s3_event, + fetch_sqs_event, ): """Test successful handler execution with actual Slack WebClient interaction""" # Mock timing - mock_time.side_effect = [1000, 1001, 1002, 1003, 1004, 1005] + mock_time.side_effect = itertools.count(start=1000) # Setup Boto3 Mock - mock_bedrock = mock_boto_client.return_value + mock_bedrock = MagicMock() + mock_sqs = MagicMock() + mock_bedrock.start_ingestion_job.return_value = { "ingestionJob": {"ingestionJobId": "job-123", "status": "STARTING"} } + mock_sqs.receive_message.side_effect = [fetch_sqs_event for _ in range(1)] + [{}] + + def boto_client_router(service_name, **kwargs): + if service_name == "bedrock-agent": + return mock_bedrock + elif service_name == "sqs": + return mock_sqs + return MagicMock() + + mock_boto_client.side_effect = boto_client_router # Setup Slack SDK WebClient Mock mock_slack_client = MagicMock() @@ -850,10 +879,10 @@ def mock_post_message_side_effect(**kwargs): assert "Successfully polled and processed sqs events" in result["body"] # Assert Boto3 was triggered correctly - mock_bedrock.start_ingestion_job.assert_called_once_with( - knowledgeBaseId="test-kb-id", - dataSourceId="test-ds-id", - description="1002", + mock_bedrock.start_ingestion_job.assert_has_calls( + [ + call(knowledgeBaseId="test-kb-id", dataSourceId="test-ds-id", description="1002"), + ] ) # Assert Slack WebClient setup calls @@ -862,31 +891,44 @@ def mock_post_message_side_effect(**kwargs): # Verify the formatted message made its way into the blocks sent to chat_update last_call_blocks_str = str(calls[-1].kwargs.get("blocks", [])) - assert "1 files created" in last_call_blocks_str + assert "2 files created" in last_call_blocks_str @patch("slack_sdk.WebClient") @patch("app.config.config.get_bot_token") @patch("boto3.client") @patch("time.time") -def test_process_multiple_s3_events_formatting( +def test_process_multiple_s3_event_formatting( mock_time, mock_boto_client, mock_get_bot_token, mock_webclient_class, mock_env, lambda_context, - receive_multiple_s3_events, + receive_s3_event, + fetch_multiple_sqs_event, ): """Test successful handler execution with actual Slack WebClient interaction""" # Mock timing - mock_time.side_effect = [1000, 1001, 1002, 1003, 1004, 1005] + mock_time.side_effect = itertools.count(start=1000) # Setup Boto3 Mock - mock_bedrock = mock_boto_client.return_value + mock_bedrock = MagicMock() + mock_sqs = MagicMock() + mock_bedrock.start_ingestion_job.return_value = { "ingestionJob": {"ingestionJobId": "job-123", "status": "STARTING"} } + mock_sqs.receive_message.side_effect = [fetch_multiple_sqs_event for _ in range(3)] + [{}] + + def boto_client_router(service_name, **kwargs): + if service_name == "bedrock-agent": + return mock_bedrock + elif service_name == "sqs": + return mock_sqs + return MagicMock() + + mock_boto_client.side_effect = boto_client_router # Setup Slack SDK WebClient Mock mock_slack_client = MagicMock() @@ -917,7 +959,98 @@ def mock_post_message_side_effect(**kwargs): from app.handler import handler # Run the handler - result = handler(receive_multiple_s3_events, lambda_context) + result = handler(receive_s3_event, lambda_context) + + # --- Assertions --- + assert result["statusCode"] == 200 + assert "Successfully polled and processed sqs events" in result["body"] + + # Assert Boto3 was triggered correctly + mock_bedrock.start_ingestion_job.assert_has_calls( + [ + call(knowledgeBaseId="test-kb-id", dataSourceId="test-ds-id", description="1002"), + call(knowledgeBaseId="test-kb-id", dataSourceId="test-ds-id", description="1003"), + call(knowledgeBaseId="test-kb-id", dataSourceId="test-ds-id", description="1004"), + ] + ) + + # Assert Slack WebClient setup calls + calls = mock_slack_client.chat_update.call_args_list + assert len(calls) > 0, "Expected chat_update to be called." + + # Verify the formatted message made its way into the blocks sent to chat_update + last_call_blocks_str = str(calls[-1].kwargs.get("blocks", [])) + assert "4 files created" in last_call_blocks_str # +1 in initial call + assert "3 files modified" in last_call_blocks_str + assert "6 files deleted" in last_call_blocks_str + + +@patch("slack_sdk.WebClient") +@patch("app.config.config.get_bot_token") +@patch("boto3.client") +@patch("time.time") +def test_process_multiple_sqs_events_formatting( + mock_time, + mock_boto_client, + mock_get_bot_token, + mock_webclient_class, + mock_env, + lambda_context, + receive_s3_event, + fetch_multiple_sqs_event, +): + """Test successful handler execution with actual Slack WebClient interaction""" + # Mock timing + mock_time.side_effect = itertools.count(start=1000) + + # Setup Boto3 Mock + mock_bedrock = MagicMock() + mock_sqs = MagicMock() + + mock_bedrock.start_ingestion_job.return_value = { + "ingestionJob": {"ingestionJobId": "job-123", "status": "STARTING"} + } + mock_sqs.receive_message.side_effect = [fetch_multiple_sqs_event for _ in range(5)] + [{}] + + def boto_client_router(service_name, **kwargs): + if service_name == "bedrock-agent": + return mock_bedrock + elif service_name == "sqs": + return mock_sqs + return MagicMock() + + mock_boto_client.side_effect = boto_client_router + + # Setup Slack SDK WebClient Mock + mock_slack_client = MagicMock() + mock_webclient_class.return_value = mock_slack_client + mock_get_bot_token.return_value = "test-bot-token" + + # Mock the initial auth and channel fetching + mock_slack_client.auth_test.return_value = {"user_id": "U123456"} + + # Needs to be a list because the handler uses: `for result in self.slack_client.conversations_list(...)` + mock_slack_client.conversations_list.return_value = [{"channels": [{"id": "C123456"}]}] + + # Echo the blocks back to mimic Slack's actual API response behavior. + def mock_post_message_side_effect(**kwargs): + return { + "ok": True, + "channel": kwargs.get("channel"), + "ts": "1002", + "message": {"blocks": kwargs.get("blocks", [])}, + } + + mock_slack_client.chat_postMessage.side_effect = mock_post_message_side_effect + mock_slack_client.chat_update.return_value = {"ok": True} + + # Force module reload to apply new patches from the source modules + if "app.handler" in sys.modules: + del sys.modules["app.handler"] + from app.handler import handler + + # Run the handler + result = handler(receive_s3_event, lambda_context) # --- Assertions --- assert result["statusCode"] == 200 @@ -928,6 +1061,10 @@ def mock_post_message_side_effect(**kwargs): [ call(knowledgeBaseId="test-kb-id", dataSourceId="test-ds-id", description="1002"), call(knowledgeBaseId="test-kb-id", dataSourceId="test-ds-id", description="1003"), + call(knowledgeBaseId="test-kb-id", dataSourceId="test-ds-id", description="1004"), + call(knowledgeBaseId="test-kb-id", dataSourceId="test-ds-id", description="1005"), + call(knowledgeBaseId="test-kb-id", dataSourceId="test-ds-id", description="1006"), + call(knowledgeBaseId="test-kb-id", dataSourceId="test-ds-id", description="1007"), ] ) @@ -937,8 +1074,9 @@ def mock_post_message_side_effect(**kwargs): # Verify the formatted message made its way into the blocks sent to chat_update last_call_blocks_str = str(calls[-1].kwargs.get("blocks", [])) - assert "1 files created" in last_call_blocks_str - assert "1 files deleted" in last_call_blocks_str + assert "6 files created" in last_call_blocks_str # +1 initial call + assert "5 files modified" in last_call_blocks_str + assert "10 files deleted" in last_call_blocks_str @patch("boto3.client") From d52249fe0be1b698aebbd9443f61880568f5bfc3 Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Fri, 13 Mar 2026 16:38:20 +0000 Subject: [PATCH 60/84] fix: handle multiple messages --- .../syncKnowledgeBaseFunction/app/handler.py | 38 +++++++++++++++---- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index b0f4b8bca..a986331e2 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -109,7 +109,12 @@ def create_task( return task def update_task( - self, id: str, message: str, status: Literal["in_progress", "completed"] = "in_progress", replace=False + self, + id: str, + message: str, + status: Literal["in_progress", "completed"] = "in_progress", + output_message: str | None = None, + replace=False, ): # Add header if self.slack_client is None: @@ -147,6 +152,11 @@ def update_task( task["status"] = status task["details"] = details + if output_message: + output = task["output"] + output["elements"][0]["elements"][0]["text"] = output_message + task["output"] = output + self.update_message(channel_id=channel_id, ts=ts, blocks=blocks) def get_bot_channels(self) -> list[str]: @@ -179,8 +189,7 @@ def search_existing_messages(self, channels, user_id, header): found_title = message.get("blocks")[0]["text"]["text"] if found_user == user_id and header == found_title: messages.append(message) - # Found latest message, break - break + break # Found latest message, stop searching except (IndexError, KeyError, TypeError): continue # Handles empty lists, missing keys, or unexpected data types @@ -188,6 +197,8 @@ def search_existing_messages(self, channels, user_id, header): except Exception as e: logger.error(f"Failed to searching slack message history: {str(e)}") + return messages + def initialise_slack_messages(self): """ Create a new slack message to inform user of SQS event process progress @@ -379,9 +390,16 @@ def process_multiple_s3_events(self, records: list, slack_handler: SlackHandler) message_list = [f"{count} files {action}" for action, count in counts if count > 0] if message_list and len(message_list) > 0: - slack_handler.update_task(id=slack_handler.update_block_id, message="Loading...", replace=True) - for message in message_list: - slack_handler.update_task(id=slack_handler.update_block_id, message=message) + slack_handler.update_task( + id=slack_handler.update_block_id, message="", output_message="Processing...", replace=True + ) + for i, message in enumerate(message_list): + output_message = ( + f"Processed a total of {len(records)} record(s)" if (i + 1 == len(message_list)) else None + ) + slack_handler.update_task( + id=slack_handler.update_block_id, message=message, output_message=output_message + ) @staticmethod def start_ingestion_job(): @@ -421,7 +439,7 @@ def process_multiple_sqs_events(self, slack_handler: SlackHandler, s3_records): def process_batched_queue_events(self, slack_handler: SlackHandler, events: list): """Handle collection of batched queue events""" - for event in events: + for i, event in enumerate(events): body = json.loads(event.get("body", "{}")) sqs_records = body.get("Records", []) @@ -430,8 +448,12 @@ def process_batched_queue_events(self, slack_handler: SlackHandler, events: list continue logger.info(f"Processing {len(sqs_records)} record(s)") + output_message = "Search Complete" if (i + 1 == len(events)) else None slack_handler.update_task( - id=slack_handler.fetching_block_id, message=f"Found {len(sqs_records)} events", replace=True + id=slack_handler.fetching_block_id, + message=f"Found {len(sqs_records)} events", + output_message=output_message, + replace=True, ) self.process_multiple_sqs_events(slack_handler, sqs_records) From ebbd7a56a1f66b25285f601e8490e4bf07c95a7a Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Fri, 13 Mar 2026 17:00:32 +0000 Subject: [PATCH 61/84] fix: handle multiple messages --- packages/syncKnowledgeBaseFunction/app/handler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index a986331e2..52c60f78b 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -398,7 +398,7 @@ def process_multiple_s3_events(self, records: list, slack_handler: SlackHandler) f"Processed a total of {len(records)} record(s)" if (i + 1 == len(message_list)) else None ) slack_handler.update_task( - id=slack_handler.update_block_id, message=message, output_message=output_message + id=slack_handler.update_block_id, message=message, output_message=output_message, replace=(i == 0) ) @staticmethod From afc97219ac112d7c0aec73592dc58d09d53cb8d7 Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Fri, 13 Mar 2026 18:36:17 +0000 Subject: [PATCH 62/84] fix: handle multiple slack messages --- .../syncKnowledgeBaseFunction/app/handler.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index 52c60f78b..460c61f05 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -186,8 +186,7 @@ def search_existing_messages(self, channels, user_id, header): for message in history: try: found_user = message.get("user", "") == user_id - found_title = message.get("blocks")[0]["text"]["text"] - if found_user == user_id and header == found_title: + if found_user == user_id: messages.append(message) break # Found latest message, stop searching except (IndexError, KeyError, TypeError): @@ -197,6 +196,7 @@ def search_existing_messages(self, channels, user_id, header): except Exception as e: logger.error(f"Failed to searching slack message history: {str(e)}") + logger.info(f"Found {len(messages)} existing messages") return messages def initialise_slack_messages(self): @@ -224,11 +224,14 @@ def initialise_slack_messages(self): channels=target_channels, user_id=user_id, header=message_default_text ) - logger.info(f"Found {len(existing_messages)} existing messages") - if len(existing_messages) > 0: + logger.info( + f"Found {len(existing_messages)} existing messages", extra={"messages": existing_messages} + ) self.messages = existing_messages return + + logger.info("No valid existing messages found") except Exception as e: logger.error(f"Failed to search for existing slack messages: {str(e)}") @@ -380,6 +383,8 @@ def process_multiple_s3_events(self, records: list, slack_handler: SlackHandler) self.modified += len([r for r in records if "ObjectModified" in r.get("eventName", "")]) self.deleted += len([r for r in records if "ObjectRemoved" in r.get("eventName", "")]) + total = self.created + self.modified + self.deleted + counts = [ ("created", self.created), ("modified", self.modified), @@ -391,11 +396,11 @@ def process_multiple_s3_events(self, records: list, slack_handler: SlackHandler) if message_list and len(message_list) > 0: slack_handler.update_task( - id=slack_handler.update_block_id, message="", output_message="Processing...", replace=True + id=slack_handler.update_block_id, message="Update pending", output_message="Processing...", replace=True ) for i, message in enumerate(message_list): output_message = ( - f"Processed a total of {len(records)} record(s)" if (i + 1 == len(message_list)) else None + f"Processed a total of {len(total)} record(s)" if (i + 1 == len(message_list)) else None ) slack_handler.update_task( id=slack_handler.update_block_id, message=message, output_message=output_message, replace=(i == 0) From b85b48847fe7e846d50c11e2b66d0b575296d169 Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Mon, 16 Mar 2026 14:01:25 +0000 Subject: [PATCH 63/84] fix: Use DynamoDb for slack history --- packages/cdk/resources/DatabaseTables.ts | 14 + packages/cdk/resources/Functions.ts | 4 +- packages/cdk/resources/RuntimePolicies.ts | 31 +- packages/cdk/stacks/EpsAssistMeStack.ts | 7 +- .../app/config/config.py | 1 + .../syncKnowledgeBaseFunction/app/handler.py | 315 +++++++++++------- .../tests/test_app.py | 204 +++++++++++- 7 files changed, 448 insertions(+), 128 deletions(-) diff --git a/packages/cdk/resources/DatabaseTables.ts b/packages/cdk/resources/DatabaseTables.ts index 84318ec39..6a2181b88 100644 --- a/packages/cdk/resources/DatabaseTables.ts +++ b/packages/cdk/resources/DatabaseTables.ts @@ -8,6 +8,7 @@ export interface TablesProps { export class DatabaseTables extends Construct { public readonly slackBotStateTable: DynamoDbTable + public readonly knowledgeSyncStateTable: DynamoDbTable constructor(scope: Construct, id: string, props: TablesProps) { super(scope, id) @@ -24,5 +25,18 @@ export class DatabaseTables extends Construct { }, timeToLiveAttribute: "ttl" }) + + this.knowledgeSyncStateTable = new DynamoDbTable(this, "KnowledgeSyncStateTable", { + tableName: `${props.stackName}-KnowledgeSyncState`, + partitionKey: { + name: "user_channel_composite", + type: AttributeType.STRING + }, + sortKey: { + name: "last_ts", + type: AttributeType.STRING + }, + timeToLiveAttribute: "ttl" + }) } } diff --git a/packages/cdk/resources/Functions.ts b/packages/cdk/resources/Functions.ts index 6f3fd991f..4dbc9ef37 100644 --- a/packages/cdk/resources/Functions.ts +++ b/packages/cdk/resources/Functions.ts @@ -37,6 +37,7 @@ export interface FunctionsProps { readonly ragModelId: string readonly reformulationModelId: string readonly docsBucketName: string + readonly knowledgeSyncStateTable: TableV2 } export class Functions extends Construct { @@ -130,7 +131,8 @@ export class Functions extends Construct { "KNOWLEDGEBASE_ID": props.knowledgeBaseId, "SLACK_BOT_TOKEN_PARAMETER": props.slackBotTokenParameter.parameterName, "SLACK_BOT_ACTIVE": `${!props.isPullRequest}`, - "DATA_SOURCE_ID": props.dataSourceId + "DATA_SOURCE_ID": props.dataSourceId, + "SLACK_BOT_STATE_TABLE": props.knowledgeSyncStateTable.tableName }, additionalPolicies: [props.syncKnowledgeBaseManagedPolicy], reservedConcurrentExecutions: 1 diff --git a/packages/cdk/resources/RuntimePolicies.ts b/packages/cdk/resources/RuntimePolicies.ts index c35acd188..ee38e7113 100644 --- a/packages/cdk/resources/RuntimePolicies.ts +++ b/packages/cdk/resources/RuntimePolicies.ts @@ -8,6 +8,8 @@ export interface RuntimePoliciesProps { readonly slackSigningSecretParameterName: string readonly slackBotStateTableArn: string readonly slackBotStateTableKmsKeyArn: string + readonly knowledgeSyncStateTableArn: string + readonly knowledgeSyncStateTableKmsKeyArn: string readonly knowledgeBaseArn: string readonly guardrailArn: string readonly dataSourceArn: string @@ -142,11 +144,38 @@ export class RuntimePolicies extends Construct { ] }) + const knowledgeSyncDynamoDbPolicy = new PolicyStatement({ + actions: [ + "dynamodb:GetItem", + "dynamodb:PutItem", + "dynamodb:DeleteItem", + "dynamodb:Query", + "dynamodb:Scan", + "dynamodb:BatchGetItem", + "dynamodb:BatchWriteItem", + "dynamodb:UpdateItem" + ], + resources: [props.knowledgeSyncStateTableArn] + }) + + const knowledgeSyncKmsPolicy = new PolicyStatement({ + actions: [ + "kms:Encrypt", + "kms:Decrypt", + "kms:ReEncrypt", + "kms:GenerateDataKey", + "kms:DescribeKey" + ], + resources: [props.knowledgeSyncStateTableKmsKeyArn] + }) + this.syncKnowledgeBasePolicy = new ManagedPolicy(this, "SyncKnowledgeBasePolicy", { description: "Policy for SyncKnowledgeBase Lambda to trigger ingestion jobs", statements: [ syncKnowledgeBaseBedrockPolicy, - syncKnowledgeBaseSSMPolicy + syncKnowledgeBaseSSMPolicy, + knowledgeSyncDynamoDbPolicy, + knowledgeSyncKmsPolicy ] }) diff --git a/packages/cdk/stacks/EpsAssistMeStack.ts b/packages/cdk/stacks/EpsAssistMeStack.ts index 0423c3bc0..0f1dc5831 100644 --- a/packages/cdk/stacks/EpsAssistMeStack.ts +++ b/packages/cdk/stacks/EpsAssistMeStack.ts @@ -160,7 +160,9 @@ export class EpsAssistMeStack extends Stack { ragModelId: bedrockPromptResources.modelId, reformulationModelId: bedrockPromptResources.modelId, docsBucketArn: storage.kbDocsBucket.bucketArn, - docsBucketKmsKeyArn: storage.kbDocsKmsKey.keyArn + docsBucketKmsKeyArn: storage.kbDocsKmsKey.keyArn, + knowledgeSyncStateTableArn: tables.knowledgeSyncStateTable.table.tableArn, + knowledgeSyncStateTableKmsKeyArn: tables.knowledgeSyncStateTable.kmsKey.keyArn }) // Create Functions construct with actual values from VectorKB @@ -193,7 +195,8 @@ export class EpsAssistMeStack extends Stack { reformulationModelId: bedrockPromptResources.modelId, isPullRequest: isPullRequest, mainSlackBotLambdaExecutionRoleArn: mainSlackBotLambdaExecutionRoleArn, - docsBucketName: storage.kbDocsBucket.bucketName + docsBucketName: storage.kbDocsBucket.bucketName, + knowledgeSyncStateTable: tables.knowledgeSyncStateTable.table }) // Grant preprocessing Lambda access to the KMS key for S3 bucket diff --git a/packages/syncKnowledgeBaseFunction/app/config/config.py b/packages/syncKnowledgeBaseFunction/app/config/config.py index 8178bf1d3..fbdbce140 100644 --- a/packages/syncKnowledgeBaseFunction/app/config/config.py +++ b/packages/syncKnowledgeBaseFunction/app/config/config.py @@ -15,6 +15,7 @@ AWS_ACCOUNT_ID = os.environ.get("AWS_ACCOUNT_ID") SQS_URL = os.environ.get("SQS_URL") SLACK_BOT_ACTIVE = os.environ.get("SLACK_BOT_ACTIVE", False) +KNOWLEDGE_SYNC_STATE_TABLE = os.environ.get("KNOWLEDGE_SYNC_STATE_TABLE", False) # Supported file types for Bedrock Knowledge Base ingestion SUPPORTED_FILE_TYPES = {".pdf", ".txt", ".md", ".csv", ".doc", ".docx", ".xls", ".xlsx", ".html", ".json"} diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index 460c61f05..0a99e781a 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -17,6 +17,7 @@ DATA_SOURCE_ID, SUPPORTED_FILE_TYPES, SQS_URL, + KNOWLEDGE_SYNC_STATE_TABLE, get_bot_active, get_bot_token, logger, @@ -24,11 +25,67 @@ from slack_sdk import WebClient from slack_sdk.errors import SlackApiError from slack_sdk.web import SlackResponse +from functools import cached_property +from botocore.exceptions import ClientError +from boto3.dynamodb.conditions import Key bedrock_agent = boto3.client("bedrock-agent") sqs = boto3.client("sqs") +class DynamoDbHandler: + @cached_property + def table(self): + # This will only run once per instance of SlackActivityDB + print("Connecting to DynamoDB...") + dynamodb = boto3.resource("dynamodb") + return dynamodb.Table(KNOWLEDGE_SYNC_STATE_TABLE) + + def save_last_message(self, user_id, channel_id, ts): + # You access it like a variable, without parentheses () + try: + self.table.put_item( + Item={ + "user_id": user_id, + "channel_id": channel_id, + "last_ts": str(ts), + "created": 0, + "modified": 0, + "deleted": 0, + } + ) + logger.info(f"Successfully saved ts {ts} for user {user_id} in {channel_id}") + except ClientError as e: + logger.error(f"Failed to save to DynamoDB: {e.response['Error']['Message']}") + + def get_latest_message(self, user_id, channel_id): + """ + Retrieves the latest message timestamp for a user in a specific channel. + Returns the timestamp as a string, or None if no record exists. + """ + try: + response = self.table.query( + KeyConditionExpression=Key("user_channel_composite").eq(f"{user_id}#{channel_id}"), + ScanIndexForward=False, # This forces Descending order (Latest first) + Limit=1, # Get only the latest result + ) + + latest_item = response.get("Items", [{}])[0] if response.get("Items") else None + if latest_item: + logger.info( + "Found latest item", + extra={"user_id": user_id, "channel_id": channel_id, "ts": latest_item.get("last_ts")}, + ) + return latest_item + else: + logger.info(f"No previous message found for {user_id} in {channel_id}") + return None + + except ClientError as e: + logger.error(f"Failed to read from DynamoDB: {e.response['Error']['Message']}") + return None + + class SlackHandler: def __init__(self, silent=True): @@ -41,13 +98,17 @@ def __init__(self, silent=True): self.slack_client: WebClient | None = None self.messages: list[SlackResponse] = [] self.default_slack_message: str = "Updating Source Files" + self.db_handler = DynamoDbHandler() + self.target_channels = [] def post_message(self, channel_id: str, blocks: list, text_fallback: str): """Send a new message to Slack""" try: if self.silent: - logger.info(f"[SILENT MODE] Would have posted to {channel_id}") - return {"ok": True, "channel": channel_id, "ts": "123456", "message": {"blocks": blocks}} + mock_ts = f"{time.time():.6f}" + logger.info(f"[SILENT MODE] Would have posted to {channel_id}", extra={"ts": mock_ts, "blocks": blocks}) + + return {"ok": True, "channel": channel_id, "ts": mock_ts, "message": {"blocks": blocks}} return self.slack_client.chat_postMessage(channel=channel_id, text=text_fallback, blocks=blocks) except SlackApiError as e: @@ -129,9 +190,13 @@ def update_task( logger.warning("No Slack message, skipping update task") continue - blocks = slack_message["message"]["blocks"] + blocks = slack_message.get("message", {}).get("blocks", []) plan = next((block for block in blocks if block["type"] == "plan"), None) - tasks = plan["tasks"] + + if plan is None: + continue + + tasks = plan.get("tasks") if tasks is None: logger.warning("No task found, skipping update task") @@ -174,132 +239,145 @@ def get_bot_channels(self) -> list[str]: return channel_ids - def search_existing_messages(self, channels, user_id, header): - """Get any messages in Slack for the last 20 minutes""" - messages = [] - try: - for channel_id in channels: - # Search message in the channel - history = self.slack_client.conversations_history( - channel=channel_id, limit=20, oldest=str(time.time() - (20 * 60)) + def create_default_response(self, channel_id, user_id, ts, blocks): + return { + "ok": True, + "channel": channel_id, + "ts": ts, + "message": { + "type": "message", + "text": "*My knowledge base has been updated!*", + "user": user_id, + "ts": ts, + "blocks": blocks, + }, + } + + def get_latest_message(self, user_id, channel_id, blocks, s3_event_handler): + latest_message = self.db_handler.get_latest_message(user_id, channel_id) + last_ts = latest_message.get("last_ts") + + if last_ts: + time_since_last = time.time() - float(last_ts) + # Check if message is less than 10 minutes old (600 seconds) + if time_since_last < 600: + logger.info( + f"Message recently sent to {channel_id} ({int(time_since_last)}s ago). Skipping new message." ) - for message in history: - try: - found_user = message.get("user", "") == user_id - if found_user == user_id: - messages.append(message) - break # Found latest message, stop searching - except (IndexError, KeyError, TypeError): - continue - # Handles empty lists, missing keys, or unexpected data types - # Just catch so the loop doesn't break - except Exception as e: - logger.error(f"Failed to searching slack message history: {str(e)}") - logger.info(f"Found {len(messages)} existing messages") - return messages + s3_event_handler.created = int(latest_message.get("created", 0)) + s3_event_handler.modified = int(latest_message.get("modified", 0)) + s3_event_handler.deleted = int(latest_message.get("deleted", 0)) + default = self.create_default_response( + channel_id=channel_id, user_id=user_id, ts=last_ts, blocks=blocks + ) + return default + return None + + def post_initial_message(self, user_id, channel_id, blocks): + logger.info("Creating new Slack Message") + response = self.post_message( + channel_id=channel_id, + blocks=blocks, + text_fallback="*My knowledge base has been updated!*", + ) - def initialise_slack_messages(self): - """ - Create a new slack message to inform user of SQS event process progress - """ - try: - # Create new client - token = get_bot_token() - slack_client = WebClient(token=token) - self.slack_client = slack_client + if not response or not response.get("ok"): + logger.error("Error initialising Slack Message.", extra={"response": response}) + return None - response = slack_client.auth_test() - user_id = response.get("user_id", "unknown") - logger.info(f"Authenticated as bot user: {user_id}", extra={"response": response}) + new_ts = response.get("ts") + if new_ts: + self.db_handler.save_last_message(user_id, channel_id, new_ts) - # Get Channels where the Bot is a member - logger.info("Find bot channels...") - target_channels = self.get_bot_channels() + return response - # Check if a message already exists - message_default_text = "I am currently syncing changes to my knowledge base.\n This may take a few minutes." - try: - existing_messages = self.search_existing_messages( - channels=target_channels, user_id=user_id, header=message_default_text - ) + def initialise_slack(self): + # Create new client + token = get_bot_token() + slack_client = WebClient(token=token) + self.slack_client = slack_client - if len(existing_messages) > 0: - logger.info( - f"Found {len(existing_messages)} existing messages", extra={"messages": existing_messages} - ) - self.messages = existing_messages - return + response = slack_client.auth_test() + user_id = response.get("user_id", "unknown") + logger.info(f"Authenticated as bot user: {user_id}", extra={"response": response}) - logger.info("No valid existing messages found") - except Exception as e: - logger.error(f"Failed to search for existing slack messages: {str(e)}") - - # Build blocks for Slack message - blocks = [ - { - "type": "section", - "text": { - "type": "plain_text", - "text": message_default_text, - }, - }, - { - "type": "plan", - "plan_id": uuid.uuid4().hex, - "title": "Processing File Changes...", - "tasks": [ - self.create_task( - id=self.fetching_block_id, - title="Fetching changes", - details=[], - outputs=["Searching"], - status="complete", - ), - self.create_task( - id=self.update_block_id, - title="Processing File Changes", - details=[], - outputs=["Initialising"], - status="in_progress", - ), - ], - }, - { - "type": "context", - "elements": [ - {"type": "plain_text", "text": "Please wait up-to 10 minutes for changes to take effect"} - ], + # Get Channels where the Bot is a member + logger.info("Find bot channels...") + self.target_channels = self.get_bot_channels() + + if not self.target_channels: + logger.warning("SKIPPING - Bot is not in any channels. No messages sent.") + return user_id, [] + + message_default_text = "I am currently syncing changes to my knowledge base.\n This may take a few minutes." + + # Build blocks for Slack message + blocks = [ + { + "type": "section", + "text": { + "type": "plain_text", + "text": message_default_text, }, - ] + }, + { + "type": "plan", + "plan_id": uuid.uuid4().hex, + "title": "Processing File Changes...", + "tasks": [ + self.create_task( + id=self.fetching_block_id, + title="Fetching changes", + details=[], + outputs=["Searching"], + status="complete", + ), + self.create_task( + id=self.update_block_id, + title="Processing File Changes", + details=[], + outputs=["Initialising"], + status="in_progress", + ), + ], + }, + { + "type": "context", + "elements": [{"type": "plain_text", "text": "Please wait up-to 10 minutes for changes to take effect"}], + }, + ] - if not target_channels: - logger.warning("SKIPPING - Bot is not in any channels. No messages sent.") - return + return user_id, blocks - # Broadcast Loop - logger.info(f"Broadcasting to {len(target_channels)} channels...") + def initialise_slack_messages(self, s3_event_handler: S3EventHandler): + """ + Create a new slack message to inform user of SQS event process progress + or skip if a message was recently created + """ + try: + user_id, blocks = self.initialise_slack() + # Broadcast Loop + logger.info(f"Searching {len(self.target_channels)} channels...") responses = [] - for channel_id in target_channels: + for channel_id in self.target_channels: try: - logger.info("Creating new Slack Message") - response = self.post_message( - channel_id=channel_id, - blocks=blocks, - text_fallback="*My knowledge base has been updated!*", + latest_message = self.get_latest_message( + user_id=user_id, channel_id=channel_id, s3_event_handler=s3_event_handler, blocks=blocks ) - - if not response or not response.get("ok"): - logger.error("Error initialising Slack Message.", extra={"response": response}) + if latest_message: + responses.append(latest_message) continue - responses.append(response) + new_message = self.post_initial_message(user_id=user_id, channel_id=channel_id, blocks=blocks) + if new_message: + responses.append(new_message) + except Exception as e: logger.error( f"Failed to initialise slack message for channel: {channel_id}", extra={"exception": e} ) - continue logger.info("Broadcast complete.", extra={"responses": len(responses)}) self.messages = responses @@ -320,12 +398,13 @@ def complete_plan(self): ts = slack_message["ts"] # Update the event count in the plan block - blocks = slack_message["message"]["blocks"] + blocks = slack_message.get("message", {}).get("blocks", []) plan = next((block for block in blocks if block["type"] == "plan"), None) - plan["title"] = "Processing complete!" - for i, task in enumerate(plan["tasks"]): - task["status"] = "complete" + if plan: + plan["title"] = "Processing complete!" + for i, task in enumerate(plan["tasks"]): + task["status"] = "complete" self.update_message(channel_id=channel_id, ts=ts, blocks=blocks) except Exception as e: @@ -399,9 +478,7 @@ def process_multiple_s3_events(self, records: list, slack_handler: SlackHandler) id=slack_handler.update_block_id, message="Update pending", output_message="Processing...", replace=True ) for i, message in enumerate(message_list): - output_message = ( - f"Processed a total of {len(total)} record(s)" if (i + 1 == len(message_list)) else None - ) + output_message = f"Processed a total of {total} record(s)" if (i + 1 == len(message_list)) else None slack_handler.update_task( id=slack_handler.update_block_id, message=message, output_message=output_message, replace=(i == 0) ) @@ -506,11 +583,11 @@ def search_and_process_sqs_events(event): events = event.get("Records", []) loop_count = 20 + s3_event_handler = S3EventHandler() + is_silent = not get_bot_active() # Mute Slack for PRs slack_handler = SlackHandler(silent=is_silent) - slack_handler.initialise_slack_messages() - - s3_event_handler = S3EventHandler() + slack_handler.initialise_slack_messages(s3_event_handler=s3_event_handler) for i in range(loop_count): logger.info(f"Starting process round {i + 1}") diff --git a/packages/syncKnowledgeBaseFunction/tests/test_app.py b/packages/syncKnowledgeBaseFunction/tests/test_app.py index 8763a1d61..d3f1bf45e 100644 --- a/packages/syncKnowledgeBaseFunction/tests/test_app.py +++ b/packages/syncKnowledgeBaseFunction/tests/test_app.py @@ -19,12 +19,28 @@ def mock_env(): "AWS_REGION": "eu-west-2", "SQS_URL": "example", "SLACK_BOT_ACTIVE": "true", + "KNOWLEDGE_SYNC_STATE_TABLE": "test-state-table", # <-- ADDED } with patch.dict(os.environ, env_vars, clear=False): yield env_vars +@pytest.fixture(autouse=True) +def mock_dynamo_resource(): + """ + ADDED: Mocks boto3.resource globally to prevent real AWS DynamoDB calls + and simulate an empty table so the 10-minute block is never triggered. + """ + with patch("boto3.resource") as mock_resource: + mock_table = MagicMock() + # Returning an empty dict simulates a missing record, meaning + # "Item" won't be in the response, and the script proceeds normally. + mock_table.get_item.return_value = {} + mock_resource.return_value.Table.return_value = mock_table + yield mock_resource + + @pytest.fixture def lambda_context(): """Mock Lambda context""" @@ -420,7 +436,7 @@ def test_handler_slack_success( ): """Test successful handler execution with actual Slack WebClient interaction""" # Mock timing - mock_time.side_effect = [1000, 1001, 1002, 1003, 1004, 1005] + mock_time.side_effect = [999, 1000, 1001, 1002, 1003, 1004, 1005] # Setup Boto3 Mock mock_bedrock = mock_boto_client.return_value @@ -467,7 +483,7 @@ def mock_post_message_side_effect(**kwargs): mock_bedrock.start_ingestion_job.assert_called_once_with( knowledgeBaseId="test-kb-id", dataSourceId="test-ds-id", - description="1002", + description="1001", ) # Assert Slack WebClient setup calls @@ -496,7 +512,7 @@ def test_handler_slack_silent_success( ): """Test successful handler execution with actual Slack WebClient interaction""" # Mock timing - mock_time.side_effect = [1000, 1001, 1002, 1003, 1004, 1005] + mock_time.side_effect = [999, 1000, 1001, 1002, 1003, 1004, 1005] # Setup Boto3 Mock mock_bedrock = mock_boto_client.return_value @@ -1001,7 +1017,7 @@ def test_process_multiple_sqs_events_formatting( ): """Test successful handler execution with actual Slack WebClient interaction""" # Mock timing - mock_time.side_effect = itertools.count(start=1000) + mock_time.side_effect = itertools.count(start=999) # Setup Boto3 Mock mock_bedrock = MagicMock() @@ -1059,12 +1075,12 @@ def mock_post_message_side_effect(**kwargs): # Assert Boto3 was triggered correctly mock_bedrock.start_ingestion_job.assert_has_calls( [ + call(knowledgeBaseId="test-kb-id", dataSourceId="test-ds-id", description="1001"), call(knowledgeBaseId="test-kb-id", dataSourceId="test-ds-id", description="1002"), call(knowledgeBaseId="test-kb-id", dataSourceId="test-ds-id", description="1003"), call(knowledgeBaseId="test-kb-id", dataSourceId="test-ds-id", description="1004"), call(knowledgeBaseId="test-kb-id", dataSourceId="test-ds-id", description="1005"), call(knowledgeBaseId="test-kb-id", dataSourceId="test-ds-id", description="1006"), - call(knowledgeBaseId="test-kb-id", dataSourceId="test-ds-id", description="1007"), ] ) @@ -1183,3 +1199,181 @@ def test_search_and_process_sqs_events(mock_boto, mock_slack_init, mock_close, m assert mock_process.call_count == 2 assert mock_close.call_count == 2 assert mock_search.call_count == 2 + + +@patch("boto3.resource") +@patch("boto3.client") +def test_dynamodb_handler_save_last_message(mock_boto, mock_boto_resource, mock_env): + """Test that save_last_message formats the item correctly and calls put_item""" + from app.handler import DynamoDbHandler + + mock_table = MagicMock() + mock_boto_resource.return_value.Table.return_value = mock_table + + db_handler = DynamoDbHandler() + db_handler.save_last_message(user_id="U123", channel_id="C456", ts="1710581159.123456") + + mock_table.put_item.assert_called_once_with( + Item={ + "user_id": "U123", + "channel_id": "C456", + "last_ts": "1710581159.123456", + "created": 0, + "modified": 0, + "deleted": 0, + } + ) + + +@patch("boto3.resource") +@patch("boto3.client") +def test_dynamodb_handler_get_latest_message_exists(mock_boto, mock_boto_resource, mock_env): + """Test retrieving a timestamp when a record already exists in the database""" + from app.handler import DynamoDbHandler + + mock_table = MagicMock() + # Simulate DynamoDB returning a found record + mock_table.query.return_value = {"Items": [{"last_ts": "999.999"}]} + mock_boto_resource.return_value.Table.return_value = mock_table + + db_handler = DynamoDbHandler() + result = db_handler.get_latest_message("U123", "C456") + + assert result.get("last_ts") == "999.999" + mock_table.query.assert_called_once() + + +@patch("slack_sdk.WebClient") +@patch("app.config.config.get_bot_token") +@patch("boto3.client") +@patch("time.time") +def test_handler_slack_skip_recent_update( + mock_time, + mock_boto_client, + mock_get_bot_token, + mock_webclient_class, + mock_env, + lambda_context, + receive_s3_event, + mock_dynamo_resource, +): + """Test successful handler execution with actual Slack WebClient interaction""" + # Mock timing + mock_time.side_effect = [1000, 1001, 1002, 1003, 1004, 1005] + + # Setup Boto3 Mock + mock_bedrock = mock_boto_client.return_value + mock_bedrock.start_ingestion_job.return_value = { + "ingestionJob": {"ingestionJobId": "job-123", "status": "STARTING"} + } + + # Setup Slack SDK WebClient Mock + mock_slack_client = MagicMock() + mock_webclient_class.return_value = mock_slack_client + mock_get_bot_token.return_value = "test-bot-token" + + # Mock the initial auth and channel fetching + mock_slack_client.auth_test.return_value = {"user_id": "U123456"} + + # Needs to be a list because the handler uses: `for result in self.slack_client.conversations_list(...)` + mock_slack_client.conversations_list.return_value = [{"channels": [{"id": "C123456"}]}] + mock_slack_client.chat_update.return_value = {"ok": True} + mock_slack_client.create_default_response = {} + + # Force module reload to apply new patches from the source modules + if "app.handler" in sys.modules: + del sys.modules["app.handler"] + from app.handler import handler + + with patch("app.handler.DynamoDbHandler") as mock_db_class: + mock_db_instance = mock_db_class.return_value + mock_db_instance.get_latest_message.return_value = {"last_ts": 1000} + + # Run the handler + result = handler(receive_s3_event, lambda_context) + + # --- Assertions --- + assert result["statusCode"] == 200 + assert "Successfully polled and processed sqs events" in result["body"] + + # Assert Boto3 was triggered correctly + mock_bedrock.start_ingestion_job.assert_called_once_with( + knowledgeBaseId="test-kb-id", + dataSourceId="test-ds-id", + description="1002", + ) + + # Assert Slack WebClient setup calls + mock_slack_client.auth_test.assert_called_once() + mock_slack_client.conversations_list.assert_called_once_with(types=["private_channel"], limit=1000) + + # Assert Messages were posted and updated + mock_slack_client.chat_postMessage.assert_not_called() + + +@patch("slack_sdk.WebClient") +@patch("app.config.config.get_bot_token") +@patch("boto3.client") +@patch("time.time") +def test_handler_slack_use_recent_update( + mock_time, + mock_boto_client, + mock_get_bot_token, + mock_webclient_class, + mock_env, + lambda_context, + receive_s3_event, + mock_dynamo_resource, +): + """Test successful handler execution with actual Slack WebClient interaction""" + # Mock timing + mock_time.side_effect = [1000, 1001, 1002, 1003, 1004, 1005] + + # Setup Boto3 Mock + mock_bedrock = mock_boto_client.return_value + mock_bedrock.start_ingestion_job.return_value = { + "ingestionJob": {"ingestionJobId": "job-123", "status": "STARTING"} + } + + # Setup Slack SDK WebClient Mock + mock_slack_client = MagicMock() + mock_webclient_class.return_value = mock_slack_client + mock_get_bot_token.return_value = "test-bot-token" + + # Mock the initial auth and channel fetching + mock_slack_client.auth_test.return_value = {"user_id": "U123456"} + + # Needs to be a list because the handler uses: `for result in self.slack_client.conversations_list(...)` + mock_slack_client.conversations_list.return_value = [{"channels": [{"id": "C123456"}]}] + mock_slack_client.chat_update.return_value = {"ok": True} + mock_slack_client.create_default_response = {} + + # Force module reload to apply new patches from the source modules + if "app.handler" in sys.modules: + del sys.modules["app.handler"] + from app.handler import handler + + with patch("app.handler.DynamoDbHandler") as mock_db_class: + mock_db_instance = mock_db_class.return_value + mock_db_instance.get_latest_message.return_value = {"last_ts": 1} + + # Run the handler + result = handler(receive_s3_event, lambda_context) + + # --- Assertions --- + assert result["statusCode"] == 200 + assert "Successfully polled and processed sqs events" in result["body"] + + # Assert Boto3 was triggered correctly + mock_bedrock.start_ingestion_job.assert_called_once_with( + knowledgeBaseId="test-kb-id", + dataSourceId="test-ds-id", + description="1002", + ) + + # Assert Slack WebClient setup calls + mock_slack_client.auth_test.assert_called_once() + mock_slack_client.conversations_list.assert_called_once_with(types=["private_channel"], limit=1000) + + # Assert Messages were posted and updated + mock_slack_client.chat_postMessage.assert_called_once() From f2d87d47e99f6fd9f3e0858e271f18598e672264 Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Mon, 16 Mar 2026 14:42:57 +0000 Subject: [PATCH 64/84] fix: Use DynamoDb for updated file history --- .../syncKnowledgeBaseFunction/app/handler.py | 79 ++++++++++++++++--- .../tests/test_app.py | 46 +++++++---- 2 files changed, 101 insertions(+), 24 deletions(-) diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index 0a99e781a..e32da53cb 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -41,8 +41,7 @@ def table(self): dynamodb = boto3.resource("dynamodb") return dynamodb.Table(KNOWLEDGE_SYNC_STATE_TABLE) - def save_last_message(self, user_id, channel_id, ts): - # You access it like a variable, without parentheses () + def save_message(self, user_id, channel_id, ts): try: self.table.put_item( Item={ @@ -58,6 +57,22 @@ def save_last_message(self, user_id, channel_id, ts): except ClientError as e: logger.error(f"Failed to save to DynamoDB: {e.response['Error']['Message']}") + def update_message(self, user_id, channel_id, ts, created, modified, deleted): + try: + self.table.put_item( + Item={ + "user_id": user_id, + "channel_id": channel_id, + "last_ts": str(ts), + "created": created, + "modified": modified, + "deleted": deleted, + } + ) + logger.info(f"Successfully updated message {ts} for user {user_id} in {channel_id}") + except ClientError as e: + logger.error(f"Failed to save to DynamoDB: {e.response['Error']['Message']}") + def get_latest_message(self, user_id, channel_id): """ Retrieves the latest message timestamp for a user in a specific channel. @@ -224,6 +239,48 @@ def update_task( self.update_message(channel_id=channel_id, ts=ts, blocks=blocks) + def update_task_db(self, created, modified, deleted): + try: + for slack_message in self.messages: + channel_id = slack_message["channel"] + ts = slack_message["ts"] + + logger.info( + "Updating database", + extra={ + "channel_id": channel_id, + "ts": ts, + "records_created": created, + "records_modified": modified, + "records_deleted": deleted, + }, + ) + + # Update data in database + self.db_handler.update_message( + user_id=self.user_id, + channel_id=channel_id, + ts=ts, + created=created, + modified=modified, + deleted=deleted, + ) + except Exception as e: + # Handle unexpected errors + logger.error( + "Unexpected error occurred", + extra={ + "status_code": 500, + "error_type": type(e).__name__, + "error_message": str(e), + "channel_id": channel_id, + "ts": ts, + "records_created": created, + "records_modified": modified, + "records_deleted": deleted, + }, + ) + def get_bot_channels(self) -> list[str]: """ Fetches all public and private channels the bot is a member of. @@ -268,6 +325,7 @@ def get_latest_message(self, user_id, channel_id, blocks, s3_event_handler): s3_event_handler.created = int(latest_message.get("created", 0)) s3_event_handler.modified = int(latest_message.get("modified", 0)) s3_event_handler.deleted = int(latest_message.get("deleted", 0)) + default = self.create_default_response( channel_id=channel_id, user_id=user_id, ts=last_ts, blocks=blocks ) @@ -288,7 +346,7 @@ def post_initial_message(self, user_id, channel_id, blocks): new_ts = response.get("ts") if new_ts: - self.db_handler.save_last_message(user_id, channel_id, new_ts) + self.db_handler.save_message(user_id, channel_id, new_ts) return response @@ -299,8 +357,8 @@ def initialise_slack(self): self.slack_client = slack_client response = slack_client.auth_test() - user_id = response.get("user_id", "unknown") - logger.info(f"Authenticated as bot user: {user_id}", extra={"response": response}) + self.user_id = response.get("user_id", "unknown") + logger.info(f"Authenticated as bot user: {self.user_id}", extra={"response": response}) # Get Channels where the Bot is a member logger.info("Find bot channels...") @@ -308,7 +366,7 @@ def initialise_slack(self): if not self.target_channels: logger.warning("SKIPPING - Bot is not in any channels. No messages sent.") - return user_id, [] + return [] message_default_text = "I am currently syncing changes to my knowledge base.\n This may take a few minutes." @@ -348,7 +406,7 @@ def initialise_slack(self): }, ] - return user_id, blocks + return blocks def initialise_slack_messages(self, s3_event_handler: S3EventHandler): """ @@ -356,7 +414,7 @@ def initialise_slack_messages(self, s3_event_handler: S3EventHandler): or skip if a message was recently created """ try: - user_id, blocks = self.initialise_slack() + blocks = self.initialise_slack() # Broadcast Loop logger.info(f"Searching {len(self.target_channels)} channels...") @@ -364,13 +422,13 @@ def initialise_slack_messages(self, s3_event_handler: S3EventHandler): for channel_id in self.target_channels: try: latest_message = self.get_latest_message( - user_id=user_id, channel_id=channel_id, s3_event_handler=s3_event_handler, blocks=blocks + user_id=self.user_id, channel_id=channel_id, s3_event_handler=s3_event_handler, blocks=blocks ) if latest_message: responses.append(latest_message) continue - new_message = self.post_initial_message(user_id=user_id, channel_id=channel_id, blocks=blocks) + new_message = self.post_initial_message(user_id=self.user_id, channel_id=channel_id, blocks=blocks) if new_message: responses.append(new_message) @@ -482,6 +540,7 @@ def process_multiple_s3_events(self, records: list, slack_handler: SlackHandler) slack_handler.update_task( id=slack_handler.update_block_id, message=message, output_message=output_message, replace=(i == 0) ) + slack_handler.update_task_db(created=self.created, modified=self.modified, deleted=self.deleted) @staticmethod def start_ingestion_job(): diff --git a/packages/syncKnowledgeBaseFunction/tests/test_app.py b/packages/syncKnowledgeBaseFunction/tests/test_app.py index d3f1bf45e..e5eb6f66c 100644 --- a/packages/syncKnowledgeBaseFunction/tests/test_app.py +++ b/packages/syncKnowledgeBaseFunction/tests/test_app.py @@ -19,7 +19,7 @@ def mock_env(): "AWS_REGION": "eu-west-2", "SQS_URL": "example", "SLACK_BOT_ACTIVE": "true", - "KNOWLEDGE_SYNC_STATE_TABLE": "test-state-table", # <-- ADDED + "KNOWLEDGE_SYNC_STATE_TABLE": "test-state-table", } with patch.dict(os.environ, env_vars, clear=False): @@ -229,10 +229,17 @@ def slack_message_event(): @patch("app.handler.SlackHandler.initialise_slack_messages") +@patch("app.handler.SlackHandler.update_task_db") @patch("boto3.client") @patch("time.time") def test_handler_success( - mock_time, mock_boto_client, mock_initialise_slack_messages, mock_env, lambda_context, receive_s3_event + mock_time, + mock_boto_client, + mock_update_task_db, + mock_initialise_slack_messages, + mock_env, + lambda_context, + receive_s3_event, ): """Test successful handler execution""" mock_time.side_effect = [1000, 1001, 1002, 1003] @@ -257,13 +264,11 @@ def test_handler_success( ) -@patch("app.handler.SlackHandler.initialise_slack_messages") @patch("boto3.client") @patch("time.time") def test_handler_multiple_files( mock_time, mock_boto_client, - mock_initialise_slack_messages, mock_env, mock_get_bot_token, lambda_context, @@ -275,18 +280,20 @@ def test_handler_multiple_files( mock_bedrock.start_ingestion_job.return_value = { "ingestionJob": {"ingestionJobId": "job-123", "status": "STARTING"} } - mock_initialise_slack_messages.return_value = (DEFAULT, []) # Force reload the module to catch the new patches if "app.handler" in sys.modules: del sys.modules["app.handler"] - from app.handler import handler + import app.handler - result = handler(receive_multiple_s3_events, lambda_context) + with patch.object(app.handler.SlackHandler, "initialise_slack_messages", return_value=(DEFAULT, [])), patch.object( + app.handler.SlackHandler, "update_task_db" + ): + result = app.handler.handler(receive_multiple_s3_events, lambda_context) - assert result["statusCode"] == 200 - assert "Successfully polled and processed sqs events" in result["body"] - assert mock_bedrock.start_ingestion_job.call_count == 1 + assert result["statusCode"] == 200 + assert "Successfully polled and processed sqs events" in result["body"] + assert mock_bedrock.start_ingestion_job.call_count == 1 @patch("boto3.client") @@ -325,7 +332,9 @@ def boto_client_router(service_name, **kwargs): del sys.modules["app.handler"] import app.handler - with patch.object(app.handler.SlackHandler, "initialise_slack_messages", return_value=(DEFAULT, [])): + with patch.object(app.handler.SlackHandler, "initialise_slack_messages", return_value=(DEFAULT, [])), patch.object( + app.handler.SlackHandler, "update_task_db" + ): result = app.handler.handler(receive_multiple_s3_events, lambda_context) assert result["statusCode"] == 200 @@ -369,7 +378,9 @@ def boto_client_router(service_name, **kwargs): del sys.modules["app.handler"] import app.handler - with patch.object(app.handler.SlackHandler, "initialise_slack_messages", return_value=(DEFAULT, [])): + with patch.object(app.handler.SlackHandler, "initialise_slack_messages", return_value=(DEFAULT, [])), patch.object( + app.handler.SlackHandler, "update_task_db" + ): result = app.handler.handler(receive_multiple_s3_events, lambda_context) assert result["statusCode"] == 200 @@ -413,7 +424,9 @@ def boto_client_router(service_name, **kwargs): del sys.modules["app.handler"] import app.handler - with patch.object(app.handler.SlackHandler, "initialise_slack_messages", return_value=(DEFAULT, [])): + with patch.object(app.handler.SlackHandler, "initialise_slack_messages", return_value=(DEFAULT, [])), patch.object( + app.handler.SlackHandler, "update_task_db" + ): result = app.handler.handler(receive_multiple_s3_events, lambda_context) assert result["statusCode"] == 200 @@ -423,11 +436,13 @@ def boto_client_router(service_name, **kwargs): @patch("slack_sdk.WebClient") @patch("app.config.config.get_bot_token") +@patch("boto3.resource") @patch("boto3.client") @patch("time.time") def test_handler_slack_success( mock_time, mock_boto_client, + mock_boto_resource, mock_get_bot_token, mock_webclient_class, mock_env, @@ -444,6 +459,9 @@ def test_handler_slack_success( "ingestionJob": {"ingestionJobId": "job-123", "status": "STARTING"} } + mock_dynamo = mock_boto_resource.return_value + mock_dynamo.table.return_value = {} + # Setup Slack SDK WebClient Mock mock_slack_client = MagicMock() mock_webclient_class.return_value = mock_slack_client @@ -1211,7 +1229,7 @@ def test_dynamodb_handler_save_last_message(mock_boto, mock_boto_resource, mock_ mock_boto_resource.return_value.Table.return_value = mock_table db_handler = DynamoDbHandler() - db_handler.save_last_message(user_id="U123", channel_id="C456", ts="1710581159.123456") + db_handler.save_message(user_id="U123", channel_id="C456", ts="1710581159.123456") mock_table.put_item.assert_called_once_with( Item={ From 365ee42893899c20f3f3b4ea1f775ff2342f541f Mon Sep 17 00:00:00 2001 From: anthony-nhs <121869075+anthony-nhs@users.noreply.github.com> Date: Mon, 16 Mar 2026 12:15:32 +0000 Subject: [PATCH 65/84] Chore: [AEA-0000] - fix sync role permissions so it does not clash with other pull requests (#448) ## Summary - Routine Change ### Details - give sync role permissions directly on bucket and kms key - stagger dependabot updates --- .devcontainer/devcontainer.json | 2 +- .github/dependabot.yml | 4 ++-- packages/cdk/constructs/S3Bucket.ts | 24 ++++++++++++++++++++++++ packages/cdk/resources/Storage.ts | 6 ++++-- packages/cdk/stacks/EpsAssistMeStack.ts | 18 +++++++----------- 5 files changed, 38 insertions(+), 16 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index a1c973560..14c91cc3b 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,5 +1,5 @@ { - "name": "Ubuntu", + "name": "eps-assist-me", "build": { "dockerfile": "Dockerfile", "context": "..", diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 4a87436b4..e903a05fd 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -25,7 +25,7 @@ updates: schedule: interval: "weekly" day: "friday" - time: "18:00" + time: "20:00" open-pull-requests-limit: 20 versioning-strategy: increase commit-message: @@ -39,7 +39,7 @@ updates: schedule: interval: "weekly" day: "friday" - time: "18:00" + time: "22:00" open-pull-requests-limit: 20 versioning-strategy: increase commit-message: diff --git a/packages/cdk/constructs/S3Bucket.ts b/packages/cdk/constructs/S3Bucket.ts index b79908cc1..8bdc8c3cd 100644 --- a/packages/cdk/constructs/S3Bucket.ts +++ b/packages/cdk/constructs/S3Bucket.ts @@ -14,6 +14,7 @@ import { AccountRootPrincipal, Effect, IPrincipal, + IRole, PolicyDocument, PolicyStatement } from "aws-cdk-lib/aws-iam" @@ -23,6 +24,7 @@ export interface S3BucketProps { readonly versioned: boolean readonly deploymentRole: IPrincipal readonly auditLoggingBucket: IBucket + readonly documentSyncRole: IRole } export class S3Bucket extends Construct { @@ -76,6 +78,19 @@ export class S3Bucket extends Construct { ] }) + const syncPolicy = new PolicyStatement({ + effect: Effect.ALLOW, + principals: [props.documentSyncRole!], + actions: [ + "s3:GetBucket*", + "s3:GetObject*", + "s3:List*" + ], + resources: [ + bucket.bucketArn, + bucket.arnForObjects("*") + ] + }) const accountRootPrincipal = new AccountRootPrincipal() const kmsPolicy = new PolicyDocument({ statements: [ @@ -93,11 +108,20 @@ export class S3Bucket extends Construct { "kms:GenerateDataKey" ], resources:["*"] + }), + new PolicyStatement({ + effect: Effect.ALLOW, + principals: [props.documentSyncRole!], + actions: [ + "kms:Decrypt" + ], + resources:["*"] }) ] }) bucket.addToResourcePolicy(deploymentPolicy) + bucket.addToResourcePolicy(syncPolicy) const contentBucketKmsKey = (kmsKey.node.defaultChild as CfnKey) contentBucketKmsKey.keyPolicy = kmsPolicy.toJSON() diff --git a/packages/cdk/resources/Storage.ts b/packages/cdk/resources/Storage.ts index 396672304..6f9c046b6 100644 --- a/packages/cdk/resources/Storage.ts +++ b/packages/cdk/resources/Storage.ts @@ -1,6 +1,6 @@ import {Construct} from "constructs" import {S3Bucket} from "../constructs/S3Bucket" -import {IPrincipal} from "aws-cdk-lib/aws-iam" +import {IPrincipal, IRole} from "aws-cdk-lib/aws-iam" import {Key} from "aws-cdk-lib/aws-kms" import {Bucket, IBucket} from "aws-cdk-lib/aws-s3" @@ -8,6 +8,7 @@ export interface StorageProps { readonly stackName: string, readonly deploymentRole: IPrincipal readonly auditLoggingBucket: IBucket + readonly assistMeDocumentSyncRole: IRole } export class Storage extends Construct { @@ -22,7 +23,8 @@ export class Storage extends Construct { bucketName: `${props.stackName}-Docs`, versioned: true, deploymentRole: props.deploymentRole, - auditLoggingBucket: props.auditLoggingBucket + auditLoggingBucket: props.auditLoggingBucket, + documentSyncRole: props.assistMeDocumentSyncRole }) this.kbDocsBucket = kbDocsBucket.bucket this.kbDocsKmsKey = kbDocsBucket.kmsKey diff --git a/packages/cdk/stacks/EpsAssistMeStack.ts b/packages/cdk/stacks/EpsAssistMeStack.ts index 0f1dc5831..2071fcc60 100644 --- a/packages/cdk/stacks/EpsAssistMeStack.ts +++ b/packages/cdk/stacks/EpsAssistMeStack.ts @@ -64,6 +64,11 @@ export class EpsAssistMeStack extends Stack { const deploymentRole = Role.fromRoleArn(this, "deploymentRole", deploymentRoleImport) const auditLoggingBucket = Bucket.fromBucketArn( this, "AuditLoggingBucket", auditLoggingBucketImport) + const assistMeDocumentSyncRole = Role.fromRoleArn( + this, + "AssistMeDocumentSyncRole", + assistMeDocumentSyncRoleArn + ) if (!slackBotToken || !slackSigningSecret) { throw new Error("Missing required context variables. Please provide slackBotToken and slackSigningSecret") @@ -94,7 +99,8 @@ export class EpsAssistMeStack extends Stack { const storage = new Storage(this, "Storage", { stackName: props.stackName, deploymentRole: deploymentRole, - auditLoggingBucket: auditLoggingBucket + auditLoggingBucket: auditLoggingBucket, + assistMeDocumentSyncRole: assistMeDocumentSyncRole }) // Create Bedrock execution role without dependencies @@ -252,16 +258,6 @@ export class EpsAssistMeStack extends Stack { regressionTestRole.addManagedPolicy(regressionTestPolicy) } - // Grant Access to Document Sync Role - const assistMeDocumentSyncRole = Role.fromRoleArn( - this, - "AssistMeDocumentSyncRole", - assistMeDocumentSyncRoleArn - ) - - storage.kbDocsBucket.grantRead(assistMeDocumentSyncRole) - storage.kbDocsKmsKey.grantDecrypt(assistMeDocumentSyncRole) - // Output: SlackBot Endpoint new CfnOutput(this, "SlackBotEventsEndpoint", { value: `https://${apis.apis["api"].api.domainName?.domainName}/slack/events`, From 0798cce01b288896d1169d8fc9d611e7055dda63 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Mar 2026 13:37:20 +0000 Subject: [PATCH 66/84] Upgrade: [dependabot] - bump pyjwt from 2.11.0 to 2.12.0 (#466) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [pyjwt](https://github.com/jpadilla/pyjwt) from 2.11.0 to 2.12.0.
Release notes

Sourced from pyjwt's releases.

2.12.0

Security

What's Changed

New Contributors

Full Changelog: https://github.com/jpadilla/pyjwt/compare/2.11.0...2.12.0

Changelog

Sourced from pyjwt's changelog.

v2.12.0 <https://github.com/jpadilla/pyjwt/compare/2.11.0...2.12.0>__

Fixed


- Annotate PyJWKSet.keys for pyright by @tamird in
`[#1134](https://github.com/jpadilla/pyjwt/issues/1134)
<https://github.com/jpadilla/pyjwt/pull/1134>`__
- Close ``HTTPError`` response to prevent ``ResourceWarning`` on Python
3.14 by @veeceey in
`[#1133](https://github.com/jpadilla/pyjwt/issues/1133)
<https://github.com/jpadilla/pyjwt/pull/1133>`__
- Do not keep ``algorithms`` dict in PyJWK instances by @akx in
`[#1143](https://github.com/jpadilla/pyjwt/issues/1143)
<https://github.com/jpadilla/pyjwt/pull/1143>`__
- Validate the crit (Critical) Header Parameter defined in RFC 7515
§4.1.11. by @dmbs335 in `GHSA-752w-5fwx-jx9f
<https://github.com/jpadilla/pyjwt/security/advisories/GHSA-752w-5fwx-jx9f>`__
- Use PyJWK algorithm when encoding without explicit algorithm in
`[#1148](https://github.com/jpadilla/pyjwt/issues/1148)
<https://github.com/jpadilla/pyjwt/pull/1148>`__

Added

  • Docs: Add PyJWKClient API reference and document the two-tier caching system (JWK Set cache and signing key LRU cache).
Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=pyjwt&package-manager=pip&previous-version=2.11.0&new-version=2.12.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/NHSDigital/eps-assist-me/network/alerts).
--------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Anthony Brown --- .gitignore | 1 + .trivyignore.yaml | 3 +++ poetry.lock | 6 +++--- pyproject.toml | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 716d5fcd9..63f88b679 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ cdk.out .local_config/ .dependencies/ .poetry/ +.trivy_out/ diff --git a/.trivyignore.yaml b/.trivyignore.yaml index 48626c7f4..47ade86ab 100644 --- a/.trivyignore.yaml +++ b/.trivyignore.yaml @@ -26,3 +26,6 @@ vulnerabilities: - id: CVE-2026-27904 statement: minimatch is only used in build stage and not included in production code expired_at: 2026-04-01 + - id: CVE-2026-32141 + statement: flatted vulnerability + expired_at: 2026-06-01 diff --git a/poetry.lock b/poetry.lock index b2313d3f8..1c0812d70 100644 --- a/poetry.lock +++ b/poetry.lock @@ -2969,14 +2969,14 @@ windows-terminal = ["colorama (>=0.4.6)"] [[package]] name = "pyjwt" -version = "2.11.0" +version = "2.12.0" description = "JSON Web Token implementation in Python" optional = false python-versions = ">=3.9" groups = ["preprocessingfunction"] files = [ - {file = "pyjwt-2.11.0-py3-none-any.whl", hash = "sha256:94a6bde30eb5c8e04fee991062b534071fd1439ef58d2adc9ccb823e7bcd0469"}, - {file = "pyjwt-2.11.0.tar.gz", hash = "sha256:35f95c1f0fbe5d5ba6e43f00271c275f7a1a4db1dab27bf708073b75318ea623"}, + {file = "pyjwt-2.12.0-py3-none-any.whl", hash = "sha256:9bb459d1bdd0387967d287f5656bf7ec2b9a26645d1961628cda1764e087fd6e"}, + {file = "pyjwt-2.12.0.tar.gz", hash = "sha256:2f62390b667cd8257de560b850bb5a883102a388829274147f1d724453f8fb02"}, ] [package.dependencies] diff --git a/pyproject.toml b/pyproject.toml index ec3c8e318..0b7bbc25c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -21,7 +21,7 @@ python = "^3.14" pytest = "^9.0.2" pre-commit = "^4.5.1" cfn-lint = "^1.44.0" -black = "^26.1.0" +black = "^26.3.1" flake8 = "^7.3.0" jinja2 = "^3.1.6" pip-licenses = "^5.5.1" From b08e4fbeb2bc7c6fccb474ab96de58b079134154 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Mar 2026 13:58:13 +0000 Subject: [PATCH 67/84] Upgrade: [dependabot] - bump slack-sdk from 3.40.1 to 3.41.0 (#459) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [slack-sdk](https://github.com/slackapi/python-slack-sdk) from 3.40.1 to 3.41.0.
Release notes

Sourced from slack-sdk's releases.

v3.41.0

What's Changed

🚀 Enhancements

📦 Other changes

Full Changelog: https://github.com/slackapi/python-slack-sdk/compare/v3.40.1...v3.41.0 Milestone: https://github.com/slackapi/python-slack-sdk/milestone/117?closed=1

Commits
  • 0c08503 chore(release): version 3.41.0 (#1841)
  • 72e915a chore(deps): bump actions/download-artifact from 7.0.0 to 8.0.0 (#1839)
  • 55d6206 chore(deps): bump actions/stale from 10.1.1 to 10.2.0 (#1838)
  • 2a2db8f chore(deps): bump actions/upload-artifact from 6.0.0 to 7.0.0 (#1837)
  • 96a914e feat: add support for apps.user.connection.update (#1835)
  • 1d765dc chore: add AGENTS.md and consolidate development scripts (#1836)
  • See full diff in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=slack-sdk&package-manager=pip&previous-version=3.40.1&new-version=3.41.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- poetry.lock | 17 +++++++++-------- pyproject.toml | 9 ++++++++- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/poetry.lock b/poetry.lock index 1c0812d70..3b3d56c92 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 2.3.2 and should not be changed by hand. +# This file is automatically @generated by Poetry 2.2.1 and should not be changed by hand. [[package]] name = "annotated-types" @@ -1090,7 +1090,7 @@ files = [ {file = "colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"}, {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"}, ] -markers = {dev = "sys_platform == \"win32\" or platform_system == \"Windows\"", preprocessingfunction = "platform_system == \"Windows\""} +markers = {dev = "platform_system == \"Windows\" or sys_platform == \"win32\"", preprocessingfunction = "platform_system == \"Windows\""} [[package]] name = "coverage" @@ -1630,7 +1630,7 @@ files = [ [package.dependencies] attrs = ">=22.2.0" -jsonschema-specifications = ">=2023.3.6" +jsonschema-specifications = ">=2023.03.6" referencing = ">=0.28.4" rpds-py = ">=0.25.0" @@ -3575,10 +3575,10 @@ files = [ ] [package.dependencies] -botocore = ">=1.37.4,<2.0a0" +botocore = ">=1.37.4,<2.0a.0" [package.extras] -crt = ["botocore[crt] (>=1.37.4,<2.0a0)"] +crt = ["botocore[crt] (>=1.37.4,<2.0a.0)"] [[package]] name = "six" @@ -3609,14 +3609,14 @@ slack_sdk = ">=3.38.0,<4" [[package]] name = "slack-sdk" -version = "3.40.1" +version = "3.41.0" description = "The Slack API Platform SDK for Python" optional = false python-versions = ">=3.7" groups = ["slackbotfunction", "syncknowledgebasefunction"] files = [ - {file = "slack_sdk-3.40.1-py2.py3-none-any.whl", hash = "sha256:cd8902252979aa248092b0d77f3a9ea3cc605bc5d53663ad728e892e26e14a65"}, - {file = "slack_sdk-3.40.1.tar.gz", hash = "sha256:a215333bc251bc90abf5f5110899497bf61a3b5184b6d9ee35d73ebf09ec3fd0"}, + {file = "slack_sdk-3.41.0-py2.py3-none-any.whl", hash = "sha256:bb18dcdfff1413ec448e759cf807ec3324090993d8ab9111c74081623b692a89"}, + {file = "slack_sdk-3.41.0.tar.gz", hash = "sha256:eb61eb12a65bebeca9cb5d36b3f799e836ed2be21b456d15df2627cfe34076ca"}, ] [package.extras] @@ -3939,3 +3939,4 @@ requests = "*" lock-version = "2.1" python-versions = "^3.14" content-hash = "827eccd89c88931c656b74c99b31acea948409992ed6795a62a78588989f0ff5" +content-hash = "d8b22a2e4d6c6fb727d45748ec1a6a68aaccb241ce87860e551f84d777729190" diff --git a/pyproject.toml b/pyproject.toml index 0b7bbc25c..145e5d375 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -34,7 +34,7 @@ moto = {extras = ["ssm"], version = "^5.1.21"} [tool.poetry.group.slackBotFunction.dependencies] slack-bolt = "^1.25.0" -slack-sdk = "^3.40.1" +slack-sdk = "^3.41.0" boto3 = "^1.42.54" requests = "^2.32.5" urllib3 = "^2.6.3" @@ -62,5 +62,12 @@ aws-lambda-powertools = "^3.23.0" markitdown = {extras = ["pdf", "docx", "xlsx"], version = "^0.0.1a12"} +[tool.poetry.group.notifyS3UploadFunction.dependencies] +aws-lambda-powertools = "^3.23.0" +urllib3 = "^2.6.3" +slack-bolt = "^1.25.0" +slack-sdk = "^3.41.0" + + [tool.black] line-length = 120 From 71f1d5f982ddee93ea918f08110976fc3a1d1335 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Mar 2026 14:19:52 +0000 Subject: [PATCH 68/84] Upgrade: [dependabot] - bump moto from 5.1.21 to 5.1.22 (#465) Bumps [moto](https://github.com/getmoto/moto) from 5.1.21 to 5.1.22.
Changelog

Sourced from moto's changelog.

5.1.22

Docker Digest for 5.1.22: sha256:1e3802c95726373544967b428201c548f0247c15b00db2d96a5ba0a77d8643b8

New Methods:
    * APIGateway:
        * delete_model()

* Athena:
    * tag_resource()
    * untag_resource()

* Pipes:
    * list_tags_for_resource()

* OSIS:
    * delete_resource_policy()
    * get_resource_policy()
    * put_resource_policy()

* RDS:
    * copy_db_cluster_parameter_group()

* STS:
    * get_access_key_info()

* Transfer:
    * list_servers()



Miscellaneous:

* CloudFormation now supports the creation/update/deletion of
AWS::CloudWatch::Dashboard resources

* CloudFormation now supports the creation/update/deletion of
AWS::KMS::Alias resources

* CloudFormation now supports the creation/update/deletion of
AWS::SSM::Document resources

* EC2: create_fleet() now supports the parameters DryRun and
LaunchTemplateConfigs.Overrides

* EC2: describe_network_interfaces() now supports the
'attachment.attachment-id'-filter

* EC2: Instances created from a LaunchTemplate now have the
'aws:ec2launchtemplate:id' and 'aws:ec2launchtemplate:version' tags

* RDS: create_db_cluster_parameter_group() now validates the provided
group name/description/familiy

* RDS: delete_db_cluster_parameter_group() now validates that the
provided group exists

* S3: delete_object() now supports IfMatch

* SecretsManager: create-secret() now throw ResourceExistsException for
duplicate requests with different token (broken since 5.1.11)

* SQS: send_message() now returns the SequenceNumber-attribute

* VPCLattice: list_access_log_subscriptions() now also supports arns as
resourceIdentifiers

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=moto&package-manager=pip&previous-version=5.1.21&new-version=5.1.22)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- poetry.lock | 9 ++++----- pyproject.toml | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/poetry.lock b/poetry.lock index 3b3d56c92..4bd716483 100644 --- a/poetry.lock +++ b/poetry.lock @@ -2023,14 +2023,14 @@ files = [ [[package]] name = "moto" -version = "5.1.21" +version = "5.1.22" description = "A library that allows you to easily mock out tests based on AWS infrastructure" optional = false python-versions = ">=3.9" groups = ["dev"] files = [ - {file = "moto-5.1.21-py3-none-any.whl", hash = "sha256:311a30095b08b39dd2707f161f1440d361684fe0090b9fd0751dfd1c9b022445"}, - {file = "moto-5.1.21.tar.gz", hash = "sha256:713dde46e71e2714fa9a29eec513ec618d35e1d84c256331b5aab3f30692feeb"}, + {file = "moto-5.1.22-py3-none-any.whl", hash = "sha256:d9f20ae3cf29c44f93c1f8f06c8f48d5560e5dc027816ef1d0d2059741ffcfbe"}, + {file = "moto-5.1.22.tar.gz", hash = "sha256:e5b2c378296e4da50ce5a3c355a1743c8d6d396ea41122f5bb2a40f9b9a8cc0e"}, ] [package.dependencies] @@ -3938,5 +3938,4 @@ requests = "*" [metadata] lock-version = "2.1" python-versions = "^3.14" -content-hash = "827eccd89c88931c656b74c99b31acea948409992ed6795a62a78588989f0ff5" -content-hash = "d8b22a2e4d6c6fb727d45748ec1a6a68aaccb241ce87860e551f84d777729190" +content-hash = "827eccd89c88931c656b74c99b31acea948409992ed6795a62a78588989f0ff5" \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index 145e5d375..e53c6da2f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,7 +29,7 @@ click = "^8.3.0" rich = "^14.3.3" pytest-mock = "^3.15.1" pytest-cov = "^7.0.0" -moto = {extras = ["ssm"], version = "^5.1.21"} +moto = {extras = ["ssm"], version = "^5.1.22"} [tool.poetry.group.slackBotFunction.dependencies] From 00b64f421083223e6fcdf0c45b57f2ee5fec78e7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Mar 2026 14:41:04 +0000 Subject: [PATCH 69/84] Upgrade: [dependabot] - bump cfn-lint from 1.44.0 to 1.46.0 (#444) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [cfn-lint](https://github.com/aws-cloudformation/cfn-lint) from 1.44.0 to 1.46.0.
Release notes

Sourced from cfn-lint's releases.

Release v1.46.0

What's Changed

New Contributors

Full Changelog: https://github.com/aws-cloudformation/cfn-lint/compare/v1.45.0...v1.46.0

Release v1.45.0

What's Changed

New Contributors

Full Changelog: https://github.com/aws-cloudformation/cfn-lint/compare/v1.44.0...v1.45.0

Changelog

Sourced from cfn-lint's changelog.

v1.46.0

What's Changed

New Contributors

Full Changelog: https://github.com/aws-cloudformation/cfn-lint/compare/v1.45.0...v1.46.0

v1.45.0

What's Changed

New Contributors

Full Changelog: https://github.com/aws-cloudformation/cfn-lint/compare/v1.44.0...v1.45.0

Commits
  • e934090 Release v1.46.0 (#4380)
  • 0baeac8 Update CloudFormation schemas to 2026-03-02 (#4375)
  • 8740131 feat: add rule E3063 to validate GuardDuty Detector property exclusivity (#4364)
  • 596a08b Release v1.45.0 (#4374)
  • 8f85b91 Update CloudFormation schemas to 2026-02-23 (#4362)
  • 718a23a Accept any SSM parameter and List types with warning for undocumented types (...
  • a46657d Fix E3009 false positive for Fn::Transform in additional properties (#4368)
  • 599b0fa Pin cfn-lint version to 1.44.0 in Dockerfile (#4365)
  • f8a00aa chore(deps): bump pyinstaller from 6.18.0 to 6.19.0 in /requirements (#4370)
  • e987bd8 Add lambda schema extensions (#4372)
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=cfn-lint&package-manager=pip&previous-version=1.44.0&new-version=1.46.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index e53c6da2f..3c092169f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -20,7 +20,7 @@ python = "^3.14" [tool.poetry.group.dev.dependencies] pytest = "^9.0.2" pre-commit = "^4.5.1" -cfn-lint = "^1.44.0" +cfn-lint = "^1.46.0" black = "^26.3.1" flake8 = "^7.3.0" jinja2 = "^3.1.6" From ce494410ef1d1d4c83d703466206c5966761d86b Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Mon, 16 Mar 2026 14:57:08 +0000 Subject: [PATCH 70/84] fix: Merge Main fix poetry lock --- poetry.lock | 1172 ++++++++++++++++++++++++++------------------------- 1 file changed, 600 insertions(+), 572 deletions(-) diff --git a/poetry.lock b/poetry.lock index 4bd716483..891befd2e 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 2.2.1 and should not be changed by hand. +# This file is automatically @generated by Poetry 2.3.2 and should not be changed by hand. [[package]] name = "annotated-types" @@ -103,14 +103,14 @@ files = [ [[package]] name = "aws-lambda-powertools" -version = "3.24.0" +version = "3.25.0" description = "Powertools for AWS Lambda (Python) is a developer toolkit to implement Serverless best practices and increase developer velocity." optional = false python-versions = "<4.0.0,>=3.10" -groups = ["bedrockloggingconfigfunction", "preprocessingfunction", "slackbotfunction", "syncknowledgebasefunction"] +groups = ["bedrockloggingconfigfunction", "notifys3uploadfunction", "preprocessingfunction", "slackbotfunction", "syncknowledgebasefunction"] files = [ - {file = "aws_lambda_powertools-3.24.0-py3-none-any.whl", hash = "sha256:9c9002856f61b86f49271a9d7efa0dad322ecd22719ddc1c6bb373e57ee0421a"}, - {file = "aws_lambda_powertools-3.24.0.tar.gz", hash = "sha256:9f86959c4aeac9669da799999aae5feac7a3a86e642b52473892eaa4273d3cc3"}, + {file = "aws_lambda_powertools-3.25.0-py3-none-any.whl", hash = "sha256:295467bfbc546b7b6a26d298cedcd06b04eb2cf96eb32e138126a47d761b7de1"}, + {file = "aws_lambda_powertools-3.25.0.tar.gz", hash = "sha256:5d9c4bdfad1de7976e4ccf26410725aba17c47f081c84311eb2da16a00f75efb"}, ] [package.dependencies] @@ -170,14 +170,14 @@ typing-extensions = ">=4.6.0" [[package]] name = "azure-core" -version = "1.38.0" +version = "1.38.3" description = "Microsoft Azure Core Library for Python" optional = false python-versions = ">=3.9" groups = ["preprocessingfunction"] files = [ - {file = "azure_core-1.38.0-py3-none-any.whl", hash = "sha256:ab0c9b2cd71fecb1842d52c965c95285d3cfb38902f6766e4a471f1cd8905335"}, - {file = "azure_core-1.38.0.tar.gz", hash = "sha256:8194d2682245a3e4e3151a667c686464c3786fed7918b394d035bdcd61bb5993"}, + {file = "azure_core-1.38.3-py3-none-any.whl", hash = "sha256:bf59d29765bf4748ab9edf25f98a30b7ea9797f43e367c06d846a30b29c1f845"}, + {file = "azure_core-1.38.3.tar.gz", hash = "sha256:a7931fd445cb4af8802c6f39c6a326bbd1e34b115846550a8245fa656ead6f8e"}, ] [package.dependencies] @@ -190,20 +190,20 @@ tracing = ["opentelemetry-api (>=1.26,<2.0)"] [[package]] name = "azure-identity" -version = "1.25.1" +version = "1.25.3" description = "Microsoft Azure Identity Library for Python" optional = false python-versions = ">=3.9" groups = ["preprocessingfunction"] files = [ - {file = "azure_identity-1.25.1-py3-none-any.whl", hash = "sha256:e9edd720af03dff020223cd269fa3a61e8f345ea75443858273bcb44844ab651"}, - {file = "azure_identity-1.25.1.tar.gz", hash = "sha256:87ca8328883de6036443e1c37b40e8dc8fb74898240f61071e09d2e369361456"}, + {file = "azure_identity-1.25.3-py3-none-any.whl", hash = "sha256:f4d0b956a8146f30333e071374171f3cfa7bdb8073adb8c3814b65567aa7447c"}, + {file = "azure_identity-1.25.3.tar.gz", hash = "sha256:ab23c0d63015f50b630ef6c6cf395e7262f439ce06e5d07a64e874c724f8d9e6"}, ] [package.dependencies] azure-core = ">=1.31.0" cryptography = ">=2.5" -msal = ">=1.30.0" +msal = ">=1.35.1" msal-extensions = ">=1.2.0" typing-extensions = ">=4.0.0" @@ -283,18 +283,18 @@ uvloop = ["uvloop (>=0.15.2) ; sys_platform != \"win32\"", "winloop (>=0.5.0) ; [[package]] name = "boto3" -version = "1.42.54" +version = "1.42.68" description = "The AWS SDK for Python" optional = false python-versions = ">=3.9" groups = ["bedrockloggingconfigfunction", "dev", "preprocessingfunction", "slackbotfunction", "syncknowledgebasefunction"] files = [ - {file = "boto3-1.42.54-py3-none-any.whl", hash = "sha256:71194e855bfc81a21872cbe29c41f52ffdbe67e0a184a52c13346ef00b328939"}, - {file = "boto3-1.42.54.tar.gz", hash = "sha256:fe3d8ec586c39a0c96327fd317c77ca601ec5f991e9ba7211cacae8db4c07a73"}, + {file = "boto3-1.42.68-py3-none-any.whl", hash = "sha256:dbff353eb7dc93cbddd7926ed24793e0174c04adbe88860dfa639568442e4962"}, + {file = "boto3-1.42.68.tar.gz", hash = "sha256:3f349f967ab38c23425626d130962bcb363e75f042734fe856ea8c5a00eef03c"}, ] [package.dependencies] -botocore = ">=1.42.54,<1.43.0" +botocore = ">=1.42.68,<1.43.0" jmespath = ">=0.7.1,<2.0.0" s3transfer = ">=0.16.0,<0.17.0" @@ -303,14 +303,14 @@ crt = ["botocore[crt] (>=1.21.0,<2.0a0)"] [[package]] name = "boto3-stubs" -version = "1.42.54" -description = "Type annotations for boto3 1.42.54 generated with mypy-boto3-builder 8.12.0" +version = "1.42.68" +description = "Type annotations for boto3 1.42.68 generated with mypy-boto3-builder 8.12.0" optional = false python-versions = ">=3.9" groups = ["slackbotfunction"] files = [ - {file = "boto3_stubs-1.42.54-py3-none-any.whl", hash = "sha256:e1d9bd138e0e535f6636fa091632753d8b0bf6014b55443a18d9279734bd0fbe"}, - {file = "boto3_stubs-1.42.54.tar.gz", hash = "sha256:1722ea18b906d8a01212acbe213e0ba566e853e33d7307cd4d94e74808942145"}, + {file = "boto3_stubs-1.42.68-py3-none-any.whl", hash = "sha256:ed7f98334ef7b2377fa8532190e63dc2c6d1dc895e3d7cb3d6d1c83771b81bf6"}, + {file = "boto3_stubs-1.42.68.tar.gz", hash = "sha256:96ad1020735619483fb9b4da7a5e694b460bf2e18f84a34d5d175d0ffe8c4653"}, ] [package.dependencies] @@ -329,7 +329,7 @@ account = ["mypy-boto3-account (>=1.42.0,<1.43.0)"] acm = ["mypy-boto3-acm (>=1.42.0,<1.43.0)"] acm-pca = ["mypy-boto3-acm-pca (>=1.42.0,<1.43.0)"] aiops = ["mypy-boto3-aiops (>=1.42.0,<1.43.0)"] -all = ["mypy-boto3-accessanalyzer (>=1.42.0,<1.43.0)", "mypy-boto3-account (>=1.42.0,<1.43.0)", "mypy-boto3-acm (>=1.42.0,<1.43.0)", "mypy-boto3-acm-pca (>=1.42.0,<1.43.0)", "mypy-boto3-aiops (>=1.42.0,<1.43.0)", "mypy-boto3-amp (>=1.42.0,<1.43.0)", "mypy-boto3-amplify (>=1.42.0,<1.43.0)", "mypy-boto3-amplifybackend (>=1.42.0,<1.43.0)", "mypy-boto3-amplifyuibuilder (>=1.42.0,<1.43.0)", "mypy-boto3-apigateway (>=1.42.0,<1.43.0)", "mypy-boto3-apigatewaymanagementapi (>=1.42.0,<1.43.0)", "mypy-boto3-apigatewayv2 (>=1.42.0,<1.43.0)", "mypy-boto3-appconfig (>=1.42.0,<1.43.0)", "mypy-boto3-appconfigdata (>=1.42.0,<1.43.0)", "mypy-boto3-appfabric (>=1.42.0,<1.43.0)", "mypy-boto3-appflow (>=1.42.0,<1.43.0)", "mypy-boto3-appintegrations (>=1.42.0,<1.43.0)", "mypy-boto3-application-autoscaling (>=1.42.0,<1.43.0)", "mypy-boto3-application-insights (>=1.42.0,<1.43.0)", "mypy-boto3-application-signals (>=1.42.0,<1.43.0)", "mypy-boto3-applicationcostprofiler (>=1.42.0,<1.43.0)", "mypy-boto3-appmesh (>=1.42.0,<1.43.0)", "mypy-boto3-apprunner (>=1.42.0,<1.43.0)", "mypy-boto3-appstream (>=1.42.0,<1.43.0)", "mypy-boto3-appsync (>=1.42.0,<1.43.0)", "mypy-boto3-arc-region-switch (>=1.42.0,<1.43.0)", "mypy-boto3-arc-zonal-shift (>=1.42.0,<1.43.0)", "mypy-boto3-artifact (>=1.42.0,<1.43.0)", "mypy-boto3-athena (>=1.42.0,<1.43.0)", "mypy-boto3-auditmanager (>=1.42.0,<1.43.0)", "mypy-boto3-autoscaling (>=1.42.0,<1.43.0)", "mypy-boto3-autoscaling-plans (>=1.42.0,<1.43.0)", "mypy-boto3-b2bi (>=1.42.0,<1.43.0)", "mypy-boto3-backup (>=1.42.0,<1.43.0)", "mypy-boto3-backup-gateway (>=1.42.0,<1.43.0)", "mypy-boto3-backupsearch (>=1.42.0,<1.43.0)", "mypy-boto3-batch (>=1.42.0,<1.43.0)", "mypy-boto3-bcm-dashboards (>=1.42.0,<1.43.0)", "mypy-boto3-bcm-data-exports (>=1.42.0,<1.43.0)", "mypy-boto3-bcm-pricing-calculator (>=1.42.0,<1.43.0)", "mypy-boto3-bcm-recommended-actions (>=1.42.0,<1.43.0)", "mypy-boto3-bedrock (>=1.42.0,<1.43.0)", "mypy-boto3-bedrock-agent (>=1.42.0,<1.43.0)", "mypy-boto3-bedrock-agent-runtime (>=1.42.0,<1.43.0)", "mypy-boto3-bedrock-agentcore (>=1.42.0,<1.43.0)", "mypy-boto3-bedrock-agentcore-control (>=1.42.0,<1.43.0)", "mypy-boto3-bedrock-data-automation (>=1.42.0,<1.43.0)", "mypy-boto3-bedrock-data-automation-runtime (>=1.42.0,<1.43.0)", "mypy-boto3-bedrock-runtime (>=1.42.0,<1.43.0)", "mypy-boto3-billing (>=1.42.0,<1.43.0)", "mypy-boto3-billingconductor (>=1.42.0,<1.43.0)", "mypy-boto3-braket (>=1.42.0,<1.43.0)", "mypy-boto3-budgets (>=1.42.0,<1.43.0)", "mypy-boto3-ce (>=1.42.0,<1.43.0)", "mypy-boto3-chatbot (>=1.42.0,<1.43.0)", "mypy-boto3-chime (>=1.42.0,<1.43.0)", "mypy-boto3-chime-sdk-identity (>=1.42.0,<1.43.0)", "mypy-boto3-chime-sdk-media-pipelines (>=1.42.0,<1.43.0)", "mypy-boto3-chime-sdk-meetings (>=1.42.0,<1.43.0)", "mypy-boto3-chime-sdk-messaging (>=1.42.0,<1.43.0)", "mypy-boto3-chime-sdk-voice (>=1.42.0,<1.43.0)", "mypy-boto3-cleanrooms (>=1.42.0,<1.43.0)", "mypy-boto3-cleanroomsml (>=1.42.0,<1.43.0)", "mypy-boto3-cloud9 (>=1.42.0,<1.43.0)", "mypy-boto3-cloudcontrol (>=1.42.0,<1.43.0)", "mypy-boto3-clouddirectory (>=1.42.0,<1.43.0)", "mypy-boto3-cloudformation (>=1.42.0,<1.43.0)", "mypy-boto3-cloudfront (>=1.42.0,<1.43.0)", "mypy-boto3-cloudfront-keyvaluestore (>=1.42.0,<1.43.0)", "mypy-boto3-cloudhsm (>=1.42.0,<1.43.0)", "mypy-boto3-cloudhsmv2 (>=1.42.0,<1.43.0)", "mypy-boto3-cloudsearch (>=1.42.0,<1.43.0)", "mypy-boto3-cloudsearchdomain (>=1.42.0,<1.43.0)", "mypy-boto3-cloudtrail (>=1.42.0,<1.43.0)", "mypy-boto3-cloudtrail-data (>=1.42.0,<1.43.0)", "mypy-boto3-cloudwatch (>=1.42.0,<1.43.0)", "mypy-boto3-codeartifact (>=1.42.0,<1.43.0)", "mypy-boto3-codebuild (>=1.42.0,<1.43.0)", "mypy-boto3-codecatalyst (>=1.42.0,<1.43.0)", "mypy-boto3-codecommit (>=1.42.0,<1.43.0)", "mypy-boto3-codeconnections (>=1.42.0,<1.43.0)", "mypy-boto3-codedeploy (>=1.42.0,<1.43.0)", "mypy-boto3-codeguru-reviewer (>=1.42.0,<1.43.0)", "mypy-boto3-codeguru-security (>=1.42.0,<1.43.0)", "mypy-boto3-codeguruprofiler (>=1.42.0,<1.43.0)", "mypy-boto3-codepipeline (>=1.42.0,<1.43.0)", "mypy-boto3-codestar-connections (>=1.42.0,<1.43.0)", "mypy-boto3-codestar-notifications (>=1.42.0,<1.43.0)", "mypy-boto3-cognito-identity (>=1.42.0,<1.43.0)", "mypy-boto3-cognito-idp (>=1.42.0,<1.43.0)", "mypy-boto3-cognito-sync (>=1.42.0,<1.43.0)", "mypy-boto3-comprehend (>=1.42.0,<1.43.0)", "mypy-boto3-comprehendmedical (>=1.42.0,<1.43.0)", "mypy-boto3-compute-optimizer (>=1.42.0,<1.43.0)", "mypy-boto3-compute-optimizer-automation (>=1.42.0,<1.43.0)", "mypy-boto3-config (>=1.42.0,<1.43.0)", "mypy-boto3-connect (>=1.42.0,<1.43.0)", "mypy-boto3-connect-contact-lens (>=1.42.0,<1.43.0)", "mypy-boto3-connectcampaigns (>=1.42.0,<1.43.0)", "mypy-boto3-connectcampaignsv2 (>=1.42.0,<1.43.0)", "mypy-boto3-connectcases (>=1.42.0,<1.43.0)", "mypy-boto3-connectparticipant (>=1.42.0,<1.43.0)", "mypy-boto3-controlcatalog (>=1.42.0,<1.43.0)", "mypy-boto3-controltower (>=1.42.0,<1.43.0)", "mypy-boto3-cost-optimization-hub (>=1.42.0,<1.43.0)", "mypy-boto3-cur (>=1.42.0,<1.43.0)", "mypy-boto3-customer-profiles (>=1.42.0,<1.43.0)", "mypy-boto3-databrew (>=1.42.0,<1.43.0)", "mypy-boto3-dataexchange (>=1.42.0,<1.43.0)", "mypy-boto3-datapipeline (>=1.42.0,<1.43.0)", "mypy-boto3-datasync (>=1.42.0,<1.43.0)", "mypy-boto3-datazone (>=1.42.0,<1.43.0)", "mypy-boto3-dax (>=1.42.0,<1.43.0)", "mypy-boto3-deadline (>=1.42.0,<1.43.0)", "mypy-boto3-detective (>=1.42.0,<1.43.0)", "mypy-boto3-devicefarm (>=1.42.0,<1.43.0)", "mypy-boto3-devops-guru (>=1.42.0,<1.43.0)", "mypy-boto3-directconnect (>=1.42.0,<1.43.0)", "mypy-boto3-discovery (>=1.42.0,<1.43.0)", "mypy-boto3-dlm (>=1.42.0,<1.43.0)", "mypy-boto3-dms (>=1.42.0,<1.43.0)", "mypy-boto3-docdb (>=1.42.0,<1.43.0)", "mypy-boto3-docdb-elastic (>=1.42.0,<1.43.0)", "mypy-boto3-drs (>=1.42.0,<1.43.0)", "mypy-boto3-ds (>=1.42.0,<1.43.0)", "mypy-boto3-ds-data (>=1.42.0,<1.43.0)", "mypy-boto3-dsql (>=1.42.0,<1.43.0)", "mypy-boto3-dynamodb (>=1.42.0,<1.43.0)", "mypy-boto3-dynamodbstreams (>=1.42.0,<1.43.0)", "mypy-boto3-ebs (>=1.42.0,<1.43.0)", "mypy-boto3-ec2 (>=1.42.0,<1.43.0)", "mypy-boto3-ec2-instance-connect (>=1.42.0,<1.43.0)", "mypy-boto3-ecr (>=1.42.0,<1.43.0)", "mypy-boto3-ecr-public (>=1.42.0,<1.43.0)", "mypy-boto3-ecs (>=1.42.0,<1.43.0)", "mypy-boto3-efs (>=1.42.0,<1.43.0)", "mypy-boto3-eks (>=1.42.0,<1.43.0)", "mypy-boto3-eks-auth (>=1.42.0,<1.43.0)", "mypy-boto3-elasticache (>=1.42.0,<1.43.0)", "mypy-boto3-elasticbeanstalk (>=1.42.0,<1.43.0)", "mypy-boto3-elb (>=1.42.0,<1.43.0)", "mypy-boto3-elbv2 (>=1.42.0,<1.43.0)", "mypy-boto3-emr (>=1.42.0,<1.43.0)", "mypy-boto3-emr-containers (>=1.42.0,<1.43.0)", "mypy-boto3-emr-serverless (>=1.42.0,<1.43.0)", "mypy-boto3-entityresolution (>=1.42.0,<1.43.0)", "mypy-boto3-es (>=1.42.0,<1.43.0)", "mypy-boto3-events (>=1.42.0,<1.43.0)", "mypy-boto3-evs (>=1.42.0,<1.43.0)", "mypy-boto3-finspace (>=1.42.0,<1.43.0)", "mypy-boto3-finspace-data (>=1.42.0,<1.43.0)", "mypy-boto3-firehose (>=1.42.0,<1.43.0)", "mypy-boto3-fis (>=1.42.0,<1.43.0)", "mypy-boto3-fms (>=1.42.0,<1.43.0)", "mypy-boto3-forecast (>=1.42.0,<1.43.0)", "mypy-boto3-forecastquery (>=1.42.0,<1.43.0)", "mypy-boto3-frauddetector (>=1.42.0,<1.43.0)", "mypy-boto3-freetier (>=1.42.0,<1.43.0)", "mypy-boto3-fsx (>=1.42.0,<1.43.0)", "mypy-boto3-gamelift (>=1.42.0,<1.43.0)", "mypy-boto3-gameliftstreams (>=1.42.0,<1.43.0)", "mypy-boto3-geo-maps (>=1.42.0,<1.43.0)", "mypy-boto3-geo-places (>=1.42.0,<1.43.0)", "mypy-boto3-geo-routes (>=1.42.0,<1.43.0)", "mypy-boto3-glacier (>=1.42.0,<1.43.0)", "mypy-boto3-globalaccelerator (>=1.42.0,<1.43.0)", "mypy-boto3-glue (>=1.42.0,<1.43.0)", "mypy-boto3-grafana (>=1.42.0,<1.43.0)", "mypy-boto3-greengrass (>=1.42.0,<1.43.0)", "mypy-boto3-greengrassv2 (>=1.42.0,<1.43.0)", "mypy-boto3-groundstation (>=1.42.0,<1.43.0)", "mypy-boto3-guardduty (>=1.42.0,<1.43.0)", "mypy-boto3-health (>=1.42.0,<1.43.0)", "mypy-boto3-healthlake (>=1.42.0,<1.43.0)", "mypy-boto3-iam (>=1.42.0,<1.43.0)", "mypy-boto3-identitystore (>=1.42.0,<1.43.0)", "mypy-boto3-imagebuilder (>=1.42.0,<1.43.0)", "mypy-boto3-importexport (>=1.42.0,<1.43.0)", "mypy-boto3-inspector (>=1.42.0,<1.43.0)", "mypy-boto3-inspector-scan (>=1.42.0,<1.43.0)", "mypy-boto3-inspector2 (>=1.42.0,<1.43.0)", "mypy-boto3-internetmonitor (>=1.42.0,<1.43.0)", "mypy-boto3-invoicing (>=1.42.0,<1.43.0)", "mypy-boto3-iot (>=1.42.0,<1.43.0)", "mypy-boto3-iot-data (>=1.42.0,<1.43.0)", "mypy-boto3-iot-jobs-data (>=1.42.0,<1.43.0)", "mypy-boto3-iot-managed-integrations (>=1.42.0,<1.43.0)", "mypy-boto3-iotdeviceadvisor (>=1.42.0,<1.43.0)", "mypy-boto3-iotevents (>=1.42.0,<1.43.0)", "mypy-boto3-iotevents-data (>=1.42.0,<1.43.0)", "mypy-boto3-iotfleetwise (>=1.42.0,<1.43.0)", "mypy-boto3-iotsecuretunneling (>=1.42.0,<1.43.0)", "mypy-boto3-iotsitewise (>=1.42.0,<1.43.0)", "mypy-boto3-iotthingsgraph (>=1.42.0,<1.43.0)", "mypy-boto3-iottwinmaker (>=1.42.0,<1.43.0)", "mypy-boto3-iotwireless (>=1.42.0,<1.43.0)", "mypy-boto3-ivs (>=1.42.0,<1.43.0)", "mypy-boto3-ivs-realtime (>=1.42.0,<1.43.0)", "mypy-boto3-ivschat (>=1.42.0,<1.43.0)", "mypy-boto3-kafka (>=1.42.0,<1.43.0)", "mypy-boto3-kafkaconnect (>=1.42.0,<1.43.0)", "mypy-boto3-kendra (>=1.42.0,<1.43.0)", "mypy-boto3-kendra-ranking (>=1.42.0,<1.43.0)", "mypy-boto3-keyspaces (>=1.42.0,<1.43.0)", "mypy-boto3-keyspacesstreams (>=1.42.0,<1.43.0)", "mypy-boto3-kinesis (>=1.42.0,<1.43.0)", "mypy-boto3-kinesis-video-archived-media (>=1.42.0,<1.43.0)", "mypy-boto3-kinesis-video-media (>=1.42.0,<1.43.0)", "mypy-boto3-kinesis-video-signaling (>=1.42.0,<1.43.0)", "mypy-boto3-kinesis-video-webrtc-storage (>=1.42.0,<1.43.0)", "mypy-boto3-kinesisanalytics (>=1.42.0,<1.43.0)", "mypy-boto3-kinesisanalyticsv2 (>=1.42.0,<1.43.0)", "mypy-boto3-kinesisvideo (>=1.42.0,<1.43.0)", "mypy-boto3-kms (>=1.42.0,<1.43.0)", "mypy-boto3-lakeformation (>=1.42.0,<1.43.0)", "mypy-boto3-lambda (>=1.42.0,<1.43.0)", "mypy-boto3-launch-wizard (>=1.42.0,<1.43.0)", "mypy-boto3-lex-models (>=1.42.0,<1.43.0)", "mypy-boto3-lex-runtime (>=1.42.0,<1.43.0)", "mypy-boto3-lexv2-models (>=1.42.0,<1.43.0)", "mypy-boto3-lexv2-runtime (>=1.42.0,<1.43.0)", "mypy-boto3-license-manager (>=1.42.0,<1.43.0)", "mypy-boto3-license-manager-linux-subscriptions (>=1.42.0,<1.43.0)", "mypy-boto3-license-manager-user-subscriptions (>=1.42.0,<1.43.0)", "mypy-boto3-lightsail (>=1.42.0,<1.43.0)", "mypy-boto3-location (>=1.42.0,<1.43.0)", "mypy-boto3-logs (>=1.42.0,<1.43.0)", "mypy-boto3-lookoutequipment (>=1.42.0,<1.43.0)", "mypy-boto3-m2 (>=1.42.0,<1.43.0)", "mypy-boto3-machinelearning (>=1.42.0,<1.43.0)", "mypy-boto3-macie2 (>=1.42.0,<1.43.0)", "mypy-boto3-mailmanager (>=1.42.0,<1.43.0)", "mypy-boto3-managedblockchain (>=1.42.0,<1.43.0)", "mypy-boto3-managedblockchain-query (>=1.42.0,<1.43.0)", "mypy-boto3-marketplace-agreement (>=1.42.0,<1.43.0)", "mypy-boto3-marketplace-catalog (>=1.42.0,<1.43.0)", "mypy-boto3-marketplace-deployment (>=1.42.0,<1.43.0)", "mypy-boto3-marketplace-entitlement (>=1.42.0,<1.43.0)", "mypy-boto3-marketplace-reporting (>=1.42.0,<1.43.0)", "mypy-boto3-marketplacecommerceanalytics (>=1.42.0,<1.43.0)", "mypy-boto3-mediaconnect (>=1.42.0,<1.43.0)", "mypy-boto3-mediaconvert (>=1.42.0,<1.43.0)", "mypy-boto3-medialive (>=1.42.0,<1.43.0)", "mypy-boto3-mediapackage (>=1.42.0,<1.43.0)", "mypy-boto3-mediapackage-vod (>=1.42.0,<1.43.0)", "mypy-boto3-mediapackagev2 (>=1.42.0,<1.43.0)", "mypy-boto3-mediastore (>=1.42.0,<1.43.0)", "mypy-boto3-mediastore-data (>=1.42.0,<1.43.0)", "mypy-boto3-mediatailor (>=1.42.0,<1.43.0)", "mypy-boto3-medical-imaging (>=1.42.0,<1.43.0)", "mypy-boto3-memorydb (>=1.42.0,<1.43.0)", "mypy-boto3-meteringmarketplace (>=1.42.0,<1.43.0)", "mypy-boto3-mgh (>=1.42.0,<1.43.0)", "mypy-boto3-mgn (>=1.42.0,<1.43.0)", "mypy-boto3-migration-hub-refactor-spaces (>=1.42.0,<1.43.0)", "mypy-boto3-migrationhub-config (>=1.42.0,<1.43.0)", "mypy-boto3-migrationhuborchestrator (>=1.42.0,<1.43.0)", "mypy-boto3-migrationhubstrategy (>=1.42.0,<1.43.0)", "mypy-boto3-mpa (>=1.42.0,<1.43.0)", "mypy-boto3-mq (>=1.42.0,<1.43.0)", "mypy-boto3-mturk (>=1.42.0,<1.43.0)", "mypy-boto3-mwaa (>=1.42.0,<1.43.0)", "mypy-boto3-mwaa-serverless (>=1.42.0,<1.43.0)", "mypy-boto3-neptune (>=1.42.0,<1.43.0)", "mypy-boto3-neptune-graph (>=1.42.0,<1.43.0)", "mypy-boto3-neptunedata (>=1.42.0,<1.43.0)", "mypy-boto3-network-firewall (>=1.42.0,<1.43.0)", "mypy-boto3-networkflowmonitor (>=1.42.0,<1.43.0)", "mypy-boto3-networkmanager (>=1.42.0,<1.43.0)", "mypy-boto3-networkmonitor (>=1.42.0,<1.43.0)", "mypy-boto3-notifications (>=1.42.0,<1.43.0)", "mypy-boto3-notificationscontacts (>=1.42.0,<1.43.0)", "mypy-boto3-nova-act (>=1.42.0,<1.43.0)", "mypy-boto3-oam (>=1.42.0,<1.43.0)", "mypy-boto3-observabilityadmin (>=1.42.0,<1.43.0)", "mypy-boto3-odb (>=1.42.0,<1.43.0)", "mypy-boto3-omics (>=1.42.0,<1.43.0)", "mypy-boto3-opensearch (>=1.42.0,<1.43.0)", "mypy-boto3-opensearchserverless (>=1.42.0,<1.43.0)", "mypy-boto3-organizations (>=1.42.0,<1.43.0)", "mypy-boto3-osis (>=1.42.0,<1.43.0)", "mypy-boto3-outposts (>=1.42.0,<1.43.0)", "mypy-boto3-panorama (>=1.42.0,<1.43.0)", "mypy-boto3-partnercentral-account (>=1.42.0,<1.43.0)", "mypy-boto3-partnercentral-benefits (>=1.42.0,<1.43.0)", "mypy-boto3-partnercentral-channel (>=1.42.0,<1.43.0)", "mypy-boto3-partnercentral-selling (>=1.42.0,<1.43.0)", "mypy-boto3-payment-cryptography (>=1.42.0,<1.43.0)", "mypy-boto3-payment-cryptography-data (>=1.42.0,<1.43.0)", "mypy-boto3-pca-connector-ad (>=1.42.0,<1.43.0)", "mypy-boto3-pca-connector-scep (>=1.42.0,<1.43.0)", "mypy-boto3-pcs (>=1.42.0,<1.43.0)", "mypy-boto3-personalize (>=1.42.0,<1.43.0)", "mypy-boto3-personalize-events (>=1.42.0,<1.43.0)", "mypy-boto3-personalize-runtime (>=1.42.0,<1.43.0)", "mypy-boto3-pi (>=1.42.0,<1.43.0)", "mypy-boto3-pinpoint (>=1.42.0,<1.43.0)", "mypy-boto3-pinpoint-email (>=1.42.0,<1.43.0)", "mypy-boto3-pinpoint-sms-voice (>=1.42.0,<1.43.0)", "mypy-boto3-pinpoint-sms-voice-v2 (>=1.42.0,<1.43.0)", "mypy-boto3-pipes (>=1.42.0,<1.43.0)", "mypy-boto3-polly (>=1.42.0,<1.43.0)", "mypy-boto3-pricing (>=1.42.0,<1.43.0)", "mypy-boto3-proton (>=1.42.0,<1.43.0)", "mypy-boto3-qapps (>=1.42.0,<1.43.0)", "mypy-boto3-qbusiness (>=1.42.0,<1.43.0)", "mypy-boto3-qconnect (>=1.42.0,<1.43.0)", "mypy-boto3-quicksight (>=1.42.0,<1.43.0)", "mypy-boto3-ram (>=1.42.0,<1.43.0)", "mypy-boto3-rbin (>=1.42.0,<1.43.0)", "mypy-boto3-rds (>=1.42.0,<1.43.0)", "mypy-boto3-rds-data (>=1.42.0,<1.43.0)", "mypy-boto3-redshift (>=1.42.0,<1.43.0)", "mypy-boto3-redshift-data (>=1.42.0,<1.43.0)", "mypy-boto3-redshift-serverless (>=1.42.0,<1.43.0)", "mypy-boto3-rekognition (>=1.42.0,<1.43.0)", "mypy-boto3-repostspace (>=1.42.0,<1.43.0)", "mypy-boto3-resiliencehub (>=1.42.0,<1.43.0)", "mypy-boto3-resource-explorer-2 (>=1.42.0,<1.43.0)", "mypy-boto3-resource-groups (>=1.42.0,<1.43.0)", "mypy-boto3-resourcegroupstaggingapi (>=1.42.0,<1.43.0)", "mypy-boto3-rolesanywhere (>=1.42.0,<1.43.0)", "mypy-boto3-route53 (>=1.42.0,<1.43.0)", "mypy-boto3-route53-recovery-cluster (>=1.42.0,<1.43.0)", "mypy-boto3-route53-recovery-control-config (>=1.42.0,<1.43.0)", "mypy-boto3-route53-recovery-readiness (>=1.42.0,<1.43.0)", "mypy-boto3-route53domains (>=1.42.0,<1.43.0)", "mypy-boto3-route53globalresolver (>=1.42.0,<1.43.0)", "mypy-boto3-route53profiles (>=1.42.0,<1.43.0)", "mypy-boto3-route53resolver (>=1.42.0,<1.43.0)", "mypy-boto3-rtbfabric (>=1.42.0,<1.43.0)", "mypy-boto3-rum (>=1.42.0,<1.43.0)", "mypy-boto3-s3 (>=1.42.0,<1.43.0)", "mypy-boto3-s3control (>=1.42.0,<1.43.0)", "mypy-boto3-s3outposts (>=1.42.0,<1.43.0)", "mypy-boto3-s3tables (>=1.42.0,<1.43.0)", "mypy-boto3-s3vectors (>=1.42.0,<1.43.0)", "mypy-boto3-sagemaker (>=1.42.0,<1.43.0)", "mypy-boto3-sagemaker-a2i-runtime (>=1.42.0,<1.43.0)", "mypy-boto3-sagemaker-edge (>=1.42.0,<1.43.0)", "mypy-boto3-sagemaker-featurestore-runtime (>=1.42.0,<1.43.0)", "mypy-boto3-sagemaker-geospatial (>=1.42.0,<1.43.0)", "mypy-boto3-sagemaker-metrics (>=1.42.0,<1.43.0)", "mypy-boto3-sagemaker-runtime (>=1.42.0,<1.43.0)", "mypy-boto3-savingsplans (>=1.42.0,<1.43.0)", "mypy-boto3-scheduler (>=1.42.0,<1.43.0)", "mypy-boto3-schemas (>=1.42.0,<1.43.0)", "mypy-boto3-sdb (>=1.42.0,<1.43.0)", "mypy-boto3-secretsmanager (>=1.42.0,<1.43.0)", "mypy-boto3-security-ir (>=1.42.0,<1.43.0)", "mypy-boto3-securityhub (>=1.42.0,<1.43.0)", "mypy-boto3-securitylake (>=1.42.0,<1.43.0)", "mypy-boto3-serverlessrepo (>=1.42.0,<1.43.0)", "mypy-boto3-service-quotas (>=1.42.0,<1.43.0)", "mypy-boto3-servicecatalog (>=1.42.0,<1.43.0)", "mypy-boto3-servicecatalog-appregistry (>=1.42.0,<1.43.0)", "mypy-boto3-servicediscovery (>=1.42.0,<1.43.0)", "mypy-boto3-ses (>=1.42.0,<1.43.0)", "mypy-boto3-sesv2 (>=1.42.0,<1.43.0)", "mypy-boto3-shield (>=1.42.0,<1.43.0)", "mypy-boto3-signer (>=1.42.0,<1.43.0)", "mypy-boto3-signer-data (>=1.42.0,<1.43.0)", "mypy-boto3-signin (>=1.42.0,<1.43.0)", "mypy-boto3-simspaceweaver (>=1.42.0,<1.43.0)", "mypy-boto3-snow-device-management (>=1.42.0,<1.43.0)", "mypy-boto3-snowball (>=1.42.0,<1.43.0)", "mypy-boto3-sns (>=1.42.0,<1.43.0)", "mypy-boto3-socialmessaging (>=1.42.0,<1.43.0)", "mypy-boto3-sqs (>=1.42.0,<1.43.0)", "mypy-boto3-ssm (>=1.42.0,<1.43.0)", "mypy-boto3-ssm-contacts (>=1.42.0,<1.43.0)", "mypy-boto3-ssm-guiconnect (>=1.42.0,<1.43.0)", "mypy-boto3-ssm-incidents (>=1.42.0,<1.43.0)", "mypy-boto3-ssm-quicksetup (>=1.42.0,<1.43.0)", "mypy-boto3-ssm-sap (>=1.42.0,<1.43.0)", "mypy-boto3-sso (>=1.42.0,<1.43.0)", "mypy-boto3-sso-admin (>=1.42.0,<1.43.0)", "mypy-boto3-sso-oidc (>=1.42.0,<1.43.0)", "mypy-boto3-stepfunctions (>=1.42.0,<1.43.0)", "mypy-boto3-storagegateway (>=1.42.0,<1.43.0)", "mypy-boto3-sts (>=1.42.0,<1.43.0)", "mypy-boto3-supplychain (>=1.42.0,<1.43.0)", "mypy-boto3-support (>=1.42.0,<1.43.0)", "mypy-boto3-support-app (>=1.42.0,<1.43.0)", "mypy-boto3-swf (>=1.42.0,<1.43.0)", "mypy-boto3-synthetics (>=1.42.0,<1.43.0)", "mypy-boto3-taxsettings (>=1.42.0,<1.43.0)", "mypy-boto3-textract (>=1.42.0,<1.43.0)", "mypy-boto3-timestream-influxdb (>=1.42.0,<1.43.0)", "mypy-boto3-timestream-query (>=1.42.0,<1.43.0)", "mypy-boto3-timestream-write (>=1.42.0,<1.43.0)", "mypy-boto3-tnb (>=1.42.0,<1.43.0)", "mypy-boto3-transcribe (>=1.42.0,<1.43.0)", "mypy-boto3-transfer (>=1.42.0,<1.43.0)", "mypy-boto3-translate (>=1.42.0,<1.43.0)", "mypy-boto3-trustedadvisor (>=1.42.0,<1.43.0)", "mypy-boto3-verifiedpermissions (>=1.42.0,<1.43.0)", "mypy-boto3-voice-id (>=1.42.0,<1.43.0)", "mypy-boto3-vpc-lattice (>=1.42.0,<1.43.0)", "mypy-boto3-waf (>=1.42.0,<1.43.0)", "mypy-boto3-waf-regional (>=1.42.0,<1.43.0)", "mypy-boto3-wafv2 (>=1.42.0,<1.43.0)", "mypy-boto3-wellarchitected (>=1.42.0,<1.43.0)", "mypy-boto3-wickr (>=1.42.0,<1.43.0)", "mypy-boto3-wisdom (>=1.42.0,<1.43.0)", "mypy-boto3-workdocs (>=1.42.0,<1.43.0)", "mypy-boto3-workmail (>=1.42.0,<1.43.0)", "mypy-boto3-workmailmessageflow (>=1.42.0,<1.43.0)", "mypy-boto3-workspaces (>=1.42.0,<1.43.0)", "mypy-boto3-workspaces-instances (>=1.42.0,<1.43.0)", "mypy-boto3-workspaces-thin-client (>=1.42.0,<1.43.0)", "mypy-boto3-workspaces-web (>=1.42.0,<1.43.0)", "mypy-boto3-xray (>=1.42.0,<1.43.0)"] +all = ["mypy-boto3-accessanalyzer (>=1.42.0,<1.43.0)", "mypy-boto3-account (>=1.42.0,<1.43.0)", "mypy-boto3-acm (>=1.42.0,<1.43.0)", "mypy-boto3-acm-pca (>=1.42.0,<1.43.0)", "mypy-boto3-aiops (>=1.42.0,<1.43.0)", "mypy-boto3-amp (>=1.42.0,<1.43.0)", "mypy-boto3-amplify (>=1.42.0,<1.43.0)", "mypy-boto3-amplifybackend (>=1.42.0,<1.43.0)", "mypy-boto3-amplifyuibuilder (>=1.42.0,<1.43.0)", "mypy-boto3-apigateway (>=1.42.0,<1.43.0)", "mypy-boto3-apigatewaymanagementapi (>=1.42.0,<1.43.0)", "mypy-boto3-apigatewayv2 (>=1.42.0,<1.43.0)", "mypy-boto3-appconfig (>=1.42.0,<1.43.0)", "mypy-boto3-appconfigdata (>=1.42.0,<1.43.0)", "mypy-boto3-appfabric (>=1.42.0,<1.43.0)", "mypy-boto3-appflow (>=1.42.0,<1.43.0)", "mypy-boto3-appintegrations (>=1.42.0,<1.43.0)", "mypy-boto3-application-autoscaling (>=1.42.0,<1.43.0)", "mypy-boto3-application-insights (>=1.42.0,<1.43.0)", "mypy-boto3-application-signals (>=1.42.0,<1.43.0)", "mypy-boto3-applicationcostprofiler (>=1.42.0,<1.43.0)", "mypy-boto3-appmesh (>=1.42.0,<1.43.0)", "mypy-boto3-apprunner (>=1.42.0,<1.43.0)", "mypy-boto3-appstream (>=1.42.0,<1.43.0)", "mypy-boto3-appsync (>=1.42.0,<1.43.0)", "mypy-boto3-arc-region-switch (>=1.42.0,<1.43.0)", "mypy-boto3-arc-zonal-shift (>=1.42.0,<1.43.0)", "mypy-boto3-artifact (>=1.42.0,<1.43.0)", "mypy-boto3-athena (>=1.42.0,<1.43.0)", "mypy-boto3-auditmanager (>=1.42.0,<1.43.0)", "mypy-boto3-autoscaling (>=1.42.0,<1.43.0)", "mypy-boto3-autoscaling-plans (>=1.42.0,<1.43.0)", "mypy-boto3-b2bi (>=1.42.0,<1.43.0)", "mypy-boto3-backup (>=1.42.0,<1.43.0)", "mypy-boto3-backup-gateway (>=1.42.0,<1.43.0)", "mypy-boto3-backupsearch (>=1.42.0,<1.43.0)", "mypy-boto3-batch (>=1.42.0,<1.43.0)", "mypy-boto3-bcm-dashboards (>=1.42.0,<1.43.0)", "mypy-boto3-bcm-data-exports (>=1.42.0,<1.43.0)", "mypy-boto3-bcm-pricing-calculator (>=1.42.0,<1.43.0)", "mypy-boto3-bcm-recommended-actions (>=1.42.0,<1.43.0)", "mypy-boto3-bedrock (>=1.42.0,<1.43.0)", "mypy-boto3-bedrock-agent (>=1.42.0,<1.43.0)", "mypy-boto3-bedrock-agent-runtime (>=1.42.0,<1.43.0)", "mypy-boto3-bedrock-agentcore (>=1.42.0,<1.43.0)", "mypy-boto3-bedrock-agentcore-control (>=1.42.0,<1.43.0)", "mypy-boto3-bedrock-data-automation (>=1.42.0,<1.43.0)", "mypy-boto3-bedrock-data-automation-runtime (>=1.42.0,<1.43.0)", "mypy-boto3-bedrock-runtime (>=1.42.0,<1.43.0)", "mypy-boto3-billing (>=1.42.0,<1.43.0)", "mypy-boto3-billingconductor (>=1.42.0,<1.43.0)", "mypy-boto3-braket (>=1.42.0,<1.43.0)", "mypy-boto3-budgets (>=1.42.0,<1.43.0)", "mypy-boto3-ce (>=1.42.0,<1.43.0)", "mypy-boto3-chatbot (>=1.42.0,<1.43.0)", "mypy-boto3-chime (>=1.42.0,<1.43.0)", "mypy-boto3-chime-sdk-identity (>=1.42.0,<1.43.0)", "mypy-boto3-chime-sdk-media-pipelines (>=1.42.0,<1.43.0)", "mypy-boto3-chime-sdk-meetings (>=1.42.0,<1.43.0)", "mypy-boto3-chime-sdk-messaging (>=1.42.0,<1.43.0)", "mypy-boto3-chime-sdk-voice (>=1.42.0,<1.43.0)", "mypy-boto3-cleanrooms (>=1.42.0,<1.43.0)", "mypy-boto3-cleanroomsml (>=1.42.0,<1.43.0)", "mypy-boto3-cloud9 (>=1.42.0,<1.43.0)", "mypy-boto3-cloudcontrol (>=1.42.0,<1.43.0)", "mypy-boto3-clouddirectory (>=1.42.0,<1.43.0)", "mypy-boto3-cloudformation (>=1.42.0,<1.43.0)", "mypy-boto3-cloudfront (>=1.42.0,<1.43.0)", "mypy-boto3-cloudfront-keyvaluestore (>=1.42.0,<1.43.0)", "mypy-boto3-cloudhsm (>=1.42.0,<1.43.0)", "mypy-boto3-cloudhsmv2 (>=1.42.0,<1.43.0)", "mypy-boto3-cloudsearch (>=1.42.0,<1.43.0)", "mypy-boto3-cloudsearchdomain (>=1.42.0,<1.43.0)", "mypy-boto3-cloudtrail (>=1.42.0,<1.43.0)", "mypy-boto3-cloudtrail-data (>=1.42.0,<1.43.0)", "mypy-boto3-cloudwatch (>=1.42.0,<1.43.0)", "mypy-boto3-codeartifact (>=1.42.0,<1.43.0)", "mypy-boto3-codebuild (>=1.42.0,<1.43.0)", "mypy-boto3-codecatalyst (>=1.42.0,<1.43.0)", "mypy-boto3-codecommit (>=1.42.0,<1.43.0)", "mypy-boto3-codeconnections (>=1.42.0,<1.43.0)", "mypy-boto3-codedeploy (>=1.42.0,<1.43.0)", "mypy-boto3-codeguru-reviewer (>=1.42.0,<1.43.0)", "mypy-boto3-codeguru-security (>=1.42.0,<1.43.0)", "mypy-boto3-codeguruprofiler (>=1.42.0,<1.43.0)", "mypy-boto3-codepipeline (>=1.42.0,<1.43.0)", "mypy-boto3-codestar-connections (>=1.42.0,<1.43.0)", "mypy-boto3-codestar-notifications (>=1.42.0,<1.43.0)", "mypy-boto3-cognito-identity (>=1.42.0,<1.43.0)", "mypy-boto3-cognito-idp (>=1.42.0,<1.43.0)", "mypy-boto3-cognito-sync (>=1.42.0,<1.43.0)", "mypy-boto3-comprehend (>=1.42.0,<1.43.0)", "mypy-boto3-comprehendmedical (>=1.42.0,<1.43.0)", "mypy-boto3-compute-optimizer (>=1.42.0,<1.43.0)", "mypy-boto3-compute-optimizer-automation (>=1.42.0,<1.43.0)", "mypy-boto3-config (>=1.42.0,<1.43.0)", "mypy-boto3-connect (>=1.42.0,<1.43.0)", "mypy-boto3-connect-contact-lens (>=1.42.0,<1.43.0)", "mypy-boto3-connectcampaigns (>=1.42.0,<1.43.0)", "mypy-boto3-connectcampaignsv2 (>=1.42.0,<1.43.0)", "mypy-boto3-connectcases (>=1.42.0,<1.43.0)", "mypy-boto3-connecthealth (>=1.42.0,<1.43.0)", "mypy-boto3-connectparticipant (>=1.42.0,<1.43.0)", "mypy-boto3-controlcatalog (>=1.42.0,<1.43.0)", "mypy-boto3-controltower (>=1.42.0,<1.43.0)", "mypy-boto3-cost-optimization-hub (>=1.42.0,<1.43.0)", "mypy-boto3-cur (>=1.42.0,<1.43.0)", "mypy-boto3-customer-profiles (>=1.42.0,<1.43.0)", "mypy-boto3-databrew (>=1.42.0,<1.43.0)", "mypy-boto3-dataexchange (>=1.42.0,<1.43.0)", "mypy-boto3-datapipeline (>=1.42.0,<1.43.0)", "mypy-boto3-datasync (>=1.42.0,<1.43.0)", "mypy-boto3-datazone (>=1.42.0,<1.43.0)", "mypy-boto3-dax (>=1.42.0,<1.43.0)", "mypy-boto3-deadline (>=1.42.0,<1.43.0)", "mypy-boto3-detective (>=1.42.0,<1.43.0)", "mypy-boto3-devicefarm (>=1.42.0,<1.43.0)", "mypy-boto3-devops-guru (>=1.42.0,<1.43.0)", "mypy-boto3-directconnect (>=1.42.0,<1.43.0)", "mypy-boto3-discovery (>=1.42.0,<1.43.0)", "mypy-boto3-dlm (>=1.42.0,<1.43.0)", "mypy-boto3-dms (>=1.42.0,<1.43.0)", "mypy-boto3-docdb (>=1.42.0,<1.43.0)", "mypy-boto3-docdb-elastic (>=1.42.0,<1.43.0)", "mypy-boto3-drs (>=1.42.0,<1.43.0)", "mypy-boto3-ds (>=1.42.0,<1.43.0)", "mypy-boto3-ds-data (>=1.42.0,<1.43.0)", "mypy-boto3-dsql (>=1.42.0,<1.43.0)", "mypy-boto3-dynamodb (>=1.42.0,<1.43.0)", "mypy-boto3-dynamodbstreams (>=1.42.0,<1.43.0)", "mypy-boto3-ebs (>=1.42.0,<1.43.0)", "mypy-boto3-ec2 (>=1.42.0,<1.43.0)", "mypy-boto3-ec2-instance-connect (>=1.42.0,<1.43.0)", "mypy-boto3-ecr (>=1.42.0,<1.43.0)", "mypy-boto3-ecr-public (>=1.42.0,<1.43.0)", "mypy-boto3-ecs (>=1.42.0,<1.43.0)", "mypy-boto3-efs (>=1.42.0,<1.43.0)", "mypy-boto3-eks (>=1.42.0,<1.43.0)", "mypy-boto3-eks-auth (>=1.42.0,<1.43.0)", "mypy-boto3-elasticache (>=1.42.0,<1.43.0)", "mypy-boto3-elasticbeanstalk (>=1.42.0,<1.43.0)", "mypy-boto3-elb (>=1.42.0,<1.43.0)", "mypy-boto3-elbv2 (>=1.42.0,<1.43.0)", "mypy-boto3-elementalinference (>=1.42.0,<1.43.0)", "mypy-boto3-emr (>=1.42.0,<1.43.0)", "mypy-boto3-emr-containers (>=1.42.0,<1.43.0)", "mypy-boto3-emr-serverless (>=1.42.0,<1.43.0)", "mypy-boto3-entityresolution (>=1.42.0,<1.43.0)", "mypy-boto3-es (>=1.42.0,<1.43.0)", "mypy-boto3-events (>=1.42.0,<1.43.0)", "mypy-boto3-evs (>=1.42.0,<1.43.0)", "mypy-boto3-finspace (>=1.42.0,<1.43.0)", "mypy-boto3-finspace-data (>=1.42.0,<1.43.0)", "mypy-boto3-firehose (>=1.42.0,<1.43.0)", "mypy-boto3-fis (>=1.42.0,<1.43.0)", "mypy-boto3-fms (>=1.42.0,<1.43.0)", "mypy-boto3-forecast (>=1.42.0,<1.43.0)", "mypy-boto3-forecastquery (>=1.42.0,<1.43.0)", "mypy-boto3-frauddetector (>=1.42.0,<1.43.0)", "mypy-boto3-freetier (>=1.42.0,<1.43.0)", "mypy-boto3-fsx (>=1.42.0,<1.43.0)", "mypy-boto3-gamelift (>=1.42.0,<1.43.0)", "mypy-boto3-gameliftstreams (>=1.42.0,<1.43.0)", "mypy-boto3-geo-maps (>=1.42.0,<1.43.0)", "mypy-boto3-geo-places (>=1.42.0,<1.43.0)", "mypy-boto3-geo-routes (>=1.42.0,<1.43.0)", "mypy-boto3-glacier (>=1.42.0,<1.43.0)", "mypy-boto3-globalaccelerator (>=1.42.0,<1.43.0)", "mypy-boto3-glue (>=1.42.0,<1.43.0)", "mypy-boto3-grafana (>=1.42.0,<1.43.0)", "mypy-boto3-greengrass (>=1.42.0,<1.43.0)", "mypy-boto3-greengrassv2 (>=1.42.0,<1.43.0)", "mypy-boto3-groundstation (>=1.42.0,<1.43.0)", "mypy-boto3-guardduty (>=1.42.0,<1.43.0)", "mypy-boto3-health (>=1.42.0,<1.43.0)", "mypy-boto3-healthlake (>=1.42.0,<1.43.0)", "mypy-boto3-iam (>=1.42.0,<1.43.0)", "mypy-boto3-identitystore (>=1.42.0,<1.43.0)", "mypy-boto3-imagebuilder (>=1.42.0,<1.43.0)", "mypy-boto3-importexport (>=1.42.0,<1.43.0)", "mypy-boto3-inspector (>=1.42.0,<1.43.0)", "mypy-boto3-inspector-scan (>=1.42.0,<1.43.0)", "mypy-boto3-inspector2 (>=1.42.0,<1.43.0)", "mypy-boto3-internetmonitor (>=1.42.0,<1.43.0)", "mypy-boto3-invoicing (>=1.42.0,<1.43.0)", "mypy-boto3-iot (>=1.42.0,<1.43.0)", "mypy-boto3-iot-data (>=1.42.0,<1.43.0)", "mypy-boto3-iot-jobs-data (>=1.42.0,<1.43.0)", "mypy-boto3-iot-managed-integrations (>=1.42.0,<1.43.0)", "mypy-boto3-iotdeviceadvisor (>=1.42.0,<1.43.0)", "mypy-boto3-iotevents (>=1.42.0,<1.43.0)", "mypy-boto3-iotevents-data (>=1.42.0,<1.43.0)", "mypy-boto3-iotfleetwise (>=1.42.0,<1.43.0)", "mypy-boto3-iotsecuretunneling (>=1.42.0,<1.43.0)", "mypy-boto3-iotsitewise (>=1.42.0,<1.43.0)", "mypy-boto3-iotthingsgraph (>=1.42.0,<1.43.0)", "mypy-boto3-iottwinmaker (>=1.42.0,<1.43.0)", "mypy-boto3-iotwireless (>=1.42.0,<1.43.0)", "mypy-boto3-ivs (>=1.42.0,<1.43.0)", "mypy-boto3-ivs-realtime (>=1.42.0,<1.43.0)", "mypy-boto3-ivschat (>=1.42.0,<1.43.0)", "mypy-boto3-kafka (>=1.42.0,<1.43.0)", "mypy-boto3-kafkaconnect (>=1.42.0,<1.43.0)", "mypy-boto3-kendra (>=1.42.0,<1.43.0)", "mypy-boto3-kendra-ranking (>=1.42.0,<1.43.0)", "mypy-boto3-keyspaces (>=1.42.0,<1.43.0)", "mypy-boto3-keyspacesstreams (>=1.42.0,<1.43.0)", "mypy-boto3-kinesis (>=1.42.0,<1.43.0)", "mypy-boto3-kinesis-video-archived-media (>=1.42.0,<1.43.0)", "mypy-boto3-kinesis-video-media (>=1.42.0,<1.43.0)", "mypy-boto3-kinesis-video-signaling (>=1.42.0,<1.43.0)", "mypy-boto3-kinesis-video-webrtc-storage (>=1.42.0,<1.43.0)", "mypy-boto3-kinesisanalytics (>=1.42.0,<1.43.0)", "mypy-boto3-kinesisanalyticsv2 (>=1.42.0,<1.43.0)", "mypy-boto3-kinesisvideo (>=1.42.0,<1.43.0)", "mypy-boto3-kms (>=1.42.0,<1.43.0)", "mypy-boto3-lakeformation (>=1.42.0,<1.43.0)", "mypy-boto3-lambda (>=1.42.0,<1.43.0)", "mypy-boto3-launch-wizard (>=1.42.0,<1.43.0)", "mypy-boto3-lex-models (>=1.42.0,<1.43.0)", "mypy-boto3-lex-runtime (>=1.42.0,<1.43.0)", "mypy-boto3-lexv2-models (>=1.42.0,<1.43.0)", "mypy-boto3-lexv2-runtime (>=1.42.0,<1.43.0)", "mypy-boto3-license-manager (>=1.42.0,<1.43.0)", "mypy-boto3-license-manager-linux-subscriptions (>=1.42.0,<1.43.0)", "mypy-boto3-license-manager-user-subscriptions (>=1.42.0,<1.43.0)", "mypy-boto3-lightsail (>=1.42.0,<1.43.0)", "mypy-boto3-location (>=1.42.0,<1.43.0)", "mypy-boto3-logs (>=1.42.0,<1.43.0)", "mypy-boto3-lookoutequipment (>=1.42.0,<1.43.0)", "mypy-boto3-m2 (>=1.42.0,<1.43.0)", "mypy-boto3-machinelearning (>=1.42.0,<1.43.0)", "mypy-boto3-macie2 (>=1.42.0,<1.43.0)", "mypy-boto3-mailmanager (>=1.42.0,<1.43.0)", "mypy-boto3-managedblockchain (>=1.42.0,<1.43.0)", "mypy-boto3-managedblockchain-query (>=1.42.0,<1.43.0)", "mypy-boto3-marketplace-agreement (>=1.42.0,<1.43.0)", "mypy-boto3-marketplace-catalog (>=1.42.0,<1.43.0)", "mypy-boto3-marketplace-deployment (>=1.42.0,<1.43.0)", "mypy-boto3-marketplace-entitlement (>=1.42.0,<1.43.0)", "mypy-boto3-marketplace-reporting (>=1.42.0,<1.43.0)", "mypy-boto3-marketplacecommerceanalytics (>=1.42.0,<1.43.0)", "mypy-boto3-mediaconnect (>=1.42.0,<1.43.0)", "mypy-boto3-mediaconvert (>=1.42.0,<1.43.0)", "mypy-boto3-medialive (>=1.42.0,<1.43.0)", "mypy-boto3-mediapackage (>=1.42.0,<1.43.0)", "mypy-boto3-mediapackage-vod (>=1.42.0,<1.43.0)", "mypy-boto3-mediapackagev2 (>=1.42.0,<1.43.0)", "mypy-boto3-mediastore (>=1.42.0,<1.43.0)", "mypy-boto3-mediastore-data (>=1.42.0,<1.43.0)", "mypy-boto3-mediatailor (>=1.42.0,<1.43.0)", "mypy-boto3-medical-imaging (>=1.42.0,<1.43.0)", "mypy-boto3-memorydb (>=1.42.0,<1.43.0)", "mypy-boto3-meteringmarketplace (>=1.42.0,<1.43.0)", "mypy-boto3-mgh (>=1.42.0,<1.43.0)", "mypy-boto3-mgn (>=1.42.0,<1.43.0)", "mypy-boto3-migration-hub-refactor-spaces (>=1.42.0,<1.43.0)", "mypy-boto3-migrationhub-config (>=1.42.0,<1.43.0)", "mypy-boto3-migrationhuborchestrator (>=1.42.0,<1.43.0)", "mypy-boto3-migrationhubstrategy (>=1.42.0,<1.43.0)", "mypy-boto3-mpa (>=1.42.0,<1.43.0)", "mypy-boto3-mq (>=1.42.0,<1.43.0)", "mypy-boto3-mturk (>=1.42.0,<1.43.0)", "mypy-boto3-mwaa (>=1.42.0,<1.43.0)", "mypy-boto3-mwaa-serverless (>=1.42.0,<1.43.0)", "mypy-boto3-neptune (>=1.42.0,<1.43.0)", "mypy-boto3-neptune-graph (>=1.42.0,<1.43.0)", "mypy-boto3-neptunedata (>=1.42.0,<1.43.0)", "mypy-boto3-network-firewall (>=1.42.0,<1.43.0)", "mypy-boto3-networkflowmonitor (>=1.42.0,<1.43.0)", "mypy-boto3-networkmanager (>=1.42.0,<1.43.0)", "mypy-boto3-networkmonitor (>=1.42.0,<1.43.0)", "mypy-boto3-notifications (>=1.42.0,<1.43.0)", "mypy-boto3-notificationscontacts (>=1.42.0,<1.43.0)", "mypy-boto3-nova-act (>=1.42.0,<1.43.0)", "mypy-boto3-oam (>=1.42.0,<1.43.0)", "mypy-boto3-observabilityadmin (>=1.42.0,<1.43.0)", "mypy-boto3-odb (>=1.42.0,<1.43.0)", "mypy-boto3-omics (>=1.42.0,<1.43.0)", "mypy-boto3-opensearch (>=1.42.0,<1.43.0)", "mypy-boto3-opensearchserverless (>=1.42.0,<1.43.0)", "mypy-boto3-organizations (>=1.42.0,<1.43.0)", "mypy-boto3-osis (>=1.42.0,<1.43.0)", "mypy-boto3-outposts (>=1.42.0,<1.43.0)", "mypy-boto3-panorama (>=1.42.0,<1.43.0)", "mypy-boto3-partnercentral-account (>=1.42.0,<1.43.0)", "mypy-boto3-partnercentral-benefits (>=1.42.0,<1.43.0)", "mypy-boto3-partnercentral-channel (>=1.42.0,<1.43.0)", "mypy-boto3-partnercentral-selling (>=1.42.0,<1.43.0)", "mypy-boto3-payment-cryptography (>=1.42.0,<1.43.0)", "mypy-boto3-payment-cryptography-data (>=1.42.0,<1.43.0)", "mypy-boto3-pca-connector-ad (>=1.42.0,<1.43.0)", "mypy-boto3-pca-connector-scep (>=1.42.0,<1.43.0)", "mypy-boto3-pcs (>=1.42.0,<1.43.0)", "mypy-boto3-personalize (>=1.42.0,<1.43.0)", "mypy-boto3-personalize-events (>=1.42.0,<1.43.0)", "mypy-boto3-personalize-runtime (>=1.42.0,<1.43.0)", "mypy-boto3-pi (>=1.42.0,<1.43.0)", "mypy-boto3-pinpoint (>=1.42.0,<1.43.0)", "mypy-boto3-pinpoint-email (>=1.42.0,<1.43.0)", "mypy-boto3-pinpoint-sms-voice (>=1.42.0,<1.43.0)", "mypy-boto3-pinpoint-sms-voice-v2 (>=1.42.0,<1.43.0)", "mypy-boto3-pipes (>=1.42.0,<1.43.0)", "mypy-boto3-polly (>=1.42.0,<1.43.0)", "mypy-boto3-pricing (>=1.42.0,<1.43.0)", "mypy-boto3-proton (>=1.42.0,<1.43.0)", "mypy-boto3-qapps (>=1.42.0,<1.43.0)", "mypy-boto3-qbusiness (>=1.42.0,<1.43.0)", "mypy-boto3-qconnect (>=1.42.0,<1.43.0)", "mypy-boto3-quicksight (>=1.42.0,<1.43.0)", "mypy-boto3-ram (>=1.42.0,<1.43.0)", "mypy-boto3-rbin (>=1.42.0,<1.43.0)", "mypy-boto3-rds (>=1.42.0,<1.43.0)", "mypy-boto3-rds-data (>=1.42.0,<1.43.0)", "mypy-boto3-redshift (>=1.42.0,<1.43.0)", "mypy-boto3-redshift-data (>=1.42.0,<1.43.0)", "mypy-boto3-redshift-serverless (>=1.42.0,<1.43.0)", "mypy-boto3-rekognition (>=1.42.0,<1.43.0)", "mypy-boto3-repostspace (>=1.42.0,<1.43.0)", "mypy-boto3-resiliencehub (>=1.42.0,<1.43.0)", "mypy-boto3-resource-explorer-2 (>=1.42.0,<1.43.0)", "mypy-boto3-resource-groups (>=1.42.0,<1.43.0)", "mypy-boto3-resourcegroupstaggingapi (>=1.42.0,<1.43.0)", "mypy-boto3-rolesanywhere (>=1.42.0,<1.43.0)", "mypy-boto3-route53 (>=1.42.0,<1.43.0)", "mypy-boto3-route53-recovery-cluster (>=1.42.0,<1.43.0)", "mypy-boto3-route53-recovery-control-config (>=1.42.0,<1.43.0)", "mypy-boto3-route53-recovery-readiness (>=1.42.0,<1.43.0)", "mypy-boto3-route53domains (>=1.42.0,<1.43.0)", "mypy-boto3-route53globalresolver (>=1.42.0,<1.43.0)", "mypy-boto3-route53profiles (>=1.42.0,<1.43.0)", "mypy-boto3-route53resolver (>=1.42.0,<1.43.0)", "mypy-boto3-rtbfabric (>=1.42.0,<1.43.0)", "mypy-boto3-rum (>=1.42.0,<1.43.0)", "mypy-boto3-s3 (>=1.42.0,<1.43.0)", "mypy-boto3-s3control (>=1.42.0,<1.43.0)", "mypy-boto3-s3outposts (>=1.42.0,<1.43.0)", "mypy-boto3-s3tables (>=1.42.0,<1.43.0)", "mypy-boto3-s3vectors (>=1.42.0,<1.43.0)", "mypy-boto3-sagemaker (>=1.42.0,<1.43.0)", "mypy-boto3-sagemaker-a2i-runtime (>=1.42.0,<1.43.0)", "mypy-boto3-sagemaker-edge (>=1.42.0,<1.43.0)", "mypy-boto3-sagemaker-featurestore-runtime (>=1.42.0,<1.43.0)", "mypy-boto3-sagemaker-geospatial (>=1.42.0,<1.43.0)", "mypy-boto3-sagemaker-metrics (>=1.42.0,<1.43.0)", "mypy-boto3-sagemaker-runtime (>=1.42.0,<1.43.0)", "mypy-boto3-savingsplans (>=1.42.0,<1.43.0)", "mypy-boto3-scheduler (>=1.42.0,<1.43.0)", "mypy-boto3-schemas (>=1.42.0,<1.43.0)", "mypy-boto3-sdb (>=1.42.0,<1.43.0)", "mypy-boto3-secretsmanager (>=1.42.0,<1.43.0)", "mypy-boto3-security-ir (>=1.42.0,<1.43.0)", "mypy-boto3-securityhub (>=1.42.0,<1.43.0)", "mypy-boto3-securitylake (>=1.42.0,<1.43.0)", "mypy-boto3-serverlessrepo (>=1.42.0,<1.43.0)", "mypy-boto3-service-quotas (>=1.42.0,<1.43.0)", "mypy-boto3-servicecatalog (>=1.42.0,<1.43.0)", "mypy-boto3-servicecatalog-appregistry (>=1.42.0,<1.43.0)", "mypy-boto3-servicediscovery (>=1.42.0,<1.43.0)", "mypy-boto3-ses (>=1.42.0,<1.43.0)", "mypy-boto3-sesv2 (>=1.42.0,<1.43.0)", "mypy-boto3-shield (>=1.42.0,<1.43.0)", "mypy-boto3-signer (>=1.42.0,<1.43.0)", "mypy-boto3-signer-data (>=1.42.0,<1.43.0)", "mypy-boto3-signin (>=1.42.0,<1.43.0)", "mypy-boto3-simpledbv2 (>=1.42.0,<1.43.0)", "mypy-boto3-simspaceweaver (>=1.42.0,<1.43.0)", "mypy-boto3-snow-device-management (>=1.42.0,<1.43.0)", "mypy-boto3-snowball (>=1.42.0,<1.43.0)", "mypy-boto3-sns (>=1.42.0,<1.43.0)", "mypy-boto3-socialmessaging (>=1.42.0,<1.43.0)", "mypy-boto3-sqs (>=1.42.0,<1.43.0)", "mypy-boto3-ssm (>=1.42.0,<1.43.0)", "mypy-boto3-ssm-contacts (>=1.42.0,<1.43.0)", "mypy-boto3-ssm-guiconnect (>=1.42.0,<1.43.0)", "mypy-boto3-ssm-incidents (>=1.42.0,<1.43.0)", "mypy-boto3-ssm-quicksetup (>=1.42.0,<1.43.0)", "mypy-boto3-ssm-sap (>=1.42.0,<1.43.0)", "mypy-boto3-sso (>=1.42.0,<1.43.0)", "mypy-boto3-sso-admin (>=1.42.0,<1.43.0)", "mypy-boto3-sso-oidc (>=1.42.0,<1.43.0)", "mypy-boto3-stepfunctions (>=1.42.0,<1.43.0)", "mypy-boto3-storagegateway (>=1.42.0,<1.43.0)", "mypy-boto3-sts (>=1.42.0,<1.43.0)", "mypy-boto3-supplychain (>=1.42.0,<1.43.0)", "mypy-boto3-support (>=1.42.0,<1.43.0)", "mypy-boto3-support-app (>=1.42.0,<1.43.0)", "mypy-boto3-swf (>=1.42.0,<1.43.0)", "mypy-boto3-synthetics (>=1.42.0,<1.43.0)", "mypy-boto3-taxsettings (>=1.42.0,<1.43.0)", "mypy-boto3-textract (>=1.42.0,<1.43.0)", "mypy-boto3-timestream-influxdb (>=1.42.0,<1.43.0)", "mypy-boto3-timestream-query (>=1.42.0,<1.43.0)", "mypy-boto3-timestream-write (>=1.42.0,<1.43.0)", "mypy-boto3-tnb (>=1.42.0,<1.43.0)", "mypy-boto3-transcribe (>=1.42.0,<1.43.0)", "mypy-boto3-transfer (>=1.42.0,<1.43.0)", "mypy-boto3-translate (>=1.42.0,<1.43.0)", "mypy-boto3-trustedadvisor (>=1.42.0,<1.43.0)", "mypy-boto3-verifiedpermissions (>=1.42.0,<1.43.0)", "mypy-boto3-voice-id (>=1.42.0,<1.43.0)", "mypy-boto3-vpc-lattice (>=1.42.0,<1.43.0)", "mypy-boto3-waf (>=1.42.0,<1.43.0)", "mypy-boto3-waf-regional (>=1.42.0,<1.43.0)", "mypy-boto3-wafv2 (>=1.42.0,<1.43.0)", "mypy-boto3-wellarchitected (>=1.42.0,<1.43.0)", "mypy-boto3-wickr (>=1.42.0,<1.43.0)", "mypy-boto3-wisdom (>=1.42.0,<1.43.0)", "mypy-boto3-workdocs (>=1.42.0,<1.43.0)", "mypy-boto3-workmail (>=1.42.0,<1.43.0)", "mypy-boto3-workmailmessageflow (>=1.42.0,<1.43.0)", "mypy-boto3-workspaces (>=1.42.0,<1.43.0)", "mypy-boto3-workspaces-instances (>=1.42.0,<1.43.0)", "mypy-boto3-workspaces-thin-client (>=1.42.0,<1.43.0)", "mypy-boto3-workspaces-web (>=1.42.0,<1.43.0)", "mypy-boto3-xray (>=1.42.0,<1.43.0)"] amp = ["mypy-boto3-amp (>=1.42.0,<1.43.0)"] amplify = ["mypy-boto3-amplify (>=1.42.0,<1.43.0)"] amplifybackend = ["mypy-boto3-amplifybackend (>=1.42.0,<1.43.0)"] @@ -376,7 +376,7 @@ bedrock-data-automation-runtime = ["mypy-boto3-bedrock-data-automation-runtime ( bedrock-runtime = ["mypy-boto3-bedrock-runtime (>=1.42.0,<1.43.0)"] billing = ["mypy-boto3-billing (>=1.42.0,<1.43.0)"] billingconductor = ["mypy-boto3-billingconductor (>=1.42.0,<1.43.0)"] -boto3 = ["boto3 (==1.42.54)"] +boto3 = ["boto3 (==1.42.68)"] braket = ["mypy-boto3-braket (>=1.42.0,<1.43.0)"] budgets = ["mypy-boto3-budgets (>=1.42.0,<1.43.0)"] ce = ["mypy-boto3-ce (>=1.42.0,<1.43.0)"] @@ -427,6 +427,7 @@ connect-contact-lens = ["mypy-boto3-connect-contact-lens (>=1.42.0,<1.43.0)"] connectcampaigns = ["mypy-boto3-connectcampaigns (>=1.42.0,<1.43.0)"] connectcampaignsv2 = ["mypy-boto3-connectcampaignsv2 (>=1.42.0,<1.43.0)"] connectcases = ["mypy-boto3-connectcases (>=1.42.0,<1.43.0)"] +connecthealth = ["mypy-boto3-connecthealth (>=1.42.0,<1.43.0)"] connectparticipant = ["mypy-boto3-connectparticipant (>=1.42.0,<1.43.0)"] controlcatalog = ["mypy-boto3-controlcatalog (>=1.42.0,<1.43.0)"] controltower = ["mypy-boto3-controltower (>=1.42.0,<1.43.0)"] @@ -468,6 +469,7 @@ elasticache = ["mypy-boto3-elasticache (>=1.42.0,<1.43.0)"] elasticbeanstalk = ["mypy-boto3-elasticbeanstalk (>=1.42.0,<1.43.0)"] elb = ["mypy-boto3-elb (>=1.42.0,<1.43.0)"] elbv2 = ["mypy-boto3-elbv2 (>=1.42.0,<1.43.0)"] +elementalinference = ["mypy-boto3-elementalinference (>=1.42.0,<1.43.0)"] emr = ["mypy-boto3-emr (>=1.42.0,<1.43.0)"] emr-containers = ["mypy-boto3-emr-containers (>=1.42.0,<1.43.0)"] emr-serverless = ["mypy-boto3-emr-serverless (>=1.42.0,<1.43.0)"] @@ -691,6 +693,7 @@ shield = ["mypy-boto3-shield (>=1.42.0,<1.43.0)"] signer = ["mypy-boto3-signer (>=1.42.0,<1.43.0)"] signer-data = ["mypy-boto3-signer-data (>=1.42.0,<1.43.0)"] signin = ["mypy-boto3-signin (>=1.42.0,<1.43.0)"] +simpledbv2 = ["mypy-boto3-simpledbv2 (>=1.42.0,<1.43.0)"] simspaceweaver = ["mypy-boto3-simspaceweaver (>=1.42.0,<1.43.0)"] snow-device-management = ["mypy-boto3-snow-device-management (>=1.42.0,<1.43.0)"] snowball = ["mypy-boto3-snowball (>=1.42.0,<1.43.0)"] @@ -744,14 +747,14 @@ xray = ["mypy-boto3-xray (>=1.42.0,<1.43.0)"] [[package]] name = "botocore" -version = "1.42.54" +version = "1.42.68" description = "Low-level, data-driven core of boto 3." optional = false python-versions = ">=3.9" groups = ["bedrockloggingconfigfunction", "dev", "preprocessingfunction", "slackbotfunction", "syncknowledgebasefunction"] files = [ - {file = "botocore-1.42.54-py3-none-any.whl", hash = "sha256:853a0822de66d060aeebafa07ca13a03799f7958313d1b29f8dc7e2e1be8f527"}, - {file = "botocore-1.42.54.tar.gz", hash = "sha256:ab203d4e57d22913c8386a695d048e003b7508a8a4a7a46c9ddf4ebd67a20b69"}, + {file = "botocore-1.42.68-py3-none-any.whl", hash = "sha256:9df7da26374601f890e2f115bfa573d65bf15b25fe136bb3aac809f6145f52ab"}, + {file = "botocore-1.42.68.tar.gz", hash = "sha256:3951c69e12ac871dda245f48dac5c7dd88ea1bfdd74a8879ec356cf2874b806a"}, ] [package.dependencies] @@ -764,14 +767,14 @@ crt = ["awscrt (==0.31.2)"] [[package]] name = "botocore-stubs" -version = "1.42.39" +version = "1.42.41" description = "Type annotations and code completion for botocore" optional = false python-versions = ">=3.9" groups = ["slackbotfunction"] files = [ - {file = "botocore_stubs-1.42.39-py3-none-any.whl", hash = "sha256:5540aa52b5071f84e4edba4bdaffb7a24d02bd1272df534eb38289c0d9a3e22a"}, - {file = "botocore_stubs-1.42.39.tar.gz", hash = "sha256:7a75265cd59fb93fea4a6a02ac5e90cbb44d14f182627ad58db1425690bc883d"}, + {file = "botocore_stubs-1.42.41-py3-none-any.whl", hash = "sha256:9423110fb0e391834bd2ed44ae5f879d8cb370a444703d966d30842ce2bcb5f0"}, + {file = "botocore_stubs-1.42.41.tar.gz", hash = "sha256:dbeac2f744df6b814ce83ec3f3777b299a015cbea57a2efc41c33b8c38265825"}, ] [package.dependencies] @@ -782,14 +785,14 @@ botocore = ["botocore"] [[package]] name = "certifi" -version = "2026.1.4" +version = "2026.2.25" description = "Python package for providing Mozilla's CA Bundle." optional = false python-versions = ">=3.7" groups = ["dev", "preprocessingfunction", "slackbotfunction"] files = [ - {file = "certifi-2026.1.4-py3-none-any.whl", hash = "sha256:9943707519e4add1115f44c2bc244f782c0249876bf51b6599fee1ffbedd685c"}, - {file = "certifi-2026.1.4.tar.gz", hash = "sha256:ac726dd470482006e014ad384921ed6438c457018f4b3d204aea4281258b2120"}, + {file = "certifi-2026.2.25-py3-none-any.whl", hash = "sha256:027692e4402ad994f1c42e52a4997a9763c646b73e4096e4d5d6db8af1d6f0fa"}, + {file = "certifi-2026.2.25.tar.gz", hash = "sha256:e887ab5cee78ea814d3472169153c2d12cd43b14bd03329a39a9c6e2e80bfba7"}, ] [[package]] @@ -904,14 +907,14 @@ files = [ [[package]] name = "cfn-lint" -version = "1.44.0" +version = "1.46.0" description = "Checks CloudFormation templates for practices and behaviour that could potentially be improved" optional = false python-versions = ">=3.9" groups = ["dev"] files = [ - {file = "cfn_lint-1.44.0-py3-none-any.whl", hash = "sha256:25f04e9727330226d01e7ff99cdda535d3bac20be0c5cb03ecbea38405fcdaaa"}, - {file = "cfn_lint-1.44.0.tar.gz", hash = "sha256:b17cbcc24852035a2a0cae2afe45f7e0b8694d7439c76a0e775dcfb6703a73d3"}, + {file = "cfn_lint-1.46.0-py3-none-any.whl", hash = "sha256:1dfca1993af3159411e4a4f79466617ccdca48eddaf424e216297167c500aa3b"}, + {file = "cfn_lint-1.46.0.tar.gz", hash = "sha256:fa7cb76db683109133241baf1e1734b1d61b46d3900ba2a309db8f3d0e5d3994"}, ] [package.dependencies] @@ -931,125 +934,141 @@ sarif = ["jschema_to_python (>=1.2.3,<1.3.0)", "sarif-om (>=1.0.4,<1.1.0)"] [[package]] name = "charset-normalizer" -version = "3.4.4" +version = "3.4.6" description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." optional = false python-versions = ">=3.7" groups = ["dev", "preprocessingfunction", "slackbotfunction"] files = [ - {file = "charset_normalizer-3.4.4-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:e824f1492727fa856dd6eda4f7cee25f8518a12f3c4a56a74e8095695089cf6d"}, - {file = "charset_normalizer-3.4.4-cp310-cp310-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:4bd5d4137d500351a30687c2d3971758aac9a19208fc110ccb9d7188fbe709e8"}, - {file = "charset_normalizer-3.4.4-cp310-cp310-manylinux2014_armv7l.manylinux_2_17_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:027f6de494925c0ab2a55eab46ae5129951638a49a34d87f4c3eda90f696b4ad"}, - {file = "charset_normalizer-3.4.4-cp310-cp310-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:f820802628d2694cb7e56db99213f930856014862f3fd943d290ea8438d07ca8"}, - {file = "charset_normalizer-3.4.4-cp310-cp310-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:798d75d81754988d2565bff1b97ba5a44411867c0cf32b77a7e8f8d84796b10d"}, - {file = "charset_normalizer-3.4.4-cp310-cp310-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:9d1bb833febdff5c8927f922386db610b49db6e0d4f4ee29601d71e7c2694313"}, - {file = "charset_normalizer-3.4.4-cp310-cp310-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:9cd98cdc06614a2f768d2b7286d66805f94c48cde050acdbbb7db2600ab3197e"}, - {file = "charset_normalizer-3.4.4-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:077fbb858e903c73f6c9db43374fd213b0b6a778106bc7032446a8e8b5b38b93"}, - {file = "charset_normalizer-3.4.4-cp310-cp310-musllinux_1_2_armv7l.whl", hash = "sha256:244bfb999c71b35de57821b8ea746b24e863398194a4014e4c76adc2bbdfeff0"}, - {file = "charset_normalizer-3.4.4-cp310-cp310-musllinux_1_2_ppc64le.whl", hash = "sha256:64b55f9dce520635f018f907ff1b0df1fdc31f2795a922fb49dd14fbcdf48c84"}, - {file = "charset_normalizer-3.4.4-cp310-cp310-musllinux_1_2_riscv64.whl", hash = "sha256:faa3a41b2b66b6e50f84ae4a68c64fcd0c44355741c6374813a800cd6695db9e"}, - {file = "charset_normalizer-3.4.4-cp310-cp310-musllinux_1_2_s390x.whl", hash = "sha256:6515f3182dbe4ea06ced2d9e8666d97b46ef4c75e326b79bb624110f122551db"}, - {file = "charset_normalizer-3.4.4-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:cc00f04ed596e9dc0da42ed17ac5e596c6ccba999ba6bd92b0e0aef2f170f2d6"}, - {file = "charset_normalizer-3.4.4-cp310-cp310-win32.whl", hash = "sha256:f34be2938726fc13801220747472850852fe6b1ea75869a048d6f896838c896f"}, - {file = "charset_normalizer-3.4.4-cp310-cp310-win_amd64.whl", hash = "sha256:a61900df84c667873b292c3de315a786dd8dac506704dea57bc957bd31e22c7d"}, - {file = "charset_normalizer-3.4.4-cp310-cp310-win_arm64.whl", hash = "sha256:cead0978fc57397645f12578bfd2d5ea9138ea0fac82b2f63f7f7c6877986a69"}, - {file = "charset_normalizer-3.4.4-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:6e1fcf0720908f200cd21aa4e6750a48ff6ce4afe7ff5a79a90d5ed8a08296f8"}, - {file = "charset_normalizer-3.4.4-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:5f819d5fe9234f9f82d75bdfa9aef3a3d72c4d24a6e57aeaebba32a704553aa0"}, - {file = "charset_normalizer-3.4.4-cp311-cp311-manylinux2014_armv7l.manylinux_2_17_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:a59cb51917aa591b1c4e6a43c132f0cdc3c76dbad6155df4e28ee626cc77a0a3"}, - {file = "charset_normalizer-3.4.4-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:8ef3c867360f88ac904fd3f5e1f902f13307af9052646963ee08ff4f131adafc"}, - {file = "charset_normalizer-3.4.4-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:d9e45d7faa48ee908174d8fe84854479ef838fc6a705c9315372eacbc2f02897"}, - {file = "charset_normalizer-3.4.4-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:840c25fb618a231545cbab0564a799f101b63b9901f2569faecd6b222ac72381"}, - {file = "charset_normalizer-3.4.4-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:ca5862d5b3928c4940729dacc329aa9102900382fea192fc5e52eb69d6093815"}, - {file = "charset_normalizer-3.4.4-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:d9c7f57c3d666a53421049053eaacdd14bbd0a528e2186fcb2e672effd053bb0"}, - {file = "charset_normalizer-3.4.4-cp311-cp311-musllinux_1_2_armv7l.whl", hash = "sha256:277e970e750505ed74c832b4bf75dac7476262ee2a013f5574dd49075879e161"}, - {file = "charset_normalizer-3.4.4-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:31fd66405eaf47bb62e8cd575dc621c56c668f27d46a61d975a249930dd5e2a4"}, - {file = "charset_normalizer-3.4.4-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:0d3d8f15c07f86e9ff82319b3d9ef6f4bf907608f53fe9d92b28ea9ae3d1fd89"}, - {file = "charset_normalizer-3.4.4-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:9f7fcd74d410a36883701fafa2482a6af2ff5ba96b9a620e9e0721e28ead5569"}, - {file = "charset_normalizer-3.4.4-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:ebf3e58c7ec8a8bed6d66a75d7fb37b55e5015b03ceae72a8e7c74495551e224"}, - {file = "charset_normalizer-3.4.4-cp311-cp311-win32.whl", hash = "sha256:eecbc200c7fd5ddb9a7f16c7decb07b566c29fa2161a16cf67b8d068bd21690a"}, - {file = "charset_normalizer-3.4.4-cp311-cp311-win_amd64.whl", hash = "sha256:5ae497466c7901d54b639cf42d5b8c1b6a4fead55215500d2f486d34db48d016"}, - {file = "charset_normalizer-3.4.4-cp311-cp311-win_arm64.whl", hash = "sha256:65e2befcd84bc6f37095f5961e68a6f077bf44946771354a28ad434c2cce0ae1"}, - {file = "charset_normalizer-3.4.4-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:0a98e6759f854bd25a58a73fa88833fba3b7c491169f86ce1180c948ab3fd394"}, - {file = "charset_normalizer-3.4.4-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:b5b290ccc2a263e8d185130284f8501e3e36c5e02750fc6b6bdeb2e9e96f1e25"}, - {file = "charset_normalizer-3.4.4-cp312-cp312-manylinux2014_armv7l.manylinux_2_17_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:74bb723680f9f7a6234dcf67aea57e708ec1fbdf5699fb91dfd6f511b0a320ef"}, - {file = "charset_normalizer-3.4.4-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:f1e34719c6ed0b92f418c7c780480b26b5d9c50349e9a9af7d76bf757530350d"}, - {file = "charset_normalizer-3.4.4-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:2437418e20515acec67d86e12bf70056a33abdacb5cb1655042f6538d6b085a8"}, - {file = "charset_normalizer-3.4.4-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:11d694519d7f29d6cd09f6ac70028dba10f92f6cdd059096db198c283794ac86"}, - {file = "charset_normalizer-3.4.4-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:ac1c4a689edcc530fc9d9aa11f5774b9e2f33f9a0c6a57864e90908f5208d30a"}, - {file = "charset_normalizer-3.4.4-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:21d142cc6c0ec30d2efee5068ca36c128a30b0f2c53c1c07bd78cb6bc1d3be5f"}, - {file = "charset_normalizer-3.4.4-cp312-cp312-musllinux_1_2_armv7l.whl", hash = "sha256:5dbe56a36425d26d6cfb40ce79c314a2e4dd6211d51d6d2191c00bed34f354cc"}, - {file = "charset_normalizer-3.4.4-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:5bfbb1b9acf3334612667b61bd3002196fe2a1eb4dd74d247e0f2a4d50ec9bbf"}, - {file = "charset_normalizer-3.4.4-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:d055ec1e26e441f6187acf818b73564e6e6282709e9bcb5b63f5b23068356a15"}, - {file = "charset_normalizer-3.4.4-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:af2d8c67d8e573d6de5bc30cdb27e9b95e49115cd9baad5ddbd1a6207aaa82a9"}, - {file = "charset_normalizer-3.4.4-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:780236ac706e66881f3b7f2f32dfe90507a09e67d1d454c762cf642e6e1586e0"}, - {file = "charset_normalizer-3.4.4-cp312-cp312-win32.whl", hash = "sha256:5833d2c39d8896e4e19b689ffc198f08ea58116bee26dea51e362ecc7cd3ed26"}, - {file = "charset_normalizer-3.4.4-cp312-cp312-win_amd64.whl", hash = "sha256:a79cfe37875f822425b89a82333404539ae63dbdddf97f84dcbc3d339aae9525"}, - {file = "charset_normalizer-3.4.4-cp312-cp312-win_arm64.whl", hash = "sha256:376bec83a63b8021bb5c8ea75e21c4ccb86e7e45ca4eb81146091b56599b80c3"}, - {file = "charset_normalizer-3.4.4-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:e1f185f86a6f3403aa2420e815904c67b2f9ebc443f045edd0de921108345794"}, - {file = "charset_normalizer-3.4.4-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6b39f987ae8ccdf0d2642338faf2abb1862340facc796048b604ef14919e55ed"}, - {file = "charset_normalizer-3.4.4-cp313-cp313-manylinux2014_armv7l.manylinux_2_17_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:3162d5d8ce1bb98dd51af660f2121c55d0fa541b46dff7bb9b9f86ea1d87de72"}, - {file = "charset_normalizer-3.4.4-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:81d5eb2a312700f4ecaa977a8235b634ce853200e828fbadf3a9c50bab278328"}, - {file = "charset_normalizer-3.4.4-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:5bd2293095d766545ec1a8f612559f6b40abc0eb18bb2f5d1171872d34036ede"}, - {file = "charset_normalizer-3.4.4-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:a8a8b89589086a25749f471e6a900d3f662d1d3b6e2e59dcecf787b1cc3a1894"}, - {file = "charset_normalizer-3.4.4-cp313-cp313-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:bc7637e2f80d8530ee4a78e878bce464f70087ce73cf7c1caf142416923b98f1"}, - {file = "charset_normalizer-3.4.4-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:f8bf04158c6b607d747e93949aa60618b61312fe647a6369f88ce2ff16043490"}, - {file = "charset_normalizer-3.4.4-cp313-cp313-musllinux_1_2_armv7l.whl", hash = "sha256:554af85e960429cf30784dd47447d5125aaa3b99a6f0683589dbd27e2f45da44"}, - {file = "charset_normalizer-3.4.4-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:74018750915ee7ad843a774364e13a3db91682f26142baddf775342c3f5b1133"}, - {file = "charset_normalizer-3.4.4-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:c0463276121fdee9c49b98908b3a89c39be45d86d1dbaa22957e38f6321d4ce3"}, - {file = "charset_normalizer-3.4.4-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:362d61fd13843997c1c446760ef36f240cf81d3ebf74ac62652aebaf7838561e"}, - {file = "charset_normalizer-3.4.4-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:9a26f18905b8dd5d685d6d07b0cdf98a79f3c7a918906af7cc143ea2e164c8bc"}, - {file = "charset_normalizer-3.4.4-cp313-cp313-win32.whl", hash = "sha256:9b35f4c90079ff2e2edc5b26c0c77925e5d2d255c42c74fdb70fb49b172726ac"}, - {file = "charset_normalizer-3.4.4-cp313-cp313-win_amd64.whl", hash = "sha256:b435cba5f4f750aa6c0a0d92c541fb79f69a387c91e61f1795227e4ed9cece14"}, - {file = "charset_normalizer-3.4.4-cp313-cp313-win_arm64.whl", hash = "sha256:542d2cee80be6f80247095cc36c418f7bddd14f4a6de45af91dfad36d817bba2"}, - {file = "charset_normalizer-3.4.4-cp314-cp314-macosx_10_13_universal2.whl", hash = "sha256:da3326d9e65ef63a817ecbcc0df6e94463713b754fe293eaa03da99befb9a5bd"}, - {file = "charset_normalizer-3.4.4-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:8af65f14dc14a79b924524b1e7fffe304517b2bff5a58bf64f30b98bbc5079eb"}, - {file = "charset_normalizer-3.4.4-cp314-cp314-manylinux2014_armv7l.manylinux_2_17_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:74664978bb272435107de04e36db5a9735e78232b85b77d45cfb38f758efd33e"}, - {file = "charset_normalizer-3.4.4-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:752944c7ffbfdd10c074dc58ec2d5a8a4cd9493b314d367c14d24c17684ddd14"}, - {file = "charset_normalizer-3.4.4-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:d1f13550535ad8cff21b8d757a3257963e951d96e20ec82ab44bc64aeb62a191"}, - {file = "charset_normalizer-3.4.4-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:ecaae4149d99b1c9e7b88bb03e3221956f68fd6d50be2ef061b2381b61d20838"}, - {file = "charset_normalizer-3.4.4-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:cb6254dc36b47a990e59e1068afacdcd02958bdcce30bb50cc1700a8b9d624a6"}, - {file = "charset_normalizer-3.4.4-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:c8ae8a0f02f57a6e61203a31428fa1d677cbe50c93622b4149d5c0f319c1d19e"}, - {file = "charset_normalizer-3.4.4-cp314-cp314-musllinux_1_2_armv7l.whl", hash = "sha256:47cc91b2f4dd2833fddaedd2893006b0106129d4b94fdb6af1f4ce5a9965577c"}, - {file = "charset_normalizer-3.4.4-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:82004af6c302b5d3ab2cfc4cc5f29db16123b1a8417f2e25f9066f91d4411090"}, - {file = "charset_normalizer-3.4.4-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:2b7d8f6c26245217bd2ad053761201e9f9680f8ce52f0fcd8d0755aeae5b2152"}, - {file = "charset_normalizer-3.4.4-cp314-cp314-musllinux_1_2_s390x.whl", hash = "sha256:799a7a5e4fb2d5898c60b640fd4981d6a25f1c11790935a44ce38c54e985f828"}, - {file = "charset_normalizer-3.4.4-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:99ae2cffebb06e6c22bdc25801d7b30f503cc87dbd283479e7b606f70aff57ec"}, - {file = "charset_normalizer-3.4.4-cp314-cp314-win32.whl", hash = "sha256:f9d332f8c2a2fcbffe1378594431458ddbef721c1769d78e2cbc06280d8155f9"}, - {file = "charset_normalizer-3.4.4-cp314-cp314-win_amd64.whl", hash = "sha256:8a6562c3700cce886c5be75ade4a5db4214fda19fede41d9792d100288d8f94c"}, - {file = "charset_normalizer-3.4.4-cp314-cp314-win_arm64.whl", hash = "sha256:de00632ca48df9daf77a2c65a484531649261ec9f25489917f09e455cb09ddb2"}, - {file = "charset_normalizer-3.4.4-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:ce8a0633f41a967713a59c4139d29110c07e826d131a316b50ce11b1d79b4f84"}, - {file = "charset_normalizer-3.4.4-cp38-cp38-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:eaabd426fe94daf8fd157c32e571c85cb12e66692f15516a83a03264b08d06c3"}, - {file = "charset_normalizer-3.4.4-cp38-cp38-manylinux2014_armv7l.manylinux_2_17_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:c4ef880e27901b6cc782f1b95f82da9313c0eb95c3af699103088fa0ac3ce9ac"}, - {file = "charset_normalizer-3.4.4-cp38-cp38-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:2aaba3b0819274cc41757a1da876f810a3e4d7b6eb25699253a4effef9e8e4af"}, - {file = "charset_normalizer-3.4.4-cp38-cp38-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:778d2e08eda00f4256d7f672ca9fef386071c9202f5e4607920b86d7803387f2"}, - {file = "charset_normalizer-3.4.4-cp38-cp38-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:f155a433c2ec037d4e8df17d18922c3a0d9b3232a396690f17175d2946f0218d"}, - {file = "charset_normalizer-3.4.4-cp38-cp38-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:a8bf8d0f749c5757af2142fe7903a9df1d2e8aa3841559b2bad34b08d0e2bcf3"}, - {file = "charset_normalizer-3.4.4-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:194f08cbb32dc406d6e1aea671a68be0823673db2832b38405deba2fb0d88f63"}, - {file = "charset_normalizer-3.4.4-cp38-cp38-musllinux_1_2_armv7l.whl", hash = "sha256:6aee717dcfead04c6eb1ce3bd29ac1e22663cdea57f943c87d1eab9a025438d7"}, - {file = "charset_normalizer-3.4.4-cp38-cp38-musllinux_1_2_ppc64le.whl", hash = "sha256:cd4b7ca9984e5e7985c12bc60a6f173f3c958eae74f3ef6624bb6b26e2abbae4"}, - {file = "charset_normalizer-3.4.4-cp38-cp38-musllinux_1_2_riscv64.whl", hash = "sha256:b7cf1017d601aa35e6bb650b6ad28652c9cd78ee6caff19f3c28d03e1c80acbf"}, - {file = "charset_normalizer-3.4.4-cp38-cp38-musllinux_1_2_s390x.whl", hash = "sha256:e912091979546adf63357d7e2ccff9b44f026c075aeaf25a52d0e95ad2281074"}, - {file = "charset_normalizer-3.4.4-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:5cb4d72eea50c8868f5288b7f7f33ed276118325c1dfd3957089f6b519e1382a"}, - {file = "charset_normalizer-3.4.4-cp38-cp38-win32.whl", hash = "sha256:837c2ce8c5a65a2035be9b3569c684358dfbf109fd3b6969630a87535495ceaa"}, - {file = "charset_normalizer-3.4.4-cp38-cp38-win_amd64.whl", hash = "sha256:44c2a8734b333e0578090c4cd6b16f275e07aa6614ca8715e6c038e865e70576"}, - {file = "charset_normalizer-3.4.4-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:a9768c477b9d7bd54bc0c86dbaebdec6f03306675526c9927c0e8a04e8f94af9"}, - {file = "charset_normalizer-3.4.4-cp39-cp39-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1bee1e43c28aa63cb16e5c14e582580546b08e535299b8b6158a7c9c768a1f3d"}, - {file = "charset_normalizer-3.4.4-cp39-cp39-manylinux2014_armv7l.manylinux_2_17_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:fd44c878ea55ba351104cb93cc85e74916eb8fa440ca7903e57575e97394f608"}, - {file = "charset_normalizer-3.4.4-cp39-cp39-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:0f04b14ffe5fdc8c4933862d8306109a2c51e0704acfa35d51598eb45a1e89fc"}, - {file = "charset_normalizer-3.4.4-cp39-cp39-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:cd09d08005f958f370f539f186d10aec3377d55b9eeb0d796025d4886119d76e"}, - {file = "charset_normalizer-3.4.4-cp39-cp39-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:4fe7859a4e3e8457458e2ff592f15ccb02f3da787fcd31e0183879c3ad4692a1"}, - {file = "charset_normalizer-3.4.4-cp39-cp39-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:fa09f53c465e532f4d3db095e0c55b615f010ad81803d383195b6b5ca6cbf5f3"}, - {file = "charset_normalizer-3.4.4-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:7fa17817dc5625de8a027cb8b26d9fefa3ea28c8253929b8d6649e705d2835b6"}, - {file = "charset_normalizer-3.4.4-cp39-cp39-musllinux_1_2_armv7l.whl", hash = "sha256:5947809c8a2417be3267efc979c47d76a079758166f7d43ef5ae8e9f92751f88"}, - {file = "charset_normalizer-3.4.4-cp39-cp39-musllinux_1_2_ppc64le.whl", hash = "sha256:4902828217069c3c5c71094537a8e623f5d097858ac6ca8252f7b4d10b7560f1"}, - {file = "charset_normalizer-3.4.4-cp39-cp39-musllinux_1_2_riscv64.whl", hash = "sha256:7c308f7e26e4363d79df40ca5b2be1c6ba9f02bdbccfed5abddb7859a6ce72cf"}, - {file = "charset_normalizer-3.4.4-cp39-cp39-musllinux_1_2_s390x.whl", hash = "sha256:2c9d3c380143a1fedbff95a312aa798578371eb29da42106a29019368a475318"}, - {file = "charset_normalizer-3.4.4-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:cb01158d8b88ee68f15949894ccc6712278243d95f344770fa7593fa2d94410c"}, - {file = "charset_normalizer-3.4.4-cp39-cp39-win32.whl", hash = "sha256:2677acec1a2f8ef614c6888b5b4ae4060cc184174a938ed4e8ef690e15d3e505"}, - {file = "charset_normalizer-3.4.4-cp39-cp39-win_amd64.whl", hash = "sha256:f8e160feb2aed042cd657a72acc0b481212ed28b1b9a95c0cee1621b524e1966"}, - {file = "charset_normalizer-3.4.4-cp39-cp39-win_arm64.whl", hash = "sha256:b5d84d37db046c5ca74ee7bb47dd6cbc13f80665fdde3e8040bdd3fb015ecb50"}, - {file = "charset_normalizer-3.4.4-py3-none-any.whl", hash = "sha256:7a32c560861a02ff789ad905a2fe94e3f840803362c84fecf1851cb4cf3dc37f"}, - {file = "charset_normalizer-3.4.4.tar.gz", hash = "sha256:94537985111c35f28720e43603b8e7b43a6ecfb2ce1d3058bbe955b73404e21a"}, + {file = "charset_normalizer-3.4.6-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:2e1d8ca8611099001949d1cdfaefc510cf0f212484fe7c565f735b68c78c3c95"}, + {file = "charset_normalizer-3.4.6-cp310-cp310-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:e25369dc110d58ddf29b949377a93e0716d72a24f62bad72b2b39f155949c1fd"}, + {file = "charset_normalizer-3.4.6-cp310-cp310-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:259695e2ccc253feb2a016303543d691825e920917e31f894ca1a687982b1de4"}, + {file = "charset_normalizer-3.4.6-cp310-cp310-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:dda86aba335c902b6149a02a55b38e96287157e609200811837678214ba2b1db"}, + {file = "charset_normalizer-3.4.6-cp310-cp310-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:51fb3c322c81d20567019778cb5a4a6f2dc1c200b886bc0d636238e364848c89"}, + {file = "charset_normalizer-3.4.6-cp310-cp310-manylinux_2_31_armv7l.whl", hash = "sha256:4482481cb0572180b6fd976a4d5c72a30263e98564da68b86ec91f0fe35e8565"}, + {file = "charset_normalizer-3.4.6-cp310-cp310-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:39f5068d35621da2881271e5c3205125cc456f54e9030d3f723288c873a71bf9"}, + {file = "charset_normalizer-3.4.6-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:8bea55c4eef25b0b19a0337dc4e3f9a15b00d569c77211fa8cde38684f234fb7"}, + {file = "charset_normalizer-3.4.6-cp310-cp310-musllinux_1_2_armv7l.whl", hash = "sha256:f0cdaecd4c953bfae0b6bb64910aaaca5a424ad9c72d85cb88417bb9814f7550"}, + {file = "charset_normalizer-3.4.6-cp310-cp310-musllinux_1_2_ppc64le.whl", hash = "sha256:150b8ce8e830eb7ccb029ec9ca36022f756986aaaa7956aad6d9ec90089338c0"}, + {file = "charset_normalizer-3.4.6-cp310-cp310-musllinux_1_2_riscv64.whl", hash = "sha256:e68c14b04827dd76dcbd1aeea9e604e3e4b78322d8faf2f8132c7138efa340a8"}, + {file = "charset_normalizer-3.4.6-cp310-cp310-musllinux_1_2_s390x.whl", hash = "sha256:3778fd7d7cd04ae8f54651f4a7a0bd6e39a0cf20f801720a4c21d80e9b7ad6b0"}, + {file = "charset_normalizer-3.4.6-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:dad6e0f2e481fffdcf776d10ebee25e0ef89f16d691f1e5dee4b586375fdc64b"}, + {file = "charset_normalizer-3.4.6-cp310-cp310-win32.whl", hash = "sha256:74a2e659c7ecbc73562e2a15e05039f1e22c75b7c7618b4b574a3ea9118d1557"}, + {file = "charset_normalizer-3.4.6-cp310-cp310-win_amd64.whl", hash = "sha256:aa9cccf4a44b9b62d8ba8b4dd06c649ba683e4bf04eea606d2e94cfc2d6ff4d6"}, + {file = "charset_normalizer-3.4.6-cp310-cp310-win_arm64.whl", hash = "sha256:e985a16ff513596f217cee86c21371b8cd011c0f6f056d0920aa2d926c544058"}, + {file = "charset_normalizer-3.4.6-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:82060f995ab5003a2d6e0f4ad29065b7672b6593c8c63559beefe5b443242c3e"}, + {file = "charset_normalizer-3.4.6-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:60c74963d8350241a79cb8feea80e54d518f72c26db618862a8f53e5023deaf9"}, + {file = "charset_normalizer-3.4.6-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:f6e4333fb15c83f7d1482a76d45a0818897b3d33f00efd215528ff7c51b8e35d"}, + {file = "charset_normalizer-3.4.6-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:bc72863f4d9aba2e8fd9085e63548a324ba706d2ea2c83b260da08a59b9482de"}, + {file = "charset_normalizer-3.4.6-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:9cc4fc6c196d6a8b76629a70ddfcd4635a6898756e2d9cac5565cf0654605d73"}, + {file = "charset_normalizer-3.4.6-cp311-cp311-manylinux_2_31_armv7l.whl", hash = "sha256:0c173ce3a681f309f31b87125fecec7a5d1347261ea11ebbb856fa6006b23c8c"}, + {file = "charset_normalizer-3.4.6-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:c907cdc8109f6c619e6254212e794d6548373cc40e1ec75e6e3823d9135d29cc"}, + {file = "charset_normalizer-3.4.6-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:404a1e552cf5b675a87f0651f8b79f5f1e6fd100ee88dc612f89aa16abd4486f"}, + {file = "charset_normalizer-3.4.6-cp311-cp311-musllinux_1_2_armv7l.whl", hash = "sha256:e3c701e954abf6fc03a49f7c579cc80c2c6cc52525340ca3186c41d3f33482ef"}, + {file = "charset_normalizer-3.4.6-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:7a6967aaf043bceabab5412ed6bd6bd26603dae84d5cb75bf8d9a74a4959d398"}, + {file = "charset_normalizer-3.4.6-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:5feb91325bbceade6afab43eb3b508c63ee53579fe896c77137ded51c6b6958e"}, + {file = "charset_normalizer-3.4.6-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:f820f24b09e3e779fe84c3c456cb4108a7aa639b0d1f02c28046e11bfcd088ed"}, + {file = "charset_normalizer-3.4.6-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:b35b200d6a71b9839a46b9b7fff66b6638bb52fc9658aa58796b0326595d3021"}, + {file = "charset_normalizer-3.4.6-cp311-cp311-win32.whl", hash = "sha256:9ca4c0b502ab399ef89248a2c84c54954f77a070f28e546a85e91da627d1301e"}, + {file = "charset_normalizer-3.4.6-cp311-cp311-win_amd64.whl", hash = "sha256:a9e68c9d88823b274cf1e72f28cb5dc89c990edf430b0bfd3e2fb0785bfeabf4"}, + {file = "charset_normalizer-3.4.6-cp311-cp311-win_arm64.whl", hash = "sha256:97d0235baafca5f2b09cf332cc275f021e694e8362c6bb9c96fc9a0eb74fc316"}, + {file = "charset_normalizer-3.4.6-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:2ef7fedc7a6ecbe99969cd09632516738a97eeb8bd7258bf8a0f23114c057dab"}, + {file = "charset_normalizer-3.4.6-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a4ea868bc28109052790eb2b52a9ab33f3aa7adc02f96673526ff47419490e21"}, + {file = "charset_normalizer-3.4.6-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:836ab36280f21fc1a03c99cd05c6b7af70d2697e374c7af0b61ed271401a72a2"}, + {file = "charset_normalizer-3.4.6-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:f1ce721c8a7dfec21fcbdfe04e8f68174183cf4e8188e0645e92aa23985c57ff"}, + {file = "charset_normalizer-3.4.6-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:0e28d62a8fc7a1fa411c43bd65e346f3bce9716dc51b897fbe930c5987b402d5"}, + {file = "charset_normalizer-3.4.6-cp312-cp312-manylinux_2_31_armv7l.whl", hash = "sha256:530d548084c4a9f7a16ed4a294d459b4f229db50df689bfe92027452452943a0"}, + {file = "charset_normalizer-3.4.6-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:30f445ae60aad5e1f8bdbb3108e39f6fbc09f4ea16c815c66578878325f8f15a"}, + {file = "charset_normalizer-3.4.6-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:ac2393c73378fea4e52aa56285a3d64be50f1a12395afef9cce47772f60334c2"}, + {file = "charset_normalizer-3.4.6-cp312-cp312-musllinux_1_2_armv7l.whl", hash = "sha256:90ca27cd8da8118b18a52d5f547859cc1f8354a00cd1e8e5120df3e30d6279e5"}, + {file = "charset_normalizer-3.4.6-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:8e5a94886bedca0f9b78fecd6afb6629142fd2605aa70a125d49f4edc6037ee6"}, + {file = "charset_normalizer-3.4.6-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:695f5c2823691a25f17bc5d5ffe79fa90972cc34b002ac6c843bb8a1720e950d"}, + {file = "charset_normalizer-3.4.6-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:231d4da14bcd9301310faf492051bee27df11f2bc7549bc0bb41fef11b82daa2"}, + {file = "charset_normalizer-3.4.6-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:a056d1ad2633548ca18ffa2f85c202cfb48b68615129143915b8dc72a806a923"}, + {file = "charset_normalizer-3.4.6-cp312-cp312-win32.whl", hash = "sha256:c2274ca724536f173122f36c98ce188fd24ce3dad886ec2b7af859518ce008a4"}, + {file = "charset_normalizer-3.4.6-cp312-cp312-win_amd64.whl", hash = "sha256:c8ae56368f8cc97c7e40a7ee18e1cedaf8e780cd8bc5ed5ac8b81f238614facb"}, + {file = "charset_normalizer-3.4.6-cp312-cp312-win_arm64.whl", hash = "sha256:899d28f422116b08be5118ef350c292b36fc15ec2daeb9ea987c89281c7bb5c4"}, + {file = "charset_normalizer-3.4.6-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:11afb56037cbc4b1555a34dd69151e8e069bee82e613a73bef6e714ce733585f"}, + {file = "charset_normalizer-3.4.6-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:423fb7e748a08f854a08a222b983f4df1912b1daedce51a72bd24fe8f26a1843"}, + {file = "charset_normalizer-3.4.6-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:d73beaac5e90173ac3deb9928a74763a6d230f494e4bfb422c217a0ad8e629bf"}, + {file = "charset_normalizer-3.4.6-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:d60377dce4511655582e300dc1e5a5f24ba0cb229005a1d5c8d0cb72bb758ab8"}, + {file = "charset_normalizer-3.4.6-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:530e8cebeea0d76bdcf93357aa5e41336f48c3dc709ac52da2bb167c5b8271d9"}, + {file = "charset_normalizer-3.4.6-cp313-cp313-manylinux_2_31_armv7l.whl", hash = "sha256:a26611d9987b230566f24a0a125f17fe0de6a6aff9f25c9f564aaa2721a5fb88"}, + {file = "charset_normalizer-3.4.6-cp313-cp313-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:34315ff4fc374b285ad7f4a0bf7dcbfe769e1b104230d40f49f700d4ab6bbd84"}, + {file = "charset_normalizer-3.4.6-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:5f8ddd609f9e1af8c7bd6e2aca279c931aefecd148a14402d4e368f3171769fd"}, + {file = "charset_normalizer-3.4.6-cp313-cp313-musllinux_1_2_armv7l.whl", hash = "sha256:80d0a5615143c0b3225e5e3ef22c8d5d51f3f72ce0ea6fb84c943546c7b25b6c"}, + {file = "charset_normalizer-3.4.6-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:92734d4d8d187a354a556626c221cd1a892a4e0802ccb2af432a1d85ec012194"}, + {file = "charset_normalizer-3.4.6-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:613f19aa6e082cf96e17e3ffd89383343d0d589abda756b7764cf78361fd41dc"}, + {file = "charset_normalizer-3.4.6-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:2b1a63e8224e401cafe7739f77efd3f9e7f5f2026bda4aead8e59afab537784f"}, + {file = "charset_normalizer-3.4.6-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:6cceb5473417d28edd20c6c984ab6fee6c6267d38d906823ebfe20b03d607dc2"}, + {file = "charset_normalizer-3.4.6-cp313-cp313-win32.whl", hash = "sha256:d7de2637729c67d67cf87614b566626057e95c303bc0a55ffe391f5205e7003d"}, + {file = "charset_normalizer-3.4.6-cp313-cp313-win_amd64.whl", hash = "sha256:572d7c822caf521f0525ba1bce1a622a0b85cf47ffbdae6c9c19e3b5ac3c4389"}, + {file = "charset_normalizer-3.4.6-cp313-cp313-win_arm64.whl", hash = "sha256:a4474d924a47185a06411e0064b803c68be044be2d60e50e8bddcc2649957c1f"}, + {file = "charset_normalizer-3.4.6-cp314-cp314-macosx_10_15_universal2.whl", hash = "sha256:9cc6e6d9e571d2f863fa77700701dae73ed5f78881efc8b3f9a4398772ff53e8"}, + {file = "charset_normalizer-3.4.6-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ef5960d965e67165d75b7c7ffc60a83ec5abfc5c11b764ec13ea54fbef8b4421"}, + {file = "charset_normalizer-3.4.6-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:b3694e3f87f8ac7ce279d4355645b3c878d24d1424581b46282f24b92f5a4ae2"}, + {file = "charset_normalizer-3.4.6-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:5d11595abf8dd942a77883a39d81433739b287b6aa71620f15164f8096221b30"}, + {file = "charset_normalizer-3.4.6-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:7bda6eebafd42133efdca535b04ccb338ab29467b3f7bf79569883676fc628db"}, + {file = "charset_normalizer-3.4.6-cp314-cp314-manylinux_2_31_armv7l.whl", hash = "sha256:bbc8c8650c6e51041ad1be191742b8b421d05bbd3410f43fa2a00c8db87678e8"}, + {file = "charset_normalizer-3.4.6-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:22c6f0c2fbc31e76c3b8a86fba1a56eda6166e238c29cdd3d14befdb4a4e4815"}, + {file = "charset_normalizer-3.4.6-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:7edbed096e4a4798710ed6bc75dcaa2a21b68b6c356553ac4823c3658d53743a"}, + {file = "charset_normalizer-3.4.6-cp314-cp314-musllinux_1_2_armv7l.whl", hash = "sha256:7f9019c9cb613f084481bd6a100b12e1547cf2efe362d873c2e31e4035a6fa43"}, + {file = "charset_normalizer-3.4.6-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:58c948d0d086229efc484fe2f30c2d382c86720f55cd9bc33591774348ad44e0"}, + {file = "charset_normalizer-3.4.6-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:419a9d91bd238052642a51938af8ac05da5b3343becde08d5cdeab9046df9ee1"}, + {file = "charset_normalizer-3.4.6-cp314-cp314-musllinux_1_2_s390x.whl", hash = "sha256:5273b9f0b5835ff0350c0828faea623c68bfa65b792720c453e22b25cc72930f"}, + {file = "charset_normalizer-3.4.6-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:0e901eb1049fdb80f5bd11ed5ea1e498ec423102f7a9b9e4645d5b8204ff2815"}, + {file = "charset_normalizer-3.4.6-cp314-cp314-win32.whl", hash = "sha256:b4ff1d35e8c5bd078be89349b6f3a845128e685e751b6ea1169cf2160b344c4d"}, + {file = "charset_normalizer-3.4.6-cp314-cp314-win_amd64.whl", hash = "sha256:74119174722c4349af9708993118581686f343adc1c8c9c007d59be90d077f3f"}, + {file = "charset_normalizer-3.4.6-cp314-cp314-win_arm64.whl", hash = "sha256:e5bcc1a1ae744e0bb59641171ae53743760130600da8db48cbb6e4918e186e4e"}, + {file = "charset_normalizer-3.4.6-cp314-cp314t-macosx_10_15_universal2.whl", hash = "sha256:ad8faf8df23f0378c6d527d8b0b15ea4a2e23c89376877c598c4870d1b2c7866"}, + {file = "charset_normalizer-3.4.6-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:f5ea69428fa1b49573eef0cc44a1d43bebd45ad0c611eb7d7eac760c7ae771bc"}, + {file = "charset_normalizer-3.4.6-cp314-cp314t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:06a7e86163334edfc5d20fe104db92fcd666e5a5df0977cb5680a506fe26cc8e"}, + {file = "charset_normalizer-3.4.6-cp314-cp314t-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:e1f6e2f00a6b8edb562826e4632e26d063ac10307e80f7461f7de3ad8ef3f077"}, + {file = "charset_normalizer-3.4.6-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:95b52c68d64c1878818687a473a10547b3292e82b6f6fe483808fb1468e2f52f"}, + {file = "charset_normalizer-3.4.6-cp314-cp314t-manylinux_2_31_armv7l.whl", hash = "sha256:7504e9b7dc05f99a9bbb4525c67a2c155073b44d720470a148b34166a69c054e"}, + {file = "charset_normalizer-3.4.6-cp314-cp314t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:172985e4ff804a7ad08eebec0a1640ece87ba5041d565fff23c8f99c1f389484"}, + {file = "charset_normalizer-3.4.6-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:4be9f4830ba8741527693848403e2c457c16e499100963ec711b1c6f2049b7c7"}, + {file = "charset_normalizer-3.4.6-cp314-cp314t-musllinux_1_2_armv7l.whl", hash = "sha256:79090741d842f564b1b2827c0b82d846405b744d31e84f18d7a7b41c20e473ff"}, + {file = "charset_normalizer-3.4.6-cp314-cp314t-musllinux_1_2_ppc64le.whl", hash = "sha256:87725cfb1a4f1f8c2fc9890ae2f42094120f4b44db9360be5d99a4c6b0e03a9e"}, + {file = "charset_normalizer-3.4.6-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:fcce033e4021347d80ed9c66dcf1e7b1546319834b74445f561d2e2221de5659"}, + {file = "charset_normalizer-3.4.6-cp314-cp314t-musllinux_1_2_s390x.whl", hash = "sha256:ca0276464d148c72defa8bb4390cce01b4a0e425f3b50d1435aa6d7a18107602"}, + {file = "charset_normalizer-3.4.6-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:197c1a244a274bb016dd8b79204850144ef77fe81c5b797dc389327adb552407"}, + {file = "charset_normalizer-3.4.6-cp314-cp314t-win32.whl", hash = "sha256:2a24157fa36980478dd1770b585c0f30d19e18f4fb0c47c13aa568f871718579"}, + {file = "charset_normalizer-3.4.6-cp314-cp314t-win_amd64.whl", hash = "sha256:cd5e2801c89992ed8c0a3f0293ae83c159a60d9a5d685005383ef4caca77f2c4"}, + {file = "charset_normalizer-3.4.6-cp314-cp314t-win_arm64.whl", hash = "sha256:47955475ac79cc504ef2704b192364e51d0d473ad452caedd0002605f780101c"}, + {file = "charset_normalizer-3.4.6-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:659a1e1b500fac8f2779dd9e1570464e012f43e580371470b45277a27baa7532"}, + {file = "charset_normalizer-3.4.6-cp38-cp38-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:f61aa92e4aad0be58eb6eb4e0c21acf32cf8065f4b2cae5665da756c4ceef982"}, + {file = "charset_normalizer-3.4.6-cp38-cp38-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:f50498891691e0864dc3da965f340fada0771f6142a378083dc4608f4ea513e2"}, + {file = "charset_normalizer-3.4.6-cp38-cp38-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:bf625105bb9eef28a56a943fec8c8a98aeb80e7d7db99bd3c388137e6eb2d237"}, + {file = "charset_normalizer-3.4.6-cp38-cp38-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:2bd9d128ef93637a5d7a6af25363cf5dec3fa21cf80e68055aad627f280e8afa"}, + {file = "charset_normalizer-3.4.6-cp38-cp38-manylinux_2_31_armv7l.whl", hash = "sha256:d08ec48f0a1c48d75d0356cea971921848fb620fdeba805b28f937e90691209f"}, + {file = "charset_normalizer-3.4.6-cp38-cp38-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:1ed80ff870ca6de33f4d953fda4d55654b9a2b340ff39ab32fa3adbcd718f264"}, + {file = "charset_normalizer-3.4.6-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:f98059e4fcd3e3e4e2d632b7cf81c2faae96c43c60b569e9c621468082f1d104"}, + {file = "charset_normalizer-3.4.6-cp38-cp38-musllinux_1_2_armv7l.whl", hash = "sha256:ab30e5e3e706e3063bc6de96b118688cb10396b70bb9864a430f67df98c61ecc"}, + {file = "charset_normalizer-3.4.6-cp38-cp38-musllinux_1_2_ppc64le.whl", hash = "sha256:d5f5d1e9def3405f60e3ca8232d56f35c98fb7bf581efcc60051ebf53cb8b611"}, + {file = "charset_normalizer-3.4.6-cp38-cp38-musllinux_1_2_riscv64.whl", hash = "sha256:461598cd852bfa5a61b09cae2b1c02e2efcd166ee5516e243d540ac24bfa68a7"}, + {file = "charset_normalizer-3.4.6-cp38-cp38-musllinux_1_2_s390x.whl", hash = "sha256:71be7e0e01753a89cf024abf7ecb6bca2c81738ead80d43004d9b5e3f1244e64"}, + {file = "charset_normalizer-3.4.6-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:df01808ee470038c3f8dc4f48620df7225c49c2d6639e38f96e6d6ac6e6f7b0e"}, + {file = "charset_normalizer-3.4.6-cp38-cp38-win32.whl", hash = "sha256:69dd852c2f0ad631b8b60cfbe25a28c0058a894de5abb566619c205ce0550eae"}, + {file = "charset_normalizer-3.4.6-cp38-cp38-win_amd64.whl", hash = "sha256:517ad0e93394ac532745129ceabdf2696b609ec9f87863d337140317ebce1c14"}, + {file = "charset_normalizer-3.4.6-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:31215157227939b4fb3d740cd23fe27be0439afef67b785a1eb78a3ae69cba9e"}, + {file = "charset_normalizer-3.4.6-cp39-cp39-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ecbbd45615a6885fe3240eb9db73b9e62518b611850fdf8ab08bd56de7ad2b17"}, + {file = "charset_normalizer-3.4.6-cp39-cp39-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:c45a03a4c69820a399f1dda9e1d8fbf3562eda46e7720458180302021b08f778"}, + {file = "charset_normalizer-3.4.6-cp39-cp39-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:e8aeb10fcbe92767f0fa69ad5a72deca50d0dca07fbde97848997d778a50c9fe"}, + {file = "charset_normalizer-3.4.6-cp39-cp39-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:54fae94be3d75f3e573c9a1b5402dc593de19377013c9a0e4285e3d402dd3a2a"}, + {file = "charset_normalizer-3.4.6-cp39-cp39-manylinux_2_31_armv7l.whl", hash = "sha256:2f7fdd9b6e6c529d6a2501a2d36b240109e78a8ceaef5687cfcfa2bbe671d297"}, + {file = "charset_normalizer-3.4.6-cp39-cp39-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:4d1d02209e06550bdaef34af58e041ad71b88e624f5d825519da3a3308e22687"}, + {file = "charset_normalizer-3.4.6-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:8bc5f0687d796c05b1e28ab0d38a50e6309906ee09375dd3aff6a9c09dd6e8f4"}, + {file = "charset_normalizer-3.4.6-cp39-cp39-musllinux_1_2_armv7l.whl", hash = "sha256:ee4ec14bc1680d6b0afab9aea2ef27e26d2024f18b24a2d7155a52b60da7e833"}, + {file = "charset_normalizer-3.4.6-cp39-cp39-musllinux_1_2_ppc64le.whl", hash = "sha256:d1a2ee9c1499fc8f86f4521f27a973c914b211ffa87322f4ee33bb35392da2c5"}, + {file = "charset_normalizer-3.4.6-cp39-cp39-musllinux_1_2_riscv64.whl", hash = "sha256:48696db7f18afb80a068821504296eb0787d9ce239b91ca15059d1d3eaacf13b"}, + {file = "charset_normalizer-3.4.6-cp39-cp39-musllinux_1_2_s390x.whl", hash = "sha256:4f41da960b196ea355357285ad1316a00099f22d0929fe168343b99b254729c9"}, + {file = "charset_normalizer-3.4.6-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:802168e03fba8bbc5ce0d866d589e4b1ca751d06edee69f7f3a19c5a9fe6b597"}, + {file = "charset_normalizer-3.4.6-cp39-cp39-win32.whl", hash = "sha256:8761ac29b6c81574724322a554605608a9960769ea83d2c73e396f3df896ad54"}, + {file = "charset_normalizer-3.4.6-cp39-cp39-win_amd64.whl", hash = "sha256:1cf0a70018692f85172348fe06d3a4b63f94ecb055e13a00c644d368eb82e5b8"}, + {file = "charset_normalizer-3.4.6-cp39-cp39-win_arm64.whl", hash = "sha256:3516bbb8d42169de9e61b8520cbeeeb716f12f4ecfe3fd30a9919aa16c806ca8"}, + {file = "charset_normalizer-3.4.6-py3-none-any.whl", hash = "sha256:947cf925bc916d90adba35a64c82aace04fa39b46b52d4630ece166655905a69"}, + {file = "charset_normalizer-3.4.6.tar.gz", hash = "sha256:1ae6b62897110aa7c79ea2f5dd38d1abca6db663687c0b1ad9aed6f6bae3d9d6"}, ] [[package]] @@ -1090,108 +1109,122 @@ files = [ {file = "colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"}, {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"}, ] -markers = {dev = "platform_system == \"Windows\" or sys_platform == \"win32\"", preprocessingfunction = "platform_system == \"Windows\""} +markers = {dev = "sys_platform == \"win32\" or platform_system == \"Windows\"", preprocessingfunction = "platform_system == \"Windows\""} [[package]] name = "coverage" -version = "7.13.2" +version = "7.13.4" description = "Code coverage measurement for Python" optional = false python-versions = ">=3.10" groups = ["dev"] files = [ - {file = "coverage-7.13.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f4af3b01763909f477ea17c962e2cca8f39b350a4e46e3a30838b2c12e31b81b"}, - {file = "coverage-7.13.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:36393bd2841fa0b59498f75466ee9bdec4f770d3254f031f23e8fd8e140ffdd2"}, - {file = "coverage-7.13.2-cp310-cp310-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:9cc7573518b7e2186bd229b1a0fe24a807273798832c27032c4510f47ffdb896"}, - {file = "coverage-7.13.2-cp310-cp310-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:ca9566769b69a5e216a4e176d54b9df88f29d750c5b78dbb899e379b4e14b30c"}, - {file = "coverage-7.13.2-cp310-cp310-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:9c9bdea644e94fd66d75a6f7e9a97bb822371e1fe7eadae2cacd50fcbc28e4dc"}, - {file = "coverage-7.13.2-cp310-cp310-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:5bd447332ec4f45838c1ad42268ce21ca87c40deb86eabd59888859b66be22a5"}, - {file = "coverage-7.13.2-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:7c79ad5c28a16a1277e1187cf83ea8dafdcc689a784228a7d390f19776db7c31"}, - {file = "coverage-7.13.2-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:76e06ccacd1fb6ada5d076ed98a8c6f66e2e6acd3df02819e2ee29fd637b76ad"}, - {file = "coverage-7.13.2-cp310-cp310-musllinux_1_2_riscv64.whl", hash = "sha256:49d49e9a5e9f4dc3d3dac95278a020afa6d6bdd41f63608a76fa05a719d5b66f"}, - {file = "coverage-7.13.2-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:ed2bce0e7bfa53f7b0b01c722da289ef6ad4c18ebd52b1f93704c21f116360c8"}, - {file = "coverage-7.13.2-cp310-cp310-win32.whl", hash = "sha256:1574983178b35b9af4db4a9f7328a18a14a0a0ce76ffaa1c1bacb4cc82089a7c"}, - {file = "coverage-7.13.2-cp310-cp310-win_amd64.whl", hash = "sha256:a360a8baeb038928ceb996f5623a4cd508728f8f13e08d4e96ce161702f3dd99"}, - {file = "coverage-7.13.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:060ebf6f2c51aff5ba38e1f43a2095e087389b1c69d559fde6049a4b0001320e"}, - {file = "coverage-7.13.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:c1ea8ca9db5e7469cd364552985e15911548ea5b69c48a17291f0cac70484b2e"}, - {file = "coverage-7.13.2-cp311-cp311-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:b780090d15fd58f07cf2011943e25a5f0c1c894384b13a216b6c86c8a8a7c508"}, - {file = "coverage-7.13.2-cp311-cp311-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:88a800258d83acb803c38175b4495d293656d5fac48659c953c18e5f539a274b"}, - {file = "coverage-7.13.2-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6326e18e9a553e674d948536a04a80d850a5eeefe2aae2e6d7cf05d54046c01b"}, - {file = "coverage-7.13.2-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:59562de3f797979e1ff07c587e2ac36ba60ca59d16c211eceaa579c266c5022f"}, - {file = "coverage-7.13.2-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:27ba1ed6f66b0e2d61bfa78874dffd4f8c3a12f8e2b5410e515ab345ba7bc9c3"}, - {file = "coverage-7.13.2-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:8be48da4d47cc68754ce643ea50b3234557cbefe47c2f120495e7bd0a2756f2b"}, - {file = "coverage-7.13.2-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:2a47a4223d3361b91176aedd9d4e05844ca67d7188456227b6bf5e436630c9a1"}, - {file = "coverage-7.13.2-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:c6f141b468740197d6bd38f2b26ade124363228cc3f9858bd9924ab059e00059"}, - {file = "coverage-7.13.2-cp311-cp311-win32.whl", hash = "sha256:89567798404af067604246e01a49ef907d112edf2b75ef814b1364d5ce267031"}, - {file = "coverage-7.13.2-cp311-cp311-win_amd64.whl", hash = "sha256:21dd57941804ae2ac7e921771a5e21bbf9aabec317a041d164853ad0a96ce31e"}, - {file = "coverage-7.13.2-cp311-cp311-win_arm64.whl", hash = "sha256:10758e0586c134a0bafa28f2d37dd2cdb5e4a90de25c0fc0c77dabbad46eca28"}, - {file = "coverage-7.13.2-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:f106b2af193f965d0d3234f3f83fc35278c7fb935dfbde56ae2da3dd2c03b84d"}, - {file = "coverage-7.13.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:78f45d21dc4d5d6bd29323f0320089ef7eae16e4bef712dff79d184fa7330af3"}, - {file = "coverage-7.13.2-cp312-cp312-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:fae91dfecd816444c74531a9c3d6ded17a504767e97aa674d44f638107265b99"}, - {file = "coverage-7.13.2-cp312-cp312-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:264657171406c114787b441484de620e03d8f7202f113d62fcd3d9688baa3e6f"}, - {file = "coverage-7.13.2-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ae47d8dcd3ded0155afbb59c62bd8ab07ea0fd4902e1c40567439e6db9dcaf2f"}, - {file = "coverage-7.13.2-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:8a0b33e9fd838220b007ce8f299114d406c1e8edb21336af4c97a26ecfd185aa"}, - {file = "coverage-7.13.2-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:b3becbea7f3ce9a2d4d430f223ec15888e4deb31395840a79e916368d6004cce"}, - {file = "coverage-7.13.2-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:f819c727a6e6eeb8711e4ce63d78c620f69630a2e9d53bc95ca5379f57b6ba94"}, - {file = "coverage-7.13.2-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:4f7b71757a3ab19f7ba286e04c181004c1d61be921795ee8ba6970fd0ec91da5"}, - {file = "coverage-7.13.2-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:b7fc50d2afd2e6b4f6f2f403b70103d280a8e0cb35320cbbe6debcda02a1030b"}, - {file = "coverage-7.13.2-cp312-cp312-win32.whl", hash = "sha256:292250282cf9bcf206b543d7608bda17ca6fc151f4cbae949fc7e115112fbd41"}, - {file = "coverage-7.13.2-cp312-cp312-win_amd64.whl", hash = "sha256:eeea10169fac01549a7921d27a3e517194ae254b542102267bef7a93ed38c40e"}, - {file = "coverage-7.13.2-cp312-cp312-win_arm64.whl", hash = "sha256:2a5b567f0b635b592c917f96b9a9cb3dbd4c320d03f4bf94e9084e494f2e8894"}, - {file = "coverage-7.13.2-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:ed75de7d1217cf3b99365d110975f83af0528c849ef5180a12fd91b5064df9d6"}, - {file = "coverage-7.13.2-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:97e596de8fa9bada4d88fde64a3f4d37f1b6131e4faa32bad7808abc79887ddc"}, - {file = "coverage-7.13.2-cp313-cp313-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:68c86173562ed4413345410c9480a8d64864ac5e54a5cda236748031e094229f"}, - {file = "coverage-7.13.2-cp313-cp313-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:7be4d613638d678b2b3773b8f687537b284d7074695a43fe2fbbfc0e31ceaed1"}, - {file = "coverage-7.13.2-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:d7f63ce526a96acd0e16c4af8b50b64334239550402fb1607ce6a584a6d62ce9"}, - {file = "coverage-7.13.2-cp313-cp313-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:406821f37f864f968e29ac14c3fccae0fec9fdeba48327f0341decf4daf92d7c"}, - {file = "coverage-7.13.2-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:ee68e5a4e3e5443623406b905db447dceddffee0dceb39f4e0cd9ec2a35004b5"}, - {file = "coverage-7.13.2-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:2ee0e58cca0c17dd9c6c1cdde02bb705c7b3fbfa5f3b0b5afeda20d4ebff8ef4"}, - {file = "coverage-7.13.2-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:6e5bbb5018bf76a56aabdb64246b5288d5ae1b7d0dd4d0534fe86df2c2992d1c"}, - {file = "coverage-7.13.2-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:a55516c68ef3e08e134e818d5e308ffa6b1337cc8b092b69b24287bf07d38e31"}, - {file = "coverage-7.13.2-cp313-cp313-win32.whl", hash = "sha256:5b20211c47a8abf4abc3319d8ce2464864fa9f30c5fcaf958a3eed92f4f1fef8"}, - {file = "coverage-7.13.2-cp313-cp313-win_amd64.whl", hash = "sha256:14f500232e521201cf031549fb1ebdfc0a40f401cf519157f76c397e586c3beb"}, - {file = "coverage-7.13.2-cp313-cp313-win_arm64.whl", hash = "sha256:9779310cb5a9778a60c899f075a8514c89fa6d10131445c2207fc893e0b14557"}, - {file = "coverage-7.13.2-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:e64fa5a1e41ce5df6b547cbc3d3699381c9e2c2c369c67837e716ed0f549d48e"}, - {file = "coverage-7.13.2-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:b01899e82a04085b6561eb233fd688474f57455e8ad35cd82286463ba06332b7"}, - {file = "coverage-7.13.2-cp313-cp313t-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:838943bea48be0e2768b0cf7819544cdedc1bbb2f28427eabb6eb8c9eb2285d3"}, - {file = "coverage-7.13.2-cp313-cp313t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:93d1d25ec2b27e90bcfef7012992d1f5121b51161b8bffcda756a816cf13c2c3"}, - {file = "coverage-7.13.2-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:93b57142f9621b0d12349c43fc7741fe578e4bc914c1e5a54142856cfc0bf421"}, - {file = "coverage-7.13.2-cp313-cp313t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:f06799ae1bdfff7ccb8665d75f8291c69110ba9585253de254688aa8a1ccc6c5"}, - {file = "coverage-7.13.2-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:7f9405ab4f81d490811b1d91c7a20361135a2df4c170e7f0b747a794da5b7f23"}, - {file = "coverage-7.13.2-cp313-cp313t-musllinux_1_2_i686.whl", hash = "sha256:f9ab1d5b86f8fbc97a5b3cd6280a3fd85fef3b028689d8a2c00918f0d82c728c"}, - {file = "coverage-7.13.2-cp313-cp313t-musllinux_1_2_riscv64.whl", hash = "sha256:f674f59712d67e841525b99e5e2b595250e39b529c3bda14764e4f625a3fa01f"}, - {file = "coverage-7.13.2-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:c6cadac7b8ace1ba9144feb1ae3cb787a6065ba6d23ffc59a934b16406c26573"}, - {file = "coverage-7.13.2-cp313-cp313t-win32.whl", hash = "sha256:14ae4146465f8e6e6253eba0cccd57423e598a4cb925958b240c805300918343"}, - {file = "coverage-7.13.2-cp313-cp313t-win_amd64.whl", hash = "sha256:9074896edd705a05769e3de0eac0a8388484b503b68863dd06d5e473f874fd47"}, - {file = "coverage-7.13.2-cp313-cp313t-win_arm64.whl", hash = "sha256:69e526e14f3f854eda573d3cf40cffd29a1a91c684743d904c33dbdcd0e0f3e7"}, - {file = "coverage-7.13.2-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:387a825f43d680e7310e6f325b2167dd093bc8ffd933b83e9aa0983cf6e0a2ef"}, - {file = "coverage-7.13.2-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:f0d7fea9d8e5d778cd5a9e8fc38308ad688f02040e883cdc13311ef2748cb40f"}, - {file = "coverage-7.13.2-cp314-cp314-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:e080afb413be106c95c4ee96b4fffdc9e2fa56a8bbf90b5c0918e5c4449412f5"}, - {file = "coverage-7.13.2-cp314-cp314-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:a7fc042ba3c7ce25b8a9f097eb0f32a5ce1ccdb639d9eec114e26def98e1f8a4"}, - {file = "coverage-7.13.2-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:d0ba505e021557f7f8173ee8cd6b926373d8653e5ff7581ae2efce1b11ef4c27"}, - {file = "coverage-7.13.2-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:7de326f80e3451bd5cc7239ab46c73ddb658fe0b7649476bc7413572d36cd548"}, - {file = "coverage-7.13.2-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:abaea04f1e7e34841d4a7b343904a3f59481f62f9df39e2cd399d69a187a9660"}, - {file = "coverage-7.13.2-cp314-cp314-musllinux_1_2_i686.whl", hash = "sha256:9f93959ee0c604bccd8e0697be21de0887b1f73efcc3aa73a3ec0fd13feace92"}, - {file = "coverage-7.13.2-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:13fe81ead04e34e105bf1b3c9f9cdf32ce31736ee5d90a8d2de02b9d3e1bcb82"}, - {file = "coverage-7.13.2-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:d6d16b0f71120e365741bca2cb473ca6fe38930bc5431c5e850ba949f708f892"}, - {file = "coverage-7.13.2-cp314-cp314-win32.whl", hash = "sha256:9b2f4714bb7d99ba3790ee095b3b4ac94767e1347fe424278a0b10acb3ff04fe"}, - {file = "coverage-7.13.2-cp314-cp314-win_amd64.whl", hash = "sha256:e4121a90823a063d717a96e0a0529c727fb31ea889369a0ee3ec00ed99bf6859"}, - {file = "coverage-7.13.2-cp314-cp314-win_arm64.whl", hash = "sha256:6873f0271b4a15a33e7590f338d823f6f66f91ed147a03938d7ce26efd04eee6"}, - {file = "coverage-7.13.2-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:f61d349f5b7cd95c34017f1927ee379bfbe9884300d74e07cf630ccf7a610c1b"}, - {file = "coverage-7.13.2-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:a43d34ce714f4ca674c0d90beb760eb05aad906f2c47580ccee9da8fe8bfb417"}, - {file = "coverage-7.13.2-cp314-cp314t-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:bff1b04cb9d4900ce5c56c4942f047dc7efe57e2608cb7c3c8936e9970ccdbee"}, - {file = "coverage-7.13.2-cp314-cp314t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:6ae99e4560963ad8e163e819e5d77d413d331fd00566c1e0856aa252303552c1"}, - {file = "coverage-7.13.2-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:e79a8c7d461820257d9aa43716c4efc55366d7b292e46b5b37165be1d377405d"}, - {file = "coverage-7.13.2-cp314-cp314t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:060ee84f6a769d40c492711911a76811b4befb6fba50abb450371abb720f5bd6"}, - {file = "coverage-7.13.2-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:3bca209d001fd03ea2d978f8a4985093240a355c93078aee3f799852c23f561a"}, - {file = "coverage-7.13.2-cp314-cp314t-musllinux_1_2_i686.whl", hash = "sha256:6b8092aa38d72f091db61ef83cb66076f18f02da3e1a75039a4f218629600e04"}, - {file = "coverage-7.13.2-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:4a3158dc2dcce5200d91ec28cd315c999eebff355437d2765840555d765a6e5f"}, - {file = "coverage-7.13.2-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:3973f353b2d70bd9796cc12f532a05945232ccae966456c8ed7034cb96bbfd6f"}, - {file = "coverage-7.13.2-cp314-cp314t-win32.whl", hash = "sha256:79f6506a678a59d4ded048dc72f1859ebede8ec2b9a2d509ebe161f01c2879d3"}, - {file = "coverage-7.13.2-cp314-cp314t-win_amd64.whl", hash = "sha256:196bfeabdccc5a020a57d5a368c681e3a6ceb0447d153aeccc1ab4d70a5032ba"}, - {file = "coverage-7.13.2-cp314-cp314t-win_arm64.whl", hash = "sha256:69269ab58783e090bfbf5b916ab3d188126e22d6070bbfc93098fdd474ef937c"}, - {file = "coverage-7.13.2-py3-none-any.whl", hash = "sha256:40ce1ea1e25125556d8e76bd0b61500839a07944cc287ac21d5626f3e620cad5"}, - {file = "coverage-7.13.2.tar.gz", hash = "sha256:044c6951ec37146b72a50cc81ef02217d27d4c3640efd2640311393cbbf143d3"}, + {file = "coverage-7.13.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:0fc31c787a84f8cd6027eba44010517020e0d18487064cd3d8968941856d1415"}, + {file = "coverage-7.13.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:a32ebc02a1805adf637fc8dec324b5cdacd2e493515424f70ee33799573d661b"}, + {file = "coverage-7.13.4-cp310-cp310-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:e24f9156097ff9dc286f2f913df3a7f63c0e333dcafa3c196f2c18b4175ca09a"}, + {file = "coverage-7.13.4-cp310-cp310-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:8041b6c5bfdc03257666e9881d33b1abc88daccaf73f7b6340fb7946655cd10f"}, + {file = "coverage-7.13.4-cp310-cp310-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:2a09cfa6a5862bc2fc6ca7c3def5b2926194a56b8ab78ffcf617d28911123012"}, + {file = "coverage-7.13.4-cp310-cp310-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:296f8b0af861d3970c2a4d8c91d48eb4dd4771bcef9baedec6a9b515d7de3def"}, + {file = "coverage-7.13.4-cp310-cp310-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:e101609bcbbfb04605ea1027b10dc3735c094d12d40826a60f897b98b1c30256"}, + {file = "coverage-7.13.4-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:aa3feb8db2e87ff5e6d00d7e1480ae241876286691265657b500886c98f38bda"}, + {file = "coverage-7.13.4-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:4fc7fa81bbaf5a02801b65346c8b3e657f1d93763e58c0abdf7c992addd81a92"}, + {file = "coverage-7.13.4-cp310-cp310-musllinux_1_2_ppc64le.whl", hash = "sha256:33901f604424145c6e9c2398684b92e176c0b12df77d52db81c20abd48c3794c"}, + {file = "coverage-7.13.4-cp310-cp310-musllinux_1_2_riscv64.whl", hash = "sha256:bb28c0f2cf2782508a40cec377935829d5fcc3ad9a3681375af4e84eb34b6b58"}, + {file = "coverage-7.13.4-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:9d107aff57a83222ddbd8d9ee705ede2af2cc926608b57abed8ef96b50b7e8f9"}, + {file = "coverage-7.13.4-cp310-cp310-win32.whl", hash = "sha256:a6f94a7d00eb18f1b6d403c91a88fd58cfc92d4b16080dfdb774afc8294469bf"}, + {file = "coverage-7.13.4-cp310-cp310-win_amd64.whl", hash = "sha256:2cb0f1e000ebc419632bbe04366a8990b6e32c4e0b51543a6484ffe15eaeda95"}, + {file = "coverage-7.13.4-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:d490ba50c3f35dd7c17953c68f3270e7ccd1c6642e2d2afe2d8e720b98f5a053"}, + {file = "coverage-7.13.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:19bc3c88078789f8ef36acb014d7241961dbf883fd2533d18cb1e7a5b4e28b11"}, + {file = "coverage-7.13.4-cp311-cp311-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:3998e5a32e62fdf410c0dbd3115df86297995d6e3429af80b8798aad894ca7aa"}, + {file = "coverage-7.13.4-cp311-cp311-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:8e264226ec98e01a8e1054314af91ee6cde0eacac4f465cc93b03dbe0bce2fd7"}, + {file = "coverage-7.13.4-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a3aa4e7b9e416774b21797365b358a6e827ffadaaca81b69ee02946852449f00"}, + {file = "coverage-7.13.4-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:71ca20079dd8f27fcf808817e281e90220475cd75115162218d0e27549f95fef"}, + {file = "coverage-7.13.4-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:e2f25215f1a359ab17320b47bcdaca3e6e6356652e8256f2441e4ef972052903"}, + {file = "coverage-7.13.4-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:d65b2d373032411e86960604dc4edac91fdfb5dca539461cf2cbe78327d1e64f"}, + {file = "coverage-7.13.4-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:94eb63f9b363180aff17de3e7c8760c3ba94664ea2695c52f10111244d16a299"}, + {file = "coverage-7.13.4-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:e856bf6616714c3a9fbc270ab54103f4e685ba236fa98c054e8f87f266c93505"}, + {file = "coverage-7.13.4-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:65dfcbe305c3dfe658492df2d85259e0d79ead4177f9ae724b6fb245198f55d6"}, + {file = "coverage-7.13.4-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:b507778ae8a4c915436ed5c2e05b4a6cecfa70f734e19c22a005152a11c7b6a9"}, + {file = "coverage-7.13.4-cp311-cp311-win32.whl", hash = "sha256:784fc3cf8be001197b652d51d3fd259b1e2262888693a4636e18879f613a62a9"}, + {file = "coverage-7.13.4-cp311-cp311-win_amd64.whl", hash = "sha256:2421d591f8ca05b308cf0092807308b2facbefe54af7c02ac22548b88b95c98f"}, + {file = "coverage-7.13.4-cp311-cp311-win_arm64.whl", hash = "sha256:79e73a76b854d9c6088fe5d8b2ebe745f8681c55f7397c3c0a016192d681045f"}, + {file = "coverage-7.13.4-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:02231499b08dabbe2b96612993e5fc34217cdae907a51b906ac7fca8027a4459"}, + {file = "coverage-7.13.4-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40aa8808140e55dc022b15d8aa7f651b6b3d68b365ea0398f1441e0b04d859c3"}, + {file = "coverage-7.13.4-cp312-cp312-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:5b856a8ccf749480024ff3bd7310adaef57bf31fd17e1bfc404b7940b6986634"}, + {file = "coverage-7.13.4-cp312-cp312-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:2c048ea43875fbf8b45d476ad79f179809c590ec7b79e2035c662e7afa3192e3"}, + {file = "coverage-7.13.4-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:b7b38448866e83176e28086674fe7368ab8590e4610fb662b44e345b86d63ffa"}, + {file = "coverage-7.13.4-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:de6defc1c9badbf8b9e67ae90fd00519186d6ab64e5cc5f3d21359c2a9b2c1d3"}, + {file = "coverage-7.13.4-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:7eda778067ad7ffccd23ecffce537dface96212576a07924cbf0d8799d2ded5a"}, + {file = "coverage-7.13.4-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:e87f6c587c3f34356c3759f0420693e35e7eb0e2e41e4c011cb6ec6ecbbf1db7"}, + {file = "coverage-7.13.4-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:8248977c2e33aecb2ced42fef99f2d319e9904a36e55a8a68b69207fb7e43edc"}, + {file = "coverage-7.13.4-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:25381386e80ae727608e662474db537d4df1ecd42379b5ba33c84633a2b36d47"}, + {file = "coverage-7.13.4-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:ee756f00726693e5ba94d6df2bdfd64d4852d23b09bb0bc700e3b30e6f333985"}, + {file = "coverage-7.13.4-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:fdfc1e28e7c7cdce44985b3043bc13bbd9c747520f94a4d7164af8260b3d91f0"}, + {file = "coverage-7.13.4-cp312-cp312-win32.whl", hash = "sha256:01d4cbc3c283a17fc1e42d614a119f7f438eabb593391283adca8dc86eff1246"}, + {file = "coverage-7.13.4-cp312-cp312-win_amd64.whl", hash = "sha256:9401ebc7ef522f01d01d45532c68c5ac40fb27113019b6b7d8b208f6e9baa126"}, + {file = "coverage-7.13.4-cp312-cp312-win_arm64.whl", hash = "sha256:b1ec7b6b6e93255f952e27ab58fbc68dcc468844b16ecbee881aeb29b6ab4d8d"}, + {file = "coverage-7.13.4-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:b66a2da594b6068b48b2692f043f35d4d3693fb639d5ea8b39533c2ad9ac3ab9"}, + {file = "coverage-7.13.4-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:3599eb3992d814d23b35c536c28df1a882caa950f8f507cef23d1cbf334995ac"}, + {file = "coverage-7.13.4-cp313-cp313-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:93550784d9281e374fb5a12bf1324cc8a963fd63b2d2f223503ef0fd4aa339ea"}, + {file = "coverage-7.13.4-cp313-cp313-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:b720ce6a88a2755f7c697c23268ddc47a571b88052e6b155224347389fdf6a3b"}, + {file = "coverage-7.13.4-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:7b322db1284a2ed3aa28ffd8ebe3db91c929b7a333c0820abec3d838ef5b3525"}, + {file = "coverage-7.13.4-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:f4594c67d8a7c89cf922d9df0438c7c7bb022ad506eddb0fdb2863359ff78242"}, + {file = "coverage-7.13.4-cp313-cp313-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:53d133df809c743eb8bce33b24bcababb371f4441340578cd406e084d94a6148"}, + {file = "coverage-7.13.4-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:76451d1978b95ba6507a039090ba076105c87cc76fc3efd5d35d72093964d49a"}, + {file = "coverage-7.13.4-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:7f57b33491e281e962021de110b451ab8a24182589be17e12a22c79047935e23"}, + {file = "coverage-7.13.4-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:1731dc33dc276dafc410a885cbf5992f1ff171393e48a21453b78727d090de80"}, + {file = "coverage-7.13.4-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:bd60d4fe2f6fa7dff9223ca1bbc9f05d2b6697bc5961072e5d3b952d46e1b1ea"}, + {file = "coverage-7.13.4-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:9181a3ccead280b828fae232df12b16652702b49d41e99d657f46cc7b1f6ec7a"}, + {file = "coverage-7.13.4-cp313-cp313-win32.whl", hash = "sha256:f53d492307962561ac7de4cd1de3e363589b000ab69617c6156a16ba7237998d"}, + {file = "coverage-7.13.4-cp313-cp313-win_amd64.whl", hash = "sha256:e6f70dec1cc557e52df5306d051ef56003f74d56e9c4dd7ddb07e07ef32a84dd"}, + {file = "coverage-7.13.4-cp313-cp313-win_arm64.whl", hash = "sha256:fb07dc5da7e849e2ad31a5d74e9bece81f30ecf5a42909d0a695f8bd1874d6af"}, + {file = "coverage-7.13.4-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:40d74da8e6c4b9ac18b15331c4b5ebc35a17069410cad462ad4f40dcd2d50c0d"}, + {file = "coverage-7.13.4-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:4223b4230a376138939a9173f1bdd6521994f2aff8047fae100d6d94d50c5a12"}, + {file = "coverage-7.13.4-cp313-cp313t-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:1d4be36a5114c499f9f1f9195e95ebf979460dbe2d88e6816ea202010ba1c34b"}, + {file = "coverage-7.13.4-cp313-cp313t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:200dea7d1e8095cc6e98cdabe3fd1d21ab17d3cee6dab00cadbb2fe35d9c15b9"}, + {file = "coverage-7.13.4-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:b8eb931ee8e6d8243e253e5ed7336deea6904369d2fd8ae6e43f68abbf167092"}, + {file = "coverage-7.13.4-cp313-cp313t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:75eab1ebe4f2f64d9509b984f9314d4aa788540368218b858dad56dc8f3e5eb9"}, + {file = "coverage-7.13.4-cp313-cp313t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:c35eb28c1d085eb7d8c9b3296567a1bebe03ce72962e932431b9a61f28facf26"}, + {file = "coverage-7.13.4-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:eb88b316ec33760714a4720feb2816a3a59180fd58c1985012054fa7aebee4c2"}, + {file = "coverage-7.13.4-cp313-cp313t-musllinux_1_2_i686.whl", hash = "sha256:7d41eead3cc673cbd38a4417deb7fd0b4ca26954ff7dc6078e33f6ff97bed940"}, + {file = "coverage-7.13.4-cp313-cp313t-musllinux_1_2_ppc64le.whl", hash = "sha256:fb26a934946a6afe0e326aebe0730cdff393a8bc0bbb65a2f41e30feddca399c"}, + {file = "coverage-7.13.4-cp313-cp313t-musllinux_1_2_riscv64.whl", hash = "sha256:dae88bc0fc77edaa65c14be099bd57ee140cf507e6bfdeea7938457ab387efb0"}, + {file = "coverage-7.13.4-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:845f352911777a8e722bfce168958214951e07e47e5d5d9744109fa5fe77f79b"}, + {file = "coverage-7.13.4-cp313-cp313t-win32.whl", hash = "sha256:2fa8d5f8de70688a28240de9e139fa16b153cc3cbb01c5f16d88d6505ebdadf9"}, + {file = "coverage-7.13.4-cp313-cp313t-win_amd64.whl", hash = "sha256:9351229c8c8407645840edcc277f4a2d44814d1bc34a2128c11c2a031d45a5dd"}, + {file = "coverage-7.13.4-cp313-cp313t-win_arm64.whl", hash = "sha256:30b8d0512f2dc8c8747557e8fb459d6176a2c9e5731e2b74d311c03b78451997"}, + {file = "coverage-7.13.4-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:300deaee342f90696ed186e3a00c71b5b3d27bffe9e827677954f4ee56969601"}, + {file = "coverage-7.13.4-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:29e3220258d682b6226a9b0925bc563ed9a1ebcff3cad30f043eceea7eaf2689"}, + {file = "coverage-7.13.4-cp314-cp314-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:391ee8f19bef69210978363ca930f7328081c6a0152f1166c91f0b5fdd2a773c"}, + {file = "coverage-7.13.4-cp314-cp314-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:0dd7ab8278f0d58a0128ba2fca25824321f05d059c1441800e934ff2efa52129"}, + {file = "coverage-7.13.4-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:78cdf0d578b15148b009ccf18c686aa4f719d887e76e6b40c38ffb61d264a552"}, + {file = "coverage-7.13.4-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:48685fee12c2eb3b27c62f2658e7ea21e9c3239cba5a8a242801a0a3f6a8c62a"}, + {file = "coverage-7.13.4-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:4e83efc079eb39480e6346a15a1bcb3e9b04759c5202d157e1dd4303cd619356"}, + {file = "coverage-7.13.4-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:ecae9737b72408d6a950f7e525f30aca12d4bd8dd95e37342e5beb3a2a8c4f71"}, + {file = "coverage-7.13.4-cp314-cp314-musllinux_1_2_i686.whl", hash = "sha256:ae4578f8528569d3cf303fef2ea569c7f4c4059a38c8667ccef15c6e1f118aa5"}, + {file = "coverage-7.13.4-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:6fdef321fdfbb30a197efa02d48fcd9981f0d8ad2ae8903ac318adc653f5df98"}, + {file = "coverage-7.13.4-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:2b0f6ccf3dbe577170bebfce1318707d0e8c3650003cb4b3a9dd744575daa8b5"}, + {file = "coverage-7.13.4-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:75fcd519f2a5765db3f0e391eb3b7d150cce1a771bf4c9f861aeab86c767a3c0"}, + {file = "coverage-7.13.4-cp314-cp314-win32.whl", hash = "sha256:8e798c266c378da2bd819b0677df41ab46d78065fb2a399558f3f6cae78b2fbb"}, + {file = "coverage-7.13.4-cp314-cp314-win_amd64.whl", hash = "sha256:245e37f664d89861cf2329c9afa2c1fe9e6d4e1a09d872c947e70718aeeac505"}, + {file = "coverage-7.13.4-cp314-cp314-win_arm64.whl", hash = "sha256:ad27098a189e5838900ce4c2a99f2fe42a0bf0c2093c17c69b45a71579e8d4a2"}, + {file = "coverage-7.13.4-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:85480adfb35ffc32d40918aad81b89c69c9cc5661a9b8a81476d3e645321a056"}, + {file = "coverage-7.13.4-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:79be69cf7f3bf9b0deeeb062eab7ac7f36cd4cc4c4dd694bd28921ba4d8596cc"}, + {file = "coverage-7.13.4-cp314-cp314t-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:caa421e2684e382c5d8973ac55e4f36bed6821a9bad5c953494de960c74595c9"}, + {file = "coverage-7.13.4-cp314-cp314t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:14375934243ee05f56c45393fe2ce81fe5cc503c07cee2bdf1725fb8bef3ffaf"}, + {file = "coverage-7.13.4-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:25a41c3104d08edb094d9db0d905ca54d0cd41c928bb6be3c4c799a54753af55"}, + {file = "coverage-7.13.4-cp314-cp314t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:6f01afcff62bf9a08fb32b2c1d6e924236c0383c02c790732b6537269e466a72"}, + {file = "coverage-7.13.4-cp314-cp314t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:eb9078108fbf0bcdde37c3f4779303673c2fa1fe8f7956e68d447d0dd426d38a"}, + {file = "coverage-7.13.4-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:0e086334e8537ddd17e5f16a344777c1ab8194986ec533711cbe6c41cde841b6"}, + {file = "coverage-7.13.4-cp314-cp314t-musllinux_1_2_i686.whl", hash = "sha256:725d985c5ab621268b2edb8e50dfe57633dc69bda071abc470fed55a14935fd3"}, + {file = "coverage-7.13.4-cp314-cp314t-musllinux_1_2_ppc64le.whl", hash = "sha256:3c06f0f1337c667b971ca2f975523347e63ec5e500b9aa5882d91931cd3ef750"}, + {file = "coverage-7.13.4-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:590c0ed4bf8e85f745e6b805b2e1c457b2e33d5255dd9729743165253bc9ad39"}, + {file = "coverage-7.13.4-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:eb30bf180de3f632cd043322dad5751390e5385108b2807368997d1a92a509d0"}, + {file = "coverage-7.13.4-cp314-cp314t-win32.whl", hash = "sha256:c4240e7eded42d131a2d2c4dec70374b781b043ddc79a9de4d55ca71f8e98aea"}, + {file = "coverage-7.13.4-cp314-cp314t-win_amd64.whl", hash = "sha256:4c7d3cc01e7350f2f0f6f7036caaf5673fb56b6998889ccfe9e1c1fe75a9c932"}, + {file = "coverage-7.13.4-cp314-cp314t-win_arm64.whl", hash = "sha256:23e3f687cf945070d1c90f85db66d11e3025665d8dafa831301a0e0038f3db9b"}, + {file = "coverage-7.13.4-py3-none-any.whl", hash = "sha256:1af1641e57cf7ba1bd67d677c9abdbcd6cc2ab7da3bca7fa1e2b7e50e65f2ad0"}, + {file = "coverage-7.13.4.tar.gz", hash = "sha256:e5c8f6ed1e61a8b2dcdf31eb0b9bbf0130750ca79c1c49eb898e2ad86f5ccc91"}, ] [package.extras] @@ -1307,14 +1340,14 @@ files = [ [[package]] name = "filelock" -version = "3.20.3" +version = "3.25.2" description = "A platform independent file lock." optional = false python-versions = ">=3.10" groups = ["dev"] files = [ - {file = "filelock-3.20.3-py3-none-any.whl", hash = "sha256:4b0dda527ee31078689fc205ec4f1c1bf7d56cf88b6dc9426c4f230e46c2dce1"}, - {file = "filelock-3.20.3.tar.gz", hash = "sha256:18c57ee915c7ec61cff0ecf7f0f869936c7c30191bb0cf406f1341778d0834e1"}, + {file = "filelock-3.25.2-py3-none-any.whl", hash = "sha256:ca8afb0da15f229774c9ad1b455ed96e85a81373065fb10446672f64444ddf70"}, + {file = "filelock-3.25.2.tar.gz", hash = "sha256:b64ece2b38f4ca29dd3e810287aa8c48182bbecd1ae6e9ae126c9b35f1382694"}, ] [[package]] @@ -1395,14 +1428,14 @@ zstd = ["zstandard (>=0.18.0)"] [[package]] name = "identify" -version = "2.6.16" +version = "2.6.18" description = "File identification library for Python" optional = false python-versions = ">=3.10" groups = ["dev"] files = [ - {file = "identify-2.6.16-py2.py3-none-any.whl", hash = "sha256:391ee4d77741d994189522896270b787aed8670389bfd60f326d677d64a6dfb0"}, - {file = "identify-2.6.16.tar.gz", hash = "sha256:846857203b5511bbe94d5a352a48ef2359532bc8f6727b5544077a0dcfb24980"}, + {file = "identify-2.6.18-py2.py3-none-any.whl", hash = "sha256:8db9d3c8ea9079db92cafb0ebf97abdc09d52e97f4dcf773a2e694048b7cd737"}, + {file = "identify-2.6.18.tar.gz", hash = "sha256:873ac56a5e3fd63e7438a7ecbc4d91aca692eb3fefa4534db2b7913f3fc352fd"}, ] [package.extras] @@ -1583,7 +1616,7 @@ version = "1.1.0" description = "JSON Matching Expressions" optional = false python-versions = ">=3.9" -groups = ["bedrockloggingconfigfunction", "dev", "preprocessingfunction", "slackbotfunction", "syncknowledgebasefunction"] +groups = ["bedrockloggingconfigfunction", "dev", "notifys3uploadfunction", "preprocessingfunction", "slackbotfunction", "syncknowledgebasefunction"] files = [ {file = "jmespath-1.1.0-py3-none-any.whl", hash = "sha256:a5663118de4908c91729bea0acadca56526eb2698e83de10cd116ae0f4e97c64"}, {file = "jmespath-1.1.0.tar.gz", hash = "sha256:472c87d80f36026ae83c6ddd0f1d05d4e510134ed462851fd5f754c8c3cbb88d"}, @@ -1630,7 +1663,7 @@ files = [ [package.dependencies] attrs = ">=22.2.0" -jsonschema-specifications = ">=2023.03.6" +jsonschema-specifications = ">=2023.3.6" referencing = ">=0.28.4" rpds-py = ">=0.25.0" @@ -1811,14 +1844,14 @@ htmlsoup = ["BeautifulSoup4"] [[package]] name = "mammoth" -version = "1.11.0" +version = "1.12.0" description = "Convert Word documents from docx to simple and clean HTML and Markdown" optional = false python-versions = ">=3.7" groups = ["preprocessingfunction"] files = [ - {file = "mammoth-1.11.0-py2.py3-none-any.whl", hash = "sha256:c077ab0d450bd7c0c6ecd529a23bf7e0fa8190c929e28998308ff4eada3f063b"}, - {file = "mammoth-1.11.0.tar.gz", hash = "sha256:a0f59e442f34d5b6447f4b0999306cbf3e67aaabfa8cb516f878fb1456744637"}, + {file = "mammoth-1.12.0-py2.py3-none-any.whl", hash = "sha256:d195ae2403b98276d7646e252035b6f70adb255987bb267e9eac6bc6531fe38f"}, + {file = "mammoth-1.12.0.tar.gz", hash = "sha256:10955a55d9173167b550de3aeb8f2ed48b420756fd66378156b2f78661a33dd5"}, ] [package.dependencies] @@ -2088,14 +2121,14 @@ tests = ["pytest (>=4.6)"] [[package]] name = "msal" -version = "1.34.0" +version = "1.35.1" description = "The Microsoft Authentication Library (MSAL) for Python library enables your app to access the Microsoft Cloud by supporting authentication of users with Microsoft Azure Active Directory accounts (AAD) and Microsoft Accounts (MSA) using industry standard OAuth2 and OpenID Connect." optional = false python-versions = ">=3.8" groups = ["preprocessingfunction"] files = [ - {file = "msal-1.34.0-py3-none-any.whl", hash = "sha256:f669b1644e4950115da7a176441b0e13ec2975c29528d8b9e81316023676d6e1"}, - {file = "msal-1.34.0.tar.gz", hash = "sha256:76ba83b716ea5a6d75b0279c0ac353a0e05b820ca1f6682c0eb7f45190c43c2f"}, + {file = "msal-1.35.1-py3-none-any.whl", hash = "sha256:8f4e82f34b10c19e326ec69f44dc6b30171f2f7098f3720ea8a9f0c11832caa3"}, + {file = "msal-1.35.1.tar.gz", hash = "sha256:70cac18ab80a053bff86219ba64cfe3da1f307c74b009e2da57ef040eb1b5656"}, ] [package.dependencies] @@ -2104,7 +2137,7 @@ PyJWT = {version = ">=1.0.0,<3", extras = ["crypto"]} requests = ">=2.0.0,<3" [package.extras] -broker = ["pymsalruntime (>=0.14,<0.19) ; python_version >= \"3.6\" and platform_system == \"Windows\"", "pymsalruntime (>=0.17,<0.19) ; python_version >= \"3.8\" and platform_system == \"Darwin\"", "pymsalruntime (>=0.18,<0.19) ; python_version >= \"3.8\" and platform_system == \"Linux\""] +broker = ["pymsalruntime (>=0.14,<0.21) ; python_version >= \"3.8\" and platform_system == \"Windows\"", "pymsalruntime (>=0.17,<0.21) ; python_version >= \"3.8\" and platform_system == \"Darwin\"", "pymsalruntime (>=0.18,<0.21) ; python_version >= \"3.8\" and platform_system == \"Linux\""] [[package]] name = "msal-extensions" @@ -2150,14 +2183,14 @@ files = [ [[package]] name = "mypy-boto3-bedrock-runtime" -version = "1.42.31" -description = "Type annotations for boto3 BedrockRuntime 1.42.31 service generated with mypy-boto3-builder 8.12.0" +version = "1.42.42" +description = "Type annotations for boto3 BedrockRuntime 1.42.42 service generated with mypy-boto3-builder 8.12.0" optional = false python-versions = ">=3.9" groups = ["slackbotfunction"] files = [ - {file = "mypy_boto3_bedrock_runtime-1.42.31-py3-none-any.whl", hash = "sha256:420961c6c22a9dfdb69bbcc725bff01ae59c6cc347a144e8092aaf9bec1dcdd2"}, - {file = "mypy_boto3_bedrock_runtime-1.42.31.tar.gz", hash = "sha256:a661d1aaadd49660dcf0bcf92beba3546047d06b4744fe5fc5b658ecd165b157"}, + {file = "mypy_boto3_bedrock_runtime-1.42.42-py3-none-any.whl", hash = "sha256:b2d16eae22607d0685f90796b3a0afc78c0b09d45872e00eafd634a31dd9358f"}, + {file = "mypy_boto3_bedrock_runtime-1.42.42.tar.gz", hash = "sha256:3a4088218478b6fbbc26055c03c95bee4fc04624a801090b3cce3037e8275c8d"}, ] [[package]] @@ -2174,14 +2207,14 @@ files = [ [[package]] name = "mypy-boto3-dynamodb" -version = "1.42.33" -description = "Type annotations for boto3 DynamoDB 1.42.33 service generated with mypy-boto3-builder 8.12.0" +version = "1.42.55" +description = "Type annotations for boto3 DynamoDB 1.42.55 service generated with mypy-boto3-builder 8.12.0" optional = false python-versions = ">=3.9" groups = ["slackbotfunction"] files = [ - {file = "mypy_boto3_dynamodb-1.42.33-py3-none-any.whl", hash = "sha256:79d783c9378d1baf1c1dab65aead1973afc4b63e23b254d5fc8c1ad805b33cd2"}, - {file = "mypy_boto3_dynamodb-1.42.33.tar.gz", hash = "sha256:a9dd48c4924356f72f250080a5fbefeac811df35817432db9ea446736788da86"}, + {file = "mypy_boto3_dynamodb-1.42.55-py3-none-any.whl", hash = "sha256:652af33641601d223fb35207b89bd98513a7493d2b95ae4cba47c925b6ec103c"}, + {file = "mypy_boto3_dynamodb-1.42.55.tar.gz", hash = "sha256:a445f439b6bc4532fd592cb7f44444c8fc8f397271c0d9087e712f71f196d2f9"}, ] [[package]] @@ -2245,84 +2278,84 @@ files = [ [[package]] name = "numpy" -version = "2.4.2" +version = "2.4.3" description = "Fundamental package for array computing in Python" optional = false python-versions = ">=3.11" groups = ["preprocessingfunction"] files = [ - {file = "numpy-2.4.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:e7e88598032542bd49af7c4747541422884219056c268823ef6e5e89851c8825"}, - {file = "numpy-2.4.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:7edc794af8b36ca37ef5fcb5e0d128c7e0595c7b96a2318d1badb6fcd8ee86b1"}, - {file = "numpy-2.4.2-cp311-cp311-macosx_14_0_arm64.whl", hash = "sha256:6e9f61981ace1360e42737e2bae58b27bf28a1b27e781721047d84bd754d32e7"}, - {file = "numpy-2.4.2-cp311-cp311-macosx_14_0_x86_64.whl", hash = "sha256:cb7bbb88aa74908950d979eeaa24dbdf1a865e3c7e45ff0121d8f70387b55f73"}, - {file = "numpy-2.4.2-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:4f069069931240b3fc703f1e23df63443dbd6390614c8c44a87d96cd0ec81eb1"}, - {file = "numpy-2.4.2-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:c02ef4401a506fb60b411467ad501e1429a3487abca4664871d9ae0b46c8ba32"}, - {file = "numpy-2.4.2-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:2653de5c24910e49c2b106499803124dde62a5a1fe0eedeaecf4309a5f639390"}, - {file = "numpy-2.4.2-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:1ae241bbfc6ae276f94a170b14785e561cb5e7f626b6688cf076af4110887413"}, - {file = "numpy-2.4.2-cp311-cp311-win32.whl", hash = "sha256:df1b10187212b198dd45fa943d8985a3c8cf854aed4923796e0e019e113a1bda"}, - {file = "numpy-2.4.2-cp311-cp311-win_amd64.whl", hash = "sha256:b9c618d56a29c9cb1c4da979e9899be7578d2e0b3c24d52079c166324c9e8695"}, - {file = "numpy-2.4.2-cp311-cp311-win_arm64.whl", hash = "sha256:47c5a6ed21d9452b10227e5e8a0e1c22979811cad7dcc19d8e3e2fb8fa03f1a3"}, - {file = "numpy-2.4.2-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:21982668592194c609de53ba4933a7471880ccbaadcc52352694a59ecc860b3a"}, - {file = "numpy-2.4.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40397bda92382fcec844066efb11f13e1c9a3e2a8e8f318fb72ed8b6db9f60f1"}, - {file = "numpy-2.4.2-cp312-cp312-macosx_14_0_arm64.whl", hash = "sha256:b3a24467af63c67829bfaa61eecf18d5432d4f11992688537be59ecd6ad32f5e"}, - {file = "numpy-2.4.2-cp312-cp312-macosx_14_0_x86_64.whl", hash = "sha256:805cc8de9fd6e7a22da5aed858e0ab16be5a4db6c873dde1d7451c541553aa27"}, - {file = "numpy-2.4.2-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6d82351358ffbcdcd7b686b90742a9b86632d6c1c051016484fa0b326a0a1548"}, - {file = "numpy-2.4.2-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:9e35d3e0144137d9fdae62912e869136164534d64a169f86438bc9561b6ad49f"}, - {file = "numpy-2.4.2-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:adb6ed2ad29b9e15321d167d152ee909ec73395901b70936f029c3bc6d7f4460"}, - {file = "numpy-2.4.2-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:8906e71fd8afcb76580404e2a950caef2685df3d2a57fe82a86ac8d33cc007ba"}, - {file = "numpy-2.4.2-cp312-cp312-win32.whl", hash = "sha256:ec055f6dae239a6299cace477b479cca2fc125c5675482daf1dd886933a1076f"}, - {file = "numpy-2.4.2-cp312-cp312-win_amd64.whl", hash = "sha256:209fae046e62d0ce6435fcfe3b1a10537e858249b3d9b05829e2a05218296a85"}, - {file = "numpy-2.4.2-cp312-cp312-win_arm64.whl", hash = "sha256:fbde1b0c6e81d56f5dccd95dd4a711d9b95df1ae4009a60887e56b27e8d903fa"}, - {file = "numpy-2.4.2-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:25f2059807faea4b077a2b6837391b5d830864b3543627f381821c646f31a63c"}, - {file = "numpy-2.4.2-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:bd3a7a9f5847d2fb8c2c6d1c862fa109c31a9abeca1a3c2bd5a64572955b2979"}, - {file = "numpy-2.4.2-cp313-cp313-macosx_14_0_arm64.whl", hash = "sha256:8e4549f8a3c6d13d55041925e912bfd834285ef1dd64d6bc7d542583355e2e98"}, - {file = "numpy-2.4.2-cp313-cp313-macosx_14_0_x86_64.whl", hash = "sha256:aea4f66ff44dfddf8c2cffd66ba6538c5ec67d389285292fe428cb2c738c8aef"}, - {file = "numpy-2.4.2-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:c3cd545784805de05aafe1dde61752ea49a359ccba9760c1e5d1c88a93bbf2b7"}, - {file = "numpy-2.4.2-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:d0d9b7c93578baafcbc5f0b83eaf17b79d345c6f36917ba0c67f45226911d499"}, - {file = "numpy-2.4.2-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:f74f0f7779cc7ae07d1810aab8ac6b1464c3eafb9e283a40da7309d5e6e48fbb"}, - {file = "numpy-2.4.2-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:c7ac672d699bf36275c035e16b65539931347d68b70667d28984c9fb34e07fa7"}, - {file = "numpy-2.4.2-cp313-cp313-win32.whl", hash = "sha256:8e9afaeb0beff068b4d9cd20d322ba0ee1cecfb0b08db145e4ab4dd44a6b5110"}, - {file = "numpy-2.4.2-cp313-cp313-win_amd64.whl", hash = "sha256:7df2de1e4fba69a51c06c28f5a3de36731eb9639feb8e1cf7e4a7b0daf4cf622"}, - {file = "numpy-2.4.2-cp313-cp313-win_arm64.whl", hash = "sha256:0fece1d1f0a89c16b03442eae5c56dc0be0c7883b5d388e0c03f53019a4bfd71"}, - {file = "numpy-2.4.2-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:5633c0da313330fd20c484c78cdd3f9b175b55e1a766c4a174230c6b70ad8262"}, - {file = "numpy-2.4.2-cp313-cp313t-macosx_14_0_arm64.whl", hash = "sha256:d9f64d786b3b1dd742c946c42d15b07497ed14af1a1f3ce840cce27daa0ce913"}, - {file = "numpy-2.4.2-cp313-cp313t-macosx_14_0_x86_64.whl", hash = "sha256:b21041e8cb6a1eb5312dd1d2f80a94d91efffb7a06b70597d44f1bd2dfc315ab"}, - {file = "numpy-2.4.2-cp313-cp313t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:00ab83c56211a1d7c07c25e3217ea6695e50a3e2f255053686b081dc0b091a82"}, - {file = "numpy-2.4.2-cp313-cp313t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:2fb882da679409066b4603579619341c6d6898fc83a8995199d5249f986e8e8f"}, - {file = "numpy-2.4.2-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:66cb9422236317f9d44b67b4d18f44efe6e9c7f8794ac0462978513359461554"}, - {file = "numpy-2.4.2-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:0f01dcf33e73d80bd8dc0f20a71303abbafa26a19e23f6b68d1aa9990af90257"}, - {file = "numpy-2.4.2-cp313-cp313t-win32.whl", hash = "sha256:52b913ec40ff7ae845687b0b34d8d93b60cb66dcee06996dd5c99f2fc9328657"}, - {file = "numpy-2.4.2-cp313-cp313t-win_amd64.whl", hash = "sha256:5eea80d908b2c1f91486eb95b3fb6fab187e569ec9752ab7d9333d2e66bf2d6b"}, - {file = "numpy-2.4.2-cp313-cp313t-win_arm64.whl", hash = "sha256:fd49860271d52127d61197bb50b64f58454e9f578cb4b2c001a6de8b1f50b0b1"}, - {file = "numpy-2.4.2-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:444be170853f1f9d528428eceb55f12918e4fda5d8805480f36a002f1415e09b"}, - {file = "numpy-2.4.2-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:d1240d50adff70c2a88217698ca844723068533f3f5c5fa6ee2e3220e3bdb000"}, - {file = "numpy-2.4.2-cp314-cp314-macosx_14_0_arm64.whl", hash = "sha256:7cdde6de52fb6664b00b056341265441192d1291c130e99183ec0d4b110ff8b1"}, - {file = "numpy-2.4.2-cp314-cp314-macosx_14_0_x86_64.whl", hash = "sha256:cda077c2e5b780200b6b3e09d0b42205a3d1c68f30c6dceb90401c13bff8fe74"}, - {file = "numpy-2.4.2-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:d30291931c915b2ab5717c2974bb95ee891a1cf22ebc16a8006bd59cd210d40a"}, - {file = "numpy-2.4.2-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:bba37bc29d4d85761deed3954a1bc62be7cf462b9510b51d367b769a8c8df325"}, - {file = "numpy-2.4.2-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:b2f0073ed0868db1dcd86e052d37279eef185b9c8db5bf61f30f46adac63c909"}, - {file = "numpy-2.4.2-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:7f54844851cdb630ceb623dcec4db3240d1ac13d4990532446761baede94996a"}, - {file = "numpy-2.4.2-cp314-cp314-win32.whl", hash = "sha256:12e26134a0331d8dbd9351620f037ec470b7c75929cb8a1537f6bfe411152a1a"}, - {file = "numpy-2.4.2-cp314-cp314-win_amd64.whl", hash = "sha256:068cdb2d0d644cdb45670810894f6a0600797a69c05f1ac478e8d31670b8ee75"}, - {file = "numpy-2.4.2-cp314-cp314-win_arm64.whl", hash = "sha256:6ed0be1ee58eef41231a5c943d7d1375f093142702d5723ca2eb07db9b934b05"}, - {file = "numpy-2.4.2-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:98f16a80e917003a12c0580f97b5f875853ebc33e2eaa4bccfc8201ac6869308"}, - {file = "numpy-2.4.2-cp314-cp314t-macosx_14_0_arm64.whl", hash = "sha256:20abd069b9cda45874498b245c8015b18ace6de8546bf50dfa8cea1696ed06ef"}, - {file = "numpy-2.4.2-cp314-cp314t-macosx_14_0_x86_64.whl", hash = "sha256:e98c97502435b53741540a5717a6749ac2ada901056c7db951d33e11c885cc7d"}, - {file = "numpy-2.4.2-cp314-cp314t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:da6cad4e82cb893db4b69105c604d805e0c3ce11501a55b5e9f9083b47d2ffe8"}, - {file = "numpy-2.4.2-cp314-cp314t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:9e4424677ce4b47fe73c8b5556d876571f7c6945d264201180db2dc34f676ab5"}, - {file = "numpy-2.4.2-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:2b8f157c8a6f20eb657e240f8985cc135598b2b46985c5bccbde7616dc9c6b1e"}, - {file = "numpy-2.4.2-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:5daf6f3914a733336dab21a05cdec343144600e964d2fcdabaac0c0269874b2a"}, - {file = "numpy-2.4.2-cp314-cp314t-win32.whl", hash = "sha256:8c50dd1fc8826f5b26a5ee4d77ca55d88a895f4e4819c7ecc2a9f5905047a443"}, - {file = "numpy-2.4.2-cp314-cp314t-win_amd64.whl", hash = "sha256:fcf92bee92742edd401ba41135185866f7026c502617f422eb432cfeca4fe236"}, - {file = "numpy-2.4.2-cp314-cp314t-win_arm64.whl", hash = "sha256:1f92f53998a17265194018d1cc321b2e96e900ca52d54c7c77837b71b9465181"}, - {file = "numpy-2.4.2-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:89f7268c009bc492f506abd6f5265defa7cb3f7487dc21d357c3d290add45082"}, - {file = "numpy-2.4.2-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:e6dee3bb76aa4009d5a912180bf5b2de012532998d094acee25d9cb8dee3e44a"}, - {file = "numpy-2.4.2-pp311-pypy311_pp73-macosx_14_0_arm64.whl", hash = "sha256:cd2bd2bbed13e213d6b55dc1d035a4f91748a7d3edc9480c13898b0353708920"}, - {file = "numpy-2.4.2-pp311-pypy311_pp73-macosx_14_0_x86_64.whl", hash = "sha256:cf28c0c1d4c4bf00f509fa7eb02c58d7caf221b50b467bcb0d9bbf1584d5c821"}, - {file = "numpy-2.4.2-pp311-pypy311_pp73-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:e04ae107ac591763a47398bb45b568fc38f02dbc4aa44c063f67a131f99346cb"}, - {file = "numpy-2.4.2-pp311-pypy311_pp73-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:602f65afdef699cda27ec0b9224ae5dc43e328f4c24c689deaf77133dbee74d0"}, - {file = "numpy-2.4.2-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:be71bf1edb48ebbbf7f6337b5bfd2f895d1902f6335a5830b20141fc126ffba0"}, - {file = "numpy-2.4.2.tar.gz", hash = "sha256:659a6107e31a83c4e33f763942275fd278b21d095094044eb35569e86a21ddae"}, + {file = "numpy-2.4.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:33b3bf58ee84b172c067f56aeadc7ee9ab6de69c5e800ab5b10295d54c581adb"}, + {file = "numpy-2.4.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:8ba7b51e71c05aa1f9bc3641463cd82308eab40ce0d5c7e1fd4038cbf9938147"}, + {file = "numpy-2.4.3-cp311-cp311-macosx_14_0_arm64.whl", hash = "sha256:a1988292870c7cb9d0ebb4cc96b4d447513a9644801de54606dc7aabf2b7d920"}, + {file = "numpy-2.4.3-cp311-cp311-macosx_14_0_x86_64.whl", hash = "sha256:23b46bb6d8ecb68b58c09944483c135ae5f0e9b8d8858ece5e4ead783771d2a9"}, + {file = "numpy-2.4.3-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a016db5c5dba78fa8fe9f5d80d6708f9c42ab087a739803c0ac83a43d686a470"}, + {file = "numpy-2.4.3-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:715de7f82e192e8cae5a507a347d97ad17598f8e026152ca97233e3666daaa71"}, + {file = "numpy-2.4.3-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:2ddb7919366ee468342b91dea2352824c25b55814a987847b6c52003a7c97f15"}, + {file = "numpy-2.4.3-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:a315e5234d88067f2d97e1f2ef670a7569df445d55400f1e33d117418d008d52"}, + {file = "numpy-2.4.3-cp311-cp311-win32.whl", hash = "sha256:2b3f8d2c4589b1a2028d2a770b0fc4d1f332fb5e01521f4de3199a896d158ddd"}, + {file = "numpy-2.4.3-cp311-cp311-win_amd64.whl", hash = "sha256:77e76d932c49a75617c6d13464e41203cd410956614d0a0e999b25e9e8d27eec"}, + {file = "numpy-2.4.3-cp311-cp311-win_arm64.whl", hash = "sha256:eb610595dd91560905c132c709412b512135a60f1851ccbd2c959e136431ff67"}, + {file = "numpy-2.4.3-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:61b0cbabbb6126c8df63b9a3a0c4b1f44ebca5e12ff6997b80fcf267fb3150ef"}, + {file = "numpy-2.4.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:7395e69ff32526710748f92cd8c9849b361830968ea3e24a676f272653e8983e"}, + {file = "numpy-2.4.3-cp312-cp312-macosx_14_0_arm64.whl", hash = "sha256:abdce0f71dcb4a00e4e77f3faf05e4616ceccfe72ccaa07f47ee79cda3b7b0f4"}, + {file = "numpy-2.4.3-cp312-cp312-macosx_14_0_x86_64.whl", hash = "sha256:48da3a4ee1336454b07497ff7ec83903efa5505792c4e6d9bf83d99dc07a1e18"}, + {file = "numpy-2.4.3-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:32e3bef222ad6b052280311d1d60db8e259e4947052c3ae7dd6817451fc8a4c5"}, + {file = "numpy-2.4.3-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:e7dd01a46700b1967487141a66ac1a3cf0dd8ebf1f08db37d46389401512ca97"}, + {file = "numpy-2.4.3-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:76f0f283506c28b12bba319c0fab98217e9f9b54e6160e9c79e9f7348ba32e9c"}, + {file = "numpy-2.4.3-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:737f630a337364665aba3b5a77e56a68cc42d350edd010c345d65a3efa3addcc"}, + {file = "numpy-2.4.3-cp312-cp312-win32.whl", hash = "sha256:26952e18d82a1dbbc2f008d402021baa8d6fc8e84347a2072a25e08b46d698b9"}, + {file = "numpy-2.4.3-cp312-cp312-win_amd64.whl", hash = "sha256:65f3c2455188f09678355f5cae1f959a06b778bc66d535da07bf2ef20cd319d5"}, + {file = "numpy-2.4.3-cp312-cp312-win_arm64.whl", hash = "sha256:2abad5c7fef172b3377502bde47892439bae394a71bc329f31df0fd829b41a9e"}, + {file = "numpy-2.4.3-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:b346845443716c8e542d54112966383b448f4a3ba5c66409771b8c0889485dd3"}, + {file = "numpy-2.4.3-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:2629289168f4897a3c4e23dc98d6f1731f0fc0fe52fb9db19f974041e4cc12b9"}, + {file = "numpy-2.4.3-cp313-cp313-macosx_14_0_arm64.whl", hash = "sha256:bb2e3cf95854233799013779216c57e153c1ee67a0bf92138acca0e429aefaee"}, + {file = "numpy-2.4.3-cp313-cp313-macosx_14_0_x86_64.whl", hash = "sha256:7f3408ff897f8ab07a07fbe2823d7aee6ff644c097cc1f90382511fe982f647f"}, + {file = "numpy-2.4.3-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:decb0eb8a53c3b009b0962378065589685d66b23467ef5dac16cbe818afde27f"}, + {file = "numpy-2.4.3-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:d5f51900414fc9204a0e0da158ba2ac52b75656e7dce7e77fb9f84bfa343b4cc"}, + {file = "numpy-2.4.3-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:6bd06731541f89cdc01b261ba2c9e037f1543df7472517836b78dfb15bd6e476"}, + {file = "numpy-2.4.3-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:22654fe6be0e5206f553a9250762c653d3698e46686eee53b399ab90da59bd92"}, + {file = "numpy-2.4.3-cp313-cp313-win32.whl", hash = "sha256:d71e379452a2f670ccb689ec801b1218cd3983e253105d6e83780967e899d687"}, + {file = "numpy-2.4.3-cp313-cp313-win_amd64.whl", hash = "sha256:0a60e17a14d640f49146cb38e3f105f571318db7826d9b6fef7e4dce758faecd"}, + {file = "numpy-2.4.3-cp313-cp313-win_arm64.whl", hash = "sha256:c9619741e9da2059cd9c3f206110b97583c7152c1dc9f8aafd4beb450ac1c89d"}, + {file = "numpy-2.4.3-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:7aa4e54f6469300ebca1d9eb80acd5253cdfa36f2c03d79a35883687da430875"}, + {file = "numpy-2.4.3-cp313-cp313t-macosx_14_0_arm64.whl", hash = "sha256:d1b90d840b25874cf5cd20c219af10bac3667db3876d9a495609273ebe679070"}, + {file = "numpy-2.4.3-cp313-cp313t-macosx_14_0_x86_64.whl", hash = "sha256:a749547700de0a20a6718293396ec237bb38218049cfce788e08fcb716e8cf73"}, + {file = "numpy-2.4.3-cp313-cp313t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:94f3c4a151a2e529adf49c1d54f0f57ff8f9b233ee4d44af623a81553ab86368"}, + {file = "numpy-2.4.3-cp313-cp313t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:22c31dc07025123aedf7f2db9e91783df13f1776dc52c6b22c620870dc0fab22"}, + {file = "numpy-2.4.3-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:148d59127ac95979d6f07e4d460f934ebdd6eed641db9c0db6c73026f2b2101a"}, + {file = "numpy-2.4.3-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:a97cbf7e905c435865c2d939af3d93f99d18eaaa3cabe4256f4304fb51604349"}, + {file = "numpy-2.4.3-cp313-cp313t-win32.whl", hash = "sha256:be3b8487d725a77acccc9924f65fd8bce9af7fac8c9820df1049424a2115af6c"}, + {file = "numpy-2.4.3-cp313-cp313t-win_amd64.whl", hash = "sha256:1ec84fd7c8e652b0f4aaaf2e6e9cc8eaa9b1b80a537e06b2e3a2fb176eedcb26"}, + {file = "numpy-2.4.3-cp313-cp313t-win_arm64.whl", hash = "sha256:120df8c0a81ebbf5b9020c91439fccd85f5e018a927a39f624845be194a2be02"}, + {file = "numpy-2.4.3-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:5884ce5c7acfae1e4e1b6fde43797d10aa506074d25b531b4f54bde33c0c31d4"}, + {file = "numpy-2.4.3-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:297837823f5bc572c5f9379b0c9f3a3365f08492cbdc33bcc3af174372ebb168"}, + {file = "numpy-2.4.3-cp314-cp314-macosx_14_0_arm64.whl", hash = "sha256:a111698b4a3f8dcbe54c64a7708f049355abd603e619013c346553c1fd4ca90b"}, + {file = "numpy-2.4.3-cp314-cp314-macosx_14_0_x86_64.whl", hash = "sha256:4bd4741a6a676770e0e97fe9ab2e51de01183df3dcbcec591d26d331a40de950"}, + {file = "numpy-2.4.3-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:54f29b877279d51e210e0c80709ee14ccbbad647810e8f3d375561c45ef613dd"}, + {file = "numpy-2.4.3-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:679f2a834bae9020f81534671c56fd0cc76dd7e5182f57131478e23d0dc59e24"}, + {file = "numpy-2.4.3-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:d84f0f881cb2225c2dfd7f78a10a5645d487a496c6668d6cc39f0f114164f3d0"}, + {file = "numpy-2.4.3-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:d213c7e6e8d211888cc359bab7199670a00f5b82c0978b9d1c75baf1eddbeac0"}, + {file = "numpy-2.4.3-cp314-cp314-win32.whl", hash = "sha256:52077feedeff7c76ed7c9f1a0428558e50825347b7545bbb8523da2cd55c547a"}, + {file = "numpy-2.4.3-cp314-cp314-win_amd64.whl", hash = "sha256:0448e7f9caefb34b4b7dd2b77f21e8906e5d6f0365ad525f9f4f530b13df2afc"}, + {file = "numpy-2.4.3-cp314-cp314-win_arm64.whl", hash = "sha256:b44fd60341c4d9783039598efadd03617fa28d041fc37d22b62d08f2027fa0e7"}, + {file = "numpy-2.4.3-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:0a195f4216be9305a73c0e91c9b026a35f2161237cf1c6de9b681637772ea657"}, + {file = "numpy-2.4.3-cp314-cp314t-macosx_14_0_arm64.whl", hash = "sha256:cd32fbacb9fd1bf041bf8e89e4576b6f00b895f06d00914820ae06a616bdfef7"}, + {file = "numpy-2.4.3-cp314-cp314t-macosx_14_0_x86_64.whl", hash = "sha256:2e03c05abaee1f672e9d67bc858f300b5ccba1c21397211e8d77d98350972093"}, + {file = "numpy-2.4.3-cp314-cp314t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:7d1ce23cce91fcea443320a9d0ece9b9305d4368875bab09538f7a5b4131938a"}, + {file = "numpy-2.4.3-cp314-cp314t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:c59020932feb24ed49ffd03704fbab89f22aa9c0d4b180ff45542fe8918f5611"}, + {file = "numpy-2.4.3-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:9684823a78a6cd6ad7511fc5e25b07947d1d5b5e2812c93fe99d7d4195130720"}, + {file = "numpy-2.4.3-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:0200b25c687033316fb39f0ff4e3e690e8957a2c3c8d22499891ec58c37a3eb5"}, + {file = "numpy-2.4.3-cp314-cp314t-win32.whl", hash = "sha256:5e10da9e93247e554bb1d22f8edc51847ddd7dde52d85ce31024c1b4312bfba0"}, + {file = "numpy-2.4.3-cp314-cp314t-win_amd64.whl", hash = "sha256:45f003dbdffb997a03da2d1d0cb41fbd24a87507fb41605c0420a3db5bd4667b"}, + {file = "numpy-2.4.3-cp314-cp314t-win_arm64.whl", hash = "sha256:4d382735cecd7bcf090172489a525cd7d4087bc331f7df9f60ddc9a296cf208e"}, + {file = "numpy-2.4.3-pp311-pypy311_pp73-macosx_10_15_x86_64.whl", hash = "sha256:c6b124bfcafb9e8d3ed09130dbee44848c20b3e758b6bbf006e641778927c028"}, + {file = "numpy-2.4.3-pp311-pypy311_pp73-macosx_11_0_arm64.whl", hash = "sha256:76dbb9d4e43c16cf9aa711fcd8de1e2eeb27539dcefb60a1d5e9f12fae1d1ed8"}, + {file = "numpy-2.4.3-pp311-pypy311_pp73-macosx_14_0_arm64.whl", hash = "sha256:29363fbfa6f8ee855d7569c96ce524845e3d726d6c19b29eceec7dd555dab152"}, + {file = "numpy-2.4.3-pp311-pypy311_pp73-macosx_14_0_x86_64.whl", hash = "sha256:bc71942c789ef415a37f0d4eab90341425a00d538cd0642445d30b41023d3395"}, + {file = "numpy-2.4.3-pp311-pypy311_pp73-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:7e58765ad74dcebd3ef0208a5078fba32dc8ec3578fe84a604432950cd043d79"}, + {file = "numpy-2.4.3-pp311-pypy311_pp73-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:8e236dbda4e1d319d681afcbb136c0c4a8e0f1a5c58ceec2adebb547357fe857"}, + {file = "numpy-2.4.3-pp311-pypy311_pp73-win_amd64.whl", hash = "sha256:4b42639cdde6d24e732ff823a3fa5b701d8acad89c4142bc1d0bd6dc85200ba5"}, + {file = "numpy-2.4.3.tar.gz", hash = "sha256:483a201202b73495f00dbc83796c6ae63137a9bdade074f7648b3e32613412dd"}, ] [[package]] @@ -2342,14 +2375,14 @@ tests = ["pytest", "pytest-cov"] [[package]] name = "openai" -version = "2.16.0" +version = "2.28.0" description = "The official Python library for the openai API" optional = false python-versions = ">=3.9" groups = ["preprocessingfunction"] files = [ - {file = "openai-2.16.0-py3-none-any.whl", hash = "sha256:5f46643a8f42899a84e80c38838135d7038e7718333ce61396994f887b09a59b"}, - {file = "openai-2.16.0.tar.gz", hash = "sha256:42eaa22ca0d8ded4367a77374104d7a2feafee5bd60a107c3c11b5243a11cd12"}, + {file = "openai-2.28.0-py3-none-any.whl", hash = "sha256:79aa5c45dba7fef84085701c235cf13ba88485e1ef4f8dfcedc44fc2a698fc1d"}, + {file = "openai-2.28.0.tar.gz", hash = "sha256:bb7fdff384d2a787fa82e8822d1dd3c02e8cf901d60f1df523b7da03cbb6d48d"}, ] [package.dependencies] @@ -2397,60 +2430,60 @@ files = [ [[package]] name = "pandas" -version = "3.0.0" +version = "3.0.1" description = "Powerful data structures for data analysis, time series, and statistics" optional = false python-versions = ">=3.11" groups = ["preprocessingfunction"] files = [ - {file = "pandas-3.0.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:d64ce01eb9cdca96a15266aa679ae50212ec52757c79204dbc7701a222401850"}, - {file = "pandas-3.0.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:613e13426069793aa1ec53bdcc3b86e8d32071daea138bbcf4fa959c9cdaa2e2"}, - {file = "pandas-3.0.0-cp311-cp311-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0192fee1f1a8e743b464a6607858ee4b071deb0b118eb143d71c2a1d170996d5"}, - {file = "pandas-3.0.0-cp311-cp311-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:f0b853319dec8d5e0c8b875374c078ef17f2269986a78168d9bd57e49bf650ae"}, - {file = "pandas-3.0.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:707a9a877a876c326ae2cb640fbdc4ef63b0a7b9e2ef55c6df9942dcee8e2af9"}, - {file = "pandas-3.0.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:afd0aa3d0b5cda6e0b8ffc10dbcca3b09ef3cbcd3fe2b27364f85fdc04e1989d"}, - {file = "pandas-3.0.0-cp311-cp311-win_amd64.whl", hash = "sha256:113b4cca2614ff7e5b9fee9b6f066618fe73c5a83e99d721ffc41217b2bf57dd"}, - {file = "pandas-3.0.0-cp311-cp311-win_arm64.whl", hash = "sha256:c14837eba8e99a8da1527c0280bba29b0eb842f64aa94982c5e21227966e164b"}, - {file = "pandas-3.0.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:9803b31f5039b3c3b10cc858c5e40054adb4b29b4d81cb2fd789f4121c8efbcd"}, - {file = "pandas-3.0.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:14c2a4099cd38a1d18ff108168ea417909b2dea3bd1ebff2ccf28ddb6a74d740"}, - {file = "pandas-3.0.0-cp312-cp312-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:d257699b9a9960e6125686098d5714ac59d05222bef7a5e6af7a7fd87c650801"}, - {file = "pandas-3.0.0-cp312-cp312-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:69780c98f286076dcafca38d8b8eee1676adf220199c0a39f0ecbf976b68151a"}, - {file = "pandas-3.0.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:4a66384f017240f3858a4c8a7cf21b0591c3ac885cddb7758a589f0f71e87ebb"}, - {file = "pandas-3.0.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:be8c515c9bc33989d97b89db66ea0cececb0f6e3c2a87fcc8b69443a6923e95f"}, - {file = "pandas-3.0.0-cp312-cp312-win_amd64.whl", hash = "sha256:a453aad8c4f4e9f166436994a33884442ea62aa8b27d007311e87521b97246e1"}, - {file = "pandas-3.0.0-cp312-cp312-win_arm64.whl", hash = "sha256:da768007b5a33057f6d9053563d6b74dd6d029c337d93c6d0d22a763a5c2ecc0"}, - {file = "pandas-3.0.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:b78d646249b9a2bc191040988c7bb524c92fa8534fb0898a0741d7e6f2ffafa6"}, - {file = "pandas-3.0.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:bc9cba7b355cb4162442a88ce495e01cb605f17ac1e27d6596ac963504e0305f"}, - {file = "pandas-3.0.0-cp313-cp313-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:3c9a1a149aed3b6c9bf246033ff91e1b02d529546c5d6fb6b74a28fea0cf4c70"}, - {file = "pandas-3.0.0-cp313-cp313-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:95683af6175d884ee89471842acfca29172a85031fccdabc35e50c0984470a0e"}, - {file = "pandas-3.0.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:1fbbb5a7288719e36b76b4f18d46ede46e7f916b6c8d9915b756b0a6c3f792b3"}, - {file = "pandas-3.0.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:8e8b9808590fa364416b49b2a35c1f4cf2785a6c156935879e57f826df22038e"}, - {file = "pandas-3.0.0-cp313-cp313-win_amd64.whl", hash = "sha256:98212a38a709feb90ae658cb6227ea3657c22ba8157d4b8f913cd4c950de5e7e"}, - {file = "pandas-3.0.0-cp313-cp313-win_arm64.whl", hash = "sha256:177d9df10b3f43b70307a149d7ec49a1229a653f907aa60a48f1877d0e6be3be"}, - {file = "pandas-3.0.0-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:2713810ad3806767b89ad3b7b69ba153e1c6ff6d9c20f9c2140379b2a98b6c98"}, - {file = "pandas-3.0.0-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:15d59f885ee5011daf8335dff47dcb8a912a27b4ad7826dc6cbe809fd145d327"}, - {file = "pandas-3.0.0-cp313-cp313t-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:24e6547fb64d2c92665dd2adbfa4e85fa4fd70a9c070e7cfb03b629a0bbab5eb"}, - {file = "pandas-3.0.0-cp313-cp313t-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:48ee04b90e2505c693d3f8e8f524dab8cb8aaf7ddcab52c92afa535e717c4812"}, - {file = "pandas-3.0.0-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:66f72fb172959af42a459e27a8d8d2c7e311ff4c1f7db6deb3b643dbc382ae08"}, - {file = "pandas-3.0.0-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:4a4a400ca18230976724a5066f20878af785f36c6756e498e94c2a5e5d57779c"}, - {file = "pandas-3.0.0-cp313-cp313t-win_amd64.whl", hash = "sha256:940eebffe55528074341a5a36515f3e4c5e25e958ebbc764c9502cfc35ba3faa"}, - {file = "pandas-3.0.0-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:597c08fb9fef0edf1e4fa2f9828dd27f3d78f9b8c9b4a748d435ffc55732310b"}, - {file = "pandas-3.0.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:447b2d68ac5edcbf94655fe909113a6dba6ef09ad7f9f60c80477825b6c489fe"}, - {file = "pandas-3.0.0-cp314-cp314-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:debb95c77ff3ed3ba0d9aa20c3a2f19165cc7956362f9873fce1ba0a53819d70"}, - {file = "pandas-3.0.0-cp314-cp314-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:fedabf175e7cd82b69b74c30adbaa616de301291a5231138d7242596fc296a8d"}, - {file = "pandas-3.0.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:412d1a89aab46889f3033a386912efcdfa0f1131c5705ff5b668dda88305e986"}, - {file = "pandas-3.0.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:e979d22316f9350c516479dd3a92252be2937a9531ed3a26ec324198a99cdd49"}, - {file = "pandas-3.0.0-cp314-cp314-win_amd64.whl", hash = "sha256:083b11415b9970b6e7888800c43c82e81a06cd6b06755d84804444f0007d6bb7"}, - {file = "pandas-3.0.0-cp314-cp314-win_arm64.whl", hash = "sha256:5db1e62cb99e739fa78a28047e861b256d17f88463c76b8dafc7c1338086dca8"}, - {file = "pandas-3.0.0-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:697b8f7d346c68274b1b93a170a70974cdc7d7354429894d5927c1effdcccd73"}, - {file = "pandas-3.0.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:8cb3120f0d9467ed95e77f67a75e030b67545bcfa08964e349252d674171def2"}, - {file = "pandas-3.0.0-cp314-cp314t-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:33fd3e6baa72899746b820c31e4b9688c8e1b7864d7aec2de7ab5035c285277a"}, - {file = "pandas-3.0.0-cp314-cp314t-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:a8942e333dc67ceda1095227ad0febb05a3b36535e520154085db632c40ad084"}, - {file = "pandas-3.0.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:783ac35c4d0fe0effdb0d67161859078618b1b6587a1af15928137525217a721"}, - {file = "pandas-3.0.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:125eb901e233f155b268bbef9abd9afb5819db74f0e677e89a61b246228c71ac"}, - {file = "pandas-3.0.0-cp314-cp314t-win_amd64.whl", hash = "sha256:b86d113b6c109df3ce0ad5abbc259fe86a1bd4adfd4a31a89da42f84f65509bb"}, - {file = "pandas-3.0.0-cp314-cp314t-win_arm64.whl", hash = "sha256:1c39eab3ad38f2d7a249095f0a3d8f8c22cc0f847e98ccf5bbe732b272e2d9fa"}, - {file = "pandas-3.0.0.tar.gz", hash = "sha256:0facf7e87d38f721f0af46fe70d97373a37701b1c09f7ed7aeeb292ade5c050f"}, + {file = "pandas-3.0.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:de09668c1bf3b925c07e5762291602f0d789eca1b3a781f99c1c78f6cac0e7ea"}, + {file = "pandas-3.0.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:24ba315ba3d6e5806063ac6eb717504e499ce30bd8c236d8693a5fd3f084c796"}, + {file = "pandas-3.0.1-cp311-cp311-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:406ce835c55bac912f2a0dcfaf27c06d73c6b04a5dde45f1fd3169ce31337389"}, + {file = "pandas-3.0.1-cp311-cp311-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:830994d7e1f31dd7e790045235605ab61cff6c94defc774547e8b7fdfbff3dc7"}, + {file = "pandas-3.0.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:a64ce8b0f2de1d2efd2ae40b0abe7f8ae6b29fbfb3812098ed5a6f8e235ad9bf"}, + {file = "pandas-3.0.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:9832c2c69da24b602c32e0c7b1b508a03949c18ba08d4d9f1c1033426685b447"}, + {file = "pandas-3.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:84f0904a69e7365f79a0c77d3cdfccbfb05bf87847e3a51a41e1426b0edb9c79"}, + {file = "pandas-3.0.1-cp311-cp311-win_arm64.whl", hash = "sha256:4a68773d5a778afb31d12e34f7dd4612ab90de8c6fb1d8ffe5d4a03b955082a1"}, + {file = "pandas-3.0.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:476f84f8c20c9f5bc47252b66b4bb25e1a9fc2fa98cead96744d8116cb85771d"}, + {file = "pandas-3.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:0ab749dfba921edf641d4036c4c21c0b3ea70fea478165cb98a998fb2a261955"}, + {file = "pandas-3.0.1-cp312-cp312-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:b8e36891080b87823aff3640c78649b91b8ff6eea3c0d70aeabd72ea43ab069b"}, + {file = "pandas-3.0.1-cp312-cp312-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:532527a701281b9dd371e2f582ed9094f4c12dd9ffb82c0c54ee28d8ac9520c4"}, + {file = "pandas-3.0.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:356e5c055ed9b0da1580d465657bc7d00635af4fd47f30afb23025352ba764d1"}, + {file = "pandas-3.0.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:9d810036895f9ad6345b8f2a338dd6998a74e8483847403582cab67745bff821"}, + {file = "pandas-3.0.1-cp312-cp312-win_amd64.whl", hash = "sha256:536232a5fe26dd989bd633e7a0c450705fdc86a207fec7254a55e9a22950fe43"}, + {file = "pandas-3.0.1-cp312-cp312-win_arm64.whl", hash = "sha256:0f463ebfd8de7f326d38037c7363c6dacb857c5881ab8961fb387804d6daf2f7"}, + {file = "pandas-3.0.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:5272627187b5d9c20e55d27caf5f2cd23e286aba25cadf73c8590e432e2b7262"}, + {file = "pandas-3.0.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:661e0f665932af88c7877f31da0dc743fe9c8f2524bdffe23d24fdcb67ef9d56"}, + {file = "pandas-3.0.1-cp313-cp313-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:75e6e292ff898679e47a2199172593d9f6107fd2dd3617c22c2946e97d5df46e"}, + {file = "pandas-3.0.1-cp313-cp313-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1ff8cf1d2896e34343197685f432450ec99a85ba8d90cce2030c5eee2ef98791"}, + {file = "pandas-3.0.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:eca8b4510f6763f3d37359c2105df03a7a221a508f30e396a51d0713d462e68a"}, + {file = "pandas-3.0.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:06aff2ad6f0b94a17822cf8b83bbb563b090ed82ff4fe7712db2ce57cd50d9b8"}, + {file = "pandas-3.0.1-cp313-cp313-win_amd64.whl", hash = "sha256:9fea306c783e28884c29057a1d9baa11a349bbf99538ec1da44c8476563d1b25"}, + {file = "pandas-3.0.1-cp313-cp313-win_arm64.whl", hash = "sha256:a8d37a43c52917427e897cb2e429f67a449327394396a81034a4449b99afda59"}, + {file = "pandas-3.0.1-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:d54855f04f8246ed7b6fc96b05d4871591143c46c0b6f4af874764ed0d2d6f06"}, + {file = "pandas-3.0.1-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:4e1b677accee34a09e0dc2ce5624e4a58a1870ffe56fc021e9caf7f23cd7668f"}, + {file = "pandas-3.0.1-cp313-cp313t-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a9cabbdcd03f1b6cd254d6dda8ae09b0252524be1592594c00b7895916cb1324"}, + {file = "pandas-3.0.1-cp313-cp313t-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:5ae2ab1f166668b41e770650101e7090824fd34d17915dd9cd479f5c5e0065e9"}, + {file = "pandas-3.0.1-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:6bf0603c2e30e2cafac32807b06435f28741135cb8697eae8b28c7d492fc7d76"}, + {file = "pandas-3.0.1-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:6c426422973973cae1f4a23e51d4ae85974f44871b24844e4f7de752dd877098"}, + {file = "pandas-3.0.1-cp313-cp313t-win_amd64.whl", hash = "sha256:b03f91ae8c10a85c1613102c7bef5229b5379f343030a3ccefeca8a33414cf35"}, + {file = "pandas-3.0.1-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:99d0f92ed92d3083d140bf6b97774f9f13863924cf3f52a70711f4e7588f9d0a"}, + {file = "pandas-3.0.1-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:3b66857e983208654294bb6477b8a63dee26b37bdd0eb34d010556e91261784f"}, + {file = "pandas-3.0.1-cp314-cp314-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:56cf59638bf24dc9bdf2154c81e248b3289f9a09a6d04e63608c159022352749"}, + {file = "pandas-3.0.1-cp314-cp314-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:c1a9f55e0f46951874b863d1f3906dcb57df2d9be5c5847ba4dfb55b2c815249"}, + {file = "pandas-3.0.1-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:1849f0bba9c8a2fb0f691d492b834cc8dadf617e29015c66e989448d58d011ee"}, + {file = "pandas-3.0.1-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:c3d288439e11b5325b02ae6e9cc83e6805a62c40c5a6220bea9beb899c073b1c"}, + {file = "pandas-3.0.1-cp314-cp314-win_amd64.whl", hash = "sha256:93325b0fe372d192965f4cca88d97667f49557398bbf94abdda3bf1b591dbe66"}, + {file = "pandas-3.0.1-cp314-cp314-win_arm64.whl", hash = "sha256:97ca08674e3287c7148f4858b01136f8bdfe7202ad25ad04fec602dd1d29d132"}, + {file = "pandas-3.0.1-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:58eeb1b2e0fb322befcf2bbc9ba0af41e616abadb3d3414a6bc7167f6cbfce32"}, + {file = "pandas-3.0.1-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:cd9af1276b5ca9e298bd79a26bda32fa9cc87ed095b2a9a60978d2ca058eaf87"}, + {file = "pandas-3.0.1-cp314-cp314t-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:94f87a04984d6b63788327cd9f79dda62b7f9043909d2440ceccf709249ca988"}, + {file = "pandas-3.0.1-cp314-cp314t-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:85fe4c4df62e1e20f9db6ebfb88c844b092c22cd5324bdcf94bfa2fc1b391221"}, + {file = "pandas-3.0.1-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:331ca75a2f8672c365ae25c0b29e46f5ac0c6551fdace8eec4cd65e4fac271ff"}, + {file = "pandas-3.0.1-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:15860b1fdb1973fffade772fdb931ccf9b2f400a3f5665aef94a00445d7d8dd5"}, + {file = "pandas-3.0.1-cp314-cp314t-win_amd64.whl", hash = "sha256:44f1364411d5670efa692b146c748f4ed013df91ee91e9bec5677fb1fd58b937"}, + {file = "pandas-3.0.1-cp314-cp314t-win_arm64.whl", hash = "sha256:108dd1790337a494aa80e38def654ca3f0968cf4f362c85f44c15e471667102d"}, + {file = "pandas-3.0.1.tar.gz", hash = "sha256:4186a699674af418f655dbd420ed87f50d56b4cd6603784279d9eef6627823c8"}, ] [package.dependencies] @@ -2667,21 +2700,16 @@ dev = ["autopep8", "black", "docutils", "isort", "mypy", "pip-tools", "pypandoc" [[package]] name = "platformdirs" -version = "4.5.1" +version = "4.9.4" description = "A small Python package for determining appropriate platform-specific dirs, e.g. a `user data dir`." optional = false python-versions = ">=3.10" groups = ["dev"] files = [ - {file = "platformdirs-4.5.1-py3-none-any.whl", hash = "sha256:d03afa3963c806a9bed9d5125c8f4cb2fdaf74a55ab60e5d59b3fde758104d31"}, - {file = "platformdirs-4.5.1.tar.gz", hash = "sha256:61d5cdcc6065745cdd94f0f878977f8de9437be93de97c1c12f853c9c0cdcbda"}, + {file = "platformdirs-4.9.4-py3-none-any.whl", hash = "sha256:68a9a4619a666ea6439f2ff250c12a853cd1cbd5158d258bd824a7df6be2f868"}, + {file = "platformdirs-4.9.4.tar.gz", hash = "sha256:1ec356301b7dc906d83f371c8f487070e99d3ccf9e501686456394622a01a934"}, ] -[package.extras] -docs = ["furo (>=2025.9.25)", "proselint (>=0.14)", "sphinx (>=8.2.3)", "sphinx-autodoc-typehints (>=3.2)"] -test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=8.4.2)", "pytest-cov (>=7)", "pytest-mock (>=3.15.1)"] -type = ["mypy (>=1.18.2)"] - [[package]] name = "pluggy" version = "1.6.0" @@ -2737,14 +2765,14 @@ tests = ["pytest", "pytest-cov", "pytest-lazy-fixtures"] [[package]] name = "puremagic" -version = "1.30" +version = "2.1.0" description = "Pure python implementation of magic file detection" optional = false -python-versions = "*" +python-versions = ">=3.12" groups = ["preprocessingfunction"] files = [ - {file = "puremagic-1.30-py3-none-any.whl", hash = "sha256:5eeeb2dd86f335b9cfe8e205346612197af3500c6872dffebf26929f56e9d3c1"}, - {file = "puremagic-1.30.tar.gz", hash = "sha256:f9ff7ac157d54e9cf3bff1addfd97233548e75e685282d84ae11e7ffee1614c9"}, + {file = "puremagic-2.1.0-py3-none-any.whl", hash = "sha256:9e613ffe9e6e33a0f651d4c0cfc1e16f86d2220edf137dfa3dd0ba2ba353f013"}, + {file = "puremagic-2.1.0.tar.gz", hash = "sha256:06beb598183c625bf9bfed70016930c2d1299e138cd07ed5d6085a7c5deaab19"}, ] [[package]] @@ -2969,14 +2997,14 @@ windows-terminal = ["colorama (>=0.4.6)"] [[package]] name = "pyjwt" -version = "2.12.0" +version = "2.12.1" description = "JSON Web Token implementation in Python" optional = false python-versions = ">=3.9" groups = ["preprocessingfunction"] files = [ - {file = "pyjwt-2.12.0-py3-none-any.whl", hash = "sha256:9bb459d1bdd0387967d287f5656bf7ec2b9a26645d1961628cda1764e087fd6e"}, - {file = "pyjwt-2.12.0.tar.gz", hash = "sha256:2f62390b667cd8257de560b850bb5a883102a388829274147f1d724453f8fb02"}, + {file = "pyjwt-2.12.1-py3-none-any.whl", hash = "sha256:28ca37c070cad8ba8cd9790cd940535d40274d22f80ab87f3ac6a713e6e8454c"}, + {file = "pyjwt-2.12.1.tar.gz", hash = "sha256:c74a7a2adf861c04d002db713dd85f84beb242228e671280bf709d765b03672b"}, ] [package.dependencies] @@ -3063,6 +3091,26 @@ files = [ [package.dependencies] six = ">=1.5" +[[package]] +name = "python-discovery" +version = "1.1.3" +description = "Python interpreter discovery" +optional = false +python-versions = ">=3.8" +groups = ["dev"] +files = [ + {file = "python_discovery-1.1.3-py3-none-any.whl", hash = "sha256:90e795f0121bc84572e737c9aa9966311b9fde44ffb88a5953b3ec9b31c6945e"}, + {file = "python_discovery-1.1.3.tar.gz", hash = "sha256:7acca36e818cd88e9b2ba03e045ad7e93e1713e29c6bbfba5d90202310b7baa5"}, +] + +[package.dependencies] +filelock = ">=3.15.4" +platformdirs = ">=4.3.6,<5" + +[package.extras] +docs = ["furo (>=2025.12.19)", "sphinx (>=9.1)", "sphinx-autodoc-typehints (>=3.6.3)", "sphinxcontrib-mermaid (>=2)"] +testing = ["covdefaults (>=2.3)", "coverage (>=7.5.4)", "pytest (>=8.3.5)", "pytest-mock (>=3.14)", "setuptools (>=75.1)"] + [[package]] name = "python-pptx" version = "1.0.2" @@ -3237,143 +3285,126 @@ rpds-py = ">=0.7.0" [[package]] name = "regex" -version = "2026.1.15" +version = "2026.2.28" description = "Alternative regular expression module, to replace re." optional = false -python-versions = ">=3.9" +python-versions = ">=3.10" groups = ["dev"] files = [ - {file = "regex-2026.1.15-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:4e3dd93c8f9abe8aa4b6c652016da9a3afa190df5ad822907efe6b206c09896e"}, - {file = "regex-2026.1.15-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:97499ff7862e868b1977107873dd1a06e151467129159a6ffd07b66706ba3a9f"}, - {file = "regex-2026.1.15-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:0bda75ebcac38d884240914c6c43d8ab5fb82e74cde6da94b43b17c411aa4c2b"}, - {file = "regex-2026.1.15-cp310-cp310-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:7dcc02368585334f5bc81fc73a2a6a0bbade60e7d83da21cead622faf408f32c"}, - {file = "regex-2026.1.15-cp310-cp310-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:693b465171707bbe882a7a05de5e866f33c76aa449750bee94a8d90463533cc9"}, - {file = "regex-2026.1.15-cp310-cp310-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:b0d190e6f013ea938623a58706d1469a62103fb2a241ce2873a9906e0386582c"}, - {file = "regex-2026.1.15-cp310-cp310-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:5ff818702440a5878a81886f127b80127f5d50563753a28211482867f8318106"}, - {file = "regex-2026.1.15-cp310-cp310-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:f052d1be37ef35a54e394de66136e30fa1191fab64f71fc06ac7bc98c9a84618"}, - {file = "regex-2026.1.15-cp310-cp310-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:6bfc31a37fd1592f0c4fc4bfc674b5c42e52efe45b4b7a6a14f334cca4bcebe4"}, - {file = "regex-2026.1.15-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:3d6ce5ae80066b319ae3bc62fd55a557c9491baa5efd0d355f0de08c4ba54e79"}, - {file = "regex-2026.1.15-cp310-cp310-musllinux_1_2_ppc64le.whl", hash = "sha256:1704d204bd42b6bb80167df0e4554f35c255b579ba99616def38f69e14a5ccb9"}, - {file = "regex-2026.1.15-cp310-cp310-musllinux_1_2_riscv64.whl", hash = "sha256:e3174a5ed4171570dc8318afada56373aa9289eb6dc0d96cceb48e7358b0e220"}, - {file = "regex-2026.1.15-cp310-cp310-musllinux_1_2_s390x.whl", hash = "sha256:87adf5bd6d72e3e17c9cb59ac4096b1faaf84b7eb3037a5ffa61c4b4370f0f13"}, - {file = "regex-2026.1.15-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:e85dc94595f4d766bd7d872a9de5ede1ca8d3063f3bdf1e2c725f5eb411159e3"}, - {file = "regex-2026.1.15-cp310-cp310-win32.whl", hash = "sha256:21ca32c28c30d5d65fc9886ff576fc9b59bbca08933e844fa2363e530f4c8218"}, - {file = "regex-2026.1.15-cp310-cp310-win_amd64.whl", hash = "sha256:3038a62fc7d6e5547b8915a3d927a0fbeef84cdbe0b1deb8c99bbd4a8961b52a"}, - {file = "regex-2026.1.15-cp310-cp310-win_arm64.whl", hash = "sha256:505831646c945e3e63552cc1b1b9b514f0e93232972a2d5bedbcc32f15bc82e3"}, - {file = "regex-2026.1.15-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:1ae6020fb311f68d753b7efa9d4b9a5d47a5d6466ea0d5e3b5a471a960ea6e4a"}, - {file = "regex-2026.1.15-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:eddf73f41225942c1f994914742afa53dc0d01a6e20fe14b878a1b1edc74151f"}, - {file = "regex-2026.1.15-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:1e8cd52557603f5c66a548f69421310886b28b7066853089e1a71ee710e1cdc1"}, - {file = "regex-2026.1.15-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:5170907244b14303edc5978f522f16c974f32d3aa92109fabc2af52411c9433b"}, - {file = "regex-2026.1.15-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:2748c1ec0663580b4510bd89941a31560b4b439a0b428b49472a3d9944d11cd8"}, - {file = "regex-2026.1.15-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:2f2775843ca49360508d080eaa87f94fa248e2c946bbcd963bb3aae14f333413"}, - {file = "regex-2026.1.15-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:d9ea2604370efc9a174c1b5dcc81784fb040044232150f7f33756049edfc9026"}, - {file = "regex-2026.1.15-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:0dcd31594264029b57bf16f37fd7248a70b3b764ed9e0839a8f271b2d22c0785"}, - {file = "regex-2026.1.15-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:c08c1f3e34338256732bd6938747daa3c0d5b251e04b6e43b5813e94d503076e"}, - {file = "regex-2026.1.15-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:e43a55f378df1e7a4fa3547c88d9a5a9b7113f653a66821bcea4718fe6c58763"}, - {file = "regex-2026.1.15-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:f82110ab962a541737bd0ce87978d4c658f06e7591ba899192e2712a517badbb"}, - {file = "regex-2026.1.15-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:27618391db7bdaf87ac6c92b31e8f0dfb83a9de0075855152b720140bda177a2"}, - {file = "regex-2026.1.15-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:bfb0d6be01fbae8d6655c8ca21b3b72458606c4aec9bbc932db758d47aba6db1"}, - {file = "regex-2026.1.15-cp311-cp311-win32.whl", hash = "sha256:b10e42a6de0e32559a92f2f8dc908478cc0fa02838d7dbe764c44dca3fa13569"}, - {file = "regex-2026.1.15-cp311-cp311-win_amd64.whl", hash = "sha256:e9bf3f0bbdb56633c07d7116ae60a576f846efdd86a8848f8d62b749e1209ca7"}, - {file = "regex-2026.1.15-cp311-cp311-win_arm64.whl", hash = "sha256:41aef6f953283291c4e4e6850607bd71502be67779586a61472beacb315c97ec"}, - {file = "regex-2026.1.15-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:4c8fcc5793dde01641a35905d6731ee1548f02b956815f8f1cab89e515a5bdf1"}, - {file = "regex-2026.1.15-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:bfd876041a956e6a90ad7cdb3f6a630c07d491280bfeed4544053cd434901681"}, - {file = "regex-2026.1.15-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:9250d087bc92b7d4899ccd5539a1b2334e44eee85d848c4c1aef8e221d3f8c8f"}, - {file = "regex-2026.1.15-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:c8a154cf6537ebbc110e24dabe53095e714245c272da9c1be05734bdad4a61aa"}, - {file = "regex-2026.1.15-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:8050ba2e3ea1d8731a549e83c18d2f0999fbc99a5f6bd06b4c91449f55291804"}, - {file = "regex-2026.1.15-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:0bf065240704cb8951cc04972cf107063917022511273e0969bdb34fc173456c"}, - {file = "regex-2026.1.15-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:c32bef3e7aeee75746748643667668ef941d28b003bfc89994ecf09a10f7a1b5"}, - {file = "regex-2026.1.15-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:d5eaa4a4c5b1906bd0d2508d68927f15b81821f85092e06f1a34a4254b0e1af3"}, - {file = "regex-2026.1.15-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:86c1077a3cc60d453d4084d5b9649065f3bf1184e22992bd322e1f081d3117fb"}, - {file = "regex-2026.1.15-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:2b091aefc05c78d286657cd4db95f2e6313375ff65dcf085e42e4c04d9c8d410"}, - {file = "regex-2026.1.15-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:57e7d17f59f9ebfa9667e6e5a1c0127b96b87cb9cede8335482451ed00788ba4"}, - {file = "regex-2026.1.15-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:c6c4dcdfff2c08509faa15d36ba7e5ef5fcfab25f1e8f85a0c8f45bc3a30725d"}, - {file = "regex-2026.1.15-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:cf8ff04c642716a7f2048713ddc6278c5fd41faa3b9cab12607c7abecd012c22"}, - {file = "regex-2026.1.15-cp312-cp312-win32.whl", hash = "sha256:82345326b1d8d56afbe41d881fdf62f1926d7264b2fc1537f99ae5da9aad7913"}, - {file = "regex-2026.1.15-cp312-cp312-win_amd64.whl", hash = "sha256:4def140aa6156bc64ee9912383d4038f3fdd18fee03a6f222abd4de6357ce42a"}, - {file = "regex-2026.1.15-cp312-cp312-win_arm64.whl", hash = "sha256:c6c565d9a6e1a8d783c1948937ffc377dd5771e83bd56de8317c450a954d2056"}, - {file = "regex-2026.1.15-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:e69d0deeb977ffe7ed3d2e4439360089f9c3f217ada608f0f88ebd67afb6385e"}, - {file = "regex-2026.1.15-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:3601ffb5375de85a16f407854d11cca8fe3f5febbe3ac78fb2866bb220c74d10"}, - {file = "regex-2026.1.15-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:4c5ef43b5c2d4114eb8ea424bb8c9cec01d5d17f242af88b2448f5ee81caadbc"}, - {file = "regex-2026.1.15-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:968c14d4f03e10b2fd960f1d5168c1f0ac969381d3c1fcc973bc45fb06346599"}, - {file = "regex-2026.1.15-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:56a5595d0f892f214609c9f76b41b7428bed439d98dc961efafdd1354d42baae"}, - {file = "regex-2026.1.15-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:0bf650f26087363434c4e560011f8e4e738f6f3e029b85d4904c50135b86cfa5"}, - {file = "regex-2026.1.15-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:18388a62989c72ac24de75f1449d0fb0b04dfccd0a1a7c1c43af5eb503d890f6"}, - {file = "regex-2026.1.15-cp313-cp313-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:6d220a2517f5893f55daac983bfa9fe998a7dbcaee4f5d27a88500f8b7873788"}, - {file = "regex-2026.1.15-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:c9c08c2fbc6120e70abff5d7f28ffb4d969e14294fb2143b4b5c7d20e46d1714"}, - {file = "regex-2026.1.15-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:7ef7d5d4bd49ec7364315167a4134a015f61e8266c6d446fc116a9ac4456e10d"}, - {file = "regex-2026.1.15-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:6e42844ad64194fa08d5ccb75fe6a459b9b08e6d7296bd704460168d58a388f3"}, - {file = "regex-2026.1.15-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:cfecdaa4b19f9ca534746eb3b55a5195d5c95b88cac32a205e981ec0a22b7d31"}, - {file = "regex-2026.1.15-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:08df9722d9b87834a3d701f3fca570b2be115654dbfd30179f30ab2f39d606d3"}, - {file = "regex-2026.1.15-cp313-cp313-win32.whl", hash = "sha256:d426616dae0967ca225ab12c22274eb816558f2f99ccb4a1d52ca92e8baf180f"}, - {file = "regex-2026.1.15-cp313-cp313-win_amd64.whl", hash = "sha256:febd38857b09867d3ed3f4f1af7d241c5c50362e25ef43034995b77a50df494e"}, - {file = "regex-2026.1.15-cp313-cp313-win_arm64.whl", hash = "sha256:8e32f7896f83774f91499d239e24cebfadbc07639c1494bb7213983842348337"}, - {file = "regex-2026.1.15-cp313-cp313t-macosx_10_13_universal2.whl", hash = "sha256:ec94c04149b6a7b8120f9f44565722c7ae31b7a6d2275569d2eefa76b83da3be"}, - {file = "regex-2026.1.15-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:40c86d8046915bb9aeb15d3f3f15b6fd500b8ea4485b30e1bbc799dab3fe29f8"}, - {file = "regex-2026.1.15-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:726ea4e727aba21643205edad8f2187ec682d3305d790f73b7a51c7587b64bdd"}, - {file = "regex-2026.1.15-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1cb740d044aff31898804e7bf1181cc72c03d11dfd19932b9911ffc19a79070a"}, - {file = "regex-2026.1.15-cp313-cp313t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:05d75a668e9ea16f832390d22131fe1e8acc8389a694c8febc3e340b0f810b93"}, - {file = "regex-2026.1.15-cp313-cp313t-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:d991483606f3dbec93287b9f35596f41aa2e92b7c2ebbb935b63f409e243c9af"}, - {file = "regex-2026.1.15-cp313-cp313t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:194312a14819d3e44628a44ed6fea6898fdbecb0550089d84c403475138d0a09"}, - {file = "regex-2026.1.15-cp313-cp313t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:fe2fda4110a3d0bc163c2e0664be44657431440722c5c5315c65155cab92f9e5"}, - {file = "regex-2026.1.15-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:124dc36c85d34ef2d9164da41a53c1c8c122cfb1f6e1ec377a1f27ee81deb794"}, - {file = "regex-2026.1.15-cp313-cp313t-musllinux_1_2_ppc64le.whl", hash = "sha256:a1774cd1981cd212506a23a14dba7fdeaee259f5deba2df6229966d9911e767a"}, - {file = "regex-2026.1.15-cp313-cp313t-musllinux_1_2_riscv64.whl", hash = "sha256:b5f7d8d2867152cdb625e72a530d2ccb48a3d199159144cbdd63870882fb6f80"}, - {file = "regex-2026.1.15-cp313-cp313t-musllinux_1_2_s390x.whl", hash = "sha256:492534a0ab925d1db998defc3c302dae3616a2fc3fe2e08db1472348f096ddf2"}, - {file = "regex-2026.1.15-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:c661fc820cfb33e166bf2450d3dadbda47c8d8981898adb9b6fe24e5e582ba60"}, - {file = "regex-2026.1.15-cp313-cp313t-win32.whl", hash = "sha256:99ad739c3686085e614bf77a508e26954ff1b8f14da0e3765ff7abbf7799f952"}, - {file = "regex-2026.1.15-cp313-cp313t-win_amd64.whl", hash = "sha256:32655d17905e7ff8ba5c764c43cb124e34a9245e45b83c22e81041e1071aee10"}, - {file = "regex-2026.1.15-cp313-cp313t-win_arm64.whl", hash = "sha256:b2a13dd6a95e95a489ca242319d18fc02e07ceb28fa9ad146385194d95b3c829"}, - {file = "regex-2026.1.15-cp314-cp314-macosx_10_13_universal2.whl", hash = "sha256:d920392a6b1f353f4aa54328c867fec3320fa50657e25f64abf17af054fc97ac"}, - {file = "regex-2026.1.15-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:b5a28980a926fa810dbbed059547b02783952e2efd9c636412345232ddb87ff6"}, - {file = "regex-2026.1.15-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:621f73a07595d83f28952d7bd1e91e9d1ed7625fb7af0064d3516674ec93a2a2"}, - {file = "regex-2026.1.15-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:3d7d92495f47567a9b1669c51fc8d6d809821849063d168121ef801bbc213846"}, - {file = "regex-2026.1.15-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:8dd16fba2758db7a3780a051f245539c4451ca20910f5a5e6ea1c08d06d4a76b"}, - {file = "regex-2026.1.15-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:1e1808471fbe44c1a63e5f577a1d5f02fe5d66031dcbdf12f093ffc1305a858e"}, - {file = "regex-2026.1.15-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:0751a26ad39d4f2ade8fe16c59b2bf5cb19eb3d2cd543e709e583d559bd9efde"}, - {file = "regex-2026.1.15-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:0f0c7684c7f9ca241344ff95a1de964f257a5251968484270e91c25a755532c5"}, - {file = "regex-2026.1.15-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:74f45d170a21df41508cb67165456538425185baaf686281fa210d7e729abc34"}, - {file = "regex-2026.1.15-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:f1862739a1ffb50615c0fde6bae6569b5efbe08d98e59ce009f68a336f64da75"}, - {file = "regex-2026.1.15-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:453078802f1b9e2b7303fb79222c054cb18e76f7bdc220f7530fdc85d319f99e"}, - {file = "regex-2026.1.15-cp314-cp314-musllinux_1_2_s390x.whl", hash = "sha256:a30a68e89e5a218b8b23a52292924c1f4b245cb0c68d1cce9aec9bbda6e2c160"}, - {file = "regex-2026.1.15-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:9479cae874c81bf610d72b85bb681a94c95722c127b55445285fb0e2c82db8e1"}, - {file = "regex-2026.1.15-cp314-cp314-win32.whl", hash = "sha256:d639a750223132afbfb8f429c60d9d318aeba03281a5f1ab49f877456448dcf1"}, - {file = "regex-2026.1.15-cp314-cp314-win_amd64.whl", hash = "sha256:4161d87f85fa831e31469bfd82c186923070fc970b9de75339b68f0c75b51903"}, - {file = "regex-2026.1.15-cp314-cp314-win_arm64.whl", hash = "sha256:91c5036ebb62663a6b3999bdd2e559fd8456d17e2b485bf509784cd31a8b1705"}, - {file = "regex-2026.1.15-cp314-cp314t-macosx_10_13_universal2.whl", hash = "sha256:ee6854c9000a10938c79238de2379bea30c82e4925a371711af45387df35cab8"}, - {file = "regex-2026.1.15-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:2c2b80399a422348ce5de4fe40c418d6299a0fa2803dd61dc0b1a2f28e280fcf"}, - {file = "regex-2026.1.15-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:dca3582bca82596609959ac39e12b7dad98385b4fefccb1151b937383cec547d"}, - {file = "regex-2026.1.15-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ef71d476caa6692eea743ae5ea23cde3260677f70122c4d258ca952e5c2d4e84"}, - {file = "regex-2026.1.15-cp314-cp314t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:c243da3436354f4af6c3058a3f81a97d47ea52c9bd874b52fd30274853a1d5df"}, - {file = "regex-2026.1.15-cp314-cp314t-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:8355ad842a7c7e9e5e55653eade3b7d1885ba86f124dd8ab1f722f9be6627434"}, - {file = "regex-2026.1.15-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:f192a831d9575271a22d804ff1a5355355723f94f31d9eef25f0d45a152fdc1a"}, - {file = "regex-2026.1.15-cp314-cp314t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:166551807ec20d47ceaeec380081f843e88c8949780cd42c40f18d16168bed10"}, - {file = "regex-2026.1.15-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:f9ca1cbdc0fbfe5e6e6f8221ef2309988db5bcede52443aeaee9a4ad555e0dac"}, - {file = "regex-2026.1.15-cp314-cp314t-musllinux_1_2_ppc64le.whl", hash = "sha256:b30bcbd1e1221783c721483953d9e4f3ab9c5d165aa709693d3f3946747b1aea"}, - {file = "regex-2026.1.15-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:2a8d7b50c34578d0d3bf7ad58cde9652b7d683691876f83aedc002862a35dc5e"}, - {file = "regex-2026.1.15-cp314-cp314t-musllinux_1_2_s390x.whl", hash = "sha256:9d787e3310c6a6425eb346be4ff2ccf6eece63017916fd77fe8328c57be83521"}, - {file = "regex-2026.1.15-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:619843841e220adca114118533a574a9cd183ed8a28b85627d2844c500a2b0db"}, - {file = "regex-2026.1.15-cp314-cp314t-win32.whl", hash = "sha256:e90b8db97f6f2c97eb045b51a6b2c5ed69cedd8392459e0642d4199b94fabd7e"}, - {file = "regex-2026.1.15-cp314-cp314t-win_amd64.whl", hash = "sha256:5ef19071f4ac9f0834793af85bd04a920b4407715624e40cb7a0631a11137cdf"}, - {file = "regex-2026.1.15-cp314-cp314t-win_arm64.whl", hash = "sha256:ca89c5e596fc05b015f27561b3793dc2fa0917ea0d7507eebb448efd35274a70"}, - {file = "regex-2026.1.15-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:55b4ea996a8e4458dd7b584a2f89863b1655dd3d17b88b46cbb9becc495a0ec5"}, - {file = "regex-2026.1.15-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:7e1e28be779884189cdd57735e997f282b64fd7ccf6e2eef3e16e57d7a34a815"}, - {file = "regex-2026.1.15-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:0057de9eaef45783ff69fa94ae9f0fd906d629d0bd4c3217048f46d1daa32e9b"}, - {file = "regex-2026.1.15-cp39-cp39-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:cc7cd0b2be0f0269283a45c0d8b2c35e149d1319dcb4a43c9c3689fa935c1ee6"}, - {file = "regex-2026.1.15-cp39-cp39-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:8db052bbd981e1666f09e957f3790ed74080c2229007c1dd67afdbf0b469c48b"}, - {file = "regex-2026.1.15-cp39-cp39-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:343db82cb3712c31ddf720f097ef17c11dab2f67f7a3e7be976c4f82eba4e6df"}, - {file = "regex-2026.1.15-cp39-cp39-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:55e9d0118d97794367309635df398bdfd7c33b93e2fdfa0b239661cd74b4c14e"}, - {file = "regex-2026.1.15-cp39-cp39-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:008b185f235acd1e53787333e5690082e4f156c44c87d894f880056089e9bc7c"}, - {file = "regex-2026.1.15-cp39-cp39-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:fd65af65e2aaf9474e468f9e571bd7b189e1df3a61caa59dcbabd0000e4ea839"}, - {file = "regex-2026.1.15-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:f42e68301ff4afee63e365a5fc302b81bb8ba31af625a671d7acb19d10168a8c"}, - {file = "regex-2026.1.15-cp39-cp39-musllinux_1_2_ppc64le.whl", hash = "sha256:f7792f27d3ee6e0244ea4697d92b825f9a329ab5230a78c1a68bd274e64b5077"}, - {file = "regex-2026.1.15-cp39-cp39-musllinux_1_2_riscv64.whl", hash = "sha256:dbaf3c3c37ef190439981648ccbf0c02ed99ae066087dd117fcb616d80b010a4"}, - {file = "regex-2026.1.15-cp39-cp39-musllinux_1_2_s390x.whl", hash = "sha256:adc97a9077c2696501443d8ad3fa1b4fc6d131fc8fd7dfefd1a723f89071cf0a"}, - {file = "regex-2026.1.15-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:069f56a7bf71d286a6ff932a9e6fb878f151c998ebb2519a9f6d1cee4bffdba3"}, - {file = "regex-2026.1.15-cp39-cp39-win32.whl", hash = "sha256:ea4e6b3566127fda5e007e90a8fd5a4169f0cf0619506ed426db647f19c8454a"}, - {file = "regex-2026.1.15-cp39-cp39-win_amd64.whl", hash = "sha256:cda1ed70d2b264952e88adaa52eea653a33a1b98ac907ae2f86508eb44f65cdc"}, - {file = "regex-2026.1.15-cp39-cp39-win_arm64.whl", hash = "sha256:b325d4714c3c48277bfea1accd94e193ad6ed42b4bad79ad64f3b8f8a31260a5"}, - {file = "regex-2026.1.15.tar.gz", hash = "sha256:164759aa25575cbc0651bef59a0b18353e54300d79ace8084c818ad8ac72b7d5"}, + {file = "regex-2026.2.28-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:fc48c500838be6882b32748f60a15229d2dea96e59ef341eaa96ec83538f498d"}, + {file = "regex-2026.2.28-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:2afa673660928d0b63d84353c6c08a8a476ddfc4a47e11742949d182e6863ce8"}, + {file = "regex-2026.2.28-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:7ab218076eb0944549e7fe74cf0e2b83a82edb27e81cc87411f76240865e04d5"}, + {file = "regex-2026.2.28-cp310-cp310-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:94d63db12e45a9b9f064bfe4800cefefc7e5f182052e4c1b774d46a40ab1d9bb"}, + {file = "regex-2026.2.28-cp310-cp310-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:195237dc327858a7721bf8b0bbbef797554bc13563c3591e91cd0767bacbe359"}, + {file = "regex-2026.2.28-cp310-cp310-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:b387a0d092dac157fb026d737dde35ff3e49ef27f285343e7c6401851239df27"}, + {file = "regex-2026.2.28-cp310-cp310-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:3935174fa4d9f70525a4367aaff3cb8bc0548129d114260c29d9dfa4a5b41692"}, + {file = "regex-2026.2.28-cp310-cp310-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:2b2b23587b26496ff5fd40df4278becdf386813ec00dc3533fa43a4cf0e2ad3c"}, + {file = "regex-2026.2.28-cp310-cp310-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:3b24bd7e9d85dc7c6a8bd2aa14ecd234274a0248335a02adeb25448aecdd420d"}, + {file = "regex-2026.2.28-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:bd477d5f79920338107f04aa645f094032d9e3030cc55be581df3d1ef61aa318"}, + {file = "regex-2026.2.28-cp310-cp310-musllinux_1_2_ppc64le.whl", hash = "sha256:b49eb78048c6354f49e91e4b77da21257fecb92256b6d599ae44403cab30b05b"}, + {file = "regex-2026.2.28-cp310-cp310-musllinux_1_2_riscv64.whl", hash = "sha256:a25c7701e4f7a70021db9aaf4a4a0a67033c6318752146e03d1b94d32006217e"}, + {file = "regex-2026.2.28-cp310-cp310-musllinux_1_2_s390x.whl", hash = "sha256:9dd450db6458387167e033cfa80887a34c99c81d26da1bf8b0b41bf8c9cac88e"}, + {file = "regex-2026.2.28-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:2954379dd20752e82d22accf3ff465311cbb2bac6c1f92c4afd400e1757f7451"}, + {file = "regex-2026.2.28-cp310-cp310-win32.whl", hash = "sha256:1f8b17be5c27a684ea6759983c13506bd77bfc7c0347dff41b18ce5ddd2ee09a"}, + {file = "regex-2026.2.28-cp310-cp310-win_amd64.whl", hash = "sha256:dd8847c4978bc3c7e6c826fb745f5570e518b8459ac2892151ce6627c7bc00d5"}, + {file = "regex-2026.2.28-cp310-cp310-win_arm64.whl", hash = "sha256:73cdcdbba8028167ea81490c7f45280113e41db2c7afb65a276f4711fa3bcbff"}, + {file = "regex-2026.2.28-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:e621fb7c8dc147419b28e1702f58a0177ff8308a76fa295c71f3e7827849f5d9"}, + {file = "regex-2026.2.28-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:0d5bef2031cbf38757a0b0bc4298bb4824b6332d28edc16b39247228fbdbad97"}, + {file = "regex-2026.2.28-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:bcb399ed84eabf4282587ba151f2732ad8168e66f1d3f85b1d038868fe547703"}, + {file = "regex-2026.2.28-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:7c1b34dfa72f826f535b20712afa9bb3ba580020e834f3c69866c5bddbf10098"}, + {file = "regex-2026.2.28-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:851fa70df44325e1e4cdb79c5e676e91a78147b1b543db2aec8734d2add30ec2"}, + {file = "regex-2026.2.28-cp311-cp311-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:516604edd17b1c2c3e579cf4e9b25a53bf8fa6e7cedddf1127804d3e0140ca64"}, + {file = "regex-2026.2.28-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:e7ce83654d1ab701cb619285a18a8e5a889c1216d746ddc710c914ca5fd71022"}, + {file = "regex-2026.2.28-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:f2791948f7c70bb9335a9102df45e93d428f4b8128020d85920223925d73b9e1"}, + {file = "regex-2026.2.28-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:03a83cc26aa2acda6b8b9dfe748cf9e84cbd390c424a1de34fdcef58961a297a"}, + {file = "regex-2026.2.28-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:ec6f5674c5dc836994f50f1186dd1fafde4be0666aae201ae2fcc3d29d8adf27"}, + {file = "regex-2026.2.28-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:50c2fc924749543e0eacc93ada6aeeb3ea5f6715825624baa0dccaec771668ae"}, + {file = "regex-2026.2.28-cp311-cp311-musllinux_1_2_s390x.whl", hash = "sha256:ba55c50f408fb5c346a3a02d2ce0ebc839784e24f7c9684fde328ff063c3cdea"}, + {file = "regex-2026.2.28-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:edb1b1b3a5576c56f08ac46f108c40333f222ebfd5cf63afdfa3aab0791ebe5b"}, + {file = "regex-2026.2.28-cp311-cp311-win32.whl", hash = "sha256:948c12ef30ecedb128903c2c2678b339746eb7c689c5c21957c4a23950c96d15"}, + {file = "regex-2026.2.28-cp311-cp311-win_amd64.whl", hash = "sha256:fd63453f10d29097cc3dc62d070746523973fb5aa1c66d25f8558bebd47fed61"}, + {file = "regex-2026.2.28-cp311-cp311-win_arm64.whl", hash = "sha256:00f2b8d9615aa165fdff0a13f1a92049bfad555ee91e20d246a51aa0b556c60a"}, + {file = "regex-2026.2.28-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:fcf26c3c6d0da98fada8ae4ef0aa1c3405a431c0a77eb17306d38a89b02adcd7"}, + {file = "regex-2026.2.28-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:02473c954af35dd2defeb07e44182f5705b30ea3f351a7cbffa9177beb14da5d"}, + {file = "regex-2026.2.28-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:9b65d33a17101569f86d9c5966a8b1d7fbf8afdda5a8aa219301b0a80f58cf7d"}, + {file = "regex-2026.2.28-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:e71dcecaa113eebcc96622c17692672c2d104b1d71ddf7adeda90da7ddeb26fc"}, + {file = "regex-2026.2.28-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:481df4623fa4969c8b11f3433ed7d5e3dc9cec0f008356c3212b3933fb77e3d8"}, + {file = "regex-2026.2.28-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:64e7c6ad614573e0640f271e811a408d79a9e1fe62a46adb602f598df42a818d"}, + {file = "regex-2026.2.28-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:d6b08a06976ff4fb0d83077022fde3eca06c55432bb997d8c0495b9a4e9872f4"}, + {file = "regex-2026.2.28-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:864cdd1a2ef5716b0ab468af40139e62ede1b3a53386b375ec0786bb6783fc05"}, + {file = "regex-2026.2.28-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:511f7419f7afab475fd4d639d4aedfc54205bcb0800066753ef68a59f0f330b5"}, + {file = "regex-2026.2.28-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:b42f7466e32bf15a961cf09f35fa6323cc72e64d3d2c990b10de1274a5da0a59"}, + {file = "regex-2026.2.28-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:8710d61737b0c0ce6836b1da7109f20d495e49b3809f30e27e9560be67a257bf"}, + {file = "regex-2026.2.28-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:4390c365fd2d45278f45afd4673cb90f7285f5701607e3ad4274df08e36140ae"}, + {file = "regex-2026.2.28-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:cb3b1db8ff6c7b8bf838ab05583ea15230cb2f678e569ab0e3a24d1e8320940b"}, + {file = "regex-2026.2.28-cp312-cp312-win32.whl", hash = "sha256:f8ed9a5d4612df9d4de15878f0bc6aa7a268afbe5af21a3fdd97fa19516e978c"}, + {file = "regex-2026.2.28-cp312-cp312-win_amd64.whl", hash = "sha256:01d65fd24206c8e1e97e2e31b286c59009636c022eb5d003f52760b0f42155d4"}, + {file = "regex-2026.2.28-cp312-cp312-win_arm64.whl", hash = "sha256:c0b5ccbb8ffb433939d248707d4a8b31993cb76ab1a0187ca886bf50e96df952"}, + {file = "regex-2026.2.28-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:6d63a07e5ec8ce7184452cb00c41c37b49e67dc4f73b2955b5b8e782ea970784"}, + {file = "regex-2026.2.28-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:e59bc8f30414d283ae8ee1617b13d8112e7135cb92830f0ec3688cb29152585a"}, + {file = "regex-2026.2.28-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:de0cf053139f96219ccfabb4a8dd2d217c8c82cb206c91d9f109f3f552d6b43d"}, + {file = "regex-2026.2.28-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:fb4db2f17e6484904f986c5a657cec85574c76b5c5e61c7aae9ffa1bc6224f95"}, + {file = "regex-2026.2.28-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:52b017b35ac2214d0db5f4f90e303634dc44e4aba4bd6235a27f97ecbe5b0472"}, + {file = "regex-2026.2.28-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:69fc560ccbf08a09dc9b52ab69cacfae51e0ed80dc5693078bdc97db2f91ae96"}, + {file = "regex-2026.2.28-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:e61eea47230eba62a31f3e8a0e3164d0f37ef9f40529fb2c79361bc6b53d2a92"}, + {file = "regex-2026.2.28-cp313-cp313-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:4f5c0b182ad4269e7381b7c27fdb0408399881f7a92a4624fd5487f2971dfc11"}, + {file = "regex-2026.2.28-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:96f6269a2882fbb0ee76967116b83679dc628e68eaea44e90884b8d53d833881"}, + {file = "regex-2026.2.28-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:b5acd4b6a95f37c3c3828e5d053a7d4edaedb85de551db0153754924cb7c83e3"}, + {file = "regex-2026.2.28-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:2234059cfe33d9813a3677ef7667999caea9eeaa83fef98eb6ce15c6cf9e0215"}, + {file = "regex-2026.2.28-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:c15af43c72a7fb0c97cbc66fa36a43546eddc5c06a662b64a0cbf30d6ac40944"}, + {file = "regex-2026.2.28-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:9185cc63359862a6e80fe97f696e04b0ad9a11c4ac0a4a927f979f611bfe3768"}, + {file = "regex-2026.2.28-cp313-cp313-win32.whl", hash = "sha256:fb66e5245db9652abd7196ace599b04d9c0e4aa7c8f0e2803938377835780081"}, + {file = "regex-2026.2.28-cp313-cp313-win_amd64.whl", hash = "sha256:71a911098be38c859ceb3f9a9ce43f4ed9f4c6720ad8684a066ea246b76ad9ff"}, + {file = "regex-2026.2.28-cp313-cp313-win_arm64.whl", hash = "sha256:39bb5727650b9a0275c6a6690f9bb3fe693a7e6cc5c3155b1240aedf8926423e"}, + {file = "regex-2026.2.28-cp313-cp313t-macosx_10_13_universal2.whl", hash = "sha256:97054c55db06ab020342cc0d35d6f62a465fa7662871190175f1ad6c655c028f"}, + {file = "regex-2026.2.28-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:0d25a10811de831c2baa6aef3c0be91622f44dd8d31dd12e69f6398efb15e48b"}, + {file = "regex-2026.2.28-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:d6cfe798d8da41bb1862ed6e0cba14003d387c3c0c4a5d45591076ae9f0ce2f8"}, + {file = "regex-2026.2.28-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:fd0ce43e71d825b7c0661f9c54d4d74bd97c56c3fd102a8985bcfea48236bacb"}, + {file = "regex-2026.2.28-cp313-cp313t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:00945d007fd74a9084d2ab79b695b595c6b7ba3698972fadd43e23230c6979c1"}, + {file = "regex-2026.2.28-cp313-cp313t-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:bec23c11cbbf09a4df32fe50d57cbdd777bc442269b6e39a1775654f1c95dee2"}, + {file = "regex-2026.2.28-cp313-cp313t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:5cdcc17d935c8f9d3f4db5c2ebe2640c332e3822ad5d23c2f8e0228e6947943a"}, + {file = "regex-2026.2.28-cp313-cp313t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:a448af01e3d8031c89c5d902040b124a5e921a25c4e5e07a861ca591ce429341"}, + {file = "regex-2026.2.28-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:10d28e19bd4888e4abf43bd3925f3c134c52fdf7259219003588a42e24c2aa25"}, + {file = "regex-2026.2.28-cp313-cp313t-musllinux_1_2_ppc64le.whl", hash = "sha256:99985a2c277dcb9ccb63f937451af5d65177af1efdeb8173ac55b61095a0a05c"}, + {file = "regex-2026.2.28-cp313-cp313t-musllinux_1_2_riscv64.whl", hash = "sha256:e1e7b24cb3ae9953a560c563045d1ba56ee4749fbd05cf21ba571069bd7be81b"}, + {file = "regex-2026.2.28-cp313-cp313t-musllinux_1_2_s390x.whl", hash = "sha256:d8511a01d0e4ee1992eb3ba19e09bc1866fe03f05129c3aec3fdc4cbc77aad3f"}, + {file = "regex-2026.2.28-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:aaffaecffcd2479ce87aa1e74076c221700b7c804e48e98e62500ee748f0f550"}, + {file = "regex-2026.2.28-cp313-cp313t-win32.whl", hash = "sha256:ef77bdde9c9eba3f7fa5b58084b29bbcc74bcf55fdbeaa67c102a35b5bd7e7cc"}, + {file = "regex-2026.2.28-cp313-cp313t-win_amd64.whl", hash = "sha256:98adf340100cbe6fbaf8e6dc75e28f2c191b1be50ffefe292fb0e6f6eefdb0d8"}, + {file = "regex-2026.2.28-cp313-cp313t-win_arm64.whl", hash = "sha256:2fb950ac1d88e6b6a9414381f403797b236f9fa17e1eee07683af72b1634207b"}, + {file = "regex-2026.2.28-cp314-cp314-macosx_10_13_universal2.whl", hash = "sha256:78454178c7df31372ea737996fb7f36b3c2c92cccc641d251e072478afb4babc"}, + {file = "regex-2026.2.28-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:5d10303dd18cedfd4d095543998404df656088240bcfd3cd20a8f95b861f74bd"}, + {file = "regex-2026.2.28-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:19a9c9e0a8f24f39d575a6a854d516b48ffe4cbdcb9de55cb0570a032556ecff"}, + {file = "regex-2026.2.28-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:09500be324f49b470d907b3ef8af9afe857f5cca486f853853f7945ddbf75911"}, + {file = "regex-2026.2.28-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:fb1c4ff62277d87a7335f2c1ea4e0387b8f2b3ad88a64efd9943906aafad4f33"}, + {file = "regex-2026.2.28-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:b8b3f1be1738feadc69f62daa250c933e85c6f34fa378f54a7ff43807c1b9117"}, + {file = "regex-2026.2.28-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:dc8ed8c3f41c27acb83f7b6a9eb727a73fc6663441890c5cb3426a5f6a91ce7d"}, + {file = "regex-2026.2.28-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:fa539be029844c0ce1114762d2952ab6cfdd7c7c9bd72e0db26b94c3c36dcc5a"}, + {file = "regex-2026.2.28-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:7900157786428a79615a8264dac1f12c9b02957c473c8110c6b1f972dcecaddf"}, + {file = "regex-2026.2.28-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:0b1d2b07614d95fa2bf8a63fd1e98bd8fa2b4848dc91b1efbc8ba219fdd73952"}, + {file = "regex-2026.2.28-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:b389c61aa28a79c2e0527ac36da579869c2e235a5b208a12c5b5318cda2501d8"}, + {file = "regex-2026.2.28-cp314-cp314-musllinux_1_2_s390x.whl", hash = "sha256:f467cb602f03fbd1ab1908f68b53c649ce393fde056628dc8c7e634dab6bfc07"}, + {file = "regex-2026.2.28-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:e8c8cb2deba42f5ec1ede46374e990f8adc5e6456a57ac1a261b19be6f28e4e6"}, + {file = "regex-2026.2.28-cp314-cp314-win32.whl", hash = "sha256:9036b400b20e4858d56d117108d7813ed07bb7803e3eed766675862131135ca6"}, + {file = "regex-2026.2.28-cp314-cp314-win_amd64.whl", hash = "sha256:1d367257cd86c1cbb97ea94e77b373a0bbc2224976e247f173d19e8f18b4afa7"}, + {file = "regex-2026.2.28-cp314-cp314-win_arm64.whl", hash = "sha256:5e68192bb3a1d6fb2836da24aa494e413ea65853a21505e142e5b1064a595f3d"}, + {file = "regex-2026.2.28-cp314-cp314t-macosx_10_13_universal2.whl", hash = "sha256:a5dac14d0872eeb35260a8e30bac07ddf22adc1e3a0635b52b02e180d17c9c7e"}, + {file = "regex-2026.2.28-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:ec0c608b7a7465ffadb344ed7c987ff2f11ee03f6a130b569aa74d8a70e8333c"}, + {file = "regex-2026.2.28-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:c7815afb0ca45456613fdaf60ea9c993715511c8d53a83bc468305cbc0ee23c7"}, + {file = "regex-2026.2.28-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:b059e71ec363968671693a78c5053bd9cb2fe410f9b8e4657e88377ebd603a2e"}, + {file = "regex-2026.2.28-cp314-cp314t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:b8cf76f1a29f0e99dcfd7aef1551a9827588aae5a737fe31442021165f1920dc"}, + {file = "regex-2026.2.28-cp314-cp314t-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:180e08a435a0319e6a4821c3468da18dc7001987e1c17ae1335488dfe7518dd8"}, + {file = "regex-2026.2.28-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1e496956106fd59ba6322a8ea17141a27c5040e5ee8f9433ae92d4e5204462a0"}, + {file = "regex-2026.2.28-cp314-cp314t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:bba2b18d70eeb7b79950f12f633beeecd923f7c9ad6f6bae28e59b4cb3ab046b"}, + {file = "regex-2026.2.28-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:6db7bfae0f8a2793ff1f7021468ea55e2699d0790eb58ee6ab36ae43aa00bc5b"}, + {file = "regex-2026.2.28-cp314-cp314t-musllinux_1_2_ppc64le.whl", hash = "sha256:d0b02e8b7e5874b48ae0f077ecca61c1a6a9f9895e9c6dfb191b55b242862033"}, + {file = "regex-2026.2.28-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:25b6eb660c5cf4b8c3407a1ed462abba26a926cc9965e164268a3267bcc06a43"}, + {file = "regex-2026.2.28-cp314-cp314t-musllinux_1_2_s390x.whl", hash = "sha256:5a932ea8ad5d0430351ff9c76c8db34db0d9f53c1d78f06022a21f4e290c5c18"}, + {file = "regex-2026.2.28-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:1c2c95e1a2b0f89d01e821ff4de1be4b5d73d1f4b0bf679fa27c1ad8d2327f1a"}, + {file = "regex-2026.2.28-cp314-cp314t-win32.whl", hash = "sha256:bbb882061f742eb5d46f2f1bd5304055be0a66b783576de3d7eef1bed4778a6e"}, + {file = "regex-2026.2.28-cp314-cp314t-win_amd64.whl", hash = "sha256:6591f281cb44dc13de9585b552cec6fc6cf47fb2fe7a48892295ee9bc4a612f9"}, + {file = "regex-2026.2.28-cp314-cp314t-win_arm64.whl", hash = "sha256:dee50f1be42222f89767b64b283283ef963189da0dda4a515aa54a5563c62dec"}, + {file = "regex-2026.2.28.tar.gz", hash = "sha256:a729e47d418ea11d03469f321aaf67cdee8954cde3ff2cf8403ab87951ad10f2"}, ] [[package]] @@ -3400,14 +3431,14 @@ use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"] [[package]] name = "responses" -version = "0.25.8" +version = "0.26.0" description = "A utility library for mocking out the `requests` Python library." optional = false python-versions = ">=3.8" groups = ["dev"] files = [ - {file = "responses-0.25.8-py3-none-any.whl", hash = "sha256:0c710af92def29c8352ceadff0c3fe340ace27cf5af1bbe46fb71275bcd2831c"}, - {file = "responses-0.25.8.tar.gz", hash = "sha256:9374d047a575c8f781b94454db5cab590b6029505f488d12899ddb10a4af1cf4"}, + {file = "responses-0.26.0-py3-none-any.whl", hash = "sha256:03ec4409088cd5c66b71ecbbbd27fe2c58ddfad801c66203457b3e6a04868c37"}, + {file = "responses-0.26.0.tar.gz", hash = "sha256:c7f6923e6343ef3682816ba421c006626777893cb0d5e1434f674b649bac9eb4"}, ] [package.dependencies] @@ -3575,10 +3606,10 @@ files = [ ] [package.dependencies] -botocore = ">=1.37.4,<2.0a.0" +botocore = ">=1.37.4,<2.0a0" [package.extras] -crt = ["botocore[crt] (>=1.37.4,<2.0a.0)"] +crt = ["botocore[crt] (>=1.37.4,<2.0a0)"] [[package]] name = "six" @@ -3598,7 +3629,7 @@ version = "1.27.0" description = "The Bolt Framework for Python" optional = false python-versions = ">=3.7" -groups = ["slackbotfunction", "syncknowledgebasefunction"] +groups = ["notifys3uploadfunction", "slackbotfunction", "syncknowledgebasefunction"] files = [ {file = "slack_bolt-1.27.0-py2.py3-none-any.whl", hash = "sha256:c43c94bf34740f2adeb9b55566c83f1e73fed6ba2878bd346cdfd6fd8ad22360"}, {file = "slack_bolt-1.27.0.tar.gz", hash = "sha256:3db91d64e277e176a565c574ae82748aa8554f19e41a4fceadca4d65374ce1e0"}, @@ -3613,7 +3644,7 @@ version = "3.41.0" description = "The Slack API Platform SDK for Python" optional = false python-versions = ">=3.7" -groups = ["slackbotfunction", "syncknowledgebasefunction"] +groups = ["notifys3uploadfunction", "slackbotfunction", "syncknowledgebasefunction"] files = [ {file = "slack_sdk-3.41.0-py2.py3-none-any.whl", hash = "sha256:bb18dcdfff1413ec448e759cf807ec3324090993d8ab9111c74081623b692a89"}, {file = "slack_sdk-3.41.0.tar.gz", hash = "sha256:eb61eb12a65bebeca9cb5d36b3f799e836ed2be21b456d15df2627cfe34076ca"}, @@ -3648,14 +3679,14 @@ files = [ [[package]] name = "speechrecognition" -version = "3.14.5" +version = "3.15.1" description = "Library for performing speech recognition, with support for several engines and APIs, online and offline." optional = false python-versions = ">=3.9" groups = ["preprocessingfunction"] files = [ - {file = "speechrecognition-3.14.5-py3-none-any.whl", hash = "sha256:0c496d74e9f29b1daadb0d96f5660f47563e42bf09316dacdd57094c5095977e"}, - {file = "speechrecognition-3.14.5.tar.gz", hash = "sha256:2d185192986b9b67a1502825a330e971f59a2cae0262f727a19ad1f6b586d00a"}, + {file = "speechrecognition-3.15.1-py3-none-any.whl", hash = "sha256:b2b046170e1dda3e921ae3e993c77dace6d3610025ce91773cfd0debf1675c2d"}, + {file = "speechrecognition-3.15.1.tar.gz", hash = "sha256:cc5c8e040639a277c7586505c92b8d0d02b871daca57f3d175f8f678e82c3850"}, ] [package.dependencies] @@ -3666,7 +3697,7 @@ typing-extensions = "*" [package.extras] assemblyai = ["requests"] audio = ["PyAudio (>=0.2.11)"] -dev = ["mypy", "numpy", "pytest", "pytest-randomly", "respx", "types-requests"] +dev = ["mypy", "numpy", "pytest", "pytest-httpserver", "pytest-randomly", "respx", "types-requests"] faster-whisper = ["faster-whisper", "soundfile"] google-cloud = ["google-cloud-speech"] groq = ["groq", "httpx (<0.28)"] @@ -3723,14 +3754,14 @@ dev = ["hypothesis (>=6.70.0)", "pytest (>=7.1.0)"] [[package]] name = "tqdm" -version = "4.67.2" +version = "4.67.3" description = "Fast, Extensible Progress Meter" optional = false python-versions = ">=3.7" groups = ["preprocessingfunction"] files = [ - {file = "tqdm-4.67.2-py3-none-any.whl", hash = "sha256:9a12abcbbff58b6036b2167d9d3853042b9d436fe7330f06ae047867f2f8e0a7"}, - {file = "tqdm-4.67.2.tar.gz", hash = "sha256:649aac53964b2cb8dec76a14b405a4c0d13612cb8933aae547dd144eacc99653"}, + {file = "tqdm-4.67.3-py3-none-any.whl", hash = "sha256:ee1e4c0e59148062281c49d80b25b67771a127c85fc9676d3be5f243206826bf"}, + {file = "tqdm-4.67.3.tar.gz", hash = "sha256:7d825f03f89244ef73f1d4ce193cb1774a8179fd96f31d7e1dcde62092b960bb"}, ] [package.dependencies] @@ -3745,14 +3776,14 @@ telegram = ["requests"] [[package]] name = "types-awscrt" -version = "0.31.1" +version = "0.31.3" description = "Type annotations and code completion for awscrt" optional = false python-versions = ">=3.8" groups = ["slackbotfunction"] files = [ - {file = "types_awscrt-0.31.1-py3-none-any.whl", hash = "sha256:7e4364ac635f72bd57f52b093883640b1448a6eded0ecbac6e900bf4b1e4777b"}, - {file = "types_awscrt-0.31.1.tar.gz", hash = "sha256:08b13494f93f45c1a92eb264755fce50ed0d1dc75059abb5e31670feb9a09724"}, + {file = "types_awscrt-0.31.3-py3-none-any.whl", hash = "sha256:e5ce65a00a2ab4f35eacc1e3d700d792338d56e4823ee7b4dbe017f94cfc4458"}, + {file = "types_awscrt-0.31.3.tar.gz", hash = "sha256:09d3eaf00231e0f47e101bd9867e430873bc57040050e2a3bd8305cb4fc30865"}, ] [[package]] @@ -3773,7 +3804,7 @@ version = "4.15.0" description = "Backported and Experimental Type Hints for Python 3.9+" optional = false python-versions = ">=3.9" -groups = ["bedrockloggingconfigfunction", "dev", "preprocessingfunction", "slackbotfunction", "syncknowledgebasefunction"] +groups = ["bedrockloggingconfigfunction", "dev", "notifys3uploadfunction", "preprocessingfunction", "slackbotfunction", "syncknowledgebasefunction"] files = [ {file = "typing_extensions-4.15.0-py3-none-any.whl", hash = "sha256:f0fa19c6845758ab08074a0cfa8b7aecb71c999ca73d62883bc25cc018c4e548"}, {file = "typing_extensions-4.15.0.tar.gz", hash = "sha256:0cea48d173cc12fa28ecabc3b837ea3cf6f38c6d1136f85cbaaf598984861466"}, @@ -3813,7 +3844,7 @@ version = "2.6.3" description = "HTTP library with thread-safe connection pooling, file post, and more." optional = false python-versions = ">=3.9" -groups = ["bedrockloggingconfigfunction", "dev", "preprocessingfunction", "slackbotfunction", "syncknowledgebasefunction"] +groups = ["bedrockloggingconfigfunction", "dev", "notifys3uploadfunction", "preprocessingfunction", "slackbotfunction", "syncknowledgebasefunction"] files = [ {file = "urllib3-2.6.3-py3-none-any.whl", hash = "sha256:bf272323e553dfb2e87d9bfd225ca7b0f467b919d7bbd355436d3fd37cb0acd4"}, {file = "urllib3-2.6.3.tar.gz", hash = "sha256:1b62b6884944a57dbe321509ab94fd4d3b307075e0c2eae991ac71ee15ad38ed"}, @@ -3827,35 +3858,32 @@ zstd = ["backports-zstd (>=1.0.0) ; python_version < \"3.14\""] [[package]] name = "virtualenv" -version = "20.36.1" +version = "21.2.0" description = "Virtual Python Environment builder" optional = false python-versions = ">=3.8" groups = ["dev"] files = [ - {file = "virtualenv-20.36.1-py3-none-any.whl", hash = "sha256:575a8d6b124ef88f6f51d56d656132389f961062a9177016a50e4f507bbcc19f"}, - {file = "virtualenv-20.36.1.tar.gz", hash = "sha256:8befb5c81842c641f8ee658481e42641c68b5eab3521d8e092d18320902466ba"}, + {file = "virtualenv-21.2.0-py3-none-any.whl", hash = "sha256:1bd755b504931164a5a496d217c014d098426cddc79363ad66ac78125f9d908f"}, + {file = "virtualenv-21.2.0.tar.gz", hash = "sha256:1720dc3a62ef5b443092e3f499228599045d7fea4c79199770499df8becf9098"}, ] [package.dependencies] distlib = ">=0.3.7,<1" -filelock = {version = ">=3.20.1,<4", markers = "python_version >= \"3.10\""} +filelock = {version = ">=3.24.2,<4", markers = "python_version >= \"3.10\""} platformdirs = ">=3.9.1,<5" - -[package.extras] -docs = ["furo (>=2023.7.26)", "proselint (>=0.13)", "sphinx (>=7.1.2,!=7.3)", "sphinx-argparse (>=0.4)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=23.6)"] -test = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7)", "packaging (>=23.1)", "pytest (>=7.4)", "pytest-env (>=0.8.2)", "pytest-freezer (>=0.4.8) ; platform_python_implementation == \"PyPy\" or platform_python_implementation == \"GraalVM\" or platform_python_implementation == \"CPython\" and sys_platform == \"win32\" and python_version >= \"3.13\"", "pytest-mock (>=3.11.1)", "pytest-randomly (>=3.12)", "pytest-timeout (>=2.1)", "setuptools (>=68)", "time-machine (>=2.10) ; platform_python_implementation == \"CPython\""] +python-discovery = ">=1" [[package]] name = "wcwidth" -version = "0.5.3" +version = "0.6.0" description = "Measures the displayed width of unicode strings in a terminal" optional = false python-versions = ">=3.8" groups = ["dev"] files = [ - {file = "wcwidth-0.5.3-py3-none-any.whl", hash = "sha256:d584eff31cd4753e1e5ff6c12e1edfdb324c995713f75d26c29807bb84bf649e"}, - {file = "wcwidth-0.5.3.tar.gz", hash = "sha256:53123b7af053c74e9fe2e92ac810301f6139e64379031f7124574212fb3b4091"}, + {file = "wcwidth-0.6.0-py3-none-any.whl", hash = "sha256:1a3a1e510b553315f8e146c54764f4fb6264ffad731b3d78088cdb1478ffbdad"}, + {file = "wcwidth-0.6.0.tar.gz", hash = "sha256:cdc4e4262d6ef9a1a57e018384cbeb1208d8abbc64176027e2c2455c81313159"}, ] [[package]] @@ -3907,14 +3935,14 @@ files = [ [[package]] name = "xmltodict" -version = "1.0.2" +version = "1.0.4" description = "Makes working with XML feel like you are working with JSON" optional = false python-versions = ">=3.9" groups = ["dev"] files = [ - {file = "xmltodict-1.0.2-py3-none-any.whl", hash = "sha256:62d0fddb0dcbc9f642745d8bbf4d81fd17d6dfaec5a15b5c1876300aad92af0d"}, - {file = "xmltodict-1.0.2.tar.gz", hash = "sha256:54306780b7c2175a3967cad1db92f218207e5bc1aba697d887807c0fb68b7649"}, + {file = "xmltodict-1.0.4-py3-none-any.whl", hash = "sha256:a4a00d300b0e1c59fc2bfccb53d7b2e88c32f200df138a0dd2229f842497026a"}, + {file = "xmltodict-1.0.4.tar.gz", hash = "sha256:6d94c9f834dd9e44514162799d344d815a3a4faec913717a9ecbfa5be1bb8e61"}, ] [package.extras] @@ -3938,4 +3966,4 @@ requests = "*" [metadata] lock-version = "2.1" python-versions = "^3.14" -content-hash = "827eccd89c88931c656b74c99b31acea948409992ed6795a62a78588989f0ff5" \ No newline at end of file +content-hash = "12ad21d4835a0d8054861766df91a61457bf99c19fb21f8346002c1685a39155" From 9d3db6b1c1d41e8dbe8a41408b32f5d95f7371fe Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Mon, 16 Mar 2026 15:04:44 +0000 Subject: [PATCH 71/84] fix: Merge poetry lock changes --- poetry.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/poetry.lock b/poetry.lock index e3ed682d9..891befd2e 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1109,7 +1109,7 @@ files = [ {file = "colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"}, {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"}, ] -markers = {dev = "platform_system == \"Windows\" or sys_platform == \"win32\"", preprocessingfunction = "platform_system == \"Windows\""} +markers = {dev = "sys_platform == \"win32\" or platform_system == \"Windows\"", preprocessingfunction = "platform_system == \"Windows\""} [[package]] name = "coverage" @@ -2997,14 +2997,14 @@ windows-terminal = ["colorama (>=0.4.6)"] [[package]] name = "pyjwt" -version = "2.11.0" +version = "2.12.1" description = "JSON Web Token implementation in Python" optional = false python-versions = ">=3.9" groups = ["preprocessingfunction"] files = [ - {file = "pyjwt-2.11.0-py3-none-any.whl", hash = "sha256:94a6bde30eb5c8e04fee991062b534071fd1439ef58d2adc9ccb823e7bcd0469"}, - {file = "pyjwt-2.11.0.tar.gz", hash = "sha256:35f95c1f0fbe5d5ba6e43f00271c275f7a1a4db1dab27bf708073b75318ea623"}, + {file = "pyjwt-2.12.1-py3-none-any.whl", hash = "sha256:28ca37c070cad8ba8cd9790cd940535d40274d22f80ab87f3ac6a713e6e8454c"}, + {file = "pyjwt-2.12.1.tar.gz", hash = "sha256:c74a7a2adf861c04d002db713dd85f84beb242228e671280bf709d765b03672b"}, ] [package.dependencies] @@ -3966,4 +3966,4 @@ requests = "*" [metadata] lock-version = "2.1" python-versions = "^3.14" -content-hash = "8d90f1f76c0d32369c14d469d0f0057509f63ae857b0f7aa371a0ed243ae0592" +content-hash = "12ad21d4835a0d8054861766df91a61457bf99c19fb21f8346002c1685a39155" From 25cb42030334c7140cc1335251680fd29ce578d7 Mon Sep 17 00:00:00 2001 From: Kieran Wilkinson Date: Mon, 16 Mar 2026 15:22:08 +0000 Subject: [PATCH 72/84] fix: update poetry - again --- poetry.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/poetry.lock b/poetry.lock index 8904affbe..df750958f 100644 --- a/poetry.lock +++ b/poetry.lock @@ -3966,4 +3966,4 @@ requests = "*" [metadata] lock-version = "2.1" python-versions = "^3.14" -content-hash = "7ede6511be58ef45fab6fe9f6f0d64320842084a0cb0dd7846eccb3a50cf6c87" +content-hash = "45b4141a6dfa3da3bfe9ddc0043648b704d5eaa0feda9ce1d10660be856affb7" From cce3da68d60b61a415a80301e76b5e75af1e84d7 Mon Sep 17 00:00:00 2001 From: kieran-wilkinson-4 Date: Mon, 16 Mar 2026 15:36:03 +0000 Subject: [PATCH 73/84] fix: Roll back merge conflict --- packages/cdk/stacks/EpsAssistMeStack.ts | 7 ------- 1 file changed, 7 deletions(-) diff --git a/packages/cdk/stacks/EpsAssistMeStack.ts b/packages/cdk/stacks/EpsAssistMeStack.ts index 88a58fe0a..2071fcc60 100644 --- a/packages/cdk/stacks/EpsAssistMeStack.ts +++ b/packages/cdk/stacks/EpsAssistMeStack.ts @@ -22,7 +22,6 @@ import {BedrockPromptSettings} from "../resources/BedrockPromptSettings" import {S3LambdaNotification} from "../resources/S3LambdaNotification" import {BedrockLoggingConfiguration} from "../resources/BedrockLoggingConfiguration" import {Bucket} from "aws-cdk-lib/aws-s3" -import {BucketDeployment, Source} from "aws-cdk-lib/aws-s3-deployment" export interface EpsAssistMeStackProps extends StackProps { readonly stackName: string @@ -104,12 +103,6 @@ export class EpsAssistMeStack extends Stack { assistMeDocumentSyncRole: assistMeDocumentSyncRole }) - // initialize s3 folders for raw and processed documents - new BucketDeployment(this, "S3FolderInitializer", { - sources: [Source.asset("packages/cdk/assets/s3-folders")], - destinationBucket: storage.kbDocsBucket - }) - // Create Bedrock execution role without dependencies const bedrockExecutionRole = new BedrockExecutionRole(this, "BedrockExecutionRole", { region, From 3493e9db00fdd86674e3b283347623864dabcf17 Mon Sep 17 00:00:00 2001 From: kieran-wilkinson-4 Date: Mon, 16 Mar 2026 15:39:30 +0000 Subject: [PATCH 74/84] fix: fix poetry issue --- poetry.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/poetry.lock b/poetry.lock index 6891063e3..474ff2dba 100644 --- a/poetry.lock +++ b/poetry.lock @@ -3966,4 +3966,4 @@ requests = "*" [metadata] lock-version = "2.1" python-versions = "^3.14" -content-hash = "11dbee52bf490f69416a8bb0e3c80ce28aab1ce067d132e6931fdaecb683e560" +content-hash = "3d242179de54a4fa3eb8f9a49a4502b8308d3a20f7c5984b557781690b9d34e7" From 3c22538e77a15ea0b62a3fce3e3ff73dd95131d6 Mon Sep 17 00:00:00 2001 From: kieran-wilkinson-4 Date: Mon, 16 Mar 2026 16:11:55 +0000 Subject: [PATCH 75/84] fix: Empty Object errors --- packages/cdk/resources/Functions.ts | 2 +- .../syncKnowledgeBaseFunction/app/handler.py | 27 ++++++++++--------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/packages/cdk/resources/Functions.ts b/packages/cdk/resources/Functions.ts index 4dbc9ef37..754457bf8 100644 --- a/packages/cdk/resources/Functions.ts +++ b/packages/cdk/resources/Functions.ts @@ -132,7 +132,7 @@ export class Functions extends Construct { "SLACK_BOT_TOKEN_PARAMETER": props.slackBotTokenParameter.parameterName, "SLACK_BOT_ACTIVE": `${!props.isPullRequest}`, "DATA_SOURCE_ID": props.dataSourceId, - "SLACK_BOT_STATE_TABLE": props.knowledgeSyncStateTable.tableName + "KNOWLEDGE_SYNC_STATE_TABLE": props.knowledgeSyncStateTable.tableName }, additionalPolicies: [props.syncKnowledgeBaseManagedPolicy], reservedConcurrentExecutions: 1 diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index e32da53cb..24dff136e 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -81,23 +81,21 @@ def get_latest_message(self, user_id, channel_id): try: response = self.table.query( KeyConditionExpression=Key("user_channel_composite").eq(f"{user_id}#{channel_id}"), - ScanIndexForward=False, # This forces Descending order (Latest first) - Limit=1, # Get only the latest result + ScanIndexForward=False, + Limit=1, ) - latest_item = response.get("Items", [{}])[0] if response.get("Items") else None - if latest_item: - logger.info( - "Found latest item", - extra={"user_id": user_id, "channel_id": channel_id, "ts": latest_item.get("last_ts")}, - ) - return latest_item - else: - logger.info(f"No previous message found for {user_id} in {channel_id}") + items = response.get("Items", []) + if not items: + logger.info(f"No previous record for {user_id} in {channel_id}") return None + latest_item = items[0] + logger.info("Found latest item", extra={"ts": latest_item.get("last_ts")}) + return latest_item + except ClientError as e: - logger.error(f"Failed to read from DynamoDB: {e.response['Error']['Message']}") + logger.error(f"DynamoDB Query Error: {e.response['Error']['Message']}") return None @@ -312,8 +310,11 @@ def create_default_response(self, channel_id, user_id, ts, blocks): def get_latest_message(self, user_id, channel_id, blocks, s3_event_handler): latest_message = self.db_handler.get_latest_message(user_id, channel_id) - last_ts = latest_message.get("last_ts") + if latest_message is None: + return None + + last_ts = latest_message.get("last_ts") if last_ts: time_since_last = time.time() - float(last_ts) # Check if message is less than 10 minutes old (600 seconds) From 81adb5528e4ab00c34371327bc982cfba0951625 Mon Sep 17 00:00:00 2001 From: kieran-wilkinson-4 Date: Mon, 16 Mar 2026 16:15:13 +0000 Subject: [PATCH 76/84] fix: poetry conflict --- poetry.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/poetry.lock b/poetry.lock index 474ff2dba..2281e66f1 100644 --- a/poetry.lock +++ b/poetry.lock @@ -107,7 +107,7 @@ version = "3.25.0" description = "Powertools for AWS Lambda (Python) is a developer toolkit to implement Serverless best practices and increase developer velocity." optional = false python-versions = "<4.0.0,>=3.10" -groups = ["bedrockloggingconfigfunction", "notifys3uploadfunction", "preprocessingfunction", "slackbotfunction", "syncknowledgebasefunction"] +groups = ["bedrockloggingconfigfunction", "preprocessingfunction", "slackbotfunction", "syncknowledgebasefunction"] files = [ {file = "aws_lambda_powertools-3.25.0-py3-none-any.whl", hash = "sha256:295467bfbc546b7b6a26d298cedcd06b04eb2cf96eb32e138126a47d761b7de1"}, {file = "aws_lambda_powertools-3.25.0.tar.gz", hash = "sha256:5d9c4bdfad1de7976e4ccf26410725aba17c47f081c84311eb2da16a00f75efb"}, @@ -1616,7 +1616,7 @@ version = "1.1.0" description = "JSON Matching Expressions" optional = false python-versions = ">=3.9" -groups = ["bedrockloggingconfigfunction", "dev", "notifys3uploadfunction", "preprocessingfunction", "slackbotfunction", "syncknowledgebasefunction"] +groups = ["bedrockloggingconfigfunction", "dev", "preprocessingfunction", "slackbotfunction", "syncknowledgebasefunction"] files = [ {file = "jmespath-1.1.0-py3-none-any.whl", hash = "sha256:a5663118de4908c91729bea0acadca56526eb2698e83de10cd116ae0f4e97c64"}, {file = "jmespath-1.1.0.tar.gz", hash = "sha256:472c87d80f36026ae83c6ddd0f1d05d4e510134ed462851fd5f754c8c3cbb88d"}, @@ -3629,7 +3629,7 @@ version = "1.27.0" description = "The Bolt Framework for Python" optional = false python-versions = ">=3.7" -groups = ["notifys3uploadfunction", "slackbotfunction", "syncknowledgebasefunction"] +groups = ["slackbotfunction", "syncknowledgebasefunction"] files = [ {file = "slack_bolt-1.27.0-py2.py3-none-any.whl", hash = "sha256:c43c94bf34740f2adeb9b55566c83f1e73fed6ba2878bd346cdfd6fd8ad22360"}, {file = "slack_bolt-1.27.0.tar.gz", hash = "sha256:3db91d64e277e176a565c574ae82748aa8554f19e41a4fceadca4d65374ce1e0"}, @@ -3644,7 +3644,7 @@ version = "3.41.0" description = "The Slack API Platform SDK for Python" optional = false python-versions = ">=3.7" -groups = ["notifys3uploadfunction", "slackbotfunction", "syncknowledgebasefunction"] +groups = ["slackbotfunction", "syncknowledgebasefunction"] files = [ {file = "slack_sdk-3.41.0-py2.py3-none-any.whl", hash = "sha256:bb18dcdfff1413ec448e759cf807ec3324090993d8ab9111c74081623b692a89"}, {file = "slack_sdk-3.41.0.tar.gz", hash = "sha256:eb61eb12a65bebeca9cb5d36b3f799e836ed2be21b456d15df2627cfe34076ca"}, @@ -3804,7 +3804,7 @@ version = "4.15.0" description = "Backported and Experimental Type Hints for Python 3.9+" optional = false python-versions = ">=3.9" -groups = ["bedrockloggingconfigfunction", "dev", "notifys3uploadfunction", "preprocessingfunction", "slackbotfunction", "syncknowledgebasefunction"] +groups = ["bedrockloggingconfigfunction", "dev", "preprocessingfunction", "slackbotfunction", "syncknowledgebasefunction"] files = [ {file = "typing_extensions-4.15.0-py3-none-any.whl", hash = "sha256:f0fa19c6845758ab08074a0cfa8b7aecb71c999ca73d62883bc25cc018c4e548"}, {file = "typing_extensions-4.15.0.tar.gz", hash = "sha256:0cea48d173cc12fa28ecabc3b837ea3cf6f38c6d1136f85cbaaf598984861466"}, @@ -3844,7 +3844,7 @@ version = "2.6.3" description = "HTTP library with thread-safe connection pooling, file post, and more." optional = false python-versions = ">=3.9" -groups = ["bedrockloggingconfigfunction", "dev", "notifys3uploadfunction", "preprocessingfunction", "slackbotfunction", "syncknowledgebasefunction"] +groups = ["bedrockloggingconfigfunction", "dev", "preprocessingfunction", "slackbotfunction", "syncknowledgebasefunction"] files = [ {file = "urllib3-2.6.3-py3-none-any.whl", hash = "sha256:bf272323e553dfb2e87d9bfd225ca7b0f467b919d7bbd355436d3fd37cb0acd4"}, {file = "urllib3-2.6.3.tar.gz", hash = "sha256:1b62b6884944a57dbe321509ab94fd4d3b307075e0c2eae991ac71ee15ad38ed"}, @@ -3966,4 +3966,4 @@ requests = "*" [metadata] lock-version = "2.1" python-versions = "^3.14" -content-hash = "3d242179de54a4fa3eb8f9a49a4502b8308d3a20f7c5984b557781690b9d34e7" +content-hash = "4b7b738b366944bb7375d62623161219d5316cb963a177ac0a06375176ae6863" From 0100213dc3f2458870b91d289d363692fe743627 Mon Sep 17 00:00:00 2001 From: kieran-wilkinson-4 Date: Mon, 16 Mar 2026 16:39:00 +0000 Subject: [PATCH 77/84] fix: missing key for dynamo --- packages/syncKnowledgeBaseFunction/app/handler.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index 24dff136e..0703b0bee 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -45,6 +45,7 @@ def save_message(self, user_id, channel_id, ts): try: self.table.put_item( Item={ + "user_channel_composite": f"{user_id}#{channel_id}", "user_id": user_id, "channel_id": channel_id, "last_ts": str(ts), @@ -61,6 +62,7 @@ def update_message(self, user_id, channel_id, ts, created, modified, deleted): try: self.table.put_item( Item={ + "user_channel_composite": f"{user_id}#{channel_id}", "user_id": user_id, "channel_id": channel_id, "last_ts": str(ts), From 03aea06c49305fe976bf37a5a62f74ae97584304 Mon Sep 17 00:00:00 2001 From: kieran-wilkinson-4 Date: Mon, 16 Mar 2026 16:43:43 +0000 Subject: [PATCH 78/84] fix: missing key for dynamo --- packages/syncKnowledgeBaseFunction/tests/test_app.py | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/syncKnowledgeBaseFunction/tests/test_app.py b/packages/syncKnowledgeBaseFunction/tests/test_app.py index e5eb6f66c..efd0be298 100644 --- a/packages/syncKnowledgeBaseFunction/tests/test_app.py +++ b/packages/syncKnowledgeBaseFunction/tests/test_app.py @@ -1233,6 +1233,7 @@ def test_dynamodb_handler_save_last_message(mock_boto, mock_boto_resource, mock_ mock_table.put_item.assert_called_once_with( Item={ + "user_channel_composite": "U123#C456", "user_id": "U123", "channel_id": "C456", "last_ts": "1710581159.123456", From 2256926df08d4f9948b108c63251e9e8ccc079a5 Mon Sep 17 00:00:00 2001 From: kieran-wilkinson-4 Date: Mon, 16 Mar 2026 17:41:38 +0000 Subject: [PATCH 79/84] fix: Increase lambda timeout to account for higher file counts --- packages/cdk/constructs/LambdaFunction.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/cdk/constructs/LambdaFunction.ts b/packages/cdk/constructs/LambdaFunction.ts index 8e9966aeb..ad4d1c4bc 100644 --- a/packages/cdk/constructs/LambdaFunction.ts +++ b/packages/cdk/constructs/LambdaFunction.ts @@ -30,6 +30,7 @@ export interface LambdaFunctionProps { readonly logLevel: string readonly dependencyLocation?: string readonly reservedConcurrentExecutions?: number + readonly timeout_in_seconds?: Duration } // Lambda Insights layer for enhanced monitoring @@ -132,7 +133,7 @@ export class LambdaFunction extends Construct { const lambdaFunction = new LambdaFunctionResource(this, props.functionName, { runtime: Runtime.PYTHON_3_14, memorySize: 256, - timeout: Duration.seconds(50), + timeout: props.timeout_in_seconds ?? Duration.seconds(50), architecture: Architecture.X86_64, handler: props.handler, code: Code.fromAsset(props.packageBasePath, { From 25be30f59b2f0f58eefb5ff2e81b9bc01e7bca81 Mon Sep 17 00:00:00 2001 From: kieran-wilkinson-4 Date: Tue, 17 Mar 2026 09:19:29 +0000 Subject: [PATCH 80/84] fix: Do not close received events --- packages/syncKnowledgeBaseFunction/app/handler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index 0703b0bee..00059b40d 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -659,7 +659,7 @@ def search_and_process_sqs_events(event): break # If we have events (either from the initial seed or the search above), process them - if events and len(events) > 0: + if events and len(events) > 0 and i > 0: logger.info("Founds events, process") s3_event_handler.process_batched_queue_events(slack_handler, events) s3_event_handler.close_sqs_events(events) From 360ef3430759283397d504c564ff0a9a7afe0987 Mon Sep 17 00:00:00 2001 From: kieran-wilkinson-4 Date: Tue, 17 Mar 2026 09:34:11 +0000 Subject: [PATCH 81/84] fix: Do not close initial event --- packages/syncKnowledgeBaseFunction/app/handler.py | 5 +++-- packages/syncKnowledgeBaseFunction/tests/test_app.py | 6 +----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index 00059b40d..dfc1a2a68 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -659,10 +659,11 @@ def search_and_process_sqs_events(event): break # If we have events (either from the initial seed or the search above), process them - if events and len(events) > 0 and i > 0: + if events and len(events) > 0: logger.info("Founds events, process") s3_event_handler.process_batched_queue_events(slack_handler, events) - s3_event_handler.close_sqs_events(events) + if i > 0: # Only close if fetched, not received + s3_event_handler.close_sqs_events(events) # Clear the list so the NEXT loop iteration knows to search again logger.info("Search for any prompts left in the queue") diff --git a/packages/syncKnowledgeBaseFunction/tests/test_app.py b/packages/syncKnowledgeBaseFunction/tests/test_app.py index efd0be298..1001208d6 100644 --- a/packages/syncKnowledgeBaseFunction/tests/test_app.py +++ b/packages/syncKnowledgeBaseFunction/tests/test_app.py @@ -1210,13 +1210,9 @@ def test_search_and_process_sqs_events(mock_boto, mock_slack_init, mock_close, m search_and_process_sqs_events(initial_event) - # Iteration 0: Processes initial event, searches SQS (finds 1) - # Iteration 1: Closes initial event, processes new event, searches SQS (finds 0) - # Iteration 2: Loop breaks immediately. - assert mock_process.call_count == 2 - assert mock_close.call_count == 2 assert mock_search.call_count == 2 + assert mock_close.call_count == 1 # Don't close initial event @patch("boto3.resource") From 62ea295dabe2bb7000d5c6e11d098ccab4520a8d Mon Sep 17 00:00:00 2001 From: kieran-wilkinson-4 Date: Fri, 20 Mar 2026 11:38:36 +0000 Subject: [PATCH 82/84] fix: resolve comments --- .../syncKnowledgeBaseFunction/app/handler.py | 83 +++++++++---------- .../tests/test_app.py | 22 ++--- 2 files changed, 50 insertions(+), 55 deletions(-) diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index dfc1a2a68..ac2c8383d 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -27,11 +27,12 @@ from slack_sdk.web import SlackResponse from functools import cached_property from botocore.exceptions import ClientError -from boto3.dynamodb.conditions import Key bedrock_agent = boto3.client("bedrock-agent") sqs = boto3.client("sqs") +TaskStatus = Literal["in_progress", "complete"] + class DynamoDbHandler: @cached_property @@ -42,52 +43,36 @@ def table(self): return dynamodb.Table(KNOWLEDGE_SYNC_STATE_TABLE) def save_message(self, user_id, channel_id, ts): - try: - self.table.put_item( - Item={ - "user_channel_composite": f"{user_id}#{channel_id}", - "user_id": user_id, - "channel_id": channel_id, - "last_ts": str(ts), - "created": 0, - "modified": 0, - "deleted": 0, - } - ) - logger.info(f"Successfully saved ts {ts} for user {user_id} in {channel_id}") - except ClientError as e: - logger.error(f"Failed to save to DynamoDB: {e.response['Error']['Message']}") + """Saves a new message with default counters set to 0.""" + return self.update_message(user_id, channel_id, ts, 0, 0, 0) def update_message(self, user_id, channel_id, ts, created, modified, deleted): + """Updates an existing message or creates one with specific counters.""" + item = { + "user_channel_composite": f"{user_id}#{channel_id}", + "user_id": user_id, + "channel_id": channel_id, + "last_ts": str(ts), + "created": created, + "modified": modified, + "deleted": deleted, + } + try: - self.table.put_item( - Item={ - "user_channel_composite": f"{user_id}#{channel_id}", - "user_id": user_id, - "channel_id": channel_id, - "last_ts": str(ts), - "created": created, - "modified": modified, - "deleted": deleted, - } - ) - logger.info(f"Successfully updated message {ts} for user {user_id} in {channel_id}") + self.table.put_item(Item=item) + logger.info(f"Successfully processed ts {ts} for user {user_id} in {channel_id}") except ClientError as e: logger.error(f"Failed to save to DynamoDB: {e.response['Error']['Message']}") - def get_latest_message(self, user_id, channel_id): + def get_sync_state(self, user_id, channel_id): """ Retrieves the latest message timestamp for a user in a specific channel. Returns the timestamp as a string, or None if no record exists. """ try: - response = self.table.query( - KeyConditionExpression=Key("user_channel_composite").eq(f"{user_id}#{channel_id}"), - ScanIndexForward=False, - Limit=1, - ) + response = self.table.get_item(Key={"user_channel_composite": f"{user_id}#{channel_id}"}) - items = response.get("Items", []) + items = response.get("Items") if not items: logger.info(f"No previous record for {user_id} in {channel_id}") return None @@ -153,7 +138,7 @@ def create_task( plan=None, details=None, outputs=None, - status: Literal["in_progress", "complete"] = "in_progress", + status: TaskStatus = "in_progress", ): """Create a new Slack Block Task for a Plan block""" task = { @@ -188,13 +173,13 @@ def update_task( self, id: str, message: str, - status: Literal["in_progress", "completed"] = "in_progress", + status: TaskStatus = "in_progress", output_message: str | None = None, replace=False, ): # Add header if self.slack_client is None: - logger.warning("No Slack client found, skipper update all tasks") + logger.warning("No Slack client found, skipped update all tasks") return for slack_message in self.messages: @@ -311,7 +296,7 @@ def create_default_response(self, channel_id, user_id, ts, blocks): } def get_latest_message(self, user_id, channel_id, blocks, s3_event_handler): - latest_message = self.db_handler.get_latest_message(user_id, channel_id) + latest_message = self.db_handler.get_sync_state(user_id, channel_id) if latest_message is None: return None @@ -569,7 +554,10 @@ def process_multiple_sqs_events(self, slack_handler: SlackHandler, s3_records): if s3_records and len(s3_records): # Start the ingestion job S3EventHandler.start_ingestion_job() + else: + logger.info("skipping start_ingestion") + valid_records = [] for record in s3_records: if record.get("eventSource") != "aws:s3": logger.warning( @@ -577,9 +565,11 @@ def process_multiple_sqs_events(self, slack_handler: SlackHandler, s3_records): extra={"event_source": record.get("eventSource")}, ) continue + valid_records.append(record) # Process event details for the Slack Messages - self.process_multiple_s3_events(records=s3_records, slack_handler=slack_handler) + if valid_records: + self.process_multiple_s3_events(records=valid_records, slack_handler=slack_handler) def process_batched_queue_events(self, slack_handler: SlackHandler, events: list): """Handle collection of batched queue events""" @@ -608,8 +598,14 @@ def process_batched_queue_events(self, slack_handler: SlackHandler, events: list def close_sqs_events(events): logger.info(f"Closing {len(events)} sqs events") for event in events: + receipt_handle = event.get("receiptHandle") or event.get("ReceiptHandle") + + if not receipt_handle: + logger.warning("No receipt handle found in event, skipping deletion.") + continue + try: - sqs.delete_message(QueueUrl=SQS_URL, ReceiptHandle=event["ReceiptHandle"]) + sqs.delete_message(QueueUrl=SQS_URL, ReceiptHandle=receipt_handle) logger.info("Successfully deleted sqs message from queue") except Exception as e: logger.error("Failed to delete sqs message from queue", extra={"Exception": e}) @@ -627,11 +623,10 @@ def search_sqs_for_events(): logger.info(f"Found {len(messages)} messages in SQS", extra={"response": response, "messages": messages}) for message in messages: - body = message.get("Body", {}) + body = message.get("Body", "{}") message_events = json.loads(body) if message_events: - s3_event = message_events.get("Records", []) - events += s3_event + events.append({"body": message.get("Body", "{}"), "receiptHandle": message.get("ReceiptHandle")}) logger.info(f"Found {len(messages)} total event(s) in SQS messages") return events diff --git a/packages/syncKnowledgeBaseFunction/tests/test_app.py b/packages/syncKnowledgeBaseFunction/tests/test_app.py index 1001208d6..9aae2cfc6 100644 --- a/packages/syncKnowledgeBaseFunction/tests/test_app.py +++ b/packages/syncKnowledgeBaseFunction/tests/test_app.py @@ -149,7 +149,7 @@ def receive_multiple_s3_events(): @pytest.fixture def fetch_sqs_event(receive_s3_event): """Mock incoming SQS event structure as expected by the new logic""" - return {"Messages": [{"MessageId": str(uuid.uuid4()), "Body": json.dumps(receive_s3_event)}]} + return {"Messages": [{"MessageId": str(uuid.uuid4()), "Body": receive_s3_event["Records"][0]["body"]}]} @pytest.fixture @@ -159,7 +159,7 @@ def fetch_multiple_sqs_event(receive_multiple_s3_events): "Messages": [ { "MessageId": str(uuid.uuid4()), - "Body": json.dumps(receive_multiple_s3_events), + "Body": receive_multiple_s3_events["Records"][0]["body"], } ] } @@ -530,7 +530,7 @@ def test_handler_slack_silent_success( ): """Test successful handler execution with actual Slack WebClient interaction""" # Mock timing - mock_time.side_effect = [999, 1000, 1001, 1002, 1003, 1004, 1005] + mock_time.side_effect = [1000, 1001, 1002, 1003, 1004, 1005] # Setup Boto3 Mock mock_bedrock = mock_boto_client.return_value @@ -575,7 +575,7 @@ def test_handler_slack_silent_success( # Assert Messages were posted and updated mock_slack_client.chat_postMessage.assert_not_called() - mock_slack_client.chat_update.asset_not_called() + mock_slack_client.chat_update.assert_not_called() @patch("app.handler.KNOWLEDGEBASE_ID", "") @@ -1093,12 +1093,12 @@ def mock_post_message_side_effect(**kwargs): # Assert Boto3 was triggered correctly mock_bedrock.start_ingestion_job.assert_has_calls( [ + call(knowledgeBaseId="test-kb-id", dataSourceId="test-ds-id", description="1000"), call(knowledgeBaseId="test-kb-id", dataSourceId="test-ds-id", description="1001"), call(knowledgeBaseId="test-kb-id", dataSourceId="test-ds-id", description="1002"), call(knowledgeBaseId="test-kb-id", dataSourceId="test-ds-id", description="1003"), call(knowledgeBaseId="test-kb-id", dataSourceId="test-ds-id", description="1004"), call(knowledgeBaseId="test-kb-id", dataSourceId="test-ds-id", description="1005"), - call(knowledgeBaseId="test-kb-id", dataSourceId="test-ds-id", description="1006"), ] ) @@ -1242,20 +1242,20 @@ def test_dynamodb_handler_save_last_message(mock_boto, mock_boto_resource, mock_ @patch("boto3.resource") @patch("boto3.client") -def test_dynamodb_handler_get_latest_message_exists(mock_boto, mock_boto_resource, mock_env): +def test_dynamodb_handler_get_sync_state_exists(mock_boto, mock_boto_resource, mock_env): """Test retrieving a timestamp when a record already exists in the database""" from app.handler import DynamoDbHandler mock_table = MagicMock() # Simulate DynamoDB returning a found record - mock_table.query.return_value = {"Items": [{"last_ts": "999.999"}]} + mock_table.get_item.return_value = {"Items": [{"last_ts": "999.999"}]} mock_boto_resource.return_value.Table.return_value = mock_table db_handler = DynamoDbHandler() - result = db_handler.get_latest_message("U123", "C456") + result = db_handler.get_sync_state("U123", "C456") assert result.get("last_ts") == "999.999" - mock_table.query.assert_called_once() + mock_table.get_item.assert_called_once() @patch("slack_sdk.WebClient") @@ -1302,7 +1302,7 @@ def test_handler_slack_skip_recent_update( with patch("app.handler.DynamoDbHandler") as mock_db_class: mock_db_instance = mock_db_class.return_value - mock_db_instance.get_latest_message.return_value = {"last_ts": 1000} + mock_db_instance.get_sync_state.return_value = {"last_ts": 1000} # Run the handler result = handler(receive_s3_event, lambda_context) @@ -1370,7 +1370,7 @@ def test_handler_slack_use_recent_update( with patch("app.handler.DynamoDbHandler") as mock_db_class: mock_db_instance = mock_db_class.return_value - mock_db_instance.get_latest_message.return_value = {"last_ts": 1} + mock_db_instance.get_sync_state.return_value = {"last_ts": 1} # Run the handler result = handler(receive_s3_event, lambda_context) From 6501843b8f17d0e9085dd49d9ecd06a00ee10202 Mon Sep 17 00:00:00 2001 From: kieran-wilkinson-4 Date: Fri, 20 Mar 2026 11:41:19 +0000 Subject: [PATCH 83/84] fix: resolve comments --- packages/syncKnowledgeBaseFunction/app/handler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index ac2c8383d..7caf08c0b 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -655,7 +655,7 @@ def search_and_process_sqs_events(event): # If we have events (either from the initial seed or the search above), process them if events and len(events) > 0: - logger.info("Founds events, process") + logger.info("Found events, process") s3_event_handler.process_batched_queue_events(slack_handler, events) if i > 0: # Only close if fetched, not received s3_event_handler.close_sqs_events(events) From 7f870992c09e66af0cbf8b230b3f48a2b01d2fc7 Mon Sep 17 00:00:00 2001 From: kieran-wilkinson-4 Date: Fri, 20 Mar 2026 15:11:01 +0000 Subject: [PATCH 84/84] fix: use query for dynamo --- packages/syncKnowledgeBaseFunction/app/handler.py | 9 +++++++-- packages/syncKnowledgeBaseFunction/tests/test_app.py | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/packages/syncKnowledgeBaseFunction/app/handler.py b/packages/syncKnowledgeBaseFunction/app/handler.py index 7caf08c0b..a9bee7138 100644 --- a/packages/syncKnowledgeBaseFunction/app/handler.py +++ b/packages/syncKnowledgeBaseFunction/app/handler.py @@ -27,6 +27,7 @@ from slack_sdk.web import SlackResponse from functools import cached_property from botocore.exceptions import ClientError +from boto3.dynamodb.conditions import Key bedrock_agent = boto3.client("bedrock-agent") sqs = boto3.client("sqs") @@ -70,9 +71,13 @@ def get_sync_state(self, user_id, channel_id): Returns the timestamp as a string, or None if no record exists. """ try: - response = self.table.get_item(Key={"user_channel_composite": f"{user_id}#{channel_id}"}) + response = self.table.query( + KeyConditionExpression=Key("user_channel_composite").eq(f"{user_id}#{channel_id}"), + ScanIndexForward=False, + Limit=1, + ) - items = response.get("Items") + items = response.get("Items", []) if not items: logger.info(f"No previous record for {user_id} in {channel_id}") return None diff --git a/packages/syncKnowledgeBaseFunction/tests/test_app.py b/packages/syncKnowledgeBaseFunction/tests/test_app.py index 9aae2cfc6..a8063a70f 100644 --- a/packages/syncKnowledgeBaseFunction/tests/test_app.py +++ b/packages/syncKnowledgeBaseFunction/tests/test_app.py @@ -36,7 +36,7 @@ def mock_dynamo_resource(): mock_table = MagicMock() # Returning an empty dict simulates a missing record, meaning # "Item" won't be in the response, and the script proceeds normally. - mock_table.get_item.return_value = {} + mock_table.query.return_value = {} mock_resource.return_value.Table.return_value = mock_table yield mock_resource @@ -1248,14 +1248,14 @@ def test_dynamodb_handler_get_sync_state_exists(mock_boto, mock_boto_resource, m mock_table = MagicMock() # Simulate DynamoDB returning a found record - mock_table.get_item.return_value = {"Items": [{"last_ts": "999.999"}]} + mock_table.query.return_value = {"Items": [{"last_ts": "999.999"}]} mock_boto_resource.return_value.Table.return_value = mock_table db_handler = DynamoDbHandler() result = db_handler.get_sync_state("U123", "C456") assert result.get("last_ts") == "999.999" - mock_table.get_item.assert_called_once() + mock_table.query.assert_called_once() @patch("slack_sdk.WebClient")