Merge pull request #171 from PiBrewing/development

Merge from Development branch

Author: avollkopf

.devcontainer/Dockerfile

@@ -1,9 +1,8 @@
-FROM mcr.microsoft.com/vscode/devcontainers/python:3.11-bookworm
+FROM mcr.microsoft.com/vscode/devcontainers/python:3.13-trixie
 
 RUN     apt-get update \
     &&  apt-get upgrade -y
 RUN apt-get install --no-install-recommends -y \
-    libatlas-base-dev \
     libsystemd-dev \
     libffi-dev \
     python3-pip \

CHANGELOG.md

@@ -1,7 +1,25 @@
 # Changelog
 
+## Server Version 4.7.0 (23.11.25):
+### Codename: Winter Bock
+
+### Maintenance: 
+- Update required packages to latest versions.
+- Update dockerfile requirements.
+- adapt deprecated get_event_loops
+
+### Fixes:
+- Fix error handling for local recipe file loading.
+- Catch empty MQTT values (Error handling).
+- Change rights of log file if file is not accessible.
+
+### Features:
+- Add Chromium autostart feature for trixie os
+- Add function to transfer free memory value to GUI as well as minimum memory config parameter to reload browser page if memory becomes lower.
+- Use output value as alternative (Alternative actor plugin required to ensure higher resolution) instead of power (0-100%).
+- Add optional actor to boilstep for steam condensor or solenoid valve
+
 ## Server Version 4.6.1 (16.04.25):
-### Codename: Hop Master
 
 ### Fixes:
 - Restore Config via raspberryPi did not work. Fix in system controller to check as well for 'application/zip' content type (Issue #162) (4.6.1.a1)

Dockerfile

@@ -3,13 +3,12 @@ RUN apk --no-cache add curl && mkdir /downloads
 # Download installation files
 RUN curl https://github.com/PiBrewing/craftbeerpi4-ui/archive/main.zip -L -o ./downloads/cbpi-ui.zip
 
-FROM python:3.10 as base
+FROM python:3.13 as base
 
 # Install dependencies
 RUN     apt-get update \
     &&  apt-get upgrade -y
 RUN apt-get install --no-install-recommends -y \
-    libatlas-base-dev \
     libsystemd-dev \
     libffi-dev \
     python3-pip \

cbpi/__init__.py

@@ -1,2 +1,2 @@
-__version__ = "4.6.1"
-__codename__ = "Hop Master"
+__version__ = "4.7.0"
+__codename__ = "Winter Bock"

cbpi/api/actor.py

@@ -21,6 +21,8 @@ def __init__(self, cbpi, id, props):
         self.state = False
         self.running = False
         self.power = 100
+        self.output = 100
+        self.maxoutput = 100
         self.timer = 0
 
     def init(self):
@@ -71,7 +73,7 @@ async def add_config_value(
     ):
         await self.cbpi.add(name, value, type, description, options=None)
 
-    async def on(self, power):
+    async def on(self, power, output=None):
         """
         Code to switch the actor on. Power is provided as integer value
 
@@ -96,3 +98,12 @@ async def set_power(self, power):
         """
         return dict(power=self.power)
         pass
+
+    async def set_output(self, output):
+        """
+        Code to set power for actor
+
+        :return: dict power
+        """
+        return dict(output=self.output)
+        pass

cbpi/api/base.py

@@ -67,10 +67,10 @@ def get_actor_state(self, id):
             logging.error("Failed to read actor state in step - actor {}".format(id))
             return False
 
-    async def actor_on(self, id, power=100):
+    async def actor_on(self, id, power=100, output=None):
 
         try:
-            await self.cbpi.actor.on(id, power)
+            await self.cbpi.actor.on(id, power, output)
         except Exception as e:
             pass
 
@@ -85,3 +85,9 @@ async def actor_set_power(self, id, power):
             await self.cbpi.actor.set_power(id, power)
         except Exception as e:
             pass
+
+    async def actor_set_output(self, id, output):
+        try:
+            await self.cbpi.actor.set_output(id, output)
+        except Exception as e:
+            pass

cbpi/api/dataclasses.py

@@ -6,6 +6,7 @@
 from cbpi.api.step import StepState
 
 
+
 class Props:
 
     def __init__(self, data={}):
@@ -58,13 +59,22 @@ class Actor:
     props: Props = Props()
     state: bool = False
     power: int = 100
+    maxoutput: int = 100
+    output: int = maxoutput
     timer: int = 0
     type: str = None
     instance: str = None
 
     def __str__(self):
-        return "name={} props={}, state={}, type={}, power={}, timer={}".format(
-            self.name, self.props, self.state, self.type, self.power, self.timer
+        return "name={} props={}, state={}, type={}, power={}, output={}, maxoutput={}, timer={}".format(
+            self.name,
+            self.props,
+            self.state,
+            self.type,
+            self.power,
+            self.output,
+            self.maxoutput,
+            self.timer,
         )
 
     def to_dict(self):
@@ -81,6 +91,8 @@ def to_dict(self):
             props=self.props.to_dict(),
             state=state,
             power=self.power,
+            output=self.output,
+            maxoutput=self.maxoutput,
             timer=self.timer,
         )
 

cbpi/api/property.py

@@ -11,16 +11,18 @@ class Select(PropertyType):
         Select Property. The user can select value from list set as options parameter
         """
 
-        def __init__(self, label, options, description=""):
+        def __init__(self, label, options, default_value=None, description=""):
             """
 
             :param label:
             :param options:
+            :param default_value:
             :param description:
             """
             PropertyType.__init__(self)
             self.label = label
             self.options = options
+            self.default_value = default_value
             self.description = description
 
     class Number(PropertyType):