Skip to content

Commit c9ae547

Browse files
apaparazzi0329apaparazzi0329
committed
refactor(all): generator only changes
1 parent 6d60aa4 commit c9ae547

16 files changed

Lines changed: 5023 additions & 3104 deletions

‎ibm_watson/assistant_v1.py‎

Lines changed: 1035 additions & 412 deletions
Large diffs are not rendered by default.

‎ibm_watson/assistant_v2.py‎

Lines changed: 674 additions & 235 deletions
Large diffs are not rendered by default.

‎ibm_watson/discovery_v1.py‎

Lines changed: 868 additions & 345 deletions
Large diffs are not rendered by default.

‎ibm_watson/discovery_v2.py‎

Lines changed: 855 additions & 373 deletions
Large diffs are not rendered by default.

‎ibm_watson/language_translator_v3.py‎

Lines changed: 97 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# coding: utf-8
22

3-
# (C) Copyright IBM Corp. 2019, 2022.
3+
# (C) Copyright IBM Corp. 2019, 2023.
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17-
# IBM OpenAPI SDK Code Generator Version: 3.53.0-9710cac3-20220713-193508
17+
# IBM OpenAPI SDK Code Generator Version: 3.64.1-cee95189-20230124-211647
1818
"""
1919
IBM Watson™ Language Translator translates text from one language to another. The
2020
service offers multiple IBM-provided translation models that you can customize based on
@@ -103,7 +103,9 @@ def list_languages(self, **kwargs) -> DetailedResponse:
103103
operation_id='list_languages')
104104
headers.update(sdk_headers)
105105

106-
params = {'version': self.version}
106+
params = {
107+
'version': self.version,
108+
}
107109

108110
if 'headers' in kwargs:
109111
headers.update(kwargs.get('headers'))
@@ -169,13 +171,15 @@ def translate(self,
169171
operation_id='translate')
170172
headers.update(sdk_headers)
171173

172-
params = {'version': self.version}
174+
params = {
175+
'version': self.version,
176+
}
173177

174178
data = {
175179
'text': text,
176180
'model_id': model_id,
177181
'source': source,
178-
'target': target
182+
'target': target,
179183
}
180184
data = {k: v for (k, v) in data.items() if v is not None}
181185
data = json.dumps(data, ensure_ascii=False).encode('utf-8')
@@ -219,7 +223,9 @@ def list_identifiable_languages(self, **kwargs) -> DetailedResponse:
219223
operation_id='list_identifiable_languages')
220224
headers.update(sdk_headers)
221225

222-
params = {'version': self.version}
226+
params = {
227+
'version': self.version,
228+
}
223229

224230
if 'headers' in kwargs:
225231
headers.update(kwargs.get('headers'))
@@ -247,15 +253,17 @@ def identify(self, text: Union[str, TextIO], **kwargs) -> DetailedResponse:
247253
:rtype: DetailedResponse with `dict` result representing a `IdentifiedLanguages` object
248254
"""
249255

250-
if text is None:
256+
if not text:
251257
raise ValueError('text must be provided')
252258
headers = {}
253259
sdk_headers = get_sdk_headers(service_name=self.DEFAULT_SERVICE_NAME,
254260
service_version='V3',
255261
operation_id='identify')
256262
headers.update(sdk_headers)
257263

258-
params = {'version': self.version}
264+
params = {
265+
'version': self.version,
266+
}
259267

260268
data = text
261269
headers['content-type'] = 'text/plain'
@@ -314,7 +322,7 @@ def list_models(self,
314322
'version': self.version,
315323
'source': source,
316324
'target': target,
317-
'default': default
325+
'default': default,
318326
}
319327

