timewise 0.4.10__py3-none-any.whl → 0.4.12__py3-none-any.whl

timewise/__init__.py

@@ -2,4 +2,4 @@ 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.4.10"
+__version__ = "0.4.12"

timewise/utils.py

@@ -12,6 +12,7 @@ from functools import cache
 from astropy.table import Table
 from PIL import Image
 from io import BytesIO
+import hashlib
 
 
 from timewise.general import cache_dir, backoff_hndlr
@@ -150,6 +151,23 @@ class PanSTARRSQueryError(Exception):
     pass
 
 
+def load_cache_or_download(url):
+    logger.debug(f"loading or downloading {url}")
+    h = hashlib.md5(url.encode()).hexdigest()
+    cache_file = os.path.join(cache_dir, h + ".cache")
+    logger.debug(f"cache file is {cache_file}")
+    if not os.path.isfile(cache_file):
+        logger.debug(f"downloading {url}")
+        r = requests.get(url)
+        with open(cache_file, 'wb') as f:
+            f.write(r.content)
+        return r.content
+    else:
+        logger.debug(f"loading {cache_file}")
+        with open(cache_file, 'rb') as f:
+            return f.read()
+
+
 def annotate_not_available(ax):
     xlim = ax.get_xlim()
     ylim = ax.get_ylim()
@@ -170,7 +188,8 @@ def getimages(ra, dec, filters="grizy"):
 
     service = "https://ps1images.stsci.edu/cgi-bin/ps1filenames.py"
     url = f"{service}?ra={ra}&dec={dec}&filters={filters}"
-    table = Table.read(url, format='ascii')
+    content = load_cache_or_download(url)
+    table = Table.read(content.decode(), format='ascii')
     return table
 
 
@@ -231,8 +250,8 @@ def getcolorim(ra, dec, size=240, output_size=None, filters="grizy", format="jpg
     if format not in ("jpg", "png"):
         raise ValueError("format must be jpg or png")
     url = geturl(ra, dec, size=size, filters=filters, output_size=output_size, format=format, color=True)
-    r = requests.get(url)
-    im = Image.open(BytesIO(r.content))
+    content = load_cache_or_download(url)
+    im = Image.open(BytesIO(content))
     return im
 
 
@@ -253,8 +272,8 @@ def getgrayim(ra, dec, size=240, output_size=None, filter="g", format="jpg"):
     if filter not in list("grizy"):
         raise ValueError("filter must be one of grizy")
     url = geturl(ra, dec, size=size, filters=filter, output_size=output_size, format=format)
-    r = requests.get(url[0])
-    im = Image.open(BytesIO(r.content))
+    content = load_cache_or_download(url[0])
+    im = Image.open(BytesIO(content))
     return im
 
 

timewise/wise_data_by_visit.py

@@ -5,6 +5,8 @@ import logging
 from scipy import stats
 import matplotlib.pyplot as plt
 from matplotlib.lines import Line2D
+from matplotlib.markers import MarkerStyle
+from matplotlib.transforms import Affine2D
 
 from timewise.wise_data_base import WISEDataBase
 from timewise.utils import get_excess_variance
@@ -538,7 +540,11 @@ class WiseDataByVisit(WISEDataBase):
         )
 
         # set markers for visits
-        markers = list(Line2D.filled_markers) + ["$1$", "$2$", "$3$", "$4$", "$5$", "$6$", "$7$", "$8$", "$9$"]
+        markers_strings = list(Line2D.filled_markers) + ["$1$", "$2$", "$3$", "$4$", "$5$", "$6$", "$7$", "$8$", "$9$"]
+        markers_straight = [MarkerStyle(im) for im in markers_strings]
+        rot = Affine2D().rotate_deg(180)
+        markers_rotated = [MarkerStyle(im, transform=rot) for im in markers_strings]
+        markers = markers_straight + markers_rotated
 
         # calculate ra and dec relative to center of cutout
         ra = (lightcurve.ra - pos[self.parent_sample.default_keymap["ra"]]) * 3600

