improve command handling

- add SEA dil pressures
- read config each time when it is used

client/jsFiles/SEAWebClientMain.js

@@ -78,15 +78,14 @@ new Settings()
     .treat("lazyPermission", "wr", to_bool, true);
 
 
-let args = '';
 if (window.instrument) {
-    args += "&instrument=" + window.instrument;
+    window.clientTags = "&instrument=" + window.instrument;
 } else {
+    let args = '';
     if (window.stream) { args += "&stream=" + window.stream; }
     if (window.device) { args += "&device=" + window.device; }
-}
-if (window.hideRightPart) { args += "&history_only=1"; }
     window.clientTags = args;
+}
 
 // console.log('TAGS', window.clientTags);
 

secop-webserver

@@ -1,10 +1,8 @@
 #!/usr/bin/env python
 
 import sys
-from os.path import expanduser
-#  look for sehistory and frappy at usual locations in home directory 
-sys.path.extend([expanduser('~'), expanduser('~/frappy')])
 import argparse
+import socket
 from webserver import server
 from base import Client
 from influxgraph import InfluxGraph
@@ -40,5 +38,6 @@ def parseArgv(argv):
 
 args = parseArgv(sys.argv[1:])
 
-instrument = None if args.instrument=='main' else args.instrument
+instrument = socket.gethostname().split('.')[0] if args.instrument == 'HOST' else args.instrument
+
 server.run(int(args.port), SEHistory(), InfluxGraph, Client, single_instrument=instrument, secop=SecopInteractor)

secop.py

@@ -54,12 +54,9 @@ class SecopInteractor(SecopClient):
         self.module_updates = set()
         self.param_updates = set()
         self.updates = {}
-        try:
         self.connect()
         node_map.update({k: self for k in self.modules})
         self.register_callback(None, updateItem=self.updateItem)
-        except Exception as e:
-            print(repr(e))
 
     def add_main_components(self, components):
         for name, desc in self.modules.items():

webserver.py

@@ -14,11 +14,6 @@ import flask
 import circularlog
 
 
-instruments = {ins: 8642 for ins in 
-    ['amor', 'boa', 'camea', 'dmc', 'eiger', 'focus', 'hrpt', 'sans', 'tasp', 'zebra']
-}
-
-
 def guess_mimetype(filename):
     if filename.endswith('.js'):
         mimetype = 'text/javascript'
@@ -91,12 +86,8 @@ class Server:
             tags['device'] = devices[0] if len(devices) == 1 else devices
         return streams, tags, ','.join(device_names)
 
-    def register_client(self, instrument=None, stream=None, device=None, history_only=None):
+    def register_client(self, instrument=None, stream=None, device=None):
         streams, tags, device_name = self.lookup_streams(instrument, stream, device)
-        if (history_only or '0') != '0':
-            # create dummy client
-            client = self.client_cls(self, [], '', '')
-        else:
         client = self.client_cls(self, streams, instrument or '', device_name)
         history = self.history_cls(self, instrument, device_name, tags)
         # history.db.debug = True
@@ -115,7 +106,7 @@ class Server:
 
         app.debug = True
 
