roman-snpit-snappl 0.22.0__tar.gz → 0.23.0__tar.gz

{roman_snpit_snappl-0.22.0 → roman_snpit_snappl-0.23.0}/.github/workflows/changelog.yml

@@ -23,6 +23,9 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  # v4.2.2
         with:
           fetch-depth: 0
+      - run: sudo apt-get -y update && sudo apt-get install -y libfftw3-double3
+      - run: sudo ln -s /usr/lib/x86_64-linux-gnu/libfftw3.so.3 /usr/lib/libfftw3.so
+      - run: ls -l /usr/lib/libff*
       - run: pip install .
       - run: pip install towncrier
       - run: towncrier check
@@ -34,4 +37,4 @@ jobs:
         with:
           fetch-depth: 0
       - name: prevent direct changes to `CHANGES.rst`
-        run: git diff HEAD ${{ github.event.pull_request.base.sha }} --no-patch --exit-code CHANGES.rst
+        run: git diff HEAD ${{ github.event.pull_request.base.sha }} --no-patch --exit-code CHANGES.rst

{roman_snpit_snappl-0.22.0/roman_snpit_snappl.egg-info → roman_snpit_snappl-0.23.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: roman_snpit_snappl
-Version: 0.22.0
+Version: 0.23.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.23.0/changes/109.bugfix.rst

@@ -0,0 +1 @@
+Fix issue #90 (spurious error messages when saving a provenance to database)

{roman_snpit_snappl-0.22.0 → roman_snpit_snappl-0.23.0/roman_snpit_snappl.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: roman_snpit_snappl
-Version: 0.22.0
+Version: 0.23.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.22.0 → roman_snpit_snappl-0.23.0}/roman_snpit_snappl.egg-info/SOURCES.txt

@@ -29,6 +29,7 @@ changes/103.snappl.rst
 changes/105.docs.rst
 changes/106.docs.rst
 changes/107.feature.rst
+changes/109.bugfix.rst
 changes/13.bugfix.rst
 changes/14.snappl.rst
 changes/15.feature.rst

{roman_snpit_snappl-0.22.0 → roman_snpit_snappl-0.23.0}/snappl/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.22.0'
-__version_tuple__ = version_tuple = (0, 22, 0)
+__version__ = version = '0.23.0'
+__version_tuple__ = version_tuple = (0, 23, 0)
 
-__commit_id__ = commit_id = 'gb84fe5a43'
+__commit_id__ = commit_id = 'g19a7a9205'

{roman_snpit_snappl-0.22.0 → roman_snpit_snappl-0.23.0}/snappl/db/webserver.py

@@ -137,7 +137,7 @@ class GetProvenance( BaseProvenance ):
                                           "WHERE t.process=%(process)s AND t.tag=%(tag)s",
                                           { 'process': process, 'tag': provid } )
             if len(rows) == 0:
-                return f"Unknown provenance {provid}{'' if process is None else f' for process {process}'}", 500
+                return { 'status': f'No such provenance {provid}' }
             if len(rows) > 1:
                 return ( f"Database corruption!  More than one provenance {provid}"
                          f"{'' if process is None else f' for process {process}'}!" ), 500

{roman_snpit_snappl-0.22.0 → roman_snpit_snappl-0.23.0}/snappl/provenance.py

@@ -178,10 +178,7 @@ class Provenance:
 
         dbclient = SNPITDBClient() if dbclient is None else dbclient
         self.update_id()
-        try:
-            savedprov = self.get_by_id( self.id, dbclient=dbclient )
-        except Exception:
-            savedprov = None
+        savedprov = self.get_by_id( self.id, dbclient=dbclient, return_none_if_not_exists=True )
 
         if ( savedprov is None ) and ( exists is not None ) and exists:
             raise RuntimeError( f"Provenance {self.id} doesn't exist in the database, and exists is True; "
@@ -189,7 +186,7 @@ class Provenance:
         if ( savedprov is not None ) and ( exists is not None ) and ( not exists ):
             raise RuntimeError( f"Error saving provenance {self.id}; it already exists in the database." )
 
-        if savedprov is None:
+        if ( savedprov is None ) or ( tag is not None ):
             res = dbclient.send( "createprovenance",
                                  { 'id': str(self.id),
                                    'process': self.process,
@@ -201,6 +198,7 @@ class Provenance:
                                    'params': self.params,
                                    'upstream_ids': [ str(u.id) for u in self.upstreams ],
                                    'tag': tag,
+                                   'exist_ok': True,
                                    'replace_tag': replace_tag } )
             if res['status'] != 'ok':
                 raise RuntimeError( f"Something went wrong saving provenance {self.id} to the databse." )
@@ -283,7 +281,7 @@ class Provenance:
 
 
     @classmethod
-    def get_by_id( cls, provid, dbclient=None ):
+    def get_by_id( cls, provid, dbclient=None, return_none_if_not_exists=False ):
         """Return a Provenance pulled from the database.
 
         Raises an exception if it does not exist.
@@ -297,10 +295,29 @@ class Provenance:
             This is needed to talk to the Roman SNPIT database web
             server.  If not given, will construct one based on config.
 
+          return_none_if_not_exists : bool, default False
+
+        Returns
+        -------
+          Provenance
+
+          If return_none_if_not_exists is True, then None will be
+          returned if the provenance does not exist in the database.  If
+          return_none_if_not_exists is False (the default), then an
+          exception will be raised if the provenance does not exist in
+          the database.
+
         """
 
         dbclient = SNPITDBClient() if dbclient is None else dbclient
-        return cls.parse_provenance( dbclient.send( f"getprovenance/{provid}" ) )
+        rval = dbclient.send( f"getprovenance/{provid}" )
+        if ( 'status' in rval ) and ( rval['status'] == f'No such provenance {provid}' ):
+            if return_none_if_not_exists:
+                return None
+            else:
+                raise ValueError( f"No such provenance {provid}" )
+        else:
+            return cls.parse_provenance( rval )