simo 2.8.15__py3-none-any.whl → 2.10.1__py3-none-any.whl

simo/generic/forms.py

@@ -90,33 +90,38 @@ class ThermostatConfigForm(BaseComponentForm):
         )
     )
     # TODO: support for multiple heaters
-    heater = Select2ModelChoiceField(
+    heaters = Select2ModelMultipleChoiceField(
         queryset=Component.objects.filter(base_type=Switch.base_type),
         required=False,
         url='autocomplete-component',
         forward=(
             forward.Const([
-                Switch.base_type,
+                Switch.base_type, Dimmer.base_type
             ], 'base_type'),
         )
     )
     # TODO: support for multiple coolers
-    cooler = Select2ModelChoiceField(
+    coolers = Select2ModelMultipleChoiceField(
         queryset=Component.objects.filter(base_type=Switch.base_type),
         required=False,
         url='autocomplete-component',
         forward=(
             forward.Const([
-                Switch.base_type,
+                Switch.base_type, Dimmer.base_type
             ], 'base_type'),
         )
 
     )
-    mode = forms.ChoiceField(
-        choices=(('heater', "Heater"), ('cooler', "Cooler"), ('auto', "Auto"),),
-        initial='heater'
+    engagement = forms.ChoiceField(
+        choices=(('dynamic', "Dynamic"), ('static', "Static")),
+        initial='dynamic',
+        help_text="Dynamic - scales engagement intensity within reaction window <br>"
+                  "Static - engages/disengages fully within reaction window <br>"
+    )
+    reaction_difference = forms.FloatField(
+        initial=2, min_value=0, max_value=50,
+        help_text="Reaction window = target temp +- reaction difference."
     )
-    reaction_difference = forms.FloatField(initial=0.5)
     min = forms.IntegerField(initial=3)
     max = forms.IntegerField(initial=36)
     use_real_feel = forms.BooleanField(
@@ -126,8 +131,6 @@ class ThermostatConfigForm(BaseComponentForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         if self.instance.pk:
-            self.fields['mode'].initial = \
-                self.instance.config['user_config']['mode']
             temperature_sensor = Component.objects.filter(
                 pk=self.instance.config.get('temperature_sensor', 0)
             ).first()

simo/generic/gateways.py

@@ -195,7 +195,7 @@ class GenericGatewayHandler(
         self.sensors_on_watch = {}
         self.sleep_is_on = {}
         self.last_set_state = None
-
+        self.pulsing_switches = {}
 
 
     def watch_thermostats(self):
@@ -208,6 +208,7 @@ class GenericGatewayHandler(
             timezone.activate(tz)
             thermostat.evaluate()
 
+
     def watch_alarm_clocks(self):
         from .controllers import AlarmClock
         drop_current_instance()
@@ -218,6 +219,7 @@ class GenericGatewayHandler(
             timezone.activate(tz)
             alarm_clock.tick()
 
+
     def watch_watering(self):
         drop_current_instance()
         from .controllers import Watering
@@ -231,13 +233,15 @@ class GenericGatewayHandler(
             else:
                 watering.controller._perform_schedule()
 
+
     def run(self, exit):
         drop_current_instance()
         self.exit = exit
         self.logger = get_gw_logger(self.gateway_instance.id)
         for task, period in self.periodic_tasks:
             threading.Thread(
-                target=self._run_periodic_task, args=(exit, task, period), daemon=True
+                target=self._run_periodic_task, args=(exit, task, period),
+                daemon=True
             ).start()
 
         from simo.generic.controllers import IPCamera
@@ -254,6 +258,11 @@ class GenericGatewayHandler(
             cam_watch = CameraWatcher(cam.id, exit)
             cam_watch.start()
 
+        threading.Thread(
+            target=self.watch_switch_pulses, args=(exit,),
+            daemon=True
+        ).start()
+
         print("GATEWAY STARTED!")
         while not exit.is_set():
             mqtt_client.loop()
@@ -278,6 +287,8 @@ class GenericGatewayHandler(
                 self.control_alarm_group(component, payload.get('set_val'))
             # elif component.controller_uid == AudioAlert.uid:
             #     self.control_audio_alert(component, payload.get('set_val'))
+            elif payload.get('pulse'):
+                self.start_pulse(component, payload['pulse'])
             else:
                 component.controller.set(payload.get('set_val'))
         except Exception:
@@ -416,6 +427,84 @@ class GenericGatewayHandler(
         ] = time.time()
 
 
+    def watch_switch_pulses(self, exit):
+        for comp in Component.objects.filter(
+            base_type='switch', meta__has_key='pulse'
+        ):
+            comp.send(True)
+            self.pulsing_switches[comp.id] = {
+                'comp': comp, 'last_toggle': time.time(), 'value': True,
+                'pulse': comp.meta['pulse']
+            }
+
+        step = 0
+        while not exit.is_set():
+            time.sleep(0.1)
+            step += 1
+            remove_switches = []
+            for id, data in self.pulsing_switches.items():
+                on_interval = data['pulse']['frame'] * data['pulse']['duty']
+                off_interval = data['pulse']['frame'] - on_interval
+
+                if (
+                    data['value'] and
+                    time.time() - data['last_toggle'] > on_interval
+                ) or (
+                    not data['value'] and
+                    time.time() - data['last_toggle'] > off_interval
+                ):
+                    data['comp'].refresh_from_db()
+                    if not data['comp'].meta.get('pulse'):
+                        remove_switches.append(id)
+                        continue
+                    if data['pulse'] != data['comp'].meta['pulse']:
+                        self.pulsing_switches[id]['pulse'] = data['comp'].meta['pulse']
+                        continue
+
+                if data['value']:
+                    if time.time() - data['last_toggle'] > on_interval:
+                        data['comp'].send(False)
+                        self.pulsing_switches[id]['last_toggle'] = time.time()
+                        self.pulsing_switches[id]['value'] = False
+                else:
+                    if time.time() - data['last_toggle'] > off_interval:
+                        data['comp'].send(True)
+                        self.pulsing_switches[id]['last_toggle'] = time.time()
+                        self.pulsing_switches[id]['value'] = True
+
+            for id in remove_switches:
+                del self.pulsing_switches[id]
+
+            # Update with db every 5s just in case something is missed.
+            if step < 50:
+                continue
+            step = 0
+
+            remove_switches = set(self.pulsing_switches.keys())
+            for comp in Component.objects.filter(
+                base_type='switch', meta__has_key='pulse'
+            ):
+                if comp.id in remove_switches:
+                    remove_switches.remove(comp.id)
+                    self.pulsing_switches[comp.id]['pulse'] = comp.meta['pulse']
+                    continue
+                comp.send(True)
+                self.pulsing_switches[comp.id] = {
+                    'comp': comp, 'last_toggle': time.time(), 'value': True,
+                    'pulse': comp.meta['pulse']
+                }
+            for id in remove_switches:
+                del self.pulsing_switches[id]
+
+
+    def start_pulse(self, comp, pulse):
+        comp.send(True)
+        self.pulsing_switches[comp.id] = {
+            'comp': comp, 'last_toggle': time.time(), 'value': True,
+            'pulse': pulse
+        }
+
+
 
 class DummyGatewayHandler(BaseObjectCommandsGatewayHandler):
     name = "Dummy"

simo/generic/migrations/0003_auto_20250409_1404.py

@@ -0,0 +1,33 @@
+# Generated by Django 4.2.10 on 2025-04-09 14:04
+
+from django.db import migrations
+
+def forwards_func(apps, schema_editor):
+
+    Component = apps.get_model("core", "Component")
+
+    for thermostat in Component.objects.filter(base_type='thermostat'):
+        thermostat.config['heaters'] = []
+        heater = thermostat.config.pop('heater')
+        if heater:
+            thermostat.config['heaters'].append(heater)
+        thermostat.config['coolers'] = []
+        cooler = thermostat.config.pop('cooler')
+        if cooler:
+            thermostat.config['coolers'].append(cooler)
+        thermostat.save()
+
+
+def reverse_func(apps, schema_editor):
+    pass
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('generic', '0002_auto_20241126_0726'),
+    ]
+
+    operations = [
+        migrations.RunPython(forwards_func, reverse_func, elidable=True),
+    ]

simo/users/api.py

@@ -194,10 +194,6 @@ class UserDeviceReport(InstanceMixin, viewsets.GenericViewSet):
         user_device.users.add(request.user)
 
         log_datetime = timezone.now()
-        # if request.data.get('timestamp'):
-        #     log_datetime = datetime.datetime.fromtimestamp(
-        #         int(float(request.GET['timestamp'])), pytz.utc
-        #     )
 
         relay = None
         if request.META.get('HTTP_HOST', '').endswith('.simo.io'):
@@ -208,22 +204,26 @@ class UserDeviceReport(InstanceMixin, viewsets.GenericViewSet):
         except:
             speed_kmh = 0
 
+        if speed_kmh < 0:
+            speed_kmh = 0
+
         avg_speed_kmh = 0
 
         if relay:
             location = request.data.get('location')
             if 'null' in location:
                 location = None
-            prev_log = UserDeviceReportLog.objects.filter(
+            sum = 0
+            no_of_points = 0
+            for speed in UserDeviceReportLog.objects.filter(
                 user_device=user_device, instance=self.instance,
                 datetime__lt=log_datetime - datetime.timedelta(seconds=3),
-                datetime__gt=log_datetime - datetime.timedelta(seconds=10),
+                datetime__gt=log_datetime - datetime.timedelta(seconds=30),
                 at_home=False, location__isnull=False
-            ).last()
-            if prev_log:
-                meters_traveled = haversine_distance(location, prev_log.location)
-                seconds_passed = (log_datetime - prev_log.datetime).total_seconds()
-                avg_speed_kmh = round(meters_traveled / seconds_passed * 3.6, 0)
+            ).values('speed_kmh',):
+                sum += speed[0]
+            sum += speed_kmh
+            avg_speed_kmh = round(sum / (no_of_points + 1))
         else:
             location = self.instance.location
 
@@ -248,7 +248,30 @@ class UserDeviceReport(InstanceMixin, viewsets.GenericViewSet):
                 self.instance.location, location
             ) < dynamic_settings['users__at_home_radius']
 
+        app_open = request.data.get('app_open', False)
+
+        if self.reject_location_report(
+            log_datetime, user_device, location, app_open, relay,
+            phone_on_charge, at_home, speed_kmh
+        ):
+            # We respond with success status, so that the device dos not try to
+            # report this data point again.
+            return RESTResponse({'status': 'success'})
+            # return RESTResponse(
+            #     {'status': 'error', 'msg': 'Duplicate or Bad report!'},
+            #     status=status.HTTP_400_BAD_REQUEST
+            # )
+
+        UserDeviceReportLog.objects.create(
+            user_device=user_device, instance=self.instance,
+            app_open=app_open,
+            location=location, datetime=log_datetime,
+            relay=relay, speed_kmh=speed_kmh, avg_speed_kmh=avg_speed_kmh,
+            phone_on_charge=phone_on_charge, at_home=at_home
+        )
+
         drop_current_instance()
+
         for iu in request.user.instance_roles.filter(is_active=True):
             if not relay:
                 iu.at_home = True
@@ -260,19 +283,49 @@ class UserDeviceReport(InstanceMixin, viewsets.GenericViewSet):
             iu.last_seen = user_device.last_seen
             if location:
                 iu.last_seen_location = location
-            iu.last_seen_speed_kmh = speed_kmh
+            iu.last_seen_speed_kmh = avg_speed_kmh
             iu.phone_on_charge = phone_on_charge
             iu.save()
 
-        UserDeviceReportLog.objects.create(
+        return RESTResponse({'status': 'success'})
+
+
+    def reject_location_report(
+        self, log_datetime, user_device, location, app_open, relay,
+        phone_on_charge, at_home, speed_kmh
+    ):
+        # Phone's App location repoorting is not always as reliable as we would like to
+        # therefore we filter out duplicate reports as they happen quiet often
+        # It has been observer that sometimes an app reports locations that are
+        # way from past, therefore locations might jump out of the usual pattern,
+        # so we try to filter out these anomalies to.
+        q = UserDeviceReportLog.objects.filter(
             user_device=user_device, instance=self.instance,
-            app_open=request.data.get('app_open', False),
-            location=location, datetime=log_datetime,
-            relay=relay, speed_kmh=speed_kmh, avg_speed_kmh=avg_speed_kmh,
-            phone_on_charge=phone_on_charge, at_home=at_home
+            app_open=app_open,
+            datetime__gt=log_datetime - datetime.timedelta(seconds=20),
+            relay=relay, phone_on_charge=phone_on_charge, at_home=at_home
         )
+        if location:
+            q = q.filter(location__isnull=False)
+        last_similar_report = q.last()
+
+        if not last_similar_report:
+            return False
+
+        if location == last_similar_report.location:
+            # This looks like 100% duplicate
+            return True
+
+        from simo.automation.helpers import haversine_distance
+        distance = haversine_distance(location, last_similar_report.location)
+        seconds_passed = (
+            log_datetime - last_similar_report.datetime
+        ).total_seconds()
+        if speed_kmh < 100 and distance / seconds_passed * 3.6 > 300:
+            return True
+
+        return False
 
-        return RESTResponse({'status': 'success'})
 
 
 class InvitationsViewSet(InstanceMixin, viewsets.ModelViewSet):

simo/users/dynamic_settings.py

@@ -12,7 +12,7 @@ users = Section('users')
 class AtHomeRadius(IntegerPreference):
     section = users
     name = 'at_home_radius'
-    default = 250
+    default = 50
     required = True
     help_text = 'Distance in meters around hub location point that is ' \
                 'considered as At Home.'

{simo-2.8.15.dist-info → simo-2.10.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simo
-Version: 2.8.15
+Version: 2.10.1
 Summary: Smart Home Supremacy
 Author-email: Simanas Venčkauskas <simanas@simo.io>
 Project-URL: Homepage, https://simo.io