apache-airflow-providers-amazon 8.6.0__py3-none-any.whl → 8.7.0__py3-none-any.whl

airflow/providers/amazon/aws/triggers/lambda_function.py

@@ -16,10 +16,14 @@
 # under the License.
 from __future__ import annotations
 
-from airflow.providers.amazon.aws.hooks.base_aws import AwsGenericHook
+from typing import TYPE_CHECKING
+
 from airflow.providers.amazon.aws.hooks.lambda_function import LambdaHook
 from airflow.providers.amazon.aws.triggers.base import AwsBaseWaiterTrigger
 
+if TYPE_CHECKING:
+    from airflow.providers.amazon.aws.hooks.base_aws import AwsGenericHook
+
 
 class LambdaCreateFunctionCompleteTrigger(AwsBaseWaiterTrigger):
     """

airflow/providers/amazon/aws/triggers/rds.py

@@ -17,16 +17,18 @@
 from __future__ import annotations
 
 import warnings
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 from airflow.exceptions import AirflowProviderDeprecationWarning
-from airflow.providers.amazon.aws.hooks.base_aws import AwsGenericHook
 from airflow.providers.amazon.aws.hooks.rds import RdsHook
 from airflow.providers.amazon.aws.triggers.base import AwsBaseWaiterTrigger
 from airflow.providers.amazon.aws.utils.rds import RdsDbType
 from airflow.providers.amazon.aws.utils.waiter_with_logging import async_wait
 from airflow.triggers.base import BaseTrigger, TriggerEvent
 
+if TYPE_CHECKING:
+    from airflow.providers.amazon.aws.hooks.base_aws import AwsGenericHook
+
 
 class RdsDbInstanceTrigger(BaseTrigger):
     """

airflow/providers/amazon/aws/triggers/redshift_cluster.py

@@ -17,12 +17,15 @@
 from __future__ import annotations
 
 import warnings
+from typing import TYPE_CHECKING
 
 from airflow.exceptions import AirflowProviderDeprecationWarning
-from airflow.providers.amazon.aws.hooks.base_aws import AwsGenericHook
 from airflow.providers.amazon.aws.hooks.redshift_cluster import RedshiftHook
 from airflow.providers.amazon.aws.triggers.base import AwsBaseWaiterTrigger
 
+if TYPE_CHECKING:
+    from airflow.providers.amazon.aws.hooks.base_aws import AwsGenericHook
+
 
 class RedshiftCreateClusterTrigger(AwsBaseWaiterTrigger):
     """

airflow/providers/amazon/aws/triggers/s3.py

@@ -17,13 +17,15 @@
 from __future__ import annotations
 
 import asyncio
-from datetime import datetime
 from functools import cached_property
-from typing import Any, AsyncIterator
+from typing import TYPE_CHECKING, Any, AsyncIterator
 
 from airflow.providers.amazon.aws.hooks.s3 import S3Hook
 from airflow.triggers.base import BaseTrigger, TriggerEvent
 
+if TYPE_CHECKING:
+    from datetime import datetime
+
 
 class S3KeyTrigger(BaseTrigger):
     """

airflow/providers/amazon/aws/triggers/sqs.py

@@ -17,14 +17,18 @@
 from __future__ import annotations
 
 import asyncio
-from typing import Any, AsyncIterator, Collection, Literal
+from typing import TYPE_CHECKING, Any, AsyncIterator, Collection
+
+from typing_extensions import 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
 
+if TYPE_CHECKING:
+    from airflow.providers.amazon.aws.hooks.base_aws import BaseAwsConnection
+
 
 class SqsSensorTrigger(BaseTrigger):
     """

airflow/providers/amazon/aws/triggers/step_function.py

@@ -16,10 +16,14 @@
 # under the License.
 from __future__ import annotations
 
-from airflow.providers.amazon.aws.hooks.base_aws import AwsGenericHook
+from typing import TYPE_CHECKING
+
 from airflow.providers.amazon.aws.hooks.step_function import StepFunctionHook
 from airflow.providers.amazon.aws.triggers.base import AwsBaseWaiterTrigger
 
+if TYPE_CHECKING:
+    from airflow.providers.amazon.aws.hooks.base_aws import AwsGenericHook
+
 
 class StepFunctionsExecutionCompleteTrigger(AwsBaseWaiterTrigger):
     """

