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

simo/automation/gateways.py

@@ -165,7 +165,7 @@ class GatesHandler:
                 if iu_id != iuser.id:
                     continue
                 gate = Component.objects.get(id=gate_id)
-                if is_out:
+                if is_out > 4:
                     print(
                         f"{iuser.user.name} is out, "
                         f"let's see if we must open the gates for him"
@@ -174,17 +174,17 @@ class GatesHandler:
                     # he is now coming back and open the gate for him
                     if self._is_in_geofence(gate, iuser.last_seen_location):
                         print("Yes he is back in a geofence! Open THE GATEEE!!")
-                        self.gate_iusers[gate_id][iuser.id] = False
-                        gate.open()
+                        self.gate_iusers[gate_id][iuser.id] = 0
+                        if iuser.last_seen_speed_kmh > 10:
+                            gate.open()
                     else:
                         print("No he is not back yet.")
                 else:
                     print(f"Check if {iuser.user.name} is out.")
-                    self.gate_iusers[gate_id][iuser.id] = self._is_out_of_geofence(
-                        gate, iuser.last_seen_location
-                    )
-                    if self.gate_iusers[gate_id][iuser.id]:
-                        print(f"YES {iuser.user.name} is out!")
+                    if self._is_out_of_geofence(gate, iuser.last_seen_location):
+                        self.gate_iusers[gate_id][iuser.id] += 1
+                    if self.gate_iusers[gate_id][iuser.id] > 4:
+                        print(f"YES {iuser.user.name} is truly out!")
 
     def watch_gates(self):
         drop_current_instance()
@@ -204,9 +204,11 @@ class GatesHandler:
                     self.gate_iusers[gate.id] = {}
                 if iuser.id not in self.gate_iusers[gate.id]:
                     if iuser.last_seen_location:
-                        self.gate_iusers[gate.id][iuser.id] = self._is_out_of_geofence(
+                        self.gate_iusers[gate.id][iuser.id] = 0
+                        if self._is_out_of_geofence(
                             gate, iuser.last_seen_location
-                        )
+                        ):
+                            self.gate_iusers[gate.id][iuser.id] += 1
                     iuser.on_change(self.check_gates)
 
 

simo/core/admin.py

@@ -366,7 +366,7 @@ class ComponentAdmin(EasyObjectsDeleteMixin, admin.ModelAdmin):
                     pop_fields_from_form(ctx['form'])
                     if ctx['form'].is_valid():
                         if ctx['form'].controller.is_discoverable:
-                            ctx['form'].controller.init_discovery(
+                            ctx['form'].controller._init_discovery(
                                 ctx['form'].cleaned_data
                             )
                             ctx['discovery_msg'] = ctx['form'].controller.discovery_msg
@@ -383,6 +383,9 @@ class ComponentAdmin(EasyObjectsDeleteMixin, admin.ModelAdmin):
                                 'components-list',
                                 kwargs={'instance_slug': instance.slug}
                             )
+                            ctx['finish_url'] = reverse(
+                                'finish-discovery',
+                            ) + f"?uid={ctx['form'].controller.uid}"
                             return render(
                                 request, 'admin/wizard/discovery.html', ctx
                             )
@@ -486,7 +489,7 @@ class ComponentAdmin(EasyObjectsDeleteMixin, admin.ModelAdmin):
     def info(self, obj):
         if not obj.controller:
             return
-        info = obj.controller.info()
+        info = obj.controller.info(obj)
         if not info:
             return
         return mark_safe(

simo/core/auto_urls.py

@@ -1,6 +1,7 @@
 from django.urls import path
 from .views import (
-    get_timestamp, upgrade, restart, reboot, set_instance, delete_instance
+    get_timestamp, upgrade, restart, reboot, set_instance, delete_instance,
+    finish_discovery
 )
 from .autocomplete_views import (
     IconModelAutocomplete,
@@ -31,6 +32,8 @@ urlpatterns = [
         ComponentAutocomplete.as_view(), name='autocomplete-component'
     ),
     path('set-instance/<slug:instance_slug>/', set_instance, name='set-instance'),
+    path('finish-discovery/',
+         finish_discovery, name='finish-discovery'),
     path('upgrade/', upgrade, name='upgrade'),
     path('restart/', restart, name='restart'),
     path('reboot/', reboot, name='reboot'),

simo/core/controllers.py

@@ -111,9 +111,7 @@ class ControllerBase(ABC):
     @classmethod
     def is_discoverable(cls):
         return hasattr(
-            cls, 'init_discovery'
-        ) and hasattr(
-            cls, '_process_discovery'
+            cls, '_init_discovery'
         )
 
     @classmethod
@@ -633,6 +631,15 @@ class Dimmer(ControllerBase, TimerMixin, OnOffPokerMixin):
             else:
                 self.send(self.component.config.get('max', 90))
 
+    def max_out(self):
+        self.send(self.component.config.get('max', 90))
+
+    def output_percent(self, value):
+        min = self.component.config.get('min', 0)
+        max = self.component.config.get('max', 100)
+        delta = max - min
+        self.send(min + delta * value / 100)
+
     def toggle(self):
         self.component.refresh_from_db()
         if self.component.value:
@@ -847,21 +854,51 @@ class Switch(MultiSwitchBase, TimerMixin, OnOffPokerMixin):
     default_value = False
 
     def turn_on(self):
+        if self.component.meta.get('pulse'):
+            self.component.meta.pop('pulse')
+            self.component.save()
         self.send(True)
 
     def turn_off(self):
+        if self.component.meta.get('pulse'):
+            self.component.meta.pop('pulse')
+            self.component.save()
         self.send(False)
 
     def toggle(self):
+        if self.component.meta.get('pulse'):
+            self.component.meta.pop('pulse')
+            self.component.save()
         self.send(not self.component.value)
 
     def click(self):
         '''
         Gateway specific implementation is very welcome of this!
         '''
+        if self.component.meta.get('pulse'):
+            self.component.meta.pop('pulse')
+            self.component.save()
         self.turn_on()
-        time.sleep(0.5)
-        self.turn_off()
+        from .tasks import component_action
+        component_action.s(
+            self.component.id, 'turn_off'
+        ).apply_async(countdown=1)
+
+    def pulse(self, frame_length_s, on_percentage):
+        self.component.meta['pulse'] = {
+            'frame': frame_length_s, 'duty': on_percentage / 100
+        }
+        self.component.save()
+        from simo.generic.gateways import GenericGatewayHandler
+        from .models import Gateway
+        generic_gateway = Gateway.objects.filter(
+            type=GenericGatewayHandler.uid
+        ).first()
+        if generic_gateway:
+            GatewayObjectCommand(
+                generic_gateway, self.component,
+                pulse=self.component.meta['pulse']
+            ).publish()
 
 
 class DoubleSwitch(MultiSwitchBase):

simo/core/models.py

@@ -294,28 +294,44 @@ class Gateway(DirtyFieldsMixin, models.Model, SimoAdminMixin):
         )
         if result:
             self.refresh_from_db()
-            if not isinstance(result, dict) and isinstance(result, Iterable):
-                for res in result:
-                    if isinstance(res, models.Model):
-                        if res.pk not in self.discovery['result']:
-                            self.discovery['result'].append(res.pk)
-                    else:
-                        if res not in self.discovery['result']:
-                            self.discovery['result'].append(res)
-            else:
-                if isinstance(result, models.Model):
-                    if result.pk not in self.discovery['result']:
-                        self.discovery['result'].append(result.pk)
-                else:
-                    if result not in self.discovery['result']:
-                        self.discovery['result'].append(result)
-
+            self.append_discovery_result(result)
 
         self.save(update_fields=['discovery'])
 
+
     def finish_discovery(self):
+        from .utils.type_constants import CONTROLLER_TYPES_MAP
         self.discovery['finished'] = time.time()
         self.save(update_fields=['discovery'])
+        ControllerClass = CONTROLLER_TYPES_MAP.get(
+            self.discovery['controller_uid']
+        )
+        if hasattr(ControllerClass, '_finish_discovery'):
+            result = ControllerClass._finish_discovery(
+                self.discovery['init_data']
+            )
+            self.append_discovery_result(result)
+        self.save(update_fields=['discovery'])
+
+
+    def append_discovery_result(self, result):
+        if not isinstance(result, dict) and isinstance(result, Iterable):
+            for res in result:
+                if isinstance(res, models.Model):
+                    if res.pk not in self.discovery['result']:
+                        self.discovery['result'].append(res.pk)
+                else:
+                    if res not in self.discovery['result']:
+                        self.discovery['result'].append(res)
+        else:
+            if isinstance(result, models.Model):
+                if result.pk not in self.discovery['result']:
+                    self.discovery['result'].append(result.pk)
+            else:
+                if result not in self.discovery['result']:
+                    self.discovery['result'].append(result)
+
+
 
 
 class Component(DirtyFieldsMixin, models.Model, SimoAdminMixin, OnChangeMixin):

simo/core/serializers.py

@@ -544,7 +544,7 @@ class ComponentSerializer(FormSerializer):
         )
         if form.is_valid():
             if form.controller.is_discoverable:
-                form.controller.init_discovery(form.cleaned_data)
+                form.controller._init_discovery(form.cleaned_data)
                 return form.save(commit=False)
             return form.save(commit=True)
         raise serializers.ValidationError(form.errors)
@@ -554,7 +554,7 @@ class ComponentSerializer(FormSerializer):
 
     def get_info(self, obj):
         if obj.controller:
-            return obj.controller.info()
+            return obj.controller.info(obj)
 
     def get_read_only(self, obj):
         user = self.context.get('user')

simo/core/tasks.py

@@ -16,11 +16,18 @@ from django.utils import timezone
 from actstream.models import Action
 from simo.conf import dynamic_settings
 from simo.core.utils.helpers import get_self_ip
-from simo.core.middleware import introduce_instance
+from simo.core.middleware import introduce_instance, drop_current_instance
 from simo.users.models import PermissionsRole, InstanceUser
 from .models import Instance, Component, ComponentHistory, HistoryAggregate
 
 
+@celery_app.task
+def component_action(comp_id, method, args=None, kwargs=None):
+    drop_current_instance()
+    component = Component.objects.get(id=comp_id)
+    getattr(component, method)(*args, **kwargs)
+
+
 @celery_app.task
 def supervisor_restart():
     time.sleep(2)

simo/core/templates/admin/core/component_change_form.html

@@ -56,7 +56,7 @@
 					<h2 style="background: linear-gradient(0.3turn, #5c7ca5, #5a95df);">Info</h2>
 					<div class="form-row">
 						{% if original.controller %}
-						  {{ original.info|markdownify }}
+						  {{ original.info|markdownify|linebreaksbr }}
 						{% endif %}
 					</div>
 				</div>

simo/core/templates/admin/wizard/discovery.html

@@ -64,8 +64,7 @@
     
     <div id="running-discovery">
       <p style="margin: 30px 15px">
-        <i class="fas fa-spinner fa-spin fa-lg" style="margin-right: 10px"></i> DISCOVERY MODE ACTIVATED! <br>
-        Your new components will appear down bellow once discovered.
+        <i class="fas fa-spinner fa-spin fa-lg" style="margin-right: 10px"></i> DISCOVERY MODE ACTIVATED!
       </p>
       {% if discovery_msg %}
         <p style="margin: 30px 15px">{{ discovery_msg }}</p>
@@ -108,8 +107,8 @@
 
     <div class="submit-row" style="text-align: left;">
 
-    <a href="{% url 'admin:core_component_changelist' %}" class="cancel-link" style="display: block; padding:9px 15px">
-      <i class="fa fa-check"></i> Done
+    <a href="{{ finish_url }}" class="cancel-link" style="display: block; padding:9px 15px">
+      <i class="fa fa-check"></i> Finish
     </a>
 
     </div>

simo/core/templates/admin/wizard/wizard_add.html

@@ -63,7 +63,7 @@
     {% if info %}
       <div class="form-row">
         <div class="markdownified-info">
-          {{ info|markdownify }}
+          {{ info|markdownify|linebreaksbr }}
         </div>
       </div>
     {% endif %}

simo/core/views.py

@@ -9,7 +9,7 @@ from django.http import (
 )
 from django.contrib import messages
 from simo.conf import dynamic_settings
-from .models import Instance
+from .models import Instance, Component, Gateway
 from .tasks import update as update_task, supervisor_restart, hardware_reboot
 from .middleware import introduce_instance
 
@@ -91,4 +91,28 @@ def hub_info(request):
             request.get_host()
         ):
             data['hub_secret'] = dynamic_settings['core__hub_secret']
