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

simo/core/tasks.py

@@ -227,16 +227,20 @@ def sync_with_remote():
             instance.is_active = True
             instance.save()
 
-        if weather:
-            from simo.generic.controllers import Weather
-            weather_component = Component.objects.filter(
-                zone__instance=instance,
-                controller_uid=Weather.uid
-            ).first()
-            if weather_component:
+        from simo.generic.controllers import Weather
+        weather_component = Component.objects.filter(
+            zone__instance=instance,
+            controller_uid=Weather.uid
+        ).first()
+        if weather_component:
+            if weather:
                 weather_component.track_history = False
+                weather_component.alive = True
                 weather_component.controller.set(weather)
                 weather_component.save()
+            else:
+                weather_component.alive = False
+                weather_component.save()
 
         if new_instance:
             print(f"NEW INSTANCE: {instance}")

simo/generic/controllers.py

@@ -76,7 +76,7 @@ class Thermostat(ControllerBase):
             min = 40
             max = 95
         return {
-            'temperature_sensor': 0, 'heater': 0, 'cooler': 0,
+            'temperature_sensor': 0, 'heaters': [], 'coolers': [],
             'engagement': 'dynamic','reaction_difference': 2,
             'min': min, 'max': max,
             'has_real_feel': False,
@@ -164,21 +164,35 @@ class Thermostat(ControllerBase):
         tz = pytz.timezone(self.component.zone.instance.timezone)
         timezone.activate(tz)
         temperature_sensor = Component.objects.filter(
-            pk=self.component.config.get('temperature_sensor')
+            pk=self.component.config.get('temperature_sensor'),
+            alive=True
         ).first()
         heaters = Component.objects.filter(
-            pk__in=self.component.config.get('heater')
+            pk__in=self.component.config.get('heaters', []),
+            alive=True
         )
         coolers = Component.objects.filter(
-            pk__in=self.component.config.get('cooler')
+            pk__in=self.component.config.get('coolers', []),
+            alive=True
         )
 
+        if not heaters and not coolers:
+            self.component.error_msg = "No heaters/coolers"
+            self.component.alive = False
+            self.component.save()
+            return
+
         if not temperature_sensor or not temperature_sensor.alive:
             self.component.error_msg = "No temperature sensor"
             self.component.alive = False
             self.component.save()
             return
 
+        if self.component.error_msg or not self.component.alive:
+            self.component.error_msg = None
+            self.component.alive = True
+            self.component.save()
+
         current_temp = temperature_sensor.value
         if temperature_sensor.base_type == MultiSensor.base_type:
             value_dict = {}
@@ -191,6 +205,23 @@ class Thermostat(ControllerBase):
 
         target_temp = self.get_current_target_temperature()
         mode = self.component.config['user_config'].get('mode', 'auto')
+        prefer_heating = True
+
+        weather = Component.objects.filter(
+            zone__instance=self.component.zone.instance,
+            controller_uid=Weather.uid, alive=True
+        ).first()
+        if weather:
+            try:
+                feels_like = weather.value['main']['feels_like']
+                if feels_like:
+                    instance = get_current_instance()
+                    if instance.units_of_measure == 'imperial':
+                        feels_like = round((feels_like * 9 / 5) + 32, 1)
+                    if target_temp < feels_like:
+                        prefer_heating = False
+            except:
+                pass
 
         low = target_temp - self.component.config['reaction_difference']
         high = target_temp + self.component.config['reaction_difference']
@@ -198,57 +229,37 @@ class Thermostat(ControllerBase):
         heating = False
         cooling = False
 
-        if self.component.config.get('engagement', 'static'):
-            if heaters:
-                for heater in heaters:
-                    if current_temp < low:
-                        if heater.base_type == 'dimmer':
-                            heater.max_out()
-                        else:
-                            heater.turn_on()
-                        heating = True
-                    elif current_temp > high:
-                        heater.turn_off()
-                        heating = False
-                    else:
-                        if heater.value:
-                            heating = True
-                            break
-
-            if coolers:
-                for cooler in coolers:
-                    if heating: # Do not cool if heating!
-                        cooler.turn_off()
-                    else:
-                        if current_temp > high:
-                            if heater.base_type == 'dimmer':
-                                cooler.max_out()
-                            else:
-                                cooler.turn_on()
-                            cooling = True
-                        elif current_temp < low:
-                            if cooler.value:
-                                cooler.turn_off()
-                            cooling = False
-                        else:
-                            if cooler.value:
-                                cooling = True
-                                break
+        if self.component.config.get('engagement', 'static') == 'static':
+            if prefer_heating and heaters:
+                heating = self._engage_heating(
+                    heaters, current_temp, low, high
+                )
+                if not heating:
+                    cooling = self._engage_cooling(
+                        coolers, current_temp, low, high
+                    )
+            else:
+                cooling = self._engage_cooling(
+                    coolers, current_temp, low, high
+                )
+                if not cooling:
+                    heating = self._engage_heating(
+                        heaters, current_temp, low, high
+                    )
 
         else:
             window = high - low
-            if heaters:
+            if prefer_heating and heaters:
                 reach = high - current_temp
                 reaction_force = self._get_reaction_force(window, reach)
                 if reaction_force:
                     heating = True
                 self._engage_devices(heaters, reaction_force)
-            if coolers:
-                if heating: # Do not cool if heating!
-                    reaction_force = 0
-                else:
-                    reach = current_temp - low
-                    reaction_force = self._get_reaction_force(window, reach)
+            elif coolers:
+                reach = current_temp - low
+                reaction_force = self._get_reaction_force(window, reach)
+                if reaction_force:
+                    cooling = True
                 self._engage_devices(coolers, reaction_force)
 
         self.component.set({
@@ -263,6 +274,45 @@ class Thermostat(ControllerBase):
         self.component.save()
 
 
+    def _engage_heating(self, heaters, current_temp, low, high):
+        heating = False
+        for heater in heaters:
+            if current_temp < low:
+                if heater.base_type == 'dimmer':
+                    heater.max_out()
+                else:
+                    heater.turn_on()
+                heating = True
+            elif current_temp > high:
+                heater.turn_off()
+                heating = False
+            else:
+                if heater.value:
+                    heating = True
+                    break
+        return heating
+
+
+    def _engage_cooling(self, coolers, current_temp, low, high):
+        cooling = False
+        for cooler in coolers:
+            if current_temp > high:
+                if cooler.base_type == 'dimmer':
+                    cooler.max_out()
+                else:
+                    cooler.turn_on()
+                cooling = True
+            elif current_temp < low:
+                if cooler.value:
+                    cooler.turn_off()
+                cooling = False
+            else:
+                if cooler.value:
+                    cooling = True
+                    break
+        return cooling
+
+
     def _get_reaction_force(self, window, reach):
         if reach > window:
             reaction_force = 100

simo/generic/gateways.py

@@ -439,7 +439,7 @@ class GenericGatewayHandler(
 
         step = 0
         while not exit.is_set():
-            time.sleep(0.1)
+            time.sleep(0.25)
             step += 1
             remove_switches = []
             for id, data in self.pulsing_switches.items():
@@ -475,8 +475,8 @@ class GenericGatewayHandler(
             for id in remove_switches:
                 del self.pulsing_switches[id]
 
-            # Update with db every 5s just in case something is missed.
-            if step < 50:
+            # Update with db every 10s just in case something is missed.
+            if step < 40:
                 continue
             step = 0
 

simo/users/api.py

@@ -218,12 +218,15 @@ class UserDeviceReport(InstanceMixin, viewsets.GenericViewSet):
             for speed in UserDeviceReportLog.objects.filter(
                 user_device=user_device, instance=self.instance,
                 datetime__lt=log_datetime - datetime.timedelta(seconds=3),
-                datetime__gt=log_datetime - datetime.timedelta(seconds=30),
+                datetime__gt=log_datetime - datetime.timedelta(seconds=120),
                 at_home=False, location__isnull=False
             ).values('speed_kmh',):
-                sum += speed[0]
-            sum += speed_kmh
-            avg_speed_kmh = round(sum / (no_of_points + 1))
+                if speed:
+                    sum += speed[0]
+                    no_of_points += 1
+            if no_of_points > 2:
+                sum += speed_kmh
+                avg_speed_kmh = round(sum / (no_of_points + 1))
         else:
             location = self.instance.location
 

{simo-2.10.1.dist-info → simo-2.10.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simo
-Version: 2.10.1
+Version: 2.10.3
 Summary: Smart Home Supremacy
 Author-email: Simanas Venčkauskas <simanas@simo.io>
 Project-URL: Homepage, https://simo.io

{simo-2.10.1.dist-info → simo-2.10.3.dist-info}/RECORD

@@ -115,7 +115,7 @@ simo/core/serializers.py,sha256=Yeu6YRGMIZzAgnfIgm0_v4pWXDgsBCSlwWaDws_bMUg,2310
 simo/core/signal_receivers.py,sha256=PsAHAvdFKuNLjxNbb7UqjrX7VHtjdPAhP2y3vbhVGXs,7114
 simo/core/socket_consumers.py,sha256=UlxV9OvTUUXaoKKYT3-qf1TyGxyOPxIpFH5cPFepH1o,9584
 simo/core/storage.py,sha256=_5igjaoWZAiExGWFEJMElxUw55DzJG1jqFty33xe8BE,342
-simo/core/tasks.py,sha256=Y9gXMd1QBjpO_4EAOuMSoHfK4H4qVcsg-36mPcx2sPU,17322
+simo/core/tasks.py,sha256=usYjpNewy7uL7vIXtG1qB8ZnhJr-Orl_kVtKyR0GOjM,17456
 simo/core/todos.py,sha256=eYVXfLGiapkxKK57XuviSNe3WsUYyIWZ0hgQJk7ThKo,665
 simo/core/types.py,sha256=WJEq48mIbFi_5Alt4wxWMGXxNxUTXqfQU5koH7wqHHI,1108
 simo/core/views.py,sha256=BBh8U2P3rS_WccKN9hN6dhtiyXIfCX9I80zNwejqfe4,3666
@@ -176,7 +176,7 @@ simo/core/__pycache__/socket_consumers.cpython-312.pyc,sha256=Yph9SQTj6c3xr2HXKn
 simo/core/__pycache__/socket_consumers.cpython-38.pyc,sha256=Mr1-x-vGjBNffbz0S6AKpJCuzHJgRm8kXefv3qVVY_E,8397
 simo/core/__pycache__/storage.cpython-312.pyc,sha256=VOD9via7BtpTbXe2jWsRovCIkeJofoX7Ts_Eyl9I_a4,934
 simo/core/__pycache__/storage.cpython-38.pyc,sha256=9R1Xu0FJDflfRXUPsqEgt0SpwiP7FGk7HaR8s8XRyI8,721
-simo/core/__pycache__/tasks.cpython-312.pyc,sha256=YNRlJSItp3_hbF6uhcksjS3Px1LQOVbjkAaAXRu1Znw,22818
+simo/core/__pycache__/tasks.cpython-312.pyc,sha256=0dDydxJ-M_he3dSQfL2Oaw_IJC5n4Ya7XOSu-heKCYM,22918
 simo/core/__pycache__/tasks.cpython-38.pyc,sha256=-J2is-l5XsfhamreN2TPQDTK-Jw6XGYL81bcVfjXsU8,11213
 simo/core/__pycache__/todos.cpython-312.pyc,sha256=bqguSv-oCCdlvzbMsm-7jAB-g0AvMFux1GL97XNJjyk,263
 simo/core/__pycache__/todos.cpython-38.pyc,sha256=lOqGZ58siHM3isoJV4r7sg8igrfE9fFd-jSfeBa0AQI,253
@@ -10606,9 +10606,9 @@ simo/fleet/templates/fleet/controllers_info/RoomZonePresenceSensor.md,sha256=Nun
 simo/generic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/generic/app_widgets.py,sha256=y8W3jR76Hh26O9pPQyg2SophMbYIOtAWD33MPKbB8Mg,856
 simo/generic/base_types.py,sha256=u3SlfpNYaCwkVBwomWgso4ODzL71ay9MhiAW-bxgnDU,341
-simo/generic/controllers.py,sha256=mtMkWH-76KlmXNwzHSfgbCEuvK1D4S9R1yvIdkjtl4E,48202
+simo/generic/controllers.py,sha256=SkXedPGmW17sErob2pyTj2xSq7FwVZXHAxBhZX8CKbc,49699
 simo/generic/forms.py,sha256=dItnnUTwc5EtTfDAHcL8Ihy_b9DVVA5ajFd8FXpA_dQ,26568
-simo/generic/gateways.py,sha256=Vth-jSq1i81cm5G7cbuOlFJ4xKjmjLtvo2hn_djfPR4,19445
+simo/generic/gateways.py,sha256=oJ4VLaL0nMB6hnTMEpZasc4OTf8m1HWRWJMhUjHbeIU,19447
 simo/generic/models.py,sha256=59fkYowOX0imviIhA6uwupvuharrpBykmBm674rJNoI,7279
 simo/generic/routing.py,sha256=elQVZmgnPiieEuti4sJ7zITk1hlRxpgbotcutJJgC60,228
 simo/generic/socket_consumers.py,sha256=qesKZVhI56Kh7vdIUDD3hzDUi0FcXwIfcmE_a3YS6JQ,1772
@@ -10619,11 +10619,11 @@ simo/generic/__pycache__/app_widgets.cpython-312.pyc,sha256=ywoKk91YSEZxpyt9haG5
 simo/generic/__pycache__/app_widgets.cpython-38.pyc,sha256=D9b13pbMlirgHmjDnQhfLIDGSVINoSouHb4SWOeCRrs,1642
 simo/generic/__pycache__/base_types.cpython-312.pyc,sha256=h8Mwu49i-zmwTbL33JaLJfRDGOgkQh2_VqrfzEc4UQ4,616
 simo/generic/__pycache__/base_types.cpython-38.pyc,sha256=aV5NdIuvXR-ItKpI__MwcyPZHD6Z882TFdgYkPCkr1I,493
-simo/generic/__pycache__/controllers.cpython-312.pyc,sha256=mPRJKmyjAiayb9ccDF1Wdm7-yI1q5DPvgqAdVGv1pf0,54042
+simo/generic/__pycache__/controllers.cpython-312.pyc,sha256=PJtqjFFJBh1UuKy7tVuAmnlhOKw4sv64akb-9zrBbU4,55883
 simo/generic/__pycache__/controllers.cpython-38.pyc,sha256=jJjwKVaDYyazrRGNjUFoY74nr_jX_DEnsC9KjyxZCgc,30427
 simo/generic/__pycache__/forms.cpython-312.pyc,sha256=kjg_rV74sV2V3qg5qYuAPRySVHLbHrJeLQzlAIgajNs,35047
 simo/generic/__pycache__/forms.cpython-38.pyc,sha256=k8lz3taXdWAg5P9jcnw66mWH51pCc4SOsg32kVEtBCg,19416
-simo/generic/__pycache__/gateways.cpython-312.pyc,sha256=naa_lnv2qQO9EALDYGajGAdU0wPqnaKjWE0ZKFjYJKQ,23195
+simo/generic/__pycache__/gateways.cpython-312.pyc,sha256=lg1j7spkhmGa5f4C49EKRXHHM2BrOJralhrsKXIsdYA,23196
 simo/generic/__pycache__/gateways.cpython-38.pyc,sha256=GIeMT51oZU2OCFD4eUDFdSRRYE0Qf14AcOr_gdUqG94,12705
 simo/generic/__pycache__/models.cpython-312.pyc,sha256=ggaeX6BQa-0-KG50HadpRCWeW84Fbog0muT2gBkqLNQ,10190
 simo/generic/__pycache__/models.cpython-38.pyc,sha256=MZpum7syAFxuulf47K7gtUlJJ7xRD-IBUBAwUM1ZRnw,5825
@@ -10754,7 +10754,7 @@ simo/notifications/migrations/__pycache__/__init__.cpython-312.pyc,sha256=YMFc4Q
 simo/notifications/migrations/__pycache__/__init__.cpython-38.pyc,sha256=YMBRHVon2nWDtIUbghckjnC12sIg_ykPWhV5aM0tto4,178
 simo/users/__init__.py,sha256=6a7uBpCWB_DR7p54rbHusc0xvi1qfT1ZCCQGb6TiBh8,52
 simo/users/admin.py,sha256=2J_ZwrwAPw03Stb6msx5GvRpGCsDSC39RPpYBLGf8UY,7441
-simo/users/api.py,sha256=K0hGtuHkjwlLiWjne6jruI-lfswHrPXfCHSLP-xqOfY,15050
+simo/users/api.py,sha256=V_LCUOV3p1_Z47CpQ5C-hNH4gUNuCkLRo5szGU1K6bs,15160
 simo/users/apps.py,sha256=cq0A8-U1HALEwev0TicgFhr4CAu7Icz8rwq0HfOaL4E,207
 simo/users/auth_backends.py,sha256=HxRp9iFvU1KqUhE7pA9YKEjqtBCJDbDqk_UMCD2Dwww,4361
 simo/users/auto_urls.py,sha256=RSUW3ai5LbMTknS8M7M5aOnG_YlFOVQrnNVNH-fkwlg,357
@@ -10773,7 +10773,7 @@ simo/users/__pycache__/__init__.cpython-312.pyc,sha256=n0GE5zxjujBUkv1t1CswZ9Gby
 simo/users/__pycache__/__init__.cpython-38.pyc,sha256=VFoDJE_SKKaPqqYaaBYd1Ndb1hjakkTo_u0EG_XJ1GM,211
 simo/users/__pycache__/admin.cpython-312.pyc,sha256=lTVuZQwkuw1bzSn0A0kt-8H6ruKas_YPb_61AxSYSoo,11465
 simo/users/__pycache__/admin.cpython-38.pyc,sha256=uL8TwAipkatZxanvQtBKKcOv8Fm3UvinBxsP0okrOZg,8443
-simo/users/__pycache__/api.cpython-312.pyc,sha256=UxOSngKsHG8FD0d0BE0734v_uj9Ynz5kL9j5zXB91Vs,19424
+simo/users/__pycache__/api.cpython-312.pyc,sha256=iCQPIgjuhtRlpbNHx1Jnib9oDImPXYGyswiZCXLQshA,19476
 simo/users/__pycache__/api.cpython-38.pyc,sha256=zZ4DfNktgeVvLAtMpaPUv7AoAgbKr7SCt-4ghJk1zp4,10386
 simo/users/__pycache__/apps.cpython-312.pyc,sha256=6KefztC11cSg6VHJ7-sVDvOA-oq_jNMB8jMvmhcVZD4,707
 simo/users/__pycache__/apps.cpython-38.pyc,sha256=dgbWL8CxzzISJQTmq_4IztPJ2UzykNVdqA2Ae1PmeGk,605
@@ -10945,9 +10945,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.10.1.dist-info/licenses/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.10.1.dist-info/METADATA,sha256=9c6MSVrGuXjWD5IIrfhZ5CDlKqLEoZFxAnC20XDyNEg,2028
-simo-2.10.1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-simo-2.10.1.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
-simo-2.10.1.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.10.1.dist-info/RECORD,,
+simo-2.10.3.dist-info/licenses/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.10.3.dist-info/METADATA,sha256=fE9OwAouErDLI5Gwxrsn2VlxlFHlNHtRH1RBO_ICaws,2028
+simo-2.10.3.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+simo-2.10.3.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
+simo-2.10.3.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.10.3.dist-info/RECORD,,