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

simo/generic/controllers.py

@@ -63,7 +63,7 @@ class Script(ControllerBase, TimerMixin):
                 )
         return value
 
-    def _send_to_device(self, value):
+    def _prepare_for_send(self, value):
         if value == 'start':
             new_code = getattr(self.component, 'new_code', None)
             if new_code:
@@ -71,7 +71,7 @@ class Script(ControllerBase, TimerMixin):
                 self.component.refresh_from_db()
                 self.component.config['code'] = new_code
                 self.component.save(update_fields=['config'])
-        return super()._send_to_device(value)
+        return value
 
     def _val_to_success(self, value):
         if value == 'start':
@@ -208,9 +208,13 @@ class Thermostat(ControllerBase):
         heater = Component.objects.filter(
             pk=self.component.config.get('heater')
         ).first()
+        if heater:
+            heater.prepare_controller()
         cooler = Component.objects.filter(
             pk=self.component.config.get('cooler')
         ).first()
+        if cooler:
+            cooler.prepare_controller()
 
         if not temperature_sensor or not temperature_sensor.alive:
             print(f"No temperature sensor on {self.component}!")
@@ -322,47 +326,6 @@ class AlarmGroup(ControllerBase):
                 )
         return value
 
-    def _send_to_device(self, value):
-        assert value in ('armed', 'disarmed')
-
-        other_alarm_groups = {}
-        stats = {
-            'disarmed': 0, 'pending-arm': 0, 'armed': 0, 'breached': 0
-        }
-
-        for c_id in self.component.config['components']:
-            slave = Component.objects.filter(pk=c_id).first()
-            if not slave:
-                continue
-            if value == 'armed':
-                if not slave.is_in_alarm():
-                    slave.arm_status = 'armed'
-                    stats['armed'] += 1
-                else:
-                    slave.arm_status = 'pending-arm'
-                    stats['pending-arm'] += 1
-            elif value == 'disarmed':
-                stats['disarmed'] += 1
-                slave.arm_status = 'disarmed'
-
-            slave.do_not_update_alarm_group = True
-            slave.save(update_fields=['arm_status'])
-
-            for other_group in Component.objects.filter(
-                controller_uid=AlarmGroup.uid,
-                config__components__contains=slave.id
-            ).exclude(pk=self.component.pk):
-                other_alarm_groups[other_group.pk] = other_group
-
-        self.component.value = value
-        if stats['pending-arm']:
-            self.component.value = 'pending-arm'
-        self.component.config['stats'] = stats
-        self.component.save()
-
-        for pk, other_group in other_alarm_groups.items():
-            other_group.refresh_status()
-
     def arm(self):
         self.send('armed')
 
@@ -375,7 +338,6 @@ class AlarmGroup(ControllerBase):
         )
 
     def refresh_status(self):
-
         stats = {
             'disarmed': 0, 'pending-arm': 0, 'armed': 0, 'breached': 0
         }
@@ -515,21 +477,6 @@ class Gate(ControllerBase, TimerMixin):
             self.component.set(self.component.value + '_moving')
         threading.Thread(target=cancel_move, daemon=True).start()
 
-    def _send_to_device(self, value):
-        switch = Component.objects.filter(
-            pk=self.component.config.get('action_switch')
-        ).first()
-        if not switch:
-            return
-
-        if self.component.config.get('action_method') == 'click':
-            switch.click()
-        else:
-            if value == 'open':
-                switch.turn_on()
-            else:
-                switch.turn_off()
-
     def open(self):
         self.send('open')
 
@@ -662,9 +609,6 @@ class Blinds(ControllerBase, TimerMixin):
 
         return value
 
-    def _send_to_device(self, value):
-        GatewayObjectCommand(self.component, **{'set_val': value}).publish()
-
     def open(self):
         self.send(0)
 
@@ -776,6 +720,7 @@ class Watering(ControllerBase):
                 switch = Component.objects.get(pk=contour_data['switch'])
             except Component.DoesNotExist:
                 continue