-    return JsonResponse(data)
+    return JsonResponse(data)
+
+
+@login_required
+def finish_discovery(request):
+    # finish discovery function for admin discovery view
+    if not request.user.is_authenticated:
+        raise Http404()
+    if not request.user.is_master:
+        raise Http404()
+    result = None
+    for gateway in Gateway.objects.filter(
+        discovery__start__gt=time.time() - 60 * 60,  # no more than an hour
+        discovery__controller_uid=request.GET['uid']
+    ):
+        gateway.finish_discovery()
+        for res in gateway.discovery['result']:
+            comp = Component.objects.filter(
+                controller_uid=request.GET['uid'], pk=res
+            ).first()
+            if comp:
+                result = comp
+    if result:
+        return redirect(result.get_admin_url())
+    return reverse('admin:core_component_changelist')

simo/fleet/api.py

@@ -4,11 +4,13 @@ from rest_framework import viewsets
 from rest_framework.response import Response as RESTResponse
 from rest_framework.decorators import action
 from rest_framework.exceptions import ValidationError as APIValidationError
+from django_filters.rest_framework import DjangoFilterBackend
 from simo.core.api import InstanceMixin
 from simo.core.permissions import IsInstanceSuperuser
-from .models import InstanceOptions, Colonel, Interface
+from .models import InstanceOptions, Colonel, Interface, CustomDaliDevice
 from .serializers import (
-    InstanceOptionsSerializer, ColonelSerializer, ColonelInterfaceSerializer
+    InstanceOptionsSerializer, ColonelSerializer, ColonelInterfaceSerializer,
+    CustomDaliDeviceSerializer
 )
 
 
