roman-snpit-snappl 0.19.0__tar.gz → 0.20.0__tar.gz

{roman_snpit_snappl-0.19.0/roman_snpit_snappl.egg-info → roman_snpit_snappl-0.20.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: roman_snpit_snappl
-Version: 0.19.0
+Version: 0.20.0
 Summary: General, database, and photometry utilities for the Roman SNPIT
 Author: Roman Supernova Project Infrastructure Team
 Maintainer-email: Roman SN PIT <raknop@lbl.gov>

roman_snpit_snappl-0.20.0/changes/86.snappl.rst

@@ -0,0 +1 @@
+Added lightcurve class.

{roman_snpit_snappl-0.19.0 → roman_snpit_snappl-0.20.0/roman_snpit_snappl.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: roman_snpit_snappl
-Version: 0.19.0
+Version: 0.20.0
 Summary: General, database, and photometry utilities for the Roman SNPIT
 Author: Roman Supernova Project Infrastructure Team
 Maintainer-email: Roman SN PIT <raknop@lbl.gov>

{roman_snpit_snappl-0.19.0 → roman_snpit_snappl-0.20.0}/roman_snpit_snappl.egg-info/SOURCES.txt

@@ -63,6 +63,7 @@ changes/82.snappl.rst
 changes/83.snappl.rst
 changes/84.feature.rst
 changes/85.feature.rst
+changes/86.snappl.rst
 changes/87.docs.rst
 changes/89.feature.rst
 changes/9.snappl.rst
@@ -109,6 +110,7 @@ snappl/http.py
 snappl/image.py
 snappl/image_simulator.py
 snappl/imagecollection.py
+snappl/lightcurve.py
 snappl/logger.py
 snappl/provenance.py
 snappl/psf.py
@@ -126,6 +128,7 @@ snappl/db/webserver.py
 snappl/db/migrations/20251008_init.sql
 snappl/db/migrations/20251017_objdetcount.sql
 snappl/db/migrations/20251024_l2image_mjd.sql
+snappl/db/migrations/20251025_lightcurve.sql
 snappl/db/migrations/apply_migrations.py
 snappl/db/migrations/schema_to_rst.py
 snappl/db/migrations/scorched_earth.py

{roman_snpit_snappl-0.19.0 → roman_snpit_snappl-0.20.0}/snappl/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.19.0'
-__version_tuple__ = version_tuple = (0, 19, 0)
+__version__ = version = '0.20.0'
+__version_tuple__ = version_tuple = (0, 20, 0)
 
-__commit_id__ = commit_id = 'g463af9082'
+__commit_id__ = commit_id = 'g3f6286e64'

{roman_snpit_snappl-0.19.0 → roman_snpit_snappl-0.20.0}/snappl/admin/load_ou2024_l2images.py

@@ -38,7 +38,7 @@ def _parse_fits_file( relpath, base_path=None, provid=None ):
                'provenance_id': provid,
                'pointing': image.pointing,
                'sca': image.sca,
-               'filter': image.band,
+               'band': image.band,
                'ra': ra,
                'dec': dec,
                'ra_corner_00': ra_corner_00,
@@ -96,17 +96,17 @@ class OU2024_L2image_loader:
                 words = line.split(',')
                 if len(words) != 3:
                     raise ValueError( f'Failed to parse line: "{line}"' )
-                if ( ( words[0].strip() == 'filter' ) and
+                if ( any( words[0].strip() == i for i in ('filter', 'band') ) and
                      ( words[1].strip() == 'pointing' ) and
                      ( words[2].strip() == 'sca' )
                     ):
                     header = True
                 elif not header:
-                    raise ValueError( f'First line was "{line}", not "filter,pointing,sca"' )
+                    raise ValueError( f'First line was "{line}", not "band,pointing,sca"' )
                 else:
-                    filter, pointing, sca = words
-                    fpath = pathlib.Path( f'{filter}/{pointing}/'
-                                          f'Roman_TDS_simple_model_{filter}_{pointing}_{sca}.fits.gz' )
+                    band, pointing, sca = words
+                    fpath = pathlib.Path( f'{band}/{pointing}/'
+                                          f'Roman_TDS_simple_model_{band}_{pointing}_{sca}.fits.gz' )
                     if ( self.base_path / fpath ).is_file():
                         imagefiles.append( fpath )
                     else:
@@ -190,7 +190,7 @@ def main():
     parser.add_argument( '-b', '--basedir', default='/ou2024/RomanTDS/images/simple_model',
                          help='Base directory.' )
     parser.add_argument( '-f', '--filelist', default=None,
-                         help="File with list of filter,pointing,sca" )
+                         help="File with list of band,pointing,sca" )
     parser.add_argument( '-j', '--just-get-filenames', default=False, action='store_true',
                          help="Don't actually load files to the database, just generate a file list." )
     parser.add_argument( '-s', '--save-file-list', default=None,

{roman_snpit_snappl-0.19.0 → roman_snpit_snappl-0.20.0}/snappl/config.py

@@ -112,7 +112,7 @@ class Config:
            images:
              format: fits
              single_file: false
-             name_convention: "{inst_name}_{date}_{time}_{section_id}_{filter}_{im_type}_{prov_hash:.6s}"
+             name_convention: "{inst_name}_{date}_{time}_{section_id}_{band}_{im_type}_{prov_hash:.6s}"
 
        then confobj.value("storage.images.format") will return
        "fits". You can also ask configobj.value for higher levels.  For
@@ -120,7 +120,7 @@ class Config:
 
           { "format": "fits",
             "single_file": False,
-            "name_convention": "{inst_name}_{date}_{time}_{section_id}_{filter}_{im_type}_{prov_hash:.6s}"
+            "name_convention": "{inst_name}_{date}_{time}_{section_id}_{band}_{im_type}_{prov_hash:.6s}"
           }
 
     4. Change a config value with::

roman_snpit_snappl-0.20.0/snappl/db/migrations/20251025_lightcurve.sql

@@ -0,0 +1,5 @@
+ALTER TABLE l2image RENAME COLUMN filter TO band;
+ALTER TABLE summed_image RENAME COLUMN filter TO band;
+ALTER TABLE lightcurve RENAME COLUMN filter TO band;
+
+ALTER TABLE lightcurve ADD COLUMN diaobject_position_id UUID DEFAULT NULL;

{roman_snpit_snappl-0.19.0 → roman_snpit_snappl-0.20.0}/snappl/db/webserver.py

@@ -484,13 +484,28 @@ class GetL2Image( BaseView ):
 
 class FindL2Images( BaseView ):
     def do_the_things( self, provid ):
-        q = "SELECT * FROM l2image WHERE "
+        q = sql.SQL( "SELECT * FROM l2image WHERE " )
         conditions = [ 'provenance_id=%(provid)s' ]
         subdict = { 'provid': provid }
 
         if flask.request.is_json:
             data = flask.request.json
 
+            orderby = []
+            limit = None
+            offset = None
+            if 'order_by' in data:
+                orderby = data['order_by']
+                if not isinstance( orderby, list ):
+                    orderby = [ orderby ]
+                del data['order_by']
+            if 'limit' in data:
+                limit = int( data['limit'] )
+                del data['limit']
+            if 'offset' in data:
+                offset = int( data['offset'] )
+                del data['offset']
+
             if ( 'ra' in data ) or ( 'dec' in data ):
                 # 'ra' and 'dec' are supposed to be "includes this".
                 #
@@ -512,7 +527,7 @@ class FindL2Images( BaseView ):
                 del data['ra']
                 del data['dec']
 
-            for kw in [ 'pointing', 'sca', 'filter', 'filepath' ]:
+            for kw in [ 'pointing', 'sca', 'band', 'filepath' ]:
                 if kw in data:
                     conditions.append( f"{kw}=%({kw})s" )
                     subdict[kw] = data[kw] if data[kw] is not None else None
@@ -534,7 +549,20 @@ class FindL2Images( BaseView ):
             if len(data) != 0:
                 return f"Error, unknown parameters: {data.keys()}", 500
 
-        q += ' AND '.join( conditions )
+        q += sql.SQL( ' AND '.join( conditions ) )
+
+        if len( orderby ) > 0:
+            q += sql.SQL( " ORDER BY " )
+            comma = ""
+            for o in orderby:
+                q += sql.SQL( f"{comma}{{orderby}}" ).format( orderby=sql.Identifier(o) )
+                comma = ","
+        if limit is not None:
+            q += sql.SQL( " LIMIT %(limit)s" )
+            subdict['limit'] = limit
+        if offset is not None:
+            q += sql.SQL( " OFFSET %(offset)s" )
+            subdict['offset'] = offset
 
         with db.DBCon( dictcursor=True ) as dbcon:
             rows = dbcon.execute( q, subdict )
@@ -542,6 +570,90 @@ class FindL2Images( BaseView ):
         return rows
 
 
+# ======================================================================
+
+class SaveLightcurve( BaseView ):
+    def do_the_things( self ):
+        if not flask.request.is_json:
+            return "Expected lightcurve info in json POST, didn't get any.", 500
+
+        data = flask.request.json
+        needed_keys = { 'id', 'provenance_id', 'diaobject_id', 'diaobject_position_id', 'band', 'filepath' }
+        passed_keys = set( data.keys() )
+        if not passed_keys.issubset( needed_keys ):
+            return f"Unknown keys: {passed_keys - needed_keys}", 500
+        if not needed_keys.issubset( passed_keys ):
+            return f"Missing required keys: {needed_keys - passed_keys}", 500
+
+        with db.DBCon( dictcursor=True ) as dbcon:
+            rows = dbcon.execute( "SELECT * FROM provenance WHERE id=%(id)s", { 'id': data['provenance_id'] } )
+            if len(rows) == 0:
+                return f"Unknown provenance {data['provenance_id']}", 500
+
+            dbcon.execute( ( "INSERT INTO lightcurve(id, provenance_id, diaobject_id, "
+                             "  diaobject_position_id, band, filepath) "
+                             "VALUES(%(id)s, %(provenance_id)s, %(diaobject_id)s, %(diaobject_position_id)s, "
+                             "  %(band)s, %(filepath)s)" ),
+                           data )
+            dbcon.commit()
+
+            res = dbcon.execute( "SELECT * FROM lightcurve WHERE id=%(id)s", {'id': data['id']} )
+            if len(res) == 0:
+                return "Something went wrong, lightcurve not saved to database", 500
+
+        return res[0]
+
+
+# ======================================================================
+
+class GetLightcurve( BaseView ):
+    def do_the_things( self, ltcvid ):
+        with db.DBCon( dictcursor=True ) as dbcon:
+            rows = dbcon.execute( "SELECT * FROM lightcurve WHERE id=%(id)s", { 'id': ltcvid } )
+            if len(rows) == 0:
+                return f"No lightcurve with id {ltcvid}", 500
+            elif len(rows) > 1:
+                return f"Multiple lightcurves with id {ltcvid}; this should never happen.", 500
+            else:
+                return rows[0]
+
+
+# ======================================================================
+
+class FindLightcurves( BaseView ):
+    def do_the_things( self ):
+        if not flask.request.is_json:
+            return "Expected lightcurve search data in json POST, didn't get any.", 500
+
+        conditions = []
+
+        data = flask.request.json
+        q = "SELECT l.* FROM lightcurve l "
+        subdict = {}
+
+        if 'provenance_id' in data:
+            conditions.append( "l.provenance_id=%(provid)s" )
+            subdict['provid'] = data['provenance_id']
+        else:
+            if ( 'provenance_tag' not in data ) or ( 'process' not in data ):
+                return "Must pass either provenance_id, or both of provenance_tag and process", 500
+            q += "INNER JOIN provenance_tag t ON l.provenance_id=t.provenance_id "
+            conditions.append( "t.tag=%(tag)s" )
+            conditions.append( "t.process=%(process)s" )
+            subdict.update( { 'tag': data['provenance_tag'], 'process': data['process'] } )
+
+        for thing in [ 'diaobject_id', 'band' ]:
+            if thing in data:
+                conditions.append( f"l.{thing}=%({thing})s" )
+                subdict[thing] = data[thing]
+
+        if len(conditions) > 0:
+            q += " WHERE " + " AND ".join( conditions )
+
+        with db.DBCon( dictcursor=True ) as dbcon:
+            return dbcon.execute( q, subdict )
+
+
 # ======================================================================
 
 urls = {
@@ -564,4 +676,8 @@ urls = {
 
     "/getl2image/<imageid>": GetL2Image,
     "/findl2images/<provid>": FindL2Images,
+
+    "/savelightcurve": SaveLightcurve,
+    "/getlightcurve/<ltcvid>": GetLightcurve,
+    "/findlightcurves": FindLightcurves,
 }

{roman_snpit_snappl-0.19.0 → roman_snpit_snappl-0.20.0}/snappl/image.py

@@ -1256,7 +1256,7 @@ class OpenUniverse2024FITSImage( FITSImageOnDisk ):
 
     @property
     def exptime( self ):
-        # Galsim has fixed exptimes for roman filters
+        # ou2024 has fixed exptimes for roman bands
         exptimes = {'F184': 901.175,
                    'J129': 302.275,
                    'H158': 302.275,

{roman_snpit_snappl-0.19.0 → roman_snpit_snappl-0.20.0}/snappl/imagecollection.py

@@ -126,7 +126,7 @@ class ImageCollection:
             Pointing.  If not given, just use the Path to find the image.
 
           band: str, default None
-            Filter.
+            Band.
 
           sca: int, default None
             SCA.
@@ -200,8 +200,8 @@ class ImageCollection:
           dec: float, default None
             Only return images that containe this dec
 
-          filter: str, default None
-            Only include images from this filter
+          band: str, default None
+            Only include images from this band
 
           exptime_min: float, default None
             Only include images with at least this exptime in seconds.
@@ -212,6 +212,25 @@ class ImageCollection:
           sca: int
             Only include images from this sca.
 
+          order_by: str or list, default None
+            By default, the returned images are not sorted in any
+            particular way.  Put a keyword here to sort by that value
+            (or by those values).  Options include 'id',
+            'provenance_id', 'pointing', 'sca', 'ra', 'dec', 'filepath',
+            'width', 'height', 'mjd', 'exptime'.  Not all of these are
+            necessarily useful, and some of them may be null for many
+            objects in the database.
+
+          limit : int, default None
+            Only return this many objects at most.
+
+          offset : int, default None
+            Useful with limit and order_by ; offset the returned value
+            by this many entries.  You can make repeated calls to
+            find_objects to get subsets of objects by passing the same
+            order_by and limit, but different offsets each time, to
+            slowly build up a list.
+
         Returns
         -------
           imagelist: list of snappl.image.Image
@@ -288,7 +307,7 @@ class ImageCollectionOU2024:
                       mjd_max=None,
                       ra=None,
                       dec=None,
-                      filter=None,
+                      band=None,
                       exptime_min=None,
                       exptime_max=None,
                       sca=None ):
@@ -304,8 +323,8 @@ class ImageCollectionOU2024:
             params['mjd_min'] = float(mjd_min)
         if mjd_max is not None:
             params['mjd_max'] = float(mjd_max)
-        if filter is not None:
-            params['filter'] = str(filter)
+        if band is not None:
+            params['filter'] = str(band)
         if exptime_min is not None:
             params['exptime_min'] = float(exptime_min)
         if exptime_max is not None:
@@ -415,7 +434,7 @@ class ImageCollectionDB:
                      ( all( i is not None for i in [ pointing, band, sca ] ) ) ):
                 raise ValueError( "Must specify one of image_id, path, or (pointing, band, and sca)." )
 
-            data = { k: v for k, v in zip( ['filepath', 'pointing', 'filter', 'sca' ],
+            data = { k: v for k, v in zip( ['filepath', 'pointing', 'band', 'sca' ],
                                            [path, pointing, band, sca ] )
                      if v is not None }
             rows = dbclient.send( f"/findl2images/{self.provenance.id}",
@@ -429,7 +448,6 @@ class ImageCollectionDB:
             row = rows[0]
 
         row['path'] = self.base_path / row['filepath']
-        row['band'] = row['filter']
         return self.image_class( **row )
 
 
@@ -446,7 +464,7 @@ class ImageCollectionDB:
         images = []
         for row in rows:
             row['path'] = self.base_path / row['filepath']
-            row['band'] = row['filter']
+            row['band'] = row['band']
             images.append( self.image_class( **row ) )
 
         return images