lockss-pyclient 0.1.0.dev2__py3-none-any.whl → 0.1.0.dev3__py3-none-any.whl

lockss/pyclient/output.py

@@ -0,0 +1,131 @@
+#!/usr/bin/env python3
+
+# Copyright (c) 2000-2025, Board of Trustees of Leland Stanford Jr. University
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# 3. Neither the name of the copyright holder nor the names of its contributors
+# may be used to endorse or promote products derived from this software without
+# specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+# Remove in Python 3.14
+# See https://stackoverflow.com/questions/33533148/how-do-i-type-hint-a-method-with-the-type-of-the-enclosing-class/33533514#33533514
+from __future__ import annotations
+
+from collections.abc import Iterable
+import json
+import jsonpath
+import sys
+from typing import Any, ClassVar, Optional, Union
+import warnings
+import yaml
+
+from lockss.pybasic.cliutil import at_most_one
+from lockss.pybasic.outpututil import OutputFormat
+from pydantic.v1 import BaseModel as BaseModel1, PositiveInt as PositiveInt1, create_model as create_model1, root_validator as root_validator1, validator as validator1
+from pydantic.v1.fields import Field as Field1, FieldInfo as FieldInfo1, PrivateAttr as PrivateAttr1
+import tabulate
+
+
+#: The objects generated by Swagger-Codegen
+SwaggerObject = object
+
+
+class BaseOutputOptions(BaseModel1):
+    DEFAULT_INDENT: ClassVar[PositiveInt1] = 4
+    DEFAULT_TABULAR: ClassVar[str] = 'tsv'
+
+    x_json: Optional[bool] = Field1(False, alias='json', aliases=['-j'], description='(output style) output the result as JSON') # 'json' is a BaseModel name
+    jsonpath: Optional[str] = Field1(aliases=['-J'], description='(output style) output the result after applying the given JSONPath')
+    tabular: Optional[bool] = Field1(False, aliases=['-t'], description='(output style) output the result in tabular form')
+    yaml: Optional[bool] = Field1(False, aliases=['-y'], description='(output style) output the result as YAML')
+    indent: Optional[PositiveInt1] = Field1(DEFAULT_INDENT, description='(JSON/YAML output) indentation spaces')
+    tabular_format: Optional[str] = Field1(DEFAULT_TABULAR, aliases=['-T'], description=f'(tabular output) output the result in the given tabular format; choices: {', '.join(OutputFormat.__members__)}')
+
+    @root_validator1
+    def _validate_output_type(cls: type[BaseOutputOptions], values: dict[str, Any]) -> dict[str, Any]:
+        return at_most_one(cls, values, 'x_json', 'jsonpath', 'tabular', 'yaml')
+
+    @validator1('tabular_format')
+    def _validate_tabular(cls: type[BaseOutputOptions], v: Optional[str]) -> Optional[str]:
+        if v and v not in OutputFormat.__members__:
+            raise ValueError(f'exactly one of {', '.join(OutputFormat.__members__)} required; got {v}')
+        return v
+
+    def display(self,
+                iterable_or_obj: Union[Iterable[SwaggerObject], SwaggerObject],
+                file: Any=sys.stdout) -> None:
+        iterable = iterable_or_obj if isinstance(iterable_or_obj, Iterable) else [iterable_or_obj]
+        if self.x_json:
+            self.display_json(iterable, file=file)
+        elif self.jsonpath:
+            self.display_jsonpath(iterable, file=file)
+        elif self.tabular:
+            self.display_tabular(iterable, file=file)
+        elif self.yaml:
+            self.display_yaml(iterable, file=file)
+        else:
+            for obj in iterable:
+                print(obj.to_dict())
+
+    def display_json(self, iterable: Iterable[SwaggerObject], file: Any) -> None:
+        for obj in iterable:
+            print(json.dumps(obj.to_dict(), indent=self.indent), file=file)
+
+    def display_jsonpath(self, iterable: Iterable[SwaggerObject], file: Any) -> None:
+        for obj in iterable:
+            print(jsonpath.findall(self.jsonpath, obj.to_dict()), file=file)
+
+    def display_tabular(self, iterable: Iterable[SwaggerObject], file: Any) -> None:
+        attrs = [attr.removeprefix('include_') if model.field_info.extra.get('disambiguated') else attr for attr, model in self.__fields__.items() if model.field_info.extra.get('column') and getattr(self, attr)] \
+                or [attr.removeprefix('include_') if model.field_info.extra.get('disambiguated') else attr for attr, model in self.__fields__.items() if model.field_info.extra.get('column')]
+        headers = [] if self.no_headers else [self._target_cls.attribute_map[attr] for attr in attrs]
+        data = [[str(getattr(obj, attr)) for attr in attrs] for obj in iterable]
+        print(tabulate.tabulate(data, headers=headers, tablefmt=self.tabular_format), file=file)
+
+    def display_yaml(self, iterable: Iterable[SwaggerObject], file: Any) -> None:
+        for obj in iterable:
+            print(yaml.dump(obj.to_dict(), indent=self.indent), file=file)
+
+
+def output_options(type_name: str,
+                   target_cls: type[SwaggerObject],
+                   disambiguate: Optional[list[str]] = None):
+    disambiguate = disambiguate or []
+    with warnings.catch_warnings():
+        warnings.simplefilter("ignore") # Pydantic v1 demands that PrivateAttr begins with a hyphen but warns that _target_cls begins with a hyphen
+        return create_model1(type_name,
+                             __base__=BaseOutputOptions,
+                             _target_cls=PrivateAttr1(target_cls),
+                             no_headers=(Optional[bool],
+                                         FieldInfo1(False,
+                                                    alias='no-headers',
+                                                    description='(tabular output) do not display column headers')),
+                             **{f'{"include_" if python_attr in disambiguate else ""}{python_attr}':
+                                  (bool,
+                                   FieldInfo1(False,
+                                              alias=python_attr.replace('_', '-') if '_' in python_attr else None,
+                                              description=f'(tabular output) include the field {original_attr} in the output',
+                                              column=True,
+                                              disambiguated=python_attr in disambiguate))
+                                for python_attr, original_attr in target_cls.attribute_map.items()})

