simo 2.5.25__py3-none-any.whl → 2.5.27__py3-none-any.whl

simo/core/middleware.py

@@ -25,6 +25,12 @@ def introduce_instance(instance, request=None):
         request.instance = instance
 
 
+def drop_current_instance(request=None):
+    if request and 'instance_id' in request.session:
+        request.session.pop('instance_id')
+    _thread_locals.instance = None
+
+
 def get_current_instance(request=None):
     from simo.core.models import Instance
     if request and request.session.get('instance_id'):
@@ -33,7 +39,8 @@ def get_current_instance(request=None):
         ).first()
         if not instance:
             del request.session['instance_id']
-        introduce_instance(instance, request)
+        else:
+            introduce_instance(instance, request)
 
     instance = getattr(_thread_locals, 'instance', None)
 

simo/core/tasks.py

@@ -231,7 +231,7 @@ def sync_with_remote():
                 weather_component.save()
 
         if new_instance:
-            print(f"NEW INSTANCE:  {instance}")
+            print(f"NEW INSTANCE: {instance}")
             print(f"Users data: {users_data}")
 
 
@@ -295,10 +295,6 @@ def sync_with_remote():
                 user.avatar_last_change = timezone.now()
                 user.save()
 
-        Instance.objects.all().exclude(
-            uid__in=instance_uids
-        ).update(is_active=False)
-
 
 
 @celery_app.task

simo/fleet/forms.py

@@ -1175,6 +1175,11 @@ class BlindsConfigForm(ColonelComponentForm):
                   "to go from fully closed to the start of open movement. <br>"
                   "Usually it's in between of 1 - 3 seconds."
     )
+    retain_angle = forms.BooleanField(
+        required=False, initial=True,
+        help_text="Retain blinds angle after adjusting it's "
+                  "position using physical buttons."
+    )
     control_mode = forms.ChoiceField(
         label="App control mode", required=True, choices=(
             ('click', "Click"), ('hold', "Hold"), ('slide', "Slide")
@@ -1186,6 +1191,10 @@ class BlindsConfigForm(ColonelComponentForm):
         )
     )
 
+    def __init__(self, *args, **kwargs):
+        self.basic_fields.append('retain_angle')
+        return super().__init__(*args, **kwargs)
+
     def clean(self):
         super().clean()
 

simo/fleet/models.py

@@ -275,7 +275,7 @@ def after_colonel_save(sender, instance, created, *args, **kwargs):
         if instance.type == 'game-changer':
             # occupy ports immediately
             Interface.objects.create(colonel=instance, no=1, type='i2c')
-            Interface.objects.create(colonel=instance, no=2, type='dali')
+            Interface.objects.create(colonel=instance, no=2)
         elif instance.type == 'game-changer-mini':
             # only create interfaces, but do not ocuupy ports
             Interface.objects.create(colonel=instance, no=1)

simo/fleet/socket_consumers.py

@@ -13,7 +13,7 @@ import paho.mqtt.client as mqtt
 from channels.generic.websocket import AsyncWebsocketConsumer
 from asgiref.sync import sync_to_async
 from simo.core.utils.model_helpers import get_log_file_path
-from simo.core.middleware import introduce_instance
+from simo.core.middleware import introduce_instance, drop_current_instance
 from simo.core.utils.logs import capture_socket_errors
 from simo.core.events import GatewayObjectCommand, get_event_obj
 from simo.core.models import Gateway, Instance, Component
@@ -87,8 +87,6 @@ class FleetConsumer(AsyncWebsocketConsumer):
         tz = await sync_to_async(get_tz, thread_sensitive=True)()
         timezone.activate(tz)
 
-        introduce_instance(self.instance)
-
         def get_colonel():
             defaults={
                 'instance': self.instance,
@@ -240,7 +238,6 @@ class FleetConsumer(AsyncWebsocketConsumer):
             }
 
         def get_components(colonel):
