simo 2.6.8__py3-none-any.whl → 2.7.1__py3-none-any.whl

simo/generic/forms.py

@@ -425,21 +425,89 @@ class StateSelectForm(BaseComponentForm):
     states = FormsetField(
         formset_factory(StateForm, can_delete=True, can_order=True, extra=0)
     )
-    is_main = forms.BooleanField(
-        initial=False, required=False,
-        help_text="Will be displayed in the app "
-                  "right top corner for quick access."
+
+
+class MainStateSelectForm(BaseComponentForm):
+    weekdays_morning_hour = forms.IntegerField(
+        initial=6, min_value=3, max_value=12
+    )
+    weekends_morning_hour = forms.IntegerField(
+        initial=6, min_value=3, max_value=12
+    )
+    away_on_no_action = forms.IntegerField(
+        required=False, initial=40, min_value=1, max_value=360,
+        help_text="Set state to Away if nobody is at home "
+                  "(requires location and fitness permissions on mobile app) "
+                  "and there were "
+                  "no action for more than given amount of minutes from any "
+                  "security alarm acategory sensors (motion sensors, door sensors etc..).<br>"
+                  "No value disables this behavior."
+    )
+    sleeping_phones_hour = forms.IntegerField(
+        initial=True, required=False, min_value=18, max_value=24,
+        help_text='Set mode to "Sleep" if it is later than given hour '
+                  'and all home owners phones who are at home are put on charge '
+                  '(requires location and fitness permissions on mobile app). <br>'
+                  'Set back to regular state as soon as none of the home owners phones '
+                  'are on charge and it is morning hour or past it.'
     )
+    states = FormsetField(
+        formset_factory(StateForm, can_delete=True, can_order=True, extra=0)
+    )
+
+    def clean(self):
+        if not self.instance.id:
+            if Component.objects.filter(
+                controller_uid='simo.generic.controllers.MainState'
+            ).count():
+                raise forms.ValidationError("Main state already exists!")
+
+        formset_errors = {}
+        required_states = {
+            'morning', 'day', 'evening', 'night', 'sleep', 'away', 'vacation'
+        }
+        found_states = set()
+        for i, state in enumerate(self.cleaned_data.get('states', [])):
+            if state.get('slug') in found_states:
+                formset_errors['i'] = {'slug': "Duplicate!"}
+                continue
+            found_states.add(state.get('slug'))
+
+        errors_list = []
+        if formset_errors:
+            for i, control in enumerate(self.cleaned_data['states']):
+                errors_list.append(formset_errors.get(i, {}))
+        if errors_list:
+            self._errors['states'] = errors_list
+            if 'states' in self.cleaned_data:
+                del self.cleaned_data['states']
+
+        else:
+            missing_states = required_states - found_states
+            if missing_states:
+                if len(missing_states) == 1:
+                    self.add_error(
+                        'states',
+                        f'"{list(missing_states)[0]}" state is missing!'
+                    )
+                self.add_error(
+                    'states',
+                    f"Required states are missing: {list(missing_states)}!"
+                )
+
+        return self.cleaned_data
 
     def save(self, commit=True):
-        if commit and self.cleaned_data['is_main']:
-            from .controllers import StateSelect
-            for c in Component.objects.filter(controller_uid=StateSelect.uid):
-                c.config['is_main'] = False
-                c.save()
+        if commit:
+            for s in Component.objects.filter(
+                base_type='state-select', config__is_main=True
+            ).exclude(id=self.instance.id):
+                s.config['is_main'] = False
+                s.save()
         return super().save(commit)
 
 
+
 class AlarmClockEventForm(forms.Form):
     uid = HiddenField(required=False)
     enabled = forms.BooleanField(initial=True)

simo/generic/gateways.py

@@ -72,10 +72,17 @@ class GenericGatewayHandler(BaseObjectCommandsGatewayHandler):
         ('watch_alarm_clocks', 30),
         ('watch_watering', 60),
         ('watch_alarm_events', 1),
-        ('watch_timers', 1)
+        ('watch_timers', 1),
+        ('watch_main_states', 60)
     )
 
-    terminating_scripts = set()
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.last_sensor_actions = {}
+        self.sensors_on_watch = {}
+        self.sleep_is_on = {}
+
+
 
     def watch_thermostats(self):
         from .controllers import Thermostat
