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

simo/automation/controllers.py

@@ -198,6 +198,9 @@ class PresenceLighting(Script):
         if must_on and on_sensor:
             print("Presence detected!")
 
+        if must_on:
+            self.last_presence = 0
+
         additional_conditions_met = True
         for condition in self.conditions:
 
@@ -226,7 +229,6 @@ class PresenceLighting(Script):
                 additional_conditions_met = False
                 break
 
-
         if not self.is_on:
             if not must_on:
                 return

simo/core/api.py

@@ -734,11 +734,12 @@ class ControllerTypes(InstanceMixin, viewsets.GenericViewSet):
         for uid, cls in get_controller_types_map(user=request.user).items():
             if cls.gateway_class.name not in data:
                 data[cls.gateway_class.name] = []
+            if not cls.manual_add:
+                continue
             data[cls.gateway_class.name].append({
                 'uid': uid,
                 'name': cls.name,
                 'is_discoverable': cls.is_discoverable,
-                'manual_add': cls.manual_add,
                 'discovery_msg': cls.discovery_msg,
                 'info': cls.info(cls)
             })
@@ -767,6 +768,8 @@ class GWControllerTypes(InstanceMixin, viewsets.GenericViewSet):
                     'info': cls.gateway_class.info,
                     'controllers': []
                 }