+            switch.prepare_controller()
             if run:
                 if switch.timer_engaged():
                     switch.stop_timer()
@@ -900,6 +845,7 @@ class Watering(ControllerBase):
                 switch = Component.objects.get(pk=contour_data['switch'])
             except Component.DoesNotExist:
                 continue
+            switch.prepare_controller()
             if switch.timer_engaged():
                 switch.stop_timer()
             switch.turn_off()
@@ -1131,6 +1077,7 @@ class AlarmClock(ControllerBase):
             print(f"Reverse event {event['uid']}!")
         comp = Component.objects.filter(id=event['component']).first()
         if comp:
+            comp.prepare_controller()
             if forward:
                 action_name = 'play_action'
             else:
@@ -1370,7 +1317,8 @@ class AlarmClock(ControllerBase):
         return current_value
 
 
-    # ----------- Dummy controllers -----------------------------
+# ----------- Dummy controllers -----------------------------
+
 class StateSelect(ControllerBase):
     gateway_class = DummyGatewayHandler
     name = _("State select")
@@ -1387,9 +1335,6 @@ class StateSelect(ControllerBase):
             raise ValidationError("Unsupported value!")
         return value
 
-    def _send_to_device(self, value):
-        self.component.set(value)
-
 
 class DummyBinarySensor(BinarySensor):
     gateway_class = DummyGatewayHandler
@@ -1406,56 +1351,35 @@ class DummyMultiSensor(MultiSensor):
 class DummySwitch(Switch):
     gateway_class = DummyGatewayHandler
 
-    def _send_to_device(self, value):
-        self.component.set(value)
-
 
 class DummyDoubleSwitch(DoubleSwitch):
     gateway_class = DummyGatewayHandler
 
-    def _send_to_device(self, value):
-        self.component.set(value)
-
 
 class DummyTripleSwitch(TripleSwitch):
     gateway_class = DummyGatewayHandler
 
-    def _send_to_device(self, value):
-        self.component.set(value)
-
 
 class DummyQuadrupleSwitch(QuadrupleSwitch):
     gateway_class = DummyGatewayHandler
 
-    def _send_to_device(self, value):
-        self.component.set(value)
-
 
 class DummyQuintupleSwitch(QuintupleSwitch):
     gateway_class = DummyGatewayHandler
 
-    def _send_to_device(self, value):
-        self.component.set(value)
-
 
 class DummyDimmer(Dimmer):
     gateway_class = DummyGatewayHandler
 
-    def _send_to_device(self, value):
+    def _prepare_for_send(self, value):
         if self.component.config.get('inverse'):
             value = self.component.config.get('max') - value
-        self.component.set(value)
+        return value
 
 
 class DummyDimmerPlus(DimmerPlus):
     gateway_class = DummyGatewayHandler
 
-    def _send_to_device(self, value):
-        self.component.set(value)
-
 
 class DummyRGBWLight(RGBWLight):
     gateway_class = DummyGatewayHandler
-
-    def _send_to_device(self, value):
-        self.component.set(value)

simo/generic/forms.py

@@ -14,18 +14,14 @@ from dal import autocomplete, forward
 from simo.core.utils.config_values import config_to_dict
 from simo.core.utils.formsets import FormsetField
 from simo.core.utils.helpers import get_random_string
