Skip to content

Commit

Permalink
Merge pull request #230 from BingAds/v13.0.15
Browse files Browse the repository at this point in the history
v13.0.15
  • Loading branch information
xinyuwen2 committed Dec 22, 2022
2 parents 43529d9 + eae3860 commit 6583566
Show file tree
Hide file tree
Showing 32 changed files with 3,549 additions and 857 deletions.
130 changes: 69 additions & 61 deletions HISTORY.rst

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bingads/manifest.py
@@ -1,5 +1,5 @@
import sys
VERSION = '13.0.14'
VERSION = '13.0.15'
BULK_FORMAT_VERSION_6 = '6.0'
WORKING_NAME = 'BingAdsSDKPython'
USER_AGENT = '{0} {1} {2}'.format(WORKING_NAME, VERSION, sys.version_info[0:3])
5 changes: 4 additions & 1 deletion bingads/v13/bulk/entities/__init__.py
Expand Up @@ -19,6 +19,8 @@
from .bulk_ad_group_dynamic_search_ad_target import *
from .bulk_ad_group_negative_dynamic_search_ad_target import *
from .bulk_bid_strategy import *
from .bulk_ad_group_criterion import *
from .bulk_ad_group_hotel_listing_group import *

from .ad_extensions import *
from .bulk_ads import *
Expand All @@ -28,6 +30,7 @@
from .target_criterions import *
from .labels import *
from .bulk_offline_conversion import *
from .bulk_online_conversion_adjustment import *
from .bulk_experiment import *
from .bulk_image import *
from .bulk_video import *
Expand All @@ -37,4 +40,4 @@
from .bulk_ad_customizer_attribute_entity_base import *
from .bulk_ad_customizer_attribute_campaign import *
from .bulk_ad_customizer_attribute_ad_group import *
from .bulk_ad_customizer_attribute_keyword import *
from .bulk_ad_customizer_attribute_keyword import *
30 changes: 25 additions & 5 deletions bingads/v13/bulk/entities/bulk_ad_group.py
Expand Up @@ -14,7 +14,7 @@ def coop_setting_to_csv(bulk_ad_group, row_values):
return
if len(settings) != 1:
raise ValueError('Can only have 1 CoOpSetting in AdGroup Settings.')

row_values[_StringTable.MaximumBid] = settings[0].BidMaxValue
row_values[_StringTable.BidBoostValue] = settings[0].BidBoostValue
row_values[_StringTable.BidOption] = settings[0].BidOption
Expand All @@ -24,7 +24,7 @@ def csv_to_coop_setting(row_values, bulk_ad_group):
maximum_bid_success, maximum_bid = row_values.try_get_value(_StringTable.MaximumBid)
bid_boost_value_success, bid_boost_value = row_values.try_get_value(_StringTable.BidBoostValue)
bid_option_success, bid_option = row_values.try_get_value(_StringTable.BidOption)

if maximum_bid_success or bid_boost_value_success or bid_option_success:
coop_setting = _CAMPAIGN_OBJECT_FACTORY_V13.create('CoOpSetting')
coop_setting.Type = 'CoOpSetting'
Expand Down Expand Up @@ -242,7 +242,7 @@ def quality_score_data(self):
field_to_csv=lambda c: bulk_optional_str(c.ad_group.FinalUrlSuffix, c.ad_group.Id),
csv_to_field=lambda c, v: setattr(c.ad_group, 'FinalUrlSuffix', v)
),

_SimpleBulkMapping(
header=_StringTable.AdScheduleUseSearcherTimeZone,
field_to_csv=lambda c: field_to_csv_UseSearcherTimeZone(c.ad_group.AdScheduleUseSearcherTimeZone, None),
Expand All @@ -262,9 +262,29 @@ def quality_score_data(self):
int(v) if v else None
)
),
_SimpleBulkMapping(
header=_StringTable.UseOptimizedTargeting,
field_to_csv=lambda c: field_to_csv_bool(c.ad_group.UseOptimizedTargeting),
csv_to_field=lambda c, v: setattr(c.ad_group, 'UseOptimizedTargeting', parse_bool(v))
),
_SimpleBulkMapping(
header=_StringTable.HotelAdGroupType,
field_to_csv=lambda c: hotel_setting_to_csv(c.ad_group),
csv_to_field=lambda c, v: csv_to_hotel_setting(c.ad_group, v)
),
_SimpleBulkMapping(
header=_StringTable.CommissionRate,
field_to_csv=lambda c: bulk_str(c.ad_group.CommissionRate.RateAmount.Amount),
csv_to_field=lambda c, v: csv_to_commission_rate(c.ad_group, v)
),
_SimpleBulkMapping(
header=_StringTable.PercentCpcBid,
field_to_csv=lambda c: bulk_str(c.ad_group.PercentCpcBid.RateAmount.Amount),
csv_to_field=lambda c, v: csv_to_percent_cpc_bid(c.ad_group, v)
)
]