+            if not cls.manual_add:
+                continue
             data[cls.gateway_class.uid]['controllers'].append({
                 'uid': uid,
                 'name': cls.name,

simo/fleet/controllers.py

@@ -100,36 +100,21 @@ class BurglarSmokeDetector(BinarySensor):
         ]
 
 
-# class AnalogSensor(FleeDeviceMixin, BasicSensorMixin, BaseNumericSensor):
-#     config_form = ColonelNumericSensorConfigForm
-#     name = "Analog sensor"
-#
-#     def _get_occupied_pins(self):
-#         return [
-#             self.component.config['pin_no'],
-#         ]
-
-
 class DS18B20Sensor(FleeDeviceMixin, BasicSensorMixin, BaseNumericSensor):
     config_form = DS18B20SensorConfigForm
     name = "DS18B20 Temperature sensor"
 
 
-
-# TODO: need to change this to {
-#                 'temp': self.sensor.temperature, 'hum': self.sensor.humidity,
-#                 'pressure': self.sensor.pressure, 'gas': self.sensor.gas
-#             }
-# which is used by BME680Sensor
-
-class BaseClimateSensor(FleeDeviceMixin, BasicSensorMixin, BaseMultiSensor):
+class DHTSensor(FleeDeviceMixin, BasicSensorMixin, BaseMultiSensor):
+    config_form = ColonelDHTSensorConfigForm
+    name = "DHT climate sensor"
     app_widget = NumericSensorWidget
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.sys_temp_units = 'C'
         if hasattr(self.component, 'zone') \
-        and self.component.zone.instance.units_of_measure == 'imperial':
+                and self.component.zone.instance.units_of_measure == 'imperial':
             self.sys_temp_units = 'F'
 
     @property
@@ -164,13 +149,6 @@ class BaseClimateSensor(FleeDeviceMixin, BasicSensorMixin, BaseMultiSensor):
         return new_val
 
 
-
-
-class DHTSensor(BaseClimateSensor):
-    config_form = ColonelDHTSensorConfigForm
-    name = "DHT climate sensor"
-
-
 class BME680Sensor(FleeDeviceMixin, BaseMultiSensor):
     gateway_class = FleetGatewayHandler
     config_form = BME680SensorConfigForm

simo/users/migrations/0039_auto_20241117_1039.py

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

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

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

{simo-2.6.8.dist-info → simo-2.6.9.dist-info}/RECORD

@@ -13,7 +13,7 @@ simo/__pycache__/urls.cpython-38.pyc,sha256=u0x6EqT8S1YfDOSPgbI8Kf-RDlveY9OV-EDX
 simo/__pycache__/wsgi.cpython-38.pyc,sha256=TpRxO7VM_ql31hbKphVdanydC5RI1nHB4l0QA2pdWxo,322
 simo/automation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/automation/app_widgets.py,sha256=gaqImMZjuMHm7nIb9a4D-Y3qipz_WhSPAHXcwGx4Uzs,199
-simo/automation/controllers.py,sha256=kk_gssVoxfkn268gAhmmSpTWnW4UnEQAVyxLHwyZYPc,10498
+simo/automation/controllers.py,sha256=cgTuS9Gwi9R94FTi4kbN9VG74HhddHxEqlCZEbvE-jY,10553
 simo/automation/forms.py,sha256=UWnkxw8pILPK0smRPTo4SLgsZl78zOySx7JIc30Bgtk,10228
 simo/automation/gateways.py,sha256=wElqHHyNd2jdpWuhO9DQ0yORIrObSzJsgZ-4dlKCLo4,9471
 simo/automation/helpers.py,sha256=iP-fxxB8HsFQy3k2CjFubu86aMqvWgmh-p24DiyOrek,4330
@@ -22,7 +22,7 @@ simo/automation/serializers.py,sha256=PjyFrjdPK1mBsgbNhyqMi9SWzcymqTa742ipy0LhAN
 simo/automation/state.py,sha256=aZZvNBae7unnux_zGHCIWCV2z47hVJc-DIL72Hqfkeo,600
 simo/automation/__pycache__/__init__.cpython-38.pyc,sha256=YmP0xAD-mxpQHgdTZeC64sXChA8TriMZD1jckNYi3xg,164
 simo/automation/__pycache__/app_widgets.cpython-38.pyc,sha256=7DfUA9V_1MiwrOe_ta-ts8dYY8xXb9UMg2_9A3XoRcs,523
-simo/automation/__pycache__/controllers.cpython-38.pyc,sha256=YTL0-xu1CjO57mz1HKX1DIDrZeSGiGtl9-uKlokbF1Y,8024
+simo/automation/__pycache__/controllers.cpython-38.pyc,sha256=K0cTMm42Ia4k0p2ZLQOU8aiJjZh32Ku965QfqSR7Vsw,8038
 simo/automation/__pycache__/forms.cpython-38.pyc,sha256=cpA5hA2Iz3JsPC0Dq01ki1I7S9c5DKRcXveHApI1dJo,7772
 simo/automation/__pycache__/gateways.cpython-38.pyc,sha256=4gDB7AeKwumAty-1x1Uyh1dEckw-kntBafMNvayH-PA,7621
 simo/automation/__pycache__/helpers.cpython-38.pyc,sha256=4VSSarOFnUk_KExWwvDlx5dEhv8aHUCHMZDtGG--pUY,3627
@@ -61,7 +61,7 @@ simo/backups/migrations/__pycache__/0004_alter_backup_options_alter_backuplog_op
 simo/backups/migrations/__pycache__/__init__.cpython-38.pyc,sha256=Lz1fs6V05h2AoxTOLNye0do9bEMnyuaXB_hHOjG5-HU,172
 simo/core/__init__.py,sha256=_s2TjJfQImsMrTIxqLAx9AZie1Ojmm6sCHASdl3WLGU,50
 simo/core/admin.py,sha256=nmFDO57D5hXHDfl0wjJ9J5jBxyCqW4Gp_uqHhpS2uuw,18564
-simo/core/api.py,sha256=iipxmn7rWnK_c2JaHJ8PQ7BVAsA19VlFIM7RkU0HxNM,30232
+simo/core/api.py,sha256=eJCV5kScDWfVUa7RprMWvu8PQlGX2T3vCGIhIl4Z6Jw,30306
 simo/core/api_auth.py,sha256=vCxvczA8aWNcW0VyKs5WlC_ytlqeGP_H_hkKUNVkCwM,1247
 simo/core/api_meta.py,sha256=e9iqVv-3d651lMvZY-ILG4F35Puh2XunnwykiBUbl5E,5055
 simo/core/app_widgets.py,sha256=VxZzapuc-a29wBH7JzpvNF2SK1ECrgNUySId5ke1ffc,2509
@@ -94,7 +94,7 @@ simo/core/views.py,sha256=yx9I0byeVUa-LAOnklpWIYwpNNOf5m9fyjKBvj4YCh4,2475
 simo/core/widgets.py,sha256=J9e06C6I22F6xKic3VMgG7WeX07glAcl-4bF2Mg180A,2827
 simo/core/__pycache__/__init__.cpython-38.pyc,sha256=ZJFM_XN0RmJMULQulgA_wFiOnEtsMoedcOWnXjH-Y8o,208
 simo/core/__pycache__/admin.cpython-38.pyc,sha256=WAfdq_hAdkW-_QwJ0E7NSd25yxnPRi_HjJ-uKFMJzcg,14146
-simo/core/__pycache__/api.cpython-38.pyc,sha256=88Btwy435_Jb5bYnkuBfsrNILpdfhMTCYHuNdo1pu-8,23209
+simo/core/__pycache__/api.cpython-38.pyc,sha256=uSPeR38cxPN2H875ky5tDlF_tkkuInzB92qaK4lQWUA,23249
 simo/core/__pycache__/api_auth.cpython-38.pyc,sha256=mi3mu5qEKio_PvfQEvr3Q6AhdPLAHxzxAxrMbAz_pKU,1712
 simo/core/__pycache__/api_meta.cpython-38.pyc,sha256=PrJrXcjbhXQkYrvEVG9jpRzkB8XYBMRQuKjXrgU9POA,3742
 simo/core/__pycache__/app_widgets.cpython-38.pyc,sha256=oN657XMMZ6GYN9nblv7fX3kdnTEzSP9XV6PXM6Z0wl4,4358
@@ -10253,7 +10253,7 @@ simo/fleet/api.py,sha256=rJwAYJvp0uslW7O6Q4XOpOa8hfCdy3keUD7b3UNL43E,3424
 simo/fleet/auto_urls.py,sha256=UX66eR2ykMqFgfIllW-RTdjup5-FieCWl_BVm3CcXKg,702
 simo/fleet/base_types.py,sha256=wL9RVkHr0gA7HI1wZq0pruGEIgvQqpfnCL4cC3ywsvw,102
 simo/fleet/ble.py,sha256=eHA_9ABjbmH1vUVCv9hiPXQL2GZZSEVwfO0xyI1S0nI,1081
-simo/fleet/controllers.py,sha256=jz-DyWP1F-eLUl8UkbCAqiAqRUm4d_TXVuepTIe9akU,29157
+simo/fleet/controllers.py,sha256=PezfOT-1N_UONSsbyTXEIyGO6Po57KdEBRv4yzk_sw0,28605
 simo/fleet/forms.py,sha256=2pbX1otTb1HqJ3aksRWz-FbsJ3YIyx6weV_tMFonecY,64772
 simo/fleet/gateways.py,sha256=C7dyapWDlJ5erYPNLkSoH50I8kj0lIXicSno0_CrdXc,5783
 simo/fleet/managers.py,sha256=ZNeHFSkF5kzsl9E1DCBevOW6kXJlD6kw0LU4B-JMOG8,828
@@ -10270,7 +10270,7 @@ simo/fleet/__pycache__/api.cpython-38.pyc,sha256=rZ1mkfkaMBEXhi9sw_jTKdk2CPJhBNx
 simo/fleet/__pycache__/auto_urls.cpython-38.pyc,sha256=Tc6a6BCXHjijP8U2jE2ghlJwnSNrGm59-hW5t-80wF0,689
 simo/fleet/__pycache__/base_types.cpython-38.pyc,sha256=deyPwjpT6xZiFxBGFnj5b7R-lbdOTh2krgpJhrcGVhc,274
 simo/fleet/__pycache__/ble.cpython-38.pyc,sha256=Nrof9w7cm4OlpFWHeVnmvvanh2_oF9oQ3TknJiV93-0,1267
-simo/fleet/__pycache__/controllers.cpython-38.pyc,sha256=C8pGEX-J8aaXsq9tNIMNAcd4Ip37--nT1V7eqXd6aQg,24906
+simo/fleet/__pycache__/controllers.cpython-38.pyc,sha256=UtuihR455FLsHFAtMBh6haJzypp_HTyo3o8kPH02gnI,24739
 simo/fleet/__pycache__/forms.cpython-38.pyc,sha256=VQqXDYGpTMMOrV3PGXFbWD_49XjglqJO2LWIHidMom0,43550
 simo/fleet/__pycache__/gateways.cpython-38.pyc,sha256=MIpXuGWitGNdsxJ99fWvMXJ6sVE96ac7iR4K4aM4Sds,5148
 simo/fleet/__pycache__/managers.cpython-38.pyc,sha256=Vmm23zoQnS3-uS5_WJt2n3wtjhLiEhLWaYxXJCU6Gts,1339
@@ -10367,6 +10367,7 @@ simo/fleet/migrations/__pycache__/0039_auto_20241016_1047.cpython-38.pyc,sha256=
 simo/fleet/migrations/__pycache__/0040_alter_colonel_pwm_frequency.cpython-38.pyc,sha256=o_trHQUyQfYzWO_iWmZpvzc-uVJlBjK-GfyKhPOVSjc,736
 simo/fleet/migrations/__pycache__/0041_alter_colonel_instance_and_more.cpython-38.pyc,sha256=76yu9gz3pcAq5IYbNeZIoOSgdi0HVqTvc3EdXLGriQI,1178
 simo/fleet/migrations/__pycache__/0042_auto_20241120_1028.cpython-38.pyc,sha256=yK2HRc7MYMc4i9ev7FaguBdnXUnUmpFn8E8JOP_yluA,1030
+simo/fleet/migrations/__pycache__/0043_auto_20241203_0930.cpython-38.pyc,sha256=0QWVIvorcCuhfuGFu0fMdu5vkxcQSosxjt8KT6Ld07E,980
 simo/fleet/migrations/__pycache__/__init__.cpython-38.pyc,sha256=5k1KW0jeSDzw6RnVPRq4CaO13Lg7M0F-pxA_gqqZ6Mg,170
 simo/fleet/templates/fleet/controllers_info/Button.md,sha256=GIuxqG617174NEtpPeCGVocxO4YMe7-CacgVSu_L5-E,739
 simo/fleet/templates/fleet/controllers_info/ENS160AirQualitySensor.md,sha256=3LSTY9YPFuVPIbVsYCAifcotrXJcOXl2k774_vo6nAE,770
@@ -10540,7 +10541,7 @@ simo/users/migrations/0035_instanceuser_last_seen_speed_kmh_and_more.py,sha256=l
 simo/users/migrations/0036_instanceuser_phone_on_charge_user_phone_on_charge.py,sha256=uHXLRmFAASdB9sPivYkRu7WV4rxZDI3RaEwl2i7U_xg,615
 simo/users/migrations/0037_rename_last_seen_location_datetime_instanceuser_last_seen_and_more.py,sha256=8f_7fC7k0Dm-0gGVHMI9_490BbEC_SfuAPrAADrZ7BA,1543
 simo/users/migrations/0038_userdevicereportlog_at_home_and_more.py,sha256=qL1ZjUJDiSrJat59ToqpNBwnMMPb3Q5mwHq-qd1eFcI,691
-simo/users/migrations/0039_auto_20241117_1039.py,sha256=e64AJM2ZId516Px-gmAxkp2NmSC5Vjo_BBTGbYrFuKY,1310
+simo/users/migrations/0039_auto_20241117_1039.py,sha256=BCIIDfvRzIHaP3SM-Df1XYjWzVLugFqAYGcFofaQepE,1369
 simo/users/migrations/0040_userdevicereportlog_location_smoothed_and_more.py,sha256=umGDjQGpCrQocNxaCvwdTsOmSxcRC61NcUdHGUczoc4,855
 simo/users/migrations/0041_userdevicereportlog_speed_kmh_received.py,sha256=WoJ-ImX1lNIl7CKO_HMt3jbFjoenFGBUm9HZWidb-eA,433
 simo/users/migrations/0042_remove_userdevicereportlog_location_smoothed_and_more.py,sha256=p-GFu6qjkxqeA0TI8aaIum0k6fQfc39RIKbfGPSf0Yk,499
@@ -10586,7 +10587,7 @@ simo/users/migrations/__pycache__/0035_instanceuser_last_seen_speed_kmh_and_more
 simo/users/migrations/__pycache__/0036_instanceuser_phone_on_charge_user_phone_on_charge.cpython-38.pyc,sha256=y1ZDJ8VM5_vJOxTPRERjwukiGXJ89UhDc4bHiHZwQ_w,723
 simo/users/migrations/__pycache__/0037_rename_last_seen_location_datetime_instanceuser_last_seen_and_more.cpython-38.pyc,sha256=W4Rc6SRNNJ_yAYrEyoklD5LFmQPAL9mTDrXHMfP8R4I,1162
 simo/users/migrations/__pycache__/0038_userdevicereportlog_at_home_and_more.cpython-38.pyc,sha256=khDSeTH3-jJ4yO1D6-i3Pm_NekJkVwBSUJ-rAxu0cr4,836
-simo/users/migrations/__pycache__/0039_auto_20241117_1039.cpython-38.pyc,sha256=IEOIfvnUiV-GX9VI4W2UKJugC3nfwKfy7QdmS3pW6Ss,1377
+simo/users/migrations/__pycache__/0039_auto_20241117_1039.cpython-38.pyc,sha256=2Qi46pncWXhcy6EaqXdLuynw3nCxqDC_KtS_3MToH1g,798
 simo/users/migrations/__pycache__/0040_userdevicereportlog_location_smoothed_and_more.cpython-38.pyc,sha256=I0W00mt73gjKunnwAyf3kz1FKfgm2HRwCJY_ogATSS0,918
 simo/users/migrations/__pycache__/0041_userdevicereportlog_speed_kmh_received.cpython-38.pyc,sha256=XWC9Emcc1Bm498UZ-6Lo7-i2Vq77vndjMA9xRdJbdfU,676
 simo/users/migrations/__pycache__/0042_remove_userdevicereportlog_location_smoothed_and_more.cpython-38.pyc,sha256=sSnWjU7rg5LXlRCxUFb_m2lUIcB4EHgtAnl-C9MMJvE,656
@@ -10600,9 +10601,9 @@ simo/users/templates/invitations/expired_msg.html,sha256=47DEQpj8HBSa-_TImW-5JCe
 simo/users/templates/invitations/expired_suggestion.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/users/templates/invitations/taken_msg.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/users/templates/invitations/taken_suggestion.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-simo-2.6.8.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.6.8.dist-info/METADATA,sha256=oLE9PcdmNJtUr78LOvEltMytRMStMXtcPoWCS7O4Y-E,1952
-simo-2.6.8.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-simo-2.6.8.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
-simo-2.6.8.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.6.8.dist-info/RECORD,,
+simo-2.6.9.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.6.9.dist-info/METADATA,sha256=cCWJSmJj43zsbyPzT4tUyfvv4mU2nbkwzh0nTHzyJdk,1952
+simo-2.6.9.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+simo-2.6.9.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
+simo-2.6.9.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.6.9.dist-info/RECORD,,