Skip to content

Commit

Permalink
update to version 12.13.4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@qitia
qitia committed Aug 22, 2019
1 parent 16bca8a commit d23e804
Show file tree
Hide file tree
Showing 5 changed files with 64 additions and 52 deletions.
4 changes: 4 additions & 0 deletions HISTORY.rst
View file
@@ -1,6 +1,10 @@
.. :changelog:
Release History
12.13.4.1(2019-08-23)
+++++++++++++++++++++++++
* Write TextAsset and ImageAsset to the Bulk upload file without the Type explicitly set.

12.13.4(2019-08-09)
+++++++++++++++++++++++++
* Updated Bing Ads API version 12 and 13 service proxies to reflect recent interface changes. For more information please see the Bing Ads API Release Notes: https://docs.microsoft.com/en-us/advertising/guides/release-notes.
Expand Down
2 changes: 1 addition & 1 deletion bingads/manifest.py
View file
@@ -1,5 +1,5 @@
import sys
VERSION = '12.13.4'
VERSION = '12.13.4.1'
BULK_FORMAT_VERSION_5 = '5.0'
BULK_FORMAT_VERSION_6 = '6.0'
WORKING_NAME = 'BingAdsSDKPython'
Expand Down
68 changes: 36 additions & 32 deletions bingads/v12/internal/extensions.py
View file
Expand Up @@ -42,6 +42,8 @@
RadiusCriterion = _CAMPAIGN_OBJECT_FACTORY_V12.create('RadiusCriterion')
TargetSetting_Type = type(_CAMPAIGN_OBJECT_FACTORY_V12.create('TargetSetting'))
CoOpSetting_Type = type(_CAMPAIGN_OBJECT_FACTORY_V12.create('CoOpSetting'))
TextAsset_Type = type(_CAMPAIGN_OBJECT_FACTORY_V12.create('TextAsset'))
ImageAsset_Type = type(_CAMPAIGN_OBJECT_FACTORY_V12.create('ImageAsset'))

def bulk_str(value):
if value is None or (hasattr(value, 'value') and value.value is None):
Expand Down Expand Up @@ -402,31 +404,32 @@ def csv_to_field_Rsa_TextAssetLinks(assetLinks, value):

for assetLinkContract in assetLinkContracts:
asset_link = _CAMPAIGN_OBJECT_FACTORY_V12.create('AssetLink')
asset_link.Asset = _CAMPAIGN_OBJECT_FACTORY_V12.create('TextAsset')
asset_link.Asset.Type = 'TextAsset'
asset_link.Asset.Id = assetLinkContract['id']
asset_link.Asset.Text = assetLinkContract['text']
asset_link.Asset.Name = assetLinkContract['name']
asset_link.AssetPerformanceLabel = assetLinkContract['assetPerformanceLabel']
asset_link.PinnedField = assetLinkContract['pinnedField']
asset_link.EditorialStatus = assetLinkContract['editorialStatus']
asset_link.Asset.Id = assetLinkContract['id'] if 'id' in assetLinkContract else None
asset_link.Asset.Text = assetLinkContract['text'] if 'text' in assetLinkContract else None
asset_link.Asset.Name = assetLinkContract['name'] if 'name' in assetLinkContract else None
asset_link.AssetPerformanceLabel = assetLinkContract['assetPerformanceLabel'] if 'assetPerformanceLabel' in assetLinkContract else None
asset_link.PinnedField = assetLinkContract['pinnedField'] if 'pinnedField' in assetLinkContract else None
asset_link.EditorialStatus = assetLinkContract['editorialStatus'] if 'editorialStatus' in assetLinkContract else None
assetLinks.AssetLink.append(asset_link)

def field_to_csv_ImageAssetLinks(entity):
if entity is None or entity.AssetLink is None:
return None
assetLinkContracts = []
for assetLink in entity.AssetLink:
if assetLink.Asset is not None and assetLink.Asset.Type == 'ImageAsset':
if assetLink.Asset is not None and isinstance(assetLink.Asset, ImageAsset_Type):
contract = {}
contract['cropHeight'] = assetLink.Asset.CropHeight
contract['cropWidth'] = assetLink.Asset.CropWidth
contract['cropX'] = assetLink.Asset.CropX
contract['cropY'] = assetLink.Asset.CropY
contract['id'] = assetLink.Asset.Id
contract['name'] = assetLink.Asset.Name
contract['assetPerformanceLabel'] = assetLink.AssetPerformanceLabel
contract['editorialStatus'] = assetLink.EditorialStatus
contract['pinnedField'] = assetLink.PinnedField
contract['cropHeight'] = assetLink.Asset.CropHeight if hasattr(assetLink.Asset, 'CropHeight') else None
contract['cropWidth'] = assetLink.Asset.CropWidth if hasattr(assetLink.Asset, 'CropWidth') else None
contract['cropX'] = assetLink.Asset.CropX if hasattr(assetLink.Asset, 'CropX') else None
contract['cropY'] = assetLink.Asset.CropY if hasattr(assetLink.Asset, 'CropY') else None
contract['id'] = assetLink.Asset.Id if hasattr(assetLink.Asset, 'Id') else None
contract['name'] = assetLink.Asset.Name if hasattr(assetLink.Asset, 'Name') else None
contract['assetPerformanceLabel'] = assetLink.AssetPerformanceLabel if hasattr(assetLink, 'AssetPerformanceLabel') else None
contract['editorialStatus'] = assetLink.EditorialStatus if hasattr(assetLink, 'EditorialStatus') else None
contract['pinnedField'] = assetLink.PinnedField if hasattr(assetLink, 'PinnedField') else None
assetLinkContracts.append(contract)
if len(assetLinkContracts) > 0:
return json.dumps(assetLinkContracts)
Expand All @@ -439,31 +442,32 @@ def csv_to_field_ImageAssetLinks(assetLinks, value):

