Fix and use context manager

Author: cmbant

cobaya/likelihoods/base_classes/planck_2018_CamSpec_python.py

@@ -197,19 +197,13 @@ def init_params(self, ini, silent=False):
         )
         if not use_cache:
             self.covinv = np.linalg.inv(self.cov)
-        elif os.path.exists(cache_file):
-            self.covinv = np.load(cache_file).astype(np.float64)
         else:
-            lock = FileLock()
-            try:
-                lock.set_lock(self.log, cache_file, wait=True)
+            with FileLock(cache_file, log=self.log, wait=True):
                 if os.path.exists(cache_file):
                     self.covinv = np.load(cache_file).astype(np.float64)
                 else:
                     self.covinv = np.linalg.inv(self.cov)
                     np.save(cache_file, self.covinv.astype(np.float32))
-            finally:
-                lock.clear_lock()
 
     def get_foregrounds(self, data_params):
         sz_bandpass100_nom143 = 2.022

cobaya/output.py

@@ -54,11 +54,13 @@ def use_portalocker():
 class FileLock:
     _file_handle: Any
 
-    def __init__(self, filename=None, log=None):
+    def __init__(self, filename=None, log=None, **kwargs):
         self.lock_error_file = ""
         self.lock_file = ""
         if filename:
-            self.set_lock(log, filename)
+            self.set_lock(log, filename, **kwargs)
+        else:
+            assert not log and not kwargs
 
     def set_lock(self, log, filename, force=False, wait=False):
         if self.has_lock():
@@ -176,6 +178,14 @@ def has_lock(self):
     def __del__(self):
         self.clear_lock()
 
+    def __enter__(self):
+        return self
+
+    def __exit__(self, exception_type, exception_value, traceback):
+        # Always clear any held lock; propagate original exceptions.
+        self.clear_lock()
+        return False
+
 
 class OutputReadOnly:
     """