release 2.0.3

Author: Sebastian

RTOC/RTLogger/DeviceFunctions.py

@@ -231,7 +231,7 @@ def getPluginParameter(self, name, parameter, *args):
                 return False
         except Exception:
             tb = traceback.format_exc()
-            logging.debug(tb)
+            logging.error(tb)
             logging.warning(
                 "PLUGIN FAILURE\nCould not get/set/call Plugin parameter/function'"+str(name)+"'\n")
             return False
@@ -249,28 +249,30 @@ def callPluginFunction(self, name, function, *args, **kwargs):
             kwargs (\*any): Keyworded parameters transmitted to the function
 
         Returns:
-            parameter (any): The value of the requested/setted parameter(s).
+            bool: True, if call was successfull
 
-            False, if any error occured, while trying to get/set parameter
+            parameter (any): The value of the requested/setted parameter(s).
         '''
         try:
             if name in self.pluginObjects.keys() and type(function) == str:
                 logging.debug(function)
                 logging.debug(name)
-                logging.debug(*args)
-                logging.debug(*kwargs)
+                # logging.debug(*args)
+                # logging.debug(*kwargs)
                 exec('self.func = self.pluginObjects["' +
                      name+'"].'+function)
-                return self.func(*args, **kwargs)
+
+                ans = self.func(*args, **kwargs)
+                return True, ans
             else:
                 logging.warning("Plugin "+name+" not found or started")
-                return False
+                return False, "Plugin "+name+" not found or started"
         except Exception:
             tb = traceback.format_exc()
-            logging.debug(tb)
+            logging.error(tb)
             logging.warning(
                 "PLUGIN FAILURE\nCould not get/set/call Plugin parameter/function'"+str(name)+"'\n")
-            return False
+            return False, tb
 
     def stopPlugin(self, name, remote=True):
         '''

RTOC/RTLogger/EventActionFunctions.py

