source-google-ads: upgrade to v17

estuary · Oct 2, 2024 · f3fea97 · f3fea97
1 parent 75c2d46
commit f3fea97
Show file tree

Hide file tree

Showing 11 changed files with 850 additions and 782 deletions.
diff --git a/source-google-ads/acmeCo/ad_group_ad_report.schema.yaml b/source-google-ads/acmeCo/ad_group_ad_report.schema.yaml
@@ -69,9 +69,7 @@ properties:
       - "null"
       - string
   segments.ad_network_type:
-    type:
-      - "null"
-      - string
+    type: string
   ad_group_ad.ad_strength:
     type:
       - "null"
@@ -149,9 +147,7 @@ properties:
       - "null"
       - string
   campaign.id:
-    type:
-      - "null"
-      - integer
+    type: integer
   campaign.name:
     type:
       - "null"
@@ -229,9 +225,7 @@ properties:
       - "null"
       - number
   segments.date:
-    type:
-      - "null"
-      - string
+    type: string
     format: date
   segments.day_of_week:
     type:
@@ -294,9 +288,7 @@ properties:
       - "null"
       - string
   customer.id:
-    type:
-      - "null"
-      - integer
+    type: integer
   ad_group_ad.ad.legacy_responsive_display_ad.format_setting:
     type:
       - "null"
@@ -326,9 +318,7 @@ properties:
       - "null"
       - string
   ad_group_ad.ad.id:
-    type:
-      - "null"
-      - integer
+    type: integer
   ad_group_ad.ad.image_ad.image_url:
     type:
       - "null"

diff --git a/source-google-ads/poetry.lock b/source-google-ads/poetry.lock
diff --git a/source-google-ads/pyproject.toml b/source-google-ads/pyproject.toml
@@ -8,7 +8,8 @@ authors = ["Jonathan Wihl <jonathan@estuary.dev>"]
 airbyte-cdk = "^0.52"
 estuary-cdk = {path="../estuary-cdk", develop = true}
 freezegun = "^1.4.0"
-google-ads = "^23.1.0"
+google-ads = "^25.0.0"
+pydantic = "==1.10.14"
 python = ">=3.11,<3.13"
 types-requests = "^2.31"
 

diff --git a/source-google-ads/source_google_ads/google_ads.py b/source-google-ads/source_google_ads/google_ads.py
@@ -12,7 +12,7 @@
 from airbyte_cdk.models import FailureType
 from airbyte_cdk.utils import AirbyteTracedException
 from google.ads.googleads.client import GoogleAdsClient
-from google.ads.googleads.v15.services.types.google_ads_service import GoogleAdsRow, SearchGoogleAdsResponse
+from google.ads.googleads.v17.services.types.google_ads_service import GoogleAdsRow, SearchGoogleAdsResponse
 from google.api_core.exceptions import ServerError, TooManyRequests
 from google.auth import exceptions
 from proto.marshal.collections import Repeated, RepeatedComposite
@@ -36,7 +36,7 @@
     "geographic_report": "geographic_view",
     "keyword_report": "keyword_view",
 }
-API_VERSION = "v15"
+API_VERSION = "v17"
 logger = logging.getLogger("airbyte")
 
 