@@ -99,4 +101,25 @@ class InterfaceViewSet(
         return permissions
 
     def get_queryset(self):
-        return Interface.objects.filter(colonel__instance=self.instance)
+        return Interface.objects.filter(colonel__instance=self.instance)
+
+
+class CustomDaliDeviceViewSet(
+    InstanceMixin,
+    viewsets.mixins.RetrieveModelMixin, viewsets.mixins.UpdateModelMixin,
+    viewsets.mixins.ListModelMixin, viewsets.mixins.CreateModelMixin,
+    viewsets.GenericViewSet
+):
+    url = 'fleet/custom-dali-devices'
+    basename = 'custom-dali-devices'
+    serializer_class = CustomDaliDeviceSerializer
+    filter_backends = [DjangoFilterBackend]
+    filterset_fields = ['random_address', 'name']
+
+    def get_permissions(self):
+        permissions = super().get_permissions()
+        permissions.append(IsInstanceSuperuser())
+        return permissions
+
+    def get_queryset(self):
+        return CustomDaliDevice.objects.filter(instance=self.instance)

simo/fleet/base_types.py

@@ -2,4 +2,5 @@ from django.utils.translation import gettext_lazy as _
 
 BASE_TYPES = {
     'dali': _("Dali Device"),
+    'room-sensor': _("Room Sensor"),
 }