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

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()
 
@@ -1184,6 +1190,7 @@ 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'])
 

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.9.dist-info → simo-1.7.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simo
-Version: 1.7.9
+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.9.dist-info → simo-1.7.10.dist-info}/RECORD

@@ -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=h6b0EoXrNuNYzAlH4w2oqlhlPTbZ-QLOq2Hb4t1ckJ0,51478
+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
@@ -10285,8 +10285,8 @@ 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
@@ -10301,7 +10301,7 @@ simo/users/__pycache__/auth_backends.cpython-38.pyc,sha256=BMVsMoWcoYUQevvj-2OSJ
 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.9.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-1.7.9.dist-info/METADATA,sha256=gaNeHhw_nxt9VGEzHzwmrrUXtBUnd8xggkk4STzTnYo,1748
-simo-1.7.9.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-simo-1.7.9.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-1.7.9.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,,