apache-airflow-providers-google 15.0.1__py3-none-any.whl → 15.1.0rc1__py3-none-any.whl

airflow/providers/google/cloud/sensors/pubsub.py

@@ -168,20 +168,19 @@ class PubSubPullSensor(BaseSensorOperator):
         if not self.deferrable:
             super().execute(context)
             return self._return_value
-        else:
-            self.defer(
-                timeout=timedelta(seconds=self.timeout),
-                trigger=PubsubPullTrigger(
-                    project_id=self.project_id,
-                    subscription=self.subscription,
-                    max_messages=self.max_messages,
-                    ack_messages=self.ack_messages,
-                    poke_interval=self.poke_interval,
-                    gcp_conn_id=self.gcp_conn_id,
-                    impersonation_chain=self.impersonation_chain,
-                ),
-                method_name="execute_complete",
-            )
+        self.defer(
+            timeout=timedelta(seconds=self.timeout),
+            trigger=PubsubPullTrigger(
+                project_id=self.project_id,
+                subscription=self.subscription,
+                max_messages=self.max_messages,
+                ack_messages=self.ack_messages,
+                poke_interval=self.poke_interval,
+                gcp_conn_id=self.gcp_conn_id,
+                impersonation_chain=self.impersonation_chain,
+            ),
+            method_name="execute_complete",
+        )
 
     def execute_complete(self, context: Context, event: dict[str, str | list[str]]) -> Any:
         """If messages_callback is provided, execute it; otherwise, return immediately with trigger event message."""

airflow/providers/google/cloud/transfers/bigquery_to_gcs.py

@@ -241,14 +241,13 @@ class BigQueryToGCSOperator(BaseOperator):
                     f"want to force rerun it consider setting `force_rerun=True`."
                     f"Or, if you want to reattach in this scenario add {job.state} to `reattach_states`"
                 )
-            else:
-                # Job already reached state DONE
-                if job.state == "DONE":
-                    raise AirflowException("Job is already in state DONE. Can not reattach to this job.")
-
-                # We are reattaching to a job
-                self.log.info("Reattaching to existing Job in state %s", job.state)
-                self._handle_job_error(job)
+            # Job already reached state DONE
+            if job.state == "DONE":
+                raise AirflowException("Job is already in state DONE. Can not reattach to this job.")
+
+            # We are reattaching to a job
+            self.log.info("Reattaching to existing Job in state %s", job.state)
+            self._handle_job_error(job)
 
         self.job_id = job.job_id
         conf = job.to_api_repr()["configuration"]["extract"]["sourceTable"]

airflow/providers/google/cloud/transfers/cassandra_to_gcs.py

@@ -261,29 +261,27 @@ class CassandraToGCSOperator(BaseOperator):
         """Convert value to BQ type."""
         if not value or isinstance(value, (str, int, float, bool, dict)):
             return value
-        elif isinstance(value, bytes):
+        if isinstance(value, bytes):
             return b64encode(value).decode("ascii")
-        elif isinstance(value, UUID):
+        if isinstance(value, UUID):
             if self.encode_uuid:
                 return b64encode(value.bytes).decode("ascii")
-            else:
-                return str(value)
-        elif isinstance(value, (datetime, Date)):
             return str(value)
-        elif isinstance(value, Decimal):
+        if isinstance(value, (datetime, Date)):
+            return str(value)
+        if isinstance(value, Decimal):
             return float(value)
-        elif isinstance(value, Time):
+        if isinstance(value, Time):
             return str(value).split(".")[0]
-        elif isinstance(value, (list, SortedSet)):
+        if isinstance(value, (list, SortedSet)):
             return self.convert_array_types(value)
-        elif hasattr(value, "_fields"):
+        if hasattr(value, "_fields"):
             return self.convert_user_type(value)
-        elif isinstance(value, tuple):
+        if isinstance(value, tuple):
             return self.convert_tuple_type(value)
-        elif isinstance(value, OrderedMapSerializedKey):
+        if isinstance(value, OrderedMapSerializedKey):
             return self.convert_map_type(value)
