mx-bluesky 1.5.10__py3-none-any.whl → 1.5.12__py3-none-any.whl

mx_bluesky/common/external_interaction/ispyb/ispyb_store.py

@@ -1,36 +1,28 @@
 from __future__ import annotations
 
 from collections.abc import Sequence
-from dataclasses import asdict
 from typing import TYPE_CHECKING
 
-import ispyb
-import ispyb.sqlalchemy
-import numpy as np
-from ispyb.connector.mysqlsp.main import ISPyBMySQLSPConnector as Connector
-from ispyb.sp.mxacquisition import MXAcquisition
-from ispyb.strictordereddict import StrictOrderedDict
 from pydantic import BaseModel
 
+from mx_bluesky.common.external_interaction.callbacks.common.ispyb_mapping import (
+    get_proposal_and_session_from_visit_string,
+)
 from mx_bluesky.common.external_interaction.ispyb.data_model import (
-    DataCollectionGridInfo,
     DataCollectionGroupInfo,
     DataCollectionInfo,
     ScanDataInfo,
 )
+from mx_bluesky.common.external_interaction.ispyb.exp_eye_store import ExpeyeInteraction
 from mx_bluesky.common.external_interaction.ispyb.ispyb_utils import (
     get_current_time_string,
-    get_session_id_from_visit,
 )
+from mx_bluesky.common.utils.exceptions import ISPyBDepositionNotMadeError
 from mx_bluesky.common.utils.log import ISPYB_ZOCALO_CALLBACK_LOGGER
-from mx_bluesky.common.utils.tracing import TRACER
 
 if TYPE_CHECKING:
     pass
 
-I03_EIGER_DETECTOR = 78
-EIGER_FILE_SUFFIX = "h5"
-
 
 class IspybIds(BaseModel):
     data_collection_ids: tuple[int, ...] = ()
@@ -41,6 +33,7 @@ class IspybIds(BaseModel):
 class StoreInIspyb:
     def __init__(self, ispyb_config: str) -> None:
         self.ISPYB_CONFIG_PATH: str = ispyb_config
+        self._expeye = ExpeyeInteraction()
 
     def begin_deposition(
         self,
@@ -76,45 +69,41 @@ class StoreInIspyb:
         data_collection_group_info: DataCollectionGroupInfo | None,
         scan_data_infos,
     ) -> IspybIds:
-        with ispyb.open(self.ISPYB_CONFIG_PATH) as conn:
-            assert conn, "Failed to connect to ISPyB"
-            if data_collection_group_info:
-                ispyb_ids.data_collection_group_id = (
-                    self._store_data_collection_group_table(
-                        conn,
-                        data_collection_group_info,
-                        ispyb_ids.data_collection_group_id,
-                    )
-                )
-            else:
-                assert ispyb_ids.data_collection_group_id, (
-                    "Attempt to update data collection without a data collection group ID"
+        if data_collection_group_info:
+            ispyb_ids.data_collection_group_id = (
+                self._store_data_collection_group_table(
+                    data_collection_group_info, ispyb_ids.data_collection_group_id
                 )
+            )
+        else:
+            assert ispyb_ids.data_collection_group_id, (
+                "Attempt to update data collection without a data collection group ID"
+            )
 
-            grid_ids = list(ispyb_ids.grid_ids)
-            data_collection_ids_out = list(ispyb_ids.data_collection_ids)
-            for scan_data_info in scan_data_infos:
-                data_collection_id = scan_data_info.data_collection_id
-                if (
-                    scan_data_info.data_collection_info
-                    and not scan_data_info.data_collection_info.parent_id
-                ):
-                    scan_data_info.data_collection_info.parent_id = (
-                        ispyb_ids.data_collection_group_id
-                    )
-
-                new_data_collection_id, grid_id = self._store_single_scan_data(
-                    conn, scan_data_info, data_collection_id
+        grid_ids = list(ispyb_ids.grid_ids)
+        data_collection_ids_out = list(ispyb_ids.data_collection_ids)
+        for scan_data_info in scan_data_infos:
+            data_collection_id = scan_data_info.data_collection_id
+            if (
+                scan_data_info.data_collection_info
+                and not scan_data_info.data_collection_info.parent_id
+            ):
+                scan_data_info.data_collection_info.parent_id = (
+                    ispyb_ids.data_collection_group_id
                 )
-                if not data_collection_id:
-                    data_collection_ids_out.append(new_data_collection_id)
-                if grid_id:
-                    grid_ids.append(grid_id)
-            ispyb_ids = IspybIds(
-                data_collection_ids=tuple(data_collection_ids_out),
-                grid_ids=tuple(grid_ids),
-                data_collection_group_id=ispyb_ids.data_collection_group_id,
+
+            new_data_collection_id, grid_id = self._store_single_scan_data(
+                scan_data_info, data_collection_id
             )
+            if not data_collection_id:
+                data_collection_ids_out.append(new_data_collection_id)
+            if grid_id:
+                grid_ids.append(grid_id)
+        ispyb_ids = IspybIds(
+            data_collection_ids=tuple(data_collection_ids_out),
+            grid_ids=tuple(grid_ids),
+            data_collection_group_id=ispyb_ids.data_collection_group_id,
+        )
         return ispyb_ids
 
     def end_deposition(self, ispyb_ids: IspybIds, success: str, reason: str):
@@ -135,24 +124,19 @@ class StoreInIspyb:
                 run_status = "DataCollection Successful"
             current_time = get_current_time_string()
             self._update_scan_with_end_time_and_status(
-                current_time,
-                run_status,
-                reason,
-                id_,
-                ispyb_ids.data_collection_group_id,
+                current_time, run_status, reason, id_
             )
 
     def append_to_comment(
         self, data_collection_id: int, comment: str, delimiter: str = " "
     ) -> None:
         try:
-            with ispyb.open(self.ISPYB_CONFIG_PATH) as conn:
-                assert conn is not None, "Failed to connect to ISPyB!"
-                mx_acquisition: MXAcquisition = conn.mx_acquisition
-                mx_acquisition.update_data_collection_append_comments(
-                    data_collection_id, comment, delimiter
-                )
-        except ispyb.ReadWriteError as e:
+            self._expeye.update_data_collection(
+                data_collection_id,
+                DataCollectionInfo(comments=delimiter + comment),
+                True,
+            )
+        except ISPyBDepositionNotMadeError as e:
             ISPYB_ZOCALO_CALLBACK_LOGGER.warning(
                 f"Unable to log comment, comment probably exceeded column length: {comment}",
                 exc_info=e,
@@ -163,143 +147,68 @@ class StoreInIspyb:
         dcg_info: DataCollectionGroupInfo,
         data_collection_group_id: int | None = None,
     ) -> None:
-        with ispyb.open(self.ISPYB_CONFIG_PATH) as conn:
-            assert conn is not None, "Failed to connect to ISPyB!"
-            self._store_data_collection_group_table(
-                conn,
-                dcg_info,
-                data_collection_group_id,
-            )
+        self._store_data_collection_group_table(dcg_info, data_collection_group_id)
 
     def _update_scan_with_end_time_and_status(
-        self,
-        end_time: str,
-        run_status: str,
-        reason: str,
-        data_collection_id: int,
-        data_collection_group_id: int,
+        self, end_time: str, run_status: str, reason: str, data_collection_id: int
     ) -> None:
-        if reason is not None and reason != "":
+        if reason != "":
             self.append_to_comment(data_collection_id, f"{run_status} reason: {reason}")
 
-        with ispyb.open(self.ISPYB_CONFIG_PATH) as conn:
-            assert conn is not None, "Failed to connect to ISPyB!"
-
-            mx_acquisition: MXAcquisition = conn.mx_acquisition
-
-            params = mx_acquisition.get_data_collection_params()
-            params["id"] = data_collection_id
-            params["parentid"] = data_collection_group_id
-            params["endtime"] = end_time
-            params["run_status"] = run_status
-            mx_acquisition.upsert_data_collection(list(params.values()))
-
-    def _store_position_table(
-        self, conn: Connector, dc_pos_info, data_collection_id
-    ) -> int:
-        mx_acquisition: MXAcquisition = conn.mx_acquisition
-
-        params = mx_acquisition.get_dc_position_params()
-        params["id"] = data_collection_id
-        params |= asdict(dc_pos_info)
-
-        return mx_acquisition.update_dc_position(list(params.values()))
+        info = DataCollectionInfo(end_time=end_time, run_status=run_status)
+        self._expeye.update_data_collection(data_collection_id, info)
 
     def _store_data_collection_group_table(
         self,
-        conn: Connector,
         dcg_info: DataCollectionGroupInfo,
         data_collection_group_id: int | None = None,
     ) -> int:
-        mx_acquisition: MXAcquisition = conn.mx_acquisition
-
-        params = mx_acquisition.get_data_collection_group_params()
         if data_collection_group_id:
-            params["id"] = data_collection_group_id
-        params["parent_id"] = get_session_id_from_visit(conn, dcg_info.visit_string)
-        params |= {k: v for k, v in asdict(dcg_info).items() if k != "visit_string"}
-
-        return self._upsert_data_collection_group(conn, params)
+            self._expeye.update_data_group(data_collection_group_id, dcg_info)
+            return data_collection_group_id
+        else:
+            proposal, session = get_proposal_and_session_from_visit_string(
+                dcg_info.visit_string
+            )
+            return self._expeye.create_data_group(proposal, session, dcg_info)
 
     def _store_data_collection_table(
-        self, conn, data_collection_id, data_collection_info
-    ):
+        self, data_collection_id, data_collection_info: DataCollectionInfo
+    ) -> int:
         if data_collection_id and data_collection_info.comments:
             self.append_to_comment(
                 data_collection_id, data_collection_info.comments, " "
             )
             data_collection_info.comments = None
 
-        params = self._fill_common_data_collection_params(
-            conn, data_collection_id, data_collection_info
-        )
-
-        return self._upsert_data_collection(conn, params)
+        if data_collection_id:
+            self._expeye.update_data_collection(
+                data_collection_id, data_collection_info
+            )
+            return data_collection_id
+        else:
+            assert data_collection_info.parent_id, (
+                "Data Collection must have a Data Collection Group"
+            )
+            return self._expeye.create_data_collection(
+                data_collection_info.parent_id, data_collection_info
+            )
 
     def _store_single_scan_data(
-        self, conn, scan_data_info, data_collection_id=None
+        self, scan_data_info, data_collection_id=None
     ) -> tuple[int, int | None]:
         data_collection_id = self._store_data_collection_table(
-            conn, data_collection_id, scan_data_info.data_collection_info
+            data_collection_id, scan_data_info.data_collection_info
         )
 
         if scan_data_info.data_collection_position_info:
-            self._store_position_table(
-                conn,
-                scan_data_info.data_collection_position_info,
-                data_collection_id,
+            self._expeye.create_position(
+                data_collection_id, scan_data_info.data_collection_position_info
             )
 
         grid_id = None
         if scan_data_info.data_collection_grid_info:
-            grid_id = self._store_grid_info_table(
-                conn,
-                data_collection_id,
-                scan_data_info.data_collection_grid_info,
+            grid_id = self._expeye.create_grid(
+                data_collection_id, scan_data_info.data_collection_grid_info
             )
         return data_collection_id, grid_id
-
-    def _store_grid_info_table(
-        self,
-        conn: Connector,
-        ispyb_data_collection_id: int,
-        dc_grid_info: DataCollectionGridInfo,
-    ) -> int:
-        mx_acquisition: MXAcquisition = conn.mx_acquisition
-        params = mx_acquisition.get_dc_grid_params()
-        params |= dc_grid_info.as_dict()
-        params["parentid"] = ispyb_data_collection_id
-        return mx_acquisition.upsert_dc_grid(list(params.values()))
-
-    def _fill_common_data_collection_params(
-        self, conn, data_collection_id, data_collection_info: DataCollectionInfo
-    ) -> StrictOrderedDict:
-        mx_acquisition: MXAcquisition = conn.mx_acquisition
-        params = mx_acquisition.get_data_collection_params()
-
-        if data_collection_id:
-            params["id"] = data_collection_id
-        if data_collection_info.visit_string:
-            # This is only needed for populating the DataCollectionGroup
-            params["visit_id"] = get_session_id_from_visit(
-                conn, data_collection_info.visit_string
-            )
-        params |= {
-            k: v.item() if isinstance(v, np.generic) else v  # Convert to native types
-            for k, v in asdict(data_collection_info).items()
-            if k != "visit_string"
-        }
-
-        return params
-
-    @staticmethod
-    @TRACER.start_as_current_span("_upsert_data_collection_group")
-    def _upsert_data_collection_group(
-        conn: Connector, params: StrictOrderedDict
-    ) -> int:
-        return conn.mx_acquisition.upsert_data_collection_group(list(params.values()))
-
-    @staticmethod
-    @TRACER.start_as_current_span("_upsert_data_collection")
-    def _upsert_data_collection(conn: Connector, params: StrictOrderedDict) -> int:
-        return conn.mx_acquisition.upsert_data_collection(list(params.values()))

mx_bluesky/common/external_interaction/ispyb/ispyb_utils.py

@@ -1,12 +1,6 @@
-from __future__ import annotations
-
 import datetime
 import os
 
-from ispyb import NoResult
-from ispyb.connector.mysqlsp.main import ISPyBMySQLSPConnector as Connector
-from ispyb.sp.core import Core
-
 
 def get_ispyb_config() -> str:
     ispyb_config = os.environ.get("ISPYB_CONFIG_PATH")
@@ -14,14 +8,6 @@ def get_ispyb_config() -> str:
     return ispyb_config
 
 
-def get_session_id_from_visit(conn: Connector, visit: str):
-    try:
-        core: Core = conn.core
-        return core.retrieve_visit_id(visit)
-    except NoResult as e:
-        raise NoResult(f"No session ID found in ispyb for visit {visit}") from e
-
-
 def get_current_time_string():
     now = datetime.datetime.now()
     return now.strftime("%Y-%m-%d %H:%M:%S")

mx_bluesky/common/external_interaction/nexus/nexus_utils.py

@@ -11,7 +11,7 @@ from nexgen.nxs_utils.axes import TransformationType
 from numpy.typing import DTypeLike
 
 from mx_bluesky.common.utils.log import NEXUS_LOGGER
-from mx_bluesky.common.utils.utils import convert_eV_to_angstrom
+from mx_bluesky.common.utils.utils import convert_ev_to_angstrom
 
 
 class AxisDirection(Enum):
@@ -158,6 +158,6 @@ def create_beam_and_attenuator_parameters(
         tuple[Beam, Attenuator]: Descriptions of the beam and attenuator for nexgen.
     """
     return (
-        Beam(wavelength=convert_eV_to_angstrom(energy_kev * 1000), flux=flux),
+        Beam(wavelength=convert_ev_to_angstrom(energy_kev * 1000), flux=flux),
         Attenuator(transmission=transmission_fraction),
     )

mx_bluesky/common/external_interaction/nexus/write_nexus.py

@@ -87,7 +87,7 @@ class NexusWriter:
         vds_shape = self.data_shape
 
         for filename in [self.nexus_file, self.master_file]:
-            NXmx_Writer = NXmxFileWriter(
+            nxmx_writer = NXmxFileWriter(
                 filename,
                 self.goniometer,
                 self.detector,
@@ -96,12 +96,12 @@ class NexusWriter:
                 self.attenuator,
                 self.full_num_of_images,
             )
-            NXmx_Writer.write(
+            nxmx_writer.write(
                 image_filename=f"{self.data_filename}",
                 start_time=start_time,
                 est_end_time=est_end_time,
             )
-            NXmx_Writer.write_vds(
+            nxmx_writer.write_vds(
                 vds_offset=self.start_index, vds_shape=vds_shape, vds_dtype=bit_depth
             )
 

mx_bluesky/common/parameters/components.py

@@ -171,6 +171,7 @@ class DiffractionExperiment(
     ispyb_experiment_type: IspybExperimentType
     storage_directory: str
     use_roi_mode: bool = Field(default=GridscanParamConstants.USE_ROI)
+    snapshot_directory: Path = None  # type:ignore # filled in on validation
 
     @model_validator(mode="before")
     @classmethod

mx_bluesky/common/parameters/constants.py

@@ -40,6 +40,8 @@ def _get_oav_config_json_path():
         return "tests/test_data/test_OAVCentring.json"
     elif BEAMLINE == "i03":
         return f"/dls_sw/{BEAMLINE}/software/daq_configuration/json/OAVCentring_hyperion.json"
+    elif BEAMLINE == "aithre":
+        return "/dls/science/groups/i23/aithre/daq_configuration/json/OAVCentring_aithre.json"
     else:
         return f"/dls_sw/{BEAMLINE}/software/daq_configuration/json/OAVCentring.json"
 
@@ -85,7 +87,6 @@ class HardwareConstants:
     OAV_REFRESH_DELAY = 0.3
     PANDA_FGS_RUN_UP_DEFAULT = 0.17
     CRYOJET_MARGIN_MM = 0.2
-    THAWING_TIME = 40
     TIP_OFFSET_UM = 0
 
     # Value quoted in https://www.dectris.com/en/detectors/x-ray-detectors/eiger2/eiger2-for-synchrotrons/eiger2-x/,
@@ -163,9 +164,9 @@ class Status(Enum):
 
 
 @dataclass
-class FeatureSetting: ...  # List of features and their default values. Subclasses must also be a pydantic dataclass
+class FeatureSettings: ...  # List of features and their default values. Subclasses must also be a pydantic dataclass
 
 
-class FeatureSettingources(
+class FeatureSettingSources(
     StrEnum
 ): ...  # List of features and the name of that property in domain.properties

mx_bluesky/common/parameters/device_composites.py

@@ -4,6 +4,7 @@ from dodal.devices.aperturescatterguard import (
 )
 from dodal.devices.attenuator.attenuator import BinaryFilterAttenuator
 from dodal.devices.backlight import Backlight
+from dodal.devices.beamsize.beamsize import BeamsizeBase
 from dodal.devices.common_dcm import DoubleCrystalMonochromator
 from dodal.devices.detector.detector_motion import DetectorMotion
 from dodal.devices.eiger import EigerDetector
@@ -18,7 +19,7 @@ from dodal.devices.robot import BartRobot
 from dodal.devices.s4_slit_gaps import S4SlitGaps
 from dodal.devices.smargon import Smargon
 from dodal.devices.synchrotron import Synchrotron
-from dodal.devices.undulator import Undulator
+from dodal.devices.undulator import UndulatorInKeV
 from dodal.devices.xbpm_feedback import XBPMFeedback
 from dodal.devices.zebra.zebra import Zebra
 from dodal.devices.zebra.zebra_controlled_shutter import ZebraShutter
@@ -51,6 +52,7 @@ class GridDetectThenXRayCentreComposite(FlyScanEssentialDevices):
     attenuator: BinaryFilterAttenuator
     backlight: Backlight
     beamstop: Beamstop
+    beamsize: BeamsizeBase
     dcm: DoubleCrystalMonochromator
     detector_motion: DetectorMotion
     zebra_fast_grid_scan: ZebraFastGridScanThreeD
@@ -58,7 +60,7 @@ class GridDetectThenXRayCentreComposite(FlyScanEssentialDevices):
     oav: OAV
     pin_tip_detection: PinTipDetection
     s4_slit_gaps: S4SlitGaps
-    undulator: Undulator
+    undulator: UndulatorInKeV
     xbpm_feedback: XBPMFeedback
     zebra: Zebra
     robot: BartRobot

mx_bluesky/common/parameters/gridscan.py

@@ -109,7 +109,7 @@ class SpecifiedGrid(GridCommon, XyzStarts, WithScan, Generic[GridScanParamType])
 
     @property
     @abstractmethod
-    def FGS_params(self) -> GridScanParamType: ...
+    def fast_gridscan_params(self) -> GridScanParamType: ...
 
     def do_set_stub_offsets(self, value: bool):
         self._set_stub_offsets = value
@@ -167,7 +167,7 @@ class SpecifiedThreeDGridScan(
     grid2_omega_deg: float = Field(default=GridscanParamConstants.OMEGA_2)
 
     @property
-    def FGS_params(self) -> ZebraGridScanParamsThreeD:
+    def fast_gridscan_params(self) -> ZebraGridScanParamsThreeD:
         return ZebraGridScanParamsThreeD(
             x_steps=self.x_steps,
             y_steps=self.y_steps,

mx_bluesky/common/utils/exceptions.py

@@ -7,20 +7,37 @@ from bluesky.preprocessors import contingency_wrapper
 from bluesky.utils import Msg
 
 
-class WarningException(Exception):
+class WarningError(
+    Exception
+):  # see https://github.com/DiamondLightSource/mx-bluesky/issues/1394 on naming
     """An exception used when we want to warn GDA of a
     problem but continue with UDC anyway"""
 
     pass
 
 
-class ISPyBDepositionNotMade(Exception):
+class BeamlineCheckFailureError(Exception):
+    """
+    An error which is raised during a beamline check to indicate that the check did
+    not pass.
+    """
+
+    ...
+
+
+class ISPyBDepositionNotMadeError(Exception):
     """Raised when the ISPyB or Zocalo callbacks can't access ISPyB deposition numbers."""
 
     pass
 
 
-class SampleException(WarningException):
+class BeamlineStateError(Exception):
+    """Exception raised when the beamline is in the incorrect state"""
+
+    pass
+
+
+class SampleError(WarningError):
     """An exception which identifies an issue relating to the sample."""
 
     def __str__(self):
@@ -36,7 +53,7 @@ class SampleException(WarningException):
 T = TypeVar("T")
 
 
-class CrystalNotFoundException(SampleException):
+class CrystalNotFoundError(SampleError):
     """Raised if grid detection completed normally but no crystal was found."""
 
     def __init__(self, *args):
@@ -49,7 +66,7 @@ def catch_exception_and_warn(
     *args,
     **kwargs,
 ) -> Generator[Msg, None, T]:
-    """A plan wrapper to catch a specific exception and instead raise a WarningException,
+    """A plan wrapper to catch a specific exception and instead raise a WarningError,
     so that UDC is not halted
 
     Example usage:
@@ -58,12 +75,12 @@ def catch_exception_and_warn(
         ...
     yield from catch_exception_and_warn(ExceptionA, plan_which_can_raise_exception_a, **args, **kwargs)'
 
-    This will catch ExceptionA raised by the plan and instead raise a WarningException
+    This will catch ExceptionA raised by the plan and instead raise a WarningError
     """
 
     def warn_if_exception_matches(exception: Exception):
         if isinstance(exception, exception_to_catch):
-            raise SampleException(str(exception)) from exception
+            raise SampleError(str(exception)) from exception
         yield from null()
 
     return (

mx_bluesky/common/utils/log.py

@@ -1,3 +1,4 @@
+import json
 import logging
 from logging.handlers import TimedRotatingFileHandler
 from os import environ
@@ -10,11 +11,11 @@ from dodal.log import (
     integrate_bluesky_and_ophyd_logging,
     set_up_all_logging_handlers,
 )
-from dodal.log import LOGGER as dodal_logger
+from dodal.log import LOGGER as DODAL_LOGGER
 
 LOGGER = logging.getLogger("MX-Bluesky")
 LOGGER.setLevel("DEBUG")
-LOGGER.parent = dodal_logger
+LOGGER.parent = DODAL_LOGGER
 
 ISPYB_ZOCALO_CALLBACK_LOGGER = logging.getLogger("ISPyB and Zocalo callbacks")
 ISPYB_ZOCALO_CALLBACK_LOGGER.setLevel(logging.DEBUG)
@@ -27,6 +28,14 @@ ALL_LOGGERS = [LOGGER, ISPYB_ZOCALO_CALLBACK_LOGGER, NEXUS_LOGGER]
 __logger_handlers: DodalLogHandlers | None = None
 
 
+def format_doc_for_log(doc):
+    class _BestEffortEncoder(json.JSONEncoder):
+        def default(self, o):
+            return repr(o)
+
+    return json.dumps(doc, indent=2, cls=_BestEffortEncoder)
+
+
 class ExperimentMetadataTagFilter(logging.Filter):
     """When an instance of this custom filter is added to a logging handler, dc_group_id
     and run_id will be tagged in that handlers' log messages."""
@@ -68,7 +77,7 @@ def do_default_logging_setup(
     and bluesky and ophyd-async are optionally included."""
     logging_path, debug_logging_path = _get_logging_dirs(dev_mode)
     handlers = set_up_all_logging_handlers(
-        dodal_logger,
+        DODAL_LOGGER,
         logging_path,
         file_name,
         dev_mode,
@@ -78,7 +87,7 @@ def do_default_logging_setup(
     )
 
     if integrate_all_logs:
-        integrate_bluesky_and_ophyd_logging(dodal_logger)
+        integrate_bluesky_and_ophyd_logging(DODAL_LOGGER)
 
     handlers["graylog_handler"].addFilter(tag_filter)
 

mx_bluesky/common/utils/tracing.py

@@ -11,18 +11,18 @@ from opentelemetry.sdk.trace.export import BatchSpanProcessor
 def setup_tracing(service_name: str = "Hyperion"):
     resource = Resource(attributes={SERVICE_NAME: service_name})
 
-    traceProvider = TracerProvider(resource=resource)
+    trace_provider = TracerProvider(resource=resource)
     processor = BatchSpanProcessor(
         OTLPSpanExporter(endpoint="http://0.0.0.0:4318/v1/traces")
     )
-    traceProvider.add_span_processor(processor)
-    trace.set_tracer_provider(traceProvider)
+    trace_provider.add_span_processor(processor)
+    trace.set_tracer_provider(trace_provider)
 
     reader = PeriodicExportingMetricReader(
         OTLPMetricExporter(endpoint="http://0.0.0.0:4318/v1/metrics")
     )
-    meterProvider = MeterProvider(resource=resource, metric_readers=[reader])
-    metrics.set_meter_provider(meterProvider)
+    meter_provider = MeterProvider(resource=resource, metric_readers=[reader])
+    metrics.set_meter_provider(meter_provider)
 
 
 TRACER = trace.get_tracer(__name__)