simo 2.5.2__py3-none-any.whl → 2.5.4__py3-none-any.whl

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/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

@@ -8,6 +8,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 +173,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,12 +200,23 @@ 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(
                 [str(i) for i in location]
             ) if location else None
 
+        speed_mps = float(request.data.get('speed', 0))
+        if speed_mps < 0:
+            speed_mps = 0
+        speed_kmh = speed_mps * 3.6
+
+
         if request.data.get('app_open', False):
             user_device.is_primary = True
             UserDevice.objects.filter(
@@ -213,23 +225,25 @@ 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
+
+            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),
+        ),
+    ]

simo/users/migrations/0037_rename_last_seen_location_datetime_instanceuser_last_seen_and_more.py

@@ -0,0 +1,53 @@
+# Generated by Django 4.2.10 on 2024-10-29 13:23
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0036_instanceuser_phone_on_charge_user_phone_on_charge'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='instanceuser',
+            old_name='last_seen_location_datetime',
+            new_name='last_seen',
+        ),
+        migrations.RemoveField(
+            model_name='user',
+            name='last_seen_location',
+        ),
+        migrations.RemoveField(
+            model_name='user',
+            name='last_seen_location_datetime',
+        ),
+        migrations.RemoveField(
+            model_name='user',
+            name='last_seen_speed_kmh',
+        ),
+        migrations.RemoveField(
+            model_name='user',
+            name='phone_on_charge',
+        ),
+        migrations.RemoveField(
+            model_name='userdevice',
+            name='last_seen_location',
+        ),
+        migrations.AddField(
+            model_name='userdevicereportlog',
+            name='phone_on_charge',
+            field=models.BooleanField(db_index=True, default=False),
+        ),
+        migrations.AddField(
+            model_name='userdevicereportlog',
+            name='speed_kmh',
+            field=models.FloatField(default=0),
+        ),
+        migrations.AlterField(
+            model_name='userdevice',
+            name='last_seen',
+            field=models.DateTimeField(auto_now=True, db_index=True),
+        ),
+    ]

simo/users/models.py

@@ -97,17 +97,22 @@ class InstanceUser(DirtyFieldsMixin, models.Model, OnChangeMixin):
         related_name='instance_users',
     )
     role = models.ForeignKey(PermissionsRole, on_delete=models.CASCADE)
-    at_home = models.BooleanField(default=False, db_index=True)
     is_active = models.BooleanField(default=True, db_index=True)
+
+    at_home = models.BooleanField(default=False, db_index=True)
+    last_seen = models.DateTimeField(
+        null=True, blank=True,
+    )
     last_seen_location = PlainLocationField(
         zoom=7, null=True, blank=True, help_text="Sent by user mobile app"
     )
-    last_seen_location_datetime = models.DateTimeField(
-        null=True, blank=True,
-    )
+    last_seen_speed_kmh = models.FloatField(default=0)
+    phone_on_charge = models.BooleanField(default=False, db_index=True)
 
     objects = ActiveInstanceManager()
 
+    on_change_fields = ('last_seen',)
+
     class Meta:
         unique_together = 'user', 'instance'
 
@@ -175,12 +180,6 @@ class User(AbstractBaseUser, SimoAdminMixin):
         help_text="Will be placed in /root/.ssh/authorized_keys "
                   "if user is active and is master of a hub."
     )
-    last_seen_location = PlainLocationField(
-        zoom=7, null=True, blank=True, help_text="Sent by user mobile app"
-    )
-    last_seen_location_datetime = models.DateTimeField(
-        null=True, blank=True,
-    )
     secret_key = models.CharField(
         max_length=20, db_index=True, default=get_random_string
     )
@@ -422,8 +421,7 @@ class UserDevice(models.Model, SimoAdminMixin):
     os = models.CharField(max_length=100, db_index=True)
     token = models.CharField(max_length=1000, db_index=True, unique=True)
     is_primary = models.BooleanField(default=True, db_index=True)
-    last_seen = models.DateTimeField(auto_now_add=True, db_index=True)
-    last_seen_location = PlainLocationField(zoom=7, null=True, blank=True)
+    last_seen = models.DateTimeField(auto_now=True, db_index=True)
 
     class Meta:
         ordering = '-last_seen',
@@ -445,54 +443,13 @@ class UserDeviceReportLog(models.Model):
         help_text="Sent via remote relay if specified, otherwise it's from LAN."
     )
     location = PlainLocationField(zoom=7, null=True, blank=True)
+    speed_kmh = models.FloatField(default=0)
+    phone_on_charge = models.BooleanField(default=False, db_index=True)
 
     class Meta:
         ordering = '-datetime',
 
 
-@receiver(post_save, sender=UserDeviceReportLog)
-def set_user_at_home(sender, instance, created, **kwargs):
-    from simo.core.models import Instance
-    if not created:
-        return
-
-    if not instance.location and not instance.relay:
-        for item in InstanceUser.objects.filter(
-            user__in=instance.user_device.users.all()
-        ):
-            item.at_home = True
-            item.save()
-        return
-
-    for hub_instance in Instance.objects.filter(is_active=True):
-        try:
-            instance_location = Point(
-                [float(hub_instance.location.split(',')[0]),
-                 float(hub_instance.location.split(',')[1])],
-                srid=4326
-            )
-        except:
-            return
-        try:
-            log_location = Point(
-                [
-                    float(instance.location.split(',')[0]),
-                    float(instance.location.split(',')[1])
-                ], srid=4326
-            )
-        except:
-            return
-        else:
-            for item in InstanceUser.objects.filter(
-                user__in=instance.user_device.users.all(),
-                instance=hub_instance
-            ):
-                item.at_home = distance(
-                    instance_location, log_location
-                ).meters < dynamic_settings['users__at_home_radius']
-                item.save()
-
-
 class ComponentPermission(models.Model):
     role = models.ForeignKey(
         PermissionsRole, on_delete=models.CASCADE,

{simo-2.5.2.dist-info → simo-2.5.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simo
-Version: 2.5.2
+Version: 2.5.4
 Summary: Smart Home on Steroids!
 Author-email: Simanas Venčkauskas <simanas@simo.io>
 Project-URL: Homepage, https://simo.io