-        else:
-            raise AirflowException(f"Unexpected value: {value}")
+        raise AirflowException(f"Unexpected value: {value}")
 
     def convert_array_types(self, value: list[Any] | SortedSet) -> list[Any]:
         """Map convert_value over array."""
@@ -376,19 +374,17 @@ class CassandraToGCSOperator(BaseOperator):
         """Convert type to equivalent BQ type."""
         if cls.is_simple_type(type_):
             return CassandraToGCSOperator.CQL_TYPE_MAP[type_.cassname]
-        elif cls.is_record_type(type_):
+        if cls.is_record_type(type_):
             return "RECORD"
-        elif cls.is_array_type(type_):
+        if cls.is_array_type(type_):
             return cls.get_bq_type(type_.subtypes[0])
-        else:
-            raise AirflowException("Not a supported type_: " + type_.cassname)
+        raise AirflowException("Not a supported type_: " + type_.cassname)
 
     @classmethod
     def get_bq_mode(cls, type_: Any) -> str:
         """Convert type to equivalent BQ mode."""
         if cls.is_array_type(type_) or type_.cassname == "MapType":
             return "REPEATED"
-        elif cls.is_record_type(type_) or cls.is_simple_type(type_):
+        if cls.is_record_type(type_) or cls.is_simple_type(type_):
             return "NULLABLE"
-        else:
-            raise AirflowException("Not a supported type_: " + type_.cassname)
+        raise AirflowException("Not a supported type_: " + type_.cassname)

airflow/providers/google/cloud/transfers/facebook_ads_to_gcs.py

@@ -157,8 +157,7 @@ class FacebookAdsReportToGcsOperator(BaseOperator):
     def _generate_rows_with_action(self, type_check: bool):
         if type_check and self.upload_as_account:
             return {FlushAction.EXPORT_EVERY_ACCOUNT: []}
-        else:
-            return {FlushAction.EXPORT_ONCE: []}
+        return {FlushAction.EXPORT_ONCE: []}
 
     def _prepare_rows_for_upload(
         self,

airflow/providers/google/cloud/transfers/gcs_to_bigquery.py

@@ -58,6 +58,7 @@ ALLOWED_FORMATS = [
     "GOOGLE_SHEETS",
     "DATASTORE_BACKUP",
     "PARQUET",
+    "ORC",
 ]
 
 
@@ -262,8 +263,7 @@ class GCSToBigQueryOperator(BaseOperator):
                 f"{source_format} is not a valid source format. "
                 f"Please use one of the following types: {ALLOWED_FORMATS}."
             )
-        else:
-            self.source_format = source_format.upper()
+        self.source_format = source_format.upper()
         self.compression = compression
         self.create_disposition = create_disposition
         self.skip_leading_rows = skip_leading_rows
@@ -406,14 +406,13 @@ class GCSToBigQueryOperator(BaseOperator):
                         f"want to force rerun it consider setting `force_rerun=True`."
                         f"Or, if you want to reattach in this scenario add {job.state} to `reattach_states`"
                     )
-                else:
-                    # Job already reached state DONE
-                    if job.state == "DONE":
-                        raise AirflowException("Job is already in state DONE. Can not reattach to this job.")
+                # Job already reached state DONE
+                if job.state == "DONE":
+                    raise AirflowException("Job is already in state DONE. Can not reattach to this job.")
 
-                    # We are reattaching to a job
-                    self.log.info("Reattaching to existing Job in state %s", job.state)
-                    self._handle_job_error(job)
+                # We are reattaching to a job
+                self.log.info("Reattaching to existing Job in state %s", job.state)
+                self._handle_job_error(job)
 
             job_types = {
                 LoadJob._JOB_TYPE: ["sourceTable", "destinationTable"],
@@ -506,8 +505,7 @@ class GCSToBigQueryOperator(BaseOperator):
                         f"Could not determine MAX value in column {self.max_id_key} "
                         f"since the default value of 'string_field_n' was set by BQ"
                     )
-                else:
-                    raise AirflowException(e.message)
+                raise AirflowException(e.message)
             if rows:
                 for row in rows:
                     max_id = row[0] if row[0] else 0
