PyPI - pybiolib - Versions diffs - 1.1.2112__tar.gz → 1.1.2123__tar.gz - Mend

@@ -1,6 +1,7 @@
 import time
 from collections import OrderedDict
+import biolib._internal.types as _types
 from biolib import api
 from biolib._internal.http_client import HttpError
 from biolib.biolib_errors import BioLibError, NotFound
@@ -23,8 +24,11 @@ class Experiment:
         }
     )
-    def __init__(self, uri: str):
-        self._experiment_dict: ExperimentDict = self._get_or_create_by_uri(uri)
+    def __init__(self, uri: str, _experiment_dict: Optional[ExperimentDict] = None):
+        if not _experiment_dict:
+            self._experiment_dict: ExperimentDict = self._get_or_create_by_uri(uri)
+        else:
+            self._experiment_dict = _experiment_dict
     def __enter__(self):
         Experiment._BIOLIB_EXPERIMENTS.append(self)
@@ -62,6 +66,21 @@ class Experiment:
             title='Experiments',
         ).print_table()
+    @staticmethod
+    def get_by_uri(uri: str) -> 'Experiment':
+        resource_dict: _types.ResourceDict = api.client.get('/resources/', params={'uri': uri}).json()
+        if not resource_dict['experiment']:
+            raise ValueError('Resource from URI is not an experiment')
+        legacy_experiment_dict = ExperimentDict(
+            created_at=resource_dict['created_at'],
+            job_count=resource_dict['experiment']['job_count'],
+            job_running_count=resource_dict['experiment']['job_running_count'],
+            name=resource_dict['name'],
+            uuid=resource_dict['uuid'],
+        )
+        return Experiment(uri=resource_dict['uri'], _experiment_dict=legacy_experiment_dict)
     def wait(self) -> None:
         self._refetch_experiment_dict()
         while self._experiment_dict['job_running_count'] > 0:

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

@@ -0,0 +1,14 @@
+from .typing import Optional, TypedDict
+class ExperimentDict(TypedDict):
+    job_count: int
+    job_running_count: int
+class ResourceDict(TypedDict):
+    created_at: str
+    experiment: Optional[ExperimentDict]
+    name: str
+    uri: str
+    uuid: str

@@ -0,0 +1,7 @@
+import sys
+# import and expose everything from the typing module
+from typing import *  # noqa:F403 pylint: disable=wildcard-import, unused-wildcard-import
+if sys.version_info < (3, 8):  # noqa: UP036
+    from typing_extensions import Literal, TypedDict  # pylint: disable=unused-import

@@ -354,7 +354,10 @@ class Job:
         self.print_logs_packages(response_json['streamed_logs_packages_b64'])
     def _get_cloud_job_awaiting_started(self) -> CloudJobStartedDict:
+        retry_count = 0
         while True:
+            retry_count += 1
+            time.sleep(min(10, retry_count))
             cloud_job = self._get_cloud_job()
             if cloud_job['finished_at']:
@@ -367,7 +370,6 @@ class Job:
                 return cast(CloudJobStartedDict, cloud_job)
             logger.info('Cloud: The job has been queued. Please wait...')
-            time.sleep(10)
     def _get_job_status_from_compute_node(self, compute_node_url):
         for _ in range(15):

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pybiolib"
-version = "1.1.2112"
+version = "1.1.2123"
 description = "BioLib Python Client"
 readme = "README.md"
 license = "MIT"

	@@ -0,0 +1,2 @@
1	+ # TODO: Deprecate and later remove this file
2	+ from biolib._internal.types.typing import * # pylint: disable=wildcard-import, unused-wildcard-import

pybiolib 1.1.2112__tar.gz → 1.1.2123__tar.gz

pybiolib 1.1.2112tar.gz → 1.1.2123tar.gz