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

simo/fleet/forms.py

@@ -741,14 +741,21 @@ class ColonelPWMOutputConfigForm(ColonelComponentForm):
         help_text="Maximum component value"
     )
     value_units = forms.CharField(required=False)
-    duty_min = forms.IntegerField(
-        min_value=0, max_value=1023, required=True, initial=0,
-        help_text="Minumum PWM signal output duty (0 - 1023)"
+
+    device_min = forms.IntegerField(
+        label="Device minimum (%).",
+        help_text="Device will turn off once it reaches this internal value. "
+                  "Usually it is a good idea to "                  
+                  "set this somewhere in between of 5 - 15 %. ",
+        initial=10, min_value=0, max_value=100,
     )
-    duty_max = forms.IntegerField(
-        min_value=0, max_value=1023, required=True, initial=900,
-        help_text="Maximum PWM signal output duty (0 - 1023)"
+    device_max = forms.IntegerField(
+        label="Device maximum (%).",
+        help_text="Can be used to prevent reaching maximum values. "
+                  "Default is 100%",
+        initial=100, min_value=0, max_value=100,
     )
+
     turn_on_time = forms.IntegerField(
         min_value=0, max_value=60000, initial=1000,
         help_text="Turn on speed in ms. 1500 is a great quick default. "
@@ -763,9 +770,6 @@ class ColonelPWMOutputConfigForm(ColonelComponentForm):
         initial='easeOutSine', choices=EASING_CHOICES,
         help_text="easeOutSine - offers most naturally looking effect."
     )
-    inverse = forms.BooleanField(
-        label=_("Inverse dimmer signal"), required=False, initial=True
-    )
     on_value = forms.FloatField(
         required=True, initial=100,
         help_text="ON value when used with toggle switch"
@@ -854,6 +858,71 @@ class ColonelPWMOutputConfigForm(ColonelComponentForm):
         return obj
 
 
+class DCDriverConfigForm(ColonelComponentForm):
+    output_pin = Select2ModelChoiceField(
+        label="Port",
+        queryset=ColonelPin.objects.filter(output=True),
+        url='autocomplete-colonel-pins',
+        forward=[
+            forward.Self(),
+            forward.Field('colonel'),
+            forward.Const({'output': True}, 'filters')
+        ]
+    )
+    min = forms.FloatField(
+        required=True, initial=0,
+        help_text="Minimum component value displayed to the user."
+    )
+    max = forms.FloatField(
+        required=True, initial=24,
+        help_text="Maximum component value displayed to the user."
+    )
+    value_units = forms.CharField(required=False)
+
+    device_min = forms.FloatField(
+        label="Device minimum Voltage.",
+        help_text="This will be the lowest possible voltage value of a device.\n"
+                   "Don't forget to adjust your component min value accordingly "
+                   "if you change this.",
+        initial=0, min_value=0, max_value=24,
+    )
+    device_max = forms.IntegerField(
+        label="Device maximum Voltage.",
+        help_text="Can be set lower than it's natural maximum of 24V. \n"
+                  "Don't forget to adjust your component max value accordingly "
+                  "if you change this.",
+        initial=24, min_value=0, max_value=24,
+    )
+
+    def clean(self):
+        super().clean()
+        if 'output_pin' in self.cleaned_data:
+            self._clean_pin('output_pin')
+        return self.cleaned_data
+
+
+    def save(self, commit=True):
+        if 'output_pin' in self.cleaned_data:
+            self.instance.config['output_pin_no'] = self.cleaned_data['output_pin'].no
+
+        update_colonel = False
+        if not self.instance.pk:
+            update_colonel = True
+        elif 'output_pin' in self.changed_data:
+            update_colonel = True
+
+        obj = super().save(commit=commit)
+
+        if not update_colonel:
+            GatewayObjectCommand(
+                obj.gateway, self.cleaned_data['colonel'], id=obj.id,
+                command='call', method='update_config', args=[
+                    obj.controller._get_colonel_config()
+                ]
+            ).publish()
+        return obj
+
+
 class ColonelRGBLightConfigForm(ColonelComponentForm):
     output_pin = Select2ModelChoiceField(
         label="Port",
@@ -1010,6 +1079,12 @@ class DualMotorValveForm(ColonelComponentForm):
         required=True, min_value=0.01, max_value=1000000000,
         initial=10, help_text="Time in seconds to close."
     )
+    min = forms.FloatField(
+        label="Minimum displayed value", required=True, initial=0
+    )
+    max = forms.FloatField(
+        label="Maximum displayed value", required=True, initial=100
+    )
 
 
     def clean(self):

simo/fleet/migrations/0039_auto_20241016_1047.py

@@ -0,0 +1,28 @@
+# Generated by Django 4.2.10 on 2024-10-16 10:47
+from django.db import migrations
+
+
+def forwards_func(apps, schema_editor):
+    Component = apps.get_model("core", "Component")
+
+    for comp in Component.objects.filter(controller_uid='simo.fleet.controllers.PWMOutput'):
+        duty_min = comp.config.get('duty_min', 0)
+        duty_max = comp.config.get('duty_max', 1023)
+        comp.config['device_min'] = int((1023 - duty_max) / 1023 * 100)
+        comp.config['device_max'] = int(100 - (duty_min / 1023 * 100))
+        comp.save()
+
+
+def reverse_func(apps, schema_editor):
+    pass
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fleet', '0038_alter_colonel_type'),
+    ]
+
+    operations = [
+        migrations.RunPython(forwards_func, reverse_func, elidable=True),
+    ]

simo/fleet/migrations/0040_alter_colonel_pwm_frequency.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.10 on 2024-10-18 08:00
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('fleet', '0039_auto_20241016_1047'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='colonel',
+            name='pwm_frequency',
+            field=models.IntegerField(choices=[(0, '3kHz'), (1, '22kHz')], default=0, help_text='Affects Ample Wall dimmer PWM output (dimmer) frequency'),
+        ),
+    ]

simo/fleet/models.py

@@ -91,7 +91,7 @@ class Colonel(DirtyFieldsMixin, models.Model):
                                  "and reset if a lot of data is being transmitted. "
                                  "Leave this off, unleess you know what you are doing!"
     )
