Remove current collection on exception

src/blueapi/data_management/visit_directory_provider.py

@@ -105,11 +105,12 @@ async def update(self) -> None:
         # TODO: Query visit service to get information about visit and data collection
         # TODO: Use AuthN information as part of verification with visit service
 
-        collection_id_info = await self._client.create_new_collection()
-        self._current_collection = self._generate_directory_info(collection_id_info)
-
-    def clear(self) -> None:
-        self._current_collection = None
+        try:
+            collection_id_info = await self._client.create_new_collection()
+            self._current_collection = self._generate_directory_info(collection_id_info)
+        except Exception as e:
+            self._current_collection = None
+            raise e
 
     def _generate_directory_info(
         self,

src/blueapi/preprocessors/attach_metadata.py

@@ -35,7 +35,6 @@ def attach_metadata(
     yield from bps.wait_for([provider.update])
     directory_info: DirectoryInfo = provider()
     yield from bpp.inject_md_wrapper(plan, md={DATA_SESSION: directory_info.prefix})
-    provider.clear()
 
 
 attach_metadata_decorator = make_decorator(attach_metadata)

tests/preprocessors/test_attach_metadata.py

@@ -351,7 +351,7 @@ def test_visit_directory_provider_fails_after_one_success(
         provider,
     )
     client.always_fail()
-    with pytest.raises(Exception):
+    with pytest.raises(ValueError):
         collect_docs(
             run_engine,
             simple_run(detectors),