SSRF BL19U1 Beamline

mxcube3/__init__.py

@@ -1,13 +1,15 @@
+from gevent import monkey
+#monkey.patch_all(thread=False)
+monkey.patch_all()
+
 import argparse
 import mock
 import os
 import redis
 import sys
 import traceback
 
-from gevent import monkey
-monkey.patch_all(thread=False)
-
+#monkey.patch_all()
 from mxcube3.server import Server
 from mxcube3.app import MXCUBEApplication
 from mxcube3.config import Config
@@ -26,7 +28,7 @@ def parse_args():
         os.path.join(os.path.dirname(__file__), os.pardir),
         "test/HardwareObjectsMockup.xml/",
     )
-
+    #XML_DIR = "/home/mxcube19u1/mxcube/mxcubecore/mxcubecore/configuration"
     opt_parser = argparse.ArgumentParser(
         description="mxcube-web Backend server command line utility."
     )
@@ -45,6 +47,7 @@ def parse_args():
         dest="static_folder",
         help="Static folder",
         default=f"{os.getcwd()}ui/build",
+        #default=f"/home/mxcube19u1/mxcube/mxcube3/ui/build",
     )
 
     opt_parser.add_argument(
@@ -77,7 +80,7 @@ def parse_args():
         action="store_true",
         dest="allow_remote",
         help="Enable remote access",
-        default=False,
+        default=True,
     )
 
     opt_parser.add_argument(
@@ -91,7 +94,6 @@ def parse_args():
 
     return opt_parser.parse_args()
 
-
 def main(test=False):
     global mxcube
     global server

mxcube3/app.py

@@ -142,6 +142,8 @@ def adapt_hardware_objects(app):
             # Go through all hardware objects exposed by mxcubecore
             # hardware repository set id to username if its deinfed
             # use the name otherwise (file name without extension)
+            # if ho_name == "dtox" or "tox" in ho_name:
+            #     ho_name = "/dtox"
             ho = MXCUBECore.hwr.get_hardware_object(ho_name)
 
             if not ho:
@@ -152,7 +154,8 @@ def adapt_hardware_objects(app):
             # Try to use the interface exposed by abstract classes in mxcubecore to adapt
             # the object
             adapter_cls = get_adapter_cls_from_hardware_object(ho)
-
+            if adapter_cls is None:
+                print("==== adapter_cls is None! ho is: ", ho_name)
             if adapter_cls:
                 try:
                     adapter_instance = adapter_cls(ho, _id, app, **dict(adapter_config))
@@ -211,8 +214,8 @@ class MXCUBEApplication:
     USERS = {}
 
     # Path to video device (i.e. /dev/videoX)
-    VIDEO_FORMAT = "MPEG1"
-
+    #VIDEO_FORMAT = "MPEG1"
+    VIDEO_FORMAT = "JPEG"
     # Contains the complete client side ui state, managed up state_storage.py
     UI_STATE = dict()
     TEMP_DISABLED = []
@@ -227,7 +230,8 @@ class MXCUBEApplication:
 
     # Enable automatic Mountie of sample when queue executed in
     # "automatic/pipeline" mode
-    AUTO_MOUNT_SAMPLE = False
+    # AUTO_MOUNT_SAMPLE = False
+    AUTO_MOUNT_SAMPLE = True
 
     # Automatically add and execute diffraction plans coming from
     # characterizations
@@ -298,11 +302,12 @@ def init_sample_video(format):
         :return: None
         """
         try:
-            HWR.beamline.sample_view.camera.start_streaming(format)
+            #HWR.beamline.sample_view.camera.start_streaming(format)
+            HWR.beamline.sample_view.camera.start_streaming()
         except Exception as ex:
             msg = "Could not initialize video, error was: "
             msg += str(ex)
-            logging.getLogger("HWR").info(msg)
+            logging.getLogger("HWR").error(msg)
 
     @staticmethod
     def init_signal_handlers():

mxcube3/core/adapter (copy)/actuator_adapter.py

@@ -0,0 +1,83 @@
+from mxcube3.core.adapter.adapter_base import ActuatorAdapterBase
+from mxcube3.core.util.adapterutils import export
+from mxcube3.core.util.networkutils import RateLimited
+
+from mxcube3.core.models.adaptermodels import (
+    HOActuatorValueChangeModel,
+    FloatValueModel,
+)
+
+
+class ActuatorAdapter(ActuatorAdapterBase):
+    """
+    Adapter for Energy Hardware Object, a web socket is used to communicate
+    information on longer running processes.
+    """
+
+    def __init__(self, ho, *args, **kwargs):
+        """
+        Args:
+            (object): Hardware object.
+        """
+        super(ActuatorAdapter, self).__init__(ho, *args, **kwargs)
+        self._event_rate = 4
+
+        @RateLimited(self._event_rate)
+        def _vc(value, **kwargs):
+            self.value_change(value, **kwargs)
+
+        self._vc = _vc
+
+        try:
+            ho.connect("valueChanged", self._value_change)
+            ho.connect("stateChanged", self.state_change)
+        except Exception:
+            pass
+
+    def _value_change(self, *args, **kwargs):
+        self._vc(*args, **kwargs)
+
+    def _set_value(self, value: HOActuatorValueChangeModel):
+        """
+        Execute the sequence to set the value.
+        Args:
+            value (float): Target energy [keV].
+        Returns:
+            (float as str): The actual value set.
+        Raises:
+            ValueError: Value not valid or attemp to set a non-tunable energy.
+            RuntimeError: Timeout while setting the value.
+            StopItteration: When a value change was interrupted (abort/cancel).
+        """
+        try:
+            self._ho.set_value(float(value.value))
+        except Exception:
+            raise
+
+    @export
+    def _get_value(self) -> FloatValueModel:
+        """
+        Read the energy.
+        Returns:
+            (float as str): Energy [keV].
+        Raises:
+            ValueError: When value for any reason can't be retrieved.
+        """
+        try:
+            return FloatValueModel(**{"value": self._ho.get_value()})
+        except (AttributeError, TypeError):
+            raise ValueError("Could not get value")
+
+    def stop(self):
+        """
+        Stop the execution.
+        """
+        self._ho.abort()
+
+    def read_only(self):
+        """
+        Check if the energy is tunable or not.
+        Retuns:
+            (bool): True if tunable, False if not.
+        """
+        return self._ho.read_only