Update annotations PR for basic_operations

Author: BenRKarl

examples/basic_operations/add_ad_groups.py

@@ -20,20 +20,20 @@
 
 import argparse
 import sys
+from typing import List
 import uuid
-from typing import Any, MutableSequence
 
 from google.ads.googleads.client import GoogleAdsClient
 from google.ads.googleads.errors import GoogleAdsException
-from google.ads.googleads.v19.services.types.ad_group_service import (
+from google.ads.googleads.v20.services.types.ad_group_service import (
     AdGroupOperation,
     MutateAdGroupsResponse,
     AdGroupServiceClient,
 )
-from google.ads.googleads.v19.services.types.campaign_service import (
+from google.ads.googleads.v20.services.types.campaign_service import (
     CampaignServiceClient,
 )
-from google.ads.googleads.v19.resources.types.ad_group import AdGroup
+from google.ads.googleads.v20.resources.types.ad_group import AdGroup
 
 
 def main(
@@ -55,11 +55,13 @@ def main(
     ad_group.type_ = client.enums.AdGroupTypeEnum.SEARCH_STANDARD
     ad_group.cpc_bid_micros = 10000000
 
+    operations: List[AdGroupOperation] = [ad_group_operation]
+
     # Add the ad group.
     ad_group_response: MutateAdGroupsResponse = (
         ad_group_service.mutate_ad_groups(
             customer_id=customer_id,
-            operations=[ad_group_operation],  # type: ignore
+            operations=operations,
         )
     )
     print(f"Created ad group {ad_group_response.results[0].resource_name}.")

examples/basic_operations/add_campaigns.py

@@ -18,30 +18,29 @@
 """
 
 
-import argparse
 import argparse
 import datetime
 import sys
+from typing import List
 import uuid
-from typing import MutableSequence
 
 from google.ads.googleads.client import GoogleAdsClient
 from google.ads.googleads.errors import GoogleAdsException
-from google.ads.googleads.v19.services.types.campaign_budget_service import (
+from google.ads.googleads.v20.services.types.campaign_budget_service import (
     CampaignBudgetOperation,
     CampaignBudgetServiceClient,
     MutateCampaignBudgetsResponse,
 )
-from google.ads.googleads.v19.services.types.campaign_service import (
+from google.ads.googleads.v20.services.types.campaign_service import (
     CampaignOperation,
     CampaignServiceClient,
     MutateCampaignsResponse,
 )
-from google.ads.googleads.v19.resources.types.campaign_budget import (
+from google.ads.googleads.v20.resources.types.campaign_budget import (
     CampaignBudget,
 )
-from google.ads.googleads.v19.resources.types.campaign import Campaign
-from google.ads.googleads.v19.common.types.bidding import ManualCpc
+from google.ads.googleads.v20.resources.types.campaign import Campaign
+from google.ads.googleads.v20.common.types.bidding import ManualCpc
 
 
 _DATE_FORMAT: str = "%Y%m%d"
@@ -70,10 +69,11 @@ def main(client: GoogleAdsClient, customer_id: str) -> None:
     # Add budget.
     campaign_budget_response: MutateCampaignBudgetsResponse
     try:
+        budget_operations: List[CampaignBudgetOperation] = [campaign_budget_operation]
         campaign_budget_response = (
             campaign_budget_service.mutate_campaign_budgets(
                 customer_id=customer_id,
-                operations=[campaign_budget_operation],  # type: ignore
+                operations=budget_operations,
             )
         )
     except GoogleAdsException as ex:
@@ -98,7 +98,7 @@ def main(client: GoogleAdsClient, customer_id: str) -> None:
     campaign.status = client.enums.CampaignStatusEnum.PAUSED
 
     # Set the bidding strategy and budget.
-    campaign.manual_cpc = ManualCpc()
+    campaign.manual_cpc = client.get_type("ManualCpc")
     campaign.campaign_budget = campaign_budget_response.results[0].resource_name
 
     # Set the campaign network options.
@@ -123,8 +123,9 @@ def main(client: GoogleAdsClient, customer_id: str) -> None:
     # Add the campaign.
     campaign_response: MutateCampaignsResponse
     try:
+        campaign_operations: List[CampaignOperation] = [campaign_operation]
         campaign_response = campaign_service.mutate_campaigns(
-            customer_id=customer_id, operations=[campaign_operation]  # type: ignore
+            customer_id=customer_id, operations=campaign_operations
         )
         print(f"Created campaign {campaign_response.results[0].resource_name}.")
     except GoogleAdsException as ex:

examples/basic_operations/get_campaigns.py

@@ -20,14 +20,14 @@
 
 import argparse
 import sys
-from typing import Iterator
+from typing import Iterator, List
 
 from google.ads.googleads.client import GoogleAdsClient
 from google.ads.googleads.errors import GoogleAdsException
-from google.ads.googleads.v19.services.services.google_ads_service import (
+from google.ads.googleads.v20.services.services.google_ads_service import (
     GoogleAdsServiceClient,
 )
-from google.ads.googleads.v19.services.types.google_ads_service import (
+from google.ads.googleads.v20.services.types.google_ads_service import (
     SearchGoogleAdsStreamResponse,
     GoogleAdsRow,
 )
@@ -50,8 +50,8 @@ def main(client: GoogleAdsClient, customer_id: str) -> None:
     )
 
     for batch in stream:
-        row: GoogleAdsRow
-        for row in batch.results:
+        rows: List[GoogleAdsRow] = batch.results
+        for row in rows:
             print(
                 f"Campaign with ID {row.campaign.id} and name "
                 f'"{row.campaign.name}" was found.'

examples/basic_operations/get_responsive_search_ads.py

@@ -24,13 +24,12 @@
 
 from google.ads.googleads.client import GoogleAdsClient
 from google.ads.googleads.errors import GoogleAdsException
-from google.ads.googleads.v19.common.types.ad_type_infos import AdTextAsset
-from google.ads.googleads.v19.resources.types.ad import Ad
-from google.ads.googleads.v19.services.services.google_ads_service import (
+from google.ads.googleads.v20.common.types.ad_type_infos import AdTextAsset
+from google.ads.googleads.v20.resources.types.ad import Ad
+from google.ads.googleads.v20.services.services.google_ads_service import (
     GoogleAdsServiceClient,
 )
-from google.ads.googleads.v19.services.types.google_ads_service import (
-    GoogleAdsRow,
+from google.ads.googleads.v20.services.types.google_ads_service import (
     SearchGoogleAdsRequest,
     SearchGoogleAdsResponse,
 )
@@ -44,12 +43,15 @@ def main(
     ga_service: GoogleAdsServiceClient = client.get_service("GoogleAdsService")
 
     query: str = """
-        SELECT ad_group.id, ad_group_ad.ad.id,
-        ad_group_ad.ad.responsive_search_ad.headlines,
-        ad_group_ad.ad.responsive_search_ad.descriptions,
-        ad_group_ad.status FROM ad_group_ad
-        WHERE ad_group_ad.ad.type = RESPONSIVE_SEARCH_AD
-        AND ad_group_ad.status != "REMOVED" """
+        SELECT
+          ad_group.id,
+          ad_group_ad.ad.id,
+          ad_group_ad.ad.responsive_search_ad.headlines,
+          ad_group_ad.ad.responsive_search_ad.descriptions,
+          ad_group_ad.status
+        FROM ad_group_ad
+          WHERE ad_group_ad.ad.type = RESPONSIVE_SEARCH_AD
+          AND ad_group_ad.status != REMOVED"""
 
     # Optional: Specify an ad group ID to restrict search to only a given
     # ad group.

examples/basic_operations/pause_ad.py

@@ -17,16 +17,16 @@
 
 import argparse
 import sys
-from typing import MutableSequence
+from typing import List
 
 from google.api_core import protobuf_helpers
 from google.ads.googleads.client import GoogleAdsClient
 from google.ads.googleads.errors import GoogleAdsException
-from google.ads.googleads.v19.resources.types.ad_group_ad import AdGroupAd
-from google.ads.googleads.v19.services.services.ad_group_ad_service import (
+from google.ads.googleads.v20.resources.types.ad_group_ad import AdGroupAd
+from google.ads.googleads.v20.services.services.ad_group_ad_service import (
     AdGroupAdServiceClient,
 )
-from google.ads.googleads.v19.services.types.ad_group_ad_service import (
+from google.ads.googleads.v20.services.types.ad_group_ad_service import (
     AdGroupAdOperation,
     MutateAdGroupAdsResponse,
 )
@@ -56,10 +56,12 @@ def main(
         protobuf_helpers.field_mask(None, ad_group_ad._pb),
     )
 
+    operations List[AdGroupAdOperation] = [ad_group_ad_operation]
+
     ad_group_ad_response: MutateAdGroupAdsResponse = (
         ad_group_ad_service.mutate_ad_group_ads(
             customer_id=customer_id,
-            operations=[ad_group_ad_operation],  # type: ignore
+            operations=operations,
         )
     )
 
@@ -99,7 +101,7 @@ def main(
     googleads_client = GoogleAdsClient.load_from_storage(version="v20")
 =======
     googleads_client: GoogleAdsClient = GoogleAdsClient.load_from_storage(
-        version="v19"
+        version="v20"
     )
 >>>>>>> e9e91feee (I've added type hints and annotations to the Python files in your `examples/basic_operations` directory. This should make the code easier to read and also help with static analysis.)
 >>>>>>> 6b1491771 (I've added type hints and annotations to the Python files in your `examples/basic_operations` directory. This should make the code easier to read and also help with static analysis.)

examples/basic_operations/remove_campaign.py

@@ -17,14 +17,14 @@
 
 import argparse
 import sys
-from typing import MutableSequence
+from typing import List
 
 from google.ads.googleads.client import GoogleAdsClient
 from google.ads.googleads.errors import GoogleAdsException
-from google.ads.googleads.v19.services.services.campaign_service import (
+from google.ads.googleads.v20.services.services.campaign_service import (
     CampaignServiceClient,
 )
-from google.ads.googleads.v19.services.types.campaign_service import (
+from google.ads.googleads.v20.services.types.campaign_service import (
     CampaignOperation,
     MutateCampaignsResponse,
 )
@@ -41,10 +41,12 @@ def main(client: GoogleAdsClient, customer_id: str, campaign_id: str) -> None:
     )
     campaign_operation.remove = resource_name
 
+    operations: List[CampaignOperation] = [campaign_operation]
+
     campaign_response: MutateCampaignsResponse = (
         campaign_service.mutate_campaigns(
             customer_id=customer_id,
-            operations=[campaign_operation],  # type: ignore
+            operations=operations,
         )
     )
 

examples/basic_operations/search_for_google_ads_fields.py

@@ -26,13 +26,13 @@
 
 from google.ads.googleads.client import GoogleAdsClient
 from google.ads.googleads.errors import GoogleAdsException
-from google.ads.googleads.v19.resources.types.google_ads_field import (
+from google.ads.googleads.v20.resources.types.google_ads_field import (
     GoogleAdsField,
 )
-from google.ads.googleads.v19.services.services.google_ads_field_service import (
+from google.ads.googleads.v20.services.services.google_ads_field_service import (
     GoogleAdsFieldServiceClient,
 )
-from google.ads.googleads.v19.services.types.google_ads_field_service import (
+from google.ads.googleads.v20.services.types.google_ads_field_service import (
     SearchGoogleAdsFieldsRequest,
     SearchGoogleAdsFieldsResponse,
 )

examples/basic_operations/update_ad_group.py

@@ -20,15 +20,16 @@
 
 import argparse
 import sys
-from typing import MutableSequence
+from typing import List
 
 from google.ads.googleads.client import GoogleAdsClient
 from google.ads.googleads.errors import GoogleAdsException
-from google.ads.googleads.v19.resources.types.ad_group import AdGroup
-from google.ads.googleads.v19.services.services.ad_group_service import (
+from google.ads.googleads.v20.resources.types.ad_group import AdGroup
+from google.ads.googleads.v20.services.services.ad_group_service import (
     AdGroupServiceClient,
 )
-from google.ads.googleads.v19.services.types.ad_group_service import (
+from google.ads.googleads.v20.services.types.ad_group_ad_service import AdGroupAdOperation
+from google.ads.googleads.v20.services.types.ad_group_service import (
     AdGroupOperation,
     MutateAdGroupsResponse,
 )
@@ -59,11 +60,13 @@ def main(
         protobuf_helpers.field_mask(None, ad_group._pb),
     )
 
+    operations: List[AdGroupAdOperation] = [ad_group_operation]
+
     # Update the ad group.
     ad_group_response: MutateAdGroupsResponse = (
         ad_group_service.mutate_ad_groups(
             customer_id=customer_id,
-            operations=[ad_group_operation],  # type: ignore
+            operations=operations,
         )
     )
 

examples/basic_operations/update_campaign.py

@@ -20,15 +20,15 @@
 
 import argparse
 import sys
-from typing import MutableSequence
+from typing import List
 
 from google.ads.googleads.client import GoogleAdsClient
 from google.ads.googleads.errors import GoogleAdsException
-from google.ads.googleads.v19.resources.types.campaign import Campaign
-from google.ads.googleads.v19.services.services.campaign_service import (
+from google.ads.googleads.v20.resources.types.campaign import Campaign
+from google.ads.googleads.v20.services.services.campaign_service import (
     CampaignServiceClient,
 )
-from google.ads.googleads.v19.services.types.campaign_service import (
+from google.ads.googleads.v20.services.types.campaign_service import (
     CampaignOperation,
     MutateCampaignsResponse,
 )
@@ -56,10 +56,12 @@ def main(client: GoogleAdsClient, customer_id: str, campaign_id: str) -> None:
         protobuf_helpers.field_mask(None, campaign._pb),
     )
 
+    operations: List[CampaignOperation] = [campaign_operation]
+
     campaign_response: MutateCampaignsResponse = (
         campaign_service.mutate_campaigns(
             customer_id=customer_id,
-            operations=[campaign_operation],  # type: ignore
+            operations=operations,
         )
     )
 

examples/basic_operations/update_responsive_search_ad.py

@@ -25,12 +25,12 @@
 
 from google.ads.googleads.client import GoogleAdsClient
 from google.ads.googleads.errors import GoogleAdsException
-from google.ads.googleads.v19.common.types.ad_type_infos import AdTextAsset
-from google.ads.googleads.v19.resources.types.ad import Ad
-from google.ads.googleads.v19.services.services.ad_service import (
+from google.ads.googleads.v20.common.types.ad_type_infos import AdTextAsset
+from google.ads.googleads.v20.resources.types.ad import Ad
+from google.ads.googleads.v20.services.services.ad_service import (
     AdServiceClient,
 )
-from google.ads.googleads.v19.services.types.ad_service import (
+from google.ads.googleads.v20.services.types.ad_service import (
     AdOperation,
     MutateAdsResponse,
 )
@@ -77,8 +77,9 @@ def main(client: GoogleAdsClient, customer_id: str, ad_id: str) -> None:
     )
 
     # Updates the ad.
+    operations: List[AdOperation] = [ad_operation]
     ad_response: MutateAdsResponse = ad_service.mutate_ads(
-        customer_id=customer_id, operations=[ad_operation]  # type: ignore
+        customer_id=customer_id, operations=operations
     )
     print(
         f'Ad with resource name "{ad_response.results[0].resource_name}" '