Skip to content

Commit c09022f

Browse files
fix(nlu): remove ListCategoriesModelsResponse
1 parent 323a2da commit c09022f

File tree

2 files changed

+3
-112
lines changed

2 files changed

+3
-112
lines changed

ibm_watson/natural_language_understanding_v1.py

Lines changed: 1 addition & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -623,7 +623,7 @@ def list_categories_models(self, **kwargs) -> DetailedResponse:
623623
624624
:param dict headers: A `dict` containing the request headers
625625
:return: A `DetailedResponse` containing the result, headers and HTTP status code.
626-
:rtype: DetailedResponse with `dict` result representing a `ListCategoriesModelsResponse` object
626+
:rtype: DetailedResponse with `dict` result representing a `CategoriesModelList` object
627627
"""
628628

629629
headers = {}
@@ -3990,62 +3990,6 @@ def __ne__(self, other: 'KeywordsResult') -> bool:
39903990
return not self == other
39913991

39923992

3993-
class ListCategoriesModelsResponse():
3994-
"""
3995-
ListCategoriesModelsResponse.
3996-
3997-
:attr List[CategoriesModelList] models: (optional)
3998-
"""
3999-
4000-
def __init__(self, *, models: List['CategoriesModelList'] = None) -> None:
4001-
"""
4002-
Initialize a ListCategoriesModelsResponse object.
4003-
4004-
:param List[CategoriesModelList] models: (optional)
4005-
"""
4006-
self.models = models
4007-
4008-
@classmethod
4009-
def from_dict(cls, _dict: Dict) -> 'ListCategoriesModelsResponse':
4010-
"""Initialize a ListCategoriesModelsResponse object from a json dictionary."""
4011-
args = {}
4012-
if 'models' in _dict:
4013-
args['models'] = [
4014-
CategoriesModelList.from_dict(x) for x in _dict.get('models')
4015-
]
4016-
return cls(**args)
4017-
4018-
@classmethod
4019-
def _from_dict(cls, _dict):
4020-
"""Initialize a ListCategoriesModelsResponse object from a json dictionary."""
4021-
return cls.from_dict(_dict)
4022-
4023-
def to_dict(self) -> Dict:
4024-
"""Return a json dictionary representing this model."""
4025-
_dict = {}
4026-
if hasattr(self, 'models') and self.models is not None:
4027-
_dict['models'] = [x.to_dict() for x in self.models]
4028-
return _dict
4029-
4030-
def _to_dict(self):
4031-
"""Return a json dictionary representing this model."""
4032-
return self.to_dict()
4033-
4034-
def __str__(self) -> str:
4035-
"""Return a `str` version of this ListCategoriesModelsResponse object."""
4036-
return json.dumps(self.to_dict(), indent=2)
4037-
4038-
def __eq__(self, other: 'ListCategoriesModelsResponse') -> bool:
4039-
"""Return `true` when self and other are equal, false otherwise."""
4040-
if not isinstance(other, self.__class__):
4041-
return False
4042-
return self.__dict__ == other.__dict__
4043-
4044-
def __ne__(self, other: 'ListCategoriesModelsResponse') -> bool:
4045-
"""Return `true` when self and other are not equal, false otherwise."""
4046-
return not self == other
4047-
4048-
40493993
class ListClassificationsModelsResponse():
40503994
"""
40513995
ListClassificationsModelsResponse.

test/unit/test_natural_language_understanding_v1.py

