simo 2.0.42__py3-none-any.whl → 2.1.2__py3-none-any.whl

simo/core/forms.py

@@ -1,27 +1,19 @@
-import os
 import traceback
-import requests
 from dal import forward
-from django import forms
 from django.contrib.admin.forms import AdminAuthenticationForm as OrgAdminAuthenticationForm
 from django.db import models
 from django import forms
 from django.forms import formset_factory
-from django.conf import settings
 from django.urls.base import get_script_prefix
 from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _
 from django.contrib.contenttypes.models import ContentType
-from timezone_utils.choices import ALL_TIMEZONES_CHOICES
+from actstream import action
 from dal import autocomplete
 from .models import (
     Icon, Category, Gateway, Component
 )
-from .widgets import LocationWidget
-from simo.conf import dynamic_settings
-from .widgets import SVGFileWidget, PythonCode, LogOutputWidget
-from .widgets import ImageWidget
-from .utils.helpers import get_random_string
+from .widgets import SVGFileWidget, LogOutputWidget
 from .utils.formsets import FormsetField
 from .utils.validators import validate_slaves
 
@@ -34,94 +26,6 @@ class HiddenField(forms.CharField):
         super().__init__(widget=forms.HiddenInput())
 
 
-class HubConfigForm(forms.Form):
-    name = forms.CharField(
-        label=_("Hub Name"), required=True,
-        widget=forms.TextInput(attrs={'placeholder': "Home Sweet Home"})
-    )
-    uid = forms.CharField(
-        label=_('Unique Identifier (UID)'), required=False,
-        widget=forms.TextInput(attrs={'placeholder': "Df5Hd8v1"}),
-        help_text="Leave blank if this is a new instance."
-    )
-    time_zone = forms.ChoiceField(
-        label=_("Time zone"), required=True,
-        choices=ALL_TIMEZONES_CHOICES
-    )
-    units_of_measure = forms.ChoiceField(
-        label=_("Units of Measure"), required=True,
-        choices=(('metric', 'Metric'), ('imperial', 'Imperial'))
-    )
-    cover_image = forms.FileField(
-        label=_("Cover image"), required=True, widget=ImageWidget
-    )
-
-    def __init__(self, *args, **kwargs):
-        self.user = kwargs.pop('user')
-        super().__init__(*args, **kwargs)
-
-    def clean(self):
-        cleaned_data = super().clean()
-        post_data = cleaned_data.copy()
-        post_data.pop('cover_image')
-        if not dynamic_settings['core__hub_secret']:
-            dynamic_settings['core__hub_secret'] = get_random_string(20)
-        post_data['secret'] = dynamic_settings['core__hub_secret']
-        post_data['email'] = self.user.email
-        try:
-            resp = requests.post(
-                'https://simo.io/hubs/sync-initial-config/', json=post_data,
-            )
-        except Exception as e:
-            raise forms.ValidationError(
-                "Connection error. "
-                "Make sure your hub can reach https://simo.io and try again."
-            )
-
-        if resp.status_code == 400:
-            resp_json = resp.json()
-            resp_json.pop('status', None)
-            for field_name, msg in resp_json.items():
-                self.add_error(field_name, msg)
-        elif resp.status_code == 200:
-            cleaned_data['uid'] = resp.json()['uid']
-        else:
-            raise forms.ValidationError(
-                "Bad response from https://simo.io. Please try again. "
-            )
-        return cleaned_data
-
-
-class CoordinatesForm(forms.Form):
-    location = forms.CharField(
-        label=_("Where is your hub located?"),
-        widget=LocationWidget(based_fields=[])
-    )
-    share_location = forms.BooleanField(
-        label="Share exact location with SIMO.io for "
-              "better accuracy of location related services.",
-        required=False
-    )
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        if not self.initial['location']:
-            self.fields['location'].widget = LocationWidget(
-                based_fields=[], zoom=2
-            )
-
-
-
-
-class TermsAndConditionsForm(forms.Form):
-    accept = forms.BooleanField(required=False)
-
-    def clean_accept(self):
-        if not self.cleaned_data['accept']:
-            raise forms.ValidationError(_("You must accept SIMO.io Terms & Conditions if you want to continue."))
-        return self.cleaned_data['accept']
-
-
 class AdminAuthenticationForm(OrgAdminAuthenticationForm):
 
     def confirm_login_allowed(self, user):
@@ -209,6 +113,19 @@ class ConfigFieldsMixin:
                 self.instance.config[field_name] = \
                     self.cleaned_data[field_name]
 
+        if commit:
+            from simo.users.middleware import get_current_user
+            actor = get_current_user()
+            if self.instance.pk:
+                verb = 'modified'
+            else:
+                verb = 'created'
+            action.send(
+                actor, target=self.instance, verb=verb,
+                instance_id=self.instance.zone.instance.id,
+                action_type='management_event'
+            )
+
         return super().save(commit)
 
 
@@ -364,7 +281,7 @@ class ComponentAdminForm(forms.ModelForm):
             'alarm_category', 'arm_status',
             'notes'
         )
-        base_fields = ['id', 'gateway', 'base_type', 'name']
+        base_fields = ['id', 'gateway', 'base_type', 'info', 'name']
         if cls.has_icon:
             base_fields.append('icon')
 
@@ -432,8 +349,6 @@ class ComponentAdminForm(forms.ModelForm):
         return self.cleaned_data['instance_methods']
 
 
-
-
 class BaseComponentForm(ConfigFieldsMixin, ComponentAdminForm):
     pass
 

simo/core/gateways.py

@@ -74,7 +74,7 @@ class BaseObjectCommandsGatewayHandler(BaseGatewayHandler):
     def _run_periodic_task(self, exit, task, period):
         while not exit.is_set():
             try:
-                print(f"Run periodic task {task}!")
+                #print(f"Run periodic task {task}!")
                 getattr(self, task)()
             except Exception as e:
                 self.logger.error(e, exc_info=True)

simo/core/managers.py

@@ -1,10 +1,21 @@
 import sys
 import traceback
+from actstream.managers import ActionManager as OrgActionManager
 from .middleware import get_current_instance
 from django.utils import timezone
 from django.db import models
 
 
+class ActionManager(OrgActionManager):
+
+    def get_queryset(self):
+        qs = super().get_queryset()
+        instance = get_current_instance()
+        if instance:
+            qs = qs.filter(data__instance_id=instance.id)
+        return qs
+
+
 class ZonesManager(models.Manager):
 
     def get_queryset(self):
@@ -32,7 +43,7 @@ class ComponentsManager(models.Manager):
         instance = get_current_instance()
         if instance:
             qs = qs.filter(zone__instance=instance)
