This is an automated email from the ASF dual-hosted git repository.
jscheffl pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new 5484b7b6244 Bugfix typing after google-ads release 26.0.0 release
(#47471)
5484b7b6244 is described below
commit 5484b7b624471fb368c2e7ab6f6984daa08e36dc
Author: Jens Scheffler <[email protected]>
AuthorDate: Fri Mar 7 00:07:36 2025 +0100
Bugfix typing after google-ads release 26.0.0 release (#47471)
---
generated/provider_dependencies.json | 2 +-
providers/google/README.rst | 2 +-
providers/google/pyproject.toml | 2 +-
providers/google/src/airflow/providers/google/ads/hooks/ads.py | 10 +++++-----
.../google/src/airflow/providers/google/get_provider_info.py | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/generated/provider_dependencies.json
b/generated/provider_dependencies.json
index 3ca5a48d108..264fe73a06c 100644
--- a/generated/provider_dependencies.json
+++ b/generated/provider_dependencies.json
@@ -655,7 +655,7 @@
"gcloud-aio-bigquery>=6.1.2",
"gcloud-aio-storage>=9.0.0",
"gcsfs>=2023.10.0",
- "google-ads>=25.1.0",
+ "google-ads>=26.0.0",
"google-analytics-admin>=0.9.0",
"google-api-core>=2.11.0,!=2.16.0,!=2.18.0",
"google-api-python-client>=2.0.2",
diff --git a/providers/google/README.rst b/providers/google/README.rst
index 1f8b3e74a4f..afc2ab6fe01 100644
--- a/providers/google/README.rst
+++ b/providers/google/README.rst
@@ -69,7 +69,7 @@ PIP package Version required
``gcloud-aio-bigquery`` ``>=6.1.2``
``gcloud-aio-storage`` ``>=9.0.0``
``gcsfs`` ``>=2023.10.0``
-``google-ads`` ``>=25.1.0``
+``google-ads`` ``>=26.0.0``
``google-analytics-admin`` ``>=0.9.0``
``google-api-core`` ``>=2.11.0,!=2.16.0,!=2.18.0``
``google-api-python-client`` ``>=2.0.2``
diff --git a/providers/google/pyproject.toml b/providers/google/pyproject.toml
index 8144dff413f..8f7aef3acf9 100644
--- a/providers/google/pyproject.toml
+++ b/providers/google/pyproject.toml
@@ -66,7 +66,7 @@ dependencies = [
"gcloud-aio-bigquery>=6.1.2",
"gcloud-aio-storage>=9.0.0",
"gcsfs>=2023.10.0",
- "google-ads>=25.1.0",
+ "google-ads>=26.0.0",
"google-analytics-admin>=0.9.0",
# Google-api-core 2.16.0 back-compat issue:
# - https://github.com/googleapis/python-api-core/issues/576
diff --git a/providers/google/src/airflow/providers/google/ads/hooks/ads.py
b/providers/google/src/airflow/providers/google/ads/hooks/ads.py
index c1d35a613a2..8654fb0a4b8 100644
--- a/providers/google/src/airflow/providers/google/ads/hooks/ads.py
+++ b/providers/google/src/airflow/providers/google/ads/hooks/ads.py
@@ -35,8 +35,8 @@ from airflow.providers.google.common.hooks.base_google import
get_field
if TYPE_CHECKING:
from google.ads.googleads.v18.services.services.customer_service import
CustomerServiceClient
from google.ads.googleads.v18.services.services.google_ads_service import
GoogleAdsServiceClient
+ from google.ads.googleads.v18.services.services.google_ads_service.pagers
import SearchPager
from google.ads.googleads.v18.services.types.google_ads_service import
GoogleAdsRow
- from google.api_core.page_iterator import GRPCIterator
class GoogleAdsHook(BaseHook):
@@ -178,7 +178,7 @@ class GoogleAdsHook(BaseHook):
"""
try:
accessible_customers =
self._get_customer_service.list_accessible_customers()
- return accessible_customers.resource_names
+ return list(accessible_customers.resource_names)
except GoogleAdsException as ex:
for error in ex.failure.errors:
self.log.error('\tError with message "%s".', error.message)
@@ -306,11 +306,11 @@ class GoogleAdsHook(BaseHook):
return self._extract_rows(iterators)
- def _extract_rows(self, iterators: list[GRPCIterator]) ->
list[GoogleAdsRow]:
+ def _extract_rows(self, iterators: list[SearchPager]) ->
list[GoogleAdsRow]:
"""
- Convert Google Page Iterator (GRPCIterator) objects to Google Ads Rows.
+ Convert Google Page Iterator (SearchPager) objects to Google Ads Rows.
- :param iterators: List of Google Page Iterator (GRPCIterator) objects
+ :param iterators: List of Google Page Iterator (SearchPager) objects
:return: API response for all clients in the form of Google Ads Row
object(s)
"""
try:
diff --git a/providers/google/src/airflow/providers/google/get_provider_info.py
b/providers/google/src/airflow/providers/google/get_provider_info.py
index 03d5443aba4..c68bfdb337a 100644
--- a/providers/google/src/airflow/providers/google/get_provider_info.py
+++ b/providers/google/src/airflow/providers/google/get_provider_info.py
@@ -1590,7 +1590,7 @@ def get_provider_info():
"gcloud-aio-bigquery>=6.1.2",
"gcloud-aio-storage>=9.0.0",
"gcsfs>=2023.10.0",
- "google-ads>=25.1.0",
+ "google-ads>=26.0.0",
"google-analytics-admin>=0.9.0",
"google-api-core>=2.11.0,!=2.16.0,!=2.18.0",
"google-api-python-client>=2.0.2",
