Merge branch 'master' into 2021-03-22T14.42.30-branched_from_master-Makefile_refactoring

devices/src/attribute_wrapper.py → devices/util/attribute_wrapper.py

@@ -3,7 +3,7 @@ from tango import AttrWriteType
 
 import numpy
 
-from src.wrappers import only_when_on, fault_on_error
+from util.wrappers import only_when_on, fault_on_error
 import logging
 
 logger = logging.getLogger()
@@ -61,8 +61,8 @@ class attribute_wrapper(attribute):
         if access == AttrWriteType.READ_WRITE:
             """ if the attribute is of READ_WRITE type, assign the RW and write function to it"""
 
-            @only_when_on
-            @fault_on_error
+            @only_when_on()
+            @fault_on_error()
             def read_RW(device):
                 # print("read_RW {}, {}x{}, {}, {}".format(me.name, me.dim_x, me.dim_y, me.attr_type, me.value))
                 """
@@ -74,8 +74,8 @@ class attribute_wrapper(attribute):
                     raise Exception("Attribute read_RW function error, attempted to read value_dict with key: `%s`, are you sure this exists?",
                                     self) from e
 
-            @only_when_on
-            @fault_on_error
+            @only_when_on()
+            @fault_on_error()
             def write_RW(device, value):
                 """
                 _write_RW writes a value to this attribute
@@ -91,8 +91,8 @@ class attribute_wrapper(attribute):
         else:
             """ if the attribute is of READ type, assign the read function to it"""
 
-            @only_when_on
-            @fault_on_error
+            @only_when_on()
+            @fault_on_error()
             def read_R(device):
                 """
                 _read_R reads the attribute value, stores it and returns it"

devices/src/hardware_device.py → devices/util/hardware_device.py

@@ -16,12 +16,12 @@ from tango.server import Device, command
 from tango import DevState, DebugIt
 # Additional import
 
-from src.attribute_wrapper import attribute_wrapper
-from src.lofar_logging import log_exceptions
+from util.attribute_wrapper import attribute_wrapper
+from util.lofar_logging import log_exceptions
 
 __all__ = ["hardware_device"]
 
-from src.wrappers import only_in_states
+from util.wrappers import only_in_states, fault_on_error
 
 #@log_exceptions()
 class hardware_device(Device):
@@ -74,6 +74,8 @@ class hardware_device(Device):
     @command()
     @only_in_states([DevState.FAULT, DevState.OFF])
     @DebugIt()
+    @fault_on_error()
+    @log_exceptions()
     def Initialise(self):
         """
         Command to ask for initialisation of this device. Can only be called in FAULT or OFF state.
@@ -83,24 +85,27 @@ class hardware_device(Device):
         self.set_state(DevState.INIT)
         self.setup_value_dict()
 
-        self.initialise()
+        self.configure_for_initialise()
 
         self.set_state(DevState.STANDBY)
 
     @command()
     @only_in_states([DevState.STANDBY])
     @DebugIt()
+    @fault_on_error()
+    @log_exceptions()
     def On(self):
         """
         Command to ask for initialisation of this device. Can only be called in FAULT or OFF state.
 
         :return:None
         """
-        self.on()
+        self.configure_for_on()
         self.set_state(DevState.ON)
 
     @command()
     @DebugIt()
+    @log_exceptions()
     def Off(self):
         """
         Command to ask for shutdown of this device.
@@ -114,7 +119,7 @@ class hardware_device(Device):
         # Turn off
         self.set_state(DevState.OFF)
 
-        self.off()
+        self.configure_for_off()
 
         # Turn off again, in case of race conditions through reconnecting
         self.set_state(DevState.OFF)
@@ -122,6 +127,7 @@ class hardware_device(Device):
     @command()
     @only_in_states([DevState.ON, DevState.INIT, DevState.STANDBY])
     @DebugIt()
+    @log_exceptions()
     def Fault(self):
         """
         FAULT state is used to indicate our connection with the OPC-UA server is down.
