simo 2.7.14__py3-none-any.whl → 2.7.16__py3-none-any.whl

simo/automation/gateways.py

@@ -240,14 +240,16 @@ class AutomationsGatewayHandler(GatesHandler, BaseObjectCommandsGatewayHandler):
 
             comp = Component.objects.filter(id=id).first()
             if comp and comp.value == 'finished':
+                if process.is_alive():
+                    process.kill()
                 self.running_scripts.pop(id)
                 continue
 
             if process.is_alive():
                 if not comp and id not in self.terminating_scripts:
                     # script is deleted and was not properly called to stop
-                    self.running_scripts.pop(id)
                     process.kill()
+                    self.running_scripts.pop(id)
                 continue
             else:
                 self.last_death = time.time()
@@ -261,15 +263,12 @@ class AutomationsGatewayHandler(GatesHandler, BaseObjectCommandsGatewayHandler):
                     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)
 
@@ -351,6 +350,7 @@ class AutomationsGatewayHandler(GatesHandler, BaseObjectCommandsGatewayHandler):
         print("START SCRIPT %s" % str(component))
         if component.id in self.running_scripts:
             if component.value in ('finished', 'error', 'stopped'):
+                self.running_scripts[component.id].kill()
                 self.running_scripts.pop(component.id)
             elif component.id not in self.terminating_scripts \
             and self.running_scripts[component.id].is_alive():
@@ -358,6 +358,7 @@ class AutomationsGatewayHandler(GatesHandler, BaseObjectCommandsGatewayHandler):
                     component.value = 'running'
                     component.save()
                 return
+            self.running_scripts[component.id].kill()
 
         self.running_scripts[component.id] = ScriptRunHandler(
             component.id, multiprocessing.Event(),

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/migrations/0049_alter_gateway_type.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.10 on 2024-12-22 07:42
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0048_publicfile_privatefile'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='gateway',
+            name='type',
+            field=models.CharField(choices=[('simo.automation.gateways.AutomationsGatewayHandler', 'Automation'), ('simo_heos.gateways.HEOSGatewayHandler', 'DENON HEOS'), ('simo.generic.gateways.DummyGatewayHandler', 'Dummy'), ('simo.generic.gateways.GenericGatewayHandler', 'Generic'), ('simo_komfovent.gateways.KomfoventGatewayHandler', 'Komfovent'), ('simo.fleet.gateways.FleetGatewayHandler', 'SIMO.io Fleet')], db_index=True, max_length=200, unique=True),
+        ),
+    ]

simo/core/serializers.py

@@ -17,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
@@ -38,6 +38,9 @@ class SoundSerializer(serializers.FileField):
     pass
 
 
+class PasswordSerializer(serializers.CharField):
+    pass
+
 
 class TimestampField(serializers.Field):
 
@@ -163,7 +166,8 @@ 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):
@@ -316,7 +320,8 @@ class ComponentSerializer(FormSerializer):
             Select2ListMultipleChoiceField: ComponentManyToManyRelatedField,
             Select2ModelMultipleChoiceField: ComponentManyToManyRelatedField,
             FormsetField: ComponentFormsetField,
-            SoundField: SoundSerializer
+            SoundField: SoundSerializer,
+            PasswordField: PasswordSerializer
         }