-from simo.core.utils.form_fields import AutocompleteSelect2
+from simo.core.utils.form_fields import ListSelect2Widget
 from simo.conf import dynamic_settings
 
 
 class ScriptConfigForm(BaseComponentForm):
     autostart = forms.BooleanField(
         initial=True, required=False,
-        help_text="Auto start my script on system boot."
-    )
-    autorestart = forms.BooleanField(
-        initial=True, required=False,
-        help_text="Wake my script up automatically if it encounters error."
+        help_text="Wake up every 60 s if not running."
     )
     code = forms.CharField(widget=PythonCode)
     log = forms.CharField(
@@ -49,7 +45,7 @@ class ScriptConfigForm(BaseComponentForm):
     def get_admin_fieldsets(cls, request, obj=None):
         base_fields = (
             'id', 'gateway', 'base_type', 'name', 'icon', 'zone', 'category',
-            'tags', 'show_in_app', 'autostart', 'autorestart',
+            'show_in_app', 'autostart',
             'code', 'control', 'log'
         )
 
@@ -200,6 +196,7 @@ class AlarmGroupConfigForm(BaseComponentForm):
                     "Can not cover self. Please remove - [%s]" % str(check_cmp)
                 )
             if comp.base_type == 'alarm-group':
+                comp.prepare_controller()
                 self.recurse_check_alarm_groups(
                     comp.get_children(), check_cmp
                 )
@@ -224,6 +221,7 @@ class AlarmGroupConfigForm(BaseComponentForm):
                 c.save(update_fields=('config',))
         if obj.id:
             comp = Component.objects.get(id=obj.id)
+            comp.prepare_controller()
             comp.refresh_status()
         return obj
 
@@ -444,21 +442,29 @@ class WateringConfigForm(BaseComponentForm):
         )
         obj = super().save(commit=commit)
         if commit:
-            obj.subcomponents.clear()
+            obj.slaves.clear()
             for contour in self.cleaned_data['contours']:
-                obj.subcomponents.add(
+                obj.slaves.add(
                     Component.objects.get(pk=contour['switch'])
                 )
         return obj
 
 
 class StateForm(forms.Form):
-    icon = AutocompleteSelect2(url='autocomplete-icon')
+    icon = forms.CharField(
+        widget=ListSelect2Widget(
+            url='autocomplete-icon', attrs={'data-html': True}
+        )
+    )
     slug = forms.SlugField(required=True)
     name = forms.CharField(required=True)
     help_text = forms.CharField(required=False, widget=forms.Textarea(attrs={'rows': 3}))
     prefix = 'states'
 
+    def clean(self):
+        print("Let's clean the data! ", self.cleaned_data)
+        return self.cleaned_data
+
 
 class StateSelectForm(BaseComponentForm):
     states = FormsetField(
@@ -497,20 +503,21 @@ class AlarmClockEventForm(forms.Form):
     def clean(self):
         if not self.cleaned_data.get('component'):
             return self.cleaned_data
-        if not self.cleaned_data.get('play_method'):
+        if not self.cleaned_data.get('play_action'):
             return self.cleaned_data
         component = self.cleaned_data.get('component')
-        if not hasattr(component, self.cleaned_data['play_method']):
+        component.prepare_controller()
+        if not hasattr(component, self.cleaned_data['play_action']):
             self.add_error(
-                'play_method',
-                f"{component} has no {self.cleaned_data['play_method']} method!"
+                'play_action',
+                f"{component} has no {self.cleaned_data['play_action']} action!"
             )
-        if self.cleaned_data.get('reverse_method'):
-            if not hasattr(component, self.cleaned_data['reverse_method']):
+        if self.cleaned_data.get('reverse_action'):
+            if not hasattr(component, self.cleaned_data['reverse_action']):
                 self.add_error(
-                    'reverse_method',
+                    'reverse_action',
                     f"{component} has no "
-                    f"{self.cleaned_data['reverse_method']} method!"
+                    f"{self.cleaned_data['reverse_action']} action!"
                 )
         return self.cleaned_data
 
@@ -525,16 +532,16 @@ class AlarmClockConfigForm(BaseComponentForm):
     def clean_default_events(self):
         events = self.cleaned_data['default_events']
         for i, cont in enumerate(events):
-            if not cont['uid']:
+            if not cont.get('uid'):
                 cont['uid'] = get_random_string(6)
         return events
 
     def save(self, commit=True):
         obj = super().save(commit=commit)
         if commit:
-            obj.subcomponents.clear()
+            obj.slaves.clear()
             for comp in self.cleaned_data['default_events']:
-                obj.subcomponents.add(
-                    Component.objects.get(pk=comp['component'])
-                )
+                c = Component.objects.filter(pk=comp['component']).first()
+                if c:
+                    obj.slaves.add(c)
         return obj

simo/generic/gateways.py

@@ -1,16 +1,14 @@
 import sys
-import cv2
 import logging
-import base64
 import pytz
-from logging.handlers import RotatingFileHandler
 import json
 import time
 import multiprocessing
 import threading
 from django.conf import settings
 from django.utils import timezone
-from django.db import close_old_connections, connection as db_connection
+from django.db import connection as db_connection
+from django.db.models import Q
 import paho.mqtt.client as mqtt
 from simo.core.models import Component
 from simo.core.gateways import BaseObjectCommandsGatewayHandler
@@ -21,9 +19,6 @@ from simo.core.loggers import get_gw_logger, get_component_logger
 
 
 
-
-
-
 class BlindsRunner(threading.Thread):
 
     def __init__(self, blinds, *args, **kwargs):
@@ -168,7 +163,9 @@ class GenericGatewayHandler(BaseObjectCommandsGatewayHandler):
     blinds_runners = {}
     periodic_tasks = (
         ('watch_thermostats', 60),
-        ('watch_alarm_clocks', 30)
+        ('watch_alarm_clocks', 30),
+        ('watch_scripts', 60),
+        ('watch_watering', 60)
     )
 
     def watch_thermostats(self):
@@ -178,6 +175,7 @@ class GenericGatewayHandler(BaseObjectCommandsGatewayHandler):
         ):
             tz = pytz.timezone(thermostat.zone.instance.timezone)
             timezone.activate(tz)
+            thermostat.prepare_controller()
             thermostat.evaluate()
 
     def watch_alarm_clocks(self):
@@ -187,14 +185,37 @@ class GenericGatewayHandler(BaseObjectCommandsGatewayHandler):
         ):
             tz = pytz.timezone(alarm_clock.zone.instance.timezone)
             timezone.activate(tz)