airflow/providers/amazon/aws/utils/__init__.py

@@ -66,8 +66,10 @@ def datetime_to_epoch_us(date_time: datetime) -> int:
 
 
 def get_airflow_version() -> tuple[int, ...]:
-    val = re.sub(r"(\d+\.\d+\.\d+).*", lambda x: x.group(1), version)
-    return tuple(int(x) for x in val.split("."))
+    match = re.match(r"(\d+)\.(\d+)\.(\d+)", version)
+    if match is None:  # Not theoratically possible.
+        raise RuntimeError(f"Broken Airflow version: {version}")
+    return tuple(int(x) for x in match.groups())
 
 
 class _StringCompareEnum(Enum):

airflow/providers/amazon/aws/utils/redshift.py

@@ -17,8 +17,10 @@
 from __future__ import annotations
 
 import logging
+from typing import TYPE_CHECKING
 
-from botocore.credentials import ReadOnlyCredentials
+if TYPE_CHECKING:
+    from botocore.credentials import ReadOnlyCredentials
 
 log = logging.getLogger(__name__)
 

airflow/providers/amazon/aws/utils/sqs.py

@@ -18,9 +18,10 @@ from __future__ import annotations
 
 import json
 import logging
-from typing import Any, Literal
+from typing import Any
 
 from jsonpath_ng import parse
+from typing_extensions import Literal
 
 log = logging.getLogger(__name__)
 
