mxcubecore 1.370.0__py3-none-any.whl → 1.372.0__py3-none-any.whl

mxcubecore/HardwareObjects/EdnaWorkflow.py

@@ -236,8 +236,15 @@ class EdnaWorkflow(HardwareObject):
                 self.dict_parameters.get("sample_lims_id")
             )
 
-        except RuntimeError:
-            logging.exception("Failed to fetch sample information for")
+        except (RuntimeError, AttributeError):
+            logging.warning("Failed to fetch sample information for")
+
+        try:
+            self.dict_parameters["investigationId"] = (
+                HWR.beamline.lims.session_manager.active_session.session_id
+            )
+        except (RuntimeError, AttributeError):
+            logging.warning("Failed to fetch investigationId from HWR.beamline.lims")
 
         self.dict_parameters["token"] = (
             self.token

mxcubecore/queue_entry/base_queue_entry.py

@@ -764,6 +764,16 @@ class SampleQueueEntry(BaseQueueEntry):
         BaseQueueEntry.post_execute(self)
         params = []
 
+        # We want to make the sample entry enabled if it contains
+        # any skipped collections, so that the user can restart them
+        has_executable_child = False
+        for child_queue_entry in self._queue_entry_list:
+            if child_queue_entry.is_enabled():
+                has_executable_child = True
+                break
+        self.set_enabled(has_executable_child)
+        self.get_data_model().set_enabled(has_executable_child)
+
         # Start grouped processing, get information from each collection
         # and call autoproc with grouped processing option
         for child in self.get_data_model().get_children():

{mxcubecore-1.370.0.dist-info → mxcubecore-1.372.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: mxcubecore
-Version: 1.370.0
+Version: 1.372.0
 Summary: Core libraries for the MXCuBE application
 License: LGPL-3.0-or-later
 Keywords: mxcube,mxcube3,mxcubecore

{mxcubecore-1.370.0.dist-info → mxcubecore-1.372.0.dist-info}/RECORD

@@ -176,7 +176,7 @@ mxcubecore/HardwareObjects/ESRF/queue_entry/ssx_laser_injector_collection.py,sha
 mxcubecore/HardwareObjects/ESRF/queue_entry/ssx_line_scan_collection.py,sha256=Ld9rt1ITfSoLzhBvaLx5sWZ8xMzbIZRKocZKAJWhNAY,5377
 mxcubecore/HardwareObjects/ESRF/queue_entry/test_collection.py,sha256=288dLh6rZxLcvpl5wDi_TaTK5g5nAU2Vc7ySgzLq6zs,2430
 mxcubecore/HardwareObjects/ESRFLIMS.py,sha256=pZzy4yC_QZytWFSGTzsR5zxkBoj8WkIgUWwRlhXPp2s,9838
-mxcubecore/HardwareObjects/EdnaWorkflow.py,sha256=zuNVFWXHcnKRZPRnY3yjW__yRjnl_FWR_OrFLF2qESc,8741
+mxcubecore/HardwareObjects/EdnaWorkflow.py,sha256=0SKi0Y-6O5dmBeEgb8x3z-G-1hQAqpyPCsecYcZSM-A,9050
 mxcubecore/HardwareObjects/Energy.py,sha256=iZyLDPPrmx38SlpeP7V82DY32AT2NovuslONB5aYGPU,6496
 mxcubecore/HardwareObjects/ExporterMotor.py,sha256=7XjyUcymJjJM7YVyteBxjLutgfSuThQ3OvwvwrJ9K1A,8671
 mxcubecore/HardwareObjects/ExporterNState.py,sha256=BH9jkRoud4bHLiflj_1mgDL0Y-LmMjesfTtTGr7EzJ0,6129
@@ -451,7 +451,7 @@ mxcubecore/model/queue_model_objects.py,sha256=ooEdMEGO-jfuL0GVyKvwbcHiEjfeLvUcP
 mxcubecore/protocols_config.py,sha256=0ujkNkTteeSvY3gNjsdhRzQw9FND2S8jNO_ZdrHNPR8,5703
 mxcubecore/queue_entry/__init__.py,sha256=fQLLDdLhLlRdV_pisyb9-G4dbqrGx_iroE4048p2sR8,4087
 mxcubecore/queue_entry/advanced_connector.py,sha256=l0GFbAu64p5mIwRL5ZEJOr08NXAdRvYLR-DXoN-DyUs,3177
-mxcubecore/queue_entry/base_queue_entry.py,sha256=Qf5rPwkAwIJuZSMoAMSBc4r4OzG3g3G_3YEPJNArHyI,33555
+mxcubecore/queue_entry/base_queue_entry.py,sha256=xla_J3CBOnQZ3TjHshxt0VJiJbLeD8To7JNrUHvBE-s,34009
 mxcubecore/queue_entry/characterisation.py,sha256=a6wb7VtzN4T4vP3LagkJkiqKPKvanvT-73U3PJmfgk8,9388
 mxcubecore/queue_entry/data_collection.py,sha256=bz2gx25NY66dxSdI0eugkEol8eDcWQp5BJmYdWETzdU,14871
 mxcubecore/queue_entry/energy_scan.py,sha256=LotucKd4wpF5dZtptgU-g05d9f2SECZzB3QLaFQXthk,7952
@@ -469,8 +469,8 @@ mxcubecore/utils/conversion.py,sha256=G1bk2Mi2ZwGbZa5pEeiFaKWxhSVXVGqu1L9_SioyUO
 mxcubecore/utils/qt_import.py,sha256=0lPmqok_oYQZ059kJCq7RWdg490T8YKyRvoZGyWDy4M,14486
 mxcubecore/utils/tango.py,sha256=lAl7Su_GgyXFEEKZ1yu_2gU18wXHVaBbGR8RYcIOVYk,2100
 mxcubecore/utils/units.py,sha256=Gh7ovTUN00XBMUoyDG5W7akCx1pROL-M6pK2z1ouemg,1361
-mxcubecore-1.370.0.dist-info/COPYING,sha256=u-Mc8zCecwyo4YoP8UulmzCiZZ_MmCLROd_NBtOcRj0,35148
-mxcubecore-1.370.0.dist-info/COPYING.LESSER,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
-mxcubecore-1.370.0.dist-info/METADATA,sha256=LpkHXXmiDnrsb-M1oPqAe-BdTH5uqJh0GGbC0yPbNQ0,4259
-mxcubecore-1.370.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-mxcubecore-1.370.0.dist-info/RECORD,,
+mxcubecore-1.372.0.dist-info/COPYING,sha256=u-Mc8zCecwyo4YoP8UulmzCiZZ_MmCLROd_NBtOcRj0,35148
+mxcubecore-1.372.0.dist-info/COPYING.LESSER,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+mxcubecore-1.372.0.dist-info/METADATA,sha256=EgkRmo0lExoyEJyWe9SQfkEw-SYqEfD3LNReVEjVpS0,4259
+mxcubecore-1.372.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+mxcubecore-1.372.0.dist-info/RECORD,,