simo 2.0.26__py3-none-any.whl → 2.0.28__py3-none-any.whl

simo/core/forms.py

@@ -347,7 +347,12 @@ class ComponentAdminForm(forms.ModelForm):
             # not a form submission, don't modify self.fields
             return
 
-        got_keys = data.keys()
+        got_keys = list(data.keys())
+        formset_fields = set()
+        for key in got_keys:
+            if key.endswith('-TOTAL_FORMS'):
+                formset_fields.add(key[:-12])
+        got_keys.extend(list(formset_fields))
         field_names = self.fields.keys()
         for missing in set(field_names) - set(got_keys):
             del self.fields[missing]

simo/core/models.py

@@ -68,7 +68,7 @@ def post_icon_delete(sender, instance, *args, **kwargs):
             pass
 
 
-class Instance(DirtyFieldsMixin, models.Model, SimoAdminMixin):
+class Instance(models.Model, SimoAdminMixin):
     # Multiple home instances can be had on a single hub computer!
     # For example separate hotel apartments
     # or something of that kind.

simo/core/permissions.py

@@ -59,7 +59,7 @@ class InstanceSuperuserCanEdit(BasePermission):
         if user_role.is_superuser:
             return True
 
-        if user_role.is_owner and request.method == 'PUT':
+        if user_role.is_owner and request.method != 'DELETE':
             return True
 
         return False
@@ -76,6 +76,8 @@ class ComponentPermission(BasePermission):
         user_role = request.user.get_role(view.instance)
         if user_role.is_superuser:
             return True
+        if user_role.is_owner and request.method != 'DELETE':
+            return True
         if request.method == 'POST' and user_role.component_permissions.filter(
             write=True, component=obj
         ).count():

simo/core/serializers.py

@@ -261,12 +261,6 @@ class ComponentSerializer(FormSerializer):
         self.set_form_cls()
 
         ret = OrderedDict()
-        if not self.context['request'].user.is_master:
-            user_role = self.context['request'].user.get_role(
-                self.context['instance']
-            )
-            if not any([user_role.is_superuser, user_role.is_owner]):
-                return ret
 
         field_mapping = reduce_attr_dict_from_instance(
             self,
@@ -376,9 +370,11 @@ class ComponentSerializer(FormSerializer):
             user_role = self.context['request'].user.get_role(
                 self.context['instance']
             )
+            print("FORM BASIC FIELDS: ", form.basic_fields)
             if not user_role.is_superuser and user_role.is_owner:
                 for field_name in list(form.fields.keys()):
                     if field_name not in form.basic_fields:
+                        print("DELETE FIELD: ", field_name)
                         del form.fields[field_name]
         return form
 

simo/core/tasks.py

@@ -331,6 +331,30 @@ def restart_postgresql():
     proc.communicate()
 
 
+@celery_app.task
+def low_battery_notifications():
+    from simo.users.models import User
+    from simo.notifications.utils import notify_users
+    for instance in Instance.objects.all():
+        timezone.activate(instance.timezone)
+        if timezone.localtime().hour != 10:
+            continue
+        for comp in Component.objects.filter(
+            zone__instance=instance,
+            battery_level__isnull=False, battery_level__lt=20
+        ):
+            users = User.objects.filter(
+                roles__is_owner=True, roles__instance=comp.zone.instance
+            ).distinct()
+            if users:
+                notify_users(
+                    comp.zone.instance, 'warning',
+                    f"Low battery ({comp.battery_level}%) on {comp}",
+                    component=comp, users=users
+                )
+
+
+
 @celery_app.on_after_finalize.connect
 def setup_periodic_tasks(sender, **kwargs):
     sender.add_periodic_task(1, watch_timers.s())
@@ -339,3 +363,4 @@ def setup_periodic_tasks(sender, **kwargs):
     sender.add_periodic_task(60 * 60 * 6, update_latest_version_available.s())
     sender.add_periodic_task(60, drop_fingerprints_learn.s())
     sender.add_periodic_task(60 * 60 * 24, restart_postgresql.s())
+    sender.add_periodic_task(60 * 60, low_battery_notifications.s())

simo/generic/models.py

@@ -125,11 +125,27 @@ def bind_controlling_locks_to_alarm_groups(sender, instance, *args, **kwargs):
             base_type=AlarmGroup.base_type,
             config__arming_locks__contains=instance.id
         ):
