mxcubecore 1.391.0__py3-none-any.whl → 1.393.0__py3-none-any.whl

mxcubecore/HardwareObjects/abstract/AbstractMultiCollect.py

@@ -270,12 +270,12 @@ class AbstractMultiCollect(object):
         try:
             sample_container_number = int(sample_info["container_reference"])
         except Exception:
-            pass
+            logging.getLogger("HWR").exception("")
         else:
             try:
                 vial_number = int(sample_info["sample_location"])
             except Exception:
-                pass
+                logging.getLogger("HWR").exception("")
             else:
                 sample_location = (sample_container_number, vial_number)
 
@@ -540,7 +540,7 @@ class AbstractMultiCollect(object):
             logging.getLogger("user_level_log").info("Getting centring status")
             centring_status = self.diffractometer().get_centring_status()
         except Exception:
-            pass
+            logging.getLogger("HWR").exception("")
         else:
             centring_info = dict(centring_status)
 
@@ -644,7 +644,7 @@ class AbstractMultiCollect(object):
                         try:
                             f.close()
                         except Exception:
-                            pass
+                            logging.getLogger("HWR").exception("")
 
                     data_collect_parameters["xtalSnapshotFullPath%i" % snapshot_i] = (
                         full_snapshot
@@ -808,7 +808,7 @@ class AbstractMultiCollect(object):
                 HWR.beamline.beam.wait_for_beam()
                 HWR.beamline.cryo.wait_temperature()
             except AttributeError:
-                pass
+                logging.getLogger("HWR").exception("")
 
             logging.getLogger("user_level_log").info("Preparing intensity monitors")
             self.prepare_intensity_monitors()
@@ -1149,7 +1149,7 @@ class AbstractMultiCollect(object):
                             ),
                         )
                 except Exception:
