simo 1.7.8__py3-none-any.whl → 1.7.10__py3-none-any.whl

simo/fleet/controllers.py

@@ -201,6 +201,9 @@ class PWMOutput(FleeDeviceMixin, BasicOutputMixin, BaseDimmer):
 
         return value
 
+    def _val_to_success(self, value):
+        return self._prepare_for_set(value)
+
 
 class RGBLight(FleeDeviceMixin, BasicOutputMixin, BaseRGBWLight):
     config_form = ColonelRGBLightConfigForm

simo/fleet/socket_consumers.py

@@ -140,10 +140,17 @@ class FleetConsumer(AsyncWebsocketConsumer):
                                      port=settings.MQTT_PORT)
             self.mqtt_client.loop_start()
 
-            config = await self.get_config_data()
-            await self.send(json.dumps({
-                'command': 'set_config', 'data': config
-            }))
+            # DO NOT FORCE CONFIG DATA!!!!
+            # as colonels might already have config and want to
+            # send updated values of components, like for example
+            # somebody turned some lights on/off while colonel was
+            # not connected to the main hub.
+            # If we force this, vales get overridden by what is last
+            # known by the hub
+            # config = await self.get_config_data()
+            # await self.send(json.dumps({
+            #     'command': 'set_config', 'data': config
+            # }))
 
         asyncio.create_task(self.watch_connection())
 

simo/generic/controllers.py

@@ -9,6 +9,8 @@ from django.utils.translation import gettext_lazy as _
 from django.conf import settings
 from django.urls import reverse_lazy
 from simo.conf import dynamic_settings
+from simo.users.middleware import get_current_user, introduce
+from simo.users.utils import get_system_user
 from simo.core.events import ObjectCommand
 from simo.core.models import RUN_STATUS_CHOICES_MAP, Component
 from simo.core.utils.helpers import get_random_string
@@ -241,6 +243,9 @@ class Thermostat(ControllerBase):
         low = target_temp - self.component.config['reaction_difference'] / 2
         high = target_temp + self.component.config['reaction_difference'] / 2
 
+        if not get_current_user():
+            introduce(get_system_user())
+
         if mode in ('auto', 'heater'):
             if (not heater or not heater.alive) and mode == 'heater':
                 print(f"No heater on {self.component}!")
@@ -934,6 +939,7 @@ class Watering(ControllerBase):
                     minute_to_start -= 24*60
 
             if minute_to_start <= local_minute < minute_to_start + gap:
+                introduce(get_system_user())
                 self.reset()
                 self.start()
 
@@ -1078,16 +1084,14 @@ class AlarmClock(ControllerBase):
         comp = Component.objects.filter(id=event['component']).first()
         if comp:
             if forward:
-                action_name = 'play_method'
+                action_name = 'play_action'
             else:
-                action_name = 'reverse_method'
+                action_name = 'reverse_action'
             action = event.get(action_name)
             action = getattr(comp, action, None)
             if action:
-                try:
-                    action()
-                except:
-                    pass
+                action()
+
 
     def _check_alarm(self, alarms, current_value):
 
@@ -1105,13 +1109,15 @@ class AlarmClock(ControllerBase):
 
         remove_ignores = []
         for ignore_alarm_uid, timestamp in current_value.get(
-                'ignore_alarms',{}
+            'ignore_alarms',{}
         ).items():
             # if ignore alarm entry is now past the current time + maximum offset
             # drop it out from ignore_alarms map
             if timestamp < localtime.timestamp():
                 print(
-                    f"remove ignore alarm because {timestamp} < {localtime.timestamp()}")
+                    f"remove ignore alarm because "
+                    f"{timestamp} < {localtime.timestamp()}"
+                )
                 remove_ignores.append(ignore_alarm_uid)
         for ignore_alarm_uid in remove_ignores:
             current_value['ignore_alarms'].pop(ignore_alarm_uid, None)
@@ -1184,14 +1190,16 @@ class AlarmClock(ControllerBase):
                     continue
                 if event['uid'] in current_value['events_triggered']:
                     continue
+                introduce(get_system_user())
                 self._execute_event(event)
                 current_value['events_triggered'].append(event['uid'])
 
