pybiolib 1.2.138.dev1__tar.gz → 1.2.141.dev1__tar.gz

{pybiolib-1.2.138.dev1 → pybiolib-1.2.141.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pybiolib
-Version: 1.2.138.dev1
+Version: 1.2.141.dev1
 Summary: BioLib Python Client
 Home-page: https://github.com/biolib
 License: MIT

{pybiolib-1.2.138.dev1 → pybiolib-1.2.141.dev1}/biolib/__init__.py

@@ -49,8 +49,8 @@ def get_data_record(uri: str) -> _DataRecord:
     return _DataRecord.get_by_uri(uri)
 
 
-def fetch_jobs(count: int = 25) -> List[_Job]:
-    return _Job.fetch_jobs(count)
+def fetch_jobs(count: int = 25, status: Optional[str] = None) -> List[_Job]:
+    return _Job.fetch_jobs(count, status)
 
 
 def fetch_data_records(uri: Optional[str] = None, count: Optional[int] = None) -> List[_DataRecord]:

{pybiolib-1.2.138.dev1 → pybiolib-1.2.141.dev1}/biolib/jobs/job.py

@@ -22,7 +22,7 @@ from biolib.compute_node.utils import SystemExceptionCodeMap, SystemExceptionCod
 from biolib.jobs.job_result import JobResult
 from biolib.jobs.types import CloudJobDict, CloudJobStartedDict, JobDict
 from biolib.tables import BioLibTable
-from biolib.typing_utils import Dict, List, Optional, cast
+from biolib.typing_utils import Dict, List, Optional, Union, cast
 from biolib.utils import IS_RUNNING_IN_NOTEBOOK
 from biolib.utils.app_uri import parse_app_uri
 
@@ -232,8 +232,8 @@ class Job:
         self._result = JobResult(job_uuid=self._uuid, job_auth_token=self._auth_token, module_output=module_output)
 
     @staticmethod
-    def fetch_jobs(count: int) -> List['Job']:
-        job_dicts = Job._get_job_dicts(count)
+    def fetch_jobs(count: int, status: Optional[str] = None) -> List['Job']:
+        job_dicts = Job._get_job_dicts(count, status)
         return [Job(job_dict) for job_dict in job_dicts]
 
     @staticmethod
@@ -242,9 +242,27 @@ class Job:
         BioLibTable(columns_to_row_map=Job.table_columns_to_row_map, rows=job_dicts, title='Jobs').print_table()
 
     @staticmethod
-    def _get_job_dicts(count: int) -> List['JobDict']:
-        job_dicts: List['JobDict'] = api.client.get(path='/jobs/', params={'page_size': str(count)}).json()['results']
-        return job_dicts
+    def _get_job_dicts(count: int, status: Optional[str] = None) -> List['JobDict']:
+        job_states = ['in_progress', 'completed', 'failed', 'cancelled']
+        if status is not None and status not in job_states:
+            raise Exception('Invalid status filter')
+
+        page_size = min(count, 1_000)
+        params: Dict[str, Union[str, int]] = dict(page_size=page_size)
+        if status:
+            params['state'] = status
+
+        api_path = '/jobs/'
+        response = api.client.get(api_path, params=params).json()
+        jobs = [job_dict for job_dict in response['results']]
+
+        for page_number in range(2, response['page_count'] + 1):
+            page_response = api.client.get(path=api_path, params=dict(**params, page=page_number)).json()
+            jobs.extend([job_dict for job_dict in page_response['results']])
+            if len(jobs) >= count:
+                break
+
+        return jobs
 
     @staticmethod
     def _get_job_dict(uuid: str, auth_token: Optional[str] = None) -> JobDict:

{pybiolib-1.2.138.dev1 → pybiolib-1.2.141.dev1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pybiolib"
-version = "1.2.138.dev1"
+version = "1.2.141.dev1"
 description = "BioLib Python Client"
 readme = "PYPI_README.md"
 license = "MIT"