-            introduce_instance(self.instance)
             return list(
                 colonel.components.all().prefetch_related('slaves')
             )
@@ -299,6 +296,7 @@ class FleetConsumer(AsyncWebsocketConsumer):
         return config_data
 
     def on_mqtt_message(self, client, userdata, msg):
+        drop_current_instance()
         try:
             payload = json.loads(msg.payload)
 
@@ -366,7 +364,6 @@ class FleetConsumer(AsyncWebsocketConsumer):
 
     async def receive(self, text_data=None, bytes_data=None):
         try:
-            introduce_instance(self.instance)
             if text_data:
                 print(f"{self.colonel}: {text_data}")
                 data = json.loads(text_data)

simo/generic/forms.py

@@ -371,7 +371,7 @@ class ThermostatConfigForm(BaseComponentForm):
             'temperature_sensor'
         ].base_type == MultiSensor.base_type else False
         self.instance.config['user_config']['use_real_feel'] = \
-        self.cleaned_data['use_real_feel']
+        self.cleaned_data.get('use_real_feel', False)
         return super().save(commit)
 
 

simo/generic/gateways.py

@@ -12,7 +12,7 @@ from django.db import connection as db_connection
 from django.db.models import Q
 import paho.mqtt.client as mqtt
 from simo.core.models import Component
-from simo.core.middleware import introduce_instance
+from simo.core.middleware import introduce_instance, drop_current_instance
 from simo.core.gateways import BaseObjectCommandsGatewayHandler
 from simo.core.forms import BaseGatewayForm
 from simo.core.utils.logs import StreamToLogger
@@ -132,6 +132,7 @@ class GenericGatewayHandler(BaseObjectCommandsGatewayHandler):
 
     def watch_thermostats(self):
         from .controllers import Thermostat
+        drop_current_instance()
         for thermostat in Component.objects.filter(
             controller_uid=Thermostat.uid
         ):
@@ -141,15 +142,18 @@ class GenericGatewayHandler(BaseObjectCommandsGatewayHandler):
 
     def watch_alarm_clocks(self):
         from .controllers import AlarmClock
+        drop_current_instance()
         for alarm_clock in Component.objects.filter(
             controller_uid=AlarmClock.uid
         ):
+            introduce_instance(alarm_clock.zone.instance)
             tz = pytz.timezone(alarm_clock.zone.instance.timezone)
             timezone.activate(tz)
             alarm_clock.tick()
 
     def watch_scripts(self):
         # observe running scripts and drop the ones that are no longer alive
+        drop_current_instance()
         dead_processes = []
         for id, process in self.running_scripts.items():
             if process.is_alive():
@@ -183,8 +187,10 @@ class GenericGatewayHandler(BaseObjectCommandsGatewayHandler):
             self.start_script(script)
 
     def watch_watering(self):
+        drop_current_instance()
         from .controllers import Watering
         for watering in Component.objects.filter(controller_uid=Watering.uid):
+            introduce_instance(watering.zone.instance)
             tz = pytz.timezone(watering.zone.instance.timezone)
             timezone.activate(tz)
             if watering.value['status'] == 'running_program':
@@ -195,6 +201,7 @@ class GenericGatewayHandler(BaseObjectCommandsGatewayHandler):
                 watering.controller._perform_schedule()
 
     def run(self, exit):
+        drop_current_instance()
         self.exit = exit
         self.logger = get_gw_logger(self.gateway_instance.id)
         for task, period in self.periodic_tasks:
@@ -261,9 +268,11 @@ class GenericGatewayHandler(BaseObjectCommandsGatewayHandler):
             Script, AlarmGroup
         )
         payload = json.loads(msg.payload)
+        drop_current_instance()
         component = get_event_obj(payload, Component)
         if not component:
             return
+        introduce_instance(component.zone.instance)
         try:
             if isinstance(component.controller, Script):
                 if payload.get('set_val') == 'start':