+            alarm_clock.prepare_controller()
             alarm_clock.tick()
 
+    def watch_scripts(self):
+        from simo.generic.controllers import Script
+        for script in Component.objects.filter(
+            controller_uid=Script.uid,
+            config__autostart=True
+        ).exclude(value='running'):
+            script.prepare_controller()
+            self.start_script(script)
+
+    def watch_watering(self):
+        from .controllers import Watering
+        for watering in Component.objects.filter(controller_uid=Watering.uid):
+            tz = pytz.timezone(watering.zone.instance.timezone)
+            timezone.activate(tz)
+            watering.prepare_controller()
+            if watering.value['status'] == 'running_program':
+                watering.set_program_progress(
+                    watering.value['program_progress'] + 1
+                )
+            else:
+                watering.controller._perform_schedule()
+
     def run(self, exit):
         self.exit = exit
         self.logger = get_gw_logger(self.gateway_instance.id)
         for task, period in self.periodic_tasks:
             threading.Thread(
-                target=self._run_periodic_task, args=(task, period), daemon=True
+                target=self._run_periodic_task, args=(exit, task, period), daemon=True
             ).start()
 
         from simo.generic.controllers import Script, IPCamera
@@ -244,7 +265,7 @@ class GenericGatewayHandler(BaseObjectCommandsGatewayHandler):
         mqtt_client.subscribe(command.get_topic())
 
     def on_mqtt_message(self, client, userdata, msg):
-        from simo.generic.controllers import Script, Blinds
+        from simo.generic.controllers import Script, Blinds, AlarmGroup, Gate
         payload = json.loads(msg.payload)
         component = get_event_obj(payload, Component)
         if not component:
@@ -258,6 +279,10 @@ class GenericGatewayHandler(BaseObjectCommandsGatewayHandler):
             return
         elif component.controller_uid == Blinds.uid:
             self.control_blinds(component, payload.get('set_val'))
