Merge pull request #22 from avollkopf/development

Merge 4.0.0.57 from Development branch

Dockerfile

@@ -36,6 +36,11 @@ RUN python3 -m pip install --no-cache-dir --upgrade pip setuptools wheel
 COPY --chown=craftbeerpi ./requirements.txt /cbpi-src/
 RUN pip3 install --no-cache-dir -r /cbpi-src/requirements.txt
 
+# Install RPi.GPIO separately because it's excluded in setup.py for non-raspberrys.
+# This can enable GPIO support for the image when used on a raspberry pi and the
+# /dev/gpiomem device.
+RUN pip3 install --no-cache-dir RPi.GPIO==0.7.1a4
+
 FROM base as deploy
 # Install craftbeerpi from source
 COPY --chown=craftbeerpi . /cbpi-src

cbpi/__init__.py

@@ -1 +1 @@
-__version__ = "4.0.0.56"
+__version__ = "4.0.0.57"

cbpi/controller/actor_controller.py

@@ -9,7 +9,7 @@ class ActorController(BasicController):
         self.update_key = "actorupdate"
 
     async def on(self, id, power=None):
-        logging.info("Controller_power: {}".format(power))
+#        logging.info("Controller_power: {}".format(power))
         try:
             item = self.find_by_id(id)
             if power is None:

cbpi/controller/log_file_controller.py

@@ -6,6 +6,13 @@ from logging.handlers import RotatingFileHandler
 from time import strftime, localtime
 import pandas as pd
 import zipfile
+import base64
+import urllib3
+from cbpi.api import *
+from cbpi.api.config import ConfigType
+from cbpi.api.base import CBPiBase
+import asyncio
+
 
 class LogController:
 
@@ -16,11 +23,22 @@ class LogController:
         '''
         self.cbpi = cbpi
         self.logger = logging.getLogger(__name__)
-
+        self.configuration = False
         self.datalogger = {}
 
-    def log_data(self, name: str, value: str) -> None:
+#        self.cbpi.config.get does not seem to work here...
+#        self.influxdbaddr="192.168.163.105"
+#        self.influxdbport="8086"
+#        self.influxdbname="cbpi4"
+#        self.influxdburl='http://' + self.influxdbaddr + ':' + str(self.influxdbport) + '/write?db=' + self.influxdbname
+#        self.influxdbuser=""
+#        self.influxdbpwd=""
+#        self.base64string = base64.b64encode(('%s:%s' % (self.influxdbuser,self.influxdbpwd)).encode())
 
+    def log_data(self, name: str, value: str) -> None:
+        self.logfiles = self.cbpi.config.get("CSVLOGFILES", "Yes")
+        self.influxdb = self.cbpi.config.get("INFLUXDB", "No")
+        if self.logfiles == "Yes":
             if name not in self.datalogger:
                 max_bytes = self.cbpi.config.get("SENSOR_LOG_MAX_BYTES", 1048576)
                 backup_count = self.cbpi.config.get("SENSOR_LOG_BACKUP_COUNT", 3)
@@ -35,8 +53,31 @@ class LogController:
             formatted_time = strftime("%Y-%m-%d %H:%M:%S", localtime())
             self.datalogger[name].info("%s,%s" % (formatted_time, value))
 
-    async def get_data(self, names, sample_rate='60s'):
+        if self.influxdb == "Yes":
+            self.influxdb = self.cbpi.config.get("INFLUXDB", "No")
+            self.influxdbaddr = self.cbpi.config.get("INFLUXDBADDR", None)
+            self.influxdbport = self.cbpi.config.get("INFLUXDBPORT", None)
+            self.influxdbname = self.cbpi.config.get("INFLUXDBNAME", None)
+            self.influxdbuser = self.cbpi.config.get("INFLUXDBUSER", None)
+            self.influxdbpwd = self.cbpi.config.get("INFLUXDBPWD", None)
+            self.base64string = base64.b64encode(('%s:%s' % (self.influxdbuser,self.influxdbpwd)).encode())
+            self.influxdburl='http://' + self.influxdbaddr + ':' + str(self.influxdbport) + '/write?db=' + self.influxdbname
 
+
+            try:
+                sensor=self.cbpi.sensor.find_by_id(name)
+                sensorname=sensor.name.replace(" ", "_")
+                out="measurement,source=" + sensorname + "___" + name + " value="+str(value)
+                header = {'User-Agent': name, 'Content-Type': 'application/x-www-form-urlencoded','Authorization': 'Basic %s' % self.base64string.decode('utf-8')}
+                http = urllib3.PoolManager()
+                req = http.request('POST',self.influxdburl, body=out, headers = header)
+            except Exception as e:
+                logging.error("InfluxDB write Error: {}".format(e))
+
+
+
+    async def get_data(self, names, sample_rate='60s'):
+        logging.info("Start Log for {}".format(names))
         '''
         :param names: name as string or list of names as string
         :param sample_rate: rate for resampling the data