@@ -132,18 +138,18 @@ class hardware_device(Device):
 
         :return:None
         """
-        self.fault()
+        self.configure_for_fault()
         self.set_state(DevState.FAULT)
 
 
     # functions that can be overloaded
-    def fault(self):
+    def configure_for_fault(self):
         pass
-    def off(self):
+    def configure_for_off(self):
         pass
-    def on(self):
+    def configure_for_on(self):
         pass
-    def initialise(self):
+    def configure_for_initialise(self):
         pass
 
     def always_executed_hook(self):

devices/src/lofar_logging.py → devices/util/lofar_logging.py

 import logging
 from functools import wraps
+import sys
 
 # Always also log the hostname because it makes the origin of the log clear.
 import socket

lib/startup.py → devices/util/startup.py

@@ -34,4 +34,3 @@ def startup(device: str, force_restart: bool):
     else:
         print("Device {} has successfully reached ON state.".format(device))
     return proxy
-

devices/src/wrappers.py → devices/util/wrappers.py

@@ -22,12 +22,13 @@ def only_in_states(allowed_states):
 
     return wrapper
 
-def only_when_on(func):
+def only_when_on():
     """
       Wrapper to call and return the wrapped function if the device is
       in the ON state. Otherwise None is returned and nothing
       will be called.
     """
+    def inner(func):
         @wraps(func)
         def when_on_wrapper(self, *args, **kwargs):
             if self.get_state() == DevState.ON:
@@ -37,10 +38,13 @@ def only_when_on(func):
 
         return when_on_wrapper
 
-def fault_on_error(func):
+    return inner
+
+def fault_on_error():
     """
       Wrapper to catch exceptions. Sets the device in a FAULT state if any occurs.
     """
+    def inner(func):
         @wraps(func)
         def error_wrapper(self, *args, **kwargs):
             try:
@@ -51,3 +55,5 @@ def fault_on_error(func):
                 return None
 
         return error_wrapper
+
+    return inner

docker-compose/archiver.yml

 version: '2'
 
 services:
-  maria-db:
+  archiver-maria-db:
     image: ${DOCKER_REGISTRY_HOST}/${DOCKER_REGISTRY_USER}/mariadb_hdbpp:latest
     container_name: archiver-maria-db
     network_mode: ${NETWORK_MODE}
@@ -23,7 +23,7 @@ services:
       depends_on:
         - databaseds
         - dsconfig
-        - maria-db
+        - archiver-maria-db
       environment:
         - TANGO_HOST=${TANGO_HOST}
         - HdbManager=archiving/hdbpp/confmanager01
@@ -40,7 +40,7 @@ services:
       depends_on:
         - databaseds
         - dsconfig
-        - maria-db
+        - archiver-maria-db
       environment:
         - TANGO_HOST=${TANGO_HOST}
         - HdbManager=archiving/hdbpp/confmanager01

docker-compose/hdbpp_viewer.yml

@@ -16,7 +16,7 @@ services:
     depends_on:
       - databaseds
       - dsconfig
-      - maria-db
+      - archiver-maria-db
       - hdbpp-es
       - hdbpp-cm
     volumes:

docker-compose/jupyter/Dockerfile

@@ -13,7 +13,7 @@ RUN sudo jupyter nbextension enable jupyter_bokeh --py --sys-prefix
 
 # Install profiles for ipython & jupyter
 COPY ipython-profiles /opt/ipython-profiles/
-RUN sudo chown tango.tango -R /opt/ipython-profiles
+RUN sudo chmod a+rw -R /opt/ipython-profiles
 COPY jupyter-kernels /usr/local/share/jupyter/kernels/
 
 # Install patched jupyter executable
@@ -27,5 +27,6 @@ ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /usr/
 RUN sudo chmod +x /usr/bin/tini
 
 # Make sure Jupyter can write to the home directory
-ENV HOME=/home/tango
-RUN chmod a+rwx /home/tango
+ENV HOME=/home/user
+RUN sudo mkdir -p $HOME
+RUN sudo chmod a+rwx $HOME

jupyter-notebooks/ini_device.ipynb

+{
+ "cells": [
+  {
+   "cell_type": "code",
+   "execution_count": 128,
+   "id": "waiting-chance",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "import time\n",
+    "import numpy"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 146,
+   "id": "moving-alexandria",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "d=DeviceProxy(\"LTS/ini_device/1\")"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 198,
+   "id": "ranking-aluminum",
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "Device is now in on state\n"
+     ]
+    }
+   ],
+   "source": [
+    "state = str(d.state())\n",
+    "\n",
+    "if state == \"OFF\":\n",
+    "    d.initialise()\n",
+    "    time.sleep(1)\n",
+    "state = str(d.state())\n",
+    "if state == \"STANDBY\":\n",
+    "    d.on()\n",
+    "state = str(d.state())\n",
+    "if state == \"ON\":\n",
+    "    print(\"Device is now in on state\")\n"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 199,
+   "id": "beneficial-evidence",
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "double_scalar_RW [0.]\n",
+      "double_scalar_R [1.2]\n",
+      "bool_scalar_RW [False]\n",
+      "bool_scalar_R [ True]\n",
+      "int_scalar_RW [0]\n",
+      "int_scalar_R [5]\n",
+      "str_scalar_RW ('',)\n",
+      "str_scalar_R ('this is',)\n",
+      "double_spectrum_RW [0. 0. 0. 0.]\n",
+      "double_spectrum_R [1.2 2.3 3.4 4.5]\n",
+      "bool_spectrum_RW [False False False False]\n",
+      "bool_spectrum_R [ True  True False False]\n",
+      "int_spectrum_RW [0 0 0 0]\n",
+      "int_spectrum_R [1 2 3 4]\n",
+      "str_spectrum_RW ('', '', '', '')\n",
+      "str_spectrum_R ('\"a\"', ' \"b\"', ' \"c\"', ' \"d\"')\n",
+      "double_image_RW [[0. 0. 0.]\n",
+      " [0. 0. 0.]]\n",
+      "double_image_R [[1.2 2.3 3.4]\n",
+      " [4.5 5.6 6.7]]\n",
+      "bool_image_RW [[False False False]\n",
+      " [False False False]]\n",
+      "bool_image_R [[ True  True False]\n",
+      " [False  True False]]\n",
+      "int_image_RW [[0 0 0]\n",
+      " [0 0 0]]\n",
+      "int_image_R [[1 2 3]\n",
+      " [4 5 6]]\n",
+      "str_image_RW (('', '', ''), ('', '', ''))\n",
+      "str_image_R (('\"a\"', ' \"b\"', ' \"c\"'), (' \"d\"', ' \"e\"', ' \"f\"'))\n",
+      "State <function __get_command_func.<locals>.f at 0x7f3efee95c80>\n",
+      "Status <function __get_command_func.<locals>.f at 0x7f3efee95c80>\n"
+     ]
+    }
+   ],
+   "source": [
+    "attr_names = d.get_attribute_list()\n",
+    "\n",
+    "for i in attr_names:\n",
+    "    try:\n",
+    "        exec(\"print(i, d.{})\".format(i))\n",
+    "    except:\n",
+    "        pass\n"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 93,
+   "id": "sharing-mechanics",
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "array([0])"
+      ]
+     },
+     "execution_count": 93,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "d.int_scalar_RW"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 203,
+   "id": "2f03759a",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "d.str_image_RW = [[\"1\", \"2\", \"3\"],[\"4\", \"5\", \"6\"]]"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 204,
+   "id": "3187f3bb",
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "(('1', '2', '3'), ('4', '5', '6'))"
+      ]
+     },
+     "execution_count": 204,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "d.str_image_RW"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 192,
+   "id": "eb406dce",
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "\"['a', 'b', 'c', 'd', 'e', 'f']\""
+      ]
+     },
+     "execution_count": 192,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "numpy.str_([\"a\", \"b\", \"c\", \"d\", \"e\", \"f\"])"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 197,
+   "id": "7b270085",
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "6"
+      ]
+     },
+     "execution_count": 197,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "array = []\n",
+    "string = '\"a\", \"b\", \"c\", \"d\", \"e\", \"f\"'\n",
+    "\n",
+    "for i in string.split(\",\"):\n",
+    "    value = numpy.str_(i)\n",
+    "    array.append(value)\n",
+    "\n",
+    "len(array)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "69ecc437",
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "StationControl",
+   "language": "python",
+   "name": "stationcontrol"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.7.3"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 5
+}