Lee-W commented on code in PR #32809: URL: https://github.com/apache/airflow/pull/32809#discussion_r1283832106
########## airflow/providers/amazon/aws/triggers/sqs.py: ########## @@ -0,0 +1,170 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +from __future__ import annotations + +import asyncio +from typing import Any, AsyncIterator, Collection, Literal + +from airflow.exceptions import AirflowException +from airflow.providers.amazon.aws.hooks.base_aws import BaseAwsConnection +from airflow.providers.amazon.aws.hooks.sqs import SqsHook +from airflow.providers.amazon.aws.utils.sqs import process_response +from airflow.triggers.base import BaseTrigger, TriggerEvent + + +class SqsSensorTrigger(BaseTrigger): + """ + Asynchronously get messages from an Amazon SQS queue and then delete the messages from the queue. + + :param aws_conn_id: AWS connection id + :param sqs_queue: The SQS queue url + :param max_messages: The maximum number of messages to retrieve for each poke (templated) + :param num_batches: The number of times the sensor will call the SQS API to receive messages (default: 1) + :param wait_time_seconds: The time in seconds to wait for receiving messages (default: 1 second) + :param visibility_timeout: Visibility timeout, a period of time during which + Amazon SQS prevents other consumers from receiving and processing the message. + :param message_filtering: Specified how received messages should be filtered. Supported options are: + `None` (no filtering, default), `'literal'` (message Body literal match) or `'jsonpath'` + (message Body filtered using a JSONPath expression). + You may add further methods by overriding the relevant class methods. + :param message_filtering_match_values: Optional value/s for the message filter to match on. + For example, with literal matching, if a message body matches any of the specified values + then it is included. For JSONPath matching, the result of the JSONPath expression is used + and may match any of the specified values. + :param message_filtering_config: Additional configuration to pass to the message filter. + For example with JSONPath filtering you can pass a JSONPath expression string here, + such as `'foo[*].baz'`. Messages with a Body which does not match are ignored. + :param delete_message_on_reception: Default to `True`, the messages are deleted from the queue + as soon as being consumed. Otherwise, the messages remain in the queue after consumption and + should be deleted manually. + :param waiter_delay: The time in seconds to wait between calls to the SQS API to receive messages. + """ + + def __init__( + self, + sqs_queue: str, + aws_conn_id: str = "aws_default", + max_messages: int = 5, + num_batches: int = 1, + wait_time_seconds: int = 1, + visibility_timeout: int | None = None, + message_filtering: Literal["literal", "jsonpath"] | None = None, + message_filtering_match_values: Any = None, + message_filtering_config: Any = None, + delete_message_on_reception: bool = True, + waiter_delay: int = 60, + ): + self.sqs_queue = sqs_queue + self.aws_conn_id = aws_conn_id + self.max_messages = max_messages + self.num_batches = num_batches + self.wait_time_seconds = wait_time_seconds + self.visibility_timeout = visibility_timeout + self.message_filtering = message_filtering + self.delete_message_on_reception = delete_message_on_reception + self.message_filtering_match_values = message_filtering_match_values + self.message_filtering_config = message_filtering_config + self.waiter_delay = waiter_delay + + def serialize(self) -> tuple[str, dict[str, Any]]: + return ( + self.__class__.__module__ + "." + self.__class__.__qualname__, + { + "sqs_queue": self.sqs_queue, + "aws_conn_id": self.aws_conn_id, + "max_messages": self.max_messages, + "num_batches": self.num_batches, + "wait_time_seconds": self.wait_time_seconds, + "visibility_timeout": self.visibility_timeout, + "message_filtering": self.message_filtering, + "delete_message_on_reception": self.delete_message_on_reception, + "message_filtering_match_values": self.message_filtering_match_values, + "message_filtering_config": self.message_filtering_config, + "waiter_delay": self.waiter_delay, + }, + ) + + @property + def hook(self) -> SqsHook: + return SqsHook(aws_conn_id=self.aws_conn_id) + + async def poll_sqs(self, client: BaseAwsConnection) -> Collection: + """ + Asynchronously poll SQS queue to retrieve messages. + + :param client: SQS connection + :return: A list of messages retrieved from SQS + """ + self.log.info("SqsSensor checking for message on queue: %s", self.sqs_queue) + + receive_message_kwargs = { + "QueueUrl": self.sqs_queue, + "MaxNumberOfMessages": self.max_messages, + "WaitTimeSeconds": self.wait_time_seconds, + } + if self.visibility_timeout is not None: + receive_message_kwargs["VisibilityTimeout"] = self.visibility_timeout + + response = await client.receive_message(**receive_message_kwargs) + return response + + async def poke(self, client: Any): + message_batch: list[Any] = [] + + for _ in range(self.num_batches): + self.log.info("starting call to poll sqs") + response = await self.poll_sqs(client=client) + messages = process_response( + response, + self.message_filtering, + self.message_filtering_match_values, + self.message_filtering_config, + ) + + if not messages: + continue + + message_batch.extend(messages) + + if self.delete_message_on_reception: + self.log.info("Deleting %d messages", len(messages)) + + entries = [ + {"Id": message["MessageId"], "ReceiptHandle": message["ReceiptHandle"]} + for message in messages + ] + response = await client.delete_message_batch(QueueUrl=self.sqs_queue, Entries=entries) + + if "Successful" not in response: + raise AirflowException( + "Delete SQS Messages failed " + str(response) + " for messages " + str(messages) + ) + if not message_batch: + return None Review Comment: Sounds great. 🙌 ########## airflow/providers/amazon/aws/triggers/sqs.py: ########## @@ -0,0 +1,170 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +from __future__ import annotations + +import asyncio +from typing import Any, AsyncIterator, Collection, Literal + +from airflow.exceptions import AirflowException +from airflow.providers.amazon.aws.hooks.base_aws import BaseAwsConnection +from airflow.providers.amazon.aws.hooks.sqs import SqsHook +from airflow.providers.amazon.aws.utils.sqs import process_response +from airflow.triggers.base import BaseTrigger, TriggerEvent + + +class SqsSensorTrigger(BaseTrigger): + """ + Asynchronously get messages from an Amazon SQS queue and then delete the messages from the queue. + + :param aws_conn_id: AWS connection id + :param sqs_queue: The SQS queue url + :param max_messages: The maximum number of messages to retrieve for each poke (templated) + :param num_batches: The number of times the sensor will call the SQS API to receive messages (default: 1) + :param wait_time_seconds: The time in seconds to wait for receiving messages (default: 1 second) + :param visibility_timeout: Visibility timeout, a period of time during which + Amazon SQS prevents other consumers from receiving and processing the message. + :param message_filtering: Specified how received messages should be filtered. Supported options are: + `None` (no filtering, default), `'literal'` (message Body literal match) or `'jsonpath'` + (message Body filtered using a JSONPath expression). + You may add further methods by overriding the relevant class methods. + :param message_filtering_match_values: Optional value/s for the message filter to match on. + For example, with literal matching, if a message body matches any of the specified values + then it is included. For JSONPath matching, the result of the JSONPath expression is used + and may match any of the specified values. + :param message_filtering_config: Additional configuration to pass to the message filter. + For example with JSONPath filtering you can pass a JSONPath expression string here, + such as `'foo[*].baz'`. Messages with a Body which does not match are ignored. + :param delete_message_on_reception: Default to `True`, the messages are deleted from the queue + as soon as being consumed. Otherwise, the messages remain in the queue after consumption and + should be deleted manually. + :param waiter_delay: The time in seconds to wait between calls to the SQS API to receive messages. + """ + + def __init__( + self, + sqs_queue: str, + aws_conn_id: str = "aws_default", + max_messages: int = 5, + num_batches: int = 1, + wait_time_seconds: int = 1, + visibility_timeout: int | None = None, + message_filtering: Literal["literal", "jsonpath"] | None = None, + message_filtering_match_values: Any = None, + message_filtering_config: Any = None, + delete_message_on_reception: bool = True, + waiter_delay: int = 60, + ): + self.sqs_queue = sqs_queue + self.aws_conn_id = aws_conn_id + self.max_messages = max_messages + self.num_batches = num_batches + self.wait_time_seconds = wait_time_seconds + self.visibility_timeout = visibility_timeout + self.message_filtering = message_filtering + self.delete_message_on_reception = delete_message_on_reception + self.message_filtering_match_values = message_filtering_match_values + self.message_filtering_config = message_filtering_config + self.waiter_delay = waiter_delay + + def serialize(self) -> tuple[str, dict[str, Any]]: + return ( + self.__class__.__module__ + "." + self.__class__.__qualname__, + { + "sqs_queue": self.sqs_queue, + "aws_conn_id": self.aws_conn_id, + "max_messages": self.max_messages, + "num_batches": self.num_batches, + "wait_time_seconds": self.wait_time_seconds, + "visibility_timeout": self.visibility_timeout, + "message_filtering": self.message_filtering, + "delete_message_on_reception": self.delete_message_on_reception, + "message_filtering_match_values": self.message_filtering_match_values, + "message_filtering_config": self.message_filtering_config, + "waiter_delay": self.waiter_delay, + }, + ) + + @property + def hook(self) -> SqsHook: + return SqsHook(aws_conn_id=self.aws_conn_id) + + async def poll_sqs(self, client: BaseAwsConnection) -> Collection: + """ + Asynchronously poll SQS queue to retrieve messages. + + :param client: SQS connection + :return: A list of messages retrieved from SQS + """ + self.log.info("SqsSensor checking for message on queue: %s", self.sqs_queue) + + receive_message_kwargs = { + "QueueUrl": self.sqs_queue, + "MaxNumberOfMessages": self.max_messages, + "WaitTimeSeconds": self.wait_time_seconds, + } + if self.visibility_timeout is not None: + receive_message_kwargs["VisibilityTimeout"] = self.visibility_timeout + + response = await client.receive_message(**receive_message_kwargs) + return response + + async def poke(self, client: Any): + message_batch: list[Any] = [] + + for _ in range(self.num_batches): + self.log.info("starting call to poll sqs") + response = await self.poll_sqs(client=client) + messages = process_response( + response, + self.message_filtering, + self.message_filtering_match_values, + self.message_filtering_config, + ) + + if not messages: + continue + + message_batch.extend(messages) + + if self.delete_message_on_reception: + self.log.info("Deleting %d messages", len(messages)) + + entries = [ + {"Id": message["MessageId"], "ReceiptHandle": message["ReceiptHandle"]} + for message in messages + ] + response = await client.delete_message_batch(QueueUrl=self.sqs_queue, Entries=entries) + + if "Successful" not in response: + raise AirflowException( + "Delete SQS Messages failed " + str(response) + " for messages " + str(messages) + ) + if not message_batch: + return None Review Comment: Sounds great. 🙌 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@airflow.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