@@ -242,6 +249,78 @@ class GenericGatewayHandler(BaseObjectCommandsGatewayHandler):
                 print(traceback.format_exc(), file=sys.stderr)
 
 
+    def watch_main_state(self, state):
+        i_id = state.zone.instance.id
+        if state.value in ('day', 'night', 'evening', 'morning'):
+            new_state = state.get_day_evening_night_morning()
+            if new_state != state.value:
+                print(f"New main state of {state.zone.instance} - {new_state}")
+                state.send(new_state)
+
+        if state.config.get('away_on_no_action'):
+            for sensor in Component.objects.filter(
+                    zone__instance=state.zone.instance,
+                    base_type='binary-sensor', alarm_category='security'
+            ):
+                if state.id not in self.sensors_on_watch:
+                    self.sensors_on_watch[state.id] = {}
+
+                if sensor.id not in self.sensors_on_watch[state.id]:
+                    self.sensors_on_watch[state.id][sensor.id] = i_id
+                    self.last_sensor_actions[i_id] = time.time()
+                    sensor.on_change(self.security_sensor_change)
+
+            last_action = self.last_sensor_actions.get(i_id, time.time())
+            if state.check_is_away(last_action):
+                if state.value != 'away':
+                    print(f"New main state of "
+                          f"{state.zone.instance} - away")
+                    state.send('away')
+            else:
+                if state.value == 'away':
+                    try:
+                        new_state = state.get_day_evening_night_morning()
+                    except:
+                        new_state = 'day'
+                    print(f"New main state of "
+                          f"{state.zone.instance} - {new_state}")
+                    state.send(new_state)
+
+        if state.config.get('sleeping_phones_hour') is not None:
+            sleep_time = state.owner_phones_on_sleep()
+            if sleep_time and state.value != 'sleep':
+                print(f"New main state of {state.zone.instance} - sleep")
+                state.send('sleep')
+            elif state.value == 'sleep':
+                try:
+                    new_state = state.get_day_evening_night_morning()
+                except:
+                    new_state = 'day'
+                print(f"New main state of "
+                      f"{state.zone.instance} - {new_state}")
+                state.send(new_state)
+
+
+    def watch_main_states(self):
+        drop_current_instance()
+        from .controllers import MainState
+        for state in Component.objects.filter(
+            controller_uid=MainState.uid
+        ).select_related('zone', 'zone__instance'):
+            try:
+                self.watch_main_state(state)
+            except Exception as e:
+                print(traceback.format_exc(), file=sys.stderr)
+
+
+
+    def security_sensor_change(self, sensor):
+        self.last_sensor_actions[
+            self.sensors_on_watch[sensor.id]
+        ] = time.time()
+
+
+
 class DummyGatewayHandler(BaseObjectCommandsGatewayHandler):
     name = "Dummy"
     config_form = BaseGatewayForm

simo/users/admin.py

@@ -32,6 +32,15 @@ class PermissionsRoleAdmin(admin.ModelAdmin):
     inlines = ComponentPermissionInline,
     list_filter = 'is_superuser', 'is_owner', 'can_manage_users', 'is_default'
 
+
+    def get_queryset(self, request):
+        qs = super().get_queryset(request)
+        instance = get_current_instance()
+        if instance:
+            return qs.filter(instance=instance)
+        return qs
+
+
     def save_model(self, request, obj, form, change):
         if not obj.id:
             obj.instance = request.instance

simo/users/api.py

@@ -11,6 +11,7 @@ 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 simo.core.middleware import drop_current_instance
 from .models import (
     User, UserDevice, UserDeviceReportLog, PermissionsRole, InstanceInvitation,
     Fingerprint, ComponentPermission, InstanceUser
@@ -247,6 +248,7 @@ class UserDeviceReport(InstanceMixin, viewsets.GenericViewSet):
                 self.instance.location, location
             ) < dynamic_settings['users__at_home_radius']
 
+        drop_current_instance()
         for iu in request.user.instance_roles.filter(is_active=True):
             if not relay:
                 iu.at_home = True

simo/users/auto_urls.py