-    pwm_frequency = models.IntegerField(default=1, choices=(
+    pwm_frequency = models.IntegerField(default=0, choices=(
         (0, "3kHz"), (1, "22kHz")
     ), help_text="Affects Ample Wall dimmer PWM output (dimmer) frequency")
 
@@ -270,6 +270,10 @@ def after_colonel_save(sender, instance, created, *args, **kwargs):
         )
         if fleet_gateway.status != 'running':
             fleet_gateway.start()
+        # create i2c and dali interfaces automatically for game-changer boards
+        if instance.type == 'game-changer':
+            Interface.objects.create(colonel=instance, no=1, type='i2c')
+            Interface.objects.create(colonel=instance, no=2, type='dali')
 
 
 @receiver(post_save, sender=Component)
@@ -311,7 +315,7 @@ def post_component_delete(sender, instance, *args, **kwargs):
                 comp, instance.config.get('da', 0), remove=True
             )
 
-    elif instance.controller.family == 'dali':
+    elif instance.controller and instance.controller.family == 'dali':
         colonel = Colonel.objects.filter(id=instance.config['colonel']).first()
         if colonel:
             GatewayObjectCommand(

simo/fleet/socket_consumers.py

@@ -218,18 +218,26 @@ class FleetConsumer(AsyncWebsocketConsumer):
             }
         }
         config_data['settings'].update(instance_options)
-        interfaces = await sync_to_async(list, thread_sensitive=True)(
-            self.colonel.interfaces.all().select_related(
+
+        def get_interfaces(colonel):
+            return list(colonel.interfaces.all().select_related(
                 'pin_a', 'pin_b'
-            )
+            ))
+        interfaces = await sync_to_async(get_interfaces, thread_sensitive=True)(
+            self.colonel
         )
         for interface in interfaces:
             config_data['interfaces'][f'{interface.type}-{interface.no}'] = {
                 'pin_a': interface.pin_a.no, 'pin_b': interface.pin_b.no,
             }
+
+        def get_components(colonel):
+            return list(
+                colonel.components.all().prefetch_related('slaves')
+            )
         components = await sync_to_async(
-            list, thread_sensitive=True
-        )(self.colonel.components.all().prefetch_related('slaves'))
+            get_components, thread_sensitive=True
+        )(self.colonel)
 
         def get_comp_config(comp):
             try:

