timewise 0.5.2__tar.gz → 0.5.3__tar.gz

{timewise-0.5.2 → timewise-0.5.3}/PKG-INFO

@@ -1,14 +1,13 @@
 Metadata-Version: 2.3
 Name: timewise
-Version: 0.5.2
+Version: 0.5.3
 Summary: A small package to download infrared data from the WISE satellite
 License: MIT
 Author: Jannis Necker
 Author-email: jannis.necker@gmail.com
-Requires-Python: >=3.8,<3.12
+Requires-Python: >=3.9,<3.12
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
@@ -25,7 +24,7 @@ Requires-Dist: numpy (>=1.23.2,<2.0.0)
 Requires-Dist: pandas (>=1.4.3,<3.0.0)
 Requires-Dist: pydantic (>=1.9.0,<2.0.0)
 Requires-Dist: pytest (>=7.2.2,<8.0.0) ; extra == "dev"
-Requires-Dist: pyvo (>=1.4.1,<2.0.0)
+Requires-Dist: pyvo (>=1.7.0,<2.0.0)
 Requires-Dist: requests (>=2.28.1,<3.0.0)
 Requires-Dist: scikit-image (>=0.19.3,<0.22.0)
 Requires-Dist: scikit-learn (>=1.3.0,<2.0.0)

{timewise-0.5.2 → timewise-0.5.3}/pyproject.toml

@@ -4,20 +4,20 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name = "timewise"
-version = "0.5.2"
+version = "0.5.3"
 description = "A small package to download infrared data from the WISE satellite"
 authors = [
     { name = "Jannis Necker", email = "jannis.necker@gmail.com" },
 ]
 license = { text = "MIT" }
 readme = "README.md"
-requires-python = ">=3.8,<3.12"
+requires-python = ">=3.9,<3.12"
 dependencies = [
     "tqdm>=4.64.0,<5.0.0",
     "requests>=2.28.1,<3.0.0",
     "pandas>=1.4.3,<3.0.0",
     "numpy>=1.23.2,<2.0.0",
-    "pyvo>=1.4.1,<2.0.0",
+    "pyvo>=1.7.0,<2.0.0",
     "astropy>=5.1,<6.0.0",
     "matplotlib>=3.5.3,<4.0.0",
     "scikit-image>=0.19.3,<0.22.0",

{timewise-0.5.2 → timewise-0.5.3}/timewise/__init__.py

@@ -1,3 +1,5 @@
 from timewise.wise_data_by_visit import WiseDataByVisit
 from timewise.wise_bigdata_desy_cluster import WISEDataDESYCluster
 from timewise.parent_sample_base import ParentSampleBase
+
+__version__ = "0.5.3"

{timewise-0.5.2 → timewise-0.5.3}/timewise/utils.py

@@ -431,9 +431,48 @@ def get_excess_variance(y, y_err, mu):
 
 class StableAsyncTAPJob(vo.dal.AsyncTAPJob):
     """
-    Implements backoff for call of phase which otherwise breaks the code if there are connection issues
+    Implements backoff for call of phase which otherwise breaks the code if there are connection issues.
+    Also stores the response of TapQuery.submit() under self.submit_response for debugging
     """
 
+    def __init__(self, url, *, session=None, delete=True):
+        super(StableAsyncTAPJob, self).__init__(url, session=session, delete=delete)
+        self.submit_response = None
+
+    @classmethod
+    def create(
+            cls, baseurl, query, *, language="ADQL", maxrec=None, uploads=None,
+            session=None, **keywords):
+        """
+        creates a async tap job on the server under ``baseurl``
+        Raises requests.HTTPError if TAPQuery.submit() failes.
+
+        Parameters
+        ----------
+        baseurl : str
+            the TAP baseurl
+        query : str
+            the query string
+        language : str
+            specifies the query language, default ADQL.
+            useful for services which allow to use the backend query language.
+        maxrec : int
+            the maximum records to return. defaults to the service default
+        uploads : dict
+            a mapping from table names to objects containing a votable
+        session : object
+           optional session to use for network requests
+        """
+        tapquery = vo.dal.TAPQuery(
+            baseurl, query, mode="async", language=language, maxrec=maxrec,
+            uploads=uploads, session=session, **keywords)
+        response = tapquery.submit()
+        response.raise_for_status()
+        job = cls(response.url, session=session)
+        job._client_set_maxrec = maxrec
+        job.submit_response = response
+        return job
+
     @property
     @backoff.on_exception(
         backoff.expo,
@@ -453,6 +492,7 @@ class StableTAPService(vo.dal.TAPService):
     def submit_job(
             self,
             query,
+            *,
             language="ADQL",
             maxrec=None,
             uploads=None,
@@ -461,10 +501,10 @@ class StableTAPService(vo.dal.TAPService):
         return StableAsyncTAPJob.create(
             self.baseurl,
             query,
-            language,
-            maxrec,
-            uploads,
-            self._session,
+            language=language,
+            maxrec=maxrec,
+            uploads=uploads,
+            session=self._session,
             **keywords
         )
 

{timewise-0.5.2 → timewise-0.5.3}/timewise/wise_data_base.py

@@ -1147,9 +1147,14 @@ class WISEDataBase(abc.ABC):
             try:
                 job = self.service.submit_job(qstring, uploads={'ids': Table(tab_d)})
                 job.run()
+                logger.debug(job.url)
+                time.sleep(5)  # wait a bit until checking phase
 
                 if isinstance(job.phase, type(None)):
-                    raise vo.dal.DALServiceError(f"Job submission failed. No phase!")
+                    raise vo.dal.DALServiceError(
+                        f"Job submission failed. No phase!"
+                        f"response: {job.submit_response}"
+                    )
 
                 logger.info(f'submitted job for {t} for chunk {i}: ')
                 logger.debug(f'Job: {job.url}; {job.phase}')
@@ -1157,7 +1162,11 @@ class WISEDataBase(abc.ABC):
                 self.queue.put((t, i))
                 break
 
-            except (requests.exceptions.ConnectionError, vo.dal.exceptions.DALServiceError) as e:
+            except (
+                    requests.exceptions.ConnectionError,
+                    vo.dal.exceptions.DALServiceError,
+                    requests.HTTPError
+            ) as e:
                 wait = 60
                 N_tries -= 1
                 logger.warning(f"{chunk_number}th query of {table_name}: Could not submit TAP job!\n"