simo 2.7.13__py3-none-any.whl → 2.7.15__py3-none-any.whl

simo/automation/gateways.py

@@ -227,37 +227,47 @@ class AutomationsGatewayHandler(GatesHandler, BaseObjectCommandsGatewayHandler):
 
     terminating_scripts = set()
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.last_death = 0
+
 
     def watch_scripts(self):
         drop_current_instance()
         # observe running scripts and drop the ones that are no longer alive
         dead_scripts = False
         for id, process in list(self.running_scripts.items()):
+
             comp = Component.objects.filter(id=id).first()
-            if comp.value == 'finished':
+            if comp and comp.value == 'finished':
                 self.running_scripts.pop(id)
                 continue
+
             if process.is_alive():
                 if not comp and id not in self.terminating_scripts:
-                    # script is deleted, or instance deactivated
+                    # script is deleted and was not properly called to stop
+                    self.running_scripts.pop(id)
                     process.kill()
                 continue
             else:
-                if id not in self.terminating_scripts:
-                    dead_scripts = True
-                    if comp:
-                        logger = get_component_logger(comp)
-                        logger.log(logging.INFO, "-------DEAD!-------")
-                    self.stop_script(comp, 'dead')
-
-        if dead_scripts:
+                self.last_death = time.time()
+                self.running_scripts.pop(id, None) # no longer running for sure!
+                if not comp or comp.value != 'running':
+                    continue
+
+                if id not in self.terminating_scripts: # was not intentionaly terminated
+                    logger = get_component_logger(comp)
+                    logger.log(logging.INFO, "-------DEAD!-------")
+                    comp.value = 'error'
+                    comp.save()
+
+
+        if self.last_death and time.time() - self.last_death < 5:
             # give 10s air before we wake these dead scripts up!
             return
 
-        from .controllers import Script
         for script in Component.objects.filter(
-            controller_uid=Script.uid,
-            config__keep_alive=True
+            base_type='script', config__keep_alive=True
         ).exclude(value__in=('running', 'stopped', 'finished')):
             self.start_script(script)
 
@@ -338,23 +348,14 @@ class AutomationsGatewayHandler(GatesHandler, BaseObjectCommandsGatewayHandler):
     def start_script(self, component):
         print("START SCRIPT %s" % str(component))
         if component.id in self.running_scripts:
-            if component.value == 'finished':
+            if component.value in ('finished', 'error', 'stopped'):
                 self.running_scripts.pop(component.id)
-            elif component.id not in self.terminating_scripts:
+            elif component.id not in self.terminating_scripts \
+            and self.running_scripts[component.id].is_alive():
                 if component.value != 'running':
                     component.value = 'running'
                     component.save()