simo/generic/controllers.py

@@ -3,6 +3,10 @@ import threading
 import pytz
 import datetime
 import json
+import requests
+import traceback
+import sys
+from bs4 import BeautifulSoup
 from django.core.exceptions import ValidationError
 from django.utils import timezone
 from django.utils.functional import cached_property
@@ -16,6 +20,7 @@ from simo.core.events import GatewayObjectCommand
 from simo.core.models import RUN_STATUS_CHOICES_MAP, Component
 from simo.core.utils.helpers import get_random_string
 from simo.core.utils.operations import OPERATIONS
+from simo.core.middleware import get_current_instance
 from simo.core.controllers import (
     BEFORE_SEND, BEFORE_SET, ControllerBase,
     BinarySensor, NumericSensor, MultiSensor, Switch, Dimmer, DimmerPlus,
@@ -42,12 +47,14 @@ from .forms import (
     BlindsConfigForm, WateringConfigForm, StateSelectForm,
     AlarmClockConfigForm
 )
+from .scripting import get_current_state
+from .scripting.serializers import UserSerializer
 
 # ----------- Generic controllers -----------------------------
 
+
 class Script(ControllerBase, TimerMixin):
-    masters_only = True
-    name = _("Script")
+    name = _("AI Script")
     base_type = 'script'
     gateway_class = GenericGatewayHandler
     app_widget = ScriptWidget
@@ -101,6 +108,42 @@ class Script(ControllerBase, TimerMixin):
         else:
             self.send('start')
 
+    def ai_assistant(self, wish):
+        try:
+            request_data = {
+                'hub_uid': dynamic_settings['core__hub_uid'],
+                'hub_secret': dynamic_settings['core__hub_secret'],
+                'instance_uid': get_current_instance().uid,
+                'system_data': json.dumps(get_current_state()),
+                'wish': wish,
+            }
+        except Exception as e:
+            print(traceback.format_exc(), file=sys.stderr)
+            return {'status': 'error', 'result': f"Internal error: {e}"}
+        user = get_current_user()
+        if user:
+            request_data['current_user'] = UserSerializer(user, many=False).data
+        try:
+            response = requests.post(
+                'https://simo.io/hubs/ai-assist/scripts/', json=request_data
+            )
+        except:
+            return {'status': 'error', 'result': "Connection error"}
+
+        if response.status_code != 200:
+            content = response.content.decode()
+            if '<html' in content:
+                # Parse the HTML content
+                soup = BeautifulSoup(response.content, 'html.parser')
+                content = F"Server error {response.status_code}: {soup.title.string}"
+            return {'status': 'error', 'result': content}
+
+        return {
+            'status': 'success',
+            'result': response.json()['script'],
+            'description': response.json()['description']
+        }
+
 
 class PresenceLighting(Script):
     masters_only = False

simo/generic/forms.py

@@ -1,3 +1,4 @@
+import time
 from django import forms
 from django.forms import formset_factory
 from django.db.models import Q
@@ -35,11 +36,32 @@ class ScriptConfigForm(BaseComponentForm):
         initial=True, required=False,
         help_text="Restart the script if it fails. "
     )
-    code = forms.CharField(widget=PythonCode)
+    assistant_request = forms.CharField(
+        label="Request for AI assistant", required=False, max_length=1000,
+        widget=forms.Textarea(
+            attrs={'placeholder':
+                    "Close the blind and turn on the main light "
+                    "in my living room when it get's dark."
+            }
+        ),
+        help_text="Clearly describe in your own words what kind of automation "
+                  "you want to happen with this scenario script. <br>"
+                  "The more defined, exact and clear is your description the more "
+                  "accurate automation script SIMO.io AI assistanw will generate.<br>"
+                  "Use component, zone and category id's for best accuracy. <br>"
+                  "SIMO.io AI will re-generate your automation code and update it's description in Notes field "                  
+                  "every time this field is changed and it might take up to 60s to do it. <br>"
+                  "Actual script code can only be edited via SIMO.io Admin.",
+    )
+    code = forms.CharField(widget=PythonCode, required=False)
     log = forms.CharField(
         widget=forms.HiddenInput, required=False
     )
 
