Merge pull request #46 from observatorycontrolsystem/feature/flat-min-exptime

Feature/flat min exptime

Author: mgdaily

CHANGELOG

@@ -1,3 +1,7 @@
+3.0.4
+2023-02-28
+Add validation_schema to ConfigurationTypeProperties model to allow for more flexible validation of instrument configs per instrument type/configuration type
+
 3.0.3
 2023-01-18
 Add back BasicAuth to rest framework and fix token auth for direct api queries

configdb/hardware/migrations/0035_configurationtypeproperties_validation_schema.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.0.3 on 2023-02-24 23:26
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('hardware', '0034_copy_instrument_state'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='configurationtypeproperties',
+            name='validation_schema',
+            field=models.JSONField(blank=True, default=dict, help_text='Cerberus styled validation schema used to validate instrument configs using this configuration type and instrument type'),
+        ),
+    ]

configdb/hardware/models.py

@@ -276,6 +276,11 @@ class ConfigurationTypeProperties(BaseModel):
                   'observation, like going between a Spectrum and a Lamp Flat for example. This could account for starting up '
                   'a lamp.'
     )
+    validation_schema = models.JSONField(
+        default=dict,
+        blank=True,
+        help_text='Cerberus styled validation schema used to validate instrument configs using this configuration type and instrument type'
+    )
 
     class Meta:
         unique_together = ('instrument_type', 'configuration_type')

configdb/hardware/serializers.py

@@ -90,7 +90,7 @@ class ConfigurationTypePropertiesSerializer(serializers.ModelSerializer):
     code = serializers.ReadOnlyField(source='configuration_type.code', help_text='Configuration type code')
 
     class Meta:
-        fields = ('name', 'code', 'config_change_overhead', 'schedulable', 'force_acquisition_off', 'requires_optical_elements')
+        fields = ('name', 'code', 'config_change_overhead', 'schedulable', 'force_acquisition_off', 'requires_optical_elements', 'validation_schema')
         model = ConfigurationTypeProperties
 
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "configdb"
-version = "3.0.3"
+version = "3.0.4"
 description = "Configuration Database"
 authors = ["Observatory Control System Project <[email protected]>"]
 license = "GPL-3.0-only"