From 7aecdac6a7f3afb8e868b553d8428c7f9b2ec5b4 Mon Sep 17 00:00:00 2001 From: avollkopf <43980694+avollkopf@users.noreply.github.com> Date: Mon, 13 Mar 2023 07:14:26 +0100 Subject: [PATCH 01/34] change in influxdb address requirements --- cbpi/__init__.py | 2 +- cbpi/controller/log_file_controller.py | 6 +++--- cbpi/extension/ConfigUpdate/__init__.py | 14 +++++++------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cbpi/__init__.py b/cbpi/__init__.py index 3e9f879..3f9f63d 100644 --- a/cbpi/__init__.py +++ b/cbpi/__init__.py @@ -1,3 +1,3 @@ -__version__ = "4.1.6" +__version__ = "4.1.7.a1" __codename__ = "Groundhog Day" diff --git a/cbpi/controller/log_file_controller.py b/cbpi/controller/log_file_controller.py index 1a93fb1..4a50604 100644 --- a/cbpi/controller/log_file_controller.py +++ b/cbpi/controller/log_file_controller.py @@ -49,7 +49,7 @@ class LogController: if self.influxdb == "Yes": self.influxdbcloud = self.cbpi.config.get("INFLUXDBCLOUD", "No") self.influxdbaddr = self.cbpi.config.get("INFLUXDBADDR", None) - self.influxdbport = self.cbpi.config.get("INFLUXDBPORT", 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) @@ -68,7 +68,7 @@ class LogController: logging.error("InfluxDB ID Error: {}".format(e)) if self.influxdbcloud == "Yes": - self.influxdburl="https://" + self.influxdbaddr + "/api/v2/write?org=" + self.influxdbuser + "&bucket=" + self.influxdbname + "&precision=s" + self.influxdburl=self.influxdbaddr + "/api/v2/write?org=" + self.influxdbuser + "&bucket=" + self.influxdbname + "&precision=s" try: header = {'User-Agent': name, 'Authorization': "Token {}".format(self.influxdbpwd)} http = urllib3.PoolManager() @@ -78,7 +78,7 @@ class LogController: else: self.base64string = base64.b64encode(('%s:%s' % (self.influxdbuser,self.influxdbpwd)).encode()) - self.influxdburl='http://' + self.influxdbaddr + ':' + str(self.influxdbport) + '/write?db=' + self.influxdbname + self.influxdburl= self.influxdbaddr + '/write?db=' + self.influxdbname try: header = {'User-Agent': name, 'Content-Type': 'application/x-www-form-urlencoded','Authorization': 'Basic %s' % self.base64string.decode('utf-8')} http = urllib3.PoolManager() diff --git a/cbpi/extension/ConfigUpdate/__init__.py b/cbpi/extension/ConfigUpdate/__init__.py index 3811dbd..c5700aa 100644 --- a/cbpi/extension/ConfigUpdate/__init__.py +++ b/cbpi/extension/ConfigUpdate/__init__.py @@ -40,7 +40,7 @@ class ConfigUpdate(CBPiExtension): 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) + #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) @@ -229,12 +229,12 @@ class ConfigUpdate(CBPiExtension): 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') + #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: From 03d1521c5e5ac6085ee6494f9bf0052234f9ab8b Mon Sep 17 00:00:00 2001 From: Maxim Strinzha Date: Sat, 18 Mar 2023 16:39:35 +0300 Subject: [PATCH 02/34] InfluxDB: support non-ASCII symbols in sensor names --- cbpi/controller/log_file_controller.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/cbpi/controller/log_file_controller.py b/cbpi/controller/log_file_controller.py index 4a50604..6c69c9d 100644 --- a/cbpi/controller/log_file_controller.py +++ b/cbpi/controller/log_file_controller.py @@ -57,12 +57,9 @@ class LogController: id = name try: - chars = {'ö':'oe','ä':'ae','ü':'ue','Ö':'Oe','Ä':'Ae','Ü':'Ue'} sensor=self.cbpi.sensor.find_by_id(name) if sensor is not None: itemname=sensor.name.replace(" ", "_") - for char in chars: - itemname = itemname.replace(char,chars[char]) out=str(self.influxdbmeasurement)+",source=" + itemname + ",itemID=" + str(id) + " value="+str(value) except Exception as e: logging.error("InfluxDB ID Error: {}".format(e)) @@ -82,7 +79,7 @@ class LogController: try: 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) + req = http.request('POST',self.influxdburl, body=out.encode(), headers = header) except Exception as e: logging.error("InfluxDB write Error: {}".format(e)) From f975eb7a4791751954f12ba5004cd90de4a57153 Mon Sep 17 00:00:00 2001 From: avollkopf <43980694+avollkopf@users.noreply.github.com> Date: Sat, 18 Mar 2023 16:05:13 +0100 Subject: [PATCH 03/34] added global settings parameter for buzzer sound in UI --- cbpi/__init__.py | 2 +- cbpi/extension/ConfigUpdate/__init__.py | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/cbpi/__init__.py b/cbpi/__init__.py index 3f9f63d..b46bc82 100644 --- a/cbpi/__init__.py +++ b/cbpi/__init__.py @@ -1,3 +1,3 @@ -__version__ = "4.1.7.a1" +__version__ = "4.1.7.a2" __codename__ = "Groundhog Day" diff --git a/cbpi/extension/ConfigUpdate/__init__.py b/cbpi/extension/ConfigUpdate/__init__.py index c5700aa..8135457 100644 --- a/cbpi/extension/ConfigUpdate/__init__.py +++ b/cbpi/extension/ConfigUpdate/__init__.py @@ -52,6 +52,7 @@ class ConfigUpdate(CBPiExtension): SENSOR_LOG_MAX_BYTES = self.cbpi.config.get("SENSOR_LOG_MAX_BYTES", None) slow_pipe_animation = self.cbpi.config.get("slow_pipe_animation", None) NOTIFY_ON_ERROR = self.cbpi.config.get("NOTIFY_ON_ERROR", None) + PLAY_BUZZER = self.cbpi.config.get("PLAY_BUZZER", None) BoilAutoTimer = self.cbpi.config.get("BoilAutoTimer", None) @@ -336,6 +337,16 @@ class ConfigUpdate(CBPiExtension): except: logger.warning('Unable to update config') + ## Check if PLAY_BUZZER is in config + if PLAY_BUZZER is None: + logger.info("INIT PLAY_BUZZER") + try: + await self.cbpi.config.add("PLAY_BUZZER", "No", ConfigType.SELECT, "Play buzzer sound in Web interface on Notifications", + [{"label": "Yes", "value": "Yes"}, + {"label": "No", "value": "No"}]) + except: + logger.warning('Unable to update config') + if BoilAutoTimer is None: logging.info("INIT BoilAutoTimer") try: From c59931dfc1ad291e582c3a7de634550592e60d98 Mon Sep 17 00:00:00 2001 From: Maxim Strinzha Date: Sun, 19 Mar 2023 16:10:01 +0300 Subject: [PATCH 04/34] InfluxDB: support non-ASCII symbols in sensor names. Fix for InfluxDB Cloud --- cbpi/controller/log_file_controller.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cbpi/controller/log_file_controller.py b/cbpi/controller/log_file_controller.py index 6c69c9d..59da525 100644 --- a/cbpi/controller/log_file_controller.py +++ b/cbpi/controller/log_file_controller.py @@ -69,7 +69,7 @@ class LogController: try: header = {'User-Agent': name, 'Authorization': "Token {}".format(self.influxdbpwd)} http = urllib3.PoolManager() - req = http.request('POST',self.influxdburl, body=out, headers = header) + req = http.request('POST',self.influxdburl, body=out.encode(), headers = header) except Exception as e: logging.error("InfluxDB cloud write Error: {}".format(e)) From 15b275b22e0db7244a8f48030f0960c581caf24a Mon Sep 17 00:00:00 2001 From: Maxim Strinzha Date: Tue, 21 Mar 2023 22:58:35 +0300 Subject: [PATCH 05/34] Setup default ULR for influxdb --- cbpi/extension/ConfigUpdate/__init__.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/cbpi/extension/ConfigUpdate/__init__.py b/cbpi/extension/ConfigUpdate/__init__.py index c5700aa..53fb369 100644 --- a/cbpi/extension/ConfigUpdate/__init__.py +++ b/cbpi/extension/ConfigUpdate/__init__.py @@ -224,18 +224,10 @@ class ConfigUpdate(CBPiExtension): if influxdbaddr is None: logger.info("INIT Influxdbaddr") try: - await self.cbpi.config.add("INFLUXDBADDR", "localhost", ConfigType.STRING, "IP Address of your influxdb server (If INFLUXDBCLOUD set to Yes use URL Address of your influxdb cloud server)") + await self.cbpi.config.add("INFLUXDBADDR", "http://localhost:8086", ConfigType.STRING, "URL Address of your influxdb server (If INFLUXDBCLOUD set to Yes use URL Address of your influxdb cloud 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") From ec1f79d7a12fa77b452f10ba65c5df067031cf12 Mon Sep 17 00:00:00 2001 From: Alexander Vollkopf <43980694+avollkopf@users.noreply.github.com> Date: Fri, 24 Mar 2023 07:08:57 +0100 Subject: [PATCH 06/34] Bump revision Bump to 4.1.7.a3 due to the last PR (Influxdb handling of non-ASCII symbols) --- cbpi/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cbpi/__init__.py b/cbpi/__init__.py index b46bc82..befcd63 100644 --- a/cbpi/__init__.py +++ b/cbpi/__init__.py @@ -1,3 +1,3 @@ -__version__ = "4.1.7.a2" +__version__ = "4.1.7.a3" __codename__ = "Groundhog Day" From c4333d2cabcfc1e3701f0d6e388826b82ed51995 Mon Sep 17 00:00:00 2001 From: avollkopf <43980694+avollkopf@users.noreply.github.com> Date: Fri, 24 Mar 2023 18:10:20 +0100 Subject: [PATCH 07/34] change cryptography version to 40 (fix security issue). Tested with raspbian 32 and 64 bit versions --- cbpi/__init__.py | 2 +- requirements.txt | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cbpi/__init__.py b/cbpi/__init__.py index befcd63..e16d0c4 100644 --- a/cbpi/__init__.py +++ b/cbpi/__init__.py @@ -1,3 +1,3 @@ -__version__ = "4.1.7.a3" +__version__ = "4.1.7.a4" __codename__ = "Groundhog Day" diff --git a/requirements.txt b/requirements.txt index 9bcb800..bce7636 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,7 @@ aiohttp-session==2.12.0 aiohttp-swagger==1.0.16 aiojobs==1.1.0 aiosqlite==0.17.0 -cryptography==36.0.1 +cryptography==40.0.0 requests==2.28.1 voluptuous==0.13.1 pyfiglet==0.8.post1 diff --git a/setup.py b/setup.py index 5e32bee..4b173cc 100644 --- a/setup.py +++ b/setup.py @@ -47,7 +47,7 @@ setup(name='cbpi4', "aiohttp-swagger==1.0.16", "aiojobs==1.1.0 ", "aiosqlite==0.17.0", - "cryptography==36.0.1", + "cryptography==40.0.0", "requests==2.28.1", "voluptuous==0.13.1", "pyfiglet==0.8.post1", From 9a8b0ca30f00e93f355b1489dc560c086c5f116d Mon Sep 17 00:00:00 2001 From: avollkopf <43980694+avollkopf@users.noreply.github.com> Date: Fri, 24 Mar 2023 18:58:35 +0100 Subject: [PATCH 08/34] separate influxdb write to async routine (test) --- cbpi/__init__.py | 2 +- cbpi/controller/log_file_controller.py | 14 +++++++++----- cbpi4.egg-info/PKG-INFO | 12 ++++++------ cbpi4.egg-info/SOURCES.txt | 4 ++++ cbpi4.egg-info/requires.txt | 2 +- 5 files changed, 21 insertions(+), 13 deletions(-) diff --git a/cbpi/__init__.py b/cbpi/__init__.py index e16d0c4..eeae0a9 100644 --- a/cbpi/__init__.py +++ b/cbpi/__init__.py @@ -1,3 +1,3 @@ -__version__ = "4.1.7.a4" +__version__ = "4.1.7.a5" __codename__ = "Groundhog Day" diff --git a/cbpi/controller/log_file_controller.py b/cbpi/controller/log_file_controller.py index 59da525..c752216 100644 --- a/cbpi/controller/log_file_controller.py +++ b/cbpi/controller/log_file_controller.py @@ -7,7 +7,7 @@ from time import strftime, localtime import pandas as pd import zipfile import base64 -import urllib3 +from urllib3 import Timeout, PoolManager from pathlib import Path from cbpi.api import * from cbpi.api.config import ConfigType @@ -46,16 +46,20 @@ class LogController: formatted_time = strftime("%Y-%m-%d %H:%M:%S", localtime()) self.datalogger[name].info("%s,%s" % (formatted_time, str(value))) + if self.influxdb == "Yes": + ## Write to influxdb in an asyncio task + self._task = asyncio.create_task(self.log_influx(name,value)) + + async def log_influx(self, name:str, value:str): self.influxdbcloud = self.cbpi.config.get("INFLUXDBCLOUD", "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.influxdbmeasurement = self.cbpi.config.get("INFLUXDBMEASUREMENT", "measurement") - id = name + timeout = Timeout(connect=5.0, read=None) try: sensor=self.cbpi.sensor.find_by_id(name) if sensor is not None: @@ -68,7 +72,7 @@ class LogController: self.influxdburl=self.influxdbaddr + "/api/v2/write?org=" + self.influxdbuser + "&bucket=" + self.influxdbname + "&precision=s" try: header = {'User-Agent': name, 'Authorization': "Token {}".format(self.influxdbpwd)} - http = urllib3.PoolManager() + http = PoolManager(timeout=timeout) req = http.request('POST',self.influxdburl, body=out.encode(), headers = header) except Exception as e: logging.error("InfluxDB cloud write Error: {}".format(e)) @@ -78,7 +82,7 @@ class LogController: self.influxdburl= self.influxdbaddr + '/write?db=' + self.influxdbname try: header = {'User-Agent': name, 'Content-Type': 'application/x-www-form-urlencoded','Authorization': 'Basic %s' % self.base64string.decode('utf-8')} - http = urllib3.PoolManager() + http = PoolManager(timeout=timeout) req = http.request('POST',self.influxdburl, body=out.encode(), headers = header) except Exception as e: logging.error("InfluxDB write Error: {}".format(e)) diff --git a/cbpi4.egg-info/PKG-INFO b/cbpi4.egg-info/PKG-INFO index acea7b7..e37f3a2 100644 --- a/cbpi4.egg-info/PKG-INFO +++ b/cbpi4.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: cbpi4 -Version: 4.1.2 +Version: 4.1.7a4 Summary: CraftBeerPi4 Brewing Software Home-page: http://web.craftbeerpi.com Author: Manuel Fritsch / Alexander Vollkopf @@ -14,14 +14,14 @@ License-File: LICENSE # CraftBeerPi 4 -[![Build](https://github.com/avollkopf/craftbeerpi4/actions/workflows/build.yml/badge.svg)](https://github.com/avollkopf/craftbeerpi4/actions/workflows/build.yml) -[![GitHub license](https://img.shields.io/github/license/avollkopf/craftbeerpi4)](https://github.com/avollkopf/craftbeerpi4/blob/master/LICENSE) -![GitHub issues](https://img.shields.io/github/issues-raw/avollkopf/craftbeerpi4) +[![Build](https://github.com/PiBrewing/craftbeerpi4/actions/workflows/build.yml/badge.svg)](https://github.com/PiBrewing/craftbeerpi4/actions/workflows/build.yml) +[![GitHub license](https://img.shields.io/github/license/PiBrewing/craftbeerpi4)](https://github.com/PiBrewing/craftbeerpi4/blob/master/LICENSE) +![GitHub issues](https://img.shields.io/github/issues-raw/PiBrewing/craftbeerpi4) ![PyPI](https://img.shields.io/pypi/v/cbpi4) ![Happy Brewing](https://img.shields.io/badge/CraftBeerPi%204-Happy%20Brewing-%23FBB117)

