openlineage: migrate OpenLineage provider to V2 facets.

.pre-commit-config.yaml

@@ -388,6 +388,14 @@ repos:
         exclude: ^airflow/kubernetes/
         entry: ./scripts/ci/pre_commit/check_airflow_k8s_not_used.py
         additional_dependencies: ['rich>=12.4.4']
+      - id: check-common-compat-used-for-openlineage
+        name: Check common.compat is used for OL deprecated classes
+        language: python
+        files: ^airflow/.*\.py$
+        require_serial: true
+        exclude: ^airflow/openlineage/
+        entry: ./scripts/ci/pre_commit/check_common_compat_used_for_openlineage.py
+        additional_dependencies: ['rich>=12.4.4']
       - id: check-airflow-providers-bug-report-template
         name: Check airflow-bug-report provider list is sorted/unique
         language: python

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

@@ -24,7 +24,7 @@
 if TYPE_CHECKING:
     from urllib.parse import SplitResult
 
-    from openlineage.client.run import Dataset as OpenLineageDataset
+    from airflow.providers.common.compat.openlineage.facet import Dataset as OpenLineageDataset
 
 
 def create_dataset(*, bucket: str, key: str, extra=None) -> Dataset:
@@ -39,7 +39,7 @@ def sanitize_uri(uri: SplitResult) -> SplitResult:
 
 def convert_dataset_to_openlineage(dataset: Dataset, lineage_context) -> OpenLineageDataset:
     """Translate Dataset with valid AIP-60 uri to OpenLineage with assistance from the hook."""
-    from openlineage.client.run import Dataset as OpenLineageDataset
+    from airflow.providers.common.compat.openlineage.facet import Dataset as OpenLineageDataset
 
     bucket, key = S3Hook.parse_s3_url(dataset.uri)
     return OpenLineageDataset(namespace=f"s3://{bucket}", name=key if key else "/")

airflow/providers/amazon/aws/operators/athena.py

@@ -30,9 +30,7 @@
 from airflow.providers.amazon.aws.utils.mixins import aws_template_fields
 
 if TYPE_CHECKING:
-    from openlineage.client.facet import BaseFacet
-    from openlineage.client.run import Dataset
-
+    from airflow.providers.common.compat.openlineage.facet import BaseFacet, Dataset, DatasetFacet
     from airflow.providers.openlineage.extractors.base import OperatorLineage
     from airflow.utils.context import Context
 
