vantage6-algorithm-tools 4.13.7__tar.gz → 4.14.0__tar.gz

{vantage6_algorithm_tools-4.13.7 → vantage6_algorithm_tools-4.14.0}/PKG-INFO

@@ -1,18 +1,18 @@
 Metadata-Version: 2.4
 Name: vantage6_algorithm_tools
-Version: 4.13.7
+Version: 4.14.0
 Summary: Vantage6 algorithm tools
 Home-page: https://github.com/vantage6/vantage6
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 Requires-Dist: openpyxl>=3.0.0
 Requires-Dist: pandas>=1.5.3
-Requires-Dist: pyjwt==2.9.0
+Requires-Dist: pyjwt==2.12.1
 Requires-Dist: pyfiglet==1.0.4
 Requires-Dist: psycopg2-binary==2.9.10
 Requires-Dist: SPARQLWrapper>=2.0.0
 Requires-Dist: sqlalchemy==1.4.46
-Requires-Dist: vantage6-common==4.13.7
+Requires-Dist: vantage6-common==4.14.0
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"

{vantage6_algorithm_tools-4.13.7 → vantage6_algorithm_tools-4.14.0}/setup.py

@@ -34,14 +34,14 @@ setup(
     install_requires=[
         "openpyxl>=3.0.0",
         "pandas>=1.5.3",
-        "pyjwt==2.9.0",
+        "pyjwt==2.12.1",
         "pyfiglet==1.0.4",
         # psycopg2-binary is not used directly in algorithm tools, but is necessary when
         # running SQL queries on a postgres database.
         "psycopg2-binary==2.9.10",
         "SPARQLWrapper>=2.0.0",
         "sqlalchemy==1.4.46",
-        f'vantage6-common=={version_ns["__version__"]}',
+        f"vantage6-common=={version_ns['__version__']}",
     ],
     extras_require={
         "dev": [

{vantage6_algorithm_tools-4.13.7 → vantage6_algorithm_tools-4.14.0}/vantage6/algorithm/client/__init__.py

@@ -157,7 +157,8 @@ class AlgorithmClient(ClientBase):
         endpoint: str
             Endpoint to which the request should be made.
         params: dict
-            Parameters to be passed to the request.
+            Parameters to be passed to the request. If 'page' is present, it
+            will be ignored.
 
         Returns
         -------
@@ -168,18 +169,18 @@ class AlgorithmClient(ClientBase):
             params = {}
         # get first page
         page = 1
-        params["page"] = page
-        response = self.request(endpoint, params=params)
+        response = self.request(endpoint, params={**params, "page": page})
+        data = response["data"]
 
         # append next pages (if any)
         links = response.get("links")
         while links and links.get("next"):
             page += 1
-            params["page"] = page
-            response["data"] += self.request(endpoint, params=params)["data"]
+            response = self.request(endpoint, params={**params, "page": page})
+            data += response["data"]
             links = response.get("links")
 
-        return response["data"]
+        return data
 
     class Run(ClientBase.SubClient):
         """

{vantage6_algorithm_tools-4.13.7 → vantage6_algorithm_tools-4.14.0}/vantage6/algorithm/client/_version.py

@@ -7,7 +7,7 @@ with open(os.path.join(here, "__build__")) as fp:
     __build__ = json.load(fp)
 
 # Module version
-version_info = (4, 13, 7, "final", __build__, 0)
+version_info = (4, 14, 0, "final", __build__, 0)
 
 # Module version stage suffix map
 _specifier_ = {"alpha": "a", "beta": "b", "candidate": "rc", "final": ""}

{vantage6_algorithm_tools-4.13.7 → vantage6_algorithm_tools-4.14.0}/vantage6_algorithm_tools.egg-info/PKG-INFO

@@ -1,18 +1,18 @@
 Metadata-Version: 2.4
 Name: vantage6_algorithm_tools
-Version: 4.13.7
+Version: 4.14.0
 Summary: Vantage6 algorithm tools
 Home-page: https://github.com/vantage6/vantage6
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 Requires-Dist: openpyxl>=3.0.0
 Requires-Dist: pandas>=1.5.3
-Requires-Dist: pyjwt==2.9.0
+Requires-Dist: pyjwt==2.12.1
 Requires-Dist: pyfiglet==1.0.4
 Requires-Dist: psycopg2-binary==2.9.10
 Requires-Dist: SPARQLWrapper>=2.0.0
 Requires-Dist: sqlalchemy==1.4.46
-Requires-Dist: vantage6-common==4.13.7
+Requires-Dist: vantage6-common==4.14.0
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"

{vantage6_algorithm_tools-4.13.7 → vantage6_algorithm_tools-4.14.0}/vantage6_algorithm_tools.egg-info/requires.txt

@@ -1,11 +1,11 @@
 openpyxl>=3.0.0
 pandas>=1.5.3
-pyjwt==2.9.0
+pyjwt==2.12.1
 pyfiglet==1.0.4
 psycopg2-binary==2.9.10
 SPARQLWrapper>=2.0.0
 sqlalchemy==1.4.46
-vantage6-common==4.13.7
+vantage6-common==4.14.0
 
 [dev]
 black