lockss/pyclient/poller/__init__.py

@@ -31,24 +31,30 @@ from lockss.pyclient.poller.models.api_status import ApiStatus
 from lockss.pyclient.poller.models.aus_import_body import AusImportBody
 from lockss.pyclient.poller.models.cached_uri_set_spec import CachedUriSetSpec
 from lockss.pyclient.poller.models.error_result import ErrorResult
+from lockss.pyclient.poller.models.export_file_type_enum import ExportFileTypeEnum
+from lockss.pyclient.poller.models.export_filename_translation_enum import ExportFilenameTranslationEnum
 from lockss.pyclient.poller.models.hasher_ws_params import HasherWsParams
 from lockss.pyclient.poller.models.link_desc import LinkDesc
-from lockss.pyclient.poller.models.page_desc import PageDesc
+from lockss.pyclient.poller.models.page_info import PageInfo
 from lockss.pyclient.poller.models.peer_data import PeerData
 from lockss.pyclient.poller.models.peer_ws_result import PeerWsResult
 from lockss.pyclient.poller.models.poll_desc import PollDesc
+from lockss.pyclient.poller.models.poll_variant_enum import PollVariantEnum
 from lockss.pyclient.poller.models.poll_ws_result import PollWsResult
 from lockss.pyclient.poller.models.poller_detail import PollerDetail
-from lockss.pyclient.poller.models.poller_pager import PollerPager
+from lockss.pyclient.poller.models.poller_page_info import PollerPageInfo
 from lockss.pyclient.poller.models.poller_summary import PollerSummary
 from lockss.pyclient.poller.models.repair_data import RepairData
