simo 1.7.19__py3-none-any.whl → 2.0.0__py3-none-any.whl

simo/fleet/auto_urls.py

@@ -1,5 +1,4 @@
-from django.conf.urls import include, url
-from django.urls import path
+from django.urls import path, re_path
 from django.views.generic import TemplateView
 from .views import (
     colonels_ping,
@@ -8,7 +7,7 @@ from .views import (
 )
 
 urlpatterns = [
-    url(
+    re_path(
         r"^colonels-ping/$", colonels_ping, name='colonels-ping'
     ),
     path(

simo/fleet/controllers.py

@@ -1,4 +1,4 @@
-from django.core.exceptions import ValidationError
+from django.utils.translation import gettext_lazy as _
 from simo.core.events import GatewayObjectCommand
 from simo.core.controllers import (
     BinarySensor as BaseBinarySensor,
@@ -8,19 +8,23 @@ from simo.core.controllers import (
 )
 from simo.conf import dynamic_settings
 from simo.core.app_widgets import NumericSensorWidget
-from simo.core.controllers import BEFORE_SEND, BEFORE_SET, ControllerBase
-from simo.core.utils import easing
+from simo.core.controllers import Lock
 from simo.core.utils.helpers import heat_index
+from simo.core.utils.serialization import (
+    serialize_form_data, deserialize_form_data
+)
 from simo.generic.controllers import Blinds as GenericBlinds
 from .models import Colonel
 from .gateways import FleetGatewayHandler
 from .forms import (
+    ColonelPinChoiceField,
     ColonelBinarySensorConfigForm, ColonelTouchSensorConfigForm,
     ColonelSwitchConfigForm, ColonelPWMOutputConfigForm,
     ColonelNumericSensorConfigForm, ColonelRGBLightConfigForm,
     ColonelDHTSensorConfigForm, DS18B20SensorConfigForm,
-    BME680SensorConfigForm,
-    DualMotorValveForm, BlindsConfigForm, BurglarSmokeDetectorConfigForm
+    BME680SensorConfigForm, MPC9808SensorConfigForm,
+    DualMotorValveForm, BlindsConfigForm, BurglarSmokeDetectorConfigForm,
+    TTLockConfigForm
 )
 
 
@@ -47,17 +51,34 @@ class FleeDeviceMixin:
             options['controls_enabled'] = True
             self.update_options(options)
 
+    def _get_colonel_config(self):
+        declared_fields = self.config_form.declared_fields
+        config = {}
+        for key, val in self.component.config.items():
+            if key == 'colonel':
+                continue
+            if val in ({}, [], None):
+                continue
+            if isinstance(declared_fields.get(key), ColonelPinChoiceField):
+                config[f'{key}_no'] = self.component.config[f'{key}_no']
+            else:
+                config[key] = val
+        return config
+
 
 class BasicSensorMixin:
     gateway_class = FleetGatewayHandler
 
-    def _get_occupied_pins(self):
-        return [self.component.config['pin']]
 
 
 class BinarySensor(FleeDeviceMixin, BasicSensorMixin, BaseBinarySensor):
     config_form = ColonelBinarySensorConfigForm
 
+    def _get_occupied_pins(self):
+        return [
+            self.component.config['pin_no'],
+        ]
+
 
 class BurglarSmokeDetector(BinarySensor):
     config_form = BurglarSmokeDetectorConfigForm
@@ -65,8 +86,8 @@ class BurglarSmokeDetector(BinarySensor):
 
     def _get_occupied_pins(self):
         return [
-            self.component.config['power_pin'],
-            self.component.config['sensor_pin']
+            self.component.config['power_pin_no'],
+            self.component.config['sensor_pin_no']
         ]
 
 
@@ -74,11 +95,21 @@ class AnalogSensor(FleeDeviceMixin, BasicSensorMixin, BaseNumericSensor):
     config_form = ColonelNumericSensorConfigForm
     name = "Analog sensor"
 
+    def _get_occupied_pins(self):
+        return [
+            self.component.config['pin_no'],
+        ]
+
 
 class DS18B20Sensor(FleeDeviceMixin, BasicSensorMixin, BaseNumericSensor):
     config_form = DS18B20SensorConfigForm
     name = "DS18B20 Temperature sensor"
 
+    def _get_occupied_pins(self):
+        return [
+            self.component.config['pin_no'],
+        ]
+
 
 class BaseClimateSensor(FleeDeviceMixin, BasicSensorMixin, BaseMultiSensor):
     app_widget = NumericSensorWidget
@@ -125,19 +156,30 @@ class DHTSensor(BaseClimateSensor):
     config_form = ColonelDHTSensorConfigForm
     name = "DHT climate sensor"
 
+    def _get_occupied_pins(self):
+        return [
+            self.component.config['pin_no'],
+        ]
+
 
 class BME680Sensor(BaseClimateSensor):
     config_form = BME680SensorConfigForm
     name = "BME680 Climate Sensor (I2C)"
 
 
+class MPC9808TempSensor(FleeDeviceMixin, BasicSensorMixin, BaseNumericSensor):
+    config_form = MPC9808SensorConfigForm
+    name = "MPC9808 Temperature Sensor (I2C)"
+
+
+
 class BasicOutputMixin:
     gateway_class = FleetGatewayHandler
 
     def _get_occupied_pins(self):
-        pins = [self.component.config['output_pin']]
+        pins = [self.component.config['output_pin_no']]
         for control_unit in self.component.config.get('controls', []):
-            pins.append(control_unit['pin'])
+            pins.append(control_unit['pin_no'])
         return pins
 
     def _send_to_device(self, value):
@@ -216,8 +258,8 @@ class DualMotorValve(FleeDeviceMixin, BasicOutputMixin, BaseSwitch):
 
     def _get_occupied_pins(self):
         return [
-            self.component.config['open_pin'],
-            self.component.config['close_pin']
+            self.component.config['open_pin_no'],
+            self.component.config['close_pin_no']
         ]
 
 
@@ -227,9 +269,150 @@ class Blinds(FleeDeviceMixin, BasicOutputMixin, GenericBlinds):
 
     def _get_occupied_pins(self):
         pins = [
-            self.component.config['open_pin'],
-            self.component.config['close_pin']
+            self.component.config['open_pin_no'],
+            self.component.config['close_pin_no']
         ]
         for p in self.component.config.get('controls', []):
             pins.append(p['pin'])
-        return pins
+        return pins
+
+
+class TTLock(FleeDeviceMixin, Lock):
+    gateway_class = FleetGatewayHandler
+    config_form = TTLockConfigForm
+    name = 'TTLock'
+    discovery_msg = _("Please activate your TTLock so it can be discovered.")
+
+    def _send_to_device(self, value):
+        GatewayObjectCommand(
+            self.component.gateway,
+            Colonel(id=self.component.config['colonel']),
+            set_val=value,
+            component_id=self.component.id,
+        ).publish()
+
+    @classmethod
+    def init_discovery(self, form_cleaned_data):
+        from simo.core.models import Gateway
+        print("Serialized form: ", serialize_form_data(form_cleaned_data))
+        gateway = Gateway.objects.filter(type=self.gateway_class.uid).first()
+        gateway.start_discovery(
+            self.uid, serialize_form_data(form_cleaned_data),
+            timeout=60
+        )
+        GatewayObjectCommand(
+            gateway, form_cleaned_data['colonel'],
+            command='discover-ttlock',
+        ).publish()
+
+    @classmethod
+    def _process_discovery(cls, started_with, data):
+        if data['discover-ttlock'] == 'fail':
+            if data['result'] == 1:
+                return {'error': 'TTLock not found.'}
+            elif data['result'] == 2:
+                return {'error': 'Error connecting to your TTLock.'}
+            elif data['result'] == 3:
+                return {
+                    'error': 'Unable to initialize your TTLock. '
+                             'Perform full reset. '
+                             'Allow the lock to rest for at least 2 min. '
+                             'Move your lock as close as possible to your SIMO.io Colonel. '
+                             'Retry!'
+                }
+            elif data['result'] == 4:
+                return {
+                    'error': 'BLE is available only on LAN connected colonels.'
+                }
+            elif data['result'] == 5:
+                return {
+                    'error': 'Single TTLock is alowed per Colonel.'
+                }
+            else:
+                return {'error': data['result']}
+
+        started_with = deserialize_form_data(started_with)
+        form = TTLockConfigForm(controller_uid=cls.uid, data=started_with)
+        if form.is_valid():
+            new_component = form.save()
+            new_component.config.update(data.get('result', {}).get('config'))
+            new_component.meta['finalization_data'] = {
+                'temp_id': data['result']['id'],
+                'permanent_id': new_component.id,
+                'config': {
+                    'type': cls.uid.split('.')[-1],
+                    'config': new_component.config,
+                    'val': False,
+                },
+            }
+            new_component.save()
+            GatewayObjectCommand(
+                new_component.gateway, Colonel(
+                    id=new_component.config['colonel']
+                ), command='finalize',
+                data=new_component.meta['finalization_data'],
+            ).publish()
+            return [new_component]
+
+        # Literally impossible, but just in case...
+        return {'error': 'INVALID INITIAL DISCOVERY FORM!'}
+
+
+    def add_code(self, code):
+        code = str(code)
+        assert 4 <= len(code) <= 8
+        for no in code:
+            try:
+                int(no)
+            except:
+                raise AssertionError("Digits only please!")
+        GatewayObjectCommand(
+            self.component.gateway,
+            Colonel(id=self.component.config['colonel']),
+            id=self.component.id,
+            command='call', method='add_code', args=[str(code)]
+        ).publish()
+
+    def delete_code(self, code):
+        GatewayObjectCommand(
+            self.component.gateway,
+            Colonel(id=self.component.config['colonel']),
+            id=self.component.id,
+            command='call', method='delete_code', args=[str(code)]
+        ).publish()
+
+    def get_codes(self):
+        GatewayObjectCommand(
+            self.component.gateway,
+            Colonel(id=self.component.config['colonel']),
+            id=self.component.id,
+            command='call', method='get_codes'
+        ).publish()
+
+
+    def add_fingerprint(self):
+        GatewayObjectCommand(
+            self.component.gateway,
+            Colonel(id=self.component.config['colonel']),
+            id=self.component.id,
+            command='call', method='add_fingerprint'
+        ).publish()
+
+    def delete_fingerprint(self, code):
+        GatewayObjectCommand(
+            self.component.gateway,
+            Colonel(id=self.component.config['colonel']),
+            id=self.component.id,
+            command='call', method='delete_fingerprint', args=[str(code)]
+        ).publish()
+
+    def get_fingerprints(self):
+        GatewayObjectCommand(
+            self.component.gateway,
+            Colonel(id=self.component.config['colonel']),
+            id=self.component.id,
+            command='call', method='get_fingerprints'
+        ).publish()
+
+
+