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

simo/automation/gateways.py

@@ -216,6 +216,7 @@ class GatesHandler:
 class AutomationsGatewayHandler(GatesHandler, BaseObjectCommandsGatewayHandler):
     name = "Automation"
     config_form = BaseGatewayForm
+    auto_create = True
     info = "Provides various types of automation capabilities"
 
     running_scripts = {}

simo/core/api.py

@@ -140,7 +140,8 @@ class ZoneViewSet(InstanceMixin, viewsets.ModelViewSet):
             )
         for i, id in enumerate(request_data.get('zones')):
             zones[str(id)].order = i
-        Zone.objects.bulk_update([z for id, z in zones.items()], fields=['order'])
+        for i, zone in zones.items():
+            zone.save()
         return RESTResponse({'status': 'success'})
 
 

simo/core/events.py

@@ -52,8 +52,8 @@ class ObjectChangeEvent(ObjMqttAnnouncement):
         self.data.update(**kwargs)
 
     def get_topic(self):
-        return f"{self.TOPIC}/{self.instance.id if self.instance else 'global'}/" \
-               f"{type(self.obj).__name__}-{self.data['obj_pk']}"
+        return f"{self.TOPIC}/{self.instance.uid if self.instance else 'global'}/" \
+               f"{type(self.obj).__name__}/{self.data['obj_pk']}"
 
     def publish(self, retain=True):
         return super().publish(retain=retain)
@@ -91,6 +91,33 @@ def get_event_obj(payload, model_class=None, gateway=None):
     return obj
 
 
+def dirty_fields_to_current_values(instance, dirty_fields):
+    """Return a mapping of changed field names to the instance's current values.
+
+    - Avoids extra DB hits by reading values from the in-memory instance.
+    - For ForeignKey fields, emits the underlying ``<field>_id`` when available
+      to keep the payload JSON-serializable and consistent.
+    """
+    if not dirty_fields:
+        return {}
+
+    current = {}
+    for field_name in dirty_fields.keys():
+        try:
+            model_field = instance._meta.get_field(field_name)
+            # Many-to-many changes are not handled here (not part of default dirty_fields)
+            if getattr(model_field, 'many_to_many', False):
+                continue
+            if getattr(model_field, 'is_relation', False) and hasattr(instance, f"{field_name}_id"):
+                current[field_name] = getattr(instance, f"{field_name}_id")
+            else:
+                current[field_name] = getattr(instance, field_name, None)
+        except Exception:
+            # Field might not be a real model field (unlikely); fallback to attribute
+            current[field_name] = getattr(instance, field_name, None)
+    return current
+
+
 class OnChangeMixin:
 
     _on_change_function = None
@@ -164,4 +191,4 @@ class OnChangeMixin:
             self._mqtt_client.disconnect()
             self._mqtt_client.loop_stop()
             self._mqtt_client = None
-            self._on_change_function = None
+            self._on_change_function = None

simo/core/gateways.py

@@ -14,6 +14,10 @@ from simo.core.loggers import get_gw_logger
 
 
 class BaseGatewayHandler(ABC):
+    # Whether core should auto-create a Gateway row for this handler
+    # at hub startup (via on_http_start). Opt-in to avoid noisy defaults
+    # and side effects for handlers that require credentials/hardware.
+    auto_create = False
 
     @property
     @abstractmethod
@@ -134,4 +138,3 @@ class BaseObjectCommandsGatewayHandler(BaseGatewayHandler):
             except Exception as e:
                 self.logger.error(e, exc_info=True)
 
-

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

@@ -63,6 +63,17 @@ server {
         proxy_send_timeout 3600s;
     }
 
