simo 2.8.5__py3-none-any.whl → 2.8.7__py3-none-any.whl

simo/asgi.py

@@ -1,4 +1,4 @@
-import importlib
+import importlib, datetime, sys
 from django.core.asgi import get_asgi_application
 from channels.auth import AuthMiddlewareStack
 from channels.routing import ProtocolTypeRouter, URLRouter
@@ -21,6 +21,26 @@ for name, app in apps.app_configs.items():
         if isinstance(item, list) and var_name == 'urlpatterns':
             urlpatterns.extend(item)
 
+
+class TimestampedStream:
+    """Adds timestamps to all the prints"""
+
+    def __init__(self, stream):
+        self.stream = stream
+
+    def write(self, data):
+        if data != '\n':
+            timestamp = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')
+            self.stream.write(f'[{timestamp}] {data}')
+        else:
+            self.stream.write(data)
+
+    def flush(self):
+        self.stream.flush()
+
+
+sys.stdout = TimestampedStream(sys.stdout)
+
 application = ProtocolTypeRouter({
     "http": get_asgi_application(),
     'websocket': AuthMiddlewareStack(

simo/core/controllers.py

@@ -289,12 +289,23 @@ class ControllerBase(ABC):
             actor = self._get_actor(value)
         if not actor:
             actor = get_current_user()
-        if actor:
-            introduce_user(actor)
 
         self.component.refresh_from_db()
         if value != self.component.value:
             self.component.value_previous = self.component.value
+            from .models import ComponentHistory
+            ComponentHistory.objects.create(
+                component=self.component, type='value', value=value,
+                user=actor
+            )
+            from actstream import action
+            action.send(
+                actor, target=self, verb="value change",
+                instance_id=self.component.zone.instance.id,
+                action_type='comp_value', value=value
+            )
+            actor.last_action = timezone.now()
+            actor.save()
         self.component.value = value
 
         self.component.change_init_by = None
@@ -303,6 +314,8 @@ class ControllerBase(ABC):
         self.component.change_init_fingerprint = None
         self.component.save()
 
+
+
     def _receive_from_device(
         self, value, is_alive=True, battery_level=None, error_msg=None
     ):
@@ -314,9 +327,6 @@ class ControllerBase(ABC):
             init_by_device = True
             actor = get_device_user()
 
-        # Introducing user to this thread for changes that might happen to other components
-        # in relation to the change of this component
-        introduce_user(actor)
         self.component.alive = is_alive
         if error_msg != None:
             self.component.error_msg = error_msg if error_msg.strip() else None

simo/core/models.py

@@ -510,18 +510,7 @@ def is_in_alarm(self):
 
         if self.pk:
             actor = get_current_user()
-            action_performed = False
-            if 'value' in dirty_fields:
-                ComponentHistory.objects.create(
-                    component=self, type='value', value=self.value,
-                    user=actor
-                )
-                action.send(
-                    actor, target=self, verb="value change",
-                    instance_id=self.zone.instance.id,
-                    action_type='comp_value', value=self.value
-                )
-                action_performed = True
+
             if 'arm_status' in dirty_fields:
                 ComponentHistory.objects.create(
                     component=self, type='security',
@@ -533,7 +522,6 @@ def is_in_alarm(self):
                     action_type='security', value=self.value
                 )
                 action_performed = True
-            if action_performed:
                 actor.last_action = timezone.now()
                 actor.save()
 

simo/settings.py

@@ -295,21 +295,3 @@ ACTSTREAM_SETTINGS = {
 DATETIME_FORMAT = 'Y-m-d H:i:s'
 
 
-class TimestampedStream:
-    """Adds timestamps to all the prints"""
-
-    def __init__(self, stream):
-        self.stream = stream
-
-    def write(self, data):
-        if data != '\n':
-            timestamp = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')
-            self.stream.write(f'[{timestamp}] {data}')
-        else:
-            self.stream.write(data)
-
-    def flush(self):
-        self.stream.flush()
-
-
-sys.stdout = TimestampedStream(sys.stdout)

{simo-2.8.5.dist-info → simo-2.8.7.dist-info}/METADATA

@@ -1,7 +1,7 @@
 Metadata-Version: 2.2
 Name: simo
-Version: 2.8.5
-Summary: Smart Home on Steroids!
+Version: 2.8.7
+Summary: Smart Home Supremacy
 Author-email: Simanas Venčkauskas <simanas@simo.io>
 Project-URL: Homepage, https://simo.io
 Project-URL: Issues, https://github.com/pypa/sampleproject/issues

{simo-2.8.5.dist-info → simo-2.8.7.dist-info}/RECORD

@@ -1,18 +1,18 @@
 simo/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-simo/asgi.py,sha256=L8CUVZLM32IMzWDZ4IShdDN-m69t7oxAUeHods4-xNM,822
+simo/asgi.py,sha256=-CIyRRKCfZqMS7SIh69Me07JWE-CjcNzls_lEvchaqc,1301
 simo/celeryc.py,sha256=eab7_e9rw0c__DCeoUFUh_tjAGVlulxVrk75BaJf57Q,1512
 simo/conf.py,sha256=H2BhXAV8MEDVXF8AbkaLSfR4ULd-9_bS4bnhE5sE5fg,112
-simo/settings.py,sha256=C04iruyTTGqrcYuZjW_EN7V8MNPWNnsde4dZiQ3tr4Y,7523
+simo/settings.py,sha256=EloltW6viNx4v6bMOorAvtjxsZ4nWI_5FiWZzQ6NCLE,7062
 simo/urls.py,sha256=d8g-wN0Xr2PVIV8RZl_h_PMN9KGZNIE9to2hQj1p1TU,2497
 simo/__pycache__/__init__.cpython-312.pyc,sha256=a12_Zr7kC5DXzcFxA5eMu-TiSU5xbdF5cdKq-gwc3x0,159
 simo/__pycache__/__init__.cpython-38.pyc,sha256=j81de0BqHMr6bs0C7cuYrXl7HwtK_vv8hDEtAdSwDJc,153
-simo/__pycache__/asgi.cpython-312.pyc,sha256=3TFbweG4IzHv2br0bONji5wjd26pUvs1r_7fGXVBUVg,1263
+simo/__pycache__/asgi.cpython-312.pyc,sha256=V3Whr1WOgmiagL6BzfKuQqwlSZHUbmi6gqsTga8N9oI,2458
 simo/__pycache__/asgi.cpython-38.pyc,sha256=5W_YSKOIrRd6NQQuJDuA3Yuj688GzirXVVOyLe8wJIQ,845
 simo/__pycache__/celeryc.cpython-312.pyc,sha256=MQlG6VeEdCpXPpiiAwZavriWKwHbhwTMrfAwdhnb2kw,2375
 simo/__pycache__/celeryc.cpython-38.pyc,sha256=eSRoaKwfYlxVaxAiwqpQ2ndEcx7W-VpZtbxRFSV8UYg,1653
 simo/__pycache__/conf.cpython-312.pyc,sha256=q63YJWqaaaQLz3qXW8clENjvH1zUfY_k34_m56n5gRY,320
 simo/__pycache__/conf.cpython-38.pyc,sha256=MYP2yk3ULxiYwZsZR6tCLjKnU-z03A3avzQzIn66y3k,273
-simo/__pycache__/settings.cpython-312.pyc,sha256=lrMjm4OihDlNrull26G_TaWUEJkFbo4Po5ir5efSRU4,7886
+simo/__pycache__/settings.cpython-312.pyc,sha256=rwwP1a_wo7d0MqznWZ8HOibSJvfy4JI2-BPKBjV0qKI,6738
 simo/__pycache__/settings.cpython-38.pyc,sha256=4w3ds3D9S78zbsovXsXC05PYBAafDrtsOhX14FT0YyE,6149
 simo/__pycache__/urls.cpython-312.pyc,sha256=mIg_YD7zgjmIzfWzpGpikMqanGKP2O-iuA1ixqQngnc,3689
 simo/__pycache__/urls.cpython-38.pyc,sha256=u0x6EqT8S1YfDOSPgbI8Kf-RDlveY9OV-EDXMYKAQ7w,2125
@@ -98,7 +98,7 @@ simo/core/auto_urls.py,sha256=FqKhH0fF7cGO6P2YrjblwG4JA2UkVXj3lreJUOB2Jq4,1194
 simo/core/autocomplete_views.py,sha256=x3MKOZvXYS3xVQ-V1S7Liv_U5bxr-uc0gePa85wv5nA,4561
 simo/core/base_types.py,sha256=WypW8hTfzveuTQtruGjLYAGQZIuczxTlW-SdRk3iQug,666
 simo/core/context.py,sha256=LKw1I4iIRnlnzoTCuSLLqDX7crHdBnMo3hjqYvVmzFc,1557
-simo/core/controllers.py,sha256=4u67VNwU4Zts64aVddqhoPt9ZRbpTmAHPCdu-pFfIX0,37407
+simo/core/controllers.py,sha256=Dsg3047IW_jxAS3AWnwTK7blLPAnr_w16R7HAI1d3gk,37709
 simo/core/dynamic_settings.py,sha256=bUs58XEZOCIEhg1TigR3LmYggli13KMryBZ9pC7ugAQ,1872
 simo/core/events.py,sha256=1_KIk5pJqdLPRQlCQ9xSyALst2Cn0b2lAEAJ3QjwIjE,4801
 simo/core/filters.py,sha256=6wbn8C2WvKTTjtfMwwLBp2Fib1V0-DMpS4iqJd6jJQo,2540
@@ -108,7 +108,7 @@ simo/core/gateways.py,sha256=Y2BME6zSyeUq_e-hzEUF6gErCUCP6nFxedkLZKiLVOo,4141
 simo/core/loggers.py,sha256=EBdq23gTQScVfQVH-xeP90-wII2DQFDjoROAW6ggUP4,1645
 simo/core/managers.py,sha256=Ampwe5K7gfE6IJULNCV35V8ysmMOdS_wz7mRzfaLZUw,3014
 simo/core/middleware.py,sha256=zX6N4P_KR7gG8N2-NcR7jKtuCEhCGRh51g4EktAhP7w,3272
-simo/core/models.py,sha256=Nw-XT0v0y5pBYlKKhzoI68HiEMMTp7fqZQZgKmeOW7Q,23752
+simo/core/models.py,sha256=brZPs8clR49VKm_Uo1wgPgCbjkS0fTLvzz3rROBeob4,23211
 simo/core/permissions.py,sha256=Ef4NO7QwwDd3Z-v61R0BeCBXxTOJz9qBvzRTIB5tHwI,2943
 simo/core/routing.py,sha256=X1_IHxyA-_Q7hw1udDoviVP4_FSBDl8GYETTC2zWTbY,499
 simo/core/serializers.py,sha256=adqe8oYP5f7hGFXcxa-Zmce2KOwy3hZOaWE3MaAFtpM,23157
@@ -10933,9 +10933,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.8.5.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.8.5.dist-info/METADATA,sha256=J6rygMMxiXfeOMVZEhetZjpGJKHF_m2obJCRJ5D7y00,2008
-simo-2.8.5.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-simo-2.8.5.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
-simo-2.8.5.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.8.5.dist-info/RECORD,,
+simo-2.8.7.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.8.7.dist-info/METADATA,sha256=dVPIZL5FPgcXAwX71CPy_Kz3UPkuye75HRntaWsnm04,2005
+simo-2.8.7.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+simo-2.8.7.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
+simo-2.8.7.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.8.7.dist-info/RECORD,,