arkindex-client 1.0.13__tar.gz → 1.0.15__tar.gz

{arkindex-client-1.0.13 → arkindex-client-1.0.15}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.1
 Name: arkindex-client
-Version: 1.0.13
+Version: 1.0.15
 Summary: API client for the Arkindex project
-Home-page: https://gitlab.com/teklia/arkindex/api-client
+Home-page: https://gitlab.teklia.com/arkindex/api-client
 Author: Teklia <contact@teklia.com>
 License: MIT
 Keywords: api client arkindex
@@ -164,13 +164,13 @@ exception's attributes:
    except ErrorResponse as e:
        print(e.title)   # "400 Bad Request"
        print(e.status_code)  # 400
-       print(e.result)  # Any kind of response body the server might give
+       print(e.content)  # Any kind of response body the server might give
 
 Note that by default, using ``repr()`` or ``str()`` on APIStar exceptions will
 not give any useful messages; a fix in APIStar is waiting to be merged. In
 the meantime, you can use Teklia's `APIStar fork`_::
 
-   pip install git+https://gitlab.com/teklia/apistar.git
+   pip install git+https://gitlab.teklia.com/arkindex/apistar.git
 
 This will provide support for ``repr()`` and ``str()``, which will also
 enhance error messages on unhandled exceptions.
@@ -197,7 +197,7 @@ Download full logs for each Ponos task in a workflow
            f.write(cli.request('RetrieveTaskLog', id=task['id']))
 
 .. _APIStar: http://docs.apistar.com/
-.. _APIStar fork: https://gitlab.com/teklia/apistar
+.. _APIStar fork: https://gitlab.teklia.com/arkindex/apistar
 
 Linting
 -------

{arkindex-client-1.0.13 → arkindex-client-1.0.15}/README.rst

@@ -142,13 +142,13 @@ exception's attributes:
    except ErrorResponse as e:
        print(e.title)   # "400 Bad Request"
        print(e.status_code)  # 400
-       print(e.result)  # Any kind of response body the server might give
+       print(e.content)  # Any kind of response body the server might give
 
 Note that by default, using ``repr()`` or ``str()`` on APIStar exceptions will
 not give any useful messages; a fix in APIStar is waiting to be merged. In
 the meantime, you can use Teklia's `APIStar fork`_::
 
-   pip install git+https://gitlab.com/teklia/apistar.git
+   pip install git+https://gitlab.teklia.com/arkindex/apistar.git
 
 This will provide support for ``repr()`` and ``str()``, which will also
 enhance error messages on unhandled exceptions.
@@ -175,7 +175,7 @@ Download full logs for each Ponos task in a workflow
            f.write(cli.request('RetrieveTaskLog', id=task['id']))
 
 .. _APIStar: http://docs.apistar.com/
-.. _APIStar fork: https://gitlab.com/teklia/apistar
+.. _APIStar fork: https://gitlab.teklia.com/arkindex/apistar
 
 Linting
 -------

arkindex-client-1.0.15/VERSION

@@ -0,0 +1 @@
+1.0.15

{arkindex-client-1.0.13 → arkindex-client-1.0.15}/arkindex/client.py

@@ -84,6 +84,7 @@ class ArkindexClient(apistar.Client):
         schema_url=None,
         csrf_cookie=None,
         sleep=0,
