simo 2.2.9__py3-none-any.whl → 2.2.10__py3-none-any.whl

simo/core/forms.py

@@ -219,7 +219,10 @@ class ComponentAdminForm(forms.ModelForm):
 
     class Meta:
         model = Component
-        fields = 'name', 'icon', 'zone', 'category', 'show_in_app', 'notes',
+        fields = (
+            'name', 'icon', 'zone', 'category', 'show_in_app', 'notes',
+            'alarm_category'
+        )
         widgets = {
             'icon': autocomplete.ModelSelect2(
                 url='autocomplete-icon', attrs={'data-html': True}

simo/core/models.py

@@ -12,7 +12,6 @@ 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
@@ -386,7 +385,9 @@ def is_in_alarm(self):
             ('security', _("Security")), ('fire', _("Fire")),
             ('flood', _("Flood")), ('other', _("Other"))
         ),
-        help_text=_("Enable alarm properties by choosing one of alarm categories.")
+        help_text=_(
+            "Enable alarm properties by choosing one of alarm categories."
+        )
     )
     arm_status = models.CharField(
         max_length=20, db_index=True, default='disarmed', choices=(

simo/fleet/controllers.py

@@ -1,6 +1,7 @@
 import json
 from django.utils.translation import gettext_lazy as _
 from django.db.transaction import atomic
+from simo.core.middleware import get_current_instance
 from simo.core.events import GatewayObjectCommand
 from simo.core.controllers import (
     BinarySensor as BaseBinarySensor,
@@ -152,6 +153,13 @@ class DS18B20Sensor(FleeDeviceMixin, BasicSensorMixin, BaseNumericSensor):
     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):
     app_widget = NumericSensorWidget
 
@@ -194,6 +202,8 @@ class BaseClimateSensor(FleeDeviceMixin, BasicSensorMixin, BaseMultiSensor):
         return new_val
 
 
+
+
 class DHTSensor(BaseClimateSensor):
     config_form = ColonelDHTSensorConfigForm
     name = "DHT climate sensor"
@@ -210,6 +220,20 @@ class MPC9808TempSensor(FleeDeviceMixin, BaseNumericSensor):
     config_form = MPC9808SensorConfigForm
     name = "MPC9808 Temperature Sensor (I2C)"
 
+    @property
+    def default_value_units(self):
+        instance = get_current_instance()
+        if not instance:
+            return 'C'
+        if instance.units_of_measure == 'imperial':
+            return 'F'
+        return 'C'
+
+    def _prepare_for_set(self, value):
+        if self.component.zone.instance.units_of_measure == 'imperial':
+            return round((value[0][1] * 9 / 5) + 32, 1)
+        return value
+
 
 class ENS160AirQualitySensor(FleeDeviceMixin, BaseMultiSensor):
     gateway_class = FleetGatewayHandler

simo/management/_hub_template/hub/nginx.conf

@@ -23,6 +23,7 @@ server{
         expires max;
     }
 
+    # daphne
     location /ws {
         include proxy_params;
 
@@ -32,9 +33,14 @@ server{
         proxy_pass http://unix:/tmp/http.sock;
     }
 
+    # gunicorn
     location / {
         include proxy_params;
-        proxy_pass http://unix:/tmp/http.sock;
+        proxy_connect_timeout       600;
+        proxy_send_timeout          600;
+        proxy_read_timeout          600;
+        send_timeout                600;
+        proxy_pass http://unix:/tmp/gunicorn.sock;
     }
 }
 
@@ -74,6 +80,7 @@ server{
         expires max;
     }
 
+    # daphne
     location /ws {
         include proxy_params;
 
@@ -83,9 +90,14 @@ server{
         proxy_pass http://unix:/tmp/http.sock;
     }
 
+    # gunicorn
     location / {
         include proxy_params;
-        proxy_pass http://unix:/tmp/http.sock;
+        proxy_connect_timeout       600;
+        proxy_send_timeout          600;
+        proxy_read_timeout          600;
+        send_timeout                600;
+        proxy_pass http://unix:/tmp/gunicorn.sock;
     }
 
 }

simo/management/_hub_template/hub/supervisor.conf

@@ -1,15 +1,30 @@
-[program:simo-http]
+# using gunicorn for regular requests
+[program:simo-gunicorn]
+directory={{ project_dir }}/hub/
+command=/usr/local/bin/gunicorn --workers 4 --timeout 120 --bind unix:/tmp/gunicorn.sock wsgi:application
+process_name=%(program_name)s
+user=root
+stdout_logfile=/var/log/simo/gunicorn.log
+stdout_logfile_maxbytes=1MB
+stdout_logfile_backups=3
+redirect_stderr=true
+autostart=true
+autorestart=true
+
+# using daphne for socket connections routed to /ws/ on nginx.conf
+[program:simo-daphne]
 directory={{ project_dir }}/hub/
 command=/usr/local/bin/daphne -u /tmp/http.sock --access-log /dev/stdout --proxy-headers asgi:application
 process_name=%(program_name)s
 user=root
-stdout_logfile=/var/log/simo/http.log
+stdout_logfile=/var/log/simo/daphne.log
 stdout_logfile_maxbytes=1MB
 stdout_logfile_backups=3
 redirect_stderr=true
 autostart=true
 autorestart=true
 
+
 [program:simo-gateways]
 command=/usr/bin/python3 {{ project_dir }}/hub/manage.py gateways_manager
 process_name=%(program_name)s

simo/management/_hub_template/hub/wsgi.py

@@ -0,0 +1,11 @@
+"""
+WSGI config for SIMO.io project.
+
+It exposes the WSGI callable as a module-level variable named ``application``.
+"""
+import os
+from django.core.wsgi import get_wsgi_application
+
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'settings')
+
+application = get_wsgi_application()

{simo-2.2.9.dist-info → simo-2.2.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simo
-Version: 2.2.9
+Version: 2.2.10
 Summary: Smart Home on Steroids!
 Author-email: Simanas Venčkauskas <simanas@simo.io>
 Project-URL: Homepage, https://simo.io
@@ -48,4 +48,5 @@ Requires-Dist: daphne ==4.1.2
 Requires-Dist: Pillow ==9.5.0
 Requires-Dist: django-markdownify ==0.9.5
 Requires-Dist: django-activity-stream ==2.0.0
+Requires-Dist: gunicorn ==23.0.0
 

{simo-2.2.9.dist-info → simo-2.2.10.dist-info}/RECORD

@@ -28,12 +28,12 @@ simo/core/dynamic_settings.py,sha256=U9pY7p_hoeD1LxobIvxZqQ7Zn_4MhYMqZvsr4O0PAYs
 simo/core/events.py,sha256=LvtonJGNyCb6HLozs4EG0WZItnDwNdtnGQ4vTcnKvUs,4438
 simo/core/filters.py,sha256=ghtOZcrwNAkIyF5_G9Sn73NkiI71mXv0NhwCk4IyMIM,411
 simo/core/form_fields.py,sha256=9tIjiEN3IE55GPyB4tOlfkd51JDne3-h8pKhpL3tLFE,2220
-simo/core/forms.py,sha256=AE-WWLOCH1O2TkhGzmYX2yr3QZJEB4mVh111SLVBuys,21851
+simo/core/forms.py,sha256=sFVz8tENhi4QSudORu_e5tlGEC0aXumy6wzJqQNYBPk,21904
 simo/core/gateways.py,sha256=m0eS3XjVe34Dge6xtoCq16kFWCKJcdQrT0JW0REqoq8,3715
 simo/core/loggers.py,sha256=EBdq23gTQScVfQVH-xeP90-wII2DQFDjoROAW6ggUP4,1645
 simo/core/managers.py,sha256=n-b3I4uXzfHKTeB1VMjSaMsDUxp8FegFJwnbV1IsWQ4,3019
 simo/core/middleware.py,sha256=LIMpHJDQ4zx9dfmy5z0-rEW2EPO9d-iG1ZJbJ_6t6hc,1927
-simo/core/models.py,sha256=Mg6UjGQjA5WtxO2kq9fO-iW2f9UzDh58etcZ9-X5RSU,21570
+simo/core/models.py,sha256=hQA8SeAPtGRSs4gk-bci2Ni3ZANtS62V-IDgCyJh2qE,21563
 simo/core/permissions.py,sha256=v0iJM4LOeYoEfMiw3OLPYio272G1aUEAg_z9Wd1q5m0,2993
 simo/core/routing.py,sha256=X1_IHxyA-_Q7hw1udDoviVP4_FSBDl8GYETTC2zWTbY,499
 simo/core/serializers.py,sha256=quXznnTKCm57rvRgke0mBnlWmaO8C5scJ8R251wa1jY,20869
@@ -61,15 +61,15 @@ simo/core/__pycache__/dynamic_settings.cpython-38.pyc,sha256=9ge2uV4QBKdA4f2pIZp
 simo/core/__pycache__/events.cpython-38.pyc,sha256=A1Axx-qftd1r7st7wkO3DkvTdt9-RkcJe5KJhpzJVk8,5109
 simo/core/__pycache__/filters.cpython-38.pyc,sha256=VIMADCBiYhziIyRmxAyUDJluZvuZmiC4bNYWTRsGSao,721
 simo/core/__pycache__/form_fields.cpython-38.pyc,sha256=u0voKXkA64xbH6LY_-jMBHQS4mOJZZeuB9WTvtv9JWE,3433
-simo/core/__pycache__/forms.cpython-38.pyc,sha256=yK5bcsGXG9QAi965Kg4jjKA6Wbi0nzluNStWjDVjIPQ,17887
+simo/core/__pycache__/forms.cpython-38.pyc,sha256=JDCNYJQrZHUaMb4qZ6A0f1JptoCHQK1yfJwMJlhV7fI,17892
 simo/core/__pycache__/gateways.cpython-38.pyc,sha256=D1ooHL-iSpQrxnD8uAl4xWFJmm-QWZfbkLiLlFOMtdU,4553
 simo/core/__pycache__/loggers.cpython-38.pyc,sha256=Z-cdQnC6XlIonPV4Sl4E52tP4NMEdPAiHK0cFaIL7I8,1623
 simo/core/__pycache__/managers.cpython-38.pyc,sha256=6RTIxyjOgpQGtAqcUyE2vFPS09w1V5Wmd_vOV7rHRRI,3370
 simo/core/__pycache__/middleware.cpython-38.pyc,sha256=UZTX3tUUHkigr_3GiSLbUX3RbJBg1_JBPiXy6saJ9GA,1911
-simo/core/__pycache__/models.cpython-38.pyc,sha256=rKg-_vQ-3L3_NKbCd0HIij7Nyev1t7SOz32-6PS4Rds,17907
+simo/core/__pycache__/models.cpython-38.pyc,sha256=nAgEN2wfcQkeWtRDwN_u-3mOn09irA2hFX23ziFJwIw,17911
 simo/core/__pycache__/permissions.cpython-38.pyc,sha256=fH4iyqd9DdzRLEu2b621-FeM-napR0M7hzBUTHo9Q3g,2972
 simo/core/__pycache__/routing.cpython-38.pyc,sha256=3T3FPJ8Cn99xZCGvMyg2xjl7al-Shm9CelbSpkJtNP8,599
-simo/core/__pycache__/serializers.cpython-38.pyc,sha256=g2xW2Epw2ne2qUS41Dsrvr9Ih56v5Ba0VfmetJJRlXk,19495
+simo/core/__pycache__/serializers.cpython-38.pyc,sha256=PzKJTctrfXeTtD1QlRL5vKKIW4YxB5MuEPj_Z2w9Wgc,19495
 simo/core/__pycache__/signal_receivers.cpython-38.pyc,sha256=3Bt9S47DR_ZFS3O-crElFgLLXPIYyDgPIc2ibwEkaic,4904
 simo/core/__pycache__/socket_consumers.cpython-38.pyc,sha256=NJUr7nRyHFvmAumxxWpsod5wzVVZM99rCEuJs1utHA4,8432
 simo/core/__pycache__/storage.cpython-38.pyc,sha256=9R1Xu0FJDflfRXUPsqEgt0SpwiP7FGk7HaR8s8XRyI8,721
@@ -10191,7 +10191,7 @@ simo/fleet/api.py,sha256=Hxn84xI-Q77HxjINgRbjSJQOv9jii4OL20LxK0VSrS8,2499
 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=9IJnT6ATuKsfIAh7oTJgSZCY2c9HVIOBLqd0CQ3mjC4,29790
+simo/fleet/controllers.py,sha256=NOoM7XmMIJfqw92JE5PI6sQo-Vlzb67YDMtebUW7T9k,30507
 simo/fleet/forms.py,sha256=YF34ZCDbLeAKpq4u0KTi8IsyqhDtNUWcal2DELRayuI,57668
 simo/fleet/gateways.py,sha256=lKEJW0MgaOEiNnijH50DNSVChvaUT3TA3UurcI57P8k,5677
 simo/fleet/managers.py,sha256=XOpDOA9L-f_550TNSyXnJbun2EmtGz1TenVTMlUSb8E,807
@@ -10208,8 +10208,8 @@ simo/fleet/__pycache__/api.cpython-38.pyc,sha256=rL9fb7cCQatyFvXyKmlNOKmxVo8vHYe
 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=PXWcEzGvEVtaKfQah35liipySnaGpswwyDG_MKm5phU,24860
-simo/fleet/__pycache__/forms.cpython-38.pyc,sha256=8Pl_cztv5iYmIySOFqiCk3NnVAvIu7os0-r5OjI05iA,39066
+simo/fleet/__pycache__/controllers.cpython-38.pyc,sha256=Pot0NMkAvOR6YEX0UYVApcGlLzLQWS-zWSa7byDL8Zc,25373
+simo/fleet/__pycache__/forms.cpython-38.pyc,sha256=LOxl1jynQbd_36Qa8eyTRkHLXiA575Ph29XVqGX0qsU,39066
 simo/fleet/__pycache__/gateways.cpython-38.pyc,sha256=0RKVn0ndreVKhsrukqeLPSdMnRrsQ_W7yeVeBkRLfIk,5058
 simo/fleet/__pycache__/managers.cpython-38.pyc,sha256=8uz-xpUiqbGDgXIZ_XRZtFb-Tju6NGxflGg-Ee4Yo6k,1310
 simo/fleet/__pycache__/models.cpython-38.pyc,sha256=GZ01BjdvTn6_XJBfV8VrSldJ67X06ne-xW4CsQ6N6Wc,13756
@@ -10352,10 +10352,11 @@ simo/management/__pycache__/on_http_start.cpython-38.pyc,sha256=ERfcMNz3QnqDJTJ4
 simo/management/_hub_template/hub/asgi.py,sha256=ElN_fdeSkf0Ysa7pS9rJVmZ1HmLhFxb8jFaMLqe1220,126
 simo/management/_hub_template/hub/celeryc.py,sha256=3ksDXftIZKJ4Cq9WNKJERdZdQlDEnjTQXycweRFmsSQ,27
 simo/management/_hub_template/hub/manage.py,sha256=PNNlw3EVeIJDgkG0l-klqoxsKWfTYWG9jzRG0upmAaI,620
-simo/management/_hub_template/hub/nginx.conf,sha256=wAV7wWgZc9JqhLI94i-j1olhLwMi8SCvE8NiyTEDwJI,2002
+simo/management/_hub_template/hub/nginx.conf,sha256=40hvXL42MeiqqkLURNcDQsRudv1dNFLJnvb2-Y3RCkk,2394
 simo/management/_hub_template/hub/settings.py,sha256=4QhvhbtLRxHvAntwqG_qeAAtpDUqKvN4jzw9u3vqff8,361
-simo/management/_hub_template/hub/supervisor.conf,sha256=IY3fdK0fDD2eAothB0n54xhjQj8LYoXIR96-Adda5Z8,1353
+simo/management/_hub_template/hub/supervisor.conf,sha256=DpLGDoyTRs27tVN-vg5ANpUnDUC68cFdlBsAp-XEm78,1815
 simo/management/_hub_template/hub/urls.py,sha256=Ydm-1BkYAzWeEF-MKSDIFf-7aE4qNLPm48-SA51XgJQ,25
+simo/management/_hub_template/hub/wsgi.py,sha256=Lo-huLHnMDTxSmMBOodVFMWBls9poddrV2KRzXU0xGo,280
 simo/multimedia/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/multimedia/admin.py,sha256=GgXiKTLfi3omjBurU-bKgneJRK-tAeiR8o2jo3zD7zs,1002
 simo/multimedia/api.py,sha256=mZ5BTggWdc_kL8P70JGC3rTCiZKPnxWYoyNcAQkFnX4,285
@@ -10506,9 +10507,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.2.9.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.2.9.dist-info/METADATA,sha256=1UFNm0bYqKsBbPc6SjdYGFfT3BTrNxcRt3GVKW6ZluU,1847
-simo-2.2.9.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-simo-2.2.9.dist-info/entry_points.txt,sha256=SJBxiDpH7noO0STxVI_eRIsGR-nLgdXXeqCDe8cXlbM,65
-simo-2.2.9.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.2.9.dist-info/RECORD,,
+simo-2.2.10.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.2.10.dist-info/METADATA,sha256=EEKuyC6CQhzBgYsGV0L6R-28zL45JxZuLNnulJrs5wU,1881
+simo-2.2.10.dist-info/WHEEL,sha256=5Mi1sN9lKoFv_gxcPtisEVrJZihrm_beibeg5R6xb4I,91
+simo-2.2.10.dist-info/entry_points.txt,sha256=SJBxiDpH7noO0STxVI_eRIsGR-nLgdXXeqCDe8cXlbM,65
+simo-2.2.10.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.2.10.dist-info/RECORD,,

{simo-2.2.9.dist-info → simo-2.2.10.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (74.1.2)
+Generator: setuptools (75.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any