allows other stuff to be put on visit name after underscore

Author: David Erb

src/dls_utilpack/visit.py

@@ -38,12 +38,12 @@ def get_visit_year(beamline, visit):
 def get_xchem_subdirectory(visit):
 
     # This is the pattern all visits must have.
-    pattern = r"^([a-z][a-z][0-9][0-9][0-9][0-9][0-9])[-]([0-9]+)$"
+    pattern = r"^([a-z][a-z][0-9][0-9][0-9][0-9][0-9])[-]([0-9]+)([_].*)?$"
 
     match = re.search(pattern, visit)
 
     if not match:
-        raise RuntimeError(
+        raise ValueError(
             f'the visit name "{visit}" does not conform to the visit naming convention'
         )
 

tests/test_visit.py

@@ -29,20 +29,28 @@ async def _main_coroutine(
         # Check valid visits.
         assert get_xchem_subdirectory("aa12345-1") == "aa12345/aa12345-1"
         assert get_xchem_subdirectory("aa12345-1234") == "aa12345/aa12345-1234"
+        assert get_xchem_subdirectory("aa12345-1234_") == "aa12345/aa12345-1234"
+        assert (
+            get_xchem_subdirectory("aa12345-1234_some stuff") == "aa12345/aa12345-1234"
+        )
 
         # Check invalid visit formats.
-        with pytest.raises(RuntimeError) as excinfo:
+        with pytest.raises(ValueError) as excinfo:
             get_xchem_subdirectory("aa12345")
         assert "convention" in str(excinfo.value)
 
-        with pytest.raises(RuntimeError) as excinfo:
+        with pytest.raises(ValueError) as excinfo:
             get_xchem_subdirectory("a12345-1")
         assert "convention" in str(excinfo.value)
 
-        with pytest.raises(RuntimeError) as excinfo:
+        with pytest.raises(ValueError) as excinfo:
             get_xchem_subdirectory("[aa12345-1]")
         assert "convention" in str(excinfo.value)
 
+        with pytest.raises(ValueError) as excinfo:
+            get_xchem_subdirectory("aa12345-1-somestuff")
+        assert "convention" in str(excinfo.value)
+
         # Check good directory.
         parent = Path(output_directory) / "processing/lab36"
         full_path = parent / "aa12345/aa12345-1"