Merge pull request #439 from aaronwmorris/dev

Add tables for RAW and FITS files

Author: aaronwmorris

indi_allsky/camera/indi.py

@@ -316,16 +316,16 @@ def getDeviceProperties(self, device):
 
         #    if p.getType() == PyIndi.INDI_TEXT:
         #        for t in p.getText():
-        #            properties[name][t.name] = t.text
+        #            properties[name][t.getName()] = t.getText()
         #    elif p.getType() == PyIndi.INDI_NUMBER:
         #        for t in p.getNumber():
-        #            properties[name][t.name] = t.value
+        #            properties[name][t.getName()] = t.getValue()
         #    elif p.getType() == PyIndi.INDI_SWITCH:
         #        for t in p.getSwitch():
-        #            properties[name][t.name] = self.__state_to_str_s[t.s]
+        #            properties[name][t.getName()] = self.__state_to_str_s[t.getState()]
         #    elif p.getType() == PyIndi.INDI_LIGHT:
         #        for t in p.getLight():
-        #            properties[name][t.name] = self.__state_to_str_p[t.s]
+        #            properties[name][t.getName()] = self.__state_to_str_p[t.getState()]
         #    elif p.getType() == PyIndi.INDI_BLOB:
         #        pass
         #        #for t in p.getBLOB():
@@ -729,7 +729,7 @@ def set_number(self, device, name, values, sync=True, timeout=None):
         #logger.info('Name: %s, values: %s', name, str(values))
         c = self.get_control(device, name, 'number')
         for control_name, index in self.__map_indexes(c, values.keys()).items():
-            c[index].value = values[control_name]
+            c[index].setValue(values[control_name])
 
         self.sendNewNumber(c)
 