@@ -37,9 +38,7 @@ def process_response(
     :param response: The response from SQS
     :return: The processed response
     """
-    if not isinstance(response, dict):
-        return []
-    elif "Messages" not in response:
+    if not isinstance(response, dict) or "Messages" not in response:
         return []
 
     messages = response["Messages"]
@@ -78,13 +77,9 @@ def filter_messages_jsonpath(messages, message_filtering_match_values, message_f
         # Body is a string, deserialize to an object and then parse
         body = json.loads(body)
         results = jsonpath_expr.find(body)
-        if not results:
-            continue
-        if message_filtering_match_values is None:
+        if results and (
+            message_filtering_match_values is None
+            or any(result.value in message_filtering_match_values for result in results)
+        ):
             filtered_messages.append(message)
-            continue
-        for result in results:
-            if result.value in message_filtering_match_values:
-                filtered_messages.append(message)
-                break
     return filtered_messages

airflow/providers/amazon/aws/utils/suppress.py

@@ -0,0 +1,74 @@
+# 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.
+
+"""
+Module for suppress errors in Amazon Provider.
+
+.. warning::
+    Only for internal usage, this module might be changed or removed in the future
+    without any further notice.
+
+:meta: private
+"""
+
+from __future__ import annotations
+
+import logging
+from functools import wraps
+from typing import Callable, TypeVar
+
+from airflow.typing_compat import ParamSpec
+
+PS = ParamSpec("PS")
+RT = TypeVar("RT")
+
+log = logging.getLogger(__name__)
+
+
+def return_on_error(return_value: RT):
+    """
+    Helper decorator which suppress any ``Exception`` raised in decorator function.
+
+    Main use-case when functional is optional, however any error on functions/methods might
+    raise any error which are subclass of ``Exception``.
+
+    .. note::
+        Decorator doesn't intend to catch ``BaseException``,
+        e.g. ``GeneratorExit``, ``KeyboardInterrupt``, ``SystemExit`` and others.
+
+    .. warning::
+        Only for internal usage, this decorator might be changed or removed in the future
+        without any further notice.
+
+    :param return_value: Return value if decorated function/method raise any ``Exception``.
+    :meta: private
+    """
+
+    def decorator(func: Callable[PS, RT]) -> Callable[PS, RT]:
+        @wraps(func)
+        def wrapper(*args, **kwargs) -> RT:
+            try:
+                return func(*args, **kwargs)
+            except Exception:
+                log.debug(
+                    "Encountered error during execution function/method %r", func.__name__, exc_info=True
+                )
+                return return_value
+
+        return wrapper
+
+    return decorator

airflow/providers/amazon/aws/utils/task_log_fetcher.py

@@ -19,14 +19,16 @@ from __future__ import annotations
 
 import time
 from datetime import datetime, timedelta
-from logging import Logger
 from threading import Event, Thread
-from typing import Generator
+from typing import TYPE_CHECKING, Generator
 
 from botocore.exceptions import ClientError, ConnectionClosedError
 
 from airflow.providers.amazon.aws.hooks.logs import AwsLogsHook
 
+if TYPE_CHECKING:
+    from logging import Logger
+
 
 class AwsTaskLogFetcher(Thread):
     """Fetch Cloudwatch log events with specific interval and send the log events to the logger.info."""

airflow/providers/amazon/aws/utils/waiter_with_logging.py

@@ -20,14 +20,16 @@ from __future__ import annotations
 import asyncio
 import logging
 import time
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 import jmespath
 from botocore.exceptions import WaiterError
-from botocore.waiter import Waiter
 
 from airflow.exceptions import AirflowException
 
+if TYPE_CHECKING:
+    from botocore.waiter import Waiter
+
 
 def wait(
     waiter: Waiter,

airflow/providers/amazon/aws/waiters/base_waiter.py

@@ -17,9 +17,13 @@
 
 from __future__ import annotations
 
-import boto3
+from typing import TYPE_CHECKING
+
 from botocore.waiter import Waiter, WaiterModel, create_waiter_with_client
 
+if TYPE_CHECKING:
+    import boto3
+
 
 class BaseBotoWaiter:
     """

airflow/providers/amazon/get_provider_info.py

@@ -29,6 +29,7 @@ def get_provider_info():
         "description": "Amazon integration (including `Amazon Web Services (AWS) <https://aws.amazon.com/>`__).\n",
         "suspended": False,
         "versions": [
+            "8.7.0",
             "8.6.0",
             "8.5.1",
             "8.5.0",
@@ -75,10 +76,6 @@ def get_provider_info():
             "apache-airflow-providers-common-sql>=1.3.1",
             "apache-airflow-providers-http",
             "boto3>=1.28.0",
-            "mypy-boto3-rds>=1.28.0",
-            "mypy-boto3-redshift-data>=1.28.0",
-            "mypy-boto3-s3>=1.28.0",
-            "mypy-boto3-appflow>=1.28.0",
             "botocore>=1.31.0",
             "asgiref",
             "watchtower~=2.0.1",
@@ -873,7 +870,11 @@ def get_provider_info():
                 "connection-type": "redshift",
             },
         ],
-        "notifications": ["airflow.providers.amazon.aws.notifications.chime.ChimeNotifier"],
+        "notifications": [
+            "airflow.providers.amazon.aws.notifications.chime.ChimeNotifier",
+            "airflow.providers.amazon.aws.notifications.sns.SnsNotifier",
+            "airflow.providers.amazon.aws.notifications.sqs.SqsNotifier",
+        ],
         "secrets-backends": [
             "airflow.providers.amazon.aws.secrets.secrets_manager.SecretsManagerBackend",
             "airflow.providers.amazon.aws.secrets.systems_manager.SystemsManagerParameterStoreBackend",
@@ -887,4 +888,18 @@ def get_provider_info():
             {"name": "aiobotocore", "dependencies": ["aiobotocore[boto3]>=2.5.3"]},
             {"name": "cncf.kubernetes", "dependencies": ["apache-airflow-providers-cncf-kubernetes>=7.2.0"]},
         ],
