mxcubecore 1.395.0__tar.gz → 1.397.0__tar.gz

{mxcubecore-1.395.0 → mxcubecore-1.397.0}/PKG-INFO

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

{mxcubecore-1.395.0 → mxcubecore-1.397.0}/mxcubecore/Command/Sardana.py

@@ -181,9 +181,6 @@ class SardanaMacro(CommandObject, SardanaObject, ChannelObject):
         try:
             fullcmd = self.macro_format + " " + " ".join([str(a) for a in args])
         except Exception:
-            import traceback
-
-            logging.getLogger("HWR").info(traceback.format_exc())
             logging.getLogger("HWR").info(
                 "  - Wrong format for macro arguments. Macro is %s / args are (%s)"
                 % (self.macro_format, str(args))
@@ -294,12 +291,7 @@ class SardanaMacro(CommandObject, SardanaObject, ChannelObject):
             logging.getLogger("HWR").debug("Cannot connect to door %s" % self.doorname)
             self.emit("commandFailed", (-1, str(self.name())))
         except Exception:
-            import traceback
-
-            logging.getLogger("HWR").debug(
-                "SardanaMacro / event handling problem. Uggh. %s"
-                % traceback.format_exc()
-            )
+            logging.getLogger("HWR").exception("SardanaMacro / event handling problem.")
             self.emit("commandFailed", (-1, str(self.name())))
 
     def abort(self):
@@ -421,10 +413,8 @@ class SardanaChannel(ChannelObject, SardanaObject):
                     self.info.maxval = maxval.magnitude
 
         except Exception:
-            import traceback
-
             logging.getLogger("HWR").info("info initialized. Cannot get limits")
-            logging.getLogger("HWR").info("%s" % traceback.format_exc())
+            logging.getLogger("HWR").exception("")
 
         # prepare polling
         # if the polling value is a number set it as the taurus polling period
@@ -454,9 +444,7 @@ class SardanaChannel(ChannelObject, SardanaObject):
             self.info.minval = limits[0].magnitude
             self.info.maxval = limits[1].magnitude
         except Exception:
-            import traceback
-
-            logging.getLogger("HWR").info("%s" % traceback.format_exc())
+            logging.getLogger("HWR").exception("")
         return self.info
 
     def update(self, event):

{mxcubecore-1.395.0 → mxcubecore-1.397.0}/mxcubecore/HardwareObjects/ALBA/ALBADataAnalysis.py

@@ -122,10 +122,8 @@ class ALBADataAnalysis(EDNACharacterisation):
             state = self.job.state
             self.log.debug("Job / is %s" % str(state))
         except Exception:
-            import traceback
-
             self.log.debug("Polling for Job state 3. exception happened")
-            self.log.debug("  %s " % traceback.format_exc())
+            self.log.exception("")
 
         while state in ["RUNNING", "PENDING"]:
             self.log.debug("Job / is %s" % state)

{mxcubecore-1.395.0 → mxcubecore-1.397.0}/mxcubecore/HardwareObjects/ALBA/ALBAEpsActuator.py

@@ -88,9 +88,7 @@ class ALBAEpsActuator(BaseHardwareObjects.HardwareObject):
                 states = state_string.split(",")
                 self.state_strings = states[1].strip(), states[0].strip()
         except Exception:
-            import traceback
-
-            self.log.warning(traceback.format_exc())
+            self.log.exception()
             self.state_strings = self.default_state_strings
 
     def get_state(self):

{mxcubecore-1.395.0 → mxcubecore-1.397.0}/mxcubecore/HardwareObjects/ALBA/ALBAFastShutter.py

@@ -99,9 +99,7 @@ class ALBAFastShutter(BaseHardwareObjects.HardwareObject):
                 states = state_string.split(",")
                 self.state_strings = states[1].strip(), states[0].strip()
         except Exception:
-            import traceback
-
-            self.log.warning(traceback.format_exc())
+            self.log.exception("")
             self.state_strings = self.default_state_strings
 
     def get_state(self):

{mxcubecore-1.395.0 → mxcubecore-1.397.0}/mxcubecore/HardwareObjects/Cats90.py

@@ -1084,10 +1084,8 @@ class Cats90(SampleChanger):
         try:
             task_id = method(*args)
         except Exception:
-            import traceback
-
             self.log.debug("Cats90. exception while executing server task")
-            self.log.debug(traceback.format_exc())
+            self.log.exception("")
             task_id = None
 
         waitsafe = kwargs.get("waitsafe", False)

{mxcubecore-1.395.0 → mxcubecore-1.397.0}/mxcubecore/HardwareObjects/CatsMaint.py

@@ -824,11 +824,8 @@ class CatsMaint(HardwareObject):
                 ret = cmd()
             return ret
         except Exception as exc:
-            import traceback
-
-            traceback.print_exc()
-            msg = exc[0].desc
-            raise Exception(msg)
+            self.log.exception("")
+            raise
 
 
 def test_hwo(hwo):

{mxcubecore-1.395.0 → mxcubecore-1.397.0}/mxcubecore/HardwareObjects/DESY/MjpgStreamVideo.py

@@ -25,7 +25,6 @@ __email__ = "jan.meyer@desy.de"
 
 
 import json
-import traceback
 
 import gevent
 
@@ -39,7 +38,6 @@ try:
 
     redis_flag = True
 except ImportError:
-    traceback.print_exc()
     redis_flag = False
 
 from mxcubecore.HardwareObjects.abstract.AbstractVideoDevice import AbstractVideoDevice

{mxcubecore-1.395.0 → mxcubecore-1.397.0}/mxcubecore/HardwareObjects/DESY/P11Collect.py

@@ -29,7 +29,6 @@ import socket
 import subprocess
 import sys
 import time
-import traceback
 
 import gevent
 import h5py
@@ -329,7 +328,7 @@ class P11Collect(AbstractCollect):
                 )
 
         except RuntimeError:
