timewise 1.0.0a7__py3-none-any.whl → 1.0.0a8__py3-none-any.whl

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/__init__.py

@@ -1 +1 @@
-__version__ = "1.0.0a7"
+__version__ = "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/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/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.dist-info → timewise-1.0.0a8.dist-info}/METADATA

@@ -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.dist-info → timewise-1.0.0a8.dist-info}/RECORD

@@ -2,24 +2,24 @@ ampel/timewise/alert/TimewiseAlertSupplier.py,sha256=HLeQBCLrmVKxqvPc4E2TVj241KW
 ampel/timewise/alert/load/TimewiseFileLoader.py,sha256=jmLppFEJwjQCSOMUtr-cSP9UbtT0VzqyAf4VDJjUf3w,4409
 ampel/timewise/ingest/TiCompilerOptions.py,sha256=j2eUxSkJEKxAjJCd9plxRRCg6Mv8dNHw72UvKyAxUsA,809
 ampel/timewise/ingest/TiDataPointShaper.py,sha256=KbAg-J0DkMaJA9K67xMY5Pe0SIP0LNKsBNAMnTYV9zA,3180
-ampel/timewise/ingest/TiMongoMuxer.py,sha256=YDiqaYiJ1TvyHUMAlNWHBHCpw0tH4Nvf8eyHUxMbzS8,6475
+ampel/timewise/ingest/TiMongoMuxer.py,sha256=Rg6yGI7AoPZhyXUsYmGD8ZiivyaLT-EJjG-U4J4yh-w,6467
 ampel/timewise/ingest/tags.py,sha256=ggn0Y6QUnjIwMzOlgKmPX1JPhmnvc21nUrORFhaR0uI,564
 ampel/timewise/t1/T1HDBSCAN.py,sha256=zVhcqQVAjlHgDBd9CJA6rGH3RCrCV84rsIIOWVxODKI,9528
 ampel/timewise/t1/TimewiseFilter.py,sha256=uDjNGsqPOISoFjSH8tX87I3UTW9qGX8rEmkyze8u2ug,1566
 ampel/timewise/t2/T2StackVisits.py,sha256=JBxFZLT-a-8jjenRw45ZVA_FvtcyOBmvMVcpYHyw_Yk,2574
 ampel/timewise/util/AuxDiagnosticPlotter.py,sha256=evvuH5vuEOFkfbkoSQw7ztiEqHos19PP91VQ_SCg_AU,1692
 ampel/timewise/util/pdutil.py,sha256=CJqeYqL2I6A5WnF5S342bwM4omJY-1XwT1XWY2uk3bc,1524
-timewise/__init__.py,sha256=E7xUjDtIcRMszsR5_yuDt--zdfFpDV9LyF3s2kNKZCU,24
+timewise/__init__.py,sha256=uSPlLo1iPfJHnwgxEbL4lAcPqtOK8qgwkOr4GpzJSyo,24
 timewise/backend/__init__.py,sha256=w79nWfCw8n9g98CkHWJELmb4j9xblWC4DGZOV3_XhH4,134
 timewise/backend/base.py,sha256=dHxRzu2q3uQ0wdGmDxnn-p68Tp19qChue7HMEu56wNA,1080
 timewise/backend/filesystem.py,sha256=qFBmiOtfv8b3uhhiZSbH8bRIUrpS4f0P8Zl03VxpgAI,2598
-timewise/chunking.py,sha256=uAfAOhWg1v6VbfHNkhBLSCEa0GehPoIZPftGueVmNRs,1845
+timewise/chunking.py,sha256=eRd3xof-5uHaxo8Pmwo4kr_cdZSfFpgTiPu-xuL-SGA,2404
 timewise/cli.py,sha256=W8SXlUQo7a5aS4_kW40KTs2UkTLQS12JuhgwkRb23DY,4172
 timewise/config.py,sha256=ZTSokRZMZDqBqVFV9DxvO-47yE9E9xWF48Rcjb0QG10,1044
 timewise/io/__init__.py,sha256=S7vb0glKJnw6ztOlrD-0Wma2bQZ2RwpmXDLFJLKBMVo,35
 timewise/io/config.py,sha256=u_nlfstvuz2_bfepRZo3y43XAqQ0ilReYg9e081CTQg,2410
-timewise/io/download.py,sha256=IMNWur1FWPKJ7SNMTjevZgWqPP_eYLzXr4Pjp3XOeXI,10589
-timewise/io/stable_tap.py,sha256=jukCkBi2d7WACOo_kXTMCppzWUsN-pLVg9EDqHi3qd0,3478
+timewise/io/download.py,sha256=4uKWIPD61wLk6rPLiX72yjByDFgrRR7ww4LzsDfVugE,10019
+timewise/io/stable_tap.py,sha256=obwzic_xvB_hh-x6S5NT4bW847emabKxp8NH1WgAh-g,3899
 timewise/plot/__init__.py,sha256=cc00UenWC_8zAkBH-Ylhs3yCF49tAqZ2Al9MfOoXYDI,120
 timewise/plot/diagnostic.py,sha256=GRp-OUwz2yzzDu9qdViFg_e3Mxl5t1IvUJXZHuMKB2U,8276
 timewise/plot/lightcurve.py,sha256=K0UvjmvbCSsRKP3Mu9X5L5AVUwqURR76ESJCIMEgE6Q,3924
@@ -44,8 +44,8 @@ timewise/util/csv_utils.py,sha256=5i3Jd4c58-doPs1N_hyYZ8Uc2nvuk9nGwgPNZoNrlu0,29
 timewise/util/error_threading.py,sha256=uyV1Ri-wf87lpa17Xlp520B1V8DWHh3v9Mk97QrPmv0,2264
 timewise/util/path.py,sha256=-CcpYdjidg5FcZnRyQqrK_EKjc-7USYbJ8gtKatGl6k,254
 timewise/util/visits.py,sha256=4ZXwH7OXmp98tUPZplvuOtykB048kZoYXyuRTwQxT7w,998
-timewise-1.0.0a7.dist-info/METADATA,sha256=r8fAKUybkR-ACivlwDuMi2_6p7ey6Ia_qycCNsyxYIs,10294
-timewise-1.0.0a7.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-timewise-1.0.0a7.dist-info/entry_points.txt,sha256=mYh1HsUFbV7KT8kxiGqVtR3Pk0oEk6Bd-2c5FsYVhG4,45
-timewise-1.0.0a7.dist-info/licenses/LICENSE,sha256=sVoNJWiTlH-NarJx0wdsob468Pg3JE6vIIgll4lCa3E,1070
-timewise-1.0.0a7.dist-info/RECORD,,
+timewise-1.0.0a8.dist-info/METADATA,sha256=QnfpFxRvJDiL_a5Z0ElFj6_F1Mylk4bscAqE0SCNjxE,10308
+timewise-1.0.0a8.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+timewise-1.0.0a8.dist-info/entry_points.txt,sha256=mYh1HsUFbV7KT8kxiGqVtR3Pk0oEk6Bd-2c5FsYVhG4,45
+timewise-1.0.0a8.dist-info/licenses/LICENSE,sha256=sVoNJWiTlH-NarJx0wdsob468Pg3JE6vIIgll4lCa3E,1070
+timewise-1.0.0a8.dist-info/RECORD,,