apache-airflow-providers-standard 1.5.0rc1__tar.gz → 1.6.0rc1__tar.gz

{apache_airflow_providers_standard-1.5.0rc1 → apache_airflow_providers_standard-1.6.0rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apache-airflow-providers-standard
-Version: 1.5.0rc1
+Version: 1.6.0rc1
 Summary: Provider package apache-airflow-providers-standard for Apache Airflow
 Keywords: airflow-provider,standard,airflow,integration
 Author-email: Apache Software Foundation <dev@airflow.apache.org>
@@ -22,8 +22,8 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: System :: Monitoring
 Requires-Dist: apache-airflow>=2.10.0rc1
 Project-URL: Bug Tracker, https://github.com/apache/airflow/issues
-Project-URL: Changelog, https://airflow.staged.apache.org/docs/apache-airflow-providers-standard/1.5.0/changelog.html
-Project-URL: Documentation, https://airflow.staged.apache.org/docs/apache-airflow-providers-standard/1.5.0
+Project-URL: Changelog, https://airflow.staged.apache.org/docs/apache-airflow-providers-standard/1.6.0/changelog.html
+Project-URL: Documentation, https://airflow.staged.apache.org/docs/apache-airflow-providers-standard/1.6.0
 Project-URL: Mastodon, https://fosstodon.org/@airflow
 Project-URL: Slack Chat, https://s.apache.org/airflow-slack
 Project-URL: Source Code, https://github.com/apache/airflow
@@ -54,7 +54,7 @@ Project-URL: YouTube, https://www.youtube.com/channel/UCSXwxpWZQ7XZ1WL3wqevChA/
 
 Package ``apache-airflow-providers-standard``
 
-Release: ``1.5.0``
+Release: ``1.6.0``
 
 Release Date: ``|PypiReleaseDate|``
 
@@ -68,7 +68,7 @@ This is a provider package for ``standard`` provider. All classes for this provi
 are in ``airflow.providers.standard`` python package.
 
 You can find package information and changelog for the provider
-in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-standard/1.5.0/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-standard/1.6.0/>`_.
 
 Installation
 ------------
@@ -89,5 +89,5 @@ PIP package         Version required
 ==================  ==================
 
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-standard/1.5.0/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-standard/1.6.0/changelog.html>`_.
 

{apache_airflow_providers_standard-1.5.0rc1 → apache_airflow_providers_standard-1.6.0rc1}/README.rst

@@ -23,7 +23,7 @@
 
 Package ``apache-airflow-providers-standard``
 
-Release: ``1.5.0``
+Release: ``1.6.0``
 
 Release Date: ``|PypiReleaseDate|``
 
@@ -37,7 +37,7 @@ This is a provider package for ``standard`` provider. All classes for this provi
 are in ``airflow.providers.standard`` python package.
 
 You can find package information and changelog for the provider
-in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-standard/1.5.0/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-standard/1.6.0/>`_.
 
 Installation
 ------------
@@ -58,4 +58,4 @@ PIP package         Version required
 ==================  ==================
 
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-standard/1.5.0/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-standard/1.6.0/changelog.html>`_.

{apache_airflow_providers_standard-1.5.0rc1 → apache_airflow_providers_standard-1.6.0rc1}/docs/changelog.rst

@@ -35,6 +35,40 @@
 Changelog
 ---------
 
+1.6.0
+.....
+
+Features
+~~~~~~~~
+
+* ``feat(htil): add 'notifiers' to HITLOperator (#54128)``
+* ``feat(hitl): add HITLBranchOperator (#53960)``
+* ``feat(HITL): improve hitl trigger logging message (#53850)``
+* ``feat(hitl): add "timedout" column to HITLTriggerEventSuccessPayload (#53852)``
+
+Bug Fixes
+~~~~~~~~~
+
+* ``Restore 'execute_complete' functionality 'TimeSensor' when 'deferrable=True' (#53669)``
+* ``Fix several deprecation warnings related to airflow.sdk (#53791)``
+
+Misc
+~~~~
+
+* ``refactor(hitl): replace timezone usage with airflow.sdk.timezone (#53962)``
+* ``refactor(HITL): make default options class variables to avoid typo (#53849)``
+
+Doc-only
+~~~~~~~~
+
+* ``Fix BranchPythonOperator doc (#54205)``
+
+.. Below changes are excluded from the changelog. Move them to
+   appropriate section above if needed. Do not delete the lines(!):
+   * ``Documentation for Human-in-the-loop operator (#53694)``
+   * ``Correct HITL version warnings to avoid confusion (#53876)``
+   * ``Move functions in 'airflow.utils.decorator' to more appropriate places (#53420)``
+
 1.5.0
 .....
 

{apache_airflow_providers_standard-1.5.0rc1 → apache_airflow_providers_standard-1.6.0rc1}/docs/index.rst

@@ -66,7 +66,7 @@ apache-airflow-providers-standard package
 Airflow Standard Provider
 
 
-Release: 1.5.0
+Release: 1.6.0
 
 Release Date: ``|PypiReleaseDate|``
 

{apache_airflow_providers_standard-1.5.0rc1 → apache_airflow_providers_standard-1.6.0rc1}/docs/operators/python.rst

@@ -298,16 +298,16 @@ Templating
 Jinja templating can be used in same way as described for the :ref:`howto/operator:PythonOperator`.
 
 
-.. _howto/operator:PythonBranchOperator:
+.. _howto/operator:BranchPythonOperator:
 
-PythonBranchOperator
+BranchPythonOperator
 ====================
 
-Use the :class:`~airflow.providers.standard.operators.python.PythonBranchOperator` to execute Python :ref:`branching <concepts:branching>`
+Use the :class:`~airflow.providers.standard.operators.python.BranchPythonOperator` to execute Python :ref:`branching <concepts:branching>`
 tasks.
 
 .. tip::
-    The ``@task.branch`` decorator is recommended over the classic ``PythonBranchOperator``
+    The ``@task.branch`` decorator is recommended over the classic ``BranchPythonOperator``
     to execute Python code.
 
 .. tab-set::
@@ -321,7 +321,7 @@ tasks.
             :start-after: [START howto_operator_branch_python]
             :end-before: [END howto_operator_branch_python]
 
-    .. tab-item:: PythonBranchOperator
+    .. tab-item:: BranchPythonOperator
         :sync: operator
 
         .. exampleinclude:: /../src/airflow/providers/standard/example_dags/example_branch_operator.py
@@ -341,7 +341,7 @@ BranchPythonVirtualenvOperator
 ==============================
 
 Use the :class:`~airflow.providers.standard.operators.python.BranchPythonVirtualenvOperator` decorator to execute Python :ref:`branching <concepts:branching>`
-tasks and is a hybrid of the :class:`~airflow.providers.standard.operators.python.PythonBranchOperator` with execution in a virtual environment.
+tasks and is a hybrid of the :class:`~airflow.providers.standard.operators.python.BranchPythonOperator` with execution in a virtual environment.
 
 .. tip::
     The ``@task.branch_virtualenv`` decorator is recommended over the classic
@@ -378,7 +378,7 @@ BranchExternalPythonOperator
 ============================
 
 Use the :class:`~airflow.providers.standard.operators.python.BranchExternalPythonOperator` to execute Python :ref:`branching <concepts:branching>`
-tasks and is a hybrid of the :class:`~airflow.providers.standard.operators.python.PythonBranchOperator` with execution in an
+tasks and is a hybrid of the :class:`~airflow.providers.standard.operators.python.BranchPythonOperator` with execution in an
 external Python environment.
 
 .. tip::

{apache_airflow_providers_standard-1.5.0rc1 → apache_airflow_providers_standard-1.6.0rc1}/provider.yaml

@@ -21,12 +21,13 @@ name: Standard
 description: |
     Airflow Standard Provider
 state: ready
-source-date-epoch: 1753692022
+source-date-epoch: 1754503555
 # Note that those versions are maintained by release manager - do not update them manually
 # with the exception of case where other provider in sources has >= new provider version.
 # In such case adding >= NEW_VERSION and bumping to NEW_VERSION in a provider have
 # to be done in the same PR
 versions:
+  - 1.6.0
   - 1.5.0
   - 1.4.1
   - 1.4.0

{apache_airflow_providers_standard-1.5.0rc1 → apache_airflow_providers_standard-1.6.0rc1}/pyproject.toml

@@ -25,7 +25,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "apache-airflow-providers-standard"
-version = "1.5.0rc1"
+version = "1.6.0rc1"
 description = "Provider package apache-airflow-providers-standard for Apache Airflow"
 readme = "README.rst"
 authors = [
@@ -95,8 +95,8 @@ apache-airflow-providers-common-sql = {workspace = true}
 apache-airflow-providers-standard = {workspace = true}
 
 [project.urls]
-"Documentation" = "https://airflow.staged.apache.org/docs/apache-airflow-providers-standard/1.5.0"
-"Changelog" = "https://airflow.staged.apache.org/docs/apache-airflow-providers-standard/1.5.0/changelog.html"
+"Documentation" = "https://airflow.staged.apache.org/docs/apache-airflow-providers-standard/1.6.0"
+"Changelog" = "https://airflow.staged.apache.org/docs/apache-airflow-providers-standard/1.6.0/changelog.html"
 "Bug Tracker" = "https://github.com/apache/airflow/issues"
 "Source Code" = "https://github.com/apache/airflow"
 "Slack Chat" = "https://s.apache.org/airflow-slack"

{apache_airflow_providers_standard-1.5.0rc1 → apache_airflow_providers_standard-1.6.0rc1}/src/airflow/providers/standard/__init__.py

@@ -29,7 +29,7 @@ from airflow import __version__ as airflow_version
 
 __all__ = ["__version__"]
 
-__version__ = "1.5.0"
+__version__ = "1.6.0"
 
 if packaging.version.parse(packaging.version.parse(airflow_version).base_version) < packaging.version.parse(
     "2.10.0"

{apache_airflow_providers_standard-1.5.0rc1 → apache_airflow_providers_standard-1.6.0rc1}/src/airflow/providers/standard/example_dags/example_external_task_parent_deferrable.py

@@ -20,7 +20,11 @@ from airflow import DAG
 from airflow.providers.standard.operators.empty import EmptyOperator
 from airflow.providers.standard.operators.trigger_dagrun import TriggerDagRunOperator
 from airflow.providers.standard.sensors.external_task import ExternalTaskSensor
-from airflow.utils.timezone import datetime
+
+try:
+    from airflow.sdk.timezone import datetime
+except ImportError:
+    from airflow.utils.timezone import datetime  # type: ignore[no-redef]
 
 with DAG(
     dag_id="example_external_task",

apache_airflow_providers_standard-1.6.0rc1/src/airflow/providers/standard/example_dags/example_hitl_operator.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 datetime
+from typing import TYPE_CHECKING
+
+import pendulum
+
+from airflow.providers.standard.operators.hitl import (
+    ApprovalOperator,
+    HITLBranchOperator,
+    HITLEntryOperator,
+    HITLOperator,
+)
+from airflow.sdk import DAG, Param, task
+from airflow.sdk.bases.notifier import BaseNotifier
+
+if TYPE_CHECKING:
+    from airflow.sdk.definitions.context import Context
+
+# [START hitl_tutorial]
+
+
+class LocalLogNotifier(BaseNotifier):
+    """Simple notifier to demonstrate HITL notification without setup any connection."""
+
+    template_fields = ("message",)
+
+    def __init__(self, message: str) -> None:
+        self.message = message
+
+    def notify(self, context: Context) -> None:
+        self.log.info(self.message)
+
+
+# [START htil_notifer]
+hitl_request_callback = LocalLogNotifier(
+    message="""
+[HITL]
+Subject: {{ task.subject }}
+Body: {{ task.body }}
+Options: {{ task.options }}
+Is Multiple Option: {{ task.multiple }}
+Default Options: {{ task.defaults }}
+Params: {{ task.params }}
+"""
+)
+hitl_success_callback = LocalLogNotifier(
+    message="{% set task_id = task.task_id -%}{{ ti.xcom_pull(task_ids=task_id) }}"
+)
+hitl_failure_callback = LocalLogNotifier(message="Request to response to '{{ task.subject }}' failed")
+# [END htil_notifer]
+
+with DAG(
+    dag_id="example_hitl_operator",
+    start_date=pendulum.datetime(2021, 1, 1, tz="UTC"),
+    catchup=False,
+    tags=["example", "HITL"],
+):
+    # [START howto_hitl_entry_operator]
+    wait_for_input = HITLEntryOperator(
+        task_id="wait_for_input",
+        subject="Please provide required information: ",
+        params={"information": Param("", type="string")},
+        notifiers=[hitl_request_callback],
+        on_success_callback=hitl_success_callback,
+        on_failure_callback=hitl_failure_callback,
+    )
+    # [END howto_hitl_entry_operator]
+
+    # [START howto_hitl_operator]
+    wait_for_option = HITLOperator(
+        task_id="wait_for_option",
+        subject="Please choose one option to proceed: ",
+        options=["option 1", "option 2", "option 3"],
+        notifiers=[hitl_request_callback],
+        on_success_callback=hitl_success_callback,
+        on_failure_callback=hitl_failure_callback,
+    )
+    # [END howto_hitl_operator]
+
+    # [START howto_hitl_operator_muliple]
+    wait_for_multiple_options = HITLOperator(
+        task_id="wait_for_multiple_options",
+        subject="Please choose option to proceed: ",
+        options=["option 4", "option 5", "option 6"],
+        multiple=True,
+        notifiers=[hitl_request_callback],
+        on_success_callback=hitl_success_callback,
+        on_failure_callback=hitl_failure_callback,
+    )
+    # [END howto_hitl_operator_muliple]
+
+    # [START howto_hitl_operator_timeout]
+    wait_for_default_option = HITLOperator(
+        task_id="wait_for_default_option",
+        subject="Please choose option to proceed: ",
+        options=["option 7", "option 8", "option 9"],
+        defaults=["option 7"],
+        execution_timeout=datetime.timedelta(seconds=1),
+        notifiers=[hitl_request_callback],
+        on_success_callback=hitl_success_callback,
+        on_failure_callback=hitl_failure_callback,
+    )
+    # [END howto_hitl_operator_timeout]
+
+    # [START howto_hitl_approval_operator]
+    valid_input_and_options = ApprovalOperator(
+        task_id="valid_input_and_options",
+        subject="Are the following input and options valid?",
+        body="""
+        Input: {{ ti.xcom_pull(task_ids='wait_for_input')["params_input"]["information"] }}
+        Option: {{ ti.xcom_pull(task_ids='wait_for_option')["chosen_options"] }}
+        Multiple Options: {{ ti.xcom_pull(task_ids='wait_for_option')["chosen_options"] }}
+        Timeout Option: {{ ti.xcom_pull(task_ids='wait_for_option')["chosen_options"] }}
+        """,
+        defaults="Reject",
+        execution_timeout=datetime.timedelta(minutes=1),
+        notifiers=[hitl_request_callback],
+        on_success_callback=hitl_success_callback,
+        on_failure_callback=hitl_failure_callback,
+    )
+    # [END howto_hitl_approval_operator]
+
+    # [START howto_hitl_branch_operator]
+    choose_a_branch_to_run = HITLBranchOperator(
+        task_id="choose_a_branch_to_run",
+        subject="You're now allowed to proceeded. Please choose one task to run: ",
+        options=["task_1", "task_2", "task_3"],
+        notifiers=[hitl_request_callback],
+        on_success_callback=hitl_success_callback,
+        on_failure_callback=hitl_failure_callback,
+    )
+    # [END howto_hitl_branch_operator]
+
+    # [START howto_hitl_workflow]
+    @task
+    def task_1(): ...
+
+    @task
+    def task_2(): ...
+
+    @task
+    def task_3(): ...
+
+    (
+        [wait_for_input, wait_for_option, wait_for_default_option, wait_for_multiple_options]
+        >> valid_input_and_options
+        >> choose_a_branch_to_run
+        >> [task_1(), task_2(), task_3()]
+    )
+    # [END howto_hitl_workflow]
+
+# [END hitl_tutorial]

{apache_airflow_providers_standard-1.5.0rc1 → apache_airflow_providers_standard-1.6.0rc1}/src/airflow/providers/standard/operators/hitl.py

@@ -20,21 +20,23 @@ import logging
 
 from airflow.exceptions import AirflowOptionalProviderFeatureException
 from airflow.providers.standard.version_compat import AIRFLOW_V_3_1_PLUS
+from airflow.sdk.bases.notifier import BaseNotifier
 
 if not AIRFLOW_V_3_1_PLUS:
     raise AirflowOptionalProviderFeatureException("Human in the loop functionality needs Airflow 3.1+.")
 
 
-from collections.abc import Collection, Mapping
-from datetime import datetime, timezone
+from collections.abc import Collection, Mapping, Sequence
 from typing import TYPE_CHECKING, Any
 
 from airflow.providers.standard.exceptions import HITLTimeoutError, HITLTriggerEventError
+from airflow.providers.standard.operators.branch import BranchMixIn
 from airflow.providers.standard.triggers.hitl import HITLTrigger, HITLTriggerEventSuccessPayload
 from airflow.providers.standard.utils.skipmixin import SkipMixin
 from airflow.providers.standard.version_compat import BaseOperator
 from airflow.sdk.definitions.param import ParamsDict
 from airflow.sdk.execution_time.hitl import upsert_hitl_detail
+from airflow.sdk.timezone import utcnow
 
 if TYPE_CHECKING:
     from airflow.sdk.definitions.context import Context
@@ -65,6 +67,7 @@ class HITLOperator(BaseOperator):
         defaults: str | list[str] | None = None,
         multiple: bool = False,
         params: ParamsDict | dict[str, Any] | None = None,
+        notifiers: Sequence[BaseNotifier] | BaseNotifier | None = None,
         **kwargs,
     ) -> None:
         super().__init__(**kwargs)
@@ -77,6 +80,9 @@ class HITLOperator(BaseOperator):
         self.multiple = multiple
 
         self.params: ParamsDict = params if isinstance(params, ParamsDict) else ParamsDict(params or {})
+        self.notifiers: Sequence[BaseNotifier] = (
+            [notifiers] if isinstance(notifiers, BaseNotifier) else notifiers or []
+        )
 
         self.validate_defaults()
 
@@ -107,11 +113,16 @@ class HITLOperator(BaseOperator):
             multiple=self.multiple,
             params=self.serialized_params,
         )
+
         if self.execution_timeout:
-            timeout_datetime = datetime.now(timezone.utc) + self.execution_timeout
+            timeout_datetime = utcnow() + self.execution_timeout
         else:
             timeout_datetime = None
+
         self.log.info("Waiting for response")
+        for notifier in self.notifiers:
+            notifier(context)
+
         # Defer the Human-in-the-loop response checking process to HITLTrigger
         self.defer(
             trigger=HITLTrigger(
@@ -170,6 +181,9 @@ class ApprovalOperator(HITLOperator, SkipMixin):
 
     FIXED_ARGS = ["options", "multiple"]
 
+    APPROVE = "Approve"
+    REJECT = "Reject"
+
     def __init__(self, ignore_downstream_trigger_rules: bool = False, **kwargs) -> None:
         for arg in self.FIXED_ARGS:
             if arg in kwargs:
@@ -177,13 +191,17 @@ class ApprovalOperator(HITLOperator, SkipMixin):
 
         self.ignore_downstream_trigger_rules = ignore_downstream_trigger_rules
 
-        super().__init__(options=["Approve", "Reject"], multiple=False, **kwargs)
+        super().__init__(
+            options=[self.APPROVE, self.REJECT],
+            multiple=False,
+            **kwargs,
+        )
 
     def execute_complete(self, context: Context, event: dict[str, Any]) -> Any:
         ret = super().execute_complete(context=context, event=event)
 
         chosen_option = ret["chosen_options"][0]
-        if chosen_option == "Approve":
+        if chosen_option == self.APPROVE:
             self.log.info("Approved. Proceeding with downstream tasks...")
             return ret
 
@@ -211,24 +229,27 @@ class ApprovalOperator(HITLOperator, SkipMixin):
         return ret
 
 
-class HITLBranchOperator(HITLOperator):
+class HITLBranchOperator(HITLOperator, BranchMixIn):
     """BranchOperator based on Human-in-the-loop Response."""
 
-    def __init__(self, **kwargs) -> None:
-        super().__init__(**kwargs)
+    inherits_from_skipmixin = True
 
-    def execute_complete(self, context: Context, event: dict[str, Any]) -> None:
-        raise NotImplementedError
+    def execute_complete(self, context: Context, event: dict[str, Any]) -> Any:
+        ret = super().execute_complete(context=context, event=event)
+        chosen_options = ret["chosen_options"]
+        return self.do_branch(context=context, branches_to_execute=chosen_options)
 
 
 class HITLEntryOperator(HITLOperator):
     """Human-in-the-loop Operator that is used to accept user input through TriggerForm."""
 
+    OK = "OK"
+
     def __init__(self, **kwargs) -> None:
         if "options" not in kwargs:
-            kwargs["options"] = ["OK"]
+            kwargs["options"] = [self.OK]
 
             if "defaults" not in kwargs:
-                kwargs["defaults"] = ["OK"]
+                kwargs["defaults"] = [self.OK]
 
         super().__init__(**kwargs)

{apache_airflow_providers_standard-1.5.0rc1 → apache_airflow_providers_standard-1.6.0rc1}/src/airflow/providers/standard/sensors/time.py

@@ -42,7 +42,10 @@ except ImportError:
         timeout: datetime.timedelta | None = None
 
 
-from airflow.utils import timezone
+try:
+    from airflow.sdk import timezone
+except ImportError:
+    from airflow.utils import timezone  # type: ignore[attr-defined,no-redef]
 
 if TYPE_CHECKING:
     try:
@@ -116,9 +119,11 @@ class TimeSensor(BaseSensorOperator):
                 ),
                 method_name="execute_complete",
             )
+        else:
+            super().execute(context)
 
-    def execute_complete(self, context: Context) -> None:
-        return
+    def execute_complete(self, context: Context, event: Any = None) -> None:
+        return None
 
     def poke(self, context: Context) -> bool:
         self.log.info("Checking if the time (%s) has come", self.target_datetime)

{apache_airflow_providers_standard-1.5.0rc1 → apache_airflow_providers_standard-1.6.0rc1}/src/airflow/providers/standard/triggers/hitl.py

@@ -34,8 +34,8 @@ from airflow.sdk.execution_time.hitl import (
     get_hitl_detail_content_detail,
     update_htil_detail_response,
 )
+from airflow.sdk.timezone import utcnow
 from airflow.triggers.base import BaseTrigger, TriggerEvent
-from airflow.utils import timezone
 
 
 class HITLTriggerEventSuccessPayload(TypedDict, total=False):
@@ -43,6 +43,7 @@ class HITLTriggerEventSuccessPayload(TypedDict, total=False):
 
     chosen_options: list[str]
     params_input: dict[str, Any]
+    timedout: bool
 
 
 class HITLTriggerEventFailurePayload(TypedDict):
@@ -96,7 +97,7 @@ class HITLTrigger(BaseTrigger):
     async def run(self) -> AsyncIterator[TriggerEvent]:
         """Loop until the Human-in-the-loop response received or timeout reached."""
         while True:
-            if self.timeout_datetime and self.timeout_datetime < timezone.utcnow():
+            if self.timeout_datetime and self.timeout_datetime < utcnow():
                 if self.defaults is None:
                     yield TriggerEvent(
                         HITLTriggerEventFailurePayload(
@@ -111,21 +112,28 @@ class HITLTrigger(BaseTrigger):
                     chosen_options=self.defaults,
                     params_input=self.params,
                 )
+                self.log.info(
+                    "[HITL] timeout reached before receiving response, fallback to default %s", self.defaults
+                )
                 yield TriggerEvent(
                     HITLTriggerEventSuccessPayload(
                         chosen_options=self.defaults,
                         params_input=self.params,
+                        timedout=True,
                     )
                 )
                 return
 
             resp = await sync_to_async(get_hitl_detail_content_detail)(ti_id=self.ti_id)
             if resp.response_received and resp.chosen_options:
-                self.log.info("Responded by %s at %s", resp.user_id, resp.response_at)
+                self.log.info(
+                    "[HITL] user=%s options=%s at %s", resp.user_id, resp.chosen_options, resp.response_at
+                )
                 yield TriggerEvent(
                     HITLTriggerEventSuccessPayload(
                         chosen_options=resp.chosen_options,
                         params_input=resp.params_input,
+                        timedout=False,
                     )
                 )
                 return