@@ -143,7 +143,7 @@ def loadGlobalActions(self):
         Loads global actions from file and stores them in dict 'self.globalActions'
         """
         print('Loading global actions from file')
-        userpath = os.path.expanduser('~/.RTOC')
+        userpath = self.config['global']['documentfolder']
         if not os.path.exists(userpath):
             os.mkdir(userpath)
         if os.path.exists(userpath+"/globalActions.json"):

RTOC/RTLogger/RTLogger.py

@@ -84,7 +84,7 @@
         "token": "",
         "default_eventlevel": 0,
         "default_permission": 'blocked', # or 'read' or 'write' or 'admin'
-        "chat_ids": {},
+        # "chat_ids": {},
         "inlineMenu": False,
         "onlyAdmin": False
     },
@@ -103,6 +103,7 @@
         "autoOnClose": True,
         "loadOnOpen": True,
         "intervall": 240,
+        "resample": 0,
     },
 }
 
@@ -356,19 +357,20 @@ def _load_config(self):
 
         self.__config['global']['documentfolder'] = userpath
 
-        if type(self.__config['telegram']['chat_ids']) == list:
-            newdict = {}
-            for id in self.__config['telegram']['chat_ids']:
-                newdict[id] = self.__config['telegram']['eventlevel']
-            self.__config['telegram']['chat_ids'] = newdict
-            logging.warning('Telegram chat ids were saved as list, changed to dict.')
-        elif type(self.__config['telegram']['chat_ids']) == dict:
-            for id in self.__config['telegram']['chat_ids'].keys():
-                if type(self.__config['telegram']['chat_ids'][id]) == int:
-                    self.__config['telegram']['chat_ids'][id] = [
-                        self.__config['telegram']['chat_ids'][id], [[], []]]
-                    logging.warning(
-                        'Telegram chat ids were saved without shortcuts. Empty list added')
+        if 'chat_ids' in self.__config.keys():
+            if type(self.__config['telegram']['chat_ids']) == list:
+                newdict = {}
+                for id in self.__config['telegram']['chat_ids']:
+                    newdict[id] = self.__config['telegram']['eventlevel']
+                self.__config['telegram']['chat_ids'] = newdict
+                logging.warning('Telegram chat ids were saved as list, changed to dict.')
+            elif type(self.__config['telegram']['chat_ids']) == dict:
+                for id in self.__config['telegram']['chat_ids'].keys():
+                    if type(self.__config['telegram']['chat_ids'][id]) == int:
+                        self.__config['telegram']['chat_ids'][id] = [
+                            self.__config['telegram']['chat_ids'][id], [[], []]]
+                        logging.warning(
+                            'Telegram chat ids were saved without shortcuts. Empty list added')
 
         if type(self.__config['tcp']['knownHosts']) == list:
             newdict = {}

RTOC/RTLogger/RT_data.py

@@ -14,6 +14,7 @@
 import json
 import psutil
 import copy
+import gzip
 
 try:
     import xlsxwriter
@@ -955,10 +956,14 @@ def pushToDatabase(self):
                         newData[sigID][4] = localData[sigID][4]
                         newData[sigID][2] = list(localData[sigID][2])[int(idx):]
                         newData[sigID][3] = list(localData[sigID][3])[int(idx):]
+                        if self.logger.config['backup']['resample'] != 0:
+                            newData[sigID][2], newData[sigID][3] = resample(newData[sigID][2], newData[sigID][3], self.logger.config['backup']['resample'])
                         # new = True
                         break
             else:
                 newSignals[sigID] = localData[sigID]
+                if self.logger.config['backup']['resample'] != 0:
+                    newSignals[sigID][2], newSignals[sigID][3] = resample(newSignals[sigID][2], newSignals[sigID][3], self.logger.config['backup']['resample'])
             # if not new:
             #     popIDs.append(sigID)
 
@@ -1099,6 +1104,7 @@ def _commit(self, query):
                     logging.info("Error while execution+commit in PostgreSQL table")
                     logging.error(error)
                     logging.error(query)
+                    logging.error(traceback.format_exc())
                 ans = False
 
     def _getSQLSignalUnit(self, sigID):
@@ -1148,9 +1154,13 @@ def _SQLdeviceExists(self, devicename):
             sig = False
         return sig
 
-    def _SQLsignalExists(self, signalname):
+    def _SQLsignalExists(self, signalname, devicename):
+        if self._SQLdeviceExists(devicename):
+            devID = self._SQLgetDeviceID(devicename)
+        else:
+            return False
         existtest = "SELECT EXISTS (select ID from "+SIGNAL_TABLE_NAME + \
-            " where NAME = '"+str(signalname)+"');"
+            " where NAME = '"+str(signalname)+"' and DEVICE_ID = "+str(devID)+");"
         sig = self._execute_n_fetchall(existtest)
         if sig is not None and sig != []:
             sig = bool(sig[0][0])
@@ -1351,9 +1361,9 @@ def _SQLplotNewData(self, x, y, dataunit, devicename, signalname, createCallback
             logging.error('mergeY is NOT IMPLEMENTED YET for postgresql')
         else:
             sql = 'UPDATE '+SIGNAL_TABLE_NAME+' SET X = ARRAY' + \
-                str(x)+'::NUMERIC[] WHERE ID ='+str(sigID)+';'
+                str(list(x))+'::NUMERIC[] WHERE ID ='+str(sigID)+';'
             sql += '\nUPDATE '+SIGNAL_TABLE_NAME + \
-                ' SET Y = ARRAY'+str(y)+'::NUMERIC[] WHERE ID ='+str(sigID)+';'
+                ' SET Y = ARRAY'+str(list(y))+'::NUMERIC[] WHERE ID ='+str(sigID)+';'
             sql += '\nUPDATE '+SIGNAL_TABLE_NAME+' SET UNIT = \'' + \
                 str(dataunit)+'\' WHERE ID ='+str(sigID)+';'
         self._execute_n_commit(sql)
@@ -1362,8 +1372,13 @@ def _SQLplotNewData(self, x, y, dataunit, devicename, signalname, createCallback
     def _SQLExportCSV(self, filenamepart):
         filenames = []
         for table in [DEVICE_TABLE_NAME, SIGNAL_TABLE_NAME, EVENT_TABLE_NAME]:
-            filename = filenamepart+'_'+table+".csv"
-            sql = "COPY "+table+" TO '"+filename+"' DELIMITER ',' CSV HEADER;"
+            filename = filenamepart+'_'+table+".gz"
+            #sql = "COPY "+table+" TO '"+filename+"' DELIMITER ',' CSV HEADER;"
+            #ans = self._execute_n_fetchall(sql)
+            #print(ans)
+            with gzip.open(filename, 'wb') as gzip_file:
+                #cursor.copy_to(gzip_file, 'my_table')
+                self._cursor.copy_to(gzip_file, table, sep="|")
             filenames.append(filename)
         return filenames
 
@@ -1862,7 +1877,10 @@ def getSignalInfo(self, sigID, database=True):
                 xmax = max([xmaxLocal, xmax])
                 sigLen = max([sigLenLocal, sigLen])
 
-        return float(xmin), float(xmax), int(sigLen)
+        if xmin is None or xmax is None or sigLen is None:
+            return 0,0,0
+        else:
+            return float(xmin), float(xmax), int(sigLen)
 
     def removeSignal(self, sigID, xmin=None, xmax=None, database=False):
         """
