- Refactoring

- Action Button with Parameter
- Actor Action with Parameter
- Sensor Action with Parameter

Dockerfile

@@ -1,14 +0,0 @@
-# Dockerfile for development on a pc/mac
-FROM python:2
-
-EXPOSE 5000
-
-WORKDIR /usr/src/app
-
-COPY requirements.txt ./
-
-RUN pip install --no-cache-dir -r requirements.txt
-
-COPY . .
-
-CMD ["python", "run.py"]

README.md

@@ -28,21 +28,6 @@ http://web.craftbeerpi.com/hardware/
 
 CraftBeerPi 3.0 is a complete rewrite. Server as well as user interface. I recommend to use a second SD card for testing.
 
-## Docker-based development
-
-For developing this application or its plugins on a PC/Mac you can use the docker-compose file:
-
-``` shell
-$ docker-compose up
-...
-Starting craftbeerpi3_app_1 ... done
-Attaching to craftbeerpi3_app_1
-app_1  | [2018-08-13 12:54:44,264] ERROR in __init__: BUZZER not working
-app_1  | (1) wsgi starting up on http://0.0.0.0:5000
-```
-
-The contents of this folder will be mounted to `/usr/src/craftbeerpi3` and the server will be accesible on `localhost:5000`.
-
 ## Donation
 
 CraftBeerPi is a free & open source project. If you like to support the project I happy about a donation:

config/schema.sql

@@ -84,8 +84,7 @@ INSERT OR IGNORE INTO config VALUES ('actor_cols', 4, 'select', 'Adjust the widt
 INSERT OR IGNORE INTO config VALUES ('sensor_cols', 4, 'select', 'Adjust the width of a sensor widget on the brewing dashboard', '[1,2,3, 4, 5, 6, 7, 8, 9, 10, 11, 12]');
 INSERT OR IGNORE INTO config VALUES ('unit', 'C', 'select', 'Temperature Unit', '["C","F"]');
 INSERT OR IGNORE INTO config VALUES ('brewery_name', 'My Home Brewery', 'text', 'Your brewery name', NULL );
-INSERT OR IGNORE INTO config VALUES ('buzzer', 16, 'select', 'Buzzer GPIO', '[16,17,18,19,20,21,22,23]');
-INSERT OR IGNORE INTO config VALUES ('buzzer_beep_level', 'HIGH', 'select', 'Buzzer Logic Beep Level', '["HIGH", "LOW"]');
+INSERT OR IGNORE INTO config VALUES ('buzzer', 16, 'select', 'Buzzer GPIO', '[16,17,18,19,20]');
 INSERT OR IGNORE INTO config VALUES ('setup', 'YES', 'select', 'Show the Setup dialog', '["YES","NO"]');
 INSERT OR IGNORE INTO config VALUES ('brew_name', '', 'text', 'Brew Name', NULL);
 INSERT OR IGNORE INTO config VALUES ('donation_notification', 'YES', 'select', 'Disable Donation Notification', '["YES","NO"]');

docker-compose.yml

@@ -1,9 +0,0 @@
-# docker-compose file for development on a pc/mac
-version: '3.3'
-services:
-  app:
-    build: .
-    ports: 
-      - 5000:5000
-    volumes:
-      - $PWD:/usr/src/app

gittest.py

@@ -0,0 +1,27 @@
+import requests
+from git import Repo, Git
+
+repo = Repo('./')
+branch = repo.active_branch
+
+print branch.name
+
+for remote in repo.remotes:
+    remote.fetch()
+
+url = 'https://api.github.com/repos/manuel83/craftbeerpi3/releases'
+response = requests.get(url)
+
+
+result = {"branches":[], "releases": []}
+
+result["branches"].append({"name": "master"})
+
+for branch in repo.branches:
+    result["branches"].append({"name": branch.name})
+
+for r in response.json():
+    result["releases"].append({"name": "tags/%s" % r.get("tag_name")})
+
+print result
+

install.sh

@@ -19,8 +19,7 @@ show_menu () {
    "7" "Software Update (git pull)" \
    "8" "Reset File Changes (git reset --hard)" \
    "9" "Clear all logs" \
-   "10" "Reboot Raspberry Pi" \
-   "11" "Stop CraftBeerPi, Clear logs, Start CraftBeerPi" 3>&1 1>&2 2>&3)
+   "10" "Reboot Raspberry Pi"  3>&1 1>&2 2>&3)
 
    BUTTON=$?
    # Exit if user pressed cancel or escape