Lines changed: 2 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1050,7 +1050,7 @@ def test_list_categories_models_all_params(self):
10501050
"""
10511051
# Set up mock
10521052
url = self.preprocess_url(_base_url + '/v1/models/categories')
1053-
mock_response = '{"models": [{"models": [{"name": "name", "user_metadata": {"mapKey": {"anyKey": "anyValue"}}, "language": "language", "description": "description", "model_version": "model_version", "workspace_id": "workspace_id", "version_description": "version_description", "features": ["features"], "status": "starting", "model_id": "model_id", "created": "2019-01-01T12:00:00.000Z", "notices": [{"message": "message"}], "last_trained": "2019-01-01T12:00:00.000Z", "last_deployed": "2019-01-01T12:00:00.000Z"}]}]}'
1053+
mock_response = '{"models": [{"name": "name", "user_metadata": {"mapKey": {"anyKey": "anyValue"}}, "language": "language", "description": "description", "model_version": "model_version", "workspace_id": "workspace_id", "version_description": "version_description", "features": ["features"], "status": "starting", "model_id": "model_id", "created": "2019-01-01T12:00:00.000Z", "notices": [{"message": "message"}], "last_trained": "2019-01-01T12:00:00.000Z", "last_deployed": "2019-01-01T12:00:00.000Z"}]}'
10541054
responses.add(responses.GET,
10551055
url,
10561056
body=mock_response,
@@ -1073,7 +1073,7 @@ def test_list_categories_models_value_error(self):
10731073
"""
10741074
# Set up mock
10751075
url = self.preprocess_url(_base_url + '/v1/models/categories')
1076-
mock_response = '{"models": [{"models": [{"name": "name", "user_metadata": {"mapKey": {"anyKey": "anyValue"}}, "language": "language", "description": "description", "model_version": "model_version", "workspace_id": "workspace_id", "version_description": "version_description", "features": ["features"], "status": "starting", "model_id": "model_id", "created": "2019-01-01T12:00:00.000Z", "notices": [{"message": "message"}], "last_trained": "2019-01-01T12:00:00.000Z", "last_deployed": "2019-01-01T12:00:00.000Z"}]}]}'
1076+
mock_response = '{"models": [{"name": "name", "user_metadata": {"mapKey": {"anyKey": "anyValue"}}, "language": "language", "description": "description", "model_version": "model_version", "workspace_id": "workspace_id", "version_description": "version_description", "features": ["features"], "status": "starting", "model_id": "model_id", "created": "2019-01-01T12:00:00.000Z", "notices": [{"message": "message"}], "last_trained": "2019-01-01T12:00:00.000Z", "last_deployed": "2019-01-01T12:00:00.000Z"}]}'
10771077
responses.add(responses.GET,
10781078
url,
10791079
body=mock_response,
@@ -3151,59 +3151,6 @@ def test_keywords_result_serialization(self):
31513151
keywords_result_model_json2 = keywords_result_model.to_dict()
31523152
assert keywords_result_model_json2 == keywords_result_model_json
31533153

3154-
class TestListCategoriesModelsResponse():
3155-
"""
3156-
Test Class for ListCategoriesModelsResponse
3157-
"""
3158-
3159-
def test_list_categories_models_response_serialization(self):
3160-
"""
3161-
Test serialization/deserialization for ListCategoriesModelsResponse
3162-
"""
3163-
3164-
# Construct dict forms of any model objects needed in order to build this model.
3165-
3166-
notice_model = {} # Notice
3167-
notice_model['message'] = 'Not enough examples for class \'foo\'. 4 were given but 5 are required.'
3168-
3169-
categories_model_model = {} # CategoriesModel
3170-
categories_model_model['name'] = 'testString'
3171-
categories_model_model['user_metadata'] = {}
3172-
categories_model_model['language'] = 'testString'
3173-
categories_model_model['description'] = 'testString'
3174-
categories_model_model['model_version'] = 'testString'
3175-
categories_model_model['workspace_id'] = 'testString'
3176-
categories_model_model['version_description'] = 'testString'
3177-
categories_model_model['features'] = ['testString']
3178-
categories_model_model['status'] = 'starting'
3179-
categories_model_model['model_id'] = 'testString'
3180-
categories_model_model['created'] = datetime_to_string(string_to_datetime("2019-01-01T12:00:00.000Z"))
3181-
categories_model_model['notices'] = [notice_model]
3182-
categories_model_model['last_trained'] = datetime_to_string(string_to_datetime("2019-01-01T12:00:00.000Z"))
3183-
categories_model_model['last_deployed'] = datetime_to_string(string_to_datetime("2019-01-01T12:00:00.000Z"))
3184-
3185-
categories_model_list_model = {} # CategoriesModelList
3186-
categories_model_list_model['models'] = [categories_model_model]
3187-
3188-
# Construct a json representation of a ListCategoriesModelsResponse model
3189-
list_categories_models_response_model_json = {}
3190-
list_categories_models_response_model_json['models'] = [categories_model_list_model]
3191-
3192-
# Construct a model instance of ListCategoriesModelsResponse by calling from_dict on the json representation
3193-
list_categories_models_response_model = ListCategoriesModelsResponse.from_dict(list_categories_models_response_model_json)
3194-
assert list_categories_models_response_model != False
3195-
3196-
# Construct a model instance of ListCategoriesModelsResponse by calling from_dict on the json representation
3197-
list_categories_models_response_model_dict = ListCategoriesModelsResponse.from_dict(list_categories_models_response_model_json).__dict__
3198-
list_categories_models_response_model2 = ListCategoriesModelsResponse(**list_categories_models_response_model_dict)
3199-
3200-
# Verify the model instances are equivalent
3201-
assert list_categories_models_response_model == list_categories_models_response_model2
3202-
3203-
# Convert model instance back to dict and verify no loss of data
3204-
list_categories_models_response_model_json2 = list_categories_models_response_model.to_dict()
3205-
assert list_categories_models_response_model_json2 == list_categories_models_response_model_json
3206-
32073154
class TestListClassificationsModelsResponse():
32083155
"""
32093156
Test Class for ListClassificationsModelsResponse

0 commit comments

Comments
 (0)