simo 2.5.18__py3-none-any.whl → 2.5.19__py3-none-any.whl

simo/core/tasks.py

@@ -214,13 +214,15 @@ def sync_with_remote():
                 weather_component.controller.set(weather)
                 weather_component.save()
 
-        print(f"NEW INSTANCE:  {instance}")
-        print(f"Users data: {users_data}")
+        if new_instance:
+            print(f"NEW INSTANCE:  {instance}")
+            print(f"Users data: {users_data}")
 
 
         for email, options in users_data.items():
-            print(f"EMAIL: {email}")
-            print(f"OPTIONS: {options}")
+            if new_instance:
+                print(f"EMAIL: {email}")
+                print(f"OPTIONS: {options}")
             if new_instance or not instance.instance_users.count():
                 # Create user for new instance!
                 user, new_user = User.objects.get_or_create(

simo/generic/controllers.py

@@ -153,64 +153,86 @@ class PresenceLighting(Script):
 
     # script specific variables
     sensors = {}
+    condition_comps = {}
     light_org_values = {}
     is_on = False
     turn_off_task = None
     last_presence = 0
+    hold_time = 60
+    conditions = []
 
     def _run(self):
+        self.hold_time = self.component.config.get('hold_time', 0) * 10
+        for id in self.component.config['presence_sensors']:
+            sensor = Component.objects.filter(id=id).first()
+            if sensor:
+                sensor.on_change(self._on_sensor)
+                self.sensors[id] = sensor
+
+        for condition in self.component.config.get('conditions', []):
+            comp = Component.objects.filter(
+                id=condition.get('component', 0)
+            ).first()
+            if comp:
+                condition['component'] = comp
+                self.conditions.append(condition)
+                comp.on_change(self._on_condition)
+                self.condition_comps[comp.id] = comp
+
         while True:
-            self._on_sensor()
-            hold_time = self.component.config.get('hold_time', 0) * 10
-            if self.last_presence and hold_time and (
-                time.time() - hold_time > self.last_presence
-            ):
-                self._turn_it_off()
+            self._regulate(on_val_change=False)
             time.sleep(random.randint(5, 15))
 
     def _on_sensor(self, sensor=None):
-
-        self.component.refresh_from_db()
-        for id in self.component.config['presence_sensors']:
-            if id not in self.sensors:
-                sensor = Component.objects.filter(id=id).first()
-                if sensor:
-                    sensor.on_change(self._on_sensor)
-                    self.sensors[id] = sensor
-
         if sensor:
             self.sensors[sensor.id] = sensor
+            self._regulate()
+
+    def _on_condition(self, condition_comp=None):
+        if condition_comp:
+            for condition in self.conditions:
+                if condition['component'].id == condition_comp.id:
+                    condition['component'] = condition_comp
+            self._regulate()
 
+
+    def _regulate(self, on_val_change=True):
         presence_values = [s.value for id, s in self.sensors.items()]
         if self.component.config.get('act_on', 0) == 0:
             must_on = any(presence_values)
         else:
             must_on = all(presence_values)
 
-        if sensor and must_on:
+        if must_on and on_val_change:
             print("Presence detected!")
 
         additional_conditions_met = True
-        for condition in self.component.config.get('conditions', []):
-            if not additional_conditions_met:
-                continue
-            comp = Component.objects.filter(
-                id=condition.get('component', 0)
-            ).first()
-            if not comp:
-                continue
+        for condition in self.conditions:
+
+            comp = condition['component']
+
             op = OPERATIONS.get(condition.get('op'))
             if not op:
                 continue
+
             if condition['op'] == 'in':
                 if comp.value not in self._string_to_vals(condition['value']):
+                    if must_on and on_val_change:
+                        print(
+                            f"Condition not met: [{comp} value:{comp.value} "
+                            f"{condition['op']} {condition['value']}]"
+                        )
                     additional_conditions_met = False
-                continue
+                    break
 
             if not op(comp.value, condition['value']):
-                if sensor and must_on:
-                    print(f"Condition not met: [{comp} value:{comp.value} {condition['op']} {condition['value']}]")
+                if must_on and on_val_change:
+                    print(
+                        f"Condition not met: [{comp} value:{comp.value} "
+                        f"{condition['op']} {condition['value']}]"
+                    )
                 additional_conditions_met = False
+                break
 
         if must_on and additional_conditions_met and not self.is_on:
             print("Turn the lights ON!")
@@ -230,9 +252,16 @@ class PresenceLighting(Script):
             if not any(presence_values):
                 if not self.component.config.get('hold_time', 0):
                     return self._turn_it_off()
+
                 if not self.last_presence:
                     self.last_presence = time.time()
 
+                if self.hold_time and (
+                    time.time() - self.hold_time > self.last_presence
+                ):
+                    self._turn_it_off()
+
+
     def _turn_it_off(self):
         print("Turn the lights OFF!")
         self.is_on = False

simo/users/api.py

@@ -234,12 +234,15 @@ class UserDeviceReport(InstanceMixin, viewsets.GenericViewSet):
             iu.phone_on_charge = request.data.get('is_charging', False)
             iu.save()
 
+        phone_on_charge = False
+        if request.data.get('is_charging'):
+            phone_on_charge = True
         UserDeviceReportLog.objects.create(
             user_device=user_device, instance=self.instance,
             app_open=request.data.get('app_open', False),
             location=','.join([str(i) for i in location]) if location else None,
             relay=relay, speed_kmh=speed_kmh,
-            phone_on_charge=request.data.get('is_charging', False)
+            phone_on_charge=phone_on_charge
         )
 
         return RESTResponse({'status': 'success'})

simo/users/models.py

@@ -257,6 +257,7 @@ class User(AbstractBaseUser, SimoAdminMixin):
         cache_key = f'user-{self.id}_instance-{instance.id}-role-id'
         cached_val = cache.get(cache_key, 'expired')
         if cached_val == 'expired':
+            cached_val = None
             for role in self.roles.all().select_related('instance'):
                 if role.instance == instance:
                     cached_val = role.id

{simo-2.5.18.dist-info → simo-2.5.19.dist-info}/METADATA

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

{simo-2.5.18.dist-info → simo-2.5.19.dist-info}/RECORD

@@ -59,7 +59,7 @@ simo/core/serializers.py,sha256=WgksN1Ombv240nfQR_UtmKslTWM9vz9Y0yTdN5usiHU,2189
 simo/core/signal_receivers.py,sha256=YZZVg0MHIqfJ4RxG_KH5G5pkVz97SLXsMkMxpo-ec2I,8842
 simo/core/socket_consumers.py,sha256=trRZvBGTJ7xIbfdmVvn7zoiWp_qssSkMZykDrI5YQyE,9783
 simo/core/storage.py,sha256=_5igjaoWZAiExGWFEJMElxUw55DzJG1jqFty33xe8BE,342
-simo/core/tasks.py,sha256=j1A7nFVQ1LfjIZ1SCcjiEst_I8xHmpRwCUuuoZyCTG4,15853
+simo/core/tasks.py,sha256=M0GHGZvRSik_CDWufcDRwbDQju_88q-yHK_Nnp0N4IA,15923
 simo/core/todos.py,sha256=eYVXfLGiapkxKK57XuviSNe3WsUYyIWZ0hgQJk7ThKo,665
 simo/core/types.py,sha256=WJEq48mIbFi_5Alt4wxWMGXxNxUTXqfQU5koH7wqHHI,1108
 simo/core/views.py,sha256=3SRZr00fyLQf8ja3U-9eekKt-ld5TvU1WQqUWprXfQ4,2390
@@ -92,7 +92,7 @@ simo/core/__pycache__/serializers.cpython-38.pyc,sha256=d4wpUjFuo8GxaNWbin9GdHKi
 simo/core/__pycache__/signal_receivers.cpython-38.pyc,sha256=bBnV6L69VVH46nrWDHi4VGBEMcxusfEsXN7aZoQRzDI,6729
 simo/core/__pycache__/socket_consumers.cpython-38.pyc,sha256=KqbO1cOewodVPcy0-htVefyUjCuELKV0o7fOfYqfgPc,8490
 simo/core/__pycache__/storage.cpython-38.pyc,sha256=9R1Xu0FJDflfRXUPsqEgt0SpwiP7FGk7HaR8s8XRyI8,721
-simo/core/__pycache__/tasks.cpython-38.pyc,sha256=H6Bjaqh6ua_naPZstKLUURvSvIob_9GnEjo1rPX06po,10750
+simo/core/__pycache__/tasks.cpython-38.pyc,sha256=mLvFf_G9SCINI2aQYV7rIuGkMj5qe6orc2L359Mz6CY,10766
 simo/core/__pycache__/todos.cpython-38.pyc,sha256=lOqGZ58siHM3isoJV4r7sg8igrfE9fFd-jSfeBa0AQI,253
 simo/core/__pycache__/views.cpython-38.pyc,sha256=K_QM967bIJeU02DJu0Dm7j8RiFDKn_TLzX77YzNkA7c,2495
 simo/core/__pycache__/widgets.cpython-38.pyc,sha256=sR0ZeHCHrhnNDBJuRrxp3zUsfBp0xrtF0xrK2TkQv1o,3520
@@ -10340,7 +10340,7 @@ simo/fleet/templates/fleet/controllers_info/ENS160AirQualitySensor.md,sha256=3LS
 simo/generic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/generic/app_widgets.py,sha256=TPRLj4hri2hBuY6mrdwBiv-01z2hDxZmsup-GDD9LrM,953
 simo/generic/base_types.py,sha256=u3SlfpNYaCwkVBwomWgso4ODzL71ay9MhiAW-bxgnDU,341
-simo/generic/controllers.py,sha256=7OmKXNGLddKP8hK94cVtCJ9UiKhv4H93AT5zTWNlKfg,49232
+simo/generic/controllers.py,sha256=i-xKQ5PrNKwCuO0dFaHHUaD5rF9lDnq18ziVSNBENao,50134
 simo/generic/forms.py,sha256=H841-wbWltnZ2-RXQEM1G8H4kfOcl88Qhg7bxE4VCiQ,28993
 simo/generic/gateways.py,sha256=sMedpxIfpxqTx746DdhsIu-pzTrqduOSIb7i7XDX9GU,15339
 simo/generic/models.py,sha256=Adq7ipWK-renxJlNW-SZnAq2oGEOwKx8EdUWaKnfcVQ,7597
@@ -10349,7 +10349,7 @@ simo/generic/socket_consumers.py,sha256=K2OjphIhKJH48BvfFfoCOyCQZ1NmXb_phs6y1IP-
 simo/generic/__pycache__/__init__.cpython-38.pyc,sha256=mLu54WS9KIl-pHwVCBKpsDFIlOqml--JsOVzAUHg6cU,161
 simo/generic/__pycache__/app_widgets.cpython-38.pyc,sha256=YZ5db6-FPynBi6ooPW5crK9lZ6ymRh2DlGN6FwxfX4M,1820
 simo/generic/__pycache__/base_types.cpython-38.pyc,sha256=aV5NdIuvXR-ItKpI__MwcyPZHD6Z882TFdgYkPCkr1I,493
-simo/generic/__pycache__/controllers.cpython-38.pyc,sha256=174l-tcQTP6EiZNZFHyFSlOwSJpNp16OLBSCGqp7dhg,32692
+simo/generic/__pycache__/controllers.cpython-38.pyc,sha256=-Y3fV0gbkye9WgWpdNY7qG9VvMWpFUT7Spl1eukztgQ,33352
 simo/generic/__pycache__/forms.cpython-38.pyc,sha256=w7p-dFYvxtNMlrKVnM2zWa1Jp0zXygP6Lbo6kKg-Ox4,21228
 simo/generic/__pycache__/gateways.cpython-38.pyc,sha256=QGj0mIWyqrVpn9AeGeYzdu6PxcF5SdQOHNzEqcHCy_E,11648
 simo/generic/__pycache__/models.cpython-38.pyc,sha256=MZpum7syAFxuulf47K7gtUlJJ7xRD-IBUBAwUM1ZRnw,5825
@@ -10443,14 +10443,14 @@ simo/notifications/migrations/__pycache__/0003_alter_notification_instance.cpyth
 simo/notifications/migrations/__pycache__/__init__.cpython-38.pyc,sha256=YMBRHVon2nWDtIUbghckjnC12sIg_ykPWhV5aM0tto4,178
 simo/users/__init__.py,sha256=6a7uBpCWB_DR7p54rbHusc0xvi1qfT1ZCCQGb6TiBh8,52
 simo/users/admin.py,sha256=WDRJJtEkbYBQFtLg_5VOIlBV0eeJhgmrsFL51ttme0w,6760
-simo/users/api.py,sha256=FdBd3D_TSrTXk1zTPtLTqppbDsf_siTvTHROjWe3Wzo,12066
+simo/users/api.py,sha256=WSFUqBf6PMZNjZeqyppXfALs-la0rV-TVZUjuqDbeHA,12154
 simo/users/apps.py,sha256=cq0A8-U1HALEwev0TicgFhr4CAu7Icz8rwq0HfOaL4E,207
 simo/users/auth_backends.py,sha256=bBSNXQJ88TRXaQxyh1aETfmOIfiDr08Jnj8rSY9sHDk,4074
 simo/users/auto_urls.py,sha256=lcJvteBsbHQMJieZpDz-63tDYejLApqsW3CUnDakd7k,272
 simo/users/dynamic_settings.py,sha256=sEIsi4yJw3kH46Jq_aOkSuK7QTfQACGUE-lkyBogCaM,570
 simo/users/managers.py,sha256=Dm21Avmu38-h8MsZ5ljtpgKihMGUBU4hHGpiPvp4NtM,323
 simo/users/middleware.py,sha256=GMCrnWSc_2qCleyQIkfQGdL-pU-UTEcSg1wPvIKZ9uk,1210
-simo/users/models.py,sha256=YXermRuV6LFndyUMiaYcTxC1kpgG0GLeJCczGJuCy10,19251
+simo/users/models.py,sha256=8P-nldx9cm17GxRM9p0Vkfc-MSzOK0jXpkuOD3Y46yI,19281
 simo/users/permissions.py,sha256=IwtYS8yQdupWbYKR9VimSRDV3qCJ2jXP57Lyjpb2EQM,242
 simo/users/serializers.py,sha256=zzw1KONTnaTNBaU0r4rNVxJ827KzD6Z5LuQt27ZsQ98,2516
 simo/users/sso_urls.py,sha256=gQOaPvGMYFD0NCVSwyoWO-mTEHe5j9sbzV_RK7kdvp0,251
@@ -10460,14 +10460,14 @@ simo/users/utils.py,sha256=1HGSZyHRqQvdJ4RtAiZDg1juvgG8aOlrGXR7CcvsyQc,1886
 simo/users/views.py,sha256=dOQVvmlHG7ihWKJLFUBcqKOA0UDctlMKR0pTc36JZqg,3487
 simo/users/__pycache__/__init__.cpython-38.pyc,sha256=VFoDJE_SKKaPqqYaaBYd1Ndb1hjakkTo_u0EG_XJ1GM,211
 simo/users/__pycache__/admin.cpython-38.pyc,sha256=5LEDivt0AydPmqk9PCKvlKRRtc3QBxA6hZgcy_8bEQU,7680
-simo/users/__pycache__/api.cpython-38.pyc,sha256=As8xBUdgmpVeUYCRCR5ZH0aU9vLdEXgnZL6TR3wAhrY,10200
+simo/users/__pycache__/api.cpython-38.pyc,sha256=BCee2Qk_VJLtXGb13VyHasDo2HmGW1ZVE6WiuTi2ijA,10223
 simo/users/__pycache__/apps.cpython-38.pyc,sha256=dgbWL8CxzzISJQTmq_4IztPJ2UzykNVdqA2Ae1PmeGk,605
 simo/users/__pycache__/auth_backends.cpython-38.pyc,sha256=n5nx2QSXNj2idzRcGE6bAagMN-8qxoCs580H1EFZXls,3105
 simo/users/__pycache__/auto_urls.cpython-38.pyc,sha256=K-3sz2h-cEitoflSmZk1t0eUg5mQMMGLNZFREVwG7_o,430
 simo/users/__pycache__/dynamic_settings.cpython-38.pyc,sha256=6F8JBjZkHykySnmZjNEzjS0ijbmPdcp9yUAZ5kqq_Fo,864
 simo/users/__pycache__/managers.cpython-38.pyc,sha256=oAy5mRBI-FQWgx9xgQsHmCiknKqojuVY363mfEVK0i8,697
 simo/users/__pycache__/middleware.cpython-38.pyc,sha256=Tj4nVEAvxEW3xA63fBRiJWRJpz_M848ZOqbHioc_IPE,1149
-simo/users/__pycache__/models.cpython-38.pyc,sha256=oQnLCmCFOJ_L_NzkjokSFKmGO-RZWkOsWEQpwS7k_AA,17873
+simo/users/__pycache__/models.cpython-38.pyc,sha256=gETn4dAfZAkIpclgbmegAxWzFeq6KjZ0GPeEIP0Un54,17879
 simo/users/__pycache__/permissions.cpython-38.pyc,sha256=ez5NxoL_JUeeH6GsKhvFreuA3FCBgGf9floSypdXUtM,633
 simo/users/__pycache__/serializers.cpython-38.pyc,sha256=Dy8RAcwNkNSXoJHvLp8fozURyHCtucqpSPyqZtbnMZc,3732
 simo/users/__pycache__/sso_urls.cpython-38.pyc,sha256=uAwDozpOmrhUald-8tOHANILXkH7-TI8fNYXOtPkSY8,402
@@ -10561,9 +10561,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.18.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.5.18.dist-info/METADATA,sha256=D6hINl3wkYn5K7lK2J8DSaS2bkCeZ70vQVUMqemiXfA,1924
-simo-2.5.18.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-simo-2.5.18.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
-simo-2.5.18.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.5.18.dist-info/RECORD,,
+simo-2.5.19.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.5.19.dist-info/METADATA,sha256=NsP9qv6SZr9uYMDMweh18wvAxLc5WRGqCiu0-apto0U,1924
+simo-2.5.19.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+simo-2.5.19.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
+simo-2.5.19.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.5.19.dist-info/RECORD,,