@@ -35,6 +34,14 @@ show_menu () {
              apt-get -y update; apt-get -y upgrade;
            fi
 
+           confirmAnswer "Would you like to install wiringPI? This is required to control the GPIO"
+           if [ $? = 0 ]; then
+             git clone git://git.drogon.net/wiringPi;
+             cd wiringPi;
+             ./build; cd ..;
+             rm -rf wiringPi;
+           fi
+
            apt-get -y install python-setuptools
            easy_install pip
            apt-get -y install python-dev
@@ -136,17 +143,6 @@ show_menu () {
               show_menu
             fi
             ;;
-        11)
-            confirmAnswer "Are you sure you want to reboot CraftBeerPi and delete all log files?"
-            if [ $? = 0 ]; then
-              sudo /etc/init.d/craftbeerpiboot stop
-	      sudo rm -rf logs/*.log
-	      sudo /etc/init.d/craftbeerpiboot start
-	      show_menu
-            else
-              show_menu
-            fi
-            ;;
        esac
    fi
 }

modules/__init__.py

@@ -1,72 +1,4 @@
-import json
-import pprint
-import sys, os
-from flask import Flask, render_template, redirect
-from flask_socketio import SocketIO, emit
+from modules.core.core import CraftBeerPI, Addon
 
-import logging
-# Define the WSGI application object
-
-from app_config import *
-import pprint
-
-from modules.core.db import get_db
-
-
-@app.route('/')
-def index():
-    return redirect('ui')
-
-
-# Define the database object which is imported
-# by modules and controllers
-
-
-import modules.steps
-import modules.config
-import modules.logs
-import modules.sensors
-import modules.actor
-import modules.notification
-import modules.fermenter
-from modules.addon.endpoints import initPlugins
-import modules.ui
-import modules.system
-import modules.buzzer
-import modules.stats
-import modules.kettle
-import modules.recipe_import
-import modules.core.db_mirgrate
-
-from app_config import cbpi
-# Build the database:
-# This will create the database file using SQLAlchemy
-
-
-pp = pprint.PrettyPrinter(indent=6)
-
-
-def init_db():
-    print "INIT DB"
-    with app.app_context():
-        db = get_db()
-
-        try:
-            with app.open_resource('../config/schema.sql', mode='r') as f:
-                db.cursor().executescript(f.read())
-
-            db.commit()
-        except Exception as e:
-            pass
-
-init_db()
-initPlugins()
-cbpi.run_init()
-
-cbpi.run_background_processes()
-
-
-
-app.logger.info("##########################################")
-app.logger.info("### STARTUP COMPLETE")
-app.logger.info("##########################################")
+cbpi = CraftBeerPI()
+cbpi.addon = Addon(cbpi)

modules/action/__init__.py

@@ -0,0 +1,34 @@
+import json
+
+from flask import request
+from flask_classy import FlaskView, route
+from modules import cbpi
+
+class ActionView(FlaskView):
+
+    @route('/<action>', methods=['POST'])
+    def action(self, action):
+        """
+        Call global action button
+        ---
+        tags:
+          - action
+        responses:
+          200:
+            description: action invoked
+        """
+        data = request.json
+
+        obj = self.cbpi.cache["actions"][action]["class"](self.cbpi)
+        obj.execute(**data)
+        return ('',204)
+
+@cbpi.addon.core.initializer()
+def init(cbpi):
+    """
+    Initializer for the message module
+    :param app: the flask app
+    :return: None
+    """
+    ActionView.cbpi = cbpi
+    ActionView.register(cbpi.web, route_base='/api/action')

modules/actor/__init__.py

@@ -1,74 +1,198 @@
 import time
+
+from flask import request
 from flask_classy import route
-from modules import DBModel, cbpi
-from modules.core.baseview import BaseView
+from flask_login import login_required
 
-class Actor(DBModel):
-    __fields__ = ["name","type", "config", "hide"]
-    __table_name__ = "actor"
-    __json_fields__ = ["config"]
+from modules.core.db import DBModel
+from modules import cbpi
+from modules.core.baseview import RestApi
+from modules.database.dbmodel import Actor
 
-class ActorView(BaseView):
+
+class ActorView(RestApi):
     model = Actor
     cache_key = "actors"
 
     @classmethod
     def post_init_callback(self, obj):
+
         obj.state = 0
         obj.power = 100
 
     def _post_post_callback(self, m):
-        self.api.init_actor(m.id)
+        self.api.actor.init_one(m.id)
 
     def _post_put_callback(self, m):
+        self.api.actor.init_one(m.id)
 
-        self.api.init_actor(m.id)
-
+    @login_required
     @route("<int:id>/switch/on", methods=["POST"])
     def on(self, id):
-        self.api.switch_actor_on(id)
+        """
+        Switch actor on
+        ---
+        tags:
+          - actor
+        parameters:
+          - in: path
+            name: id
+            schema:
+              type: integer
+            required: true
+            description: Numeric ID of the actor
+        responses:
+          200:
+            description: Actor switched on
+        """
+        self.api.actor.on(id)
         return ('', 204)
 
+    @login_required
     @route("<int:id>/switch/off", methods=["POST"])
     def off(self, id):
-        self.api.switch_actor_off(id)
+        """
+        Switch actor off
+        ---
+        tags:
+          - actor
+        parameters:
+          - in: path
+            name: id
+            schema:
+              type: integer
+            required: true
+            description: Numeric ID of the actor
+        responses:
+          200:
+            description: Actor switched off
+        """
+        self.api.actor.off(id)
         return ('', 204)
 
+    @login_required
     @route("<int:id>/power/<int:power>", methods=["POST"])
     def power(self, id, power):
-        self.api.actor_power(id, power)
+        """
+        Set Actor Power 
+        ---
+        tags:
+          - actor
+        parameters:
+          - in: path
+            name: id
+            schema:
+              type: integer
+            required: true
+            description: Numeric ID of the actor
+          - in: path
+            name: power
+            schema:
+              type: integer
+            required: true
+            description: Power value between 0 - 100
+        responses:
+          200:
+            description: Actor power set
+        """
+        self.api.actor.power(id, power)
         return ('', 204)
 
+    @login_required
     @route("<int:id>/toggle", methods=["POST"])
     def toggle(self, id):
-
-        if self.api.cache.get("actors").get(id).state == 0:
-            self.on(id)
-        else:
-            self.off(id)
+        """
+        Toggle Actor 
+        ---
+        tags:
+          - actor
+        parameters:
+          - in: path
+            name: id
+            schema:
+              type: integer
+            required: true
+            description: Numeric ID of the actor
+        responses:
+          200:
+            description: Actor toggled
+        """
+        cbpi.actor.toggle(id)
         return ('', 204)
 
     def toggleTimeJob(self, id, t):
         self.api.cache.get("actors").get(int(id)).timer = int(time.time()) + int(t)
         self.toggle(int(id))
-        self.api.socketio.sleep(t)
+        self.api.sleep(t)
         self.api.cache.get("actors").get(int(id)).timer = None
         self.toggle(int(id))
 
+    @login_required
     @route("/<id>/toggle/<int:t>", methods=["POST"])
     def toggleTime(self, id, t):
-        t = self.api.socketio.start_background_task(target=self.toggleTimeJob, id=id, t=t)
+        """
+        Toggle Actor for a defined time
+        ---
+        tags:
+          - actor
+        parameters:
+          - in: path
+            name: id
+            schema:
+              type: integer
+            required: true
+            description: Numeric ID of the actor
+          - in: path
+            name: time
+            schema:
+              type: integer
+            required: true
+            description: time in seconds
+        responses:
+          200:
+            description: Actor toggled
+        """
+        self.api.actor.toggle_timeout(id, t)
+        #t = self.api._socketio.start_background_task(target=self.toggleTimeJob, id=id, t=t)
         return ('', 204)
 
+    @login_required
     @route('<int:id>/action/<method>', methods=["POST"])
     def action(self, id, method):
-
-        cbpi.cache.get("actors").get(id).instance.__getattribute__(method)()
+        """
+        Actor Action 
+        ---
+        tags:
+          - actor
+        parameters:
+          - in: path
+            name: id
+            schema:
+              type: integer
+            required: true
+            description: Numeric ID of the actor
+          - in: path
+            name: method
+            schema:
+              type: string
+            required: true
+            description: action method name
+        responses:
+          200:
+            description: Actor Action called
+        """
+        data = request.json
+        if data:
+            cbpi.actor.action(id, method, **data)
+        else:
+            cbpi.actor.action(id, method)
         return ('', 204)
 
 
-@cbpi.initalizer(order=1000)
+
+
+@cbpi.addon.core.initializer(order=1000)
 def init(cbpi):
-    ActorView.register(cbpi.app, route_base='/api/actor')
+    ActorView.register(cbpi.web, route_base='/api/actor')
     ActorView.init_cache()
-    cbpi.init_actors()
+    #cbpi.init_actors()

modules/addon/__init__.py

@@ -1 +0,0 @@
-import endpoints

modules/addon/endpoints.py

@@ -1,199 +0,0 @@
-import json
-
-import sys
-from flask import Blueprint, request, send_from_directory
-from importlib import import_module
-from modules import socketio, cbpi
-
-
-from git import Repo
-import os
-import requests
-import yaml
-import shutil
-
-blueprint = Blueprint('addon', __name__)
-
-
-modules = {}
-
-def merge(source, destination):
-    """
-    Helper method to merge two dicts
-    :param source:
-    :param destination:
-    :return:
-    """
-    for key, value in source.items():
-        if isinstance(value, dict):
-               # get node or create one
-            node = destination.setdefault(key, {})
-            merge(value, node)
-        else:
-            destination[key] = value
-
-    return destination
-
-@blueprint.route('/', methods=['GET'])
-def getPlugins():
-    """
-    Endpoint for all plugins
-    :return:
-    """
-    result = []
-    for filename in os.listdir("./modules/plugins"):
-        if filename.endswith(".DS_Store") or filename.endswith(".py") or filename.endswith(".pyc"):
-            continue
-        result.append(filename)
-
-    return json.dumps(result)
-
-@blueprint.route('/<name>', methods=['GET'])
-def getFile(name):
-    """
-    Returns plugin code
-    :param name: plugin name
-    :return: the plugin code from __init__.py
-    """
-    return send_from_directory('./plugins/'+name, "__init__.py")
-
-@blueprint.route('/<name>', methods=['PUT'])
-def createPlugin(name):
-
-    """
-    Create a new plugin file
-    :param name: the plugin name
-    :return: empty http response 204
-    """
-    if not os.path.exists("./modules/plugins/"+name):
-        os.makedirs("./modules/plugins/"+name)
-        with open("./modules/plugins/" + name + "/__init__.py", "wb") as fo:
-            fo.write("")
-        cbpi.emit_message("PLUGIN %s CREATED" % (name))
-        return ('', 204)
-    else:
-        cbpi.emit_message("Failed to create plugin %s. Name arlready in use" % (name))
-        return ('', 500)
-
-
-
-
-@blueprint.route('/<name>', methods=['POST'])
-def saveFile(name):
-
-    """
-    save plugin code. code is provides via http body
-    :param name: the plugin name
-    :return: empty http reponse
-    """
-    with open("./modules/plugins/"+name+"/__init__.py", "wb") as fo:
-        fo.write(request.get_data())
-    cbpi.emit_message("PLUGIN %s SAVED" % (name))
-
-    return ('', 204)
-
-@blueprint.route('/<name>', methods=['DELETE'])
-def deletePlugin(name):
-
-    """
-    Delete plugin
-    :param name: plugin name
-    :return: HTTP 204 if ok - HTTP 500 if plugin not exists
-    """
-    if os.path.isdir("./modules/plugins/"+name) is False:
-        return ('Dir Not found', 500)
-    shutil.rmtree("./modules/plugins/"+name)
-    cbpi.notify("Plugin deleted", "Plugin %s deleted successfully" % name)
-    return ('', 204)
-
-@blueprint.route('/<name>/reload/', methods=['POST'])
-def reload(name):
-    """
-    hot reload plugnin
-    :param name:
-    :return:
-    """
-    try:
-        if name in cache["modules"]:
-            reload(cache["modules"][name])
-            cbpi.emit_message("REALOD OF PLUGIN %s SUCCESSFUL" % (name))
-            return ('', 204)
-        else:
-            cache["modules"][name] = import_module("modules.plugins.%s" % (name))
-            return ('', 204)
-    except Exception as e:
-        cbpi.emit_message("REALOD OF PLUGIN %s FAILED" % (name))
-        return json.dumps(e.message)
-
-
-@blueprint.route('/list', methods=['GET'])
-def plugins():
-    """
-    Read the central plugin yaml to get a list of all official plugins
-    :return:
-    """
-    response = requests.get("https://raw.githubusercontent.com/Manuel83/craftbeerpi-plugins/master/plugins.yaml")
-    cbpi.cache["plugins"] = merge(yaml.load(response.text), cbpi.cache["plugins"])
-    for key, value in  cbpi.cache["plugins"].iteritems():
-        value["installed"] = os.path.isdir("./modules/plugins/%s/" % (key))
-
-    return json.dumps(cbpi.cache["plugins"])
-
-
-@blueprint.route('/<name>/download', methods=['POST'])
-def download_addon(name):
-
-    plugin = cbpi.cache["plugins"].get(name)
-    plugin["loading"] = True
-    if plugin is None:
-        return ('', 404)
-    try:
-        Repo.clone_from(plugin.get("repo_url"), "./modules/plugins/%s/" % (name))
-        cbpi.notify("Download successful", "Plugin %s downloaded successfully" % name)
-    finally:
-        plugin["loading"] = False
-
-    return ('', 204)
-
-@blueprint.route('/<name>/update', methods=['POST'])
-def update_addon(name):
-    repo = Repo("./modules/plugins/%s/" % (name))
-    o = repo.remotes.origin
-    info = o.pull()
-    cbpi.notify("Plugin Updated", "Plugin %s updated successfully. Please restart the system" % name)
-    return ('', 204)
-
-
-def loadCorePlugins():
-    for filename in os.listdir("./modules/base_plugins"):
-
-
-        if os.path.isdir("./modules/base_plugins/"+filename) is False:
-            continue
-        try:
-            modules[filename] = import_module("modules.base_plugins.%s" % (filename))
-        except Exception as e:
-
-
-            cbpi.notify("Failed to load plugin %s " % filename, str(e), type="danger", timeout=None)
-            cbpi.app.logger.error(e)
-
-def loadPlugins():
-    for filename in os.listdir("./modules/plugins"):
-        if os.path.isdir("./modules/plugins/" + filename) is False:
-            continue
-        try:
-            modules[filename] = import_module("modules.plugins.%s" % (filename))
-        except Exception as e:
-            cbpi.notify("Failed to load plugin %s " % filename, str(e), type="danger", timeout=None)
-            cbpi.app.logger.error(e)
-
-#@cbpi.initalizer(order=1)
-def initPlugins():
-    loadCorePlugins()
-    loadPlugins()
-
-@cbpi.initalizer(order=2)
-def init(cbpi):
-
-    cbpi.app.register_blueprint(blueprint, url_prefix='/api/editor')

modules/app_config.py

@@ -1,55 +0,0 @@
-
-import json
-import sys, os
-from flask import Flask, render_template, redirect, json, g
-
-
-from flask_socketio import SocketIO, emit
-
-import logging
-
-
-
-from modules.core.core import CraftBeerPi, ActorBase, SensorBase
-from modules.core.db import DBModel
-
-app = Flask(__name__)
-
-FORMAT = '%(asctime)-15s - %(levelname)s - %(message)s'
-
-logging.basicConfig(filename='./logs/app.log',level=logging.INFO, format=FORMAT)
-app.config['SECRET_KEY'] = 'craftbeerpi'
-app.config['UPLOAD_FOLDER'] = './upload'
-
-
-@app.teardown_appcontext
-def close_connection(exception):
-    db = getattr(g, '_database', None)
-    if db is not None:
-        db.close()
-
-
-class ComplexEncoder(json.JSONEncoder):
-    def default(self, obj):
-        try:
-            if isinstance(obj, DBModel):
-                return obj.__dict__
-            elif isinstance(obj, ActorBase):
-                return obj.state()
-            elif isinstance(obj, SensorBase):
-                return obj.get_value()
-            elif hasattr(obj, "callback"):
-                return obj()
-            else:
-                return None
-        except TypeError as e:
-            pass
-        return None
-
-app.json_encoder = ComplexEncoder
-socketio = SocketIO(app, json=json, logging=False)
-cbpi   = CraftBeerPi(app, socketio)
-
-app.logger.info("##########################################")
-app.logger.info("### NEW STARTUP Version 3.0")
-app.logger.info("##########################################")

modules/base_plugins/actor.py

@@ -0,0 +1,76 @@
+from modules.core.baseapi import Buzzer
+from modules.core.basetypes import Actor, KettleController, FermenterController
+from modules import cbpi
+from modules.core.proptypes import Property
+
+@cbpi.addon.actor.type("Dummy Actor")
+class Dummy(Actor):
+
+
+    # Decorator to create a parameter based action
+    @cbpi.addon.actor.action("Run until Temp reached", parameters={"t": Property.Text(label="Target Temp")})
+    def check_sensor_value(self, t=1):
+
+        def check(api, id, value):
+            '''
+            Background Prozess which checks the sensor value every second
+            :param api: 
+            :param id: 
+            :param value: 
+            :return: 
+            '''
+            while api.sensor.get_value(1) < value:
+                api.sleep(1)
+            api.actor.off(id)
+
+        target_value = int(t)
+
+        # Create notificaiton
+        self.api.notify(headline="Waiting", message="Waiting for temp %s" % target_value)
+        # Switch actor on
+        self.api.actor.on(self.id, 100)
+        # Start Background task
+        self.api.start_background_task(check, self.api, id=self.id, value=target_value)
+
+
+    def on(self, power=100):
+        '''
+        Code to switch on the actor
+        :param power: int value between 0 - 100
+        :return: 
+        '''
+        print "ID %s ON" % self.id
+
+    def off(self):
+        print "ID %s OFF" % self.id
+
+
+@cbpi.addon.kettle.controller()
+class MyController(KettleController):
+
+    def run(self):
+        while self.is_running():
+            print "HALLO"
+
+            self.sleep(1)
+
+@cbpi.addon.fermenter.controller()
+class MyController2(FermenterController):
+
+
+    def run(self):
+        while self.is_running():
+            print "HALLO"
+
+            self.get_target_temp()
+            self.sleep(1)
+
+@cbpi.addon.core.initializer(order=200)
+def init(cbpi):
+
+    class MyBuzzer(Buzzer):
+        def beep(self):
+            print "BEEEEEP"
+            pass
+
+    cbpi.buzzer = MyBuzzer()

modules/base_plugins/dummy_temp/__init__.py

@@ -1,53 +0,0 @@
-# -*- coding: utf-8 -*-
-import subprocess
-import time
-
-from modules import cbpi, socketio
-from modules.core.hardware import  SensorActive
-from modules import cbpi
-from modules.core.props import Property
-
-
-@cbpi.sensor
-class DummyTempSensor(SensorActive):
-
-    temp = Property.Number("Temperature", configurable=True, default_value=5, description="Dummy Temperature as decimal value")
-
-    @cbpi.action("My Custom Action")
-    def my_action(self):
-        print "HELLO WORLD"
-        pass
-
-    def get_unit(self):
-        '''
-        :return: Unit of the sensor as string. Should not be longer than 3 characters
-        '''
-        return "°C" if self.get_config_parameter("unit", "C") == "C" else "°F"
-
-    def stop(self):
-        SensorActive.stop(self)
-
-    def execute(self):
-        '''
-        Active sensor has to handle his own loop
-        :return: 
-        '''
-        while self.is_running() is True:
-            self.data_received(self.temp)
-            self.sleep(5)
-
-    @classmethod
-    def init_global(cls):
-        '''
-        Called one at the startup for all sensors
-        :return: 
-        '''
-
-
-
-
-
-
-
-
-

modules/base_plugins/fermenter_hysteresis/__init__.py

@@ -1,38 +0,0 @@
-from modules import cbpi
-from modules.core.controller import KettleController, FermenterController
-from modules.core.props import Property
-
-
-@cbpi.fermentation_controller
-class Hysteresis(FermenterController):
-
-    heater_offset_min = Property.Number("Heater Offset ON", True, 0, description="Offset as decimal number when the heater is switched on. Should be greater then 'Heater Offset OFF'. For example a value of 2 switches on the heater if the current temperature is 2 degrees below the target temperature")
-    heater_offset_max = Property.Number("Heater Offset OFF", True, 0, description="Offset as decimal number when the heater is switched off. Should be smaller then 'Heater Offset ON'. For example a value of 1 switches off the heater if the current temperature is 1 degree below the target temperature")
-    cooler_offset_min = Property.Number("Cooler Offset ON", True, 0, description="Offset as decimal number when the cooler is switched on. Should be greater then 'Cooler Offset OFF'. For example a value of 2 switches on the cooler if the current temperature is 2 degrees above the target temperature")
-    cooler_offset_max = Property.Number("Cooler Offset OFF", True, 0, description="Offset as decimal number when the cooler is switched off. Should be less then 'Cooler Offset ON'. For example a value of 1 switches off the cooler if the current temperature is 1 degree above the target temperature")
-
-    def stop(self):
-        super(FermenterController, self).stop()
-
-        self.heater_off()
-        self.cooler_off()
-
-    def run(self):
-        while self.is_running():
-
-            target_temp = self.get_target_temp()
-            temp = self.get_temp()
-
-            if temp + float(self.heater_offset_min) <= target_temp:
-                self.heater_on(100)
-
-            if temp + float(self.heater_offset_max) >= target_temp:
-                self.heater_off()
-
-            if temp >= target_temp + float(self.cooler_offset_min):
-                self.cooler_on(100)
-
-            if temp <= target_temp + float(self.cooler_offset_max):
-                self.cooler_off()
-
-            self.sleep(1)

modules/base_plugins/gpio_actor/__init__.py

@@ -1,107 +0,0 @@
-# -*- coding: utf-8 -*-
-import time
-
-from modules import cbpi
-from modules.core.hardware import ActorBase, SensorPassive, SensorActive
-from modules.core.props import Property
-
-try:
-    import RPi.GPIO as GPIO
-
-    GPIO.setmode(GPIO.BCM)
-except Exception as e:
-    print e
-    pass
-
-
-
-@cbpi.actor
-class GPIOSimple(ActorBase):
-
-    gpio = Property.Select("GPIO", options=[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27], description="GPIO to which the actor is connected")
-
-    def init(self):
-        GPIO.setup(int(self.gpio), GPIO.OUT)
-        GPIO.output(int(self.gpio), 0)
-
-    def on(self, power=0):
-        print "GPIO ON %s" % str(self.gpio)
-        GPIO.output(int(self.gpio), 1)
-
-    def off(self):
-        print "GPIO OFF"
-        GPIO.output(int(self.gpio), 0)
-
-@cbpi.actor
-class GPIOPWM(ActorBase):
-
-    gpio = Property.Select("GPIO", options=[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27], description="GPIO to which the actor is connected")
-    frequency = Property.Number("Frequency (Hz)", configurable=True)
-
-    p = None
-    power = 100  # duty cycle
-
-    def init(self):
-        GPIO.setup(int(self.gpio), GPIO.OUT)
-        GPIO.output(int(self.gpio), 0)
-
-
-    def on(self, power=None):
-        if power is not None:
-            self.power = int(power)
-
-        if self.frequency is None:
-            self.frequency = 0.5  # 2 sec
-
-        self.p = GPIO.PWM(int(self.gpio), float(self.frequency))
-        self.p.start(int(self.power))
-
-    def set_power(self, power):
-        '''
-        Optional: Set the power of your actor
-        :param power: int value between 0 - 100
-        :return: 
-        '''
-        if power is not None:
-            self.power = int(power)
-        self.p.ChangeDutyCycle(self.power)
-
-    def off(self):
-        print "GPIO OFF"
-        self.p.stop()
-
-
-@cbpi.actor
-class RelayBoard(ActorBase):
-
-    gpio = Property.Select("GPIO", options=[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27], description="GPIO to which the actor is connected")
-
-    def init(self):
-        GPIO.setup(int(self.gpio), GPIO.OUT)
-        GPIO.output(int(self.gpio), 1)
-
-    def on(self, power=0):
-
-        GPIO.output(int(self.gpio), 0)
-
-    def off(self):
-
-        GPIO.output(int(self.gpio), 1)
-
-@cbpi.actor
-class Dummy(ActorBase):
-
-
-    def on(self, power=100):
-        '''
-        Code to switch on the actor
-        :param power: int value between 0 - 100
-        :return: 
-        '''
-        print "ON"
-
-    def off(self):
-        print "OFF"
-
-
-

modules/base_plugins/hysteresis/__init__.py

@@ -1,38 +0,0 @@
-from modules import cbpi
-from modules.core.controller import KettleController
-from modules.core.props import Property
-
-
-@cbpi.controller
-class Hysteresis(KettleController):
-
-    # Custom Properties
-
-    on = Property.Number("Offset On", True, 0, description="Offset below target temp when heater should switched on. Should be bigger then Offset Off")
-    off = Property.Number("Offset Off", True, 0, description="Offset below target temp when heater should switched off. Should be smaller then Offset Off")
-
-    def stop(self):
-        '''
-        Invoked when the automatic is stopped.
-        Normally you switch off the actors and clean up everything
-        :return: None
-        '''
-        super(KettleController, self).stop()
-        self.heater_off()
-
-
-
-
-    def run(self):
-        '''
-        Each controller is exectuted in its own thread. The run method is the entry point
-        :return: 
-        '''
-        while self.is_running():
-
-            if self.get_temp() < self.get_target_temp() - float(self.on):
-                self.heater_on(100)
-            elif self.get_temp() >= self.get_target_temp() - float(self.off):
-                self.heater_off()
-            self.sleep(1)
-

modules/base_plugins/one_wire/__init__.py

@@ -1,118 +0,0 @@
-# -*- coding: utf-8 -*-
-import os
-from subprocess import Popen, PIPE, call
-
-from modules import cbpi, app
-from modules.core.hardware import SensorPassive
-import json
-import os, re, threading, time
-from flask import Blueprint, render_template, request
-from modules.core.props import Property
-
-blueprint = Blueprint('one_wire', __name__)
-
-temp = 22
-
-def getSensors():
-    try:
-        arr = []
-        for dirname in os.listdir('/sys/bus/w1/devices'):
-            if (dirname.startswith("28") or dirname.startswith("10")):
-                cbpi.app.logger.info("Device %s Found (Family: 28/10, Thermometer on GPIO4 (w1))" % dirname)
-                arr.append(dirname)
-        return arr
-    except:
-        return []
-
-
-
-
-class myThread (threading.Thread):
-
-    value = 0
-
-
-    def __init__(self, sensor_name):
-        threading.Thread.__init__(self)
-        self.value = 0
-        self.sensor_name = sensor_name
-        self.runnig = True
-
-    def shutdown(self):
-        pass
-
-    def stop(self):
-        self.runnig = False
-
-    def run(self):
-
-        while self.runnig:
-            try:
-                app.logger.info("READ TEMP")
-                ## Test Mode
-                if self.sensor_name is None:
-                    return
-                with open('/sys/bus/w1/devices/w1_bus_master1/%s/w1_slave' % self.sensor_name, 'r') as content_file:
-                    content = content_file.read()
-                    if (content.split('\n')[0].split(' ')[11] == "YES"):
-                        temp = float(content.split("=")[-1]) / 1000  # temp in Celcius
-                        self.value = temp
-            except:
-                pass
-
-            time.sleep(4)
-
-
-
-@cbpi.sensor
-class ONE_WIRE_SENSOR(SensorPassive):
-
-    sensor_name = Property.Select("Sensor", getSensors(), description="The OneWire sensor address.")
-    offset = Property.Number("Offset", True, 0, description="Offset which is added to the received sensor data. Positive and negative values are both allowed.")
-
-    def init(self):
-
-        self.t = myThread(self.sensor_name)
-
-        def shudown():
-            shudown.cb.shutdown()
-        shudown.cb = self.t
-
-        self.t.start()
-
-    def stop(self):
-        try:
-            self.t.stop()
-        except:
-            pass
-
-    def read(self):
-        if self.get_config_parameter("unit", "C") == "C":
-            self.data_received(round(self.t.value + self.offset_value(), 2))
-        else:
-            self.data_received(round(9.0 / 5.0 * self.t.value + 32 + self.offset_value(), 2))
-
-    @cbpi.try_catch(0)
-    def offset_value(self):
-        return float(self.offset)
-            
-    @classmethod
-    def init_global(self):
-        try:
-            call(["modprobe", "w1-gpio"])
-            call(["modprobe", "w1-therm"])
-        except Exception as e:
-            pass
-
-
-@blueprint.route('/<int:t>', methods=['GET'])
-def set_temp(t):
-    global temp
-    temp = t
-    return ('', 204)
-
-
-@cbpi.initalizer()
-def init(cbpi):
-
-    cbpi.app.register_blueprint(blueprint, url_prefix='/api/one_wire')

modules/base_plugins/sensor.py

@@ -0,0 +1,67 @@
+# -*- coding: utf-8 -*-
+import os
+
+from os.path import join
+
+from modules.core.basetypes import Actor, Sensor, Action
+from modules import cbpi
+from modules.core.proptypes import Property
+import random
+
+
+@cbpi.addon.sensor.type("Dummy Sensor")
+class Dummy(Sensor):
+
+    text = Property.Text(label="Text", required=True, description="This is a parameter", configurable=True)
+    p = Property.Select(label="hallo",options=[1,2,3])
+
+    def init(self):
+
+        if self.api.get_config_parameter("unit","C") == "C":
+            self.unit = "°C"
+        else:
+            self.unit = "°F"
+
+    @cbpi.addon.sensor.action(label="Set Dummy Temp", parameters={
+        "p1":Property.Select(label="Temp",options=[1,2,3]),
+
+    })
+    def myaction(self, p1):
+        self.text = p1
+        self.update_value(int(p1))
+
+
+
+    def execute(self):
+        while True:
+            try:
+                self.update_value(int(self.text))
+            except:
+                pass
+            self.api.sleep(5)
+
+
+@cbpi.addon.core.action(name="Delete All Logs")
+class ParameterAction(Action):
+
+    p1 = Property.Number("P1", configurable=True, description="Target Temperature of Mash Step", unit="C")
+    p2 = Property.Number("P2", configurable=True, description="Target Temperature of Mash Step", unit="C")
+
+
+    def execute(self, p1, p2, **kwargs):
+        for i in range(5):
+            cbpi.sleep(1)
+            cbpi.notify(headline="Woohoo", message="%s %s" % (p1, p2))
+
+
+@cbpi.addon.core.action(name="Delete All Logs")
+class DeleteAllLogs(Action):
+    def execute(self, **kwargs):
+        dir = "./logs"
+        test = os.listdir(dir)
+
+        for item in test:
+
+            if item.endswith(".log"):
+                os.remove(join(dir, item))
+        cbpi.notify(headline="Logs Deleted", message="All Logs Cleared")

modules/base_plugins/steps.py

@@ -1,21 +1,43 @@
-# -*- coding: utf-8 -*-
+from modules.core.basetypes import Step
+from modules import cbpi
+from modules.core.proptypes import Property
 import time
 
 
-from modules.core.props import Property, StepProperty
-from modules.core.step import StepBase
-from modules import cbpi
+@cbpi.addon.step.type("Dummy Step")
+class Dummy(Step):
+
+
+    @cbpi.addon.step.action("WOHOO")
+    def myaction(self):
+        self.stop_timer()
+        self.start_timer(10)
+
+
+    text = Property.Text(label="Text", configurable=True, description="WOHOOO")
+    time = Property.Text(label="Text", configurable=True, description="WOHOOO")
+
+    def execute(self):
+
+        pass
+
+    def reset(self):
+
+        self.stop_timer()
 
 
 
-@cbpi.step
-class MashStep(StepBase):
+# -*- coding: utf-8 -*-
+
+
+@cbpi.addon.step.type("Dummy Step")
+class MashStep(Step):
     '''
     Just put the decorator @cbpi.step on top of a method
     '''
     # Properties
-    temp = Property.Number("Temperature", configurable=True, description="Target Temperature of Mash Step")
-    kettle = StepProperty.Kettle("Kettle", description="Kettle in which the mashing takes place")
+    temp = Property.Number("Temperature", configurable=True, description="Target Temperature of Mash Step", unit="C")
+    kettle = Property.Kettle("Kettle", description="Kettle in which the mashing takes place" )
     timer = Property.Number("Timer in Minutes", configurable=True, description="Timer is started when the target temperature is reached")
 
     def init(self):
@@ -26,7 +48,7 @@ class MashStep(StepBase):
         # set target tep
         self.set_target_temp(self.temp, self.kettle)
 
-    @cbpi.action("Start Timer Now")
+    @cbpi.addon.step.action("Start Timer")
     def start(self):
         '''
         Custom Action which can be execute form the brewing dashboard.
@@ -57,23 +79,21 @@ class MashStep(StepBase):
 
         # Check if timer finished and go to next step
         if self.is_timer_finished() == True:
+            self.api.beep()
             self.notify("Mash Step Completed!", "Starting the next step", timeout=None)
             self.next()
 
 
-@cbpi.step
-class MashInStep(StepBase):
+@cbpi.addon.step.type("MashInStep")
+class MashInStep(Step):
     '''
     Just put the decorator @cbpi.step on top of a method
     '''
     # Properties
     temp = Property.Number("Temperature", configurable=True,  description="Target Temperature of Mash Step")
-    kettle = StepProperty.Kettle("Kettle", description="Kettle in which the mashing takes place")
+    kettle = Property.Kettle("Kettle", description="Kettle in which the mashing takes place")
     s = False
 
-    @cbpi.action("Change Power")
-    def change_power(self):
-        self.actor_power(1, 50)
 
     def init(self):
         '''
@@ -99,12 +119,12 @@ class MashInStep(StepBase):
 
 
 
-@cbpi.step
-class ChilStep(StepBase):
+@cbpi.addon.step.type("MashInStep")
+class ChilStep(Step):
 
     timer = Property.Number("Timer in Minutes", configurable=True, default_value=0, description="Timer is started immediately")
 
-    @cbpi.action("Stat Timer")
+    @cbpi.addon.step.action("Start Timer")
     def start(self):
         if self.is_timer_finished() is None:
             self.start_timer(int(self.timer) * 60)
@@ -123,13 +143,13 @@ class ChilStep(StepBase):
         if self.is_timer_finished() == True:
             self.next()
 
-@cbpi.step
-class PumpStep(StepBase):
+@cbpi.addon.step.type("MashInStep")
+class PumpStep(Step):
 
-    pump = StepProperty.Actor("Pump", description="Pump actor gets toogled")
+    pump = Property.Actor("Pump", description="Pump actor gets toogled")
     timer = Property.Number("Timer in Minutes", configurable=True, default_value=0, description="Timer is started immediately")
 
-    @cbpi.action("Stat Timer")
+    @cbpi.addon.step.action("Start Timer")
     def start(self):
         if self.is_timer_finished() is None:
             self.start_timer(int(self.timer) * 60)
@@ -151,14 +171,14 @@ class PumpStep(StepBase):
         if self.is_timer_finished() == True:
             self.next()
 
-@cbpi.step
-class BoilStep(StepBase):
+@cbpi.addon.step.type("MashInStep")
+class BoilStep(Step):
     '''
     Just put the decorator @cbpi.step on top of a method
     '''
     # Properties
     temp = Property.Number("Temperature", configurable=True, default_value=100, description="Target temperature for boiling")
-    kettle = StepProperty.Kettle("Kettle", description="Kettle in which the boiling step takes place")
+    kettle = Property.Kettle("Kettle", description="Kettle in which the boiling step takes place")
     timer = Property.Number("Timer in Minutes", configurable=True, default_value=90, description="Timer is started when target temperature is reached")
     hop_1 = Property.Number("Hop 1 Addition", configurable=True, description="Fist Hop alert")
     hop_1_added = Property.Number("",default_value=None)
@@ -179,10 +199,7 @@ class BoilStep(StepBase):
         # set target tep
         self.set_target_temp(self.temp, self.kettle)
 
-
-
-
-    @cbpi.action("Start Timer Now")
+    @cbpi.addon.step.action("Start Timer")
     def start(self):
         '''
         Custom Action which can be execute form the brewing dashboard.
@@ -227,3 +244,5 @@ class BoilStep(StepBase):
         if self.is_timer_finished() == True:
             self.notify("Boil Step Completed!", "Starting the next step", timeout=None)
             self.next()
+
+

modules/buzzer/__init__.py

@@ -1,5 +1,7 @@
 import time
 from thread import start_new_thread
+
+from modules.core.baseapi import Buzzer
 from modules import cbpi
 
 try:
@@ -7,39 +9,36 @@ try:
 except Exception as e:
     pass
 
-class Buzzer(object):
+class GPIOBuzzer(Buzzer):
 
     sound = ["H", 0.1, "L", 0.1, "H", 0.1, "L", 0.1, "H", 0.1, "L"]
-    def __init__(self, gpio, beep_level):
+
+
+    def __init__(self, gpio):
         try:
-            cbpi.app.logger.info("INIT BUZZER NOW GPIO%s" % gpio)
+            cbpi.web.logger.info("INIT BUZZER NOW GPIO%s" % gpio)
             self.gpio = int(gpio)
-            self.beep_level = beep_level
             GPIO.setmode(GPIO.BCM)
             GPIO.setup(self.gpio, GPIO.OUT)
             self.state = True
-            cbpi.app.logger.info("BUZZER SETUP OK")
+            cbpi.web.logger.info("BUZZER SETUP OK")
         except Exception as e:
-            cbpi.app.logger.info("BUZZER EXCEPTION %s" % str(e))
+            cbpi.web.logger.info("BUZZER EXCEPTION %s" % str(e))
             self.state = False
 
     def beep(self):
         if self.state is False:
-            cbpi.app.logger.error("BUZZER not working")
+            cbpi.web.logger.error("BUZZER not working")
             return
 
         def play(sound):
             try:
                 for i in sound:
                     if (isinstance(i, str)):
-                        if i == "H" and self.beep_level == "HIGH":
+                        if i == "H":
                             GPIO.output(int(self.gpio), GPIO.HIGH)
-                        elif i == "H" and self.beep_level != "HIGH":
-                            GPIO.output(int(self.gpio), GPIO.LOW)
-                        elif i == "L" and self.beep_level == "HIGH":
-                            GPIO.output(int(self.gpio), GPIO.LOW)
                         else:
-                            GPIO.output(int(self.gpio), GPIO.HIGH)
+                            GPIO.output(int(self.gpio), GPIO.LOW)
                     else:
                         time.sleep(i)
             except Exception as e:
@@ -47,11 +46,8 @@ class Buzzer(object):
 
         start_new_thread(play, (self.sound,))
 
-@cbpi.initalizer(order=1)
+@cbpi.addon.core.initializer(order=1)
 def init(cbpi):
-    gpio = cbpi.get_config_parameter("buzzer", 22)
-    beep_level = cbpi.get_config_parameter("buzzer_beep_level", "HIGH")
+    gpio = cbpi.get_config_parameter("buzzer", 16)
+    cbpi.buzzer = GPIOBuzzer(gpio)
 
-    cbpi.buzzer = Buzzer(gpio, beep_level)
-    cbpi.beep()
-    cbpi.app.logger.info("INIT OK")

modules/config/__init__.py

@@ -2,23 +2,27 @@ import time
 
 from flask import json, request
 from flask_classy import route
-from modules import DBModel, cbpi, get_db
-from modules.core.baseview import BaseView
-
-class Config(DBModel):
-    __fields__ = ["type", "value", "description", "options"]
-    __table_name__ = "config"
-    __json_fields__ = ["options"]
-    __priamry_key__ = "name"
+from modules import cbpi
+from modules.core.db import DBModel
+from modules.core.baseview import RestApi
+from modules.database.dbmodel import Config
 
 
-class ConfigView(BaseView):
+class ConfigView(RestApi):
     model = Config
     cache_key = "config"
 
     @route('/<name>', methods=["PUT"])
     def put(self, name):
-
+        """
+        Set new config value
+        ---
+        tags:
+          - config
+        responses:
+          204:
+            description: New config value set
+        """
         data = request.json
         data["name"] = name
         update_data = {"name": data["name"], "value": data["value"]}
@@ -27,31 +31,59 @@ class ConfigView(BaseView):
             self.api.cache.get(self.cache_key)[name].__dict__.update(**update_data)
         m = self.model.update(**self.api.cache.get(self.cache_key)[name].__dict__)
         self._post_put_callback(self.api.cache.get(self.cache_key)[name])
+
+        self.api.emit("CONFIG_UPDATE", name=name, data=data["value"])
         return json.dumps(self.api.cache.get(self.cache_key)[name].__dict__)
 
     @route('/<id>', methods=["GET"])
     def getOne(self, id):
+        """
+        Get config parameter
+        ---
+        tags:
+          - config
+        responses:
+          400:
+            description: Get one config parameter via web api is not supported
+        """
         return ('NOT SUPPORTED', 400)
 
     @route('/<id>', methods=["DELETE"])
     def delete(self, id):
+        """
+        Delete config parameter
+        ---
+        tags:
+          - config
+        responses:
+          400:
+            description: Deleting config parameter via web api is not supported
+        """
         return ('NOT SUPPORTED', 400)
 
     @route('/', methods=["POST"])
     def post(self):
+        """
+        Get config parameter
+        ---
+        tags:
+          - config
+        responses:
+          400:
+            description: Adding new config parameter via web api is not supported
+        """
         return ('NOT SUPPORTED', 400)
 
     @classmethod
     def init_cache(cls):
 
-        with cls.api.app.app_context():
+        with cls.api.web.app_context():
             cls.api.cache[cls.cache_key] = {}
             for key, value  in cls.model.get_all().iteritems():
                 cls.post_init_callback(value)
                 cls.api.cache[cls.cache_key][value.name] = value
 
-@cbpi.initalizer(order=0)
+@cbpi.addon.core.initializer(order=0)
 def init(cbpi):
-
-    ConfigView.register(cbpi.app, route_base='/api/config')
+    ConfigView.register(cbpi.web, route_base='/api/config')
     ConfigView.init_cache()

modules/core/baseapi.py

@@ -0,0 +1,260 @@
+from proptypes import *
+
+class BaseAPI(object):
+
+    def __init__(self, cbpi):
+        self.cbpi = cbpi
+        self.cbpi.cache[self.key] = {}
+
+
+    def init(self):
+        for name, value in self.cbpi.cache[self.key].iteritems():
+
+            value["class"].init_global()
+
+    def parseProps(self, key, cls, **options):
+
+        name = cls.__name__
+        tmpObj = cls()
+
+        try:
+            doc = tmpObj.__doc__.strip()
+        except:
+            doc = ""
+
+        if self.cbpi.cache.get(key) is None:
+            self.cbpi.cache[key] = {}
+        self.cbpi.logger.debug(name)
+        self.cbpi.cache.get(key)[name] = {"name": name, "class": cls, "description":doc, "properties": [], "actions": []}
+        self.cbpi.cache.get(key)[name].update(options)
+        members = [attr for attr in dir(tmpObj) if not callable(getattr(tmpObj, attr)) and not attr.startswith("__")]
+        for m in members:
+            t = tmpObj.__getattribute__(m)
+
+            if isinstance(t, Property.Number):
+                self.cbpi.cache.get(key)[name]["properties"].append({"name": m, "label": t.label, "type": "number", "configurable": t.configurable, "description": t.description, "default_value": t.default_value, "unit": t.unit})
+            elif isinstance(t, Property.Text):
+                self.cbpi.cache.get(key)[name]["properties"].append({"name": m, "label": t.label, "type": "text", "required": t.required, "configurable": t.configurable, "description": t.description, "default_value": t.default_value})
+            elif isinstance(t, Property.Select):
+                self.cbpi.cache.get(key)[name]["properties"].append({"name": m, "label": t.label, "type": "select",  "configurable": True, "options": t.options, "description": t.description})
+            elif isinstance(t, Property.Actor):
+                self.cbpi.cache.get(key)[name]["properties"].append({"name": m, "label": t.label, "type": "actor",  "configurable": True, "description": t.description})
+            elif isinstance(t, Property.Sensor):
+                self.cbpi.cache.get(key)[name]["properties"].append({"name": m, "label": t.label, "type": "sensor", "configurable": True, "description": t.description})
+            elif isinstance(t, Property.Kettle):
+                self.cbpi.cache.get(key)[name]["properties"].append({"name": m, "label": t.label, "type": "kettle", "configurable": True, "description": t.description})
+
+        for method_name, method in cls.__dict__.iteritems():
+            if hasattr(method, "action"):
+                label = method.__getattribute__("label")
+                parameters = method.__getattribute__("parameters")
+                props = []
+                if parameters is not None:
+                    for k, t in parameters.iteritems():
+                        if isinstance(t, Property.Number):
+                            props.append({"name": k, "label": t.label, "type": "number", "configurable": t.configurable, "description": t.description, "default_value": t.default_value, "unit": t.unit})
+                        elif isinstance(t, Property.Text):
+                            props.append({"name": k, "label": t.label, "type": "text", "required": t.required, "configurable": t.configurable, "description": t.description, "default_value": t.default_value})
+                        elif isinstance(t, Property.Select):
+                            props.append({"name": k, "label": t.label, "type": "select", "configurable": True, "options": t.options, "description": t.description})
+                        elif isinstance(t, Property.Actor):
+                            props.append({"name": k, "label": t.label, "type": "actor", "configurable": True, "description": t.description})
+                        elif isinstance(t, Property.Sensor):
+                            props.append({"name": k, "label": t.label, "type": "sensor", "configurable": True, "description": t.description})
+                        elif isinstance(t, Property.Kettle):
+                            props.append({"name": k, "label": t.label, "type": "kettle", "configurable": True, "description": t.description})
+
+                self.cbpi.cache.get(key)[name]["actions"].append({"method": method_name, "label": label, "properties":props })
+        return cls
+
+
+class SensorAPI(BaseAPI):
+
+    key = "sensor_types"
+
+    def type(self, description="Step", **options):
+       def decorator(f):
+            BaseAPI.parseProps(self, self.key,f, description=description)
+            return f
+       return decorator
+
+    def action(self, label, parameters=None):
+
+        def real_decorator(func):
+            func.action = True
+            func.parameters = parameters
+            func.label = label
+            return func
+        return real_decorator
+
+
+class StepAPI(BaseAPI):
+
+    key = "step_types"
+
+    def init(self):
+        pass
+
+    def type(self, description="Step", **options):
+       def decorator(f):
+            BaseAPI.parseProps(self, self.key,f, description=description)
+            return f
+       return decorator
+
+    def action(self, label, parameters=None):
+        def real_decorator(func):
+            func.action = True
+            func.label = label
+            func.parameters = parameters
+            return func
+        return real_decorator
+
+
+
+
+class ActorAPI(BaseAPI):
+
+    key = "actor_types"
+
+    def type(self, description="", **options):
+       def decorator(f):
+            BaseAPI.parseProps(self, self.key, f, description=description)
+            return f
+       return decorator
+
+    def action(self, label, parameters=None):
+        def real_decorator(func):
+            func.action = True
+            func.label = label
+            func.parameters = parameters
+            return func
+        return real_decorator
+
+
+
+class KettleAPI(BaseAPI):
+
+    key = "controller_types"
+
+    def controller(self, description="", **options):
+       def decorator(f):
+            BaseAPI.parseProps(self, self.key,f,description=description)
+            return f
+       return decorator
+
+    def action(self, label, parameters=None):
+        def real_decorator(func):
+            func.action = True
+            func.label = label
+            func.parameters = parameters
+            return func
+        return real_decorator
+
+class FermenterAPI(BaseAPI):
+
+    key = "fermentation_controller_types"
+
+    def controller(self, description="Step", **options):
+       def decorator(f):
+            BaseAPI.parseProps(self, self.key,f,description=description)
+            return f
+       return decorator
+
+    def action(self, label, parameters=None):
+        def real_decorator(func):
+            func.action = True
+            func.label = label
+            func.parameters = parameters
+            return func
+        return real_decorator
+
+class CoreAPI(BaseAPI):
+
+    key = "core"
+
+    def __init__(self, cbpi):
+        self.cbpi = cbpi
+        self.cbpi.cache["actions"] = {}
+        self.cbpi.cache["init"] = []
+        self.cbpi.cache["js"] = {}
+        self.cbpi.cache["background"] = []
+        self.cbpi.cache["web_menu"] =[]
+
+    def init(self):
+        self.cbpi.cache["init"] = sorted(self.cbpi.cache["init"], key=lambda k: k['order'])
+        for value in self.cbpi.cache.get("init"):
+
+
+            value["function"](self.cbpi)
+
+        def job(interval, method):
+            while True:
+                try:
+                    method(self.cbpi)
+                except Exception as e:
+                    self.cbpi.logger.error(e)
+                self.cbpi.sleep(interval)
+
+        for value in self.cbpi.cache.get("background"):
+            t = self.cbpi.start_background_task(target=job,  interval=value.get("interval"),  method=value.get("function"))
+
+    def action(self, **options):
+       def decorator(f):
+            BaseAPI.parseProps(self, "actions", f)
+            return f
+       return decorator
+
+    def add_js(self, name, file):
+        self.cbpi.cache["js"][name] = file
+
+    def add_menu_link(self, name, path):
+        self.cbpi.cache["web_menu"].append(dict(name=name, path=path))
+
+    def initializer(self, order=0, **options):
+        def decorator(f):
+             self.cbpi.cache.get("init").append({"function": f, "order": order})
+             return f
+        return decorator
+
+    def backgroundtask(self, key, interval, **options):
+        def decorator(f):
+             self.cbpi.cache.get("background").append({"function": f, "key": key, "interval": interval})
+             return f
+        return decorator
+
+    def listen(self, name, method=None, async=False):
+
+        if method is not None:
+            if self.cbpi.eventbus.get(name) is None:
+                self.cbpi.eventbus[name] = []
+            self.cbpi.eventbus[name].append({"function": method, "async": async})
+        else:
+            def real_decorator(function):
+                if self.cbpi.eventbus.get(name) is None:
+                    self.cbpi.eventbus[name] = []
+                self.cbpi.eventbus[name].append({"function": function, "async": async})
+                def wrapper(*args, **kwargs):
+                    return function(*args, **kwargs)
+                return wrapper
+            return real_decorator
+
+
+class Buzzer(object):
+
+    def beep(self):
+        pass
+
+class Addon(object):
+    def __init__(self, cbpi):
+        self.step = StepAPI(cbpi)
+        self.actor = ActorAPI(cbpi)
+        self.sensor = SensorAPI(cbpi)
+        self.kettle = KettleAPI(cbpi)
+        self.fermenter = FermenterAPI(cbpi)
+        self.core = CoreAPI(cbpi)
+
+    def init(self):
+        self.core.init()
+        self.step.init()
+        self.actor.init()
+        self.sensor.init()

modules/core/basetypes.py

@@ -0,0 +1,305 @@
+from modules.core.proptypes import Property
+import time
+
+class Base(object):
+
+    def __init__(self, *args, **kwds):
+        for a in kwds:
+
+            super(Base, self).__setattr__(a, kwds.get(a))
+        self.api = kwds.get("cbpi")
+        self.id = kwds.get("id")
+        self.value = None
+        self.__dirty = False
+
+class Action(Base):
+
+    def execute(self):
+        pass
+
+class Actor(Base):
+
+    @classmethod
+    def init_global(cls):
+        pass
+
+    def init(self):
+        pass
+
+    def shutdown(self):
+        pass
+
+    def on(self, power=100):
+        print "SWITCH ON"
+        pass
+
+    def off(self):
+        print "SWITCH OFF"
+        pass
+
+    def power(self, power):
+        print "SET POWER", power
+        pass
+
+    def state(self):
+        pass
+
+
+class Sensor(Base):
+
+    unit = ""
+
+    @classmethod
+    def init_global(cls):
+        pass
+
+    def init(self):
+        pass
+
+    def get_unit(self):
+        pass
+
+    def stop(self):
+        pass
+
+    def update_value(self, value):
+        self.value = value
+        self.cbpi.sensor.write_log(self.id, value)
+        self.cbpi.emit("SENSOR_UPDATE", id=self.id, value=value)
+        self.cbpi.ws_emit("SENSOR_UPDATE", self.cbpi.cache["sensors"][self.id])
+
+    def execute(self):
+        print "EXECUTE"
+        pass
+
+class ControllerBase(object):
+    __dirty = False
+    __running = False
+
+    @staticmethod
+    def init_global():
+        print "GLOBAL CONTROLLER INIT"
+
+    def notify(self, headline, message, type="success", timeout=5000):
+        self.api.notify(headline, message, type, timeout)
+
+    def is_running(self):
+        return self.__running
+
+    def init(self):
+        self.__running = True
+
+    def sleep(self, seconds):
+        self.api.sleep(seconds)
+
+    def stop(self):
+        self.__running = False
+
+    def get_sensor_value(self, id):
+        return self.api.sensor.get_sensor_value(id)
+
+    def __init__(self, *args, **kwds):
+        for a in kwds:
+            super(ControllerBase, self).__setattr__(a, kwds.get(a))
+        self.api = kwds.get("api")
+        self.heater = kwds.get("heater")
+        self.sensor = kwds.get("sensor")
+
+    def actor_on(self,id, power=100):
+        self.api.actor.on(id, power=power)
+
+    def actor_off(self, id):
+        self.api.actor.off(id)
+
+    def actor_power(self, power, id=None):
+        self.api.actor.power(id, power)
+
+    def run(self):
+        pass
+
+class KettleController(ControllerBase):
+
+    @staticmethod
+    def chart(kettle):
+        result = []
+        result.append({"name": "Temp", "data_type": "sensor", "data_id": kettle.sensor})
+        result.append({"name": "Target Temp", "data_type": "kettle", "data_id": kettle.id})
+        return result
+
+    def __init__(self, *args, **kwds):
+        ControllerBase.__init__(self, *args, **kwds)
+        self.kettle_id = kwds.get("kettle_id")
+
+    def heater_on(self, power=100):
+        k = self.api.cache.get("kettle").get(self.kettle_id)
+        if k.heater is not None:
+            self.actor_on(k.heater, power)
+
+    def heater_off(self):
+        k = self.api.cache.get("kettle").get(self.kettle_id)
+        if k.heater is not None:
+            self.actor_off(k.heater)
+
+    def get_temp(self, id=None):
+        if id is None:
+            id = self.kettle_id
+        return self.get_sensor_value(int(self.api.cache.get("kettle").get(id).sensor))
+
+    def get_target_temp(self, id=None):
+        if id is None:
+            id = self.kettle_id
+        return self.api.cache.get("kettle").get(id).target_temp
+
+class FermenterController(ControllerBase):
+
+    @staticmethod
+    def chart(fermenter):
+        result = []
+        result.append({"name": "Temp", "data_type": "sensor", "data_id": fermenter.sensor})
+        result.append({"name": "Target Temp", "data_type": "fermenter", "data_id": fermenter.id})
+        return result
+
+    def __init__(self, *args, **kwds):
+        ControllerBase.__init__(self, *args, **kwds)
+        self.fermenter_id = kwds.get("fermenter_id")
+        self.cooler = kwds.get("cooler")
+
+    def get_target_temp(self, id=None):
+        if id is None:
+            id = self.fermenter_id
+        return self.api.cache.get("fermenter").get(id).target_temp
+
+    def heater_on(self, power=100):
+        f = self.api.cache.get("fermenter").get(self.fermenter_id)
+        if f.heater is not None:
+            self.actor_on(int(f.heater))
+
+    def heater_off(self):
+        f = self.api.cache.get("fermenter").get(self.fermenter_id)
+        if f.heater is not None:
+            self.actor_off(int(f.heater))
+
+    def cooler_on(self, power=100):
+        f = self.api.cache.get("fermenter").get(self.fermenter_id)
+        if f.cooler is not None:
+            self.actor_on(power, int(f.cooler))
+
+    def cooler_off(self):
+        f = self.api.cache.get("fermenter").get(self.fermenter_id)
+        if f.cooler is not None:
+            self.actor_off(int(f.cooler))
+
+    def get_temp(self, id=None):
+        if id is None:
+            id = self.fermenter_id
+        return self.get_sensor_value(int(self.api.cache.get("fermenter").get(id).sensor))
+
+
+class Timer(object):
+    timer_end = Property.Number("TIMER_END", configurable=False)
+
+    def start_timer(self, timer):
+        if self.timer_end is not None:
+            return
+        self.timer_end = int(time.time()) + timer
+
+    def stop_timer(self):
+        if self.timer_end is not None:
+            self.timer_end = None
+
+    def is_timer_running(self):
+        if self.timer_end is not None:
+            return True
+        else:
+            return False
+
+    def timer_remaining(self):
+        if self.timer_end is not None:
+            return self.timer_end - int(time.time())
+        else:
+            return None
+
+    def is_timer_finished(self):
+        if self.timer_end is None:
+            return None
+        if self.timer_end <= int(time.time()):
+            return True
+        else:
+            return False
+
+
+
+
+class Step(Base, Timer):
+
+
+    @classmethod
+    def init_global(cls):
+        pass
+
+    __dirty = False
+    managed_fields = []
+    n = False
+
+    def next(self):
+        self.n = True
+
+    def init(self):
+        pass
+
+    def finish(self):
+        pass
+
+    def reset(self):
+        pass
+
+    def execute(self):
+
+        print "Step Info"
+        print "Kettle ID: %s" % self.kettle_id
+        print "ID: %s" % self.id
+
+    def __init__(self, *args, **kwds):
+
+        for a in kwds:
+            super(Step, self).__setattr__(a, kwds.get(a))
+        self.api = kwds.get("api")
+        self.id = kwds.get("id")
+        self.name = kwds.get("name")
+        self.kettle_id = kwds.get("kettleid")
+        self.value = None
+        self.__dirty = False
+
+    def set_target_temp(self, temp, id=None):
+        temp = float(temp)
+        try:
+            if id is None:
+                self.api.emit("SET_TARGET_TEMP", id=self.kettle_id, temp=temp)
+            else:
+                self.api.emit("SET_TARGET_TEMP", id=id, temp=temp)
+        except Exception as e:
+
+            self.api.notify("Faild to set Target Temp", "", type="warning")
+
+    def get_kettle_temp(self, id=None):
+        id = int(id)
+        if id is None:
+            id = self.kettle_id
+        return self.api.sensor.get_value(int(self.api.cache.get("kettle").get(id).sensor))
+
+    def is_dirty(self):
+        return self.__dirty
+
+    def reset_dirty(self):
+        self.__dirty = False
+
+    def notify(self, headline, messsage, timeout=None):
+        self.api.notify(headline, messsage, timeout)
+    def __setattr__(self, name, value):
+
+        if name != "_StepBase__dirty" and name in self.managed_fields:
+            self.__dirty = True
+            super(Step, self).__setattr__(name, value)
+        else:
+            super(Step, self).__setattr__(name, value)
+

modules/core/baseview.py

@@ -1,22 +1,25 @@
 from flask import request, json
 from flask_classy import route, FlaskView
+from flask_login import login_required
+
 from modules import cbpi
 
 
-class BaseView(FlaskView):
+class RestApi(FlaskView):
 
     as_array = False
     cache_key = None
     api = cbpi
 
+    @login_required
     @route('/<int:id>', methods=["GET"])
     def getOne(self, id):
-
         if self.api.cache.get(self.cache_key) is not None:
             return json.dumps(self.api.cache.get(self.cache_key).get(id))
         else:
             return json.dumps(self.model.get_one(id))
 
+    @login_required
     @route('/', methods=["GET"])
     def getAll(self):
         if self.api.cache.get(self.cache_key) is not None:
@@ -31,9 +34,12 @@ class BaseView(FlaskView):
     def _post_post_callback(self, m):
         pass
 
+    @login_required
     @route('/', methods=["POST"])
     def post(self):
+
         data = request.json
+        self.api.web.logger.info("INSERT Model %s", self.model.__name__)
         self._pre_post_callback(data)
         m = self.model.insert(**data)
         if self.api.cache.get(self.cache_key) is not None:
@@ -49,7 +55,7 @@ class BaseView(FlaskView):
     def _post_put_callback(self, m):
         pass
 
-
+    @login_required
     @route('/<int:id>', methods=["PUT"])
     def put(self, id):
         data = request.json
@@ -77,6 +83,7 @@ class BaseView(FlaskView):
     def _post_delete_callback(self, id):
         pass
 
+    @login_required
     @route('/<int:id>', methods=["DELETE"])
     def delete(self, id):
         if self.api.cache.get(self.cache_key) is not None:
@@ -94,7 +101,7 @@ class BaseView(FlaskView):
 
     @classmethod
     def init_cache(cls):
-        with cls.api.app.app_context():
+        with cls.api.web.app_context():
 
             if cls.model.__as_array__ is True:
                 cls.api.cache[cls.cache_key] = []

modules/core/controller.py

@@ -1,168 +0,0 @@
-from modules import cbpi
-
-
-class ActorController(object):
-
-    @cbpi.try_catch(None)
-    def actor_on(self, power=100, id=None):
-
-        if id is None:
-            id = self.heater
-        self.api.switch_actor_on(int(id), power=power)
-
-    @cbpi.try_catch(None)
-    def actor_off(self, id=None):
-        if id is None:
-            id = self.heater
-
-        self.api.switch_actor_off(int(id))
-
-    @cbpi.try_catch(None)
-    def actor_power(self, power, id=None):
-        if id is None:
-            id = self.heater
-        self.api.actor_power(int(id), power)
-
-
-class SensorController(object):
-
-    @cbpi.try_catch(None)
-    def get_sensor_value(self, id=None):
-
-        if id is None:
-            id = self.sensor
-
-        return cbpi.get_sensor_value(id)
-
-
-
-class ControllerBase(object):
-    __dirty = False
-    __running = False
-
-    @staticmethod
-    def init_global():
-        print "GLOBAL CONTROLLER INIT"
-
-    def notify(self, headline, message, type="success", timeout=5000):
-        self.api.notify(headline, message, type, timeout)
-
-    def is_running(self):
-        return self.__running
-
-    def init(self):
-        self.__running = True
-
-
-    def sleep(self, seconds):
-        self.api.socketio.sleep(seconds)
-
-    def stop(self):
-        self.__running = False
-
-
-    def __init__(self, *args, **kwds):
-        for a in kwds:
-            super(ControllerBase, self).__setattr__(a, kwds.get(a))
-        self.api = kwds.get("api")
-        self.heater = kwds.get("heater")
-        self.sensor = kwds.get("sensor")
-
-
-    def run(self):
-        pass
-
-class KettleController(ControllerBase, ActorController, SensorController):
-
-    @staticmethod
-    def chart(kettle):
-        result = []
-        result.append({"name": "Temp", "data_type": "sensor", "data_id": kettle.sensor})
-        result.append({"name": "Target Temp", "data_type": "kettle", "data_id": kettle.id})
-
-        return result
-
-    def __init__(self, *args, **kwds):
-        ControllerBase.__init__(self, *args, **kwds)
-        self.kettle_id = kwds.get("kettle_id")
-
-    @cbpi.try_catch(None)
-    def heater_on(self, power=100):
-        k = self.api.cache.get("kettle").get(self.kettle_id)
-        if k.heater is not None:
-            self.actor_on(power, int(k.heater))
-
-
-
-
-    @cbpi.try_catch(None)
-    def heater_off(self):
-        k = self.api.cache.get("kettle").get(self.kettle_id)
-        if k.heater is not None:
-            self.actor_off(int(k.heater))
-
-    @cbpi.try_catch(None)
-    def get_temp(self, id=None):
-        if id is None:
-            id = self.kettle_id
-        return self.get_sensor_value(int(self.api.cache.get("kettle").get(id).sensor))
-
-    @cbpi.try_catch(None)
-    def get_target_temp(self, id=None):
-        if id is None:
-            id = self.kettle_id
-        return self.api.cache.get("kettle").get(id).target_temp
-
-class FermenterController(ControllerBase, ActorController, SensorController):
-
-    @staticmethod
-    def chart(fermenter):
-        result = []
-        result.append({"name": "Temp", "data_type": "sensor", "data_id": fermenter.sensor})
-        result.append({"name": "Target Temp", "data_type": "fermenter", "data_id": fermenter.id})
-        return result
-
-    def __init__(self, *args, **kwds):
-        ControllerBase.__init__(self, *args, **kwds)
-        self.fermenter_id = kwds.get("fermenter_id")
-        self.cooler = kwds.get("cooler")
-
-
-
-    @cbpi.try_catch(None)
-    def get_target_temp(self, id=None):
-        if id is None:
-            id = self.fermenter_id
-        return self.api.cache.get("fermenter").get(id).target_temp
-
-    @cbpi.try_catch(None)
-    def heater_on(self, power=100):
-        f = self.api.cache.get("fermenter").get(self.fermenter_id)
-        if f.heater is not None:
-            self.actor_on(power, int(f.heater))
-
-    @cbpi.try_catch(None)
-    def heater_off(self):
-        f = self.api.cache.get("fermenter").get(self.fermenter_id)
-        if f.heater is not None:
-            self.actor_off(int(f.heater))
-
-    @cbpi.try_catch(None)
-    def cooler_on(self, power=100):
-        f = self.api.cache.get("fermenter").get(self.fermenter_id)
-        if f.cooler is not None:
-            self.actor_on(power, int(f.cooler))
-
-    @cbpi.try_catch(None)
-    def cooler_off(self):
-        f = self.api.cache.get("fermenter").get(self.fermenter_id)
-        if f.cooler is not None:
-            self.actor_off(int(f.cooler))
-
-    @cbpi.try_catch(None)
-    def get_temp(self, id=None):
-
-        if id is None:
-            id = self.fermenter_id
-        return self.get_sensor_value(int(self.api.cache.get("fermenter").get(id).sensor))
-

modules/core/core.py

@@ -1,160 +1,200 @@
-import inspect
-import pprint
-
+import json
+import logging
+import os
 import sqlite3
-from flask import make_response, g
-import datetime
-from datetime import datetime
-from flask.views import MethodView
-from flask_classy import FlaskView, route
-
-from time import localtime, strftime
-from functools import wraps, update_wrapper
-
-
-from props import *
-
-from hardware import *
-
-import time
 import uuid
+from datetime import datetime
+from functools import wraps, update_wrapper
+from importlib import import_module
+from time import localtime, strftime
+import time
+
+from flask import Flask, redirect, json, g, make_response
+from flask_socketio import SocketIO
+
+from baseapi import *
+from db import DBModel
+from modules.core.basetypes import Sensor, Actor
+from modules.database.dbmodel import Kettle
 
 
-class NotificationAPI(object):
-    pass
 
-class ActorAPI(object):
-
-    def init_actors(self):
-        self.app.logger.info("Init Actors")
-        t = self.cache.get("actor_types")
-        for key, value in t.iteritems():
-            value.get("class").api = self
-            value.get("class").init_global()
-
-        for key in self.cache.get("actors"):
-            self.init_actor(key)
-
-    def init_actor(self, id):
+class ComplexEncoder(json.JSONEncoder):
+    def default(self, obj):
         try:
-            value = self.cache.get("actors").get(int(id))
-            cfg = value.config.copy()
-            cfg.update(dict(api=self, id=id, name=value.name))
-            clazz = self.cache.get("actor_types").get(value.type).get("class")
-            value.instance = clazz(**cfg)
-            value.instance.init()
-            value.state = 0
-            value.power = 100
+            if isinstance(obj, DBModel):
+                return obj.__dict__
+            elif isinstance(obj, Actor):
+                return {"state": obj.value}
+            elif isinstance(obj, Sensor):
+                return {"value": obj.value, "unit": obj.unit}
+            elif hasattr(obj, "callback"):
+                return obj()
+            else:
+                return None
+            return None
+        except TypeError as e:
+            pass
+        return None
+
+class ActorCore(object):
+    key = "actor_types"
+
+    def __init__(self, cbpi):
+        self.cbpi = cbpi
+        self.cbpi.cache["actors"] = {}
+        self.cbpi.cache[self.key] = {}
+
+    def init(self):
+        for key, value in self.cbpi.cache["actors"].iteritems():
+            self.init_one(key)
+
+    def init_one(self, id):
+        try:
+
+            actor = self.cbpi.cache["actors"][id]
+            clazz = self.cbpi.cache[self.key].get(actor.type)["class"]
+            cfg = actor.config.copy()
+            cfg.update(dict(cbpi=self.cbpi, id=id))
+            self.cbpi.cache["actors"][id].instance = clazz(**cfg)
+            actor.state = 0
+            actor.power = 100
+            self.cbpi.emit("INIT_ACTOR", id=id)
         except Exception as e:
-            self.notify("Actor Error", "Failed to setup actor %s. Please check the configuraiton" % value.name,
-                        type="danger", timeout=None)
-            self.app.logger.error("Initializing of Actor %s failed" % id)
+            self.cbpi.web.logger.error(e)
 
-    def switch_actor_on(self, id, power=None):
-        actor = self.cache.get("actors").get(id)
+    def stop_one(self, id):
+        self.cbpi.cache["actors"][id]["instance"].stop()
+        self.cbpi.emit("STOP_ACTOR", id=id)
 
-        if actor.state == 1:
-            return
-
-        actor.instance.on(power=power)
+    def on(self, id, power=100):
+        try:
+            actor = self.cbpi.cache["actors"].get(int(id))
+            actor.instance.on()
             actor.state = 1
-        if power is not None:
-
             actor.power = power
-        self.emit("SWITCH_ACTOR", actor)
+            self.cbpi.ws_emit("SWITCH_ACTOR", actor)
+            self.cbpi.emit("SWITCH_ACTOR_ON", id=id, power=power)
+            return True
+        except Exception as e:
+            self.cbpi.logger.error(e)
+            return False
 
-    def actor_power(self, id, power=100):
-        actor = self.cache.get("actors").get(id)
-        actor.instance.set_power(power=power)
-        actor.power = power
-        self.emit("SWITCH_ACTOR", actor)
-
-    def switch_actor_off(self, id):
-        actor = self.cache.get("actors").get(id)
-
-        if actor.state == 0:
-            return
+    def off(self, id):
+        try:
+            actor = self.cbpi.cache["actors"].get(int(id))
             actor.instance.off()
             actor.state = 0
-        self.emit("SWITCH_ACTOR", actor)
-
-class SensorAPI(object):
-
-    def init_sensors(self):
-        '''
-        Initialize all sensors
-        :return: 
-        '''
-
-        self.app.logger.info("Init Sensors")
-
-        t = self.cache.get("sensor_types")
-        for key, value in t.iteritems():
-            value.get("class").init_global()
-
-        for key in self.cache.get("sensors"):
-            self.init_sensor(key)
-
-    def stop_sensor(self, id):
-
-        try:
-            self.cache.get("sensors").get(id).instance.stop()
+            self.cbpi.ws_emit("SWITCH_ACTOR", actor)
+            self.cbpi.emit("SWITCH_ACTOR_OFF", id=id)
+            return True
         except Exception as e:
+            self.cbpi.logger.error(e)
+            return False
 
-            self.app.logger.info("Stop Sensor Error")
+    def toggle(self, id):
+        if self.cbpi.cache.get("actors").get(id).state == 0:
+            self.on(id)
+        else:
+            self.off(id)
+
+    def power(self, id, power):
+        try:
+            actor = self.cbpi.cache["actors"].get(int(id))
+            actor.instance.power(power)
+            actor.power = power
+            self.cbpi.ws_emit("SWITCH_ACTOR", actor)
+            self.cbpi.emit("SWITCH_ACTOR_POWER_CHANGE", id=id, power=power)
+            return True
+        except Exception as e:
+            self.cbpi.logger.error(e)
+            return False
+
+    def action(self, id, method, **data):
+        self.cbpi.cache.get("actors").get(id).instance.__getattribute__(method)(**data)
+
+
+    def toggle_timeout(self, id, seconds):
+
+        def toggle( id, seconds):
+            self.cbpi.cache.get("actors").get(int(id)).timer = int(time.time()) + int(seconds)
+            self.toggle(int(id))
+            self.cbpi.sleep(seconds)
+            self.cbpi.cache.get("actors").get(int(id)).timer = None
+            self.toggle(int(id))
+        job = self.cbpi._socketio.start_background_task(target=toggle, id=id, seconds=seconds)
+
+    def get_state(self, actor_id):
         pass
 
 
-    def init_sensor(self, id):
-        '''
-        initialize sensor by id
-        :param id: 
-        :return: 
-        '''
+class SensorCore(object):
+    key = "sensor_types"
 
-        def start_active_sensor(instance):
-            '''
-            start active sensors as background job
-            :param instance: 
-            :return: 
-            '''
-            instance.execute()
+    def __init__(self, cbpi):
+        self.cbpi = cbpi
+        self.cbpi.cache["sensors"] = {}
+        self.cbpi.cache["sensor_instances"] = {}
+        self.cbpi.cache["sensor_types"] = {}
 
+    def init(self):
+        for key, value in self.cbpi.cache["sensors"].iteritems():
+            self.init_one(key)
+
+    def init_one(self, id):
         try:
-            if id in self.cache.get("sensor_instances"):
-                self.cache.get("sensor_instances").get(id).stop()
-            value = self.cache.get("sensors").get(id)
+            sensor = self.cbpi.cache["sensors"][id]
+            clazz = self.cbpi.cache[self.key].get(sensor.type)["class"]
+            cfg = sensor.config.copy()
+            cfg.update(dict(cbpi=self.cbpi, id=id))
+            self.cbpi.cache["sensors"][id].instance = clazz(**cfg)
+            self.cbpi.cache["sensors"][id].instance.init()
 
-            cfg = value.config.copy()
-            cfg.update(dict(api=self, id=id, name=value.name))
-            clazz = self.cache.get("sensor_types").get(value.type).get("class")
-            value.instance = clazz(**cfg)
-            value.instance.init()
-            if isinstance(value.instance, SensorPassive):
-                # Passive Sensors
-                value.mode = "P"
-            else:
-                # Active Sensors
-                value.mode = "A"
-                t = self.socketio.start_background_task(target=start_active_sensor, instance=value.instance)
+            self.cbpi.emit("INIT_SENSOR", id=id)
+
+            def job(obj):
+                obj.execute()
+
+            t = self.cbpi._socketio.start_background_task(target=job, obj=self.cbpi.cache["sensors"][id].instance)
+            self.cbpi.emit("INIT_SENSOR", id=id)
 
         except Exception as e:
+            print "ERROR"
+            self.cbpi.web.logger.error(e)
 
-            self.notify("Sensor Error", "Failed to setup Sensor %s. Please check the configuraiton" % value.name, type="danger", timeout=None)
-            self.app.logger.error("Initializing of Sensor %s failed" % id)
+    def stop_one(self, id):
 
-    def receive_sensor_value(self, id, value):
-        self.emit("SENSOR_UPDATE", self.cache.get("sensors")[id])
-        self.save_to_file(id, value)
+        self.cbpi.cache["sensors"][id].instance.stop()
+        self.cbpi.emit("STOP_SENSOR", id=id)
 
-    def save_to_file(self, id, value, prefix="sensor"):
+    def get_value(self, sensorid):
+        try:
+            return self.cbpi.cache["sensors"][sensorid].instance.value
+        except:
+            return None
+
+    def get_state(self, actor_id):
+        pass
+
+    def write_log(self, id, value, prefix="sensor"):
         filename = "./logs/%s_%s.log" % (prefix, str(id))
         formatted_time = strftime("%Y-%m-%d %H:%M:%S", localtime())
-        msg = str(formatted_time) + "," +str(value) + "\n"
+        msg = str(formatted_time) + "," + str(value) + "\n"
 
         with open(filename, "a") as file:
             file.write(msg)
 
+    def action(self, id, method, **data):
+        self.cbpi.cache.get("sensors").get(id).instance.__getattribute__(method)(**data)
+
+
+class BrewingCore(object):
+
+    def __init__(self, cbpi):
+        self.cbpi = cbpi
+        self.cbpi.cache["step_types"] = {}
+        self.cbpi.cache["controller_types"] = {}
+
     def log_action(self, text):
         filename = "./logs/action.log"
         formatted_time = strftime("%Y-%m-%d %H:%M:%S", localtime())
@@ -162,265 +202,141 @@ class SensorAPI(object):
             text = text.encode("utf-8")
             file.write("%s,%s\n" % (formatted_time, text))
 
-    def shutdown_sensor(self, id):
-        self.cache.get("sensors")[id].stop()
+    def get_controller(self, name):
+        return self.cbpi.cache["controller_types"].get(name)
+
+    def set_target_temp(self, id, temp):
+        self.cbpi.cache.get("kettle")[id].target_temp = float(temp)
+        Kettle.update(**self.cbpi.cache.get("kettle")[id].__dict__)
+        self.cbpi.ws_emit("UPDATE_KETTLE_TARGET_TEMP", {"id": id, "target_temp": temp})
+        self.cbpi.emit("SET_KETTLE_TARGET_TEMP", id=id, temp=temp)
 
 
-    def get_sensor_value(self, id):
-        try:
-            id = int(id)
-            return float(self.cache.get("sensors")[id].instance.last_value)
-        except Exception as e:
+    def toggle_automatic(self, id):
+        kettle = self.cbpi.cache.get("kettle")[id]
+        if kettle.state is False:
+            # Start controller
+            if kettle.logic is not None:
+                cfg = kettle.config.copy()
+                cfg.update(dict(api=self.cbpi, kettle_id=kettle.id, heater=kettle.heater, sensor=kettle.sensor))
+                instance = self.get_controller(kettle.logic).get("class")(**cfg)
+                instance.init()
+                kettle.instance = instance
 
-            return None
+                def run(instance):
+                    instance.run()
 
-class CacheAPI(object):
-
-    def get_sensor(self, id):
-        try:
-            return self.cache["sensors"][id]
-        except:
-            return None
-
-    def get_actor(self, id):
-        try:
-            return self.cache["actors"][id]
-        except:
-            return None
-
-class CraftBeerPi(ActorAPI, SensorAPI):
-
-    cache = {
-        "init": {},
-        "config": {},
-        "actor_types": {},
-        "sensor_types": {},
-        "sensors": {},
-        "sensor_instances": {},
-        "init": [],
-        "background":[],
-        "step_types": {},
-        "controller_types": {},
-        "messages": [],
-        "plugins": {},
-        "fermentation_controller_types": {},
-        "fermenter_task": {}
-    }
-    buzzer = None
-    eventbus = {}
-
-
-    # constructor
-    def __init__(self, app, socketio):
-        self.app = app
-        self.socketio = socketio
-
-
-    def emit(self, key, data):
-        self.socketio.emit(key, data, namespace='/brew')
-
-    def notify(self, headline, message, type="success", timeout=5000):
-        self.beep()
-        msg = {"id": str(uuid.uuid1()), "type": type, "headline": headline, "message": message, "timeout": timeout}
-        self.emit_message(msg)
-
-    def beep(self):
-        if self.buzzer is not None:
-            self.buzzer.beep()
-
-
-    def add_cache_callback(self, key,  method):
-        method.callback = True
-        self.cache[key] = method
-
-    def get_config_parameter(self, key, default):
-        cfg = self.cache.get("config").get(key)
-
-        if cfg is None:
-            return default
+                t = self.cbpi._socketio.start_background_task(target=run, instance=instance)
+            kettle.state = not kettle.state
+            self.cbpi.ws_emit("UPDATE_KETTLE", self.cbpi.cache.get("kettle").get(id))
+            self.cbpi.emit("KETTLE_CONTROLLER_STARTED", id=id)
         else:
-            return cfg.value
-
-    def set_config_parameter(self, name, value):
-        from modules.config import Config
-        with self.app.app_context():
-            update_data = {"name": name, "value": value}
-            self.cache.get("config")[name].__dict__.update(**update_data)
-            c = Config.update(**update_data)
-            self.emit("UPDATE_CONFIG", c)
+            # Stop controller
+            kettle.instance.stop()
+            kettle.state = not kettle.state
+            self.cbpi.ws_emit("UPDATE_KETTLE", self.cbpi.cache.get("kettle").get(id))
+            self.cbpi.emit("KETTLE_CONTROLLER_STOPPED", id=id)
 
 
-    def add_config_parameter(self, name, value, type, description, options=None):
-        from modules.config import Config
-        with self.app.app_context():
-            c = Config.insert(**{"name":name, "value": value, "type": type, "description": description, "options": options})
-            if self.cache.get("config") is not None:
-                self.cache.get("config")[c.name] = c
-
-    def clear_cache(self, key, is_array=False):
-        if is_array:
-            self.cache[key] = []
-        else:
-            self.cache[key] = {}
-
-    # helper method for parsing props
-    def __parseProps(self, key, cls):
-        name = cls.__name__
-        self.cache[key][name] = {"name": name, "class": cls, "properties": [], "actions": []}
-        tmpObj = cls()
-        members = [attr for attr in dir(tmpObj) if not callable(getattr(tmpObj, attr)) and not attr.startswith("__")]
-        for m in members:
-            if isinstance(tmpObj.__getattribute__(m), Property.Number):
-                t = tmpObj.__getattribute__(m)
-                self.cache[key][name]["properties"].append(
-                    {"name": m, "label": t.label, "type": "number", "configurable": t.configurable, "description": t.description, "default_value": t.default_value})
-            elif isinstance(tmpObj.__getattribute__(m), Property.Text):
-                t = tmpObj.__getattribute__(m)
-                self.cache[key][name]["properties"].append(
-                    {"name": m, "label": t.label, "type": "text", "configurable": t.configurable, "default_value": t.default_value, "description": t.description})
-            elif isinstance(tmpObj.__getattribute__(m), Property.Select):
-                t = tmpObj.__getattribute__(m)
-                self.cache[key][name]["properties"].append(
-                    {"name": m, "label": t.label, "type": "select",  "configurable": True, "options": t.options, "description": t.description})
-            elif isinstance(tmpObj.__getattribute__(m), Property.Actor):
-                t = tmpObj.__getattribute__(m)
-                self.cache[key][name]["properties"].append({"name": m, "label": t.label, "type": "actor",  "configurable": t.configurable, "description": t.description})
-            elif isinstance(tmpObj.__getattribute__(m), Property.Sensor):
-                t = tmpObj.__getattribute__(m)
-                self.cache[key][name]["properties"].append({"name": m, "label": t.label, "type": "sensor", "configurable": t.configurable, "description": t.description})
-            elif isinstance(tmpObj.__getattribute__(m), Property.Kettle):
-                t = tmpObj.__getattribute__(m)
-                self.cache[key][name]["properties"].append({"name": m, "label": t.label, "type": "kettle", "configurable": t.configurable, "description": t.description})
-
-        for name, method in cls.__dict__.iteritems():
-            if hasattr(method, "action"):
-                label = method.__getattribute__("label")
-                self.cache[key][cls.__name__]["actions"].append({"method": name, "label": label})
-
-
-        return cls
-
-
-    def actor(self, cls):
-        return self.__parseProps("actor_types", cls)
-
-
-
-    def actor2(self, description="", power=True, **options):
-
-        def decorator(f):
-            print f()
-            print f
-            print options
-            print description
-            return f
-        return decorator
-
-    def sensor(self, cls):
-        return self.__parseProps("sensor_types", cls)
-
-    def controller(self, cls):
-        return self.__parseProps("controller_types", cls)
-
-    def fermentation_controller(self, cls):
-        return self.__parseProps("fermentation_controller_types", cls)
+class FermentationCore(object):
+    def __init__(self, cbpi):
+        self.cbpi = cbpi
+        self.cbpi.cache["fermenter"] = {}
+        self.cbpi.cache["fermentation_controller_types"] = {}
 
     def get_controller(self, name):
-        return self.cache["controller_types"].get(name)
-
-    def get_fermentation_controller(self, name):
-        return self.cache["fermentation_controller_types"].get(name)
+        return self.cbpi.cache["fermentation_controller_types"].get(name)
 
 
-    # Step action
-    def action(self,label):
-        def real_decorator(func):
-            func.action = True
-            func.label = label
-            return func
-        return real_decorator
+class Logger(object):
+    def __init__(self, cbpi):
+        self.cbpi = cbpi
 
-    # step decorator
-    def step(self, cls):
+    def error(self, msg, *args, **kwargs):
+        self.cbpi.web.logger.error(msg, *args, **kwargs)
 
-        key = "step_types"
-        name = cls.__name__
-        self.cache[key][name] = {"name": name, "class": cls, "properties": [], "actions": []}
+    def info(self, msg, *args, **kwargs):
+        self.cbpi.web.logger.info(msg, *args, **kwargs)
 
-        tmpObj = cls()
-        members = [attr for attr in dir(tmpObj) if not callable(getattr(tmpObj, attr)) and not attr.startswith("__")]
-        for m in members:
-            if isinstance(tmpObj.__getattribute__(m), StepProperty.Number):
-                t = tmpObj.__getattribute__(m)
-                self.cache[key][name]["properties"].append({"name": m, "label": t.label, "type": "number", "configurable": t.configurable, "default_value": t.default_value, "description": t.description})
-            elif isinstance(tmpObj.__getattribute__(m), StepProperty.Text):
-                t = tmpObj.__getattribute__(m)
-                self.cache[key][name]["properties"].append({"name": m, "label": t.label, "type": "text", "configurable": t.configurable, "default_value": t.default_value, "description": t.description})
-            elif isinstance(tmpObj.__getattribute__(m), StepProperty.Select):
-                t = tmpObj.__getattribute__(m)
-                self.cache[key][name]["properties"].append({"name": m, "label": t.label, "type": "select", "configurable": True, "options": t.options, "description": t.description})
-            elif isinstance(tmpObj.__getattribute__(m), StepProperty.Actor):
-                t = tmpObj.__getattribute__(m)
-                self.cache[key][name]["properties"].append({"name": m, "label": t.label, "type": "actor",  "configurable": t.configurable, "description": t.description})
-            elif isinstance(tmpObj.__getattribute__(m), StepProperty.Sensor):
-                t = tmpObj.__getattribute__(m)
-                self.cache[key][name]["properties"].append({"name": m, "label": t.label, "type": "sensor", "configurable": t.configurable, "description": t.description})
-            elif isinstance(tmpObj.__getattribute__(m), StepProperty.Kettle):
-                t = tmpObj.__getattribute__(m)
-                self.cache[key][name]["properties"].append({"name": m, "label": t.label, "type": "kettle", "configurable": t.configurable, "description": t.description})
+    def debug(self, msg, *args, **kwargs):
+        self.cbpi.web.logger.debug(msg, *args, **kwargs)
 
-        for name, method in cls.__dict__.iteritems():
-            if hasattr(method, "action"):
-                label = method.__getattribute__("label")
-                self.cache[key][cls.__name__]["actions"].append({"method": name, "label": label})
+    def warning(self, msg, *args, **kwargs):
+        self.cbpi.web.logger.warning(msg, *args, **kwargs)
 
-        return cls
+class CraftBeerPI(object):
+    cache = {}
+    eventbus = {}
+
+    def __init__(self):
+        self.cache["messages"] = []
+        self.cache["version"] = "3.1"
+        FORMAT = '%(asctime)-15s - %(levelname)s - %(message)s'
+        logging.basicConfig(filename='./logs/app.log', level=logging.INFO, format=FORMAT)
+        logging.getLogger('socketio').setLevel(logging.ERROR)
+        logging.getLogger('engineio').setLevel(logging.ERROR)
+        self.web = Flask(__name__)
+        self.logger = Logger(self)
+
+        self.logger.info("###Startup CraftBeerPi %s ###" % self.cache.get("version"))
+        self.web.secret_key = 'Cr4ftB33rP1'
+        self.web.json_encoder = ComplexEncoder
+        self._socketio = SocketIO(self.web, json=json, logging=False)
 
 
-    # Event Bus
-    def event(self, name, async=False):
+        self.modules = {}
+        self.addon = Addon(self)
+        self.actor = ActorCore(self)
+        self.sensor = SensorCore(self)
+        self.brewing = BrewingCore(self)
+        self.fermentation = FermentationCore(self)
 
-        def real_decorator(function):
-            if self.eventbus.get(name) is None:
-                self.eventbus[name] = []
-            self.eventbus[name].append({"function": function, "async": async})
-            def wrapper(*args, **kwargs):
-                return function(*args, **kwargs)
-            return wrapper
-        return real_decorator
+        @self.web.route('/')
+        def index():
+            return redirect('ui')
 
-    def emit_message(self, message):
-        self.emit_event(name="MESSAGE", message=message)
-
-    def emit_event(self, name, **kwargs):
-        for i in self.eventbus.get(name, []):
-            if i["async"] is False:
-                i["function"](**kwargs)
-            else:
-                t = self.socketio.start_background_task(target=i["function"], **kwargs)
-
-    # initializer decorator
-    def initalizer(self, order=0):
-        def real_decorator(function):
-            self.cache["init"].append({"function": function, "order": order})
-            def wrapper(*args, **kwargs):
-                return function(*args, **kwargs)
-            return wrapper
-        return real_decorator
-
-
-
-    def try_catch(self, errorResult="ERROR"):
-        def real_decorator(function):
-            def wrapper(*args, **kwargs):
+    def run(self):
+        self.__init_db()
+        self.loadPlugins()
+        self.addon.init()
+        self.sensor.init()
+        self.actor.init()
+        self.beep()
         try:
-                    return function(*args, **kwargs)
-                except:
-                    self.app.logger.error("Exception in function %s. Return default %s" % (function.__name__, errorResult))
-                    return errorResult
-            return wrapper
+            port = int(self.get_config_parameter('port', '5000'))
+        except ValueError:
+            port = 5000
 
-        return real_decorator
+        self._socketio.run(self.web, host='0.0.0.0', port=port)
+
+    def beep(self):
+        self.buzzer.beep()
+
+    def sleep(self, seconds):
+        self._socketio.sleep(seconds)
+
+    def start_background_task(self, target, *args, **kwargs):
+
+        self._socketio.start_background_task(target, *args, **kwargs)
+
+    def notify(self, headline, message, type="success", timeout=5000):
+        msg = {"id": str(uuid.uuid1()), "type": type, "headline": headline, "message": message, "timeout": timeout}
+        self.ws_emit("NOTIFY", msg)
+
+    def ws_emit(self, key, data):
+        self._socketio.emit(key, data, namespace='/brew')
+
+    def __init_db(self, ):
+
+        with self.web.app_context():
+            db = self.get_db()
+            try:
+                with self.web.open_resource('../../config/schema.sql', mode='r') as f:
+                    db.cursor().executescript(f.read())
+                db.commit()
+            except Exception as e:
+
+                pass
 
     def nocache(self, view):
         @wraps(view)
@@ -435,59 +351,55 @@ class CraftBeerPi(ActorAPI, SensorAPI):
 
         return update_wrapper(no_cache, view)
 
-    def init_kettle(self, id):
+    def get_db(self):
+        db = getattr(g, '_database', None)
+        if db is None:
+            def dict_factory(cursor, row):
+                d = {}
+                for idx, col in enumerate(cursor.description):
+                    d[col[0]] = row[idx]
+                return d
+
+            db = g._database = sqlite3.connect('craftbeerpi.db')
+            db.row_factory = dict_factory
+        return db
+
+    def add_cache_callback(self, key, method):
+        method.callback = True
+        self.cache[key] = method
+
+    def get_config_parameter(self, key, default=None):
+        cfg = self.cache["config"].get(key)
+        if cfg is None:
+            return default
+        else:
+            return cfg.value
+
+    def set_config_parameter(self, name, value):
+        from modules.config import Config
+        with self.web.app_context():
+            update_data = {"name": name, "value": value}
+            self.cache.get("config")[name].__dict__.update(**update_data)
+            c = Config.update(**update_data)
+            self.ws_emit("UPDATE_CONFIG", c)
+
+
+    def emit(self, key, **kwargs):
+        if self.eventbus.get(key) is not None:
+            for value in self.eventbus[key]:
+                if value["async"] is False:
+                    value["function"](**kwargs)
+                else:
+                    t = self.cbpi._socketio.start_background_task(target=value["function"], **kwargs)
+
+    def loadPlugins(self):
+        for filename in os.listdir("./modules/plugins"):
+
+            if os.path.isdir("./modules/plugins/" + filename) is False:
+                continue
             try:
-            value = self.cache.get("kettle").get(id)
-            value["state"] = False
-        except:
-            self.notify("Kettle Setup Faild", "Please check %s configuration" % value.name, type="danger", timeout=None)
-            self.app.logger.error("Initializing of Kettle %s failed" % id)
-
-
-    def run_init(self):
-        '''
-        call all initialziers after startup
-        :return: 
-        '''
-        self.app.logger.info("Invoke Init")
-        self.cache["init"] = sorted(self.cache["init"], key=lambda k: k['order'])
-        for i in self.cache.get("init"):
-            self.app.logger.info("INITIALIZER - METHOD %s PAHT %s: " % (i.get("function").__name__, str(inspect.getmodule(i.get("function")).__file__) ))
-            i.get("function")(self)
-
-
-
-    def backgroundtask(self, key, interval, config_parameter=None):
-
-        '''
-        Background Task Decorator
-        :param key: 
-        :param interval: 
-        :param config_parameter: 
-        :return: 
-        '''
-        def real_decorator(function):
-            self.cache["background"].append({"function": function, "key": key, "interval": interval, "config_parameter": config_parameter})
-            def wrapper(*args, **kwargs):
-                return function(*args, **kwargs)
-            return wrapper
-        return real_decorator
-
-    def run_background_processes(self):
-        '''
-        call all background task after startup
-        :return: 
-        '''
-        self.app.logger.info("Start Background")
-
-        def job(interval, method):
-            while True:
-                try:
-                    method(self)
+                self.modules[filename] = import_module("modules.plugins.%s" % (filename))
             except Exception as e:
-                    self.app.logger.error("Exception" + method.__name__ + ": " + str(e))
-                self.socketio.sleep(interval)
 
+                self.notify("Failed to load plugin %s " % filename, str(e), type="danger", timeout=None)
 
-        for  value in self.cache.get("background"):
-            t = self.socketio.start_background_task(target=job,  interval=value.get("interval"),  method=value.get("function"))

modules/core/db.py

@@ -1,5 +1,4 @@
 import sqlite3
-
 from flask import json, g
 
 

modules/core/db_migrate.py

@@ -1,11 +1,11 @@
 import sqlite3
 import os
 from modules import cbpi
-from db import get_db
+from modules.core.db import get_db
 
 def execute_file(curernt_version, data):
     if curernt_version >= data["version"]:
-        cbpi.app.logger.info("SKIP DB FILE: %s" % data["file"])
+        cbpi.web.logger.info("SKIP DB FILE: %s" % data["file"])
         return
     try:
         with sqlite3.connect("craftbeerpi.db") as conn:
@@ -18,14 +18,13 @@ def execute_file(curernt_version, data):
                 cur.execute("INSERT INTO schema_info (version,filename) values (?,?)", (data["version"], data["file"]))
                 conn.commit()
 
-    except sqlite3.OperationalError as err:
-        print "EXCEPT"
-        print err
+    except sqlite3.OperationalError as e:
+        cbpi.logger.error(e)
 
-@cbpi.initalizer(order=-9999)
-def init(app=None):
+@cbpi.addon.core.initializer(order=-9999)
+def init(cbpi):
 
-    with cbpi.app.app_context():
+    with cbpi.web.app_context():
         conn = get_db()
         cur = conn.cursor()
         current_version = None
@@ -37,11 +36,8 @@ def init(app=None):
             pass
         result = []
         for filename in os.listdir("./update"):
+
             if filename.endswith(".sql"):
                 d = {"version": int(filename[:filename.index('_')]), "file": filename}
                 result.append(d)
                 execute_file(current_version, d)
-
-
-
-

modules/core/hardware.py

@@ -1,108 +0,0 @@
-# -*- coding: utf-8 -*-
-
-class Base(object):
-    __dirty = False
-
-    @classmethod
-    def init_global(cls):
-        pass
-
-    def get_config_parameter(self, key, default_value):
-        return self.api.get_config_parameter(key, default_value)
-
-    def sleep(self, seconds):
-        self.api.socketio.sleep(seconds)
-
-    def init(self):
-        pass
-
-    def stop(self):
-        pass
-
-    def update(self, **kwds):
-        pass
-
-    def __init__(self, *args, **kwds):
-        for a in kwds:
-            super(Base, self).__setattr__(a, kwds.get(a))
-        self.api = kwds.get("api")
-        self.id = kwds.get("id")
-        self.value = None
-        self.__dirty = False
-
-    def __setattr__(self, name, value):
-
-        if name != "_Base__dirty":
-            self.__dirty = True
-            super(Base, self).__setattr__(name, value)
-        else:
-            super(Base, self).__setattr__(name, value)
-
-
-class SensorBase(Base):
-
-    last_value = 0
-
-    def init(self):
-        print "INIT Base SENSOR"
-
-    def stop(self):
-        print "STOP SENSOR"
-
-    def data_received(self, data):
-
-
-        self.last_value = data
-        self.api.receive_sensor_value(self.id, data)
-
-    def get_unit(self):
-        if self.get_config_parameter("unit", "C") == "C":
-            return "°C"
-        else:
-            return "°F"
-
-    def get_value(self):
-
-        return {"value": self.last_value, "unit": self.get_unit()}
-
-class SensorActive(SensorBase):
-
-    __running = False
-
-    def is_running(self):
-
-        return self.__running
-
-    def init(self):
-        self.__running = True
-
-    def stop(self):
-        self.__running = False
-
-
-    def execute(self):
-        pass
-
-
-class SensorPassive(SensorBase):
-    def init(self):
-        print "INIT PASSIV SENSOR"
-        pass
-
-    def read(self):
-        return 0
-
-
-class ActorBase(Base):
-
-    def state(self):
-        return 1
-
-    def set_power(self, power):
-        pass
-
-    def on(self, power=0):
-        pass
-
-    def off(self):
-        pass

modules/core/proptypes.py

@@ -16,11 +16,13 @@ class Property(object):
             self.configurable = configurable
             self.default_value = default_value
             self.description = description
+            self.unit = unit
 
     class Text(PropertyType):
-        def __init__(self, label, configurable=False, default_value="", description=""):
+        def __init__(self, label, configurable=False, required=False, default_value="", description=""):
             PropertyType.__init__(self)
             self.label = label
+            self.required = required
             self.configurable = configurable
             self.default_value = default_value
             self.description = description
@@ -43,26 +45,6 @@ class Property(object):
         def __init__(self, label, description=""):
             PropertyType.__init__(self)
             self.label = label
-            self.configurable = True
-            self.description = description
-
-
-class StepProperty(Property):
-    class Actor(PropertyType):
-        def __init__(self, label, description=""):
-            PropertyType.__init__(self)
-            self.label = label
-            self.configurable = True
-            self.description = description
-    class Sensor(PropertyType):
-        def __init__(self, label, description=""):
-            PropertyType.__init__(self)
-            self.label = label
-            self.configurable = True
-            self.description = description
-    class Kettle(PropertyType):
-        def __init__(self, label, description=""):
-            PropertyType.__init__(self)
-            self.label = label
+            self.unit = ""
             self.configurable = True
             self.description = description

modules/core/step.py

@@ -1,146 +0,0 @@
-from modules import cbpi
-from modules.core.props import StepProperty, Property
-import time
-
-
-class NotificationAPI(object):
-    def notify(self, headline, message, type="success", timeout=5000):
-        self.api.notify(headline, message, type, timeout)
-
-class ActorAPI(NotificationAPI):
-
-    @cbpi.try_catch(None)
-    def actor_on(self, id, power=100):
-        self.api.switch_actor_on(int(id), power=power)
-
-    @cbpi.try_catch(None)
-    def actor_off(self, id):
-        self.api.switch_actor_off(int(id))
-
-    @cbpi.try_catch(None)
-    def actor_power(self, id, power):
-        self.api.actor_power(int(id), power)
-
-class SensorAPI(NotificationAPI):
-
-    @cbpi.try_catch(None)
-    def get_sensor_value(self, id):
-        return cbpi.get_sensor_value(id)
-
-class KettleAPI(NotificationAPI):
-
-    @cbpi.try_catch(None)
-    def get_kettle_temp(self, id=None):
-        id = int(id)
-        if id is None:
-            id = self.kettle_id
-        return cbpi.get_sensor_value(int(self.api.cache.get("kettle").get(id).sensor))
-
-    @cbpi.try_catch(None)
-    def get_target_temp(self, id=None):
-        id = int(id)
-        if id is None:
-            id = self.kettle_id
-        return self.api.cache.get("kettle").get(id).target_temp
-
-    def set_target_temp(self, temp, id=None):
-        temp = float(temp)
-
-        try:
-            if id is None:
-                self.api.emit_event("SET_TARGET_TEMP", id=self.kettle_id, temp=temp)
-            else:
-                self.api.emit_event("SET_TARGET_TEMP", id=id, temp=temp)
-        except Exception as e:
-
-            self.notify("Faild to set Target Temp", "", type="warning")
-
-class Timer(object):
-    timer_end = Property.Number("TIMER_END", configurable=False)
-
-    def start_timer(self, timer):
-
-        if self.timer_end is not None:
-            return
-        self.timer_end = int(time.time()) + timer
-
-
-    def stop_timer(self):
-        if self.timer_end is not None:
-            self.timer_end = None
-
-    def is_timer_running(self):
-        if self.timer_end is not None:
-            return True
-        else:
-            return False
-
-    def timer_remaining(self):
-        if self.timer_end is not None:
-            return self.timer_end - int(time.time())
-        else:
-            return None
-
-    def is_timer_finished(self):
-        if self.timer_end is None:
-            return None
-        if self.timer_end <= int(time.time()):
-            return True
-        else:
-            return False
-
-
-class StepBase(Timer, ActorAPI, SensorAPI, KettleAPI):
-
-    __dirty = False
-    managed_fields = []
-    n = False
-
-    def next(self):
-        self.n = True
-
-    def init(self):
-        pass
-
-    def finish(self):
-        pass
-
-    def reset(self):
-        pass
-
-    def execute(self):
-        print "-------------"
-        print "Step Info"
-        print "Kettle ID: %s" % self.kettle_id
-        print "ID: %s" % self.id
-
-
-    def __init__(self, *args, **kwds):
-
-        for a in kwds:
-
-            super(StepBase, self).__setattr__(a, kwds.get(a))
-
-
-        self.api = kwds.get("api")
-        self.id = kwds.get("id")
-        self.name = kwds.get("name")
-        self.kettle_id = kwds.get("kettleid")
-        self.value = None
-        self.__dirty = False
-
-
-    def is_dirty(self):
-        return self.__dirty
-
-    def reset_dirty(self):
-        self.__dirty = False
-
-    def __setattr__(self, name, value):
-
-        if name != "_StepBase__dirty" and name in self.managed_fields:
-            self.__dirty = True
-            super(StepBase, self).__setattr__(name, value)
-        else:
-            super(StepBase, self).__setattr__(name, value)
-

modules/database/dbmodel.py

@@ -0,0 +1,135 @@
+from modules.core.db import DBModel, get_db
+from flask import json
+
+class Kettle(DBModel):
+    __fields__ = ["name","sensor", "heater", "automatic", "logic", "config", "agitator", "target_temp"]
+    __table_name__ = "kettle"
+    __json_fields__ = ["config"]
+
+class Sensor(DBModel):
+    __fields__ = ["name","type", "config", "hide"]
+    __table_name__ = "sensor"
+    __json_fields__ = ["config"]
+
+class Config(DBModel):
+    __fields__ = ["type", "value", "description", "options"]
+    __table_name__ = "config"
+    __json_fields__ = ["options"]
+    __priamry_key__ = "name"
+
+class Actor(DBModel):
+    __fields__ = ["name","type", "config", "hide"]
+    __table_name__ = "actor"
+    __json_fields__ = ["config"]
+
+class Step(DBModel):
+    __fields__      = ["name","type", "stepstate", "state", "start", "end", "order", "config"]
+    __table_name__  = "step"
+    __json_fields__ = ["config", "stepstate"]
+    __order_by__    = "order"
+    __as_array__    = True
+
+    @classmethod
+    def get_max_order(cls):
+        cur = get_db().cursor()
+        cur.execute("SELECT max(step.'order') as 'order' FROM %s" % cls.__table_name__)
+        r = cur.fetchone()
+        return r.get("order")
+
+    @classmethod
+    def get_by_state(cls, state, order=True):
+        cur = get_db().cursor()
+        cur.execute("SELECT * FROM %s WHERE state = ? ORDER BY %s.'order'" % (cls.__table_name__,cls.__table_name__,), state)
+        r = cur.fetchone()
+        if r is not None:
+            return cls(r)
+        else:
+            return None
+
+    @classmethod
+    def delete_all(cls):
+        cur = get_db().cursor()
+        cur.execute("DELETE FROM %s" % cls.__table_name__)
+        get_db().commit()
+
+    @classmethod
+    def reset_all_steps(cls):
+        cur = get_db().cursor()
+        cur.execute("UPDATE %s SET state = 'I', stepstate = NULL , start = NULL, end = NULL " % cls.__table_name__)
+        get_db().commit()
+
+    @classmethod
+    def update_state(cls, id, state):
+        cur = get_db().cursor()
+        cur.execute("UPDATE %s SET state = ? WHERE id =?" % cls.__table_name__, (state, id))
+        get_db().commit()
+
+    @classmethod
+    def update_step_state(cls, id, state):
+        cur = get_db().cursor()
+        cur.execute("UPDATE %s SET stepstate = ? WHERE id =?" % cls.__table_name__, (json.dumps(state),id))
+        get_db().commit()
+
+    @classmethod
+    def sort(cls, new_order):
+        cur = get_db().cursor()
+
+        for e in new_order:
+
+            cur.execute("UPDATE %s SET '%s' = ? WHERE id = ?" % (cls.__table_name__, "order"), (e[1], e[0]))
+        get_db().commit()
+
+
+class Fermenter(DBModel):
+    __fields__ = ["name", "brewname", "sensor", "sensor2", "sensor3", "heater", "cooler",  "logic",  "config",  "target_temp"]
+    __table_name__ = "fermenter"
+    __json_fields__ = ["config"]
+
+class FermenterStep(DBModel):
+    __fields__ = ["name", "days", "hours", "minutes", "temp", "direction", "order", "state", "start", "end", "timer_start", "fermenter_id"]
+    __table_name__ = "fermenter_step"
+
+    @classmethod
+    def get_by_fermenter_id(cls, id):
+        cur = get_db().cursor()
+        cur.execute("SELECT * FROM %s WHERE fermenter_id = ?" % cls.__table_name__,(id,))
+        result = []
+        for r in cur.fetchall():
+            result.append(cls(r))
+        return result
+
+    @classmethod
+    def get_max_order(cls,id):
+        cur = get_db().cursor()
+        cur.execute("SELECT max(fermenter_step.'order') as 'order' FROM %s WHERE fermenter_id = ?" % cls.__table_name__, (id,))
+        r = cur.fetchone()
+        return r.get("order")
+
+    @classmethod
+    def update_state(cls, id, state):
+        cur = get_db().cursor()
+        cur.execute("UPDATE %s SET state = ? WHERE id =?" % cls.__table_name__, (state, id))
+        get_db().commit()
+
+    @classmethod
+    def update_timer(cls, id, timer):
+        cur = get_db().cursor()
+        cur.execute("UPDATE %s SET timer_start = ? WHERE id =?" % cls.__table_name__, (timer, id))
+        get_db().commit()
+
+    @classmethod
+    def get_by_state(cls, state):
+        cur = get_db().cursor()
+        cur.execute("SELECT * FROM %s WHERE state = ?" % cls.__table_name__, state)
+        r = cur.fetchone()
+        if r is not None:
+            return cls(r)
+        else:
+            return None
+
+    @classmethod
+    def reset_all_steps(cls,id):
+        cur = get_db().cursor()
+        cur.execute("UPDATE %s SET state = 'I', start = NULL, end = NULL, timer_start = NULL WHERE fermenter_id = ?" % cls.__table_name__, (id,))
+        get_db().commit()
+

modules/example_plugins/WebViewJquery/__init__.py

@@ -0,0 +1,19 @@
+from flask import Blueprint
+
+from modules import cbpi
+from flask_swagger import swagger
+from flask import json
+from flask import Blueprint
+
+@cbpi.addon.core.initializer(order=22)
+def web(cbpi):
+
+    s = Blueprint('web_view', __name__, template_folder='templates', static_folder='static')
+
+    @s.route('/',  methods=["GET"])
+    def index():
+        return s.send_static_file("index.html")
+
+
+    cbpi.addon.core.add_menu_link("JQuery View", "/web_view")
+    cbpi.web.register_blueprint(s, url_prefix='/web_view')

modules/example_plugins/WebViewJquery/static/index.html

@@ -0,0 +1,32 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+
+    <title>CraftBeerPi WebView</title>
+  </head>
+  <body>
+    <div id="root" >
+
+
+        <div id="kettle">
+
+
+        </div>
+    </div>
+    <!--script src="static/bundle.js" type="text/javascript"></script-->
+     <script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
+    <script>
+        $(document).ready(function() {
+    $.ajax({
+        url: "/api/system/dump",
+        dataType: "json"
+    }).then(function(data) {
+       $.each(data.actors, function (i, val) {
+           $( "#kettle" ).append("<div>"+ val.name +"</div>")
+           });
+        });
+    });
+    </script>
+  </body>
+</html>

modules/example_plugins/WebViewReactJs/.babelrc

@@ -0,0 +1,3 @@
+{
+  "presets" : ["es2015", "stage-0", "react"]
+}

modules/example_plugins/WebViewReactJs/__init__.py

@@ -0,0 +1,19 @@
+from flask import Blueprint
+
+from modules import cbpi
+from flask_swagger import swagger
+from flask import json
+from flask import Blueprint
+
+@cbpi.addon.core.initializer(order=22)
+def web(cbpi):
+
+    s = Blueprint('webviewreact', __name__, template_folder='templates', static_folder='static')
+
+    @s.route('/',  methods=["GET"])
+    def index():
+        return s.send_static_file("index.html")
+
+
+    cbpi.addon.core.add_menu_link("ReactJS View", "/webviewreact")
+    cbpi.web.register_blueprint(s, url_prefix='/webviewreact')

modules/example_plugins/WebViewReactJs/package.json

@@ -0,0 +1,44 @@
+{
+  "name": "react-app2",
+  "version": "0.1.0",
+  "private": true,
+  "devDependencies": {
+    "react-scripts": "0.9.5"
+  },
+  "dependencies": {
+    "axios": "^0.16.1",
+    "babel-core": "^6.18.2",
+    "babel-loader": "^6.2.8",
+    "babel-preset-es2015": "^6.18.0",
+    "babel-preset-react": "^6.16.0",
+    "babel-preset-stage-0": "^6.22.0",
+    "classnames": "^2.2.5",
+    "highcharts-boost": "^0.1.2",
+    "highcharts-exporting": "^0.1.2",
+    "highcharts-more": "^0.1.2",
+    "immutability-helper": "^2.1.2",
+    "rc-slider": "^7.0.8",
+    "react": "^15.5.4",
+    "react-bootstrap": "^0.30.10",
+    "react-bs-notifier": "^4.3.2",
+    "react-dom": "^15.5.4",
+    "react-fileupload-progress": "^0.4.0",
+    "react-highcharts": "^12.0.0",
+    "react-js-diagrams": "^3.1.2",
+    "react-jsonschema-form": "^0.50.1",
+    "react-redux": "^5.0.4",
+    "react-router-dom": "^4.1.1",
+    "react-sortable-hoc": "^0.6.3",
+    "redux": "^3.6.0",
+    "redux-logger": "^3.0.1",
+    "redux-thunk": "^2.2.0",
+    "socket.io-client": "^1.7.3",
+    "webpack": "^1.13.3"
+  },
+  "scripts": {
+    "start": "react-scripts start",
+    "build": "react-scripts build",
+    "test": "react-scripts test --env=jsdom",
+    "eject": "react-scripts eject"
+  }
+}

modules/example_plugins/WebViewReactJs/static/index.html

@@ -0,0 +1,15 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+
+    <title>CraftBeerPi WebView</title>
+  </head>
+  <body>
+    <div id="root" >
+
+    </div>
+    <script src="static/bundle.js" type="text/javascript"></script>
+
+  </body>
+</html>

modules/example_plugins/swagger/__init__.py

@@ -0,0 +1,23 @@
+from modules import cbpi
+from flask_swagger import swagger
+from flask import json
+from flask import Blueprint
+
+@cbpi.addon.core.initializer(order=22)
+def hello(cbpi):
+
+    s = Blueprint('react', __name__, template_folder='templates', static_folder='static')
+
+    @s.route('/',  methods=["GET"])
+    def index():
+        return s.send_static_file("index.html")
+
+    @s.route('/swagger.json',  methods=["GET"])
+    def spec():
+        swag = swagger(cbpi.web)
+        swag['info']['version'] = "3.0"
+        swag['info']['title'] = "CraftBeerPi"
+        return json.dumps(swag)
+
+    cbpi.addon.core.add_menu_link("Swagger API", "/swagger")
+    cbpi.web.register_blueprint(s, url_prefix='/swagger')

modules/example_plugins/swagger/static/index.html

@@ -0,0 +1,95 @@
+<!-- HTML for static distribution bundle build -->
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>Swagger UI</title>
+  <link href="https://fonts.googleapis.com/css?family=Open+Sans:400,700|Source+Code+Pro:300,600|Titillium+Web:400,600,700" rel="stylesheet">
+  <link rel="stylesheet" type="text/css" href="./static/swagger-ui.css" >
+  <link rel="icon" type="image/png" href="./favicon-32x32.png" sizes="32x32" />
+  <link rel="icon" type="image/png" href="./favicon-16x16.png" sizes="16x16" />
+  <style>
+    html
+    {
+      box-sizing: border-box;
+      overflow: -moz-scrollbars-vertical;
+      overflow-y: scroll;
+    }
+    *,
+    *:before,
+    *:after
+    {
+      box-sizing: inherit;
+    }
+
+    body {
+      margin:0;
+      background: #fafafa;
+    }
+  </style>
+</head>
+
+<body>
+
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="position:absolute;width:0;height:0">
+  <defs>
+    <symbol viewBox="0 0 20 20" id="unlocked">
+          <path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V6h2v-.801C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8z"></path>
+    </symbol>
+
+    <symbol viewBox="0 0 20 20" id="locked">
+      <path d="M15.8 8H14V5.6C14 2.703 12.665 1 10 1 7.334 1 6 2.703 6 5.6V8H4c-.553 0-1 .646-1 1.199V17c0 .549.428 1.139.951 1.307l1.197.387C5.672 18.861 6.55 19 7.1 19h5.8c.549 0 1.428-.139 1.951-.307l1.196-.387c.524-.167.953-.757.953-1.306V9.199C17 8.646 16.352 8 15.8 8zM12 8H8V5.199C8 3.754 8.797 3 10 3c1.203 0 2 .754 2 2.199V8z"/>
+    </symbol>
+
+    <symbol viewBox="0 0 20 20" id="close">
+      <path d="M14.348 14.849c-.469.469-1.229.469-1.697 0L10 11.819l-2.651 3.029c-.469.469-1.229.469-1.697 0-.469-.469-.469-1.229 0-1.697l2.758-3.15-2.759-3.152c-.469-.469-.469-1.228 0-1.697.469-.469 1.228-.469 1.697 0L10 8.183l2.651-3.031c.469-.469 1.228-.469 1.697 0 .469.469.469 1.229 0 1.697l-2.758 3.152 2.758 3.15c.469.469.469 1.229 0 1.698z"/>
+    </symbol>
+
+    <symbol viewBox="0 0 20 20" id="large-arrow">
+      <path d="M13.25 10L6.109 2.58c-.268-.27-.268-.707 0-.979.268-.27.701-.27.969 0l7.83 7.908c.268.271.268.709 0 .979l-7.83 7.908c-.268.271-.701.27-.969 0-.268-.269-.268-.707 0-.979L13.25 10z"/>
+    </symbol>
+
+    <symbol viewBox="0 0 20 20" id="large-arrow-down">
+      <path d="M17.418 6.109c.272-.268.709-.268.979 0s.271.701 0 .969l-7.908 7.83c-.27.268-.707.268-.979 0l-7.908-7.83c-.27-.268-.27-.701 0-.969.271-.268.709-.268.979 0L10 13.25l7.418-7.141z"/>
+    </symbol>
+
+
+    <symbol viewBox="0 0 24 24" id="jump-to">
+      <path d="M19 7v4H5.83l3.58-3.59L8 6l-6 6 6 6 1.41-1.41L5.83 13H21V7z"/>
+    </symbol>
+
+    <symbol viewBox="0 0 24 24" id="expand">
+      <path d="M10 18h4v-2h-4v2zM3 6v2h18V6H3zm3 7h12v-2H6v2z"/>
+    </symbol>
+
+  </defs>
+</svg>
+
+<div id="swagger-ui"></div>
+
+<script src="./static/swagger-ui-bundle.js"> </script>
+<script src="./static/swagger-ui-standalone-preset.js"> </script>
+<script>
+window.onload = function() {
+
+  // Build a system
+  const ui = SwaggerUIBundle({
+    url: "http://" + window.location.hostname + ":" + window.location.port + "/swagger/swagger.json",
+    dom_id: '#swagger-ui',
+    deepLinking: true,
+    presets: [
+      SwaggerUIBundle.presets.apis,
+      SwaggerUIStandalonePreset
+    ],
+    plugins: [
+      SwaggerUIBundle.plugins.DownloadUrl
+    ],
+    layout: "StandaloneLayout"
+  })
+
+  window.ui = ui
+}
+</script>
+</body>
+
+</html>

modules/example_plugins/swagger/static/oauth2-redirect.html

@@ -0,0 +1,57 @@
+<!doctype html>
+<html lang="en-US">
+<body onload="run()">
+</body>
+</html>
+<script>
+    'use strict';
+    function run () {
+        var oauth2 = window.opener.swaggerUIRedirectOauth2;
+        var sentState = oauth2.state;
+        var redirectUrl = oauth2.redirectUrl;
+        var isValid, qp, arr;
+
+        if (/code|token|error/.test(window.location.hash)) {
+            qp = window.location.hash.substring(1);
+        } else {
+            qp = location.search.substring(1);
+        }
+
+        arr = qp.split("&")
+        arr.forEach(function (v,i,_arr) { _arr[i] = '"' + v.replace('=', '":"') + '"';})
+        qp = qp ? JSON.parse('{' + arr.join() + '}',
+                function (key, value) {
+                    return key === "" ? value : decodeURIComponent(value)
+                }
+        ) : {}
+
+        isValid = qp.state === sentState
+
+        if (oauth2.auth.schema.get("flow") === "accessCode" && !oauth2.auth.code) {
+            if (!isValid) {
+                oauth2.errCb({
+                    authId: oauth2.auth.name,
+                    source: "auth",
+                    level: "warning",
+                    message: "Authorization may be unsafe, passed state was changed in server Passed state wasn't returned from auth server"
+                });
+            }
+
+            if (qp.code) {
+                delete oauth2.state;
+                oauth2.auth.code = qp.code;
+                oauth2.callback({auth: oauth2.auth, redirectUrl: redirectUrl});
+            } else {
+                oauth2.errCb({
+                    authId: oauth2.auth.name,
+                    source: "auth",
+                    level: "error",
+                    message: "Authorization failed: no accessCode received from the server"
+                });
+            }
+        } else {
+            oauth2.callback({auth: oauth2.auth, token: qp, isValid: isValid, redirectUrl: redirectUrl});
+        }
+        window.close();
+    }
+</script>

modules/example_plugins/swagger/static/swagger-ui-bundle.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"swagger-ui-bundle.js","sources":["webpack:///swagger-ui-bundle.js"],"mappings":"AAAA;;;;;AAu7LA;;;;;;AA65DA;;;;;;;;;;;;;;;;;;;;;;;;;;AA68TA;;;;;;;;;;;;;;AAs8JA;;;;;;;;;AA69pBA;;;;;AA81QA;AAm4DA;;;;;;AAo4YA;;;;;;AA0iaA;AA4lvBA","sourceRoot":""}

modules/example_plugins/swagger/static/swagger-ui-standalone-preset.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"swagger-ui-standalone-preset.js","sources":["webpack:///swagger-ui-standalone-preset.js"],"mappings":"AAAA;;;;;AA80CA;;;;;;AAqpFA","sourceRoot":""}

modules/example_plugins/swagger/static/swagger-ui.css.map

@@ -0,0 +1 @@
+{"version":3,"file":"swagger-ui.css","sources":[],"mappings":"","sourceRoot":""}

modules/example_plugins/swagger/static/swagger-ui.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"swagger-ui.js","sources":["webpack:///swagger-ui.js"],"mappings":"AAAA;;;;;;AAokeA","sourceRoot":""}

modules/fermenter/__init__.py

@@ -2,64 +2,13 @@ import time
 from flask import request
 from flask_classy import route
 
-from modules import DBModel, cbpi, get_db
-from modules.core.baseview import BaseView
+from modules import cbpi
+from modules.core.db import get_db, DBModel
+from modules.core.baseview import RestApi
+from modules.database.dbmodel import Fermenter, FermenterStep
 
 
-class Fermenter(DBModel):
-    __fields__ = ["name", "brewname", "sensor", "sensor2", "sensor3", "heater", "cooler",  "logic",  "config",  "target_temp"]
-    __table_name__ = "fermenter"
-    __json_fields__ = ["config"]
-
-class FermenterStep(DBModel):
-    __fields__ = ["name", "days", "hours", "minutes", "temp", "direction", "order", "state", "start", "end", "timer_start", "fermenter_id"]
-    __table_name__ = "fermenter_step"
-
-    @classmethod
-    def get_by_fermenter_id(cls, id):
-        cur = get_db().cursor()
-        cur.execute("SELECT * FROM %s WHERE fermenter_id = ?" % cls.__table_name__,(id,))
-        result = []
-        for r in cur.fetchall():
-            result.append(cls(r))
-        return result
-
-    @classmethod
-    def get_max_order(cls,id):
-        cur = get_db().cursor()
-        cur.execute("SELECT max(fermenter_step.'order') as 'order' FROM %s WHERE fermenter_id = ?" % cls.__table_name__, (id,))
-        r = cur.fetchone()
-        return r.get("order")
-
-    @classmethod
-    def update_state(cls, id, state):
-        cur = get_db().cursor()
-        cur.execute("UPDATE %s SET state = ? WHERE id =?" % cls.__table_name__, (state, id))
-        get_db().commit()
-
-    @classmethod
-    def update_timer(cls, id, timer):
-        cur = get_db().cursor()
-        cur.execute("UPDATE %s SET timer_start = ? WHERE id =?" % cls.__table_name__, (timer, id))
-        get_db().commit()
-
-    @classmethod
-    def get_by_state(cls, state):
-        cur = get_db().cursor()
-        cur.execute("SELECT * FROM %s WHERE state = ?" % cls.__table_name__, state)
-        r = cur.fetchone()
-        if r is not None:
-            return cls(r)
-        else:
-            return None
-
-    @classmethod
-    def reset_all_steps(cls,id):
-        cur = get_db().cursor()
-        cur.execute("UPDATE %s SET state = 'I', start = NULL, end = NULL, timer_start = NULL WHERE fermenter_id = ?" % cls.__table_name__, (id,))
-        get_db().commit()
-
-class FermenterView(BaseView):
+class FermenterView(RestApi):
     model = Fermenter
     cache_key = "fermenter"
 
@@ -77,7 +26,6 @@ class FermenterView(BaseView):
 
     def _post_put_callback(self, m):
         m.state = False
-        self.reset(int(m.id))
 
     @route('/<int:id>/targettemp/<temp>', methods=['POST'])
     def postTargetTemp(self, id, temp):
@@ -87,7 +35,7 @@ class FermenterView(BaseView):
         temp = float(temp)
         cbpi.cache.get(self.cache_key)[id].target_temp = float(temp)
         self.model.update(**self.api.cache.get(self.cache_key)[id].__dict__)
-        cbpi.emit("UPDATE_FERMENTER_TARGET_TEMP", {"id": id, "target_temp": temp})
+        cbpi.ws_emit("UPDATE_FERMENTER_TARGET_TEMP", {"id": id, "target_temp": temp})
         return ('', 204)
 
     @route('/<int:id>/brewname', methods=['POST'])
@@ -96,7 +44,7 @@ class FermenterView(BaseView):
         brewname = data.get("brewname")
         cbpi.cache.get(self.cache_key)[id].brewname = brewname
         self.model.update(**self.api.cache.get(self.cache_key)[id].__dict__)
-        cbpi.emit("UPDATE_FERMENTER_BREWNAME", {"id": id, "brewname": brewname})
+        cbpi.ws_emit("UPDATE_FERMENTER_BREWNAME", {"id": id, "brewname": brewname})
         return ('', 204)
 
     @classmethod
@@ -120,7 +68,7 @@ class FermenterView(BaseView):
 
         cbpi.cache.get(self.cache_key)[id].steps.append(f)
 
-        cbpi.emit("UPDATE_FERMENTER", cbpi.cache.get(self.cache_key)[id])
+        cbpi.ws_emit("UPDATE_FERMENTER", cbpi.cache.get(self.cache_key)[id])
 
         return ('', 204)
 
@@ -142,7 +90,7 @@ class FermenterView(BaseView):
 
                 FermenterStep.update(**s.__dict__)
                 break
-        cbpi.emit("UPDATE_FERMENTER", cbpi.cache.get(self.cache_key)[id])
+        cbpi.ws_emit("UPDATE_FERMENTER", cbpi.cache.get(self.cache_key)[id])
         return ('', 204)
 
     @route('/<int:id>/step/<int:stepid>', methods=["DELETE"])
@@ -153,11 +101,12 @@ class FermenterView(BaseView):
                 del cbpi.cache.get(self.cache_key)[id].steps[idx]
                 FermenterStep.delete(s.id)
                 break
-        cbpi.emit("UPDATE_FERMENTER", cbpi.cache.get(self.cache_key)[id])
+        cbpi.ws_emit("UPDATE_FERMENTER", cbpi.cache.get(self.cache_key)[id])
         return ('', 204)
 
     @route('/<int:id>/start', methods=['POST'])
     def start_fermentation(self, id):
+        print "START"
         active = None
         for idx, s in enumerate(cbpi.cache.get(self.cache_key)[id].steps):
             if s.state == 'A':
@@ -180,7 +129,8 @@ class FermenterView(BaseView):
 
         if inactive is not None:
             fermenter = self.get_fermenter(inactive.fermenter_id)
-            current_temp = cbpi.get_sensor_value(int(fermenter.sensor))
+
+            current_temp = cbpi.sensor.get_value(int(fermenter.sensor))
 
             inactive.state = 'A'
             inactive.start = time.time()
@@ -191,7 +141,7 @@ class FermenterView(BaseView):
 
             cbpi.cache["fermenter_task"][id] = inactive
 
-        cbpi.emit("UPDATE_FERMENTER", cbpi.cache.get(self.cache_key)[id])
+        cbpi.ws_emit("UPDATE_FERMENTER", cbpi.cache.get(self.cache_key)[id])
         return ('', 204)
 
     @route('/<int:id>/reset', methods=["POST"])
@@ -203,40 +153,40 @@ class FermenterView(BaseView):
         if id in cbpi.cache["fermenter_task"]:
             del cbpi.cache["fermenter_task"][id]
 
-        cbpi.emit("UPDATE_FERMENTER", cbpi.cache.get(self.cache_key)[id])
+        cbpi.ws_emit("UPDATE_FERMENTER", cbpi.cache.get(self.cache_key)[id])
         return ('', 204)
 
     @route('/<int:id>/automatic', methods=['POST'])
     def toggle(self, id):
         fermenter = cbpi.cache.get(self.cache_key)[id]
         try:
-            print fermenter.state
+
             if fermenter.state is False:
                 # Start controller
                 if fermenter.logic is not None:
                     cfg = fermenter.config.copy()
                     cfg.update(
                         dict(api=cbpi, fermenter_id=fermenter.id, heater=fermenter.heater, sensor=fermenter.sensor))
-                    instance = cbpi.get_fermentation_controller(fermenter.logic).get("class")(**cfg)
+                    instance = cbpi.fermentation.get_controller(fermenter.logic).get("class")(**cfg)
                     instance.init()
                     fermenter.instance = instance
 
                     def run(instance):
                         instance.run()
-                        fermenter.state = not fermenter.state
-                        cbpi.emit("UPDATE_FERMENTER", cbpi.cache.get(self.cache_key).get(id))
 
-                    t = cbpi.socketio.start_background_task(target=run, instance=instance)
+                    t = cbpi._socketio.start_background_task(target=run, instance=instance)
                 fermenter.state = not fermenter.state
-                cbpi.emit("UPDATE_FERMENTER", cbpi.cache.get(self.cache_key).get(id))
+                cbpi.ws_emit("UPDATE_FERMENTER", cbpi.cache.get(self.cache_key).get(id))
+                cbpi.emit("FERMENTER_CONTROLLER_STARTED", id=id)
             else:
                 # Stop controller
                 fermenter.instance.stop()
                 fermenter.state = not fermenter.state
-                cbpi.emit("UPDATE_FERMENTER", cbpi.cache.get(self.cache_key).get(id))
+                cbpi.ws_emit("UPDATE_FERMENTER", cbpi.cache.get(self.cache_key).get(id))
+                cbpi.emit("FERMENTER_CONTROLLER_STOPPED", id=id)
 
         except Exception as e:
-            print e
+
             cbpi.notify("Toogle Fementer Controller failed", "Pleae check the %s configuration" % fermenter.name,
                         type="danger", timeout=None)
             return ('', 500)
@@ -247,6 +197,7 @@ class FermenterView(BaseView):
         return cbpi.cache["fermenter"].get(id)
 
     def target_temp_reached(self,id, step):
+        print "TARGET TEMP REACHED"
         timestamp = time.time()
 
         days = step.days * 24 * 60 * 60
@@ -258,22 +209,24 @@ class FermenterView(BaseView):
 
         step.timer_start = target_time
 
-        cbpi.emit("UPDATE_FERMENTER", cbpi.cache.get(self.cache_key)[id])
+        cbpi.ws_emit("UPDATE_FERMENTER", cbpi.cache.get(self.cache_key)[id])
 
     def check_step(self):
+
         for key, value in cbpi.cache["fermenter_task"].iteritems():
 
             try:
                 fermenter = self.get_fermenter(key)
-                current_temp = current_temp = cbpi.get_sensor_value(int(fermenter.sensor))
+                current_temp = current_temp = cbpi.sensor.get_value(int(fermenter.sensor))
 
                 if value.timer_start is None:
-
+                    print "TIMER IS NONE"
                     if value.direction == "H" :
-
+                        print "TIMER WATING FOR HEATING"
                         if current_temp >= value.temp:
                             self.target_temp_reached(key,value)
                     else:
+                        print "TIMER WATING FOR COILING"
                         if current_temp <= value.temp:
                             self.target_temp_reached(key, value)
                 else:
@@ -282,38 +235,37 @@ class FermenterView(BaseView):
                     else:
                         pass
             except Exception as e:
+                self.api.looger.error(e)
                 pass
 
 
-@cbpi.backgroundtask(key="read_target_temps_fermenter", interval=5)
-def read_target_temps(api):
+@cbpi.addon.core.backgroundtask(key="read_target_temps_fermenter", interval=5)
+def read_target_temps(cbpi):
     """
     background process that reads all passive sensors in interval of 1 second
     :return: None
     """
-    result = {}
     for key, value in cbpi.cache.get("fermenter").iteritems():
-        cbpi.save_to_file(key, value.target_temp, prefix="fermenter")
+        cbpi.sensor.write_log(key, value.target_temp, prefix="fermenter")
+
 
 
 instance = FermenterView()
 
-@cbpi.backgroundtask(key="fermentation_task", interval=1)
-def execute_fermentation_step(api):
-    with cbpi.app.app_context():
+@cbpi.addon.core.backgroundtask(key="fermentation_task", interval=1)
+def execute_fermentation_step(cbpi):
+    with cbpi.web.app_context():
         instance.check_step()
 
 
 def init_active_steps():
-    '''
-    active_steps = FermenterStep.query.filter_by(state='A')
-    for a in active_steps:
-        db.session.expunge(a)
-        cbpi.cache["fermenter_task"][a.fermenter_id] = a
-    '''
+    pass
 
-@cbpi.initalizer(order=1)
+
+
+@cbpi.addon.core.initializer(order=1)
 def init(cbpi):
 
-    FermenterView.register(cbpi.app, route_base='/api/fermenter')
+    cbpi.cache["fermenter_task"] = {}
+    FermenterView.register(cbpi.web, route_base='/api/fermenter')
     FermenterView.init_cache()

modules/kettle/__init__.py

@@ -1,19 +1,145 @@
 from flask import request
 from flask_classy import FlaskView, route
-from modules import cbpi, socketio
-from modules.core.baseview import BaseView
+from modules import cbpi
+from modules.core.baseview import RestApi
 from modules.core.db import DBModel
+from modules.database.dbmodel import Kettle
 
-class Kettle(DBModel):
-    __fields__ = ["name","sensor", "heater", "automatic", "logic", "config", "agitator", "target_temp"]
-    __table_name__ = "kettle"
-    __json_fields__ = ["config"]
-
-
-class Kettle2View(BaseView):
+class KettleView(RestApi):
     model = Kettle
     cache_key = "kettle"
 
+    @route('/', methods=["GET"])
+    def getAll(self):
+        """
+        Get all Kettles
+        ---
+        tags:
+          - kettle
+        responses:
+          200:
+            description: List auf all Kettles
+        """
+        return super(KettleView, self).getAll()
+
+    @route('/', methods=["POST"])
+    def post(self):
+        """
+        Create a new kettle
+        ---
+        tags:
+          - kettle
+        parameters:
+          - in: body
+            name: body
+            schema:
+              id: Kettle
+              required:
+                - name
+              properties:
+                name:
+                  type: string
+                  description: name for user
+                sensor:
+                  type: string
+                  description: name for user
+                heater:
+                  type: string
+                  description: name for user
+                automatic:
+                  type: string
+                  description: name for user
+                logic:
+                  type: string
+                  description: name for user
+                config:
+                  type: string
+                  description: name for user
+                agitator:
+                  type: string
+                  description: name for user
+                target_temp:
+                  type: string
+                  description: name for user
+        responses:
+          200:
+            description: User created
+        """
+        return super(KettleView, self).post()
+
+
+    @route('/<int:id>', methods=["PUT"])
+    def put(self, id):
+        """
+        Update a kettle
+        ---
+        tags:
+          - kettle
+        parameters:
+          - in: path
+            name: id
+            schema:
+              type: integer
+            required: true
+            description: Numeric ID of the Kettle
+          - in: body
+            name: body
+            schema:
+              id: Kettle
+              required:
+                - name
+              properties:
+                name:
+                  type: string
+                  description: name for user
+                sensor:
+                  type: string
+                  description: name for user
+                heater:
+                  type: string
+                  description: name for user
+                automatic:
+                  type: string
+                  description: name for user
+                logic:
+                  type: string
+                  description: name for user
+                config:
+                  type: string
+                  description: name for user
+                agitator:
+                  type: string
+                  description: name for user
+                target_temp:
+                  type: string
+                  description: name for user
+        responses:
+          200:
+            description: User created
+        """
+        return super(KettleView, self).put(id)
+
+    @route('/<int:id>', methods=["DELETE"])
+    def delete(self, id):
+        """
+        Delete a kettle
+        ---
+        tags:
+          - kettle
+        parameters:
+          - in: path
+            name: id
+            schema:
+              type: integer
+            required: true
+            description: Numeric ID of the Kettle
+
+        responses:
+          200:
+            description: User created
+        """
+        return super(KettleView, self).delete(id)
+
     @classmethod
     def _pre_post_callback(self, data):
         data["target_temp"] = 0
@@ -37,38 +163,62 @@ class Kettle2View(BaseView):
 
     @route('/<int:id>/targettemp/<temp>', methods=['POST'])
     def postTargetTemp(self, id, temp):
+
+        """
+        Set Target Temp
+        ---
+        tags:
+          - kettle
+        parameters:
+          - required: true
+            type: string
+            description: ID of pet to return
+            in: path
+            name: id
+          - required: true
+            type: string
+            description: Temperature you like to set
+            in: path
+            name: temp
+        responses:
+          201:
+            description: User created
+        """
+
         id = int(id)
         temp = float(temp)
-        cbpi.cache.get("kettle")[id].target_temp = float(temp)
-        self.model.update(**self.api.cache.get(self.cache_key)[id].__dict__)
-        cbpi.emit("UPDATE_KETTLE_TARGET_TEMP", {"id": id, "target_temp": temp})
+        cbpi.brewing.set_target_temp(id, temp)
         return ('', 204)
 
     @route('/<int:id>/automatic', methods=['POST'])
     def toggle(self, id):
-        kettle = cbpi.cache.get("kettle")[id]
 
-        if kettle.state is False:
-            # Start controller
-            if kettle.logic is not None:
-                cfg = kettle.config.copy()
-                cfg.update(dict(api=cbpi, kettle_id=kettle.id, heater=kettle.heater, sensor=kettle.sensor))
-                instance = cbpi.get_controller(kettle.logic).get("class")(**cfg)
-                instance.init()
-                kettle.instance = instance
-                def run(instance):
-                    instance.run()
-                t = self.api.socketio.start_background_task(target=run, instance=instance)
-            kettle.state = not kettle.state
-            cbpi.emit("UPDATE_KETTLE", cbpi.cache.get("kettle").get(id))
-        else:
-            # Stop controller
-            kettle.instance.stop()
-            kettle.state = not kettle.state
-            cbpi.emit("UPDATE_KETTLE", cbpi.cache.get("kettle").get(id))
+        """
+                Set Target Temp
+                ---
+                tags:
+                  - kettle
+                parameters:
+                  - required: true
+                    type: string
+                    description: ID of pet to return
+                    in: path
+                    name: id
+                  - required: true
+                    type: string
+                    description: Temperature you like to set
+                    in: path
+                    name: temp
+                responses:
+                  201:
+                    description: User created
+                """
+
+        self.api.brewing.toggle_automatic(id)
         return ('', 204)
 
-@cbpi.event("SET_TARGET_TEMP")
+
+@cbpi.addon.core.listen("SET_TARGET_TEMP")
 def set_target_temp(id, temp):
     '''
     Change Taget Temp Event
@@ -76,10 +226,9 @@ def set_target_temp(id, temp):
     :param temp: target temp to set
     :return: None
     '''
+    KettleView().postTargetTemp(id,temp)
 
-    Kettle2View().postTargetTemp(id,temp)
-
-@cbpi.backgroundtask(key="read_target_temps", interval=5)
+@cbpi.addon.core.backgroundtask(key="read_target_temps", interval=5)
 def read_target_temps(api):
     """
     background process that reads all passive sensors in interval of 1 second
@@ -87,10 +236,10 @@ def read_target_temps(api):
     """
     result = {}
     for key, value in cbpi.cache.get("kettle").iteritems():
-        cbpi.save_to_file(key, value.target_temp, prefix="kettle")
+        cbpi.sensor.write_log(key, value.target_temp, prefix="kettle")
 
-@cbpi.initalizer()
+@cbpi.addon.core.initializer()
 def init(cbpi):
-    Kettle2View.api = cbpi
-    Kettle2View.register(cbpi.app,route_base='/api/kettle')
-    Kettle2View.init_cache()
+    KettleView.api = cbpi
+    KettleView.register(cbpi.web, route_base='/api/kettle')
+    KettleView.init_cache()

modules/login/__init__.py

@@ -0,0 +1,73 @@
+import flask_login
+from flask import request
+
+from modules import cbpi
+
+class User(flask_login.UserMixin):
+    pass
+
+@cbpi.addon.core.initializer(order=0)
+def log(cbpi):
+
+
+    cbpi._login_manager = flask_login.LoginManager()
+    cbpi._login_manager.init_app(cbpi.web)
+
+    @cbpi.web.route('/login', methods=['POST'])
+    def login():
+
+         data = request.json
+         password = cbpi.get_config_parameter("password", None)
+
+         if password is None:
+             return ('',500)
+
+         if password == data.get("password",""):
+            user = User()
+            user.id = "craftbeerpi"
+            flask_login.login_user(user)
+            return ('',204)
+         else:
+            return ('',401)
+
+
+    @cbpi.web.route('/logout', methods=['POST'])
+    def logout():
+        flask_login.logout_user()
+        return 'Logged out'
+
+    @cbpi._login_manager.request_loader
+    def load_user_from_request(request):
+
+
+        api_key = request.args.get('api_key')
+
+        if cbpi.get_config_parameter("password_security", "NO") == "NO":
+            user = User()
+            user.id = "craftbeerpi"
+            return user
+        elif api_key == "123":
+            user = User()
+            user.id = "craftbeerpi"
+            return user
+        return None
+
+    @cbpi._login_manager.user_loader
+    def user_loader(user):
+
+        if cbpi.get_config_parameter("password_security", "NO") == "YES":
+            if user != "craftbeerpi":
+                return
+            user = User()
+            user.id = user
+            return user
+        else:
+            user = User()
+            user.id = user
+            return user
+
+    @cbpi._login_manager.unauthorized_handler
+    def unauthorized_handler():
+
+
+        return ('Please login',401)

modules/logs/__init__.py

@@ -1 +1,175 @@
-import endpoints
+import datetime
+import os
+from flask import Blueprint, request, send_from_directory, json
+from flask_classy import FlaskView, route
+from modules import cbpi
+
+
+class LogView(FlaskView):
+
+    @route('/', methods=['GET'])
+    def get_all_logfiles(self):
+        """
+        Get a list of all Log Files
+        ---
+        tags:
+          - logs
+        responses:
+          200:
+            description: List of all log files
+        """
+        result = []
+        for filename in os.listdir("./logs"):
+            if filename.endswith(".log"):
+                result.append(filename)
+        return json.dumps(result)
+
+    @route('/actions')
+    def actions(self):
+        """
+        Get a list of all brewing actions
+        ---
+        tags:
+          - logs
+        responses:
+          200:
+            description: List of all log files
+        """
+        filename = "./logs/action.log"
+        if os.path.isfile(filename) == False:
+            return
+        import csv
+        array = []
+        with open(filename, 'rb') as f:
+            reader = csv.reader(f)
+            for row in reader:
+                try:
+                    array.append([int((datetime.datetime.strptime(row[0], "%Y-%m-%d %H:%M:%S") - datetime.datetime(1970, 1, 1)).total_seconds()) * 1000, row[1]])
+                except:
+                    pass
+        return json.dumps(array)
+
+    @route('/<file>', methods=["DELETE"])
+    def clearlog(self, file):
+        """
+        Delete a log file by name
+        ---
+        tags:
+          - logs
+        parameters:
+          - in: path
+            name: file
+            schema:
+              type: string
+            required: true
+            description: File name
+        responses:
+          204:
+            description: Log deleted
+        """
+        if not self.check_filename(file):
+            return ('File Not Found', 404)
+
+        filename = "./logs/%s" % file
+        if os.path.isfile(filename) == True:
+            os.remove(filename)
+            cbpi.notify("log deleted succesfully", "")
+            return ('', 204)
+        else:
+            cbpi.notify("Failed to delete log", "", type="danger")
+            return ('', 404)
+
+
+    def read_log_as_json(self, type, id):
+        filename = "./logs/%s_%s.log" % (type, id)
+        if os.path.isfile(filename) == False:
+            return
+
+        import csv
+        array = []
+        with open(filename, 'rb') as f:
+            reader = csv.reader(f)
+            for row in reader:
+                try:
+                    array.append([int((datetime.datetime.strptime(row[0], "%Y-%m-%d %H:%M:%S") - datetime.datetime(1970, 1, 1)).total_seconds()) * 1000, float(row[1])])
+                except:
+                    pass
+        return array
+
+    def convert_chart_data_to_json(self, chart_data):
+        return {"name": chart_data["name"], "data": self.read_log_as_json(chart_data["data_type"], chart_data["data_id"])}
+
+    @route('/<t>/<int:id>', methods=["POST"])
+    def get_logs_as_json(self, t, id):
+
+        """
+        Get Log as json
+        ---
+        tags:
+          - logs
+        parameters:
+          - in: path
+            name: id
+            schema:
+              type: string
+            required: true
+            description: id of the file
+        responses:
+          200:
+            description: Log File Data
+        """
+
+        data = request.json
+        result = []
+        if t == "s":
+            name = cbpi.cache.get("sensors").get(id).name
+            result.append({"name": name, "data": self.read_log_as_json("sensor", id)})
+
+        if t == "k":
+            kettle = cbpi.cache.get("kettle").get(id)
+            result = map(self.convert_chart_data_to_json, cbpi.brewing.get_controller(kettle.logic).get("class").chart(kettle))
+
+        if t == "f":
+            fermenter = cbpi.cache.get("fermenter").get(id)
+            result = map(self.convert_chart_data_to_json, cbpi.fermentation.get_controller(fermenter.logic).get("class").chart(fermenter))
+
+        return json.dumps(result)
+
+    @route('/download/<file>')
+    @cbpi.nocache
+    def download(self, file):
+
+        """
+        Download a log file by name
+        ---
+        tags:
+          - logs
+        parameters:
+          - in: path
+            name: file
+            schema:
+              type: string
+            required: true
+            description: filename
+        responses:
+          200:
+            description: Log file downloaded
+        """
+        if not self.check_filename(file):
+            return ('File Not Found', 404)
+        return send_from_directory('../../logs', file, as_attachment=True, attachment_filename=file)
+
+    def check_filename(self, name):
+        import re
+        pattern = re.compile('^([A-Za-z0-9-_])+.log$')
+
+        return True if pattern.match(name) else False
+
+@cbpi.addon.core.initializer()
+def init(cbpi):
+    """
+    Initializer for the message module
+    :param app: the flask app
+    :return: None
+    """
+    LogView.register(cbpi.web, route_base='/api/logs')

modules/logs/endpoints.py

@@ -1,109 +0,0 @@
-import datetime
-import os
-from flask import Blueprint, request, send_from_directory, json
-from flask_classy import FlaskView, route
-from modules import cbpi
-
-
-class LogView(FlaskView):
-
-    @route('/', methods=['GET'])
-    def get_all_logfiles(self):
-        result = []
-        for filename in os.listdir("./logs"):
-            if filename.endswith(".log"):
-                result.append(filename)
-        return json.dumps(result)
-
-    @route('/actions')
-    def actions(self):
-        filename = "./logs/action.log"
-        if os.path.isfile(filename) == False:
-            return
-        import csv
-        array = []
-        with open(filename, 'rb') as f:
-            reader = csv.reader(f)
-            for row in reader:
-                try:
-                    array.append([int((datetime.datetime.strptime(row[0], "%Y-%m-%d %H:%M:%S") - datetime.datetime(1970, 1, 1)).total_seconds()) * 1000, row[1]])
-                except:
-                    pass
-        return json.dumps(array)
-
-    @route('/<file>', methods=["DELETE"])
-    def clearlog(self, file):
-        """
-        Overload delete method to shutdown sensor before delete
-        :param id: sensor id
-        :return: HTTP 204
-        """
-        if not self.check_filename(file):
-            return ('File Not Found', 404)
-
-        filename = "./logs/%s" % file
-        if os.path.isfile(filename) == True:
-            os.remove(filename)
-            cbpi.notify("log deleted succesfully", "")
-        else:
-            cbpi.notify("Failed to delete log", "", type="danger")
-        return ('', 204)
-
-    def read_log_as_json(self, type, id):
-        filename = "./logs/%s_%s.log" % (type, id)
-        if os.path.isfile(filename) == False:
-            return
-
-        import csv
-        array = []
-        with open(filename, 'rb') as f:
-            reader = csv.reader(f)
-            for row in reader:
-                try:
-                    array.append([int((datetime.datetime.strptime(row[0], "%Y-%m-%d %H:%M:%S") - datetime.datetime(1970, 1, 1)).total_seconds()) * 1000, float(row[1])])
-                except:
-                    pass
-        return array
-
-    def convert_chart_data_to_json(self, chart_data):
-        return {"name": chart_data["name"], "data": self.read_log_as_json(chart_data["data_type"], chart_data["data_id"])}
-
-    @route('/<t>/<int:id>', methods=["POST"])
-    def get_logs_as_json(self, t, id):
-        data = request.json
-        result = []
-        if t == "s":
-            name = cbpi.cache.get("sensors").get(id).name
-            result.append({"name": name, "data": self.read_log_as_json("sensor", id)})
-
-        if t == "k":
-            kettle = cbpi.cache.get("kettle").get(id)
-            result = map(self.convert_chart_data_to_json, cbpi.get_controller(kettle.logic).get("class").chart(kettle))
-
-        if t == "f":
-            fermenter = cbpi.cache.get("fermenter").get(id)
-            result = map(self.convert_chart_data_to_json, cbpi.get_fermentation_controller(fermenter.logic).get("class").chart(fermenter))
-
-        return json.dumps(result)
-
-    @route('/download/<file>')
-    @cbpi.nocache
-    def download(self, file):
-        if not self.check_filename(file):
-            return ('File Not Found', 404)
-        return send_from_directory('../logs', file, as_attachment=True, attachment_filename=file)
-
-    def check_filename(self, name):
-        import re
-        pattern = re.compile('^([A-Za-z0-9-_])+.log$')
-
-        return True if pattern.match(name) else False
-
-@cbpi.initalizer()
-def init(app):
-    """
-    Initializer for the message module
-    :param app: the flask app
-    :return: None
-    """
-    LogView.register(cbpi.app, route_base='/api/logs')

modules/notification/__init__.py

@@ -1,30 +1,46 @@
 import json
 from flask_classy import FlaskView, route
 from modules import cbpi
+
 class NotificationView(FlaskView):
 
     @route('/', methods=['GET'])
     def getMessages(self):
         """
-        Get all messages
-        :return: current messages
+        Get all Messages 
+        ---
+        tags:
+          - notification
+        responses:
+          200:
+            description: All messages
         """
-
         return json.dumps(cbpi.cache["messages"])
 
     @route('/<id>', methods=['DELETE'])
     def dismiss(self, id):
         """
-        Delete message from cache by id
-        :param id: message id to be deleted
-        :return: empty response HTTP 204
+        Delete Message 
+        ---
+        tags:
+          - notification
+        parameters:
+          - in: path
+            name: id
+            schema:
+              type: integer
+            required: true
+            description: Numeric ID of the message
+        responses:
+          200:
+            description: Message deleted
         """
         for idx, m in enumerate(cbpi.cache.get("messages", [])):
             if (m.get("id") == id):
                 cbpi.cache["messages"].pop(idx)
         return ('', 204)
 
-@cbpi.event("MESSAGE", async=True)
+#@cbpi.event("MESSAGE", async=True)
 def messageEvent(message, **kwargs):
     """
     React on message event. add the message to the cache and push the message to the clients
@@ -36,7 +52,7 @@ def messageEvent(message, **kwargs):
         cbpi.cache["messages"].append(message)
     cbpi.emit("NOTIFY", message)
 
-@cbpi.initalizer(order=2)
+@cbpi.addon.core.initializer(order=2)
 def init(cbpi):
     """
     Initializer for the message module
@@ -47,4 +63,4 @@ def init(cbpi):
         msg = {"id": len(cbpi.cache["messages"]), "type": "info", "headline": "Support CraftBeerPi with your donation", "message": "You will find the PayPay Donation button in the system menu" , "read": False}
         cbpi.cache["messages"].append(msg)
 
-    NotificationView.register(cbpi.app, route_base='/api/notification')
+    NotificationView.register(cbpi.web, route_base='/api/notification')

modules/plugin/__init__.py

@@ -0,0 +1,139 @@
+import sys
+from flask import  request, send_from_directory, json
+from importlib import import_module
+from modules import cbpi
+from git import Repo
+import os
+import requests
+import yaml
+import shutil
+from flask_classy import FlaskView, route
+
+modules = {}
+
+class PluginView(FlaskView):
+
+
+    def merge(self, source, destination):
+        """
+        Helper method to merge two dicts
+        :param source:
+        :param destination:
+        :return:
+        """
+        for key, value in source.items():
+            if isinstance(value, dict):
+                   # get node or create one
+                node = destination.setdefault(key, {})
+                self.merge(value, node)
+            else:
+                destination[key] = value
+
+        return destination
+
+
+    @route('/', methods=['GET'])
+    def get(self):
+        """
+        Get Plugin List
+        ---
+        tags:
+          - plugin
+        responses:
+          200:
+            description: List of all plugins
+        """
+        response = requests.get("https://raw.githubusercontent.com/Manuel83/craftbeerpi-plugins/master/plugins.yaml")
+        self.api.cache["plugins"] = self.merge(yaml.load(response.text), self.api.cache["plugins"])
+        for key, value in  cbpi.cache["plugins"].iteritems():
+
+            value["installed"] = os.path.isdir("./plugins/%s/" % (key))
+        return json.dumps(cbpi.cache["plugins"])
+
+
+    @route('/<name>', methods=['DELETE'])
+    def delete(self,name):
+        """
+        Delete Plugin
+        ---
+        tags:
+          - plugin
+        parameters:
+          - in: path
+            name: name
+            schema:
+              type: string
+            required: true
+            description: Plugin name 
+        responses:
+          200:
+            description: Plugin deleted
+        """
+        if os.path.isdir("./plugins/"+name) is False:
+            return ('Dir not found', 500)
+        shutil.rmtree("./plugins/"+name)
+        cbpi.notify("Plugin deleted", "Plugin %s deleted successfully" % name)
+        return ('', 204)
+
+    @route('/<name>/download', methods=['POST'])
+    def download(self, name):
+        """
+        Download Plugin
+        ---
+        tags:
+          - plugin
+        parameters:
+          - in: path
+            name: name
+            schema:
+              type: string
+            required: true
+            description: Plugin name 
+        responses:
+          200:
+            description: Plugin downloaded
+        """
+        plugin = self.api.cache["plugins"].get(name)
+        plugin["loading"] = True
+        if plugin is None:
+            return ('', 404)
+        try:
+            Repo.clone_from(plugin.get("repo_url"), "./modules/plugins/%s/" % (name))
+            self.api.notify("Download successful", "Plugin %s downloaded successfully" % name)
+        finally:
+            plugin["loading"] = False
+        return ('', 204)
+
+    @route('/<name>/update', methods=['POST'])
+    def update(self, name):
+        """
+        Pull Plugin Update
+        ---
+        tags:
+          - plugin
+        parameters:
+          - in: path
+            name: name
+            schema:
+              type: string
+            required: true
+            description: Plugin name 
+        responses:
+          200:
+            description: Plugin updated
+        """
+        repo = Repo("./modules/plugins/%s/" % (name))
+        o = repo.remotes.origin
+        info = o.pull()
+        self.api.notify("Plugin Updated", "Plugin %s updated successfully. Please restart the system" % name)
+        return ('', 204)
+
+
+
+
+
+@cbpi.addon.core.initializer()
+def init(cbpi):
+    cbpi.cache["plugins"] = {}
+    PluginView.api = cbpi
+    PluginView.register(cbpi.web, route_base='/api/plugin')

modules/recipe_book/__init__.py

@@ -0,0 +1,146 @@
+import os
+import re
+import time
+
+import datetime
+from flask import json, request, send_from_directory
+from flask_classy import route, FlaskView
+
+from modules.core.db import DBModel
+from modules.core.baseview import RestApi
+from modules import cbpi
+from modules.database.dbmodel import Step
+from yaml import Loader, Dumper
+from yaml import load, dump
+
+from modules.step import StepView
+
+
+class RecipeBook(FlaskView):
+
+
+    @route('/load', methods=["POST"])
+    def load(self):
+
+        data = request.json
+        recipe_name = data.get("name")
+        if re.match("^[A-Za-z0-9_-]*$", recipe_name) is None:
+            return ('Recipie Name contains not allowed characters', 500)
+
+        with open("./recipes/%s.json" % recipe_name) as json_data:
+            d = json.load(json_data)
+            Step.delete_all()
+            StepView().reset()
+            for s in d["steps"]:
+                Step.insert(**{"name": s.get("name"), "type": s.get("type"), "config": s.get("config")})
+
+        self.api.ws_emit("UPDATE_ALL_STEPS", Step.get_all())
+        self.api.notify(headline="Recipe %s loaded successfully" % recipe_name, message="")
+
+        return ('', 204)
+
+    @route('/download/<name>', methods=["GET"])
+    def download(self, name):
+
+        """
+                Download a log file by name
+                ---
+                tags:
+                  - logs
+                parameters:
+                  - in: path
+                    name: file
+                    schema:
+                      type: string
+                    required: true
+                    description: filename
+                responses:
+                  200:
+                    description: Log file downloaded
+                """
+        file = "%s.json" % name
+
+        if not self.check_filename(file):
+            return ('File Not Found111', 404)
+        return send_from_directory('../../recipes', file, as_attachment=True, attachment_filename=file)
+
+    def check_filename(self, name):
+        import re
+        print "CHECK"
+        pattern = re.compile('^([A-Za-z0-9-_])+.json$')
+        return True if pattern.match(name) else False
+
+    @route('/<name>', methods=["DELETE"])
+    def remove(self, name):
+
+
+        recipe_name = name
+        if re.match("^[A-Za-z0-9_-]*$", recipe_name) is None:
+            return ('Recipie Name contains not allowed characters', 500)
+
+        filename = "./recipes/%s.json" % recipe_name
+        if os.path.isfile(filename) == True:
+            os.remove(filename)
+            self.api.notify(headline="Recipe %s deleted successfully" % recipe_name, message="")
+            return ('', 204)
+        else:
+            self.api.notify(headline="Faild to delete Recipe %s deleted" % recipe_name, message="")
+            return ('', 404)
+
+        return ('', 204)
+
+
+    @route('/', methods=["GET"])
+    def get_all(self):
+        result = []
+        for filename in os.listdir("./recipes"):
+            if filename.endswith(".json"):
+
+                result.append({"id":filename.split(".")[0], "name": filename.split(".")[0], "change_date": self._modification_date('./recipes/%s' % filename)})
+        return json.dumps(result)
+
+
+    def _modification_date(self, filename):
+        t = os.path.getmtime(filename)
+        return datetime.datetime.fromtimestamp(t).strftime('%Y-%m-%d %H:%M:%S')
+
+    @route('/save', methods=["POST"])
+    def save(self):
+        """
+        Save Recepie
+        ---
+        tags:
+          - steps
+        responses:
+          204:
+            description: Recipe saved
+        """
+
+
+
+        recipe_name = self.api.get_config_parameter("brew_name")
+
+        if recipe_name is None or len(recipe_name) <= 0:
+            self.api.notify(headline="Please set brew name", message="Recipe not saved!", type="danger")
+            return ('Recipie Name contains not allowed characters', 500)
+
+        if re.match("^[\sA-Za-z0-9_-]*$", recipe_name) is None:
+            self.api.notify(headline="Only alphanummeric charaters are allowd for recipe name", message="", type="danger")
+            return ('Recipie Name contains not allowed characters', 500)
+
+        recipe_data = {"name": recipe_name, "steps": Step.get_all()}
+
+        file_name = recipe_name.replace(" ", "_")
+        with open('./recipes/%s.json' % file_name, 'w') as outfile:
+            json.dump(recipe_data, outfile, indent=4)
+
+        self.api.notify(headline="Recipe %s saved successfully" % recipe_name, message="")
+
+
+        return ('', 204)
+
+
+@cbpi.addon.core.initializer(order=2000)
+def init(cbpi):
+    RecipeBook.api = cbpi
+    RecipeBook.register(cbpi.web, route_base='/api/recipebook')

modules/recipe_import/beerxml.py

@@ -2,18 +2,28 @@ from flask import json, request
 from flask_classy import FlaskView, route
 from git import Repo, Git
 import sqlite3
-from modules.app_config import cbpi
+from modules import cbpi
 from werkzeug.utils import secure_filename
 import pprint
 import time
 import os
-from modules.steps import Step,StepView
+from modules.step import Step,StepView
 import xml.etree.ElementTree
 
 class BeerXMLImport(FlaskView):
     BEER_XML_FILE = "./upload/beer.xml"
     @route('/', methods=['GET'])
     def get(self):
+
+        """
+        Get BeerXML
+        ---
+        tags:
+          - beerxml
+        responses:
+          200:
+            description: BeerXML file stored in CraftBeerPI
+        """
         if not os.path.exists(self.BEER_XML_FILE):
             self.api.notify(headline="File Not Found", message="Please upload a Beer.xml File",
                             type="danger")
@@ -31,33 +41,60 @@ class BeerXMLImport(FlaskView):
 
     @route('/upload', methods=['POST'])
     def upload_file(self):
+        """
+        Upload BeerXML File
+        ---
+        tags:
+          - beerxml
+       
+        responses:
+          200:
+            description: BeerXML File Uploaded
+        """
         try:
             if request.method == 'POST':
                 file = request.files['file']
                 if file and self.allowed_file(file.filename):
-                    file.save(os.path.join(self.api.app.config['UPLOAD_FOLDER'], "beer.xml"))
+                    file.save(os.path.join(self.api.get_config_parameter('UPLOAD_FOLDER', "./upload"), "beer.xml"))
                     self.api.notify(headline="Upload Successful", message="The Beer XML file was uploaded succesfully")
                     return ('', 204)
                 return ('', 404)
         except Exception as e:
+            self.api.logger.error(e)
             self.api.notify(headline="Upload Failed", message="Failed to upload Beer xml", type="danger")
             return ('', 500)
 
     @route('/<int:id>', methods=['POST'])
     def load(self, id):
 
+        """
+        Load Recipe from BeerXML
+        ---
+        tags:
+          - beerxml
+        parameters:
+          - in: path
+            name: id
+            schema:
+              type: integer
+            required: true
+            description: Recipe ID from BeerXML
+
+        responses:
+          200:
+            description: Recipe loaed
+        """
 
         steps = self.getSteps(id)
-        boil_time_alerts = self.getBoilAlerts(id)
         name = self.getRecipeName(id)
         self.api.set_config_parameter("brew_name", name)
         boil_time = self.getBoilTime(id)
-        mashstep_type = cbpi.get_config_parameter("step_mash", "MashStep")
-        mash_kettle = cbpi.get_config_parameter("step_mash_kettle", None)
+        mashstep_type = self.api.get_config_parameter("step_mash", "MashStep")
+        mash_kettle = self.api.get_config_parameter("step_mash_kettle", None)
 
-        boilstep_type = cbpi.get_config_parameter("step_boil", "BoilStep")
-        boil_kettle = cbpi.get_config_parameter("step_boil_kettle", None)
-        boil_temp = 100 if cbpi.get_config_parameter("unit", "C") == "C" else 212
+        boilstep_type = self.api.get_config_parameter("step_boil", "BoilStep")
+        boil_kettle = self.api.get_config_parameter("step_boil_kettle", None)
+        boil_temp = 100 if self.api.get_config_parameter("unit", "C") == "C" else 212
 
         # READ KBH DATABASE
         Step.delete_all()
@@ -68,30 +105,12 @@ class BeerXMLImport(FlaskView):
             for row in steps:
                 Step.insert(**{"name": row.get("name"), "type": mashstep_type, "config": {"kettle": mash_kettle, "temp": float(row.get("temp")), "timer": row.get("timer")}})
             Step.insert(**{"name": "ChilStep", "type": "ChilStep", "config": {"timer": 15}})
-            ## Add boiling step
-            Step.insert(**{
-                "name": "Boil",
-                "type": boilstep_type,
-                "config": {
-                    "kettle": boil_kettle,
-                    "temp": boil_temp,
-                    "timer": boil_time,
-                    ## Beer XML defines additions as the total time spent in boiling,
-                    ## CBP defines it as time-until-alert
-
-                    ## Also, The model supports five boil-time additions.
-                    ## Set the rest to None to signal them being absent
-                    "hop_1": boil_time - boil_time_alerts[0] if len(boil_time_alerts) >= 1 else None,
-                    "hop_2": boil_time - boil_time_alerts[1] if len(boil_time_alerts) >= 2 else None,
-                    "hop_3": boil_time - boil_time_alerts[2] if len(boil_time_alerts) >= 3 else None,
-                    "hop_4": boil_time - boil_time_alerts[3] if len(boil_time_alerts) >= 4 else None,
-                    "hop_5": boil_time - boil_time_alerts[4] if len(boil_time_alerts) >= 5 else None
-                }
-            })
+            ## Add cooking step
+            Step.insert(**{"name": "Boil", "type": boilstep_type, "config": {"kettle": boil_kettle, "temp": boil_temp, "timer": boil_time}})
             ## Add Whirlpool step
             Step.insert(**{"name": "Whirlpool", "type": "ChilStep", "config": {"timer": 15}})
-            StepView().reset()
-            self.api.emit("UPDATE_ALL_STEPS", Step.get_all())
+
+            self.api.ws_emit("UPDATE_ALL_STEPS", Step.get_all())
             self.api.notify(headline="Recipe %s loaded successfully" % name, message="")
         except Exception as e:
             self.api.notify(headline="Failed to load Recipe", message=e.message, type="danger")
@@ -107,46 +126,21 @@ class BeerXMLImport(FlaskView):
         e = xml.etree.ElementTree.parse(self.BEER_XML_FILE).getroot()
         return float(e.find('./RECIPE[%s]/BOIL_TIME' % (str(id))).text)
 
-    def getBoilAlerts(self, id):
-        e = xml.etree.ElementTree.parse(self.BEER_XML_FILE).getroot()
-
-        recipe = e.find('./RECIPE[%s]' % (str(id)))
-        alerts = []
-        for e in recipe.findall('./HOPS/HOP'):
-            use = e.find('USE').text
-            ## Hops which are not used in the boil step should not cause alerts
-            if use != 'Aroma' and use != 'Boil':
-                continue
-
-            alerts.append(float(e.find('TIME').text))
-
-        ## There might also be miscelaneous additions during boild time
-        for e in recipe.findall('MISCS/MISC[USE="Boil"]'):
-            alerts.append(float(e.find('TIME').text))
-
-        ## Dedupe and order the additions by their time, to prevent multiple alerts at the same time
-        alerts = sorted(list(set(alerts)))
-
-        ## CBP should have these additions in reverse
-        alerts.reverse()
-
-        return alerts
-
     def getSteps(self, id):
         e = xml.etree.ElementTree.parse(self.BEER_XML_FILE).getroot()
         steps = []
         for e in e.findall('./RECIPE[%s]/MASH/MASH_STEPS/MASH_STEP' % (str(id))):
+
             if self.api.get_config_parameter("unit", "C") == "C":
                 temp = float(e.find("STEP_TEMP").text)
             else:
                 temp = round(9.0 / 5.0 * float(e.find("STEP_TEMP").text) + 32, 2)
-
             steps.append({"name": e.find("NAME").text, "temp": temp, "timer": float(e.find("STEP_TIME").text)})
 
         return steps
 
-@cbpi.initalizer()
+@cbpi.addon.core.initializer()
 def init(cbpi):
 
     BeerXMLImport.api = cbpi
-    BeerXMLImport.register(cbpi.app, route_base='/api/beerxml')
+    BeerXMLImport.register(cbpi.web, route_base='/api/beerxml')

modules/recipe_import/kbh.py

@@ -2,18 +2,28 @@ from flask import json, request
 from flask_classy import FlaskView, route
 from git import Repo, Git
 import sqlite3
-from modules.app_config import cbpi
+from modules import cbpi
 from werkzeug.utils import secure_filename
 import pprint
 import time
 import os
-from modules.steps import Step, StepView
+from modules.step import Step, StepView
 
 
 class KBH(FlaskView):
 
     @route('/', methods=['GET'])
     def get(self):
+
+        """
+        Get all recipes from uploaded kleinerbrauhelfer database
+        ---
+        tags:
+          - kleinerbrauhelfer
+        responses:
+          200:
+            description: Recipes from kleinerbrauhelfer database
+        """
         conn = None
         try:
             if not os.path.exists(self.api.app.config['UPLOAD_FOLDER'] + '/kbh.db'):
@@ -29,7 +39,7 @@ class KBH(FlaskView):
                 result.append({"id": row[0], "name": row[1], "brewed": row[2]})
             return json.dumps(result)
         except Exception as e:
-            print e
+            self.api.logger.error(e)
             self.api.notify(headline="Failed to load KHB database", message="ERROR", type="danger")
             return ('', 500)
         finally:
@@ -41,6 +51,16 @@ class KBH(FlaskView):
 
     @route('/upload', methods=['POST'])
     def upload_file(self):
+        """
+        Upload KleinerBrauhelfer Database File
+        ---
+        tags:
+          - kleinerbrauhelfer
+        
+        responses:
+          200:
+            description: File uploaed
+        """
         try:
             if request.method == 'POST':
                 file = request.files['file']
@@ -57,6 +77,23 @@ class KBH(FlaskView):
 
     @route('/<int:id>', methods=['POST'])
     def load(self, id):
+        """
+        Load Recipe from Kleinerbrauhelfer Database
+        ---
+        tags:
+          - kleinerbrauhelfer
+        parameters:
+          - in: path
+            name: id
+            schema:
+              type: integer
+            required: true
+            description: Numeric ID of recipe
+
+        responses:
+          200:
+            description: Recipe loaded
+        """
         mashstep_type = cbpi.get_config_parameter("step_mash", "MashStep")
         mashinstep_type = cbpi.get_config_parameter("step_mashin", "MashInStep")
         chilstep_type = cbpi.get_config_parameter("step_chil", "ChilStep")
@@ -102,8 +139,8 @@ class KBH(FlaskView):
 
 
 
-@cbpi.initalizer()
+@cbpi.addon.core.initializer()
 def init(cbpi):
 
     KBH.api = cbpi
-    KBH.register(cbpi.app, route_base='/api/kbh')
+    KBH.register(cbpi.web, route_base='/api/kbh')

modules/recipe_import/restapi.py

@@ -2,12 +2,12 @@ from flask import json, request
 from flask_classy import FlaskView, route
 from git import Repo, Git
 import sqlite3
-from modules.app_config import cbpi
+from modules import cbpi
 from werkzeug.utils import secure_filename
 import pprint
 import time
 import os
-from modules.steps import Step,StepView
+from modules.step import Step,StepView
 import xml.etree.ElementTree
 
 
@@ -56,7 +56,7 @@ class RESTImport(FlaskView):
         return ('', 204)
 
 
-@cbpi.initalizer()
+@cbpi.addon.core.initializer()
 def init(cbpi):
     RESTImport.api = cbpi
-    RESTImport.register(cbpi.app, route_base='/api/recipe/import/v1')
+    RESTImport.register(cbpi.web, route_base='/api/recipe/import/v1')

modules/sensor/__init__.py

@@ -0,0 +1,73 @@
+import time
+from flask_classy import route
+from modules import cbpi
+from modules.core.db import DBModel
+from modules.core.baseview import RestApi
+from modules.database.dbmodel import Sensor
+from flask import request
+
+class SensorView(RestApi):
+    model = Sensor
+    cache_key = "sensors"
+
+    @route('<int:id>/action/<method>', methods=["POST"])
+    def action(self, id, method):
+        """
+        Sensor Action 
+        ---
+        tags:
+          - sensor
+        parameters:
+          - in: path
+            name: id
+            schema:
+              type: integer
+            required: true
+            description: Numeric ID of the sensor
+          - in: path
+            name: method
+            schema:
+              type: string
+            required: true
+            description: action method name
+        responses:
+          200:
+            description: Sensor Action called
+        """
+        data = request.json
+        if data:
+            cbpi.sensor.action(id, method, **data)
+        else:
+            cbpi.sensor.action(id, method)
+        return ('', 204)
+
+    def _post_post_callback(self, m):
+
+        cbpi.sensor.init_one(m.id)
+
+    def _post_put_callback(self, m):
+        cbpi.sensor.stop_one(m.id)
+        cbpi.sensor.init_one(m.id)
+
+    def _pre_delete_callback(self, m):
+        cbpi.sensor.stop_one(m.id)
+
+@cbpi.addon.core.initializer(order=1000)
+def init(cbpi):
+
+    SensorView.register(cbpi.web, route_base='/api/sensor')
+    SensorView.init_cache()
+
+
+#@cbpi.addon.core.backgroundtask(key="read_passiv_sensor", interval=5)
+def read_passive_sensor(api):
+    """
+    background process that reads all passive sensors in interval of 1 second
+    :return: None
+
+    """
+
+
+    #for key, value in cbpi.cache.get("sensors").iteritems():
+    #    if value.mode == "P":
+    #        value.instance.read()

modules/sensors/__init__.py

@@ -1,48 +0,0 @@
-import time
-from flask_classy import route
-from modules import DBModel, cbpi
-from modules.core.baseview import BaseView
-
-class Sensor(DBModel):
-    __fields__ = ["name","type", "config", "hide"]
-    __table_name__ = "sensor"
-    __json_fields__ = ["config"]
-
-class SensorView(BaseView):
-    model = Sensor
-    cache_key = "sensors"
-
-    @route('<int:id>/action/<method>', methods=["POST"])
-    def action(self, id, method):
-
-        cbpi.cache.get("sensors").get(id).instance.__getattribute__(method)()
-        return ('', 204)
-
-    def _post_post_callback(self, m):
-        cbpi.init_sensor(m.id)
-
-    def _post_put_callback(self, m):
-        cbpi.stop_sensor(m.id)
-        cbpi.init_sensor(m.id)
-
-    def _pre_delete_callback(self, m):
-        cbpi.stop_sensor(m.id)
-
-@cbpi.initalizer(order=1000)
-def init(cbpi):
-
-    SensorView.register(cbpi.app, route_base='/api/sensor')
-    SensorView.init_cache()
-    cbpi.init_sensors()
-
-
-@cbpi.backgroundtask(key="read_passiv_sensor", interval=5)
-def read_passive_sensor(api):
-    """
-    background process that reads all passive sensors in interval of 1 second
-    :return: None
-
-    """
-    for key, value in cbpi.cache.get("sensors").iteritems():
-        if value.mode == "P":
-            value.instance.read()

modules/stats/__init__.py

@@ -19,10 +19,9 @@ def sendStats(cbpi):
 
     try:
         serial = getserial()
-
         info = {
         "id": serial,
-        "version": "3.0",
+        "version": "3.1",
         "kettle": len(cbpi.cache.get("kettle")),
         "hardware": len(cbpi.cache.get("actors")),
         "thermometer": "CBP3.0",
@@ -30,7 +29,7 @@ def sendStats(cbpi):
         }
 
         import requests
-        r = requests.post('http://statistics.craftbeerpi.com', json=info)
+        #r = requests.post('http://statistics.craftbeerpi.com', json=info)
 
     except Exception as e:
         pass

modules/step/__init__.py

@@ -2,69 +2,13 @@ import time
 from flask import json, request
 from flask_classy import route
 
-from modules import DBModel, cbpi, get_db
-from modules.core.baseview import BaseView
+from modules.core.db import DBModel
+from modules.core.baseview import RestApi
+from modules import cbpi
+from modules.database.dbmodel import Step
 
 
-class Step(DBModel):
-    __fields__ = ["name","type", "stepstate", "state", "start", "end", "order", "config"]
-    __table_name__ = "step"
-    __json_fields__ = ["config", "stepstate"]
-    __order_by__ = "order"
-    __as_array__ = True
-
-    @classmethod
-    def get_max_order(cls):
-        cur = get_db().cursor()
-        cur.execute("SELECT max(step.'order') as 'order' FROM %s" % cls.__table_name__)
-        r = cur.fetchone()
-        return r.get("order")
-
-    @classmethod
-    def get_by_state(cls, state, order=True):
-        cur = get_db().cursor()
-        cur.execute("SELECT * FROM %s WHERE state = ? ORDER BY %s.'order'" % (cls.__table_name__,cls.__table_name__,), state)
-        r = cur.fetchone()
-        if r is not None:
-            return cls(r)
-        else:
-            return None
-
-    @classmethod
-    def delete_all(cls):
-        cur = get_db().cursor()
-        cur.execute("DELETE FROM %s" % cls.__table_name__)
-        get_db().commit()
-
-    @classmethod
-    def reset_all_steps(cls):
-        cur = get_db().cursor()
-        cur.execute("UPDATE %s SET state = 'I', stepstate = NULL , start = NULL, end = NULL " % cls.__table_name__)
-        get_db().commit()
-
-    @classmethod
-    def update_state(cls, id, state):
-        cur = get_db().cursor()
-        cur.execute("UPDATE %s SET state = ? WHERE id =?" % cls.__table_name__, (state, id))
-        get_db().commit()
-
-    @classmethod
-    def update_step_state(cls, id, state):
-        cur = get_db().cursor()
-        cur.execute("UPDATE %s SET stepstate = ? WHERE id =?" % cls.__table_name__, (json.dumps(state),id))
-        get_db().commit()
-
-    @classmethod
-    def sort(cls, new_order):
-        cur = get_db().cursor()
-
-        for e in new_order:
-
-            cur.execute("UPDATE %s SET '%s' = ? WHERE id = ?" % (cls.__table_name__, "order"), (e[1], e[0]))
-        get_db().commit()
-
-
-class StepView(BaseView):
+class StepView(RestApi):
     model = Step
     def _pre_post_callback(self, data):
         order = self.model.get_max_order()
@@ -73,26 +17,67 @@ class StepView(BaseView):
 
     @route('/sort', methods=["POST"])
     def sort_steps(self):
+        """
+        Sort all steps
+        ---
+        tags:
+          - steps
+        responses:
+          204:
+            description: Steps sorted. Update delivered via web socket
+        """
         Step.sort(request.json)
-        cbpi.emit("UPDATE_ALL_STEPS", self.model.get_all())
+        cbpi.ws_emit("UPDATE_ALL_STEPS", self.model.get_all())
         return ('', 204)
 
     @route('/', methods=["DELETE"])
     def deleteAll(self):
+        """
+        Delete all Steps
+        ---
+        tags:
+          - steps
+        responses:
+          204:
+            description: All steps deleted
+        """
         self.model.delete_all()
-        cbpi.emit("UPDATE_ALL_STEPS", self.model.get_all())
+        self.api.emit("ALL_BREWING_STEPS_DELETED")
+        self.api.set_config_parameter("brew_name", "")
+        cbpi.ws_emit("UPDATE_ALL_STEPS", self.model.get_all())
         return ('', 204)
 
     @route('/action/<method>', methods=["POST"])
     def action(self, method):
+        """
+        Call Step Action 
+        ---
+        tags:
+          - steps
+        responses:
+          204:
+            description: Step action called
+        """
+        self.api.emit("BREWING_STEP_ACTION_INVOKED", method=method)
         cbpi.cache["active_step"].__getattribute__(method)()
         return ('', 204)
 
     @route('/reset', methods=["POST"])
     def reset(self):
+
+        """
+        Reset All Steps
+        ---
+        tags:
+          - steps
+        responses:
+          200:
+            description: Steps reseted
+        """
         self.model.reset_all_steps()
         self.stop_step()
-        cbpi.emit("UPDATE_ALL_STEPS", self.model.get_all())
+        self.api.emit("ALL_BREWING_STEPS_RESET")
+        cbpi.ws_emit("UPDATE_ALL_STEPS", self.model.get_all())
         return ('', 204)
 
     def stop_step(self):
@@ -102,16 +87,21 @@ class StepView(BaseView):
         '''
         step = cbpi.cache.get("active_step")
         cbpi.cache["active_step"] = None
-
+        self.api.emit("BREWING_STEPS_STOP")
         if step is not None:
             step.finish()
 
     @route('/reset/current', methods=['POST'])
     def resetCurrentStep(self):
-        '''
-        Reset current step
-        :return: 
-        '''
+        """
+        Reset current Steps
+        ---
+        tags:
+          - steps
+        responses:
+          200:
+            description: Current Steps reseted
+        """
         step = cbpi.cache.get("active_step")
 
         if step is not None:
@@ -123,11 +113,13 @@ class StepView(BaseView):
                     state[field] = step.__getattribute__(field)
                 Step.update_step_state(step.id, state)
                 step.reset_dirty()
-                cbpi.emit("UPDATE_ALL_STEPS", self.model.get_all())
+                self.api.emit("BREWING_STEPS_RESET_CURRENT")
+                cbpi.ws_emit("UPDATE_ALL_STEPS", self.model.get_all())
         return ('', 204)
 
     def init_step(self, step):
-        cbpi.log_action("Start Step %s" % step.name)
+
+        cbpi.brewing.log_action("Start Step %s" % step.name)
         type_cfg = cbpi.cache.get("step_types").get(step.type)
         if type_cfg is None:
             # if type not found
@@ -145,6 +137,16 @@ class StepView(BaseView):
     @route('/next', methods=['POST'])
     @route('/start', methods=['POST'])
     def start(self):
+
+        """
+        Next Step
+        ---
+        tags:
+          - steps
+        responses:
+          200:
+            description: Next Step
+        """
         active = Step.get_by_state("A")
         inactive = Step.get_by_state('I')
 
@@ -153,6 +155,7 @@ class StepView(BaseView):
             active.end = int(time.time())
             self.stop_step()
             Step.update(**active.__dict__)
+            self.api.emit("BREWING_STEP_DONE")
 
         if (inactive is not None):
             self.init_step(inactive)
@@ -160,11 +163,15 @@ class StepView(BaseView):
             inactive.stepstate = inactive.config
             inactive.start = int(time.time())
             Step.update(**inactive.__dict__)
+            self.api.emit("BREWING_STEP_STARTED")
         else:
-            cbpi.log_action("Brewing Finished")
+            cbpi.brewing.log_action("Brewing Finished")
+            self.api.emit("BREWING_FINISHED")
             cbpi.notify("Brewing Finished", "You are done!", timeout=None)
 
-        cbpi.emit("UPDATE_ALL_STEPS", Step.get_all())
+
+        cbpi.ws_emit("UPDATE_ALL_STEPS", Step.get_all())
+
         return ('', 204)
 
 def get_manged_fields_as_array(type_cfg):
@@ -176,64 +183,64 @@ def get_manged_fields_as_array(type_cfg):
 
     return result
 
-@cbpi.try_catch(None)
+
 def init_after_startup():
     '''
     Restart after startup. Check is a step is in state A and reinitialize
     :return: None
     '''
-
     step = Step.get_by_state('A')
     # We have an active step
     if step is not None:
-
         # get the type
-
-
         type_cfg = cbpi.cache.get("step_types").get(step.type)
 
         if type_cfg is None:
             # step type not found. cant restart step
             return
-
         cfg = step.stepstate.copy()
         cfg.update(dict(api=cbpi, id=step.id, managed_fields=get_manged_fields_as_array(type_cfg)))
         instance = type_cfg.get("class")(**cfg)
         instance.init()
         cbpi.cache["active_step"] = instance
 
-@cbpi.initalizer(order=2000)
+@cbpi.addon.core.initializer(order=2000)
 def init(cbpi):
 
-    StepView.register(cbpi.app, route_base='/api/step')
+    StepView.register(cbpi.web, route_base='/api/step')
 
     def get_all():
-        with cbpi.app.app_context():
+        with cbpi.web.app_context():
             return Step.get_all()
 
-    with cbpi.app.app_context():
+    with cbpi.web.app_context():
         init_after_startup()
+
     cbpi.add_cache_callback("steps", get_all)
 
-@cbpi.backgroundtask(key="step_task", interval=0.1)
+@cbpi.addon.core.backgroundtask(key="step_task", interval=0.1)
 def execute_step(api):
     '''
     Background job which executes the step
     :return:
     '''
-    with cbpi.app.app_context():
+    with cbpi.web.app_context():
+
         step = cbpi.cache.get("active_step")
         if step is not None:
             step.execute()
+
             if step.is_dirty():
+
                 state = {}
                 for field in step.managed_fields:
                     state[field] = step.__getattribute__(field)
+
                 Step.update_step_state(step.id, state)
                 step.reset_dirty()
-                cbpi.emit("UPDATE_ALL_STEPS", Step.get_all())
+                cbpi.ws_emit("UPDATE_ALL_STEPS", Step.get_all())
 
             if step.n is True:
 
                 StepView().start()
-                cbpi.emit("UPDATE_ALL_STEPS", Step.get_all())
+                cbpi.ws_emit("UPDATE_ALL_STEPS", Step.get_all())

modules/system/__init__.py

@@ -1 +1,193 @@
-import endpoints
+import flask_login
+import requests
+import yaml
+from flask import json, url_for, Response, request
+from flask_classy import FlaskView, route
+from flask_login import login_required, current_user
+from git import Repo, Git
+from modules import cbpi
+import pprint
+import time
+
+from modules.login import User
+
+
+class SystemView(FlaskView):
+    def doShutdown(self):
+        time.sleep(5)
+        from subprocess import call
+        call("halt")
+
+    @login_required
+    @route('/shutdown', methods=['POST'])
+    def shutdown(self):
+        """
+        System Shutdown
+        ---
+        tags:
+          - system
+        responses:
+          200:
+            description: Shutdown triggered
+        """
+        self.doShutdown()
+
+        return ('', 204)
+
+    def doReboot(self):
+        time.sleep(5)
+        from subprocess import call
+        call("reboot")
+
+    @login_required
+    @route('/reboot', methods=['POST'])
+    def reboot(self):
+        """
+        System Reboot  
+        ---
+        tags:
+          - system
+        responses:
+          200:
+            description: Reboot triggered
+        """
+        self.doReboot()
+        return ('', 204)
+
+    @login_required
+    @route('/checkout', methods=['POST'])
+    def checkout_tag(self):
+
+        data = request.json
+        name = data.get("name")
+
+        if name is None:
+            return ('', 500)
+
+        repo = Repo('./')
+        repo.git.reset('--hard')
+        o = repo.remotes.origin
+        o.fetch()
+        g = Git('./')
+        g.checkout(name)
+        cbpi.notify("Checkout successful", "Please restart the system")
+        return ('', 204)
+
+
+    @login_required
+    @route('/git/status', methods=['GET'])
+    def git_status(self):
+
+        repo = Repo('./')
+
+        o = repo.remotes.origin
+        o.fetch()
+
+        branch = repo.active_branch
+
+        url = 'https://api.github.com/repos/manuel83/craftbeerpi3/releases'
+        response = requests.get(url)
+
+        result = {"current_branch": branch.name, "branches": [], "releases": []}
+        result["branches"].append({"name": "master"})
+
+        for branch in repo.branches:
+            result["branches"].append({"name": branch.name})
+
+        for r in response.json():
+            result["releases"].append({"name": "tags/%s" % r.get("tag_name")})
+
+        """
+        Check for GIT status
+        ---
+        tags:
+          - system
+        responses:
+          200:
+            description: Git Status
+        """
+        return json.dumps(result)
+
+    @login_required
+    @route('/check_update', methods=['GET'])
+    def check_update(self):
+        """
+        Check for GIT update
+        ---
+        tags:
+          - system
+        responses:
+          200:
+            description: Git Changes
+        """
+        repo = Repo('./')
+        o = repo.remotes.origin
+        o.fetch()
+        changes = []
+        commits_behind = repo.iter_commits('master..origin/master')
+
+        for c in list(commits_behind):
+            changes.append({"committer": c.committer.name, "message": c.message})
+
+        return json.dumps(changes)
+
+    @login_required
+    @route('/git/pull', methods=['POST'])
+    def update(self):
+        """
+        System Update
+        ---
+        tags:
+          - system
+        responses:
+          200:
+            description: Git Pull Triggered
+        """
+        repo = Repo('./')
+        o = repo.remotes.origin
+        info = o.pull()
+        cbpi.notify("Pull successful", "The lasted updated was downloaded. Please restart the system")
+        return ('', 204)
+
+    @route('/connect', methods=['GET'])
+    def connect(self):
+        """
+        Connect
+        ---
+        tags:
+          - system
+        responses:
+          200:
+            description: CraftBeerPi System Cache
+        """
+        if cbpi.get_config_parameter("password_security", "NO") == "NO":
+            user = User()
+            user.id = "craftbeerpi"
+            flask_login.login_user(user)
+
+        if self.api.get_config_parameter("setup", "YES") == "YES":
+            return json.dumps(dict(setup=True, loggedin= current_user.is_authenticated ))
+        else:
+            return json.dumps(dict(setup=False, loggedin= current_user.is_authenticated))
+
+    @login_required
+    @route('/dump', methods=['GET'])
+    def dump(self):
+        """
+        Dump Cache
+        ---
+        tags:
+          - system
+        responses:
+          200:
+            description: CraftBeerPi System Cache
+        """
+        return Response(response=json.dumps(cbpi.cache, sort_keys=True, indent=4), status=200, mimetype='application/json')
+
+
+
+@cbpi.addon.core.initializer()
+def init(cbpi):
+
+    SystemView.api = cbpi
+    SystemView.register(cbpi.web, route_base='/api/system')

modules/system/endpoints.py

@@ -1,145 +0,0 @@
-import yaml
-from flask import json, url_for, Response
-from flask_classy import FlaskView, route
-from git import Repo, Git
-
-from modules.app_config import cbpi
-
-import pprint
-import time
-
-
-class SystemView(FlaskView):
-    def doShutdown(self):
-        time.sleep(5)
-        from subprocess import call
-        call("halt")
-
-    @route('/shutdown', methods=['POST'])
-    def shutdown(self):
-        """
-        Shutdown hook
-        :return: HTTP 204
-        """
-        self.doShutdown()
-
-        return ('', 204)
-
-    def doReboot(self):
-        time.sleep(5)
-        from subprocess import call
-        call("reboot")
-
-    @route('/reboot', methods=['POST'])
-    def reboot(self):
-        """
-        Reboot hook
-        :return: HTTP 204
-        """
-        self.doReboot()
-
-        return ('', 204)
-
-    @route('/tags/<name>', methods=['GET'])
-    def checkout_tag(self,name):
-        repo = Repo('./')
-        repo.git.reset('--hard')
-        o = repo.remotes.origin
-        o.fetch()
-        g = Git('./')
-        g.checkout(name)
-        cbpi.notify("Checkout successful", "Please restart the system")
-        return ('', 204)
-
-    @route('/git/status', methods=['GET'])
-    def git_status(self):
-        repo = Repo('./')
-        o = repo.remotes.origin
-        o.fetch()
-        # Tags
-        tags = []
-        for t in repo.tags:
-            tags.append({"name": t.name, "commit": str(t.commit), "date": t.commit.committed_date,
-                         "committer": t.commit.committer.name, "message": t.commit.message})
-        try:
-            branch_name = repo.active_branch.name
-            # test1
-        except:
-            branch_name = None
-
-        changes = []
-        commits_behind = repo.iter_commits('master..origin/master')
-
-        for c in list(commits_behind):
-            changes.append({"committer": c.committer.name, "message": c.message})
-
-        return json.dumps({"tags": tags, "headcommit": str(repo.head.commit), "branchname": branch_name,
-                           "master": {"changes": changes}})
-
-    @route('/check_update', methods=['GET'])
-    def check_update(self):
-
-        repo = Repo('./')
-        o = repo.remotes.origin
-        o.fetch()
-        changes = []
-        commits_behind = repo.iter_commits('master..origin/master')
-
-        for c in list(commits_behind):
-            changes.append({"committer": c.committer.name, "message": c.message})
-
-        return json.dumps(changes)
-
-    @route('/git/pull', methods=['POST'])
-    def update(self):
-        repo = Repo('./')
-        o = repo.remotes.origin
-        info = o.pull()
-        cbpi.notify("Pull successful", "The lasted updated was downloaded. Please restart the system")
-        return ('', 204)
-
-    @route('/dump', methods=['GET'])
-    def dump(self):
-        return json.dumps(cbpi.cache)
-
-    @route('/endpoints', methods=['GET'])
-    def endpoints(self):
-        import urllib
-        output = []
-        vf = self.api.app.view_functions
-
-        for f in self.api.app.view_functions:
-            print  f
-        endpoints = {}
-        re =  {
-            "swagger": "2.0",
-            "host": "",
-            "info": {
-                "description":"",
-                "version": "",
-                "title": "CraftBeerPi"
-            },
-            "schemes": ["http"],
-            "paths": endpoints}
-        for rule in self.api.app.url_map.iter_rules():
-            r = rule
-            endpoints[rule.rule] = {}
-            if "HEAD" in r.methods: r.methods.remove("HEAD")
-            if "OPTIONS" in r.methods: r.methods.remove("OPTIONS")
-            for m in rule.methods:
-                endpoints[rule.rule][m] = dict(summary="", description="", consumes=["application/json"],produces=["application/json"])
-
-        with open("config/version.yaml", 'r') as stream:
-
-            y = yaml.load(stream)
-        pprint.pprint(y)
-        pprint.pprint(re)
-        return Response(yaml.dump(re), mimetype='text/yaml')
-
-
-
-@cbpi.initalizer()
-def init(cbpi):
-
-    SystemView.api = cbpi
-    SystemView.register(cbpi.app, route_base='/api/system')

modules/ui/__init__.py

@@ -1 +1,32 @@
-import endpoints
+from flask import Blueprint,render_template
+
+from modules import cbpi
+
+react = Blueprint('ui', __name__, template_folder='templates', static_folder='static')
+
+@cbpi.addon.core.initializer(order=10)
+def init(cbpi):
+    cbpi.web.register_blueprint(react, url_prefix='/ui')
+
+
+@react.route('/',  methods=["GET"])
+def index():
+    #return react.send_static_file("index.html")
+
+    js_files = []
+    for key, value in cbpi.cache["js"].iteritems():
+        js_files.append(value)
+
+
+    return render_template('index.html', js_files=js_files)
+
+
+
+@cbpi.web.errorhandler(404)
+def page_not_found(e):
+    return render_template('404.html'), 404
+
+
+
+
+

modules/ui/endpoints.py

@@ -1,25 +0,0 @@
-from flask import Blueprint
-
-from modules import cbpi
-
-react = Blueprint('react', __name__, template_folder='templates', static_folder='static')
-
-@cbpi.initalizer(order=10)
-def init(cbpi):
-    cbpi.app.register_blueprint(react, url_prefix='/ui')
-
-
-
-
-@react.route('/',  methods=["GET"])
-def index():
-    return react.send_static_file("index.html")
-
-
-
-
-
-
-
-
-

modules/ui/src/App.css

@@ -7,8 +7,7 @@
 }
 
 .container-fluid {
-    padding-right: 5px;
-    padding-left: 5px;
+
 
 }
 

modules/ui/src/index.css

@@ -1,5 +1,3 @@
 body {
-    margin: 0;
-    padding: 0;
-    font-family: sans-serif;
+
 }

modules/ui/static/index.html

@@ -10,12 +10,19 @@
     <link rel="stylesheet" href="static/bootstrap.dark.css">
 
 
+    <style>
 
+        html {
+            background-image: url('static/bg.png');
+        }
+    </style>
     <title>CraftBeerPi 3.0</title>
   </head>
   <body>
     <div id="root" ></div>
+    HALLO
     <script src="static/bundle.js" type="text/javascript"></script>
 
+
   </body>
 </html>

modules/ui/templates/404.html

@@ -0,0 +1,29 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
+
+      <link rel="stylesheet" href="/ui/static/bootstrap.min.css">
+    <link rel="stylesheet" href="/ui/static/css/font-awesome.min.css">
+    <link rel="stylesheet" href="/ui/static/bootstrap.dark.css">
+    <link href="https://fonts.googleapis.com/css?family=Dosis:200,500" rel="stylesheet">
+      <style>
+
+          body, h1, h2, h3, h4, h5, h6  {
+              font-family: 'Dosis', sans-serif;
+          }
+
+      </style>
+
+
+    <title>CraftBeerPi 3.1</title>
+  </head>
+  <body>
+
+    <h1>CraftBeerPi - Page not Found!</h1>
+
+
+  </body>
+</html>

modules/ui/templates/index.html

@@ -0,0 +1,28 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
+
+      <link rel="stylesheet" href="static/bootstrap.min.css">
+    <link rel="stylesheet" href="static/css/font-awesome.min.css">
+    <link rel="stylesheet" href="static/theme.css">
+    <link href="https://fonts.googleapis.com/css?family=Dosis:200,500" rel="stylesheet"/>
+
+
+    <title>CraftBeerPi 3.1</title>
+
+
+  </head>
+  <body>
+    <div id="root" ></div>
+    {% for file in js_files %}
+
+     <script src="{{ file }}" type="text/javascript"></script>
+     {% endfor %}
+    <script src="static/bundle.js" type="text/javascript"></script>
+
+
+  </body>
+</html>

requirements.txt

@@ -1,13 +1,15 @@
-Flask==0.12.4
+Flask==0.11.1
 Flask-SocketIO==2.6.2
+flask_login==0.4.0
+flask_swagger==0.2.13
 eventlet==0.19.0
 greenlet==0.4.10
 python-dateutil==2.5.3
 python-engineio==0.9.2
 python-mimeparse==1.5.2
 python-socketio==1.4.4
-PyYAML==4.2b1
-requests==2.20.0
+PyYAML==3.11
+requests==2.11.0
 Werkzeug==0.11.10
 httplib2==0.9.2
 flask-classy==0.6.10

run.py

@@ -1,11 +1,32 @@
 #!/usr/bin/env python
 
-from modules import socketio, app, cbpi
 
-try:
-  port = int(cbpi.get_config_parameter('port', '5000'))
-except ValueError:
-  port = 5000
 
-socketio.run(app, host='0.0.0.0', port=port)
+from modules import cbpi
 
+
+from modules.core.db_migrate import *
+from modules.buzzer import *
+from modules.config import *
+from modules.login import *
+from modules.system import *
+from modules.ui import *
+from modules.step import *
+from modules.kettle import *
+from modules.actor import *
+from modules.plugin import *
+from modules.logs import *
+from modules.notification import *
+from modules.sensor import *
+from modules.recipe_import import *
+from modules.fermenter import *
+from modules.action import *
+from modules.base_plugins.actor import *
+from modules.base_plugins.sensor import *
+from modules.base_plugins.steps import *
+from modules.example_plugins.WebViewJquery import *
+from modules.example_plugins.WebViewReactJs import *
+from modules.example_plugins.swagger import *
+from modules.recipe_book import *
+
+cbpi.run()

update/4_login_password.sql

@@ -0,0 +1,2 @@
+INSERT OR IGNORE INTO config VALUES ('password', 'beer', 'text', 'LoginPassword', NULL );
+INSERT OR IGNORE INTO config VALUES ('password_security', 'NO', 'select', 'Show Login Dialog', '["YES","NO"]');

upload/beer.xml

@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<RECIPES>
+ <RECIPE>
+  <NAME>Pale Ale</NAME>
+  <VERSION>1</VERSION>
+  <TYPE>All Grain</TYPE>
+  <BREWER></BREWER>
+  <DISPLAY_BATCH_SIZE>6.5 gal</DISPLAY_BATCH_SIZE>
+  <DISPLAY_BOIL_SIZE>7.5 gal</DISPLAY_BOIL_SIZE>
+  <BATCH_SIZE>24.60517657</BATCH_SIZE>
+  <BOIL_SIZE>28.39058835</BOIL_SIZE>
+  <BOIL_TIME>60</BOIL_TIME>
+  <EFFICIENCY>63</EFFICIENCY>
+  <NOTES>&#13;
+</NOTES>
+  <PRIMARY_TEMP>20</PRIMARY_TEMP>
+  <EST_COLOR>8.75</EST_COLOR>
+  <IBU>62.22</IBU>
+  <IBU_METHOD>Tinseth</IBU_METHOD>
+  <EST_ABV>4.88</EST_ABV>
+  <EST_OG>1.047 sg</EST_OG>
+  <EST_FG>1.01 sg</EST_FG>
+  <OG>1.047</OG>
+  <FG>1.01</FG>
+  <PRIMING_SUGAR_NAME></PRIMING_SUGAR_NAME>
+  <CARBONATION_USED></CARBONATION_USED>
+  <BF_PRIMING_METHOD></BF_PRIMING_METHOD>
+  <BF_PRIMING_AMOUNT></BF_PRIMING_AMOUNT>
+  <BF_CO2_LEVEL></BF_CO2_LEVEL>
+  <BF_CO2_UNIT>Volumes</BF_CO2_UNIT>
+  <URL></URL>
+  <BATCH_SIZE_MODE>f</BATCH_SIZE_MODE>
+  <YEAST_STARTER>false</YEAST_STARTER>
+  <NO_CHILL_EXTRA_MINUTES></NO_CHILL_EXTRA_MINUTES>
+  <STARTING_MASH_THICKNESS>3.33880656</STARTING_MASH_THICKNESS>
+  <PITCH_RATE>0.35</PITCH_RATE>
+  <FERMENTABLES>
+   <FERMENTABLE>
+    <NAME>Pale 2-Row</NAME>
+    <VERSION>1</VERSION>
+    <TYPE>Grain</TYPE>
+    <AMOUNT>4.08233133</AMOUNT>
+    <YIELD>80.43</YIELD>
+    <COLOR>1.8</COLOR>
+    <ADD_AFTER_BOIL>false</ADD_AFTER_BOIL>
+    <ORIGIN>American</ORIGIN>
+   </FERMENTABLE>
+   <FERMENTABLE>
+    <NAME>Caramel / Crystal 60L</NAME>
+    <VERSION>1</VERSION>
+    <TYPE>Grain</TYPE>
+    <AMOUNT>0.45359237</AMOUNT>
+    <YIELD>73.91</YIELD>
+    <COLOR>60</COLOR>
+    <ADD_AFTER_BOIL>false</ADD_AFTER_BOIL>
+    <ORIGIN>American</ORIGIN>
+   </FERMENTABLE>
+   <FERMENTABLE>
+    <NAME>Rye</NAME>
+    <VERSION>1</VERSION>
+    <TYPE>Grain</TYPE>
+    <AMOUNT>1.0205828325</AMOUNT>
+    <YIELD>82.61</YIELD>
+    <COLOR>3.5</COLOR>
+    <ADD_AFTER_BOIL>false</ADD_AFTER_BOIL>
+    <ORIGIN>American</ORIGIN>
+   </FERMENTABLE>
+   <FERMENTABLE>
+    <NAME>Flaked Wheat</NAME>
+    <VERSION>1</VERSION>
+    <TYPE>Adjunct</TYPE>
+    <AMOUNT>0.226796185</AMOUNT>
+    <YIELD>73.91</YIELD>
+    <COLOR>2</COLOR>
+    <ADD_AFTER_BOIL>false</ADD_AFTER_BOIL>
+    <ORIGIN></ORIGIN>
+   </FERMENTABLE>
+   <FERMENTABLE>
+    <NAME>Carapils</NAME>
+    <VERSION>1</VERSION>
+    <TYPE>Grain</TYPE>
+    <AMOUNT>0.226796185</AMOUNT>
+    <YIELD>76.09</YIELD>
+    <COLOR>1.3</COLOR>
+    <ADD_AFTER_BOIL>false</ADD_AFTER_BOIL>
+    <ORIGIN>German</ORIGIN>
+   </FERMENTABLE>
+  </FERMENTABLES>
+  <HOPS>
+   <HOP>
+    <NAME>El Dorado</NAME>
+    <VERSION>1</VERSION>
+    <ALPHA>15.7</ALPHA>
+    <AMOUNT>0.0283495231</AMOUNT>
+    <USE>First Wort</USE>
+    <USER_HOP_USE>First Wort</USER_HOP_USE>
+    <TIME>0</TIME>
+    <FORM>Leaf</FORM>
+   </HOP>
+   <HOP>
+    <NAME>El Dorado</NAME>
+    <VERSION>1</VERSION>
+    <ALPHA>15.7</ALPHA>
+    <AMOUNT>0.0283495231</AMOUNT>
+    <USE>Boil</USE>
+    <USER_HOP_USE>Boil</USER_HOP_USE>
+    <TIME>30</TIME>
+    <FORM>Leaf</FORM>
+   </HOP>
+   <HOP>
+    <NAME>El Dorado</NAME>
+    <VERSION>1</VERSION>
+    <ALPHA>15.7</ALPHA>
+    <AMOUNT>0.0283495231</AMOUNT>
+    <USE>Dry Hop</USE>
+    <USER_HOP_USE>Dry Hop</USER_HOP_USE>
+    <TIME>14400</TIME>
+    <FORM>Leaf</FORM>
+   </HOP>
+  </HOPS>
+  <MISCS/>
+  <MASH>
+   <NAME>Mash Steps</NAME>
+   <VERSION>1</VERSION>
+   <GRAIN_TEMP>20</GRAIN_TEMP>
+   <MASH_STEPS>
+    <MASH_STEP>
+     <NAME>STEP1</NAME>
+     <VERSION>1</VERSION>
+     <TYPE>Infusion</TYPE>
+     <STEP_TIME>60</STEP_TIME>
+     <INFUSE_AMOUNT>1.5141647136</INFUSE_AMOUNT>
+     <STEP_TEMP>65.555555555556</STEP_TEMP>
+    </MASH_STEP>
+   </MASH_STEPS>
+  </MASH>
+  <YEASTS>
+   <YEAST>
+    <NAME>California Ale Yeast WLP001</NAME>
+    <VERSION>1</VERSION>
+    <TYPE>Ale</TYPE>
+    <FORM>Liquid</FORM>
+    <AMOUNT>0.1</AMOUNT>
+    <PRODUCT_ID>WLP001</PRODUCT_ID>
+    <LABORATORY>White Labs</LABORATORY>
+    <ATTENUATION>76.5</ATTENUATION>
+    <FLOCCULATION>Medium</FLOCCULATION>
+    <MIN_TEMPERATURE>20</MIN_TEMPERATURE>
+    <MAX_TEMPERATURE>22.777777777778</MAX_TEMPERATURE>
+   </YEAST>
+  </YEASTS>
+  <WATERS/>
+  <STYLE>
+   <NAME>English IPA</NAME>
+   <VERSION>1</VERSION>
+   <CATEGORY>India Pale Ale (IPA)</CATEGORY>
+   <CATEGORY_NUMBER>14</CATEGORY_NUMBER>
+   <STYLE_LETTER>A</STYLE_LETTER>
+   <STYLE_GUIDE>BJCP</STYLE_GUIDE>
+   <TYPE>Ale</TYPE>
+   <OG_MIN>1.05</OG_MIN>
+   <OG_MAX>1.075</OG_MAX>
+   <FG_MIN>1.01</FG_MIN>
+   <FG_MAX>1.018</FG_MAX>
+   <ABV_MIN>5</ABV_MIN>
+   <ABV_MAX>7.5</ABV_MAX>
+   <IBU_MIN>40</IBU_MIN>
+   <IBU_MAX>60</IBU_MAX>
+   <COLOR_MIN>8</COLOR_MIN>
+   <COLOR_MAX>14</COLOR_MAX>
+  </STYLE>
+ </RECIPE>
+</RECIPES>