From f7bbdde9929342e7fd5e54e75b3f913c6cb1fb18 Mon Sep 17 00:00:00 2001 From: Nathan Thorpe Date: Mon, 12 Jun 2023 17:13:50 -0700 Subject: [PATCH 1/2] fetch all projects and processes --- cirro/api/services/process.py | 7 +++++-- cirro/api/services/project.py | 7 ++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/cirro/api/services/process.py b/cirro/api/services/process.py index 437291e8..c8d16317 100644 --- a/cirro/api/services/process.py +++ b/cirro/api/services/process.py @@ -5,6 +5,7 @@ from cirro.api.models.form_specification import ParameterSpecification from cirro.api.models.process import Executor, RunAnalysisCommand, Process from cirro.api.models.s3_path import S3Path +from cirro.api.services.base import fetch_all_items from cirro.api.services.file import FileEnabledService @@ -56,8 +57,10 @@ def list(self, process_type: Executor = None) -> List[Process]: item_filter = {} if process_type: item_filter['executor'] = {'eq': process_type.value} - resp = self._api_client.query(query, variables={'filter': item_filter})['listProcesses'] - return [Process.from_record(p) for p in resp['items']] + + items = fetch_all_items(self._api_client, query, + input_variables={'filter': item_filter}) + return [Process.from_record(p) for p in items] def get_process(self, process_id: str) -> Process: """ diff --git a/cirro/api/services/project.py b/cirro/api/services/project.py index c89bf9f8..03d28030 100644 --- a/cirro/api/services/project.py +++ b/cirro/api/services/project.py @@ -4,6 +4,7 @@ from cirro.api.models.file import FileAccessContext from cirro.api.models.project import Project from cirro.api.models.reference import Reference, References +from cirro.api.services.base import fetch_all_items from cirro.api.services.file import FileEnabledService from cirro.file_utils import filter_files_by_pattern @@ -30,9 +31,9 @@ def list(self) -> List[Project]: } ''' - resp = self._api_client.query(query)['listProjects'] - items = filter_deleted(resp['items']) - return [Project.from_record(item) for item in items] + items = fetch_all_items(self._api_client, query, {}) + not_deleted = filter_deleted(items) + return [Project.from_record(item) for item in not_deleted] def find_by_name(self, name: str) -> Optional[Project]: """ From 4cceb7a971d6d2d084ae0fd0fef3605437e5e150 Mon Sep 17 00:00:00 2001 From: Nathan Thorpe Date: Mon, 12 Jun 2023 17:14:04 -0700 Subject: [PATCH 2/2] bump version --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 6a6b095f..255e606e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "cirro" -version = "0.7.0" +version = "0.7.1" description = "CLI tool and SDK for interacting with the Cirro platform" authors = ["Fred Hutch "] license = "MIT"