-                    pass
+                    logging.getLogger("HWR").exception("")
                 else:
                     collections_analyse_params.append(
                         (

mxcubecore/HardwareObjects/abstract/AbstractNState.py

@@ -24,6 +24,7 @@ Implements validate_value, set/update limits.
 
 import abc
 import ast
+import logging
 from enum import (
     Enum,
     unique,
@@ -92,7 +93,7 @@ class AbstractNState(AbstractActuator):
             values_dict.update(values)
             self.VALUES = Enum("ValueEnum", values_dict)
         except (ValueError, TypeError):
-            pass
+            logging.getLogger("HWR").exception("")
 
     def value_to_enum(self, value, idx=0):
         """Transform a value to Enum

mxcubecore/HardwareObjects/abstract/AbstractVideoDevice.py

@@ -42,7 +42,7 @@ import numpy as np
 try:
     import cv2
 except ImportError:
-    pass
+    logging.getLogger("HWR").exception("")
 
 from mxcubecore.BaseHardwareObjects import HardwareObject
 
@@ -120,7 +120,7 @@ class AbstractVideoDevice(HardwareObject):
         try:
             self.cam_gain = float(self.get_property("gain"))
         except TypeError:
-            pass
+            logging.getLogger("HWR").exception("")
 
         try:
             self.cam_exposure = float(self.get_property("exposure"))

mxcubecore/HardwareObjects/abstract/AbstractXRFSpectrum.py

@@ -182,6 +182,8 @@ class AbstractXRFSpectrum(HardwareObject):
                 logging.getLogger().error(msg)
                 self.spectrum_status_change("Error creating directory")
                 self.spectrum_command_aborted()
+
+                logging.getLogger("HWR").exception("")
                 return False
         return True
 

mxcubecore/HardwareObjects/abstract/ISPyBAbstractLims.py

@@ -58,7 +58,7 @@ class ISPyBAbstractLIMS(AbstractLims):
         try:
             self.base_result_url = self.get_property("base_result_url").strip()
         except AttributeError:
-            pass
+            logging.getLogger("HWR").exception("")
 
         self.adapter = self._create_data_adapter()
         logging.getLogger("HWR").debug("[ISPYB] Proxy address: %s" % self.proxy)
@@ -72,15 +72,15 @@ class ISPyBAbstractLIMS(AbstractLims):
                 try:
                     self._translations[code]["ldap"] = proposal.ldap
                 except AttributeError:
-                    pass
+                    logging.getLogger("HWR").exception("")
                 try:
                     self._translations[code]["ispyb"] = proposal.ispyb
                 except AttributeError:
-                    pass
+                    logging.getLogger("HWR").exception("")
                 try:
                     self._translations[code]["gui"] = proposal.gui
                 except AttributeError:
-                    pass
+                    logging.getLogger("HWR").exception("")
 
     def _create_data_adapter(self) -> ISPyBDataAdapter:
         return ISPyBDataAdapter(
@@ -180,7 +180,7 @@ class ISPyBAbstractLIMS(AbstractLims):
                     )
                     return sample
             except (TypeError, KeyError):
-                pass
+                logging.getLogger("HWR").exception("")
         return None
 
     def get_samples(self, lims_name):

mxcubecore/HardwareObjects/abstract/ISPyBDataAdapter.py

@@ -59,7 +59,7 @@ def utf_decode(res_d):
         try:
             res_d[key] = value.decode("utf8", "ignore")
         except Exception:
-            pass
+            logging.getLogger("HWR").exception("")
 
     return res_d
 
@@ -529,7 +529,7 @@ class ISPyBDataAdapter:
                         session_dict["timeStamp"].split("+")[0], "%Y-%m-%d %H:%M:%S"
                     )
                 except Exception:
-                    pass
+                    logging.getLogger("HWR").exception("")
 
                 # return data to original codification
                 decoded_dict = utf_decode(session_dict)
@@ -673,7 +673,7 @@ class ISPyBDataAdapter:
             try:
                 del energyscan_dict["remoteEnergy"]
             except KeyError:
-                pass
+                logging.getLogger("HWR").exception("")
 
             status["energyScanId"] = self._collection.service.storeOrUpdateEnergyScan(
                 energyscan_dict

mxcubecore/HardwareObjects/abstract/sample_changer/Crims.py

@@ -16,6 +16,8 @@ def get_image(url: str) -> Optional[bytes]:
         logging.getLogger("user_level_log").warning(
             "Failed to fetch image from %s: %s", url, e
         )
+
+        logging.getLogger("HWR").exception("")
         return None
 
 
@@ -28,6 +30,8 @@ def get_image_size(url: str) -> Tuple[int, int]:
         logging.getLogger("user_level_log").warning(
             "Failed to get image size from %s: %s", url, e
         )
+
+        logging.getLogger("HWR").exception("")
         return (0, 0)
 
 
@@ -147,6 +151,8 @@ def get_processing_plan(
         logging.getLogger("user_level_log").warning(
             "Error getting processing plan from  %s : %s", url, e
         )
+
+        logging.getLogger("HWR").exception("")
         return None
 
 
@@ -174,4 +180,6 @@ def send_data_collection_info_to_crims(
         return True
     except requests.RequestException as e:
         logging.getLogger("user_level_log").warning("Request to %s failed: %s", url, e)
+
+        logging.getLogger("HWR").exception("")
         return False

mxcubecore/HardwareObjects/mockup/BeamlineTestMockup.py

@@ -130,6 +130,8 @@ class BeamlineTestMockup(HardwareObject):
                 logging.getLogger("HWR").warning(
                     "BeamlineTest: Unable to create test directories"
                 )
+
+                logging.getLogger("HWR").exception("")
                 return
 
         self.results_list = []

mxcubecore/HardwareObjects/mockup/EnergyScanMockup.py

@@ -392,7 +392,7 @@ class EnergyScanMockup(AbstractEnergyScan):
             for el in self.config.elements["element"]:
                 elements.append({"symbol": el["symbol"], "energy": el["energy"]})
         except IndexError:
-            pass
+            logging.getLogger("HWR").exception("")
         return elements
 
     #

mxcubecore/HardwareObjects/mockup/ISPyBClientMockup.py

@@ -35,7 +35,7 @@ class ISPyBClientMockup(ProposalTypeISPyBLims):
         try:
             self.base_result_url = self.get_property("base_result_url").strip()
         except AttributeError:
-            pass
+            logging.getLogger("HWR").exception("")
 
         self.__test_proposal = {
             "status": {"code": "ok"},

mxcubecore/HardwareObjects/mockup/ISPyBRestClientMockup.py

@@ -84,7 +84,7 @@ class ISPyBRestClientMockup(HardwareObject):
         try:
             self.base_result_url = self.get_property("base_result_url").strip()
         except AttributeError:
-            pass
+            logging.getLogger("HWR").exception("")
 
         self.__update_rest_token()
 

mxcubecore/HardwareObjects/mockup/MDCameraMockup.py

@@ -160,7 +160,7 @@ class MDCameraMockup(BaseHardwareObjects.HardwareObject):
                 for p in ps:
                     p.kill()
             except psutil.NoSuchProcess:
-                pass
+                logging.getLogger("HWR").exception("")
 
             self._video_stream_process = None
 

mxcubecore/HardwareObjects/mockup/MicrodiffInOutMockup.py

@@ -45,7 +45,7 @@ class MicrodiffInOutMockup(HardwareObject):
             tt = float(self.get_property("timeout"))
             self.timeout = tt
         except Exception:
-            pass
+            logging.getLogger("HWR").exception("")
 
         self.moves = dict((self.states[k], k) for k in self.states)
 

mxcubecore/TaskUtils.py

@@ -77,6 +77,8 @@ class wrap_errors(object):
             return func(*args, **kwargs)
         except Exception:
             sys.excepthook(*sys.exc_info())
+
+            logging.getLogger("HWR").exception("")
             return TaskException(*sys.exc_info())
 
     def __str__(self):

mxcubecore/queue_entry/base_queue_entry.py

@@ -640,7 +640,7 @@ class TaskGroupQueueEntry(BaseQueueEntry):
                         "queue_entry"
                     ].execute()
                 except Exception:
-                    pass
+                    logging.getLogger("HWR").exception("")
                 self.interleave_items[item["collect_index"]][
                     "queue_entry"
                 ].post_execute()
@@ -804,7 +804,7 @@ class SampleQueueEntry(BaseQueueEntry):
             programs = HWR.beamline.collect["auto_processing"]
             autoprocessing.start(programs, "end_multicollect", params)
         except KeyError:
-            pass
+            logging.getLogger("HWR").exception("")
 
         self._set_background_color()
         self._view.setText(1, "")

mxcubecore/queue_entry/energy_scan.py

@@ -195,7 +195,7 @@ class EnergyScanQueueEntry(BaseQueueEntry):
         try:
             energy_scan.result.data = HWR.beamline.energy_scan.get_scan_data()
         except Exception:
-            pass
+            logging.getLogger("HWR").exception("")
 
         if (
             sample.crystals[0].energy_scan_result.peak

mxcubecore/saferef.py

@@ -1,6 +1,7 @@
 """Refactored 'safe reference from dispatcher.py"""
 
 import collections
+import logging
 import traceback
 import weakref
 
@@ -115,7 +116,7 @@ class BoundMethodWeakref(object):
             try:
                 del self.__class__._all_instances[self.key]
             except KeyError:
-                pass
+                logging.getLogger("HWR").exception("")
             for function in methods:
                 try:
                     if isinstance(function, collections.abc.Callable):

mxcubecore/utils/qt_import.py

@@ -68,6 +68,7 @@ splot is licensed under LGPL license
 
 """
 
+import logging
 import os
 import sys
 
@@ -99,9 +100,9 @@ try:
             if m:
                 mpl_version_no[2] = int(m.group("release"))
         except BaseException:
-            pass
+            logging.getLogger("HWR").exception("")
 except BaseException:
-    pass
+    logging.getLogger("HWR").exception("")
 
 if "--pyqt5" in sys.argv:
     qt_variant = "PyQt5"
@@ -239,12 +240,12 @@ if (qt_variant == "PyQt5") or (qt_variant is None and not qt_imported):
         ver = _ver + ["0"] * (3 - len(_ver))
         pyqt_version_no = list(map(int, ver))[:3]
     except ImportError:
-        pass
+        logging.getLogger("HWR").exception("")
 
     try:
         from PyQt5.QtWebKit import QWebPage
     except ImportError:
-        pass
+        logging.getLogger("HWR").exception("")
 
 #
 # PyQt4
@@ -380,12 +381,12 @@ if (qt_variant == "PyQt4") or (qt_variant is None and not qt_imported):
         ver = _ver + ["0"] * (3 - len(_ver))
         pyqt_version_no = list(map(int, ver))[:3]
     except BaseException:
-        pass
+        logging.getLogger("HWR").exception("")
 
     try:
         from PyQt4.QtWebKit import QWebPage
     except ImportError:
-        pass
+        logging.getLogger("HWR").exception("")
 
 #
 # PySide
@@ -423,7 +424,7 @@ if (qt_variant == "PySide") or (qt_variant is None and not qt_imported):
             return ui
 
     except BaseException:
-        pass
+        logging.getLogger("HWR").exception("")
 
 #
 #  Matplotlib backend assignment

{mxcubecore-1.391.0.dist-info → mxcubecore-1.393.0.dist-info}/METADATA

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