@@ -70,7 +70,6 @@ def send_request(self, query: str, customer_id: str) -> Iterator[SearchGoogleAds
         client = self.client
         search_request = client.get_type("SearchGoogleAdsRequest")
         search_request.query = query
-        search_request.page_size = self.DEFAULT_PAGE_SIZE
         search_request.customer_id = customer_id
         return [self.ga_service.search(search_request)]
 

diff --git a/source-google-ads/source_google_ads/source.py b/source-google-ads/source_google_ads/source.py
@@ -12,7 +12,7 @@
 from airbyte_cdk.sources.streams import Stream
 from airbyte_cdk.utils import AirbyteTracedException
 from google.ads.googleads.errors import GoogleAdsException
-from google.ads.googleads.v15.errors.types.authorization_error import AuthorizationErrorEnum
+from google.ads.googleads.v17.errors.types.authorization_error import AuthorizationErrorEnum
 from pendulum import parse, today
 
 from .custom_query_stream import CustomQuery, IncrementalCustomQuery
@@ -51,7 +51,7 @@ def _validate_and_transform(config: Mapping[str, Any]):
             try:
                 query["query"] = GAQL.parse(query["query"])
             except ValueError:
-                message = f"The custom GAQL query {query['table_name']} failed. Validate your GAQL query with the Google Ads query validator. https://developers.google.com/google-ads/api/fields/v15/query_validator"
+                message = f"The custom GAQL query {query['table_name']} failed. Validate your GAQL query with the Google Ads query validator. https://developers.google.com/google-ads/api/fields/v17/query_validator"
                 raise AirbyteTracedException(message=message, failure_type=FailureType.config_error)
         return config
 

diff --git a/source-google-ads/source_google_ads/streams.py b/source-google-ads/source_google_ads/streams.py
@@ -11,9 +11,9 @@
 from airbyte_cdk.sources.streams import IncrementalMixin, Stream
 from airbyte_cdk.sources.utils.transform import TransformConfig, TypeTransformer
 from google.ads.googleads.errors import GoogleAdsException
-from google.ads.googleads.v15.errors.types.authorization_error import AuthorizationErrorEnum
-from google.ads.googleads.v15.errors.types.request_error import RequestErrorEnum
-from google.ads.googleads.v15.services.services.google_ads_service.pagers import SearchPager
+from google.ads.googleads.v17.errors.types.authorization_error import AuthorizationErrorEnum
+from google.ads.googleads.v17.errors.types.request_error import RequestErrorEnum
+from google.ads.googleads.v17.services.services.google_ads_service.pagers import SearchPager
 
 from .google_ads import GoogleAds
 from .models import Customer

diff --git a/source-google-ads/tests/common.py b/source-google-ads/tests/common.py
@@ -5,7 +5,7 @@
 import json
 
 from google.ads.googleads.errors import GoogleAdsException
-from google.ads.googleads.v15 import GoogleAdsFailure
+from google.ads.googleads.v17 import GoogleAdsFailure
 
 
 class MockSearchRequest:

diff --git a/source-google-ads/tests/test_google_ads.py b/source-google-ads/tests/test_google_ads.py
@@ -73,13 +73,11 @@ def test_send_request(mocker, customers):
     mocker.patch("source_google_ads.google_ads.GoogleAdsClient.get_service", return_value=MockGoogleAdsService())
     google_ads_client = GoogleAds(**SAMPLE_CONFIG)
     query = "Query"
-    page_size = 1000
     customer_id = next(iter(customers)).id
     response = list(google_ads_client.send_request(query, customer_id=customer_id))
 
     assert response[0].customer_id == customer_id
     assert response[0].query == query
-    assert response[0].page_size == page_size
 
 
 def test_get_fields_from_schema():

diff --git a/source-google-ads/tests/test_source.py b/source-google-ads/tests/test_source.py
@@ -10,7 +10,7 @@
 from airbyte_cdk import AirbyteLogger
 from freezegun import freeze_time
 from google.ads.googleads.errors import GoogleAdsException
-from google.ads.googleads.v15.errors.types.authorization_error import AuthorizationErrorEnum
+from google.ads.googleads.v17.errors.types.authorization_error import AuthorizationErrorEnum
 from pendulum import today
 from source_google_ads.custom_query_stream import IncrementalCustomQuery
 from source_google_ads.google_ads import GoogleAds

diff --git a/source-google-ads/tests/test_streams.py b/source-google-ads/tests/test_streams.py
@@ -8,8 +8,8 @@
 import pytest
 from airbyte_cdk.models import SyncMode
 from google.ads.googleads.errors import GoogleAdsException
-from google.ads.googleads.v15.errors.types.errors import ErrorCode, GoogleAdsError, GoogleAdsFailure
-from google.ads.googleads.v15.errors.types.request_error import RequestErrorEnum
+from google.ads.googleads.v17.errors.types.errors import ErrorCode, GoogleAdsError, GoogleAdsFailure
+from google.ads.googleads.v17.errors.types.request_error import RequestErrorEnum
 from google.api_core.exceptions import DataLoss, InternalServerError, ResourceExhausted, TooManyRequests
 from grpc import RpcError
 from source_google_ads.google_ads import GoogleAds

diff --git a/source-google-ads/tests/test_utils.py b/source-google-ads/tests/test_utils.py
@@ -107,7 +107,7 @@ def test_parse_GAQL_ok():
 def test_parse_GAQL_fail(config):
     with pytest.raises(AirbyteTracedException) as e:
         SourceGoogleAds._validate_and_transform(config)
-    expected_message = "The custom GAQL query test_table failed. Validate your GAQL query with the Google Ads query validator. https://developers.google.com/google-ads/api/fields/v15/query_validator"
+    expected_message = "The custom GAQL query test_table failed. Validate your GAQL query with the Google Ads query validator. https://developers.google.com/google-ads/api/fields/v17/query_validator"
     assert e.value.message == expected_message