simo 2.5.3__py3-none-any.whl → 2.5.5__py3-none-any.whl

simo/generic/forms.py

@@ -620,55 +620,6 @@ class GateConfigForm(BaseComponentForm):
     )
 
 
-class BlindsConfigForm(BaseComponentForm):
-    open_switch = forms.ModelChoiceField(
-        Component.objects.filter(base_type=Switch.base_type),
-        widget=autocomplete.ModelSelect2(
-            url='autocomplete-component', attrs={'data-html': True},
-            forward=(
-                forward.Const([Switch.base_type], 'base_type'),
-            )
-        )
-    )
-    close_switch = forms.ModelChoiceField(
-        Component.objects.filter(base_type=Switch.base_type),
-        widget=autocomplete.ModelSelect2(
-            url='autocomplete-component', attrs={'data-html': True},
-            forward=(
-                forward.Const([Switch.base_type], 'base_type'),
-            )
-        )
-    )
-    open_direction = forms.ChoiceField(
-        label='Closed > Open direction',
-        required=True, choices=(
-            ('up', "Up"), ('down', "Down"),
-            ('right', "Right"), ('left', "Left")
-        ),
-        help_text="Move direction from fully closed to fully open."
-
-    )
-    open_duration = forms.FloatField(
-        label='Open duration', min_value=0.001, max_value=360000,
-        initial=30,
-        help_text="Time in seconds it takes for your blinds to go "
-                  "from fully closed to fully open."
-    )
-    slats_angle_duration = forms.FloatField(
-        label='Slats angle duration', min_value=0.01, max_value=360000,
-        required=False,
-        help_text="Takes effect only with App control mode - 'Slide', "
-                  "can be used with slat blinds to control slats angle. <br>"
-                  "Time in seconds it takes "
-                  "to go from fully closed to the start of open movement. <br>"
-                  "Usually it's in between of 1 - 3 seconds."
-    )
-    control_mode = forms.ChoiceField(
-        label="App control mode", required=True, choices=(
-            ('click', "Click"), ('hold', "Hold"), ('slide', "Slide")
-        ),
-    )
-
 
 class ContourForm(forms.Form):
     uid = forms.CharField(widget=forms.HiddenInput(), required=False)

simo/generic/gateways.py

@@ -20,62 +20,6 @@ from simo.core.events import GatewayObjectCommand, get_event_obj
 from simo.core.loggers import get_gw_logger, get_component_logger
 
 
-
-class BlindsRunner(threading.Thread):
-
-    def __init__(self, blinds, *args, **kwargs):
-        self.blinds = blinds
-        self.target = self.blinds.value['target']
-        self.position = self.blinds.value['position']
-        self.open_duration = self.blinds.config.get('open_duration', 0) * 1000
-        assert self.target >= -1
-        assert self.target <= self.open_duration
-        self.exit = multiprocessing.Event()
-        super().__init__(*args, **kwargs)
-
-    def run(self):
-        try:
-            self.open_switch = Component.objects.get(
-                pk=self.blinds.config.get('open_switch')
-            )
-            self.close_switch = Component.objects.get(
-                pk=self.blinds.config.get('close_switch')
-            )
-        except:
-            self.done = True
-            return
-        self.start_position = self.blinds.value['position']
-        self.position = self.blinds.value['position']
-        self.start_time = time.time()
-        self.last_save = time.time()
-        while not self.exit.is_set():
-            change = (time.time() - self.start_time) * 1000
-            if self.target > self.start_position:
-                self.position = self.start_position + change
-                if self.position >= self.target:
-                    self.blinds.set(
-                        {'position': self.target, 'target': -1}
-                    )
-                    self.open_switch.turn_off()
-                    self.close_switch.turn_off()
-                    return
-            else:
-                self.position = self.start_position - change
-                if self.position < self.target:
-                    self.blinds.set({'position': self.target, 'target': -1})
-                    self.open_switch.turn_off()
-                    self.close_switch.turn_off()
-                    return
-
-            if self.last_save < time.time() - 1:
-                self.blinds.set({'position': self.position})
-                self.last_save = time.time()
-            time.sleep(0.01)
-
-    def terminate(self):
-        self.exit.set()
-
-
 class CameraWatcher(threading.Thread):
 
     def __init__(self, component_id, exit, *args, **kwargs):
