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

simo/core/api.py

@@ -7,6 +7,7 @@ from django.utils.translation import gettext_lazy as _
 from django.utils import timezone
 from django.http import HttpResponse, Http404
 from simo.core.utils.helpers import get_self_ip, search_queryset
+from simo.core.middleware import introduce_instance
 from rest_framework import status
 from actstream.models import Action
 from rest_framework.pagination import PageNumberPagination
@@ -41,6 +42,7 @@ class InstanceMixin:
         ).last()
         if not self.instance:
             raise Http404()
+        introduce_instance(self.instance)
         return super().dispatch(request, *args, **kwargs)
 
     def get_serializer_context(self):

simo/core/db_backend/base.py

@@ -1,21 +1,19 @@
-import random, time
 from django.contrib.gis.db.backends.postgis.base import (
     DatabaseWrapper as PostGisPsycopg2DatabaseWrapper
 )
-from django.db import close_old_connections, connection as db_connection
+from django.db.utils import OperationalError, InterfaceError
 from django.utils.asyncio import async_unsafe
-from django.db.utils import InterfaceError
-from django.conf import settings
 
 
 class DatabaseWrapper(PostGisPsycopg2DatabaseWrapper):
-
     @async_unsafe
     def create_cursor(self, name=None):
-        if not self.is_usable():
-            close_old_connections()
-            db_connection.connect()
-        return super().create_cursor(name=name)
-
+        try:
+            return super().create_cursor(name=name)
+        except (InterfaceError, OperationalError):
+            # Heal this very connection
+            self.close()
+            self.connect()
+            return super().create_cursor(name=name)
 
 

simo/core/management/_hub_template/hub/supervisor.conf

@@ -12,6 +12,7 @@ autostart=true
 autorestart=false
 stopwaitsecs=15
 killasgroup=true
+environment=PYTHONUNBUFFERED=1
 
 
 # using gunicorn for regular requests
@@ -60,6 +61,7 @@ autostart=true
 autorestart=true
 stopwaitsecs=15
 killasgroup=true
+environment=PYTHONUNBUFFERED=1
 
 
 [program:simo-gateways]
@@ -76,6 +78,7 @@ autorestart=true
 stopwaitsecs=15
 killasgroup=true
 stopsignal=INT
+environment=PYTHONUNBUFFERED=1
 
 
 [program:simo-app-mqtt]
@@ -92,6 +95,7 @@ autorestart=true
 stopwaitsecs=15
 killasgroup=true
 stopsignal=INT
+environment=PYTHONUNBUFFERED=1
 
 [program:simo-app-mqtt-fanout]
 directory={{ project_dir }}/hub/
@@ -107,6 +111,7 @@ autorestart=true
 stopwaitsecs=15
 killasgroup=true
 stopsignal=INT
+environment=PYTHONUNBUFFERED=1
 
 
 [program:simo-celery-beat]

simo/core/management/commands/on_http_start.py

@@ -56,7 +56,7 @@ def prepare_mosquitto():
             f.write(render_to_string('conf/mosquitto.conf'))
 
     subprocess.run(
-        ['service', 'mosquitto', 'reload'], stdout=subprocess.PIPE
+        ['service', 'mosquitto', 'restart'], stdout=subprocess.PIPE
     )
 
 

simo/core/management/commands/run_app_mqtt_control.py

@@ -37,6 +37,7 @@ class Command(BaseCommand):
 
     def on_message(self, client, userdata, msg):
         try:
+            print("Control: ", msg.topic)
             parts = msg.topic.split('/')
             # SIMO/user/<user-id>/control/<instance-uid>/Component/<component-id>
             if len(parts) < 7 or parts[0] != 'SIMO' or parts[1] != 'user' or parts[3] != 'control':

simo/core/management/commands/run_app_mqtt_fanout.py

@@ -36,6 +36,7 @@ class Command(BaseCommand):
 
     def on_message(self, client, userdata, msg):
         try:
+            print("Fanout: ", msg.topic)
             topic_parts = msg.topic.split('/')
             # SIMO/obj-state/<instance-uid>/<Model>/<id>
             if len(topic_parts) < 5 or topic_parts[0] != 'SIMO' or topic_parts[1] != 'obj-state':

simo/settings.py