@@ -1,10 +1,13 @@
-from django.urls import include, re_path
-from django.views.generic import TemplateView
-from .views import accept_invitation
+from django.urls import re_path, path
+from .views import accept_invitation, RolesAutocomplete
 
 urlpatterns = [
     re_path(
         r"^accept-invitation/(?P<token>[a-zA-Z0-9]+)/$",
         accept_invitation, name='accept_invitation'
     ),
+    path(
+        'autocomplete-roles',
+        RolesAutocomplete.as_view(), name='autocomplete-user-roles'
+    ),
 ]

simo/users/migrations/0039_auto_20241117_1039.py

@@ -4,30 +4,31 @@ from django.db import migrations
 
 
 def forwards_func(apps, schema_editor):
-    from simo.generic.scripting.helpers import haversine_distance
-    UserDeviceReportLog = apps.get_model("users", "UserDeviceReportLog")
-
-    logs = UserDeviceReportLog.objects.filter(
-        instance__isnull=False
-    ).select_related('instance')
-
-    print("Calculate at_home on UserDeviceReportLog's!")
-
-    bulk_update = []
-    for log in tqdm(logs, total=logs.count()):
-        log.at_home = False
-        if not log.relay:
-            log.at_home = True
-        elif log.location:
-            log.at_home = haversine_distance(
-                log.instance.location, log.location
-            ) < 250
-        if log.at_home:
-            bulk_update.append(log)
-        if len(bulk_update) > 1000:
-            UserDeviceReportLog.objects.bulk_update(bulk_update, ["at_home"])
-            bulk_update = []
-    UserDeviceReportLog.objects.bulk_update(bulk_update, ["at_home"])
+    pass
+    # from simo.automation.helpers import haversine_distance
+    # UserDeviceReportLog = apps.get_model("users", "UserDeviceReportLog")
+    #
+    # logs = UserDeviceReportLog.objects.filter(
+    #     instance__isnull=False
+    # ).select_related('instance')
+    #
+    # print("Calculate at_home on UserDeviceReportLog's!")
+    #
+    # bulk_update = []
+    # for log in tqdm(logs, total=logs.count()):
+    #     log.at_home = False
+    #     if not log.relay:
+    #         log.at_home = True
+    #     elif log.location:
+    #         log.at_home = haversine_distance(
+    #             log.instance.location, log.location
+    #         ) < 250
+    #     if log.at_home:
+    #         bulk_update.append(log)
+    #     if len(bulk_update) > 1000:
+    #         UserDeviceReportLog.objects.bulk_update(bulk_update, ["at_home"])
+    #         bulk_update = []
+    # UserDeviceReportLog.objects.bulk_update(bulk_update, ["at_home"])
 
 
 def reverse_func(apps, schema_editor):

simo/users/views.py

@@ -1,5 +1,6 @@
 import re
 from django.contrib.auth.decorators import login_required
+from dal import autocomplete
 from django.contrib.auth import logout
 from django.urls import re_path
 from django.shortcuts import get_object_or_404, render
@@ -11,8 +12,10 @@ from django.template.loader import render_to_string
 from django.http import (
     JsonResponse, HttpResponseRedirect, HttpResponse, Http404
 )
+from simo.core.middleware import get_current_instance
+from simo.core.utils.helpers import search_queryset
 from simo.conf import dynamic_settings
-from .models import InstanceInvitation
+from .models import InstanceInvitation, PermissionsRole, InstanceUser
 
 
 @atomic
@@ -104,3 +107,19 @@ def protected_static(prefix, **kwargs):
         r'^%s(?P<path>.*)$' % re.escape(prefix.lstrip('/')),
         serve_protected, kwargs={'prefix': prefix}
     )
+
+
+class RolesAutocomplete(autocomplete.Select2QuerySetView):
+
+    def get_queryset(self):
+        if not self.request.user.is_authenticated:
+            raise Http404()
+
+        qs = PermissionsRole.objects.filter(instance=get_current_instance(self.request))
+
+        if self.request.GET.get('value'):
+            qs = qs.filter(pk__in=self.request.GET['value'].split(','))
+        elif self.q:
+            qs = search_queryset(qs, self.q, ('name',))
+
+        return qs.distinct()

{simo-2.6.8.dist-info → simo-2.7.1.dist-info}/METADATA

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