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

lockss/pyclient/crawler/__init__.py

@@ -28,6 +28,7 @@ from lockss.pyclient.crawler.models.api_status import ApiStatus
 from lockss.pyclient.crawler.models.counter import Counter
 from lockss.pyclient.crawler.models.crawl_desc import CrawlDesc
 from lockss.pyclient.crawler.models.crawl_job import CrawlJob
+from lockss.pyclient.crawler.models.crawl_kind_enum import CrawlKindEnum
 from lockss.pyclient.crawler.models.crawl_pager import CrawlPager
 from lockss.pyclient.crawler.models.crawl_status import CrawlStatus
 from lockss.pyclient.crawler.models.crawl_ws_result import CrawlWsResult

lockss/pyclient/crawler/api/crawls_api.py

@@ -223,7 +223,7 @@ class CrawlsApi(object):
         auth_settings = ['basicAuth']  # noqa: E501
 
         return self.api_client.call_api(
-            '/crawls/{jobId}/mimeType/{type}', 'GET',
+            '/crawls/{jobId}/mediatypes/{type}', 'GET',
             path_params,
             query_params,
             header_params,
@@ -635,7 +635,7 @@ class CrawlsApi(object):
         auth_settings = ['basicAuth']  # noqa: E501
 
         return self.api_client.call_api(
-            '/crawls/{jobId}/notModified', 'GET',
+            '/crawls/{jobId}/notmodified', 'GET',
             path_params,
             query_params,
             header_params,

lockss/pyclient/crawler/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
 

lockss/pyclient/crawler/models/__init__.py

@@ -18,6 +18,7 @@ from lockss.pyclient.crawler.models.api_status import ApiStatus
 from lockss.pyclient.crawler.models.counter import Counter
 from lockss.pyclient.crawler.models.crawl_desc import CrawlDesc
 from lockss.pyclient.crawler.models.crawl_job import CrawlJob
+from lockss.pyclient.crawler.models.crawl_kind_enum import CrawlKindEnum
 from lockss.pyclient.crawler.models.crawl_pager import CrawlPager
 from lockss.pyclient.crawler.models.crawl_status import CrawlStatus
 from lockss.pyclient.crawler.models.crawl_ws_result import CrawlWsResult

lockss/pyclient/crawler/models/crawl_desc.py

@@ -29,7 +29,7 @@ class CrawlDesc(object):
     """
     swagger_types = {
         'au_id': 'str',
-        'crawl_kind': 'str',
+        'crawl_kind': 'CrawlKindEnum',
         'crawler_id': 'str',
         'force_crawl': 'bool',
         'refetch_depth': 'int',
@@ -51,7 +51,7 @@ class CrawlDesc(object):
         'extra_crawler_data': 'extraCrawlerData'
     }
 
-    def __init__(self, au_id=None, crawl_kind=None, crawler_id='classic', force_crawl=False, refetch_depth=-1, priority=0, crawl_list=None, crawl_depth=None, extra_crawler_data=None):  # noqa: E501
+    def __init__(self, au_id=None, crawl_kind=None, crawler_id='classic', force_crawl=False, refetch_depth=-1, priority=None, crawl_list=None, crawl_depth=None, extra_crawler_data=None):  # noqa: E501
         """CrawlDesc - a model defined in Swagger"""  # noqa: E501
         self._au_id = None
         self._crawl_kind = None
@@ -109,10 +109,9 @@ class CrawlDesc(object):
     def crawl_kind(self):
         """Gets the crawl_kind of this CrawlDesc.  # noqa: E501
 
-        The kind of crawl being performed either 'newContent' or 'repair'.  # noqa: E501
 
         :return: The crawl_kind of this CrawlDesc.  # noqa: E501
-        :rtype: str
+        :rtype: CrawlKindEnum
         """
         return self._crawl_kind
 
@@ -120,19 +119,12 @@ class CrawlDesc(object):
     def crawl_kind(self, crawl_kind):
         """Sets the crawl_kind of this CrawlDesc.
 
-        The kind of crawl being performed either 'newContent' or 'repair'.  # noqa: E501
 
         :param crawl_kind: The crawl_kind of this CrawlDesc.  # noqa: E501
-        :type: str
+        :type: CrawlKindEnum
         """
         if crawl_kind is None:
             raise ValueError("Invalid value for `crawl_kind`, must not be `None`")  # noqa: E501
-        allowed_values = ["newContent", "repair"]  # noqa: E501
-        if crawl_kind not in allowed_values:
-            raise ValueError(
-                "Invalid value for `crawl_kind` ({0}), must be one of {1}"  # noqa: E501
-                .format(crawl_kind, allowed_values)
-            )
 
         self._crawl_kind = crawl_kind
 

lockss/pyclient/crawler/models/crawl_kind_enum.py

@@ -0,0 +1,90 @@
+# coding: utf-8
+
+"""
+    LOCKSS Crawler Service REST API
+
+    REST API of the LOCKSS Crawler Service  # noqa: E501
+
+    OpenAPI spec version: 2.0.0
+    Contact: lockss-support@lockss.org
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+import pprint
+import re  # noqa: F401
+
+import six
+
+class CrawlKindEnum(object):
+    """NOTE: This class is auto generated by the swagger code generator program.
+
+    Do not edit the class manually.
+    """
+
+    """
+    allowed enum values
+    """
+    NEWCONTENT = "newContent"
+    REPAIR = "repair"
+    """
+    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
+        """CrawlKindEnum - 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
+        if issubclass(CrawlKindEnum, dict):
+            for key, value in self.items():
+                result[key] = 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, CrawlKindEnum):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other

lockss/pyclient/crawler/models/page_info.py

@@ -29,7 +29,7 @@ class PageInfo(object):
     """
     swagger_types = {
         'total_count': 'int',
-        'results_per_page': 'int',
+        'items_in_page': 'int',
         'continuation_token': 'str',
         'cur_link': 'str',
         'next_link': 'str'
@@ -37,23 +37,25 @@ class PageInfo(object):
 
     attribute_map = {
         'total_count': 'totalCount',
-        'results_per_page': 'resultsPerPage',
+        'items_in_page': 'itemsInPage',
         'continuation_token': 'continuationToken',
         'cur_link': 'curLink',
         'next_link': 'nextLink'
     }
 
-    def __init__(self, total_count=None, results_per_page=None, continuation_token=None, cur_link=None, next_link=None):  # noqa: E501
+    def __init__(self, total_count=None, items_in_page=None, continuation_token=None, cur_link=None, next_link=None):  # noqa: E501
         """PageInfo - a model defined in Swagger"""  # noqa: E501
         self._total_count = None
-        self._results_per_page = None
+        self._items_in_page = None
         self._continuation_token = None
         self._cur_link = None
         self._next_link = None
         self.discriminator = None
-        self.total_count = total_count
-        self.results_per_page = results_per_page
-        self.continuation_token = continuation_token
+        if total_count is not None:
+            self.total_count = total_count
+        self.items_in_page = items_in_page
+        if continuation_token is not None:
+            self.continuation_token = continuation_token
         self.cur_link = cur_link
         if next_link is not None:
             self.next_link = next_link
@@ -78,35 +80,33 @@ class PageInfo(object):
         :param total_count: The total_count of this PageInfo.  # noqa: E501
         :type: int
         """
-        if total_count is None:
-            raise ValueError("Invalid value for `total_count`, must not be `None`")  # noqa: E501
 
         self._total_count = total_count
 
     @property
-    def results_per_page(self):
-        """Gets the results_per_page of this PageInfo.  # noqa: E501
+    def items_in_page(self):
+        """Gets the items_in_page of this PageInfo.  # noqa: E501
 
-        The number of results per page.  # noqa: E501
+        The number of items in page.  # noqa: E501
 
-        :return: The results_per_page of this PageInfo.  # noqa: E501
+        :return: The items_in_page of this PageInfo.  # noqa: E501
         :rtype: int
         """
-        return self._results_per_page
+        return self._items_in_page
 
-    @results_per_page.setter
-    def results_per_page(self, results_per_page):
-        """Sets the results_per_page of this PageInfo.
+    @items_in_page.setter
+    def items_in_page(self, items_in_page):
+        """Sets the items_in_page of this PageInfo.
 
-        The number of results per page.  # noqa: E501
+        The number of items in page.  # noqa: E501
 
-        :param results_per_page: The results_per_page of this PageInfo.  # noqa: E501
+        :param items_in_page: The items_in_page of this PageInfo.  # noqa: E501
         :type: int
         """
-        if results_per_page is None:
-            raise ValueError("Invalid value for `results_per_page`, must not be `None`")  # noqa: E501
+        if items_in_page is None:
+            raise ValueError("Invalid value for `items_in_page`, must not be `None`")  # noqa: E501
 
-        self._results_per_page = results_per_page
+        self._items_in_page = items_in_page
 
     @property
     def continuation_token(self):
@@ -128,8 +128,6 @@ class PageInfo(object):
         :param continuation_token: The continuation_token of this PageInfo.  # noqa: E501
         :type: str
         """
-        if continuation_token is None:
-            raise ValueError("Invalid value for `continuation_token`, must not be `None`")  # noqa: E501
 
         self._continuation_token = continuation_token