+        "config": {
+            "aws": {
+                "description": "This section contains settings for Amazon Web Services (AWS) integration.",
+                "options": {
+                    "session_factory": {
+                        "description": "Full import path to the class which implements a custom session factory for\n``boto3.session.Session``. For more details please have a look at\n:ref:`howto/connection:aws:session-factory`.\n",
+                        "default": None,
+                        "example": "my_company.aws.MyCustomSessionFactory",
+                        "type": "string",
+                        "version_added": "3.1.1",
+                    }
+                },
+            }
+        },
     }

{apache_airflow_providers_amazon-8.6.0.dist-info → apache_airflow_providers_amazon-8.7.0.dist-info}/METADATA

@@ -1,14 +1,14 @@
 Metadata-Version: 2.1
 Name: apache-airflow-providers-amazon
-Version: 8.6.0
+Version: 8.7.0
 Summary: Provider for Apache Airflow. Implements apache-airflow-providers-amazon package
 Home-page: https://airflow.apache.org/
 Download-URL: https://archive.apache.org/dist/airflow/providers
 Author: Apache Software Foundation
 Author-email: dev@airflow.apache.org
 License: Apache License 2.0
-Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-amazon/8.6.0/
-Project-URL: Changelog, https://airflow.apache.org/docs/apache-airflow-providers-amazon/8.6.0/changelog.html
+Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-amazon/8.7.0/
+Project-URL: Changelog, https://airflow.apache.org/docs/apache-airflow-providers-amazon/8.7.0/changelog.html
 Project-URL: Bug Tracker, https://github.com/apache/airflow/issues
 Project-URL: Source Code, https://github.com/apache/airflow
 Project-URL: Slack Chat, https://s.apache.org/airflow-slack
@@ -38,10 +38,6 @@ Requires-Dist: asgiref
 Requires-Dist: boto3 >=1.28.0
 Requires-Dist: botocore >=1.31.0
 Requires-Dist: jsonpath-ng >=1.5.3
-Requires-Dist: mypy-boto3-appflow >=1.28.0
-Requires-Dist: mypy-boto3-rds >=1.28.0
-Requires-Dist: mypy-boto3-redshift-data >=1.28.0
-Requires-Dist: mypy-boto3-s3 >=1.28.0
 Requires-Dist: redshift-connector >=2.0.888
 Requires-Dist: sqlalchemy-redshift >=0.8.6
 Requires-Dist: watchtower ~=2.0.1
@@ -114,7 +110,7 @@ Requires-Dist: apache-airflow-providers-ssh ; extra == 'ssh'
 
 Package ``apache-airflow-providers-amazon``
 
-Release: ``8.6.0``
+Release: ``8.7.0``
 
 
 Amazon integration (including `Amazon Web Services (AWS) <https://aws.amazon.com/>`__).
@@ -127,7 +123,7 @@ This is a provider package for ``amazon`` provider. All classes for this provide
 are in ``airflow.providers.amazon`` python package.
 
 You can find package information and changelog for the provider
-in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-amazon/8.6.0/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-amazon/8.7.0/>`_.
 
 
 Installation
@@ -149,10 +145,6 @@ PIP package                              Version required
 ``apache-airflow-providers-common-sql``  ``>=1.3.1``
 ``apache-airflow-providers-http``
 ``boto3``                                ``>=1.28.0``
-``mypy-boto3-rds``                       ``>=1.28.0``
-``mypy-boto3-redshift-data``             ``>=1.28.0``
-``mypy-boto3-s3``                        ``>=1.28.0``
-``mypy-boto3-appflow``                   ``>=1.28.0``
 ``botocore``                             ``>=1.31.0``
 ``asgiref``
 ``watchtower``                           ``~=2.0.1``
@@ -194,4 +186,4 @@ Dependent package
 ======================================================================================================================  ===================
 
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-amazon/8.6.0/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-amazon/8.7.0/changelog.html>`_.