@@ -644,11 +642,10 @@ class GCSToBigQueryOperator(BaseOperator):
                     "allowed if write_disposition is "
                     "'WRITE_APPEND' or 'WRITE_TRUNCATE'."
                 )
-            else:
-                # To provide backward compatibility
-                self.schema_update_options = list(self.schema_update_options or [])
-                self.log.info("Adding experimental 'schemaUpdateOptions': %s", self.schema_update_options)
-                self.configuration["load"]["schemaUpdateOptions"] = self.schema_update_options
+            # To provide backward compatibility
+            self.schema_update_options = list(self.schema_update_options or [])
+            self.log.info("Adding experimental 'schemaUpdateOptions': %s", self.schema_update_options)
+            self.configuration["load"]["schemaUpdateOptions"] = self.schema_update_options
 
         if self.max_bad_records:
             self.configuration["load"]["maxBadRecords"] = self.max_bad_records
@@ -680,6 +677,7 @@ class GCSToBigQueryOperator(BaseOperator):
             "NEWLINE_DELIMITED_JSON": ["autodetect", "ignoreUnknownValues"],
             "PARQUET": ["autodetect", "ignoreUnknownValues"],
             "AVRO": ["useAvroLogicalTypes"],
+            "ORC": ["autodetect"],
         }
 
         valid_configs = src_fmt_to_configs_mapping[self.source_format]

airflow/providers/google/cloud/transfers/postgres_to_gcs.py

@@ -57,9 +57,8 @@ class _PostgresServerSideCursorDecorator:
     def __next__(self):
         if self.rows:
             return self.rows.pop()
-        else:
-            self.initialized = True
-            return next(self.cursor)
+        self.initialized = True
+        return next(self.cursor)
 
     @property
     def description(self):

airflow/providers/google/cloud/utils/bigquery.py

@@ -27,16 +27,15 @@ def bq_cast(string_field: str, bq_type: str) -> None | int | float | bool | str:
     """
     if string_field is None:
         return None
-    elif bq_type == "INTEGER":
+    if bq_type == "INTEGER":
         return int(string_field)
-    elif bq_type in ("FLOAT", "TIMESTAMP"):
+    if bq_type in ("FLOAT", "TIMESTAMP"):
         return float(string_field)
-    elif bq_type == "BOOLEAN":
+    if bq_type == "BOOLEAN":
         if string_field not in ["true", "false"]:
             raise ValueError(f"{string_field} must have value 'true' or 'false'")
         return string_field == "true"
-    else:
-        return string_field
+    return string_field
 
 
 def convert_job_id(job_id: str | list[str], project_id: str, location: str | None) -> Any:
@@ -51,5 +50,4 @@ def convert_job_id(job_id: str | list[str], project_id: str, location: str | Non
     location = location or "US"
     if isinstance(job_id, list):
         return [f"{project_id}:{location}:{i}" for i in job_id]
-    else:
-        return f"{project_id}:{location}:{job_id}"
+    return f"{project_id}:{location}:{job_id}"

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

@@ -202,7 +202,7 @@ def make_initialization_workspace_flow(
 def define_default_location(region: str) -> DataformLocations:
     if "us" in region:
         return DataformLocations.US
-    elif "europe" in region:
+    if "europe" in region:
         return DataformLocations.EUROPE
 
     regions_mapping: Mapping[str, DataformLocations] = {}

airflow/providers/google/common/hooks/base_google.py

@@ -156,7 +156,7 @@ T = TypeVar("T", bound=Callable)
 RT = TypeVar("RT")
 
 
-def get_field(extras: dict, field_name: str):
+def get_field(extras: dict, field_name: str) -> str | None:
     """Get field from extra, first checking short name, then for backcompat we check for prefixed name."""
     if field_name.startswith("extra__"):
         raise ValueError(

airflow/providers/google/common/hooks/operation_helpers.py

@@ -22,7 +22,6 @@ from __future__ import annotations
 from typing import TYPE_CHECKING
 
 from google.api_core.exceptions import GoogleAPICallError
-from google.api_core.gapic_v1.method import DEFAULT, _MethodDefault
 
 from airflow.exceptions import AirflowException
 
@@ -38,7 +37,7 @@ class OperationHelper:
     @staticmethod
     def wait_for_operation_result(
         operation: Operation,
-        timeout: int | None | _MethodDefault = DEFAULT,
+        timeout: int | None = None,
         polling: Retry | None = None,
         retry: Retry | None = None,
     ) -> Message:

airflow/providers/google/common/utils/id_token_credentials.py

@@ -111,7 +111,7 @@ def _load_credentials_from_file(
 
         return current_credentials
 
-    elif credential_type == _SERVICE_ACCOUNT_TYPE:
+    if credential_type == _SERVICE_ACCOUNT_TYPE:
         try:
             return service_account.IDTokenCredentials.from_service_account_info(
                 info, target_audience=target_audience

airflow/providers/google/leveldb/hooks/leveldb.py

@@ -96,18 +96,17 @@ class LevelDBHook(BaseHook):
             if not value:
                 raise ValueError("Please provide `value`!")
             return self.put(key, value)
-        elif command == "get":
+        if command == "get":
             return self.get(key)
-        elif command == "delete":
+        if command == "delete":
             return self.delete(key)
-        elif command == "write_batch":
+        if command == "write_batch":
             if not keys:
                 raise ValueError("Please provide `keys`!")
             if not values:
                 raise ValueError("Please provide `values`!")
             return self.write_batch(keys, values)
-        else:
-            raise LevelDBHookException("Unknown command for LevelDB hook")
+        raise LevelDBHookException("Unknown command for LevelDB hook")
 
     def put(self, key: bytes, value: bytes):
         """

