pybiolib 1.1.1003__py3-none-any.whl → 1.1.1011__py3-none-any.whl

biolib/utils/cache_state.py

@@ -42,19 +42,22 @@ class CacheState(abc.ABC, Generic[StateType]):
 
     def __enter__(self) -> StateType:
         logger_no_user_data.debug(f'CacheState: Entering state path: {self._state_path}...')
-        self._acquire_state_lock()
-        if os.path.exists(self._state_path):
-            with open(self._state_path, mode='r') as file:
-                self._state = json.loads(file.read())
-        else:
-            self._state = self._get_default_state()
-            with open(self._state_path, mode='w') as file:
-                file.write(json.dumps(self._state))
-
-        # Check for type checking
-        if self._state is None:
-            raise CacheStateError('Internal state is not defined')
-
+        try:
+            self._acquire_state_lock()
+            if os.path.exists(self._state_path):
+                with open(self._state_path, mode='r') as file:
+                    self._state = json.loads(file.read())
+            else:
+                self._state = self._get_default_state()
+                with open(self._state_path, mode='w') as file:
+                    file.write(json.dumps(self._state))
+
+            # Check for type checking
+            if self._state is None:
+                raise CacheStateError('Internal state is not defined')
+        except BaseException as error:  # pylint: disable=broad-except
+            logger_no_user_data.debug(f'Could not get LFS lock, got error: {error}...')
+            raise error
         return self._state
 
     def __exit__(self, exc_type, exc_val, exc_tb) -> None:
@@ -65,17 +68,17 @@ class CacheState(abc.ABC, Generic[StateType]):
         logger_no_user_data.debug(f'CacheState: Exited state path: {self._state_path}')
 
     def _acquire_state_lock(self) -> None:
-        timeout_seconds = 5.0
-        seconds_to_sleep = 0.5
+        for _ in range(10):
+            try:
+                lock_file = open(self._state_lock_path, mode='x')
+                lock_file.close()
+                return
+            except BaseException as error:  # pylint: disable=broad-except
+                logger_no_user_data.debug(f'Failed to acquire lock file "{self._state_lock_path}". Got error: {error}')
 
-        while os.path.exists(self._state_lock_path):
-            time.sleep(seconds_to_sleep)
-            timeout_seconds -= seconds_to_sleep
-            if timeout_seconds < 0:
-                raise CacheStateError('Cache state timed out waiting for lock file')
+            time.sleep(0.5)
 
-        lock_file = open(self._state_lock_path, mode='x')
-        lock_file.close()
+        raise CacheStateError(f'Cache state timed out waiting to acquire lock file "{self._state_lock_path}"')
 
     def _release_state_lock(self) -> None:
         if os.path.exists(self._state_lock_path):

{pybiolib-1.1.1003.dist-info → pybiolib-1.1.1011.dist-info}/METADATA

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

{pybiolib-1.1.1003.dist-info → pybiolib-1.1.1011.dist-info}/RECORD

@@ -98,7 +98,7 @@ biolib/typing_utils.py,sha256=krMhxB3SedVQA3HXIrC7DBXWpHKWN5JNmXGcSrrysOc,263
 biolib/user/__init__.py,sha256=Db5wtxLfFz3ID9TULSSTo77csw9tO6RtxMRvV5cqKEE,39
 biolib/user/sign_in.py,sha256=CvHBgoYjg5d5CL9etVopns_g1pImgW8mQH3zAjpe1Ik,2061
 biolib/utils/__init__.py,sha256=a_7oy3XCxrVDdsCynxjw27tOgOongkOh0bw8cp6TXWo,8219
-biolib/utils/cache_state.py,sha256=TXCjJzcWLAc8qgcYJN2OTpvTsvwMCRKKsGWB_ZuwGMg,2727
+biolib/utils/cache_state.py,sha256=BFrZlV4XZIueIFzAFiPidX4hmwADKY5Y5ZuqlerF5l0,3060
 biolib/utils/multipart_uploader.py,sha256=XFEz-4LRNVFNR6D_FKCecjxosY0bgaR5DGigKAyY5iI,9717
 biolib/utils/seq_util.py,sha256=CEFtNVBcnmVq_801T_jT4g1O30_iI4P-sRZ2GCU9EqU,1757
 biolib/utils/zip/remote_zip.py,sha256=NCdUnVbGCv7SfXCI-yVU-is_OnyWmLAnVpIdSvo-W4k,23500
@@ -107,8 +107,8 @@ biolib/validators/validate_argument.py,sha256=B-tqgMgXuTvJLhaMWcBTUKw18L5brJtIdf
 biolib/validators/validate_module.py,sha256=aHe0YAWFSrMbZNw-h64oweqruDS-k7KOUzK1ECpG8Wg,13298
 biolib/validators/validate_zip_file.py,sha256=2j8kJ1WF2u5OyMkfEDCoU_BvOtr8gLPWTtsmUG0zQ5g,1655
 biolib/validators/validator_utils.py,sha256=2QCJWdKiLTUHsvjDidrXKBjH95kKsEmFwd17muTGL0M,2135
-pybiolib-1.1.1003.dist-info/LICENSE,sha256=F2h7gf8i0agDIeWoBPXDMYScvQOz02pAWkKhTGOHaaw,1067
-pybiolib-1.1.1003.dist-info/METADATA,sha256=2SLxI7_TcP4ZUde7MzShAtyToSIdb-C2ZjITiOv0ub0,1612
-pybiolib-1.1.1003.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-pybiolib-1.1.1003.dist-info/entry_points.txt,sha256=p6DyaP_2kctxegTX23WBznnrDi4mz6gx04O5uKtRDXg,42
-pybiolib-1.1.1003.dist-info/RECORD,,
+pybiolib-1.1.1011.dist-info/LICENSE,sha256=F2h7gf8i0agDIeWoBPXDMYScvQOz02pAWkKhTGOHaaw,1067
+pybiolib-1.1.1011.dist-info/METADATA,sha256=oJS8zh0ywTWDD79FbnPQjbYPy_GXh2XcqWnyUUhEVtY,1612
+pybiolib-1.1.1011.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+pybiolib-1.1.1011.dist-info/entry_points.txt,sha256=p6DyaP_2kctxegTX23WBznnrDi4mz6gx04O5uKtRDXg,42
+pybiolib-1.1.1011.dist-info/RECORD,,