-            if ag.config.get(
-                'arm_on_away', ''
-            ).startswith('on_away_and_locked'):
+            if ag.config.get('arm_on_away') in (None, 'on_away'):
                 continue
-            ag.arm()
+            users_at_home = InstanceUser.objects.filter(
+                instance=instance.instance, at_home=True
+            ).exclude(is_active=False).exclude(id=instance.id).count()
+            if users_at_home:
+                continue
+            if ag.config.get('arm_on_away') == 'on_away_and_locked':
+                print(f"Nobody is at home, lock was locked. Arm {ag}!")
+                ag.arm()
+                continue
+            locked_states = [
+                True if l['value'] == 'locked' else False
+                for l in Component.objects.filter(
+                    base_type='lock', id__in=ag.config.get('arming_locks', []),
+                ).values('value')
+            ]
+            if all(locked_states):
+                print(f"Nobody is at home, all locks are now locked. Arm {ag}!")
+                ag.arm()
+
     elif instance.value == 'unlocked':
         for ag in Component.objects.filter(
             base_type=AlarmGroup.base_type,
@@ -148,8 +164,8 @@ def bind_alarm_groups(sender, instance, created, *args, **kwargs):
         return
     users_at_home = InstanceUser.objects.filter(
         instance=instance.instance, at_home=True
-    ).exclude(is_active=False).exclude(id=instance.id)
-    if users_at_home.count():
+    ).exclude(is_active=False).exclude(id=instance.id).count()
+    if users_at_home:
         return
     for ag in Component.objects.filter(
         zone__instance=instance.instance,

simo/notifications/utils.py

@@ -6,9 +6,7 @@ def notify_users(instance, severity, title, body=None, component=None, users=Non
     assert severity in ('info', 'warning', 'alarm')
     notification = Notification.objects.create(
         instance=instance,
-        title='<strong>%s:</strong> %s' % (
-            instance.name, title
-        ),
+        title=f'{instance.name}: {title}',
         severity=severity, body=body,
         component=component
     )
@@ -18,6 +16,9 @@ def notify_users(instance, severity, title, body=None, component=None, users=Non
             instance_roles__is_active=True
         )
     for user in users:
+        # do not send emails to system users
+        if user.email.endswith('simo.io'):
+            continue
         if instance not in user.instances:
             continue
         if component and not component.can_write(user):

{simo-2.0.26.dist-info → simo-2.0.28.dist-info}/METADATA

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

{simo-2.0.26.dist-info → simo-2.0.28.dist-info}/RECORD

@@ -38,19 +38,19 @@ simo/core/controllers.py,sha256=iJ7cIGv2WhSGjyxCFfK49pZXuEMfSe75bMEAkRN8G4g,2710
 simo/core/dynamic_settings.py,sha256=U2WNL96JzVXdZh0EqMPWrxqO6BaRR2Eo5KTDqz7MC4o,1943
 simo/core/events.py,sha256=LvtonJGNyCb6HLozs4EG0WZItnDwNdtnGQ4vTcnKvUs,4438
 simo/core/filters.py,sha256=ghtOZcrwNAkIyF5_G9Sn73NkiI71mXv0NhwCk4IyMIM,411
-simo/core/forms.py,sha256=tsWBsoBJeUiXDVU6lKbMbnBZORmNrnK5XnoBS_9uWsU,23583
+simo/core/forms.py,sha256=fLPVOZOuHZigeXhuFaliY03-egMKiad1QW91LPpSMA8,23786
 simo/core/gateways.py,sha256=s_c2W0v2_te89i6LS4Nj7F2wn9UwjZXPT7pfy6SToVo,3714
 simo/core/loggers.py,sha256=EBdq23gTQScVfQVH-xeP90-wII2DQFDjoROAW6ggUP4,1645
 simo/core/managers.py,sha256=WoQ4OX3akIvoroSYji-nLVqXBSJzCiC1u_IiWkKbKmA,2413
 simo/core/middleware.py,sha256=pO52hQOJV_JRmNyUe7zfufSnJFlRITOWX6jwkoPWJhk,2052
-simo/core/models.py,sha256=m05fXzOtLrq4LEGknU1mjTHzaTmIEBi1zhwvtDWDknE,19773
-simo/core/permissions.py,sha256=TCIHf6kjVAs2mGQ2IV2YRxjHYBsDbl47FLm_wCRKMwY,2618
+simo/core/models.py,sha256=PAVuRYldy4qw7KTsU3ClkEHY7UVvW7CPGGqM3frtvz4,19755
+simo/core/permissions.py,sha256=yqVXq6SNZccSKcOoGdb0oh-WHsyTTtI9ovJdJyhjv28,2707
 simo/core/routing.py,sha256=X1_IHxyA-_Q7hw1udDoviVP4_FSBDl8GYETTC2zWTbY,499
-simo/core/serializers.py,sha256=xL0RHvi20_2qsQzHMN92xhmpp-wmo54UUl9wfkYp61k,18329
+simo/core/serializers.py,sha256=vOrWlfSkmdyaG0VPM0fmRLd7OkkNNGyAkc6Q8Cwa_1Q,18179
 simo/core/signal_receivers.py,sha256=EZ8NSYZxUgSaLS16YZdK7T__l8dl0joMRllOxx5PUt4,2809
 simo/core/socket_consumers.py,sha256=n7VE2Fvqt4iEAYLTRbTPOcI-7tszMAADu7gimBxB-Fg,9635
 simo/core/storage.py,sha256=YlxmdRs-zhShWtFKgpJ0qp2NDBuIkJGYC1OJzqkbttQ,572
-simo/core/tasks.py,sha256=4QShdl39MB6InYfBYiGJ167ARKBhO7WHMvU7i-kvsRU,11325
+simo/core/tasks.py,sha256=PEGGsKBbkQOl3LhLfGR5orbYtCxzcv8peMLiVxgl3R0,12228
 simo/core/todos.py,sha256=eYVXfLGiapkxKK57XuviSNe3WsUYyIWZ0hgQJk7ThKo,665
 simo/core/types.py,sha256=WJEq48mIbFi_5Alt4wxWMGXxNxUTXqfQU5koH7wqHHI,1108
 simo/core/views.py,sha256=hlAKpAbCbqI3a-uL5tDp532T2oLFiF0MBzKUJ_SNzo0,5833
@@ -69,19 +69,19 @@ simo/core/__pycache__/controllers.cpython-38.pyc,sha256=40wJ3mu0CnzexxDzXyDIlSxa
 simo/core/__pycache__/dynamic_settings.cpython-38.pyc,sha256=ELu06Hub4DOidja71ybvD3ZM4HdXiyZjNJrZfnXZXNA,2476
 simo/core/__pycache__/events.cpython-38.pyc,sha256=A1Axx-qftd1r7st7wkO3DkvTdt9-RkcJe5KJhpzJVk8,5109
 simo/core/__pycache__/filters.cpython-38.pyc,sha256=VIMADCBiYhziIyRmxAyUDJluZvuZmiC4bNYWTRsGSao,721
-simo/core/__pycache__/forms.cpython-38.pyc,sha256=d0ruviTG6zihcc9hJ1TvVxPODwe7LJCyo_ZpLIUt5pI,19850
+simo/core/__pycache__/forms.cpython-38.pyc,sha256=jHbvv2098I6-lWHLg6_G6sxTmXSzk670WophuMGcSzI,19987
 simo/core/__pycache__/gateways.cpython-38.pyc,sha256=XBiwMfBkjoQ2re6jvADJOwK0_0Aav-crzie9qtfqT9U,4599
 simo/core/__pycache__/loggers.cpython-38.pyc,sha256=Z-cdQnC6XlIonPV4Sl4E52tP4NMEdPAiHK0cFaIL7I8,1623
 simo/core/__pycache__/managers.cpython-38.pyc,sha256=5vstOMfm997CZBBkaSiaS7EojhLTWZlbeA_EQ8u-yfg,2554
 simo/core/__pycache__/middleware.cpython-38.pyc,sha256=ESR5JPtITo9flczO0672sfzYUxrc_cQU0e0w5DFL-60,2038
-simo/core/__pycache__/models.cpython-38.pyc,sha256=kYcojazryAAgZCXMoqqutIG2p8ofSKxza9TMx1SR2dQ,17233
-simo/core/__pycache__/permissions.cpython-38.pyc,sha256=SV8hZn3Zh-K4NrdtADZ9RlkkHSHTDbScR24Nto8mJXw,2759
+simo/core/__pycache__/models.cpython-38.pyc,sha256=Meg9pm3gCMVgE1a37nEsCtqONMNFeG9R4oPON4CQgcw,17231
+simo/core/__pycache__/permissions.cpython-38.pyc,sha256=flJOCh94U8mFhE0XWzUD0sGR6Xe1HlfG4hQtNSnAGZ4,2788
 simo/core/__pycache__/routing.cpython-38.pyc,sha256=3T3FPJ8Cn99xZCGvMyg2xjl7al-Shm9CelbSpkJtNP8,599
-simo/core/__pycache__/serializers.cpython-38.pyc,sha256=LqjUor0ggXAWSRgTSEdWYGllIOhio8Mlh-kkhBbai30,17237
+simo/core/__pycache__/serializers.cpython-38.pyc,sha256=Pi9lddoS_DtMuA1iZ4mFHu_dG2mjouWxajM4udPQKqo,17185
 simo/core/__pycache__/signal_receivers.cpython-38.pyc,sha256=sgjH_wv-1U99auH5uHb3or0qettPeHAlsz8P7B03ajY,2430
 simo/core/__pycache__/socket_consumers.cpython-38.pyc,sha256=NJUr7nRyHFvmAumxxWpsod5wzVVZM99rCEuJs1utHA4,8432
 simo/core/__pycache__/storage.cpython-38.pyc,sha256=BTkYH8QQyjqI0WOtJC8fHNtgu0YA1vjqZclXjC2vCVI,1116
-simo/core/__pycache__/tasks.cpython-38.pyc,sha256=JTqXI_QPhU8u5c8MdhxILLKcn-5ZlIwtG1mGO4bgB7A,8474
+simo/core/__pycache__/tasks.cpython-38.pyc,sha256=8VyzcG4psw5cS2oTy8W7EVW_nP7fzhoMvxXczTe1rcw,9134
 simo/core/__pycache__/todos.cpython-38.pyc,sha256=lOqGZ58siHM3isoJV4r7sg8igrfE9fFd-jSfeBa0AQI,253
 simo/core/__pycache__/views.cpython-38.pyc,sha256=YrKRZPaV_JM4VGpdhVhsK-90UwUTOqp-V-Yj0SRGZgs,4212
 simo/core/__pycache__/widgets.cpython-38.pyc,sha256=sR0ZeHCHrhnNDBJuRrxp3zUsfBp0xrtF0xrK2TkQv1o,3520
@@ -10278,7 +10278,7 @@ simo/generic/base_types.py,sha256=djymox_boXTHX1BTTCLXrCH7ED-uAsV_idhaDOc3OLI,40
 simo/generic/controllers.py,sha256=WYuOUzDWvkYRaTvlbdGy_qmwp1o_ohqKDfV7OrOq2QU,52218
 simo/generic/forms.py,sha256=uLZ25Fw1xGqyDBngWPve9EaHpyldFegY_TPBKV4Oby0,24051
 simo/generic/gateways.py,sha256=b3tQ2bAkDVYXCF5iZi2yi-6nZAM8WmHE9ICwxMyR0to,17034
-simo/generic/models.py,sha256=ni1cgqVZ8ttk1snW26EB-2dqsHRZkLg6463my_Cu3EU,6618
+simo/generic/models.py,sha256=92TACMhJHadAg0TT9GnARO_R3_Sl6i-GGjhG_x7YdFI,7391
 simo/generic/routing.py,sha256=elQVZmgnPiieEuti4sJ7zITk1hlRxpgbotcutJJgC60,228
 simo/generic/socket_consumers.py,sha256=NfTQGYtVAc864IoogZRxf_0xpDPM0eMCWn0SlKA5P7Y,1751
 simo/generic/__pycache__/__init__.cpython-38.pyc,sha256=mLu54WS9KIl-pHwVCBKpsDFIlOqml--JsOVzAUHg6cU,161
@@ -10287,7 +10287,7 @@ simo/generic/__pycache__/base_types.cpython-38.pyc,sha256=ptw6axyAqemZA35oa6vzr7
 simo/generic/__pycache__/controllers.cpython-38.pyc,sha256=e0bvgyePgJbIs1omBq0TRPlVSKar2sK_JbUKqDRj7mY,33235
 simo/generic/__pycache__/forms.cpython-38.pyc,sha256=U67jiwt6R8J547n7d84-_9mUxCXxKl-L0VFdYfo1aiM,17787
 simo/generic/__pycache__/gateways.cpython-38.pyc,sha256=a4lLIMPyxm9tNzIqorXHIPZFVTcXlPsM1ycJMghxcHA,12673
-simo/generic/__pycache__/models.cpython-38.pyc,sha256=yr64EX5n9u9uaOHNbPhNIBoBJo4Y3V_lvDj1ggMAZCQ,5123
+simo/generic/__pycache__/models.cpython-38.pyc,sha256=PzlZsM1jxo3FVb7QDm3bny8UFwTsGrMQe4mj4tJ06eQ,5675
 simo/generic/__pycache__/routing.cpython-38.pyc,sha256=xtxTUTBTdivzFyA5Wh7k-hUj1WDO_FiRq6HYXdbr9Ks,382
 simo/generic/__pycache__/socket_consumers.cpython-38.pyc,sha256=piFHces0J9QuXu_CNBCQCYjoZEeoaxyVjLfJ9KaR8C8,1898
 simo/generic/static/weather_icons/01d@2x.png,sha256=TZfWi6Rfddb2P-oldWWcjUiuCHiU9Yrc5hyrQAhF26I,948
@@ -10348,7 +10348,7 @@ simo/notifications/admin.py,sha256=y_gmHYXbDh98LUUa-lp9DilTIgM6-pIujWPQPLQsJo8,8
 simo/notifications/api.py,sha256=GXQpq68ULBaJpU8w3SJKaCKuxYGWYehKnGeocGB1RVc,1783
 simo/notifications/models.py,sha256=VZcvweii59j89nPKlWeUSJ44Qz3ZLjJ6mXN6uB9F1Sw,2506
 simo/notifications/serializers.py,sha256=altDEAPWwOhxRcEzE9-34jL8EFpyf3vPoEdAPoVLfGc,523
-simo/notifications/utils.py,sha256=5CtKOvX0vbWLXFvJD_8WfWulMEp1FuMwrfCGDLHySdA,907
+simo/notifications/utils.py,sha256=VCBKcHrtZrdCalKe2w7umt7-trhG3vw-fKn1ndyr3CA,971
 simo/notifications/__pycache__/__init__.cpython-38.pyc,sha256=YvucUfu98XFvEEg1LYFMlOZJpo_jSGxTVrM-ylAFLOg,167
 simo/notifications/__pycache__/admin.cpython-38.pyc,sha256=Fl4crSZTFQOTYQioV6ff9fBRV4MhNiwQgMS2VnmCI4M,1632
 simo/notifications/__pycache__/api.cpython-38.pyc,sha256=ys6E4AFghX6bq-rQ0gtA9s0Y2Hh-ypsWH8-Yz4edMrc,2073
@@ -10456,8 +10456,8 @@ 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.0.26.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.0.26.dist-info/METADATA,sha256=7QlteBUjfDoMYB7h3GQspaQINFPXrri9o-vxvt9QPQY,1730
-simo-2.0.26.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-simo-2.0.26.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.0.26.dist-info/RECORD,,
+simo-2.0.28.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.0.28.dist-info/METADATA,sha256=_YtDqotbhb9Tmq6gjFTcocuHWtFdM-7pcy2H10cipLQ,1730
+simo-2.0.28.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+simo-2.0.28.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.0.28.dist-info/RECORD,,