-from lockss.pyclient.poller.models.repair_pager import RepairPager
+from lockss.pyclient.poller.models.repair_page_info import RepairPageInfo
 from lockss.pyclient.poller.models.repair_queue import RepairQueue
+from lockss.pyclient.poller.models.repair_type_enum import RepairTypeEnum
 from lockss.pyclient.poller.models.repository_space_ws_result import RepositorySpaceWsResult
 from lockss.pyclient.poller.models.repository_ws_result import RepositoryWsResult
 from lockss.pyclient.poller.models.tally_data import TallyData
-from lockss.pyclient.poller.models.url_pager import UrlPager
+from lockss.pyclient.poller.models.tally_type_enum import TallyTypeEnum
+from lockss.pyclient.poller.models.url_page_info import UrlPageInfo
 from lockss.pyclient.poller.models.vote_ws_result import VoteWsResult
 from lockss.pyclient.poller.models.voter_detail import VoterDetail
-from lockss.pyclient.poller.models.voter_pager import VoterPager
+from lockss.pyclient.poller.models.voter_page_info import VoterPageInfo
 from lockss.pyclient.poller.models.voter_summary import VoterSummary
+from lockss.pyclient.poller.models.voter_urls_enum import VoterUrlsEnum

lockss/pyclient/poller/api/export_api.py

@@ -43,10 +43,10 @@ class ExportApi(object):
 
         :param async_req bool
         :param str auid: Identifier of the Archival Unit containing the artifacts (required)
-        :param str file_type: The type of archive to create
+        :param ExportFileTypeEnum file_type: The type of archive to create
         :param bool is_compress: Indication of whether contents should be compressed
         :param bool is_exclude_dir_nodes: Indication of whether directories should be excluded
-        :param str xlate_filenames: Type of filename translation to be done
+        :param ExportFilenameTranslationEnum xlate_filenames: Type of filename translation to be done
         :param str file_prefix: The prefix to be used to name the exported file
         :param int max_size: The maximum size of the exported file
         :param int max_versions: The maximum number of versions of an artifact to be exported
@@ -72,10 +72,10 @@ class ExportApi(object):
 
         :param async_req bool
         :param str auid: Identifier of the Archival Unit containing the artifacts (required)
-        :param str file_type: The type of archive to create
+        :param ExportFileTypeEnum file_type: The type of archive to create
         :param bool is_compress: Indication of whether contents should be compressed
         :param bool is_exclude_dir_nodes: Indication of whether directories should be excluded
-        :param str xlate_filenames: Type of filename translation to be done
+        :param ExportFilenameTranslationEnum xlate_filenames: Type of filename translation to be done
         :param str file_prefix: The prefix to be used to name the exported file
         :param int max_size: The maximum size of the exported file
         :param int max_versions: The maximum number of versions of an artifact to be exported
@@ -134,7 +134,7 @@ class ExportApi(object):
         body_params = None
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.select_header_accept(
-            ['multipart/form-data', 'application/json'])  # noqa: E501
+            ['multipart/form-data', 'application/json;q=0.9'])  # noqa: E501
 
         # Authentication setting
         auth_settings = ['basicAuth']  # noqa: E501

lockss/pyclient/poller/api/hash_api.py

@@ -193,7 +193,7 @@ class HashApi(object):
         body_params = None
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.select_header_accept(
-            ['multipart/form-data', 'application/json'])  # noqa: E501
+            ['multipart/form-data', 'application/json;q=0.9'])  # noqa: E501
 
         # Authentication setting
         auth_settings = ['basicAuth']  # noqa: E501
@@ -288,7 +288,7 @@ class HashApi(object):
         body_params = None
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.select_header_accept(
-            ['multipart/form-data', 'application/json'])  # noqa: E501
+            ['multipart/form-data', 'application/json;q=0.9'])  # noqa: E501
 
         # Authentication setting
         auth_settings = ['basicAuth']  # noqa: E501
