simo 2.8.6__py3-none-any.whl → 2.8.9__py3-none-any.whl

simo/core/controllers.py

@@ -275,6 +275,7 @@ class ControllerBase(ABC):
             self.component.value = value
 
     def set(self, value, actor=None):
+        from simo.users.models import InstanceUser
         if self.component.value_translation:
             try:
                 namespace = {}
@@ -289,20 +290,36 @@ 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.component, 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
         self.component.change_init_date = None
         self.component.change_init_to = None
         self.component.change_init_fingerprint = None
+        self.component.change_actor = InstanceUser.objects.filter(
+            instance=self.component.zone.instance,
+            user=actor
+        ).first()
         self.component.save()
 
+
+
     def _receive_from_device(
         self, value, is_alive=True, battery_level=None, error_msg=None
     ):
@@ -314,9 +331,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/events.py

@@ -131,16 +131,16 @@ class OnChangeMixin:
 
         self.refresh_from_db()
 
-        if inspect.getfullargspec(self._on_change_function).args:
-            try:
-                self._on_change_function(self)
-            except Exception:
-                print(traceback.format_exc(), file=sys.stderr)
-        else:
-            try:
-                self._on_change_function()
-            except Exception:
-                print(traceback.format_exc(), file=sys.stderr)
+        no_args = len(inspect.getfullargspec(self._on_change_function).args)
+        args = []
+        if no_args > 0:
+            args = [self]
+        if no_args > 1:
+            args.append(payload.get('actor'))
+        try:
+            self._on_change_function(*args)
+        except Exception:
+            print(traceback.format_exc(), file=sys.stderr)
 
     def on_change(self, function):
         if function:

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/core/signal_receivers.py

@@ -164,6 +164,7 @@ def post_save_change_events(sender, instance, created, **kwargs):
             ObjectChangeEvent(
                 target.zone.instance, target,
                 dirty_fields=dirty_fields,
+                actor=getattr(target, 'change_actor', None),
                 **data
             ).publish()
             for master in target.masters.all():