@@ -130,7 +74,10 @@ class ScriptRunHandler(multiprocessing.Process):
     def run(self):
         db_connection.connect()
         self.component = Component.objects.get(id=self.component_id)
-        tz = pytz.timezone(self.component.zone.instance.timezone)
+        try:
+            tz = pytz.timezone(self.component.zone.instance.timezone)
+        except:
+            tz = pytz.timezone('UTC')
         timezone.activate(tz)
         introduce_instance(self.component.zone.instance)
         self.logger = get_component_logger(self.component)
@@ -174,7 +121,6 @@ class GenericGatewayHandler(BaseObjectCommandsGatewayHandler):
     config_form = BaseGatewayForm
 
     running_scripts = {}
-    blinds_runners = {}
     periodic_tasks = (
         ('watch_thermostats', 60),
         ('watch_alarm_clocks', 30),
@@ -207,6 +153,9 @@ class GenericGatewayHandler(BaseObjectCommandsGatewayHandler):
         dead_processes = []
         for id, process in self.running_scripts.items():
             if process.is_alive():
+                if not Component.objects.filter(id=id).count():
+                    # script is deleted, or instance deactivated
+                    process.terminate()
                 continue
             component = Component.objects.filter(id=id).exclude(
                 value__in=('error', 'finished')
@@ -270,7 +219,7 @@ class GenericGatewayHandler(BaseObjectCommandsGatewayHandler):
             component.save()
 
         # Start scripts that are designed to be autostarted
-        # as well as those who are designed to be kept alive, but
+        # as well as those that are designed to be kept alive, but
         # got terminated unexpectedly
         for script in Component.objects.filter(
             base_type='script',
@@ -291,9 +240,6 @@ class GenericGatewayHandler(BaseObjectCommandsGatewayHandler):
             mqtt_client.loop()
         mqtt_client.disconnect()
 
-        for id, runner in self.blinds_runners.items():
-            runner.terminate()
-
         script_ids = [id for id in self.running_scripts.keys()]
         for id in script_ids:
             self.stop_script(
@@ -310,7 +256,7 @@ class GenericGatewayHandler(BaseObjectCommandsGatewayHandler):
     def on_mqtt_message(self, client, userdata, msg):
         print("Mqtt message: ", msg.payload)
         from simo.generic.controllers import (
-            Script, Blinds, AlarmGroup, Gate
+            Script, AlarmGroup
         )
         payload = json.loads(msg.payload)
         component = get_event_obj(payload, Component)
@@ -323,12 +269,8 @@ class GenericGatewayHandler(BaseObjectCommandsGatewayHandler):
                 elif payload.get('set_val') == 'stop':
                     self.stop_script(component)
                 return
-            elif component.controller_uid == Blinds.uid:
-                self.control_blinds(component, payload.get('set_val'))
             elif component.controller_uid == AlarmGroup.uid:
                 self.control_alarm_group(component, payload.get('set_val'))
-            elif component.controller_uid == Gate:
-                self.control_gate(component, payload.get('set_val'))
             else:
                 component.controller.set(payload.get('set_val'))
         except Exception:
@@ -385,43 +327,6 @@ class GenericGatewayHandler(BaseObjectCommandsGatewayHandler):
 
             threading.Thread(target=kill, daemon=True).start()
 
-    def control_blinds(self, blinds, target):
-        try:
-            open_switch = Component.objects.get(
-                pk=blinds.config['open_switch']
-            )
-            close_switch = Component.objects.get(
-                pk=blinds.config['close_switch']
-            )
-        except:
-            return
-
-        blinds.set({'target': target})
-
-        blinds_runner = self.blinds_runners.get(blinds.id)
-        if blinds_runner:
-            blinds_runner.terminate()
-
-        if target == -1:
-            open_switch.turn_off()
-            close_switch.turn_off()
-
-        elif target != blinds.value['position']:
-            try:
-                self.blinds_runners[blinds.id] = BlindsRunner(blinds)
-                self.blinds_runners[blinds.id].daemon = True
-            except:
-                pass
-            else:
-                if target > blinds.value['position']:
-                    close_switch.turn_off()
-                    open_switch.turn_on()
-                else:
-                    open_switch.turn_off()
-                    close_switch.turn_on()
-
-                self.blinds_runners[blinds.id].start()
-
     def control_alarm_group(self, alarm_group, value):
         from simo.generic.controllers import AlarmGroup
 
@@ -464,21 +369,6 @@ class GenericGatewayHandler(BaseObjectCommandsGatewayHandler):
             other_group.refresh_status()
 
 
-    def control_gate(self, gate, value):
-        switch = Component.objects.filter(
-            pk=gate.config.get('action_switch')
-        ).first()
-        if not switch:
-            return
-
-        if gate.config.get('action_method') == 'click':
-            switch.click()
-        else:
-            if value == 'open':
-                switch.turn_on()
-            else:
-                switch.turn_off()
-
     def watch_alarm_events(self):
         from .controllers import AlarmGroup
         for alarm in Component.objects.filter(

simo/generic/models.py

@@ -8,6 +8,7 @@ from simo.core.models import Instance, Component
 from simo.users.models import InstanceUser
 
 
+
 @receiver(post_save, sender=Component)
 def handle_alarm_groups(sender, instance, *args, **kwargs):
     if not instance.alarm_category:

simo/generic/scripting/example.py

@@ -0,0 +1,66 @@
+import time
+import random
+from django.utils import timezone
+from simo.core.middleware import get_current_instance
+from simo.core.models import Component
+from simo.users.models import InstanceUser
+from simo.generic.scripting.helpers import LocalSun
+
+
+class Automation:
+    REZIMAS_COMPONENT_ID = 130
+
+    def __init__(self):
+        self.instance = get_current_instance()
+        self.rezimas = Component.objects.get(id=self.REZIMAS_COMPONENT_ID)
+        self.sun = LocalSun(self.instance.location)
+        self.night_is_on = False
+
+    def check_owner_phones(self, rezimas, instance_users, datetime):
+        if not self.night_is_on:
+            if not (datetime.hour >= 22 or datetime.hour < 6):
+                return
+
+            for iuser in instance_users:
+                # skipping users that are not at home
+                if not iuser.at_home:
+                    continue
+                if not iuser.phone_on_charge:
+                    # at least one user's phone is not yet on charge
+                    return
+            self.night_is_on = True
+            return 'night'
+        else:
+            # return new_rezimas diena only if there are still users
+            # at home, none of them have their phones on charge
+            # and current rezimas is still night
+            for iuser in instance_users:
+                # skipping users that are not at home
+                if not iuser.at_home:
+                    continue
+                if iuser.phone_on_charge:
+                    # at least one user's phone is still on charge
+                    return
+                else:
+                    self.night_is_on = False
+            if not self.night_is_on and rezimas.value == 'night':
+                return 'day'
+
+    def run(self):
+        while True:
+            instance_users = InstanceUser.objects.filter(
+                is_active=True, role__is_owner=True
+            )
+            self.rezimas.refresh_from_db()
+            new_rezimas = self.check_owner_phones(
+                self.rezimas, instance_users, timezone.localtime()
+            )
+            if new_rezimas:
+                self.rezimas.send(new_rezimas)
+
+            # randomize script load
+            time.sleep(random.randint(20, 40))
+
+
+    def test(self):
+        pass

simo/generic/scripting/helpers.py

@@ -1,3 +1,5 @@
+import pytz
+import math
 from django.utils import timezone
 from suntime import Sun
 from simo.core.models import Instance
@@ -5,10 +7,12 @@ from simo.core.models import Instance
 
 class LocalSun(Sun):
 
-    def __init__(self, instance=None):
-        if not instance:
+    def __init__(self, location=None):
+        if not location:
             instance = Instance.objects.all().first()
-        coordinates = instance.location.split(',')
+            coordinates = instance.location.split(',')
+        else:
+            coordinates = location.split(',')
         try:
             lat = float(coordinates[0])
         except:
@@ -19,17 +23,69 @@ class LocalSun(Sun):
             lon = 0
         super().__init__(lat, lon)
 
-    def is_night(self):
-        if timezone.now() > self.get_sunset_time():
+    def get_sunrise_time(self, localdatetime=None):
+        sunrise = super().get_sunrise_time(date=localdatetime)
+        if not localdatetime or not localdatetime.tzinfo:
+            return sunrise
+        return sunrise.astimezone(localdatetime.tzinfo)
+
+    def get_sunset_time(self, localdatetime=None):
+        sunset = super().get_sunset_time(date=localdatetime)
+        if not localdatetime or not localdatetime.tzinfo:
+            return sunset
+        return sunset.astimezone(localdatetime.tzinfo)
+
+    def _get_utc_datetime(self, localdatetime=None):
+        if not localdatetime:
+            utc_datetime = timezone.now()
+        else:
+            utc_datetime = localdatetime.astimezone(pytz.utc)
+        return utc_datetime
+
+    def is_night(self, localdatetime=None):
+        utc_datetime = self._get_utc_datetime(localdatetime)
+        if utc_datetime > self.get_sunset_time(utc_datetime):
             return True
-        if timezone.now() < self.get_sunrise_time():
+        if utc_datetime < self.get_sunrise_time(utc_datetime):
             return True
         return False
 
-    def seconds_to_sunset(self):
-        return (self.get_sunset_time() - timezone.now()).total_seconds()
+    def seconds_to_sunset(self, localdatetime=None):
+        utc_datetime = self._get_utc_datetime(localdatetime)
+        return (self.get_sunset_time(utc_datetime) - utc_datetime).total_seconds()
+
+    def seconds_to_sunrise(self, localdatetime=None):
+        utc_datetime = self._get_utc_datetime(localdatetime)
+        return (self.get_sunrise_time(utc_datetime) - utc_datetime).total_seconds()
+
+
+def haversine_distance(location1, location2, units_of_measure='metric'):
+    # Radius of Earth in meters
+    R = 6371000
+
+    # Unpack coordinates
+    lat1, lon1 = location1.split(',')
+    lat2, lon2 = location2.split(',')
+    lat1, lon1, lat2, lon2 = float(lat1), float(lon1), float(lat2), float(lon2)
+
+    # Convert latitude and longitude from degrees to radians
+    phi1 = math.radians(lat1)
+    phi2 = math.radians(lat2)
+    delta_phi = math.radians(lat2 - lat1)
+    delta_lambda = math.radians(lon2 - lon1)
+
+    # Haversine formula
+    a = math.sin(delta_phi / 2) ** 2 + math.cos(phi1) * math.cos(
+        phi2) * math.sin(delta_lambda / 2) ** 2
+    c = 2 * math.atan2(math.sqrt(a), math.sqrt(1 - a))
 
-    def seconds_to_sunrise(self):
-        return (self.get_sunrise_time() - timezone.now()).total_seconds()
+    # Distance in meters
+    distance_meters = R * c
 
+    # Convert to feet if 'imperial' is chosen
+    if units_of_measure == 'imperial':
+        distance = distance_meters * 3.28084  # Convert meters to feet
+    else:
+        distance = distance_meters  # Keep in meters for 'metric'
 
+    return distance

simo/notifications/admin.py

@@ -1,4 +1,5 @@
 from django.contrib import admin
+from simo.core.middleware import get_current_instance
 from .models import Notification, UserNotification
 
 
@@ -15,9 +16,12 @@ class NotificationAdmin(admin.ModelAdmin):
     actions = 'dispatch',
 
     def get_queryset(self, request):
-        return super().get_queryset(request).filter(
-            instance__in=request.user.instances
-        ).prefetch_related('to_users')
+        qs = super().get_queryset(request)
+        instance = get_current_instance()
+        if instance:
+            qs = qs.filter(instance=instance)
+        return qs.prefetch_related('to_users')
+
 
     def to(self, obj):
         return ', '.join([str(u) for u in obj.to_users.all()])

simo/users/admin.py

@@ -50,6 +50,20 @@ class PermissionsRoleAdmin(admin.ModelAdmin):
         return fields
 
 
+@admin.register(InstanceUser)
+class InstanceUserAdmin(admin.ModelAdmin):
+    list_display = (
+        'user', 'role', 'is_active', 'at_home', 'last_seen', 'phone_on_charge'
+    )
+    fields = (
+        'user', 'role', 'is_active', 'at_home', 'last_seen',
+        'last_seen_location', 'last_seen_speed_kmh', 'phone_on_charge'
+    )
+    readonly_fields = (
+        'at_home', 'last_seen', 'last_seen_speed_kmh', 'phone_on_charge',
+    )
+
+
 class InstanceUserInline(admin.TabularInline):
     model = InstanceUser
     extra = 0
@@ -69,7 +83,6 @@ class UserAdmin(OrgUserAdmin):
     fields = (
         'name', 'email', 'is_active', 'is_master',
         'ssh_key', 'secret_key',
-        'last_seen_location',
     )
     readonly_fields = (
         'name', 'email', 'avatar', 'last_action', 'is_active'
@@ -114,11 +127,18 @@ admin.site.unregister(Group)
 
 
 @admin.register(UserDeviceReportLog)
-class UserDeviceLogInline(admin.ModelAdmin):
+class UserDeviceLog(admin.ModelAdmin):
     model = UserDeviceReportLog
-    readonly_fields = 'datetime', 'app_open', 'location', 'relay', 'users'
-    list_display = 'datetime', 'app_open', 'location', 'relay', 'users'
+    readonly_fields = (
+        'datetime', 'app_open', 'location', 'relay', 'users',
+        'speed_kmh', 'phone_on_charge'
+    )
+    list_display = (
+        'datetime', 'app_open', 'location', 'relay', 'speed_kmh',
+        'phone_on_charge', 'users'
+    )
     fields = readonly_fields
+    list_filter = 'user_device__users',
 
     def has_add_permission(self, request, obj=None):
         return False
@@ -142,7 +162,7 @@ class UserDeviceAdmin(admin.ModelAdmin):
     readonly_fields = (
         'users_display', 'token', 'os', 'last_seen',
     )
-    fields = readonly_fields + ('last_seen_location', 'is_primary')
+    fields = readonly_fields + ('is_primary', )
 
     def get_queryset(self, request):
         qs = super().get_queryset(request)

simo/users/api.py

@@ -1,4 +1,5 @@
 import sys
+import datetime
 from django.db.models import Q
 from rest_framework import viewsets, mixins, status
 from rest_framework.serializers import Serializer
@@ -8,6 +9,7 @@ from rest_framework.exceptions import ValidationError, PermissionDenied
 from django.contrib.gis.geos import Point
 from django.utils import timezone
 from django_filters.rest_framework import DjangoFilterBackend
+from simo.conf import dynamic_settings
 from simo.core.api import InstanceMixin
 from .models import (
     User, UserDevice, UserDeviceReportLog, PermissionsRole, InstanceInvitation,
@@ -172,7 +174,7 @@ class UserDeviceReport(InstanceMixin, viewsets.GenericViewSet):
 
     @action(url_path='device-report', detail=False, methods=['post'])
     def report(self, request, *args, **kwargs):
-
+        from simo.generic.scripting.helpers import haversine_distance
         if not request.data.get('device_token'):
             return RESTResponse(
                 {'status': 'error', 'msg': 'device_token - not provided'},
@@ -199,6 +201,11 @@ class UserDeviceReport(InstanceMixin, viewsets.GenericViewSet):
         except:
             location = None
 
+        relay = None
+        if request.META.get('HTTP_HOST', '').endswith('.simo.io'):
+            relay = request.META.get('HTTP_HOST')
+
+
         user_device.last_seen = timezone.now()
         if location:
             user_device.last_seen_location = ','.join(
@@ -213,23 +220,39 @@ class UserDeviceReport(InstanceMixin, viewsets.GenericViewSet):
         user_device.save()
 
         for iu in request.user.instance_roles.filter(is_active=True):
+            if location:
+                iu.at_home = haversine_distance(
+                    iu.instance.location, user_device.last_seen_location
+                ) < dynamic_settings['users__at_home_radius']
+            elif not relay:
+                iu.at_home = True
+            speed_kmh = 0
+            if user_device.last_seen_location and iu.last_seen_location \
+            and iu.last_seen > timezone.now() - datetime.timedelta(seconds=30):
+                if user_device.last_seen_location == iu.last_seen_location:
+                    speed_kmh = iu.last_seen_speed_kmh
+                else:
+                    seconds_passed = (timezone.now() - user_device.last_seen).seconds
+                    if not seconds_passed:
+                        speed_kmh = 0
+                    else:
+                        moved_distance = haversine_distance(
+                            iu.last_seen_location, user_device.last_seen_location
+                        )
+                        speed_mps = moved_distance / seconds_passed
+                        speed_kmh = speed_mps * 3.6
+            iu.last_seen = user_device.last_seen
             iu.last_seen_location = user_device.last_seen_location
-            iu.last_seen_location_datetime = user_device.last_seen
+            iu.last_seen_speed_kmh = speed_kmh
+            iu.phone_on_charge = request.data.get('is_charging', False)
             iu.save()
 
-        request.user.last_seen_location = user_device.last_seen_location
-        request.user.last_seen_location_datetime = user_device.last_seen
-        request.user.save()
-
-        relay = None
-        if request.META.get('HTTP_HOST', '').endswith('.simo.io'):
-            relay = request.META.get('HTTP_HOST')
-
         UserDeviceReportLog.objects.create(
             user_device=user_device, instance=self.instance,
             app_open=request.data.get('app_open', False),
             location=','.join([str(i) for i in location]) if location else None,
-            relay=relay
+            relay=relay, speed_kmh=speed_kmh,
+            phone_on_charge=request.data.get('is_charging', False)
         )
 
         return RESTResponse({'status': 'success'})

simo/users/migrations/0035_instanceuser_last_seen_speed_kmh_and_more.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.2.10 on 2024-10-29 07:38
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0034_instanceuser_last_seen_location_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='instanceuser',
+            name='last_seen_speed_kmh',
+            field=models.FloatField(default=0),
+        ),
+        migrations.AddField(
+            model_name='user',
+            name='last_seen_speed_kmh',
+            field=models.FloatField(default=0),
+        ),
+    ]

simo/users/migrations/0036_instanceuser_phone_on_charge_user_phone_on_charge.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.2.10 on 2024-10-29 12:58
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0035_instanceuser_last_seen_speed_kmh_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='instanceuser',
+            name='phone_on_charge',
+            field=models.BooleanField(db_index=True, default=False),
+        ),
+        migrations.AddField(
+            model_name='user',
+            name='phone_on_charge',
+            field=models.BooleanField(db_index=True, default=False),
+        ),
+    ]