simo 3.1.4__py3-none-any.whl → 3.1.6__py3-none-any.whl

simo/automation/gateways.py

@@ -311,11 +311,19 @@ class AutomationsGatewayHandler(GatesHandler, BaseObjectCommandsGatewayHandler):
 
         from .controllers import Script
 
-        mqtt_client = mqtt.Client()
-        mqtt_client.username_pw_set('root', settings.SECRET_KEY)
-        mqtt_client.on_connect = self.on_mqtt_connect
-        mqtt_client.on_message = self.on_mqtt_message
-        mqtt_client.connect(host=settings.MQTT_HOST, port=settings.MQTT_PORT)
+        self.mqtt_client = mqtt.Client()
+        self.mqtt_client.username_pw_set('root', settings.SECRET_KEY)
+        self.mqtt_client.on_connect = self.on_mqtt_connect
+        self.mqtt_client.on_message = self.on_mqtt_message
+        try:
+            self.mqtt_client.reconnect_delay_set(min_delay=1, max_delay=30)
+        except Exception:
+            pass
+        try:
+            # Avoid raising if broker restarts or is down at boot
+            self.mqtt_client.connect_async(host=settings.MQTT_HOST, port=settings.MQTT_PORT)
+        except Exception:
+            pass
 
         # We presume that this is the only running gateway, therefore
         # if there are any running scripts, that is not true.
@@ -337,9 +345,11 @@ class AutomationsGatewayHandler(GatesHandler, BaseObjectCommandsGatewayHandler):
             self.start_script(script)
 
         print("GATEWAY STARTED!")
+        self.mqtt_client.loop_start()
         while not exit.is_set():
-            mqtt_client.loop()
-        mqtt_client.disconnect()
+            time.sleep(1)
+        self.mqtt_client.loop_stop()
+        self.mqtt_client.disconnect()
 
         script_ids = [id for id in self.running_scripts.keys()]
         for id in script_ids:

simo/core/db_backend/base.py

@@ -1,19 +1,73 @@
 from django.contrib.gis.db.backends.postgis.base import (
     DatabaseWrapper as PostGisPsycopg2DatabaseWrapper
 )
-from django.db.utils import OperationalError, InterfaceError
+"""Custom PostGIS database wrapper with light self-healing.
+
+We retry cursor creation on transient driver-level errors. Previously we
+were catching Django's wrapper exceptions (django.db.utils.InterfaceError/
+OperationalError). However, those are only raised by the outer
+`wrap_database_errors` context. Inside `create_cursor()` the driver
+(`psycopg2`) raises its own exceptions, so our except block never ran and
+connections weren't healed.
+
+By catching psycopg2 errors here (in addition to Django's), we ensure
+we can close() and reconnect() this connection when `self.connection`
+is already closed or becomes unusable, avoiding busy error loops in
+MQTT threads and periodic tasks.
+"""
+
+from django.db.utils import OperationalError as DjangoOperationalError, InterfaceError as DjangoInterfaceError
+try:
+    # Catch driver-level errors where they originate.
+    from psycopg2 import OperationalError as PsycopgOperationalError, InterfaceError as PsycopgInterfaceError
+except Exception:  # pragma: no cover - very defensive
+    PsycopgOperationalError = PsycopgInterfaceError = Exception
 from django.utils.asyncio import async_unsafe
+import time
+import random
 
 
 class DatabaseWrapper(PostGisPsycopg2DatabaseWrapper):
     @async_unsafe
     def create_cursor(self, name=None):
+        """Create a DB cursor with a single, simple heal-once path.
+
+        - Fast path: return cursor immediately.
+        - On error: if it's a connectivity issue (known exceptions or
+          connection.closed set), close + backoff + reconnect, then retry once.
+        - Otherwise: re-raise the original exception.
+        """
         try:
             return super().create_cursor(name=name)