-        logging.basicConfig(filename=f'logfile{port}.log', filemode='w', level=logging.INFO,
+        logging.basicConfig(filename='webserver.log', filemode='w', level=logging.INFO,
                             format='%(asctime)s %(levelname)s %(message)s')
 
         # srv = gevent.wsgi.WSGIServer(('', port), app, keyfile='key.key', certfile='key.crt')
@@ -146,7 +137,7 @@ pollinterval = 0.2
 @app.route('/update')
 def get_update(_=None):
     # Client Adress: socket.getfqdn(flask.request.remote_addr)
-    kwargs = {k: flask.request.values.get(k) for k in ('instrument', 'stream', 'device', 'history_only')}
+    kwargs = {k: flask.request.values.get(k) for k in ('instrument', 'stream', 'device')}
 
     client = server.register_client(**kwargs)
     client.remote_info = circularlog.strtm() + " " + socket.getfqdn(flask.request.remote_addr.split(':')[-1])
@@ -156,8 +147,7 @@ def get_update(_=None):
         logging.info('UPDATE %s %s', client.id, socket.getfqdn(flask.request.remote_addr.split(':')[-1]))
         # msg = dict(type='id', id=client.id, title=instrument.title);
         # yield to_json_sse(msg)
-        msg = dict(type='id', id=client.id,
-                   instrument=kwargs.get('instrument') or server.single_instrument or 'n_a',
+        msg = dict(type='id', id=client.id, instrument=kwargs.get('instrument') or 'n_a',
                    device=client.device_name)
         yield to_json_sse(msg)
         try:
@@ -313,31 +303,28 @@ def default():
     return general_file('SEAWebClient.html')
 
 
-#@app.route('/select_instrument')
-#def select_instrument():
-#    out = ['''<html><body><table>
-#<style>
-#th {
-#  text-align: left;
-#}
-#</style>
-#<tr><th>instrument</th><th colspan=99>devices</th></tr>''']
-#    result = {}
-#    for stream, tags in server.db.get_streams().items():
-#        ins = tags.get('instrument', '0')
-#        result.setdefault(ins, []).append((stream, tags.get('device')))
-#    bare_streams = result.pop('0', [])
-#    for ins, streams in result.items():
-#        out.append(f'<tr><td><a href="/?ins={ins}">{ins}</a></td>')
-#        out.extend(f'<td>{d or s}</td>' for s, d in streams)
-#        out.append('</tr>')
-#    for stream, device in bare_streams:
-#        out.append(f'<tr><td><a href="/?srv={stream}">{stream}</a></td><td>{device}</td><tr>')
-#    out.append('</table>')
-#    out.append('<h3>servers on the instruments:</h3>')
-#    out.extend([f"<a href='http://{i.lower()}.psi.ch:8642/'>{i}</a>&nbsp;\n" for i in instlist])
-#    out.extend(['</body></html>', ''])
-#    return '\n'.join(out)
+@app.route('/select_instrument')
+def select_instrument():
+    out = ['''<html><body><table>
+<style>
+th {
+  text-align: left;
+}
+</style>
+<tr><th>instrument</th><th colspan=99>devices</th></tr>''']
+    result = {}
+    for stream, tags in server.db.get_streams().items():
+        ins = tags.get('instrument', '0')
+        result.setdefault(ins, []).append((stream, tags.get('device')))
+    bare_streams = result.pop('0', [])
+    for ins, streams in result.items():
+        out.append(f'<tr><td><a href="/?ins={ins}">{ins}</a></td>')
+        out.extend(f'<td>{d or s}</td>' for s, d in streams)
+        out.append('</tr>')
+    for stream, device in bare_streams:
+        out.append(f'<tr><td><a href="/?srv={stream}">{stream}</a></td><td>{device}</td><tr>')
+    out.extend(['</table></body></html>', ''])
+    return '\n'.join(out)
 
 
 @app.route('/select_experiment')
@@ -348,6 +335,7 @@ content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale
 <style>
 th {
   text-align: left;
+  background-color: #cccccc;
 }
 a {
   text-decoration: none;
@@ -355,27 +343,11 @@ a {
 </style></head>
 <body><table>
 ''']
+    showtitle = 0
     ONEMONTH = 30 * 24 * 3600
 
-    out.append('<br><i>direct link to instruments:</i><br>')
-    out.extend([f'<a href="http://{ins}.psi.ch:{port}/">{ins.upper()}</a>&nbsp;\n'
-                for ins, port in instruments.items()])
-    if server.db.has_local:
-        out.append('<h3><a href="http://linse-c.psi.ch:8888/">linse-c (central)</a></h3>')
-
-    class prev:  # just a namesapce
-        title = None
-        legend = None
-
-    def change_title(text):
-        if text == prev.title:
-            return False
-        if prev.legend:
-            out.append(f'<tr>{prev.legend}</tr>')
-            prev.legend = None
-        prev.title = text
-        out.append(f'<tr><td colspan=3><br><i>{text}:</i></td></tr>')
-        return True
+    def title(text):
+        out.append(f'<tr><td colspan=2><b>{text}</b></td></tr>')
 
     # TODO: sort this by (instrument / device) and list dates
     # period format: Ymd..Ymd, Ymd (single date), Ymd..now, HM..now
@@ -397,50 +369,27 @@ a {
         chunk_list.sort(reverse=True)
         for end, beg, key, devices in chunk_list:
             today, begdate, enddate = (time.strftime("%Y-%m-%d", time.localtime(t)) for t in (now, beg, end))
-            port = None
-            if key[0] == 'instrument':
-                ins = key[1]
-                port = instruments.get(ins)
-                left = ins.upper()
-            else:
-                left = key[1]  # shown in left column
             args = ['='.join(key)]
-            remote = None if port is None else f'http://{ins}.psi.ch:{port}'
-            history_only = bool(remote)
             if end > now:
                 if begdate == today:
                     daterange = f'since {time.strftime("%H:%M", time.localtime(beg))}'
                 else:
                     daterange = f'since {begdate}'
-                change_title('currently running')
+                if showtitle == 0:
+                    title('currently running')
+                    showtitle = 1
             else:
-                args.append(f'time={beg},{end}')
-                history_only = True
-                remote = None
                 daterange = begdate if begdate == enddate else f'{begdate}...{enddate}'
-                if end > now - ONEMONTH:
-                    change_title('recently running (history graphics only)')
-                else:
-                    change_title('older than 30 days')
-            if history_only:
-                args.append('hr=1')
+                if end < now - ONEMONTH:
+                    if showtitle == 1:
+                        title('older than 30 days')
+                        showtitle = 2
 
-            def link(label):
-                return f'<a href="/?{"&".join(args)}">{label}</a>'
-
-            label = " ".join(devices)
-            if remote:
-                prev.legend = '<td></td><td></td><td colspan=2>linse-c*: <i>history graphics only</i></td>'
-                out.append(f'<tr><td><a href="{remote}">{ins.upper()}</a></td>'
-                           f'<td>{label}</td><td>{link("linse-c*")}</td>')
-            else:
-                out.append(f'<tr><td>{link(left)}</td><td colspan=2>{label}</td>')
+            out.append(f'<tr><th><a href="/?{"&".join(args)}">{key[1]} / {" ".join(devices)}</a></th>')
             out.append(f'<td>{daterange}</td></tr>')
         if timerange:
             out.append(f'<h3><a href="/select_experiment?time=all">earlier dates</a></h3><br>')
-        out.append('</table>')
-
-        out.extend(['</body></html>', ''])
+        out.extend(['</table></body></html>', ''])
     except Exception as e:
         logging.error('%s', traceback.format_exc())
         circularlog.log()