Committing latest changes.

Author: grivescorbett

ChangeLog

@@ -1,3 +1,11 @@
+9.0.0 -- 11/14/17
+* Added support and examples for DFP v201711
+* Removed support and examples for DFP v201611
+* DFP PQL queries can now accept simple python dicts for variable substitution.
+* Resolved issues:
+- Issue 230: https://github.com/googleads/googleads-python-lib/issues/230
+
+
 8.1.0 -- 10/11/17
 * Added support for AdWords v201710.
 * Resolved issues:

examples/adwords/v201708/reporting/download_criteria_report_as_stream_with_awql.py

@@ -47,11 +47,14 @@ def main(client):
   report_downloader = client.GetReportDownloader(version='v201708')
 
   # Create report query.
-  report_query = ('SELECT CampaignId, AdGroupId, Id, Criteria, CriteriaType, '
-                  'FinalUrls, Impressions, Clicks, Cost '
-                  'FROM CRITERIA_PERFORMANCE_REPORT '
-                  'WHERE Status IN [ENABLED, PAUSED] '
-                  'DURING LAST_7_DAYS')
+  report_query = (adwords.ReportQueryBuilder()
+                  .Select('CampaignId', 'AdGroupId', 'Id', 'Criteria',
+                          'CriteriaType', 'FinalUrls', 'Impressions', 'Clicks',
+                          'Cost')
+                  .From('CRITERIA_PERFORMANCE_REPORT')
+                  .Where('Status').In('ENABLED', 'PAUSED')
+                  .During('LAST_7_DAYS')
+                  .Build())
 
   print report_downloader.DownloadReportAsStringWithAwql(
       report_query, 'CSV', skip_report_header=False, skip_column_header=False,

examples/adwords/v201708/reporting/download_criteria_report_as_string_with_awql.py

@@ -37,11 +37,14 @@ def main(client):
   report_downloader = client.GetReportDownloader(version='v201708')
 
   # Create report query.
-  report_query = ('SELECT CampaignId, AdGroupId, Id, Criteria, CriteriaType, '
-                  'FinalUrls, Impressions, Clicks, Cost '
-                  'FROM CRITERIA_PERFORMANCE_REPORT '
-                  'WHERE Status IN [ENABLED, PAUSED] '
-                  'DURING LAST_7_DAYS')
+  report_query = (adwords.ReportQueryBuilder()
+                  .Select('CampaignId', 'AdGroupId', 'Id', 'Criteria',
+                          'CriteriaType', 'FinalUrls', 'Impressions', 'Clicks',
+                          'Cost')
+                  .From('CRITERIA_PERFORMANCE_REPORT')
+                  .Where('Status').In('ENABLED', 'PAUSED')
+                  .During('LAST_7_DAYS')
+                  .Build())
 
   print report_downloader.DownloadReportAsStringWithAwql(
       report_query, 'CSV', skip_report_header=False, skip_column_header=False,

examples/adwords/v201708/reporting/download_criteria_report_with_awql.py

@@ -34,11 +34,14 @@ def main(client):
   report_downloader = client.GetReportDownloader(version='v201708')
 
   # Create report query.
-  report_query = ('SELECT CampaignId, AdGroupId, Id, Criteria, CriteriaType, '
-                  'FinalUrls, Impressions, Clicks, Cost '
-                  'FROM CRITERIA_PERFORMANCE_REPORT '
-                  'WHERE Status IN [ENABLED, PAUSED] '
-                  'DURING LAST_7_DAYS')
+  report_query = (adwords.ReportQueryBuilder()
+                  .Select('CampaignId', 'AdGroupId', 'Id', 'Criteria',
+                          'CriteriaType', 'FinalUrls', 'Impressions', 'Clicks',
+                          'Cost')
+                  .From('CRITERIA_PERFORMANCE_REPORT')
+                  .Where('Status').In('ENABLED', 'PAUSED')
+                  .During('LAST_7_DAYS')
+                  .Build())
 
   # You can provide a file object to write the output to. For this
   # demonstration we use sys.stdout to write the report to the screen.

examples/adwords/v201710/basic_operations/get_campaigns_with_awql.py

@@ -38,13 +38,14 @@ def main(client):
   campaign_service = client.GetService('CampaignService', version='v201710')
 
   # Construct query and get all campaigns.
-  offset = 0
-  query = 'SELECT Id, Name, Status ORDER BY Name'
-
-  more_pages = True
-  while more_pages:
-    page = campaign_service.query(query + ' LIMIT %s, %s' % (offset, PAGE_SIZE))
-
+  query = (adwords.ServiceQueryBuilder()
+           .Select('Id', 'Name', 'Status')
+           .Where('Status').EqualTo('ENABLED')
+           .OrderBy('Name')
+           .Limit(0, PAGE_SIZE)
+           .Build())
+
+  for page in query.Pager(campaign_service):
     # Display results.
     if 'entries' in page:
       for campaign in page['entries']:
@@ -53,8 +54,6 @@ def main(client):
                            campaign['status']))
     else:
       print 'No campaigns were found.'
-    offset += PAGE_SIZE
-    more_pages = offset < int(page['totalNumEntries'])
     time.sleep(1)
 
 

examples/adwords/v201710/campaign_management/get_all_disapproved_ads_with_awql.py

@@ -38,17 +38,18 @@ def main(client, ad_group_id):
                                           version='v201710')
 
   # Construct query and get all ads for a given campaign.
