apache-airflow-providers-openlineage 2.1.0rc1__tar.gz → 2.1.1rc1__tar.gz

{apache_airflow_providers_openlineage-2.1.0rc1 → apache_airflow_providers_openlineage-2.1.1rc1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: apache-airflow-providers-openlineage
-Version: 2.1.0rc1
+Version: 2.1.1rc1
 Summary: Provider package apache-airflow-providers-openlineage for Apache Airflow
 Keywords: airflow-provider,openlineage,airflow,integration
 Author-email: Apache Software Foundation <dev@airflow.apache.org>
@@ -26,42 +26,40 @@ Requires-Dist: apache-airflow-providers-common-compat>=1.4.0rc0
 Requires-Dist: attrs>=22.2
 Requires-Dist: openlineage-integration-common>=1.24.2
 Requires-Dist: openlineage-python>=1.24.2
-Requires-Dist: uuid6>=2024.7.10
 Project-URL: Bug Tracker, https://github.com/apache/airflow/issues
-Project-URL: Changelog, https://airflow.apache.org/docs/apache-airflow-providers-openlineage/2.1.0/changelog.html
-Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-openlineage/2.1.0
+Project-URL: Changelog, https://airflow.apache.org/docs/apache-airflow-providers-openlineage/2.1.1/changelog.html
+Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-openlineage/2.1.1
 Project-URL: Slack Chat, https://s.apache.org/airflow-slack
 Project-URL: Source Code, https://github.com/apache/airflow
 Project-URL: Twitter, https://x.com/ApacheAirflow
 Project-URL: YouTube, https://www.youtube.com/channel/UCSXwxpWZQ7XZ1WL3wqevChA/
 
 
- .. 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
+.. 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
+..   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.
+.. 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.
 
- .. NOTE! THIS FILE IS AUTOMATICALLY GENERATED AND WILL BE OVERWRITTEN!
-
- .. IF YOU WANT TO MODIFY TEMPLATE FOR THIS FILE, YOU SHOULD MODIFY THE TEMPLATE
-    `PROVIDER_README_TEMPLATE.rst.jinja2` IN the `dev/breeze/src/airflow_breeze/templates` DIRECTORY
+.. NOTE! THIS FILE IS AUTOMATICALLY GENERATED AND WILL BE OVERWRITTEN!
 
+.. IF YOU WANT TO MODIFY TEMPLATE FOR THIS FILE, YOU SHOULD MODIFY THE TEMPLATE
+   ``PROVIDER_README_TEMPLATE.rst.jinja2`` IN the ``dev/breeze/src/airflow_breeze/templates`` DIRECTORY
 
 Package ``apache-airflow-providers-openlineage``
 
-Release: ``2.1.0``
+Release: ``2.1.1``
 
 
 `OpenLineage <https://openlineage.io/>`__
@@ -74,7 +72,7 @@ This is a provider package for ``openlineage`` provider. All classes for this pr
 are in ``airflow.providers.openlineage`` python package.
 
 You can find package information and changelog for the provider
-in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-openlineage/2.1.0/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-openlineage/2.1.1/>`_.
 
 Installation
 ------------
@@ -97,7 +95,6 @@ PIP package                                 Version required
 ``attrs``                                   ``>=22.2``
 ``openlineage-integration-common``          ``>=1.24.2``
 ``openlineage-python``                      ``>=1.24.2``
-``uuid6``                                   ``>=2024.7.10``
 ==========================================  ==================
 
 Cross provider package dependencies
@@ -121,5 +118,5 @@ Dependent package
 ==================================================================================================================  =================
 
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-openlineage/2.1.0/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-openlineage/2.1.1/changelog.html>`_.
 

{apache_airflow_providers_openlineage-2.1.0rc1 → apache_airflow_providers_openlineage-2.1.1rc1}/README.rst

@@ -1,30 +1,29 @@
 
- .. 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
+.. 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
+..   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.
+.. 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.
 
- .. NOTE! THIS FILE IS AUTOMATICALLY GENERATED AND WILL BE OVERWRITTEN!
-
- .. IF YOU WANT TO MODIFY TEMPLATE FOR THIS FILE, YOU SHOULD MODIFY THE TEMPLATE
-    `PROVIDER_README_TEMPLATE.rst.jinja2` IN the `dev/breeze/src/airflow_breeze/templates` DIRECTORY
+.. NOTE! THIS FILE IS AUTOMATICALLY GENERATED AND WILL BE OVERWRITTEN!
 
+.. IF YOU WANT TO MODIFY TEMPLATE FOR THIS FILE, YOU SHOULD MODIFY THE TEMPLATE
+   ``PROVIDER_README_TEMPLATE.rst.jinja2`` IN the ``dev/breeze/src/airflow_breeze/templates`` DIRECTORY
 
 Package ``apache-airflow-providers-openlineage``
 
-Release: ``2.1.0``
+Release: ``2.1.1``
 
 
 `OpenLineage <https://openlineage.io/>`__
@@ -37,7 +36,7 @@ This is a provider package for ``openlineage`` provider. All classes for this pr
 are in ``airflow.providers.openlineage`` python package.
 
 You can find package information and changelog for the provider
-in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-openlineage/2.1.0/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-openlineage/2.1.1/>`_.
 
 Installation
 ------------
@@ -60,7 +59,6 @@ PIP package                                 Version required
 ``attrs``                                   ``>=22.2``
 ``openlineage-integration-common``          ``>=1.24.2``
 ``openlineage-python``                      ``>=1.24.2``
-``uuid6``                                   ``>=2024.7.10``
 ==========================================  ==================
 
 Cross provider package dependencies
@@ -84,4 +82,4 @@ Dependent package
 ==================================================================================================================  =================
 
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-openlineage/2.1.0/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-openlineage/2.1.1/changelog.html>`_.

{apache_airflow_providers_openlineage-2.1.0rc1 → apache_airflow_providers_openlineage-2.1.1rc1}/pyproject.toml

@@ -20,12 +20,12 @@
 # IF YOU WANT TO MODIFY THIS FILE EXCEPT DEPENDENCIES, YOU SHOULD MODIFY THE TEMPLATE
 # `pyproject_TEMPLATE.toml.jinja2` IN the `dev/breeze/src/airflow_breeze/templates` DIRECTORY
 [build-system]
-requires = ["flit_core==3.10.1"]
+requires = ["flit_core==3.11.0"]
 build-backend = "flit_core.buildapi"
 
 [project]
 name = "apache-airflow-providers-openlineage"
-version = "2.1.0.rc1"
+version = "2.1.1.rc1"
 description = "Provider package apache-airflow-providers-openlineage for Apache Airflow"
 readme = "README.rst"
 authors = [
@@ -52,8 +52,10 @@ classifiers = [
 ]
 requires-python = "~=3.9"
 
-# The dependencies should be modified in place in the generated file
+# The dependencies should be modified in place in the generated file.
 # Any change in the dependencies is preserved when the file is regenerated
+# Make sure to run ``breeze static-checks --type update-providers-dependencies --all-files``
+# After you modify the dependencies, and rebuild your Breeze CI image with ``breeze ci-image build``
 dependencies = [
     "apache-airflow>=2.9.0rc0",
     "apache-airflow-providers-common-sql>=1.20.0rc0",
@@ -61,12 +63,32 @@ dependencies = [
     "attrs>=22.2",
     "openlineage-integration-common>=1.24.2",
     "openlineage-python>=1.24.2",
+]
+
+[dependency-groups]
+dev = [
+    "apache-airflow",
+    "apache-airflow-task-sdk",
+    "apache-airflow-devel-common",
+    "apache-airflow-providers-common-compat",
+    "apache-airflow-providers-common-sql",
+    # Additional devel dependencies (do not remove this line and add extra development dependencies)
     "uuid6>=2024.7.10",
 ]
 
+[tool.uv.sources]
+# These names must match the names as defined in the pyproject.toml of the workspace items,
+# *not* the workspace folder paths
+apache-airflow = {workspace = true}
+apache-airflow-devel-common = {workspace = true}
+apache-airflow-task-sdk = {workspace = true}
+apache-airflow-providers-common-sql = {workspace = true}
+apache-airflow-providers-fab = {workspace = true}
+apache-airflow-providers-standard = {workspace = true}
+
 [project.urls]
-"Documentation" = "https://airflow.apache.org/docs/apache-airflow-providers-openlineage/2.1.0"
-"Changelog" = "https://airflow.apache.org/docs/apache-airflow-providers-openlineage/2.1.0/changelog.html"
+"Documentation" = "https://airflow.apache.org/docs/apache-airflow-providers-openlineage/2.1.1"
+"Changelog" = "https://airflow.apache.org/docs/apache-airflow-providers-openlineage/2.1.1/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"
@@ -81,6 +103,3 @@ openlineage = "airflow.providers.openlineage.plugins.openlineage:OpenLineageProv
 
 [tool.flit.module]
 name = "airflow.providers.openlineage"
-
-[tool.pytest.ini_options]
-ignore = "tests/system/"

{apache_airflow_providers_openlineage-2.1.0rc1 → apache_airflow_providers_openlineage-2.1.1rc1}/src/airflow/providers/openlineage/__init__.py

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

{apache_airflow_providers_openlineage-2.1.0rc1 → apache_airflow_providers_openlineage-2.1.1rc1}/src/airflow/providers/openlineage/extractors/bash.py

@@ -17,10 +17,11 @@
 
 from __future__ import annotations
 
+from openlineage.client.facet_v2 import source_code_job
+
 from airflow.providers.openlineage import conf
 from airflow.providers.openlineage.extractors.base import BaseExtractor, OperatorLineage
 from airflow.providers.openlineage.utils.utils import get_unknown_source_attribute_run_facet
-from openlineage.client.facet_v2 import source_code_job
 
 """
 :meta private:

{apache_airflow_providers_openlineage-2.1.0rc1 → apache_airflow_providers_openlineage-2.1.1rc1}/src/airflow/providers/openlineage/extractors/manager.py

@@ -34,9 +34,10 @@ from airflow.providers.openlineage.utils.utils import (
 from airflow.utils.log.logging_mixin import LoggingMixin
 
 if TYPE_CHECKING:
+    from openlineage.client.event_v2 import Dataset
+
     from airflow.models import Operator
     from airflow.providers.common.compat.lineage.entities import Table
-    from openlineage.client.event_v2 import Dataset
 
 
 def _iter_extractor_types() -> Iterator[type[BaseExtractor]]:
@@ -290,9 +291,10 @@ class ExtractorManager(LoggingMixin):
 
     @staticmethod
     def convert_to_ol_dataset(obj) -> Dataset | None:
-        from airflow.providers.common.compat.lineage.entities import File, Table
         from openlineage.client.event_v2 import Dataset
 
+        from airflow.providers.common.compat.lineage.entities import File, Table
+
         if isinstance(obj, Dataset):
             return obj
         elif isinstance(obj, Table):

{apache_airflow_providers_openlineage-2.1.0rc1 → apache_airflow_providers_openlineage-2.1.1rc1}/src/airflow/providers/openlineage/extractors/python.py

@@ -20,10 +20,11 @@ from __future__ import annotations
 import inspect
 from typing import Callable
 
+from openlineage.client.facet_v2 import source_code_job
+
 from airflow.providers.openlineage import conf
 from airflow.providers.openlineage.extractors.base import BaseExtractor, OperatorLineage
 from airflow.providers.openlineage.utils.utils import get_unknown_source_attribute_run_facet
-from openlineage.client.facet_v2 import source_code_job
 
 """
 :meta private:

{apache_airflow_providers_openlineage-2.1.0rc1 → apache_airflow_providers_openlineage-2.1.1rc1}/src/airflow/providers/openlineage/get_provider_info.py

@@ -27,8 +27,9 @@ def get_provider_info():
         "name": "OpenLineage Airflow",
         "description": "`OpenLineage <https://openlineage.io/>`__\n",
         "state": "ready",
-        "source-date-epoch": 1739964022,
+        "source-date-epoch": 1741509355,
         "versions": [
+            "2.1.1",
             "2.1.0",
             "2.0.0",
             "1.14.0",
@@ -72,7 +73,7 @@ def get_provider_info():
         ],
         "config": {
             "openlineage": {
-                "description": "This section applies settings for OpenLineage integration.\nMore about configuration and it's precedence can be found at\nhttps://airflow.apache.org/docs/apache-airflow-providers-openlineage/stable/guides/user.html#transport-setup\n",
+                "description": "This section applies settings for OpenLineage integration.\nMore about configuration and it's precedence can be found in the `user's guide\n<https://airflow.apache.org/docs/apache-airflow-providers-openlineage/stable/guides/user.html#transport-setup>`_.\n",
                 "options": {
                     "disabled": {
                         "description": "Disable sending events without uninstalling the OpenLineage Provider by setting this to true.\n",
@@ -124,7 +125,7 @@ def get_provider_info():
                         "default": "",
                     },
                     "transport": {
-                        "description": "Pass OpenLineage Client transport configuration as JSON string. It should contain type of the\ntransport and additional options (different for each transport type). For more details see:\nhttps://openlineage.io/docs/client/python/#built-in-transport-types\n\nCurrently supported types are:\n\n  * HTTP\n  * Kafka\n  * Console\n  * File\n",
+                        "description": "Pass OpenLineage Client transport configuration as a JSON string, including the transport type\nand any additional options specific to that type, as described in `OpenLineage docs\n<https://openlineage.io/docs/client/python/#built-in-transport-types>`_.\n\nCurrently supported types are:\n\n  * HTTP\n  * Kafka\n  * Console\n  * File\n  * Composite\n  * Custom\n",
                         "type": "string",
                         "example": '{"type": "http", "url": "http://localhost:5000", "endpoint": "api/v1/lineage"}',
                         "default": "",
@@ -145,7 +146,7 @@ def get_provider_info():
                         "version_added": "1.8.0",
                     },
                     "execution_timeout": {
-                        "description": "Maximum amount of time (in seconds) that OpenLineage can spend executing metadata extraction.\n",
+                        "description": "Maximum amount of time (in seconds) that OpenLineage can spend executing metadata extraction.\nNote that other configurations, sometimes with higher priority, such as\n`[core] task_success_overtime\n<https://airflow.apache.org/docs/apache-airflow/stable/configurations-ref.html#task-success-overtime>`_,\nmay also affect how much time OpenLineage has for execution.\n",
                         "default": "10",
                         "example": None,
                         "type": "integer",
@@ -189,6 +190,6 @@ def get_provider_info():
             "attrs>=22.2",
             "openlineage-integration-common>=1.24.2",
             "openlineage-python>=1.24.2",
-            "uuid6>=2024.7.10",
         ],
+        "devel-dependencies": ["uuid6>=2024.7.10"],
     }

{apache_airflow_providers_openlineage-2.1.0rc1 → apache_airflow_providers_openlineage-2.1.1rc1}/src/airflow/providers/openlineage/plugins/facets.py

@@ -17,7 +17,6 @@
 from __future__ import annotations
 
 from attrs import define
-
 from openlineage.client.facet_v2 import JobFacet, RunFacet
 from openlineage.client.utils import RedactMixin
 

{apache_airflow_providers_openlineage-2.1.0rc1 → apache_airflow_providers_openlineage-2.1.1rc1}/src/airflow/providers/openlineage/plugins/listener.py

@@ -23,6 +23,7 @@ from datetime import datetime
 from typing import TYPE_CHECKING
 
 import psutil
+from openlineage.client.serde import Serde
 from setproctitle import getproctitle, setproctitle
 
 from airflow import settings
@@ -50,7 +51,6 @@ from airflow.stats import Stats
 from airflow.utils import timezone
 from airflow.utils.state import TaskInstanceState
 from airflow.utils.timeout import timeout
-from openlineage.client.serde import Serde
 
 if TYPE_CHECKING:
     from airflow.models import TaskInstance
@@ -104,7 +104,7 @@ class OpenLineageListener:
                 assert task
             dagrun = context["dag_run"]
             dag = context["dag"]
-            start_date = context["start_date"]
+            start_date = task_instance.start_date
             self._on_task_instance_running(task_instance, dag, dagrun, task, start_date)
     else:
 

{apache_airflow_providers_openlineage-2.1.0rc1 → apache_airflow_providers_openlineage-2.1.1rc1}/src/airflow/providers/openlineage/utils/sql.py

@@ -23,10 +23,9 @@ from enum import IntEnum
 from typing import TYPE_CHECKING, Optional
 
 from attrs import define
-from sqlalchemy import Column, MetaData, Table, and_, or_, union_all
-
 from openlineage.client.event_v2 import Dataset
 from openlineage.client.facet_v2 import schema_dataset
+from sqlalchemy import Column, MetaData, Table, and_, or_, union_all
 
 if TYPE_CHECKING:
     from sqlalchemy.engine import Engine

{apache_airflow_providers_openlineage-2.1.0rc1 → apache_airflow_providers_openlineage-2.1.1rc1}/src/airflow/providers/openlineage/utils/utils.py

@@ -26,6 +26,7 @@ from importlib import metadata
 from typing import TYPE_CHECKING, Any, Callable
 
 import attrs
+from openlineage.client.utils import RedactMixin
 
 from airflow import __version__ as AIRFLOW_VERSION
 
@@ -54,7 +55,6 @@ from airflow.sensors.base import BaseSensorOperator
 from airflow.serialization.serialized_objects import SerializedBaseOperator
 from airflow.utils.module_loading import import_string
 from airflow.utils.session import NEW_SESSION, provide_session
-from openlineage.client.utils import RedactMixin
 
 try:
     from airflow.sdk import BaseOperator as SdkBaseOperator
@@ -62,6 +62,9 @@ except ImportError:
     SdkBaseOperator = BaseOperator  # type: ignore[misc]
 
 if TYPE_CHECKING:
+    from openlineage.client.event_v2 import Dataset as OpenLineageDataset
+    from openlineage.client.facet_v2 import RunFacet, processing_engine_run
+
     from airflow.models import TaskInstance
     from airflow.providers.common.compat.assets import Asset
     from airflow.sdk import DAG, MappedOperator
@@ -72,8 +75,6 @@ if TYPE_CHECKING:
         should_hide_value_for_key,
     )
     from airflow.utils.state import DagRunState, TaskInstanceState
-    from openlineage.client.event_v2 import Dataset as OpenLineageDataset
-    from openlineage.client.facet_v2 import RunFacet, processing_engine_run
 else:
     try:
         from airflow.sdk import DAG, MappedOperator
@@ -325,25 +326,35 @@ class DagInfo(InfoJsonEncodable):
 
     @classmethod
     def serialize_timetable(cls, dag: DAG) -> dict[str, Any]:
-        serialized = dag.timetable.serialize()
-        if serialized != {} and serialized is not None:
-            return serialized
-        if (
-            hasattr(dag, "dataset_triggers")
-            and isinstance(dag.dataset_triggers, list)
-            and len(dag.dataset_triggers)
-        ):
-            triggers = dag.dataset_triggers
-            return {
-                "dataset_condition": {
+        # This is enough for Airflow 2.10+ and has all the information needed
+        serialized = dag.timetable.serialize() or {}
+
+        # In Airflow 2.9 when using Dataset scheduling we do not receive datasets in serialized timetable
+        # Also for DatasetOrTimeSchedule, we only receive timetable without dataset_condition
+        if hasattr(dag, "dataset_triggers") and "dataset_condition" not in serialized:
+            try:
+                # Make sure we are in Airflow version where these are importable
+                from airflow.datasets import BaseDatasetEventInput, DatasetAll, DatasetAny
+            except ImportError:
+                log.warning("OpenLineage could not serialize full dag's timetable for dag `%s`.", dag.dag_id)
+                return serialized
+
+            def _serialize_ds(ds: BaseDatasetEventInput) -> dict[str, Any]:
+                if isinstance(ds, (DatasetAny, DatasetAll)):
+                    return {
+                        "__type": "dataset_all" if isinstance(ds, DatasetAll) else "dataset_any",
+                        "objects": [_serialize_ds(child) for child in ds.objects],
+                    }
+                return {"__type": "dataset", "uri": ds.uri, "extra": ds.extra}
+
+            if isinstance(dag.dataset_triggers, BaseDatasetEventInput):
+                serialized["dataset_condition"] = _serialize_ds(dag.dataset_triggers)
+            elif isinstance(dag.dataset_triggers, list) and len(dag.dataset_triggers):
+                serialized["dataset_condition"] = {
                     "__type": "dataset_all",
-                    "objects": [
-                        {"__type": "dataset", "uri": trigger.uri, "extra": trigger.extra}
-                        for trigger in triggers
-                    ],
+                    "objects": [_serialize_ds(trigger) for trigger in dag.dataset_triggers],
                 }
-            }
-        return {}
+        return serialized
 
 
 class DagRunInfo(InfoJsonEncodable):
@@ -354,7 +365,7 @@ class DagRunInfo(InfoJsonEncodable):
         "dag_id",
         "data_interval_start",
         "data_interval_end",
-        "external_trigger",
+        "external_trigger",  # Removed in Airflow 3, use run_type instead
         "run_id",
         "run_type",
         "start_date",

{apache_airflow_providers_openlineage-2.1.0rc1 → apache_airflow_providers_openlineage-2.1.1rc1}/src/airflow/providers/openlineage/extractors/base.py

@@ -22,16 +22,16 @@ from abc import ABC, abstractmethod
 from typing import Generic, TypeVar, Union
 
 from attrs import Factory, define
-
 from openlineage.client.event_v2 import Dataset as OLDataset
 
 with warnings.catch_warnings():
     warnings.simplefilter("ignore", DeprecationWarning)
     from openlineage.client.facet import BaseFacet as BaseFacet_V1
+from openlineage.client.facet_v2 import JobFacet, RunFacet
+
 from airflow.providers.openlineage.utils.utils import AIRFLOW_V_2_10_PLUS
 from airflow.utils.log.logging_mixin import LoggingMixin
 from airflow.utils.state import TaskInstanceState
-from openlineage.client.facet_v2 import JobFacet, RunFacet
 
 # this is not to break static checks compatibility with v1 OpenLineage facet classes
 DatasetSubclass = TypeVar("DatasetSubclass", bound=OLDataset)

{apache_airflow_providers_openlineage-2.1.0rc1 → apache_airflow_providers_openlineage-2.1.1rc1}/src/airflow/providers/openlineage/plugins/adapter.py

@@ -21,16 +21,6 @@ from contextlib import ExitStack
 from typing import TYPE_CHECKING
 
 import yaml
-
-from airflow.providers.openlineage import __version__ as OPENLINEAGE_PROVIDER_VERSION, conf
-from airflow.providers.openlineage.utils.utils import (
-    OpenLineageRedactor,
-    get_airflow_debug_facet,
-    get_airflow_state_run_facet,
-    get_processing_engine_facet,
-)
-from airflow.stats import Stats
-from airflow.utils.log.logging_mixin import LoggingMixin
 from openlineage.client import OpenLineageClient, set_producer
 from openlineage.client.event_v2 import Job, Run, RunEvent, RunState
 from openlineage.client.facet_v2 import (
@@ -46,6 +36,16 @@ from openlineage.client.facet_v2 import (
 )
 from openlineage.client.uuid import generate_static_uuid
 
+from airflow.providers.openlineage import __version__ as OPENLINEAGE_PROVIDER_VERSION, conf
+from airflow.providers.openlineage.utils.utils import (
+    OpenLineageRedactor,
+    get_airflow_debug_facet,
+    get_airflow_state_run_facet,
+    get_processing_engine_facet,
+)
+from airflow.stats import Stats
+from airflow.utils.log.logging_mixin import LoggingMixin
+
 if TYPE_CHECKING:
     from datetime import datetime
 

{apache_airflow_providers_openlineage-2.1.0rc1 → apache_airflow_providers_openlineage-2.1.1rc1}/src/airflow/providers/openlineage/sqlparser.py

@@ -21,6 +21,9 @@ from typing import TYPE_CHECKING, Callable, TypedDict
 
 import sqlparse
 from attrs import define
+from openlineage.client.event_v2 import Dataset
+from openlineage.client.facet_v2 import column_lineage_dataset, extraction_error_run, sql_job
+from openlineage.common.sql import DbTableMeta, SqlMeta, parse
 
 from airflow.providers.openlineage.extractors.base import OperatorLineage
 from airflow.providers.openlineage.utils.sql import (
@@ -30,16 +33,13 @@ from airflow.providers.openlineage.utils.sql import (
 )
 from airflow.providers.openlineage.utils.utils import should_use_external_connection
 from airflow.utils.log.logging_mixin import LoggingMixin
-from openlineage.client.event_v2 import Dataset
-from openlineage.client.facet_v2 import column_lineage_dataset, extraction_error_run, sql_job
-from openlineage.common.sql import DbTableMeta, SqlMeta, parse
 
 if TYPE_CHECKING:
+    from openlineage.client.facet_v2 import JobFacet, RunFacet
     from sqlalchemy.engine import Engine
 
     from airflow.hooks.base import BaseHook
     from airflow.providers.common.sql.hooks.sql import DbApiHook
-    from openlineage.client.facet_v2 import JobFacet, RunFacet
 
 log = logging.getLogger(__name__)