simo 3.1.3__py3-none-any.whl → 3.1.5__py3-none-any.whl

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/management/_hub_template/hub/supervisor.conf

@@ -81,12 +81,12 @@ stopsignal=INT
 environment=PYTHONUNBUFFERED=1
 
 
-[program:simo-app-mqtt]
+[program:simo-mqtt-control]
 directory={{ project_dir }}/hub/
 command={{ venv_path }}/python manage.py run_app_mqtt_control
 process_name=%(program_name)s
 user=root
-stdout_logfile=/var/log/simo/app_mqtt.log
+stdout_logfile=/var/log/simo/mqtt_control.log
 stdout_logfile_maxbytes=1MB
 stdout_logfile_backups=3
 redirect_stderr=true
@@ -97,12 +97,12 @@ killasgroup=true
 stopsignal=INT
 environment=PYTHONUNBUFFERED=1
 
-[program:simo-app-mqtt-fanout]
+[program:simo-mqtt-fanout]
 directory={{ project_dir }}/hub/
 command={{ venv_path }}/python manage.py run_app_mqtt_fanout
 process_name=%(program_name)s
 user=root
-stdout_logfile=/var/log/simo/app_mqtt_fanout.log
+stdout_logfile=/var/log/simo/mqtt_fanout.log
 stdout_logfile_maxbytes=1MB
 stdout_logfile_backups=3
 redirect_stderr=true

simo/core/management/commands/run_app_mqtt_control.py

@@ -21,10 +21,18 @@ class Command(BaseCommand):
         client.username_pw_set('root', settings.SECRET_KEY)
         client.on_connect = self.on_connect
         client.on_message = self.on_message
+        client.on_disconnect = self.on_disconnect
+        # Back off on reconnects to avoid busy-spin during outages
+        client.reconnect_delay_set(min_delay=1, max_delay=30)
+        # Route Paho logs to Python logging for visibility
+        try:
+            client.enable_logger()
+        except Exception:
+            pass
         client.connect(host=settings.MQTT_HOST, port=settings.MQTT_PORT)
         try:
-            while True:
-                client.loop()
+            # Blocking network loop with built-in reconnect/backoff
+            client.loop_forever(retry_first_connection=True)
         finally:
             try:
                 client.disconnect()
@@ -118,6 +126,14 @@ class Command(BaseCommand):
             # Never crash the consumer
             pass
 
+    def on_disconnect(self, client, userdata, rc):
+        # Non-zero rc means unexpected disconnect. Paho will back off and retry.
+        if rc != 0:
+            try:
+                print(f"Control MQTT disconnect rc={rc}; reconnecting with backoff...", file=sys.stderr)
+            except Exception:
+                pass
+
     def respond(self, client, user_id, request_id, ok=True, result=None, error=None):
         if not request_id:
             return

simo/core/management/commands/run_app_mqtt_fanout.py

@@ -21,10 +21,18 @@ class Command(BaseCommand):
         self.client.username_pw_set('root', settings.SECRET_KEY)
         self.client.on_connect = self.on_connect
         self.client.on_message = self.on_message
+        self.client.on_disconnect = self.on_disconnect
+        # Back off on reconnects to avoid busy-spin during outages
+        self.client.reconnect_delay_set(min_delay=1, max_delay=30)
+        # Route Paho logs to Python logging for visibility
+        try:
+            self.client.enable_logger()
+        except Exception:
+            pass
         self.client.connect(host=settings.MQTT_HOST, port=settings.MQTT_PORT)
         try:
-            while True:
-                self.client.loop()
+            # Blocking network loop with built-in reconnect/backoff
+            self.client.loop_forever(retry_first_connection=True)
         finally:
             try:
                 self.client.disconnect()
@@ -95,3 +103,11 @@ class Command(BaseCommand):
         except Exception:
             # Never crash the consumer
             print('Fanout error:', ''.join(traceback.format_exception(*sys.exc_info())), file=sys.stderr)
+
+    def on_disconnect(self, client, userdata, rc):
+        # Non-zero rc means unexpected disconnect. Paho will back off and retry.
+        if rc != 0:
+            try:
+                print(f"Fanout MQTT disconnect rc={rc}; reconnecting with backoff...", file=sys.stderr)
+            except Exception:
+                pass