+        verify=True,
         **kwargs,
     ):
         r"""
@@ -103,6 +104,7 @@ class ArkindexClient(apistar.Client):
         if not schema_url:
             schema_url = urljoin(base_url, SCHEMA_ENDPOINT)
 
+        self.verify = verify
         try:
             split = urlsplit(schema_url)
             if split.scheme == "file" or not (split.scheme or split.netloc):
@@ -110,7 +112,7 @@ class ArkindexClient(apistar.Client):
                 with open(schema_url) as f:
                     schema = yaml.safe_load(f)
             else:
-                resp = requests.get(schema_url)
+                resp = requests.get(schema_url, verify=self.verify)
                 resp.raise_for_status()
                 schema = yaml.safe_load(resp.content)
         except Exception as e:
@@ -173,7 +175,7 @@ class ArkindexClient(apistar.Client):
         )
 
     def init_transport(self, *args, **kwargs):
-        return ArkindexHTTPTransport(*args, **kwargs)
+        return ArkindexHTTPTransport(self.verify, *args, **kwargs)
 
     def configure(
         self,

{arkindex-client-1.0.13 → arkindex-client-1.0.15}/arkindex/pagination.py

@@ -117,9 +117,10 @@ class ResponsePaginator(Sized, Iterator):
                 if "with_count" in operation_fields:
                     extra_kwargs["with_count"] = "true"
             else:
+                remaining_count = self.pages_count - self.pages_loaded
                 logger.info(
                     f"Loading {self.mode.value} {index} on try {self.retries - retry + 1}/{self.retries}"
-                    f" - remains {self.pages_count - self.pages_loaded} pages to load."
+                    f" - remains {remaining_count} page{'s' if remaining_count > 1 else ''} to load."
                 )
 
             # Fetch the next page
@@ -147,7 +148,7 @@ class ResponsePaginator(Sized, Iterator):
                     return False
                 self.pages_count = math.ceil(self.count / len(self.results))
                 logger.info(
-                    f"Pagination will load a total of {self.pages_count} pages."
+                    f"Pagination will load a total of {self.pages_count} page{'s' if self.pages_count > 1 else ''}."
                 )
                 if self.mode == PaginationMode.PageNumber:
                     # Initialize all pages once

{arkindex-client-1.0.13 → arkindex-client-1.0.15}/arkindex/transports.py

@@ -3,7 +3,12 @@ from apistar.client.transports import HTTPTransport
 
 
 class ArkindexHTTPTransport(HTTPTransport):
+    def __init__(self, verify=True, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.verify = verify
+
     def get_request_options(self, *args, **kwargs):
         options = super().get_request_options(*args, **kwargs)
         options["timeout"] = (30, 60)
+        options["verify"] = self.verify
         return options

{arkindex-client-1.0.13 → arkindex-client-1.0.15}/arkindex_client.egg-info/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.1
 Name: arkindex-client
-Version: 1.0.13
+Version: 1.0.15
 Summary: API client for the Arkindex project
-Home-page: https://gitlab.com/teklia/arkindex/api-client
+Home-page: https://gitlab.teklia.com/arkindex/api-client
 Author: Teklia <contact@teklia.com>
 License: MIT
 Keywords: api client arkindex
@@ -164,13 +164,13 @@ exception's attributes:
    except ErrorResponse as e:
        print(e.title)   # "400 Bad Request"
        print(e.status_code)  # 400
-       print(e.result)  # Any kind of response body the server might give
+       print(e.content)  # Any kind of response body the server might give
 
 Note that by default, using ``repr()`` or ``str()`` on APIStar exceptions will
 not give any useful messages; a fix in APIStar is waiting to be merged. In
 the meantime, you can use Teklia's `APIStar fork`_::
 
-   pip install git+https://gitlab.com/teklia/apistar.git
+   pip install git+https://gitlab.teklia.com/arkindex/apistar.git
 
 This will provide support for ``repr()`` and ``str()``, which will also
 enhance error messages on unhandled exceptions.
@@ -197,7 +197,7 @@ Download full logs for each Ponos task in a workflow
            f.write(cli.request('RetrieveTaskLog', id=task['id']))
 
 .. _APIStar: http://docs.apistar.com/
-.. _APIStar fork: https://gitlab.com/teklia/apistar
+.. _APIStar fork: https://gitlab.teklia.com/arkindex/apistar
 
 Linting
 -------

{arkindex-client-1.0.13 → arkindex-client-1.0.15}/arkindex_client.egg-info/requires.txt

@@ -1,3 +1,3 @@
 apistar==0.7.2
-requests==2.28.2
+requests~=2.28
 typesystem==0.2.5

{arkindex-client-1.0.13 → arkindex-client-1.0.15}/requirements.txt

@@ -1,3 +1,3 @@
 apistar==0.7.2
-requests==2.28.2
+requests~=2.28
 typesystem==0.2.5

{arkindex-client-1.0.13 → arkindex-client-1.0.15}/setup.py

@@ -22,7 +22,7 @@ setup(
     long_description=open("README.rst").read(),
     long_description_content_type="text/x-rst",
     keywords="api client arkindex",
-    url="https://gitlab.com/teklia/arkindex/api-client",
+    url="https://gitlab.teklia.com/arkindex/api-client",
     classifiers=[
         "License :: OSI Approved :: MIT License",
         "Natural Language :: English",

arkindex-client-1.0.13/VERSION

@@ -1 +0,0 @@
-1.0.13