simo 2.0.4__py3-none-any.whl → 2.0.5__py3-none-any.whl

simo/core/api.py

@@ -14,6 +14,7 @@ from rest_framework.decorators import action
 from rest_framework.response import Response as RESTResponse
 from rest_framework.exceptions import ValidationError as APIValidationError
 from simo.core.utils.config_values import ConfigException
+from simo.users.middleware import introduce as introduce_user
 from .models import (
     Instance, Category, Zone, Component, Icon, ComponentHistory,
     HistoryAggregate, Gateway

simo/core/api_auth.py

@@ -1,7 +1,7 @@
-import json
 from rest_framework.authentication import SessionAuthentication, BasicAuthentication
 from rest_framework import HTTP_HEADER_ENCODING, exceptions
 from simo.users.models import User
+from simo.users.middleware import introduce as introduce_user
 
 
 class SecretKeyAuth(BasicAuthentication):
@@ -15,7 +15,7 @@ class SecretKeyAuth(BasicAuthentication):
 
             if not user or not user.is_active:
                 return
-
+            introduce_user(user)
             return (user, None)
 
     def authenticate_header(self, request):
@@ -35,6 +35,8 @@ class IsAuthenticated(SessionAuthentication):
         if not user.is_authenticated:
             raise exceptions.NotAuthenticated()
 
+        introduce_user(user)
+
         return (user, None)
 
     def authenticate_header(self, request):

simo/core/controllers.py

@@ -222,6 +222,7 @@ class ControllerBase(ABC):
         if value != self.component.value:
             self.component.value_previous = self.component.value
         self.component.value = value
+
         self.component.change_init_by = None
         self.component.change_init_date = None
         self.component.change_init_to = None

simo/fleet/models.py

@@ -166,7 +166,8 @@ class Colonel(DirtyFieldsMixin, models.Model):
     @transaction.atomic
     def rebuild_occupied_pins(self):
         for pin in ColonelPin.objects.filter(colonel=self):
-            pin.occupied_by = None
+            pin.occupied_by_id = None
+            pin.occupied_by_content_type = None
             pin.save()
 
         for component in self.components.all():

simo/users/middleware.py

@@ -11,9 +11,8 @@ import threading
 
 # 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.
+# more robust.
 
-# TODO: rework this in to something more roboust
 
 _thread_locals = threading.local()
 
@@ -39,7 +38,6 @@ class IntroduceUser:
         self.get_response = get_response
 
     def __call__(self, request):
-        response = self.get_response(request)
         if request.user.is_authenticated:
             introduce(request.user)
-        return response
+        return self.get_response(request)

{simo-2.0.4.dist-info → simo-2.0.5.dist-info}/METADATA

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

{simo-2.0.4.dist-info → simo-2.0.5.dist-info}/RECORD

@@ -26,15 +26,15 @@ simo/_hub_template/hub/supervisor.conf,sha256=IY3fdK0fDD2eAothB0n54xhjQj8LYoXIR9
 simo/_hub_template/hub/urls.py,sha256=Ydm-1BkYAzWeEF-MKSDIFf-7aE4qNLPm48-SA51XgJQ,25
 simo/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/core/admin.py,sha256=SXZlKI2aiEscDS12qXdkxDa30GNkFsgnJMT711S1wuw,17525
-simo/core/api.py,sha256=3uUaWOPD-wKrLktJqEg5J3eSeDLNQkZRRQAqQnMvlI4,23633
-simo/core/api_auth.py,sha256=2MRmCid_Fy67chKiJEt6_UaJZmb1PDF8KdbBlkA7YgU,1139
+simo/core/api.py,sha256=D2uX25Do7UkKaYNNY5ZIMtuet8r-_XgoEzK9324smkw,23695
+simo/core/api_auth.py,sha256=_3hG4e1eLKrcRnSAOB_xTL6cwtOJ2_7JS7GZU_iqTgA,1251
 simo/core/api_meta.py,sha256=li4KLFl6xTYOoD8pgS8PYcjqTZlzhXI0reAkt06PZFA,3404
 simo/core/app_widgets.py,sha256=EEQOto3fGR0syDqpJE38tQrx8DoTTyg26nF5kYzHY38,2018
 simo/core/auto_urls.py,sha256=0gu-IL7PHobrmKW6ksffiOkAYu-aIorykWdxRNtwGYo,1194
 simo/core/autocomplete_views.py,sha256=JT5LA2_Wtr60XYSAIqaXFKFYPjrmkEf6yunXD9y2zco,4022
 simo/core/base_types.py,sha256=yqbIZqBksrAkEuHRbt6iExwPDDy0K5II2NzRCkmOvMU,589
 simo/core/context.py,sha256=98PXAMie43faRVBFkOG22uNpvGRNprcGhzjBFkrxaRY,1367
-simo/core/controllers.py,sha256=oxdl3a8cZvR-4_Z-TGUROz2tHjN-T-OuqC-Q4AGcljA,27199
+simo/core/controllers.py,sha256=paeZU6Ky2LgRTwj9nFqrgfeJ4kxWPcl95WDTf6P7jOo,27200
 simo/core/dynamic_settings.py,sha256=U2WNL96JzVXdZh0EqMPWrxqO6BaRR2Eo5KTDqz7MC4o,1943
 simo/core/events.py,sha256=LvtonJGNyCb6HLozs4EG0WZItnDwNdtnGQ4vTcnKvUs,4438
 simo/core/filters.py,sha256=ghtOZcrwNAkIyF5_G9Sn73NkiI71mXv0NhwCk4IyMIM,411
@@ -10128,7 +10128,7 @@ simo/fleet/controllers.py,sha256=N8Qzdp2RPFrpZ_l9O4u8VjHWoY_WTWGg76s3V3oJqEs,139
 simo/fleet/forms.py,sha256=HpvcdFyMl9dLNx1sEOkAkXOkYht6ku2HwWWga-PJzZQ,35067
 simo/fleet/gateways.py,sha256=xFsmF_SXYXK_kMJOCHkiInPJ_0VcPWz-kJDoMup2lT8,1576
 simo/fleet/managers.py,sha256=kpfvvfdH4LDxddIBDpdAb5gsVk8Gb0-L9biFcj9OFPs,807
-simo/fleet/models.py,sha256=MldGstAZf5k0T_QE2qZEyp-64LhUG8Dqiy22_HptwH0,11779
+simo/fleet/models.py,sha256=O0lsXRmTgPyOhpcwWeJ-2GHTNe2uFhiJy4FTW9Ljz-c,11830
 simo/fleet/routing.py,sha256=cofGsVWXMfPDwsJ6HM88xxtRxHwERhJ48Xyxc8mxg5o,149
 simo/fleet/serializers.py,sha256=zEpXAXxjk4Rf1JhlNnLTrs20qJggqjvIySbeHVo4Tt4,1505
 simo/fleet/socket_consumers.py,sha256=xNeR1IuaBTiHO2GEXwB1_4CJ29uMlqBycIUdxGT96E8,19578
@@ -10276,7 +10276,7 @@ simo/users/api.py,sha256=xJCCj75eQXdaYfiCxxG_rMDKzEZuYuCadOhOutqX2YY,9053
 simo/users/auth_backends.py,sha256=I5pnaTa20-Lxfw_dFG8471xDITb0_fQl1PVhJalp5vU,3992
 simo/users/auto_urls.py,sha256=lcJvteBsbHQMJieZpDz-63tDYejLApqsW3CUnDakd7k,272
 simo/users/dynamic_settings.py,sha256=sEIsi4yJw3kH46Jq_aOkSuK7QTfQACGUE-lkyBogCaM,570
-simo/users/middleware.py,sha256=9epN8xDcnYAMoEjAeJGg4W9e54szTgh48LKz3rlywFI,1287
+simo/users/middleware.py,sha256=GMCrnWSc_2qCleyQIkfQGdL-pU-UTEcSg1wPvIKZ9uk,1210
 simo/users/models.py,sha256=f59mkQBpq_fFLDUa-44b1qWleB-TvGdC1M0G67huJMg,18498
 simo/users/permissions.py,sha256=IwtYS8yQdupWbYKR9VimSRDV3qCJ2jXP57Lyjpb2EQM,242
 simo/users/serializers.py,sha256=yrWghK7ONxfzkjO3LbDLK1WPxsPBMYUegdm29qovjjo,2486
@@ -10343,8 +10343,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.4.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.0.4.dist-info/METADATA,sha256=jFNjSQgwnq0CvLKeo5qrAgzbGkeytZt7Em6JVT7WGJM,1699
-simo-2.0.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-simo-2.0.4.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.0.4.dist-info/RECORD,,
+simo-2.0.5.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.0.5.dist-info/METADATA,sha256=aQw7niHw3pcQrYlEkzWz-SoLhr68a4It838k65sh08Q,1699
+simo-2.0.5.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+simo-2.0.5.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.0.5.dist-info/RECORD,,