for assetLinkContract in assetLinkContracts:
asset_link = _CAMPAIGN_OBJECT_FACTORY_V12.create('AssetLink')
asset_link.Asset = _CAMPAIGN_OBJECT_FACTORY_V12.create('ImageAsset')
asset_link.Asset.Type = 'ImageAsset'
asset_link.Asset.CropHeight = assetLinkContract['cropHeight']
asset_link.Asset.CropWidth = assetLinkContract['cropWidth']
asset_link.Asset.CropX = assetLinkContract['cropX']
asset_link.Asset.CropY = assetLinkContract['cropY']
asset_link.Asset.Id = assetLinkContract['id']
asset_link.Asset.Name = assetLinkContract['name']
asset_link.AssetPerformanceLabel = assetLinkContract['assetPerformanceLabel']
asset_link.PinnedField = assetLinkContract['pinnedField']
asset_link.EditorialStatus = assetLinkContract['editorialStatus']
asset_link.Asset.CropHeight = assetLinkContract['cropHeight'] if 'cropHeight' in assetLinkContract else None
asset_link.Asset.CropWidth = assetLinkContract['cropWidth'] if 'cropWidth' in assetLinkContract else None
asset_link.Asset.CropX = assetLinkContract['cropX'] if 'cropX' in assetLinkContract else None
asset_link.Asset.CropY = assetLinkContract['cropY'] if 'cropY' in assetLinkContract else None
asset_link.Asset.Id = assetLinkContract['id'] if 'id' in assetLinkContract else None
asset_link.Asset.Name = assetLinkContract['name'] if 'name' in assetLinkContract else None
asset_link.AssetPerformanceLabel = assetLinkContract['assetPerformanceLabel'] if 'assetPerformanceLabel' in assetLinkContract else None
asset_link.PinnedField = assetLinkContract['pinnedField'] if 'pinnedField' in assetLinkContract else None
asset_link.EditorialStatus = assetLinkContract['editorialStatus'] if 'editorialStatus' in assetLinkContract else None
assetLinks.AssetLink.append(asset_link)

def field_to_csv_Rsa_TextAssetLinks(entity):
if entity is None or entity.AssetLink is None:
return None
assetLinkContracts = []
for assetLink in entity.AssetLink:
if assetLink.Asset is not None and assetLink.Asset.Type == 'TextAsset':
if assetLink.Asset is not None and isinstance(assetLink.Asset, TextAsset_Type):
contract = {}
contract['id'] = assetLink.Asset.Id
contract['name'] = assetLink.Asset.Name
contract['text'] = assetLink.Asset.Text
contract['assetPerformanceLabel'] = assetLink.AssetPerformanceLabel
contract['editorialStatus'] = assetLink.EditorialStatus
contract['pinnedField'] = assetLink.PinnedField
contract['id'] = assetLink.Asset.Id if hasattr(assetLink.Asset, 'Id') else None
contract['name'] = assetLink.Asset.Name if hasattr(assetLink.Asset, 'Name') else None
contract['text'] = assetLink.Asset.Text if hasattr(assetLink.Asset, 'Text') else None
contract['assetPerformanceLabel'] = assetLink.AssetPerformanceLabel if hasattr(assetLink, 'AssetPerformanceLabel') else None
contract['editorialStatus'] = assetLink.EditorialStatus if hasattr(assetLink, 'EditorialStatus') else None
contract['pinnedField'] = assetLink.PinnedField if hasattr(assetLink, 'PinnedField') else None
assetLinkContracts.append(contract)
if len(assetLinkContracts) > 0:
return json.dumps(assetLinkContracts)
Expand Down
40 changes: 22 additions & 18 deletions bingads/v13/internal/extensions.py
View file
Expand Up @@ -42,6 +42,8 @@
RadiusCriterion = _CAMPAIGN_OBJECT_FACTORY_V13.create('RadiusCriterion')
TargetSetting_Type = type(_CAMPAIGN_OBJECT_FACTORY_V13.create('TargetSetting'))
CoOpSetting_Type = type(_CAMPAIGN_OBJECT_FACTORY_V13.create('CoOpSetting'))
TextAsset_Type = type(_CAMPAIGN_OBJECT_FACTORY_V13.create('TextAsset'))
ImageAsset_Type = type(_CAMPAIGN_OBJECT_FACTORY_V13.create('ImageAsset'))

