simo 2.5.5__py3-none-any.whl → 2.5.6__py3-none-any.whl

simo/core/models.py

@@ -119,7 +119,8 @@ class Instance(DirtyFieldsMixin, models.Model, SimoAdminMixin):
 
 class Zone(DirtyFieldsMixin, models.Model, SimoAdminMixin):
     instance = models.ForeignKey(
-        Instance, on_delete=models.CASCADE, related_name='zones'
+        Instance, on_delete=models.CASCADE, related_name='zones',
+        limit_choices_to={'is_active': True}
     )
     name = models.CharField(_('name'), max_length=40)
     order = models.PositiveIntegerField(
@@ -139,7 +140,9 @@ class Zone(DirtyFieldsMixin, models.Model, SimoAdminMixin):
 
 
 class Category(DirtyFieldsMixin, models.Model, SimoAdminMixin):
-    instance = models.ForeignKey(Instance, on_delete=models.CASCADE)
+    instance = models.ForeignKey(
+        Instance, on_delete=models.CASCADE, limit_choices_to={'is_active': True}
+    )
     name = models.CharField(_('name'), max_length=40)
     icon = models.ForeignKey(Icon, on_delete=models.SET_NULL, null=True)
     header_image = models.ImageField(

simo/core/templates/core/auto_night_day_script.py

@@ -29,8 +29,11 @@ class Automation:
                     # at least one user's phone is not yet on charge
                     return
             self.night_is_on = True
+            print("Night!")
             return 'night'
         else:
+            if datetime.hour >= 22 or datetime.hour < 6:
+                return
             # return new_state diena only if there are still users
             # at home, none of them have their phones on charge
             # and current state is still night
@@ -41,9 +44,10 @@ class Automation:
                 if iuser.phone_on_charge:
                     # at least one user's phone is still on charge
                     return
-                else:
-                    self.night_is_on = False
+
+            self.night_is_on = False
             if not self.night_is_on and state.value == 'night':
+                print("Day has come!")
                 return 'day'
 
     def run(self):

simo/fleet/models.py

@@ -33,7 +33,8 @@ def get_new_secret():
 
 class InstanceOptions(models.Model):
     instance = models.OneToOneField(
-        Instance, on_delete=models.CASCADE, related_name='fleet_options'
+        Instance, on_delete=models.CASCADE, related_name='fleet_options',
+        limit_choices_to={'is_active': True}
     )
     secret_key = models.CharField(max_length=20, default=get_new_secret)
 
@@ -46,7 +47,7 @@ def create_instance_options(sender, instance, *args, **kwargs):
 class Colonel(DirtyFieldsMixin, models.Model):
     instance = models.ForeignKey(
         'core.Instance', on_delete=models.CASCADE, related_name='colonels',
-        null=True,
+        limit_choices_to={'is_active': True}
     )
     uid = models.CharField(
         max_length=100, db_index=True, editable=False, unique=True,

simo/generic/scripting/example.py

@@ -1,66 +0,0 @@
-import time
-import random
-from django.utils import timezone
-from simo.core.middleware import get_current_instance
-from simo.core.models import Component
-from simo.users.models import InstanceUser
-from simo.generic.scripting.helpers import LocalSun
-
-
-class Automation:
-    REZIMAS_COMPONENT_ID = 130
-
-    def __init__(self):
-        self.instance = get_current_instance()
-        self.rezimas = Component.objects.get(id=self.REZIMAS_COMPONENT_ID)
-        self.sun = LocalSun(self.instance.location)
-        self.night_is_on = False
-
-    def check_owner_phones(self, rezimas, instance_users, datetime):
-        if not self.night_is_on:
-            if not (datetime.hour >= 22 or datetime.hour < 6):
-                return
-
-            for iuser in instance_users:
-                # skipping users that are not at home
-                if not iuser.at_home:
-                    continue
-                if not iuser.phone_on_charge:
-                    # at least one user's phone is not yet on charge
-                    return
-            self.night_is_on = True
-            return 'night'
-        else:
-            # return new_rezimas diena only if there are still users
-            # at home, none of them have their phones on charge
-            # and current rezimas is still night
-            for iuser in instance_users:
-                # skipping users that are not at home
-                if not iuser.at_home:
-                    continue
-                if iuser.phone_on_charge:
-                    # at least one user's phone is still on charge
-                    return
-                else:
-                    self.night_is_on = False
-            if not self.night_is_on and rezimas.value == 'night':
-                return 'day'
-
-    def run(self):
-        while True:
-            instance_users = InstanceUser.objects.filter(
-                is_active=True, role__is_owner=True
-            )
-            self.rezimas.refresh_from_db()
-            new_rezimas = self.check_owner_phones(
-                self.rezimas, instance_users, timezone.localtime()
-            )
-            if new_rezimas:
-                self.rezimas.send(new_rezimas)
-
-            # randomize script load
-            time.sleep(random.randint(20, 40))
-
-
-    def test(self):
-        pass

simo/notifications/admin.py

@@ -15,6 +15,13 @@ class NotificationAdmin(admin.ModelAdmin):
     inlines = UserNotificationInline,
     actions = 'dispatch',
 
+    readonly_fields = 'instance',
+
+    def save_model(self, request, obj, form, change):
+        if not obj.id:
+            obj.instance = get_current_instance()
+        return super().save_model(request, obj, form, change)
+
     def get_queryset(self, request):
         qs = super().get_queryset(request)
         instance = get_current_instance()

simo/notifications/models.py

@@ -14,7 +14,9 @@ class Notification(models.Model):
     Notification get's sent to_users as soon as it's created.
     If new users are added, notification gets sent to those users as well.
     '''
-    instance = models.ForeignKey(Instance, on_delete=models.CASCADE)
+    instance = models.ForeignKey(
+        Instance, on_delete=models.CASCADE, limit_choices_to={'is_active': True}
+    )
     datetime = models.DateTimeField(auto_now_add=True)
     to_users = models.ManyToManyField(
         User, through='notifications.UserNotification'

{simo-2.5.5.dist-info → simo-2.5.6.dist-info}/METADATA

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

{simo-2.5.5.dist-info → simo-2.5.6.dist-info}/RECORD

@@ -52,7 +52,7 @@ simo/core/gateways.py,sha256=m0eS3XjVe34Dge6xtoCq16kFWCKJcdQrT0JW0REqoq8,3715
 simo/core/loggers.py,sha256=EBdq23gTQScVfQVH-xeP90-wII2DQFDjoROAW6ggUP4,1645
 simo/core/managers.py,sha256=n-b3I4uXzfHKTeB1VMjSaMsDUxp8FegFJwnbV1IsWQ4,3019
 simo/core/middleware.py,sha256=hExD7Vmw7eitk0vAjOwKzkwrtuw8YxpflF92j_CA2YY,3193
-simo/core/models.py,sha256=OSvBVfl5rmkx_h6cfQ3k_2gxoV9Nk1f8rvdoQtALquw,22496
+simo/core/models.py,sha256=dqwnGUc-BKefkWx4SfGDhiytP7vxAGFcKOlEXz2VhHA,22594
 simo/core/permissions.py,sha256=v0iJM4LOeYoEfMiw3OLPYio272G1aUEAg_z9Wd1q5m0,2993
 simo/core/routing.py,sha256=X1_IHxyA-_Q7hw1udDoviVP4_FSBDl8GYETTC2zWTbY,499
 simo/core/serializers.py,sha256=Pa2lhJ6VgNalbH4awbKdGJCYAPNsu5WQWfo6Tz6LbOQ,20782
@@ -85,7 +85,7 @@ simo/core/__pycache__/gateways.cpython-38.pyc,sha256=D1ooHL-iSpQrxnD8uAl4xWFJmm-
 simo/core/__pycache__/loggers.cpython-38.pyc,sha256=Z-cdQnC6XlIonPV4Sl4E52tP4NMEdPAiHK0cFaIL7I8,1623
 simo/core/__pycache__/managers.cpython-38.pyc,sha256=6RTIxyjOgpQGtAqcUyE2vFPS09w1V5Wmd_vOV7rHRRI,3370
 simo/core/__pycache__/middleware.cpython-38.pyc,sha256=iOSTXSQl3sEsa-9kx_6w5zbEByRtfzJHT6XkUIYMGdE,2469
-simo/core/__pycache__/models.cpython-38.pyc,sha256=4lNUqjILHQyssviRXrr82-03Bc5LxgUrdQ_OmWozahE,18459
+simo/core/__pycache__/models.cpython-38.pyc,sha256=lNpWQXIobV40Pxnq3p5PO8vSE6vX-nFrKARsWlk-76E,18508
 simo/core/__pycache__/permissions.cpython-38.pyc,sha256=fH4iyqd9DdzRLEu2b621-FeM-napR0M7hzBUTHo9Q3g,2972
 simo/core/__pycache__/routing.cpython-38.pyc,sha256=3T3FPJ8Cn99xZCGvMyg2xjl7al-Shm9CelbSpkJtNP8,599
 simo/core/__pycache__/serializers.cpython-38.pyc,sha256=qIHxrurPk555mHc9P8Udg9eGv-ODw1FTmBS_jXrPuws,19220
@@ -10166,7 +10166,7 @@ simo/core/templates/admin/users/qr_code.html,sha256=kE4WNSVsPUvNUFnSUAY8jiD9JCvc
 simo/core/templates/admin/wizard/discovery.html,sha256=xpAiXgKneT0d53c7h1MyAjoOFdXc_lDaH9TdelrggVU,6608
 simo/core/templates/admin/wizard/field.html,sha256=ZbgzAUMs6RdJDH44yQ3-rmAkPmBdsIvBTk1RAQaENAs,413
 simo/core/templates/admin/wizard/wizard_add.html,sha256=RPkwKXctu_yxJxjJqcvVEzG4YtK9-CJK801RPxleWRE,4127
-simo/core/templates/core/auto_night_day_script.py,sha256=IJ-akeGG-aSWY1loJHArCH2PhQj_IzsukH5O62f9JLw,2231
+simo/core/templates/core/auto_night_day_script.py,sha256=6dnoU4UsjgdiEaD3hIPMovBRhI4p1aCAKL8ca_D-3zQ,2349
 simo/core/templates/core/auto_state_script.py,sha256=_UhSTpeCnv1oOzRzdOI9EXGdaSYevBolWChCKfPPZ6w,2666
 simo/core/templates/core/icon_acutocomplete_select_item.html,sha256=D7aWefAJjrDqyMcwt4vtuwkruklJ1aSjCTi99HLrQUY,768
 simo/core/templates/core/object_acutocomplete_select_item.html,sha256=pS8APlv1IdhfttONh3npzQNfrOhj63YC7837tnOfSHk,465
@@ -10225,7 +10225,7 @@ simo/fleet/controllers.py,sha256=fjri1GtCnflkkDpNqhTwy6i9CK6RDEB0Q_BtADzcG8E,291
 simo/fleet/forms.py,sha256=XTkQUxce-6VPr7-HRONJnIzWZizeIUeA6DGqqTACInQ,62980
 simo/fleet/gateways.py,sha256=lKEJW0MgaOEiNnijH50DNSVChvaUT3TA3UurcI57P8k,5677
 simo/fleet/managers.py,sha256=XOpDOA9L-f_550TNSyXnJbun2EmtGz1TenVTMlUSb8E,807
-simo/fleet/models.py,sha256=eaXuUdiK9LnBFHARcR9sC049It1s6OrPTWVmysfQyYg,16812
+simo/fleet/models.py,sha256=4ZHiT2yoUv3xnDzsMbPi0Z3DOvYzEfwYZw-jxFlqG30,16884
 simo/fleet/routing.py,sha256=cofGsVWXMfPDwsJ6HM88xxtRxHwERhJ48Xyxc8mxg5o,149
 simo/fleet/serializers.py,sha256=-16BjY_bp9VbDOYuD0V54h7r_RHpuLNkJX0SydWL9aU,2247
 simo/fleet/socket_consumers.py,sha256=8RLEmKQ0Q7nVgJJ6IrU4ioocsWBJrgBVH_AUpVas1no,18095
@@ -10242,7 +10242,7 @@ simo/fleet/__pycache__/controllers.cpython-38.pyc,sha256=jtFHr_uyjCCeuidL-o-hGaf
 simo/fleet/__pycache__/forms.cpython-38.pyc,sha256=8ARAilbCnSUjwluL0mmknFcNvBRn8oZ7b2-z8Yer6ns,42498
 simo/fleet/__pycache__/gateways.cpython-38.pyc,sha256=0RKVn0ndreVKhsrukqeLPSdMnRrsQ_W7yeVeBkRLfIk,5058
 simo/fleet/__pycache__/managers.cpython-38.pyc,sha256=8uz-xpUiqbGDgXIZ_XRZtFb-Tju6NGxflGg-Ee4Yo6k,1310
-simo/fleet/__pycache__/models.cpython-38.pyc,sha256=am7ceraEUIJPD5qO3y-_X1riXIYsZGYZOlZmGjqhy7g,13906
+simo/fleet/__pycache__/models.cpython-38.pyc,sha256=ePD11IHU9AoiufsuwcgaXukCGkNE0dco-JPajXB96c0,13935
 simo/fleet/__pycache__/routing.cpython-38.pyc,sha256=aPrCmxFKVyB8R8ZbJDwdPdFfvT7CvobovvZeq_mqRgY,314
 simo/fleet/__pycache__/serializers.cpython-38.pyc,sha256=9ljhwoHkolcVrJwOVbYCbGPAUKgALRwor_M3W_K0adE,3173
 simo/fleet/__pycache__/socket_consumers.cpython-38.pyc,sha256=cNLhA0PTF2BgXXcw4b4va1zIw-gBrghoRrSr8iZluE0,13893
@@ -10352,7 +10352,7 @@ simo/generic/__pycache__/models.cpython-38.pyc,sha256=MZpum7syAFxuulf47K7gtUlJJ7
 simo/generic/__pycache__/routing.cpython-38.pyc,sha256=xtxTUTBTdivzFyA5Wh7k-hUj1WDO_FiRq6HYXdbr9Ks,382
 simo/generic/__pycache__/socket_consumers.cpython-38.pyc,sha256=qJO5kvQLWhsQDOr1AtAtsAybuRWioxSkQei3Pc7rdP0,1737
 simo/generic/scripting/__init__.py,sha256=aZZvNBae7unnux_zGHCIWCV2z47hVJc-DIL72Hqfkeo,600
-simo/generic/scripting/example.py,sha256=zj1puyzc9v4HNR0MTha2_1h7tkBvmVyu_drR4e-3qC0,2277
+simo/generic/scripting/example.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/generic/scripting/helpers.py,sha256=Zt8Mx5AXIggzYk0e7jn-xQNR_NOqzolAReLkrmDJzVQ,3042
 simo/generic/scripting/serializers.py,sha256=PjyFrjdPK1mBsgbNhyqMi9SWzcymqTa742ipy0LhAN4,1996
 simo/generic/scripting/__pycache__/__init__.cpython-38.pyc,sha256=eHncoNpv5dy35IO1_htWd8CK0sHFBnU_WJ0hl5TKOHQ,794
@@ -10414,15 +10414,15 @@ simo/multimedia/migrations/__pycache__/0003_alter_sound_length.cpython-38.pyc,sh
 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/notifications/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-simo/notifications/admin.py,sha256=hB9M_gIHx6RFB693mbOENRQR0kZhiUCrPFrakn78Y1s,949
+simo/notifications/admin.py,sha256=WQbN_bd2KRxVjbOajeworNrV9QlDNSadQT58La0Nn2M,1174
 simo/notifications/api.py,sha256=GXQpq68ULBaJpU8w3SJKaCKuxYGWYehKnGeocGB1RVc,1783
-simo/notifications/models.py,sha256=VZcvweii59j89nPKlWeUSJ44Qz3ZLjJ6mXN6uB9F1Sw,2506
+simo/notifications/models.py,sha256=gJW0ahHvSyFrb7BzrJXa3Nk2FFDvX361ZgLcf1k7ff8,2558
 simo/notifications/serializers.py,sha256=altDEAPWwOhxRcEzE9-34jL8EFpyf3vPoEdAPoVLfGc,523
 simo/notifications/utils.py,sha256=uBl-Y7WGu00iaGM5rrdogcq0OMRVtyVfJF39-mdB3_k,1853
 simo/notifications/__pycache__/__init__.cpython-38.pyc,sha256=YvucUfu98XFvEEg1LYFMlOZJpo_jSGxTVrM-ylAFLOg,167
-simo/notifications/__pycache__/admin.cpython-38.pyc,sha256=cMa2NAu5NZUE5IOL5w2--SHdlCyAeboUu4RrZk26UJc,1704
+simo/notifications/__pycache__/admin.cpython-38.pyc,sha256=MScNrtVM1wavefsPfxy0A7LVyXKcbvEkLH9GJkgNOl8,1945
 simo/notifications/__pycache__/api.cpython-38.pyc,sha256=ys6E4AFghX6bq-rQ0gtA9s0Y2Hh-ypsWH8-Yz4edMrc,2073
-simo/notifications/__pycache__/models.cpython-38.pyc,sha256=rrYjYOEzDZ3Eos2O7aof5wuIo0VUgGt6LLzhXwORDuc,2559
+simo/notifications/__pycache__/models.cpython-38.pyc,sha256=iOBlXejQrYV-M_SaPIGt6WbIV2YF5y5a3eXgnG5ZaJg,2604
 simo/notifications/__pycache__/serializers.cpython-38.pyc,sha256=7-eRGKYuQ4g1SpKOMpz17SIiu1HmaMoYv-cJbaO9QGA,1028
 simo/notifications/__pycache__/utils.cpython-38.pyc,sha256=6Tq7VkW-pZLzWzcxPtBU9MDFZLO7iLY8-ygyefoJ5OQ,1529
 simo/notifications/migrations/0001_initial.py,sha256=Zh69AQ-EKlQKfqfnMDVRcxvo1MxRY-TFLCdnNcgqi6g,2003
@@ -10551,9 +10551,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.5.5.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.5.5.dist-info/METADATA,sha256=DQfobm2LHYKsXxNe8CJcy_auAd59Ox-Uym_vPMW-MCc,1923
-simo-2.5.5.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-simo-2.5.5.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
-simo-2.5.5.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.5.5.dist-info/RECORD,,
+simo-2.5.6.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.5.6.dist-info/METADATA,sha256=Q8JlXRCVfWvw15jO8jXZp65dGIWYlLNfz4u8gNIA5NI,1923
+simo-2.5.6.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+simo-2.5.6.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
+simo-2.5.6.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.5.6.dist-info/RECORD,,