mirror of
https://github.com/Manuel83/craftbeerpi3
synced 2026-08-10 02:55:27 +02:00
First Refactoring
- Major API Changes in Core Module - Will be changed further. Still work in progress
This commit is contained in:
Manuel83
Regular → Executable
+264
-96
@@ -1,96 +1,264 @@
|
||||
from flask import request
|
||||
from flask_classy import FlaskView, route
|
||||
from modules import cbpi, socketio
|
||||
from modules.core.baseview import BaseView
|
||||
from modules.core.db import DBModel
|
||||
|
||||
class Kettle(DBModel):
|
||||
__fields__ = ["name","sensor", "heater", "automatic", "logic", "config", "agitator", "target_temp"]
|
||||
__table_name__ = "kettle"
|
||||
__json_fields__ = ["config"]
|
||||
|
||||
|
||||
class Kettle2View(BaseView):
|
||||
model = Kettle
|
||||
cache_key = "kettle"
|
||||
|
||||
@classmethod
|
||||
def _pre_post_callback(self, data):
|
||||
data["target_temp"] = 0
|
||||
|
||||
@classmethod
|
||||
def post_init_callback(cls, obj):
|
||||
obj.state = False
|
||||
|
||||
|
||||
def _post_post_callback(self, m):
|
||||
m.state = False
|
||||
|
||||
def _pre_put_callback(self, m):
|
||||
try:
|
||||
m.instance.stop()
|
||||
except:
|
||||
pass
|
||||
|
||||
def _post_put_callback(self, m):
|
||||
m.state = False
|
||||
|
||||
@route('/<int:id>/targettemp/<temp>', methods=['POST'])
|
||||
def postTargetTemp(self, id, temp):
|
||||
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})
|
||||
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))
|
||||
return ('', 204)
|
||||
|
||||
@cbpi.event("SET_TARGET_TEMP")
|
||||
def set_target_temp(id, temp):
|
||||
'''
|
||||
Change Taget Temp Event
|
||||
:param id: kettle id
|
||||
:param temp: target temp to set
|
||||
:return: None
|
||||
'''
|
||||
|
||||
Kettle2View().postTargetTemp(id,temp)
|
||||
|
||||
@cbpi.backgroundtask(key="read_target_temps", interval=5)
|
||||
def read_target_temps(api):
|
||||
"""
|
||||
background process that reads all passive sensors in interval of 1 second
|
||||
:return: None
|
||||
"""
|
||||
result = {}
|
||||
for key, value in cbpi.cache.get("kettle").iteritems():
|
||||
cbpi.save_to_file(key, value.target_temp, prefix="kettle")
|
||||
|
||||
@cbpi.initalizer()
|
||||
def init(cbpi):
|
||||
Kettle2View.api = cbpi
|
||||
Kettle2View.register(cbpi.app,route_base='/api/kettle')
|
||||
Kettle2View.init_cache()
|
||||
from flask import request
|
||||
from flask_classy import FlaskView, route
|
||||
from modules.core.core import cbpi
|
||||
from modules.core.baseview import BaseView
|
||||
from modules.core.db import DBModel
|
||||
from modules.database.dbmodel import Kettle
|
||||
|
||||
class KettleView(BaseView):
|
||||
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
|
||||
|
||||
@classmethod
|
||||
def post_init_callback(cls, obj):
|
||||
obj.state = False
|
||||
|
||||
|
||||
def _post_post_callback(self, m):
|
||||
m.state = False
|
||||
|
||||
def _pre_put_callback(self, m):
|
||||
try:
|
||||
m.instance.stop()
|
||||
except:
|
||||
pass
|
||||
|
||||
def _post_put_callback(self, m):
|
||||
m.state = False
|
||||
|
||||
@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.brewing.set_target_temp(id, temp)
|
||||
return ('', 204)
|
||||
|
||||
@route('/<int:id>/automatic', methods=['POST'])
|
||||
def toggle(self, 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
|
||||
"""
|
||||
|
||||
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.brewing.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.ws_emit("UPDATE_KETTLE", cbpi.cache.get("kettle").get(id))
|
||||
cbpi.emit("KETTLE_CONTROLLER_STARTED", id=id)
|
||||
else:
|
||||
# Stop controller
|
||||
kettle.instance.stop()
|
||||
kettle.state = not kettle.state
|
||||
cbpi.ws_emit("UPDATE_KETTLE", cbpi.cache.get("kettle").get(id))
|
||||
cbpi.emit("KETTLE_CONTROLLER_STOPPED", id=id)
|
||||
return ('', 204)
|
||||
|
||||
#@cbpi.event("SET_TARGET_TEMP")
|
||||
def set_target_temp(id, temp):
|
||||
'''
|
||||
Change Taget Temp Event
|
||||
:param id: kettle id
|
||||
:param temp: target temp to set
|
||||
:return: None
|
||||
'''
|
||||
KettleView().postTargetTemp(id, temp)
|
||||
|
||||
@cbpi.addon.core.backgroundjob(key="read_target_temps", interval=5)
|
||||
def read_target_temps(api):
|
||||
"""
|
||||
background process that reads all passive sensors in interval of 1 second
|
||||
:return: None
|
||||
"""
|
||||
result = {}
|
||||
for key, value in cbpi.cache.get("kettle").iteritems():
|
||||
cbpi.sensor.write_log(key, value.target_temp, prefix="kettle")
|
||||
|
||||
@cbpi.addon.core.initializer()
|
||||
def init(cbpi):
|
||||
KettleView.api = cbpi
|
||||
KettleView.register(cbpi._app, route_base='/api/kettle')
|
||||
KettleView.init_cache()
|
||||
|
||||
Reference in New Issue
Block a user