@@ -387,7 +387,7 @@ class HashApi(object):
             body_params = params['body']
         # HTTP header `Accept`
         header_params['Accept'] = self.api_client.select_header_accept(
-            ['multipart/form-data', 'application/json'])  # noqa: E501
+            ['multipart/form-data', 'application/json;q=0.9'])  # noqa: E501
 
         # HTTP header `Content-Type`
         header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501

lockss/pyclient/poller/api/poll_detail_api.py

@@ -44,10 +44,10 @@ class PollDetailApi(object):
         :param async_req bool
         :param str poll_key: The pollKey from the PollDetail. (required)
         :param str peer_id: The peerId from the Poll Detail.PeerData. (required)
-        :param str urls: The voter urls to return. (required)
-        :param int page: The page number
-        :param int size: The page size
-        :return: UrlPager
+        :param VoterUrlsEnum urls: The voter urls to return. (required)
+        :param int limit: The requested maximum number of URLs per response
+        :param str continuation_token: The continuation token of the next page of URLs to be returned
+        :return: UrlPageInfo
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -70,15 +70,15 @@ class PollDetailApi(object):
         :param async_req bool
         :param str poll_key: The pollKey from the PollDetail. (required)
         :param str peer_id: The peerId from the Poll Detail.PeerData. (required)
-        :param str urls: The voter urls to return. (required)
-        :param int page: The page number
-        :param int size: The page size
-        :return: UrlPager
+        :param VoterUrlsEnum urls: The voter urls to return. (required)
+        :param int limit: The requested maximum number of URLs per response
+        :param str continuation_token: The continuation token of the next page of URLs to be returned
+        :return: UrlPageInfo
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
-        all_params = ['poll_key', 'peer_id', 'urls', 'page', 'size']  # noqa: E501
+        all_params = ['poll_key', 'peer_id', 'urls', 'limit', 'continuation_token']  # noqa: E501
         all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
@@ -117,10 +117,10 @@ class PollDetailApi(object):
         query_params = []
         if 'urls' in params:
             query_params.append(('urls', params['urls']))  # noqa: E501
-        if 'page' in params:
-            query_params.append(('page', params['page']))  # noqa: E501
-        if 'size' in params:
-            query_params.append(('size', params['size']))  # noqa: E501
+        if 'limit' in params:
+            query_params.append(('limit', params['limit']))  # noqa: E501
+        if 'continuation_token' in params:
+            query_params.append(('continuationToken', params['continuation_token']))  # noqa: E501
 
         header_params = {}
 
@@ -143,7 +143,7 @@ class PollDetailApi(object):
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='UrlPager',  # noqa: E501
+            response_type='UrlPageInfo',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -162,10 +162,10 @@ class PollDetailApi(object):
 
         :param async_req bool
         :param str poll_key: The pollKey as listed in the PollDetail object. (required)
-        :param str repair: The repair queue elements to return. (required)
-        :param int page: The page number.
-        :param int size: The size of the page.
-        :return: RepairPager
+        :param RepairTypeEnum repair: The repair queue elements to return. (required)
+        :param int limit: The requested maximum number of repair items per response
+        :param str continuation_token: The continuation token of the next page of repair items to be returned
+        :return: RepairPageInfo
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -187,15 +187,15 @@ class PollDetailApi(object):
 
         :param async_req bool
         :param str poll_key: The pollKey as listed in the PollDetail object. (required)
-        :param str repair: The repair queue elements to return. (required)
-        :param int page: The page number.
-        :param int size: The size of the page.
-        :return: RepairPager
+        :param RepairTypeEnum repair: The repair queue elements to return. (required)
+        :param int limit: The requested maximum number of repair items per response
+        :param str continuation_token: The continuation token of the next page of repair items to be returned
+        :return: RepairPageInfo
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
-        all_params = ['poll_key', 'repair', 'page', 'size']  # noqa: E501
+        all_params = ['poll_key', 'repair', 'limit', 'continuation_token']  # noqa: E501
         all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
