simo 2.1.7__py3-none-any.whl → 2.1.8__py3-none-any.whl

simo/generic/controllers.py

@@ -322,7 +322,7 @@ class Thermostat(ControllerBase):
         ).first()
 
         if not temperature_sensor or not temperature_sensor.alive:
-            print(f"No temperature sensor on {self.component}!")
+            self.component.error_msg = "No temperature sensor"
             self.component.alive = False
             self.component.save()
             return
@@ -355,7 +355,7 @@ class Thermostat(ControllerBase):
 
         if mode in ('auto', 'heater'):
             if (not heater or not heater.alive) and mode == 'heater':
-                print(f"No heater on {self.component}!")
+                self.component.error_msg = "No heater"
                 self.component.alive = False
                 self.component.save()
                 return

simo/generic/gateways.py

@@ -304,25 +304,32 @@ class GenericGatewayHandler(BaseObjectCommandsGatewayHandler):
         mqtt_client.subscribe(command.get_topic())
 
     def on_mqtt_message(self, client, userdata, msg):
-        from simo.generic.controllers import Script, Blinds, AlarmGroup, Gate
+        print("Mqtt message: ", msg.payload)
+        from simo.generic.controllers import (
+            Script, Blinds, AlarmGroup, Gate
+        )
         payload = json.loads(msg.payload)
         component = get_event_obj(payload, Component)
         if not component:
             return
+        try:
+            if isinstance(component.controller, Script):
+                if payload.get('set_val') == 'start':
+                    self.start_script(component)
+                elif payload.get('set_val') == 'stop':
+                    self.stop_script(component)
+                return
+            elif component.controller_uid == Blinds.uid:
+                self.control_blinds(component, payload.get('set_val'))
+            elif component.controller_uid == AlarmGroup.uid:
+                self.control_alarm_group(component, payload.get('set_val'))
+            elif component.controller_uid == Gate:
+                self.control_gate(component, payload.get('set_val'))
+            else:
+                component.controller.set(payload.get('set_val'))
+        except Exception:
+            print(traceback.format_exc(), file=sys.stderr)
 
-        if isinstance(component.controller, Script):
-            if payload.get('set_val') == 'start':
-                print("START THIS SCRIPT!!!", component)
-                self.start_script(component)
-            elif payload.get('set_val') == 'stop':
-                self.stop_script(component)
-            return
-        elif component.controller_uid == Blinds.uid:
-            self.control_blinds(component, payload.get('set_val'))
-        elif component.controller_uid == AlarmGroup.uid:
-            self.control_alarm_group(component, payload.get('set_val'))
-        elif component.controller_uid == Gate:
-            self.control_gate(component, payload.get('set_val'))
 
     def start_script(self, component):
         print("START SCRIPT %s" % str(component))

{simo-2.1.7.dist-info → simo-2.1.8.dist-info}/METADATA

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

{simo-2.1.7.dist-info → simo-2.1.8.dist-info}/RECORD

@@ -10299,9 +10299,9 @@ simo/fleet/templates/fleet/controllers_info/button.md,sha256=GIuxqG617174NEtpPeC
 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=tZ0q1op_A_ql2OWW6KM3XlpOrZYGsUuhWgr1ZiiIEwY,58249
+simo/generic/controllers.py,sha256=fgjsEtc4tJx3VaZ4R6HcrYQ0JosarR7JKKEar7ip5HI,58245
 simo/generic/forms.py,sha256=IAfDtmEk1-CP0JBoetOD_ahLm64nK41GOUXjmbUzNtY,29550
-simo/generic/gateways.py,sha256=io9l67q4DwnPjqnEgy-aYxUf_FAOf__HJIPGluqNqZQ,18113
+simo/generic/gateways.py,sha256=FAGShbPuO88Ww8f5KxUwsMvvowK2d6BWsC4o3706y7Y,18354
 simo/generic/models.py,sha256=92TACMhJHadAg0TT9GnARO_R3_Sl6i-GGjhG_x7YdFI,7391
 simo/generic/routing.py,sha256=elQVZmgnPiieEuti4sJ7zITk1hlRxpgbotcutJJgC60,228
 simo/generic/socket_consumers.py,sha256=NfTQGYtVAc864IoogZRxf_0xpDPM0eMCWn0SlKA5P7Y,1751
@@ -10502,9 +10502,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.1.7.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.1.7.dist-info/METADATA,sha256=GmYnqsbm6poKGIYXr6sl5CHQHn-5b7BVWLpiZpI0OgM,1847
-simo-2.1.7.dist-info/WHEEL,sha256=mguMlWGMX-VHnMpKOjjQidIo1ssRlCFu4a4mBpz1s2M,91
-simo-2.1.7.dist-info/entry_points.txt,sha256=SJBxiDpH7noO0STxVI_eRIsGR-nLgdXXeqCDe8cXlbM,65
-simo-2.1.7.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.1.7.dist-info/RECORD,,
+simo-2.1.8.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.1.8.dist-info/METADATA,sha256=nWipQhTgzmOkBqv6OOGUYMoptAirTzYtomh-xD-4x_c,1847
+simo-2.1.8.dist-info/WHEEL,sha256=mguMlWGMX-VHnMpKOjjQidIo1ssRlCFu4a4mBpz1s2M,91
+simo-2.1.8.dist-info/entry_points.txt,sha256=SJBxiDpH7noO0STxVI_eRIsGR-nLgdXXeqCDe8cXlbM,65
+simo-2.1.8.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.1.8.dist-info/RECORD,,