-  query = ('SELECT Id, PolicySummary '
-           'WHERE AdGroupId = %s AND CombinedApprovalStatus = DISAPPROVED '
-           'ORDER BY Id' % ad_group_id)
-  more_pages = True
+  query = (adwords.ServiceQueryBuilder()
+           .Select('Id', 'PolicySummary')
+           .Where('AdGroupId').EqualTo(ad_group_id)
+           .Where('CombinedApprovalStatus').EqualTo('DISAPPROVED')
+           .OrderBy('Id')
+           .Limit(0, PAGE_SIZE)
+           .Build())
   disapproved_count = 0
-  offset = 0
 
   # Display results.
-  while more_pages:
-    page = ad_group_ad_service.query(query + ' LIMIT %s, %s' % (
-        offset, PAGE_SIZE))
+  while True:
+    page = ad_group_ad_service.query(query)
 
     if 'entries' in page:
       for ad in page['entries']:
@@ -63,8 +64,8 @@ def main(client, ad_group_id):
               policy_topic_entry['policyTopicId'],
               policy_topic_entry['policyTopicName'])
           # Display the attributes and values that triggered the policy topic.
-          policy_topic_evidences = policy_topic_entry['policyTopicEvidences']
-          if policy_topic_evidences:
+          if ('policyTopicEvidences' in policy_topic_entry
+              and policy_topic_entry['policyTopicEvidences']):
             for evidence in policy_topic_entry['policyTopicEvidences']:
               print ('    evidence type: %s'
                      % evidence['policyTopicEvidenceType'])
@@ -73,8 +74,9 @@ def main(client, ad_group_id):
                 for index, evidence_text in enumerate(evidence_text_list):
                   print '      evidence text[%d]: %s' % (index, evidence_text)
 
-    offset += PAGE_SIZE
-    more_pages = offset < int(page['totalNumEntries'])
+    if not query.HasNext(page):
+      break
+    query.NextPage()
 
   print '%d disapproved ads were found.' % disapproved_count
 

examples/adwords/v201710/migration/migrate_to_extension_settings.py

@@ -52,7 +52,6 @@
     'TRACKING_URL_TEMPLATE': 7
 }
 
-
 PAGE_SIZE = 500
 
 

examples/adwords/v201710/reporting/download_criteria_report_as_stream_with_awql.py

@@ -47,11 +47,14 @@ def main(client):
   report_downloader = client.GetReportDownloader(version='v201710')
 
   # Create report query.
-  report_query = ('SELECT CampaignId, AdGroupId, Id, Criteria, CriteriaType, '
-                  'FinalUrls, Impressions, Clicks, Cost '
-                  'FROM CRITERIA_PERFORMANCE_REPORT '
-                  'WHERE Status IN [ENABLED, PAUSED] '
-                  'DURING LAST_7_DAYS')
+  report_query = (adwords.ReportQueryBuilder()
+                  .Select('CampaignId', 'AdGroupId', 'Id', 'Criteria',
+                          'CriteriaType', 'FinalUrls', 'Impressions', 'Clicks',
+                          'Cost')
+                  .From('CRITERIA_PERFORMANCE_REPORT')
+                  .Where('Status').In('ENABLED', 'PAUSED')
+                  .During('LAST_7_DAYS')
+                  .Build())
 
   print report_downloader.DownloadReportAsStringWithAwql(
       report_query, 'CSV', skip_report_header=False, skip_column_header=False,

examples/adwords/v201710/reporting/download_criteria_report_as_string_with_awql.py

@@ -37,11 +37,14 @@ def main(client):
   report_downloader = client.GetReportDownloader(version='v201710')
 
   # Create report query.
-  report_query = ('SELECT CampaignId, AdGroupId, Id, Criteria, CriteriaType, '
-                  'FinalUrls, Impressions, Clicks, Cost '
-                  'FROM CRITERIA_PERFORMANCE_REPORT '
-                  'WHERE Status IN [ENABLED, PAUSED] '
-                  'DURING LAST_7_DAYS')
+  report_query = (adwords.ReportQueryBuilder()
+                  .Select('CampaignId', 'AdGroupId', 'Id', 'Criteria',
+                          'CriteriaType', 'FinalUrls', 'Impressions', 'Clicks',
+                          'Cost')
+                  .From('CRITERIA_PERFORMANCE_REPORT')
+                  .Where('Status').In('ENABLED', 'PAUSED')
+                  .During('LAST_7_DAYS')
+                  .Build())
 
   print report_downloader.DownloadReportAsStringWithAwql(
       report_query, 'CSV', skip_report_header=False, skip_column_header=False,

examples/adwords/v201710/reporting/download_criteria_report_with_awql.py

@@ -34,11 +34,14 @@ def main(client):
   report_downloader = client.GetReportDownloader(version='v201710')
 
   # Create report query.
-  report_query = ('SELECT CampaignId, AdGroupId, Id, Criteria, CriteriaType, '
-                  'FinalUrls, Impressions, Clicks, Cost '
-                  'FROM CRITERIA_PERFORMANCE_REPORT '
-                  'WHERE Status IN [ENABLED, PAUSED] '
-                  'DURING LAST_7_DAYS')
+  report_query = (adwords.ReportQueryBuilder()
+                  .Select('CampaignId', 'AdGroupId', 'Id', 'Criteria',
+                          'CriteriaType', 'FinalUrls', 'Impressions', 'Clicks',
+                          'Cost')
+                  .From('CRITERIA_PERFORMANCE_REPORT')
+                  .Where('Status').In('ENABLED', 'PAUSED')
+                  .During('LAST_7_DAYS')
+                  .Build())
 
   # You can provide a file object to write the output to. For this
   # demonstration we use sys.stdout to write the report to the screen.