-        except (InterfaceError, OperationalError):
-            # Heal this very connection
-            self.close()
-            self.connect()
-            return super().create_cursor(name=name)
+        except Exception as e:
+            # Determine if this is a connectivity problem
+            is_connectivity_err = isinstance(
+                e,
+                (
+                    DjangoInterfaceError,
+                    DjangoOperationalError,
+                    PsycopgInterfaceError,
+                    PsycopgOperationalError,
+                ),
+            )
+            if not is_connectivity_err:
+                try:
+                    conn = getattr(self, 'connection', None)
+                    is_connectivity_err = bool(getattr(conn, 'closed', 0))
+                except Exception:
+                    is_connectivity_err = False
 
+            if not is_connectivity_err:
+                # Not a connection issue; bubble up unchanged
+                raise
 
+            # Heal this very connection and retry once
+            try:
+                self.close()
+            finally:
+                try:
+                    time.sleep(0.05 + random.random() * 0.15)  # 50–200 ms
+                except Exception:
+                    pass
+                self.connect()
+            return super().create_cursor(name=name)

simo/core/events.py

@@ -181,9 +181,21 @@ class OnChangeMixin:
             self._mqtt_client.username_pw_set('root', settings.SECRET_KEY)
             self._mqtt_client.on_connect = self.on_mqtt_connect
             self._mqtt_client.on_message = self.on_mqtt_message
-            self._mqtt_client.connect(
-                host=settings.MQTT_HOST, port=settings.MQTT_PORT
-            )
+            # Be gentle when broker is down or connection flaps
+            try:
+                # paho 1.x supports reconnect backoff configuration
+                self._mqtt_client.reconnect_delay_set(min_delay=1, max_delay=30)
+            except Exception:
+                pass
+            try:
+                self._mqtt_client.connect_async(
+                    host=settings.MQTT_HOST, port=settings.MQTT_PORT
+                )
+            except Exception:
+                # connect_async should not normally raise; in case of programming
+                # errors keep the API surface consistent by cleaning up
+                self._mqtt_client = None
+                raise
             self._mqtt_client.loop_start()
             self._on_change_function = function
             self._obj_ct_id = ContentType.objects.get_for_model(self).pk

simo/core/gateways.py

@@ -63,6 +63,10 @@ class BaseObjectCommandsGatewayHandler(BaseGatewayHandler):
         self.mqtt_client.username_pw_set('root', settings.SECRET_KEY)
         self.mqtt_client.on_connect = self._on_mqtt_connect
         self.mqtt_client.on_message = self._on_mqtt_message
+        try:
+            self.mqtt_client.reconnect_delay_set(min_delay=1, max_delay=30)
+        except Exception:
+            pass
 
 
     def run(self, exit):
@@ -74,7 +78,12 @@ class BaseObjectCommandsGatewayHandler(BaseGatewayHandler):
                 target=self._run_periodic_task, args=(self.exit, task, period), daemon=True
             ).start()
 
-        self.mqtt_client.connect(host=settings.MQTT_HOST, port=settings.MQTT_PORT)
+        # Use async connect so we don't crash if broker is temporarily down
+        try:
+            self.mqtt_client.connect_async(host=settings.MQTT_HOST, port=settings.MQTT_PORT)
+        except Exception:
+            # connect_async shouldn't raise for normal scenarios; ignore just in case
+            pass
         self.mqtt_client.loop_start()
 
         while not self.exit.is_set():
@@ -137,4 +146,3 @@ class BaseObjectCommandsGatewayHandler(BaseGatewayHandler):
                 self.perform_value_send(component, val)
             except Exception as e:
                 self.logger.error(e, exc_info=True)
-

simo/core/management/commands/gateways_manager.py

@@ -117,18 +117,28 @@ class GatewaysManager:
         self.mqtt_client.username_pw_set('root', settings.SECRET_KEY)
         self.mqtt_client.on_connect = self.on_mqtt_connect
         self.mqtt_client.on_message = self.on_mqtt_message
-        self.mqtt_client.connect(
-            host=settings.MQTT_HOST, port=settings.MQTT_PORT
-        )
+        try:
+            self.mqtt_client.reconnect_delay_set(min_delay=1, max_delay=30)
+        except Exception:
+            pass
+        try:
+            self.mqtt_client.connect_async(
+                host=settings.MQTT_HOST, port=settings.MQTT_PORT
+            )
+        except Exception:
+            pass
 
