Skip to content

Commit 6122ab1

Browse files
committed
feat(vr4): regenerate vr4 where TrainingDataObject is optional
1 parent ecb261e commit 6122ab1

File tree

1 file changed

+9
-14
lines changed

1 file changed

+9
-14
lines changed

ibm_watson/visual_recognition_v4.py

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -142,12 +142,10 @@ def analyze(self,
142142
params = {'version': self.version}
143143

144144
form_data = []
145-
if collection_ids:
146-
collection_ids = self._convert_list(collection_ids)
147-
form_data.append(('collection_ids', (None, collection_ids, 'text/plain')))
148-
if features:
149-
features = self._convert_list(features)
150-
form_data.append(('features', (None, features, 'text/plain')))
145+
for item in collection_ids:
146+
form_data.append(('collection_ids', (None, item, 'text/plain')))
147+
for item in features:
148+
form_data.append(('features', (None, item, 'text/plain')))
151149
if images_file:
152150
for item in images_file:
153151
form_data.append(('images_file', (item.filename, item.data,
@@ -2219,15 +2217,16 @@ class TrainingDataObjects():
22192217
"""
22202218
Training data for all objects.
22212219
2222-
:attr list[TrainingDataObject] objects: Training data for specific objects.
2220+
:attr list[TrainingDataObject] objects: (optional) Training data for specific
2221+
objects.
22232222
"""
22242223

2225-
def __init__(self, objects):
2224+
def __init__(self, *, objects=None):
22262225
"""
22272226
Initialize a TrainingDataObjects object.
22282227
2229-
:param list[TrainingDataObject] objects: Training data for specific
2230-
objects.
2228+
:param list[TrainingDataObject] objects: (optional) Training data for
2229+
specific objects.
22312230
"""
22322231
self.objects = objects
22332232

@@ -2245,10 +2244,6 @@ def _from_dict(cls, _dict):
22452244
args['objects'] = [
22462245
TrainingDataObject._from_dict(x) for x in (_dict.get('objects'))
22472246
]
2248-
else:
2249-
raise ValueError(
2250-
'Required property \'objects\' not present in TrainingDataObjects JSON'
2251-
)
22522247
return cls(**args)
22532248

22542249
def _to_dict(self):

0 commit comments

Comments
 (0)