{timewise-0.4.10.dist-info → timewise-0.4.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: timewise
-Version: 0.4.10
+Version: 0.4.12
 Summary: A small package to download infrared data from the WISE satellite
 Home-page: https://github.com/JannisNe/timewise
 License: MIT

{timewise-0.4.10.dist-info → timewise-0.4.12.dist-info}/RECORD

@@ -1,17 +1,17 @@
-timewise/__init__.py,sha256=bpaFG17d5deZG7A2f0cudusG-8-rgHkfs1efXLC6F74,204
+timewise/__init__.py,sha256=gnpyn_jjCr_5brbB3Xi6G1eDotPNrlP6PINA-UAHGnM,204
 timewise/big_parent_sample.py,sha256=B7w7TMJx2mohsVfY0RiBHQU9N6mn_MDqrB7Ica0aafU,3480
 timewise/cli.py,sha256=LRBR3cOd_qBEpGkyP7tbJBCKvO0XxRQA8BgoMZfw08k,533
 timewise/config_loader.py,sha256=gqu881fSoBIzK_-KSVSCDV1pLPuD_g0AHbWovKFtWEA,5675
 timewise/general.py,sha256=cadgPIACEWpFsa4yncFb-nboGgXmJ1TicjPQalB_SAU,1472
 timewise/parent_sample_base.py,sha256=fHRBS791w51JCEwkfrCMyzXSyyc94NNSu-J9AfRFf2E,3298
 timewise/point_source_utils.py,sha256=4dmxfujrrNxDLkh2rVziSR-NNaHzrKFa8xgx_Lj-ZNE,2171
-timewise/utils.py,sha256=0EfB5cEmT25xe3c-YDr4pqkDwZQthVRJEXCE1z4Y6Eo,14476
+timewise/utils.py,sha256=-tS5jrRnMYa7tosWvs_Jitjv8qPfi9VZE-o0-DMHKEQ,15144
 timewise/wise_bigdata_desy_cluster.py,sha256=8Zd1jCgVpR8nefGrmHxFtyBasP2oaOZ04NXUuEikyhI,56173
 timewise/wise_data_base.py,sha256=PrOhI7RtgVgdAaZKzGcmiFAIPhwLjg2aT_y9opG8DhQ,82744
-timewise/wise_data_by_visit.py,sha256=e-tb_Zk_iEz0Jglzo-oKhQn244I6wKRramdtI-atGgY,28785
+timewise/wise_data_by_visit.py,sha256=5fR5qaDz_liWJaBwnDhsEx--yoyh3oxPKKpXGpEsXmk,29129
 timewise/wise_flux_conversion_correction.dat,sha256=XLnYqk0g1NVthVSNGsKlqinzKI7QUwJidO-qg4tHXKU,1095
-timewise-0.4.10.dist-info/LICENSE,sha256=sVoNJWiTlH-NarJx0wdsob468Pg3JE6vIIgll4lCa3E,1070
-timewise-0.4.10.dist-info/METADATA,sha256=O7ggTZMS4IpDnZ6t_gzpFMxrjMyi0_Jm5yEc2Edsoro,2496
-timewise-0.4.10.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-timewise-0.4.10.dist-info/entry_points.txt,sha256=yIWgzM0CZCJBrSR9-zbQW9d8MpFae0KlRVnZXF8rZow,54
-timewise-0.4.10.dist-info/RECORD,,
+timewise-0.4.12.dist-info/LICENSE,sha256=sVoNJWiTlH-NarJx0wdsob468Pg3JE6vIIgll4lCa3E,1070
+timewise-0.4.12.dist-info/METADATA,sha256=s4qqipfvBVCdeFyTy5ko5d7dsjXlXYPFWOcpHFEdFoc,2496
+timewise-0.4.12.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
+timewise-0.4.12.dist-info/entry_points.txt,sha256=yIWgzM0CZCJBrSR9-zbQW9d8MpFae0KlRVnZXF8rZow,54
+timewise-0.4.12.dist-info/RECORD,,

{timewise-0.4.10.dist-info → timewise-0.4.12.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.8.1
+Generator: poetry-core 2.0.0
 Root-Is-Purelib: true
 Tag: py3-none-any