-        current_value['in_alarm'] = bool(current_value['events_triggered'])
+        if not current_value['in_alarm']:
+            current_value['in_alarm'] = bool(current_value['events_triggered'])
 
         # If alarm time is in the past and all events executed move to next alarm
         if current_value['in_alarm'] \
-        and current_value['alarm_timestamp'] < localtime.timestamp() \
+        and current_value['alarm_timestamp'] + 60 < localtime.timestamp() \
         and len(current_value['events_triggered']) >= len(
             [e for e in current_value['events'] if e.get('enabled')]
         ):
@@ -1291,15 +1299,15 @@ class AlarmClock(ControllerBase):
         current_value['alarm_datetime'] = str(datetime.datetime.fromtimestamp(
             current_value['alarm_timestamp'],
         ).astimezone(tz=timezone.localtime().tzinfo))
-        triggered_events = []
+        events_triggered = []
         for event in current_value['events']:
             event['fire_timestamp'] += mins * 60
             if event['uid'] in current_value['events_triggered']:
                 if event['fire_timestamp'] > localtime.timestamp():
                     self._execute_event(event, False)
                 else:
-                    triggered_events.append(event['uid'])
-        current_value['triggered_events'] = triggered_events
+                    events_triggered.append(event['uid'])
+        current_value['events_triggered'] = events_triggered
 
         self.component.value = current_value
         self.component.save()

simo/users/api.py