-        return qs
+        return qs.select_related('zone', 'zone__instance', 'gateway')
 
     def bulk_send(self, data):
         """
@@ -50,6 +61,8 @@ class ComponentsManager(models.Manager):
 
         gateway_components = {}
         for comp, value in data.items():
+            if not comp.controller:
+                continue
             try:
                 value = comp.controller._validate_val(value, BEFORE_SEND)
             except:

simo/core/migrations/0037_auto_20240606_1057.py

@@ -0,0 +1,33 @@
+# Generated by Django 4.2.10 on 2024-06-06 10:57
+
+from django.db import migrations
+
+def forwards_func(apps, schema_editor):
+
+    Component = apps.get_model("core", "Component")
+    Gateway = apps.get_model('core', "Gateway")
+
+    generic_gateway = Gateway.objects.filter(
+        type='simo.generic.gateways.GenericGatewayHandler'
+    ).first()
+    if not generic_gateway:
+        return
+
+    Component.objects.filter(
+        controller_uid='simo.generic.controllers.StateSelect'
+    ).update(gateway=generic_gateway)
+
+
+def reverse_func(apps, schema_editor):
+    pass
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0036_auto_20240521_0823'),
+    ]
+
+    operations = [
+        migrations.RunPython(forwards_func, reverse_func, elidable=True),
+    ]

simo/core/migrations/0038_remove_instance_cover_image_and_more.py

@@ -0,0 +1,30 @@
+# Generated by Django 4.2.10 on 2024-06-12 08:14
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0037_auto_20240606_1057'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='instance',
+            name='cover_image',
+        ),
+        migrations.RemoveField(
+            model_name='instance',
+            name='cover_image_synced',
+        ),
+        migrations.RemoveField(
+            model_name='instance',
+            name='secret_key',
+        ),
+        migrations.AlterField(
+            model_name='instance',
+            name='timezone',
+            field=models.CharField(choices=[('Africa/Abidjan', 'Africa/Abidjan'), ('Africa/Accra', 'Africa/Accra'), ('Africa/Addis_Ababa', 'Africa/Addis_Ababa'), ('Africa/Algiers', 'Africa/Algiers'), ('Africa/Asmara', 'Africa/Asmara'), ('Africa/Asmera', 'Africa/Asmera'), ('Africa/Bamako', 'Africa/Bamako'), ('Africa/Bangui', 'Africa/Bangui'), ('Africa/Banjul', 'Africa/Banjul'), ('Africa/Bissau', 'Africa/Bissau'), ('Africa/Blantyre', 'Africa/Blantyre'), ('Africa/Brazzaville', 'Africa/Brazzaville'), ('Africa/Bujumbura', 'Africa/Bujumbura'), ('Africa/Cairo', 'Africa/Cairo'), ('Africa/Casablanca', 'Africa/Casablanca'), ('Africa/Ceuta', 'Africa/Ceuta'), ('Africa/Conakry', 'Africa/Conakry'), ('Africa/Dakar', 'Africa/Dakar'), ('Africa/Dar_es_Salaam', 'Africa/Dar_es_Salaam'), ('Africa/Djibouti', 'Africa/Djibouti'), ('Africa/Douala', 'Africa/Douala'), ('Africa/El_Aaiun', 'Africa/El_Aaiun'), ('Africa/Freetown', 'Africa/Freetown'), ('Africa/Gaborone', 'Africa/Gaborone'), ('Africa/Harare', 'Africa/Harare'), ('Africa/Johannesburg', 'Africa/Johannesburg'), ('Africa/Juba', 'Africa/Juba'), ('Africa/Kampala', 'Africa/Kampala'), ('Africa/Khartoum', 'Africa/Khartoum'), ('Africa/Kigali', 'Africa/Kigali'), ('Africa/Kinshasa', 'Africa/Kinshasa'), ('Africa/Lagos', 'Africa/Lagos'), ('Africa/Libreville', 'Africa/Libreville'), ('Africa/Lome', 'Africa/Lome'), ('Africa/Luanda', 'Africa/Luanda'), ('Africa/Lubumbashi', 'Africa/Lubumbashi'), ('Africa/Lusaka', 'Africa/Lusaka'), ('Africa/Malabo', 'Africa/Malabo'), ('Africa/Maputo', 'Africa/Maputo'), ('Africa/Maseru', 'Africa/Maseru'), ('Africa/Mbabane', 'Africa/Mbabane'), ('Africa/Mogadishu', 'Africa/Mogadishu'), ('Africa/Monrovia', 'Africa/Monrovia'), ('Africa/Nairobi', 'Africa/Nairobi'), ('Africa/Ndjamena', 'Africa/Ndjamena'), ('Africa/Niamey', 'Africa/Niamey'), ('Africa/Nouakchott', 'Africa/Nouakchott'), ('Africa/Ouagadougou', 'Africa/Ouagadougou'), ('Africa/Porto-Novo', 'Africa/Porto-Novo'), ('Africa/Sao_Tome', 'Africa/Sao_Tome'), ('Africa/Timbuktu', 'Africa/Timbuktu'), ('Africa/Tripoli', 'Africa/Tripoli'), ('Africa/Tunis', 'Africa/Tunis'), ('Africa/Windhoek', 'Africa/Windhoek'), ('America/Adak', 'America/Adak'), ('America/Anchorage', 'America/Anchorage'), ('America/Anguilla', 'America/Anguilla'), ('America/Antigua', 'America/Antigua'), ('America/Araguaina', 'America/Araguaina'), ('America/Argentina/Buenos_Aires', 'America/Argentina/Buenos_Aires'), ('America/Argentina/Catamarca', 'America/Argentina/Catamarca'), ('America/Argentina/ComodRivadavia', 'America/Argentina/ComodRivadavia'), ('America/Argentina/Cordoba', 'America/Argentina/Cordoba'), ('America/Argentina/Jujuy', 'America/Argentina/Jujuy'), ('America/Argentina/La_Rioja', 'America/Argentina/La_Rioja'), ('America/Argentina/Mendoza', 'America/Argentina/Mendoza'), ('America/Argentina/Rio_Gallegos', 'America/Argentina/Rio_Gallegos'), ('America/Argentina/Salta', 'America/Argentina/Salta'), ('America/Argentina/San_Juan', 'America/Argentina/San_Juan'), ('America/Argentina/San_Luis', 'America/Argentina/San_Luis'), ('America/Argentina/Tucuman', 'America/Argentina/Tucuman'), ('America/Argentina/Ushuaia', 'America/Argentina/Ushuaia'), ('America/Aruba', 'America/Aruba'), ('America/Asuncion', 'America/Asuncion'), ('America/Atikokan', 'America/Atikokan'), ('America/Atka', 'America/Atka'), ('America/Bahia', 'America/Bahia'), ('America/Bahia_Banderas', 'America/Bahia_Banderas'), ('America/Barbados', 'America/Barbados'), ('America/Belem', 'America/Belem'), ('America/Belize', 'America/Belize'), ('America/Blanc-Sablon', 'America/Blanc-Sablon'), ('America/Boa_Vista', 'America/Boa_Vista'), ('America/Bogota', 'America/Bogota'), ('America/Boise', 'America/Boise'), ('America/Buenos_Aires', 'America/Buenos_Aires'), ('America/Cambridge_Bay', 'America/Cambridge_Bay'), ('America/Campo_Grande', 'America/Campo_Grande'), ('America/Cancun', 'America/Cancun'), ('America/Caracas', 'America/Caracas'), ('America/Catamarca', 'America/Catamarca'), ('America/Cayenne', 'America/Cayenne'), ('America/Cayman', 'America/Cayman'), ('America/Chicago', 'America/Chicago'), ('America/Chihuahua', 'America/Chihuahua'), ('America/Ciudad_Juarez', 'America/Ciudad_Juarez'), ('America/Coral_Harbour', 'America/Coral_Harbour'), ('America/Cordoba', 'America/Cordoba'), ('America/Costa_Rica', 'America/Costa_Rica'), ('America/Creston', 'America/Creston'), ('America/Cuiaba', 'America/Cuiaba'), ('America/Curacao', 'America/Curacao'), ('America/Danmarkshavn', 'America/Danmarkshavn'), ('America/Dawson', 'America/Dawson'), ('America/Dawson_Creek', 'America/Dawson_Creek'), ('America/Denver', 'America/Denver'), ('America/Detroit', 'America/Detroit'), ('America/Dominica', 'America/Dominica'), ('America/Edmonton', 'America/Edmonton'), ('America/Eirunepe', 'America/Eirunepe'), ('America/El_Salvador', 'America/El_Salvador'), ('America/Ensenada', 'America/Ensenada'), ('America/Fort_Nelson', 'America/Fort_Nelson'), ('America/Fort_Wayne', 'America/Fort_Wayne'), ('America/Fortaleza', 'America/Fortaleza'), ('America/Glace_Bay', 'America/Glace_Bay'), ('America/Godthab', 'America/Godthab'), ('America/Goose_Bay', 'America/Goose_Bay'), ('America/Grand_Turk', 'America/Grand_Turk'), ('America/Grenada', 'America/Grenada'), ('America/Guadeloupe', 'America/Guadeloupe'), ('America/Guatemala', 'America/Guatemala'), ('America/Guayaquil', 'America/Guayaquil'), ('America/Guyana', 'America/Guyana'), ('America/Halifax', 'America/Halifax'), ('America/Havana', 'America/Havana'), ('America/Hermosillo', 'America/Hermosillo'), ('America/Indiana/Indianapolis', 'America/Indiana/Indianapolis'), ('America/Indiana/Knox', 'America/Indiana/Knox'), ('America/Indiana/Marengo', 'America/Indiana/Marengo'), ('America/Indiana/Petersburg', 'America/Indiana/Petersburg'), ('America/Indiana/Tell_City', 'America/Indiana/Tell_City'), ('America/Indiana/Vevay', 'America/Indiana/Vevay'), ('America/Indiana/Vincennes', 'America/Indiana/Vincennes'), ('America/Indiana/Winamac', 'America/Indiana/Winamac'), ('America/Indianapolis', 'America/Indianapolis'), ('America/Inuvik', 'America/Inuvik'), ('America/Iqaluit', 'America/Iqaluit'), ('America/Jamaica', 'America/Jamaica'), ('America/Jujuy', 'America/Jujuy'), ('America/Juneau', 'America/Juneau'), ('America/Kentucky/Louisville', 'America/Kentucky/Louisville'), ('America/Kentucky/Monticello', 'America/Kentucky/Monticello'), ('America/Knox_IN', 'America/Knox_IN'), ('America/Kralendijk', 'America/Kralendijk'), ('America/La_Paz', 'America/La_Paz'), ('America/Lima', 'America/Lima'), ('America/Los_Angeles', 'America/Los_Angeles'), ('America/Louisville', 'America/Louisville'), ('America/Lower_Princes', 'America/Lower_Princes'), ('America/Maceio', 'America/Maceio'), ('America/Managua', 'America/Managua'), ('America/Manaus', 'America/Manaus'), ('America/Marigot', 'America/Marigot'), ('America/Martinique', 'America/Martinique'), ('America/Matamoros', 'America/Matamoros'), ('America/Mazatlan', 'America/Mazatlan'), ('America/Mendoza', 'America/Mendoza'), ('America/Menominee', 'America/Menominee'), ('America/Merida', 'America/Merida'), ('America/Metlakatla', 'America/Metlakatla'), ('America/Mexico_City', 'America/Mexico_City'), ('America/Miquelon', 'America/Miquelon'), ('America/Moncton', 'America/Moncton'), ('America/Monterrey', 'America/Monterrey'), ('America/Montevideo', 'America/Montevideo'), ('America/Montreal', 'America/Montreal'), ('America/Montserrat', 'America/Montserrat'), ('America/Nassau', 'America/Nassau'), ('America/New_York', 'America/New_York'), ('America/Nipigon', 'America/Nipigon'), ('America/Nome', 'America/Nome'), ('America/Noronha', 'America/Noronha'), ('America/North_Dakota/Beulah', 'America/North_Dakota/Beulah'), ('America/North_Dakota/Center', 'America/North_Dakota/Center'), ('America/North_Dakota/New_Salem', 'America/North_Dakota/New_Salem'), ('America/Nuuk', 'America/Nuuk'), ('America/Ojinaga', 'America/Ojinaga'), ('America/Panama', 'America/Panama'), ('America/Pangnirtung', 'America/Pangnirtung'), ('America/Paramaribo', 'America/Paramaribo'), ('America/Phoenix', 'America/Phoenix'), ('America/Port-au-Prince', 'America/Port-au-Prince'), ('America/Port_of_Spain', 'America/Port_of_Spain'), ('America/Porto_Acre', 'America/Porto_Acre'), ('America/Porto_Velho', 'America/Porto_Velho'), ('America/Puerto_Rico', 'America/Puerto_Rico'), ('America/Punta_Arenas', 'America/Punta_Arenas'), ('America/Rainy_River', 'America/Rainy_River'), ('America/Rankin_Inlet', 'America/Rankin_Inlet'), ('America/Recife', 'America/Recife'), ('America/Regina', 'America/Regina'), ('America/Resolute', 'America/Resolute'), ('America/Rio_Branco', 'America/Rio_Branco'), ('America/Rosario', 'America/Rosario'), ('America/Santa_Isabel', 'America/Santa_Isabel'), ('America/Santarem', 'America/Santarem'), ('America/Santiago', 'America/Santiago'), ('America/Santo_Domingo', 'America/Santo_Domingo'), ('America/Sao_Paulo', 'America/Sao_Paulo'), ('America/Scoresbysund', 'America/Scoresbysund'), ('America/Shiprock', 'America/Shiprock'), ('America/Sitka', 'America/Sitka'), ('America/St_Barthelemy', 'America/St_Barthelemy'), ('America/St_Johns', 'America/St_Johns'), ('America/St_Kitts', 'America/St_Kitts'), ('America/St_Lucia', 'America/St_Lucia'), ('America/St_Thomas', 'America/St_Thomas'), ('America/St_Vincent', 'America/St_Vincent'), ('America/Swift_Current', 'America/Swift_Current'), ('America/Tegucigalpa', 'America/Tegucigalpa'), ('America/Thule', 'America/Thule'), ('America/Thunder_Bay', 'America/Thunder_Bay'), ('America/Tijuana', 'America/Tijuana'), ('America/Toronto', 'America/Toronto'), ('America/Tortola', 'America/Tortola'), ('America/Vancouver', 'America/Vancouver'), ('America/Virgin', 'America/Virgin'), ('America/Whitehorse', 'America/Whitehorse'), ('America/Winnipeg', 'America/Winnipeg'), ('America/Yakutat', 'America/Yakutat'), ('America/Yellowknife', 'America/Yellowknife'), ('Antarctica/Casey', 'Antarctica/Casey'), ('Antarctica/Davis', 'Antarctica/Davis'), ('Antarctica/DumontDUrville', 'Antarctica/DumontDUrville'), ('Antarctica/Macquarie', 'Antarctica/Macquarie'), ('Antarctica/Mawson', 'Antarctica/Mawson'), ('Antarctica/McMurdo', 'Antarctica/McMurdo'), ('Antarctica/Palmer', 'Antarctica/Palmer'), ('Antarctica/Rothera', 'Antarctica/Rothera'), ('Antarctica/South_Pole', 'Antarctica/South_Pole'), ('Antarctica/Syowa', 'Antarctica/Syowa'), ('Antarctica/Troll', 'Antarctica/Troll'), ('Antarctica/Vostok', 'Antarctica/Vostok'), ('Arctic/Longyearbyen', 'Arctic/Longyearbyen'), ('Asia/Aden', 'Asia/Aden'), ('Asia/Almaty', 'Asia/Almaty'), ('Asia/Amman', 'Asia/Amman'), ('Asia/Anadyr', 'Asia/Anadyr'), ('Asia/Aqtau', 'Asia/Aqtau'), ('Asia/Aqtobe', 'Asia/Aqtobe'), ('Asia/Ashgabat', 'Asia/Ashgabat'), ('Asia/Ashkhabad', 'Asia/Ashkhabad'), ('Asia/Atyrau', 'Asia/Atyrau'), ('Asia/Baghdad', 'Asia/Baghdad'), ('Asia/Bahrain', 'Asia/Bahrain'), ('Asia/Baku', 'Asia/Baku'), ('Asia/Bangkok', 'Asia/Bangkok'), ('Asia/Barnaul', 'Asia/Barnaul'), ('Asia/Beirut', 'Asia/Beirut'), ('Asia/Bishkek', 'Asia/Bishkek'), ('Asia/Brunei', 'Asia/Brunei'), ('Asia/Calcutta', 'Asia/Calcutta'), ('Asia/Chita', 'Asia/Chita'), ('Asia/Choibalsan', 'Asia/Choibalsan'), ('Asia/Chongqing', 'Asia/Chongqing'), ('Asia/Chungking', 'Asia/Chungking'), ('Asia/Colombo', 'Asia/Colombo'), ('Asia/Dacca', 'Asia/Dacca'), ('Asia/Damascus', 'Asia/Damascus'), ('Asia/Dhaka', 'Asia/Dhaka'), ('Asia/Dili', 'Asia/Dili'), ('Asia/Dubai', 'Asia/Dubai'), ('Asia/Dushanbe', 'Asia/Dushanbe'), ('Asia/Famagusta', 'Asia/Famagusta'), ('Asia/Gaza', 'Asia/Gaza'), ('Asia/Harbin', 'Asia/Harbin'), ('Asia/Hebron', 'Asia/Hebron'), ('Asia/Ho_Chi_Minh', 'Asia/Ho_Chi_Minh'), ('Asia/Hong_Kong', 'Asia/Hong_Kong'), ('Asia/Hovd', 'Asia/Hovd'), ('Asia/Irkutsk', 'Asia/Irkutsk'), ('Asia/Istanbul', 'Asia/Istanbul'), ('Asia/Jakarta', 'Asia/Jakarta'), ('Asia/Jayapura', 'Asia/Jayapura'), ('Asia/Jerusalem', 'Asia/Jerusalem'), ('Asia/Kabul', 'Asia/Kabul'), ('Asia/Kamchatka', 'Asia/Kamchatka'), ('Asia/Karachi', 'Asia/Karachi'), ('Asia/Kashgar', 'Asia/Kashgar'), ('Asia/Kathmandu', 'Asia/Kathmandu'), ('Asia/Katmandu', 'Asia/Katmandu'), ('Asia/Khandyga', 'Asia/Khandyga'), ('Asia/Kolkata', 'Asia/Kolkata'), ('Asia/Krasnoyarsk', 'Asia/Krasnoyarsk'), ('Asia/Kuala_Lumpur', 'Asia/Kuala_Lumpur'), ('Asia/Kuching', 'Asia/Kuching'), ('Asia/Kuwait', 'Asia/Kuwait'), ('Asia/Macao', 'Asia/Macao'), ('Asia/Macau', 'Asia/Macau'), ('Asia/Magadan', 'Asia/Magadan'), ('Asia/Makassar', 'Asia/Makassar'), ('Asia/Manila', 'Asia/Manila'), ('Asia/Muscat', 'Asia/Muscat'), ('Asia/Nicosia', 'Asia/Nicosia'), ('Asia/Novokuznetsk', 'Asia/Novokuznetsk'), ('Asia/Novosibirsk', 'Asia/Novosibirsk'), ('Asia/Omsk', 'Asia/Omsk'), ('Asia/Oral', 'Asia/Oral'), ('Asia/Phnom_Penh', 'Asia/Phnom_Penh'), ('Asia/Pontianak', 'Asia/Pontianak'), ('Asia/Pyongyang', 'Asia/Pyongyang'), ('Asia/Qatar', 'Asia/Qatar'), ('Asia/Qostanay', 'Asia/Qostanay'), ('Asia/Qyzylorda', 'Asia/Qyzylorda'), ('Asia/Rangoon', 'Asia/Rangoon'), ('Asia/Riyadh', 'Asia/Riyadh'), ('Asia/Saigon', 'Asia/Saigon'), ('Asia/Sakhalin', 'Asia/Sakhalin'), ('Asia/Samarkand', 'Asia/Samarkand'), ('Asia/Seoul', 'Asia/Seoul'), ('Asia/Shanghai', 'Asia/Shanghai'), ('Asia/Singapore', 'Asia/Singapore'), ('Asia/Srednekolymsk', 'Asia/Srednekolymsk'), ('Asia/Taipei', 'Asia/Taipei'), ('Asia/Tashkent', 'Asia/Tashkent'), ('Asia/Tbilisi', 'Asia/Tbilisi'), ('Asia/Tehran', 'Asia/Tehran'), ('Asia/Tel_Aviv', 'Asia/Tel_Aviv'), ('Asia/Thimbu', 'Asia/Thimbu'), ('Asia/Thimphu', 'Asia/Thimphu'), ('Asia/Tokyo', 'Asia/Tokyo'), ('Asia/Tomsk', 'Asia/Tomsk'), ('Asia/Ujung_Pandang', 'Asia/Ujung_Pandang'), ('Asia/Ulaanbaatar', 'Asia/Ulaanbaatar'), ('Asia/Ulan_Bator', 'Asia/Ulan_Bator'), ('Asia/Urumqi', 'Asia/Urumqi'), ('Asia/Ust-Nera', 'Asia/Ust-Nera'), ('Asia/Vientiane', 'Asia/Vientiane'), ('Asia/Vladivostok', 'Asia/Vladivostok'), ('Asia/Yakutsk', 'Asia/Yakutsk'), ('Asia/Yangon', 'Asia/Yangon'), ('Asia/Yekaterinburg', 'Asia/Yekaterinburg'), ('Asia/Yerevan', 'Asia/Yerevan'), ('Atlantic/Azores', 'Atlantic/Azores'), ('Atlantic/Bermuda', 'Atlantic/Bermuda'), ('Atlantic/Canary', 'Atlantic/Canary'), ('Atlantic/Cape_Verde', 'Atlantic/Cape_Verde'), ('Atlantic/Faeroe', 'Atlantic/Faeroe'), ('Atlantic/Faroe', 'Atlantic/Faroe'), ('Atlantic/Jan_Mayen', 'Atlantic/Jan_Mayen'), ('Atlantic/Madeira', 'Atlantic/Madeira'), ('Atlantic/Reykjavik', 'Atlantic/Reykjavik'), ('Atlantic/South_Georgia', 'Atlantic/South_Georgia'), ('Atlantic/St_Helena', 'Atlantic/St_Helena'), ('Atlantic/Stanley', 'Atlantic/Stanley'), ('Australia/ACT', 'Australia/ACT'), ('Australia/Adelaide', 'Australia/Adelaide'), ('Australia/Brisbane', 'Australia/Brisbane'), ('Australia/Broken_Hill', 'Australia/Broken_Hill'), ('Australia/Canberra', 'Australia/Canberra'), ('Australia/Currie', 'Australia/Currie'), ('Australia/Darwin', 'Australia/Darwin'), ('Australia/Eucla', 'Australia/Eucla'), ('Australia/Hobart', 'Australia/Hobart'), ('Australia/LHI', 'Australia/LHI'), ('Australia/Lindeman', 'Australia/Lindeman'), ('Australia/Lord_Howe', 'Australia/Lord_Howe'), ('Australia/Melbourne', 'Australia/Melbourne'), ('Australia/NSW', 'Australia/NSW'), ('Australia/North', 'Australia/North'), ('Australia/Perth', 'Australia/Perth'), ('Australia/Queensland', 'Australia/Queensland'), ('Australia/South', 'Australia/South'), ('Australia/Sydney', 'Australia/Sydney'), ('Australia/Tasmania', 'Australia/Tasmania'), ('Australia/Victoria', 'Australia/Victoria'), ('Australia/West', 'Australia/West'), ('Australia/Yancowinna', 'Australia/Yancowinna'), ('Brazil/Acre', 'Brazil/Acre'), ('Brazil/DeNoronha', 'Brazil/DeNoronha'), ('Brazil/East', 'Brazil/East'), ('Brazil/West', 'Brazil/West'), ('CET', 'CET'), ('CST6CDT', 'CST6CDT'), ('Canada/Atlantic', 'Canada/Atlantic'), ('Canada/Central', 'Canada/Central'), ('Canada/Eastern', 'Canada/Eastern'), ('Canada/Mountain', 'Canada/Mountain'), ('Canada/Newfoundland', 'Canada/Newfoundland'), ('Canada/Pacific', 'Canada/Pacific'), ('Canada/Saskatchewan', 'Canada/Saskatchewan'), ('Canada/Yukon', 'Canada/Yukon'), ('Chile/Continental', 'Chile/Continental'), ('Chile/EasterIsland', 'Chile/EasterIsland'), ('Cuba', 'Cuba'), ('EET', 'EET'), ('EST', 'EST'), ('EST5EDT', 'EST5EDT'), ('Egypt', 'Egypt'), ('Eire', 'Eire'), ('Etc/GMT', 'Etc/GMT'), ('Etc/GMT+0', 'Etc/GMT+0'), ('Etc/GMT+1', 'Etc/GMT+1'), ('Etc/GMT+10', 'Etc/GMT+10'), ('Etc/GMT+11', 'Etc/GMT+11'), ('Etc/GMT+12', 'Etc/GMT+12'), ('Etc/GMT+2', 'Etc/GMT+2'), ('Etc/GMT+3', 'Etc/GMT+3'), ('Etc/GMT+4', 'Etc/GMT+4'), ('Etc/GMT+5', 'Etc/GMT+5'), ('Etc/GMT+6', 'Etc/GMT+6'), ('Etc/GMT+7', 'Etc/GMT+7'), ('Etc/GMT+8', 'Etc/GMT+8'), ('Etc/GMT+9', 'Etc/GMT+9'), ('Etc/GMT-0', 'Etc/GMT-0'), ('Etc/GMT-1', 'Etc/GMT-1'), ('Etc/GMT-10', 'Etc/GMT-10'), ('Etc/GMT-11', 'Etc/GMT-11'), ('Etc/GMT-12', 'Etc/GMT-12'), ('Etc/GMT-13', 'Etc/GMT-13'), ('Etc/GMT-14', 'Etc/GMT-14'), ('Etc/GMT-2', 'Etc/GMT-2'), ('Etc/GMT-3', 'Etc/GMT-3'), ('Etc/GMT-4', 'Etc/GMT-4'), ('Etc/GMT-5', 'Etc/GMT-5'), ('Etc/GMT-6', 'Etc/GMT-6'), ('Etc/GMT-7', 'Etc/GMT-7'), ('Etc/GMT-8', 'Etc/GMT-8'), ('Etc/GMT-9', 'Etc/GMT-9'), ('Etc/GMT0', 'Etc/GMT0'), ('Etc/Greenwich', 'Etc/Greenwich'), ('Etc/UCT', 'Etc/UCT'), ('Etc/UTC', 'Etc/UTC'), ('Etc/Universal', 'Etc/Universal'), ('Etc/Zulu', 'Etc/Zulu'), ('Europe/Amsterdam', 'Europe/Amsterdam'), ('Europe/Andorra', 'Europe/Andorra'), ('Europe/Astrakhan', 'Europe/Astrakhan'), ('Europe/Athens', 'Europe/Athens'), ('Europe/Belfast', 'Europe/Belfast'), ('Europe/Belgrade', 'Europe/Belgrade'), ('Europe/Berlin', 'Europe/Berlin'), ('Europe/Bratislava', 'Europe/Bratislava'), ('Europe/Brussels', 'Europe/Brussels'), ('Europe/Bucharest', 'Europe/Bucharest'), ('Europe/Budapest', 'Europe/Budapest'), ('Europe/Busingen', 'Europe/Busingen'), ('Europe/Chisinau', 'Europe/Chisinau'), ('Europe/Copenhagen', 'Europe/Copenhagen'), ('Europe/Dublin', 'Europe/Dublin'), ('Europe/Gibraltar', 'Europe/Gibraltar'), ('Europe/Guernsey', 'Europe/Guernsey'), ('Europe/Helsinki', 'Europe/Helsinki'), ('Europe/Isle_of_Man', 'Europe/Isle_of_Man'), ('Europe/Istanbul', 'Europe/Istanbul'), ('Europe/Jersey', 'Europe/Jersey'), ('Europe/Kaliningrad', 'Europe/Kaliningrad'), ('Europe/Kiev', 'Europe/Kiev'), ('Europe/Kirov', 'Europe/Kirov'), ('Europe/Kyiv', 'Europe/Kyiv'), ('Europe/Lisbon', 'Europe/Lisbon'), ('Europe/Ljubljana', 'Europe/Ljubljana'), ('Europe/London', 'Europe/London'), ('Europe/Luxembourg', 'Europe/Luxembourg'), ('Europe/Madrid', 'Europe/Madrid'), ('Europe/Malta', 'Europe/Malta'), ('Europe/Mariehamn', 'Europe/Mariehamn'), ('Europe/Minsk', 'Europe/Minsk'), ('Europe/Monaco', 'Europe/Monaco'), ('Europe/Moscow', 'Europe/Moscow'), ('Europe/Nicosia', 'Europe/Nicosia'), ('Europe/Oslo', 'Europe/Oslo'), ('Europe/Paris', 'Europe/Paris'), ('Europe/Podgorica', 'Europe/Podgorica'), ('Europe/Prague', 'Europe/Prague'), ('Europe/Riga', 'Europe/Riga'), ('Europe/Rome', 'Europe/Rome'), ('Europe/Samara', 'Europe/Samara'), ('Europe/San_Marino', 'Europe/San_Marino'), ('Europe/Sarajevo', 'Europe/Sarajevo'), ('Europe/Saratov', 'Europe/Saratov'), ('Europe/Simferopol', 'Europe/Simferopol'), ('Europe/Skopje', 'Europe/Skopje'), ('Europe/Sofia', 'Europe/Sofia'), ('Europe/Stockholm', 'Europe/Stockholm'), ('Europe/Tallinn', 'Europe/Tallinn'), ('Europe/Tirane', 'Europe/Tirane'), ('Europe/Tiraspol', 'Europe/Tiraspol'), ('Europe/Ulyanovsk', 'Europe/Ulyanovsk'), ('Europe/Uzhgorod', 'Europe/Uzhgorod'), ('Europe/Vaduz', 'Europe/Vaduz'), ('Europe/Vatican', 'Europe/Vatican'), ('Europe/Vienna', 'Europe/Vienna'), ('Europe/Vilnius', 'Europe/Vilnius'), ('Europe/Volgograd', 'Europe/Volgograd'), ('Europe/Warsaw', 'Europe/Warsaw'), ('Europe/Zagreb', 'Europe/Zagreb'), ('Europe/Zaporozhye', 'Europe/Zaporozhye'), ('Europe/Zurich', 'Europe/Zurich'), ('GB', 'GB'), ('GB-Eire', 'GB-Eire'), ('GMT', 'GMT'), ('GMT+0', 'GMT+0'), ('GMT-0', 'GMT-0'), ('GMT0', 'GMT0'), ('Greenwich', 'Greenwich'), ('HST', 'HST'), ('Hongkong', 'Hongkong'), ('Iceland', 'Iceland'), ('Indian/Antananarivo', 'Indian/Antananarivo'), ('Indian/Chagos', 'Indian/Chagos'), ('Indian/Christmas', 'Indian/Christmas'), ('Indian/Cocos', 'Indian/Cocos'), ('Indian/Comoro', 'Indian/Comoro'), ('Indian/Kerguelen', 'Indian/Kerguelen'), ('Indian/Mahe', 'Indian/Mahe'), ('Indian/Maldives', 'Indian/Maldives'), ('Indian/Mauritius', 'Indian/Mauritius'), ('Indian/Mayotte', 'Indian/Mayotte'), ('Indian/Reunion', 'Indian/Reunion'), ('Iran', 'Iran'), ('Israel', 'Israel'), ('Jamaica', 'Jamaica'), ('Japan', 'Japan'), ('Kwajalein', 'Kwajalein'), ('Libya', 'Libya'), ('MET', 'MET'), ('MST', 'MST'), ('MST7MDT', 'MST7MDT'), ('Mexico/BajaNorte', 'Mexico/BajaNorte'), ('Mexico/BajaSur', 'Mexico/BajaSur'), ('Mexico/General', 'Mexico/General'), ('NZ', 'NZ'), ('NZ-CHAT', 'NZ-CHAT'), ('Navajo', 'Navajo'), ('PRC', 'PRC'), ('PST8PDT', 'PST8PDT'), ('Pacific/Apia', 'Pacific/Apia'), ('Pacific/Auckland', 'Pacific/Auckland'), ('Pacific/Bougainville', 'Pacific/Bougainville'), ('Pacific/Chatham', 'Pacific/Chatham'), ('Pacific/Chuuk', 'Pacific/Chuuk'), ('Pacific/Easter', 'Pacific/Easter'), ('Pacific/Efate', 'Pacific/Efate'), ('Pacific/Enderbury', 'Pacific/Enderbury'), ('Pacific/Fakaofo', 'Pacific/Fakaofo'), ('Pacific/Fiji', 'Pacific/Fiji'), ('Pacific/Funafuti', 'Pacific/Funafuti'), ('Pacific/Galapagos', 'Pacific/Galapagos'), ('Pacific/Gambier', 'Pacific/Gambier'), ('Pacific/Guadalcanal', 'Pacific/Guadalcanal'), ('Pacific/Guam', 'Pacific/Guam'), ('Pacific/Honolulu', 'Pacific/Honolulu'), ('Pacific/Johnston', 'Pacific/Johnston'), ('Pacific/Kanton', 'Pacific/Kanton'), ('Pacific/Kiritimati', 'Pacific/Kiritimati'), ('Pacific/Kosrae', 'Pacific/Kosrae'), ('Pacific/Kwajalein', 'Pacific/Kwajalein'), ('Pacific/Majuro', 'Pacific/Majuro'), ('Pacific/Marquesas', 'Pacific/Marquesas'), ('Pacific/Midway', 'Pacific/Midway'), ('Pacific/Nauru', 'Pacific/Nauru'), ('Pacific/Niue', 'Pacific/Niue'), ('Pacific/Norfolk', 'Pacific/Norfolk'), ('Pacific/Noumea', 'Pacific/Noumea'), ('Pacific/Pago_Pago', 'Pacific/Pago_Pago'), ('Pacific/Palau', 'Pacific/Palau'), ('Pacific/Pitcairn', 'Pacific/Pitcairn'), ('Pacific/Pohnpei', 'Pacific/Pohnpei'), ('Pacific/Ponape', 'Pacific/Ponape'), ('Pacific/Port_Moresby', 'Pacific/Port_Moresby'), ('Pacific/Rarotonga', 'Pacific/Rarotonga'), ('Pacific/Saipan', 'Pacific/Saipan'), ('Pacific/Samoa', 'Pacific/Samoa'), ('Pacific/Tahiti', 'Pacific/Tahiti'), ('Pacific/Tarawa', 'Pacific/Tarawa'), ('Pacific/Tongatapu', 'Pacific/Tongatapu'), ('Pacific/Truk', 'Pacific/Truk'), ('Pacific/Wake', 'Pacific/Wake'), ('Pacific/Wallis', 'Pacific/Wallis'), ('Pacific/Yap', 'Pacific/Yap'), ('Poland', 'Poland'), ('Portugal', 'Portugal'), ('ROC', 'ROC'), ('ROK', 'ROK'), ('Singapore', 'Singapore'), ('Turkey', 'Turkey'), ('UCT', 'UCT'), ('US/Alaska', 'US/Alaska'), ('US/Aleutian', 'US/Aleutian'), ('US/Arizona', 'US/Arizona'), ('US/Central', 'US/Central'), ('US/East-Indiana', 'US/East-Indiana'), ('US/Eastern', 'US/Eastern'), ('US/Hawaii', 'US/Hawaii'), ('US/Indiana-Starke', 'US/Indiana-Starke'), ('US/Michigan', 'US/Michigan'), ('US/Mountain', 'US/Mountain'), ('US/Pacific', 'US/Pacific'), ('US/Samoa', 'US/Samoa'), ('UTC', 'UTC'), ('Universal', 'Universal'), ('W-SU', 'W-SU'), ('WET', 'WET'), ('Zulu', 'Zulu')], db_index=True, max_length=50),
+        ),
+    ]

simo/core/models.py

@@ -12,9 +12,11 @@ from timezone_utils.choices import ALL_TIMEZONES_CHOICES
 from location_field.models.plain import PlainLocationField
 from model_utils import FieldTracker
 from dirtyfields import DirtyFieldsMixin
+from actstream import action
 from simo.core.utils.mixins import SimoAdminMixin
 from simo.core.storage import OverwriteStorage
 from simo.core.utils.validators import validate_svg
+from simo.core.utils.helpers import get_random_string
 from simo.users.models import User
 from .managers import ZonesManager, CategoriesManager, ComponentsManager
 from .events import GatewayObjectCommand, OnChangeMixin
@@ -64,16 +66,10 @@ class Instance(models.Model, SimoAdminMixin):
     # or something of that kind.
     # Usually, there will be only one.
     uid = models.CharField(
-        max_length=50, unique=True,
-        help_text="Issued by SIMO.io"
+        max_length=50, unique=True, help_text="Issued by SIMO.io"
     )
     name = models.CharField(max_length=100, db_index=True, unique=True)
     slug = models.CharField(max_length=100, db_index=True, unique=True)
-    cover_image = models.ImageField(
-        name='cover_image', upload_to='hub_covers', null=True, blank=True
-    )
-    cover_image_synced = models.BooleanField(default=False)
-    secret_key = models.CharField(max_length=100, blank=True)
     date_created = models.DateTimeField(auto_now_add=True)
     location = PlainLocationField(null=True, blank=True, zoom=7)
     timezone = models.CharField(
@@ -399,6 +395,8 @@ def is_in_alarm(self):
 
     controller_cls = None
 
+    _controller_initiated = False
+
     _mqtt_client = None
     _on_change_function = None
     _obj_ct_id = 0
@@ -408,15 +406,21 @@ def is_in_alarm(self):
         verbose_name_plural = _("Components")
         ordering = 'zone', 'base_type', 'name'
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.prepare_controller()
-
     def __str__(self):
         if self.zone:
             return '%s | %s' % (self.zone.name, self.name)
         return self.name
 
+    def __getattribute__(self, attr):
+        try:
+            return super().__getattribute__(attr)
+        except Exception as e:
+            if not attr.startswith('_') and not self._controller_initiated:
+                self._controller_initiated = True
+                self.prepare_controller()
+                return super().__getattribute__(attr)
+            raise e
+
     @cached_property
     def controller(self):
         from .utils.type_constants import (
@@ -425,13 +429,13 @@ def is_in_alarm(self):
         )
         self._meta.get_field('controller_uid').choices = CONTROLLER_TYPES_CHOICES
         if self.controller_uid:
-            controller_cls = None
-            if not controller_cls:
-                controller_cls = CONTROLLERS_BY_GATEWAY.get(
+            self.controller_cls = None
+            if not self.controller_cls:
+                self.controller_cls = CONTROLLERS_BY_GATEWAY.get(
                     self.gateway.type, {}
                 ).get(self.controller_uid)
-            if controller_cls:
-                return controller_cls(self)
+            if self.controller_cls:
+                return self.controller_cls(self)
 
     def prepare_controller(self):
         if self.controller:
@@ -483,6 +487,11 @@ def is_in_alarm(self):
                     component=self, type='value', value=self.value,
                     user=actor
                 )
+                action.send(
+                    actor, target=self, verb="value change",
+                    instance_id=self.zone.instance.id,
+                    action_type='comp_value', value=self.value
+                )
                 action_performed = True
                 self.last_change = timezone.now()
             if 'arm_status' in dirty_fields:
@@ -490,6 +499,11 @@ def is_in_alarm(self):
                     component=self, type='security',
                     value=self.arm_status, user=actor
                 )
+                action.send(
+                    actor, target=self, verb="security event",
+                    instance_id=self.zone.instance.id,
+                    action_type='security', value=self.value
+                )
                 action_performed = True
                 self.last_change = timezone.now()
             if action_performed:

simo/core/permissions.py

@@ -10,9 +10,12 @@ class InstancePermission(BasePermission):
         if not request.user.is_active:
             return False
 
-        instance = Instance.objects.filter(
-            slug=request.resolver_match.kwargs.get('instance_slug')
-        ).first()
+        instance = getattr(view, 'instance', None)
+        if not instance:
+            instance = Instance.objects.filter(
+                slug=request.resolver_match.kwargs.get('instance_slug')
+            ).first()
+
         if not instance:
             raise Http404()
 

simo/core/serializers.py

@@ -1,9 +1,8 @@
 import inspect
 import datetime
-import json
+import re
 from django import forms
 from collections import OrderedDict
-from django.forms.utils import ErrorDict
 from django.conf import settings
 from collections.abc import Iterable
 from easy_thumbnails.files import get_thumbnailer
@@ -11,7 +10,13 @@ from simo.core.middleware import get_current_request
 from rest_framework import serializers
 from rest_framework.fields import SkipField
 from rest_framework.relations import Hyperlink, PKOnlyObject
+from actstream.models import Action
 from simo.core.forms import HiddenField, FormsetField
+from simo.core.form_fields import (
+    Select2ListChoiceField, Select2ListChoiceField,
+    Select2ModelChoiceField, Select2ListMultipleChoiceField
+)
+from simo.core.models import Component
 from rest_framework.relations import PrimaryKeyRelatedField, ManyRelatedField
 from .drf_braces.serializers.form_serializer import (
     FormSerializer, FormSerializerBase, reduce_attr_dict_from_instance,
@@ -106,6 +111,7 @@ class ComponentFormsetField(FormSerializer):
         form = forms.Form
         field_mapping = {
             HiddenField: HiddenSerializerField,
+            Select2ListChoiceField: serializers.ChoiceField,
             forms.ModelChoiceField: FormsetPrimaryKeyRelatedField,
             forms.TypedChoiceField: serializers.ChoiceField,
             forms.FloatField: serializers.FloatField,
@@ -249,6 +255,9 @@ class ComponentSerializer(FormSerializer):
     arm_status = ObjectSerializerMethodField()
     battery_level = ObjectSerializerMethodField()
     controller_methods = serializers.SerializerMethodField()
+    info = serializers.SerializerMethodField()
+
+    _forms = {}
 
     class Meta:
         form = ComponentAdminForm
@@ -258,11 +267,27 @@ class ComponentSerializer(FormSerializer):
             forms.FloatField: serializers.FloatField,
             forms.SlugField: serializers.CharField,
             forms.ModelChoiceField: ComponentPrimaryKeyRelatedField,
+            Select2ModelChoiceField: ComponentPrimaryKeyRelatedField,
             forms.ModelMultipleChoiceField: ComponentManyToManyRelatedField,
+            Select2ListMultipleChoiceField: ComponentManyToManyRelatedField,
             FormsetField: ComponentFormsetField,
         }
 
+
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        # Set proper instance for OPTIONS request
+        if not self.instance:
+            res = re.findall(
+                r'.*\/core\/components\/(?P<component_id>[0-9]+)\/',
+                self.context['request'].path
+            )
+            if res:
+                self.instance = Component.objects.filter(id=res[0]).first()
+
     def get_fields(self):
+
         self.set_form_cls()
 
         ret = OrderedDict()
@@ -322,6 +347,7 @@ class ComponentSerializer(FormSerializer):
             if name in ret:
                 continue
             ret[name] = field
+
         return ret
 
     def _get_field_kwargs(self, form_field, serializer_field_class):
@@ -359,7 +385,15 @@ class ComponentSerializer(FormSerializer):
                 if controller:
                     self.Meta.form = controller.config_form
 
-    def get_form(self, data=None, **kwargs):
+    def get_form(self, data=None, instance=None, **kwargs):
+        form_key = None
+        if not data:
+            form_key = 0
+            if instance:
+                form_key = instance.id
+        if form_key in self._forms:
+            return self._forms[form_key]
+
         self.set_form_cls()
         if not self.instance or isinstance(self.instance, Iterable):
             #controller_uid = 'simo.generic.controllers.AlarmClock'
@@ -368,7 +402,7 @@ class ComponentSerializer(FormSerializer):
             controller_uid = self.instance.controller_uid
         form = self.Meta.form(
             data=data, request=self.context['request'],
-            controller_uid=controller_uid,
+            controller_uid=controller_uid, instance=instance,
             **kwargs
         )
         if not self.context['request'].user.is_master:
@@ -380,6 +414,10 @@ class ComponentSerializer(FormSerializer):
                     if field_name not in form.basic_fields:
                         print("DELETE FIELD: ", field_name)
                         del form.fields[field_name]
+
+        if form_key is not None:
+            self._forms[form_key] = form
+
         return form
 
     def accomodate_formsets(self, form, data):
@@ -426,7 +464,6 @@ class ComponentSerializer(FormSerializer):
         a_data = self.accomodate_formsets(form, validated_data)
         form = self.get_form(instance=instance, data=a_data)
         if form.is_valid():
-            print("FORM FIELDS", form.fields)
             instance = form.save(commit=True)
             return instance
         raise serializers.ValidationError(form.errors)
@@ -450,6 +487,10 @@ class ComponentSerializer(FormSerializer):
             c_methods.extend(['arm', 'disarm'])
         return c_methods
 
+    def get_info(self, obj):
+        if obj.controller:
+            return obj.controller.info()
+
     def get_read_only(self, obj):
         user = self.context.get('user')
         if not user:
@@ -507,3 +548,34 @@ class ComponentHistorySerializer(serializers.ModelSerializer):
     class Meta:
         model = ComponentHistory
         fields = '__all__'
+
+
+class ActionSerializer(serializers.ModelSerializer):
+    timestamp = TimestampField()
+    actor = serializers.SerializerMethodField()
+    target = serializers.SerializerMethodField()
+    action_type = serializers.SerializerMethodField()
+    value = serializers.SerializerMethodField()
+
+    class Meta:
+        model = Action
+        fields = (
+            'id', 'timestamp', 'actor', 'target', 'verb',
+            'action_type', 'value'
+        )
+
+    def get_actor(self, obj):
+        if obj.actor:
+            return str(obj.actor)
+
+    def get_target(self, obj):
+        if obj.target:
+            return str(obj.target)
+
+
+    def get_action_type(self, obj):
+        return obj.data.get('action_type')
+
+    def get_value(self, obj):
+        return obj.data.get('value')
+