-            self.log.error(traceback.format_exc())
+            self.log.exception("")
         finally:
             self.acquisition_cleanup()
 
@@ -783,7 +782,7 @@ class P11Collect(AbstractCollect):
             HWR.beamline.diffractometer.stop_motion()
 
         except RuntimeError:
-            self.log.error(traceback.format_exc())
+            self.log.exception("")
 
     def get_or_create_group(self, parent_group, group_name):
         """Gets or creates a group within a parent group.

{mxcubecore-1.395.0 → mxcubecore-1.397.0}/mxcubecore/HardwareObjects/DESY/P11EDNACharacterisation.py

@@ -244,10 +244,8 @@ class P11EDNACharacterisation(EDNACharacterisation):
             transmission = HWR.beamline.transmission.get_value()
             beam.setTransmission(XSDataDouble(transmission))
         except AttributeError:
-            import traceback
-
             self.log.debug("EDNACharacterisation. transmission not saved ")
-            self.log.debug(traceback.format_exc())
+            self.log.exception("")
 
         try:
             wavelength = HWR.beamline.energy.get_wavelength()

{mxcubecore-1.395.0 → mxcubecore-1.397.0}/mxcubecore/HardwareObjects/EDNACharacterisation.py

@@ -140,10 +140,7 @@ class EDNACharacterisation(AbstractCharacterisation):
             transmission = HWR.beamline.transmission.get_value()
             beam.setTransmission(XSDataDouble(transmission))
         except AttributeError:
-            import traceback
-
-            self.log.debug("EDNACharacterisation. transmission not saved ")
-            self.log.debug(traceback.format_exc())
+            self.log.exception("EDNACharacterisation. transmission not saved ")
 
         try:
             wavelength = HWR.beamline.energy.get_wavelength()

{mxcubecore-1.395.0 → mxcubecore-1.397.0}/mxcubecore/HardwareObjects/QueueManager.py

@@ -9,7 +9,6 @@ documentation for the queue_entry module for more information.
 """
 
 import logging
-import traceback
 
 import gevent
 
@@ -250,7 +249,7 @@ class QueueManager(HardwareObject, QueueEntryContainer):
             self.emit("queue_entry_execute_finished", (entry, "Failed"))
             self.emit("statusMessage", ("status", "Queue execution failed", "error"))
         except:
-            self.log.warning("encountered Exception:\n%s" % traceback.format_exc())
+            self.log.exception("")
             raise
         else:
             entry.post_execute()

{mxcubecore-1.395.0 → mxcubecore-1.397.0}/mxcubecore/HardwareObjects/SOLEIL/PX1/PX1Collect.py

@@ -450,10 +450,8 @@ class PX1Collect(AbstractCollect, HardwareObject):
                 )
                 return False
         except Exception:
-            import traceback
-
             logging.error("PX1Collect: Cannot generate thumbnails for %s" % filename)
-            logging.error(traceback.format_exc())
+            logging.exception("")
             return False
 
     ## generate snapshots and data thumbnails (END) ##
@@ -487,12 +485,10 @@ class PX1Collect(AbstractCollect, HardwareObject):
         try:
             os.chmod(process_dir, 0o777)
         except Exception:
-            import traceback
-
             self.log.error(
                 "PX1Collect: Error changing permissions for PROCESS directory"
             )
-            self.log.error(traceback.format_exc())
+            self.log.exception()
 
         self.create_goimg_file(process_dir)
 

{mxcubecore-1.395.0 → mxcubecore-1.397.0}/mxcubecore/HardwareObjects/SOLEIL/PX1/PX1EnergyScan.py

@@ -313,11 +313,7 @@ class PX1EnergyScan(AbstractEnergyScan, Equipment):
 
             self.scanCommandFinished()
         except Exception:
-            import traceback
-
-            self.log.error(
-                "EnergyScan: problem starting energy scan. %s" % traceback.format_exc()
-            )
+            self.log.exception("EnergyScan: problem starting energy scan.")
             self.scanCommandFailed()
             self.scanStatusChanged("error starting energy scan")
             return False
@@ -497,9 +493,7 @@ class PX1EnergyScan(AbstractEnergyScan, Equipment):
             # pk, fppPeak, fpPeak, ip, fppInfl, fpInfl, chooch_graph_data = \
             #       result
         except Exception:
-            import traceback
-
-            self.log.debug(traceback.format_exc())
+            self.log.exception("")
             self.store_energy_scan()
             self.log.error("Energy scan: Chooch failed")
             return

{mxcubecore-1.395.0 → mxcubecore-1.397.0}/mxcubecore/HardwareObjects/SOLEIL/PX1/PX1MiniDiff.py

@@ -226,12 +226,10 @@ class PX1MiniDiff(GenericDiffractometer):
             try:
                 motor.set_value(position, timeout=None)
             except Exception:
-                import traceback
-
                 self.log.debug(
                     "  / error moving motor on diffractometer. state is %s"
                     % (self.smargon_state)
                 )
-                self.log.debug("     / %s " % traceback.format_exc())
+                self.log.exception("")
 
         self.wait_device_ready(timeout)

{mxcubecore-1.395.0 → mxcubecore-1.397.0}/mxcubecore/HardwareObjects/SOLEIL/PX2/PX2Diffractometer.py

@@ -23,7 +23,6 @@ import logging
 import os
 import pickle
 import time
-import traceback
 from math import sqrt
 
 import beam_align
@@ -812,7 +811,6 @@ class PX2Diffractometer(GenericDiffractometer):
         # motors[motor_role] = motor_pos[motor_obj]
         # except KeyError:
 
-        # self.log.exception('convert_from_obj_to_name %s' % traceback.format_exc())
         # if motor_obj:
         # motors[motor_role] = motor_obj.get_value()
 
@@ -912,7 +910,7 @@ class PX2Diffractometer(GenericDiffractometer):
                         c[key] = self.motor_hwobj_dict[key].get_value()
                     except Exception:
                         # self.log.info('motor_positions_to_screen exception key %s' % key)
-                        self.log.info(traceback.format_exc())
+                        self.log.exception("")
 
             if "kappa" in c and c["kappa"] is None:
                 kappa = self.motor_hwobj_dict["kappa"].get_value()
@@ -1402,14 +1400,14 @@ class PX2Diffractometer(GenericDiffractometer):
         try:
             self.nclicks = int(nclicks)
         except Exception:
-            self.log.exception(traceback.format_exc())
+            self.log.exception("")
 
     def set_step(self, step):
         self.log.info("PX2Diffractometer: centring step changed: %s" % step)
         try:
             self.step = float(step)
         except Exception:
-            self.log.exception(traceback.format_exc())
+            self.log.exception("")
 
     def set_centring_method(self, centring_method):
         self.log.info(
@@ -1418,7 +1416,7 @@ class PX2Diffractometer(GenericDiffractometer):
         try:
             self.centring_method = centring_method
         except Exception:
-            self.log.exception(traceback.format_exc())
+            self.log.exception("")
 
     def is_ready(self):
         """

{mxcubecore-1.395.0 → mxcubecore-1.397.0}/mxcubecore/HardwareObjects/SOLEIL/SOLEILEnergyScan.py

@@ -285,11 +285,7 @@ class SOLEILEnergyScan(HardwareObject):
             self.xanes.scan()  # start() #scan()
             self.scanCommandFinished("success")
         except Exception:
-            import traceback
-
-            self.log.error(
-                "EnergyScan: problem calling sequence %s" % traceback.format_exc()
-            )
+            self.log.exception("EnergyScan: problem calling sequence")
             self.emit("scanStatusChanged", ("Error problem spec macro",))
             return False
         return True
@@ -509,12 +505,9 @@ class SOLEILEnergyScan(HardwareObject):
                 )
                 return None
             except Exception:
-                import traceback
+                self.user_log.error("Error creating archive path")
+                self.log.exception("Error creating archive path")
 
-                logging.getLogger("user_level_log").error(
-                    "Error creating archive path (%s) \n   %s"
-                    % (dirname, traceback.format_exc())
-                )
                 return None
         else:
             if not os.path.isdir(dirname):
@@ -528,9 +521,7 @@ class SOLEILEnergyScan(HardwareObject):
             fi = open(scanFile)
             fo = open(archiveEfsFile, "w")
         except Exception:
-            import traceback
-
-            logging.getLogger("user_level_log").error(traceback.format_exc())
+            self.user_log.exception("")
             self.storeEnergyScan()
             self.emit("energyScanFailed", ())
             return None

{mxcubecore-1.395.0 → mxcubecore-1.397.0}/mxcubecore/HardwareObjects/SOLEIL/SOLEILISPyBClient.py

@@ -1,6 +1,5 @@
 import logging
 import os
-import traceback
 from collections import namedtuple
 
 import urllib2
@@ -95,11 +94,9 @@ class SOLEILISPyBClient(ISPyBClient):
                         "SOLEILISPyBClient: extracted from ISPyB values for shipping, collection and tools"
                     )
                 except Exception:
-                    print(traceback.print_exc())
-                    logging.exception("SOLEILISPyBClient: %s" % _CONNECTION_ERROR_MSG)
+                    self.log.exception("SOLEILISPyBClient: %s" % _CONNECTION_ERROR_MSG)
                     return
         except Exception:
-            print(traceback.print_exc())
             self.log.exception(_CONNECTION_ERROR_MSG)
             return
         try:

{mxcubecore-1.395.0 → mxcubecore-1.397.0}/mxcubecore/HardwareObjects/SOLEIL/SOLEILSafetyShutter.py

@@ -19,10 +19,7 @@ class SOLEILSafetyShutter(HardwareObject):
             self.connect(self.shutter, "shutterStateChanged", self.shutterStateChanged)
             self.connect(self.pss, "wagoStateChanged", self.shutterStateChanged)
         except Exception:
-            import traceback
-
-            print(traceback.print_exc())
-            logging.debug(traceback.format_exc())
+            logging.exception("")
             logging.getLogger().warning("pss device not configured")
 
     def getShutterState(self):

{mxcubecore-1.395.0 → mxcubecore-1.397.0}/mxcubecore/HardwareObjects/SOLEIL/SOLEILqueue_entry.py

@@ -92,7 +92,7 @@ class PX2DataCollectionQueueEntry(DataCollectionQueueEntry):
                 list_item.setText(1, "Stopped")
                 raise QueueAbortedException("queue stopped by user", self)
             except Exception as ex:
-                print(traceback.print_exc())
+                self.log.exception("")
                 raise QueueExecutionException(ex.message, self)
         else:
             log.error(

{mxcubecore-1.395.0 → mxcubecore-1.397.0}/mxcubecore/HardwareObjects/SOLEIL/TangoDCMotor.py

@@ -128,8 +128,6 @@ class TangoDCMotor(HardwareObject):
             if numpy.inf in limits:
                 limits = numpy.array([-10000, 10000])
         except Exception:
-            # import traceback
-            # self.log.info("TangoDCMotor.get_limits: Cannot get limits for %s.\nException %s " % (self.motor_name, traceback.print_exc()))
             if self.motor_name in [
                 "detector_distance",
                 "detector_horizontal",

{mxcubecore-1.395.0 → mxcubecore-1.397.0}/mxcubecore/HardwareObjects/SecureXMLRpcRequestHandler.py

@@ -83,17 +83,10 @@ class SecureXMLRpcRequestHandler(SimpleXMLRPCRequestHandler):
                 response = self.server._marshaled_dispatch(
                     data, getattr(self, "_dispatch", None)
                 )
-            except Exception as e:  # This should only happen if the module is buggy
+            except Exception:  # This should only happen if the module is buggy
                 # internal error, report as HTTP server error
                 self.send_response(500)
-
-                # Send information about the exception if requested
-                if (
-                    hasattr(self.server, "_send_traceback_header")
-                    and self.server._send_traceback_header
-                ):
-                    self.send_header("X-exception", str(e))
-                    self.send_header("X-traceback", traceback.format_exc())
+                logging.getLogger("HWR").exception("Exception during request.")
 
                 self.end_headers()
             else:

{mxcubecore-1.395.0 → mxcubecore-1.397.0}/mxcubecore/saferef.py

@@ -2,7 +2,6 @@
 
 import collections
 import logging
-import traceback
 import weakref
 
 
@@ -122,15 +121,9 @@ class BoundMethodWeakref(object):
                     if isinstance(function, collections.abc.Callable):
                         function(self)
                 except Exception:
-                    try:
-                        traceback.print_exc()
-                    except AttributeError as e:
-                        print(
-                            (
-                                "Exception during saferef %s "
-                                "cleanup function %s: %s" % (self, function, e)
-                            )
-                        )
+                    logging.getLogger("HWR").exception(
+                        f"Exception during `saferef` {self} cleanup function {function}"
+                    )
 
         self.deletion_methods = [on_delete]
         self.key = self.calculate_key(target)

{mxcubecore-1.395.0 → mxcubecore-1.397.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mxcubecore"
-version = "1.395.0"
+version = "1.397.0"
 license = "LGPL-3.0-or-later"
 description = "Core libraries for the MXCuBE application"
 authors = [