@@ -373,6 +382,7 @@ class GenericGatewayHandler(BaseObjectCommandsGatewayHandler):
 
     def watch_alarm_events(self):
         from .controllers import AlarmGroup
+        drop_current_instance()
         for alarm in Component.objects.filter(
             controller_uid=AlarmGroup.uid, value='breached',
             meta__breach_start__gt=0
@@ -393,6 +403,7 @@ class GenericGatewayHandler(BaseObjectCommandsGatewayHandler):
                 alarm.save(update_fields=['meta'])
 
     def watch_timers(self):
+        drop_current_instance()
         for component in Component.objects.filter(
             meta__timer_to__gt=0
         ).filter(meta__timer_to__lt=time.time()):

simo/users/auth_backends.py

@@ -99,13 +99,17 @@ class SSOBackend(ModelBackend):
                 user=user, instance=invitation.instance,
                 defaults={'role': invitation.role}
             )
-            user.is_active = True
+            if not user.is_active:
+                user.is_active = True
+                user.save()
 
         if not user.is_active:
             return
 
         if user_data.get('name'):
-            user.name = user_data['name']
+            if user_data['name'] != user.name:
+                user.name = user_data['name']
+                user.save()
         if user_data.get('avatar_url') \
         and user.avatar_url != user_data.get('avatar_url'):
             user.avatar_url = user_data.get('avatar_url')
@@ -113,7 +117,5 @@ class SSOBackend(ModelBackend):
             user.avatar.save(
                 os.path.basename(user.avatar_url), io.BytesIO(resp.content)
             )
-        if user.get_dirty_fields():
-            user.save()
 
         return user

simo/users/models.py

@@ -154,7 +154,10 @@ def post_instance_user_save(sender, instance, created, **kwargs):
         dynamic_settings['core__needs_mqtt_acls_rebuild'] = True
 
 