+    # MQTT over WebSockets (WSS)
+    location ^~ /mqtt/ {
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "Upgrade";
+        proxy_set_header Host $host;
+        proxy_read_timeout 600s;
+        proxy_send_timeout 600s;
+        proxy_pass http://127.0.0.1:8083/;
+    }
+
 
     location / {
         include proxy_params;

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

@@ -78,6 +78,37 @@ killasgroup=true
 stopsignal=INT
 
 
+[program:simo-app-mqtt]
+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_maxbytes=1MB
+stdout_logfile_backups=3
+redirect_stderr=true
+autostart=true
+autorestart=true
+stopwaitsecs=15
+killasgroup=true
+stopsignal=INT
+
+[program:simo-app-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_maxbytes=1MB
+stdout_logfile_backups=3
+redirect_stderr=true
+autostart=true
+autorestart=true
+stopwaitsecs=15
+killasgroup=true
+stopsignal=INT
+
+
 [program:simo-celery-beat]
 directory={{ project_dir }}/hub/
 command={{ venv_path }}/celery -A celeryc.celery_app beat -l info --pidfile="/var/run/celerybeat.pid"

simo/core/management/commands/on_http_start.py

@@ -10,6 +10,7 @@ from django.apps import apps
 from crontab import CronTab
 from django.conf import settings
 from django.template.loader import render_to_string
+from django.db import transaction
 
 
 def prepare_mosquitto():
@@ -84,6 +85,70 @@ class Command(BaseCommand):
         from simo.core.tasks import maybe_update_to_latest
         maybe_update_to_latest.delay()
         update_auto_update()
+        # Auto-create Gateway rows for handlers that opted in
+        try:
+            from simo.core.models import Gateway
+            from simo.core.utils.type_constants import GATEWAYS_MAP
+            created_any = False
+            for uid, handler_cls in GATEWAYS_MAP.items():
+                if getattr(handler_cls, 'auto_create', False):
+                    # Build default config from handler's config_form
+                    config_defaults = {}
+                    try:
+                        form_cls = getattr(handler_cls, 'config_form', None)
+                        if form_cls is not None:
+                            tmp_instance = Gateway(type=uid)
+                            form = form_cls(instance=tmp_instance)
+                            for fname, field in getattr(form, 'fields', {}).items():
+                                if fname in ('log',):
+                                    continue
+                                init = getattr(field, 'initial', None)
+                                if init is None:
+                                    continue
+                                # Normalize potential Model/QuerySet values to pks
+                                try:
+                                    import json as _json
+                                    def _norm(v):
+                                        try:
+                                            return _json.loads(_json.dumps(v))
+                                        except Exception:
+                                            pass
+                                        # Model instance
+                                        if hasattr(v, 'pk'):
+                                            return v.pk
+                                        # QuerySet or iterable of models
+                                        try:
+                                            from django.db.models.query import QuerySet as _QS
+                                            if isinstance(v, _QS):
+                                                return [obj.pk for obj in v]
+                                        except Exception:
+                                            pass
+                                        if isinstance(v, (list, tuple, set)):
+                                            return [_norm(x) for x in v]
+                                        return v
+                                    config_defaults[fname] = _norm(init)
+                                except Exception:
+                                    # Best-effort; skip if cannot serialize
+                                    continue
+                    except Exception:
+                        # If we cannot introspect defaults, fall back to empty config
+                        pass
+
+                    obj, created = Gateway.objects.get_or_create(
+                        type=uid, defaults={'config': config_defaults}
+                    )
+                    if created:
+                        created_any = True
+                        print(f"Auto-created gateway: {handler_cls.name} ({uid})")
+                        try:
+                            obj.start()
+                        except Exception:
+                            print(traceback.format_exc(), file=sys.stderr)
+            if created_any:
+                pass
+        except Exception:
+            # Do not fail startup on gateway auto-create issues
+            print(traceback.format_exc(), file=sys.stderr)
         for name, app in apps.app_configs.items():
             if name in (
                 'auth', 'admin', 'contenttypes', 'sessions', 'messages',
@@ -96,4 +161,3 @@ class Command(BaseCommand):
                 continue
             except:
                 print(traceback.format_exc(), file=sys.stderr)
-

simo/core/management/commands/republish_mqtt_state.py

@@ -0,0 +1,60 @@
+from django.core.management.base import BaseCommand
+from django.utils import timezone
+
+from simo.core.events import ObjectChangeEvent
+from simo.core.models import Instance, Zone, Category, Component
+from simo.users.models import InstanceUser
+
+
+class Command(BaseCommand):
+    help = "Republish retained MQTT state for zones, categories, components, and instance users."
+
+    def add_arguments(self, parser):
+        parser.add_argument('--instance', type=int, help='Instance ID to republish (default: all)')
+
+    def handle(self, *args, **options):
+        instance_id = options.get('instance')
+        instances = Instance.objects.filter(is_active=True)
+        if instance_id:
+            instances = instances.filter(id=instance_id)
+
+        count = 0
+        for inst in instances:
+            # Zones
+            for zone in Zone.objects.filter(instance=inst):
+                ObjectChangeEvent(inst, zone, name=zone.name).publish()
+                count += 1
+
+            # Categories
+            for cat in Category.objects.filter(instance=inst):
+                ObjectChangeEvent(
+                    inst, cat, name=cat.name, last_modified=cat.last_modified
+                ).publish()
+                count += 1
+
+            # Components
+            for comp in Component.objects.filter(zone__instance=inst):
+                data = {
+                    'value': comp.value,
+                    'last_change': comp.last_change,
+                    'arm_status': comp.arm_status,
+                    'battery_level': comp.battery_level,
+                    'alive': comp.alive,
+                    'meta': comp.meta,
+                }
+                ObjectChangeEvent(inst, comp, **data).publish()
+                count += 1
+
+            # Instance users (presence and phone charging)
+            for iu in InstanceUser.objects.filter(instance=inst, is_active=True):
+                ObjectChangeEvent(
+                    inst,
+                    iu,
+                    at_home=iu.at_home,
+                    last_seen=iu.last_seen,
+                    phone_on_charge=iu.phone_on_charge,
+                ).publish()
+                count += 1
+
+        self.stdout.write(self.style.SUCCESS(f"Republished {count} retained messages."))
+

simo/core/management/commands/run_app_mqtt_control.py

@@ -0,0 +1,129 @@
+import json
+import sys
+import traceback
+import paho.mqtt.client as mqtt
+from django.core.management.base import BaseCommand
+from django.conf import settings
+
+from simo.users.models import User, InstanceUser, ComponentPermission
+from simo.users.utils import introduce_user
+from simo.core.models import Component
+
+
+CONTROL_PREFIX = 'SIMO/user'
+
+
+class Command(BaseCommand):
+    help = 'Run MQTT control bridge to execute component controller methods from app MQTT requests.'
+
+    def handle(self, *args, **options):
+        client = mqtt.Client()
+        client.username_pw_set('root', settings.SECRET_KEY)
+        client.on_connect = self.on_connect
+        client.on_message = self.on_message
+        client.connect(host=settings.MQTT_HOST, port=settings.MQTT_PORT)
+        try:
+            while True:
+                client.loop()
+        finally:
+            try:
+                client.disconnect()
+            except Exception:
+                pass
+
+    def on_connect(self, client, userdata, flags, rc):
+        # SIMO/user/+/control/#
+        client.subscribe(f'{CONTROL_PREFIX}/+/control/#')
+
+    def on_message(self, client, userdata, msg):
+        try:
+            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':
+                return
+            user_id = int(parts[2])
+            instance_uid = parts[4]
+            if parts[5] != 'Component':
+                return
+            try:
+                component_id = int(parts[6])
+            except Exception:
+                return
+
+            # Resolve user and permission
+            user = User.objects.filter(id=user_id).first()
+            if not user or not user.is_active:
+                return
+            if not user.is_master:
+                # Must be active on instance
+                if not InstanceUser.objects.filter(
+                    user=user, instance__uid=instance_uid, is_active=True
+                ).exists():
+                    return
+                # Must have write permission on the component
+                has_write = ComponentPermission.objects.filter(
+                    role__in=user.roles.all(),
+                    component_id=component_id,
+                    component__zone__instance__uid=instance_uid,
+                    write=True,
+                ).exists()
+                if not has_write:
+                    return
+
+            # Execute controller method
+            component = Component.objects.filter(
+                id=component_id, zone__instance__uid=instance_uid
+            ).first()
+            if not component:
+                return
+
+            introduce_user(user)
+            payload = json.loads(msg.payload or '{}')
+            request_id = payload.get('request_id')
+            sub_id = payload.get('subcomponent_id')
+            method = payload.get('method')
+            args = payload.get('args', [])
+            kwargs = payload.get('kwargs', {})
+            if method in (None, 'id', 'secret') or str(method).startswith('_'):
+                return
+
+            # Choose target component (main or subcomponent)
+            target = component
+            if sub_id:
+                try:
+                    target = component.slaves.get(pk=sub_id)
+                except Exception:
+                    return
+
+            # Prepare controller and call
+            target.prepare_controller()
+            if not hasattr(target, method):
+                self.respond(client, user_id, request_id, ok=False, error=f'Method {method} not found')
+                return
+            call = getattr(target, method)
+            try:
+                if isinstance(args, list) and isinstance(kwargs, dict):
+                    result = call(*args, **kwargs)
+                elif isinstance(args, list):
+                    result = call(*args)
+                elif isinstance(kwargs, dict):
+                    result = call(**kwargs)
+                else:
+                    result = call()
+                self.respond(client, user_id, request_id, ok=True, result=result)
+            except Exception:
+                self.respond(client, user_id, request_id, ok=False, error=''.join(traceback.format_exception(*sys.exc_info())))
+        except Exception:
+            # Never crash the consumer
+            pass
+
+    def respond(self, client, user_id, request_id, ok=True, result=None, error=None):
+        if not request_id:
+            return
+        topic = f'{CONTROL_PREFIX}/{user_id}/control-resp/{request_id}'
+        payload = {'ok': ok}
+        if ok:
+            payload['result'] = result
+        else:
+            payload['error'] = error
+        client.publish(topic, json.dumps(payload), qos=0, retain=False)

simo/core/management/commands/run_app_mqtt_fanout.py

@@ -0,0 +1,96 @@
+import json
+import sys
+import traceback
+import paho.mqtt.client as mqtt
+from django.core.management.base import BaseCommand
+from django.conf import settings
+from simo.core.events import get_event_obj
+from simo.core.models import Component, Zone, Category
+from simo.users.models import User, InstanceUser, ComponentPermission
+
+
+OBJ_STATE_PREFIX = 'SIMO/obj-state'
+FEED_PREFIX = 'SIMO/user'
+
+
+class Command(BaseCommand):
+    help = 'Authorizing fanout for app feeds: replicate internal obj-state to per-user feed topics.'
+
+    def handle(self, *args, **options):
+        self.client = mqtt.Client()
+        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.connect(host=settings.MQTT_HOST, port=settings.MQTT_PORT)
+        try:
+            while True:
+                self.client.loop()
+        finally:
+            try:
+                self.client.disconnect()
+            except Exception:
+                pass
+
+    def on_connect(self, client, userdata, flags, rc):
+        client.subscribe(f'{OBJ_STATE_PREFIX}/#')
+
+    def on_message(self, client, userdata, msg):
+        try:
+            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':
+                return
+            instance_uid = topic_parts[2]
+            model_name = topic_parts[3]
+            obj_id = topic_parts[4]
+
+            # Only forward instance-scoped objects that the app cares about
+            payload = json.loads(msg.payload or '{}')
+
+            # Resolve object if needed (mainly for Components to do permission checks)
+            target_obj = None
+            if model_name == 'Component':
+                target_obj = get_event_obj(payload, model_class=Component)
+                if not target_obj:
+                    return
+            elif model_name == 'Zone':
+                target_obj = get_event_obj(payload, model_class=Zone)
+            elif model_name == 'Category':
+                target_obj = get_event_obj(payload, model_class=Category)
+            elif model_name == 'InstanceUser':
+                # presence updates; no need to resolve explicitly
+                pass
+            else:
+                # Ignore other objects for feed
+                return
+
+            publish_to_users = set([
+                m.id for m in User.objects.filter(is_master=True) if m.is_active
+            ])
+            for iu in InstanceUser.objects.filter(
+                instance__uid=instance_uid, is_active=True
+            ).select_related('user', 'role'):
+                if iu.user.is_master:
+                    publish_to_users.add(iu.user.id)
+                    continue
+                if iu.role.is_superuser:
+                    publish_to_users.add(iu.user.id)
+                    continue
+                if model_name != 'Component':
+                    publish_to_users.add(iu.user.id)
+                    continue
+                if ComponentPermission.objects.filter(
+                    role=iu.role,
+                    component_id=target_obj.id,
+                    component__zone__instance__uid=instance_uid,
+                    read=True,
+                ).exists():
+                    publish_to_users.add(iu.user.id)
+                    continue
+
+            for user_id in publish_to_users:
+                feed_topic = f'{FEED_PREFIX}/{user_id}/feed/{instance_uid}/{model_name}/{obj_id}'
+                client.publish(feed_topic, msg.payload, qos=0, retain=True)
+        except Exception:
+            # Never crash the consumer
+            print('Fanout error:', ''.join(traceback.format_exception(*sys.exc_info())), file=sys.stderr)

simo/core/signal_receivers.py

@@ -136,26 +136,50 @@ def post_save_actions_dispatcher(sender, instance, created, **kwargs):
         action_type='management_event'
     )
 
+    # Announce Zone/Category changes over MQTT for mobile live updates
+    from .events import ObjectChangeEvent, dirty_fields_to_current_values
+    dirty_fields_prev = instance.get_dirty_fields()
+
+    def post_update():
+        if not dirty_fields_prev:
+            return
+
+        data = {}
+        # Provide minimal fields clients can use without re-fetching
+        if isinstance(instance, Zone):
+            data['name'] = instance.name
+        elif isinstance(instance, Category):
+            data['name'] = instance.name
+            data['last_modified'] = instance.last_modified
+
+        ObjectChangeEvent(
+            instance.instance, instance,
+            dirty_fields=dirty_fields_to_current_values(instance, dirty_fields_prev),
+            **data
+        ).publish()
+
+    transaction.on_commit(post_update)
+
 
 @receiver(post_save, sender=Component)
 @receiver(post_save, sender=Gateway)
 def post_save_change_events(sender, instance, created, **kwargs):
     target = instance
-    from .events import ObjectChangeEvent
-    dirty_fields = target.get_dirty_fields()
+    from .events import ObjectChangeEvent, dirty_fields_to_current_values
+    dirty_fields_prev = target.get_dirty_fields()
     for ignore_field in (
         'change_init_by', 'change_init_date', 'change_init_to', 'last_update'
     ):
-        dirty_fields.pop(ignore_field, None)
+        dirty_fields_prev.pop(ignore_field, None)
 
     def post_update():
-        if not dirty_fields:
+        if not dirty_fields_prev:
             return
 
         if type(target) == Gateway:
             ObjectChangeEvent(
                 None, target,
-                dirty_fields=dirty_fields,
+                dirty_fields=dirty_fields_to_current_values(target, dirty_fields_prev),
             ).publish()
         elif type(target) == Component:
             data = {}
@@ -166,7 +190,7 @@ def post_save_change_events(sender, instance, created, **kwargs):
                 data[field_name] = getattr(target, field_name, None)
             ObjectChangeEvent(
                 target.zone.instance, target,
-                dirty_fields=dirty_fields,
+                dirty_fields=dirty_fields_to_current_values(target, dirty_fields_prev),
                 actor=getattr(target, 'change_actor', None),
                 **data
             ).publish()
@@ -217,4 +241,4 @@ def delete_file_itself(sender, instance, *args, **kwargs):
     try:
         os.remove(instance.file.path)
     except:
-        pass
+        pass

simo/core/tasks.py

@@ -441,39 +441,7 @@ def restart_postgresql():
     proc.communicate()
 
 
-@celery_app.task
-def low_battery_notifications():
-    from simo.notifications.utils import notify_users
-    from simo.automation.helpers import be_or_not_to_be
-    for instance in Instance.objects.filter(is_active=True):
-        timezone.activate(instance.timezone)
-        hour = timezone.localtime().hour
-        if hour < 7:
-            continue
-        if hour > 21:
-            continue
-
-        introduce_instance(instance)
-        for comp in Component.objects.filter(
-            zone__instance=instance,
-            battery_level__isnull=False, battery_level__lt=20
-        ):
-            last_warning = comp.meta.get('last_battery_warning', 0)
-            notify = be_or_not_to_be(12 * 60 * 60, 72 * 60 * 60, last_warning)
-            if not notify:
-                continue
 
-            iusers = comp.zone.instance.instance_users.filter(
-                is_active=True, role__is_owner=True
-            )
-            if iusers:
-                notify_users(
-                    'warning',
-                    f"Low battery ({comp.battery_level}%) on {comp}",
-                    component=comp, instance_users=iusers
-                )
-            comp.meta['last_battery_warning'] = time.time()
-            comp.save()
 
 
 @celery_app.task
@@ -516,4 +484,3 @@ def setup_periodic_tasks(sender, **kwargs):
     sender.add_periodic_task(60 * 60, maybe_update_to_latest.s())
     sender.add_periodic_task(60, drop_fingerprints_learn.s())
     sender.add_periodic_task(60 * 60 * 24, restart_postgresql.s())
-    sender.add_periodic_task(60 * 60, low_battery_notifications.s())

simo/generic/gateways.py

@@ -7,9 +7,8 @@ import traceback
 from django.conf import settings
 from django.utils import timezone
 import paho.mqtt.client as mqtt
-from simo.core.utils.helpers import get_self_ip
-from simo.core.models import Component, PublicFile
-from simo.core.middleware import drop_current_instance
+from simo.core.models import Instance, Component
+from simo.core.middleware import introduce_instance, drop_current_instance
 from simo.core.gateways import BaseObjectCommandsGatewayHandler
 from simo.core.forms import BaseGatewayForm
 from simo.core.events import GatewayObjectCommand, get_event_obj
@@ -176,15 +175,18 @@ class GenericGatewayHandler(
 ):
     name = "Generic"
     config_form = BaseGatewayForm
+    auto_create = True
     info = "Provides generic type components which use other components to operate like " \
            "thermostats, alarm groups, watering programs, alarm clocks," \
            "etc. "
 
     running_scripts = {}
     periodic_tasks = (
+        ('watch_timers', 1),
         ('watch_thermostats', 60),
         ('watch_alarm_clocks', 30),
         ('watch_watering', 60),
+        ('low_battery_notifications', 60 * 60),
         ('watch_main_states', 60),
         ('watch_groups', 60)
     )
@@ -198,6 +200,21 @@ class GenericGatewayHandler(
         self.pulsing_switches = {}
 
 
+    def watch_timers(self):
+        from simo.core.models import Component
+        drop_current_instance()
+        for component in Component.objects.filter(
+            meta__timer_to__gt=0
+        ).filter(meta__timer_to__lt=time.time()):
+            component.meta['timer_to'] = 0
+            component.meta['timer_start'] = 0
+            component.save()
+            try:
+                component.controller._on_timer_end()
+            except Exception as e:
+                print(traceback.format_exc(), file=sys.stderr)
+
+
     def watch_thermostats(self):
         from .controllers import Thermostat
         drop_current_instance()
@@ -206,7 +223,7 @@ class GenericGatewayHandler(
         ):
             tz = pytz.timezone(thermostat.zone.instance.timezone)
             timezone.activate(tz)
-            thermostat._evaluate()
+            thermostat.controller._evaluate()
 
 
     def watch_alarm_clocks(self):
@@ -217,7 +234,7 @@ class GenericGatewayHandler(
         ):
             tz = pytz.timezone(alarm_clock.zone.instance.timezone)
             timezone.activate(tz)
-            alarm_clock._tick()
+            alarm_clock.controller._tick()
 
 
     def watch_watering(self):
@@ -227,12 +244,46 @@ class GenericGatewayHandler(
             tz = pytz.timezone(watering.zone.instance.timezone)
             timezone.activate(tz)
             if watering.value['status'] == 'running_program':
-                watering._set_program_progress(
+                watering.controller._set_program_progress(
                     watering.value['program_progress'] + 1
                 )
             else:
                 watering.controller._perform_schedule()
 
+    def low_battery_notifications(self):
+        from simo.notifications.utils import notify_users
+        from simo.automation.helpers import be_or_not_to_be
+        for instance in Instance.objects.filter(is_active=True):
+            timezone.activate(instance.timezone)
+            hour = timezone.localtime().hour
+            if hour < 7:
+                continue
+            if hour > 21:
+                continue
+
+            introduce_instance(instance)
+            for comp in Component.objects.filter(
+                    zone__instance=instance,
+                    battery_level__isnull=False, battery_level__lt=20
+            ):
+                last_warning = comp.meta.get('last_battery_warning', 0)
+                notify = be_or_not_to_be(12 * 60 * 60, 72 * 60 * 60,
+                                         last_warning)
+                if not notify:
+                    continue
+
+                iusers = comp.zone.instance.instance_users.filter(
+                    is_active=True, role__is_owner=True
+                )
+                if iusers:
+                    notify_users(
+                        'warning',
+                        f"Low battery ({comp.battery_level}%) on {comp}",
+                        component=comp, instance_users=iusers
+                    )
+                comp.meta['last_battery_warning'] = time.time()
+                comp.save()
+
 
     def run(self, exit):
         drop_current_instance()
@@ -340,7 +391,7 @@ class GenericGatewayHandler(
     def set_get_day_evening_night_morning(self, state):
         if state.value  not in ('day', 'night', 'evening', 'morning'):
             return
-        new_state = state._get_day_evening_night_morning()
+        new_state = state.controller._get_day_evening_night_morning()
         if new_state == state.value:
             self.last_set_state = state.value
             return
@@ -377,7 +428,7 @@ class GenericGatewayHandler(
                     self.sensors_on_watch[state.id][sensor.id] = i_id
                     sensor.on_change(self.security_sensor_change)
 
-            if state._check_is_away(self.last_sensor_actions.get(i_id, 0)):
+            if state.controller._check_is_away(self.last_sensor_actions.get(i_id, 0)):
                 if state.value != 'away':
                     print(f"New main state of "
                           f"{state.zone.instance} - away")
@@ -385,7 +436,7 @@ class GenericGatewayHandler(
             else:
                 if state.value == 'away':
                     try:
-                        new_state = state._get_day_evening_night_morning()
+                        new_state = state.controller._get_day_evening_night_morning()
                     except:
                         new_state = 'day'
                     print(f"New main state of "
@@ -394,14 +445,14 @@ class GenericGatewayHandler(
 
         if state.config.get('sleeping_phones_hour') is not None:
             if state.value != 'sleep':
-                if state._is_sleep_time() and state._owner_phones_on_charge(True):
+                if state.controller._is_sleep_time() and state.controller._owner_phones_on_charge(True):
                     print(f"New main state of {state.zone.instance} - sleep")
                     state.send('sleep')
             else:
-                if not state._owner_phones_on_charge(True) \
-                and not state._is_sleep_time():
+                if not state.controller._owner_phones_on_charge(True) \
+                and not state.controller._is_sleep_time():
                     try:
-                        new_state = state._get_day_evening_night_morning()
+                        new_state = state.controller._get_day_evening_night_morning()
                     except:
                         new_state = 'day'
                     print(f"New main state of "
@@ -509,9 +560,9 @@ class GenericGatewayHandler(
 class DummyGatewayHandler(BaseObjectCommandsGatewayHandler):
     name = "Dummy"
     config_form = BaseGatewayForm
+    auto_create = True
     info = "Provides dummy components that do absolutely anything, " \
            "but comes in super handy when configuring custom automations."
 
     def perform_value_send(self, component, value):
         component.controller.set(value)
-

simo/generic/tasks.py

@@ -56,25 +56,4 @@ def fire_breach_events(ag_id):
             ag.meta['events_triggered'] = [uid]
         else:
             ag.meta['events_triggered'].append(uid)
-        ag.save(update_fields=['meta'])
-
-
-@celery_app.task
-def watch_timers():
-    from simo.core.models import Component
-    drop_current_instance()
-    for component in Component.objects.filter(
-        meta__timer_to__gt=0
-    ).filter(meta__timer_to__lt=time.time()):
-        component.meta['timer_to'] = 0
-        component.meta['timer_start'] = 0
-        component.save()
-        try:
-            component.controller._on_timer_end()
-        except Exception as e:
-            print(traceback.format_exc(), file=sys.stderr)
-
-
-@celery_app.on_after_finalize.connect
-def setup_periodic_tasks(sender, **kwargs):
-    sender.add_periodic_task(1, watch_timers.s())
+        ag.save(update_fields=['meta'])

simo/urls.py

@@ -45,7 +45,8 @@ urlpatterns = [
     path('logout/', LogoutView.as_view(), name='logout'),
     path('admin/', admin_site.urls),
     path('api-hub-info/', hub_info),
-    path('api/<instance_slug>/', include(rest_router.urls)),
+    # REST API (instance-scoped)
+    path('api/<slug:instance_slug>/', include(rest_router.urls)),
 
 ]
 

simo/users/api.py

@@ -127,9 +127,16 @@ class UsersViewSet(mixins.RetrieveModelMixin,
                 raise ValidationError(
                     'You do not have permission for this!', code=403
                 )
-        self.perform_destroy(user)
+        if InstanceUser.objects.filter(user=user, is_active=True).count() > 1:
+            InstanceUser.objects.filter(
+                user=user, instance=self.instance
+            ).delete()
+        else:
+            user.delete()
         return RESTResponse(status=status.HTTP_204_NO_CONTENT)
 
+    # (moved to dedicated view at /users/mqtt-credentials/)
+
 
 class RolesViewsets(InstanceMixin, viewsets.ReadOnlyModelViewSet):
     url = 'users/roles'
@@ -406,4 +413,3 @@ class FingerprintViewSet(
     def destroy(self, request, *args, **kwargs):
         self.check_can_manage_user(request)
         return super().destroy(request, *args, **kwargs)
-

simo/users/auto_urls.py

@@ -1,5 +1,5 @@
 from django.urls import re_path, path
-from .views import accept_invitation, RolesAutocomplete
+from .views import accept_invitation, RolesAutocomplete, mqtt_credentials
 
 urlpatterns = [
     re_path(
@@ -10,4 +10,5 @@ urlpatterns = [
         'autocomplete-roles',
         RolesAutocomplete.as_view(), name='autocomplete-user-roles'
     ),
+    path('mqtt-credentials/', mqtt_credentials, name='mqtt-credentials'),
 ]

simo/users/models.py

@@ -1,4 +1,6 @@
 import datetime
+import time
+import json
 import requests
 import subprocess
 from django.urls import reverse
@@ -16,6 +18,7 @@ from actstream import action
 from django.contrib.auth.models import (
     AbstractBaseUser, PermissionsMixin, UserManager as DefaultUserManager
 )
+from django.conf import settings
 from django.utils import timezone
 from easy_thumbnails.fields import ThumbnailerImageField
 from location_field.models.plain import PlainLocationField
@@ -115,7 +118,9 @@ class InstanceUser(DirtyFieldsMixin, models.Model, OnChangeMixin):
     objects = ActiveInstanceManager()
 
     on_change_fields = (
-        'is_active', 'last_seen', 'last_seen_location', 'phone_on_charge'
+        'is_active', 'role', 'at_home',
+        'last_seen', 'last_seen_location', 'last_seen_speed_kmh',
+        'phone_on_charge'
     )
 
     class Meta:
@@ -158,13 +163,11 @@ class InstanceUser(DirtyFieldsMixin, models.Model, OnChangeMixin):
 
 @receiver(post_save, sender=InstanceUser)
 def post_instance_user_save(sender, instance, created, **kwargs):
-    if created:
-        return
-    from simo.core.events import ObjectChangeEvent
-    dirty_fields = instance.get_dirty_fields()
-    if any([f in dirty_fields.keys() for f in InstanceUser.on_change_fields]):
+    from simo.core.events import ObjectChangeEvent, dirty_fields_to_current_values
+    dirty_fields_prev = instance.get_dirty_fields()
+    if not created and any([f in dirty_fields_prev.keys() for f in InstanceUser.on_change_fields]):
         def post_update():
-            if 'at_home' in dirty_fields:
+            if 'at_home' in dirty_fields_prev:
                 if instance.at_home:
                     verb = 'came home'
                 else:
@@ -174,12 +177,57 @@ def post_instance_user_save(sender, instance, created, **kwargs):
                     instance_id=instance.instance.id,
                     action_type='user_presence', value=instance.at_home
                 )
+            # Include key fields so clients can update UI without a refetch
             ObjectChangeEvent(
-                instance.instance, instance,  dirty_fields=dirty_fields
+                instance.instance,
+                instance,
+                dirty_fields=dirty_fields_to_current_values(instance, dirty_fields_prev),
+                at_home=instance.at_home,
+                last_seen=instance.last_seen,
+                last_seen_location=instance.last_seen_location,
+                last_seen_speed_kmh=instance.last_seen_speed_kmh,
+                phone_on_charge=instance.phone_on_charge,
+                is_active=instance.is_active,
+                role=instance.role_id,
             ).publish()
+            # If role changed, notify the affected user to re-fetch states
+            if 'role' in dirty_fields_prev:
+                from paho.mqtt import publish as mqtt_publish
+                topic = f"SIMO/user/{instance.user.id}/perms-changed"
+                payload = json.dumps({
+                    'instance_id': instance.instance.id,
+                    'timestamp': int(time.time())
+                })
+                try:
+                    mqtt_publish.single(
+                        topic, payload,
+                        hostname=settings.MQTT_HOST, port=settings.MQTT_PORT,
+                        auth={'username': 'root', 'password': settings.SECRET_KEY},
+                        retain=False
+                    )
+                except Exception:
+                    pass
+            # Invalidate cached role lookups
+            try:
+                cache.delete(f'user-{instance.user.id}_instance-{instance.instance.id}-role-id')
+                cache.delete(f'user-{instance.user.id}_instance-{instance.instance.id}_role')
+            except Exception:
+                pass
         transaction.on_commit(post_update)
-    if 'role' or 'is_active' in instance.dirty_fields:
+    # Rebuild ACLs if user became active/inactive due to this role change
+    try:
+        if created or ('is_active' in dirty_fields_prev):
+            dynamic_settings['core__needs_mqtt_acls_rebuild'] = True
+    except Exception:
+        pass
+
+@receiver(post_delete, sender=InstanceUser)
+def post_instance_user_delete(sender, instance, **kwargs):
+    # Deleting role entry may change user's overall is_active; rebuild ACLs
+    try:
         dynamic_settings['core__needs_mqtt_acls_rebuild'] = True
+    except Exception:
+        pass
 
 
 # DirtyFieldsMixin does not work with AbstractBaseUser model!!!
@@ -256,6 +304,14 @@ class User(AbstractBaseUser, SimoAdminMixin):
         if not org or (org.secret_key != self.secret_key):
             self.update_mqtt_secret()
 
+        # Rebuild ACLs when a user is created or properties affecting ACLs change
+        # (username/email used by Mosquitto + master flag)
+        try:
+            if (not org) or (org.email != self.email) or (org.is_master != self.is_master):
+                dynamic_settings['core__needs_mqtt_acls_rebuild'] = True
+        except Exception:
+            pass
+
         return obj
 
     def update_mqtt_secret(self, reload=True):
@@ -408,6 +464,12 @@ class User(AbstractBaseUser, SimoAdminMixin):
 
         rebuild_authorized_keys()
 
+        # Reflect access changes in Mosquitto ACLs
+        try:
+            dynamic_settings['core__needs_mqtt_acls_rebuild'] = True
+        except Exception:
+            pass
+
         self._is_active = None
 
 
@@ -507,8 +569,28 @@ class ComponentPermission(models.Model):
 
 @receiver(post_save, sender=ComponentPermission)
 def rebuild_mqtt_acls_on_create(sender, instance, created, **kwargs):
-    if not created:
-        dynamic_settings['core__needs_mqtt_acls_rebuild'] = True
+    # ACLs are per-user prefix; permission changes don't require ACL rebuilds.
+
+    # Notify affected users to re-sync their subscriptions
+    def _notify():
+        from paho.mqtt import publish as mqtt_publish
+        role = instance.role
+        for iu in role.instance.instance_users.filter(role=role, is_active=True).select_related('user'):
+            topic = f"SIMO/user/{iu.user.id}/perms-changed"
+            payload = json.dumps({
+                'instance_id': role.instance.id,
+                'timestamp': int(time.time())
+            })
+            try:
+                mqtt_publish.single(
+                    topic, payload,
+                    hostname=settings.MQTT_HOST, port=settings.MQTT_PORT,
+                    auth={'username': 'root', 'password': settings.SECRET_KEY},
+                    retain=False
+                )
+            except Exception:
+                pass
+    transaction.on_commit(_notify)
 
 
 
@@ -524,7 +606,7 @@ def create_component_permissions_comp(sender, instance, created, **kwargs):
                     'write': role.is_superuser or role.is_owner
                 }
             )
-        dynamic_settings['core__needs_mqtt_acls_rebuild'] = True
+        # ACLs are per-user prefix; component additions don't require ACL rebuilds.
 
 
 @receiver(post_save, sender=PermissionsRole)
@@ -541,6 +623,35 @@ def create_component_permissions_role(sender, instance, created, **kwargs):
                 }
             )
 
+    # Permissions topology changed; notify users on this role
+    def _notify():
+        from paho.mqtt import publish as mqtt_publish
+        for iu in instance.instance.instance_users.filter(role=instance, is_active=True).select_related('user'):
+            topic = f"SIMO/user/{iu.user.id}/perms-changed"
+            payload = json.dumps({
+                'instance_id': instance.instance.id,
+                'timestamp': int(time.time())
+            })
+            try:
+                mqtt_publish.single(
+                    topic, payload,
+                    hostname=settings.MQTT_HOST, port=settings.MQTT_PORT,
+                    auth={'username': 'root', 'password': settings.SECRET_KEY},
+                    retain=False
+                )
+            except Exception:
+                pass
+    transaction.on_commit(_notify)
+
+
+@receiver(post_delete, sender=User)
+def rebuild_mqtt_acls_on_user_delete(sender, instance, **kwargs):
+    # Remove ACL stanza for deleted user
+    try:
+        dynamic_settings['core__needs_mqtt_acls_rebuild'] = True
+    except Exception:
+        pass
+
 
 def get_default_inviation_expire_date():
     return timezone.now() + datetime.timedelta(days=14)
@@ -607,5 +718,3 @@ class InstanceInvitation(models.Model):
 
     def get_absolute_url(self):
         return reverse('accept_invitation', kwargs={'token': self.token})
-
-

simo/users/templates/conf/mosquitto_acls.conf

@@ -2,18 +2,18 @@ user root
 topic readwrite #
 
 {% for user in users %}
+{% if user.email == 'system@simo.io' %}
 user {{ user.email }}
-    {% if user.email == 'system@simo.io' or user.is_master %}
 topic readwrite #
-    {% elif user.email == 'device@simo.io' %}
+{% elif user.is_active %}
+user {{ user.email }}
+    {% if user.is_master %}
 topic readwrite #
-topic deny SIMO/#
     {% else %}
-        {% for perm in user.get_component_permissions %}
-topic read SIMO/obj-state/{{ perm.component.zone.instance.id }}/Component-{{ perm.component.id }}
-        {% endfor %}
+topic readwrite SIMO/user/{{ user.id }}/#
     {% endif %}
+{% endif %}
 {% endfor %}
 
 # This affects all clients.
-pattern deny #
+pattern deny #

simo/users/views.py

@@ -125,3 +125,15 @@ class RolesAutocomplete(autocomplete.Select2QuerySetView):
         return qs.distinct()
 
 
+@login_required
+def mqtt_credentials(request):
+    """Return MQTT credentials for the authenticated user.
+    Response payload:
+      - username: user's email
+      - password: user's MQTT secret
+    """
+    return JsonResponse({
+        'username': request.user.email,
+        'password': request.user.secret_key,
+        'user_id': request.user.id
+    })

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

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

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

@@ -3,7 +3,7 @@ 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/urls.py,sha256=d8g-wN0Xr2PVIV8RZl_h_PMN9KGZNIE9to2hQj1p1TU,2497
+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
 simo/__pycache__/asgi.cpython-312.pyc,sha256=rP901zORYEHQnumQ25VCDkVC5dXqi7rK0xn_MfUjJI4,2416
@@ -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=nqqiNFTYmHnwyYCM2tI-AS4gCnEFPVoJojoMo2mytVM,17383
+simo/automation/gateways.py,sha256=SGq91nr2K1i8aSFh0XTZDHBb7TzFU_X24-wkt8IQkeM,17406
 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
@@ -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=yqGxO0dQC3aUfIfZw2XpVeeVuGEjKgtO5hLhOhqAD6g,29924
+simo/core/api.py,sha256=CCjo8DN7uzAhScW5BEJMnxq8GprAvOtnpLEwNmNN-rA,29903
 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
@@ -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=hnv17g37kqwpfrkMUStfk_Rk_-G28MU1HEjolwWNNFg,4978
+simo/core/events.py,sha256=GQwolnqO4ZoxgyVi9C4eKXpMULD3gMstGJsxWhc1TWU,6172
 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=Y2BME6zSyeUq_e-hzEUF6gErCUCP6nFxedkLZKiLVOo,4141
+simo/core/gateways.py,sha256=ik9C9L0Z_pTuWXMDXCW09MuTgb6IGdMPn8uVQAJVw5I,4377
 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
@@ -117,10 +117,10 @@ simo/core/models.py,sha256=wmwL-pUYYTmhuYrTZJWeumnnojhPbRSQsgiIVDN1Scc,23880
 simo/core/permissions.py,sha256=Ef4NO7QwwDd3Z-v61R0BeCBXxTOJz9qBvzRTIB5tHwI,2943
 simo/core/routing.py,sha256=X1_IHxyA-_Q7hw1udDoviVP4_FSBDl8GYETTC2zWTbY,499
 simo/core/serializers.py,sha256=BwkqDmV2vEumyw7EDYlD2Wm0FAYs88G_4JuTVbcEBqU,27235
-simo/core/signal_receivers.py,sha256=jTAjsrm5uPBmrwWvG--OuVGbSIKicynpTis_veNWuM0,7150
+simo/core/signal_receivers.py,sha256=5HG7bTUcX99PUpm2aoGTsHSueoPfziZtqjtbEB56_N8,8110
 simo/core/socket_consumers.py,sha256=UlxV9OvTUUXaoKKYT3-qf1TyGxyOPxIpFH5cPFepH1o,9584
 simo/core/storage.py,sha256=_5igjaoWZAiExGWFEJMElxUw55DzJG1jqFty33xe8BE,342
-simo/core/tasks.py,sha256=gGbKn7iGFakhI-73pCdI_d3VcxC8mRGzQuu3YDyZLKA,17324
+simo/core/tasks.py,sha256=zhHK-4tRAIEkfxRUiTRhtUqRgX56J30ggPblEtO0PE4,16027
 simo/core/todos.py,sha256=eYVXfLGiapkxKK57XuviSNe3WsUYyIWZ0hgQJk7ThKo,665
 simo/core/types.py,sha256=WJEq48mIbFi_5Alt4wxWMGXxNxUTXqfQU5koH7wqHHI,1108
 simo/core/views.py,sha256=BBh8U2P3rS_WccKN9hN6dhtiyXIfCX9I80zNwejqfe4,3666
@@ -284,9 +284,9 @@ simo/core/management/__pycache__/update.cpython-312.pyc,sha256=wB8M-RzaPgoOkeH92
 simo/core/management/_hub_template/hub/asgi.py,sha256=ElN_fdeSkf0Ysa7pS9rJVmZ1HmLhFxb8jFaMLqe1220,126
 simo/core/management/_hub_template/hub/celeryc.py,sha256=3ksDXftIZKJ4Cq9WNKJERdZdQlDEnjTQXycweRFmsSQ,27
 simo/core/management/_hub_template/hub/manage.py,sha256=PNNlw3EVeIJDgkG0l-klqoxsKWfTYWG9jzRG0upmAaI,620
-simo/core/management/_hub_template/hub/nginx.conf,sha256=u-e6ExdkxQX6yyh34ZIpyS8o3GtwzGvMj6yMy0-XPjg,2001
+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=55MHRuq0964q1hgqyqLgV-jCMxOY456bwB3g3JKAr5U,2766
+simo/core/management/_hub_template/hub/supervisor.conf,sha256=eHdvz98YtxizyPyiJ57-uiTrHGthXdFEN4lybxGBJZk,3492
 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,7 +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=C6Xt5yTZPQQd_EdzEz-1U6-2HTIIPZzRsYKw8nnPsQM,2766
+simo/core/management/commands/on_http_start.py,sha256=SYhE1d2GJ_tOFLvT9VFLPcXA3Lzz-dw5x3zMWPkdHYI,6278
+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_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
@@ -10672,11 +10675,11 @@ 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=9K4KkTn0rHRsRba1o8hIQFtRpRtpoL2E33Vozcy-FzM,19458
+simo/generic/gateways.py,sha256=mnr4nAwLLESI50cwz1-LeeaLt0ABOt8s0D2_U-NgRsc,21586
 simo/generic/models.py,sha256=59fkYowOX0imviIhA6uwupvuharrpBykmBm674rJNoI,7279
 simo/generic/routing.py,sha256=elQVZmgnPiieEuti4sJ7zITk1hlRxpgbotcutJJgC60,228
 simo/generic/socket_consumers.py,sha256=qesKZVhI56Kh7vdIUDD3hzDUi0FcXwIfcmE_a3YS6JQ,1772
-simo/generic/tasks.py,sha256=5jhi7Jv7lfaM3T8GArWKaDqQfuvdBsKqz5obN6NVUqk,2570
+simo/generic/tasks.py,sha256=BRS2-jwxT4vQIWxzRXmRiEAchImu9vksyxXCfirsQEM,1946
 simo/generic/__pycache__/__init__.cpython-312.pyc,sha256=ve2HqQWbGZuKo28_jvzAITLRnqC_Hx3482zCu82uW3Y,125
 simo/generic/__pycache__/__init__.cpython-38.pyc,sha256=mLu54WS9KIl-pHwVCBKpsDFIlOqml--JsOVzAUHg6cU,161
 simo/generic/__pycache__/app_widgets.cpython-312.pyc,sha256=sfJl7ZyJHbNtwfU3Y7DMRLt1hOznFArMQPOWk8tLPoo,1895
@@ -10838,21 +10841,21 @@ simo/notifications/migrations/__pycache__/__init__.cpython-312.pyc,sha256=AA5lsh
 simo/notifications/migrations/__pycache__/__init__.cpython-38.pyc,sha256=YMBRHVon2nWDtIUbghckjnC12sIg_ykPWhV5aM0tto4,178
 simo/users/__init__.py,sha256=6a7uBpCWB_DR7p54rbHusc0xvi1qfT1ZCCQGb6TiBh8,52
 simo/users/admin.py,sha256=DVXDfq8ssauNA7-H6sj89UlsfbOvJldpveNSAaYIVPY,7515
-simo/users/api.py,sha256=7LXVAsCuheS4k8JtkORNXFGh6bb1jR4QPZknuS12nzw,15136
+simo/users/api.py,sha256=Dt9L6Tx4gf3_4TNGFl6YHJB8aGAF2-xVdp_g-ADwkK4,15394
 simo/users/apps.py,sha256=cq0A8-U1HALEwev0TicgFhr4CAu7Icz8rwq0HfOaL4E,207
 simo/users/auth_backends.py,sha256=HxRp9iFvU1KqUhE7pA9YKEjqtBCJDbDqk_UMCD2Dwww,4361
-simo/users/auto_urls.py,sha256=RSUW3ai5LbMTknS8M7M5aOnG_YlFOVQrnNVNH-fkwlg,357
+simo/users/auto_urls.py,sha256=OUUaTSpd6aPG6IuRc9FPxYDNL8Ix7todFpH7457BOGc,449
 simo/users/dynamic_settings.py,sha256=yDtjpcEKA5uS2fcma6e-Zznh2iyMT3x8N7aRqNCtzSM,569
 simo/users/managers.py,sha256=OHgEP85MBtdkdYxdstBd8RavTBT8F_2WyDxUJ9aCqqM,246
 simo/users/middleware.py,sha256=tNPmnzo0eTrJ25SLHP7NotqYKI2cKnmv8hf6v5DLOWo,427
-simo/users/models.py,sha256=2bnUEFM1UqwWntBOTnoYwzWRMr0KsQEv6HTHGo9VdxE,20679
+simo/users/models.py,sha256=hEspAbqpbIYfQ4IiXnYtl96waILuuqlfTg4p44rBUTY,25355
 simo/users/permissions.py,sha256=IwtYS8yQdupWbYKR9VimSRDV3qCJ2jXP57Lyjpb2EQM,242
 simo/users/serializers.py,sha256=Uy5JsZp6nEGNMuK9HgLbA0KJdsbjG8GDIyF7z7Ue_so,2610
 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
 simo/users/utils.py,sha256=KjLdDFoUYt7oEA-xUVMhJA9cHH1PLMYQ3VOCVIz2Pds,2499
-simo/users/views.py,sha256=iIfv8DqNztzBB3fiZcnHOyzp4eFtjrC-gCv5rBX3XsQ,4136
+simo/users/views.py,sha256=fS7amCXDOGeaz2wmUb4QPmvKSdMYjKtDo3uZrT_Z_vk,4493
 simo/users/__pycache__/__init__.cpython-312.pyc,sha256=UiRwMF_vg4qhVZwHICgp47rZ96O7CMtn5d5tkK9NlDE,181
 simo/users/__pycache__/__init__.cpython-38.pyc,sha256=VFoDJE_SKKaPqqYaaBYd1Ndb1hjakkTo_u0EG_XJ1GM,211
 simo/users/__pycache__/admin.cpython-312.pyc,sha256=ZN9E9ldfrK-dG-ZyvNajdDOjVwNhyJHksy5OSFFEehk,11446
@@ -11024,16 +11027,16 @@ simo/users/migrations/__pycache__/0044_permissionsrole_is_person.cpython-312.pyc
 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_acls.conf,sha256=ga44caTDNQE0CBKw55iM2jOuna6-9fKGwAhjyERZdRE,500
+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
 simo/users/templates/invitations/expired_msg.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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.0.5.dist-info/licenses/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-3.0.5.dist-info/METADATA,sha256=9t_mI0DDVS1T9_wexKOfhYcg8O02-AgArAxvrVnseuY,2224
-simo-3.0.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-simo-3.0.5.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
-simo-3.0.5.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-3.0.5.dist-info/RECORD,,
+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,,