simo 2.0.16__py3-none-any.whl → 2.0.18__py3-none-any.whl

simo/core/models.py

@@ -79,7 +79,7 @@ class Instance(DirtyFieldsMixin, models.Model, SimoAdminMixin):
     )
     name = models.CharField(max_length=100, db_index=True, unique=True)
     slug = models.CharField(max_length=100, db_index=True, unique=True)
-    cover_image = ThumbnailerImageField(
+    cover_image = models.ImageField(
         upload_to='hub_covers', null=True, blank=True
     )
     cover_image_synced = models.BooleanField(default=False)
@@ -151,7 +151,7 @@ class Category(DirtyFieldsMixin, models.Model, SimoAdminMixin):
     instance = models.ForeignKey(Instance, on_delete=models.CASCADE)
     name = models.CharField(_('name'), max_length=40)
     icon = models.ForeignKey(Icon, on_delete=models.SET_NULL, null=True)
-    header_image = ThumbnailerImageField(
+    header_image = models.ImageField(
         upload_to='categories', null=True, blank=True,
         help_text="Will be cropped down to: 830x430"
     )

simo/core/serializers.py

@@ -4,6 +4,7 @@ import json
 from django import forms
 from collections import OrderedDict
 from django.forms.utils import ErrorDict
+from django.conf import settings
 from collections.abc import Iterable
 from easy_thumbnails.files import get_thumbnailer
 from simo.core.middleware import get_current_request
@@ -51,9 +52,11 @@ class CategorySerializer(serializers.ModelSerializer):
 
     def get_header_image_thumb(self, obj):
         if obj.header_image:
-            url = get_thumbnailer(obj.header_image).get_thumbnail(
+            thumbnailer = get_thumbnailer(obj.header_image.path)
+            thumb = thumbnailer.get_thumbnail(
                 {'size': (830, 430), 'crop': True}
-            ).url
+            )
+            url = '/' + thumb.path.strip(settings.VAR_DIR)
             request = get_current_request()
             if request:
                 url = request.build_absolute_uri(url)

simo/core/tasks.py

@@ -7,20 +7,16 @@ import datetime
 import requests
 import subprocess
 import threading
-import simo
 import pkg_resources
 from django.db.models import Q
 from django.db import connection
-from django.db import transaction
 from django.template.loader import render_to_string
-from easy_thumbnails.files import get_thumbnailer
 from celeryc import celery_app
 from django.utils import timezone
-from django.conf import settings
+from easy_thumbnails.files import get_thumbnailer
 from simo.conf import dynamic_settings
 from simo.core.utils.helpers import get_self_ip
 from .models import Instance, Component, ComponentHistory, HistoryAggregate
-from .utils.helpers import get_random_string, is_update_available
 
 
 def supervisor_restart():
@@ -150,7 +146,8 @@ def sync_with_remote():
         if instance.share_location:
             instance_data['location'] = instance.location
         if instance.cover_image and not instance.cover_image_synced:
-            cover_imb_path = instance.cover_image.get_thumbnail(
+            thumbnailer = get_thumbnailer(instance.cover_image.path)
+            cover_imb_path = thumbnailer.get_thumbnail(
                 {'size': (880, 490), 'crop': True}
             ).path
             with open(cover_imb_path, 'rb') as img:

simo/fleet/serializers.py

@@ -1,5 +1,5 @@
 from rest_framework import serializers
-from .models import InstanceOptions, Colonel, ColonelPin
+from .models import InstanceOptions, Colonel, ColonelPin, Interface
 
 
 class InstanceOptionsSerializer(serializers.ModelSerializer):
@@ -25,19 +25,28 @@ class ColonelPinSerializer(serializers.ModelSerializer):
         return bool(obj.occupied_by)
 
 
+class ColonelInterfaceSerializer(serializers.ModelSerializer):
+
+    class Meta:
+        model = Interface
+        fields = 'id', 'no', 'type'
+        read_only_fields = fields
+
+
 class ColonelSerializer(serializers.ModelSerializer):
     pins = serializers.SerializerMethodField()
+    interfaces = serializers.SerializerMethodField()
 
     class Meta:
         model = Colonel
         fields = (
             'id', 'uid', 'name', 'type', 'firmware_version', 'firmware_auto_update',
             'socket_connected', 'last_seen', 'enabled', 'pwm_frequency',
-            'logs_stream', 'pins'
+            'logs_stream', 'pins', 'interfaces',
         )
         read_only_fields = [
             'uid', 'type', 'firmware_version', 'socket_connected',
-            'last_seen', 'pins'
+            'last_seen', 'pins', 'interfaces',
         ]
 
     def get_pins(self, obj):
@@ -46,6 +55,12 @@ class ColonelSerializer(serializers.ModelSerializer):
             result.append(ColonelPinSerializer(pin).data)
         return result
 
+    def get_interfaces(self, obj):
+        result = []
+        for interface in obj.interfaces.all():
+            result.append(ColonelInterfaceSerializer(interface).data)
+        return result
+
     def update(self, instance, validated_data):
         instance = super().update(instance, validated_data)
         instance.update_config()

simo/generic/forms.py

@@ -218,6 +218,16 @@ class AlarmGroupConfigForm(BaseComponentForm):
         required=False,
         help_text="Defines if this is your main/top global alarm group."
     )
+    arm_on_away = forms.ChoiceField(
+        required=False,
+        choices=(
+            (None, "No"),
+            ('on_away', "Yes"),
+            ('on_away_and_locked', "Yes, but only if at least one arming lock is Locked."),
+            ('on_away_and_locked_all', "Yes, but only if all arming locks are Locked."),
+        ),
+        help_text="Arm automatically as soon as everybody leaves.<br>"
+    )
     arming_locks = forms.ModelMultipleChoiceField(
         Component.objects.filter(base_type='lock'),
         label="Arming locks", required=False,
@@ -228,7 +238,9 @@ class AlarmGroupConfigForm(BaseComponentForm):
             )
         ),
         help_text="Alarm group will get armed automatically whenever "
-                  "any of assigned locks get's locked. "
+                  "any of assigned locks changes it's state to locked. <br>"
+                  "If Arm on away is enabled and set to work with arming locks, "
+                  "arming will take effect only after everybody leaves."
     )
     disarming_locks = forms.ModelMultipleChoiceField(
         Component.objects.filter(base_type='lock'),
@@ -240,7 +252,7 @@ class AlarmGroupConfigForm(BaseComponentForm):
             )
         ),
         help_text="Alarm group will be disarmed automatically whenever "
