From ac1cbadf4d9a0374e6983df481549cc28a09a910 Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Sat, 22 Sep 2018 17:32:35 -0700 Subject: update python codegen Strip out TAGLINE (tag-related) lines from spec, so we don't get many small Api classes (just one top-level). Ugh. --- python/codegen_python_client.sh | 3 +- python/fatcat_client/api/default_api.py | 30 ++-- python/fatcat_client/models/changelogentries.py | 86 ----------- .../fatcat_client/models/changelogentries_inner.py | 167 --------------------- python/fatcat_client/models/release_ref.py | 30 ++-- .../tests/codegen_tests/test_changelogentries.py | 40 ----- .../codegen_tests/test_changelogentries_inner.py | 40 ----- 7 files changed, 32 insertions(+), 364 deletions(-) delete mode 100644 python/fatcat_client/models/changelogentries.py delete mode 100644 python/fatcat_client/models/changelogentries_inner.py delete mode 100644 python/tests/codegen_tests/test_changelogentries.py delete mode 100644 python/tests/codegen_tests/test_changelogentries_inner.py diff --git a/python/codegen_python_client.sh b/python/codegen_python_client.sh index 3cf79810..4cd30c44 100755 --- a/python/codegen_python_client.sh +++ b/python/codegen_python_client.sh @@ -5,7 +5,8 @@ set -o pipefail OUTPUT=`pwd`/codegen-out mkdir -p $OUTPUT -cp ../fatcat-openapi2.yml $OUTPUT/api.yml +# Strip tags, so entire API is under a single class +cat ../fatcat-openapi2.yml | grep -v "TAGLINE$" > $OUTPUT/api.yml docker run \ -v $OUTPUT:/tmp/swagger/ \ diff --git a/python/fatcat_client/api/default_api.py b/python/fatcat_client/api/default_api.py index 0db7be3d..a5971279 100644 --- a/python/fatcat_client/api/default_api.py +++ b/python/fatcat_client/api/default_api.py @@ -550,43 +550,43 @@ class DefaultApi(object): _request_timeout=params.get('_request_timeout'), collection_formats=collection_formats) - def create_editgroup(self, entity, **kwargs): # noqa: E501 + def create_editgroup(self, editgroup, **kwargs): # noqa: E501 """create_editgroup # noqa: E501 This method makes a synchronous HTTP request by default. To make an asynchronous HTTP request, please pass async=True - >>> thread = api.create_editgroup(entity, async=True) + >>> thread = api.create_editgroup(editgroup, async=True) >>> result = thread.get() :param async bool - :param Editgroup entity: (required) + :param Editgroup editgroup: (required) :return: Editgroup If the method is called asynchronously, returns the request thread. """ kwargs['_return_http_data_only'] = True if kwargs.get('async'): - return self.create_editgroup_with_http_info(entity, **kwargs) # noqa: E501 + return self.create_editgroup_with_http_info(editgroup, **kwargs) # noqa: E501 else: - (data) = self.create_editgroup_with_http_info(entity, **kwargs) # noqa: E501 + (data) = self.create_editgroup_with_http_info(editgroup, **kwargs) # noqa: E501 return data - def create_editgroup_with_http_info(self, entity, **kwargs): # noqa: E501 + def create_editgroup_with_http_info(self, editgroup, **kwargs): # noqa: E501 """create_editgroup # noqa: E501 This method makes a synchronous HTTP request by default. To make an asynchronous HTTP request, please pass async=True - >>> thread = api.create_editgroup_with_http_info(entity, async=True) + >>> thread = api.create_editgroup_with_http_info(editgroup, async=True) >>> result = thread.get() :param async bool - :param Editgroup entity: (required) + :param Editgroup editgroup: (required) :return: Editgroup If the method is called asynchronously, returns the request thread. """ - all_params = ['entity'] # noqa: E501 + all_params = ['editgroup'] # noqa: E501 all_params.append('async') all_params.append('_return_http_data_only') all_params.append('_preload_content') @@ -601,10 +601,10 @@ class DefaultApi(object): ) params[key] = val del params['kwargs'] - # verify the required parameter 'entity' is set - if ('entity' not in params or - params['entity'] is None): - raise ValueError("Missing the required parameter `entity` when calling `create_editgroup`") # noqa: E501 + # verify the required parameter 'editgroup' is set + if ('editgroup' not in params or + params['editgroup'] is None): + raise ValueError("Missing the required parameter `editgroup` when calling `create_editgroup`") # noqa: E501 collection_formats = {} @@ -618,8 +618,8 @@ class DefaultApi(object): local_var_files = {} body_params = None - if 'entity' in params: - body_params = params['entity'] + if 'editgroup' in params: + body_params = params['editgroup'] # HTTP header `Accept` header_params['Accept'] = self.api_client.select_header_accept( ['application/json']) # noqa: E501 diff --git a/python/fatcat_client/models/changelogentries.py b/python/fatcat_client/models/changelogentries.py deleted file mode 100644 index acae2ad7..00000000 --- a/python/fatcat_client/models/changelogentries.py +++ /dev/null @@ -1,86 +0,0 @@ -# coding: utf-8 - -""" - fatcat - - A scalable, versioned, API-oriented catalog of bibliographic entities and file metadata # noqa: E501 - - OpenAPI spec version: 0.1.0 - - Generated by: https://github.com/swagger-api/swagger-codegen.git -""" - - -import pprint -import re # noqa: F401 - -import six - -from fatcat_client.models.changelogentries_inner import ChangelogentriesInner # noqa: F401,E501 - - -class Changelogentries(object): - """NOTE: This class is auto generated by the swagger code generator program. - - Do not edit the class manually. - """ - - """ - Attributes: - swagger_types (dict): The key is attribute name - and the value is attribute type. - attribute_map (dict): The key is attribute name - and the value is json key in definition. - """ - swagger_types = { - } - - attribute_map = { - } - - def __init__(self): # noqa: E501 - """Changelogentries - a model defined in Swagger""" # noqa: E501 - self.discriminator = None - - def to_dict(self): - """Returns the model properties as a dict""" - result = {} - - for attr, _ in six.iteritems(self.swagger_types): - value = getattr(self, attr) - if isinstance(value, list): - result[attr] = list(map( - lambda x: x.to_dict() if hasattr(x, "to_dict") else x, - value - )) - elif hasattr(value, "to_dict"): - result[attr] = value.to_dict() - elif isinstance(value, dict): - result[attr] = dict(map( - lambda item: (item[0], item[1].to_dict()) - if hasattr(item[1], "to_dict") else item, - value.items() - )) - else: - result[attr] = value - - return result - - def to_str(self): - """Returns the string representation of the model""" - return pprint.pformat(self.to_dict()) - - def __repr__(self): - """For `print` and `pprint`""" - return self.to_str() - - def __eq__(self, other): - """Returns true if both objects are equal""" - if not isinstance(other, Changelogentries): - return False - - return self.__dict__ == other.__dict__ - - def __ne__(self, other): - """Returns true if both objects are not equal""" - return not self == other diff --git a/python/fatcat_client/models/changelogentries_inner.py b/python/fatcat_client/models/changelogentries_inner.py deleted file mode 100644 index 08024f6f..00000000 --- a/python/fatcat_client/models/changelogentries_inner.py +++ /dev/null @@ -1,167 +0,0 @@ -# coding: utf-8 - -""" - fatcat - - A scalable, versioned, API-oriented catalog of bibliographic entities and file metadata # noqa: E501 - - OpenAPI spec version: 0.1.0 - - Generated by: https://github.com/swagger-api/swagger-codegen.git -""" - - -import pprint -import re # noqa: F401 - -import six - - -class ChangelogentriesInner(object): - """NOTE: This class is auto generated by the swagger code generator program. - - Do not edit the class manually. - """ - - """ - Attributes: - swagger_types (dict): The key is attribute name - and the value is attribute type. - attribute_map (dict): The key is attribute name - and the value is json key in definition. - """ - swagger_types = { - 'index': 'int', - 'editgroup_id': 'int', - 'timestamp': 'datetime' - } - - attribute_map = { - 'index': 'index', - 'editgroup_id': 'editgroup_id', - 'timestamp': 'timestamp' - } - - def __init__(self, index=None, editgroup_id=None, timestamp=None): # noqa: E501 - """ChangelogentriesInner - a model defined in Swagger""" # noqa: E501 - - self._index = None - self._editgroup_id = None - self._timestamp = None - self.discriminator = None - - self.index = index - self.editgroup_id = editgroup_id - self.timestamp = timestamp - - @property - def index(self): - """Gets the index of this ChangelogentriesInner. # noqa: E501 - - - :return: The index of this ChangelogentriesInner. # noqa: E501 - :rtype: int - """ - return self._index - - @index.setter - def index(self, index): - """Sets the index of this ChangelogentriesInner. - - - :param index: The index of this ChangelogentriesInner. # noqa: E501 - :type: int - """ - if index is None: - raise ValueError("Invalid value for `index`, must not be `None`") # noqa: E501 - - self._index = index - - @property - def editgroup_id(self): - """Gets the editgroup_id of this ChangelogentriesInner. # noqa: E501 - - - :return: The editgroup_id of this ChangelogentriesInner. # noqa: E501 - :rtype: int - """ - return self._editgroup_id - - @editgroup_id.setter - def editgroup_id(self, editgroup_id): - """Sets the editgroup_id of this ChangelogentriesInner. - - - :param editgroup_id: The editgroup_id of this ChangelogentriesInner. # noqa: E501 - :type: int - """ - if editgroup_id is None: - raise ValueError("Invalid value for `editgroup_id`, must not be `None`") # noqa: E501 - - self._editgroup_id = editgroup_id - - @property - def timestamp(self): - """Gets the timestamp of this ChangelogentriesInner. # noqa: E501 - - - :return: The timestamp of this ChangelogentriesInner. # noqa: E501 - :rtype: datetime - """ - return self._timestamp - - @timestamp.setter - def timestamp(self, timestamp): - """Sets the timestamp of this ChangelogentriesInner. - - - :param timestamp: The timestamp of this ChangelogentriesInner. # noqa: E501 - :type: datetime - """ - if timestamp is None: - raise ValueError("Invalid value for `timestamp`, must not be `None`") # noqa: E501 - - self._timestamp = timestamp - - def to_dict(self): - """Returns the model properties as a dict""" - result = {} - - for attr, _ in six.iteritems(self.swagger_types): - value = getattr(self, attr) - if isinstance(value, list): - result[attr] = list(map( - lambda x: x.to_dict() if hasattr(x, "to_dict") else x, - value - )) - elif hasattr(value, "to_dict"): - result[attr] = value.to_dict() - elif isinstance(value, dict): - result[attr] = dict(map( - lambda item: (item[0], item[1].to_dict()) - if hasattr(item[1], "to_dict") else item, - value.items() - )) - else: - result[attr] = value - - return result - - def to_str(self): - """Returns the string representation of the model""" - return pprint.pformat(self.to_dict()) - - def __repr__(self): - """For `print` and `pprint`""" - return self.to_str() - - def __eq__(self, other): - """Returns true if both objects are equal""" - if not isinstance(other, ChangelogentriesInner): - return False - - return self.__dict__ == other.__dict__ - - def __ne__(self, other): - """Returns true if both objects are not equal""" - return not self == other diff --git a/python/fatcat_client/models/release_ref.py b/python/fatcat_client/models/release_ref.py index 7f0ff1bf..99012c42 100644 --- a/python/fatcat_client/models/release_ref.py +++ b/python/fatcat_client/models/release_ref.py @@ -36,7 +36,7 @@ class ReleaseRef(object): 'extra': 'object', 'key': 'str', 'year': 'int', - 'container_title': 'str', + 'container_name': 'str', 'title': 'str', 'locator': 'str' } @@ -47,12 +47,12 @@ class ReleaseRef(object): 'extra': 'extra', 'key': 'key', 'year': 'year', - 'container_title': 'container_title', + 'container_name': 'container_name', 'title': 'title', 'locator': 'locator' } - def __init__(self, index=None, target_release_id=None, extra=None, key=None, year=None, container_title=None, title=None, locator=None): # noqa: E501 + def __init__(self, index=None, target_release_id=None, extra=None, key=None, year=None, container_name=None, title=None, locator=None): # noqa: E501 """ReleaseRef - a model defined in Swagger""" # noqa: E501 self._index = None @@ -60,7 +60,7 @@ class ReleaseRef(object): self._extra = None self._key = None self._year = None - self._container_title = None + self._container_name = None self._title = None self._locator = None self.discriminator = None @@ -75,8 +75,8 @@ class ReleaseRef(object): self.key = key if year is not None: self.year = year - if container_title is not None: - self.container_title = container_title + if container_name is not None: + self.container_name = container_name if title is not None: self.title = title if locator is not None: @@ -188,25 +188,25 @@ class ReleaseRef(object): self._year = year @property - def container_title(self): - """Gets the container_title of this ReleaseRef. # noqa: E501 + def container_name(self): + """Gets the container_name of this ReleaseRef. # noqa: E501 - :return: The container_title of this ReleaseRef. # noqa: E501 + :return: The container_name of this ReleaseRef. # noqa: E501 :rtype: str """ - return self._container_title + return self._container_name - @container_title.setter - def container_title(self, container_title): - """Sets the container_title of this ReleaseRef. + @container_name.setter + def container_name(self, container_name): + """Sets the container_name of this ReleaseRef. - :param container_title: The container_title of this ReleaseRef. # noqa: E501 + :param container_name: The container_name of this ReleaseRef. # noqa: E501 :type: str """ - self._container_title = container_title + self._container_name = container_name @property def title(self): diff --git a/python/tests/codegen_tests/test_changelogentries.py b/python/tests/codegen_tests/test_changelogentries.py deleted file mode 100644 index 3b2bc885..00000000 --- a/python/tests/codegen_tests/test_changelogentries.py +++ /dev/null @@ -1,40 +0,0 @@ -# coding: utf-8 - -""" - fatcat - - A scalable, versioned, API-oriented catalog of bibliographic entities and file metadata # noqa: E501 - - OpenAPI spec version: 0.1.0 - - Generated by: https://github.com/swagger-api/swagger-codegen.git -""" - - -from __future__ import absolute_import - -import unittest - -import fatcat_client -from fatcat_client.models.changelogentries import Changelogentries # noqa: E501 -from fatcat_client.rest import ApiException - - -class TestChangelogentries(unittest.TestCase): - """Changelogentries unit test stubs""" - - def setUp(self): - pass - - def tearDown(self): - pass - - def testChangelogentries(self): - """Test Changelogentries""" - # FIXME: construct object with mandatory attributes with example values - # model = fatcat_client.models.changelogentries.Changelogentries() # noqa: E501 - pass - - -if __name__ == '__main__': - unittest.main() diff --git a/python/tests/codegen_tests/test_changelogentries_inner.py b/python/tests/codegen_tests/test_changelogentries_inner.py deleted file mode 100644 index ac836714..00000000 --- a/python/tests/codegen_tests/test_changelogentries_inner.py +++ /dev/null @@ -1,40 +0,0 @@ -# coding: utf-8 - -""" - fatcat - - A scalable, versioned, API-oriented catalog of bibliographic entities and file metadata # noqa: E501 - - OpenAPI spec version: 0.1.0 - - Generated by: https://github.com/swagger-api/swagger-codegen.git -""" - - -from __future__ import absolute_import - -import unittest - -import fatcat_client -from fatcat_client.models.changelogentries_inner import ChangelogentriesInner # noqa: E501 -from fatcat_client.rest import ApiException - - -class TestChangelogentriesInner(unittest.TestCase): - """ChangelogentriesInner unit test stubs""" - - def setUp(self): - pass - - def tearDown(self): - pass - - def testChangelogentriesInner(self): - """Test ChangelogentriesInner""" - # FIXME: construct object with mandatory attributes with example values - # model = fatcat_client.models.changelogentries_inner.ChangelogentriesInner() # noqa: E501 - pass - - -if __name__ == '__main__': - unittest.main() -- cgit v1.2.3