{apache_airflow_providers_google-15.0.1.dist-info → apache_airflow_providers_google-15.1.0rc1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apache-airflow-providers-google
-Version: 15.0.1
+Version: 15.1.0rc1
 Summary: Provider package apache-airflow-providers-google for Apache Airflow
 Keywords: airflow-provider,google,airflow,integration
 Author-email: Apache Software Foundation <dev@airflow.apache.org>
@@ -20,9 +20,9 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: System :: Monitoring
-Requires-Dist: apache-airflow>=2.9.0
-Requires-Dist: apache-airflow-providers-common-compat>=1.4.0
-Requires-Dist: apache-airflow-providers-common-sql>=1.20.0
+Requires-Dist: apache-airflow>=2.9.0rc0
+Requires-Dist: apache-airflow-providers-common-compat>=1.4.0rc0
+Requires-Dist: apache-airflow-providers-common-sql>=1.20.0rc0
 Requires-Dist: asgiref>=3.5.2
 Requires-Dist: dill>=0.2.3
 Requires-Dist: gcloud-aio-auth>=5.2.0
@@ -108,8 +108,8 @@ Requires-Dist: apache-airflow-providers-sftp ; extra == "sftp"
 Requires-Dist: apache-airflow-providers-ssh ; extra == "ssh"
 Requires-Dist: apache-airflow-providers-trino ; extra == "trino"
 Project-URL: Bug Tracker, https://github.com/apache/airflow/issues
-Project-URL: Changelog, https://airflow.apache.org/docs/apache-airflow-providers-google/15.0.1/changelog.html
-Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-google/15.0.1
+Project-URL: Changelog, https://airflow.apache.org/docs/apache-airflow-providers-google/15.1.0/changelog.html
+Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-google/15.1.0
 Project-URL: Mastodon, https://fosstodon.org/@airflow
 Project-URL: Slack Chat, https://s.apache.org/airflow-slack
 Project-URL: Source Code, https://github.com/apache/airflow
@@ -158,7 +158,7 @@ Provides-Extra: trino
 
 Package ``apache-airflow-providers-google``
 
-Release: ``15.0.1``
+Release: ``15.1.0``
 
 
 Google services including:
@@ -178,7 +178,7 @@ This is a provider package for ``google`` provider. All classes for this provide
 are in ``airflow.providers.google`` python package.
 
 You can find package information and changelog for the provider
-in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-google/15.0.1/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-google/15.1.0/>`_.
 
 Installation
 ------------
@@ -302,5 +302,5 @@ Dependent package
 ========================================================================================================================  ====================
 
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-google/15.0.1/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-google/15.1.0/changelog.html>`_.