@@ -228,10 +228,10 @@ class PollDetailApi(object):
         query_params = []
         if 'repair' in params:
             query_params.append(('repair', params['repair']))  # noqa: E501
-        if 'page' in params:
-            query_params.append(('page', params['page']))  # noqa: E501
-        if 'size' in params:
-            query_params.append(('size', params['size']))  # noqa: E501
+        if 'limit' in params:
+            query_params.append(('limit', params['limit']))  # noqa: E501
+        if 'continuation_token' in params:
+            query_params.append(('continuationToken', params['continuation_token']))  # noqa: E501
 
         header_params = {}
 
@@ -254,7 +254,7 @@ class PollDetailApi(object):
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='RepairPager',  # noqa: E501
+            response_type='RepairPageInfo',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -273,10 +273,10 @@ class PollDetailApi(object):
 
         :param async_req bool
         :param str poll_key: The pollKey as listed in the PollDetail object. (required)
-        :param str tally: The kind of tally element to return. (required)
-        :param int page: The page number.
-        :param int size: The size of the page.
-        :return: UrlPager
+        :param TallyTypeEnum tally: The kind of tally element to return. (required)
+        :param int limit: The requested maximum number of URLs per response
+        :param str continuation_token: The continuation token of the next page of URLs to be returned
+        :return: UrlPageInfo
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -298,15 +298,15 @@ class PollDetailApi(object):
 
         :param async_req bool
         :param str poll_key: The pollKey as listed in the PollDetail object. (required)
-        :param str tally: The kind of tally element to return. (required)
-        :param int page: The page number.
-        :param int size: The size of the page.
-        :return: UrlPager
+        :param TallyTypeEnum tally: The kind of tally element to return. (required)
+        :param int limit: The requested maximum number of URLs per response
+        :param str continuation_token: The continuation token of the next page of URLs to be returned
+        :return: UrlPageInfo
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
-        all_params = ['poll_key', 'tally', 'page', 'size']  # noqa: E501
+        all_params = ['poll_key', 'tally', 'limit', 'continuation_token']  # noqa: E501
         all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
@@ -339,10 +339,10 @@ class PollDetailApi(object):
         query_params = []
         if 'tally' in params:
             query_params.append(('tally', params['tally']))  # noqa: E501
-        if 'page' in params:
-            query_params.append(('page', params['page']))  # noqa: E501
-        if 'size' in params:
-            query_params.append(('size', params['size']))  # noqa: E501
+        if 'limit' in params:
+            query_params.append(('limit', params['limit']))  # noqa: E501
+        if 'continuation_token' in params:
+            query_params.append(('continuationToken', params['continuation_token']))  # noqa: E501
 
         header_params = {}
 
@@ -365,7 +365,7 @@ class PollDetailApi(object):
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='UrlPager',  # noqa: E501
+            response_type='UrlPageInfo',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),

lockss/pyclient/poller/api/poller_polls_api.py

@@ -35,7 +35,7 @@ class PollerPollsApi(object):
     def get_poller_poll_details(self, poll_key, **kwargs):  # noqa: E501
         """PollerDetails  # noqa: E501
 
-        Return the detailed information about a poll.  # noqa: E501
+        Return the detailed information about a poll in which this peer is the poller.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_poller_poll_details(poll_key, async_req=True)
@@ -57,7 +57,7 @@ class PollerPollsApi(object):
     def get_poller_poll_details_with_http_info(self, poll_key, **kwargs):  # noqa: E501
         """PollerDetails  # noqa: E501
 