def process_mappings_from_row_values(self, row_values):
self.ad_group = _CAMPAIGN_OBJECT_FACTORY_V13.create('AdGroup')

Expand Down
207 changes: 207 additions & 0 deletions bingads/v13/bulk/entities/bulk_ad_group_criterion.py
@@ -0,0 +1,207 @@
from bingads.service_client import _CAMPAIGN_OBJECT_FACTORY_V13
from bingads.v13.internal.bulk.entities.single_record_bulk_entity import _SingleRecordBulkEntity
from bingads.v13.internal.bulk.mappings import _SimpleBulkMapping, _ComplexBulkMapping
from bingads.v13.internal.bulk.string_table import _StringTable
from bingads.v13.internal.extensions import *
from abc import abstractmethod

_AdGroupCriterion = type(_CAMPAIGN_OBJECT_FACTORY_V13.create('AdGroupCriterion'))
_NegativeAdGroupCriterion = type(_CAMPAIGN_OBJECT_FACTORY_V13.create('NegativeAdGroupCriterion'))
_FixedBid = type(_CAMPAIGN_OBJECT_FACTORY_V13.create('FixedBid'))
_BiddableAdGroupCriterion = type(_CAMPAIGN_OBJECT_FACTORY_V13.create('BiddableAdGroupCriterion'))


def csv_to_bidding(row_values, entity):
success, exclude = row_values.try_get_value(_StringTable.IsExcluded)
if exclude is None:
exclude = ''
exclude = exclude.lower()
if exclude == 'yes' or exclude == 'true':
is_excluded = True
elif exclude == 'no' or exclude == 'false':
is_excluded = False
else:
raise ValueError('IsExcluded can only be set to TRUE|FALSE in Ad Group Criterion row')
if is_excluded:
negative_ad_group_criterion = _CAMPAIGN_OBJECT_FACTORY_V13.create('NegativeAdGroupCriterion')
negative_ad_group_criterion.Criterion = entity.create_criterion()
negative_ad_group_criterion.Type = 'NegativeAdGroupCriterion'

entity.ad_group_criterion = negative_ad_group_criterion
else:
bid = _CAMPAIGN_OBJECT_FACTORY_V13.create('FixedBid')
bid.Type = 'FixedBid'

biddable_ad_group_criterion = _CAMPAIGN_OBJECT_FACTORY_V13.create('BiddableAdGroupCriterion')
biddable_ad_group_criterion.Criterion = entity.create_criterion()

success, bid_value = row_values.try_get_value(_StringTable.Bid)
if success and bid_value is not None and bid_value != '':
bid.Amount = float(bid_value)
else:
success, bid_value = row_values.try_get_value(_StringTable.BidAdjustment)
if success and bid_value is not None and bid_value != '':
bid = _CAMPAIGN_OBJECT_FACTORY_V13.create('BidMultiplier')
bid.Type = 'BidMultiplier'
bid.Multiplier = float(bid_value)

biddable_ad_group_criterion.CriterionBid = bid
biddable_ad_group_criterion.Type = 'BiddableAdGroupCriterion'

entity.ad_group_criterion = biddable_ad_group_criterion


def bidding_to_csv(entity, row_values):
if isinstance(entity.ad_group_criterion, _NegativeAdGroupCriterion):
row_values[_StringTable.IsExcluded] = 'True'
else:
row_values[_StringTable.IsExcluded] = 'False'
bid = entity.ad_group_criterion.CriterionBid
if bid is None:
return
if isinstance(bid, _FixedBid):
row_values[_StringTable.Bid] = fixed_bid_bulk_str(bid)
else:
row_values[_StringTable.BidAdjustment] = bid_multiplier_bulk_str(bid)

class BulkAdGroupCriterion(_SingleRecordBulkEntity):
""" Represents a Ad Group Criterion that can be read or written in a bulk file.
This class exposes the :attr:`ad_group_criterion` property that can be read and written as fields of the
Ad Group Criterion record in a bulk file.
For more information, see Ad Group Criterion at https://go.microsoft.com/fwlink/?linkid=836837.
*See also:*
* :class:`.BulkServiceManager`
* :class:`.BulkOperation`
* :class:`.BulkFileReader`
* :class:`.BulkFileWriter`
"""

def __init__(self,
campaign_name=None,
ad_group_name=None,
ad_group_criterion=None):
super(BulkAdGroupCriterion, self).__init__()

self._campaign_name = campaign_name
self._ad_group_name = ad_group_name
self._ad_group_criterion = ad_group_criterion
self._performance_data = None

