apache-airflow-providers-databricks 7.8.0rc1__tar.gz → 7.8.1__tar.gz

{apache_airflow_providers_databricks-7.8.0rc1 → apache_airflow_providers_databricks-7.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apache-airflow-providers-databricks
-Version: 7.8.0rc1
+Version: 7.8.1
 Summary: Provider package apache-airflow-providers-databricks for Apache Airflow
 Keywords: airflow-provider,databricks,airflow,integration
 Author-email: Apache Software Foundation <dev@airflow.apache.org>
@@ -22,9 +22,9 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: System :: Monitoring
 License-File: LICENSE
 License-File: NOTICE
-Requires-Dist: apache-airflow>=2.11.0rc1
-Requires-Dist: apache-airflow-providers-common-compat>=1.8.0rc1
-Requires-Dist: apache-airflow-providers-common-sql>=1.27.0rc1
+Requires-Dist: apache-airflow>=2.11.0
+Requires-Dist: apache-airflow-providers-common-compat>=1.10.1
+Requires-Dist: apache-airflow-providers-common-sql>=1.27.0
 Requires-Dist: requests>=2.32.0,<3
 Requires-Dist: databricks-sql-connector>=4.0.0
 Requires-Dist: databricks-sqlalchemy>=1.0.2
@@ -35,13 +35,13 @@ Requires-Dist: pandas>=2.2.3; python_version >="3.13"
 Requires-Dist: pyarrow>=16.1.0; python_version < '3.13'
 Requires-Dist: pyarrow>=18.0.0; python_version >= '3.13'
 Requires-Dist: azure-identity>=1.3.1 ; extra == "azure-identity"
-Requires-Dist: apache-airflow-providers-fab>=2.2.0rc1 ; extra == "fab" and ( python_version < '3.13')
-Requires-Dist: apache-airflow-providers-openlineage>=2.3.0rc1 ; extra == "openlineage"
+Requires-Dist: apache-airflow-providers-fab>=2.2.0 ; extra == "fab" and ( python_version < '3.13')
+Requires-Dist: apache-airflow-providers-openlineage>=2.3.0 ; extra == "openlineage"
 Requires-Dist: databricks-sdk==0.10.0 ; extra == "sdk"
 Requires-Dist: apache-airflow-providers-standard ; extra == "standard"
 Project-URL: Bug Tracker, https://github.com/apache/airflow/issues
-Project-URL: Changelog, https://airflow.staged.apache.org/docs/apache-airflow-providers-databricks/7.8.0/changelog.html
-Project-URL: Documentation, https://airflow.staged.apache.org/docs/apache-airflow-providers-databricks/7.8.0
+Project-URL: Changelog, https://airflow.apache.org/docs/apache-airflow-providers-databricks/7.8.1/changelog.html
+Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-databricks/7.8.1
 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
@@ -77,7 +77,7 @@ Provides-Extra: standard
 
 Package ``apache-airflow-providers-databricks``
 
-Release: ``7.8.0``
+Release: ``7.8.1``
 
 
 `Databricks <https://databricks.com/>`__
@@ -90,7 +90,7 @@ This is a provider package for ``databricks`` provider. All classes for this pro
 are in ``airflow.providers.databricks`` python package.
 
 You can find package information and changelog for the provider
-in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-databricks/7.8.0/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-databricks/7.8.1/>`_.
 
 Installation
 ------------
@@ -108,7 +108,7 @@ Requirements
 PIP package                                 Version required
 ==========================================  ======================================
 ``apache-airflow``                          ``>=2.11.0``
-``apache-airflow-providers-common-compat``  ``>=1.8.0``
+``apache-airflow-providers-common-compat``  ``>=1.10.1``
 ``apache-airflow-providers-common-sql``     ``>=1.27.0``
 ``requests``                                ``>=2.32.0,<3``
 ``databricks-sql-connector``                ``>=4.0.0``
@@ -156,5 +156,5 @@ Extra               Dependencies
 ==================  ================================================================
 
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-databricks/7.8.0/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-databricks/7.8.1/changelog.html>`_.
 

{apache_airflow_providers_databricks-7.8.0rc1 → apache_airflow_providers_databricks-7.8.1}/README.rst

@@ -23,7 +23,7 @@
 
 Package ``apache-airflow-providers-databricks``
 
-Release: ``7.8.0``
+Release: ``7.8.1``
 
 
 `Databricks <https://databricks.com/>`__
@@ -36,7 +36,7 @@ This is a provider package for ``databricks`` provider. All classes for this pro
 are in ``airflow.providers.databricks`` python package.
 
 You can find package information and changelog for the provider
-in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-databricks/7.8.0/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-databricks/7.8.1/>`_.
 
 Installation
 ------------
@@ -54,7 +54,7 @@ Requirements
 PIP package                                 Version required
 ==========================================  ======================================
 ``apache-airflow``                          ``>=2.11.0``
-``apache-airflow-providers-common-compat``  ``>=1.8.0``
+``apache-airflow-providers-common-compat``  ``>=1.10.1``
 ``apache-airflow-providers-common-sql``     ``>=1.27.0``
 ``requests``                                ``>=2.32.0,<3``
 ``databricks-sql-connector``                ``>=4.0.0``
@@ -102,4 +102,4 @@ Extra               Dependencies
 ==================  ================================================================
 
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-databricks/7.8.0/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-databricks/7.8.1/changelog.html>`_.

{apache_airflow_providers_databricks-7.8.0rc1 → apache_airflow_providers_databricks-7.8.1}/docs/changelog.rst

@@ -26,6 +26,18 @@
 Changelog
 ---------
 
+7.8.1
+.....
+
+Misc
+~~~~
+
+* ``chore: use OL macros instead of building OL ids from scratch (#59197)``
+* ``Add backcompat for exceptions in providers (#58727)``
+
+.. Below changes are excluded from the changelog. Move them to
+   appropriate section above if needed. Do not delete the lines(!):
+
 7.8.0
 .....
 

{apache_airflow_providers_databricks-7.8.0rc1 → apache_airflow_providers_databricks-7.8.1}/docs/index.rst

@@ -78,7 +78,7 @@ apache-airflow-providers-databricks package
 `Databricks <https://databricks.com/>`__
 
 
-Release: 7.8.0
+Release: 7.8.1
 
 Provider package
 ----------------
@@ -102,7 +102,7 @@ The minimum Apache Airflow version supported by this provider distribution is ``
 PIP package                                 Version required
 ==========================================  ======================================
 ``apache-airflow``                          ``>=2.11.0``
-``apache-airflow-providers-common-compat``  ``>=1.8.0``
+``apache-airflow-providers-common-compat``  ``>=1.10.1``
 ``apache-airflow-providers-common-sql``     ``>=1.27.0``
 ``requests``                                ``>=2.32.0,<3``
 ``databricks-sql-connector``                ``>=4.0.0``
@@ -142,5 +142,5 @@ Downloading official packages
 You can download officially released packages and verify their checksums and signatures from the
 `Official Apache Download site <https://downloads.apache.org/airflow/providers/>`_
 
-* `The apache-airflow-providers-databricks 7.8.0 sdist package <https://downloads.apache.org/airflow/providers/apache_airflow_providers_databricks-7.8.0.tar.gz>`_ (`asc <https://downloads.apache.org/airflow/providers/apache_airflow_providers_databricks-7.8.0.tar.gz.asc>`__, `sha512 <https://downloads.apache.org/airflow/providers/apache_airflow_providers_databricks-7.8.0.tar.gz.sha512>`__)
-* `The apache-airflow-providers-databricks 7.8.0 wheel package <https://downloads.apache.org/airflow/providers/apache_airflow_providers_databricks-7.8.0-py3-none-any.whl>`_ (`asc <https://downloads.apache.org/airflow/providers/apache_airflow_providers_databricks-7.8.0-py3-none-any.whl.asc>`__, `sha512 <https://downloads.apache.org/airflow/providers/apache_airflow_providers_databricks-7.8.0-py3-none-any.whl.sha512>`__)
+* `The apache-airflow-providers-databricks 7.8.1 sdist package <https://downloads.apache.org/airflow/providers/apache_airflow_providers_databricks-7.8.1.tar.gz>`_ (`asc <https://downloads.apache.org/airflow/providers/apache_airflow_providers_databricks-7.8.1.tar.gz.asc>`__, `sha512 <https://downloads.apache.org/airflow/providers/apache_airflow_providers_databricks-7.8.1.tar.gz.sha512>`__)
+* `The apache-airflow-providers-databricks 7.8.1 wheel package <https://downloads.apache.org/airflow/providers/apache_airflow_providers_databricks-7.8.1-py3-none-any.whl>`_ (`asc <https://downloads.apache.org/airflow/providers/apache_airflow_providers_databricks-7.8.1-py3-none-any.whl.asc>`__, `sha512 <https://downloads.apache.org/airflow/providers/apache_airflow_providers_databricks-7.8.1-py3-none-any.whl.sha512>`__)

{apache_airflow_providers_databricks-7.8.0rc1 → apache_airflow_providers_databricks-7.8.1}/provider.yaml

@@ -22,12 +22,13 @@ description: |
     `Databricks <https://databricks.com/>`__
 
 state: ready
-source-date-epoch: 1764109970
+source-date-epoch: 1765298937
 # 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:
+  - 7.8.1
   - 7.8.0
   - 7.7.5
   - 7.7.4

{apache_airflow_providers_databricks-7.8.0rc1 → apache_airflow_providers_databricks-7.8.1}/pyproject.toml

@@ -25,7 +25,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "apache-airflow-providers-databricks"
-version = "7.8.0rc1"
+version = "7.8.1"
 description = "Provider package apache-airflow-providers-databricks for Apache Airflow"
 readme = "README.rst"
 license = "Apache-2.0"
@@ -58,9 +58,9 @@ requires-python = ">=3.10"
 # Make sure to run ``prek 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.11.0rc1",
-    "apache-airflow-providers-common-compat>=1.8.0rc1",
-    "apache-airflow-providers-common-sql>=1.27.0rc1",
+    "apache-airflow>=2.11.0",
+    "apache-airflow-providers-common-compat>=1.10.1",
+    "apache-airflow-providers-common-sql>=1.27.0",
     "requests>=2.32.0,<3",
     "databricks-sql-connector>=4.0.0",
     "databricks-sqlalchemy>=1.0.2",
@@ -83,13 +83,13 @@ dependencies = [
     "azure-identity>=1.3.1",
 ]
 "fab" = [
-    "apache-airflow-providers-fab>=2.2.0rc1; python_version < '3.13'"
+    "apache-airflow-providers-fab>=2.2.0; python_version < '3.13'"
 ]
 "standard" = [
     "apache-airflow-providers-standard"
 ]
 "openlineage" = [
-    "apache-airflow-providers-openlineage>=2.3.0rc1"
+    "apache-airflow-providers-openlineage>=2.3.0"
 ]
 
 [dependency-groups]
@@ -134,8 +134,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-databricks/7.8.0"
-"Changelog" = "https://airflow.staged.apache.org/docs/apache-airflow-providers-databricks/7.8.0/changelog.html"
+"Documentation" = "https://airflow.apache.org/docs/apache-airflow-providers-databricks/7.8.1"
+"Changelog" = "https://airflow.apache.org/docs/apache-airflow-providers-databricks/7.8.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"

{apache_airflow_providers_databricks-7.8.0rc1 → apache_airflow_providers_databricks-7.8.1}/src/airflow/providers/databricks/__init__.py

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

{apache_airflow_providers_databricks-7.8.0rc1 → apache_airflow_providers_databricks-7.8.1}/src/airflow/providers/databricks/exceptions.py

@@ -21,7 +21,7 @@
 
 from __future__ import annotations
 
-from airflow.exceptions import AirflowException
+from airflow.providers.common.compat.sdk import AirflowException
 
 
 class DatabricksSqlExecutionError(AirflowException):

{apache_airflow_providers_databricks-7.8.0rc1 → apache_airflow_providers_databricks-7.8.1}/src/airflow/providers/databricks/hooks/databricks.py

@@ -34,7 +34,7 @@ from typing import Any
 
 from requests import exceptions as requests_exceptions
 
-from airflow.exceptions import AirflowException
+from airflow.providers.common.compat.sdk import AirflowException
 from airflow.providers.databricks.hooks.databricks_base import BaseDatabricksHook
 
 GET_CLUSTER_ENDPOINT = ("GET", "2.0/clusters/get")

{apache_airflow_providers_databricks-7.8.0rc1 → apache_airflow_providers_databricks-7.8.1}/src/airflow/providers/databricks/hooks/databricks_base.py

@@ -49,7 +49,8 @@ from tenacity import (
 )
 
 from airflow import __version__
-from airflow.exceptions import AirflowException, AirflowOptionalProviderFeatureException
+from airflow.exceptions import AirflowOptionalProviderFeatureException
+from airflow.providers.common.compat.sdk import AirflowException
 from airflow.providers_manager import ProvidersManager
 
 try:

{apache_airflow_providers_databricks-7.8.0rc1 → apache_airflow_providers_databricks-7.8.1}/src/airflow/providers/databricks/hooks/databricks_sql.py

@@ -34,7 +34,7 @@ from databricks import sql
 from databricks.sql.types import Row
 from sqlalchemy.engine import URL
 
-from airflow.exceptions import AirflowException
+from airflow.providers.common.compat.sdk import AirflowException
 from airflow.providers.common.sql.hooks.handlers import return_single_query_results
 from airflow.providers.common.sql.hooks.sql import DbApiHook
 from airflow.providers.databricks.exceptions import DatabricksSqlExecutionError, DatabricksSqlExecutionTimeout

{apache_airflow_providers_databricks-7.8.0rc1 → apache_airflow_providers_databricks-7.8.1}/src/airflow/providers/databricks/operators/databricks.py

@@ -27,8 +27,7 @@ from functools import cached_property
 from typing import TYPE_CHECKING, Any
 
 from airflow.configuration import conf
-from airflow.exceptions import AirflowException
-from airflow.providers.common.compat.sdk import BaseOperator, BaseOperatorLink, XCom
+from airflow.providers.common.compat.sdk import AirflowException, BaseOperator, BaseOperatorLink, XCom
 from airflow.providers.databricks.hooks.databricks import (
     DatabricksHook,
     RunLifeCycleState,

{apache_airflow_providers_databricks-7.8.0rc1 → apache_airflow_providers_databricks-7.8.1}/src/airflow/providers/databricks/operators/databricks_repos.py

@@ -25,8 +25,7 @@ from functools import cached_property
 from typing import TYPE_CHECKING
 from urllib.parse import urlsplit
 
-from airflow.exceptions import AirflowException
-from airflow.providers.common.compat.sdk import BaseOperator
+from airflow.providers.common.compat.sdk import AirflowException, BaseOperator
 from airflow.providers.databricks.hooks.databricks import DatabricksHook
 
 if TYPE_CHECKING:

{apache_airflow_providers_databricks-7.8.0rc1 → apache_airflow_providers_databricks-7.8.1}/src/airflow/providers/databricks/operators/databricks_sql.py

@@ -27,8 +27,7 @@ from typing import TYPE_CHECKING, Any, ClassVar
 
 from databricks.sql.utils import ParamEscaper
 
-from airflow.exceptions import AirflowException
-from airflow.providers.common.compat.sdk import BaseOperator
+from airflow.providers.common.compat.sdk import AirflowException, BaseOperator
 from airflow.providers.common.sql.operators.sql import SQLExecuteQueryOperator
 from airflow.providers.databricks.hooks.databricks_sql import DatabricksSqlHook
 

{apache_airflow_providers_databricks-7.8.0rc1 → apache_airflow_providers_databricks-7.8.1}/src/airflow/providers/databricks/operators/databricks_workflow.py

@@ -25,8 +25,7 @@ from typing import TYPE_CHECKING, Any
 
 from mergedeep import merge
 
-from airflow.exceptions import AirflowException
-from airflow.providers.common.compat.sdk import BaseOperator, TaskGroup
+from airflow.providers.common.compat.sdk import AirflowException, BaseOperator, TaskGroup
 from airflow.providers.databricks.hooks.databricks import DatabricksHook, RunLifeCycleState
 from airflow.providers.databricks.plugins.databricks_workflow import (
     WorkflowJobRepairAllFailedLink,

{apache_airflow_providers_databricks-7.8.0rc1 → apache_airflow_providers_databricks-7.8.1}/src/airflow/providers/databricks/plugins/databricks_workflow.py

@@ -20,11 +20,11 @@ from __future__ import annotations
 from typing import TYPE_CHECKING, Any
 from urllib.parse import unquote
 
-from airflow.exceptions import AirflowException, TaskInstanceNotFound
+from airflow.exceptions import TaskInstanceNotFound
 from airflow.models.dagrun import DagRun
 from airflow.models.taskinstance import TaskInstance, TaskInstanceKey, clear_task_instances
 from airflow.plugins_manager import AirflowPlugin
-from airflow.providers.common.compat.sdk import BaseOperatorLink, TaskGroup, XCom
+from airflow.providers.common.compat.sdk import AirflowException, BaseOperatorLink, TaskGroup, XCom
 from airflow.providers.databricks.hooks.databricks import DatabricksHook
 from airflow.providers.databricks.version_compat import AIRFLOW_V_3_0_PLUS
 from airflow.utils.log.logging_mixin import LoggingMixin

{apache_airflow_providers_databricks-7.8.0rc1 → apache_airflow_providers_databricks-7.8.1}/src/airflow/providers/databricks/sensors/databricks.py

@@ -23,8 +23,7 @@ from functools import cached_property
 from typing import TYPE_CHECKING, Any
 
 from airflow.configuration import conf
-from airflow.exceptions import AirflowException
-from airflow.providers.common.compat.sdk import BaseSensorOperator
+from airflow.providers.common.compat.sdk import AirflowException, BaseSensorOperator
 from airflow.providers.databricks.hooks.databricks import DatabricksHook, SQLStatementState
 from airflow.providers.databricks.operators.databricks import DEFER_METHOD_NAME
 from airflow.providers.databricks.utils.mixins import DatabricksSQLStatementsMixin

{apache_airflow_providers_databricks-7.8.0rc1 → apache_airflow_providers_databricks-7.8.1}/src/airflow/providers/databricks/sensors/databricks_partition.py

@@ -27,8 +27,7 @@ from typing import TYPE_CHECKING, Any
 
 from databricks.sql.utils import ParamEscaper
 
-from airflow.exceptions import AirflowException
-from airflow.providers.common.compat.sdk import BaseSensorOperator
+from airflow.providers.common.compat.sdk import AirflowException, BaseSensorOperator
 from airflow.providers.common.sql.hooks.handlers import fetch_all_handler
 from airflow.providers.databricks.hooks.databricks_sql import DatabricksSqlHook
 

{apache_airflow_providers_databricks-7.8.0rc1 → apache_airflow_providers_databricks-7.8.1}/src/airflow/providers/databricks/sensors/databricks_sql.py

@@ -24,8 +24,7 @@ from collections.abc import Callable, Iterable, Sequence
 from functools import cached_property
 from typing import TYPE_CHECKING, Any
 
-from airflow.exceptions import AirflowException
-from airflow.providers.common.compat.sdk import BaseSensorOperator
+from airflow.providers.common.compat.sdk import AirflowException, BaseSensorOperator
 from airflow.providers.common.sql.hooks.handlers import fetch_all_handler
 from airflow.providers.databricks.hooks.databricks_sql import DatabricksSqlHook
 

{apache_airflow_providers_databricks-7.8.0rc1 → apache_airflow_providers_databricks-7.8.1}/src/airflow/providers/databricks/utils/databricks.py

@@ -17,7 +17,7 @@
 # under the License.
 from __future__ import annotations
 
-from airflow.exceptions import AirflowException
+from airflow.providers.common.compat.sdk import AirflowException
 from airflow.providers.databricks.hooks.databricks import DatabricksHook, RunState
 
 

{apache_airflow_providers_databricks-7.8.0rc1 → apache_airflow_providers_databricks-7.8.1}/src/airflow/providers/databricks/utils/mixins.py

@@ -26,7 +26,7 @@ from typing import (
     Protocol,
 )
 
-from airflow.exceptions import AirflowException
+from airflow.providers.common.compat.sdk import AirflowException
 from airflow.providers.databricks.hooks.databricks import DatabricksHook, SQLStatementState
 from airflow.providers.databricks.triggers.databricks import DatabricksSQLStatementExecutionTrigger
 

{apache_airflow_providers_databricks-7.8.0rc1 → apache_airflow_providers_databricks-7.8.1}/src/airflow/providers/databricks/utils/openlineage.py

@@ -24,7 +24,6 @@ from typing import TYPE_CHECKING, Any
 import requests
 
 from airflow.providers.common.compat.openlineage.check import require_openlineage_version
-from airflow.providers.databricks.version_compat import AIRFLOW_V_3_0_PLUS
 from airflow.utils import timezone
 
 if TYPE_CHECKING:
@@ -37,60 +36,6 @@ if TYPE_CHECKING:
 log = logging.getLogger(__name__)
 
 
-def _get_logical_date(task_instance):
-    # todo: remove when min airflow version >= 3.0
-    if AIRFLOW_V_3_0_PLUS:
-        dagrun = task_instance.get_template_context()["dag_run"]
-        return dagrun.logical_date or dagrun.run_after
-
-    if hasattr(task_instance, "logical_date"):
-        date = task_instance.logical_date
-    else:
-        date = task_instance.execution_date
-
-    return date
-
-
-def _get_dag_run_clear_number(task_instance):
-    # todo: remove when min airflow version >= 3.0
-    if AIRFLOW_V_3_0_PLUS:
-        dagrun = task_instance.get_template_context()["dag_run"]
-        return dagrun.clear_number
-    return task_instance.dag_run.clear_number
-
-
-# todo: move this run_id logic into OpenLineage's listener to avoid differences
-def _get_ol_run_id(task_instance) -> str:
-    """
-    Get OpenLineage run_id from TaskInstance.
-
-    It's crucial that the task_instance's run_id creation logic matches OpenLineage's listener implementation.
-    Only then can we ensure that the generated run_id aligns with the Airflow task,
-    enabling a proper connection between events.
-    """
-    from airflow.providers.openlineage.plugins.adapter import OpenLineageAdapter
-
-    # Generate same OL run id as is generated for current task instance
-    return OpenLineageAdapter.build_task_instance_run_id(
-        dag_id=task_instance.dag_id,
-        task_id=task_instance.task_id,
-        logical_date=_get_logical_date(task_instance),
-        try_number=task_instance.try_number,
-        map_index=task_instance.map_index,
-    )
-
-
-# todo: move this run_id logic into OpenLineage's listener to avoid differences
-def _get_ol_dag_run_id(task_instance) -> str:
-    from airflow.providers.openlineage.plugins.adapter import OpenLineageAdapter
-
-    return OpenLineageAdapter.build_dag_run_id(
-        dag_id=task_instance.dag_id,
-        logical_date=_get_logical_date(task_instance),
-        clear_number=_get_dag_run_clear_number(task_instance),
-    )
-
-
 def _get_parent_run_facet(task_instance):
     """
     Retrieve the ParentRunFacet associated with a specific Airflow task instance.
@@ -101,22 +46,39 @@ def _get_parent_run_facet(task_instance):
     """
     from openlineage.client.facet_v2 import parent_run
 
-    from airflow.providers.openlineage.conf import namespace
+    from airflow.providers.openlineage.plugins.macros import (
+        lineage_job_name,
+        lineage_job_namespace,
+        lineage_root_job_name,
+        lineage_root_run_id,
+        lineage_run_id,
+    )
+
+    parent_run_id = lineage_run_id(task_instance)
+    parent_job_name = lineage_job_name(task_instance)
+    parent_job_namespace = lineage_job_namespace()
+
+    root_parent_run_id = lineage_root_run_id(task_instance)
+    rot_parent_job_name = lineage_root_job_name(task_instance)
+
+    try:  # Added in OL provider 2.9.0, try to use it if possible
+        from airflow.providers.openlineage.plugins.macros import lineage_root_job_namespace
 
-    parent_run_id = _get_ol_run_id(task_instance)
-    root_parent_run_id = _get_ol_dag_run_id(task_instance)
+        root_parent_job_namespace = lineage_root_job_namespace(task_instance)
+    except ImportError:
+        root_parent_job_namespace = lineage_job_namespace()
 
     return parent_run.ParentRunFacet(
         run=parent_run.Run(runId=parent_run_id),
         job=parent_run.Job(
-            namespace=namespace(),
-            name=f"{task_instance.dag_id}.{task_instance.task_id}",
+            namespace=parent_job_namespace,
+            name=parent_job_name,
         ),
         root=parent_run.Root(
             run=parent_run.RootRun(runId=root_parent_run_id),
             job=parent_run.RootJob(
-                name=task_instance.dag_id,
-                namespace=namespace(),
+                name=rot_parent_job_name,
+                namespace=root_parent_job_namespace,
             ),
         ),
     )
@@ -209,7 +171,7 @@ def _create_ol_event_pair(
     return start, end
 
 
-@require_openlineage_version(provider_min_version="2.3.0")
+@require_openlineage_version(provider_min_version="2.5.0")
 def emit_openlineage_events_for_databricks_queries(
     task_instance,
     hook: DatabricksSqlHook | DatabricksHook | None = None,

{apache_airflow_providers_databricks-7.8.0rc1 → apache_airflow_providers_databricks-7.8.1}/tests/unit/databricks/hooks/test_databricks.py

@@ -33,8 +33,8 @@ from azure.core.credentials import AccessToken
 from requests import exceptions as requests_exceptions
 from requests.auth import HTTPBasicAuth
 
-from airflow.exceptions import AirflowException
 from airflow.models import Connection
+from airflow.providers.common.compat.sdk import AirflowException
 from airflow.providers.databricks.hooks.databricks import (
     GET_RUN_ENDPOINT,
     SUBMIT_RUN_ENDPOINT,

{apache_airflow_providers_databricks-7.8.0rc1 → apache_airflow_providers_databricks-7.8.1}/tests/unit/databricks/hooks/test_databricks_base.py

@@ -28,8 +28,8 @@ from requests import exceptions as requests_exceptions
 from requests.auth import HTTPBasicAuth
 from tenacity import AsyncRetrying, Future, RetryError, retry_if_exception, stop_after_attempt, wait_fixed
 
-from airflow.exceptions import AirflowException
 from airflow.models import Connection
+from airflow.providers.common.compat.sdk import AirflowException
 from airflow.providers.databricks.hooks.databricks_base import (
     DEFAULT_AZURE_CREDENTIAL_SETTING_KEY,
     DEFAULT_DATABRICKS_SCOPE,

{apache_airflow_providers_databricks-7.8.0rc1 → apache_airflow_providers_databricks-7.8.1}/tests/unit/databricks/hooks/test_databricks_sql.py

@@ -30,8 +30,9 @@ import polars as pl
 import pytest
 from databricks.sql.types import Row
 
-from airflow.exceptions import AirflowException, AirflowOptionalProviderFeatureException
+from airflow.exceptions import AirflowOptionalProviderFeatureException
 from airflow.models import Connection
+from airflow.providers.common.compat.sdk import AirflowException
 from airflow.providers.common.sql.hooks.handlers import fetch_all_handler
 from airflow.providers.databricks.hooks.databricks_sql import DatabricksSqlHook, create_timeout_thread
 
@@ -569,7 +570,7 @@ def test_get_openlineage_database_specific_lineage_with_old_openlineage_provider
     hook.get_openlineage_database_info = lambda x: mock.MagicMock(authority="auth", scheme="scheme")
 
     expected_err = (
-        "OpenLineage provider version `1.99.0` is lower than required `2.3.0`, "
+        "OpenLineage provider version `1.99.0` is lower than required `2.5.0`, "
         "skipping function `emit_openlineage_events_for_databricks_queries` execution"
     )
     with pytest.raises(AirflowOptionalProviderFeatureException, match=expected_err):

{apache_airflow_providers_databricks-7.8.0rc1 → apache_airflow_providers_databricks-7.8.1}/tests/unit/databricks/operators/test_databricks.py

@@ -28,13 +28,13 @@ import pytest
 # Do not run the tests when FAB / Flask is not installed
 pytest.importorskip("flask_session")
 
-from airflow.exceptions import AirflowException, TaskDeferred
 from airflow.models import DAG
 from airflow.providers.common.compat.openlineage.facet import (
     Dataset,
     ExternalQueryRunFacet,
     SQLJobFacet,
 )
+from airflow.providers.common.compat.sdk import AirflowException, TaskDeferred
 from airflow.providers.databricks.hooks.databricks import RunState, SQLStatementState
 from airflow.providers.databricks.operators.databricks import (
     DatabricksCreateJobsOperator,

{apache_airflow_providers_databricks-7.8.0rc1 → apache_airflow_providers_databricks-7.8.1}/tests/unit/databricks/operators/test_databricks_copy.py

@@ -21,12 +21,12 @@ from unittest import mock
 
 import pytest
 
-from airflow.exceptions import AirflowException
 from airflow.providers.common.compat.openlineage.facet import (
     Dataset,
     ExternalQueryRunFacet,
     SQLJobFacet,
 )
+from airflow.providers.common.compat.sdk import AirflowException
 from airflow.providers.databricks.operators.databricks_sql import DatabricksCopyIntoOperator
 from airflow.providers.openlineage.extractors import OperatorLineage
 

{apache_airflow_providers_databricks-7.8.0rc1 → apache_airflow_providers_databricks-7.8.1}/tests/unit/databricks/operators/test_databricks_repos.py

@@ -21,7 +21,7 @@ from unittest import mock
 
 import pytest
 
-from airflow.exceptions import AirflowException
+from airflow.providers.common.compat.sdk import AirflowException
 from airflow.providers.databricks.operators.databricks_repos import (
     DatabricksReposCreateOperator,
     DatabricksReposDeleteOperator,

{apache_airflow_providers_databricks-7.8.0rc1 → apache_airflow_providers_databricks-7.8.1}/tests/unit/databricks/operators/test_databricks_workflow.py

@@ -25,8 +25,8 @@ import pytest
 pytest.importorskip("flask_session")
 
 from airflow import DAG
-from airflow.exceptions import AirflowException
 from airflow.models.baseoperator import BaseOperator
+from airflow.providers.common.compat.sdk import AirflowException
 from airflow.providers.databricks.hooks.databricks import RunLifeCycleState
 from airflow.providers.databricks.operators.databricks_workflow import (
     DatabricksWorkflowTaskGroup,

{apache_airflow_providers_databricks-7.8.0rc1 → apache_airflow_providers_databricks-7.8.1}/tests/unit/databricks/plugins/test_databricks_workflow.py

@@ -34,10 +34,10 @@ if AIRFLOW_V_3_0_PLUS:
 
 from flask import url_for
 
-from airflow.exceptions import AirflowException
 from airflow.models.dagrun import DagRun
 from airflow.models.taskinstance import TaskInstanceKey
 from airflow.plugins_manager import AirflowPlugin
+from airflow.providers.common.compat.sdk import AirflowException
 from airflow.providers.databricks.plugins.databricks_workflow import (
     DatabricksWorkflowPlugin,
     RepairDatabricksTasks,

{apache_airflow_providers_databricks-7.8.0rc1 → apache_airflow_providers_databricks-7.8.1}/tests/unit/databricks/sensors/test_databricks.py

@@ -21,7 +21,7 @@ from unittest import mock
 
 import pytest
 
-from airflow.exceptions import AirflowException, TaskDeferred
+from airflow.providers.common.compat.sdk import AirflowException, TaskDeferred
 from airflow.providers.databricks.hooks.databricks import SQLStatementState
 from airflow.providers.databricks.sensors.databricks import DatabricksSQLStatementsSensor
 from airflow.providers.databricks.triggers.databricks import DatabricksSQLStatementExecutionTrigger

{apache_airflow_providers_databricks-7.8.0rc1 → apache_airflow_providers_databricks-7.8.1}/tests/unit/databricks/sensors/test_databricks_partition.py

@@ -23,8 +23,8 @@ from unittest.mock import patch
 
 import pytest
 
-from airflow.exceptions import AirflowException
 from airflow.models import DAG
+from airflow.providers.common.compat.sdk import AirflowException
 from airflow.providers.common.sql.hooks.handlers import fetch_all_handler
 from airflow.providers.databricks.sensors.databricks_partition import DatabricksPartitionSensor
 from airflow.utils import timezone

{apache_airflow_providers_databricks-7.8.0rc1 → apache_airflow_providers_databricks-7.8.1}/tests/unit/databricks/sensors/test_databricks_sql.py

@@ -23,8 +23,8 @@ from unittest.mock import patch
 
 import pytest
 
-from airflow.exceptions import AirflowException
 from airflow.models import DAG
+from airflow.providers.common.compat.sdk import AirflowException
 from airflow.providers.databricks.sensors.databricks_sql import DatabricksSqlSensor
 from airflow.utils import timezone
 

{apache_airflow_providers_databricks-7.8.0rc1 → apache_airflow_providers_databricks-7.8.1}/tests/unit/databricks/utils/test_databricks.py

@@ -22,7 +22,7 @@ from unittest.mock import MagicMock
 
 import pytest
 
-from airflow.exceptions import AirflowException
+from airflow.providers.common.compat.sdk import AirflowException
 from airflow.providers.databricks.hooks.databricks import RunState
 from airflow.providers.databricks.utils.databricks import (
     extract_failed_task_errors,

{apache_airflow_providers_databricks-7.8.0rc1 → apache_airflow_providers_databricks-7.8.1}/tests/unit/databricks/utils/test_mixins.py

@@ -21,7 +21,7 @@ from unittest.mock import MagicMock
 
 import pytest
 
-from airflow.exceptions import AirflowException
+from airflow.providers.common.compat.sdk import AirflowException
 from airflow.providers.databricks.utils.mixins import DatabricksSQLStatementsMixin
 
 

{apache_airflow_providers_databricks-7.8.0rc1 → apache_airflow_providers_databricks-7.8.1}/tests/unit/databricks/utils/test_openlineage.py

@@ -34,7 +34,6 @@ from airflow.providers.databricks.hooks.databricks import DatabricksHook
 from airflow.providers.databricks.hooks.databricks_sql import DatabricksSqlHook
 from airflow.providers.databricks.utils.openlineage import (
     _create_ol_event_pair,
-    _get_ol_run_id,
     _get_parent_run_facet,
     _get_queries_details_from_databricks,
     _process_data_from_api,
@@ -46,40 +45,9 @@ from airflow.utils import timezone
 from airflow.utils.state import TaskInstanceState
 
 
-def test_get_ol_run_id_ti_success():
-    logical_date = timezone.datetime(2025, 1, 1)
-    mock_ti = mock.MagicMock(
-        dag_id="dag_id",
-        task_id="task_id",
-        map_index=1,
-        try_number=1,
-        logical_date=logical_date,
-        state=TaskInstanceState.SUCCESS,
-    )
-    mock_ti.get_template_context.return_value = {"dag_run": mock.MagicMock(logical_date=logical_date)}
-
-    result = _get_ol_run_id(mock_ti)
-    assert result == "01941f29-7c00-7087-8906-40e512c257bd"
-
-
-def test_get_ol_run_id_ti_failed():
-    logical_date = timezone.datetime(2025, 1, 1)
-    mock_ti = mock.MagicMock(
-        dag_id="dag_id",
-        task_id="task_id",
-        map_index=1,
-        try_number=1,
-        logical_date=logical_date,
-        state=TaskInstanceState.FAILED,
-    )
-    mock_ti.get_template_context.return_value = {"dag_run": mock.MagicMock(logical_date=logical_date)}
-
-    result = _get_ol_run_id(mock_ti)
-    assert result == "01941f29-7c00-7087-8906-40e512c257bd"
-
-
 def test_get_parent_run_facet():
     logical_date = timezone.datetime(2025, 1, 1)
+    dr = mock.MagicMock(logical_date=logical_date, clear_number=0)
     mock_ti = mock.MagicMock(
         dag_id="dag_id",
         task_id="task_id",
@@ -87,14 +55,18 @@ def test_get_parent_run_facet():
         try_number=1,
         logical_date=logical_date,
         state=TaskInstanceState.SUCCESS,
+        dag_run=dr,
     )
-    mock_ti.get_template_context.return_value = {"dag_run": mock.MagicMock(logical_date=logical_date)}
+    mock_ti.get_template_context.return_value = {"dag_run": dr}
 
     result = _get_parent_run_facet(mock_ti)
 
     assert result.run.runId == "01941f29-7c00-7087-8906-40e512c257bd"
     assert result.job.namespace == namespace()
     assert result.job.name == "dag_id.task_id"
+    assert result.root.run.runId == "01941f29-7c00-743e-b109-28b18d0a19c5"
+    assert result.root.job.namespace == namespace()
+    assert result.root.job.name == "dag_id"
 
 
 def test_run_api_call_success():
@@ -283,7 +255,7 @@ def test_create_ol_event_pair_success(mock_generate_uuid, is_successful):
     assert start_event.job == end_event.job
 
 
-@mock.patch("importlib.metadata.version", return_value="2.3.0")
+@mock.patch("importlib.metadata.version", return_value="3.0.0")
 @mock.patch("openlineage.client.uuid.generate_new_uuid")
 def test_emit_openlineage_events_for_databricks_queries(mock_generate_uuid, mock_version, time_machine):
     fake_uuid = "01958e68-03a2-79e3-9ae9-26865cc40e2f"
@@ -520,7 +492,7 @@ def test_emit_openlineage_events_for_databricks_queries(mock_generate_uuid, mock
         assert fake_adapter.emit.call_args_list == expected_calls
 
 
-@mock.patch("importlib.metadata.version", return_value="2.3.0")
+@mock.patch("importlib.metadata.version", return_value="3.0.0")
 @mock.patch("openlineage.client.uuid.generate_new_uuid")
 def test_emit_openlineage_events_for_databricks_queries_without_metadata(
     mock_generate_uuid, mock_version, time_machine
@@ -638,7 +610,7 @@ def test_emit_openlineage_events_for_databricks_queries_without_metadata(
         assert fake_adapter.emit.call_args_list == expected_calls
 
 
-@mock.patch("importlib.metadata.version", return_value="2.3.0")
+@mock.patch("importlib.metadata.version", return_value="3.0.0")
 @mock.patch("openlineage.client.uuid.generate_new_uuid")
 def test_emit_openlineage_events_for_databricks_queries_without_explicit_query_ids(
     mock_generate_uuid, mock_version, time_machine
@@ -760,7 +732,7 @@ def test_emit_openlineage_events_for_databricks_queries_without_explicit_query_i
 @mock.patch(
     "airflow.providers.openlineage.sqlparser.SQLParser.create_namespace", return_value="databricks_ns"
 )
-@mock.patch("importlib.metadata.version", return_value="2.3.0")
+@mock.patch("importlib.metadata.version", return_value="3.0.0")
 @mock.patch("openlineage.client.uuid.generate_new_uuid")
 def test_emit_openlineage_events_for_databricks_queries_without_explicit_query_ids_and_namespace(
     mock_generate_uuid, mock_version, mock_parser, time_machine
@@ -878,7 +850,7 @@ def test_emit_openlineage_events_for_databricks_queries_without_explicit_query_i
         assert fake_adapter.emit.call_args_list == expected_calls
 
 
-@mock.patch("importlib.metadata.version", return_value="2.3.0")
+@mock.patch("importlib.metadata.version", return_value="3.0.0")
 @mock.patch("openlineage.client.uuid.generate_new_uuid")
 def test_emit_openlineage_events_for_databricks_queries_without_explicit_query_ids_and_namespace_raw_ns(
     mock_generate_uuid, mock_version, time_machine
@@ -997,7 +969,7 @@ def test_emit_openlineage_events_for_databricks_queries_without_explicit_query_i
         assert fake_adapter.emit.call_args_list == expected_calls
 
 
-@mock.patch("importlib.metadata.version", return_value="2.3.0")
+@mock.patch("importlib.metadata.version", return_value="3.0.0")
 @mock.patch("openlineage.client.uuid.generate_new_uuid")
 def test_emit_openlineage_events_for_databricks_queries_ith_query_ids_and_hook_query_ids(
     mock_generate_uuid, mock_version, time_machine
@@ -1117,7 +1089,7 @@ def test_emit_openlineage_events_for_databricks_queries_ith_query_ids_and_hook_q
         assert fake_adapter.emit.call_args_list == expected_calls
 
 
-@mock.patch("importlib.metadata.version", return_value="2.3.0")
+@mock.patch("importlib.metadata.version", return_value="3.0.0")
 def test_emit_openlineage_events_for_databricks_queries_missing_query_ids_and_hook(mock_version):
     query_ids = []
     original_query_ids = copy.deepcopy(query_ids)
@@ -1142,7 +1114,7 @@ def test_emit_openlineage_events_for_databricks_queries_missing_query_ids_and_ho
         fake_adapter.emit.assert_not_called()  # No events should be emitted
 
 
-@mock.patch("importlib.metadata.version", return_value="2.3.0")
+@mock.patch("importlib.metadata.version", return_value="3.0.0")
 def test_emit_openlineage_events_for_databricks_queries_missing_query_namespace_and_hook(mock_version):
     query_ids = ["1", "2"]
     original_query_ids = copy.deepcopy(query_ids)
@@ -1168,7 +1140,7 @@ def test_emit_openlineage_events_for_databricks_queries_missing_query_namespace_
         fake_adapter.emit.assert_not_called()  # No events should be emitted
 
 
-@mock.patch("importlib.metadata.version", return_value="2.3.0")
+@mock.patch("importlib.metadata.version", return_value="3.0.0")
 def test_emit_openlineage_events_for_databricks_queries_missing_hook_and_query_for_extra_metadata_true(
     mock_version,
 ):
@@ -1213,7 +1185,7 @@ def test_emit_openlineage_events_with_old_openlineage_provider(mock_version):
         return_value=fake_listener,
     ):
         expected_err = (
-            "OpenLineage provider version `1.99.0` is lower than required `2.3.0`, "
+            "OpenLineage provider version `1.99.0` is lower than required `2.5.0`, "
             "skipping function `emit_openlineage_events_for_databricks_queries` execution"
         )