Add pre-commit and black

.gitignore

@@ -11,7 +11,7 @@ cbpi/extension/ui
 node_modules
 .DS_STORE
 .vscode
-.DS_Store 
+.DS_Store
 .vscode/
 config/*
-logs/
+logs/

.pre-commit-config.yaml

@@ -0,0 +1,14 @@
+---
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v3.4.0
+    hooks:
+      - id: check-added-large-files
+      - id: check-toml
+      - id: end-of-file-fixer
+      - id: trailing-whitespace
+      - id: check-added-large-files
+  - repo: https://github.com/ambv/black
+    rev: 21.5b0
+    hooks:
+      - id: black

Dockerfile

@@ -10,5 +10,3 @@ COPY . .
 EXPOSE 8080
 
 CMD [ "cbpi" ]
-
-

MANIFEST.in

@@ -1,3 +1,3 @@
 recursive-include cbpi/config *
 recursive-include cbpi/extension *
-recursive-include cbpi/static *
+recursive-include cbpi/static *

README.md

@@ -1,4 +1,3 @@
 # CraftBeerPi
 
 You will finde the documentation here: https://craftbeerpi.gitbook.io/craftbeerpi4/
-

cbpi/__init__.py

@@ -1 +1 @@
-__version__ = "4.0.0.29"
+__version__ = "4.0.0.29"

cbpi/api/__init__.py

@@ -1,20 +1,22 @@
-__all__ = ["CBPiActor",
-           "CBPiExtension",
-           "Property",
-           "PropertyType",
-           "on_event",
-           "on_startup",
-           "request_mapping",
-           "action",
-           "parameters",
-           "background_task",
-           "CBPiKettleLogic",
-           "CBPiException",
-           "KettleException",
-           "SensorException",
-           "ActorException",
-           "CBPiSensor",
-           "CBPiStep"]
+__all__ = [
+    "CBPiActor",
+    "CBPiExtension",
+    "Property",
+    "PropertyType",
+    "on_event",
+    "on_startup",
+    "request_mapping",
+    "action",
+    "parameters",
+    "background_task",
+    "CBPiKettleLogic",
+    "CBPiException",
+    "KettleException",
+    "SensorException",
+    "ActorException",
+    "CBPiSensor",
+    "CBPiStep",
+]
 
 from cbpi.api.actor import *
 from cbpi.api.sensor import *
@@ -23,4 +25,4 @@
 from cbpi.api.decorator import *
 from cbpi.api.kettle_logic import *
 from cbpi.api.step import *
-from cbpi.api.exceptions import *
+from cbpi.api.exceptions import *

cbpi/api/actor.py

@@ -11,22 +11,21 @@
 
 
 class CBPiActor(metaclass=ABCMeta):
-
     def __init__(self, cbpi, id, props):
         self.cbpi = cbpi
         self.id = id
         self.props = props
         self.logger = logging.getLogger(__file__)
         self.data_logger = None
-        self.state = False  
+        self.state = False
         self.running = False
 
     def init(self):
         pass
 
     def log_data(self, value):
         self.cbpi.log.log_data(self.id, value)
-        
+
     def get_state(self):
         return dict(state=self.state)
 
@@ -44,7 +43,7 @@ async def on_stop(self):
 
     async def run(self):
         pass
-    
+
     async def _run(self):
 
         try:
@@ -55,37 +54,34 @@ async def _run(self):
         finally:
             await self.on_stop()
 
-
-
-    def get_static_config_value(self,name,default):
+    def get_static_config_value(self, name, default):
         return self.cbpi.static_config.get(name, default)
 
-    def get_config_value(self,name,default):
+    def get_config_value(self, name, default):
         return self.cbpi.config.get(name, default=default)
 
-    async def set_config_value(self,name,value):
-        return await self.cbpi.config.set(name,value)
+    async def set_config_value(self, name, value):
+        return await self.cbpi.config.set(name, value)
 
-    async def add_config_value(self, name, value, type: ConfigType, description, options=None):
+    async def add_config_value(
+        self, name, value, type: ConfigType, description, options=None
+    ):
         await self.cbpi.add(name, value, type, description, options=None)
 
     async def on(self, power):
-        '''
-        Code to switch the actor on. Power is provided as integer value  
-        
-        :param power: power value between 0 and 100 
+        """
+        Code to switch the actor on. Power is provided as integer value
+
+        :param power: power value between 0 and 100
         :return: None
-        '''
+        """
         pass
 
     async def off(self):
 
-        '''
+        """
         Code to switch the actor off
-
-        :return: None 
-        '''
-        pass
-
-
 
+        :return: None
+        """
+        pass

cbpi/api/base.py

@@ -7,57 +7,56 @@
 
 
 class CBPiBase(metaclass=ABCMeta):
-
-    def get_static_config_value(self,name,default):
+    def get_static_config_value(self, name, default):
         return self.cbpi.static_config.get(name, default)
 
-    def get_config_value(self,name,default):
+    def get_config_value(self, name, default):
         return self.cbpi.config.get(name, default=default)
 
-    async def set_config_value(self,name,value):
-        return await self.cbpi.config.set(name,value)
+    async def set_config_value(self, name, value):
+        return await self.cbpi.config.set(name, value)
 
-    async def add_config_value(self, name, value, type: ConfigType, description, options=None):
+    async def add_config_value(
+        self, name, value, type: ConfigType, description, options=None
+    ):
         await self.cbpi.add(name, value, type, description, options=None)
 
-    def get_kettle(self,id):
+    def get_kettle(self, id):
         return self.cbpi.kettle.find_by_id(id)
 
-    def get_kettle_target_temp(self,id):
+    def get_kettle_target_temp(self, id):
         return self.cbpi.kettle.find_by_id(id).target_temp
 
-    async def set_target_temp(self,id, temp):
+    async def set_target_temp(self, id, temp):
         await self.cbpi.kettle.set_target_temp(id, temp)
 
-    def get_sensor(self,id):
+    def get_sensor(self, id):
         return self.cbpi.sensor.find_by_id(id)
-    
-    def get_sensor_value(self,id):
-        
+
+    def get_sensor_value(self, id):
+
         return self.cbpi.sensor.get_sensor_value(id)
 
-    def get_actor(self,id):
+    def get_actor(self, id):
         return self.cbpi.actor.find_by_id(id)
 
-    def get_actor_state(self,id):
+    def get_actor_state(self, id):
         try:
             actor = self.cbpi.actor.find_by_id(id)
             return actor.get("instance").get_state()
         except:
             logging.error("Faild to read actor state in step - actor {}".format(id))
             return None
 
-    async def actor_on(self,id):
-        
+    async def actor_on(self, id):
+
         try:
             await self.cbpi.actor.on(id)
         except Exception as e:
             pass
 
-    async def actor_off(self,id):
+    async def actor_off(self, id):
         try:
             await self.cbpi.actor.off(id)
         except Exception as e:
             pass
-
-

cbpi/api/config.py

@@ -1,11 +1,10 @@
 from enum import Enum
 
+
 class ConfigType(Enum):
     STRING = "string"
     NUMBER = "number"
     SELECT = "select"
     KETTLE = "kettle"
     ACTOR = "actor"
     SENSOR = "sensor"
-
-