-                    return
-            else:
-                good_to_go = False
-                for i in range(12): # wait for 3s
-                    time.sleep(0.2)
-                    component.refresh_from_db()
-                    if component.id not in self.running_scripts:
-                        good_to_go = True
-                        break
-                if not good_to_go:
-                    return self.stop_script(component, 'error')
+                return
 
         self.running_scripts[component.id] = ScriptRunHandler(
             component.id, multiprocessing.Event(),

simo/core/api.py

@@ -285,7 +285,6 @@ class ComponentViewSet(
 
     @action(detail=True, methods=['post'])
     def controller(self, request, pk=None, *args, **kwargs):
-        start = time.time()
         component = self.get_object()
         data = request.data
         if not isinstance(request.data, dict):

simo/core/api_meta.py

@@ -9,7 +9,7 @@ from simo.core.middleware import introduce_instance
 from .serializers import (
     HiddenSerializerField, ComponentManyToManyRelatedField,
     TextAreaSerializerField, Component, LocationSerializer,
-    SoundSerializer
+    SoundSerializer, PasswordSerializer
 )
 
 
@@ -19,6 +19,7 @@ class SIMOAPIMetadata(SimpleMetadata):
         serializers.Field: 'field',
         serializers.BooleanField: 'boolean',
         serializers.CharField: 'string',
+        PasswordSerializer: 'password',
         serializers.UUIDField: 'string',
         serializers.URLField: 'url',
         serializers.EmailField: 'email',

simo/core/form_fields.py

@@ -189,3 +189,9 @@ class PlainLocationField(forms.fields.CharField):
 class SoundField(forms.fields.FileField):
     pass
 
+
+
+class PasswordField(forms.fields.CharField):
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(widget=forms.PasswordInput, *args, **kwargs)

simo/core/management/commands/on_http_start.py

@@ -4,6 +4,9 @@ import pwd
 import grp
 import sys
 import subprocess
+import importlib
+import traceback
+from django.apps import apps
 from crontab import CronTab
 from django.conf import settings
 from django.template.loader import render_to_string
@@ -81,3 +84,16 @@ class Command(BaseCommand):
         from simo.core.tasks import maybe_update_to_latest
         maybe_update_to_latest.delay()
         update_auto_update()
+        for name, app in apps.app_configs.items():
+            if name in (
+                'auth', 'admin', 'contenttypes', 'sessions', 'messages',
+                'staticfiles'
+            ):
+                continue
+            try:
+                importlib.import_module('%s.on_start' % app.name)
+            except ModuleNotFoundError:
+                continue
+            except:
+                print(traceback.format_exc(), file=sys.stderr)
+

simo/core/models.py

@@ -544,7 +544,7 @@ def is_in_alarm(self):
                     kwargs['update_fields'].append('last_change')
 
             modifying_fields = (
-                'name', 'icon', 'zone', 'category', 'config', 'meta',
+                'name', 'icon', 'zone', 'category', 'config',
                 'value_units', 'slaves', 'show_in_app', 'alarm_category'
             )
             if any(f in dirty_fields for f in modifying_fields):

simo/core/serializers.py

@@ -1,6 +1,7 @@
 import inspect
 import datetime
 import re
+import json
 from django import forms
 from collections import OrderedDict
 from django.conf import settings
@@ -16,7 +17,7 @@ from simo.core.forms import HiddenField, FormsetField
 from simo.core.form_fields import (
     Select2ListChoiceField, Select2ModelChoiceField,
     Select2ListMultipleChoiceField, Select2ModelMultipleChoiceField,
-    PlainLocationField, SoundField
+    PlainLocationField, SoundField, PasswordField
 )
 from simo.core.models import Component
 from rest_framework.relations import PrimaryKeyRelatedField, ManyRelatedField
@@ -37,6 +38,9 @@ class SoundSerializer(serializers.FileField):
     pass
 
 
+class PasswordSerializer(serializers.CharField):
+    pass
+
 
 class TimestampField(serializers.Field):
 
@@ -137,6 +141,10 @@ class ComponentManyToManyRelatedField(serializers.Field):
     def to_internal_value(self, data):
         if data == [] and self.allow_blank:
             return []
+        if type(data) == str:
+            data = json.loads(data)
+        if not isinstance(data, Iterable):
+            data = [data]
         return self.queryset.filter(pk__in=data)
 
 
@@ -158,16 +166,17 @@ class ComponentFormsetField(FormSerializer):
             Select2ModelMultipleChoiceField: ComponentManyToManyRelatedField,
             forms.TypedChoiceField: serializers.ChoiceField,
             forms.FloatField: serializers.FloatField,
-            forms.SlugField: serializers.CharField
+            forms.SlugField: serializers.CharField,
+            PasswordField: PasswordSerializer
         }
 
     def __init__(self, formset_field, *args, **kwargs):
         self.form = formset_field.formset_cls.form
         super().__init__(*args, **kwargs)
 
-    def get_form(self, data=None, **kwargs):
+    def get_form(self, data=None, files=None, **kwargs):
         form_cls = self.form
-        instance = form_cls(data=data, **kwargs)
+        instance = form_cls(data=data, files=files, **kwargs)
         # Handle partial validation on the form side
         if self.partial:
             set_form_partial_validation(
@@ -311,7 +320,8 @@ class ComponentSerializer(FormSerializer):
             Select2ListMultipleChoiceField: ComponentManyToManyRelatedField,
             Select2ModelMultipleChoiceField: ComponentManyToManyRelatedField,
             FormsetField: ComponentFormsetField,
-            SoundField: SoundSerializer
+            SoundField: SoundSerializer,
+            PasswordField: PasswordSerializer
         }
 
 
@@ -435,7 +445,7 @@ class ComponentSerializer(FormSerializer):
                 if controller:
                     self.Meta.form = controller.config_form
 
-    def get_form(self, data=None, instance=None, **kwargs):
+    def get_form(self, data=None, instance=None, files=None, **kwargs):
         if 'forms' not in self.context:
             self.context['forms'] = {}
         form_key = None
@@ -453,7 +463,7 @@ class ComponentSerializer(FormSerializer):
         else:
             controller_uid = self.instance.controller_uid
         form = self.Meta.form(
-            data=data, request=self.context['request'],
+            data=data, files=files, request=self.context['request'],
             controller_uid=controller_uid, instance=instance,
             **kwargs
         )
@@ -508,7 +518,8 @@ class ComponentSerializer(FormSerializer):
         a_data = self.accomodate_formsets(form, data)
 
         form = self.get_form(
-            data=a_data, instance=self.instance
+            data=a_data, files=self.context['request'].FILES,
+            instance=self.instance
         )
         if not form.is_valid():
             raise serializers.ValidationError(form.errors)
@@ -520,7 +531,10 @@ class ComponentSerializer(FormSerializer):
     def update(self, instance, validated_data):
         form = self.get_form(instance=instance)
         a_data = self.accomodate_formsets(form, validated_data)
-        form = self.get_form(instance=instance, data=a_data)
+        form = self.get_form(
+            instance=instance, data=a_data,
+            files=self.context['request'].FILES
+        )
         if form.is_valid():
             instance = form.save(commit=True)
             return instance
@@ -529,7 +543,9 @@ class ComponentSerializer(FormSerializer):
     def create(self, validated_data):
         form = self.get_form()
         a_data = self.accomodate_formsets(form, validated_data)
-        form = self.get_form(data=a_data)
+        form = self.get_form(
+            data=a_data, files=self.context['request'].FILES
+        )
         if form.is_valid():
             if form.controller.is_discoverable:
                 form.controller.init_discovery(form.cleaned_data)