@@ -133,6 +133,14 @@ DATABASES = {
         'ENGINE': 'simo.core.db_backend',
         'NAME': 'SIMO',
         'ATOMIC_REQUESTS': False,
+        'CONN_HEALTH_CHECKS': True,
+        'CONN_MAX_AGE': 300,
+        'OPTIONS': {
+            "keepalives": 1,
+            "keepalives_idle": 30,
+            "keepalives_interval": 10,
+            "keepalives_count": 3,
+        }
     }
 }
 

simo/users/serializers.py

@@ -32,7 +32,10 @@ class UserSerializer(serializers.ModelSerializer):
         iu = InstanceUser.objects.filter(
             user=obj, instance=get_current_instance()
         ).first()
-        return iu.is_active
+        try:
+            return iu.is_active
+        except:
+            return False
 
     def get_avatar(self, obj):
         if not obj.avatar:

simo/users/templates/conf/mosquitto.conf

@@ -3,4 +3,13 @@ allow_anonymous false
 # ....which are stored in the following file
 password_file /etc/mosquitto/mosquitto_users
 
-acl_file /etc/mosquitto/acls.conf
+acl_file /etc/mosquitto/acls.conf
+
+# Ensure WebSocket listener for /mqtt/ via Nginx
+listener 8083 127.0.0.1
+protocol websockets
+
+
+# Ensure local TCP listener for internal services
+listener 1883 127.0.0.1
+

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

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

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

@@ -2,7 +2,7 @@ simo/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 simo/asgi.py,sha256=J0Xmxbi26_EWRTOn36ada6YMX7Pjp_ngMRrcdPUEFes,1839
 simo/celeryc.py,sha256=eab7_e9rw0c__DCeoUFUh_tjAGVlulxVrk75BaJf57Q,1512
 simo/conf.py,sha256=H2BhXAV8MEDVXF8AbkaLSfR4ULd-9_bS4bnhE5sE5fg,112
-simo/settings.py,sha256=WuW5CCVB66nkRZI-rPV_8b3o6BOfIs8sO-xsP7DjCDU,7090
+simo/settings.py,sha256=V5m3CWeCSAJPrGhQVo0AF5RFTMvB8j4YwPEA9sv-PqA,7324
 simo/urls.py,sha256=AwTvBi1NE1j-MIUIsrHtlDXo34HRU4__ASwIedzBjPU,2535
 simo/__pycache__/__init__.cpython-312.pyc,sha256=EAVr4EWzl4QAeIboNWdHmEaFudefMrqjEq6IRDYtkGs,117
 simo/__pycache__/__init__.cpython-38.pyc,sha256=j81de0BqHMr6bs0C7cuYrXl7HwtK_vv8hDEtAdSwDJc,153
@@ -93,7 +93,7 @@ simo/backups/migrations/__pycache__/__init__.cpython-312.pyc,sha256=gxhvSSUK92Z7
 simo/backups/migrations/__pycache__/__init__.cpython-38.pyc,sha256=Lz1fs6V05h2AoxTOLNye0do9bEMnyuaXB_hHOjG5-HU,172
 simo/core/__init__.py,sha256=_s2TjJfQImsMrTIxqLAx9AZie1Ojmm6sCHASdl3WLGU,50
 simo/core/admin.py,sha256=blhsDujAQZ5UAbwhmatKvYiAns9fOzRPL2LyOTHaUBw,18880
-simo/core/api.py,sha256=CCjo8DN7uzAhScW5BEJMnxq8GprAvOtnpLEwNmNN-rA,29903
+simo/core/api.py,sha256=kr6eb2D70GlHvEJGkvadAs1ZCh8zJS_mjd2N9dnZdsA,29997
 simo/core/api_auth.py,sha256=I9bALko_L7M2dodUkVLRHPctdwR-KPbyZ-r1HygDyEU,1229
 simo/core/api_meta.py,sha256=Y-kq5lLwjymARnKOx0jHCS4OOH9PhyWNwIUxLUJMny8,5350
 simo/core/app_widgets.py,sha256=VxZzapuc-a29wBH7JzpvNF2SK1ECrgNUySId5ke1ffc,2509
