Fix import statement issues

Change-Id: I596533ebae0749abe06a2c7e6601614e9564c9c5

Author: BenRKarl

examples/basic_operations/add_ad_groups.py

@@ -25,20 +25,20 @@
 
 from google.ads.googleads.client import GoogleAdsClient
 from google.ads.googleads.errors import GoogleAdsException
+from google.ads.googleads.v20.services.services.ad_group_service import (
+    AdGroupServiceClient,
+)
 from google.ads.googleads.v20.services.types.ad_group_service import (
     AdGroupOperation,
     MutateAdGroupsResponse,
-    AdGroupServiceClient,
 )
-from google.ads.googleads.v20.services.types.campaign_service import (
+from google.ads.googleads.v20.services.services.campaign_service import (
     CampaignServiceClient,
 )
 from google.ads.googleads.v20.resources.types.ad_group import AdGroup
 
 
-def main(
-    client: GoogleAdsClient, customer_id: str, campaign_id: str
-) -> None:
+def main(client: GoogleAdsClient, customer_id: str, campaign_id: str) -> None:
     ad_group_service: AdGroupServiceClient = client.get_service(
         "AdGroupService"
     )
@@ -86,7 +86,9 @@ def main(
 
     # GoogleAdsClient will read the google-ads.yaml configuration file in the
     # home directory if none is specified.
-    googleads_client: GoogleAdsClient = GoogleAdsClient.load_from_storage(version="v20")
+    googleads_client: GoogleAdsClient = GoogleAdsClient.load_from_storage(
+        version="v20"
+    )
 
     try:
         main(googleads_client, args.customer_id, args.campaign_id)

examples/basic_operations/add_campaigns.py

@@ -26,21 +26,24 @@
 
 from google.ads.googleads.client import GoogleAdsClient
 from google.ads.googleads.errors import GoogleAdsException
+from google.ads.googleads.v20.services.services.campaign_budget_service import (
+    CampaignBudgetServiceClient,
+)
 from google.ads.googleads.v20.services.types.campaign_budget_service import (
     CampaignBudgetOperation,
-    CampaignBudgetServiceClient,
     MutateCampaignBudgetsResponse,
 )
+from google.ads.googleads.v20.services.services.campaign_service import (
+    CampaignServiceClient,
+)
 from google.ads.googleads.v20.services.types.campaign_service import (
     CampaignOperation,
-    CampaignServiceClient,
     MutateCampaignsResponse,
 )
 from google.ads.googleads.v20.resources.types.campaign_budget import (
     CampaignBudget,
 )
 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"
@@ -69,7 +72,9 @@ def main(client: GoogleAdsClient, customer_id: str) -> None:
     # Add budget.
     campaign_budget_response: MutateCampaignBudgetsResponse
     try:
-        budget_operations: List[CampaignBudgetOperation] = [campaign_budget_operation]
+        budget_operations: List[CampaignBudgetOperation] = [
+            campaign_budget_operation
+        ]
         campaign_budget_response = (
             campaign_budget_service.mutate_campaign_budgets(
                 customer_id=customer_id,

examples/basic_operations/get_responsive_search_ads.py

@@ -24,7 +24,7 @@
 
 from google.ads.googleads.client import GoogleAdsClient
 from google.ads.googleads.errors import GoogleAdsException
-from google.ads.googleads.v20.common.types.ad_type_infos import AdTextAsset
+from google.ads.googleads.v20.common.types.ad_asset import AdTextAsset
 from google.ads.googleads.v20.resources.types.ad import Ad
 from google.ads.googleads.v20.services.services.google_ads_service import (
     GoogleAdsServiceClient,

examples/basic_operations/pause_ad.py

@@ -20,6 +20,7 @@
 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.v20.resources.types.ad_group_ad import AdGroupAd
@@ -56,7 +57,7 @@ def main(
         protobuf_helpers.field_mask(None, ad_group_ad._pb),
     )
 
-    operations List[AdGroupAdOperation] = [ad_group_ad_operation]
+    operations: List[AdGroupAdOperation] = [ad_group_ad_operation]
 
     ad_group_ad_response: MutateAdGroupAdsResponse = (
         ad_group_ad_service.mutate_ad_group_ads(
@@ -92,19 +93,9 @@ def main(
 
     # GoogleAdsClient will read the google-ads.yaml configuration file in the
     # home directory if none is specified.
-<<<<<<< HEAD
-    googleads_client: GoogleAdsClient = GoogleAdsClient.load_from_storage(
-        version="v20"
-    )
-=======
-<<<<<<< HEAD
-    googleads_client = GoogleAdsClient.load_from_storage(version="v20")
-=======
     googleads_client: GoogleAdsClient = GoogleAdsClient.load_from_storage(
         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.)
 
     try:
         main(googleads_client, args.customer_id, args.ad_group_id, args.ad_id)

examples/basic_operations/update_ad_group.py

@@ -22,18 +22,21 @@
 import sys
 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.v20.resources.types.ad_group import AdGroup
 from google.ads.googleads.v20.services.services.ad_group_service import (
     AdGroupServiceClient,
 )
-from google.ads.googleads.v20.services.types.ad_group_ad_service import AdGroupAdOperation
+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,
 )
-from google.api_core import protobuf_helpers
 
 
 # [START update_ad_group]

examples/basic_operations/update_campaign.py

@@ -22,6 +22,8 @@
 import sys
 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.v20.resources.types.campaign import Campaign
@@ -32,7 +34,6 @@
     CampaignOperation,
     MutateCampaignsResponse,
 )
-from google.api_core import protobuf_helpers
 
 
 def main(client: GoogleAdsClient, customer_id: str, campaign_id: str) -> None:

examples/basic_operations/update_responsive_search_ad.py

@@ -20,12 +20,14 @@
 
 import argparse
 import sys
-from typing import MutableSequence
+from typing import List
 from uuid import uuid4
 
+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.v20.common.types.ad_type_infos import AdTextAsset
+from google.ads.googleads.v20.common.types.ad_asset import AdTextAsset
 from google.ads.googleads.v20.resources.types.ad import Ad
 from google.ads.googleads.v20.services.services.ad_service import (
     AdServiceClient,
@@ -34,7 +36,6 @@
     AdOperation,
     MutateAdsResponse,
 )
-from google.api_core import protobuf_helpers
 
 
 # [START update_responsive_search_ad]