_MAPPINGS = [
_ComplexBulkMapping(bidding_to_csv, csv_to_bidding),

_SimpleBulkMapping(
header=_StringTable.Status,
field_to_csv=lambda c: c.ad_group_criterion.Status,
csv_to_field=lambda c, v: setattr(c.ad_group_criterion, 'Status', v)
),
_SimpleBulkMapping(
header=_StringTable.Id,
field_to_csv=lambda c: bulk_str(c.ad_group_criterion.Id),
csv_to_field=lambda c, v: setattr(c.ad_group_criterion, 'Id', int(v) if v else None)
),
_SimpleBulkMapping(
header=_StringTable.ParentId,
field_to_csv=lambda c: bulk_str(c.ad_group_criterion.AdGroupId),
csv_to_field=lambda c, v: setattr(c.ad_group_criterion, 'AdGroupId', int(v) if v else None)
),
_SimpleBulkMapping(
header=_StringTable.Campaign,
field_to_csv=lambda c: c.campaign_name,
csv_to_field=lambda c, v: setattr(c, 'campaign_name', v)
),
_SimpleBulkMapping(
header=_StringTable.AdGroup,
field_to_csv=lambda c: c.ad_group_name,
csv_to_field=lambda c, v: setattr(c, 'ad_group_name', v)
),
_SimpleBulkMapping(
header=_StringTable.FinalUrl,
field_to_csv=lambda c: field_to_csv_Urls(c.ad_group_criterion.FinalUrls, c.ad_group_criterion.Id)
if isinstance(c.ad_group_criterion, _BiddableAdGroupCriterion) else None,
csv_to_field=lambda c, v: csv_to_field_Urls(c.ad_group_criterion.FinalUrls, v)
if isinstance(c.ad_group_criterion, _BiddableAdGroupCriterion) else None
),
_SimpleBulkMapping(
header=_StringTable.FinalMobileUrl,
field_to_csv=lambda c: field_to_csv_Urls(c.ad_group_criterion.FinalMobileUrls, c.ad_group_criterion.Id)
if isinstance(c.ad_group_criterion, _BiddableAdGroupCriterion) else None,
csv_to_field=lambda c, v: csv_to_field_Urls(c.ad_group_criterion.FinalMobileUrls, v)
if isinstance(c.ad_group_criterion, _BiddableAdGroupCriterion) else None
),
_SimpleBulkMapping(
header=_StringTable.TrackingTemplate,
field_to_csv=lambda c: bulk_optional_str(c.ad_group_criterion.TrackingUrlTemplate, c.ad_group_criterion.Id)
if isinstance(c.ad_group_criterion, _BiddableAdGroupCriterion) else None,
csv_to_field=lambda c, v: setattr(c.ad_group_criterion, 'TrackingUrlTemplate', v if v else None)
if isinstance(c.ad_group_criterion, _BiddableAdGroupCriterion) else None
),
_SimpleBulkMapping(
header=_StringTable.CustomParameter,
field_to_csv=lambda c: field_to_csv_UrlCustomParameters(c.ad_group_criterion)
if isinstance(c.ad_group_criterion, _BiddableAdGroupCriterion) else None,
csv_to_field=lambda c, v: csv_to_field_UrlCustomParameters(c.ad_group_criterion, v)
if isinstance(c.ad_group_criterion, _BiddableAdGroupCriterion) else None
),
_SimpleBulkMapping(
header=_StringTable.FinalUrlSuffix,
field_to_csv=lambda c: bulk_optional_str(c.ad_group_criterion.FinalUrlSuffix,c.ad_group_criterion.Id)
if isinstance(c.ad_group_criterion, _BiddableAdGroupCriterion) else None,
csv_to_field=lambda c, v: setattr(c.ad_group_criterion, 'FinalUrlSuffix', v)
if isinstance(c.ad_group_criterion, _BiddableAdGroupCriterion) else None
)
]

@property
def ad_group_criterion(self):
""" Defines an Ad Group Criterion """

return self._ad_group_criterion

@ad_group_criterion.setter
def ad_group_criterion(self, ad_group_criterion):
self._ad_group_criterion = ad_group_criterion

@property
def campaign_name(self):
""" Defines the name of the Campaign.
:rtype: str
"""

return self._campaign_name

@campaign_name.setter
def campaign_name(self, campaign_name):
self._campaign_name = campaign_name

@property
def ad_group_name(self):
""" Defines the name of the Ad Group
:rtype: str
"""

return self._ad_group_name

@ad_group_name.setter
def ad_group_name(self, ad_group_name):
self._ad_group_name = ad_group_name

def process_mappings_from_row_values(self, row_values):
row_values.convert_to_entity(self, BulkAdGroupCriterion._MAPPINGS)

def process_mappings_to_row_values(self, row_values, exclude_readonly_data):
self._validate_property_not_null(self.ad_group_criterion, 'ad_group_criterion')
self.convert_to_values(row_values, BulkAdGroupCriterion._MAPPINGS)

def read_additional_data(self, stream_reader):
super(BulkAdGroupCriterion, self).read_additional_data(stream_reader)

@abstractmethod
def create_criterion(self):
return None

0 comments on commit 6583566

Please sign in to comment.