Move Orientation to data_model

src/hyperion/external_interaction/callbacks/xray_centre/ispyb_callback.py

@@ -27,9 +27,9 @@
     DataCollectionGridInfo,
     DataCollectionInfo,
     DataCollectionPositionInfo,
+    Orientation,
     ScanDataInfo,
 )
-from hyperion.external_interaction.ispyb.ispyb_dataclass import Orientation
 from hyperion.external_interaction.ispyb.ispyb_store import (
     IspybIds,
     StoreInIspyb,

src/hyperion/external_interaction/ispyb/data_model.py

@@ -1,7 +1,11 @@
 from dataclasses import asdict, dataclass
+from enum import Enum
 from typing import Optional
 
-from hyperion.external_interaction.ispyb.ispyb_dataclass import Orientation
+
+class Orientation(Enum):
+    HORIZONTAL = "horizontal"
+    VERTICAL = "vertical"
 
 
 @dataclass()

tests/system_tests/external_interaction/test_ispyb_dev_connection.py

@@ -41,9 +41,9 @@
 )
 from hyperion.external_interaction.ispyb.data_model import (
     DataCollectionGridInfo,
+    Orientation,
     ScanDataInfo,
 )
-from hyperion.external_interaction.ispyb.ispyb_dataclass import Orientation
 from hyperion.external_interaction.ispyb.ispyb_store import (
     IspybIds,
     StoreInIspyb,

tests/unit_tests/external_interaction/callbacks/xray_centre/test_ispyb_mapping.py

@@ -5,8 +5,10 @@
 from hyperion.external_interaction.callbacks.xray_centre.ispyb_mapping import (
     construct_comment_for_gridscan,
 )
-from hyperion.external_interaction.ispyb.data_model import DataCollectionGridInfo
-from hyperion.external_interaction.ispyb.ispyb_dataclass import Orientation
+from hyperion.external_interaction.ispyb.data_model import (
+    DataCollectionGridInfo,
+    Orientation,
+)
 from hyperion.parameters.gridscan import ThreeDGridScan
 
 from ...conftest import (
@@ -28,25 +30,22 @@ def test_ispyb_deposition_rounds_position_to_int(
     mock_ispyb_conn: MagicMock,
     dummy_params,
 ):
-    assert (
-        construct_comment_for_gridscan(
-            DataCollectionGridInfo(
-                0.1,
-                0.1,
-                40,
-                20,
-                1.25,
-                1.25,
-                0.01,  # type: ignore
-                100,
-                Orientation.HORIZONTAL,
-                True,  # type: ignore
-            ),
-        )
-        == (
-            "Hyperion: Xray centring - Diffraction grid scan of 40 by 20 images "
-            "in 100.0 um by 100.0 um steps. Top left (px): [0,100], bottom right (px): [3200,1700]."
-        )
+    assert construct_comment_for_gridscan(
+        DataCollectionGridInfo(
+            0.1,
+            0.1,
+            40,
+            20,
+            1.25,
+            1.25,
+            0.01,  # type: ignore
+            100,
+            Orientation.HORIZONTAL,
+            True,  # type: ignore
+        ),
+    ) == (
+        "Hyperion: Xray centring - Diffraction grid scan of 40 by 20 images "
+        "in 100.0 um by 100.0 um steps. Top left (px): [0,100], bottom right (px): [3200,1700]."
     )
 
 

tests/unit_tests/external_interaction/ispyb/conftest.py

@@ -5,9 +5,9 @@
 from hyperion.external_interaction.ispyb.data_model import (
     DataCollectionGridInfo,
     DataCollectionPositionInfo,
+    Orientation,
     ScanDataInfo,
 )
-from hyperion.external_interaction.ispyb.ispyb_dataclass import Orientation
 from hyperion.external_interaction.ispyb.ispyb_store import StoreInIspyb
 from hyperion.parameters.constants import CONST
 from hyperion.parameters.gridscan import ThreeDGridScan

tests/unit_tests/external_interaction/ispyb/test_gridscan_ispyb_store_3d.py

@@ -8,9 +8,9 @@
     DataCollectionGroupInfo,
     DataCollectionInfo,
     DataCollectionPositionInfo,
+    Orientation,
     ScanDataInfo,
 )
-from hyperion.external_interaction.ispyb.ispyb_dataclass import Orientation
 from hyperion.external_interaction.ispyb.ispyb_store import (
     IspybIds,
     StoreInIspyb,