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

simo/fleet/controllers.py

@@ -72,6 +72,14 @@ class FleeDeviceMixin:
                 config[key] = val
         return config
 
+    def _call_cmd(self, method, *args, **kwargs):
+        GatewayObjectCommand(
+            self.component.gateway,
+            Colonel(id=self.component.config['colonel']),
+            id=self.component.id, command='call', method=method,
+            args=args, kwargs=kwargs
+        ).publish()
+
 
 class BasicSensorMixin:
     gateway_class = FleetGatewayHandler

simo/generic/controllers.py

@@ -1059,6 +1059,16 @@ class AudioAlert(Switch):
     name = _("Audio Alert")
     config_form = AudioAlertConfigForm
 
+    def send(self, value):
+        for player in Component.objects.filter(
+            id__in=self.component.config['players']
+        ):
+            if value:
+                player.play_alert(self.component.id)
+            else:
+                self.component.set(False)
+                player.cancel_alert()
+
 
 class StateSelect(ControllerBase):
     gateway_class = GenericGatewayHandler

simo/generic/forms.py

@@ -7,7 +7,7 @@ from django.db.models import Q
 from django.utils.translation import gettext_lazy as _
 from django.core.files.uploadedfile import InMemoryUploadedFile
 from simo.core.forms import HiddenField, BaseComponentForm
-from simo.core.models import Icon, Component, PublicFile
+from simo.core.models import Component
 from simo.core.controllers import (
     NumericSensor, MultiSensor, Switch, Dimmer
 )
@@ -22,6 +22,7 @@ from simo.core.form_fields import (
 )
 from simo.core.forms import DimmerConfigForm, SwitchForm
 from simo.core.form_fields import SoundField
+from simo.multimedia.models import Sound
 
 ACTION_METHODS = (
     ('turn_on', "Turn ON"), ('turn_off', "Turn OFF"),
@@ -625,8 +626,9 @@ class AudioAlertConfigForm(BaseComponentForm):
     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'),
+        queryset=Component.objects.filter(base_type='audio-player'),
         url='autocomplete-component',
+        forward=(forward.Const(['audio-player',], 'base_type'),)
     )
 
     def __init__(self, *args, **kwargs):
@@ -669,24 +671,26 @@ class AudioAlertConfigForm(BaseComponentForm):
 
         return self.cleaned_data['sound']
 
-
     def save(self, commit=True):
         obj = super().save(commit=commit)
         if type(self.cleaned_data['sound']) != InMemoryUploadedFile:
             return obj
 