@@ -745,15 +745,15 @@ def set_switch(self, device, name, on_switches=[], off_switches=[], sync=True, t
         is_exclusive = c.getRule() == PyIndi.ISR_ATMOST1 or c.getRule() == PyIndi.ISR_1OFMANY
         if is_exclusive :
             on_switches = on_switches[0:1]
-            off_switches = [s.name for s in c if s.name not in on_switches]
+            off_switches = [s.getName() for s in c if s.getName() not in on_switches]
 
         for index in range(0, len(c)):
             current_state = c[index].getState()
             new_state = current_state
 
-            if c[index].name in on_switches:
+            if c[index].getName() in on_switches:
                 new_state = PyIndi.ISS_ON
-            elif is_exclusive or c[index].name in off_switches:
+            elif is_exclusive or c[index].getName() in off_switches:
                 new_state = PyIndi.ISS_OFF
 
             c[index].setState(new_state)
@@ -766,7 +766,7 @@ def set_switch(self, device, name, on_switches=[], off_switches=[], sync=True, t
     def set_text(self, device, control_name, values, sync=True, timeout=None):
         c = self.get_control(device, control_name, 'text')
         for control_name, index in self.__map_indexes(c, values.keys()).items():
-            c[index].text = values[control_name]
+            c[index].setText(values[control_name])
 
         self.sendNewText(c)
 
@@ -777,19 +777,19 @@ def set_text(self, device, control_name, values, sync=True, timeout=None):
 
 
     def values(self, device, ctl_name, ctl_type):
-        return dict(map(lambda c: (c.name, c.value), self.get_control(device, ctl_name, ctl_type)))
+        return dict(map(lambda c: (c.getName(), c.getValue()), self.get_control(device, ctl_name, ctl_type)))
 
 
     def switch_values(self, device, name, ctl=None):
         return self.__control2dict(device, name, 'switch', lambda c: {'value': c.getState() == PyIndi.ISS_ON}, ctl)
 
 
     def text_values(self, device, name, ctl=None):
-        return self.__control2dict(device, name, 'text', lambda c: {'value': c.text}, ctl)
+        return self.__control2dict(device, name, 'text', lambda c: {'value': c.getText()}, ctl)
 
 
     def number_values(self, device, name, ctl=None):
-        return self.__control2dict(device, name, 'text', lambda c: {'value': c.value, 'min': c.min, 'max': c.max, 'step': c.step, 'format': c.format}, ctl)
+        return self.__control2dict(device, name, 'text', lambda c: {'value': c.getValue(), 'min': c.min, 'max': c.max, 'step': c.step, 'format': c.format}, ctl)
 
 
     def light_values(self, device, name, ctl=None):
@@ -830,15 +830,15 @@ def __wait_for_ctl_statuses(self, ctl, statuses=[PyIndi.IPS_OK, PyIndi.IPS_IDLE]
     def __map_indexes(self, ctl, values):
         result = {}
         for i, c in enumerate(ctl):
-            #logger.info('Value name: %s', c.name)  # useful to find value names
-            if c.name in values:
-                result[c.name] = i
+            #logger.info('Value name: %s', c.getName())  # useful to find value names
+            if c.getName() in values:
+                result[c.getName()] = i
         return result
 
 
     def __control2dict(self, device, control_name, control_type, transform, control=None):
         def get_dict(element):
-            dest = {'name': element.name, 'label': element.label}
+            dest = {'name': element.getName(), 'label': element.getLabel()}
             dest.update(transform(element))
             return dest
 

indi_allsky/flask/forms.py

@@ -30,7 +30,7 @@
 from sqlalchemy import func
 #from sqlalchemy.types import DateTime
 #from sqlalchemy.types import Date
-#from sqlalchemy.orm.exc import NoResultFound
+from sqlalchemy.orm.exc import NoResultFound
 
 from flask import current_app as app
 
@@ -40,6 +40,8 @@
 from .models import IndiAllSkyDbKeogramTable
 from .models import IndiAllSkyDbStarTrailsTable
 from .models import IndiAllSkyDbStarTrailsVideoTable
+from .models import IndiAllSkyDbFitsImageTable
+from .models import IndiAllSkyDbRawImageTable
 
 from . import db
 
@@ -1384,6 +1386,8 @@ class IndiAllskyImageViewer(FlaskForm):
     DAY_SELECT           = SelectField('Day', choices=[], validators=[])
     HOUR_SELECT          = SelectField('Hour', choices=[], validators=[])
     IMG_SELECT           = SelectField('Image', choices=[], validators=[])
+    FITS_SELECT          = SelectField('FITS', choices=[], validators=[])  # hidden
+    RAW_SELECT           = SelectField('RAW', choices=[], validators=[])  # hidden
     FILTER_DETECTIONS    = BooleanField('Detections')
 
 
@@ -1508,26 +1512,51 @@ def getImages(self, year, month, day, hour):
             .filter(createDate_hour == hour)\
             .order_by(IndiAllSkyDbImageTable.createDate.desc())
 
-        images_choices = []
-        for i in images_query:
+        images_choices = list()
+        fits_choices = list()
+        raw_choices = list()
+        for i, img in enumerate(images_query):
             try:
-                uri = i.getUri()
+                uri = img.getUri()
             except ValueError as e:
                 app.logger.error('Error determining relative file name: %s', str(e))
                 continue
 
-            if i.detections:
-                entry_str = '{0:s} [*]'.format(i.createDate.strftime('%H:%M:%S'))
+            if img.detections:
+                entry_str = '{0:s} [*]'.format(img.createDate.strftime('%H:%M:%S'))
             else:
-                entry_str = i.createDate.strftime('%H:%M:%S')
+                entry_str = img.createDate.strftime('%H:%M:%S')
 
-            entry = (str(uri), entry_str)
+            images_choices.append((str(uri), entry_str))
 
-            images_choices.append(entry)
 
+            # look for fits
+            try:
+                fits_image = IndiAllSkyDbFitsImageTable.query\
+                    .filter(IndiAllSkyDbFitsImageTable.createDate == img.createDate)\
+                    .one()
+
+                fits_select = (str(fits_image.getUri()), i)
+            except NoResultFound:
+                fits_select = ('None', str(i))
+
+            fits_choices.append(fits_select)
 
-        return images_choices
 
+            # look for raw
+            try:
+                fits_image = IndiAllSkyDbRawImageTable.query\
+                    .filter(IndiAllSkyDbRawImageTable.createDate == img.createDate)\
+                    .one()
+
+                raw_select = (str(fits_image.getUri()), i)
+            except NoResultFound:
+                raw_select = ('None', i)
+
+            raw_choices.append(raw_select)
+
+
+        return images_choices, fits_choices, raw_choices
 
 
 
@@ -1548,6 +1577,8 @@ def __init__(self, *args, **kwargs):
             self.DAY_SELECT.choices = (('', 'None'),)
             self.HOUR_SELECT.choices = (('', 'None'),)
             self.IMG_SELECT.choices = (('', 'None'),)
+            self.FITS_SELECT.choices = (('', 'None'),)
+            self.RAW_SELECT.choices = (('', 'None'),)
 
             return
 
@@ -1564,7 +1595,11 @@ def __init__(self, *args, **kwargs):
         self.MONTH_SELECT.choices = self.getMonths(year)
         self.DAY_SELECT.choices = self.getDays(year, month)
         self.HOUR_SELECT.choices = self.getHours(year, month, day)
-        self.IMG_SELECT.choices = self.getImages(year, month, day, hour)
+
+        img_select, fits_select, raw_select = self.getImages(year, month, day, hour)
+        self.IMG_SELECT.choices = img_select
+        self.FITS_SELECT.choices = fits_select
+        self.RAW_SELECT.choices = raw_select
 
         dates_elapsed_s = time.time() - dates_start
         app.logger.info('Dates processed in %0.4f s', dates_elapsed_s)

indi_allsky/flask/miscDb.py

@@ -13,6 +13,8 @@
 from .models import IndiAllSkyDbKeogramTable
 from .models import IndiAllSkyDbStarTrailsTable
 from .models import IndiAllSkyDbStarTrailsVideoTable
+from .models import IndiAllSkyDbFitsImageTable
+from .models import IndiAllSkyDbRawImageTable
 
 from sqlalchemy.orm.exc import NoResultFound
 
@@ -358,6 +360,84 @@ def addStarTrailVideo(self, filename, camera_id, dayDate, timeofday='night'):
         return startrail_video
 
 
+    def addFitsImage(self, filename, camera_id, createDate, exposure, gain, binmode, night=True):
+        if not filename:
+            return
+
+        p_filename = Path(filename)
+        if not p_filename.exists():
+            logger.warning('File not found: %s', p_filename)
+
+
+        if night:
+            # day date for night is offset by 12 hours
+            dayDate = (createDate - datetime.timedelta(hours=12)).date()
+        else:
+            dayDate = createDate.date()
+
+
+        logger.info('Adding fits image %s to DB', filename)
+
+
+        filename_str = str(filename)  # might be a pathlib object
+
+
+        fits_image = IndiAllSkyDbFitsImageTable(
+            camera_id=camera_id,
+            filename=filename_str,
+            createDate=createDate,
+            exposure=exposure,
+            gain=gain,
+            binmode=binmode,
+            dayDate=dayDate,
+            night=night,
+        )
+
+        db.session.add(fits_image)
+        db.session.commit()
+
+        return fits_image
+
+
+    def addRawImage(self, filename, camera_id, createDate, exposure, gain, binmode, night=True):
+        if not filename:
+            return
+
+        p_filename = Path(filename)
+        if not p_filename.exists():
+            logger.warning('File not found: %s', p_filename)
+
+
+        if night:
+            # day date for night is offset by 12 hours
+            dayDate = (createDate - datetime.timedelta(hours=12)).date()
+        else:
+            dayDate = createDate.date()
+
+
+        logger.info('Adding raw image %s to DB', filename)
+
+
+        filename_str = str(filename)  # might be a pathlib object
+
+
+        fits_image = IndiAllSkyDbRawImageTable(
+            camera_id=camera_id,
+            filename=filename_str,
+            createDate=createDate,
+            exposure=exposure,
+            gain=gain,
+            binmode=binmode,
+            dayDate=dayDate,
+            night=night,
+        )
+
+        db.session.add(fits_image)
+        db.session.commit()
+
+        return fits_image
+
+
     def addUploadedFlag(self, entry):
         entry.uploaded = True
         db.session.commit()