{simo-2.8.6.dist-info → simo-2.8.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: simo
-Version: 2.8.6
+Version: 2.8.9
 Summary: Smart Home Supremacy
 Author-email: Simanas Venčkauskas <simanas@simo.io>
 Project-URL: Homepage, https://simo.io

{simo-2.8.6.dist-info → simo-2.8.9.dist-info}/RECORD

@@ -98,9 +98,9 @@ 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=P4D0Tw1_t0CGM3JzRRMdyW9941xxrMsJVwikJz62ffE,37928
 simo/core/dynamic_settings.py,sha256=bUs58XEZOCIEhg1TigR3LmYggli13KMryBZ9pC7ugAQ,1872
-simo/core/events.py,sha256=1_KIk5pJqdLPRQlCQ9xSyALst2Cn0b2lAEAJ3QjwIjE,4801
+simo/core/events.py,sha256=YkTtkhJJ1MlSarTZ8qhZYMB3ZI7e5-7sK9A0SgVNQYA,4768
 simo/core/filters.py,sha256=6wbn8C2WvKTTjtfMwwLBp2Fib1V0-DMpS4iqJd6jJQo,2540
 simo/core/form_fields.py,sha256=b4wZ4n7OO0m0_BPPS9ILVrwBvhhjUB079YrroveFUWA,5222
 simo/core/forms.py,sha256=D56T38VIdqWXHJ3fW4_jQdxX40YOR8l7ynfWSm8Q1W0,22011
@@ -108,11 +108,11 @@ 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
-simo/core/signal_receivers.py,sha256=tSHKGEFbGqfD-WNKnbDjOQRoABII4akB2oj7l_gLRWk,6517
+simo/core/signal_receivers.py,sha256=eBz-K81W150mavnVzVPU6z8VU_BCqX33O066Xwo8gXw,6578
 simo/core/socket_consumers.py,sha256=UlxV9OvTUUXaoKKYT3-qf1TyGxyOPxIpFH5cPFepH1o,9584
 simo/core/storage.py,sha256=_5igjaoWZAiExGWFEJMElxUw55DzJG1jqFty33xe8BE,342
 simo/core/tasks.py,sha256=-yBjOPILEnKRga-6MK-hBpEINQcY5mpwZwUWiDpqISs,17091
@@ -142,11 +142,11 @@ simo/core/__pycache__/base_types.cpython-312.pyc,sha256=Lnq2NL9B5hfwJARJYC447Rdv
 simo/core/__pycache__/base_types.cpython-38.pyc,sha256=CX-qlF7CefRi_mCE954wYa9rUFR88mOl6g7fybDRu7g,803
 simo/core/__pycache__/context.cpython-312.pyc,sha256=8rsN2Er-Sx3rrVmO0Gk4cem3euGh0kTELXj667GGZ5E,2193
 simo/core/__pycache__/context.cpython-38.pyc,sha256=NlTHt2GvXxA21AhBkeyOLfRFUuXw7wmwqyNhhcDl2cw,1373
-simo/core/__pycache__/controllers.cpython-312.pyc,sha256=pNjKIaSvzEWJlI6_yQdmakyFYNgrxv6dyexVvoScUj4,52897
+simo/core/__pycache__/controllers.cpython-312.pyc,sha256=BjN6TuuqdShWbEFHdZXSdZFB4CwstDJa8LZ1YCe46a0,53852
 simo/core/__pycache__/controllers.cpython-38.pyc,sha256=LtrQQ8egOIOuQbAckeM-z8OfbzS4W8VQ3vBnryAm3iU,32086
 simo/core/__pycache__/dynamic_settings.cpython-312.pyc,sha256=WUZ6XF4kZb6zPf541PkKmiQaBIw-r5C6F3EUUZiTEnE,3331
 simo/core/__pycache__/dynamic_settings.cpython-38.pyc,sha256=wGpnscX1DxFpRl54MQURhjz2aD3NJohSzw9JCFnzh2Y,2384
-simo/core/__pycache__/events.cpython-312.pyc,sha256=G7ayf6HKwjsd6dOUn_TT9JsJsq8KAg7RzCMANqjnZEc,8927
+simo/core/__pycache__/events.cpython-312.pyc,sha256=XMi5fRd97IFEH5wwCJEqUMPtpv_0xJgWr4wqjT7SasU,8900
 simo/core/__pycache__/events.cpython-38.pyc,sha256=1y8YaZsiDkBOeIWzH7SQz4holmMG_RLlMWi8kuSZcoE,5280
 simo/core/__pycache__/filters.cpython-312.pyc,sha256=-vgZ2km1A2q4Un1i30fgHT-6rROgso7HJyd7ct2coJI,3640
 simo/core/__pycache__/filters.cpython-38.pyc,sha256=WBBDwcDQwOmgbrRhyUxenSN80rU4Eq9jQ6RcrRGCP_o,2440
@@ -162,7 +162,7 @@ simo/core/__pycache__/managers.cpython-312.pyc,sha256=RpeR1Z0GtSZht4_a4iDfTU_E8P
 simo/core/__pycache__/managers.cpython-38.pyc,sha256=6RTIxyjOgpQGtAqcUyE2vFPS09w1V5Wmd_vOV7rHRRI,3370
 simo/core/__pycache__/middleware.cpython-312.pyc,sha256=2VhHTVY-rdPNqNX0wst2ioVbHD5uMqHkY-tpujLdpH0,4195
 simo/core/__pycache__/middleware.cpython-38.pyc,sha256=SgTLFNkKxvJ62hevSAVNZHgHdG_u2p7AZBhrj-jfFPs,2649
-simo/core/__pycache__/models.cpython-312.pyc,sha256=z6RR7Rv4POCpVl5acn2VHVhLLRh59YhO1jq_JSO8CmI,31960
+simo/core/__pycache__/models.cpython-312.pyc,sha256=C1whcLl5R_kD5HDfQhtM5WfK8NlsB6_wIqR-Zem9mLk,31570
 simo/core/__pycache__/models.cpython-38.pyc,sha256=A4JsWsDMBaQ_U5sV5cX0c_Uox9mP5fAqn_712EjfNS4,19605
 simo/core/__pycache__/permissions.cpython-312.pyc,sha256=yqG6t9NZZtL30Hr7razjiG6JDGKiz0Qjcjxgv1C93vM,4450
 simo/core/__pycache__/permissions.cpython-38.pyc,sha256=UdtxCTXPEbe99vgZOfRz9wfKSYvUn9hSRbpIV9CJSyI,2988
@@ -170,7 +170,7 @@ simo/core/__pycache__/routing.cpython-312.pyc,sha256=bDvF5HTZ8POSOHKwREyhSPO7oh9
 simo/core/__pycache__/routing.cpython-38.pyc,sha256=3T3FPJ8Cn99xZCGvMyg2xjl7al-Shm9CelbSpkJtNP8,599
 simo/core/__pycache__/serializers.cpython-312.pyc,sha256=LW6xmjKG5Ex5y8kslVd2xGy9eRqjNP2E29GxdJaAq48,32997
 simo/core/__pycache__/serializers.cpython-38.pyc,sha256=H3K_retN44wOj-ew0cvoxUSXqrUOhHCMV_oJabNF0Xg,20431
-simo/core/__pycache__/signal_receivers.cpython-312.pyc,sha256=aSU_K0X2heDJL7DM8zGrjj4JqcNBgkwY_dIMiMWJI2I,8942
+simo/core/__pycache__/signal_receivers.cpython-312.pyc,sha256=5ahQ8vCFy7-mCeptOPEv10vUzJe-Hk31fzuAjaBNDPc,8999
 simo/core/__pycache__/signal_receivers.cpython-38.pyc,sha256=R_h1GHkoZXR-nrwiRJWQ9xE69JB1R_mP_fNYIBX4lrE,5165
 simo/core/__pycache__/socket_consumers.cpython-312.pyc,sha256=Yph9SQTj6c3xr2HXKnSm7r2M7dp1ks2lp8Q6v8TJ7cM,15322
 simo/core/__pycache__/socket_consumers.cpython-38.pyc,sha256=Mr1-x-vGjBNffbz0S6AKpJCuzHJgRm8kXefv3qVVY_E,8397
@@ -10763,7 +10763,7 @@ simo/users/__pycache__/admin.cpython-312.pyc,sha256=lTVuZQwkuw1bzSn0A0kt-8H6ruKa
 simo/users/__pycache__/admin.cpython-38.pyc,sha256=uL8TwAipkatZxanvQtBKKcOv8Fm3UvinBxsP0okrOZg,8443
 simo/users/__pycache__/api.cpython-312.pyc,sha256=p8nEOe95slqWK0QxhAkmXXbyPiZd-0VcA-ejvFcS6Mo,18333
 simo/users/__pycache__/api.cpython-38.pyc,sha256=zZ4DfNktgeVvLAtMpaPUv7AoAgbKr7SCt-4ghJk1zp4,10386
-simo/users/__pycache__/apps.cpython-312.pyc,sha256=yLvyvcBuRr6jfIxwiA9sjQOE4VyHVUKl5FUVDPXuAkM,707
+simo/users/__pycache__/apps.cpython-312.pyc,sha256=6KefztC11cSg6VHJ7-sVDvOA-oq_jNMB8jMvmhcVZD4,707
 simo/users/__pycache__/apps.cpython-38.pyc,sha256=dgbWL8CxzzISJQTmq_4IztPJ2UzykNVdqA2Ae1PmeGk,605
 simo/users/__pycache__/auth_backends.cpython-312.pyc,sha256=63popQIO8sxcaOGOWxol_5RpKNbYiQhJtPEWEm31xc4,5469
 simo/users/__pycache__/auth_backends.cpython-38.pyc,sha256=jYS2hlbTZh_ZtPeWcN50pc0IpyfCSO7_MvIbuVwEp8M,3144
@@ -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.6.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.8.6.dist-info/METADATA,sha256=mFNkzajYfWS7t90qazcDEGula2-oxIgJyKptnT7M4DY,2005
-simo-2.8.6.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-simo-2.8.6.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
-simo-2.8.6.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.8.6.dist-info/RECORD,,
+simo-2.8.9.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.8.9.dist-info/METADATA,sha256=OfOi51AIAYPieYx4Q2xWSE2j04nlW_U7PHkheouo6Xo,2005
+simo-2.8.9.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+simo-2.8.9.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
+simo-2.8.9.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.8.9.dist-info/RECORD,,