+        elif component.controller_uid == AlarmGroup.uid:
+            self.control_alarm_group(component, payload.get('set_val'))
+        elif component.controller_uid == Gate:
+            self.control_gate(component, payload.get('set_val'))
 
     def start_script(self, component):
         print("START SCRIPT %s" % str(component))
@@ -308,9 +333,11 @@ class GenericGatewayHandler(BaseObjectCommandsGatewayHandler):
             open_switch = Component.objects.get(
                 pk=blinds.config['open_switch']
             )
+            open_switch.prepare_controller()
             close_switch = Component.objects.get(
                 pk=blinds.config['close_switch']
             )
+            close_switch.prepare_controller()
         except:
             return
 
@@ -340,9 +367,70 @@ class GenericGatewayHandler(BaseObjectCommandsGatewayHandler):
 
                 self.blinds_runners[blinds.id].start()
 
+    def control_alarm_group(self, alarm_group, value):
+        from simo.generic.controllers import AlarmGroup
+
+        other_alarm_groups = {}
+        stats = {
+            'disarmed': 0, 'pending-arm': 0, 'armed': 0, 'breached': 0
+        }
+
+        for c_id in alarm_group.config['components']:
+            slave = Component.objects.filter(pk=c_id).first()
+            if not slave:
+                continue
+            if value == 'armed':
+                if not slave.is_in_alarm():
+                    slave.arm_status = 'armed'
+                    stats['armed'] += 1
+                else:
+                    slave.arm_status = 'pending-arm'
+                    stats['pending-arm'] += 1
+            elif value == 'disarmed':
+                stats['disarmed'] += 1
+                slave.arm_status = 'disarmed'
+
+            slave.do_not_update_alarm_group = True
+            slave.save(update_fields=['arm_status'])
+
+            for other_group in Component.objects.filter(
+                controller_uid=AlarmGroup.uid,
+                config__components__contains=slave.id
+            ).exclude(pk=alarm_group.pk):
+                other_alarm_groups[other_group.pk] = other_group
+
+        alarm_group.value = value
+        if stats['pending-arm']:
+            alarm_group.value = 'pending-arm'
+        alarm_group.config['stats'] = stats
+        alarm_group.save()
+
+        for pk, other_group in other_alarm_groups.items():
+            other_group.prepare_controller()
+            other_group.refresh_status()
+
+
+    def control_gate(self, gate, value):
+        switch = Component.objects.filter(
+            pk=gate.config.get('action_switch')
+        ).first()
+        if not switch:
+            return
+        switch.prepare_controller()
 
+        if gate.config.get('action_method') == 'click':
+            switch.click()
+        else:
+            if value == 'open':
+                switch.turn_on()
+            else:
+                switch.turn_off()
 
 
 class DummyGatewayHandler(BaseObjectCommandsGatewayHandler):
     name = "Dummy"
     config_form = BaseGatewayForm
+
+    def perform_value_send(self, component, value):
+        component.controller.set(value)
+

simo/generic/models.py

@@ -63,9 +63,9 @@ def handle_alarm_groups(sender, instance, *args, **kwargs):
         alarm_group.set(alarm_group_value)
 
 
-@receiver(pre_save, sender=Component)
-def set_initial_alarm_group_stats(sender, instance, *args, **kwargs):
-    if instance.pk:
+@receiver(post_save, sender=Component)
+def set_initial_alarm_group_stats(sender, instance, created, *args, **kwargs):
+    if not created:
         return
     if instance.controller_uid != AlarmGroup.uid:
         return

simo/multimedia/controllers.py

@@ -1,11 +1,11 @@
 from django.utils.translation import gettext_lazy as _
 from django.core.exceptions import ValidationError
 from simo.core.controllers import BEFORE_SEND, BEFORE_SET
-from simo.core.controllers import ControllerBase, TimerMixin
+from simo.core.controllers import Switch, TimerMixin
 from .app_widgets import AudioPlayerWidget, VideoPlayerWidget
 
 
