simo 2.7.10__py3-none-any.whl → 2.7.12__py3-none-any.whl

simo/automation/gateways.py

@@ -33,9 +33,12 @@ class ScriptRunHandler(multiprocessing.Process):
     component = None
     logger = None
 
-    def __init__(self, component_id, *args, **kwargs):
+    def __init__(self, component_id, exit_event, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.component_id = component_id
+        self.exit_event = exit_event
+        self.exit_in_use = multiprocessing.Event()
+        self.exin_in_use_fail = multiprocessing.Event()
 
     def run(self):
         db_connection.connect()
@@ -51,34 +54,40 @@ class ScriptRunHandler(multiprocessing.Process):
         sys.stderr = StreamToLogger(self.logger, logging.ERROR)
         self.component.meta['pid'] = os.getpid()
         self.component.set('running')
-
-        if hasattr(self.component.controller, '_run'):
-            def run_code():
-                self.component.controller._run()
-        else:
-            code = self.component.config.get('code')
-            def run_code():
-                start = time.time()
-                exec(code, globals())
-                if 'class Automation:' in code and time.time() - start < 1:
-                    Automation().run()
-
-            if not code:
-                self.component.value = 'finished'
-                self.component.save(update_fields=['value'])
-                return
         print("------START-------")
         try:
-            run_code()
+            self.run_code()
         except:
             print("------ERROR------")
             self.component.set('error')
             raise
         else:
-            print("------FINISH-----")
-            self.component.set('finished')
+            if not self.exit_event.is_set():
+                print("------FINISH-----")
+                self.component.set('finished')
             return
 
+    def run_code(self):
+        if hasattr(self.component.controller, '_run'):
+            self.component.controller._run()
+        else:
+            code = self.component.config.get('code')
+            if not code:
+                self.component.value = 'finished'
+                self.component.save(update_fields=['value'])
+                return
+            start = time.time()
+            namespace = {}
+            exec(code, namespace)
+            if 'Automation' in namespace and time.time() - start < 1:
+                self.exit_in_use.set()
+                try:
+                    namespace['Automation']().run(self.exit_event)
+                except:
+                    self.exin_in_use_fail.set()
+                    namespace['Automation']().run()
+
+
 
 class GatesHandler:
     '''
@@ -225,6 +234,9 @@ class AutomationsGatewayHandler(GatesHandler, BaseObjectCommandsGatewayHandler):
         dead_scripts = False
         for id, process in list(self.running_scripts.items()):
             comp = Component.objects.filter(id=id).first()
+            if 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
@@ -236,7 +248,7 @@ class AutomationsGatewayHandler(GatesHandler, BaseObjectCommandsGatewayHandler):
                     if comp:
                         logger = get_component_logger(comp)
                         logger.log(logging.INFO, "-------DEAD!-------")
-                    self.stop_script(comp, 'error')
+                    self.stop_script(comp, 'dead')
 
         if dead_scripts:
             # give 10s air before we wake these dead scripts up!
@@ -326,7 +338,9 @@ class AutomationsGatewayHandler(GatesHandler, BaseObjectCommandsGatewayHandler):
     def start_script(self, component):
         print("START SCRIPT %s" % str(component))
         if component.id in self.running_scripts:
-            if component.id not in self.terminating_scripts:
+            if component.value == 'finished':
+                self.running_scripts.pop(component.id)
+            elif component.id not in self.terminating_scripts:
                 if component.value != 'running':
                     component.value = 'running'
                     component.save()
@@ -343,7 +357,8 @@ class AutomationsGatewayHandler(GatesHandler, BaseObjectCommandsGatewayHandler):
                     return self.stop_script(component, 'error')
 
         self.running_scripts[component.id] = ScriptRunHandler(
-            component.id, daemon=True
+            component.id, multiprocessing.Event(),
+            daemon=True
         )
         self.running_scripts[component.id].start()
 
@@ -360,9 +375,14 @@ class AutomationsGatewayHandler(GatesHandler, BaseObjectCommandsGatewayHandler):
         logger = get_component_logger(component)
         if stop_status == 'error':
             logger.log(logging.INFO, "-------GATEWAY STOP-------")
-        else:
+        elif stop_status == 'stopped':
             logger.log(logging.INFO, "-------STOP-------")
-        self.running_scripts[component.id].terminate()
+
+        if self.running_scripts[component.id].exit_in_use.is_set()\
+        and not self.running_scripts[component.id].exin_in_use_fail.is_set():
+            self.running_scripts[component.id].exit_event.set()
+        else:
+            self.running_scripts[component.id].terminate()
 
         def kill():
             start = time.time()

simo/core/api_meta.py

@@ -8,7 +8,8 @@ from simo.core.models import Icon, Instance, Category, Zone
 from simo.core.middleware import introduce_instance
 from .serializers import (
     HiddenSerializerField, ComponentManyToManyRelatedField,
-    TextAreaSerializerField, Component, LocationSerializer
+    TextAreaSerializerField, Component, LocationSerializer,
+    SoundSerializer
 )
 
 
@@ -33,6 +34,7 @@ class SIMOAPIMetadata(SimpleMetadata):
         serializers.MultipleChoiceField: 'multiple choice',
         serializers.FileField: 'file upload',
         serializers.ImageField: 'image upload',
+        SoundSerializer: 'sound upload',
         serializers.ListField: 'list',
         serializers.DictField: 'nested object',
         serializers.Serializer: 'nested object',

simo/core/auto_urls.py

@@ -1,6 +1,6 @@
 from django.urls import path
 from .views import (
-    get_timestamp, upgrade, restart, reboot, set_instance
+    get_timestamp, upgrade, restart, reboot, set_instance, delete_instance
 )
 from .autocomplete_views import (
     IconModelAutocomplete,
@@ -33,5 +33,6 @@ urlpatterns = [
     path('set-instance/<slug:instance_slug>/', set_instance, name='set-instance'),
     path('upgrade/', upgrade, name='upgrade'),
     path('restart/', restart, name='restart'),
-    path('reboot/', reboot, name='reboot')
+    path('reboot/', reboot, name='reboot'),
+    path('delete-instance/', delete_instance, name='delete-instance')
 ]

simo/core/form_fields.py

@@ -182,4 +182,10 @@ class PlainLocationField(forms.fields.CharField):
             if attr in kwargs:
                 dwargs[attr] = kwargs[attr]
 
-        super(PlainLocationField, self).__init__(*args, **dwargs)
+        super(PlainLocationField, self).__init__(*args, **dwargs)
+
+
+
+class SoundField(forms.fields.FileField):
+    pass
+

simo/core/forms.py

@@ -1,4 +1,4 @@
-import traceback
+import traceback, json
 from dal import forward
 from django.contrib.admin.forms import AdminAuthenticationForm as OrgAdminAuthenticationForm
 from django.db import models
@@ -117,8 +117,11 @@ class ConfigFieldsMixin:
                     obj.pk for obj in self.cleaned_data[field_name]
                 ]
             else:
-                self.instance.config[field_name] = \
-                    self.cleaned_data[field_name]
+                try:
+                    self.instance.config[field_name] = \
+                        json.loads(json.dumps(self.cleaned_data[field_name]))
+                except:
+                    continue
 
         if commit:
             from simo.users.middleware import get_current_user
@@ -269,9 +272,9 @@ class ComponentAdminForm(forms.ModelForm):
                 self.instance.config = self.controller.default_config
                 self.instance.meta = self.controller.default_meta
 
-        self.cleanup_missing_keys(kwargs.get("data"))
+        self.cleanup_missing_keys(kwargs.get("data"), kwargs.get("files"))
 
-    def cleanup_missing_keys(self, data):
+    def cleanup_missing_keys(self, data, files=None):
         """
         Removes missing keys from fields on form submission.
         This avoids resetting fields that are not present in
@@ -286,6 +289,11 @@ class ComponentAdminForm(forms.ModelForm):
             return
 
         got_keys = list(data.keys())
+        if files:
+            try:
+                got_keys += list(files.keys())
+            except:
+                pass
         formset_fields = set()
         for key in got_keys:
             if key.endswith('-TOTAL_FORMS'):

simo/core/migrations/0047_alter_component_value_translation.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.10 on 2024-12-11 14:14
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0046_component_value_translation_alter_gateway_type'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='component',
+            name='value_translation',
+            field=models.TextField(blank=True, default="def translate(value, occasion):\n    if occasion == 'before-set':\n        return value\n    else: # 'before-send'\n        return value", help_text='Adjust this to make value translations before value isset on to a component and before it is sent to a device from your SIMO.io smart home instance.'),
+        ),
+    ]

simo/core/migrations/0048_publicfile_privatefile.py

@@ -0,0 +1,35 @@
+# Generated by Django 4.2.10 on 2024-12-13 09:44
+
+import django.core.files.storage
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0047_alter_component_value_translation'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='PublicFile',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('file', models.FileField(storage=django.core.files.storage.FileSystemStorage(base_url='/public_media/', location='/home/simanas/Projects/SIMO/_var/public_media'), upload_to='public_files')),
+                ('date_uploaded', models.DateTimeField(auto_now_add=True)),
+                ('meta', models.JSONField(default=dict)),
+                ('component', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='public_files', to='core.component')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='PrivateFile',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('file', models.FileField(upload_to='private_files')),
+                ('date_uploaded', models.DateTimeField(auto_now_add=True)),
+                ('meta', models.JSONField(default=dict)),
+                ('component', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='private_files', to='core.component')),
+            ],
+        ),
+    ]

simo/core/models.py

@@ -1,5 +1,6 @@
 import inspect
 import time
+import os
 from collections.abc import Iterable
 from django.utils.text import slugify
 from django.utils.functional import cached_property
@@ -9,6 +10,8 @@ from django.db import models
 from django.db.models.signals import post_delete
 from django.dispatch import receiver
 from django.template.loader import render_to_string
+from django.conf import settings
+from django.core.files.storage import FileSystemStorage
 from timezone_utils.choices import ALL_TIMEZONES_CHOICES
 from location_field.models.plain import PlainLocationField
 from model_utils import FieldTracker
@@ -602,6 +605,35 @@ def is_in_alarm(self):
         return c_methods
 
 
+class PublicFile(models.Model):
+    component = models.ForeignKey(
+        Component, on_delete=models.CASCADE, related_name='public_files'
+    )
+    file = models.FileField(
+        upload_to='public_files', storage=FileSystemStorage(
+            location=os.path.join(settings.VAR_DIR, 'public_media'),
+            base_url='/public_media/'
+        )
+    )
+    date_uploaded = models.DateTimeField(auto_now_add=True)
+    meta = models.JSONField(default=dict)
+
+    def get_absolute_url(self):
+        return self.file.url
+
+
+class PrivateFile(models.Model):
+    component = models.ForeignKey(
+        Component, on_delete=models.CASCADE, related_name='private_files'
+    )
+    file = models.FileField(upload_to='private_files')
+    date_uploaded = models.DateTimeField(auto_now_add=True)
+    meta = models.JSONField(default=dict)
+
+    def get_absolute_url(self):
+        return self.file.url
+
+
 class ComponentHistory(models.Model):
     component = models.ForeignKey(
         Component, on_delete=models.CASCADE, related_name='history'

simo/core/serializers.py

@@ -16,7 +16,7 @@ from simo.core.forms import HiddenField, FormsetField
 from simo.core.form_fields import (
     Select2ListChoiceField, Select2ModelChoiceField,
     Select2ListMultipleChoiceField, Select2ModelMultipleChoiceField,
-    PlainLocationField
+    PlainLocationField, SoundField
 )
 from simo.core.models import Component
 from rest_framework.relations import PrimaryKeyRelatedField, ManyRelatedField
@@ -33,6 +33,10 @@ class LocationSerializer(serializers.CharField):
     pass
 
 
+class SoundSerializer(serializers.FileField):
+    pass
+
+
 
 class TimestampField(serializers.Field):
 
@@ -145,6 +149,7 @@ class ComponentFormsetField(FormSerializer):
         field_mapping = {
             HiddenField: HiddenSerializerField,
             PlainLocationField: LocationSerializer,
+            SoundField: SoundSerializer,
             Select2ListChoiceField: serializers.ChoiceField,
             forms.ModelChoiceField: FormsetPrimaryKeyRelatedField,
             Select2ModelChoiceField: FormsetPrimaryKeyRelatedField,
@@ -306,6 +311,7 @@ class ComponentSerializer(FormSerializer):
             Select2ListMultipleChoiceField: ComponentManyToManyRelatedField,
             Select2ModelMultipleChoiceField: ComponentManyToManyRelatedField,
             FormsetField: ComponentFormsetField,
+            SoundField: SoundSerializer
         }
 
 

simo/core/signal_receivers.py

@@ -8,7 +8,9 @@ from django.conf import settings
 from django.template.loader import render_to_string
 from actstream import action
 from simo.users.models import PermissionsRole
-from .models import Instance, Gateway, Component, Icon, Zone, Category
+from .models import (
+    Instance, Gateway, Component, Icon, Zone, Category, PublicFile, PrivateFile
+)
 
 
 @receiver(post_save, sender=Instance)
@@ -192,4 +194,13 @@ def gateway_post_save(sender, instance, created, *args, **kwargs):
 
 @receiver(post_delete, sender=Gateway)
 def gateway_post_delete(sender, instance, *args, **kwargs):
-    instance.stop()
+    instance.stop()
+
+
+@receiver(post_delete, sender=PublicFile)
+@receiver(post_delete, sender=PrivateFile)
+def delete_file_itself(sender, instance, *args, **kwargs):
+    try:
+        os.remove(instance.file.path)
+    except:
+        pass

simo/core/templates/admin/wizard/wizard_add.html

@@ -33,7 +33,7 @@
   </ul>
 {% endif %}{% endif %}
 {% endblock %}
-<form {% if has_file_field %}enctype="multipart/form-data" {% endif %}action="{{ form_url }}" method="post" id="{{ opts.model_name }}_form" novalidate>{% csrf_token %}{% block form_top %}{% endblock %}
+<form enctype="multipart/form-data" action="{{ form_url }}" method="post" id="{{ opts.model_name }}_form" novalidate>{% csrf_token %}{% block form_top %}{% endblock %}
 <div>
 {% if is_popup %}<input type="hidden" name="{{ is_popup_var }}" value="1">{% endif %}
 {% if to_field %}<input type="hidden" name="{{ to_field_var }}" value="{{ to_field }}">{% endif %}

simo/core/views.py

@@ -2,9 +2,11 @@ import time
 import re
 from django.contrib.auth.decorators import login_required
 from django.urls import reverse
-from django.shortcuts import redirect
+from django.shortcuts import redirect, get_object_or_404
 from django.views.decorators.csrf import csrf_exempt
-from django.http import HttpResponse, Http404, JsonResponse
+from django.http import (
+    HttpResponse, Http404, JsonResponse, HttpResponseForbidden
+)
 from django.contrib import messages
 from simo.conf import dynamic_settings
 from .models import Instance
@@ -69,6 +71,18 @@ def set_instance(request, instance_slug):
     return redirect(reverse('admin:index'))
 
 
+@login_required
+@csrf_exempt
+def delete_instance(request):
+    if request.method != 'POST':
+        raise Http404()
+    if not request.user.is_master:
+        return HttpResponseForbidden()
+    instance = get_object_or_404(Instance, uid=request.GET['uid'])
+    instance.delete()
+    return HttpResponse('success')
+
+
 def hub_info(request):
     data = {"hub_uid": dynamic_settings['core__hub_uid']}
     if not Instance.objects.filter(is_active=True).count():

simo/generic/controllers.py

@@ -37,7 +37,7 @@ from .forms import (
     ThermostatConfigForm, AlarmGroupConfigForm,
     IPCameraConfigForm, WeatherForm,
     WateringConfigForm, StateSelectForm, MainStateSelectForm,
-    AlarmClockConfigForm
+    AlarmClockConfigForm, AudioAlertConfigForm
 )
 
 # ----------- Generic controllers -----------------------------
@@ -1054,6 +1054,12 @@ class AlarmClock(ControllerBase):
         return current_value
 
 
+class AudioAlert(Switch):
+    gateway_class = GenericGatewayHandler
+    name = _("Audio Alert")
+    config_form = AudioAlertConfigForm
+
+
 class StateSelect(ControllerBase):
     gateway_class = GenericGatewayHandler
     name = _("State select")
@@ -1188,6 +1194,9 @@ class MainState(StateSelect):
             return any(phones_on_charge)
 
 
+
+
+
 # ----------- Dummy controllers -----------------------------
 
 class DummyBinarySensor(BinarySensor):

simo/generic/forms.py

@@ -1,9 +1,12 @@
+import os
+import librosa
+import tempfile
 from django import forms
 from django.forms import formset_factory
 from django.db.models import Q
 from django.utils.translation import gettext_lazy as _
 from simo.core.forms import HiddenField, BaseComponentForm
-from simo.core.models import Icon, Component
+from simo.core.models import Icon, Component, PublicFile
 from simo.core.controllers import (
     NumericSensor, MultiSensor, Switch, Dimmer
 )
@@ -17,6 +20,7 @@ from simo.core.form_fields import (
     Select2ModelMultipleChoiceField
 )
 from simo.core.forms import DimmerConfigForm, SwitchForm
+from simo.core.form_fields import SoundField
 
 ACTION_METHODS = (
     ('turn_on', "Turn ON"), ('turn_off', "Turn OFF"),
@@ -613,3 +617,73 @@ class AlarmClockConfigForm(BaseComponentForm):
                 if c:
                     obj.slaves.add(c)
         return obj
+
+
+class AudioAlertConfigForm(BaseComponentForm):
+    sound = SoundField(required=False)
+    loop = forms.BooleanField(initial=False, required=False)
+    volume = forms.IntegerField(initial=30, min_value=2, max_value=100)
+    players = Select2ModelMultipleChoiceField(
+        queryset=Component.objects.all(),#filter(base_type='audio-player'),
+        url='autocomplete-component',
+    )
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.basic_fields.extend(['sound', 'loop', 'volume', 'players'])
+        if self.instance.id:
+            public_file = PublicFile.objects.filter(
+                component=self.instance
+            ).first()
+            if public_file:
+                self.fields['sound'].help_text = f"Currently: {public_file.file}"
+
+    def clean_sound(self):
+        if not self.cleaned_data.get('sound'):
+            if not self.instance.pk:
+                raise forms.ValidationError("Please pick a sound!")
+            return
+        if self.cleaned_data['sound'].size > 1024 * 1024 * 50:
+            raise forms.ValidationError("No more than 50Mb please.")
+        temp_path = os.path.join(
+            tempfile.gettempdir(), self.cleaned_data['sound'].name
+        )
+        with open(temp_path, 'wb') as temp_file:
+            for chunk in self.cleaned_data['sound'].chunks():
+                temp_file.write(chunk)
+
+        try:
+            self.cleaned_data['sound'].duration = int(
+                librosa.core.get_duration(sr=22050, filename=temp_path)
+            )
+        except:
+            try:
+                os.remove(temp_path)
+            except:
+                pass
+            raise forms.ValidationError("This doesn't look like audio file!")
+        try:
+            os.remove(temp_path)
+        except:
+            pass
+
+        return self.cleaned_data['sound']
+
+
+    def save(self, commit=True):
+        if commit and self.cleaned_data.get('sound') \
+        and self.cleaned_data['sound'] != self.fields['sound'].initial:
+            public_file = PublicFile(component=self.instance)
+            public_file.file.save(
+                self.cleaned_data['sound'].name, self.cleaned_data['sound'],
+                save=True
+            )
+            org = PublicFile.objects.filter(
+                id=self.instance.config.get('public_file_id', 0)
+            )
+            if org:
+                org.delete()
+            self.instance.config['public_file_id'] = public_file.id
+            self.instance.config['duration'] = self.cleaned_data['sound'].duration
+            #self.cleaned_data.pop('sound')
+        return super().save(commit=commit)