try_enkf_reset

src/ert/dark_storage/endpoints/updates.py

@@ -1,8 +1,4 @@
-from fastapi import APIRouter, Depends
-
-from ert.dark_storage.enkf import get_storage
-
-DEFAULT_STORAGE = Depends(get_storage)
+from fastapi import APIRouter
 
 router = APIRouter(tags=["ensemble"])
 

src/ert/dark_storage/enkf.py

@@ -18,16 +18,11 @@
 
 
 def get_storage() -> Storage:
-    global _storage  # noqa
+    global _storage
     if _storage is None:
-        _storage = update_storage()
+        try:
+            return (_storage := open_storage(os.environ["ERT_STORAGE_ENS_PATH"]))
+        except RuntimeError as err:
+            raise InternalServerError(f"{err!s}") from err
     _storage.refresh()
     return _storage
-
-
-def update_storage() -> Storage:
-    global _storage
-    try:
-        return (_storage := open_storage(os.environ["ERT_STORAGE_ENS_PATH"]))
-    except RuntimeError as err:
-        raise InternalServerError(f"{err!s}") from err

tests/ert/unit_tests/dark_storage/conftest.py

@@ -12,7 +12,6 @@
 from ert.cli.main import run_cli
 from ert.dark_storage import enkf
 from ert.dark_storage.app import app
-from ert.dark_storage.enkf import update_storage
 from ert.mode_definitions import ENSEMBLE_SMOOTHER_MODE
 
 
@@ -53,7 +52,6 @@ def poly_example_tmp_dir(poly_example_tmp_dir_shared):
 def dark_storage_client(monkeypatch):
     with dark_storage_app_(monkeypatch) as dark_app:
         monkeypatch.setenv("ERT_STORAGE_ENS_PATH", "storage")
-        update_storage()
         with TestClient(dark_app) as client:
             yield client
 
@@ -62,7 +60,6 @@ def dark_storage_client(monkeypatch):
 def dark_storage_client_snake_oil(monkeypatch):
     with dark_storage_app_(monkeypatch) as dark_app:
         monkeypatch.setenv("ERT_STORAGE_ENS_PATH", "storage/snake_oil/ensemble")
-        update_storage()
         with TestClient(dark_app) as client:
             yield client
 
@@ -83,7 +80,6 @@ def reset_enkf():
 def dark_storage_app_(monkeypatch):
     monkeypatch.setenv("ERT_STORAGE_NO_TOKEN", "yup")
     monkeypatch.setenv("ERT_STORAGE_ENS_PATH", "storage")
-    update_storage()
 
     yield app
     reset_enkf()

tests/ert/unit_tests/dark_storage/test_dark_storage_state.py

@@ -1,3 +1,4 @@
+import gc
 import io
 import os
 from urllib.parse import quote
@@ -10,8 +11,8 @@
 from hypothesis.stateful import rule
 from starlette.testclient import TestClient
 
+from ert.dark_storage import enkf
 from ert.dark_storage.app import app
-from ert.dark_storage.enkf import update_storage
 from tests.ert.unit_tests.storage.test_local_storage import StatefulStorageTest
 
 
@@ -26,7 +27,6 @@ def __init__(self):
         self.prev_ens_path = os.environ.get("ERT_STORAGE_ENS_PATH")
         os.environ["ERT_STORAGE_NO_TOKEN"] = "yup"
         os.environ["ERT_STORAGE_ENS_PATH"] = str(self.storage.path)
-        update_storage()
         self.client = TestClient(app)
 
     @rule()
@@ -96,6 +96,10 @@ def get_response_csv_through_client(self, model_ensemble, data):
 
     def teardown(self):
         super().teardown()
+        if enkf._storage is not None:
+            enkf._storage.close()
+        enkf._storage = None
+        gc.collect()
         if self.prev_no_token is not None:
             os.environ["ERT_STORAGE_NO_TOKEN"] = self.prev_no_token
         else: