mxcubecore 1.371.0__py3-none-any.whl → 1.373.0__py3-none-any.whl

mxcubecore/BaseHardwareObjects.py

@@ -23,6 +23,7 @@ from __future__ import absolute_import
 import ast
 import copy
 import enum
+import itertools
 import logging
 import typing
 import warnings
@@ -520,14 +521,14 @@ class HardwareObjectNode:
         #
         # Look-up object by role the old way.
         #
-        objects = [self]
 
-        for curr in objects:
-            result = curr._objects_by_role.get(role)
-            if result is None:
-                objects.extend(obj for obj in curr if obj)
-
-            else:
+        #
+        # Look for object recursively, starting with our self
+        # and then checking the child objects.
+        #
+        for object in itertools.chain([self], *self.__objects):
+            result = object._objects_by_role.get(role)
+            if result is not None:
                 return result
 
     def _objects_names(self) -> List[Union[str, None]]:

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-1.371.0.dist-info → mxcubecore-1.373.0.dist-info}/METADATA

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

{mxcubecore-1.371.0.dist-info → mxcubecore-1.373.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-mxcubecore/BaseHardwareObjects.py,sha256=KuvnwMTXRZsozQcuMqhQVGdj-T6xSsaeoFu2NuprL18,41184
+mxcubecore/BaseHardwareObjects.py,sha256=2kMsbOvqMsRv5qoHP_dOY6_eAC_roA_KP8o3BEN4b3w,41268
 mxcubecore/Command/Epics.py,sha256=9ftSEd4VdaFTE0qSrjL7LikLc_LJjz1-nNZF4J7hbWE,7748
 mxcubecore/Command/Exporter.py,sha256=HL6hncI_EUjjVX7frOsmxGa2Gyc-3PwUPXLUBJk4B20,8076
 mxcubecore/Command/Mockup.py,sha256=OrGAJC0JjTTjGSMZl7NiWJmVUQeEThMYdSQzuBD-bEc,1949
@@ -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
@@ -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.371.0.dist-info/COPYING,sha256=u-Mc8zCecwyo4YoP8UulmzCiZZ_MmCLROd_NBtOcRj0,35148
-mxcubecore-1.371.0.dist-info/COPYING.LESSER,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
-mxcubecore-1.371.0.dist-info/METADATA,sha256=SEfNqG9qGU8a1gpATN1JSPTUmcSULyVhnM3ed9SfCAQ,4259
-mxcubecore-1.371.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-mxcubecore-1.371.0.dist-info/RECORD,,
+mxcubecore-1.373.0.dist-info/COPYING,sha256=u-Mc8zCecwyo4YoP8UulmzCiZZ_MmCLROd_NBtOcRj0,35148
+mxcubecore-1.373.0.dist-info/COPYING.LESSER,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+mxcubecore-1.373.0.dist-info/METADATA,sha256=RxlY3zEk1cyD3sj9-jwKNlZvic6m6yEchwnJxsRWlhg,4259
+mxcubecore-1.373.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+mxcubecore-1.373.0.dist-info/RECORD,,