{simo-3.1.3.dist-info → simo-3.1.5.dist-info}/METADATA

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

{simo-3.1.3.dist-info → simo-3.1.5.dist-info}/RECORD

@@ -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
@@ -286,7 +286,7 @@ simo/core/management/_hub_template/hub/celeryc.py,sha256=3ksDXftIZKJ4Cq9WNKJERdZ
 simo/core/management/_hub_template/hub/manage.py,sha256=PNNlw3EVeIJDgkG0l-klqoxsKWfTYWG9jzRG0upmAaI,620
 simo/core/management/_hub_template/hub/nginx.conf,sha256=_-ch60oQYXMWmcvYUEbxMvXq9S46exwKmiBaVrxkQ3c,2339
 simo/core/management/_hub_template/hub/settings.py,sha256=4QhvhbtLRxHvAntwqG_qeAAtpDUqKvN4jzw9u3vqff8,361
-simo/core/management/_hub_template/hub/supervisor.conf,sha256=dWgBeLucl355Lw0MmM7HXVl7ZUBT-Mb8LwRyEjn2QOo,3647
+simo/core/management/_hub_template/hub/supervisor.conf,sha256=g9Df8scz-FrcLJWSkFzwcEH9yfGR332W_BWXCxxpR_U,3647
 simo/core/management/_hub_template/hub/urls.py,sha256=Ydm-1BkYAzWeEF-MKSDIFf-7aE4qNLPm48-SA51XgJQ,25
 simo/core/management/_hub_template/hub/wsgi.py,sha256=Lo-huLHnMDTxSmMBOodVFMWBls9poddrV2KRzXU0xGo,280
 simo/core/management/_hub_template/hub/__pycache__/asgi.cpython-312.pyc,sha256=FVjb5whNF2mVopSz71s0Zms8d_b90_4smf84OWWkzDI,396
@@ -299,8 +299,8 @@ simo/core/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 simo/core/management/commands/gateways_manager.py,sha256=oHzgC-eV4w_KHkiz6eCAlt3XMIwtS8_7mHDQ4UsU5y0,6967
 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=oB0KbwDD_a08qwxo9jvKJJnCblzbrARr9xiQ6d54Hdc,4862
-simo/core/management/commands/run_app_mqtt_fanout.py,sha256=JHlRXDDsRYf72XzhV8uHcTh0-HlKYpk8f1uCw9hsHac,3861
+simo/core/management/commands/run_app_mqtt_control.py,sha256=-eDDAXbGtjqN1OK7Ym2FIdP1wVNJYR0DdvIyRzmXPDc,5592
+simo/core/management/commands/run_app_mqtt_fanout.py,sha256=diSEZM_sBQqm4wzzVgBT90Kt8kAhbZm5at2meEMv73M,4605
 simo/core/management/commands/run_gateway.py,sha256=bp0FQQoBeOSoxjHCCMicDL1fxPZZGyLgnq2QKht3bJo,645
 simo/core/management/commands/__pycache__/__init__.cpython-312.pyc,sha256=2Rw8IQ8vlr-wLXgjtc9zACkDD_SWZCxDlbrXw5vfI6o,142
 simo/core/management/commands/__pycache__/__init__.cpython-38.pyc,sha256=WKpfZZpAB9D7U4X6oWQIrU_H-6rUmq8Gl9fj9XaY2fw,178
@@ -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.3.dist-info/licenses/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-3.1.3.dist-info/METADATA,sha256=B7aSWj9iQ9HzHfD0b3mnLVPsfKtqGrpkkSHnTH8i-VM,2224
-simo-3.1.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-simo-3.1.3.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
-simo-3.1.3.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-3.1.3.dist-info/RECORD,,
+simo-3.1.5.dist-info/licenses/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-3.1.5.dist-info/METADATA,sha256=hXkJ2qxHLFHebhXd3yRy4Gvj2Bd4Vi2-ulumfeyYcIM,2224
+simo-3.1.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+simo-3.1.5.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
+simo-3.1.5.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-3.1.5.dist-info/RECORD,,