-                  "any of assigned locks get's unlocked. "
+                  "any of assigned locks changes it's state to unlocked. "
     )
     notify_on_breach = forms.IntegerField(
         required=False, min_value=0,

simo/generic/models.py

@@ -5,6 +5,7 @@ from threading import Timer
 from django.db.models.signals import pre_save, post_save, post_delete
 from django.dispatch import receiver
 from simo.core.models import Instance, Component
+from simo.users.models import InstanceUser
 from .controllers import AlarmGroup
 
 
@@ -124,6 +125,10 @@ 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'):
+                continue
             ag.arm()
     elif instance.value == 'unlocked':
         for ag in Component.objects.filter(
@@ -132,3 +137,39 @@ def bind_controlling_locks_to_alarm_groups(sender, instance, *args, **kwargs):
         ):
             ag.disarm()
 
+
+@receiver(post_save, sender=InstanceUser)
+def bind_alarm_groups(sender, instance, created, *args, **kwargs):
+    if created:
+        return
+    if instance.at_home:
+        return
+    if 'at_home' not in instance.get_dirty_fields():
+        return
+    users_at_home = InstanceUser.objects.filter(
+        instance=instance.instance, at_home=True
+    ).exclude(is_active=False).exclude(instance.id)
+    if not users_at_home.count():
+        for ag in Component.objects.filter(
+            zone__instance=instance.instance,
+            base_type=AlarmGroup.base_type,
+            config__has_key='arm_on_away'
+        ).exclude(config__arm_on_away=None):
+            if ag.config.get('arm_on_away') == 'on_away':
+                ag.arm()
+            elif ag.config.get('arm_on_away').startswith('on_away_and_locked'):
+                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 not any(locked_states):
+                    continue
+                if ag.config['arm_on_away'] == 'on_away_and_locked':
+                    ag.arm()
+                    continue
+                if ag.config['arm_on_away'] == 'on_away_and_locked_all' \
+                and all(locked_states):
+                    ag.arm()
+                    continue

{simo-2.0.16.dist-info → simo-2.0.18.dist-info}/METADATA

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

{simo-2.0.16.dist-info → simo-2.0.18.dist-info}/RECORD

@@ -43,14 +43,14 @@ 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=64PYjnyRnYf4sgMvPfR0oQqf9UEtxUwnhJe3RV6z_HI,2040
-simo/core/models.py,sha256=j5AymbJFt5HOIOYsHJ8UUKhb1TvIoqgH0T1y3BeGJuM,19408
+simo/core/models.py,sha256=dPLPju4xxc46x9JciOTC65SFSPogboXyNxjwrewXB1Y,19400
 simo/core/permissions.py,sha256=UmFjGPDWtAUbaWxJsWORb2q6BREHqndv9mkSIpnmdLk,1379
 simo/core/routing.py,sha256=X1_IHxyA-_Q7hw1udDoviVP4_FSBDl8GYETTC2zWTbY,499
-simo/core/serializers.py,sha256=dY2R9KPvmmwMP4Up_6AHM6lf0MY3BoON8Dn8ixFubAI,17118
+simo/core/serializers.py,sha256=HMSMOA5IcIYDIVipvuozf6bymJ-drvABPjEs-4lPjsI,17251
 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=se27V-noW02v4ZY2PMv0AJkXNsY3NtJ4G43__KLW7Kg,11005
+simo/core/tasks.py,sha256=K64_8msFxUnggQDD2lBhtv4l7WliajQTlJNwe-m4BvY,10920
 simo/core/todos.py,sha256=eYVXfLGiapkxKK57XuviSNe3WsUYyIWZ0hgQJk7ThKo,665
 simo/core/types.py,sha256=WJEq48mIbFi_5Alt4wxWMGXxNxUTXqfQU5koH7wqHHI,1108
 simo/core/views.py,sha256=hlAKpAbCbqI3a-uL5tDp532T2oLFiF0MBzKUJ_SNzo0,5833
@@ -74,14 +74,14 @@ simo/core/__pycache__/gateways.cpython-38.pyc,sha256=XBiwMfBkjoQ2re6jvADJOwK0_0A
 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=bGOFJNEhJeLbpsZp8LYn1VA3paLF5HULHQ6IFKa7Juc,2022
-simo/core/__pycache__/models.cpython-38.pyc,sha256=Gm36LWRxswvWiB3Wz0F7g32ZVXugh7chSSBz1lgBPZs,16995
+simo/core/__pycache__/models.cpython-38.pyc,sha256=J3VZfFaU-aMkptCoviPvAJzJ8zBptGHmt504zjf2TCI,17006
 simo/core/__pycache__/permissions.cpython-38.pyc,sha256=uygjPbfRQiEzyo5-McCxsuMDJLbDYO_TLu55U7bJbR0,1809
 simo/core/__pycache__/routing.cpython-38.pyc,sha256=3T3FPJ8Cn99xZCGvMyg2xjl7al-Shm9CelbSpkJtNP8,599
-simo/core/__pycache__/serializers.cpython-38.pyc,sha256=07FzXZGZBEHlx1vboZThhU98WpmJDSbcQP3uYWNKMDw,16551
+simo/core/__pycache__/serializers.cpython-38.pyc,sha256=YkAXdCwfPEysAQ5Nin9B48cZ5pK_2WZwyR5ZEwfJrC4,16666
 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=SyDXfBVyLfDnCcBYUVFDTMhmfB_frWyEQG6jQYcbyh4,8392
+simo/core/__pycache__/tasks.cpython-38.pyc,sha256=9L1a14-cifiS4WSS7SliJ2486tpL245YbPkmUiCUe3A,8244
 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
@@ -10174,7 +10174,7 @@ simo/fleet/gateways.py,sha256=KV5i5fxXIrlK-k6zyEkk83x11GJt-ELQ0npb4Ac83cM,3693
 simo/fleet/managers.py,sha256=XOpDOA9L-f_550TNSyXnJbun2EmtGz1TenVTMlUSb8E,807
 simo/fleet/models.py,sha256=1Wb9xPc61OtoiYu9aS4KezchPGZTC4CDxa2dqVhltqM,14161
 simo/fleet/routing.py,sha256=cofGsVWXMfPDwsJ6HM88xxtRxHwERhJ48Xyxc8mxg5o,149
-simo/fleet/serializers.py,sha256=zEpXAXxjk4Rf1JhlNnLTrs20qJggqjvIySbeHVo4Tt4,1505
+simo/fleet/serializers.py,sha256=LgSTnSI_sUhFXmW9-669keM6gmaSI_teaqMHEab4aL4,1972
 simo/fleet/socket_consumers.py,sha256=Z-MooNN2HQccdhkynADJks5slbK9mGsnEpMLuA51H3I,18534
 simo/fleet/tasks.py,sha256=AGq9BXFNAqkhOANsPvId8yjEbDtVCB3MRsi_AKDpgIM,821
 simo/fleet/utils.py,sha256=2gcjbwQawsGw2edr_wm9q6XacGpYqO-gd4BF1t0Hg6U,3511
@@ -10191,7 +10191,7 @@ simo/fleet/__pycache__/gateways.cpython-38.pyc,sha256=YAcgTOqJbtjGI03lvEcU6keFfr
 simo/fleet/__pycache__/managers.cpython-38.pyc,sha256=8uz-xpUiqbGDgXIZ_XRZtFb-Tju6NGxflGg-Ee4Yo6k,1310
 simo/fleet/__pycache__/models.cpython-38.pyc,sha256=DQtRR6kI9bt3atgJ0pArCVfSyuutqb6SpxYrsBg10cM,12277
 simo/fleet/__pycache__/routing.cpython-38.pyc,sha256=aPrCmxFKVyB8R8ZbJDwdPdFfvT7CvobovvZeq_mqRgY,314
-simo/fleet/__pycache__/serializers.cpython-38.pyc,sha256=yuY2H7jcboQGZdjb5WIsgNHXFhI9IPMUrEu9NgSiXNo,2452
+simo/fleet/__pycache__/serializers.cpython-38.pyc,sha256=gwLIoLQJwkFoDCjKC_ikksNCYea3-mF8hVHFeKlOkbc,3098
 simo/fleet/__pycache__/socket_consumers.cpython-38.pyc,sha256=RjzPD580096fby0HYLzZorm61zdZNOq5AHXmNAC4Yd8,13764
 simo/fleet/__pycache__/tasks.cpython-38.pyc,sha256=RoNxL2WUiW67s9O9DjaYVVjCBSZu2nje0Qn9FJkWVS0,1116
 simo/fleet/__pycache__/utils.cpython-38.pyc,sha256=dTuvW9MnhUycwdCc6eHYfHsMlvZw-CmEWXWYu18X8Uw,1955
@@ -10270,18 +10270,18 @@ simo/generic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/generic/app_widgets.py,sha256=E_pnpA1hxMIhenRCrHoQ5cik06jm2BAHCkl_eo-OudU,1264
 simo/generic/base_types.py,sha256=djymox_boXTHX1BTTCLXrCH7ED-uAsV_idhaDOc3OLI,409
 simo/generic/controllers.py,sha256=WYuOUzDWvkYRaTvlbdGy_qmwp1o_ohqKDfV7OrOq2QU,52218
-simo/generic/forms.py,sha256=lrdGgOuFxizUu2l5PbW8CUiI0V_L8xHl2pN_kZB9238,23160
+simo/generic/forms.py,sha256=U6MIS5U7jLG6XabqCZvrfSoiNCQiWZYE8VZPnyN3SJw,23757
 simo/generic/gateways.py,sha256=b3tQ2bAkDVYXCF5iZi2yi-6nZAM8WmHE9ICwxMyR0to,17034
-simo/generic/models.py,sha256=qRwZq92_suejbXSPTqbjIfICT0Y_ABywwYPa8DJ2V8A,5053
+simo/generic/models.py,sha256=iUE1-PVyAPvOkxczU6sXZKUwWVQxkljtx2E4g9WstnU,6711
 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
 simo/generic/__pycache__/app_widgets.cpython-38.pyc,sha256=0IoKRG9n1tkNRRkrqAeOQwWBPd_33u98JBcVtMVVCio,2374
 simo/generic/__pycache__/base_types.cpython-38.pyc,sha256=ptw6axyAqemZA35oa6vzr7EihzvbhW9w7Y-G6kfDedU,555
 simo/generic/__pycache__/controllers.cpython-38.pyc,sha256=e0bvgyePgJbIs1omBq0TRPlVSKar2sK_JbUKqDRj7mY,33235
-simo/generic/__pycache__/forms.cpython-38.pyc,sha256=IOiN9D0NVn8e8OOieawG0QjSTZDcmFhGsf2i6oWaj5A,17430
+simo/generic/__pycache__/forms.cpython-38.pyc,sha256=lqpRTX5rnrkyJZ5Dga4e9y2WJ81r394AW5DV4KkvxXQ,17856
 simo/generic/__pycache__/gateways.cpython-38.pyc,sha256=a4lLIMPyxm9tNzIqorXHIPZFVTcXlPsM1ycJMghxcHA,12673
-simo/generic/__pycache__/models.cpython-38.pyc,sha256=j4jKYVTM4XUfFzxIaRFhYx0oRSYzDRn8YVQyCteEhtc,3881
+simo/generic/__pycache__/models.cpython-38.pyc,sha256=GQeX2Y6diAiDKwd43RvSjRF3jGpkvXSu3ja7daEfQSA,5006
 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
@@ -10446,8 +10446,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.16.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.0.16.dist-info/METADATA,sha256=toSBqhmwLzLJ7BNGd9_e0-YJpXhry91efsl9xGJn01M,1700
-simo-2.0.16.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-simo-2.0.16.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.0.16.dist-info/RECORD,,
+simo-2.0.18.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.0.18.dist-info/METADATA,sha256=8siQqkBY_YIe8F8ZRhHunOOfyQmw3CZ9U2mZRLwXokk,1700
+simo-2.0.18.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+simo-2.0.18.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.0.18.dist-info/RECORD,,