-class BasePlayer(ControllerBase, TimerMixin):
+class BasePlayer(Switch):
     default_config = {
         'has_volume_control': True,
     }
@@ -22,6 +22,13 @@ class BasePlayer(ControllerBase, TimerMixin):
     }
     default_value = 'stopped'
 
+    def _prepare_for_send(self, value):
+        if isinstance(value, bool):
+            if value:
+                return 'play'
+            return 'pause'
+        return value
+
     def _validate_val(self, value, occasion=None):
         return value
 
@@ -59,12 +66,6 @@ class BasePlayer(ControllerBase, TimerMixin):
     def play_library_item(self, val):
         self.send({'play_from_library': val})
 
-    def turn_on(self):
-        self.play()
-
-    def turn_off(self):
-        self.pause()
-
     def toggle(self):
         if self.component.value == 'playing':
             self.turn_off()

simo/settings.py

@@ -41,7 +41,6 @@ EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
 
 INSTALLED_APPS = [
     'channels',
-    'filebrowser',
     'dal',
     'dal_select2',
     'django.forms',
@@ -87,8 +86,11 @@ MIDDLEWARE = [
     'simo.core.middleware.instance_middleware'
 ]
 
+
+FILE_UPLOAD_MAX_MEMORY_SIZE = 20971520 # 20Mb
+
 ROOT_URLCONF = 'urls'
-WSGI_APPLICATION = 'wsgi.application'
+WSGI_APPLICATION = 'simo.wsgi.application'
 
 CHANNELS_URLCONF = 'simo.asgi'
 ASGI_APPLICATION = "asgi.application"
@@ -120,7 +122,7 @@ DATABASES = {
     'default': {
         'ENGINE': 'simo.core.db_backend',
         'NAME': 'SIMO',
-        'ATOMIC_REQUESTS': False
+        'ATOMIC_REQUESTS': False,
     }
 }
 
@@ -185,7 +187,8 @@ REST_FRAMEWORK = {
     'DEFAULT_FILTER_BACKENDS': ['django_filters.rest_framework.DjangoFilterBackend'],
     'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.PageNumberPagination',
     'PAGE_SIZE': 1000,
-    'DATETIME_FORMAT': '%s.%f'
+    'DATETIME_FORMAT': '%s.%f',
+    'DEFAULT_METADATA_CLASS': 'simo.core.api_meta.SIMOAPIMetadata'
 }
 
 REDIS_DB = {

simo/urls.py

@@ -1,5 +1,6 @@
 import importlib
 import inspect
+import sys
 from django.urls import path, include
 from django.conf.urls.static import static
 from django.conf import settings
@@ -9,23 +10,17 @@ from django.apps import apps
 from django.contrib.auth.views import LogoutView
 from rest_framework import routers
 from rest_framework.viewsets import GenericViewSet
-from filebrowser.sites import FileBrowserSite
 from django.contrib.admin import site as admin_site
 from simo.users.views import protected_static
 
 
-filebrowser_site = FileBrowserSite(
-    name='filebrowser', storage=FileSystemStorage(
-        settings.VAR_DIR, settings.VAR_DIR_URL
-    )
-)
 
 rest_router = routers.DefaultRouter()
 registered_classes = []
 for name, app in apps.app_configs.items():
     try:
         apis = importlib.import_module('%s.api' % app.name)
-    except ModuleNotFoundError:
+    except ModuleNotFoundError as e:
         continue
     for cls_name, cls in apis.__dict__.items():
         cls_id = '%s.%s' % (app.name, cls_name)
@@ -39,7 +34,8 @@ for name, app in apps.app_configs.items():
 urlpatterns = [
     path('', RedirectView.as_view(pattern_name='admin:index')),
     path('login/', include('simo.users.sso_urls')),
-    path('admin/filebrowser/', filebrowser_site.urls),
+
+
     path('admin/login/',
          RedirectView.as_view(
              pattern_name='login', query_string=True