-        public_file = PublicFile(component=obj)
-        public_file.file.save(
+        sound = Sound(
+            name=self.cleaned_data['sound'].name,
+            duration=self.cleaned_data['sound'].duration
+        )
+        sound.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
+        Sound.objects.filter(
+            id=self.instance.config.get('sound_id', 0)
+        ).delete()
+        self.instance.config['sound_id'] = sound.id
         self.instance.config['duration'] = self.cleaned_data['sound'].duration
+        self.instance.config['stream_url'] = sound.stream_url()
+        self.instance.config['file_url'] = sound.get_absolute_url()
         self.instance.config['sound'] = self.cleaned_data['sound'].name
         self.instance.save()
         return obj

simo/generic/gateways.py

@@ -130,49 +130,49 @@ class GroupButtonsHandler:
                 group.toggle()
 
 
-class AudioAlertsHandler:
-
-    def control_audio_alert(self, component, val):
-        if val:
-            public_file = PublicFile.objects.filter(
-                component=component
-            ).first()
-            if not public_file:
-                return
-            uri = f"http://{get_self_ip()}{public_file.get_absolute_url()}"
-            loop = component.config.get('loop', False)
-            for pl_id in component.config.get('players', []):
-                player = Component.objects.filter(
-                    id=pl_id, base_type='audio-player'
-                ).first()
-                if not player:
-                    continue
-                player.play_alert(
-                    uri,
-                    component.config.get('loop', False),
-                    component.config.get('volume', 50)
-                )
-                if not loop:
-                    def set_done(comp):
-                        comp.set(False)
-                    threading.Timer(
-                        component.config.get('duration', 1),
-                        set_done, args=[component]
-                    )
-            component.set(True)
-        else:
-            for pl_id in component.config.get('players', []):
-                player = Component.objects.filter(
-                    id=pl_id, base_type='audio-player'
-                ).first()
-                if not player:
-                    continue
-                player.cancel_alert()
-            component.set(False)
+# class AudioAlertsHandler:
+#
+#     def control_audio_alert(self, component, val):
+#         if val:
+#             public_file = PublicFile.objects.filter(
+#                 component=component
+#             ).first()
+#             if not public_file:
+#                 return
+#             uri = f"http://{get_self_ip()}{public_file.get_absolute_url()}"
+#             loop = component.config.get('loop', False)
+#             for pl_id in component.config.get('players', []):
+#                 player = Component.objects.filter(
+#                     id=pl_id, base_type='audio-player'
+#                 ).first()
+#                 if not player:
+#                     continue
+#                 player.play_alert(
+#                     uri,
+#                     component.config.get('loop', False),
+#                     component.config.get('volume', 50)
+#                 )
+#                 if not loop:
+#                     def set_done(comp):
+#                         comp.set(False)
+#                     threading.Timer(
+#                         component.config.get('duration', 1),
+#                         set_done, args=[component]
+#                     )
+#             component.set(True)
+#         else:
+#             for pl_id in component.config.get('players', []):
+#                 player = Component.objects.filter(
+#                     id=pl_id, base_type='audio-player'
+#                 ).first()
+#                 if not player:
+#                     continue
+#                 player.cancel_alert()
+#             component.set(False)
 
 
 class GenericGatewayHandler(
-    BaseObjectCommandsGatewayHandler, GroupButtonsHandler, AudioAlertsHandler
+    BaseObjectCommandsGatewayHandler, GroupButtonsHandler
 ):
     name = "Generic"
     config_form = BaseGatewayForm
@@ -268,7 +268,7 @@ class GenericGatewayHandler(
 
     def on_mqtt_message(self, client, userdata, msg):
         print("Mqtt message: ", msg.payload)
-        from simo.generic.controllers import AlarmGroup, AudioAlert
+        from simo.generic.controllers import AlarmGroup#, #AudioAlert
 
         payload = json.loads(msg.payload)
         drop_current_instance()
@@ -278,8 +278,8 @@ class GenericGatewayHandler(
         try:
             if component.controller_uid == AlarmGroup.uid:
                 self.control_alarm_group(component, payload.get('set_val'))
-            elif component.controller_uid == AudioAlert.uid:
-                self.control_audio_alert(component, payload.get('set_val'))
+            # elif component.controller_uid == AudioAlert.uid:
+            #     self.control_audio_alert(component, payload.get('set_val'))
             else:
                 component.controller.set(payload.get('set_val'))
         except Exception:

simo/multimedia/admin.py

@@ -7,23 +7,23 @@ from .forms import SoundModelForm
 
 @admin.register(Sound)
 class SoundAdmin(admin.ModelAdmin):
-    list_display = 'id', 'name', 'file', 'length_display', 'date_uploaded'
+    list_display = 'id', 'name', 'file', 'duration_display', 'date_uploaded'
     search_fields = 'name', 'file'
     list_display_links = 'id', 'name',
     form = SoundModelForm
-    readonly_fields = 'length_display',
+    readonly_fields = 'duration_display',
 
-    def length_display(self, obj=None):
-        if obj and obj.length != None:
-            return str(timedelta(seconds=obj.length))
+    def duration_display(self, obj=None):
+        if obj and obj.duration != None:
+            return str(timedelta(seconds=obj.duration))
 
-    length_display.short_description = 'length'
+    duration_display.short_description = 'duration'
 
     def save_model(self, request, obj, form, change):
         super().save_model(request, obj, form, change)
         # need to keep it here as using admin interface skips post_save signals
         try:
-            obj.length = int(
+            obj.duration = int(
                 librosa.core.get_duration(
                     sr=22050, filename=obj.file.path
                 )

simo/multimedia/app_widgets.py

@@ -5,7 +5,7 @@ from simo.core.app_widgets import BaseAppWidget
 class AudioPlayerWidget(BaseAppWidget):
     uid = 'audio-player'
     name = _('Audio Player')
-    size = [2, 2]
+    size = [4, 1]
 
 
 class VideoPlayerWidget(BaseAppWidget):

simo/multimedia/auto_urls.py

@@ -1,10 +1,13 @@
 from django.urls import path, re_path
-from .views import SoundAutocomplete
+from .views import SoundAutocomplete, sound_stream
 
 
 urlpatterns = [
     path(
-        'autocomplete-sound',
+        'autocomplete-sound/',
         SoundAutocomplete.as_view(), name='autocomplete-sound'
+    ),
+    path(
+        'sound-<int:sound_id>-stream/', sound_stream, name='sound-stream'
     )
 ]

simo/multimedia/controllers.py

@@ -17,6 +17,7 @@ class BasePlayer(Switch):
         'duration': None,
         'position': None,
         'title': None,
+        'image_url': None,
         'library': []
     }
     default_value = 'stopped'
@@ -89,18 +90,22 @@ class BasePlayer(Switch):
             assert 0 <= volume <= 100
         self.send({"play_uri": uri, 'volume': volume})
 
-    def play_alert(self, val, loop=False, volume=None):
-        '''
-        Plays alert and goes back to whatever was playing initially
-        :param val: uri
-        :param loop: Repeat infinitely
-        :param volume: volume at which to play
-        :return:
-        '''
-        assert type(val) == str
-        if volume:
-            assert 0 <= volume <= 100
-        self.send({"alert": val, 'loop': loop, 'volume': volume})
+    # def play_alert(self, val, loop=False, volume=None):
+    #     '''
+    #     Plays alert and goes back to whatever was playing initially
+    #     :param val: uri
+    #     :param loop: Repeat infinitely
+    #     :param volume: volume at which to play
+    #     :return:
+    #     '''
+    #     assert type(val) == str
+    #     if volume:
+    #         assert 0 <= volume <= 100
+    #     self.send({"alert": val, 'loop': loop, 'volume': volume})
+
+
+    def play_alert(self, id):
+        self.send({"alert": id})
 
     def cancel_alert(self):
         '''Cancel alert if it's currently playing'''

simo/multimedia/migrations/0006_remove_sound_length_sound_duration.py

@@ -0,0 +1,22 @@
+# Generated by Django 4.2.10 on 2024-12-22 07:42
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('multimedia', '0005_remove_sound_slug_sound_date_uploaded'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='sound',
+            name='length',
+        ),
+        migrations.AddField(
+            model_name='sound',
+            name='duration',
+            field=models.PositiveIntegerField(default=0, editable=False, help_text='Sound duration in seconds'),
+        ),
+    ]

simo/multimedia/models.py

@@ -1,4 +1,5 @@
 import os, librosa
+from django.urls import reverse
 from django.db import models
 from django.db.models.signals import post_save, post_delete
 from django.dispatch import receiver
@@ -15,8 +16,8 @@ class Sound(models.Model):
         )
     )
     note = models.TextField(null=True, blank=True)
-    length = models.PositiveIntegerField(
-        editable=False, default=0, help_text='Sound length in seconds'
+    duration = models.PositiveIntegerField(
+        editable=False, default=0, help_text='Sound duration in seconds'
     )
     date_uploaded = models.DateTimeField(auto_now_add=True)
 
@@ -26,11 +27,14 @@ class Sound(models.Model):
     def get_absolute_url(self):
         return self.file.url
 
+    def stream_url(self):
+        return reverse('sound-stream', kwargs={'sound_id': self.id})
+
 
 @receiver(post_save, sender=Sound)
 def determine_duration(sender, instance, created, **kwargs):
-    if not instance.length:
-        instance.length = int(
+    if not instance.duration:
+        instance.duration = int(
             librosa.core.get_duration(
                 sr=22050, filename=instance.file.path
             )

simo/multimedia/views.py

@@ -1,4 +1,9 @@
+import re, os
 from django.http import Http404
+from django.conf import settings
+from wsgiref.util import FileWrapper
+from django.shortcuts import get_object_or_404
+from django.http import StreamingHttpResponse
 from dal import autocomplete
 from simo.core.utils.helpers import search_queryset
 from .models import Sound
@@ -16,4 +21,61 @@ class SoundAutocomplete(autocomplete.Select2QuerySetView):
             qs = qs.filter(pk__in=self.request.GET['value'].split(','))
         elif self.q:
             qs = search_queryset(qs, self.q, ('name', 'slug'))
-        return qs
+        return qs
+
+
+
+
+
+def file_iterator(file_path, chunk_size=8192, offset=0, length=None):
+    with open(file_path, "rb") as f:
+        f.seek(offset, os.SEEK_SET)
+        remaining = length
+        while True:
+            bytes_length = (
+                chunk_size
+                if remaining is None
+                else min(remaining, chunk_size)
+            )
+            data = f.read(bytes_length)
+            if not data:
+                break
+            if remaining:
+                remaining -= len(data)
+            yield data
+
+
+
+def sound_stream(request, sound_id):
+    sound = get_object_or_404(Sound, id=sound_id)
+    path = sound.file.path
+    content_type = "audio/" + path.split('.')[-1]
+
+    range_header = request.META.get("HTTP_RANGE", "").strip()
+    RANGE_RE = re.compile(r"bytes\s*=\s*(\d+)\s*-\s*(\d*)", re.I)
+    range_match = RANGE_RE.match(range_header)
+    size = os.path.getsize(path)
+
+    if range_match:
+        print(f"RANGE HEADER: {range_header}")
+        first_byte, last_byte = range_match.groups()
+        first_byte = int(first_byte) if first_byte else 0
+        last_byte = (
+                first_byte + 1024 * 1024 * 8
+        )  # The max volume of the response body is 8M per piece
+        if last_byte >= size:
+            last_byte = size - 1
+        length = last_byte - first_byte + 1
+        response = StreamingHttpResponse(
+            file_iterator(path, offset=first_byte, length=length),
+            status=206,
+            content_type=content_type,
+        )
+        response["Content-Range"] = f"bytes {first_byte}-{last_byte}/{size}"
+
+    else:
+        response = StreamingHttpResponse(
+            FileWrapper(open(path, "rb")), content_type=content_type
+        )
+    response["Accept-Ranges"] = "bytes"
+    return response