simo 2.1.5__py3-none-any.whl → 2.1.6__py3-none-any.whl

simo/core/api.py

@@ -544,6 +544,46 @@ class SettingsViewSet(InstanceMixin, viewsets.GenericViewSet):
         if main_alarm_group:
             main_alarm_group_id = main_alarm_group.id
 
+        if request.method == 'POST':
+            data = request.data
+            if not isinstance(request.data, dict):
+                data = data.dict()
+            request_data = restore_json(data)
+            if 'history_days' in request_data:
+                try:
+                    history_days = int(request_data['history_days'])
+                except:
+                    raise APIValidationError(
+                        _('Bad value for history days!'), code=400
+                    )
+                if history_days < 0 or history_days > 365:
+                    raise APIValidationError(
+                        _('History days must be 0 - 365!'), code=400
+                    )
+                self.instance.history_days = history_days
+            if 'device_report_history_days' in request_data:
+                try:
+                    device_report_history_days = int(
+                        request_data['device_report_history_days']
+                    )
+                except:
+                    raise APIValidationError(
+                        _('Bad value for device_report_history_days days!'),
+                        code=400
+                    )
+                if device_report_history_days < 0 \
+                or device_report_history_days > 365:
+                    raise APIValidationError(
+                        _('History days must be 0 - 365!'), code=400
+                    )
+                self.instance.device_report_history_days = device_report_history_days
+
+            self.instance.indoor_climate_sensor = Component.objects.filter(
+                id=request_data.get('indoor_climate_sensor', 0)
+            ).first()
+
+            self.instance.save()
+
         return RESTResponse({
             'hub_uid': dynamic_settings['core__hub_uid'],
             'instance_name': self.instance.name,
@@ -551,12 +591,15 @@ class SettingsViewSet(InstanceMixin, viewsets.GenericViewSet):
             'timezone': self.instance.timezone,
             'location': self.instance.location,
             'last_event': last_event,
-            'indoor_climate_sensor': self.instance.indoor_climate_sensor_id,
             'weather_forecast': wf_comp_id,
             'main_alarm_group': main_alarm_group_id,
             'remote_http': dynamic_settings['core__remote_http'],
             'local_http': 'https://%s' % get_self_ip(),
-            'units_of_measure': self.instance.units_of_measure
+            'units_of_measure': self.instance.units_of_measure,
+            # editable fields
+            'history_days': self.instance.history_days,
+            'device_report_history_days': self.instance.device_report_history_days,
+            'indoor_climate_sensor': self.instance.indoor_climate_sensor_id,
         })
 
 

simo/core/apps.py

@@ -9,5 +9,8 @@ class SIMOCoreAppConfig(AppConfig):
         from actstream import registry
         registry.register(self.get_model('Component'))
         registry.register(self.get_model('Gateway'))
+        registry.register(self.get_model('Instance'))
+        registry.register(self.get_model('Zone'))
+        registry.register(self.get_model('Category'))
 
 

simo/core/serializers.py

@@ -257,8 +257,6 @@ class ComponentSerializer(FormSerializer):
     controller_methods = serializers.SerializerMethodField()
     info = serializers.SerializerMethodField()
 
-    _forms = {}
-
     class Meta:
         form = ComponentAdminForm
         field_mapping = {
@@ -386,13 +384,15 @@ class ComponentSerializer(FormSerializer):
                     self.Meta.form = controller.config_form
 
     def get_form(self, data=None, instance=None, **kwargs):
+        if 'forms' not in self.context:
+            self.context['forms'] = {}
         form_key = None
         if not data:
             form_key = 0
             if instance:
                 form_key = instance.id
-        if form_key in self._forms:
-            return self._forms[form_key]
+        if form_key in self.context['forms']:
+            return self.context['forms'][form_key]
 
         self.set_form_cls()
         if not self.instance or isinstance(self.instance, Iterable):
@@ -412,11 +412,10 @@ class ComponentSerializer(FormSerializer):
             if not user_role.is_superuser and user_role.is_owner:
                 for field_name in list(form.fields.keys()):
                     if field_name not in form.basic_fields:
-                        print("DELETE FIELD: ", field_name)
                         del form.fields[field_name]
 
         if form_key is not None:
-            self._forms[form_key] = form
+            self.context['forms'][form_key] = form
 
         return form
 

simo/core/signal_receivers.py

@@ -71,8 +71,8 @@ def create_instance_defaults(sender, instance, created, **kwargs):
     )
     dummy.start()
     weather_icon = Icon.objects.get(slug='cloud-bolt-sun')
