timewise 1.0.0a7__tar.gz → 1.0.0a8__tar.gz

{timewise-1.0.0a7 → timewise-1.0.0a8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: timewise
-Version: 1.0.0a7
+Version: 1.0.0a8
 Summary: Download WISE infrared data for many objects and process them with AMPEL
 License: MIT
 License-File: LICENSE
@@ -63,7 +63,7 @@ Description-Content-Type: text/markdown
 This package downloads WISE data for positions on the sky and stacks single-exposure photometry per visit
 
 ## Prerequisites
-Python version 3.11.
+Python version 3.11, 3.12 or 3.13.
 
 If you want to not only download individual exposure photometry but also stack detections per visit (see below),
 you must have access to a running [MongoDB](https://www.mongodb.com/)*. 
@@ -77,12 +77,12 @@ to get the MongoDB community edition. </sub>
 ### If you use timewise only for downloading
 The package can be installed via `pip` (but make sure to install the v1 pre-release):
 ```bash
-pip install --pre timewise==1.0.0a6
+pip install --pre timewise==1.0.0a8
 ```
 ### If you use timewise also for stacking individual exposures
 You must install with the `ampel` extra:
 ```bash
-pip install --pre 'timewise[ampel]==1.0.0a6'
+pip install --pre 'timewise[ampel]==1.0.0a8'
 ```
 To tell AMPEL which modules, aka units, to use, build the corresponding configuration file:
 ```bash

{timewise-1.0.0a7 → timewise-1.0.0a8}/README.md

@@ -10,7 +10,7 @@
 This package downloads WISE data for positions on the sky and stacks single-exposure photometry per visit
 
 ## Prerequisites
-Python version 3.11.
+Python version 3.11, 3.12 or 3.13.
 
 If you want to not only download individual exposure photometry but also stack detections per visit (see below),
 you must have access to a running [MongoDB](https://www.mongodb.com/)*. 
@@ -24,12 +24,12 @@ to get the MongoDB community edition. </sub>
 ### If you use timewise only for downloading
 The package can be installed via `pip` (but make sure to install the v1 pre-release):
 ```bash
-pip install --pre timewise==1.0.0a6
+pip install --pre timewise==1.0.0a8
 ```
 ### If you use timewise also for stacking individual exposures
 You must install with the `ampel` extra:
 ```bash
-pip install --pre 'timewise[ampel]==1.0.0a6'
+pip install --pre 'timewise[ampel]==1.0.0a8'
 ```
 To tell AMPEL which modules, aka units, to use, build the corresponding configuration file:
 ```bash

{timewise-1.0.0a7 → timewise-1.0.0a8}/ampel/timewise/ingest/TiMongoMuxer.py

@@ -32,7 +32,7 @@ class TiMongoMuxer(AbsT0Muxer):
     """
 
     # Standard projection used when checking DB for existing PPS/ULS
-    projection = {
+    projection: dict[str, int] = {
         "_id": 0,
         "id": 1,
         "tag": 1,
@@ -51,6 +51,8 @@ class TiMongoMuxer(AbsT0Muxer):
         "body.dec": 1,
     }
 
+    unique_key: list[str] = ["mjd", "ra", "dec"]
+
     def __init__(self, **kwargs) -> None:
         super().__init__(**kwargs)
 
@@ -116,11 +118,7 @@ class TiMongoMuxer(AbsT0Muxer):
             # jd alone is not enough for matching pps because each time is associated with
             # two filters! Also, if there can be multiple sources within the same frame which
             # leads to duplicate MJD and FID. Check position in addition.
-            key = (
-                dp["body"]["mjd"],
-                dp["body"]["ra"],
-                dp["body"]["dec"],
-            )
+            key = tuple(dp["body"][k] for k in self.unique_key)
 
             if target := unique_dps_ids.get(key):
                 # insert id in order

{timewise-1.0.0a7 → timewise-1.0.0a8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name = "timewise"
-version = "1.0.0a7"
+version = "1.0.0a8"
 description = "Download WISE infrared data for many objects and process them with AMPEL"
 authors = [
     { name = "Jannis Necker", email = "jannis.necker@gmail.com" },

timewise-1.0.0a8/timewise/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.0.0a8"

{timewise-1.0.0a7 → timewise-1.0.0a8}/timewise/chunking.py

@@ -1,7 +1,7 @@
 import logging
 from functools import cached_property
 from pathlib import Path
-from typing import Iterator
+from typing import Iterator, Sequence, cast
 
 import numpy as np
 import pandas as pd
@@ -24,6 +24,23 @@ class Chunk:
         stop = max(self.row_numbers) + 1
         return pd.read_csv(self.input_csv, skiprows=start, nrows=stop - start).index
 
+    @property
+    def data(self) -> pd.DataFrame:
+        start = (
+            min(cast(Sequence[int], self.row_numbers)) + 1
+        )  # plus one to always skip header line
+        nrows = (
+            max(cast(Sequence[int], self.row_numbers)) - start + 2
+        )  # plus one: skip header, plus one:
+
+        columns = list(pd.read_csv(self.input_csv, nrows=0).columns)
+        return pd.read_csv(
+            filepath_or_buffer=self.input_csv,
+            skiprows=start,
+            nrows=nrows,
+            names=columns,
+        )
+
 
 class Chunker:
     def __init__(self, input_csv: Path, chunk_size: int):

{timewise-1.0.0a7 → timewise-1.0.0a8}/timewise/io/download.py

@@ -106,25 +106,10 @@ class Downloader:
     # ----------------------------
     # TAP submission and download
     # ----------------------------
-    def get_chunk_data(self, chunk: Chunk) -> pd.DataFrame:
-        start = (
-            min(cast(Sequence[int], chunk.row_numbers)) + 1
-        )  # plus one to always skip header line
-        nrows = (
-            max(cast(Sequence[int], chunk.row_numbers)) - start + 2
-        )  # plus one: skip header, plus one:
-
-        columns = list(pd.read_csv(self.input_csv, nrows=0).columns)
-        return pd.read_csv(
-            filepath_or_buffer=self.input_csv,
-            skiprows=start,
-            nrows=nrows,
-            names=columns,
-        )
 
     def submit_tap_job(self, query: Query, chunk: Chunk) -> TAPJobMeta:
         adql = query.adql
-        chunk_df = self.get_chunk_data(chunk)
+        chunk_df = chunk.data
 
         assert all(chunk_df.index.isin(chunk.indices)), (
             "Some inputs loaded from wrong chunk!"

{timewise-1.0.0a7 → timewise-1.0.0a8}/timewise/io/stable_tap.py

@@ -3,6 +3,8 @@ import backoff
 import pyvo as vo
 from xml.etree import ElementTree
 
+import requests
+
 from timewise.util.backoff import backoff_hndlr
 
 
@@ -20,6 +22,12 @@ class StableAsyncTAPJob(vo.dal.AsyncTAPJob):
         self.submit_response = None
 
     @classmethod
+    @backoff.on_exception(
+        backoff.expo,
+        requests.exceptions.HTTPError,
+        max_tries=5,
+        on_backoff=backoff_hndlr,
+    )
     def create(
         cls,
         baseurl,
@@ -89,6 +97,15 @@ class StableAsyncTAPJob(vo.dal.AsyncTAPJob):
     def phase(self):
         return super(StableAsyncTAPJob, self).phase
 
+    @backoff.on_exception(
+        backoff.expo,
+        vo.dal.DALServiceError,
+        max_tries=50,
+        on_backoff=backoff_hndlr,
+    )
+    def _update(self, *args, **kwargs):
+        return super(StableAsyncTAPJob, self)._update(*args, **kwargs)
+
 
 class StableTAPService(vo.dal.TAPService):
     """

timewise-1.0.0a7/timewise/__init__.py

@@ -1 +0,0 @@
-__version__ = "1.0.0a7"