diff --git a/backend/postcode_splitter/main.py b/backend/postcode_splitter/main.py index 2714f330..7aaf1fbb 100644 --- a/backend/postcode_splitter/main.py +++ b/backend/postcode_splitter/main.py @@ -63,7 +63,9 @@ def parse_s3_uri(s3_uri: str) -> tuple[str, str]: raise ValueError(f"Could not parse S3 URI") from e -def upload_batch_to_s3(batch_df: pd.DataFrame, task_id: str, sub_task_id: str, bucket_name: str = None) -> str: +def upload_batch_to_s3( + batch_df: pd.DataFrame, task_id: str, sub_task_id: str, bucket_name: str = None +) -> str: """ Upload batch DataFrame to S3 as CSV. @@ -87,7 +89,9 @@ def upload_batch_to_s3(batch_df: pd.DataFrame, task_id: str, sub_task_id: str, b try: file_name = f"{datetime.now().isoformat()}_{str(uuid4())[:8]}" - file_key = f"ara_postcode_splitter_batches/{task_id}/{sub_task_id}/{file_name}.csv" + file_key = ( + f"ara_postcode_splitter_batches/{task_id}/{sub_task_id}/{file_name}.csv" + ) success = save_csv_to_s3(batch_df, bucket_name, file_key) @@ -128,10 +132,11 @@ def send_to_address2uprn_queue(task_id: str, sub_task_id: str, s3_uri: str) -> s "s3_uri": s3_uri, } - response = sqs_client.send_message( - QueueUrl=queue_url, - MessageBody=json.dumps(message_body), - ) + # Don't run on sqs yet + # response = sqs_client.send_message( + # QueueUrl=queue_url, + # MessageBody=json.dumps(message_body), + # ) logger.info( f"Sent message to address2UPRN queue. " @@ -174,7 +179,7 @@ def create_batch_and_send_to_address2uprn( "sub_task_id": batch_sub_task_id, "batch_size": len(batch_rows), "s3_uri": s3_uri, - } + }, ) logger.info(f"Created batch subtask {created_batch_sub_task_id}") @@ -241,9 +246,7 @@ def handler(event, context): logger.info(f"Created subtask {subtask_id} for task {task_id}") # Mark subtask as in progress - subtask_interface.update_subtask_status( - subtask_id, "in progress" - ) + subtask_interface.update_subtask_status(subtask_id, "in progress") logger.info(f"Marked subtask {subtask_id} as in progress") # Read CSV from S3