a2p2 0.7.6__py3-none-any.whl → 0.7.8__py3-none-any.whl

a2p2/jmmc/catalogs.py

@@ -26,6 +26,9 @@ class Catalog():
 
     def __init__(self, catalogName, username=None, password=None, prod=False, apiUrl=None, tapUrl=None, where=None, joins=None):
         self.catalogName = catalogName
+        self.updated = False
+        self.lastTable = None
+        self.lastDataFrame = None
         self.where = where
         self.joins = joins
         self.prod = prod
@@ -91,21 +94,26 @@ class Catalog():
         """
         return self.api._get(f"/{self.catalogName}/{id}")
 
-    def getDataFrame(self):
+    def getDataFrame(self, forceUpdate=False):
         """ Get a pandas DataFrame from the main catalog joined the other if provided in constructor.
 
             usage: cat.getDataFrame()
         """
+        if not ( self.updated or forceUpdate or self.lastDataFrame is None):
+            return self.lastDataFrame
+        self.lastDataFrame = self.getTable(forceUpdate=forceUpdate).to_pandas()
+        return self.lastDataFrame
 
-        return self.getTable().to_pandas()
-
-    def getTable(self, maxrec=10000):
+    def getTable(self, maxrec=10000, forceUpdate=False):
         """ Get an astropy table from the main catalog joined the other if provided in constructor.
 
             usage: cat.getTable()
         """
         # using SELECT TOP N below to workarround astroquery.utils.tap BUG
 
+        if not ( self.updated or forceUpdate or self.lastTable is None ):
+            return self.lastTable
+
         clauses = []
         if self.joins :
             joinedCatalogNames = []
@@ -136,7 +144,9 @@ class Catalog():
 
         query = "  ".join(clauses)
         logger.info(f"Querying remote catalog : {query}")
-        return self.tap.search(query,maxrec=maxrec).to_table()
+        self.lastTable = self.tap.search(query,maxrec=maxrec).to_table()
+        self.updated=False
+        return self.lastTable
 
     def tableToDict(self, table):
         """ Convert table (astropy.table or row) to a list of dict so we can modify content and update remote catalog using updateRows().
@@ -166,6 +176,7 @@ class Catalog():
 
             usage: cat.updateRows(42, {"col_a":"a", "col_b":"b" })
         """
+        self.updated = True
         return self.api._put(f"/{self.catalogName}/{id}", values)
 
     def updateRows(self, values):
@@ -174,7 +185,7 @@ class Catalog():
 
             usage: updateRows([ { "id":42, "col_a":"a" }, { "id":24, "col_b":"b" } ])
         """
-
+        self.updated = True
         # We may check befere sending payload that we always provide an id for every record
         # What is the behaviour if we provide various data assosiated to the same id ?
         return self.api._put(f"/{self.catalogName}", values)