@@ -70,11 +111,11 @@ class LogController:
 
             # concat all logs
             df = pd.concat([pd.read_csv(f, parse_dates=True, date_parser=dateparse, index_col='DateTime', names=['DateTime', name], header=None) for f in all_filenames])
-
+            logging.info("Read all files for {}".format(names))
             # resample if rate provided
             if sample_rate is not None:
                 df = df[name].resample(sample_rate).max()
-
+            logging.info("Sampled now for {}".format(names))
             df = df.dropna()
             if result is None:
                 result = df
@@ -88,7 +129,7 @@ class LogController:
                 data[name] = result[name].interpolate(limit_direction='both', limit=10).tolist()
         else:
             data[name] = result.interpolate().tolist()
-
+        logging.info("Send Log for {}".format(names))
         return data
 
     async def get_data2(self, ids) -> dict:

cbpi/extension/ConfigUpdate/__init__.py

@@ -35,6 +35,15 @@ class ConfigUpdate(CBPiExtension):
         cooldown_step = self.cbpi.config.get("steps_cooldown", None)
         max_dashboard_number = self.cbpi.config.get("max_dashboard_number", None)
         current_dashboard_number = self.cbpi.config.get("current_dashboard_number", None)
+        logfiles = self.cbpi.config.get("CSVLOGFILES", None)
+        influxdb = self.cbpi.config.get("INFLUXDB", None)
+        influxdbaddr = self.cbpi.config.get("INFLUXDBADDR", None)
+        influxdbport = self.cbpi.config.get("INFLUXDBPORT", None)
+        influxdbname = self.cbpi.config.get("INFLUXDBNAME", None)
+        influxdbuser = self.cbpi.config.get("INFLUXDBUSER", None)
+        influxdbpwd = self.cbpi.config.get("INFLUXDBPWD", None)
+
+
 
         if boil_temp is None:
             logger.info("INIT Boil Temp Setting")
@@ -174,6 +183,65 @@ class ConfigUpdate(CBPiExtension):
             except:
                 logger.warning('Unable to update config')
 
+       ## Check if CSV logfiles is on config 
+        if logfiles is None:
+            logger.info("INIT CSV logfiles")
+            try:
+                await self.cbpi.config.add("CSVLOGFILES", "Yes", ConfigType.SELECT, "Write sensor data to csv logfiles", 
+                                                                                                [{"label": "Yes", "value": "Yes"},
+                                                                                                {"label": "No", "value": "No"}])
+            except:
+                logger.warning('Unable to update config')
+
+       ## Check if CSV logfiles is on config 
+        if influxdb is None:
+            logger.info("INIT Influxdb")
+            try:
+                await self.cbpi.config.add("INFLUXDB", "No", ConfigType.SELECT, "Write sensor data to influxdb", 
+                                                                                                [{"label": "Yes", "value": "Yes"},
+                                                                                                {"label": "No", "value": "No"}])
+            except:
+                logger.warning('Unable to update config')
+
+        ## Check if influxdbaddr is in config
+        if influxdbaddr is None:
+            logger.info("INIT Influxdbaddr")
+            try:
+                await self.cbpi.config.add("INFLUXDBADDR", "localhost", ConfigType.STRING, "IP Address of your influxdb server")
+            except:
+                logger.warning('Unable to update config')
+
+        ## Check if influxdbport is in config
+        if influxdbport is None:
+            logger.info("INIT Influxdbport")
+            try:
+                await self.cbpi.config.add("INFLUXDBPORT", "8086", ConfigType.STRING, "Port of your influxdb server")
+            except:
+                logger.warning('Unable to update config')
+
+        ## Check if influxdbname is in config
+        if influxdbname is None:
+            logger.info("INIT Influxdbname")
+            try:
+                await self.cbpi.config.add("INFLUXDBNAME", "cbpi4", ConfigType.STRING, "Name of your influxdb database name")
+            except:
+                logger.warning('Unable to update config')
+
+        ## Check if influxdber is in config
+        if influxdbuser is None:
+            logger.info("INIT Influxdbuser")
+            try:
+                await self.cbpi.config.add("INFLUXDBUSER", " ", ConfigType.STRING, "User name for your influxdb database (only if required)")
+            except:
+                logger.warning('Unable to update config')
+
+        ## Check if influxdber is in config
+        if influxdbpwd is None:
+            logger.info("INIT Influxdbpwd")
+            try:
+                await self.cbpi.config.add("INFLUXDBPWD", " ", ConfigType.STRING, "Password for your influxdb database (only if required)")
+            except:
+                logger.warning('Unable to update config')
 
 def setup(cbpi):
     cbpi.plugin.register("ConfigUpdate", ConfigUpdate)