Made MXLIMS export function again; Updated poetry.lock

Author: rhfogh

mxcubecore/queue_entry/base_queue_entry.py

@@ -22,6 +22,7 @@
 execute queue entries in a hierarchical manner.
 """
 
+from __future__ import annotations
 import copy
 import logging
 import sys
@@ -32,7 +33,7 @@
 from enum import Enum
 
 import gevent
-from mxlims.pydantic.messages import JobMessage
+from typing import Optional, TYPE_CHECKING
 
 from mxcubecore import HardwareRepository as HWR
 from mxcubecore.HardwareObjects import autoprocessing
@@ -42,6 +43,8 @@
     EXPERIMENT_TYPE,
 )
 from mxcubecore.utils import mxlims as mxutils
+if TYPE_CHECKING:
+    from mxlims.pydantic.objects.MxExperiment import MxExperiment
 
 __credits__ = ["MXCuBE collaboration"]
 __license__ = "LGPLv3+"
@@ -262,7 +265,7 @@ def __init__(self, view=None, data_model=None, view_set_queue_entry=True):
         self._data_model.lims_session_id = HWR.beamline.session.session_id
 
         # MXLIMS record for currently running experiment
-        self._mxlims_record: Optional[JobMessage.JobMessage] = None
+        self._mxlims_job: Optional[MxExperiment] = None
 
     def is_failed(self):
         """Returns True if failed"""
@@ -336,13 +339,13 @@ def set_enabled(self, state):
         """
         self._checked_for_exec = state
 
-    def get_mxlims_record(self) -> JobMessage.JobMessage:
+    def get_mxlims_job(self) -> Optional[MxExperiment]:
         """Get MxExperiment MXLIMS record if the entry is currently running"""
         obj = self
         result = None
         container = obj.get_container()
         while result is None and container is not None:
-            result = obj._mxlims_record
+            result = obj._mxlims_job
             obj = container
             container = obj.get_container()
         return result
@@ -384,13 +387,11 @@ def post_execute(self):
         self.get_data_model().set_enabled(False)
         self.set_enabled(False)
 
-        mxlims_record = self._mxlims_record
-        if mxlims_record is not None:
-            self._mxlims_record = None
-            mxlims_record.job.end_time = datetime.now()
-            mxutils.export_mxrecord(
-                mxlims_record, None,
-            )
+        mxlims_job = self._mxlims_job
+        if mxlims_job is not None:
+            self._mxlims_job = None
+            mxlims_job.end_time = datetime.now()
+            mxutils.export_mxjob(mxlims_job, None,)
 
         # self._set_background_color()
 

mxcubecore/utils/mxlims.py

@@ -27,8 +27,9 @@
 from pathlib import Path
 from typing import Optional, Tuple, Union
 
-from mxlims.pydantic.datatypes import Scan, UnitCell
-from mxlims.pydantic.mxlims_messages import MxlimsMessage
+from mxlims.pydantic.datatypes.Scan import Scan
+from mxlims.pydantic.datatypes.UnitCell import UnitCell
+from mxlims.pydantic.messages.MxlimsMessage import MxlimsMessage
 from mxlims.pydantic.objects.CollectionSweep import CollectionSweep
 from mxlims.pydantic.objects.MacromoleculeSample import MacromoleculeSample
 from mxlims.pydantic.objects.MxExperiment import MxExperiment
@@ -120,7 +121,7 @@ def make_mx_experiment(  # noqa: C901, PLR0912, PLR0915
             "beta": crystal.cell_beta,
             "gamma": crystal.cell_gamma,
         }
-        unit_cell = UnitCell.UnitCell(**dd1) if all(dd1.values()) else None
+        unit_cell = UnitCell(**dd1) if all(dd1.values()) else None
         if unit_cell:
             jobdata["expected_unit_cell"] = unit_cell
 
@@ -179,7 +180,7 @@ def add_data_collection(
     detector_distance = parameters.pop("detector_distance", None)
     if detector_distance is not None:
         startpos["detector_distance"] = detector_distance
-    scan = Scan.Scan(
+    scan = Scan(
         scan_position_start=axis_pos_start,
         first_image_number=acqparams.first_image,
         number_images=acqparams.num_images,