320328
if 'headers' in kwargs:
@@ -440,7 +448,7 @@ def create_model(self,
440448
:rtype: DetailedResponse with `dict` result representing a `TranslationModel` object
441449
"""
442450

443-
if base_model_id is None:
451+
if not base_model_id:
444452
raise ValueError('base_model_id must be provided')
445453
headers = {}
446454
sdk_headers = get_sdk_headers(service_name=self.DEFAULT_SERVICE_NAME,
@@ -451,7 +459,7 @@ def create_model(self,
451459
params = {
452460
'version': self.version,
453461
'base_model_id': base_model_id,
454-
'name': name
462+
'name': name,
455463
}
456464

457465
form_data = []
@@ -493,15 +501,17 @@ def delete_model(self, model_id: str, **kwargs) -> DetailedResponse:
493501
:rtype: DetailedResponse with `dict` result representing a `DeleteModelResult` object
494502
"""
495503

496-
if model_id is None:
504+
if not model_id:
497505
raise ValueError('model_id must be provided')
498506
headers = {}
499507
sdk_headers = get_sdk_headers(service_name=self.DEFAULT_SERVICE_NAME,
500508
service_version='V3',
501509
operation_id='delete_model')
502510
headers.update(sdk_headers)
503511

504-
params = {'version': self.version}
512+
params = {
513+
'version': self.version,
514+
}
505515

506516
if 'headers' in kwargs:
507517
headers.update(kwargs.get('headers'))
@@ -534,15 +544,17 @@ def get_model(self, model_id: str, **kwargs) -> DetailedResponse:
534544
:rtype: DetailedResponse with `dict` result representing a `TranslationModel` object
535545
"""
536546

537-
if model_id is None:
547+
if not model_id:
538548
raise ValueError('model_id must be provided')
539549
headers = {}
540550
sdk_headers = get_sdk_headers(service_name=self.DEFAULT_SERVICE_NAME,
541551
service_version='V3',
542552
operation_id='get_model')
543553
headers.update(sdk_headers)
544554

545-
params = {'version': self.version}
555+
params = {
556+
'version': self.version,
557+
}
546558

547559
if 'headers' in kwargs:
548560
headers.update(kwargs.get('headers'))
@@ -582,7 +594,9 @@ def list_documents(self, **kwargs) -> DetailedResponse:
582594
operation_id='list_documents')
583595
headers.update(sdk_headers)
584596

585-
params = {'version': self.version}
597+
params = {
598+
'version': self.version,
599+
}
586600

587601
if 'headers' in kwargs:
588602
headers.update(kwargs.get('headers'))
@@ -654,7 +668,9 @@ def translate_document(self,
654668
operation_id='translate_document')
655669
headers.update(sdk_headers)
656670

657-
params = {'version': self.version}
671+
params = {
672+
'version': self.version,
673+
}
658674

659675
form_data = []
660676
if not filename and hasattr(file, 'name'):
@@ -700,15 +716,17 @@ def get_document_status(self, document_id: str,
700716
:rtype: DetailedResponse with `dict` result representing a `DocumentStatus` object
701717
"""
702718

703-
if document_id is None:
719+
if not document_id:
704720
raise ValueError('document_id must be provided')
705721
headers = {}
706722
sdk_headers = get_sdk_headers(service_name=self.DEFAULT_SERVICE_NAME,
707723
service_version='V3',
708724
operation_id='get_document_status')
709725
headers.update(sdk_headers)
710726

711-
params = {'version': self.version}
727+
params = {
728+
'version': self.version,
729+
}
712730

713731
if 'headers' in kwargs:
714732
headers.update(kwargs.get('headers'))
@@ -739,15 +757,17 @@ def delete_document(self, document_id: str, **kwargs) -> DetailedResponse:
739757
:rtype: DetailedResponse
740758
"""
741759

742-
if document_id is None:
760+
if not document_id:
743761
raise ValueError('document_id must be provided')
744762
headers = {}
745763
sdk_headers = get_sdk_headers(service_name=self.DEFAULT_SERVICE_NAME,
746764
service_version='V3',
747765
operation_id='delete_document')
748766
headers.update(sdk_headers)
749767

750-
params = {'version': self.version}
768+
params = {
769+
'version': self.version,
770+
}
751771

752772
if 'headers' in kwargs:
753773
headers.update(kwargs.get('headers'))
@@ -796,15 +816,19 @@ def get_translated_document(self,
796816
:rtype: DetailedResponse with `BinaryIO` result
797817
"""
798818

799-
if document_id is None:
819+
if not document_id:
800820
raise ValueError('document_id must be provided')
801-
headers = {'Accept': accept}
821+
headers = {
822+
'Accept': accept,
823+
}
802824
sdk_headers = get_sdk_headers(service_name=self.DEFAULT_SERVICE_NAME,
803825
service_version='V3',
804826
operation_id='get_translated_document')
805827
headers.update(sdk_headers)
806828

807-
params = {'version': self.version}
829+
params = {
830+
'version': self.version,
831+
}
808832

809833
if 'headers' in kwargs:
810834
headers.update(kwargs.get('headers'))
@@ -1019,7 +1043,7 @@ def from_dict(cls, _dict: Dict) -> 'DocumentList':
10191043
args = {}
10201044
if 'documents' in _dict:
10211045
args['documents'] = [
1022-
DocumentStatus.from_dict(x) for x in _dict.get('documents')
1046+
DocumentStatus.from_dict(v) for v in _dict.get('documents')
10231047
]
10241048
else:
10251049
raise ValueError(
@@ -1036,7 +1060,13 @@ def to_dict(self) -> Dict:
10361060
"""Return a json dictionary representing this model."""
10371061
_dict = {}
10381062
if hasattr(self, 'documents') and self.documents is not None:
1039-
_dict['documents'] = [x.to_dict() for x in self.documents]
1063+
documents_list = []
1064+
for v in self.documents:
1065+
if isinstance(v, dict):
1066+
documents_list.append(v)
1067+
else:
1068+
documents_list.append(v.to_dict())
1069+
_dict['documents'] = documents_list
10401070
return _dict
10411071

10421072
def _to_dict(self):
@@ -1357,8 +1387,8 @@ def from_dict(cls, _dict: Dict) -> 'IdentifiableLanguages':
13571387
args = {}
13581388
if 'languages' in _dict:
13591389
args['languages'] = [
1360-
IdentifiableLanguage.from_dict(x)
1361-
for x in _dict.get('languages')
1390+
IdentifiableLanguage.from_dict(v)
1391+
for v in _dict.get('languages')
13621392
]
13631393
else:
13641394
raise ValueError(
@@ -1375,7 +1405,13 @@ def to_dict(self) -> Dict:
13751405
"""Return a json dictionary representing this model."""
13761406
_dict = {}
13771407
if hasattr(self, 'languages') and self.languages is not None:
1378-
_dict['languages'] = [x.to_dict() for x in self.languages]
1408+
languages_list = []
1409+
for v in self.languages:
1410+
if isinstance(v, dict):
1411+
languages_list.append(v)
1412+
else:
1413+
languages_list.append(v.to_dict())
1414+
_dict['languages'] = languages_list
13791415
return _dict
13801416

13811417
def _to_dict(self):
@@ -1489,7 +1525,7 @@ def from_dict(cls, _dict: Dict) -> 'IdentifiedLanguages':
14891525
args = {}
14901526
if 'languages' in _dict:
14911527
args['languages'] = [
1492-
IdentifiedLanguage.from_dict(x) for x in _dict.get('languages')
1528+
IdentifiedLanguage.from_dict(v) for v in _dict.get('languages')
14931529
]
14941530
else:
14951531
raise ValueError(
@@ -1506,7 +1542,13 @@ def to_dict(self) -> Dict:
15061542
"""Return a json dictionary representing this model."""
15071543
_dict = {}
15081544
if hasattr(self, 'languages') and self.languages is not None:
1509-
_dict['languages'] = [x.to_dict() for x in self.languages]
1545+
languages_list = []
1546+
for v in self.languages:
1547+
if isinstance(v, dict):
1548+
languages_list.append(v)
1549+
else:
1550+
languages_list.append(v.to_dict())
1551+
_dict['languages'] = languages_list
15101552
return _dict
15111553

15121554
def _to_dict(self):
@@ -1703,7 +1745,7 @@ def from_dict(cls, _dict: Dict) -> 'Languages':
17031745
args = {}
17041746
if 'languages' in _dict:
17051747
args['languages'] = [
1706-
Language.from_dict(x) for x in _dict.get('languages')
1748+
Language.from_dict(v) for v in _dict.get('languages')
17071749
]
17081750
else:
17091751
raise ValueError(
@@ -1719,7 +1761,13 @@ def to_dict(self) -> Dict:
17191761
"""Return a json dictionary representing this model."""
17201762
_dict = {}
17211763
if hasattr(self, 'languages') and self.languages is not None:
1722-
_dict['languages'] = [x.to_dict() for x in self.languages]
1764+
languages_list = []
1765+
for v in self.languages:
1766+
if isinstance(v, dict):
1767+
languages_list.append(v)
1768+
else:
1769+
languages_list.append(v.to_dict())
1770+
_dict['languages'] = languages_list
17231771
return _dict
17241772

17251773
def _to_dict(self):
@@ -1987,7 +2035,7 @@ def from_dict(cls, _dict: Dict) -> 'TranslationModels':
19872035
args = {}
19882036
if 'models' in _dict:
19892037
args['models'] = [
1990-
TranslationModel.from_dict(x) for x in _dict.get('models')
2038+
TranslationModel.from_dict(v) for v in _dict.get('models')
19912039
]
19922040
else:
19932041
raise ValueError(
@@ -2004,7 +2052,13 @@ def to_dict(self) -> Dict:
20042052
"""Return a json dictionary representing this model."""
20052053
_dict = {}
20062054
if hasattr(self, 'models') and self.models is not None:
2007-
_dict['models'] = [x.to_dict() for x in self.models]
2055+
models_list = []
2056+
for v in self.models:
2057+
if isinstance(v, dict):
2058+
models_list.append(v)
2059+
else:
2060+
models_list.append(v.to_dict())
2061+
_dict['models'] = models_list
20082062
return _dict
20092063

20102064
def _to_dict(self):
@@ -2093,7 +2147,7 @@ def from_dict(cls, _dict: Dict) -> 'TranslationResult':
20932147
'detected_language_confidence')
20942148
if 'translations' in _dict:
20952149
args['translations'] = [
2096-
Translation.from_dict(x) for x in _dict.get('translations')
2150+
Translation.from_dict(v) for v in _dict.get('translations')
20972151
]
20982152
else:
20992153
raise ValueError(
@@ -2122,7 +2176,13 @@ def to_dict(self) -> Dict:
21222176
_dict[
21232177
'detected_language_confidence'] = self.detected_language_confidence
21242178
if hasattr(self, 'translations') and self.translations is not None:
2125-
_dict['translations'] = [x.to_dict() for x in self.translations]
2179+
translations_list = []
2180+
for v in self.translations:
2181+
if isinstance(v, dict):
2182+
translations_list.append(v)
2183+
else:
2184+
translations_list.append(v.to_dict())
2185+
_dict['translations'] = translations_list
21262186
return _dict
21272187

21282188
def _to_dict(self):

0 commit comments

Comments
 (0)