apache-airflow-providers-google 16.0.0rc1__py3-none-any.whl → 16.1.0__py3-none-any.whl

airflow/providers/google/cloud/links/dataform.py

@@ -19,14 +19,8 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
-
 from airflow.providers.google.cloud.links.base import BaseGoogleLink
 
-if TYPE_CHECKING:
-    from airflow.models import BaseOperator
-    from airflow.utils.context import Context
-
 DATAFORM_BASE_LINK = "/bigquery/dataform"
 DATAFORM_WORKFLOW_INVOCATION_LINK = (
     DATAFORM_BASE_LINK
@@ -53,26 +47,6 @@ class DataformWorkflowInvocationLink(BaseGoogleLink):
     key = "dataform_workflow_invocation_config"
     format_str = DATAFORM_WORKFLOW_INVOCATION_LINK
 
-    @staticmethod
-    def persist(
-        operator_instance: BaseOperator,
-        context: Context,
-        project_id: str,
-        region: str,
-        repository_id: str,
-        workflow_invocation_id: str,
-    ):
-        operator_instance.xcom_push(
-            context,
-            key=DataformWorkflowInvocationLink.key,
-            value={
-                "project_id": project_id,
-                "region": region,
-                "repository_id": repository_id,
-                "workflow_invocation_id": workflow_invocation_id,
-            },
-        )
-
 
 class DataformRepositoryLink(BaseGoogleLink):
     """Helper class for constructing Dataflow repository link."""
@@ -81,24 +55,6 @@ class DataformRepositoryLink(BaseGoogleLink):
     key = "dataform_repository"
     format_str = DATAFORM_REPOSITORY_LINK
 
-    @staticmethod
-    def persist(
-        operator_instance: BaseOperator,
-        context: Context,
-        project_id: str,
-        region: str,
-        repository_id: str,
-    ) -> None:
-        operator_instance.xcom_push(
-            context=context,
-            key=DataformRepositoryLink.key,
-            value={
-                "project_id": project_id,
-                "region": region,
-                "repository_id": repository_id,
-            },
-        )
-
 
 class DataformWorkspaceLink(BaseGoogleLink):
     """Helper class for constructing Dataform workspace link."""
@@ -106,23 +62,3 @@ class DataformWorkspaceLink(BaseGoogleLink):
     name = "Dataform Workspace"
     key = "dataform_workspace"
     format_str = DATAFORM_WORKSPACE_LINK
-
-    @staticmethod
-    def persist(
-        operator_instance: BaseOperator,
-        context: Context,
-        project_id: str,
-        region: str,
-        repository_id: str,
-        workspace_id: str,
-    ) -> None:
-        operator_instance.xcom_push(
-            context=context,
-            key=DataformWorkspaceLink.key,
-            value={
-                "project_id": project_id,
-                "region": region,
-                "repository_id": repository_id,
-                "workspace_id": workspace_id,
-            },
-        )

airflow/providers/google/cloud/links/datafusion.py

@@ -19,21 +19,7 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, ClassVar
-
-from airflow.providers.google.version_compat import AIRFLOW_V_3_0_PLUS
-
-if AIRFLOW_V_3_0_PLUS:
-    from airflow.sdk import BaseOperatorLink
-    from airflow.sdk.execution_time.xcom import XCom
-else:
-    from airflow.models import XCom  # type: ignore[no-redef]
-    from airflow.models.baseoperatorlink import BaseOperatorLink  # type: ignore[no-redef]
-
-if TYPE_CHECKING:
-    from airflow.models import BaseOperator
-    from airflow.models.taskinstancekey import TaskInstanceKey
-    from airflow.utils.context import Context
+from airflow.providers.google.cloud.links.base import BaseGoogleLink
 
 BASE_LINK = "https://console.cloud.google.com/data-fusion"
 DATAFUSION_INSTANCE_LINK = BASE_LINK + "/locations/{region}/instances/{instance_name}?project={project_id}"
@@ -41,35 +27,6 @@ DATAFUSION_PIPELINES_LINK = "{uri}/cdap/ns/{namespace}/pipelines"
 DATAFUSION_PIPELINE_LINK = "{uri}/pipelines/ns/{namespace}/view/{pipeline_name}"
 
 
-class BaseGoogleLink(BaseOperatorLink):
-    """
-    Link for Google operators.
-
-    Prevent adding ``https://console.cloud.google.com`` in front of every link
-    where URI is used.
-    """
-
-    name: ClassVar[str]
-    key: ClassVar[str]
-    format_str: ClassVar[str]
-
-    def get_link(
-        self,
-        operator: BaseOperator,
-        *,
-        ti_key: TaskInstanceKey,
-    ) -> str:
-        conf = XCom.get_value(key=self.key, ti_key=ti_key)
-
-        if not conf:
-            return ""
-
-        # Add a default value for the 'namespace' parameter for backward compatibility.
-        conf.setdefault("namespace", "default")
-
-        return self.format_str.format(**conf)
-
-
 class DataFusionInstanceLink(BaseGoogleLink):
     """Helper class for constructing Data Fusion Instance link."""
 
@@ -77,24 +34,6 @@ class DataFusionInstanceLink(BaseGoogleLink):
     key = "instance_conf"
     format_str = DATAFUSION_INSTANCE_LINK
 
-    @staticmethod
-    def persist(
-        context: Context,
-        task_instance: BaseOperator,
-        location: str,
-        instance_name: str,
-        project_id: str,
-    ):
-        task_instance.xcom_push(
-            context=context,
-            key=DataFusionInstanceLink.key,
-            value={
-                "region": location,
-                "instance_name": instance_name,
-                "project_id": project_id,
-            },
-        )
-
 
 class DataFusionPipelineLink(BaseGoogleLink):
     """Helper class for constructing Data Fusion Pipeline link."""
@@ -103,24 +42,6 @@ class DataFusionPipelineLink(BaseGoogleLink):
     key = "pipeline_conf"
     format_str = DATAFUSION_PIPELINE_LINK
 
-    @staticmethod
-    def persist(
-        context: Context,
-        task_instance: BaseOperator,
-        uri: str,
-        pipeline_name: str,
-        namespace: str,
-    ):
-        task_instance.xcom_push(
-            context=context,
-            key=DataFusionPipelineLink.key,
-            value={
-                "uri": uri,
-                "pipeline_name": pipeline_name,
-                "namespace": namespace,
-            },
-        )
-
 
 class DataFusionPipelinesLink(BaseGoogleLink):
     """Helper class for constructing list of Data Fusion Pipelines link."""
@@ -128,19 +49,3 @@ class DataFusionPipelinesLink(BaseGoogleLink):
     name = "Data Fusion Pipelines List"
     key = "pipelines_conf"
     format_str = DATAFUSION_PIPELINES_LINK
-
-    @staticmethod
-    def persist(
-        context: Context,
-        task_instance: BaseOperator,
-        uri: str,
-        namespace: str,
-    ):
-        task_instance.xcom_push(
-            context=context,
-            key=DataFusionPipelinesLink.key,
-            value={
-                "uri": uri,
-                "namespace": namespace,
-            },
-        )

airflow/providers/google/cloud/links/dataplex.py

@@ -19,13 +19,8 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
-
 from airflow.providers.google.cloud.links.base import BaseGoogleLink
 
-if TYPE_CHECKING:
-    from airflow.utils.context import Context
-
 DATAPLEX_BASE_LINK = "/dataplex/process/tasks"
 DATAPLEX_TASK_LINK = DATAPLEX_BASE_LINK + "/{lake_id}.{task_id};location={region}/jobs?project={project_id}"
 DATAPLEX_TASKS_LINK = DATAPLEX_BASE_LINK + "?project={project_id}&qLake={lake_id}.{region}"
@@ -53,22 +48,6 @@ class DataplexTaskLink(BaseGoogleLink):
     key = "task_conf"
     format_str = DATAPLEX_TASK_LINK
 
-    @staticmethod
-    def persist(
-        context: Context,
-        task_instance,
-    ):
-        task_instance.xcom_push(
-            context=context,
-            key=DataplexTaskLink.key,
-            value={
-                "lake_id": task_instance.lake_id,
-                "task_id": task_instance.dataplex_task_id,
-                "region": task_instance.region,
-                "project_id": task_instance.project_id,
-            },
-        )
-
 
 class DataplexTasksLink(BaseGoogleLink):
     """Helper class for constructing Dataplex Tasks link."""
@@ -77,21 +56,6 @@ class DataplexTasksLink(BaseGoogleLink):
     key = "tasks_conf"
     format_str = DATAPLEX_TASKS_LINK
 
-    @staticmethod
-    def persist(
-        context: Context,
-        task_instance,
-    ):
-        task_instance.xcom_push(
-            context=context,
-            key=DataplexTasksLink.key,
-            value={
-                "project_id": task_instance.project_id,
-                "lake_id": task_instance.lake_id,
-                "region": task_instance.region,
-            },
-        )
-
 
 class DataplexLakeLink(BaseGoogleLink):
     """Helper class for constructing Dataplex Lake link."""
@@ -100,21 +64,6 @@ class DataplexLakeLink(BaseGoogleLink):
     key = "dataplex_lake_key"
     format_str = DATAPLEX_LAKE_LINK
 
-    @staticmethod
-    def persist(
-        context: Context,
-        task_instance,
-    ):
-        task_instance.xcom_push(
-            context=context,
-            key=DataplexLakeLink.key,
-            value={
-                "lake_id": task_instance.lake_id,
-                "region": task_instance.region,
-                "project_id": task_instance.project_id,
-            },
-        )
-
 
 class DataplexCatalogEntryGroupLink(BaseGoogleLink):
     """Helper class for constructing Dataplex Catalog EntryGroup link."""
@@ -123,21 +72,6 @@ class DataplexCatalogEntryGroupLink(BaseGoogleLink):
     key = "dataplex_catalog_entry_group_key"
     format_str = DATAPLEX_CATALOG_ENTRY_GROUP_LINK
 
-    @staticmethod
-    def persist(
-        context: Context,
-        task_instance,
-    ):
-        task_instance.xcom_push(
-            context=context,
-            key=DataplexCatalogEntryGroupLink.key,
-            value={
-                "entry_group_id": task_instance.entry_group_id,
-                "location": task_instance.location,
-                "project_id": task_instance.project_id,
-            },
-        )
-
 
 class DataplexCatalogEntryGroupsLink(BaseGoogleLink):
     """Helper class for constructing Dataplex Catalog EntryGroups link."""
@@ -146,20 +80,6 @@ class DataplexCatalogEntryGroupsLink(BaseGoogleLink):
     key = "dataplex_catalog_entry_groups_key"
     format_str = DATAPLEX_CATALOG_ENTRY_GROUPS_LINK
 
-    @staticmethod
-    def persist(
-        context: Context,
-        task_instance,
-    ):
-        task_instance.xcom_push(
-            context=context,
-            key=DataplexCatalogEntryGroupsLink.key,
-            value={
-                "location": task_instance.location,
-                "project_id": task_instance.project_id,
-            },
-        )
-
 
 class DataplexCatalogEntryTypeLink(BaseGoogleLink):
     """Helper class for constructing Dataplex Catalog EntryType link."""
@@ -168,21 +88,6 @@ class DataplexCatalogEntryTypeLink(BaseGoogleLink):
     key = "dataplex_catalog_entry_type_key"
     format_str = DATAPLEX_CATALOG_ENTRY_TYPE_LINK
 
-    @staticmethod
-    def persist(
-        context: Context,
-        task_instance,
-    ):
-        task_instance.xcom_push(
-            context=context,
-            key=DataplexCatalogEntryTypeLink.key,
-            value={
-                "entry_type_id": task_instance.entry_type_id,
-                "location": task_instance.location,
-                "project_id": task_instance.project_id,
-            },
-        )
-
 
 class DataplexCatalogEntryTypesLink(BaseGoogleLink):
     """Helper class for constructing Dataplex Catalog EntryTypes link."""
@@ -191,20 +96,6 @@ class DataplexCatalogEntryTypesLink(BaseGoogleLink):
     key = "dataplex_catalog_entry_types_key"
     format_str = DATAPLEX_CATALOG_ENTRY_TYPES_LINK
 
-    @staticmethod
-    def persist(
-        context: Context,
-        task_instance,
-    ):
-        task_instance.xcom_push(
-            context=context,
-            key=DataplexCatalogEntryTypesLink.key,
-            value={
-                "location": task_instance.location,
-                "project_id": task_instance.project_id,
-            },
-        )
-
 
 class DataplexCatalogAspectTypeLink(BaseGoogleLink):
     """Helper class for constructing Dataplex Catalog AspectType link."""
@@ -213,21 +104,6 @@ class DataplexCatalogAspectTypeLink(BaseGoogleLink):
     key = "dataplex_catalog_aspect_type_key"
     format_str = DATAPLEX_CATALOG_ASPECT_TYPE_LINK
 
-    @staticmethod
-    def persist(
-        context: Context,
-        task_instance,
-    ):
-        task_instance.xcom_push(
-            context=context,
-            key=DataplexCatalogAspectTypeLink.key,
-            value={
-                "aspect_type_id": task_instance.aspect_type_id,
-                "location": task_instance.location,
-                "project_id": task_instance.project_id,
-            },
-        )
-
 
 class DataplexCatalogAspectTypesLink(BaseGoogleLink):
     """Helper class for constructing Dataplex Catalog AspectTypes link."""
@@ -236,20 +112,6 @@ class DataplexCatalogAspectTypesLink(BaseGoogleLink):
     key = "dataplex_catalog_aspect_types_key"
     format_str = DATAPLEX_CATALOG_ASPECT_TYPES_LINK
 
-    @staticmethod
-    def persist(
-        context: Context,
-        task_instance,
-    ):
-        task_instance.xcom_push(
-            context=context,
-            key=DataplexCatalogAspectTypesLink.key,
-            value={
-                "location": task_instance.location,
-                "project_id": task_instance.project_id,
-            },
-        )
-
 
 class DataplexCatalogEntryLink(BaseGoogleLink):
     """Helper class for constructing Dataplex Catalog Entry link."""
@@ -257,19 +119,3 @@ class DataplexCatalogEntryLink(BaseGoogleLink):
     name = "Dataplex Catalog Entry"
     key = "dataplex_catalog_entry_key"
     format_str = DATAPLEX_CATALOG_ENTRY_LINK
-
-    @staticmethod
-    def persist(
-        context: Context,
-        task_instance,
-    ):
-        task_instance.xcom_push(
-            context=context,
-            key=DataplexCatalogEntryLink.key,
-            value={
-                "entry_id": task_instance.entry_id,
-                "entry_group_id": task_instance.entry_group_id,
-                "location": task_instance.location,
-                "project_id": task_instance.project_id,
-            },
-        )

airflow/providers/google/cloud/links/dataprep.py

@@ -16,13 +16,8 @@
 # under the License.
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
-
 from airflow.providers.google.cloud.links.base import BaseGoogleLink
 
-if TYPE_CHECKING:
-    from airflow.utils.context import Context
-
 BASE_LINK = "https://clouddataprep.com"
 DATAPREP_FLOW_LINK = BASE_LINK + "/flows/{flow_id}?projectId={project_id}"
 DATAPREP_JOB_GROUP_LINK = BASE_LINK + "/jobs/{job_group_id}?projectId={project_id}"
@@ -35,14 +30,6 @@ class DataprepFlowLink(BaseGoogleLink):
     key = "dataprep_flow_page"
     format_str = DATAPREP_FLOW_LINK
 
-    @staticmethod
-    def persist(context: Context, task_instance, project_id: str, flow_id: int):
-        task_instance.xcom_push(
-            context=context,
-            key=DataprepFlowLink.key,
-            value={"project_id": project_id, "flow_id": flow_id},
-        )
-
 
 class DataprepJobGroupLink(BaseGoogleLink):
     """Helper class for constructing Dataprep job group link."""
@@ -50,14 +37,3 @@ class DataprepJobGroupLink(BaseGoogleLink):
     name = "Job group details page"
     key = "dataprep_job_group_page"
     format_str = DATAPREP_JOB_GROUP_LINK
-
-    @staticmethod
-    def persist(context: Context, task_instance, project_id: str, job_group_id: int):
-        task_instance.xcom_push(
-            context=context,
-            key=DataprepJobGroupLink.key,
-            value={
-                "project_id": project_id,
-                "job_group_id": job_group_id,
-            },
-        )

airflow/providers/google/cloud/links/dataproc.py

@@ -26,19 +26,20 @@ import attr
 
 from airflow.exceptions import AirflowProviderDeprecationWarning
 from airflow.providers.google.cloud.links.base import BASE_LINK, BaseGoogleLink
-from airflow.providers.google.version_compat import AIRFLOW_V_3_0_PLUS
+from airflow.providers.google.version_compat import (
+    AIRFLOW_V_3_0_PLUS,
+    BaseOperator,
+    BaseOperatorLink,
+)
 
 if TYPE_CHECKING:
-    from airflow.models import BaseOperator
     from airflow.models.taskinstancekey import TaskInstanceKey
     from airflow.utils.context import Context
 
 if AIRFLOW_V_3_0_PLUS:
-    from airflow.sdk import BaseOperatorLink
     from airflow.sdk.execution_time.xcom import XCom
 else:
-    from airflow.models import XCom  # type: ignore[no-redef]
-    from airflow.models.baseoperatorlink import BaseOperatorLink  # type: ignore[no-redef]
+    from airflow.models.xcom import XCom  # type: ignore[no-redef]
 
 
 def __getattr__(name: str) -> Any:
@@ -94,16 +95,16 @@ class DataprocLink(BaseOperatorLink):
     @staticmethod
     def persist(
         context: Context,
-        task_instance,
         url: str,
         resource: str,
+        region: str,
+        project_id: str,
     ):
-        task_instance.xcom_push(
-            context=context,
+        context["task_instance"].xcom_push(
             key=DataprocLink.key,
             value={
-                "region": task_instance.region,
-                "project_id": task_instance.project_id,
+                "region": region,
+                "project_id": project_id,
                 "url": url,
                 "resource": resource,
             },
@@ -147,14 +148,13 @@ class DataprocListLink(BaseOperatorLink):
     @staticmethod
     def persist(
         context: Context,
-        task_instance,
         url: str,
+        project_id: str,
     ):
-        task_instance.xcom_push(
-            context=context,
+        context["task_instance"].xcom_push(
             key=DataprocListLink.key,
             value={
-                "project_id": task_instance.project_id,
+                "project_id": project_id,
                 "url": url,
             },
         )
@@ -189,20 +189,6 @@ class DataprocClusterLink(BaseGoogleLink):
     key = "dataproc_cluster"
     format_str = DATAPROC_CLUSTER_LINK
 
-    @staticmethod
-    def persist(
-        context: Context,
-        operator: BaseOperator,
-        cluster_id: str,
-        region: str,
-        project_id: str,
-    ):
-        operator.xcom_push(
-            context,
-            key=DataprocClusterLink.key,
-            value={"cluster_id": cluster_id, "region": region, "project_id": project_id},
-        )
-
 
 class DataprocJobLink(BaseGoogleLink):
     """Helper class for constructing Dataproc Job Link."""
@@ -211,20 +197,6 @@ class DataprocJobLink(BaseGoogleLink):
     key = "dataproc_job"
     format_str = DATAPROC_JOB_LINK
 
-    @staticmethod
-    def persist(
-        context: Context,
-        operator: BaseOperator,
-        job_id: str,
-        region: str,
-        project_id: str,
-    ):
-        operator.xcom_push(
-            context,
-            key=DataprocJobLink.key,
-            value={"job_id": job_id, "region": region, "project_id": project_id},
-        )
-
 
 class DataprocWorkflowLink(BaseGoogleLink):
     """Helper class for constructing Dataproc Workflow Link."""
@@ -233,14 +205,6 @@ class DataprocWorkflowLink(BaseGoogleLink):
     key = "dataproc_workflow"
     format_str = DATAPROC_WORKFLOW_LINK
 
-    @staticmethod
-    def persist(context: Context, operator: BaseOperator, workflow_id: str, project_id: str, region: str):
-        operator.xcom_push(
-            context,
-            key=DataprocWorkflowLink.key,
-            value={"workflow_id": workflow_id, "region": region, "project_id": project_id},
-        )
-
 
 class DataprocWorkflowTemplateLink(BaseGoogleLink):
     """Helper class for constructing Dataproc Workflow Template Link."""
@@ -249,20 +213,6 @@ class DataprocWorkflowTemplateLink(BaseGoogleLink):
     key = "dataproc_workflow_template"
     format_str = DATAPROC_WORKFLOW_TEMPLATE_LINK
 
-    @staticmethod
-    def persist(
-        context: Context,
-        operator: BaseOperator,
-        workflow_template_id: str,
-        project_id: str,
-        region: str,
-    ):
-        operator.xcom_push(
-            context,
-            key=DataprocWorkflowTemplateLink.key,
-            value={"workflow_template_id": workflow_template_id, "region": region, "project_id": project_id},
-        )
-
 
 class DataprocBatchLink(BaseGoogleLink):
     """Helper class for constructing Dataproc Batch Link."""
@@ -271,20 +221,6 @@ class DataprocBatchLink(BaseGoogleLink):
     key = "dataproc_batch"
     format_str = DATAPROC_BATCH_LINK
 
-    @staticmethod
-    def persist(
-        context: Context,
-        operator: BaseOperator,
-        batch_id: str,
-        project_id: str,
-        region: str,
-    ):
-        operator.xcom_push(
-            context,
-            key=DataprocBatchLink.key,
-            value={"batch_id": batch_id, "region": region, "project_id": project_id},
-        )
-
 
 class DataprocBatchesListLink(BaseGoogleLink):
     """Helper class for constructing Dataproc Batches List Link."""
@@ -292,15 +228,3 @@ class DataprocBatchesListLink(BaseGoogleLink):
     name = "Dataproc Batches List"
     key = "dataproc_batches_list"
     format_str = DATAPROC_BATCHES_LINK
-
-    @staticmethod
-    def persist(
-        context: Context,
-        operator: BaseOperator,
-        project_id: str,
-    ):
-        operator.xcom_push(
-            context,
-            key=DataprocBatchesListLink.key,
-            value={"project_id": project_id},
-        )