simo 1.6.2__tar.gz → 1.6.4__tar.gz

{simo-1.6.2/src/simo.egg-info → simo-1.6.4}/PKG-INFO

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

{simo-1.6.2 → simo-1.6.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "simo"
-version = "1.6.2"
+version = "1.6.4"
 authors = [
   { name="Simanas Venčkauskas", email="simanas@simo.io" },
 ]

{simo-1.6.2 → simo-1.6.4}/src/simo/core/api.py

@@ -3,7 +3,6 @@ from calendar import monthrange
 import pytz
 import logging
 from django.db.models import Q, Prefetch
-from django.urls import get_script_prefix
 from django.utils.translation import gettext_lazy as _
 from django.utils import timezone
 from django.shortcuts import get_object_or_404

{simo-1.6.2 → simo-1.6.4}/src/simo/core/apps.py

@@ -19,6 +19,6 @@ class CoreAppConfig(AppConfig):
             # We are running as root and there is no symbolic link yet made
             # for auto updates.
             os.symlink(auto_update_file_path, executable_path)
-            auto_update_cron = f'*/10 * * * * {executable_path} \n'
+            auto_update_cron = f'0 * * * * {executable_path} \n'
             cron_out = subprocess.Popen(['crontab', '-'], stdin=subprocess.PIPE)
             cron_out.communicate(input=str.encode(auto_update_cron))

{simo-1.6.2 → simo-1.6.4}/src/simo/core/autocomplete_views.py

@@ -1,5 +1,4 @@
 from dal import autocomplete
-from django.urls import get_script_prefix
 from django.db.models import Q
 from django.template.loader import render_to_string
 from simo.core.utils.helpers import search_queryset
@@ -24,7 +23,7 @@ class IconModelAutocomplete(autocomplete.Select2QuerySetView):
     def get_result_label(self, item):
         return render_to_string(
             'core/icon_acutocomplete_select_item.html', {
-                'icon': item, 'prefix': get_script_prefix()[:-1]
+                'icon': item,
             }
         )
 
@@ -70,7 +69,7 @@ class CategoryAutocomplete(autocomplete.Select2QuerySetView):
     def get_result_label(self, item):
         return render_to_string(
             'core/object_acutocomplete_select_item.html', {
-                'object': item, 'prefix': get_script_prefix()[:-1]
+                'object': item
             }
         )
 
@@ -96,7 +95,7 @@ class ZoneAutocomplete(autocomplete.Select2QuerySetView):
     def get_result_label(self, item):
         return render_to_string(
             'core/object_acutocomplete_select_item.html', {
-                'object': item, 'prefix': get_script_prefix()[:-1]
+                'object': item
             }
         )
 
@@ -133,7 +132,7 @@ class ComponentAutocomplete(autocomplete.Select2QuerySetView):
     def get_result_label(self, item):
         return render_to_string(
             'core/object_acutocomplete_select_item.html', {
-                'object': item, 'prefix': get_script_prefix()[:-1]
+                'object': item
             }
         )
 

{simo-1.6.2 → simo-1.6.4}/src/simo/core/events.py

@@ -2,9 +2,14 @@ import json
 import time
 import logging
 import threading
+import sys
+import json
+import traceback
+import pytz
 from django.contrib.contenttypes.models import ContentType
 from django.conf import settings
 import paho.mqtt.client as mqtt
+from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 import paho.mqtt.publish as mqtt_publish
 
@@ -130,3 +135,54 @@ class EventsStream:
     def on_tick(self):
         """Override me to do something every second"""
         pass
+
+
+class OnChangeMixin:
+
+    on_change_fields = ('value', )
+
+    def get_instance(self):
+        # default for component
+        return self.zone.instance.timezone
+
+    def on_mqtt_connect(self, mqtt_client, userdata, flags, rc):
+        mqtt_client.subscribe(ObjectManagementEvent.TOPIC)
+
+    def on_mqtt_message(self, client, userdata, msg):
+        payload = json.loads(msg.payload)
+        if not self._on_change_function:
+            return
+        if payload['obj_pk'] != self.id:
+            return
+        if payload['obj_ct_pk'] != self._obj_ct_id:
+            return
+        if payload['event'] != 'changed':
+            return
+        if 'value' not in payload.get('dirty_fields', {}):
+            return
+
+        tz = pytz.timezone(self.gget_instance().timezone)
+        timezone.activate(tz)
+
+        self.refresh_from_db()
+
+        try:
+            self._on_change_function(self)
+        except Exception:
+            print(traceback.format_exc(), file=sys.stderr)
+
+    def on_change(self, function):
+        if function:
+            self._mqtt_client = mqtt.Client()
+            self._mqtt_client.on_connect = self.on_mqtt_connect
+            self._mqtt_client.on_message = self.on_mqtt_message
+            self._mqtt_client.connect(host=settings.MQTT_HOST,
+                                     port=settings.MQTT_PORT)
+            self._mqtt_client.loop_start()
+            self._on_change_function = function
+            self._obj_ct_id = ContentType.objects.get_for_model(self).pk
+        elif self._mqtt_client:
+            self._mqtt_client.disconnect()
+            self._mqtt_client.loop_stop()
+            self._mqtt_client = None
+            self._on_change_function = None

{simo-1.6.2 → simo-1.6.4}/src/simo/core/middleware.py

@@ -1,14 +1,9 @@
 import pytz
 import threading
-from django.urls import set_script_prefix, get_script_prefix
-from django.shortcuts import redirect, render
+from django.urls import set_script_prefix
 from django.utils import timezone
-from django.conf import settings
-from simo.users.models import User
 from simo.conf import dynamic_settings
 
-
-
 _thread_locals = threading.local()
 
 
@@ -25,7 +20,6 @@ def simo_router_middleware(get_response):
         _thread_locals.request = request
 
         request.relay = None
-        router_prefix = '/'
 
         if request.META.get('HTTP_HOST', '').endswith('.simo.io'):
             router_prefix = dynamic_settings['core__remote_http']

simo-1.6.4/src/simo/core/migrations/0022_auto_20231221_0735.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.2.9 on 2023-12-21 07:35
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0021_auto_20231020_1041'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='gateway',
+            name='type',
+            field=models.CharField(choices=[('simo.generic.gateways.DummyGatewayHandler', 'Dummy'), ('simo_esphome.gateways.ESPHomeGatewayHandler', 'ESPHome'), ('simo.generic.gateways.GenericGatewayHandler', 'Generic'), ('NukiDevices', 'Nuki'), ('simo_fleet.gateways.FleetGatewayHandler', 'SIMO.io Fleet'), ('simo_sonos.gateways.SONOSGatewayHandler', 'SONOS'), ('simo_zwave.gateways.ZwaveGatewayHandler', 'Zwave')], db_index=True, max_length=200, unique=True),
+        ),
+        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-1.6.2 → simo-1.6.4}/src/simo/core/models.py

