Remove references to visit_directory

DiamondLightSource · Sep 15, 2024 · 6011f53 · 6011f53
1 parent fc4a6dd
commit 6011f53
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 39 deletions.
diff --git a/src/mx_bluesky/hyperion/external_interaction/callbacks/common/ispyb_mapping.py b/src/mx_bluesky/hyperion/external_interaction/callbacks/common/ispyb_mapping.py
@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-import re
-
 from mx_bluesky.hyperion.external_interaction.ispyb.data_model import (
     DataCollectionGroupInfo,
     DataCollectionInfo,
@@ -11,7 +9,6 @@
     I03_EIGER_DETECTOR,
 )
 from mx_bluesky.hyperion.external_interaction.ispyb.ispyb_utils import (
-    VISIT_PATH_REGEX,
     get_current_time_string,
 )
 from mx_bluesky.hyperion.parameters.components import DiffractionExperimentWithSample
@@ -63,8 +60,3 @@ def get_proposal_and_session_from_visit_string(visit_string: str) -> tuple[str,
     visit_parts = visit_string.split("-")
     assert len(visit_parts) == 2, f"Unexpected visit string {visit_string}"
     return visit_parts[0], int(visit_parts[1])
-
-
-def get_visit_string_from_path(path: str | None) -> str | None:
-    match = re.search(VISIT_PATH_REGEX, path) if path else None
-    return str(match.group(1)) if match else None
diff --git a/src/mx_bluesky/hyperion/external_interaction/ispyb/ispyb_utils.py b/src/mx_bluesky/hyperion/external_interaction/ispyb/ispyb_utils.py
@@ -9,8 +9,6 @@
 
 from mx_bluesky.hyperion.parameters.constants import CONST
 
-VISIT_PATH_REGEX = r".+/([a-zA-Z]{2}\d{4,5}-\d{1,3})(/?$)"
-
 
 def get_ispyb_config():
     return os.environ.get("ISPYB_CONFIG_PATH", CONST.SIM.ISPYB_CONFIG)

diff --git a/src/mx_bluesky/hyperion/parameters/components.py b/src/mx_bluesky/hyperion/parameters/components.py
@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import datetime
 import json
 from abc import abstractmethod
 from collections.abc import Sequence
@@ -185,12 +184,6 @@ def validate_snapshot_directory(cls, values):
         )
         return values
 
-    @property
-    def visit_directory(self) -> Path:
-        return (
-            Path(CONST.I03.BASE_DATA_DIR) / str(datetime.date.today().year) / self.visit
-        )
-
     @property
     def num_images(self) -> int:
         return 0

diff --git a/...ests/hyperion/external_interaction/callbacks/robot_load/test_robot_load_ispyb_callback.py b/...ests/hyperion/external_interaction/callbacks/robot_load/test_robot_load_ispyb_callback.py
@@ -14,7 +14,7 @@
 )
 from mx_bluesky.hyperion.parameters.constants import CONST
 
-VISIT_PATH = "cm31105-4"
+VISIT = "cm31105-4"
 
 SAMPLE_ID = 231412
 SAMPLE_PUCK = 50
@@ -24,7 +24,7 @@
 metadata = {
     "subplan_name": CONST.PLAN.ROBOT_LOAD,
     "metadata": {
-        "visit": VISIT_PATH,
+        "visit": VISIT,
         "sample_id": SAMPLE_ID,
         "sample_puck": SAMPLE_PUCK,
         "sample_pin": SAMPLE_PIN,

diff --git a/tests/unit_tests/hyperion/external_interaction/test_ispyb_utils.py b/tests/unit_tests/hyperion/external_interaction/test_ispyb_utils.py
@@ -4,7 +4,6 @@
 
 from mx_bluesky.hyperion.external_interaction.callbacks.common.ispyb_mapping import (
     get_proposal_and_session_from_visit_string,
-    get_visit_string_from_path,
 )
 from mx_bluesky.hyperion.external_interaction.ispyb.ispyb_utils import (
     get_current_time_string,
@@ -20,24 +19,6 @@ def test_get_current_time_string():
     assert re.match(TIME_FORMAT_REGEX, current_time) is not None
 
 
-@pytest.mark.parametrize(
-    "visit_path, expected_match",
-    [
-        ("/dls/i03/data/2022/cm6477-45/", "cm6477-45"),
-        ("/dls/i03/data/2022/cm6477-45", "cm6477-45"),
-        ("/dls/i03/data/2022/mx54663-1/", "mx54663-1"),
-        ("/dls/i03/data/2022/mx54663-1", "mx54663-1"),
-        ("/dls/i03/data/2022/mx53-1/", None),
-        ("/dls/i03/data/2022/mx53-1", None),
-        ("/dls/i03/data/2022/mx5563-1565/", None),
-        ("/dls/i03/data/2022/mx5563-1565", None),
-    ],
-)
-def test_find_visit_in_visit_path(visit_path: str, expected_match: str):
-    test_visit_path = get_visit_string_from_path(visit_path)
-    assert test_visit_path == expected_match
-
-
 @pytest.mark.parametrize(
     "visit_string, expected_proposal, expected_session",
     [

diff --git a/tests/unit_tests/hyperion/parameters/test_parameter_model.py b/tests/unit_tests/hyperion/parameters/test_parameter_model.py
@@ -84,7 +84,6 @@ def test_robot_load_then_centre_params():
     }
     params["detector_distance_mm"] = 200
     test_params = RobotLoadThenCentre(**params)
-    assert test_params.visit_directory
     assert test_params.detector_params