-class User(DirtyFieldsMixin, AbstractBaseUser, SimoAdminMixin):
+# DirtyFieldsMixin does not work with AbstractBaseUser model!!!
+# goes in to RecursionError: maximum recursion depth exceeded
+# when saving, so do not ever use it!!!!
+class User(AbstractBaseUser, SimoAdminMixin):
     name = models.CharField(_('name'), max_length=150)
     email = models.EmailField(_('email address'), unique=True)
     avatar = ThumbnailerImageField(

{simo-2.5.25.dist-info → simo-2.5.27.dist-info}/METADATA

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

{simo-2.5.25.dist-info → simo-2.5.27.dist-info}/RECORD

@@ -51,7 +51,7 @@ simo/core/forms.py,sha256=O40apPH7a4qX4WdCc10A1aoAaGWOpKqmjB8d-OhEKCo,21523
 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/middleware.py,sha256=eUFf6iP-Snx_0TE3MoXsSwqrd5IjlukqZk2GQGStRCo,3385
 simo/core/models.py,sha256=DXJXTtNdpn9yC4VArHp0yrhpRb7vGpwH2c-JvqLE56M,22784
 simo/core/permissions.py,sha256=INQPrUAIM3WXCvd7e6cmYytKaak8fMEn7VooX-fIds0,3002
 simo/core/routing.py,sha256=X1_IHxyA-_Q7hw1udDoviVP4_FSBDl8GYETTC2zWTbY,499
@@ -59,7 +59,7 @@ simo/core/serializers.py,sha256=WgksN1Ombv240nfQR_UtmKslTWM9vz9Y0yTdN5usiHU,2189
 simo/core/signal_receivers.py,sha256=WYBRCFJhP83Ukd-Ipc1HlNyTXdTHD1rl0tV3uOKnYWY,8861
 simo/core/socket_consumers.py,sha256=trRZvBGTJ7xIbfdmVvn7zoiWp_qssSkMZykDrI5YQyE,9783
 simo/core/storage.py,sha256=_5igjaoWZAiExGWFEJMElxUw55DzJG1jqFty33xe8BE,342
-simo/core/tasks.py,sha256=KjRx7X948A7j-ZKZNU0LucV-HGRQnd4ai6ikb49yYb0,16517
+simo/core/tasks.py,sha256=N0E9ps1n1d8xayYElGlm7GDudVEwpWfFjC8Aq9fP7TA,16407
 simo/core/todos.py,sha256=eYVXfLGiapkxKK57XuviSNe3WsUYyIWZ0hgQJk7ThKo,665
 simo/core/types.py,sha256=WJEq48mIbFi_5Alt4wxWMGXxNxUTXqfQU5koH7wqHHI,1108
 simo/core/views.py,sha256=3SRZr00fyLQf8ja3U-9eekKt-ld5TvU1WQqUWprXfQ4,2390
@@ -10224,13 +10224,13 @@ simo/fleet/auto_urls.py,sha256=UX66eR2ykMqFgfIllW-RTdjup5-FieCWl_BVm3CcXKg,702
 simo/fleet/base_types.py,sha256=wL9RVkHr0gA7HI1wZq0pruGEIgvQqpfnCL4cC3ywsvw,102
 simo/fleet/ble.py,sha256=eHA_9ABjbmH1vUVCv9hiPXQL2GZZSEVwfO0xyI1S0nI,1081
 simo/fleet/controllers.py,sha256=fjri1GtCnflkkDpNqhTwy6i9CK6RDEB0Q_BtADzcG8E,29156
-simo/fleet/forms.py,sha256=LbYphCtfpSxK3GwzSrcbMkB_spcspsf5FzYQFE9n-Q4,62614
+simo/fleet/forms.py,sha256=dNyM0hAKR93DPeKs6NJnE42prAeCR4MoXjkv5mGeQ4g,62952
 simo/fleet/gateways.py,sha256=lKEJW0MgaOEiNnijH50DNSVChvaUT3TA3UurcI57P8k,5677
 simo/fleet/managers.py,sha256=ZNeHFSkF5kzsl9E1DCBevOW6kXJlD6kw0LU4B-JMOG8,828
-simo/fleet/models.py,sha256=xAffeAh5hf8NC94B66ZqmYoF7qDN53wEQ1xE2E9D8Xc,17524
+simo/fleet/models.py,sha256=zPplx_v64nfKBmb-nCb74aCVtEeY3m3SjEy-VhbnydU,17511
 simo/fleet/routing.py,sha256=cofGsVWXMfPDwsJ6HM88xxtRxHwERhJ48Xyxc8mxg5o,149
 simo/fleet/serializers.py,sha256=X2M0DFKVaxM6JFGDsdg3S2nJlLIcBvbujidZdfxD88w,2169
-simo/fleet/socket_consumers.py,sha256=nfwMAzHHDWrvmwOIfPJqYHgr2fF-OJ_l6gWOnljyFWI,18434
+simo/fleet/socket_consumers.py,sha256=PwxGOqstI5wzglBHTvxosa9mwg8n3tWDQEPLb1vbxlc,18354
 simo/fleet/tasks.py,sha256=AGq9BXFNAqkhOANsPvId8yjEbDtVCB3MRsi_AKDpgIM,821
 simo/fleet/utils.py,sha256=wNJvURzLP3-aho3D3rfg07N9kWCaMIw5gOsmeeO9Nlg,4740
 simo/fleet/views.py,sha256=jT3GcGv_JEj3dqyfHH2whCnGqwT8YEAuFxRgIX4Dk9w,3237
@@ -10341,8 +10341,8 @@ 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=i-xKQ5PrNKwCuO0dFaHHUaD5rF9lDnq18ziVSNBENao,50134
-simo/generic/forms.py,sha256=H841-wbWltnZ2-RXQEM1G8H4kfOcl88Qhg7bxE4VCiQ,28993
-simo/generic/gateways.py,sha256=sMedpxIfpxqTx746DdhsIu-pzTrqduOSIb7i7XDX9GU,15339
+simo/generic/forms.py,sha256=tCbIZtbruBHjZRzulGXJQOjmxaGJ2uoKqjT1scScdDQ,29004
+simo/generic/gateways.py,sha256=MxPQzgEnnXSG-t6rErHZQJACFWegCWGaME640UIGrA8,15783
 simo/generic/models.py,sha256=Adq7ipWK-renxJlNW-SZnAq2oGEOwKx8EdUWaKnfcVQ,7597
 simo/generic/routing.py,sha256=elQVZmgnPiieEuti4sJ7zITk1hlRxpgbotcutJJgC60,228
 simo/generic/socket_consumers.py,sha256=K2OjphIhKJH48BvfFfoCOyCQZ1NmXb_phs6y1IP-qaQ,1757
@@ -10445,12 +10445,12 @@ simo/users/__init__.py,sha256=6a7uBpCWB_DR7p54rbHusc0xvi1qfT1ZCCQGb6TiBh8,52
 simo/users/admin.py,sha256=9P0iIGAep2R1AUvZnROsRULbxwCYK9pCfSJ2X4aLLBg,6965
 simo/users/api.py,sha256=xe__HFxzOaKgrh75PFpP4nkSs5DvmJp8QvMDNhP5kLU,12127
 simo/users/apps.py,sha256=cq0A8-U1HALEwev0TicgFhr4CAu7Icz8rwq0HfOaL4E,207
-simo/users/auth_backends.py,sha256=EErYrGti3TIlYH9Bxj0UFs5EKsbYMV4FP4wGfpdHtts,4165
+simo/users/auth_backends.py,sha256=KIw2AdjCUKfm_7Lql6aC4qdE6JznP0ECIMA5MVMLeiM,4251
 simo/users/auto_urls.py,sha256=lcJvteBsbHQMJieZpDz-63tDYejLApqsW3CUnDakd7k,272
 simo/users/dynamic_settings.py,sha256=sEIsi4yJw3kH46Jq_aOkSuK7QTfQACGUE-lkyBogCaM,570
 simo/users/managers.py,sha256=OHgEP85MBtdkdYxdstBd8RavTBT8F_2WyDxUJ9aCqqM,246
 simo/users/middleware.py,sha256=GMCrnWSc_2qCleyQIkfQGdL-pU-UTEcSg1wPvIKZ9uk,1210
-simo/users/models.py,sha256=KcIanqB8xvgvTO_jAUJpoN6JSRJha_DhIDSs4lniFXA,19402
+simo/users/models.py,sha256=Ms5YiU_N1rDSxWMYErO1RnBiK7Jo8Ww_raYJZ5p4yL0,19551
 simo/users/permissions.py,sha256=IwtYS8yQdupWbYKR9VimSRDV3qCJ2jXP57Lyjpb2EQM,242
 simo/users/serializers.py,sha256=zzw1KONTnaTNBaU0r4rNVxJ827KzD6Z5LuQt27ZsQ98,2516
 simo/users/sso_urls.py,sha256=gQOaPvGMYFD0NCVSwyoWO-mTEHe5j9sbzV_RK7kdvp0,251
@@ -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.25.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.5.25.dist-info/METADATA,sha256=0QbwBkQyX8aCdHsmCEsHZAP2gqvrBugk80H1VV06kRI,1924
-simo-2.5.25.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-simo-2.5.25.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
-simo-2.5.25.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.5.25.dist-info/RECORD,,
+simo-2.5.27.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.5.27.dist-info/METADATA,sha256=iYNcZpbiLgJERBKWPk9fk0ZMXQqO7-pT2h-9B6N9YbE,1924
+simo-2.5.27.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+simo-2.5.27.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
+simo-2.5.27.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.5.27.dist-info/RECORD,,