@@ -1,9 +1,7 @@
 import os
 import sys
 import inspect
-import json
-import traceback
-import pytz
+
 from django.utils.text import slugify
 from django.core.cache import cache
 from django.urls import reverse_lazy
@@ -25,10 +23,7 @@ from django.contrib.contenttypes.models import ContentType
 from simo.core.utils.mixins import SimoAdminMixin
 from simo.core.storage import OverwriteStorage
 from simo.core.utils.validators import validate_svg
-from .events import ObjectCommand, ObjectManagementEvent
-
-
-
+from .events import ObjectCommand, ObjectManagementEvent, OnChangeMixin
 
 
 User = get_user_model()
@@ -239,7 +234,7 @@ class Gateway(DirtyFieldsMixin, models.Model, SimoAdminMixin):
             )
 
 
-class Component(DirtyFieldsMixin, models.Model, SimoAdminMixin):
+class Component(DirtyFieldsMixin, models.Model, SimoAdminMixin, OnChangeMixin):
     name = models.CharField(
         _('name'), max_length=100, db_index=True
     )
@@ -403,47 +398,6 @@ def translate_before_set(self, value):
             return '%s | %s' % (self.zone.name, self.name)
         return self.name
 
-    def on_mqtt_connect(self, mqtt_client, userdata, flags, rc):
-        mqtt_client.subscribe(ObjectManagementEvent.TOPIC)
-
-    def on_mqtt_message(self, client, userdata, msg):
-        payload = json.loads(msg.payload)
-        if not self._on_change_function:
-            return
-        if payload['obj_pk'] != self.id:
-            return
-        if payload['obj_ct_pk'] != self._obj_ct_id:
-            return
-        if payload['event'] != 'changed':
-            return
-        if 'value' not in payload.get('dirty_fields', {}):
-            return
-
-        tz = pytz.timezone(self.zone.instance.timezone)
-        timezone.activate(tz)
-
-        self.refresh_from_db()
-
-        try:
-            self._on_change_function(self)
-        except Exception:
-            print(traceback.format_exc(), file=sys.stderr)
-
-    def on_change(self, function):
-        if function:
-            self._mqtt_client = mqtt.Client()
-            self._mqtt_client.on_connect = self.on_mqtt_connect
-            self._mqtt_client.on_message = self.on_mqtt_message
-            self._mqtt_client.connect(host=settings.MQTT_HOST,
-                                     port=settings.MQTT_PORT)
-            self._mqtt_client.loop_start()
-            self._on_change_function = function
-            self._obj_ct_id = ContentType.objects.get_for_model(self).pk
-        elif self._mqtt_client:
-            self._mqtt_client.disconnect()
-            self._mqtt_client.loop_stop()
-            self._mqtt_client = None
-            self._on_change_function = None
 
     def get_socket_url(self):
         return reverse_lazy(

{simo-1.6.2 → simo-1.6.4}/src/simo/core/socket_consumers.py

@@ -6,7 +6,7 @@ import os
 import logging
 from ansi2html import Ansi2HTMLConverter
 from asgiref.sync import sync_to_async
-from django.urls import set_script_prefix, get_script_prefix
+from django.urls import set_script_prefix
 from django.core.exceptions import ValidationError
 from django.template.loader import render_to_string
 from django.conf import settings

{simo-1.6.2 → simo-1.6.4}/src/simo/core/widgets.py

@@ -1,5 +1,6 @@
 from django import forms
 from django.conf import settings
+from django.templatetags.static import static
 from django.utils.safestring import mark_safe
 from location_field.widgets import LocationWidget as OrgLocationWidget
 
@@ -12,6 +13,14 @@ class LocationWidget(OrgLocationWidget):
         if zoom:
             self.options['map.zoom'] = zoom
 
+    @property
+    def media(self):
+        return forms.Media({
+            'js': [
+                static('location_field') + '/js/form.js',
+            ],
+        })
+
 
 class SVGFileWidget(forms.ClearableFileInput):
     template_name = 'admin/svg_file_widget.html'

{simo-1.6.2 → simo-1.6.4}/src/simo/generic/controllers.py

@@ -1123,6 +1123,7 @@ class AlarmClock(ControllerBase):
                 week_days.sort()
                 week_days = week_days + [d + 7 for d in week_days]
                 for wd in week_days:
+                    alarm = json.loads(json.dumps(alarm))
                     if wd < weekday:
                         continue
                     days_diff = wd - weekday

{simo-1.6.2 → simo-1.6.4}/src/simo/users/admin.py

@@ -6,7 +6,7 @@ from django.contrib.auth.admin import UserAdmin as OrgUserAdmin
 from django.contrib import admin
 from .models import (
     PermissionsRole, ComponentPermission, User, UserDevice, UserDeviceReportLog,
-    InstanceInvitation, UserInstanceRole
+    InstanceInvitation, InstanceUser
 )
 
 
@@ -67,8 +67,8 @@ class UserDeviceInline(admin.TabularInline):
         return mark_safe('<a href="%s">more >></a>' % obj.get_admin_url())
 
 
-class UserInstanceRoleInline(admin.TabularInline):
-    model = UserInstanceRole
+class InstanceUserInline(admin.TabularInline):
+    model = InstanceUser
     extra = 0
     readonly_fields = 'instance', 'at_home'
 
@@ -90,7 +90,7 @@ class UserAdmin(OrgUserAdmin):
         'name', 'email', 'avatar',
         'last_action', 'ssh_key',
     )
