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

simo/core/forms.py

@@ -310,6 +310,7 @@ class ComponentAdminForm(forms.ModelForm):
 
         base_fields.append('zone')
         base_fields.append('category')
+        base_fields.append('show_in_app')
 
         for field_name in cls.declared_fields:
             if field_name not in main_fields:
@@ -319,7 +320,9 @@ class ComponentAdminForm(forms.ModelForm):
         base_fields.append('notes')
 
         fieldsets = [
-            (_("Base settings"), {'fields': base_fields + ['value_units', 'value_translation']}),
+            (_("Base settings"), {
+                'fields': base_fields + ['value_units', 'value_translation']}
+             ),
         ]
         if cls.has_alarm:
             fieldsets.append(

simo/core/models.py

@@ -586,21 +586,6 @@ def is_in_alarm(self):
             return self.is_in_alarm()
         return bool(self.value)
 
-    def can_read(self, user):
-        if user.is_master:
-            return True
-        from .middleware import get_current_instance
-        instance = get_current_instance()
-        if instance:
-            role = user.get_role(instance)
-            if not role:
-                return False
-            for perm in role.component_permissions.all():
-                if perm.component.id == self.id:
-                    return any([perm.write, perm.read])
-            return False
-        return False
-
     def get_controller_methods(self):
         c_methods = []
         for m in inspect.getmembers(

simo/fleet/forms.py

@@ -306,12 +306,6 @@ class ColonelButtonConfigForm(ColonelComponentForm):
             ('up', "UP (On +5V delivery)")
         )
     )
-    btn_type = forms.ChoiceField(
-        label="Type", initial='momentary',
-        choices=(
-            ('momentary', "Momentary"), ('toggle', "Toggle")
-        )
-    )
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)

simo/generic/socket_consumers.py

@@ -33,11 +33,11 @@ class CamStreamConsumer(AsyncWebsocketConsumer):
         except:
             return self.close()
 
-        can_read = await sync_to_async(
-            self.component.can_read, thread_sensitive=True
-        )(self.scope['user'])
-        if not can_read:
-            return self.close()
+        # can_read = await sync_to_async(
+        #     self.component.can_read, thread_sensitive=True
+        # )(self.scope['user'])
+        # if not can_read:
+        #     return self.close()
 
         # self.video = cv2.VideoCapture(self.component.config['rtsp_address'])
         # asyncio.create_task(self.send_cam())

simo/multimedia/controllers.py

@@ -4,6 +4,7 @@ from .app_widgets import AudioPlayerWidget, VideoPlayerWidget
 
 
 class BasePlayer(Switch):
+    admin_widget_template = 'admin/controller_widgets/player.html'
     default_config = {
         'has_volume_control': True,
     }
@@ -50,19 +51,55 @@ class BasePlayer(Switch):
 
     def set_volume(self, val):
         assert 0 <= val <= 100
+        self.component.meta['volume'] = val
+        self.component.save()
         self.send({'set_volume': val})
 
     def get_volume(self):
+        '''override of possible with something more reliable'''
         return self.component.meta['volume']
 
     def set_shuffle_play(self, val):
+        self.component.meta['shuffle'] = bool(val)
+        self.component.save()
         self.send({'shuffle': bool(val)})
 
     def set_loop_play(self, val):
+        self.component.meta['loop'] = bool(val)
+        self.component.save()
         self.send({'loop': bool(val)})
 
-    def play_library_item(self, val):
-        self.send({'play_from_library': val})
+    def play_library_item(self, id, volume=None, fade_in=None):
+        '''
+        :param id: Library item ID
+        :param volume: Volume to play at. Current volume will be used if not provided
+        :param fade_in: number of seconds to fade in
+        :return:
+        '''
+        self.send({'play_from_library': id, 'volume': volume, 'fade_in': fade_in})
+
+    def play_uri(self, uri, volume=None):
+        '''
+        Replace que with this single uri and play it immediately
+        :param uri: playable uri or url
+        :param volume: volume at which to play
+        :return:
+        '''
+        if volume:
+            assert 0 <= volume <= 100
+        self.send({"play_uri": uri, 'volume': volume})
+
+    def play_alert(self, val, volume=None):
+        '''
+        Plays alert and goes back to whatever was playing initially
+        :param val: Sound.id or uri
+        :param volume: volume at which to play
+        :return:
+        '''
+        assert type(val) in (int, str)
+        if volume:
+            assert 0 <= volume <= 100
+        self.send({"alert": val, 'volume': volume})
 
     def toggle(self):
         if self.component.value == 'playing':

simo/multimedia/templates/admin/controller_widgets/player.html