def bulk_str(value):
if value is None or (hasattr(value, 'value') and value.value is None):
Expand Down Expand Up @@ -402,6 +404,7 @@ def csv_to_field_Rsa_TextAssetLinks(assetLinks, value):

for assetLinkContract in assetLinkContracts:
asset_link = _CAMPAIGN_OBJECT_FACTORY_V13.create('AssetLink')
asset_link.Asset = _CAMPAIGN_OBJECT_FACTORY_V13.create('TextAsset')
asset_link.Asset.Type = 'TextAsset'
asset_link.Asset.Id = assetLinkContract['id']
asset_link.Asset.Text = assetLinkContract['text']
Expand All @@ -416,17 +419,17 @@ def field_to_csv_ImageAssetLinks(entity):
return None
assetLinkContracts = []
for assetLink in entity.AssetLink:
if assetLink.Asset is not None and assetLink.Asset.Type == 'ImageAsset':
contract = {}
contract['cropHeight'] = assetLink.Asset.CropHeight
contract['cropWidth'] = assetLink.Asset.CropWidth
contract['cropX'] = assetLink.Asset.CropX
contract['cropY'] = assetLink.Asset.CropY
contract['id'] = assetLink.Asset.Id
contract['name'] = assetLink.Asset.Name
contract['assetPerformanceLabel'] = assetLink.AssetPerformanceLabel
contract['editorialStatus'] = assetLink.EditorialStatus
contract['pinnedField'] = assetLink.PinnedField
if assetLink.Asset is not None and isinstance(assetLink.Asset, ImageAsset_Type):
contract = {}
contract['cropHeight'] = assetLink.Asset.CropHeight if hasattr(assetLink.Asset, 'CropHeight') else None
contract['cropWidth'] = assetLink.Asset.CropWidth if hasattr(assetLink.Asset, 'CropWidth') else None
contract['cropX'] = assetLink.Asset.CropX if hasattr(assetLink.Asset, 'CropX') else None
contract['cropY'] = assetLink.Asset.CropY if hasattr(assetLink.Asset, 'CropY') else None
contract['id'] = assetLink.Asset.Id if hasattr(assetLink.Asset, 'Id') else None
contract['name'] = assetLink.Asset.Name if hasattr(assetLink.Asset, 'Name') else None
contract['assetPerformanceLabel'] = assetLink.AssetPerformanceLabel if hasattr(assetLink, 'AssetPerformanceLabel') else None
contract['editorialStatus'] = assetLink.EditorialStatus if hasattr(assetLink, 'EditorialStatus') else None
contract['pinnedField'] = assetLink.PinnedField if hasattr(assetLink, 'PinnedField') else None
assetLinkContracts.append(contract)
if len(assetLinkContracts) > 0:
return json.dumps(assetLinkContracts)
Expand All @@ -439,6 +442,7 @@ def csv_to_field_ImageAssetLinks(assetLinks, value):

for assetLinkContract in assetLinkContracts:
asset_link = _CAMPAIGN_OBJECT_FACTORY_V13.create('AssetLink')
asset_link.Asset = _CAMPAIGN_OBJECT_FACTORY_V13.create('ImageAsset')
asset_link.Asset.Type = 'ImageAsset'
asset_link.Asset.CropHeight = assetLinkContract['cropHeight']
asset_link.Asset.CropWidth = assetLinkContract['cropWidth']
Expand All @@ -456,14 +460,14 @@ def field_to_csv_Rsa_TextAssetLinks(entity):
return None
assetLinkContracts = []
for assetLink in entity.AssetLink:
if assetLink.Asset is not None and assetLink.Asset.Type == 'TextAsset':
if assetLink.Asset is not None and isinstance(assetLink.Asset, TextAsset_Type):
contract = {}
contract['id'] = assetLink.Asset.Id
contract['name'] = assetLink.Asset.Name
contract['text'] = assetLink.Asset.Text
contract['assetPerformanceLabel'] = assetLink.AssetPerformanceLabel
contract['editorialStatus'] = assetLink.EditorialStatus
contract['pinnedField'] = assetLink.PinnedField
contract['id'] = assetLink.Asset.Id if hasattr(assetLink.Asset, 'Id') else None
contract['name'] = assetLink.Asset.Name if hasattr(assetLink.Asset, 'Name') else None
contract['text'] = assetLink.Asset.Text if hasattr(assetLink.Asset, 'Text') else None
contract['assetPerformanceLabel'] = assetLink.AssetPerformanceLabel if hasattr(assetLink, 'AssetPerformanceLabel') else None
contract['editorialStatus'] = assetLink.EditorialStatus if hasattr(assetLink, 'EditorialStatus') else None
contract['pinnedField'] = assetLink.PinnedField if hasattr(assetLink, 'PinnedField') else None
assetLinkContracts.append(contract)
if len(assetLinkContracts) > 0:
return json.dumps(assetLinkContracts)
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Expand Up @@ -3,7 +3,7 @@
except ImportError:
from distutils.core import setup

VERSION = '12.13.4'
VERSION = '12.13.4.1'

with open('README.rst', 'r') as f:
readme = f.read()
Expand Down

0 comments on commit d23e804

Please sign in to comment.