-    inlines = UserDeviceInline, UserInstanceRoleInline
+    inlines = UserDeviceInline, InstanceUserInline
 
     def name_display(self, obj=None):
         if not obj:
@@ -132,8 +132,8 @@ admin.site.unregister(Group)
 @admin.register(UserDeviceReportLog)
 class UserDeviceLogInline(admin.ModelAdmin):
     model = UserDeviceReportLog
-    readonly_fields = 'datetime', 'app_open', 'location', 'relay', 'at_home'
-    list_display = 'datetime', 'app_open', 'location', 'relay', 'at_home'
+    readonly_fields = 'datetime', 'app_open', 'location', 'relay'
+    list_display = 'datetime', 'app_open', 'location', 'relay'
     fields = readonly_fields
     list_filter = 'user_device__user',
 

{simo-1.6.2 → simo-1.6.4}/src/simo/users/api.py

@@ -11,7 +11,7 @@ from simo.core.api import InstanceMixin
 from simo.core.models import Instance
 from .models import (
     User, UserDevice, UserDeviceReportLog, PermissionsRole, InstanceInvitation,
-    UserInstanceRole
+    InstanceUser
 )
 from .serializers import (
     UserSerializer, PermissionsRoleSerializer, InstanceInvitationSerializer
@@ -169,12 +169,6 @@ class UserDeviceReport(viewsets.GenericViewSet):
         if request.META.get('HTTP_HOST', '').endswith('.simo.io'):
             relay = request.META.get('HTTP_HOST')
 
-        at_home = False
-        if not relay:
-            at_home = True
-        elif location:
-            pass
-
 
         # TODO: fire at home event:
         # from simo.core.events import Event
@@ -185,9 +179,9 @@ class UserDeviceReport(viewsets.GenericViewSet):
         # ).publish()
 
         if not relay:
-            UserInstanceRole.objects.filter(
-                user=request.user
-            ).update(at_home=True)
+            for item in InstanceUser.objects.filter(user=request.user):
+                item.at_home = True
+                item.save()
         elif location:
             for instance in Instance.objects.all():
                 cords = instance.location
@@ -201,19 +195,21 @@ class UserDeviceReport(viewsets.GenericViewSet):
                 else:
                     if distance(instance_location, location).meters < \
                             dynamic_settings['users__at_home_radius']:
-                        UserInstanceRole.objects.filter(
-                            user=request.user, instance=instance
-                        ).update(at_home=True)
+                        at_home = True
                     else:
-                        UserInstanceRole.objects.filter(
-                            user=request.user, instance=instance
-                        ).update(at_home=False)
+                        at_home = False
+
+                    for item in InstanceUser.objects.filter(
+                        user=request.user, instance=instance
+                    ):
+                        item.at_home = at_home
+                        item.save()
 
         log_entry = UserDeviceReportLog.objects.create(
             user_device=user_device,
             app_open=request.data.get('app_open', False),
             location=','.join([str(i) for i in location]) if location else None,
-            relay=relay, at_home=at_home
+            relay=relay
         )
         # Do not keep more than 1000 entries for every device.
         for log in UserDeviceReportLog.objects.filter(

{simo-1.6.2 → simo-1.6.4}/src/simo/users/auth_backends.py

@@ -4,7 +4,7 @@ import requests
 from django.core.files import File
 from django.contrib.auth.backends import ModelBackend
 from django.utils import timezone
-from .models import User, InstanceInvitation, UserInstanceRole
+from .models import User, InstanceInvitation, InstanceUser
 from .utils import get_superuser_role
 
 
@@ -52,7 +52,7 @@ class SSOBackend(ModelBackend):
         if invitation:
             invitation.taken_by = user
             invitation.save()
-            UserInstanceRole.objects.create(
+            InstanceUser.objects.create(
                 user=user, role=invitation.role,
                 instance=invitation.instance
             )

simo-1.6.4/src/simo/users/migrations/0017_auto_20231221_0735.py

@@ -0,0 +1,22 @@
+# Generated by Django 3.2.9 on 2023-12-21 07:35
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0022_auto_20231221_0735'),
+        ('users', '0016_auto_20231005_1050'),
+    ]
+
+    operations = [
+        migrations.RenameModel(
+            old_name='UserInstanceRole',
+            new_name='InstanceUser',
+        ),
+        migrations.RemoveField(
+            model_name='userdevicereportlog',
+            name='at_home',
+        ),
+    ]

{simo-1.6.2 → simo-1.6.4}/src/simo/users/models.py

@@ -7,6 +7,8 @@ from django.db.models import Q
 from django.db import transaction
 from django.db.models.signals import post_save, post_delete, m2m_changed
 from django.dispatch import receiver
+from model_utils import FieldTracker
+from dirtyfields import DirtyFieldsMixin
 from django.core.exceptions import ValidationError
 from django.contrib.auth.models import (
     AbstractBaseUser, PermissionsMixin, UserManager as DefaultUserManager
@@ -17,6 +19,7 @@ from location_field.models.plain import PlainLocationField
 from simo.conf import dynamic_settings
 from simo.core.utils.mixins import SimoAdminMixin
 from simo.core.utils.helpers import get_random_string
+from simo.core.events import OnChangeMixin
 from .middleware import get_current_user
 from .utils import rebuild_authorized_keys
 
@@ -69,7 +72,7 @@ class UserManager(DefaultUserManager):
         return user
 
 
-class UserInstanceRole(models.Model):
+class InstanceUser(DirtyFieldsMixin, models.Model, OnChangeMixin):
     user = models.ForeignKey(
         'User', on_delete=models.CASCADE, related_name='instance_roles'
     )
@@ -91,6 +94,23 @@ class UserInstanceRole(models.Model):
         self.instance = self.role.instance
         return super().save(*args, **kwargs)
 
+    def get_instance(self):
+        return self.instance
+
+
+@receiver(post_save, sender=InstanceUser)
+def post_instance_user_save(sender, instance, created, **kwargs):
+    if created:
+        return
+    from simo.core.events import ObjectManagementEvent
+    dirty_fields = instance.get_dirty_fields()
+    if 'at_home' in dirty_fields:
+        def post_update():
+            ObjectManagementEvent(
+                instance, 'changed', dirty_fields=dirty_fields
+            ).publish()
+        transaction.on_commit(post_update)
+
 
 class User(AbstractBaseUser, SimoAdminMixin):
     name = models.CharField(_('name'), max_length=150)
@@ -101,7 +121,7 @@ class User(AbstractBaseUser, SimoAdminMixin):
     )
     avatar_url = models.URLField(null=True, blank=True)
     avatar_last_change = models.DateTimeField(auto_now_add=True)
-    roles = models.ManyToManyField(PermissionsRole, through=UserInstanceRole)
+    roles = models.ManyToManyField(PermissionsRole, through=InstanceUser)
     is_active = models.BooleanField(
         _('active'),
         default=True,
@@ -205,7 +225,7 @@ class User(AbstractBaseUser, SimoAdminMixin):
         if not role:
             raise ValueError("There is no such a role on this instance")
 
-        UserInstanceRole.objects.update_or_create(
+        InstanceUser.objects.update_or_create(
             user=self, instance=self._instance, defaults={
                 'role': role
             }
@@ -324,7 +344,6 @@ class UserDeviceReportLog(models.Model):
         help_text="Sent via remote relay if specified, otherwise it's from LAN."
     )
     location = PlainLocationField(zoom=7, null=True, blank=True)
-    at_home = models.BooleanField(default=False)
 
     class Meta:
         ordering = '-datetime',

{simo-1.6.2 → simo-1.6.4}/src/simo/users/serializers.py

@@ -3,7 +3,7 @@ from collections.abc import Iterable
 from simo.core.middleware import get_current_request
 from simo.core.serializers import TimestampField
 from easy_thumbnails.files import get_thumbnailer
-from .models import User, PermissionsRole, InstanceInvitation, UserInstanceRole
+from .models import User, PermissionsRole, InstanceInvitation, InstanceUser
 
 
 class UserSerializer(serializers.ModelSerializer):
@@ -42,7 +42,7 @@ class UserSerializer(serializers.ModelSerializer):
         return None
 
     def get_at_home(self, obj):
-        return UserInstanceRole.objects.filter(
+        return InstanceUser.objects.filter(
             user=obj
         ).first().at_home
 

{simo-1.6.2 → simo-1.6.4/src/simo.egg-info}/PKG-INFO

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