+    app_exclude_fields = ('alarm_category', 'code', 'log')
+
+    _ai_resp = None
+
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.basic_fields.extend(['autostart', 'keep_alive'])
@@ -47,19 +69,20 @@ class ScriptConfigForm(BaseComponentForm):
             prefix = get_script_prefix()
             if prefix == '/':
                 prefix = ''
-            self.fields['log'].widget = LogOutputWidget(
-                prefix + '/ws/log/%d/%d/' % (
-                    ContentType.objects.get_for_model(Component).id,
-                    self.instance.id
+            if 'log' in self.fields:
+                self.fields['log'].widget = LogOutputWidget(
+                    prefix + '/ws/log/%d/%d/' % (
+                        ContentType.objects.get_for_model(Component).id,
+                        self.instance.id
+                    )
                 )
-            )
 
     @classmethod
     def get_admin_fieldsets(cls, request, obj=None):
         base_fields = (
             'id', 'gateway', 'base_type', 'name', 'icon', 'zone', 'category',
             'show_in_app', 'autostart', 'keep_alive',
-            'code', 'control', 'log'
+            'assistant_request', 'notes', 'code', 'control', 'log'
         )
 
         fieldsets = [
@@ -72,6 +95,44 @@ class ScriptConfigForm(BaseComponentForm):
         return fieldsets
 
 
+    def clean(self):
+        if self.cleaned_data.get('assistant_request'):
+            if self.instance.pk:
+                org = Component.objects.get(pk=self.instance.pk)
+                call_assistant = org.config.get('assistant_request') \
+                                 != self.cleaned_data['assistant_request']
+            else:
+                call_assistant = True
+            call_assistant = False
+            if call_assistant:
+                resp = self.instance.ai_assistant(
+                    self.cleaned_data['assistant_request'],
+                )
+                if resp['status'] == 'success':
+                    self._ai_resp = resp
+                elif resp['status'] == 'error':
+                    self.add_error('assistant_request', resp['result'])
+
+        return self.cleaned_data
+
+    def save(self, commit=True):
+        if commit and self._ai_resp:
+            self.instance.config['code'] = self._ai_resp['result']
+            self.instance.notes = self._ai_resp['description']
+            if 'code' in self.cleaned_data:
+                self.cleaned_data['code'] = self._ai_resp['result']
+            if 'notes' in self.cleaned_data:
+                self.cleaned_data['notes'] = self._ai_resp['description']
+        obj = super().save(commit)
+        if commit:
+            obj.controller.stop()
+            if self.cleaned_data.get('keep_alive') \
+            or self.cleaned_data.get('autostart'):
+                time.sleep(2)
+                obj.controller.start()
+        return obj
+
+
 class ConditionForm(forms.Form):
     component = forms.ModelChoiceField(
         Component.objects.all(),
@@ -717,6 +778,19 @@ 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."
+    )
+
+    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()
+        return super().save(commit)
 
 
 class AlarmClockEventForm(forms.Form):

simo/generic/models.py

@@ -56,7 +56,6 @@ def handle_alarm_groups(sender, instance, *args, **kwargs):
                     )
                     from simo.notifications.utils import notify_users
                     notify_users(
-                        alarm_group_component.zone.instance,
                         'alarm', str(alarm_group_component), body,
                         component=alarm_group_component
                     )

simo/generic/scripting/__init__.py

@@ -0,0 +1,16 @@
+from .serializers import *
+from simo.core.models import Zone, Category, Component
+from simo.users.models import InstanceUser
+from simo.core.middleware import get_current_instance
+
+
+def get_current_state():
+    get_current_instance()
+    return {
+        'zones': ZoneSerializer(Zone.objects.all(), many=True).data,
+        'categories': CategorySerializer(Category.objects.all(), many=True).data,
+        'component': ComponentSerializer(Component.objects.all(), many=True).data,
+        'instanceusers': InstanceUserSerializer(
+            InstanceUser.objects.all(), many=True
+        ).data,
+    }

simo/generic/scripting/helpers.py

@@ -0,0 +1,35 @@
+from django.utils import timezone
+from suntime import Sun
+from simo.core.models import Instance
+
+
+class LocalSun(Sun):
+
+    def __init__(self, instance=None):
+        if not instance:
+            instance = Instance.objects.all().first()
+        coordinates = instance.location.split(',')
+        try:
+            lat = float(coordinates[0])
+        except:
+            lat = 0
+        try:
+            lon = float(coordinates[1])
+        except:
+            lon = 0
+        super().__init__(lat, lon)
+
+    def is_night(self):
+        if timezone.now() > self.get_sunset_time():
+            return True
+        if timezone.now() < self.get_sunrise_time():
+            return True
+        return False
+
+    def seconds_to_sunset(self):
+        return (self.get_sunset_time() - timezone.now()).total_seconds()
+
+    def seconds_to_sunrise(self):
+        return (self.get_sunrise_time() - timezone.now()).total_seconds()
+
+

simo/generic/scripting/serializers.py

@@ -0,0 +1,77 @@
+from rest_framework import serializers
+from simo.core.models import Zone, Category, Component
+from simo.users.models import User, InstanceUser, PermissionsRole
+
+
+class ZoneSerializer(serializers.ModelSerializer):
+    '''Zone serializer for AI scripts helper'''
+
+    class Meta:
+        model = Zone
+        fields = 'id', 'name'
+
+
+class CategorySerializer(serializers.ModelSerializer):
+    '''Category serializer for AI scripts helper'''
+
+    class Meta:
+        model = Category
+        fields = 'id', 'name'
+
+
+class ComponentSerializer(serializers.ModelSerializer):
+    '''Component serializer for AI scripts helper'''
+
+    MAX_LENGTH = 500
+
+    value = serializers.SerializerMethodField()
+    meta = serializers.SerializerMethodField()
+    config = serializers.SerializerMethodField()
+
+    class Meta:
+        model = Component
+        fields = (
+            'id', 'name', 'icon', 'zone', 'category', 'base_type',
+            'value', 'value_units', 'meta', 'config'
+        )
+
+    def get_value(self, obj):
+        if obj.base_type in ('ip-camera', ):
+            return 'SKIP'
+        if len(str(obj.value)) > self.MAX_LENGTH:
+            return 'SKIP'
+        return obj.value
+
+    def get_meta(self, obj):
+        if len(str(obj.value)) > self.MAX_LENGTH:
+            return 'SKIP'
+        return obj.value
+
+    def get_config(self, obj):
+        if len(str(obj.value)) > self.MAX_LENGTH:
+            return 'SKIP'
+        return obj.value
+
+
+class UserSerializer(serializers.ModelSerializer):
+
+    class Meta:
+        model = User
+        fields = 'email', 'name'
+
+
+class PermissionsRoleSerializer(serializers.ModelSerializer):
+
+    class Meta:
+        model = PermissionsRole
+        fields = 'id', 'name', 'is_owner', 'is_superuser'
+
+
+class InstanceUserSerializer(serializers.ModelSerializer):
+    '''Role serializer for AI scripts helper'''
+    user = UserSerializer()
+    role = PermissionsRoleSerializer()
+
+    class Meta:
+        model = InstanceUser
+        fields = 'user', 'role',

simo/generic/templates/admin/controller_widgets/weather_forecast.html

@@ -3,11 +3,11 @@
        data-ws_url="{{ obj.get_socket_url|default_if_none:"" }}">
 <span style="
     width: 20px; height:20px;
-    background: url({% static 'weather_icons' %}/{{ obj.value.current.weather.0.icon }}@2x.png) center no-repeat;
+    background: url({% static 'weather_icons' %}/{{ obj.value.weather.0.icon }}@2x.png) center no-repeat;
     background-size: 150%;
     display: inline-block;
     position: relative;
     bottom: -4px;
 "></span>
- {{ obj.value.current.temp }}ᴼ {% if obj.zone.instance.units_of_measure == 'metric' %}C{% else %}F{% endif %}
+ {{ obj.value.temp }}ᴼ {% if obj.zone.instance.units_of_measure == 'metric' %}C{% else %}F{% endif %}
 </div>