-        Return the detailed information about a poll.  # noqa: E501
+        Return the detailed information about a poll in which this peer is the poller.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_poller_poll_details_with_http_info(poll_key, async_req=True)
@@ -128,18 +128,18 @@ class PollerPollsApi(object):
             collection_formats=collection_formats)
 
     def get_polls_as_poller(self, **kwargs):  # noqa: E501
-        """Get the list of recent polls as poller.  # noqa: E501
+        """Get the list of recent polls in which this peer is the poller.  # noqa: E501
 
-        Get the list of recent polls as poller from the poll queue. if size and page are passed in use those arguments to limit return data.  # noqa: E501
+        Get the list of recent polls in which this peer is the poller from the poll queue.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_polls_as_poller(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param int size: Size of the page to retrieve.
-        :param int page: Number of the page to retrieve.
-        :return: PollerPager
+        :param int limit: The requested maximum number of poll summaries per response
+        :param str continuation_token: The continuation token of the next page of poll summaries to be returned
+        :return: PollerPageInfo
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -151,23 +151,23 @@ class PollerPollsApi(object):
             return data
 
     def get_polls_as_poller_with_http_info(self, **kwargs):  # noqa: E501
-        """Get the list of recent polls as poller.  # noqa: E501
+        """Get the list of recent polls in which this peer is the poller.  # noqa: E501
 
-        Get the list of recent polls as poller from the poll queue. if size and page are passed in use those arguments to limit return data.  # noqa: E501
+        Get the list of recent polls in which this peer is the poller from the poll queue.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_polls_as_poller_with_http_info(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param int size: Size of the page to retrieve.
-        :param int page: Number of the page to retrieve.
-        :return: PollerPager
+        :param int limit: The requested maximum number of poll summaries per response
+        :param str continuation_token: The continuation token of the next page of poll summaries to be returned
+        :return: PollerPageInfo
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
-        all_params = ['size', 'page']  # noqa: E501
+        all_params = ['limit', 'continuation_token']  # noqa: E501
         all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
@@ -188,10 +188,10 @@ class PollerPollsApi(object):
         path_params = {}
 
         query_params = []
-        if 'size' in params:
-            query_params.append(('size', params['size']))  # noqa: E501
-        if 'page' in params:
-            query_params.append(('page', params['page']))  # noqa: E501
+        if 'limit' in params:
+            query_params.append(('limit', params['limit']))  # noqa: E501
+        if 'continuation_token' in params:
+            query_params.append(('continuationToken', params['continuation_token']))  # noqa: E501
 
         header_params = {}
 
@@ -214,7 +214,7 @@ class PollerPollsApi(object):
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='PollerPager',  # noqa: E501
+            response_type='PollerPageInfo',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),

lockss/pyclient/poller/api/service_api.py

@@ -35,7 +35,7 @@ class ServiceApi(object):
     def call_poll(self, body, **kwargs):  # noqa: E501
         """Send a request to call a poll to the poller  # noqa: E501
 
-        Use the information found in the descriptor object to initiate a  poll.  # noqa: E501
+        Use the information found in the descriptor object to initiate a poll.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.call_poll(body, async_req=True)
@@ -57,7 +57,7 @@ class ServiceApi(object):
     def call_poll_with_http_info(self, body, **kwargs):  # noqa: E501
         """Send a request to call a poll to the poller  # noqa: E501
 
-        Use the information found in the descriptor object to initiate a  poll.  # noqa: E501
+        Use the information found in the descriptor object to initiate a poll.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.call_poll_with_http_info(body, async_req=True)

lockss/pyclient/poller/api/voter_polls_api.py

@@ -33,18 +33,18 @@ class VoterPollsApi(object):
         self.api_client = api_client
 
     def get_polls_as_voter(self, **kwargs):  # noqa: E501
-        """Get the list of recent voter only polls.  # noqa: E501
+        """Get the list of recent polls in which this peer is a voter.  # noqa: E501
 
-        Get the list of recent polls as voter from the poll queue. if size and page are passed in use those arguments to limit return data.  # noqa: E501
+        Get the list of recent polls in which this peer is a voter from the poll queue.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_polls_as_voter(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param int size: Size of the page to retrieve.
-        :param int page: Number of the page to retrieve.
-        :return: VoterPager
+        :param int limit: The requested maximum number of poll summaries per response
+        :param str continuation_token: The continuation token of the next page of poll summaries to be returned
+        :return: VoterPageInfo
                  If the method is called asynchronously,
                  returns the request thread.
         """
@@ -56,23 +56,23 @@ class VoterPollsApi(object):
             return data
 
     def get_polls_as_voter_with_http_info(self, **kwargs):  # noqa: E501
-        """Get the list of recent voter only polls.  # noqa: E501
+        """Get the list of recent polls in which this peer is a voter.  # noqa: E501
 
-        Get the list of recent polls as voter from the poll queue. if size and page are passed in use those arguments to limit return data.  # noqa: E501
+        Get the list of recent polls in which this peer is a voter from the poll queue.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_polls_as_voter_with_http_info(async_req=True)
         >>> result = thread.get()
 
         :param async_req bool
-        :param int size: Size of the page to retrieve.
-        :param int page: Number of the page to retrieve.
-        :return: VoterPager
+        :param int limit: The requested maximum number of poll summaries per response
+        :param str continuation_token: The continuation token of the next page of poll summaries to be returned
+        :return: VoterPageInfo
                  If the method is called asynchronously,
                  returns the request thread.
         """
 
-        all_params = ['size', 'page']  # noqa: E501
+        all_params = ['limit', 'continuation_token']  # noqa: E501
         all_params.append('async_req')
         all_params.append('_return_http_data_only')
         all_params.append('_preload_content')
@@ -93,10 +93,10 @@ class VoterPollsApi(object):
         path_params = {}
 
         query_params = []
-        if 'size' in params:
-            query_params.append(('size', params['size']))  # noqa: E501
-        if 'page' in params:
-            query_params.append(('page', params['page']))  # noqa: E501
+        if 'limit' in params:
+            query_params.append(('limit', params['limit']))  # noqa: E501
+        if 'continuation_token' in params:
+            query_params.append(('continuationToken', params['continuation_token']))  # noqa: E501
 
         header_params = {}
 
@@ -119,7 +119,7 @@ class VoterPollsApi(object):
             body=body_params,
             post_params=form_params,
             files=local_var_files,
-            response_type='VoterPager',  # noqa: E501
+            response_type='VoterPageInfo',  # noqa: E501
             auth_settings=auth_settings,
             async_req=params.get('async_req'),
             _return_http_data_only=params.get('_return_http_data_only'),
@@ -130,7 +130,7 @@ class VoterPollsApi(object):
     def get_voter_poll_details(self, poll_key, **kwargs):  # noqa: E501
         """VoterDetails  # noqa: E501
 
-        Return the detailed information about a poll.  # noqa: E501
+        Return the detailed information about a poll in which this peer is a voter.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_voter_poll_details(poll_key, async_req=True)
@@ -152,7 +152,7 @@ class VoterPollsApi(object):
     def get_voter_poll_details_with_http_info(self, poll_key, **kwargs):  # noqa: E501
         """VoterDetails  # noqa: E501
 
-        Return the detailed information about a poll.  # noqa: E501
+        Return the detailed information about a poll in which this peer is a voter.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
         >>> thread = api.get_voter_poll_details_with_http_info(poll_key, async_req=True)

lockss/pyclient/poller/configuration.py

@@ -46,7 +46,7 @@ class Configuration(six.with_metaclass(TypeWithDefault, object)):
     def __init__(self):
         """Constructor"""
         # Default Base url
-        self.host = "https://laaws.lockss.org:443/"
+        self.host = "{proto}://{hostname}:{port}/"
         # Temp file folder for downloading files
         self.temp_folder_path = None