@@ -217,20 +215,19 @@ def get_openlineage_facets_on_complete(self, _) -> OperatorLineage:
         path where the results are saved (user's prefix + some UUID), we are creating a dataset with the
         user-provided path only. This should make it easier to match this dataset across different processes.
         """
-        from openlineage.client.facet import (
+        from airflow.providers.common.compat.openlineage.facet import (
+            Dataset,
+            Error,
             ExternalQueryRunFacet,
-            ExtractionError,
             ExtractionErrorRunFacet,
-            SqlJobFacet,
+            SQLJobFacet,
         )
-        from openlineage.client.run import Dataset
-
         from airflow.providers.openlineage.extractors.base import OperatorLineage
         from airflow.providers.openlineage.sqlparser import SQLParser
 
         sql_parser = SQLParser(dialect="generic")
 
-        job_facets: dict[str, BaseFacet] = {"sql": SqlJobFacet(query=sql_parser.normalize_sql(self.query))}
+        job_facets: dict[str, BaseFacet] = {"sql": SQLJobFacet(query=sql_parser.normalize_sql(self.query))}
         parse_result = sql_parser.parse(sql=self.query)
 
         if not parse_result:
@@ -242,7 +239,7 @@ def get_openlineage_facets_on_complete(self, _) -> OperatorLineage:
                 totalTasks=len(self.query) if isinstance(self.query, list) else 1,
                 failedTasks=len(parse_result.errors),
                 errors=[
-                    ExtractionError(
+                    Error(
                         errorMessage=error.message,
                         stackTrace=None,
                         task=error.origin_statement,
@@ -284,13 +281,13 @@ def get_openlineage_facets_on_complete(self, _) -> OperatorLineage:
         return OperatorLineage(job_facets=job_facets, run_facets=run_facets, inputs=inputs, outputs=outputs)
 
     def get_openlineage_dataset(self, database, table) -> Dataset | None:
-        from openlineage.client.facet import (
+        from airflow.providers.common.compat.openlineage.facet import (
+            Dataset,
+            Identifier,
             SchemaDatasetFacet,
-            SchemaField,
+            SchemaDatasetFacetFields,
             SymlinksDatasetFacet,
-            SymlinksDatasetFacetIdentifiers,
         )
-        from openlineage.client.run import Dataset
 
         client = self.hook.get_conn()
         try:
@@ -301,10 +298,10 @@ def get_openlineage_dataset(self, database, table) -> Dataset | None:
             # Dataset has also its' physical location which we can add in symlink facet.
             s3_location = table_metadata["TableMetadata"]["Parameters"]["location"]
             parsed_path = urlparse(s3_location)
-            facets: dict[str, BaseFacet] = {
+            facets: dict[str, DatasetFacet] = {
                 "symlinks": SymlinksDatasetFacet(
                     identifiers=[
-                        SymlinksDatasetFacetIdentifiers(
+                        Identifier(
                             namespace=f"{parsed_path.scheme}://{parsed_path.netloc}",
                             name=str(parsed_path.path),
                             type="TABLE",
@@ -313,7 +310,9 @@ def get_openlineage_dataset(self, database, table) -> Dataset | None:
                 )
             }
             fields = [
-                SchemaField(name=column["Name"], type=column["Type"], description=column.get("Comment"))
+                SchemaDatasetFacetFields(
+                    name=column["Name"], type=column["Type"], description=column["Comment"]
+                )
                 for column in table_metadata["TableMetadata"]["Columns"]
             ]
             if fields:

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

@@ -324,8 +324,7 @@ def execute(self, context: Context):
         )
 
     def get_openlineage_facets_on_start(self):
-        from openlineage.client.run import Dataset
-
+        from airflow.providers.common.compat.openlineage.facet import Dataset
         from airflow.providers.openlineage.extractors import OperatorLineage
 
         dest_bucket_name, dest_bucket_key = S3Hook.get_s3_bucket_key(
@@ -439,8 +438,7 @@ def execute(self, context: Context):
             s3_hook.load_bytes(self.data, s3_key, s3_bucket, self.replace, self.encrypt, self.acl_policy)
 
     def get_openlineage_facets_on_start(self):
-        from openlineage.client.run import Dataset
-
+        from airflow.providers.common.compat.openlineage.facet import Dataset
         from airflow.providers.openlineage.extractors import OperatorLineage
 
         bucket, key = S3Hook.get_s3_bucket_key(self.s3_bucket, self.s3_key, "dest_bucket", "dest_key")
@@ -546,13 +544,12 @@ def execute(self, context: Context):
 
     def get_openlineage_facets_on_complete(self, task_instance):
         """Implement _on_complete because object keys are resolved in execute()."""
-        from openlineage.client.facet import (
+        from airflow.providers.common.compat.openlineage.facet import (
+            Dataset,
             LifecycleStateChange,
             LifecycleStateChangeDatasetFacet,
-            LifecycleStateChangeDatasetFacetPreviousIdentifier,
+            PreviousIdentifier,
         )
-        from openlineage.client.run import Dataset
-
         from airflow.providers.openlineage.extractors import OperatorLineage
 
         if not self._keys:
@@ -570,7 +567,7 @@ def get_openlineage_facets_on_complete(self, task_instance):
                 facets={
                     "lifecycleStateChange": LifecycleStateChangeDatasetFacet(
                         lifecycleStateChange=LifecycleStateChange.DROP.value,
-                        previousIdentifier=LifecycleStateChangeDatasetFacetPreviousIdentifier(
+                        previousIdentifier=PreviousIdentifier(
                             namespace=bucket_url,
                             name=key,
                         ),
@@ -725,8 +722,7 @@ def execute(self, context: Context):
             self.log.info("Upload successful")
 
     def get_openlineage_facets_on_start(self):
-        from openlineage.client.run import Dataset
-
+        from airflow.providers.common.compat.openlineage.facet import Dataset
         from airflow.providers.openlineage.extractors import OperatorLineage
 
         dest_bucket_name, dest_bucket_key = S3Hook.get_s3_bucket_key(

airflow/providers/amazon/aws/operators/sagemaker.py

@@ -46,8 +46,7 @@
 from airflow.utils.json import AirflowJsonEncoder
 
 if TYPE_CHECKING:
-    from openlineage.client.run import Dataset
-
+    from airflow.providers.common.compat.openlineage.facet import Dataset
     from airflow.providers.openlineage.extractors.base import OperatorLineage
     from airflow.utils.context import Context
 
@@ -208,7 +207,7 @@ def hook(self):
 
     @staticmethod
     def path_to_s3_dataset(path) -> Dataset:
-        from openlineage.client.run import Dataset
+        from airflow.providers.common.compat.openlineage.facet import Dataset
 
         path = path.replace("s3://", "")
         split_path = path.split("/")

airflow/providers/amazon/provider.yaml

@@ -89,6 +89,7 @@ versions:
 
 dependencies:
   - apache-airflow>=2.7.0
+  - apache-airflow-providers-common-compat>=1.1.0
   - apache-airflow-providers-common-sql>=1.3.1
   - apache-airflow-providers-http
   - apache-airflow-providers-common-compat>=1.1.0

airflow/providers/common/compat/__init__.py

@@ -29,7 +29,7 @@
 
 __all__ = ["__version__"]
 
-__version__ = "1.0.0"
+__version__ = "1.1.0"
 
 if packaging.version.parse(packaging.version.parse(airflow_version).base_version) < packaging.version.parse(
     "2.7.0"

airflow/providers/common/compat/openlineage/__init__.py

@@ -0,0 +1,16 @@
+# 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.

airflow/providers/common/compat/openlineage/facet.py

@@ -0,0 +1,158 @@
+# 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
+
+from typing import TYPE_CHECKING
+
+
+def create_no_op(*_, **__) -> None:
+    """
+    Create a no-op placeholder.
+
+    This function creates and returns a None value, used as a placeholder when the OpenLineage client
+    library is available. It represents an action that has no effect.
+    """
+    return None
+
+
+if TYPE_CHECKING:
+    from openlineage.client.generated.base import (
+        BaseFacet,
+        Dataset,
+        DatasetFacet,
+        InputDataset,
+        OutputDataset,
+        RunFacet,
+    )
+    from openlineage.client.generated.column_lineage_dataset import (
+        ColumnLineageDatasetFacet,
+        Fields,
+        InputField,
+    )
+    from openlineage.client.generated.documentation_dataset import DocumentationDatasetFacet
+    from openlineage.client.generated.error_message_run import ErrorMessageRunFacet
+    from openlineage.client.generated.external_query_run import ExternalQueryRunFacet
+    from openlineage.client.generated.extraction_error_run import Error, ExtractionErrorRunFacet
+    from openlineage.client.generated.lifecycle_state_change_dataset import (
+        LifecycleStateChange,
+        LifecycleStateChangeDatasetFacet,
+        PreviousIdentifier,
+    )
+    from openlineage.client.generated.output_statistics_output_dataset import (
+        OutputStatisticsOutputDatasetFacet,
+    )
+    from openlineage.client.generated.schema_dataset import SchemaDatasetFacet, SchemaDatasetFacetFields
+    from openlineage.client.generated.sql_job import SQLJobFacet
+    from openlineage.client.generated.symlinks_dataset import Identifier, SymlinksDatasetFacet
+else:
+    try:
+        try:
+            from openlineage.client.generated.base import (
+                BaseFacet,
+                Dataset,
+                DatasetFacet,
+                InputDataset,
+                OutputDataset,
+                RunFacet,
+            )
+            from openlineage.client.generated.column_lineage_dataset import (
+                ColumnLineageDatasetFacet,
+                Fields,
+                InputField,
+            )
+            from openlineage.client.generated.documentation_dataset import DocumentationDatasetFacet
+            from openlineage.client.generated.error_message_run import ErrorMessageRunFacet
+            from openlineage.client.generated.external_query_run import ExternalQueryRunFacet
+            from openlineage.client.generated.extraction_error_run import Error, ExtractionErrorRunFacet
+            from openlineage.client.generated.lifecycle_state_change_dataset import (
+                LifecycleStateChange,
+                LifecycleStateChangeDatasetFacet,
+                PreviousIdentifier,
+            )
+            from openlineage.client.generated.output_statistics_output_dataset import (
+                OutputStatisticsOutputDatasetFacet,
+            )
+            from openlineage.client.generated.schema_dataset import (
+                SchemaDatasetFacet,
+                SchemaDatasetFacetFields,
+            )
+            from openlineage.client.generated.sql_job import SQLJobFacet
+            from openlineage.client.generated.symlinks_dataset import Identifier, SymlinksDatasetFacet
+        except ImportError:
+            from openlineage.client.facet import (
+                BaseFacet,
+                BaseFacet as DatasetFacet,
+                BaseFacet as RunFacet,
+                ColumnLineageDatasetFacet,
+                ColumnLineageDatasetFacetFieldsAdditional as Fields,
+                ColumnLineageDatasetFacetFieldsAdditionalInputFields as InputField,
+                DocumentationDatasetFacet,
+                ErrorMessageRunFacet,
+                ExternalQueryRunFacet,
+                ExtractionError as Error,
+                ExtractionErrorRunFacet,
+                LifecycleStateChange,
+                LifecycleStateChangeDatasetFacet,
+                LifecycleStateChangeDatasetFacetPreviousIdentifier as PreviousIdentifier,
+                OutputStatisticsOutputDatasetFacet,
+                SchemaDatasetFacet,
+                SchemaField as SchemaDatasetFacetFields,
+                SqlJobFacet as SQLJobFacet,
+                SymlinksDatasetFacet,
+                SymlinksDatasetFacetIdentifiers as Identifier,
+            )
+            from openlineage.client.run import Dataset, InputDataset, OutputDataset
+    except ImportError:
+        # When no openlineage client library installed we create no-op classes.
+        # This allows avoiding raising ImportError when making OL imports in top-level code
+        # (which shouldn't be the case anyway).
+        BaseFacet = Dataset = DatasetFacet = InputDataset = OutputDataset = RunFacet = (
+            ColumnLineageDatasetFacet
+        ) = Fields = InputField = DocumentationDatasetFacet = ErrorMessageRunFacet = ExternalQueryRunFacet = (
+            Error
+        ) = ExtractionErrorRunFacet = LifecycleStateChange = LifecycleStateChangeDatasetFacet = (
+            PreviousIdentifier
+        ) = OutputStatisticsOutputDatasetFacet = SchemaDatasetFacet = SchemaDatasetFacetFields = (
+            SQLJobFacet
+        ) = Identifier = SymlinksDatasetFacet = create_no_op
+
+__all__ = [
+    "BaseFacet",
+    "Dataset",
+    "DatasetFacet",
+    "InputDataset",
+    "OutputDataset",
+    "RunFacet",
+    "ColumnLineageDatasetFacet",
+    "Fields",
+    "InputField",
+    "DocumentationDatasetFacet",
+    "ErrorMessageRunFacet",
+    "ExternalQueryRunFacet",
+    "Error",
+    "ExtractionErrorRunFacet",
+    "LifecycleStateChange",
+    "LifecycleStateChangeDatasetFacet",
+    "PreviousIdentifier",
+    "OutputStatisticsOutputDatasetFacet",
+    "SchemaDatasetFacet",
+    "SchemaDatasetFacetFields",
+    "SQLJobFacet",
+    "Identifier",
+    "SymlinksDatasetFacet",
+]