@@ -0,0 +1,11 @@
+<div class="component-controller" data-ws_url="{{ obj.get_socket_url|default_if_none:"" }}">
+  {% if obj.value == 'playing' %}
+    <i class="fas fa-toggle-on fa-2x component_switch action"
+       data-method="pause"
+    ></i>
+  {% else %}
+    <i class="fas fa-toggle-off fa-2x component_switch action"
+       data-method="play"
+    ></i>
+  {% endif %}
+</div>

simo/notifications/utils.py

@@ -33,7 +33,7 @@ def notify_users(severity, title, body=None, component=None, instance_users=None
         severity=severity, body=body,
         component=component
     )
-    if not instance_users:
+    if instance_users is None:
         instance_users = instance.instance_users.filter(
             is_active=True
         ).select_related('user')
@@ -43,7 +43,7 @@ def notify_users(severity, title, body=None, component=None, instance_users=None
             continue
         if iuser.instance.id != instance.id:
             continue
-        if component and not component.can_read(iuser.user):
+        if not iuser.can_read(component):
             continue
         UserNotification.objects.create(
             user=iuser.user, notification=notification,

simo/users/models.py

@@ -4,6 +4,7 @@ import subprocess
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 from django.db import models
+from django.db.models import Q
 from django.db import transaction
 from django.db.models.signals import post_save, post_delete, m2m_changed
 from django.dispatch import receiver
@@ -129,6 +130,27 @@ class InstanceUser(DirtyFieldsMixin, models.Model, OnChangeMixin):
     def get_instance(self):
         return self.instance
 
+    def can_read(self, component):
+        if self.user.is_master:
+            return True
+        if self.role.is_superuser:
+            return True
+        return bool(
+            self.role.component_permissions.filter(component=component).filter(
+            Q(read=True) | Q(write=True)
+        ).count())
+
+    def can_write(self, component):
+        if self.user.is_master:
+            return True
+        if self.role.is_superuser:
+            return True
+        return bool(
+            self.role.component_permissions.filter(
+                component=component, write=True
+            ).count()
+        )
+
 
 @receiver(post_save, sender=InstanceUser)
 def post_instance_user_save(sender, instance, created, **kwargs):

{simo-2.7.8.dist-info → simo-2.7.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simo
-Version: 2.7.8
+Version: 2.7.10
 Summary: Smart Home on Steroids!
 Author-email: Simanas Venčkauskas <simanas@simo.io>
 Project-URL: Homepage, https://simo.io

{simo-2.7.8.dist-info → simo-2.7.10.dist-info}/RECORD

@@ -75,12 +75,12 @@ simo/core/dynamic_settings.py,sha256=bUs58XEZOCIEhg1TigR3LmYggli13KMryBZ9pC7ugAQ
 simo/core/events.py,sha256=1_KIk5pJqdLPRQlCQ9xSyALst2Cn0b2lAEAJ3QjwIjE,4801
 simo/core/filters.py,sha256=6wbn8C2WvKTTjtfMwwLBp2Fib1V0-DMpS4iqJd6jJQo,2540
 simo/core/form_fields.py,sha256=m3dR31M31q3DQM-7P4jBOXLofm-PiC0ykIfUrpWhOjg,5007
-simo/core/forms.py,sha256=KZKmc5dWGvEicTEokQdijM5SgA-ZjrdenJPVwcb5R3s,21675
+simo/core/forms.py,sha256=UGGsBU8qPFWf_NMGg6IvImloojhoU0sTX2jrJ9mJPjs,21748
 simo/core/gateways.py,sha256=Y2BME6zSyeUq_e-hzEUF6gErCUCP6nFxedkLZKiLVOo,4141
 simo/core/loggers.py,sha256=EBdq23gTQScVfQVH-xeP90-wII2DQFDjoROAW6ggUP4,1645
 simo/core/managers.py,sha256=n-b3I4uXzfHKTeB1VMjSaMsDUxp8FegFJwnbV1IsWQ4,3019
 simo/core/middleware.py,sha256=eUFf6iP-Snx_0TE3MoXsSwqrd5IjlukqZk2GQGStRCo,3385
-simo/core/models.py,sha256=cJrY7mBnKD-AsM62WzCnrNw21wmGu6bGuxpvBPjQg60,23220
+simo/core/models.py,sha256=-zhQEvQRqacTjdqL4Gv7shlP1Uo09Rj3vHKqNONlxWU,22716
 simo/core/permissions.py,sha256=2YNRot2qoHjHKWPGOpO4PBseecctPbTlUQpepnFkCRs,3027
 simo/core/routing.py,sha256=X1_IHxyA-_Q7hw1udDoviVP4_FSBDl8GYETTC2zWTbY,499
 simo/core/serializers.py,sha256=pa4F5fSvIxgGJWBEcXdzpmemRWl6QbUoUDMqQ_RdA2o,22514
@@ -10259,7 +10259,7 @@ simo/fleet/auto_urls.py,sha256=vrfrooPyY4pDuQjya-eLxCgZldfhwbEeEiXa7diO_CY,847
 simo/fleet/base_types.py,sha256=wL9RVkHr0gA7HI1wZq0pruGEIgvQqpfnCL4cC3ywsvw,102
 simo/fleet/ble.py,sha256=eHA_9ABjbmH1vUVCv9hiPXQL2GZZSEVwfO0xyI1S0nI,1081
 simo/fleet/controllers.py,sha256=PezfOT-1N_UONSsbyTXEIyGO6Po57KdEBRv4yzk_sw0,28605
-simo/fleet/forms.py,sha256=CHSmIz9bsdyukyTQnU5t554ggriWJjjwoBQe68l4FKI,67022
+simo/fleet/forms.py,sha256=VcqATlX-omZruUgUC2fJpeLNUGSR-szmf36_M3aa5dg,66850
 simo/fleet/gateways.py,sha256=C7dyapWDlJ5erYPNLkSoH50I8kj0lIXicSno0_CrdXc,5783
 simo/fleet/managers.py,sha256=ZNeHFSkF5kzsl9E1DCBevOW6kXJlD6kw0LU4B-JMOG8,828
 simo/fleet/models.py,sha256=zPplx_v64nfKBmb-nCb74aCVtEeY3m3SjEy-VhbnydU,17511
@@ -10385,7 +10385,7 @@ simo/generic/forms.py,sha256=ikSwn6hg6m4XoaWyZNydw9e5aoFRHxbeM8tWsyYlen4,22993
 simo/generic/gateways.py,sha256=SBQPlcU2oNCWzRQ1H1XWQ11O2E3zWDNImXlWNDzKg-Y,15865
 simo/generic/models.py,sha256=Adq7ipWK-renxJlNW-SZnAq2oGEOwKx8EdUWaKnfcVQ,7597
 simo/generic/routing.py,sha256=elQVZmgnPiieEuti4sJ7zITk1hlRxpgbotcutJJgC60,228
-simo/generic/socket_consumers.py,sha256=K2OjphIhKJH48BvfFfoCOyCQZ1NmXb_phs6y1IP-qaQ,1757
+simo/generic/socket_consumers.py,sha256=pyiqzfGxSKBNqfrfEJ_kCU0UbSC28XnvDn6QjKkbqyY,1767
 simo/generic/__pycache__/__init__.cpython-38.pyc,sha256=mLu54WS9KIl-pHwVCBKpsDFIlOqml--JsOVzAUHg6cU,161
 simo/generic/__pycache__/app_widgets.cpython-38.pyc,sha256=D9b13pbMlirgHmjDnQhfLIDGSVINoSouHb4SWOeCRrs,1642
 simo/generic/__pycache__/base_types.cpython-38.pyc,sha256=aV5NdIuvXR-ItKpI__MwcyPZHD6Z882TFdgYkPCkr1I,493
@@ -10431,7 +10431,7 @@ simo/multimedia/admin.py,sha256=GgXiKTLfi3omjBurU-bKgneJRK-tAeiR8o2jo3zD7zs,1002
 simo/multimedia/api.py,sha256=mZ5BTggWdc_kL8P70JGC3rTCiZKPnxWYoyNcAQkFnX4,285
 simo/multimedia/app_widgets.py,sha256=g_IPx5bNmIS6JbaXXDCzYZYV2KVKAiYvWjH4oI30lWM,331
 simo/multimedia/base_types.py,sha256=dAP7_uh_b3A03yXBJZyQdRFucKIro4_RkIZ5yOaWXVE,151
-simo/multimedia/controllers.py,sha256=kaoi-nv9b6O87k1eijgk-6ub0-E2KdTN1lL99OPGpo8,1993
+simo/multimedia/controllers.py,sha256=A_kSKOVRJIiGvEl4CzpqjcWt4v-JsDQNQJ8ylrgplCc,3368
 simo/multimedia/forms.py,sha256=oMCVUXRNiESrY3w_uBLRRgjMjx8BrmNeVglzorA9QtY,239
 simo/multimedia/models.py,sha256=5aWGLWDdCkekGAOGZIdanvX1l6ULnhgJN4JAvDZT4nQ,734
 simo/multimedia/requirements.txt,sha256=QeIhjf1RfNGCYn_WZm3VuinPI2wK31WEJPbCxRWxssY,28
@@ -10455,12 +10455,13 @@ simo/multimedia/migrations/__pycache__/0002_sound_length.cpython-38.pyc,sha256=5
 simo/multimedia/migrations/__pycache__/0003_alter_sound_length.cpython-38.pyc,sha256=dkdqLx_cWLAxxVCUxuuAX39iTv7G5kG-PhJ40HsPzx8,669
 simo/multimedia/migrations/__pycache__/0004_auto_20231023_1055.cpython-38.pyc,sha256=tX6x1gNeVcUHcCFvisP9Z2jPBE029TJG632fvtvUjV8,892
 simo/multimedia/migrations/__pycache__/__init__.cpython-38.pyc,sha256=mCgSiQBphL85imdWyTi9-4zBDYF6HfXbhB0ycSPVVuA,175
+simo/multimedia/templates/admin/controller_widgets/player.html,sha256=v4PFoL37-C7L6ILZI6yF5ff9iO3EnEs5kXbRayaHy0s,358
 simo/notifications/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/notifications/admin.py,sha256=WQbN_bd2KRxVjbOajeworNrV9QlDNSadQT58La0Nn2M,1174
 simo/notifications/api.py,sha256=QrfFn5kBU0vlqi8X368w1-0iTmDGu_hmMxLW2R0OTTg,1765
 simo/notifications/models.py,sha256=QGDLGAi5gk8OTcvd7ho5WNdctDymWGmGF1ZqN4-G_ZA,2443
 simo/notifications/serializers.py,sha256=altDEAPWwOhxRcEzE9-34jL8EFpyf3vPoEdAPoVLfGc,523
-simo/notifications/utils.py,sha256=RnvwKFGZ6e34ishUWHfZq4m3H6XFxFbRF4NQCi2LT-E,2049
+simo/notifications/utils.py,sha256=k-dtvgPDuNB5T_PDPBA3NhQN_xZoIgRUGHQkBy1EGMg,2034
 simo/notifications/__pycache__/__init__.cpython-38.pyc,sha256=YvucUfu98XFvEEg1LYFMlOZJpo_jSGxTVrM-ylAFLOg,167
 simo/notifications/__pycache__/admin.cpython-38.pyc,sha256=MScNrtVM1wavefsPfxy0A7LVyXKcbvEkLH9GJkgNOl8,1945
 simo/notifications/__pycache__/api.cpython-38.pyc,sha256=eQmCHwTnr4zQ3ZY_SKZVCryiSEnzmyIjHQM13pZ5LT0,2071
@@ -10484,7 +10485,7 @@ simo/users/auto_urls.py,sha256=RSUW3ai5LbMTknS8M7M5aOnG_YlFOVQrnNVNH-fkwlg,357
 simo/users/dynamic_settings.py,sha256=sEIsi4yJw3kH46Jq_aOkSuK7QTfQACGUE-lkyBogCaM,570
 simo/users/managers.py,sha256=OHgEP85MBtdkdYxdstBd8RavTBT8F_2WyDxUJ9aCqqM,246
 simo/users/middleware.py,sha256=GMCrnWSc_2qCleyQIkfQGdL-pU-UTEcSg1wPvIKZ9uk,1210
-simo/users/models.py,sha256=2c9unF8xd9kjwzwQEUEsxw79NrO1_YSJZl6h4wpNsI8,19915
+simo/users/models.py,sha256=qTlhML4zRfL_Gcomblc09GU1xWDa4DOwbFaxCgd_rsE,20563
 simo/users/permissions.py,sha256=IwtYS8yQdupWbYKR9VimSRDV3qCJ2jXP57Lyjpb2EQM,242
 simo/users/serializers.py,sha256=zzw1KONTnaTNBaU0r4rNVxJ827KzD6Z5LuQt27ZsQ98,2516
 simo/users/sso_urls.py,sha256=gQOaPvGMYFD0NCVSwyoWO-mTEHe5j9sbzV_RK7kdvp0,251
@@ -10607,9 +10608,9 @@ simo/users/templates/invitations/expired_msg.html,sha256=47DEQpj8HBSa-_TImW-5JCe
 simo/users/templates/invitations/expired_suggestion.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/users/templates/invitations/taken_msg.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/users/templates/invitations/taken_suggestion.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-simo-2.7.8.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.7.8.dist-info/METADATA,sha256=N8l_soYBEp5Ohuwp2gwQwgd2ScThohJQUa7cfGSkVVk,1952
-simo-2.7.8.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-simo-2.7.8.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
-simo-2.7.8.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.7.8.dist-info/RECORD,,
+simo-2.7.10.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.7.10.dist-info/METADATA,sha256=FMpBbEAAJ0ZOZX4tmR9O9f-8ytqI4l4BHTCYUWAELbA,1953
+simo-2.7.10.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+simo-2.7.10.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
+simo-2.7.10.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.7.10.dist-info/RECORD,,