- CraftBeerPi Logo + CraftBeerPi Logo

CraftBeerPi 4 is an open source software solution to control the brewing and @@ -50,6 +50,6 @@ For a more detailed description of a development setup without the _development ### Contributors Thanks to all the people who have contributed -[![contributors](https://contributors-img.web.app/image?repo=avollkopf/craftbeerpi4)](https://github.com/avollkopf/craftbeerpi4/graphs/contributors) +[![contributors](https://contributors-img.web.app/image?repo=PiBrewing/craftbeerpi4)](https://github.com/PiBrewing/craftbeerpi4/graphs/contributors) diff --git a/cbpi4.egg-info/SOURCES.txt b/cbpi4.egg-info/SOURCES.txt index 001e06e..93caa9c 100644 --- a/cbpi4.egg-info/SOURCES.txt +++ b/cbpi4.egg-info/SOURCES.txt @@ -158,6 +158,10 @@ cbpi/extension/onewire/__pycache__/__init__.cpython-310.pyc cbpi/extension/onewire/__pycache__/__init__.cpython-311.pyc cbpi/extension/onewire/__pycache__/__init__.cpython-37.pyc cbpi/extension/onewire/__pycache__/__init__.cpython-39.pyc +cbpi/extension/timer/__init__.py +cbpi/extension/timer/config.yaml +cbpi/extension/timer/__pycache__/__init__.cpython-311.pyc +cbpi/extension/timer/__pycache__/__init__.cpython-39.pyc cbpi/http_endpoints/__init__.py cbpi/http_endpoints/http_actor.py cbpi/http_endpoints/http_config.py diff --git a/cbpi4.egg-info/requires.txt b/cbpi4.egg-info/requires.txt index 347a698..337e19f 100644 --- a/cbpi4.egg-info/requires.txt +++ b/cbpi4.egg-info/requires.txt @@ -7,7 +7,7 @@ aiohttp-session==2.12.0 aiohttp-swagger==1.0.16 aiojobs==1.1.0 aiosqlite==0.17.0 -cryptography==36.0.1 +cryptography==40.0.0 requests==2.28.1 voluptuous==0.13.1 pyfiglet==0.8.post1 From 2aa2ef71ba4625278e7e95baaaff6027747dde7e Mon Sep 17 00:00:00 2001 From: avollkopf <43980694+avollkopf@users.noreply.github.com> Date: Sat, 25 Mar 2023 10:56:42 +0100 Subject: [PATCH 09/34] mqttsensor with reduced logging freqency option on inactive fermenter or kettle --- cbpi/__init__.py | 2 +- cbpi/extension/mqtt_sensor/__init__.py | 64 ++++++++++++++++++++++++-- 2 files changed, 62 insertions(+), 4 deletions(-) diff --git a/cbpi/__init__.py b/cbpi/__init__.py index eeae0a9..87f2a9d 100644 --- a/cbpi/__init__.py +++ b/cbpi/__init__.py @@ -1,3 +1,3 @@ -__version__ = "4.1.7.a5" +__version__ = "4.1.7.a6" __codename__ = "Groundhog Day" diff --git a/cbpi/extension/mqtt_sensor/__init__.py b/cbpi/extension/mqtt_sensor/__init__.py index c50a776..7ece8ce 100644 --- a/cbpi/extension/mqtt_sensor/__init__.py +++ b/cbpi/extension/mqtt_sensor/__init__.py @@ -11,7 +11,10 @@ from datetime import datetime @parameters([Property.Text(label="Topic", configurable=True, description="MQTT Topic"), Property.Text(label="PayloadDictionary", configurable=True, default_value="", description="Where to find msg in payload, leave blank for raw payload"), - Property.Number(label="Timeout", configurable="True",unit="sec", + Property.Kettle(label="Kettle", description="Reduced logging if Kettle is inactive (only Kettle or Fermenter to be selected)"), + Property.Fermenter(label="Fermenter", description="Reduced logging in seconds if Fermenter is inactive (only Kettle or Fermenter to be selected)"), + Property.Number(label="ReducedLogging", configurable=True, description="Reduced logging frequency in seconds if selected Kettle or Fermenter is inactive (default is 60 sec)"), + Property.Number(label="Timeout", configurable=True, unit="sec", description="Timeout in seconds to send notification (default:60 | deactivated: 0)")]) class MQTTSensor(CBPiSensor): @@ -28,7 +31,21 @@ class MQTTSensor(CBPiSensor): self.notificationsend = False self.nextchecktime=self.starttime+self.timeout self.lastdata=time.time() + self.lastlog=0 self.sensor=self.get_sensor(self.id) + self.reducedfrequency=int(self.props.get("ReducedLogging", 60)) + + self.kettleid=self.props.get("Kettle", None) + self.reducedlogging=True + self.fermenterid=self.props.get("Fermenter", None) + + if self.kettleid is not None and self.fermenterid is not None: + self.reducedlogging=False + self.cbpi.notify("MQTTSensor", "Sensor '" + str(self.sensor.name) + "' cant't have Fermenter and Kettle defined for reduced logging.", NotificationType.WARNING, action=[NotificationAction("OK", self.Confirm)]) + + self.kettle = self.get_kettle(self.kettleid) if self.kettleid is not None else None + self.fermenter = self.get_fermenter(self.fermenterid) if self.fermenterid is not None else None + async def Confirm(self, **kwargs): self.nextchecktime = time.time() + self.timeout @@ -49,14 +66,55 @@ class MQTTSensor(CBPiSensor): if isinstance(val, (int, float, str)): self.value = float(val) - self.log_data(self.value) self.push_update(self.value) + if self.reducedlogging: + await self.logvalue() + else: + self.log_data(self.value) + self.lastlog = time.time() + if self.timeout !=0: self.nextchecktime = time.time() + self.timeout self.notificationsend = False self.lastdata=time.time() except Exception as e: - logging.info("MQTT Sensor Error {}".format(e)) + logging.error("MQTT Sensor Error {}".format(e)) + + async def logvalue(self): + now=time.time() + if self.kettle is not None: + try: + kettlestatus=self.kettle.instance.state + except: + kettlestatus=False + if kettlestatus: + self.log_data(self.value) + logging.info("Kettle Active") + self.lastlog = time.time() + else: + logging.info("Kettle Inactive") + if now >= self.lastlog + self.reducedfrequency: + self.log_data(self.value) + self.lastlog = time.time() + logging.info("Logged with reduced freqency") + pass + + if self.fermenter is not None: + try: + fermenterstatus=self.fermenter.instance.state + except: + fermenterstatus=False + if fermenterstatus: + self.log_data(self.value) + logging.info("Fermenter Active") + self.lastlog = time.time() + else: + logging.info("Fermenter Inactive") + if now >= self.lastlog + self.reducedfrequency: + self.log_data(self.value) + self.lastlog = time.time() + logging.info("Logged with reduced freqency") + pass async def run(self): while self.running: From 88528f6df717dbbb186c8203619adbb8fa3958a4 Mon Sep 17 00:00:00 2001 From: avollkopf <43980694+avollkopf@users.noreply.github.com> Date: Sat, 25 Mar 2023 11:30:38 +0100 Subject: [PATCH 10/34] added reduced logging fucntionality to onewire sensor (depeding on kettle or fermenter activity) --- cbpi/extension/onewire/__init__.py | 90 +++++++++++++++++++++++++----- 1 file changed, 77 insertions(+), 13 deletions(-) diff --git a/cbpi/extension/onewire/__init__.py b/cbpi/extension/onewire/__init__.py index 0191354..2be943f 100644 --- a/cbpi/extension/onewire/__init__.py +++ b/cbpi/extension/onewire/__init__.py @@ -1,13 +1,11 @@ # -*- coding: utf-8 -*- import asyncio -import random -import re -import random +import logging from aiohttp import web from cbpi.api import * -import os, re, threading, time +import os, threading, time from subprocess import call -import random +from cbpi.api.dataclasses import NotificationAction, NotificationType def getSensors(): try: @@ -53,7 +51,11 @@ class ReadThread (threading.Thread): @parameters([Property.Select(label="Sensor", options=getSensors()), Property.Number(label="offset",configurable = True, default_value = 0, description="Sensor Offset (Default is 0)"), - Property.Select(label="Interval", options=[1,5,10,30,60], description="Interval in Seconds")]) + Property.Select(label="Interval", options=[1,5,10,30,60], description="Interval in Seconds"), + Property.Kettle(label="Kettle", description="Reduced logging if Kettle is inactive (only Kettle or Fermenter to be selected)"), + Property.Fermenter(label="Fermenter", description="Reduced logging in seconds if Fermenter is inactive (only Kettle or Fermenter to be selected)"), + Property.Number(label="ReducedLogging", configurable=True, description="Reduced logging frequency in seconds if selected Kettle or Fermenter is inactive (default is 60 sec)") + ]) class OneWire(CBPiSensor): def __init__(self, cbpi, id, props): @@ -63,15 +65,37 @@ class OneWire(CBPiSensor): async def start(self): await super().start() self.name = self.props.get("Sensor") - self.interval = self.props.get("Interval", 60) + self.interval = int(self.props.get("Interval", 60)) self.offset = float(self.props.get("offset",0)) + self.lastlog=0 + self.sensor=self.get_sensor(self.id) + self.reducedfrequency=int(self.props.get("ReducedLogging", 60)) + + self.kettleid=self.props.get("Kettle", None) + self.reducedlogging=True + self.fermenterid=self.props.get("Fermenter", None) + + if self.kettleid is not None and self.fermenterid is not None: + self.reducedlogging=False + self.cbpi.notify("OneWire Sensor", "Sensor '" + str(self.sensor.name) + "' cant't have Fermenter and Kettle defined for reduced logging.", NotificationType.WARNING, action=[NotificationAction("OK", self.Confirm)]) + if self.interval >= self.reducedfrequency: + self.reducedlogging=False + self.cbpi.notify("OneWire Sensor", "Sensor '" + str(self.sensor.name) + "' has shorter or equal 'reduced logging' compared to regular interval.", NotificationType.WARNING, action=[NotificationAction("OK", self.Confirm)]) + + self.kettle = self.get_kettle(self.kettleid) if self.kettleid is not None else None + self.fermenter = self.get_fermenter(self.fermenterid) if self.fermenterid is not None else None + self.t = ReadThread(self.name) self.t.daemon = True - def shudown(): - shudown.cb.shutdown() - shudown.cb = self.t + def shutdown(): + shutdown.cb.shutdown() + shutdown.cb = self.t self.t.start() + + + async def Confirm(self, **kwargs): + pass async def stop(self): try: @@ -86,11 +110,51 @@ class OneWire(CBPiSensor): if self.TEMP_UNIT == "C": # Report temp in C if nothing else is selected in settings self.value = round((self.t.value + self.offset),2) else: # Report temp in F if unit selected in settings - self.value = round((9.0 / 5.0 * self.t.value + 32 + self.offset), 2) - - self.log_data(self.value) + self.value = round((9.0 / 5.0 * self.t.value + 32 + self.offset), 2) self.push_update(self.value) + if self.reducedlogging: + await self.logvalue() + else: + self.log_data(self.value) + self.lastlog = time.time() await asyncio.sleep(self.interval) + + async def logvalue(self): + now=time.time() + if self.kettle is not None: + try: + kettlestatus=self.kettle.instance.state + except: + kettlestatus=False + if kettlestatus: + self.log_data(self.value) + logging.info("Kettle Active") + self.lastlog = time.time() + else: + logging.info("Kettle Inactive") + if now >= self.lastlog + self.reducedfrequency: + self.log_data(self.value) + self.lastlog = time.time() + logging.info("Logged with reduced freqency") + pass + + if self.fermenter is not None: + try: + fermenterstatus=self.fermenter.instance.state + except: + fermenterstatus=False + if fermenterstatus: + self.log_data(self.value) + logging.info("Fermenter Active") + self.lastlog = time.time() + else: + logging.info("Fermenter Inactive") + if now >= self.lastlog + self.reducedfrequency: + self.log_data(self.value) + self.lastlog = time.time() + logging.info("Logged with reduced freqency") + pass + def get_state(self): return dict(value=self.value) From 5bc5259bc38366c3be18d52633691698d5bb5ef4 Mon Sep 17 00:00:00 2001 From: avollkopf <43980694+avollkopf@users.noreply.github.com> Date: Sat, 25 Mar 2023 11:56:01 +0100 Subject: [PATCH 11/34] added reduced logging functionality to httpsensor --- cbpi/__init__.py | 2 +- cbpi/extension/httpsensor/__init__.py | 66 +++++++++++++++++++++++++-- 2 files changed, 64 insertions(+), 4 deletions(-) diff --git a/cbpi/__init__.py b/cbpi/__init__.py index 87f2a9d..62c453c 100644 --- a/cbpi/__init__.py +++ b/cbpi/__init__.py @@ -1,3 +1,3 @@ -__version__ = "4.1.7.a6" +__version__ = "4.1.7.a7" __codename__ = "Groundhog Day" diff --git a/cbpi/extension/httpsensor/__init__.py b/cbpi/extension/httpsensor/__init__.py index 0abd2a4..0ff1443 100644 --- a/cbpi/extension/httpsensor/__init__.py +++ b/cbpi/extension/httpsensor/__init__.py @@ -11,8 +11,11 @@ from cbpi.api.dataclasses import NotificationAction, NotificationType cache = {} @parameters([Property.Text(label="Key", configurable=True, description="Http Key"), - Property.Number(label="Timeout", configurable="True",unit="sec",description="Timeout in seconds to send notification (default:60 | deactivated: 0)") -]) + Property.Number(label="Timeout", configurable="True",unit="sec",description="Timeout in seconds to send notification (default:60 | deactivated: 0)"), + Property.Kettle(label="Kettle", description="Reduced logging if Kettle is inactive (only Kettle or Fermenter to be selected)"), + Property.Fermenter(label="Fermenter", description="Reduced logging in seconds if Fermenter is inactive (only Kettle or Fermenter to be selected)"), + Property.Number(label="ReducedLogging", configurable=True, description="Reduced logging frequency in seconds if selected Kettle or Fermenter is inactive (default is 60 sec)")]) + class HTTPSensor(CBPiSensor): def __init__(self, cbpi, id, props): super(HTTPSensor, self).__init__(cbpi, id, props) @@ -25,6 +28,21 @@ class HTTPSensor(CBPiSensor): self.sensor=self.get_sensor(self.id) self.lastdata=time.time() + self.lastlog=0 + self.reducedfrequency=int(self.props.get("ReducedLogging", 60)) + + self.kettleid=self.props.get("Kettle", None) + self.reducedlogging=True + self.fermenterid=self.props.get("Fermenter", None) + + if self.kettleid is not None and self.fermenterid is not None: + self.reducedlogging=False + self.cbpi.notify("HTTPSensor", "Sensor '" + str(self.sensor.name) + "' cant't have Fermenter and Kettle defined for reduced logging.", NotificationType.WARNING, action=[NotificationAction("OK", self.Confirm)]) + + self.kettle = self.get_kettle(self.kettleid) if self.kettleid is not None else None + self.fermenter = self.get_fermenter(self.fermenterid) if self.fermenterid is not None else None + + async def Confirm(self, **kwargs): self.nextchecktime = time.time() + self.timeout self.notificationsend = False @@ -51,6 +69,13 @@ class HTTPSensor(CBPiSensor): if cache_value is not None: self.value = float(cache_value) self.push_update(self.value) + + if self.reducedlogging: + await self.logvalue() + else: + self.log_data(self.value) + self.lastlog = time.time() + if self.timeout !=0: self.nextchecktime = currenttime + self.timeout self.notificationsend = False @@ -60,13 +85,48 @@ class HTTPSensor(CBPiSensor): pass await asyncio.sleep(1) + async def logvalue(self): + now=time.time() + if self.kettle is not None: + try: + kettlestatus=self.kettle.instance.state + except: + kettlestatus=False + if kettlestatus: + self.log_data(self.value) + logging.info("Kettle Active") + self.lastlog = time.time() + else: + logging.info("Kettle Inactive") + if now >= self.lastlog + self.reducedfrequency: + self.log_data(self.value) + self.lastlog = time.time() + logging.info("Logged with reduced freqency") + pass + + if self.fermenter is not None: + try: + fermenterstatus=self.fermenter.instance.state + except: + fermenterstatus=False + if fermenterstatus: + self.log_data(self.value) + logging.info("Fermenter Active") + self.lastlog = time.time() + else: + logging.info("Fermenter Inactive") + if now >= self.lastlog + self.reducedfrequency: + self.log_data(self.value) + self.lastlog = time.time() + logging.info("Logged with reduced freqency") + pass + def get_state(self): # return the current state of the sensor return dict(value=self.value) class HTTPSensorEndpoint(CBPiExtension): - def __init__(self, cbpi): ''' Initializer From 9257b95e370b4755d85d6e288ded06ba650a72c8 Mon Sep 17 00:00:00 2001 From: avollkopf <43980694+avollkopf@users.noreply.github.com> Date: Sat, 25 Mar 2023 12:44:28 +0100 Subject: [PATCH 12/34] additional logging info --- cbpi/__init__.py | 2 +- cbpi/extension/mqtt_sensor/__init__.py | 8 ++++---- cbpi/extension/onewire/__init__.py | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cbpi/__init__.py b/cbpi/__init__.py index 62c453c..6375379 100644 --- a/cbpi/__init__.py +++ b/cbpi/__init__.py @@ -1,3 +1,3 @@ -__version__ = "4.1.7.a7" +__version__ = "4.1.7.a8" __codename__ = "Groundhog Day" diff --git a/cbpi/extension/mqtt_sensor/__init__.py b/cbpi/extension/mqtt_sensor/__init__.py index 7ece8ce..c42de5a 100644 --- a/cbpi/extension/mqtt_sensor/__init__.py +++ b/cbpi/extension/mqtt_sensor/__init__.py @@ -89,10 +89,10 @@ class MQTTSensor(CBPiSensor): kettlestatus=False if kettlestatus: self.log_data(self.value) - logging.info("Kettle Active") + logging.info("MQTTSensor {} Kettle Active".format(self.sensor.name)) self.lastlog = time.time() else: - logging.info("Kettle Inactive") + logging.info("MQTTSensor {} Kettle Inactive".format(self.sensor.name)) if now >= self.lastlog + self.reducedfrequency: self.log_data(self.value) self.lastlog = time.time() @@ -106,10 +106,10 @@ class MQTTSensor(CBPiSensor): fermenterstatus=False if fermenterstatus: self.log_data(self.value) - logging.info("Fermenter Active") + logging.info("MQTTSensor {} Fermenter Active".format(self.sensor.name)) self.lastlog = time.time() else: - logging.info("Fermenter Inactive") + logging.info("MQTTSensor {} Fermenter Inactive".format(self.sensor.name)) if now >= self.lastlog + self.reducedfrequency: self.log_data(self.value) self.lastlog = time.time() diff --git a/cbpi/extension/onewire/__init__.py b/cbpi/extension/onewire/__init__.py index 2be943f..622cf82 100644 --- a/cbpi/extension/onewire/__init__.py +++ b/cbpi/extension/onewire/__init__.py @@ -128,10 +128,10 @@ class OneWire(CBPiSensor): kettlestatus=False if kettlestatus: self.log_data(self.value) - logging.info("Kettle Active") + logging.info("OneWire {} Kettle Active".format(self.sensor.name)) self.lastlog = time.time() else: - logging.info("Kettle Inactive") + logging.info("OneWire {} Kettle Inactive".format(self.sensor.name)) if now >= self.lastlog + self.reducedfrequency: self.log_data(self.value) self.lastlog = time.time() @@ -145,10 +145,10 @@ class OneWire(CBPiSensor): fermenterstatus=False if fermenterstatus: self.log_data(self.value) - logging.info("Fermenter Active") + logging.info("OneWire {} Fermenter Active".format(self.sensor.name)) self.lastlog = time.time() else: - logging.info("Fermenter Inactive") + logging.info("OneWire {} Fermenter Inactive".format(self.sensor.name)) if now >= self.lastlog + self.reducedfrequency: self.log_data(self.value) self.lastlog = time.time() From a8ec65b3e47069a2e3aff582857cfad9d4d5e1e0 Mon Sep 17 00:00:00 2001 From: avollkopf <43980694+avollkopf@users.noreply.github.com> Date: Sat, 25 Mar 2023 12:56:37 +0100 Subject: [PATCH 13/34] update --- cbpi/__init__.py | 2 +- cbpi/extension/mqtt_sensor/__init__.py | 3 +-- cbpi/extension/onewire/__init__.py | 3 ++- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cbpi/__init__.py b/cbpi/__init__.py index 6375379..50436a0 100644 --- a/cbpi/__init__.py +++ b/cbpi/__init__.py @@ -1,3 +1,3 @@ -__version__ = "4.1.7.a8" +__version__ = "4.1.7.a9" __codename__ = "Groundhog Day" diff --git a/cbpi/extension/mqtt_sensor/__init__.py b/cbpi/extension/mqtt_sensor/__init__.py index c42de5a..b654e05 100644 --- a/cbpi/extension/mqtt_sensor/__init__.py +++ b/cbpi/extension/mqtt_sensor/__init__.py @@ -34,10 +34,9 @@ class MQTTSensor(CBPiSensor): self.lastlog=0 self.sensor=self.get_sensor(self.id) self.reducedfrequency=int(self.props.get("ReducedLogging", 60)) - self.kettleid=self.props.get("Kettle", None) - self.reducedlogging=True self.fermenterid=self.props.get("Fermenter", None) + self.reducedlogging=True if self.kettleid or self.fermenterid else False if self.kettleid is not None and self.fermenterid is not None: self.reducedlogging=False diff --git a/cbpi/extension/onewire/__init__.py b/cbpi/extension/onewire/__init__.py index 622cf82..ba42137 100644 --- a/cbpi/extension/onewire/__init__.py +++ b/cbpi/extension/onewire/__init__.py @@ -72,8 +72,8 @@ class OneWire(CBPiSensor): self.reducedfrequency=int(self.props.get("ReducedLogging", 60)) self.kettleid=self.props.get("Kettle", None) - self.reducedlogging=True self.fermenterid=self.props.get("Fermenter", None) + self.reducedlogging=True if self.kettleid or self.fermenterid else False if self.kettleid is not None and self.fermenterid is not None: self.reducedlogging=False @@ -115,6 +115,7 @@ class OneWire(CBPiSensor): if self.reducedlogging: await self.logvalue() else: + logging.info("OneWire {} regular logging".format(self.sensor.name)) self.log_data(self.value) self.lastlog = time.time() await asyncio.sleep(self.interval) From 5f24e2d149afa1638d8b4f694f471a350e20131a Mon Sep 17 00:00:00 2001 From: avollkopf <43980694+avollkopf@users.noreply.github.com> Date: Sat, 25 Mar 2023 13:19:02 +0100 Subject: [PATCH 14/34] test --- cbpi/extension/mqtt_sensor/__init__.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cbpi/extension/mqtt_sensor/__init__.py b/cbpi/extension/mqtt_sensor/__init__.py index b654e05..5687ef6 100644 --- a/cbpi/extension/mqtt_sensor/__init__.py +++ b/cbpi/extension/mqtt_sensor/__init__.py @@ -36,7 +36,9 @@ class MQTTSensor(CBPiSensor): self.reducedfrequency=int(self.props.get("ReducedLogging", 60)) self.kettleid=self.props.get("Kettle", None) self.fermenterid=self.props.get("Fermenter", None) - self.reducedlogging=True if self.kettleid or self.fermenterid else False + logging.info(self.kettleid) + logging.info(self.fermenterid) + self.reducedlogging = True if self.kettleid or self.fermenterid else False if self.kettleid is not None and self.fermenterid is not None: self.reducedlogging=False @@ -66,9 +68,10 @@ class MQTTSensor(CBPiSensor): if isinstance(val, (int, float, str)): self.value = float(val) self.push_update(self.value) - if self.reducedlogging: + if self.reducedlogging == True: await self.logvalue() else: + logging.info("MQTTSensor {} regular logging".format(self.sensor.name)) self.log_data(self.value) self.lastlog = time.time() From 848fb4e778de59b6a67ea417713df9f27f74282b Mon Sep 17 00:00:00 2001 From: avollkopf <43980694+avollkopf@users.noreply.github.com> Date: Sat, 25 Mar 2023 13:25:07 +0100 Subject: [PATCH 15/34] test --- cbpi/extension/mqtt_sensor/__init__.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cbpi/extension/mqtt_sensor/__init__.py b/cbpi/extension/mqtt_sensor/__init__.py index 5687ef6..88c62c9 100644 --- a/cbpi/extension/mqtt_sensor/__init__.py +++ b/cbpi/extension/mqtt_sensor/__init__.py @@ -25,6 +25,9 @@ class MQTTSensor(CBPiSensor): if self.payload_text != None: self.payload_text = self.payload_text.split('.') self.mqtt_task = self.cbpi.satellite.subcribe(self.Topic, self.on_message) + + async def start(self): + await super().start() self.value: float = 999 self.timeout=int(self.props.get("Timeout", 60)) self.starttime = time.time() From 1fcbe91e097512ecafb96d514ee77584eddb4e71 Mon Sep 17 00:00:00 2001 From: avollkopf <43980694+avollkopf@users.noreply.github.com> Date: Sat, 25 Mar 2023 13:27:15 +0100 Subject: [PATCH 16/34] test --- cbpi/extension/mqtt_sensor/__init__.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/cbpi/extension/mqtt_sensor/__init__.py b/cbpi/extension/mqtt_sensor/__init__.py index 88c62c9..155e76f 100644 --- a/cbpi/extension/mqtt_sensor/__init__.py +++ b/cbpi/extension/mqtt_sensor/__init__.py @@ -25,9 +25,6 @@ class MQTTSensor(CBPiSensor): if self.payload_text != None: self.payload_text = self.payload_text.split('.') self.mqtt_task = self.cbpi.satellite.subcribe(self.Topic, self.on_message) - - async def start(self): - await super().start() self.value: float = 999 self.timeout=int(self.props.get("Timeout", 60)) self.starttime = time.time() @@ -39,8 +36,6 @@ class MQTTSensor(CBPiSensor): self.reducedfrequency=int(self.props.get("ReducedLogging", 60)) self.kettleid=self.props.get("Kettle", None) self.fermenterid=self.props.get("Fermenter", None) - logging.info(self.kettleid) - logging.info(self.fermenterid) self.reducedlogging = True if self.kettleid or self.fermenterid else False if self.kettleid is not None and self.fermenterid is not None: From 5cbc7e1393d634a606b1e36c4c9a719df4874153 Mon Sep 17 00:00:00 2001 From: avollkopf <43980694+avollkopf@users.noreply.github.com> Date: Sat, 25 Mar 2023 13:51:13 +0100 Subject: [PATCH 17/34] test --- cbpi/extension/onewire/__init__.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/cbpi/extension/onewire/__init__.py b/cbpi/extension/onewire/__init__.py index ba42137..19f6add 100644 --- a/cbpi/extension/onewire/__init__.py +++ b/cbpi/extension/onewire/__init__.py @@ -61,16 +61,9 @@ class OneWire(CBPiSensor): def __init__(self, cbpi, id, props): super(OneWire, self).__init__(cbpi, id, props) self.value = 200 - - async def start(self): - await super().start() - self.name = self.props.get("Sensor") - self.interval = int(self.props.get("Interval", 60)) - self.offset = float(self.props.get("offset",0)) - self.lastlog=0 - self.sensor=self.get_sensor(self.id) self.reducedfrequency=int(self.props.get("ReducedLogging", 60)) - + self.lastlog=0 + self.sensor=self.get_sensor(self.id) self.kettleid=self.props.get("Kettle", None) self.fermenterid=self.props.get("Fermenter", None) self.reducedlogging=True if self.kettleid or self.fermenterid else False @@ -85,6 +78,11 @@ class OneWire(CBPiSensor): self.kettle = self.get_kettle(self.kettleid) if self.kettleid is not None else None self.fermenter = self.get_fermenter(self.fermenterid) if self.fermenterid is not None else None + async def start(self): + await super().start() + self.name = self.props.get("Sensor") + self.interval = int(self.props.get("Interval", 60)) + self.offset = float(self.props.get("offset",0)) self.t = ReadThread(self.name) self.t.daemon = True @@ -121,7 +119,8 @@ class OneWire(CBPiSensor): await asyncio.sleep(self.interval) async def logvalue(self): - now=time.time() + now=time.time() + logging.info("OneWire {} logging subroutine".format(self.sensor.name)) if self.kettle is not None: try: kettlestatus=self.kettle.instance.state From 84bb745054df5c9f6ef2df94c70594ca1c4037f2 Mon Sep 17 00:00:00 2001 From: avollkopf <43980694+avollkopf@users.noreply.github.com> Date: Sat, 25 Mar 2023 13:54:24 +0100 Subject: [PATCH 18/34] test --- cbpi/extension/onewire/__init__.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/cbpi/extension/onewire/__init__.py b/cbpi/extension/onewire/__init__.py index 19f6add..80f3cc3 100644 --- a/cbpi/extension/onewire/__init__.py +++ b/cbpi/extension/onewire/__init__.py @@ -62,6 +62,14 @@ class OneWire(CBPiSensor): super(OneWire, self).__init__(cbpi, id, props) self.value = 200 self.reducedfrequency=int(self.props.get("ReducedLogging", 60)) + + async def start(self): + await super().start() + self.name = self.props.get("Sensor") + self.interval = int(self.props.get("Interval", 60)) + self.offset = float(self.props.get("offset",0)) + + self.reducedfrequency=int(self.props.get("ReducedLogging", 60)) self.lastlog=0 self.sensor=self.get_sensor(self.id) self.kettleid=self.props.get("Kettle", None) @@ -78,12 +86,6 @@ class OneWire(CBPiSensor): self.kettle = self.get_kettle(self.kettleid) if self.kettleid is not None else None self.fermenter = self.get_fermenter(self.fermenterid) if self.fermenterid is not None else None - async def start(self): - await super().start() - self.name = self.props.get("Sensor") - self.interval = int(self.props.get("Interval", 60)) - self.offset = float(self.props.get("offset",0)) - self.t = ReadThread(self.name) self.t.daemon = True def shutdown(): From c5d6cb5ae56f27a7b2161582b1ccd1504dadacef Mon Sep 17 00:00:00 2001 From: avollkopf <43980694+avollkopf@users.noreply.github.com> Date: Sat, 25 Mar 2023 14:15:30 +0100 Subject: [PATCH 19/34] test --- cbpi/extension/onewire/__init__.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cbpi/extension/onewire/__init__.py b/cbpi/extension/onewire/__init__.py index 80f3cc3..0e93b39 100644 --- a/cbpi/extension/onewire/__init__.py +++ b/cbpi/extension/onewire/__init__.py @@ -61,7 +61,6 @@ class OneWire(CBPiSensor): def __init__(self, cbpi, id, props): super(OneWire, self).__init__(cbpi, id, props) self.value = 200 - self.reducedfrequency=int(self.props.get("ReducedLogging", 60)) async def start(self): await super().start() @@ -69,7 +68,7 @@ class OneWire(CBPiSensor): self.interval = int(self.props.get("Interval", 60)) self.offset = float(self.props.get("offset",0)) - self.reducedfrequency=int(self.props.get("ReducedLogging", 60)) + self.reducedfrequency=float(self.props.get("ReducedLogging", 60)) self.lastlog=0 self.sensor=self.get_sensor(self.id) self.kettleid=self.props.get("Kettle", None) From 3186c182f782fd4ebb5ea1223858575e8424862d Mon Sep 17 00:00:00 2001 From: avollkopf <43980694+avollkopf@users.noreply.github.com> Date: Sat, 25 Mar 2023 14:23:21 +0100 Subject: [PATCH 20/34] test --- cbpi/extension/onewire/__init__.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cbpi/extension/onewire/__init__.py b/cbpi/extension/onewire/__init__.py index 0e93b39..85c71da 100644 --- a/cbpi/extension/onewire/__init__.py +++ b/cbpi/extension/onewire/__init__.py @@ -82,9 +82,6 @@ class OneWire(CBPiSensor): self.reducedlogging=False self.cbpi.notify("OneWire Sensor", "Sensor '" + str(self.sensor.name) + "' has shorter or equal 'reduced logging' compared to regular interval.", NotificationType.WARNING, action=[NotificationAction("OK", self.Confirm)]) - self.kettle = self.get_kettle(self.kettleid) if self.kettleid is not None else None - self.fermenter = self.get_fermenter(self.fermenterid) if self.fermenterid is not None else None - self.t = ReadThread(self.name) self.t.daemon = True def shutdown(): @@ -104,6 +101,10 @@ class OneWire(CBPiSensor): pass async def run(self): + + self.kettle = self.get_kettle(self.kettleid) if self.kettleid is not None else None + self.fermenter = self.get_fermenter(self.fermenterid) if self.fermenterid is not None else None + while self.running == True: self.TEMP_UNIT=self.get_config_value("TEMP_UNIT", "C") if self.TEMP_UNIT == "C": # Report temp in C if nothing else is selected in settings From 6e066282c412441bc754275f86e00fc255a7044b Mon Sep 17 00:00:00 2001 From: avollkopf <43980694+avollkopf@users.noreply.github.com> Date: Sat, 25 Mar 2023 14:56:04 +0100 Subject: [PATCH 21/34] some tweaks --- cbpi/__init__.py | 2 +- cbpi/extension/httpsensor/__init__.py | 8 +++----- cbpi/extension/mqtt_sensor/__init__.py | 6 ++---- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/cbpi/__init__.py b/cbpi/__init__.py index 50436a0..36da73a 100644 --- a/cbpi/__init__.py +++ b/cbpi/__init__.py @@ -1,3 +1,3 @@ -__version__ = "4.1.7.a9" +__version__ = "4.1.7.a10" __codename__ = "Groundhog Day" diff --git a/cbpi/extension/httpsensor/__init__.py b/cbpi/extension/httpsensor/__init__.py index 0ff1443..e938bb5 100644 --- a/cbpi/extension/httpsensor/__init__.py +++ b/cbpi/extension/httpsensor/__init__.py @@ -32,16 +32,12 @@ class HTTPSensor(CBPiSensor): self.reducedfrequency=int(self.props.get("ReducedLogging", 60)) self.kettleid=self.props.get("Kettle", None) - self.reducedlogging=True self.fermenterid=self.props.get("Fermenter", None) + self.reducedlogging = True if self.kettleid or self.fermenterid else False if self.kettleid is not None and self.fermenterid is not None: self.reducedlogging=False self.cbpi.notify("HTTPSensor", "Sensor '" + str(self.sensor.name) + "' cant't have Fermenter and Kettle defined for reduced logging.", NotificationType.WARNING, action=[NotificationAction("OK", self.Confirm)]) - - self.kettle = self.get_kettle(self.kettleid) if self.kettleid is not None else None - self.fermenter = self.get_fermenter(self.fermenterid) if self.fermenterid is not None else None - async def Confirm(self, **kwargs): self.nextchecktime = time.time() + self.timeout @@ -59,6 +55,8 @@ class HTTPSensor(CBPiSensor): In this example the code is executed every second ''' while self.running is True: + self.kettle = self.get_kettle(self.kettleid) if self.kettleid is not None else None + self.fermenter = self.get_fermenter(self.fermenterid) if self.fermenterid is not None else None if self.timeout !=0: currenttime=time.time() if currenttime > self.nextchecktime and self.notificationsend == False: diff --git a/cbpi/extension/mqtt_sensor/__init__.py b/cbpi/extension/mqtt_sensor/__init__.py index 155e76f..443ce07 100644 --- a/cbpi/extension/mqtt_sensor/__init__.py +++ b/cbpi/extension/mqtt_sensor/__init__.py @@ -41,11 +41,7 @@ class MQTTSensor(CBPiSensor): if self.kettleid is not None and self.fermenterid is not None: self.reducedlogging=False self.cbpi.notify("MQTTSensor", "Sensor '" + str(self.sensor.name) + "' cant't have Fermenter and Kettle defined for reduced logging.", NotificationType.WARNING, action=[NotificationAction("OK", self.Confirm)]) - - self.kettle = self.get_kettle(self.kettleid) if self.kettleid is not None else None - self.fermenter = self.get_fermenter(self.fermenterid) if self.fermenterid is not None else None - async def Confirm(self, **kwargs): self.nextchecktime = time.time() + self.timeout self.notificationsend = False @@ -81,6 +77,8 @@ class MQTTSensor(CBPiSensor): logging.error("MQTT Sensor Error {}".format(e)) async def logvalue(self): + self.kettle = self.get_kettle(self.kettleid) if self.kettleid is not None else None + self.fermenter = self.get_fermenter(self.fermenterid) if self.fermenterid is not None else None now=time.time() if self.kettle is not None: try: From 62298ae844c25729878241d2655bf019d7bf8a6f Mon Sep 17 00:00:00 2001 From: avollkopf <43980694+avollkopf@users.noreply.github.com> Date: Sat, 25 Mar 2023 18:35:17 +0100 Subject: [PATCH 22/34] additional logging in mqttsensor task cancel --- cbpi/__init__.py | 2 +- cbpi/extension/mqtt_sensor/__init__.py | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/cbpi/__init__.py b/cbpi/__init__.py index 36da73a..cf50002 100644 --- a/cbpi/__init__.py +++ b/cbpi/__init__.py @@ -1,3 +1,3 @@ -__version__ = "4.1.7.a10" +__version__ = "4.1.7.a11" __codename__ = "Groundhog Day" diff --git a/cbpi/extension/mqtt_sensor/__init__.py b/cbpi/extension/mqtt_sensor/__init__.py index 443ce07..d7c78d3 100644 --- a/cbpi/extension/mqtt_sensor/__init__.py +++ b/cbpi/extension/mqtt_sensor/__init__.py @@ -126,12 +126,15 @@ class MQTTSensor(CBPiSensor): return dict(value=self.value) async def on_stop(self): - if self.mqtt_task.done() is False: + if not self.mqtt_task.done(): + logging.warning("Task not done -> cancelling") self.mqtt_task.cancel() - try: - await self.mqtt_task - except asyncio.CancelledError: - pass + try: + logging.warning("trying to call cancelled task") + await self.mqtt_task + except asyncio.CancelledError: + logging.warning("Task has been Cancelled") + pass def setup(cbpi): From bcf9b3e06b59b19fa2a08becde138aecaa3244f8 Mon Sep 17 00:00:00 2001 From: avollkopf <43980694+avollkopf@users.noreply.github.com> Date: Sat, 25 Mar 2023 18:50:36 +0100 Subject: [PATCH 23/34] improved handling in cancelling the mqtt subscription --- cbpi/__init__.py | 2 +- cbpi/controller/satellite_controller.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cbpi/__init__.py b/cbpi/__init__.py index cf50002..9b0b24d 100644 --- a/cbpi/__init__.py +++ b/cbpi/__init__.py @@ -1,3 +1,3 @@ -__version__ = "4.1.7.a11" +__version__ = "4.1.7.a12" __codename__ = "Groundhog Day" diff --git a/cbpi/controller/satellite_controller.py b/cbpi/controller/satellite_controller.py index d11885e..47779dd 100644 --- a/cbpi/controller/satellite_controller.py +++ b/cbpi/controller/satellite_controller.py @@ -164,10 +164,10 @@ class SatelliteController: except asyncio.CancelledError: # Cancel self.logger.warning("Sub Cancelled") + break except MqttError as e: self.logger.error("Sub MQTT Exception: {}".format(e)) except Exception as e: self.logger.error("Sub Exception: {}".format(e)) - # wait before try to resubscribe await asyncio.sleep(5) From 3768a77dfe17ebc13652e71b08011dcb8378dee8 Mon Sep 17 00:00:00 2001 From: avollkopf <43980694+avollkopf@users.noreply.github.com> Date: Sat, 25 Mar 2023 19:15:26 +0100 Subject: [PATCH 24/34] added soome additional info on cancelled task --- cbpi/__init__.py | 2 +- cbpi/controller/satellite_controller.py | 8 ++++++-- cbpi/extension/mqtt_sensor/__init__.py | 10 +++++----- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/cbpi/__init__.py b/cbpi/__init__.py index 9b0b24d..18a652d 100644 --- a/cbpi/__init__.py +++ b/cbpi/__init__.py @@ -1,3 +1,3 @@ -__version__ = "4.1.7.a12" +__version__ = "4.1.7.a13" __codename__ = "Groundhog Day" diff --git a/cbpi/controller/satellite_controller.py b/cbpi/controller/satellite_controller.py index 47779dd..7060401 100644 --- a/cbpi/controller/satellite_controller.py +++ b/cbpi/controller/satellite_controller.py @@ -153,6 +153,7 @@ class SatelliteController: return task async def _subcribe(self, topic, method): + self.error=False while True: try: if self.client._connected.done(): @@ -164,10 +165,13 @@ class SatelliteController: except asyncio.CancelledError: # Cancel self.logger.warning("Sub Cancelled") - break + self.error=True except MqttError as e: self.logger.error("Sub MQTT Exception: {}".format(e)) except Exception as e: self.logger.error("Sub Exception: {}".format(e)) # wait before try to resubscribe - await asyncio.sleep(5) + if self.error == True: + break + else: + await asyncio.sleep(5) diff --git a/cbpi/extension/mqtt_sensor/__init__.py b/cbpi/extension/mqtt_sensor/__init__.py index d7c78d3..c9dce95 100644 --- a/cbpi/extension/mqtt_sensor/__init__.py +++ b/cbpi/extension/mqtt_sensor/__init__.py @@ -127,15 +127,15 @@ class MQTTSensor(CBPiSensor): async def on_stop(self): if not self.mqtt_task.done(): - logging.warning("Task not done -> cancelling") - self.mqtt_task.cancel() + logging.info("Task not done -> cancelling") + was_cancelled = self.mqtt_task.cancel() try: - logging.warning("trying to call cancelled task") + logging.info("Trying to call cancelled task") await self.mqtt_task except asyncio.CancelledError: - logging.warning("Task has been Cancelled") + logging.info("Task has been Cancelled") pass - + logging.info("Task cancelled: {}".format(was_cancelled)) def setup(cbpi): ''' From b0406a4de8fb64b579a7cd84049b6d2cac5b6fdc Mon Sep 17 00:00:00 2001 From: avollkopf <43980694+avollkopf@users.noreply.github.com> Date: Sun, 26 Mar 2023 11:36:18 +0200 Subject: [PATCH 25/34] cancelling also mqtt listening on cacnellederror --- cbpi/__init__.py | 2 +- cbpi/controller/satellite_controller.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cbpi/__init__.py b/cbpi/__init__.py index 18a652d..13869a7 100644 --- a/cbpi/__init__.py +++ b/cbpi/__init__.py @@ -1,3 +1,3 @@ -__version__ = "4.1.7.a13" +__version__ = "4.1.7.a14" __codename__ = "Groundhog Day" diff --git a/cbpi/controller/satellite_controller.py b/cbpi/controller/satellite_controller.py index 7060401..dad797a 100644 --- a/cbpi/controller/satellite_controller.py +++ b/cbpi/controller/satellite_controller.py @@ -70,6 +70,10 @@ class SatelliteController: method = topic_filter[1] if message.topic.matches(topic): await (method(message)) + except asyncio.CancelledError: + # Cancel + self.logger.warning("MQTT Listening Cancelled") + break except MqttError as e: self.logger.error("MQTT Exception: {}".format(e)) except Exception as e: @@ -164,7 +168,7 @@ class SatelliteController: await method(message.payload.decode()) except asyncio.CancelledError: # Cancel - self.logger.warning("Sub Cancelled") + self.logger.warning("Subscription {} Cancelled".format(topic)) self.error=True except MqttError as e: self.logger.error("Sub MQTT Exception: {}".format(e)) From 37203dd93ea412e7efc9d859f43f2b23c02671e3 Mon Sep 17 00:00:00 2001 From: avollkopf <43980694+avollkopf@users.noreply.github.com> Date: Sun, 26 Mar 2023 15:22:44 +0200 Subject: [PATCH 26/34] uncomment 'break' in listening -> does not help to shutdown faster --- cbpi/__init__.py | 2 +- cbpi/controller/satellite_controller.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cbpi/__init__.py b/cbpi/__init__.py index 13869a7..eb2531b 100644 --- a/cbpi/__init__.py +++ b/cbpi/__init__.py @@ -1,3 +1,3 @@ -__version__ = "4.1.7.a14" +__version__ = "4.1.7.a15" __codename__ = "Groundhog Day" diff --git a/cbpi/controller/satellite_controller.py b/cbpi/controller/satellite_controller.py index dad797a..3fc4b2e 100644 --- a/cbpi/controller/satellite_controller.py +++ b/cbpi/controller/satellite_controller.py @@ -73,7 +73,7 @@ class SatelliteController: except asyncio.CancelledError: # Cancel self.logger.warning("MQTT Listening Cancelled") - break + #break except MqttError as e: self.logger.error("MQTT Exception: {}".format(e)) except Exception as e: From 5a2b0a8bd0991fdc58b401e40760573754707619 Mon Sep 17 00:00:00 2001 From: avollkopf <43980694+avollkopf@users.noreply.github.com> Date: Sun, 26 Mar 2023 16:41:45 +0200 Subject: [PATCH 27/34] bump version to rc1 --- cbpi/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cbpi/__init__.py b/cbpi/__init__.py index eb2531b..0bbcfc8 100644 --- a/cbpi/__init__.py +++ b/cbpi/__init__.py @@ -1,3 +1,3 @@ -__version__ = "4.1.7.a15" +__version__ = "4.1.7.rc1" __codename__ = "Groundhog Day" From 187426eb4a79e56cd52c713b118df1528bdb6739 Mon Sep 17 00:00:00 2001 From: avollkopf <43980694+avollkopf@users.noreply.github.com> Date: Mon, 27 Mar 2023 20:19:37 +0200 Subject: [PATCH 28/34] added sensor disabling with fermenter/kettle inactivity --- .gitignore | 3 +- cbpi/__init__.py | 2 +- cbpi/extension/httpsensor/__init__.py | 66 +++++++++++++------------ cbpi/extension/mqtt_sensor/__init__.py | 67 ++++++++++++++------------ cbpi/extension/onewire/__init__.py | 65 +++++++++++++------------ cbpi4.egg-info/PKG-INFO | 2 +- 6 files changed, 108 insertions(+), 97 deletions(-) diff --git a/.gitignore b/.gitignore index 32b01ba..c0c7ec6 100644 --- a/.gitignore +++ b/.gitignore @@ -4,8 +4,7 @@ build dist .idea *.log -cbpi.egg-info -cbpi4.egg-info +/cbpi4.egg-info log venv cbpi/extension/ui diff --git a/cbpi/__init__.py b/cbpi/__init__.py index 0bbcfc8..2c56255 100644 --- a/cbpi/__init__.py +++ b/cbpi/__init__.py @@ -1,3 +1,3 @@ -__version__ = "4.1.7.rc1" +__version__ = "4.1.7.rc2" __codename__ = "Groundhog Day" diff --git a/cbpi/extension/httpsensor/__init__.py b/cbpi/extension/httpsensor/__init__.py index e938bb5..74fc002 100644 --- a/cbpi/extension/httpsensor/__init__.py +++ b/cbpi/extension/httpsensor/__init__.py @@ -14,7 +14,7 @@ cache = {} Property.Number(label="Timeout", configurable="True",unit="sec",description="Timeout in seconds to send notification (default:60 | deactivated: 0)"), Property.Kettle(label="Kettle", description="Reduced logging if Kettle is inactive (only Kettle or Fermenter to be selected)"), Property.Fermenter(label="Fermenter", description="Reduced logging in seconds if Fermenter is inactive (only Kettle or Fermenter to be selected)"), - Property.Number(label="ReducedLogging", configurable=True, description="Reduced logging frequency in seconds if selected Kettle or Fermenter is inactive (default is 60 sec)")]) + Property.Number(label="ReducedLogging", configurable=True, description="Reduced logging frequency in seconds if selected Kettle or Fermenter is inactive (default: 60 sec | disabled: 0)")]) class HTTPSensor(CBPiSensor): def __init__(self, cbpi, id, props): @@ -30,6 +30,8 @@ class HTTPSensor(CBPiSensor): self.lastlog=0 self.reducedfrequency=int(self.props.get("ReducedLogging", 60)) + if self.reducedfrequency < 0: + self.reducedfrequency = 0 self.kettleid=self.props.get("Kettle", None) self.fermenterid=self.props.get("Fermenter", None) @@ -84,40 +86,44 @@ class HTTPSensor(CBPiSensor): await asyncio.sleep(1) async def logvalue(self): - now=time.time() - if self.kettle is not None: - try: - kettlestatus=self.kettle.instance.state - except: - kettlestatus=False - if kettlestatus: - self.log_data(self.value) - logging.info("Kettle Active") - self.lastlog = time.time() - else: - logging.info("Kettle Inactive") - if now >= self.lastlog + self.reducedfrequency: + if self.reducedfrequency != 0: + now=time.time() + if self.kettle is not None: + try: + kettlestatus=self.kettle.instance.state + except: + kettlestatus=False + if kettlestatus: self.log_data(self.value) + logging.info("Kettle Active") self.lastlog = time.time() - logging.info("Logged with reduced freqency") - pass + else: + logging.info("Kettle Inactive") + if now >= self.lastlog + self.reducedfrequency: + self.log_data(self.value) + self.lastlog = time.time() + logging.info("Logged with reduced freqency") + pass - if self.fermenter is not None: - try: - fermenterstatus=self.fermenter.instance.state - except: - fermenterstatus=False - if fermenterstatus: - self.log_data(self.value) - logging.info("Fermenter Active") - self.lastlog = time.time() - else: - logging.info("Fermenter Inactive") - if now >= self.lastlog + self.reducedfrequency: + if self.fermenter is not None: + try: + fermenterstatus=self.fermenter.instance.state + except: + fermenterstatus=False + if fermenterstatus: self.log_data(self.value) + logging.info("Fermenter Active") self.lastlog = time.time() - logging.info("Logged with reduced freqency") - pass + else: + logging.info("Fermenter Inactive") + if now >= self.lastlog + self.reducedfrequency: + self.log_data(self.value) + self.lastlog = time.time() + logging.info("Logged with reduced freqency") + pass + else: + logging.warning("No logging") + pass def get_state(self): # return the current state of the sensor diff --git a/cbpi/extension/mqtt_sensor/__init__.py b/cbpi/extension/mqtt_sensor/__init__.py index c9dce95..7a9a6aa 100644 --- a/cbpi/extension/mqtt_sensor/__init__.py +++ b/cbpi/extension/mqtt_sensor/__init__.py @@ -13,7 +13,7 @@ from datetime import datetime description="Where to find msg in payload, leave blank for raw payload"), Property.Kettle(label="Kettle", description="Reduced logging if Kettle is inactive (only Kettle or Fermenter to be selected)"), Property.Fermenter(label="Fermenter", description="Reduced logging in seconds if Fermenter is inactive (only Kettle or Fermenter to be selected)"), - Property.Number(label="ReducedLogging", configurable=True, description="Reduced logging frequency in seconds if selected Kettle or Fermenter is inactive (default is 60 sec)"), + Property.Number(label="ReducedLogging", configurable=True, description="Reduced logging frequency in seconds if selected Kettle or Fermenter is inactive (default:60 sec | 0 disabled)"), Property.Number(label="Timeout", configurable=True, unit="sec", description="Timeout in seconds to send notification (default:60 | deactivated: 0)")]) class MQTTSensor(CBPiSensor): @@ -34,6 +34,8 @@ class MQTTSensor(CBPiSensor): self.lastlog=0 self.sensor=self.get_sensor(self.id) self.reducedfrequency=int(self.props.get("ReducedLogging", 60)) + if self.reducedfrequency < 0: + self.reducedfrequency = 0 self.kettleid=self.props.get("Kettle", None) self.fermenterid=self.props.get("Fermenter", None) self.reducedlogging = True if self.kettleid or self.fermenterid else False @@ -77,42 +79,43 @@ class MQTTSensor(CBPiSensor): logging.error("MQTT Sensor Error {}".format(e)) async def logvalue(self): - self.kettle = self.get_kettle(self.kettleid) if self.kettleid is not None else None - self.fermenter = self.get_fermenter(self.fermenterid) if self.fermenterid is not None else None - now=time.time() - if self.kettle is not None: - try: - kettlestatus=self.kettle.instance.state - except: - kettlestatus=False - if kettlestatus: - self.log_data(self.value) - logging.info("MQTTSensor {} Kettle Active".format(self.sensor.name)) - self.lastlog = time.time() - else: - logging.info("MQTTSensor {} Kettle Inactive".format(self.sensor.name)) - if now >= self.lastlog + self.reducedfrequency: + if self.reducedfrequency == 0: + self.kettle = self.get_kettle(self.kettleid) if self.kettleid is not None else None + self.fermenter = self.get_fermenter(self.fermenterid) if self.fermenterid is not None else None + now=time.time() + if self.kettle is not None: + try: + kettlestatus=self.kettle.instance.state + except: + kettlestatus=False + if kettlestatus: self.log_data(self.value) + logging.info("MQTTSensor {} Kettle Active".format(self.sensor.name)) self.lastlog = time.time() - logging.info("Logged with reduced freqency") - pass + else: + logging.info("MQTTSensor {} Kettle Inactive".format(self.sensor.name)) + if now >= self.lastlog + self.reducedfrequency: + self.log_data(self.value) + self.lastlog = time.time() + logging.info("Logged with reduced freqency") + pass - if self.fermenter is not None: - try: - fermenterstatus=self.fermenter.instance.state - except: - fermenterstatus=False - if fermenterstatus: - self.log_data(self.value) - logging.info("MQTTSensor {} Fermenter Active".format(self.sensor.name)) - self.lastlog = time.time() - else: - logging.info("MQTTSensor {} Fermenter Inactive".format(self.sensor.name)) - if now >= self.lastlog + self.reducedfrequency: + if self.fermenter is not None: + try: + fermenterstatus=self.fermenter.instance.state + except: + fermenterstatus=False + if fermenterstatus: self.log_data(self.value) + logging.info("MQTTSensor {} Fermenter Active".format(self.sensor.name)) self.lastlog = time.time() - logging.info("Logged with reduced freqency") - pass + else: + logging.info("MQTTSensor {} Fermenter Inactive".format(self.sensor.name)) + if now >= self.lastlog + self.reducedfrequency: + self.log_data(self.value) + self.lastlog = time.time() + logging.info("Logged with reduced freqency") + pass async def run(self): while self.running: diff --git a/cbpi/extension/onewire/__init__.py b/cbpi/extension/onewire/__init__.py index 85c71da..056f401 100644 --- a/cbpi/extension/onewire/__init__.py +++ b/cbpi/extension/onewire/__init__.py @@ -54,7 +54,7 @@ class ReadThread (threading.Thread): Property.Select(label="Interval", options=[1,5,10,30,60], description="Interval in Seconds"), Property.Kettle(label="Kettle", description="Reduced logging if Kettle is inactive (only Kettle or Fermenter to be selected)"), Property.Fermenter(label="Fermenter", description="Reduced logging in seconds if Fermenter is inactive (only Kettle or Fermenter to be selected)"), - Property.Number(label="ReducedLogging", configurable=True, description="Reduced logging frequency in seconds if selected Kettle or Fermenter is inactive (default is 60 sec)") + Property.Number(label="ReducedLogging", configurable=True, description="Reduced logging frequency in seconds if selected Kettle or Fermenter is inactive (default: 60 sec | disabled: 0)") ]) class OneWire(CBPiSensor): @@ -69,6 +69,8 @@ class OneWire(CBPiSensor): self.offset = float(self.props.get("offset",0)) self.reducedfrequency=float(self.props.get("ReducedLogging", 60)) + if self.reducedfrequency < 0: + self.reducedfrequency = 0 self.lastlog=0 self.sensor=self.get_sensor(self.id) self.kettleid=self.props.get("Kettle", None) @@ -121,41 +123,42 @@ class OneWire(CBPiSensor): await asyncio.sleep(self.interval) async def logvalue(self): - now=time.time() - logging.info("OneWire {} logging subroutine".format(self.sensor.name)) - if self.kettle is not None: - try: - kettlestatus=self.kettle.instance.state - except: - kettlestatus=False - if kettlestatus: - self.log_data(self.value) - logging.info("OneWire {} Kettle Active".format(self.sensor.name)) - self.lastlog = time.time() - else: - logging.info("OneWire {} Kettle Inactive".format(self.sensor.name)) - if now >= self.lastlog + self.reducedfrequency: + if self.reducedfrequency == 0: + now=time.time() + logging.info("OneWire {} logging subroutine".format(self.sensor.name)) + if self.kettle is not None: + try: + kettlestatus=self.kettle.instance.state + except: + kettlestatus=False + if kettlestatus: self.log_data(self.value) + logging.info("OneWire {} Kettle Active".format(self.sensor.name)) self.lastlog = time.time() - logging.info("Logged with reduced freqency") - pass + else: + logging.info("OneWire {} Kettle Inactive".format(self.sensor.name)) + if now >= self.lastlog + self.reducedfrequency: + self.log_data(self.value) + self.lastlog = time.time() + logging.info("Logged with reduced freqency") + pass - if self.fermenter is not None: - try: - fermenterstatus=self.fermenter.instance.state - except: - fermenterstatus=False - if fermenterstatus: - self.log_data(self.value) - logging.info("OneWire {} Fermenter Active".format(self.sensor.name)) - self.lastlog = time.time() - else: - logging.info("OneWire {} Fermenter Inactive".format(self.sensor.name)) - if now >= self.lastlog + self.reducedfrequency: + if self.fermenter is not None: + try: + fermenterstatus=self.fermenter.instance.state + except: + fermenterstatus=False + if fermenterstatus: self.log_data(self.value) + logging.info("OneWire {} Fermenter Active".format(self.sensor.name)) self.lastlog = time.time() - logging.info("Logged with reduced freqency") - pass + else: + logging.info("OneWire {} Fermenter Inactive".format(self.sensor.name)) + if now >= self.lastlog + self.reducedfrequency: + self.log_data(self.value) + self.lastlog = time.time() + logging.info("Logged with reduced freqency") + pass def get_state(self): diff --git a/cbpi4.egg-info/PKG-INFO b/cbpi4.egg-info/PKG-INFO index e37f3a2..38c883c 100644 --- a/cbpi4.egg-info/PKG-INFO +++ b/cbpi4.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: cbpi4 -Version: 4.1.7a4 +Version: 4.1.7rc1 Summary: CraftBeerPi4 Brewing Software Home-page: http://web.craftbeerpi.com Author: Manuel Fritsch / Alexander Vollkopf From e16c0ac66d547056fc1ff63576d36a966689c6ee Mon Sep 17 00:00:00 2001 From: avollkopf <43980694+avollkopf@users.noreply.github.com> Date: Mon, 27 Mar 2023 20:24:01 +0200 Subject: [PATCH 29/34] remove egg.info dir --- .gitignore | 2 +- cbpi4.egg-info/PKG-INFO | 55 ------- cbpi4.egg-info/SOURCES.txt | 223 ---------------------------- cbpi4.egg-info/dependency_links.txt | 1 - cbpi4.egg-info/entry_points.txt | 3 - cbpi4.egg-info/requires.txt | 24 --- cbpi4.egg-info/top_level.txt | 2 - 7 files changed, 1 insertion(+), 309 deletions(-) delete mode 100644 cbpi4.egg-info/PKG-INFO delete mode 100644 cbpi4.egg-info/SOURCES.txt delete mode 100644 cbpi4.egg-info/dependency_links.txt delete mode 100644 cbpi4.egg-info/entry_points.txt delete mode 100644 cbpi4.egg-info/requires.txt delete mode 100644 cbpi4.egg-info/top_level.txt diff --git a/.gitignore b/.gitignore index c0c7ec6..d23da45 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,7 @@ build dist .idea *.log -/cbpi4.egg-info +*egg-info/ log venv cbpi/extension/ui diff --git a/cbpi4.egg-info/PKG-INFO b/cbpi4.egg-info/PKG-INFO deleted file mode 100644 index 38c883c..0000000 --- a/cbpi4.egg-info/PKG-INFO +++ /dev/null @@ -1,55 +0,0 @@ -Metadata-Version: 2.1 -Name: cbpi4 -Version: 4.1.7rc1 -Summary: CraftBeerPi4 Brewing Software -Home-page: http://web.craftbeerpi.com -Author: Manuel Fritsch / Alexander Vollkopf -Author-email: manuel@craftbeerpi.com -License: GPLv3 -Project-URL: Documentation, https://openbrewing.gitbook.io/craftbeerpi4_support/ -Platform: UNKNOWN -Requires-Python: >=3.9 -Description-Content-Type: text/markdown -License-File: LICENSE - -# CraftBeerPi 4 - -[![Build](https://github.com/PiBrewing/craftbeerpi4/actions/workflows/build.yml/badge.svg)](https://github.com/PiBrewing/craftbeerpi4/actions/workflows/build.yml) -[![GitHub license](https://img.shields.io/github/license/PiBrewing/craftbeerpi4)](https://github.com/PiBrewing/craftbeerpi4/blob/master/LICENSE) -![GitHub issues](https://img.shields.io/github/issues-raw/PiBrewing/craftbeerpi4) -![PyPI](https://img.shields.io/pypi/v/cbpi4) -![Happy Brewing](https://img.shields.io/badge/CraftBeerPi%204-Happy%20Brewing-%23FBB117) - -