-    other_zone = Zone.objects.get(name='Other')
-    climate_category = Category.objects.get(name='Climate')
+    other_zone = Zone.objects.get(name='Other', instance=instance)
+    climate_category = Category.objects.get(name='Climate', instance=instance)
     Component.objects.create(
         name='Weather', icon=weather_icon,
         zone=other_zone,

simo/core/tasks.py

@@ -167,82 +167,83 @@ def sync_with_remote():
 
     print("Responded with: ", json.dumps(r_json))
 
-    if 'hub_uid' in r_json:
-        dynamic_settings['core__hub_uid'] = r_json['hub_uid']
-
-    dynamic_settings['core__remote_http'] = r_json.get('hub_remote_http', '')
-    if 'new_secret' in r_json:
-        dynamic_settings['core__hub_secret'] = r_json['new_secret']
-
-    if dynamic_settings['core__remote_conn_version'] < r_json['remote_conn_version']:
-        save_config(r_json)
-    dynamic_settings['core__remote_conn_version'] = r_json['remote_conn_version']
-
-    for data in r_json['instances']:
-        users_data = data.pop('users', {})
-        instance_uid = data.pop('uid')
-        weather_forecast = data.pop('weather_forecast', None)
-        instance, new_instance = Instance.objects.update_or_create(
-            uid=instance_uid, defaults=data
-        )
+    with transaction.atomic():
+        if 'hub_uid' in r_json:
+            dynamic_settings['core__hub_uid'] = r_json['hub_uid']
+
+        dynamic_settings['core__remote_http'] = r_json.get('hub_remote_http', '')
+        if 'new_secret' in r_json:
+            dynamic_settings['core__hub_secret'] = r_json['new_secret']
+
+        if dynamic_settings['core__remote_conn_version'] < r_json['remote_conn_version']:
+            save_config(r_json)
+        dynamic_settings['core__remote_conn_version'] = r_json['remote_conn_version']
+
+        for data in r_json['instances']:
+            users_data = data.pop('users', {})
+            instance_uid = data.pop('uid')
+            weather_forecast = data.pop('weather_forecast', None)
+            instance, new_instance = Instance.objects.update_or_create(
+                uid=instance_uid, defaults=data
+            )
 
-        if weather_forecast:
-            from simo.generic.controllers import WeatherForecast
-            weather_component = Component.objects.filter(
-                zone__instance=instance,
-                controller_uid=WeatherForecast.uid
-            ).first()
-            if weather_component:
-                weather_component.track_history = False
-                weather_component.controller.set(weather_forecast)
-
-
-        for email, options in users_data.items():
-            with transaction.atomic():
-                if new_instance:
-                    # Create users for new instance!
-                    user, new_user = User.objects.update_or_create(
-                        email=email, defaults={
-                        'name': options.get('name'),
-                        'is_master': options.get('is_hub_master', False),
-                        'ssh_key': options.get('ssh_key')
-                    })
-                    role = None
-                    if options.get('is_superuser'):
-                        role = PermissionsRole.objects.filter(
-                            instance=new_instance, is_superuser=True
-                        ).first()
-                    elif options.get('is_owner'):
-                        role = PermissionsRole.objects.filter(
-                            instance=new_instance, is_owner=True
-                        ).first()
-                    InstanceUser.objects.update_or_create(
-                        user=user, instance=new_instance, defaults={
-                            'is_active': True, 'role': role
-                        }
-                    )
-                else:
-                    user = User.objects.filter(email=email).first()
-
-                if not user:
-                    continue
-
-                if user.name != options.get('name'):
-                    user.name = options['name']
-                    user.save()
-                if user.ssh_key != options.get('ssh_key'):
-                    user.ssh_key = options['ssh_key']
-                    user.save()
-
-                avatar_url = options.get('avatar_url')
-                if avatar_url and user.avatar_url != avatar_url:
-                    resp = requests.get(avatar_url)
-                    user.avatar.save(
-                        os.path.basename(avatar_url), io.BytesIO(resp.content)
-                    )
-                    user.avatar_url = avatar_url
-                    user.avatar_last_change = timezone.now()
-                    user.save()
+            if weather_forecast:
+                from simo.generic.controllers import WeatherForecast
+                weather_component = Component.objects.filter(
+                    zone__instance=instance,
+                    controller_uid=WeatherForecast.uid
+                ).first()
+                if weather_component:
+                    weather_component.track_history = False
+                    weather_component.controller.set(weather_forecast)
+
+
+            for email, options in users_data.items():
+                with transaction.atomic():
+                    if new_instance:
+                        # Create users for new instance!
+                        user, new_user = User.objects.update_or_create(
+                            email=email, defaults={
+                            'name': options.get('name'),
+                            'is_master': options.get('is_hub_master', False),
+                            'ssh_key': options.get('ssh_key')
+                        })
+                        role = None
+                        if options.get('is_superuser'):
+                            role = PermissionsRole.objects.filter(
+                                instance=new_instance, is_superuser=True
+                            ).first()
+                        elif options.get('is_owner'):
+                            role = PermissionsRole.objects.filter(
+                                instance=new_instance, is_owner=True
+                            ).first()
+                        InstanceUser.objects.update_or_create(
+                            user=user, instance=new_instance, defaults={
+                                'is_active': True, 'role': role
+                            }
+                        )
+                    else:
+                        user = User.objects.filter(email=email).first()
+
+                    if not user:
+                        continue
+
+                    if user.name != options.get('name'):
+                        user.name = options['name']
+                        user.save()
+                    if user.ssh_key != options.get('ssh_key'):
+                        user.ssh_key = options['ssh_key']
+                        user.save()
+
+                    avatar_url = options.get('avatar_url')
+                    if avatar_url and user.avatar_url != avatar_url:
+                        resp = requests.get(avatar_url)
+                        user.avatar.save(
+                            os.path.basename(avatar_url), io.BytesIO(resp.content)
+                        )
+                        user.avatar_url = avatar_url
+                        user.avatar_last_change = timezone.now()
+                        user.save()
 
 
 @celery_app.task

simo/management/install.py

@@ -222,7 +222,7 @@ def install():
     with open('/etc/ssh/sshd_config', 'r') as ssh_conf:
         line = ssh_conf.readline()
         while line:
-            if line.startswitn('PasswordAuthentication'):
+            if line.startswith('PasswordAuthentication'):
                 line.replace(' yes', ' no')
             new_ssh_conf += line
 

{simo-2.1.5.dist-info → simo-2.1.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simo
-Version: 2.1.5
+Version: 2.1.6
 Summary: Smart Home on Steroids!
 Author-email: Simanas Venčkauskas <simanas@simo.io>
 Project-URL: Homepage, https://simo.io
@@ -33,6 +33,7 @@ Requires-Dist: itsdangerous ==2.0.1
 Requires-Dist: redis ==3.5.3
 Requires-Dist: django-redis ==4.12.1
 Requires-Dist: webservices ==0.7
+Requires-Dist: numpy ==1.24.4
 Requires-Dist: opencv-python ==4.5.4.60
 Requires-Dist: geopy ==2.2.0
 Requires-Dist: requests ==2.26.0

{simo-2.1.5.dist-info → simo-2.1.6.dist-info}/RECORD

@@ -14,11 +14,11 @@ simo/__pycache__/urls.cpython-38.pyc,sha256=sqfstQthcjXtv31Tad0RAlWWI2A0HH6HN0fW
 simo/__pycache__/wsgi.cpython-38.pyc,sha256=TpRxO7VM_ql31hbKphVdanydC5RI1nHB4l0QA2pdWxo,322
 simo/core/__init__.py,sha256=_s2TjJfQImsMrTIxqLAx9AZie1Ojmm6sCHASdl3WLGU,50
 simo/core/admin.py,sha256=Gb1lSyvFtYj2oC5lA7j3VqU6zlqlncx5R-_XJbb8Wdk,17927
-simo/core/api.py,sha256=HSokv9CZCCr0WHSzo5TBXe2BF5-EnTZHPnShlzN86ms,25706
+simo/core/api.py,sha256=qx2hwBTeDmuVFL__gRS4ySZkl8aoHM_8R6F47tzME7w,27581
 simo/core/api_auth.py,sha256=vCxvczA8aWNcW0VyKs5WlC_ytlqeGP_H_hkKUNVkCwM,1247
 simo/core/api_meta.py,sha256=0leq4qdAELwACL7-9V_LCkuzu1VSEexys1b3iz0bsYM,3848
 simo/core/app_widgets.py,sha256=4Lh9FDzdkfh_mccJMe09dyRTT3Uqf9VXwbkurJ9E9oQ,2115
-simo/core/apps.py,sha256=CL4-BX6lYYGwq6hcXL-ozT7RTvy9hyfuiPCC_RfGIY0,267
+simo/core/apps.py,sha256=CsqpiQerhmrMsH-wGiG-gQgXd9qEkIi-LUaA9cXpKSw,425
 simo/core/auto_urls.py,sha256=nNXEgLAAAQAhRWQDA9AbDtw-zcPKmu_pufJaSa8g818,1102
 simo/core/autocomplete_views.py,sha256=JT5LA2_Wtr60XYSAIqaXFKFYPjrmkEf6yunXD9y2zco,4022
 simo/core/base_types.py,sha256=qVh6MrXZEfN7bFOyFftC7u0yyz0PkvpsjllLBc6SCp4,616
@@ -36,11 +36,11 @@ simo/core/middleware.py,sha256=pO52hQOJV_JRmNyUe7zfufSnJFlRITOWX6jwkoPWJhk,2052
 simo/core/models.py,sha256=MaE6BUIJdXwrrlsGZRkrPSaOLY1OTWRCyjEoYArdAl8,20739
 simo/core/permissions.py,sha256=u89OubeV_NPMX87Mcireg6FhCs-XTuyYLIiL2HDaxg4,2815
 simo/core/routing.py,sha256=X1_IHxyA-_Q7hw1udDoviVP4_FSBDl8GYETTC2zWTbY,499
-simo/core/serializers.py,sha256=M3r2P1-Eb5eObOqcI9dttedh4UxgPwWwGYmOfXe3BDk,20303
-simo/core/signal_receivers.py,sha256=ZhHg1mLn_Yhin-23Af1WNPfE5hnGYhhVDZDTEjRtO-A,6190
+simo/core/serializers.py,sha256=wrOSMN1P3iBSLpHKB8EUyrK-TqRKltXM-tks_84hrNw,20335
+simo/core/signal_receivers.py,sha256=9-qFCCeSLcMFEMg6QUtKOVgUsoNoqhzGoI98nuNSTEo,6228
 simo/core/socket_consumers.py,sha256=n7VE2Fvqt4iEAYLTRbTPOcI-7tszMAADu7gimBxB-Fg,9635
 simo/core/storage.py,sha256=YlxmdRs-zhShWtFKgpJ0qp2NDBuIkJGYC1OJzqkbttQ,572
-simo/core/tasks.py,sha256=VTr83_8avke6UwFZ9VQ8c2qROpVOqAWqc0RbMxNPd08,14005
+simo/core/tasks.py,sha256=wlhesYdCKMm2rOvgXglmMB2WfEnH7m4uNsNHNVy6H0k,14304
 simo/core/todos.py,sha256=eYVXfLGiapkxKK57XuviSNe3WsUYyIWZ0hgQJk7ThKo,665
 simo/core/types.py,sha256=WJEq48mIbFi_5Alt4wxWMGXxNxUTXqfQU5koH7wqHHI,1108
 simo/core/views.py,sha256=ze8yX0PBLN-DH8B8jol6NKj0hLOAE4WA1rTXf07G-MU,2129
@@ -10337,7 +10337,7 @@ simo/generic/templates/generic/controllers_info/stateselect.md,sha256=T0w3vJg02W
 simo/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/management/auto_update.py,sha256=4MDrJHdtC5LxEJM258Y0kc5yI4yloeKhDjh-S2BN-ZQ,2115
 simo/management/copy_template.py,sha256=Iehq57FYMzdHNp3LU4ue6rr6AkRiGeOthG7PoGWd88Q,2002
-simo/management/install.py,sha256=s9GqIRwLpli8g_utu2pZ0QGVSXSHFXbkY12S_R3MnVc,10127
+simo/management/install.py,sha256=hy2LB0sPNpaFHv2Wvp6CeiItvKJb3sFVU0lJuz02VDM,10127
 simo/management/on_http_start.py,sha256=ZDotfMQaCjksD5FFf3eZYgJS-gd_-7eZhYTHLaD-448,3312
 simo/management/__pycache__/__init__.cpython-38.pyc,sha256=ey9k5mPsmvAHRVf5Du6QUqy40LgBCAPN_B5EaR6h9Eg,164
 simo/management/__pycache__/on_http_start.cpython-38.pyc,sha256=ERfcMNz3QnqDJTJ4PwbmDfLgPCh5hrEcaedejARFkUQ,2864
@@ -10494,9 +10494,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.1.5.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.1.5.dist-info/METADATA,sha256=sV13UwrNRCCV4LImcqM__PHth4pKToD1KXgItU6eMoY,1817
-simo-2.1.5.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-simo-2.1.5.dist-info/entry_points.txt,sha256=SJBxiDpH7noO0STxVI_eRIsGR-nLgdXXeqCDe8cXlbM,65
-simo-2.1.5.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.1.5.dist-info/RECORD,,
+simo-2.1.6.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.1.6.dist-info/METADATA,sha256=0v_e39Aa9o7fBTvk4ee7urOjd86tTljt6QQxgIhOLdA,1847
+simo-2.1.6.dist-info/WHEEL,sha256=mguMlWGMX-VHnMpKOjjQidIo1ssRlCFu4a4mBpz1s2M,91
+simo-2.1.6.dist-info/entry_points.txt,sha256=SJBxiDpH7noO0STxVI_eRIsGR-nLgdXXeqCDe8cXlbM,65
+simo-2.1.6.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.1.6.dist-info/RECORD,,

{simo-2.1.5.dist-info → simo-2.1.6.dist-info}/WHEEL

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