simo 2.5.3__py3-none-any.whl → 2.5.4__py3-none-any.whl

simo/core/app_widgets.py

@@ -104,4 +104,22 @@ class LockWidget(BaseAppWidget):
 class AirQualityWidget(BaseAppWidget):
     uid = 'air-quality'
     name = _("Air Quality")
-    size = [2, 2]
+    size = [2, 2]
+
+
+class GateWidget(BaseAppWidget):
+    uid = 'gate'
+    name = _('Gate')
+    size = [2, 1]
+
+
+class BlindsWidget(BaseAppWidget):
+    uid = 'blinds'
+    name = _('Blinds')
+    size = [4, 1]
+
+
+class SlidesWidget(BaseAppWidget):
+    uid = 'slides'
+    name = _('Slides')
+    size = [2, 1]

simo/core/base_types.py

@@ -18,4 +18,6 @@ BASE_TYPES = {
     'switch-quadruple': _("Switch Quadruple"),
     'switch-quintuple': _("Switch Quintuple"),
     'lock': _("Lock"),
+    'gate': _("Gate"),
+    'blinds': _("Blinds"),
 }

simo/core/controllers.py

@@ -777,10 +777,8 @@ class Switch(MultiSwitchBase, TimerMixin, OnOffPokerMixin):
         Gateway specific implementation is very welcome of this!
         '''
         self.turn_on()
-        def toggle_back():
-            time.sleep(0.5)
-            self.turn_off()
-        threading.Thread(target=toggle_back).start()
+        time.sleep(0.5)
+        self.turn_off()
 
 
 class DoubleSwitch(MultiSwitchBase):
@@ -899,3 +897,155 @@ class Lock(Switch):
             self.component.save(
                 update_fields=['change_init_by', 'change_init_date']
             )
+
+
+class Blinds(ControllerBase, TimerMixin):
+    name = _("Blind")
+    base_type = 'blinds'
+    admin_widget_template = 'admin/controller_widgets/blinds.html'
+    default_config = {}
+
+    @property
+    def app_widget(self):
+        if self.component.config.get('control_mode') == 'slide':
+            return SlidesWidget
+        else:
+            return BlindsWidget
+
+    @property
+    def default_value(self):
+        # target and current positions in milliseconds, angle in degrees (0 - 180)
+        return {'target': 0, 'position': 0, 'angle': 0}
+
+    def _validate_val(self, value, occasion=None):
+
+        if occasion == BEFORE_SEND:
+            if isinstance(value, int) or isinstance(value, float):
+                # legacy support
+                value = {'target': int(value)}
+            if 'target' not in value:
+                raise ValidationError("Target value is required!")
+            target = value.get('target')
+            if type(target) not in (float, int):
+                raise ValidationError(
+                    "Bad target position for blinds to go."
+                )
+            if target > self.component.config.get('open_duration') * 1000:
+                raise ValidationError(
+                    "Target value lower than %d expected, "
+                    "%d received instead" % (
+                        self.component.config['open_duration'] * 1000,
+                        target
+                    )
+                )
+            if 'angle' in value:
+                try:
+                    angle = int(value['angle'])
+                except:
+                    raise ValidationError(
+                        "Integer between 0 - 180 is required for blinds angle."
+                    )
+                if angle < 0 or angle > 180:
+                    raise ValidationError(
+                        "Integer between 0 - 180 is required for blinds angle."
+                    )
+            else:
+                value['angle'] = self.component.value.get('angle', 0)
+
+        elif occasion == BEFORE_SET:
+            if not isinstance(value, dict):
+                raise ValidationError("Dictionary is expected")
+            for key, val in value.items():
+                if key not in ('target', 'position', 'angle'):
+                    raise ValidationError(
+                        "'target', 'position' or 'angle' parameters are expected."
+                    )
+                if key == 'position':
+                    if val < 0:
+                        raise ValidationError(
+                            "Positive integer expected for blind position"
+                        )
+                    if val > self.component.config.get('open_duration') * 1000:
+                        raise ValidationError(
+                            "Positive value is to big. Must be lower than %d, "
+                            "but you have provided %d" % (
+                                self.component.config.get('open_duration') * 1000, val
+                            )
+                        )
+
+            self.component.refresh_from_db()
+            if 'target' not in value:
+                value['target'] = self.component.value.get('target')
+            if 'position' not in value:
+                value['position'] = self.component.value.get('position')
+            if 'angle' not in value:
+                value['angle'] = self.component.value.get('angle')
+
+        return value
+
+    def open(self):
+        send_val = {'target': 0}
+        angle = self.component.value.get('angle')
+        if angle is not None and 0 <= angle <= 180:
+            send_val['angle'] = angle
+        self.send(send_val)
+
+    def close(self):
+        send_val = {'target': self.component.config['open_duration'] * 1000}
+        angle = self.component.value.get('angle')
+        if angle is not None and 0 <= angle <= 180:
+            send_val['angle'] = angle
+        self.send(send_val)
+
+    def stop(self):
+        send_val = {'target': -1}
+        angle = self.component.value.get('angle')
+        if angle is not None and 0 <= angle <= 180:
+            send_val['angle'] = angle
+        self.send(send_val)
+
+
+class Gate(ControllerBase, TimerMixin):
+    name = _("Gate")
+    base_type = 'gate'
+    app_widget = GateWidget
+    admin_widget_template = 'admin/controller_widgets/gate.html'
+    default_config = {}
+
+    @property
+    def default_value(self):
+        return 'closed'
+
+    def _validate_val(self, value, occasion=None):
+        if occasion == BEFORE_SEND:
+            if self.component.config.get('action_method') == 'click':
+                if value != 'call':
+                    raise ValidationError(
+                        'Gate component understands only one command: '
+                        '"call". You have provided: "%s"' % (str(value))
+                    )
+            else:
+                if value not in ('call', 'open', 'close'):
+                    raise ValidationError(
+                        'This gate component understands only 3 commands: '
+                        '"open", "close" and "call". You have provided: "%s"' %
+                        (str(value))
+                    )
+        elif occasion == BEFORE_SET and value not in (
+            'closed', 'open', 'open_moving', 'closed_moving'
+        ):
+            raise ValidationError(
+                'Gate component can only be in 4 states:  '
+                '"closed", "closed", "open_moving", "closed_moving". '
+                'You have provided: "%s"' % (str(value))
+            )
+        return value
+
+    def open(self):
+        self.send('open')
+
+    def close(self):
+        self.send('close')
+
+    def call(self):
+        self.send('call')

simo/core/management/_hub_template/hub/supervisor.conf

@@ -27,6 +27,8 @@ stdout_logfile_backups=3
 redirect_stderr=true
 autostart=true
 autorestart=true
+stopasgroup=true
+killasgroup=true
 
 
 [program:simo-gateways]
@@ -41,6 +43,8 @@ stdout_logfile_backups=3
 redirect_stderr=true
 autostart=true
 autorestart=true
+stopasgroup=true
+killasgroup=true
 
 [program:simo-celery-beat]
 directory={{ project_dir }}/hub/

simo/core/signal_receivers.py

@@ -26,10 +26,12 @@ def create_instance_defaults(sender, instance, created, **kwargs):
     # Create default zones
 
     for zone_name in (
-        'Living Room', 'Kitchen', 'Bathroom', 'Porch', 'Garage', 'Yard', 'Other'
+        'Living Room', 'Kitchen', 'Bathroom', 'Porch', 'Garage', 'Yard',
     ):
         Zone.objects.create(instance=instance, name=zone_name)
 
+    other_zone = Zone.objects.create(instance=instance, name='Other')
+
     core_dir_path = os.path.dirname(os.path.realpath(__file__))
     imgs_folder = os.path.join(
         core_dir_path, 'static/defaults/category_headers'
@@ -40,7 +42,7 @@ def create_instance_defaults(sender, instance, created, **kwargs):
         os.makedirs(categories_media_dir)
 
     # Create default categories
-
+    climate_category = None
     for i, data in enumerate([
         ("All", 'star'), ("Climate", 'temperature-half'),
         ("Lights", 'lightbulb'), ("Security", 'eye'),
@@ -52,13 +54,15 @@ def create_instance_defaults(sender, instance, created, **kwargs):
                 settings.MEDIA_ROOT, 'categories', "%s.jpg" % data[0].lower()
             )
         )
-        Category.objects.create(
+        cat = Category.objects.create(
             instance=instance,
             name=data[0], icon=Icon.objects.get(slug=data[1]),
             all=i == 0, header_image=os.path.join(
                 'categories', "%s.jpg" % data[0].lower()
             ), order=i + 10
         )
+        if cat.name == 'Climate':
+            climate_category = cat
 
     # Create generic gateway and components
 
@@ -71,8 +75,7 @@ def create_instance_defaults(sender, instance, created, **kwargs):
     )
     dummy.start()
     weather_icon = Icon.objects.get(slug='cloud-bolt-sun')
-    other_zone = Zone.objects.get(name='Other', instance=instance)
-    climate_category = Category.objects.get(name='Climate', instance=instance)
+
     Component.objects.create(
         name='Weather', icon=weather_icon,
         zone=other_zone,

simo/core/tasks.py

@@ -143,7 +143,7 @@ def sync_with_remote():
 
         for user in User.objects.filter(
             Q(roles__instance=instance) | Q(is_master=True)
-        ).exclude(email__in=('system@simo.io', 'device@simo.io')):
+        ).exclude(email__in=('system@simo.io', 'device@simo.io')).distinct():
             is_superuser = False
             user_role = user.get_role(instance)
             if user_role and user_role.is_superuser:

simo/fleet/controllers.py

@@ -8,7 +8,8 @@ from simo.core.controllers import (
     Button as BaseButton,
     NumericSensor as BaseNumericSensor,
     Switch as BaseSwitch, Dimmer as BaseDimmer,
-    MultiSensor as BaseMultiSensor, RGBWLight as BaseRGBWLight
+    MultiSensor as BaseMultiSensor, RGBWLight as BaseRGBWLight,
+    Blinds as BaseBlinds, Gate as BaseGate
 )
 from simo.core.app_widgets import NumericSensorWidget, AirQualityWidget
 from simo.core.controllers import Lock, ControllerBase, SingleSwitchWidget
@@ -16,8 +17,7 @@ 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, ColonelPin
+from .models import Colonel
 from .gateways import FleetGatewayHandler
 from .forms import (
     ColonelPinChoiceField,
@@ -26,7 +26,8 @@ from .forms import (
     ColonelNumericSensorConfigForm, ColonelRGBLightConfigForm,
     ColonelDHTSensorConfigForm, DS18B20SensorConfigForm,
     BME680SensorConfigForm, MPC9808SensorConfigForm, ENS160SensorConfigForm,
-    DualMotorValveForm, BlindsConfigForm, BurglarSmokeDetectorConfigForm,
+    DualMotorValveForm, BlindsConfigForm, GateConfigForm,
+    BurglarSmokeDetectorConfigForm,
     TTLockConfigForm, DALIDeviceConfigForm, DaliLampForm, DaliGearGroupForm,
     DaliSwitchConfigForm,
     DaliOccupancySensorConfigForm, DALILightSensorConfigForm,
@@ -71,9 +72,6 @@ class FleeDeviceMixin:
                 config[key] = val
         return config
 
-    def _fix_pin_relations(self):
-        pass
-
 
 class BasicSensorMixin:
     gateway_class = FleetGatewayHandler
@@ -83,21 +81,6 @@ class BasicSensorMixin:
             self.component.config['pin_no'],
         ]
 
-    @atomic
-    def _fix_pin_relations(self):
-        colonel = Colonel.objects.filter(
-            id=self.component.config.get('colonel', 0)
-        ).first()
-        if not colonel:
-            return
-        cp = ColonelPin.objects.filter(
-            colonel=colonel, no=self.component.config['pin_no']
-        ).first()
-        if self.component.config.get('pin') != cp.id:
-            self.component.config['pin'] = cp.id
-            self.component.save()
-
-
 class BinarySensor(FleeDeviceMixin, BasicSensorMixin, BaseBinarySensor):
     config_form = ColonelBinarySensorConfigForm
 
@@ -116,26 +99,6 @@ class BurglarSmokeDetector(BinarySensor):
             self.component.config['sensor_pin_no']
         ]
 
-    @atomic
-    def _fix_pin_relations(self):
-        colonel = Colonel.objects.filter(
-            id=self.component.config.get('colonel', 0)
-        ).first()
-        if not colonel:
-            return
-        cp = ColonelPin.objects.filter(
-            colonel=colonel, no=self.component.config['power_pin_no']
-        ).first()
-        if self.component.config.get('power_pin') != cp.id:
-            self.component.config['power_pin'] = cp.id
-            self.component.save()
-        cp = ColonelPin.objects.filter(
-            colonel=colonel, no=self.component.config['sensor_pin_no']
-        ).first()
-        if self.component.config.get('sensor_pin') != cp.id:
-            self.component.config['sensor_pin'] = cp.id
-            self.component.save()
-
 
 # class AnalogSensor(FleeDeviceMixin, BasicSensorMixin, BaseNumericSensor):
 #     config_form = ColonelNumericSensorConfigForm
@@ -281,34 +244,6 @@ class BasicOutputMixin:
                 pins.append(ctrl['pin_no'])
         return pins
 
-    @atomic
-    def _fix_pin_relations(self):
-        colonel = Colonel.objects.filter(
-            id=self.component.config.get('colonel', 0)
-        ).first()
-        if not colonel:
-            return
-        cp = ColonelPin.objects.filter(
-            colonel=colonel, no=self.component.config['output_pin_no']
-        ).first()
-        if self.component.config.get('output_pin') != cp.id:
-            self.component.config['output_pin'] = cp.id
-
-        for ctrl in self.component.config.get('controls', []):
-            if 'pin_no' not in ctrl:
-                continue
-            if not ctrl.get('input').startswith('pin-'):
-                continue
-            cp = ColonelPin.objects.filter(
-                colonel=colonel, no=ctrl['pin_no']
-            ).first()
-            if not cp:
-                continue
-            ctrl['input'] = f'pin-{cp.id}'
-
-        self.component.save()
-
-
     def _ctrl(self, ctrl_no, ctrl_event, method):
         GatewayObjectCommand(
             self.component.gateway,
@@ -485,26 +420,6 @@ class DualMotorValve(FleeDeviceMixin, BasicOutputMixin, BaseDimmer):
             self.component.config['close_pin_no']
         ]
 
-    @atomic
-    def _fix_pin_relations(self):
-        colonel = Colonel.objects.filter(
-            id=self.component.config.get('colonel', 0)
-        ).first()
-        if not colonel:
-            return
-        cp = ColonelPin.objects.filter(
-            colonel=colonel, no=self.component.config['open_pin_no']
-        ).first()
-        if self.component.config.get('open_pin') != cp.id:
-            self.component.config['open_pin'] = cp.id
-        cp = ColonelPin.objects.filter(
-            colonel=colonel, no=self.component.config['close_pin_no']
-        ).first()
-        if self.component.config.get('close_pin') != cp.id:
-            self.component.config['close_pin'] = cp.id
-
-        self.component.save()
-
     def _prepare_for_send(self, value):
         conf = self.component.config
         if value >= conf.get('max', 100):
@@ -525,7 +440,7 @@ class DualMotorValve(FleeDeviceMixin, BasicOutputMixin, BaseDimmer):
         return conf.get('min', 0) + (value / 100) * val_amplitude
 
 
-class Blinds(FleeDeviceMixin, BasicOutputMixin, GenericBlinds):
+class Blinds(FleeDeviceMixin, BasicOutputMixin, BaseBlinds):
     gateway_class = FleetGatewayHandler
     config_form = BlindsConfigForm
 
@@ -539,35 +454,21 @@ class Blinds(FleeDeviceMixin, BasicOutputMixin, GenericBlinds):
                 pins.append(ctrl['pin_no'])
         return pins
 
-    @atomic
-    def _fix_pin_relations(self):
-        colonel = Colonel.objects.filter(
-            id=self.component.config.get('colonel', 0)
-        ).first()
-        if not colonel:
-            return
-        cp = ColonelPin.objects.filter(
-            colonel=colonel, no=self.component.config['open_pin_no']
-        ).first()
-        if self.component.config.get('open_pin') != cp.id:
-            self.component.config['open_pin'] = cp.id
-        cp = ColonelPin.objects.filter(
-            colonel=colonel, no=self.component.config['close_pin_no']
-        ).first()
-        if self.component.config.get('close_pin') != cp.id:
-            self.component.config['close_pin'] = cp.id
+
+class Gate(FleeDeviceMixin, BasicOutputMixin, BaseGate):
+    gateway_class = FleetGatewayHandler
+    config_form = GateConfigForm
+
+    def _get_occupied_pins(self):
+        pins = [
+            self.component.config['control_pin_no'],
+            self.component.config['sensor_pin_no']
+        ]
         for ctrl in self.component.config.get('controls', []):
-            if 'pin_no' not in ctrl:
-                continue
-            if not ctrl.get('input').startswith('pin-'):
-                continue
-            cp = ColonelPin.objects.filter(
-                colonel=colonel, no=ctrl['pin_no']
-            ).first()
-            if not cp:
-                continue
-            ctrl['input'] = f'pin-{cp.id}'
-        self.component.save()
+            if 'pin_no' in ctrl:
+                pins.append(ctrl['pin_no'])
+        return pins
+
 
 
 class TTLock(FleeDeviceMixin, Lock):

simo/fleet/forms.py

@@ -1256,6 +1256,107 @@ class BlindsConfigForm(ColonelComponentForm):
         return obj
 
 
+class GateConfigForm(ColonelComponentForm):
+    control_pin = Select2ModelChoiceField(
+        label="Control Relay Port",
+        queryset=ColonelPin.objects.filter(output=True),
+        url='autocomplete-colonel-pins',
+        forward=[
+            forward.Self(),
+            forward.Field('colonel'),
+            forward.Const({'output': True}, 'filters')
+        ]
+    )
+    open_action = forms.ChoiceField(
+        choices=(('HIGH', "HIGH"), ('LOW', "LOW")), initial='HIGH'
+    )
+    control_method = forms.ChoiceField(
+        choices=(('pulse', "Pulse"), ('hold', "Hold")), initial="pulse",
+        help_text="What your gate motor expects to receive as control command?"
+    )
+    sensor_pin = Select2ModelChoiceField(
+        label='Gate open/closed sensor port',
+        queryset=ColonelPin.objects.filter(input=True),
+        url='autocomplete-colonel-pins',
+        forward=[
+            forward.Self(),
+            forward.Field('colonel'),
+            forward.Const({'input': True}, 'filters')
+        ]
+    )
+    closed_value = forms.ChoiceField(
+        label='Gate closed value',
+        choices=(("LOW", "LOW"), ('HIGH', "HIGH")), initial="LOW",
+        help_text="What is the input sensor value, "
+                  "when your gate is in closed position?"
+    )
+    open_duration = forms.FloatField(
+        initial=30, min_value=1, max_value=600,
+        help_text="How much time in seconds does it take for your gate "
+                  "to go from fully closed to fully open?"
+    )
+
+    controls = FormsetField(
+        formset_factory(
+            ControlForm, can_delete=True, can_order=True, extra=0, max_num=2
+        )
+    )
+
+    def clean(self):
+        super().clean()
+
+        if self.cleaned_data.get('control_pin') \
+        and self.cleaned_data.get('sensor_pin') \
+        and self.cleaned_data['control_pin'] == self.cleaned_data['sensor_pin']:
+            self.add_error(
+                'sensor_pin', "Can't be the same as control port!"
+            )
+
+        if self.cleaned_data.get('control_pin'):
+            self._clean_pin('control_pin')
+        if self.cleaned_data.get('sensor_pin'):
+            self._clean_pin('sensor_pin')
+
+        if 'controls' in self.cleaned_data:
+
+            self._clean_controls()
+
+            if self.cleaned_data.get('control_pin') and self.cleaned_data.get('controls'):
+                for ctrl in self.cleaned_data['controls']:
+                    if not ctrl['input'].startswith('pin'):
+                        continue
+                    if int(ctrl['input'][4:]) == self.cleaned_data['control_pin'].id:
+                        self.add_error(
+                            "control_pin",
+                            "Can't be used as control pin at the same time!"
+                        )
+
+            if self.cleaned_data.get('sensor_pin') and self.cleaned_data.get('controls'):
+                for ctrl in self.cleaned_data['controls']:
+                    if not ctrl['input'].startswith('pin'):
+                        continue
+                    if int(ctrl['input'][4:]) == self.cleaned_data['sensor_pin'].id:
+                        self.add_error(
+                            "sensor_pin",
+                            "Can't be used as control pin at the same time!"
+                        )
+        return self.cleaned_data
+
+    def save(self, commit=True):
+        if 'control_pin' in self.cleaned_data:
+            self.instance.config['control_pin_no'] = \
+                self.cleaned_data['control_pin'].no
+        if 'sensor_pin' in self.cleaned_data:
+            self.instance.config['sensor_pin_no'] = \
+                self.cleaned_data['sensor_pin'].no
+        obj = super().save(commit=commit)
+        if commit and self.cleaned_data.get('controls'):
+            GatewayObjectCommand(
+                self.instance.gateway, obj, command='watch_buttons'
+            ).publish()
+        return obj
+
+
 class BurglarSmokeDetectorConfigForm(ColonelComponentForm):
     power_pin = Select2ModelChoiceField(
         label="Power port",

simo/generic/app_widgets.py

@@ -38,24 +38,6 @@ class WeatherForecastWidget(BaseAppWidget):
     size = [4, 2]
 
 
-class GateWidget(BaseAppWidget):
-    uid = 'gate'
-    name = _('Gate')
-    size = [2, 1]
-
-
-class BlindsWidget(BaseAppWidget):
-    uid = 'blinds'
-    name = _('Blinds')
-    size = [4, 1]
-
-
-class SlidesWidget(BaseAppWidget):
-    uid = 'slides'
-    name = _('Slides')
-    size = [2, 1]
-
-
 class WateringWidget(BaseAppWidget):
     uid = 'watering'
     name = _('Watering')

simo/generic/base_types.py

@@ -6,8 +6,6 @@ BASE_TYPES = {
     'alarm-group': _("Alarm Group"),
     'ip-camera': _("IP Camera"),
     'weather-forecast': _("Weather Forecast"),
-    'gate': _("Gate"),
-    'blinds': _("Blinds"),
     'watering': _("Watering"),
     'state-select': _("State Select"),
     'alarm-clock': _("Alarm Clock"),