@@ -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=wY5jsZ8hQpwot3o-7JNtDe33xy-vlfMLXa011htDojI,601
+simo/core/db_backend/base.py,sha256=4vl0Nx8PcBG5C8QQpAQPFu-TKH8Hs6R5OmzJqIiLibQ,598
 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=eHdvz98YtxizyPyiJ57-uiTrHGthXdFEN4lybxGBJZk,3492
+simo/core/management/_hub_template/hub/supervisor.conf,sha256=dWgBeLucl355Lw0MmM7HXVl7ZUBT-Mb8LwRyEjn2QOo,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
@@ -297,10 +297,10 @@ simo/core/management/_hub_template/hub/__pycache__/urls.cpython-312.pyc,sha256=d
 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/on_http_start.py,sha256=SYhE1d2GJ_tOFLvT9VFLPcXA3Lzz-dw5x3zMWPkdHYI,6278
+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=Vopy9BPWRCmHaWwqYkJQE5a_OHCrUfC6LVI2VEB9w2o,4820
-simo/core/management/commands/run_app_mqtt_fanout.py,sha256=NLLE4A6KijvmId8pWD2qYr4VGbM_65Q8UKlbgXhNfIs,3820
+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_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
@@ -10850,7 +10850,7 @@ simo/users/managers.py,sha256=OHgEP85MBtdkdYxdstBd8RavTBT8F_2WyDxUJ9aCqqM,246
 simo/users/middleware.py,sha256=tNPmnzo0eTrJ25SLHP7NotqYKI2cKnmv8hf6v5DLOWo,427
 simo/users/models.py,sha256=hEspAbqpbIYfQ4IiXnYtl96waILuuqlfTg4p44rBUTY,25355
 simo/users/permissions.py,sha256=IwtYS8yQdupWbYKR9VimSRDV3qCJ2jXP57Lyjpb2EQM,242
-simo/users/serializers.py,sha256=Uy5JsZp6nEGNMuK9HgLbA0KJdsbjG8GDIyF7z7Ue_so,2610
+simo/users/serializers.py,sha256=zhotOlezhU43A2QeJCju-SqFrgGUDFF21u8WQclQGXI,2668
 simo/users/sso_urls.py,sha256=gQOaPvGMYFD0NCVSwyoWO-mTEHe5j9sbzV_RK7kdvp0,251
 simo/users/sso_views.py,sha256=qHjiw3Ru-hWZRJAcLJa46DrQuDORl5ZKUHgRwmN3XlE,4335
 simo/users/tasks.py,sha256=FhbczWFHRFI6To4xqkx4gUX4p0vCwwTT297GWBPAoIg,1162
@@ -11026,7 +11026,7 @@ simo/users/migrations/__pycache__/0043_userdevicereportlog_avg_speed_kmh.cpython
 simo/users/migrations/__pycache__/0044_permissionsrole_is_person.cpython-312.pyc,sha256=ONWJu9MdXkOPlq1exNumEf1iEnCbvIsEul1EW2WMVgA,832
 simo/users/migrations/__pycache__/__init__.cpython-312.pyc,sha256=i3P6nr4OxZF7ZodnxhMfQ4jecJ7O0gsEAnUPiAEtNZ0,134
 simo/users/migrations/__pycache__/__init__.cpython-38.pyc,sha256=NKq7WLgktK8WV1oOqCPbAbdkrPV5GRGhYx4VxxI4dcs,170
-simo/users/templates/conf/mosquitto.conf,sha256=1eIGNuRu4Y3hfAU6qiWix648eCRrw0oOT24PnyFI4ys,189
+simo/users/templates/conf/mosquitto.conf,sha256=Df0-4luyyU5b_WW2XJd0SzDYUccNVvWjKqjoTwEfXc0,361
 simo/users/templates/conf/mosquitto_acls.conf,sha256=e_2GN-5stuOO2QgFmELUCdHzZEF4pd2M7YGTTGpVQYo,369
 simo/users/templates/invitations/authenticated_msg.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/users/templates/invitations/authenticated_suggestion.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -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.0.dist-info/licenses/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-3.1.0.dist-info/METADATA,sha256=GRNmAs7CWJByJjZAyx8DZC15smFmWgQ2vHveK1HrEjI,2224
-simo-3.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-simo-3.1.0.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
-simo-3.1.0.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-3.1.0.dist-info/RECORD,,
+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,,