arkindex-client 1.0.13__py3-none-any.whl → 1.0.15__py3-none-any.whl

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/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/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.dist-info → arkindex_client-1.0.15.dist-info}/METADATA

@@ -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
@@ -19,9 +19,9 @@ Classifier: Topic :: Text Processing :: Indexing
 Classifier: Topic :: Text Processing :: Linguistic
 Requires-Python: >=3.7
 Description-Content-Type: text/x-rst
-Requires-Dist: apistar (==0.7.2)
-Requires-Dist: requests (==2.28.2)
-Requires-Dist: typesystem (==0.2.5)
+Requires-Dist: apistar ==0.7.2
+Requires-Dist: requests ~=2.28
+Requires-Dist: typesystem ==0.2.5
 
 Arkindex API Client
 ===================
@@ -167,13 +167,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.
@@ -200,7 +200,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.dist-info/RECORD

@@ -0,0 +1,11 @@
+arkindex/__init__.py,sha256=OBw25Nwe6r1AN3a36-8lnUcDy3nkDIiebBgYNK2Zo9o,99
+arkindex/auth.py,sha256=O45HgpsblBqNJr9nRALU14wZgCGcmCgcGjAoD0zAyrg,1073
+arkindex/client.py,sha256=nTD_P4mjiyjKsgTprDFJbpswKDoZkGJTuxxrznkcZWc,10592
+arkindex/exceptions.py,sha256=3jzuuXgsPA28qH7GMwPVQisWCvitAQtYiQ5uKxzFQ_M,155
+arkindex/mock.py,sha256=hWU8EKfvVBAQ8VVI4Rgic809GLLDoh8Nvuvih54luKQ,2762
+arkindex/pagination.py,sha256=CfcHtqJb9MtuCfZPMTLYCnXlPfHEG3nCurt7bCYEByg,8947
+arkindex/transports.py,sha256=RmQ9fXdnLd6PizifyVI5E7QTIj3MU6Xua76jp87TKpM,464
+arkindex_client-1.0.15.dist-info/METADATA,sha256=P1C2tmJTUnFpfrotrQewS1EBOzT62ISRGa6Q4OGIKDs,7027
+arkindex_client-1.0.15.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+arkindex_client-1.0.15.dist-info/top_level.txt,sha256=iP1TxDW_jSDQA4FIcahBFXiDcZXqam2a_gFVnDbR3c4,9
+arkindex_client-1.0.15.dist-info/RECORD,,

{arkindex_client-1.0.13.dist-info → arkindex_client-1.0.15.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.40.0)
+Generator: bdist_wheel (0.41.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

arkindex_client-1.0.13.dist-info/RECORD

@@ -1,11 +0,0 @@
-arkindex/__init__.py,sha256=OBw25Nwe6r1AN3a36-8lnUcDy3nkDIiebBgYNK2Zo9o,99
-arkindex/auth.py,sha256=O45HgpsblBqNJr9nRALU14wZgCGcmCgcGjAoD0zAyrg,1073
-arkindex/client.py,sha256=XKIb5vW8-VjFWBWnuE28zJm93qOEgKJ5fbTFHkBr1PU,10509
-arkindex/exceptions.py,sha256=3jzuuXgsPA28qH7GMwPVQisWCvitAQtYiQ5uKxzFQ_M,155
-arkindex/mock.py,sha256=hWU8EKfvVBAQ8VVI4Rgic809GLLDoh8Nvuvih54luKQ,2762
-arkindex/pagination.py,sha256=mOF2wI70lnXeF89j4UJnhTUoVN4c_CrtmIQvbz92YXA,8826
-arkindex/transports.py,sha256=cBnCQ1MPaBA163bAa3UAd7lUG-SFStYkOPajer_C_GM,298
-arkindex_client-1.0.13.dist-info/METADATA,sha256=oCANpJXrbvNct7Rf0krgAKw_4v5u48XYvl7w55NPgIw,7016
-arkindex_client-1.0.13.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-arkindex_client-1.0.13.dist-info/top_level.txt,sha256=iP1TxDW_jSDQA4FIcahBFXiDcZXqam2a_gFVnDbR3c4,9
-arkindex_client-1.0.13.dist-info/RECORD,,