a2p2 0.7.7__tar.gz → 0.7.9__tar.gz

{a2p2-0.7.7/a2p2.egg-info → a2p2-0.7.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: a2p2
-Version: 0.7.7
+Version: 0.7.9
 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.7 → a2p2-0.7.9}/a2p2/jmmc/catalogs.py

@@ -28,6 +28,7 @@ class Catalog():
         self.catalogName = catalogName
         self.updated = False
         self.lastTable = None
+        self.lastDataFrame = None
         self.where = where
         self.joins = joins
         self.prod = prod
@@ -93,13 +94,15 @@ 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()
         """
-
-        return self.getTable().to_pandas()
+        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
 
     def getTable(self, maxrec=10000, forceUpdate=False):
         """ Get an astropy table from the main catalog joined the other if provided in constructor.
@@ -108,7 +111,7 @@ class Catalog():
         """
         # using SELECT TOP N below to workarround astroquery.utils.tap BUG
 
-        if not self.updated and self.lastTable and not forceUpdate:
+        if not ( self.updated or forceUpdate or self.lastTable is None ):
             return self.lastTable
 
         clauses = []

{a2p2-0.7.7 → a2p2-0.7.9}/a2p2/jmmc/utils.py

@@ -27,7 +27,7 @@ logger = logging.getLogger(__name__)
 def requests_retry_session(
         retries=3,
         backoff_factor=1.0,
-        status_forcelist=(500, 502, 504)):
+        status_forcelist=(401, 500, 502, 504)):
 
     adapter = HTTPAdapter()
     adapter.max_retries = Retry(
@@ -79,38 +79,13 @@ class JmmcAPI():
     def _put(self, url, json):
         return self._request('PUT', url, json)
 
-    def _post(self, url, json):
-        return self._request('POST', url, json)
-
     def _post(self, url, **kwargs):
-        return self._request2('POST', url, **kwargs)
-
-    def _request2(self, method, url, **kwargs):
-        logger.info("performing %s request on %s" % (method, self.rootURL+url))
-        r = self.requests_session.request(
-            method, self.rootURL+url, **kwargs)
-        # handle response if any or throw an exception
-        if (r.status_code == 204):  # No Content : everything is fine
-            return
-        elif 200 <= r.status_code < 300:
-            if 'Content-Type' in r.headers.keys() and 'application/json' in r.headers['Content-Type']:
-                return r.json()
-            else:
-                return r.content
-        # TODO enhance error handling ? Throw an exception ....
-        error = []
-        error.append("status_code is %s"%r.status_code)
-        if r.reason :
-            error.append(r.reason)
-        if "X-Http-Error-Description" in r.headers.keys():
-            error.append(r.headers["X-Http-Error-Description"])
-
-        raise Exception(error)
+        return self._request('POST', url, **kwargs)
 
-    def _request(self, method, url, json=None, data=None, files=None):
+    def _request(self, method, url, **kwargs):
         logger.info("performing %s request on %s" % (method, self.rootURL+url))
         r = self.requests_session.request(
-            method, self.rootURL+url, auth=self.auth, json=json, data=data, files=files)
+            method, self.rootURL+url, auth=self.auth, **kwargs)
         # handle response if any or throw an exception
         if (r.status_code == 204):  # No Content : everything is fine
             return

{a2p2-0.7.7 → a2p2-0.7.9}/a2p2/version.py

@@ -1,4 +1,4 @@
-__version__ = "0.7.7"
+__version__ = "0.7.9"
 
 __release_notes__ = {
     # "0.1.6": {
@@ -23,9 +23,17 @@ __release_notes__ = {
 #          "Try to read OB in P2 and send them back to Aspro2 as a new obs",
 #      ],
 
-    "0.7.7": {
+    "0.7.9": {
        "A2P2": [
-           "save some data retrival until update or force request occurs",
+           "catalogs : remove duplicated code and force auth on POST requests",
+        ],
+    },"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": [

{a2p2-0.7.7 → a2p2-0.7.9/a2p2.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: a2p2
-Version: 0.7.7
+Version: 0.7.9
 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