+        self.mqtt_client.loop_start()
         while not self.exit_event.is_set():
-            self.mqtt_client.loop()
+            time.sleep(1)
 
         ids_to_stop = [id for id in self.running_gateways.keys()]
         for id in ids_to_stop:
             self.stop_gateway(Gateway(id=id))
         while self.running_gateways.keys():
             time.sleep(0.3)
+        self.mqtt_client.loop_stop()
+        self.mqtt_client.disconnect()
         close_old_connections()
         print("-------------Gateways Manager STOPPED.------------------")
         return sys.exit()

simo/generic/gateways.py

@@ -297,11 +297,19 @@ class GenericGatewayHandler(
 
         from simo.generic.controllers import IPCamera
 
-        mqtt_client = mqtt.Client()
-        mqtt_client.username_pw_set('root', settings.SECRET_KEY)
-        mqtt_client.on_connect = self.on_mqtt_connect
-        mqtt_client.on_message = self.on_mqtt_message
-        mqtt_client.connect(host=settings.MQTT_HOST, port=settings.MQTT_PORT)
+        # Use non-blocking MQTT loop to avoid busy-spin when broker is down
+        self.mqtt_client = mqtt.Client()
+        self.mqtt_client.username_pw_set('root', settings.SECRET_KEY)
+        self.mqtt_client.on_connect = self.on_mqtt_connect
+        self.mqtt_client.on_message = self.on_mqtt_message
+        try:
+            self.mqtt_client.reconnect_delay_set(min_delay=1, max_delay=30)
+        except Exception:
+            pass
+        try:
+            self.mqtt_client.connect_async(host=settings.MQTT_HOST, port=settings.MQTT_PORT)
+        except Exception:
+            pass
 
         for cam in Component.objects.filter(
             controller_uid=IPCamera.uid
@@ -315,9 +323,11 @@ class GenericGatewayHandler(
         ).start()
 
         print("GATEWAY STARTED!")
+        self.mqtt_client.loop_start()
         while not exit.is_set():
-            mqtt_client.loop()
-        mqtt_client.disconnect()
+            time.sleep(1)
+        self.mqtt_client.loop_stop()
+        self.mqtt_client.disconnect()
 
 
     def on_mqtt_connect(self, mqtt_client, userdata, flags, rc):
@@ -425,8 +435,14 @@ class GenericGatewayHandler(
                 base_type='binary-sensor', alarm_category='security'
             ):
                 if sensor.id not in self.sensors_on_watch[state.id]:
-                    self.sensors_on_watch[state.id][sensor.id] = i_id
-                    sensor.on_change(self.security_sensor_change)
+                    # Register callback only when MQTT subscription succeeds
+                    try:
+                        sensor.on_change(self.security_sensor_change)
+                    except Exception:
+                        # Leave it untracked so we retry on next tick
+                        raise
+                    else:
+                        self.sensors_on_watch[state.id][sensor.id] = i_id
 
             if state.controller._check_is_away(self.last_sensor_actions.get(i_id, 0)):
                 if state.value != 'away':

{simo-3.1.4.dist-info → simo-3.1.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simo
-Version: 3.1.4
+Version: 3.1.6
 Summary: Smart Home Supremacy
 Author-email: "Simon V." <simon@simo.io>
 Project-URL: Homepage, https://simo.io

{simo-3.1.4.dist-info → simo-3.1.6.dist-info}/RECORD

@@ -21,7 +21,7 @@ simo/automation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/automation/app_widgets.py,sha256=gaqImMZjuMHm7nIb9a4D-Y3qipz_WhSPAHXcwGx4Uzs,199
 simo/automation/controllers.py,sha256=jtoG91nYlUPW-Pkl025bBoGELWFm8SQD3duTPsjRhfk,12230
 simo/automation/forms.py,sha256=NAQUS9qrXp2d4GuvdpVyWj0Yh7vqMyX6pzs5oX4ze5Y,9800
-simo/automation/gateways.py,sha256=SGq91nr2K1i8aSFh0XTZDHBb7TzFU_X24-wkt8IQkeM,17406
+simo/automation/gateways.py,sha256=WhZNliJhpuf8FnHGqIaWXzW3qcac5AtqpU9THPYYgw4,17770
 simo/automation/helpers.py,sha256=iP-fxxB8HsFQy3k2CjFubu86aMqvWgmh-p24DiyOrek,4330
 simo/automation/models.py,sha256=zt-jkzyq5ddqGT864OkJzCsvov2vZ0nO4ez3hAeZkXg,934
 simo/automation/serializers.py,sha256=Pg-hMaASQPB5_BTAMkfqM6z4jdHWH8xMYWOvDxIvmx8,2126
@@ -104,11 +104,11 @@ simo/core/base_types.py,sha256=FNIS9Y7wmdbVl-dISLdSBYvMEiV4zSLpBOBDYOVyam0,6580
 simo/core/context.py,sha256=LKw1I4iIRnlnzoTCuSLLqDX7crHdBnMo3hjqYvVmzFc,1557
 simo/core/controllers.py,sha256=jGn9bDvUuAbFL_uCAV8aqXgDJz9akYDroJuyU0ONsC8,48563
 simo/core/dynamic_settings.py,sha256=bUs58XEZOCIEhg1TigR3LmYggli13KMryBZ9pC7ugAQ,1872
-simo/core/events.py,sha256=GQwolnqO4ZoxgyVi9C4eKXpMULD3gMstGJsxWhc1TWU,6172
+simo/core/events.py,sha256=mjrYsByw0hGct4rXoLmnbBodViN8S1ReBIZG3g660Yo,6735
 simo/core/filters.py,sha256=6wbn8C2WvKTTjtfMwwLBp2Fib1V0-DMpS4iqJd6jJQo,2540
 simo/core/form_fields.py,sha256=b4wZ4n7OO0m0_BPPS9ILVrwBvhhjUB079YrroveFUWA,5222
 simo/core/forms.py,sha256=IwuljCxwqPcSn3eXJRF2pWjktvlQ4DH2LCsncHzCHw0,22720
-simo/core/gateways.py,sha256=ik9C9L0Z_pTuWXMDXCW09MuTgb6IGdMPn8uVQAJVw5I,4377
+simo/core/gateways.py,sha256=cM_du3VsHbSYUSWL5JHxXMV8yn6s-QrSzB3WreglGjw,4736
 simo/core/loggers.py,sha256=EBdq23gTQScVfQVH-xeP90-wII2DQFDjoROAW6ggUP4,1645
 simo/core/managers.py,sha256=Ampwe5K7gfE6IJULNCV35V8ysmMOdS_wz7mRzfaLZUw,3014
 simo/core/mcp.py,sha256=MDx_m6BmkYDxCrfFegchz6NMCDCB0Mrbjx4gb2iJxHU,5188
@@ -191,7 +191,7 @@ simo/core/__pycache__/views.cpython-38.pyc,sha256=kYKvEcyKicdkTcN0iEJ4pT101-KHiZ
 simo/core/__pycache__/widgets.cpython-312.pyc,sha256=f_AiYFfA7Wl4Wm9FqUOlluSGLAN_nkLyDUsKpkScsXg,4447
 simo/core/__pycache__/widgets.cpython-38.pyc,sha256=sR0ZeHCHrhnNDBJuRrxp3zUsfBp0xrtF0xrK2TkQv1o,3520
 simo/core/db_backend/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-simo/core/db_backend/base.py,sha256=4vl0Nx8PcBG5C8QQpAQPFu-TKH8Hs6R5OmzJqIiLibQ,598
+simo/core/db_backend/base.py,sha256=fGagw119bvP3Ns3NFvIDlrlNSa9-LLt2HMuIjnB9h9g,2933
 simo/core/db_backend/__pycache__/__init__.cpython-312.pyc,sha256=Brq4UBCggJrt590OFV3VmgARJYRK902FnnFFFK_Azng,133
 simo/core/db_backend/__pycache__/__init__.cpython-38.pyc,sha256=sxC6PmFqnwe6RRKzSR7QtUFzRc_aRRR1fffsR3TPLRc,169
 simo/core/db_backend/__pycache__/base.cpython-312.pyc,sha256=ykKrTOC28v2cl0C--bqeLEaydHS5CG1RFGL0lon53HU,1135
@@ -296,7 +296,7 @@ simo/core/management/_hub_template/hub/__pycache__/settings.cpython-312.pyc,sha2
 simo/core/management/_hub_template/hub/__pycache__/urls.cpython-312.pyc,sha256=dNFa6cLiHRIB5Efyaxd9SmC8hPbMkpvp8zvtkiwt1hc,178
 simo/core/management/_hub_template/hub/__pycache__/wsgi.cpython-312.pyc,sha256=oA9duba-bsc_OOQnUaz_qiaB-0OcsS5dfjSVHTscrUM,529
 simo/core/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-simo/core/management/commands/gateways_manager.py,sha256=oHzgC-eV4w_KHkiz6eCAlt3XMIwtS8_7mHDQ4UsU5y0,6967
+simo/core/management/commands/gateways_manager.py,sha256=_PlFQ40rtqML38RC0U_KFMbqHma-ACNgEQ_iUwvwUBs,7276
 simo/core/management/commands/on_http_start.py,sha256=kxtWB3lOSyQA8tVmZRmLmaoVsliy5mhZp9_wwCvkj_A,6279
 simo/core/management/commands/republish_mqtt_state.py,sha256=mc8e7qnhDyC9_fiYr6d0g2s_3wGUXCrLo95-HBIrkOA,2248
 simo/core/management/commands/run_app_mqtt_control.py,sha256=-eDDAXbGtjqN1OK7Ym2FIdP1wVNJYR0DdvIyRzmXPDc,5592
@@ -10675,7 +10675,7 @@ simo/generic/app_widgets.py,sha256=y8W3jR76Hh26O9pPQyg2SophMbYIOtAWD33MPKbB8Mg,8
 simo/generic/base_types.py,sha256=gJUJYpd_gE-f1ogzagAPA1u2TYljhyU0_SMlgGUvCVk,2318
 simo/generic/controllers.py,sha256=oQ7mLYU-MxO4lpCQEGJA0ClIw253Ayzx3pOAFbkqC_4,53273
 simo/generic/forms.py,sha256=0RIDtLLzCkiSb9OxlioicOQW9yp1OjLKekpjbxzGVfM,26272
-simo/generic/gateways.py,sha256=mnr4nAwLLESI50cwz1-LeeaLt0ABOt8s0D2_U-NgRsc,21586
+simo/generic/gateways.py,sha256=HWLwr9hmZPNbMRFiKtsjYhKxLPHlTqoIUBCmFD0JB08,22234
 simo/generic/models.py,sha256=59fkYowOX0imviIhA6uwupvuharrpBykmBm674rJNoI,7279
 simo/generic/routing.py,sha256=elQVZmgnPiieEuti4sJ7zITk1hlRxpgbotcutJJgC60,228
 simo/generic/socket_consumers.py,sha256=qesKZVhI56Kh7vdIUDD3hzDUi0FcXwIfcmE_a3YS6JQ,1772
@@ -11034,9 +11034,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-3.1.4.dist-info/licenses/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-3.1.4.dist-info/METADATA,sha256=fdQuK5JIjFNaNn7FMY7R2vbKhlMuFf282kuWRWawPhc,2224
-simo-3.1.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-simo-3.1.4.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
-simo-3.1.4.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-3.1.4.dist-info/RECORD,,
+simo-3.1.6.dist-info/licenses/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-3.1.6.dist-info/METADATA,sha256=3ZPTUNXT0K8Vdj8pNXmdll7TIhFDbYpKHtByuNk1Kio,2224
+simo-3.1.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+simo-3.1.6.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
+simo-3.1.6.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-3.1.6.dist-info/RECORD,,