@@ -102,12 +102,14 @@ class UsersViewSet(mixins.RetrieveModelMixin,
     def destroy(self, request, *args, **kwargs):
         user = self.get_object()
         if request.user.pk == user.pk:
-            pass
-        elif request.user.is_superuser:
+            raise ValidationError(
+                'Deleting yourself is not allowed!', code=403
+            )
+        if request.user.is_superuser:
             pass
         else:
             role = request.user.get_role(self.instance)
-            if not role or not role.is_superuser:
+            if not role or not role.can_manage_users:
                 raise ValidationError(
                     'You do not have permission for this!', code=403
                 )

simo/users/middleware.py

@@ -1,11 +1,24 @@
 # -*- coding: utf-8 -*-
 import threading
 
+# This is only ment for logging component history actions.
+# Do not use this for anything permissions related!
+
+# This technique can only be used with asgi/wsgi runners that
+# are not performing thread swapping for handling simultaneous requests.
+# For example gunicorn does that when configured with more than one worker,
+# which eventually messes up this system.
+
+# We use daphne for asgi, which seems to be working fine for what we have already
+# observed. However, this is a good candidate for reworking it in to something
+# more rboust.
+
+# TODO: rework this in to something more roboust
+
 _thread_locals = threading.local()
 
 
 def get_current_user():
-    #TODO: VERY BAD PRACTICE!!! DROP THIS!
     try:
         return getattr(_thread_locals, 'user')
     except:

simo/users/models.py

@@ -255,6 +255,10 @@ class User(AbstractBaseUser, SimoAdminMixin):
 
     @property
     def is_active(self):
+        if self.is_master and not self.instance_roles.all():
+            # Master that has no roles on any instance is in GOD mode!
+            # It can not be disabled by anybody, nor it is seen by anybody. :)
+            return True
         if self._instance:
             return bool(
                 self.instance_roles.filter(

{simo-1.7.8.dist-info → simo-1.7.10.dist-info}/METADATA

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

{simo-1.7.8.dist-info → simo-1.7.10.dist-info}/RECORD

@@ -10112,13 +10112,13 @@ simo/fleet/admin.py,sha256=NXlvKIe8ZDDcF1U6bwAXP1d8LX-0QAfruoS5pKIcdCM,4789
 simo/fleet/api.py,sha256=38_RUZxGRdvRCgHoX59zXqlzI-3vS2O_pCVP-lyBlR8,446
 simo/fleet/auto_urls.py,sha256=9kP8M_HqiXF6Dl8JLOHgXT0UaUTOr6DMH2Qr4POvecM,607
 simo/fleet/ble.py,sha256=eHA_9ABjbmH1vUVCv9hiPXQL2GZZSEVwfO0xyI1S0nI,1081
-simo/fleet/controllers.py,sha256=voctXyfEXDWpMxPoUpG_6bKAeawIWViktQACu2krgFo,8073
+simo/fleet/controllers.py,sha256=u3xTeGFUs4pVHWQl-va-INe4zqmaS1XqB2h5OeWg8P0,8156
 simo/fleet/forms.py,sha256=mG7yUbjzhSFy3hCnIrmFxxslZziq51qcBmd2_7zPIJ8,41720
 simo/fleet/gateways.py,sha256=W87o1P8Nubf3_v1RNn134rivHCiYIHbj4Za4sRQzSqw,204
 simo/fleet/models.py,sha256=4SHPX7HuZBfNwSkoDFwJjgNQs3oaSbhw_j85cXAxkqE,10092
 simo/fleet/routing.py,sha256=cofGsVWXMfPDwsJ6HM88xxtRxHwERhJ48Xyxc8mxg5o,149
 simo/fleet/serializers.py,sha256=uz_OE_bMdlE_C28gnBpUP0P08FdZKvFP-hgRKvJRYT0,348
-simo/fleet/socket_consumers.py,sha256=wt6aXI4YY7GFij0QfuqoGgTxkoIFn3aFD2DvXz6Y_v4,11746
+simo/fleet/socket_consumers.py,sha256=pKXXkDKuGoL_Lg9IL6xgb6r4-E-kTuRwq0Nmw1mvAbg,12139
 simo/fleet/tasks.py,sha256=QcMgXUE2V--CsNfzmbW35F-Q3b8D53-Q6twlWOow2Ig,704
 simo/fleet/utils.py,sha256=ZGxN94Wp472SEZRXVC6ZkUd2dmh_tMHc0qbMtoMfDRg,4511
 simo/fleet/views.py,sha256=1AwE_JC13n76JiM3cQ__8CgBidCoRFUbJN-Yaz1s4HQ,1198
@@ -10132,7 +10132,7 @@ simo/fleet/__pycache__/gateways.cpython-38.pyc,sha256=hZZlVkARLKo0VwiENJh65hgiuG
 simo/fleet/__pycache__/models.cpython-38.pyc,sha256=RNzIw4bNTwuEvHVqs2VSLKMWa8xKPfTXD_f6WrwC-1k,8519
 simo/fleet/__pycache__/routing.cpython-38.pyc,sha256=aPrCmxFKVyB8R8ZbJDwdPdFfvT7CvobovvZeq_mqRgY,314
 simo/fleet/__pycache__/serializers.cpython-38.pyc,sha256=nbkFJzjZP27U0fvMi_yPOhH7Hj1vK0HB44wn5yT6m_Y,869
-simo/fleet/__pycache__/socket_consumers.cpython-38.pyc,sha256=PALYpTLf9FPk3E34YAMeFqHvUykVtdXXWMLHpW3UvyY,9506
+simo/fleet/__pycache__/socket_consumers.cpython-38.pyc,sha256=GTO0-0ThS8ZGbcWKe_dF1Z3cI9FRSvF1ckuz8RDqsmc,9419
 simo/fleet/__pycache__/utils.cpython-38.pyc,sha256=txFY3LyTkjtEdaGfcjrjgZogMIoq4T1XR5OQCTkwh7w,2815
 simo/fleet/__pycache__/views.cpython-38.pyc,sha256=FAenBel5MTzNDM8Qa-QBr_5gjSYmCMWMyVjWnfz-HYM,1757
 simo/fleet/migrations/0001_initial.py,sha256=lce8nkD8Sz6pYr-XJSpDm4CMDuB6TA__WtnHpIp-eA4,1326
@@ -10188,7 +10188,7 @@ simo/fleet/migrations/__pycache__/__init__.cpython-38.pyc,sha256=5k1KW0jeSDzw6Rn
 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=-32OfzDsOWNVISgG-Tz4LwKyy9dQqjlM2m7eQd9EcfA,51463
+simo/generic/controllers.py,sha256=AgOOVQrIEm8_6__BMme2tB05BSGm4V15miKQhhu5dDc,51752
 simo/generic/forms.py,sha256=zF-QYfu6C0TZ7sJ5_-VkhUweV0_J8gg0CC07At6RIK8,19829
 simo/generic/gateways.py,sha256=Pp29L_2AoZ_4nW6rLHmDCbDoac-yK9evJ1ZTcfMOItc,14807
 simo/generic/models.py,sha256=XG8VnLSpMSiBnbKwvMknF9J9kdbmBolXvJ9L3Giz8pQ,3330
@@ -10200,7 +10200,7 @@ simo/generic/__pycache__/__init__.cpython-38.pyc,sha256=MCjhrSijserYi14I03LlOwRU
 simo/generic/__pycache__/app_widgets.cpython-38.pyc,sha256=QGPG6EkuNwk5PhFtNFIYfbJVrXiA76fBZlu31lwuvdY,2366
 simo/generic/__pycache__/base_types.cpython-38.pyc,sha256=ePcCgG0U4mrc_I3MLs2cnUh5KPX-Kf13jTy_d5pTP78,547
 simo/generic/__pycache__/controllers.cpython-37.pyc,sha256=5cET2P5vw-ujjYhyyLOoski91fXqiuV4zZdhRKgb028,2461
-simo/generic/__pycache__/controllers.cpython-38.pyc,sha256=ia-Qo0ZRKWfEone45ca2kKYMnS5LtuzUJtZV_q1971M,35375
+simo/generic/__pycache__/controllers.cpython-38.pyc,sha256=4DN-Y57ts0OrkAzeAH_khTnmocBmarHMiwm-O0-Fkuk,35330
 simo/generic/__pycache__/forms.cpython-38.pyc,sha256=fhJCmt60aYabvuylL4ZADGuIcI7YA62iJVFav9zZ_QU,15457
 simo/generic/__pycache__/gateways.cpython-38.pyc,sha256=RcFpnL04ruMINc4gr-gi8LmzqlUdHPqR7MDdxuzTMjE,10005
 simo/generic/__pycache__/models.cpython-38.pyc,sha256=8upnlvxpuYsg16gghJg9JZCcuyatsrWuYzDYT4psaC0,3035
@@ -10281,12 +10281,12 @@ simo/notifications/migrations/__pycache__/0002_notification_instance.cpython-38.
 simo/notifications/migrations/__pycache__/__init__.cpython-38.pyc,sha256=wXGUV-iMXaTLV1UNZ8FtuSK85VPF07qIr5wKwlv5yuc,186
 simo/users/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/users/admin.py,sha256=XpUrz1zIVLuK3Y9MF7kCJBExHpMEMkU3iNZG1YZdxO0,6560
-simo/users/api.py,sha256=in_rxvuZWB2jPvy9P-DI5r5_lKbYtpwozerBewDNvdA,7790
+simo/users/api.py,sha256=_1Z8m4pU-9LAbLfSdZ6qXLj0amgulVPqmLX2kRGJWF4,7886
 simo/users/auth_backends.py,sha256=I5pnaTa20-Lxfw_dFG8471xDITb0_fQl1PVhJalp5vU,3992
 simo/users/auto_urls.py,sha256=ee0d6fWABkJY5mQOTC8KhrqDI6d8xZkYZ4ja-gZJ-rw,269
 simo/users/dynamic_settings.py,sha256=sEIsi4yJw3kH46Jq_aOkSuK7QTfQACGUE-lkyBogCaM,570
-simo/users/middleware.py,sha256=FhsAwgUVHSq99qbcyjZ6CXtevvZiLYQ11kPPpkI5uk0,737
-simo/users/models.py,sha256=iaGqXLM94U_lqwtP4T7zesEt3Lu_HIS6wbs41RfrrJQ,17012
+simo/users/middleware.py,sha256=9epN8xDcnYAMoEjAeJGg4W9e54szTgh48LKz3rlywFI,1287
+simo/users/models.py,sha256=aSWcLp-UCrLgebYca5-w2Vnbgqe2da3AOFDGbrXsMXI,17247
 simo/users/permissions.py,sha256=IwtYS8yQdupWbYKR9VimSRDV3qCJ2jXP57Lyjpb2EQM,242
 simo/users/serializers.py,sha256=Mh2pWmsKDp7CNIxK2OTw3CfVkteZHiVoXWNF1fluvX8,2161
 simo/users/sso_urls.py,sha256=pcb_GhYHRtmairxJhMXE1bdcTma0BcYfKU3nCRtHQMQ,244
@@ -10296,12 +10296,12 @@ simo/users/utils.py,sha256=bbdBVDzXY3xyy8SdB8ERZF6PCmKbR137AnIyrn4HqLQ,867
 simo/users/views.py,sha256=dOQVvmlHG7ihWKJLFUBcqKOA0UDctlMKR0pTc36JZqg,3487
 simo/users/__pycache__/__init__.cpython-38.pyc,sha256=qVNCdQSNCAQRCsXJ__8eDa_UuFbLz4j_twP9f0TrCMk,144
 simo/users/__pycache__/admin.cpython-38.pyc,sha256=RAAzAh_7fTAKOnK-VaITHJkieOwmL8zYhDqrajHOHGs,7274
-simo/users/__pycache__/api.cpython-38.pyc,sha256=bwuezVy5VBdlIut7fE3JxJCzIFGS1aokDCSl5ioo-MQ,6620
+simo/users/__pycache__/api.cpython-38.pyc,sha256=Tt3vjPEfeK2SioWa5eIE-Ujr2iNKUCADcV7RQNaPv8U,6676
 simo/users/__pycache__/auth_backends.cpython-38.pyc,sha256=BMVsMoWcoYUQevvj-2OSJShHbMhxbzJzP8SwqJ3Kg2E,3007
 simo/users/__pycache__/auto_urls.cpython-38.pyc,sha256=UCgzFKwKi1_W9jTQ2BBFq7GF7Q-wbP8r-d4Jsw8644c,423
 simo/users/__pycache__/dynamic_settings.cpython-38.pyc,sha256=dexiY5hjMsvBrxCb5_ww1rlETHtSihVRLS_j_-dLCSw,856
 simo/users/__pycache__/middleware.cpython-38.pyc,sha256=L1kh7QWOsrpBd6yfaiG-3MGdsB3hm-HWOzHPMUbtMnU,1165
-simo/users/__pycache__/models.cpython-38.pyc,sha256=RPd5pi9Of8tRch0fGzVGhuIWfCLWleWVKyUlmJy5Bls,16541
+simo/users/__pycache__/models.cpython-38.pyc,sha256=C1RmjoSBn6aBV7SkFKPNf3uqo2hNlRqKhcEuM1JOn3E,16563
 simo/users/__pycache__/permissions.cpython-38.pyc,sha256=bIV9s6Y4uTX6KisJeWA_MZZ7aaDuIKu0sSYIPMXUCoo,625
 simo/users/__pycache__/serializers.cpython-38.pyc,sha256=XtCwvcq1BT0pVVPrmjF59ME3V9kP2Or-QAzV2ozwiR0,2868
 simo/users/__pycache__/sso_urls.cpython-38.pyc,sha256=DlIv-bsQRFX1LI-sr-COJb8Ah1iuAvaiVIZtY7fD2WI,395
@@ -10362,8 +10362,8 @@ simo/users/templates/invitations/expired_msg.html,sha256=3hTtUm-Cr1axOjlwAIKsSj9
 simo/users/templates/invitations/expired_suggestion.html,sha256=pT67ludJdeohrlF0QIzs4eqy1SI_oH2i6H0ecEIgaCg,100
 simo/users/templates/invitations/taken_msg.html,sha256=Dv1MaxVVmSdL20gri4Ei-K0aZ0OTmIdmO6a3l5MKwCs,445
 simo/users/templates/invitations/taken_suggestion.html,sha256=NCE2XQail0WQGW8v6y3BkQoM3IOWlh02z9XPEws659E,301
-simo-1.7.8.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-1.7.8.dist-info/METADATA,sha256=BsplD0jGI9Y5AwsGOvkspvfC930bdDqYkQkHhiduEpk,1748
-simo-1.7.8.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-simo-1.7.8.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-1.7.8.dist-info/RECORD,,
+simo-1.7.10.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-1.7.10.dist-info/METADATA,sha256=xRuEwYtKb2OMY_lpMvvyj1ipx31C0jHOTnUV67nTgWM,1749
+simo-1.7.10.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+simo-1.7.10.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-1.7.10.dist-info/RECORD,,