mxcubecore 1.387.0__py3-none-any.whl → 1.389.0__py3-none-any.whl

mxcubecore/HardwareRepository.py

@@ -79,7 +79,11 @@ _instance = None
 TIMERS = []
 
 beamline = None
-BEAMLINE_CONFIG_FILE = "beamline_config.yml"
+#
+# Supported beamline configuration filenames.
+# The first name in the list takes precedence.
+#
+BEAMLINE_CONFIG_FILES = ["beamline.yaml", "beamline_config.yml"]
 
 
 def load_from_yaml(
@@ -394,8 +398,16 @@ def init_hardware_repository(
     logging.getLogger("HWR").info("Hardware repository: %s", configuration_path)
     _instance = __HardwareRepositoryClient(configuration_path)
     _instance.connect()
+
+    beamline_config_file = _instance.find_beamline_config_file()
+    if beamline_config_file.endswith(".yml"):
+        warn(  # noqa: B028 we don't care about stacklevel for this warning
+            f"Config file '{beamline_config_file}' have deprecated extension 'yml', "
+            "change to 'yaml'."
+        )
+
     beamline = load_from_yaml(
-        BEAMLINE_CONFIG_FILE,
+        beamline_config_file,
         role="beamline",
         yaml_export_directory=yaml_export_directory,
     )
@@ -455,6 +467,21 @@ class __HardwareRepositoryClient:
         finally:
             self.__connected = True
 
+    def find_beamline_config_file(self) -> str | None:
+        """Find beamline configuration file name.
+
+        Look in the repository paths for beamline config file.
+
+        Returns:
+            The found config file name, or None if not found.
+        """
+        for file_name in BEAMLINE_CONFIG_FILES:
+            file = self.find_in_repository(file_name)
+            if file is not None:
+                return Path(file).name
+
+        return None
+
     def find_in_repository(self, relative_path):
         """Finds absolute path of a file or directory matching relativePath
         in one of the hardwareRepository directories

mxcubecore/__init__.py

@@ -4,6 +4,7 @@ import functools
 import logging
 import os
 import sys
+import time
 from logging.handlers import RotatingFileHandler
 
 from colorama import (
@@ -50,9 +51,10 @@ def trace_call_log(_func=None, *, level: int = logging.DEBUG):
                     " HardwareObject instance's methods only"
                 )
                 raise TypeError(err_msg)
+
             args = list(args)
             self = args.pop(0)
-            hwo_name = f" ({self.name.strip('/')})" if self.name else ""
+
             # Remove named parameters which are not in the signature of the method
             code_obj = func.__code__
             kwargs = {
@@ -61,13 +63,30 @@ def trace_call_log(_func=None, *, level: int = logging.DEBUG):
                 if k in code_obj.co_varnames[: code_obj.co_argcount]
             }
 
+            hwo_name = f" ({self.name.strip('/')})" if self.name else ""
             args_str = ",".join([str(arg) for arg in args])
             kwargs_str = ",".join(["%s=%s" % (k, v) for k, v in kwargs.items()])
             params_str = f"{args_str}{', ' if args and kwargs else ''}{kwargs_str}"
             method_name = func.__name__
             signature = f"{method_name}({params_str})"
-            self.log.log(level, f"{hwo_name} In {signature}")
-            return func(self, *args, **kwargs)
+
+            t0 = time.time()
+            try:
+                result = func(self, *args, **kwargs)
+            except Exception:
+                self.log.log(
+                    level,
+                    f"{hwo_name} In {signature} -> ! Raise exception ! "
+                    f"[Execution time: {time.time() - t0} sec]",
+                )
+                raise
+            else:
+                self.log.log(
+                    level,
+                    f"{hwo_name} In {signature} -> {result} "
+                    f"[Execution time: {time.time() - t0} sec]",
+                )
+                return result
 
         return fun_wrapper
 

{mxcubecore-1.387.0.dist-info → mxcubecore-1.389.0.dist-info}/METADATA

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

{mxcubecore-1.387.0.dist-info → mxcubecore-1.389.0.dist-info}/RECORD

@@ -427,10 +427,10 @@ mxcubecore/HardwareObjects/mockup/XrayCentringMockup.py,sha256=b7LTjBL_1EhX4H4CX
 mxcubecore/HardwareObjects/mockup/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mxcubecore/HardwareObjects/mockup/sample.jpg,sha256=7ztjjtAk5c0T2lmJOySAyXjJFFUklKLJnAv4NqdL1y8,81093
 mxcubecore/HardwareObjects/sample_centring.py,sha256=iAIZn5UiBsxuZMVxtZtAleRRqjcZnUoMT71Mvutn7ng,18922
-mxcubecore/HardwareRepository.py,sha256=UIFODCUQZEbXrxgT6W3YQrec2-Q9CVHtdH9RkT8jN4o,37642
+mxcubecore/HardwareRepository.py,sha256=9ndIfoHBbzAXj2k28YHnldJ4iqFYcTdITbAo0EkPe48,38533
 mxcubecore/Poller.py,sha256=ImsmlvJVutzJSix3Pvr_DNUcPQJZcDSI-LwESjji0rA,5654
 mxcubecore/TaskUtils.py,sha256=nheMRSsNuYnbH-2yKTPdb1ua6UYAdYBXcYqbDiIHCEY,3891
-mxcubecore/__init__.py,sha256=0sksNT-0EuQ7AY7EZcDdUqZiQJs9NpVwYGxCpogi-m4,4293
+mxcubecore/__init__.py,sha256=C9iqd79UY9AVijPg0xBKodGkG0g_G0-YJH5fP2ktaoQ,4813
 mxcubecore/__version__.py,sha256=1McIKkf_3i3aywS_FJiFvAWjVJ8DxAY2V6j_kvGC1m8,945
 mxcubecore/dispatcher.py,sha256=LL3SZtn9M1aTBYTqYWkTCzlw7iiMyF3VsTIZ-oi0e60,1567
 mxcubecore/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -467,8 +467,8 @@ mxcubecore/utils/conversion.py,sha256=G1bk2Mi2ZwGbZa5pEeiFaKWxhSVXVGqu1L9_SioyUO
 mxcubecore/utils/qt_import.py,sha256=0lPmqok_oYQZ059kJCq7RWdg490T8YKyRvoZGyWDy4M,14486
 mxcubecore/utils/tango.py,sha256=vwEVrIrWKEFaeaJUz3xbaC7XWHY8ZeJ-pfcSrTfZPIE,2114
 mxcubecore/utils/units.py,sha256=Gh7ovTUN00XBMUoyDG5W7akCx1pROL-M6pK2z1ouemg,1361
-mxcubecore-1.387.0.dist-info/COPYING,sha256=u-Mc8zCecwyo4YoP8UulmzCiZZ_MmCLROd_NBtOcRj0,35148
-mxcubecore-1.387.0.dist-info/COPYING.LESSER,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
-mxcubecore-1.387.0.dist-info/METADATA,sha256=Vl_lItAKjN-pNZID9q_MG97AIrHIkckHLOl1MfoQ1ak,4259
-mxcubecore-1.387.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-mxcubecore-1.387.0.dist-info/RECORD,,
+mxcubecore-1.389.0.dist-info/COPYING,sha256=u-Mc8zCecwyo4YoP8UulmzCiZZ_MmCLROd_NBtOcRj0,35148
+mxcubecore-1.389.0.dist-info/COPYING.LESSER,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+mxcubecore-1.389.0.dist-info/METADATA,sha256=DLdn2P8xIB3ITPJRy87F2gtrRESC1JuNYY_0EXwCIg8,4259
+mxcubecore-1.389.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+mxcubecore-1.389.0.dist-info/RECORD,,