mxcubecore 1.388.0__py3-none-any.whl → 1.390.0__py3-none-any.whl

mxcubecore/HardwareObjects/AutoPowerSardanaMotor.py

@@ -1,13 +1,3 @@
-#
-# Disable 'Invalid module name' check.
-#
-# We can possibly make module name ruff compliant once we migrated to
-# YAML config files. With YAML configs we get more flexibility with module
-# names.
-#
-# ruff: noqa: N999
-#
-
 from mxcubecore.HardwareObjects.SardanaMotor import SardanaMotor
 
 

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

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

{mxcubecore-1.388.0.dist-info → mxcubecore-1.390.0.dist-info}/RECORD

@@ -45,7 +45,7 @@ mxcubecore/HardwareObjects/ALBA/XalocMachineInfo.py,sha256=2yAOzay9ZUC_V2Ou6hi1P
 mxcubecore/HardwareObjects/ALBA/XalocMiniDiff.py,sha256=DYrg1M8L1L_B8UuEfDgKiEdO5ZGSGua8QFw5HsQJmww,9093
 mxcubecore/HardwareObjects/ALBA/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mxcubecore/HardwareObjects/Attenuators.py,sha256=i1mVIATukrWMuMcfRmDKrrE502PDZj8wIoPtVjhp6TY,2044
-mxcubecore/HardwareObjects/AutoPowerSardanaMotor.py,sha256=uE4IiouOAgZ293jEg46VxWsBJOG8EBDOSjXhgUK3sus,1215
+mxcubecore/HardwareObjects/AutoPowerSardanaMotor.py,sha256=9NFwkw8Cq1ySc6oHFsAIqc_hw6K_n2ND1WP-JKGZT0U,994
 mxcubecore/HardwareObjects/BeamInfo.py,sha256=_-AAaim9PtjRD2oqbPVSqtodQABAytM3OV6ElJGrCVA,7309
 mxcubecore/HardwareObjects/Beamline.py,sha256=cvUZ05_yc-ZNT5faE6T692amdITfQHo1LYr1eOQT06Q,14226
 mxcubecore/HardwareObjects/BeamlineActions.py,sha256=Nwf2Gkq6_YIfkSngDGw7VYCkHa9OBesoJAv9jP0Vczc,10653
@@ -430,7 +430,7 @@ mxcubecore/HardwareObjects/sample_centring.py,sha256=iAIZn5UiBsxuZMVxtZtAleRRqjc
 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.388.0.dist-info/COPYING,sha256=u-Mc8zCecwyo4YoP8UulmzCiZZ_MmCLROd_NBtOcRj0,35148
-mxcubecore-1.388.0.dist-info/COPYING.LESSER,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
-mxcubecore-1.388.0.dist-info/METADATA,sha256=c_IqCvulcXDPDDOO6un1_e_3fwHBvW70hHyAEGxkzRk,4259
-mxcubecore-1.388.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-mxcubecore-1.388.0.dist-info/RECORD,,
+mxcubecore-1.390.0.dist-info/COPYING,sha256=u-Mc8zCecwyo4YoP8UulmzCiZZ_MmCLROd_NBtOcRj0,35148
+mxcubecore-1.390.0.dist-info/COPYING.LESSER,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+mxcubecore-1.390.0.dist-info/METADATA,sha256=XaujJyIEQcdICz8jo7vzzvabSnlwrQpY2pL3z5ePvhE,4259
+mxcubecore-1.390.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+mxcubecore-1.390.0.dist-info/RECORD,,