@@ -185,6 +196,7 @@ class Catalog():
 
             usage: addCatalogRows([ { "id":42, "col_a":"a" }, { "id":24, "col_b":"b" } ])
         """
+        self.updated = True
         return self.api._post(f"/{self.catalogName}", json=values)
 
 

a2p2/version.py

@@ -1,4 +1,4 @@
-__version__ = "0.7.6"
+__version__ = "0.7.8"
 
 __release_notes__ = {
     # "0.1.6": {
@@ -23,7 +23,15 @@ __release_notes__ = {
 #          "Try to read OB in P2 and send them back to Aspro2 as a new obs",
 #      ],
 
-    "0.7.6": {
+    "0.7.8": {
+       "A2P2": [
+           "catalogs : use cache for dataFrame() so we can modify it (was recreated from astropy table on each call)",
+        ],
+    },"0.7.7": {
+       "A2P2": [
+           "catalogs : save some data retrieval until update or force request occurs",
+        ],
+    },"0.7.6": {
        "A2P2": [
            "add getDataFrame() to a2p2.jmmc.Catalog to provide remote data with pandas format",
         ],

{a2p2-0.7.6.dist-info → a2p2-0.7.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: a2p2
-Version: 0.7.6
+Version: 0.7.8
 Author-email: JMMC Tech Group <jmmc-tech-group@jmmc.fr>
 License: OSI Approved :: GNU General Public License v3 (GPLv3)
 Project-URL: Homepage, https://www.jmmc.fr/a2p2

{a2p2-0.7.6.dist-info → a2p2-0.7.8.dist-info}/RECORD

@@ -7,12 +7,12 @@ a2p2/instrument.py,sha256=JI1i8vsGu1ku_3i7my278b8y8vL5Z-SF3V8XkHPSs48,732
 a2p2/ob.py,sha256=lcSm5eXv79K6cjp0VxvxD4sSlsBTKHGbmT85XEx74lY,6268
 a2p2/samp.py,sha256=DN20lWszkuuneR1BV1MBLEyoGyN8tZWvOeC5rEVLICo,3438
 a2p2/utils.py,sha256=QEA9cpc2TaqXDa4yqrFiGkCl__1wV8--rVw_A-p_HM0,23833
-a2p2/version.py,sha256=SBcM00GM4AaYrNLt35Q9OmYC5RG20coTbavUQYpboB0,12614
+a2p2/version.py,sha256=mebJf7nf4K-TQzFhN6N5xz0DL3FogdsUD2zmdxIwzrs,12910
 a2p2/chara/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 a2p2/chara/facility.py,sha256=otv0UVQVYD7dE_ENojjatjld5owgM9qRm7vsAc0jyqQ,2754
 a2p2/chara/gui.py,sha256=4O8u-g-UJSeqEV9CUPNflVNWIsmH0b_xf8c9huxAivs,5119
 a2p2/jmmc/__init__.py,sha256=Yx8Ae77UQA_aLMzhKgWym4m2fbMR_4m77TGfaXy6I4A,187
-a2p2/jmmc/catalogs.py,sha256=bEmG_gkte5uGeKcbsnz6BTMYLnWB4HFpp_XmgSxcwyg,8624
+a2p2/jmmc/catalogs.py,sha256=BTfG5550GOehjouFx7J_9-Ww2S8NFjQUpEwBbSoinNQ,9199
 a2p2/jmmc/generated_models.py,sha256=69fmPfkCMBc0GyDeHp1rs0vkoPqOE4j0egMBWX5mB1U,11823
 a2p2/jmmc/models.py,sha256=ikI8Dk-9ThkG1uHtoPJwB43tPF_YZj8M5tftIcJio7s,3776
 a2p2/jmmc/services.py,sha256=kcRaRnR4COKijF5izDqqNHjKyU1j2H8PEPvbDsBUFcw,312
@@ -31,9 +31,9 @@ a2p2/vlti/conf/MATISSE_ditTable.json,sha256=2RQXb9UL1_VlcAAGoxqpe3nTrRfO4gyOX_IG
 a2p2/vlti/conf/MATISSE_rangeTable.json,sha256=_j5m-EOh4bbfwdaANdh23yjgNef95AUku_uNujr9BDc,5770
 a2p2/vlti/conf/PIONIER_ditTable.json,sha256=BKK7nF0nE_LOP44l_fAvAnpG8oOq5p9srcdTNQ2udKo,857
 a2p2/vlti/conf/PIONIER_rangeTable.json,sha256=71Ycm2h-uBUVSAWy6lTpaBDOYwKKL5MuZH6F5ESHOI0,2113
-a2p2-0.7.6.dist-info/licenses/LICENSE,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
-a2p2-0.7.6.dist-info/METADATA,sha256=7JQoo7_dNUObegDtEqWxnsdSkFIOZOeTziMDx7hKyTY,4188
-a2p2-0.7.6.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-a2p2-0.7.6.dist-info/entry_points.txt,sha256=5Pq7faxs04hSEtjpqtBAlHw3cGUpvTmBugnS5PzgJMY,44
-a2p2-0.7.6.dist-info/top_level.txt,sha256=lLDb6xGRyHYSbrO0EUx8vNEzTiCDtPe2z7PSbqGY4kE,5
-a2p2-0.7.6.dist-info/RECORD,,
+a2p2-0.7.8.dist-info/licenses/LICENSE,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
+a2p2-0.7.8.dist-info/METADATA,sha256=RU21-wyWUbs1npE-so85NC_ecHLkfHNB3XsTCVwQ2_M,4188
+a2p2-0.7.8.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+a2p2-0.7.8.dist-info/entry_points.txt,sha256=5Pq7faxs04hSEtjpqtBAlHw3cGUpvTmBugnS5PzgJMY,44
+a2p2-0.7.8.dist-info/top_level.txt,sha256=lLDb6xGRyHYSbrO0EUx8vNEzTiCDtPe2z7PSbqGY4kE,5
+a2p2-0.7.8.dist-info/RECORD,,

{a2p2-0.7.6.dist-info → a2p2-0.7.8.dist-info}/WHEEL

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