- CraftBeerPi Logo -

- -CraftBeerPi 4 is an open source software solution to control the brewing and -fermentation of beer :beer:. - -## 📚 Documentation -Instructions on how to install CraftBeerPi and use its plugins is described -in the documentation, that can be found here: [gitbook.io](https://openbrewing.gitbook.io/craftbeerpi4_support/). - -### Plugins -Plugins extend the base functionality of CraftBeerPi 4. -You can find a list of available plugins [here](https://openbrewing.gitbook.io/craftbeerpi4_support/master/plugin-installation#plugin-list). - -## 🧑‍🤝‍🧑 Contribute -You want to help develop CraftBeerPi4? To get you quickly stated, this repository comes with a preconfigured -development environment. To be able to use this environment you need 2 things installed on your computer: - -- docker -- visual studio code (vscode) - -To start developing clone this repository, open the folder in vscode and use the _development container_ feature. The command is called _Reopen in container_. Please note that this quick start setup does not work if you want to develop directly on a 32bit raspberry pi os because docker is only available for 64bit arm plattform. Please use the regular development setup for that. - -For a more detailed description of a development setup without the _development container_ feature see the documentation page: -[gitbook.io](https://openbrewing.gitbook.io/craftbeerpi4_support/) - -### Contributors -Thanks to all the people who have contributed - -[![contributors](https://contributors-img.web.app/image?repo=PiBrewing/craftbeerpi4)](https://github.com/PiBrewing/craftbeerpi4/graphs/contributors) - - diff --git a/cbpi4.egg-info/SOURCES.txt b/cbpi4.egg-info/SOURCES.txt deleted file mode 100644 index 93caa9c..0000000 --- a/cbpi4.egg-info/SOURCES.txt +++ /dev/null @@ -1,223 +0,0 @@ -LICENSE -MANIFEST.in -README.md -setup.py -cbpi/__init__.py -cbpi/cli.py -cbpi/configFolder.py -cbpi/craftbeerpi.py -cbpi/eventbus.py -cbpi/satellite.py -cbpi/websocket.py -cbpi4.egg-info/PKG-INFO -cbpi4.egg-info/SOURCES.txt -cbpi4.egg-info/dependency_links.txt -cbpi4.egg-info/entry_points.txt -cbpi4.egg-info/requires.txt -cbpi4.egg-info/top_level.txt -cbpi/api/__init__.py -cbpi/api/actor.py -cbpi/api/base.py -cbpi/api/config.py -cbpi/api/dataclasses.py -cbpi/api/decorator.py -cbpi/api/exceptions.py -cbpi/api/extension.py -cbpi/api/fermenter_logic.py -cbpi/api/kettle_logic.py -cbpi/api/property.py -cbpi/api/sensor.py -cbpi/api/step.py -cbpi/api/timer.py -cbpi/config/actor.json -cbpi/config/chromium.desktop -cbpi/config/config.json -cbpi/config/config.yaml -cbpi/config/craftbeerpi.service -cbpi/config/craftbeerpiboot -cbpi/config/create_database.sql -cbpi/config/fermenter_data.json -cbpi/config/kettle.json -cbpi/config/plugin_list.txt -cbpi/config/sensor.json -cbpi/config/splash.png -cbpi/config/step_data.json -cbpi/controller/__init__.py -cbpi/controller/actor_controller.py -cbpi/controller/basic_controller2.py -cbpi/controller/config_controller.py -cbpi/controller/dashboard_controller.py -cbpi/controller/fermentation_controller.py -cbpi/controller/fermenter_recipe_controller.py -cbpi/controller/job_controller.py -cbpi/controller/kettle_controller.py -cbpi/controller/log_file_controller.py -cbpi/controller/notification_controller.py -cbpi/controller/plugin_controller.py -cbpi/controller/recipe_controller.py -cbpi/controller/satellite_controller.py -cbpi/controller/sensor_controller.py -cbpi/controller/step_controller.py -cbpi/controller/system_controller.py -cbpi/controller/upload_controller.py -cbpi/extension/__init__.py -cbpi/extension/ConfigUpdate/__init__.py -cbpi/extension/ConfigUpdate/config.yaml -cbpi/extension/ConfigUpdate/__pycache__/__init__.cpython-310.pyc -cbpi/extension/ConfigUpdate/__pycache__/__init__.cpython-311.pyc -cbpi/extension/ConfigUpdate/__pycache__/__init__.cpython-37.pyc -cbpi/extension/ConfigUpdate/__pycache__/__init__.cpython-39.pyc -cbpi/extension/FermentationStep/__init__.py -cbpi/extension/FermentationStep/config.yaml -cbpi/extension/FermentationStep/__pycache__/__init__.cpython-310.pyc -cbpi/extension/FermentationStep/__pycache__/__init__.cpython-311.pyc -cbpi/extension/FermentationStep/__pycache__/__init__.cpython-37.pyc -cbpi/extension/FermentationStep/__pycache__/__init__.cpython-39.pyc -cbpi/extension/FermenterHysteresis/__init__.py -cbpi/extension/FermenterHysteresis/config.yaml -cbpi/extension/FermenterHysteresis/__pycache__/__init__.cpython-310.pyc -cbpi/extension/FermenterHysteresis/__pycache__/__init__.cpython-311.pyc -cbpi/extension/FermenterHysteresis/__pycache__/__init__.cpython-37.pyc -cbpi/extension/FermenterHysteresis/__pycache__/__init__.cpython-39.pyc -cbpi/extension/__pycache__/__init__.cpython-310.pyc -cbpi/extension/__pycache__/__init__.cpython-311.pyc -cbpi/extension/__pycache__/__init__.cpython-37.pyc -cbpi/extension/__pycache__/__init__.cpython-39.pyc -cbpi/extension/dummyactor/__init__.py -cbpi/extension/dummyactor/config.yaml -cbpi/extension/dummyactor/__pycache__/__init__.cpython-310.pyc -cbpi/extension/dummyactor/__pycache__/__init__.cpython-311.pyc -cbpi/extension/dummyactor/__pycache__/__init__.cpython-37.pyc -cbpi/extension/dummyactor/__pycache__/__init__.cpython-39.pyc -cbpi/extension/dummysensor/__init__.py -cbpi/extension/dummysensor/config.yaml -cbpi/extension/dummysensor/__pycache__/__init__.cpython-310.pyc -cbpi/extension/dummysensor/__pycache__/__init__.cpython-311.pyc -cbpi/extension/dummysensor/__pycache__/__init__.cpython-37.pyc -cbpi/extension/dummysensor/__pycache__/__init__.cpython-39.pyc -cbpi/extension/gpioactor/__init__.py -cbpi/extension/gpioactor/config.yaml -cbpi/extension/gpioactor/__pycache__/__init__.cpython-310.pyc -cbpi/extension/gpioactor/__pycache__/__init__.cpython-311.pyc -cbpi/extension/gpioactor/__pycache__/__init__.cpython-37.pyc -cbpi/extension/gpioactor/__pycache__/__init__.cpython-39.pyc -cbpi/extension/httpsensor/__init__.py -cbpi/extension/httpsensor/config.yaml -cbpi/extension/httpsensor/__pycache__/__init__.cpython-310.pyc -cbpi/extension/httpsensor/__pycache__/__init__.cpython-311.pyc -cbpi/extension/httpsensor/__pycache__/__init__.cpython-37.pyc -cbpi/extension/httpsensor/__pycache__/__init__.cpython-39.pyc -cbpi/extension/hysteresis/__init__.py -cbpi/extension/hysteresis/config.yaml -cbpi/extension/hysteresis/__pycache__/__init__.cpython-310.pyc -cbpi/extension/hysteresis/__pycache__/__init__.cpython-311.pyc -cbpi/extension/hysteresis/__pycache__/__init__.cpython-37.pyc -cbpi/extension/hysteresis/__pycache__/__init__.cpython-39.pyc -cbpi/extension/mashstep/__init__.py -cbpi/extension/mashstep/config.yaml -cbpi/extension/mashstep/__pycache__/__init__.cpython-310.pyc -cbpi/extension/mashstep/__pycache__/__init__.cpython-311.pyc -cbpi/extension/mashstep/__pycache__/__init__.cpython-37.pyc -cbpi/extension/mashstep/__pycache__/__init__.cpython-39.pyc -cbpi/extension/mqtt_actor/__init__.py -cbpi/extension/mqtt_actor/config.yaml -cbpi/extension/mqtt_actor/generic_mqtt_actor.py -cbpi/extension/mqtt_actor/mqtt_actor.py -cbpi/extension/mqtt_actor/tasmota_mqtt_actor.py -cbpi/extension/mqtt_actor/__pycache__/__init__.cpython-310.pyc -cbpi/extension/mqtt_actor/__pycache__/__init__.cpython-311.pyc -cbpi/extension/mqtt_actor/__pycache__/__init__.cpython-37.pyc -cbpi/extension/mqtt_actor/__pycache__/__init__.cpython-39.pyc -cbpi/extension/mqtt_actor/__pycache__/generic_mqtt_actor.cpython-310.pyc -cbpi/extension/mqtt_actor/__pycache__/generic_mqtt_actor.cpython-311.pyc -cbpi/extension/mqtt_actor/__pycache__/generic_mqtt_actor.cpython-37.pyc -cbpi/extension/mqtt_actor/__pycache__/generic_mqtt_actor.cpython-39.pyc -cbpi/extension/mqtt_actor/__pycache__/mqtt_actor.cpython-310.pyc -cbpi/extension/mqtt_actor/__pycache__/mqtt_actor.cpython-311.pyc -cbpi/extension/mqtt_actor/__pycache__/mqtt_actor.cpython-37.pyc -cbpi/extension/mqtt_actor/__pycache__/mqtt_actor.cpython-39.pyc -cbpi/extension/mqtt_actor/__pycache__/tasmota_mqtt_actor.cpython-310.pyc -cbpi/extension/mqtt_actor/__pycache__/tasmota_mqtt_actor.cpython-311.pyc -cbpi/extension/mqtt_actor/__pycache__/tasmota_mqtt_actor.cpython-37.pyc -cbpi/extension/mqtt_actor/__pycache__/tasmota_mqtt_actor.cpython-39.pyc -cbpi/extension/mqtt_sensor/__init__.py -cbpi/extension/mqtt_sensor/config.yaml -cbpi/extension/mqtt_sensor/__pycache__/__init__.cpython-310.pyc -cbpi/extension/mqtt_sensor/__pycache__/__init__.cpython-311.pyc -cbpi/extension/mqtt_sensor/__pycache__/__init__.cpython-37.pyc -cbpi/extension/mqtt_sensor/__pycache__/__init__.cpython-39.pyc -cbpi/extension/mqtt_util/__init__.py -cbpi/extension/mqtt_util/config.yaml -cbpi/extension/mqtt_util/__pycache__/__init__.cpython-310.pyc -cbpi/extension/mqtt_util/__pycache__/__init__.cpython-311.pyc -cbpi/extension/mqtt_util/__pycache__/__init__.cpython-37.pyc -cbpi/extension/mqtt_util/__pycache__/__init__.cpython-39.pyc -cbpi/extension/onewire/__init__.py -cbpi/extension/onewire/config.yaml -cbpi/extension/onewire/__pycache__/__init__.cpython-310.pyc -cbpi/extension/onewire/__pycache__/__init__.cpython-311.pyc -cbpi/extension/onewire/__pycache__/__init__.cpython-37.pyc -cbpi/extension/onewire/__pycache__/__init__.cpython-39.pyc -cbpi/extension/timer/__init__.py -cbpi/extension/timer/config.yaml -cbpi/extension/timer/__pycache__/__init__.cpython-311.pyc -cbpi/extension/timer/__pycache__/__init__.cpython-39.pyc -cbpi/http_endpoints/__init__.py -cbpi/http_endpoints/http_actor.py -cbpi/http_endpoints/http_config.py -cbpi/http_endpoints/http_dashboard.py -cbpi/http_endpoints/http_fermentation.py -cbpi/http_endpoints/http_fermenterrecipe.py -cbpi/http_endpoints/http_kettle.py -cbpi/http_endpoints/http_log.py -cbpi/http_endpoints/http_login.py -cbpi/http_endpoints/http_notification.py -cbpi/http_endpoints/http_plugin.py -cbpi/http_endpoints/http_recipe.py -cbpi/http_endpoints/http_sensor.py -cbpi/http_endpoints/http_step.py -cbpi/http_endpoints/http_system.py -cbpi/http_endpoints/http_upload.py -cbpi/job/__init__.py -cbpi/job/_job.py -cbpi/job/_scheduler.py -cbpi/job/aiohttp.py -cbpi/static/beer_icon.svg -cbpi/static/calculator_icon.svg -cbpi/static/cbpi_icon.svg -cbpi/static/control_icon.svg -cbpi/static/glass_icon.svg -cbpi/static/grain.svg -cbpi/static/hops_icon.svg -cbpi/static/kettle2_icon.svg -cbpi/static/kettle_icon.svg -cbpi/static/led.svg -cbpi/static/liquid_icon.svg -cbpi/static/paddle_icon.svg -cbpi/static/pipe_icon.svg -cbpi/static/sensor_icon.svg -cbpi/static/splash.png -cbpi/static/svg_icon.svg -cbpi/static/tank_icon.svg -cbpi/static/target_temp.svg -cbpi/static/test.html -cbpi/static/thermomenter.svg -cbpi/static/yeast.svg -cbpi/utils/__init__.py -cbpi/utils/encoder.py -cbpi/utils/utils.py -tests/__init__.py -tests/cbpi_config_fixture.py -tests/test_actor.py -tests/test_cli.py -tests/test_config.py -tests/test_dashboard.py -tests/test_gpio.py -tests/test_index.py -tests/test_kettle.py -tests/test_logger.py -tests/test_notification_controller.py -tests/test_sensor.py -tests/test_step.py -tests/test_system.py -tests/test_ws.py \ No newline at end of file diff --git a/cbpi4.egg-info/dependency_links.txt b/cbpi4.egg-info/dependency_links.txt deleted file mode 100644 index 0ee89bd..0000000 --- a/cbpi4.egg-info/dependency_links.txt +++ /dev/null @@ -1 +0,0 @@ -https://testpypi.python.org/pypi diff --git a/cbpi4.egg-info/entry_points.txt b/cbpi4.egg-info/entry_points.txt deleted file mode 100644 index 604f401..0000000 --- a/cbpi4.egg-info/entry_points.txt +++ /dev/null @@ -1,3 +0,0 @@ -[console_scripts] -cbpi = cbpi.cli:main - diff --git a/cbpi4.egg-info/requires.txt b/cbpi4.egg-info/requires.txt deleted file mode 100644 index 337e19f..0000000 --- a/cbpi4.egg-info/requires.txt +++ /dev/null @@ -1,24 +0,0 @@ -typing-extensions>=4 -aiohttp==3.8.3 -aiohttp-auth==0.1.1 -aiohttp-route-decorator==0.1.4 -aiohttp-security==0.4.0 -aiohttp-session==2.12.0 -aiohttp-swagger==1.0.16 -aiojobs==1.1.0 -aiosqlite==0.17.0 -cryptography==40.0.0 -requests==2.28.1 -voluptuous==0.13.1 -pyfiglet==0.8.post1 -click==8.1.3 -shortuuid==1.0.11 -tabulate==0.9.0 -asyncio-mqtt==0.16.1 -inquirer==3.1.1 -colorama==0.4.6 -psutil==5.9.4 -cbpi4gui -importlib_metadata -numpy==1.24.1 -pandas==1.5.3 diff --git a/cbpi4.egg-info/top_level.txt b/cbpi4.egg-info/top_level.txt deleted file mode 100644 index 4e032d0..0000000 --- a/cbpi4.egg-info/top_level.txt +++ /dev/null @@ -1,2 +0,0 @@ -cbpi -tests From b52e260b4a0ee27cf069a3c54ffc956bac84544e Mon Sep 17 00:00:00 2001 From: avollkopf <43980694+avollkopf@users.noreply.github.com> Date: Mon, 27 Mar 2023 22:04:54 +0200 Subject: [PATCH 30/34] bug fix --- cbpi/extension/mqtt_sensor/__init__.py | 2 +- cbpi/extension/onewire/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cbpi/extension/mqtt_sensor/__init__.py b/cbpi/extension/mqtt_sensor/__init__.py index 7a9a6aa..bec2799 100644 --- a/cbpi/extension/mqtt_sensor/__init__.py +++ b/cbpi/extension/mqtt_sensor/__init__.py @@ -79,7 +79,7 @@ class MQTTSensor(CBPiSensor): logging.error("MQTT Sensor Error {}".format(e)) async def logvalue(self): - if self.reducedfrequency == 0: + if self.reducedfrequency != 0: self.kettle = self.get_kettle(self.kettleid) if self.kettleid is not None else None self.fermenter = self.get_fermenter(self.fermenterid) if self.fermenterid is not None else None now=time.time() diff --git a/cbpi/extension/onewire/__init__.py b/cbpi/extension/onewire/__init__.py index 056f401..c4d442f 100644 --- a/cbpi/extension/onewire/__init__.py +++ b/cbpi/extension/onewire/__init__.py @@ -123,7 +123,7 @@ class OneWire(CBPiSensor): await asyncio.sleep(self.interval) async def logvalue(self): - if self.reducedfrequency == 0: + if self.reducedfrequency != 0: now=time.time() logging.info("OneWire {} logging subroutine".format(self.sensor.name)) if self.kettle is not None: From 54eb769fb33bf0ff455296275b654d49808756ea Mon Sep 17 00:00:00 2001 From: avollkopf <43980694+avollkopf@users.noreply.github.com> Date: Mon, 27 Mar 2023 22:12:11 +0200 Subject: [PATCH 31/34] another fix --- cbpi/extension/onewire/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cbpi/extension/onewire/__init__.py b/cbpi/extension/onewire/__init__.py index c4d442f..663fb58 100644 --- a/cbpi/extension/onewire/__init__.py +++ b/cbpi/extension/onewire/__init__.py @@ -80,7 +80,7 @@ class OneWire(CBPiSensor): if self.kettleid is not None and self.fermenterid is not None: self.reducedlogging=False self.cbpi.notify("OneWire Sensor", "Sensor '" + str(self.sensor.name) + "' cant't have Fermenter and Kettle defined for reduced logging.", NotificationType.WARNING, action=[NotificationAction("OK", self.Confirm)]) - if self.interval >= self.reducedfrequency: + if (self.reducedfrequency != 0) and (self.interval >= self.reducedfrequency): self.reducedlogging=False self.cbpi.notify("OneWire Sensor", "Sensor '" + str(self.sensor.name) + "' has shorter or equal 'reduced logging' compared to regular interval.", NotificationType.WARNING, action=[NotificationAction("OK", self.Confirm)]) From 7df48bdf088ad12f8482eb7b2c3c470dc86db528 Mon Sep 17 00:00:00 2001 From: avollkopf <43980694+avollkopf@users.noreply.github.com> Date: Mon, 27 Mar 2023 22:31:47 +0200 Subject: [PATCH 32/34] missing varable in mqttsensor --- cbpi/__init__.py | 2 +- cbpi/extension/mqtt_sensor/__init__.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cbpi/__init__.py b/cbpi/__init__.py index 2c56255..497a4df 100644 --- a/cbpi/__init__.py +++ b/cbpi/__init__.py @@ -1,3 +1,3 @@ -__version__ = "4.1.7.rc2" +__version__ = "4.1.7.rc3" __codename__ = "Groundhog Day" diff --git a/cbpi/extension/mqtt_sensor/__init__.py b/cbpi/extension/mqtt_sensor/__init__.py index bec2799..b6c8d09 100644 --- a/cbpi/extension/mqtt_sensor/__init__.py +++ b/cbpi/extension/mqtt_sensor/__init__.py @@ -129,6 +129,7 @@ class MQTTSensor(CBPiSensor): return dict(value=self.value) async def on_stop(self): + was_cancelled=False if not self.mqtt_task.done(): logging.info("Task not done -> cancelling") was_cancelled = self.mqtt_task.cancel() From 03647695739c24dc6624f94645c8d0434ab5d7bb Mon Sep 17 00:00:00 2001 From: avollkopf <43980694+avollkopf@users.noreply.github.com> Date: Tue, 28 Mar 2023 07:00:21 +0200 Subject: [PATCH 33/34] fixed another bug in case of no logging during inactivity --- cbpi/extension/httpsensor/__init__.py | 52 ++++++++++++------------- cbpi/extension/mqtt_sensor/__init__.py | 53 +++++++++++++------------- cbpi/extension/onewire/__init__.py | 51 +++++++++++++------------ 3 files changed, 78 insertions(+), 78 deletions(-) diff --git a/cbpi/extension/httpsensor/__init__.py b/cbpi/extension/httpsensor/__init__.py index 74fc002..c37c11e 100644 --- a/cbpi/extension/httpsensor/__init__.py +++ b/cbpi/extension/httpsensor/__init__.py @@ -86,44 +86,42 @@ class HTTPSensor(CBPiSensor): await asyncio.sleep(1) async def logvalue(self): - if self.reducedfrequency != 0: - now=time.time() - if self.kettle is not None: - try: - kettlestatus=self.kettle.instance.state - except: - kettlestatus=False - if kettlestatus: - self.log_data(self.value) - logging.info("Kettle Active") - self.lastlog = time.time() - else: - logging.info("Kettle Inactive") + now=time.time() + if self.kettle is not None: + try: + kettlestatus=self.kettle.instance.state + except: + kettlestatus=False + if kettlestatus: + self.log_data(self.value) + logging.info("Kettle Active") + self.lastlog = time.time() + else: + logging.info("Kettle Inactive") + if self.reducedfrequency != 0: if now >= self.lastlog + self.reducedfrequency: self.log_data(self.value) self.lastlog = time.time() logging.info("Logged with reduced freqency") pass - if self.fermenter is not None: - try: - fermenterstatus=self.fermenter.instance.state - except: - fermenterstatus=False - if fermenterstatus: - self.log_data(self.value) - logging.info("Fermenter Active") - self.lastlog = time.time() - else: - logging.info("Fermenter Inactive") + if self.fermenter is not None: + try: + fermenterstatus=self.fermenter.instance.state + except: + fermenterstatus=False + if fermenterstatus: + self.log_data(self.value) + logging.info("Fermenter Active") + self.lastlog = time.time() + else: + logging.info("Fermenter Inactive") + if self.reducedfrequency != 0: if now >= self.lastlog + self.reducedfrequency: self.log_data(self.value) self.lastlog = time.time() logging.info("Logged with reduced freqency") pass - else: - logging.warning("No logging") - pass def get_state(self): # return the current state of the sensor diff --git a/cbpi/extension/mqtt_sensor/__init__.py b/cbpi/extension/mqtt_sensor/__init__.py index b6c8d09..47114cf 100644 --- a/cbpi/extension/mqtt_sensor/__init__.py +++ b/cbpi/extension/mqtt_sensor/__init__.py @@ -79,38 +79,39 @@ class MQTTSensor(CBPiSensor): logging.error("MQTT Sensor Error {}".format(e)) async def logvalue(self): - if self.reducedfrequency != 0: - self.kettle = self.get_kettle(self.kettleid) if self.kettleid is not None else None - self.fermenter = self.get_fermenter(self.fermenterid) if self.fermenterid is not None else None - now=time.time() - if self.kettle is not None: - try: - kettlestatus=self.kettle.instance.state - except: - kettlestatus=False - if kettlestatus: - self.log_data(self.value) - logging.info("MQTTSensor {} Kettle Active".format(self.sensor.name)) - self.lastlog = time.time() - else: - logging.info("MQTTSensor {} Kettle Inactive".format(self.sensor.name)) + self.kettle = self.get_kettle(self.kettleid) if self.kettleid is not None else None + self.fermenter = self.get_fermenter(self.fermenterid) if self.fermenterid is not None else None + now=time.time() + if self.kettle is not None: + try: + kettlestatus=self.kettle.instance.state + except: + kettlestatus=False + if kettlestatus: + self.log_data(self.value) + logging.info("MQTTSensor {} Kettle Active".format(self.sensor.name)) + self.lastlog = time.time() + else: + logging.info("MQTTSensor {} Kettle Inactive".format(self.sensor.name)) + if self.reducedfrequency != 0: if now >= self.lastlog + self.reducedfrequency: self.log_data(self.value) self.lastlog = time.time() logging.info("Logged with reduced freqency") pass - if self.fermenter is not None: - try: - fermenterstatus=self.fermenter.instance.state - except: - fermenterstatus=False - if fermenterstatus: - self.log_data(self.value) - logging.info("MQTTSensor {} Fermenter Active".format(self.sensor.name)) - self.lastlog = time.time() - else: - logging.info("MQTTSensor {} Fermenter Inactive".format(self.sensor.name)) + if self.fermenter is not None: + try: + fermenterstatus=self.fermenter.instance.state + except: + fermenterstatus=False + if fermenterstatus: + self.log_data(self.value) + logging.info("MQTTSensor {} Fermenter Active".format(self.sensor.name)) + self.lastlog = time.time() + else: + logging.info("MQTTSensor {} Fermenter Inactive".format(self.sensor.name)) + if self.reducedfrequency != 0: if now >= self.lastlog + self.reducedfrequency: self.log_data(self.value) self.lastlog = time.time() diff --git a/cbpi/extension/onewire/__init__.py b/cbpi/extension/onewire/__init__.py index 663fb58..de78c78 100644 --- a/cbpi/extension/onewire/__init__.py +++ b/cbpi/extension/onewire/__init__.py @@ -123,37 +123,38 @@ class OneWire(CBPiSensor): await asyncio.sleep(self.interval) async def logvalue(self): - if self.reducedfrequency != 0: - now=time.time() - logging.info("OneWire {} logging subroutine".format(self.sensor.name)) - if self.kettle is not None: - try: - kettlestatus=self.kettle.instance.state - except: - kettlestatus=False - if kettlestatus: - self.log_data(self.value) - logging.info("OneWire {} Kettle Active".format(self.sensor.name)) - self.lastlog = time.time() - else: - logging.info("OneWire {} Kettle Inactive".format(self.sensor.name)) + now=time.time() + logging.info("OneWire {} logging subroutine".format(self.sensor.name)) + if self.kettle is not None: + try: + kettlestatus=self.kettle.instance.state + except: + kettlestatus=False + if kettlestatus: + self.log_data(self.value) + logging.info("OneWire {} Kettle Active".format(self.sensor.name)) + self.lastlog = time.time() + else: + logging.info("OneWire {} Kettle Inactive".format(self.sensor.name)) + if self.reducedfrequency != 0: if now >= self.lastlog + self.reducedfrequency: self.log_data(self.value) self.lastlog = time.time() logging.info("Logged with reduced freqency") pass - if self.fermenter is not None: - try: - fermenterstatus=self.fermenter.instance.state - except: - fermenterstatus=False - if fermenterstatus: - self.log_data(self.value) - logging.info("OneWire {} Fermenter Active".format(self.sensor.name)) - self.lastlog = time.time() - else: - logging.info("OneWire {} Fermenter Inactive".format(self.sensor.name)) + if self.fermenter is not None: + try: + fermenterstatus=self.fermenter.instance.state + except: + fermenterstatus=False + if fermenterstatus: + self.log_data(self.value) + logging.info("OneWire {} Fermenter Active".format(self.sensor.name)) + self.lastlog = time.time() + else: + logging.info("OneWire {} Fermenter Inactive".format(self.sensor.name)) + if self.reducedfrequency != 0: if now >= self.lastlog + self.reducedfrequency: self.log_data(self.value) self.lastlog = time.time() From 35252a2b83583541b877172ae50b4771c7ddfa29 Mon Sep 17 00:00:00 2001 From: avollkopf <43980694+avollkopf@users.noreply.github.com> Date: Wed, 29 Mar 2023 06:53:59 +0200 Subject: [PATCH 34/34] change rev --- cbpi/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cbpi/__init__.py b/cbpi/__init__.py index 497a4df..be197c8 100644 --- a/cbpi/__init__.py +++ b/cbpi/__init__.py @@ -1,3 +1,3 @@ -__version__ = "4.1.7.rc3" +__version__ = "4.1.7" __codename__ = "Groundhog Day"