@@ -2011,10 +2029,15 @@ def getSignal(self, sigID, xmin=None, xmax=None, database=False, maxN=None):
             if signal is None:
                 signal = signal_local
             else:
-                for idx, x in enumerate(signal_local[2]):
-                    if x > signal[2][-1]:
-                        signal[2] += list(signal_local[2])[idx:]
-                        signal[3] += list(signal_local[3])[idx:]
+                # for idx, x in enumerate(signal_local[2]):
+                #     if x > signal[2][-1]:
+                #         signal[2] += list(signal_local[2])[idx:]
+                #         signal[3] += list(signal_local[3])[idx:]
+                #         break
+                for idx, x in enumerate(signal[2]):
+                    if signal_local[2][0] < x:
+                        signal[2] = signal[2][:idx]+list(signal_local[2])
+                        signal[3] = signal[3][:idx]+list(signal_local[3])
                         break
 
         if signal is not None:
@@ -2167,12 +2190,14 @@ def resampleDatabase(self, samplerate):
             signals = {signal[0]: list(signal)[1:] for signal in signals}
 
             for sigID in signals.keys():
+                signals[sigID][0] = [float(i) for i in signals[sigID][0]]
+                signals[sigID][1] = [float(i) for i in signals[sigID][1]]
                 s = signals[sigID]
                 if len(s[0])>2:
                     xrange = s[0][-1]-s[0][0]
-                    n = samplerate*xrange
+                    n = samplerate*float(xrange)
                     if len(s[0]) == len(s[1]):
-                        x = np.linspace(s[0][0], s[0][-1], n)
+                        x = np.linspace(float(s[0][0]), float(s[0][-1]), n)
                         y = np.interp(x, s[0], s[1])
 
                         self._SQLplot(x=x, y=y, sigID=sigID)
@@ -2202,3 +2227,13 @@ def column(matrix, i):
         if i < len(row):
             ans.append(row[i])
     return ans
+
+
+def resample(x,y, samplerate):
+    # xlen = len(x)
+    xtime = x[-1]-x[0]
+    n = samplerate*xtime
+    x2 = np.linspace(x[0], x[-1], n)
+    y = np.interp(x2, x, y)
+
+    return list(x2), list(y)

RTOC/RTLogger/__main__.py

@@ -56,7 +56,7 @@ def main():
                     'RTOC.RTLogger [-h, -s, -l, -w]\n -h: Hilfe\n-s (--server) [COMMAND]: TCP-Server ohne GUI\n\t- start: Starts the RTOC-daemon\n\t- stop: Stops the RTOC-daemon\n\t- restart: Restarts the RTOC-daemon\n-w Startet RTLogger mit Website\n-p (--port): Starte TCP-Server auf anderem Port (Standart: 5050)\n-c (--config [OPTION=value]): Configure RTOC, type "-c list" to see all options')
                 sys.exit(0)
             elif opt == '-v':
-                logging.info("2.0.2")
+                logging.info("2.0.3")
             elif opt in ('-s', '--server'):
                 if os.name == 'nt':
                     logging.info(