a2p2 0.7.5__py3-none-any.whl → 0.7.7__py3-none-any.whl

a2p2/jmmc/catalogs.py

@@ -26,6 +26,8 @@ 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.where = where
         self.joins = joins
         self.prod = prod
@@ -91,13 +93,24 @@ class Catalog():
         """
         return self.api._get(f"/{self.catalogName}/{id}")
 
-    def getTable(self, maxrec=10000):
+    def getDataFrame(self):
+        """ Get a pandas DataFrame from the main catalog joined the other if provided in constructor.
+
+            usage: cat.getDataFrame()
+        """
+
+        return self.getTable().to_pandas()
+
+    def getTable(self, maxrec=10000, forceUpdate=False):
         """ Get an astropy table from the main catalog joined the other if provided in constructor.
 
-            usage: cat.getRows()
+            usage: cat.getTable()
         """
         # using SELECT TOP N below to workarround astroquery.utils.tap BUG
 
+        if not self.updated and self.lastTable and not forceUpdate:
+            return self.lastTable
+
         clauses = []
         if self.joins :
             joinedCatalogNames = []
@@ -127,9 +140,10 @@ class Catalog():
                 clauses.append(f" WHERE {self.where}")
 
         query = "  ".join(clauses)
-        logger.info(f"Queriing TAP : {query}")
-        return self.tap.search(query,maxrec=maxrec).to_table()
-
+        logger.info(f"Querying remote catalog : {query}")
+        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().
@@ -159,6 +173,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):
@@ -167,7 +182,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)
@@ -178,6 +193,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.5"
+__version__ = "0.7.7"
 
 __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.5": {
+    "0.7.7": {
+       "A2P2": [
+           "save some data retrival until update or force request occurs",
+        ],
+    },"0.7.6": {
+       "A2P2": [
+           "add getDataFrame() to a2p2.jmmc.Catalog to provide remote data with pandas format",
+        ],
+    },"0.7.5": {
        "A2P2": [
            "Add support for join and filter in a2p2.jmmc.Catalog wrapper",
         ],

{a2p2-0.7.5.dist-info → a2p2-0.7.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: a2p2
-Version: 0.7.5
+Version: 0.7.7
 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.5.dist-info → a2p2-0.7.7.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=GLpDGpPVD2K0jGYvnnIDDQtBKAakwU6GVqNfLgQjqHU,12473
+a2p2/version.py,sha256=IlWxDqoVq3nbpxcyAiJ0pxrp7opkJ4Stqhg8ICCrs6s,12734
 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=DSbtbYTVKlzeLqRRTjtoXL_VRKrwmIyQYV7wyUZ0JE0,8387
+a2p2/jmmc/catalogs.py,sha256=dbo54rz26EkPWUCsV9zngLpllnFqvNKpS84Gomn2WL8,8955
 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.5.dist-info/licenses/LICENSE,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
-a2p2-0.7.5.dist-info/METADATA,sha256=oFkoCUDTJtJcg3R2CoGt3lh0CczgpGnTpKlL5hLTDP4,4188
-a2p2-0.7.5.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-a2p2-0.7.5.dist-info/entry_points.txt,sha256=5Pq7faxs04hSEtjpqtBAlHw3cGUpvTmBugnS5PzgJMY,44
-a2p2-0.7.5.dist-info/top_level.txt,sha256=lLDb6xGRyHYSbrO0EUx8vNEzTiCDtPe2z7PSbqGY4kE,5
-a2p2-0.7.5.dist-info/RECORD,,
+a2p2-0.7.7.dist-info/licenses/LICENSE,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
+a2p2-0.7.7.dist-info/METADATA,sha256=2PINF64OeVs9rRtgU5NY7DVEODvfjXB7BlAB_9nc07M,4188
+a2p2-0.7.7.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+a2p2-0.7.7.dist-info/entry_points.txt,sha256=5Pq7faxs04hSEtjpqtBAlHw3cGUpvTmBugnS5PzgJMY,44
+a2p2-0.7.7.dist-info/top_level.txt,sha256=lLDb6xGRyHYSbrO0EUx8vNEzTiCDtPe2z7PSbqGY4kE,5
+a2p2-0.7.7.dist-info/RECORD,,

{a2p2-0.7.5.dist-info → a2p2-0.7.7.dist-info}/WHEEL

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