arvi 0.1.29__py3-none-any.whl → 0.1.30__py3-none-any.whl

arvi/dace_wrapper.py

@@ -15,6 +15,7 @@ def load_spectroscopy(user=None) -> SpectroscopyClass:
     from .config import config
     # requesting as public
     if config.request_as_public:
+        logger.warning('requesting DACE data as public')
         with all_logging_disabled():
             dace = DaceClass(dace_rc_config_path='none')
         return SpectroscopyClass(dace_instance=dace)
@@ -300,26 +301,54 @@ def get_observations(star, instrument=None, user=None, main_id=None, verbose=Tru
             msg = f'no {instrument} observations for {star}'
         raise ValueError(msg)
 
-    # sort pipelines, being extra careful with HARPS pipeline names
-    # (i.e. ensure that 3.x.x > 3.5)
+    # # sort pipelines, being extra careful with HARPS pipeline names
+    # # (i.e. ensure that 3.x.x > 3.5)
+    # from re import match
+    # def cmp(a, b):
+    #     if a[0] in ('3.5', '3.5 EGGS') or 'EGGS' in a[0] and match(r'3.\d.\d', b[0]):
+    #         return -1
+    #     if b[0] in ('3.5', '3.5 EGGS') or 'EGGS' in b[0] and match(r'3.\d.\d', a[0]):
+    #         return 1
+
+    #     if a[0] == b[0]:
+    #         return 0
+    #     elif a[0] > b[0]:
+    #         return 1
+    #     else:
+    #         return -1
+
+    # sort pipelines, must be extra careful with HARPS/HARPN pipeline version numbers
+    # got here with the help of DeepSeek
     from re import match
-    def cmp(a, b):
-        if a[0] in ('3.5', '3.5 EGGS') or 'EGGS' in a[0] and match(r'3.\d.\d', b[0]):
-            return -1
-        if b[0] in ('3.5', '3.5 EGGS') or 'EGGS' in b[0] and match(r'3.\d.\d', a[0]):
-            return 1
-
-        if a[0] == b[0]:
-            return 0
-        elif a[0] > b[0]:
-            return 1
-        else:
-            return -1
-
-    from functools import cmp_to_key
+    def custom_sort_key(s):
+        s = s[0]
+        print(s)
+        # Check for version number pattern (e.g., 3.2.5 or 3.2.5-EGGS)
+        version_match = match(r'^(\d+(?:\.\d+)*)(?:-(.*))?$', s)
+        if version_match:
+            version_parts = tuple(map(int, version_match.group(1).split('.')))
+            suffix = version_match.group(2)
+            
+            if suffix is not None:
+                # Suffixed versions: sort in ascending order (3.2.5-HR11 < 3.3.1-HR11)
+                return (0, 0, version_parts, suffix)
+            else:
+                # Unsuffixed versions: sort in descending order (3.5 > 3.2.5)
+                return (0, 1, tuple(-x for x in version_parts))
+        
+        # Check for scientific reference pattern (e.g., 2004A&A...)
+        year_match = match(r'^(\d{4})', s)
+        if year_match:
+            year = int(year_match.group(1))
+            return (1, year)
+        
+        # For all other strings, sort alphabetically
+        return (2, s)
+
+    # from functools import cmp_to_key
     new_result = {}
     for inst in instruments:
-        new_result[inst] = dict(sorted(result[inst].items(), key=cmp_to_key(cmp), reverse=True))
+        new_result[inst] = dict(sorted(result[inst].items(), key=custom_sort_key, reverse=True))
 
     if verbose:
         logger.info('RVs available from')

arvi/timeseries.py

@@ -765,13 +765,19 @@ class RV:
         if isinstance(files, str):
             files = [files]
 
-        CCFs = iCCF.from_file(files)
+        hdu_number = kwargs.pop('hdu_number', 1)
+        data_index = kwargs.pop('data_index', -1)
+        CCFs = iCCF.from_file(files, hdu_number=hdu_number, data_index=data_index)
 
         if not isinstance(CCFs, list):
             CCFs = [CCFs]
 
-        objects = np.unique([i.HDU[0].header['OBJECT'].replace(' ', '') for i in CCFs])
-        if objects.size != 1:
+        try:
+            objects = [i.OBJECT for i in CCFs]
+        except AttributeError:
+            objects = np.unique([i.HDU[0].header['OBJECT'].replace(' ', '') for i in CCFs])
+
+        if len(objects) != 1:
             logger.warning(f'found {objects.size} different stars in the CCF files, '
                            'choosing the first one')
         star = objects[0]
@@ -808,7 +814,7 @@ class RV:
 
             _s.mask = np.full_like(_s.time, True, dtype=bool)
 
-            _s.drs_qc = np.array([i.HDU[0].header['HIERARCH ESO QC SCIRED CHECK'] for i in CCFs], dtype=bool)
+            _s.drs_qc = np.array([i.HDU[0].header['*QC SCIRED CHECK'][0] for i in CCFs], dtype=bool)
             # mask out drs_qc = False
             if not _s.drs_qc.all():
                 n = (~ _s.drs_qc).sum()
@@ -859,7 +865,7 @@ class RV:
         fits_file = f'{star}_RVs.fits'
 
         local_exists = os.path.exists(local_targz_file)
-        local_recent = os.path.getmtime(local_targz_file) > pytime() - 60*60*2
+        local_recent = local_exists and os.path.getmtime(local_targz_file) > pytime() - 60*60*2
 
         if os.path.exists(os.path.join(directory, fits_file)):
             logger.info(f'found file "{fits_file}" in "{directory}"')

{arvi-0.1.29.dist-info → arvi-0.1.30.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: arvi
-Version: 0.1.29
+Version: 0.1.30
 Summary: The Automated RV Inspector
 Author-email: João Faria <joao.faria@unige.ch>
 License: MIT
@@ -20,6 +20,7 @@ Requires-Dist: loguru
 Requires-Dist: tqdm
 Requires-Dist: pySWEETCat
 Requires-Dist: kepmodel
+Dynamic: license-file
 
 <p align="center">
   <img width = "140" src="https://github.com/j-faria/arvi/blob/main/docs/logo/logo.png?raw=true"/>
@@ -58,7 +59,7 @@ s = RV('HD1234', instrument='ESPRESSO')
 
 #### Current version
 
-![PyPI - Version](https://img.shields.io/pypi/v/arvi)
+[![PyPI - Version](https://img.shields.io/pypi/v/arvi?color=32c854)](https://pypi.org/project/arvi/)
 
 #### Actions
 

{arvi-0.1.29.dist-info → arvi-0.1.30.dist-info}/RECORD

@@ -4,7 +4,7 @@ arvi/ariadne_wrapper.py,sha256=YvilopJa9T4NwPcj3Nah_U8smSeSAU5-HYZMb_GJ-BQ,2232
 arvi/berv.py,sha256=eKnpuPC1w45UrUEyFRbs9F9j3bXz3kxYzNXbnRgvFQM,17596
 arvi/binning.py,sha256=jbemJ-bM3aqoOsqMo_OhWt_co-JAQ0nhdG_GpTsrRsw,15403
 arvi/config.py,sha256=W-v8NNhRd_PROu0wCMilXmOhYcju4xbUalugd5u7SRU,1881
-arvi/dace_wrapper.py,sha256=dwGj_XuN8J5An9I8ioeK7saj2TNLwwcobOu6oRo_HmM,22228
+arvi/dace_wrapper.py,sha256=C2TZwskbODMVRGi-xdCW9sCDQrUx5Z2ZM7yVWkeKde4,23463
 arvi/extra_data.py,sha256=cpJGMle0ZqY_dtrmbbMQcyU48PkNjfzUgQ-qY-2XTj8,3249
 arvi/gaia_wrapper.py,sha256=2q_7bm6MGvTLlegfNUCY_EhnMKYv1CZmcbanOm_ot-k,4197
 arvi/headers.py,sha256=uvdJebw1M5YkGjE3vJJwYBOnLikib75uuZE9FXB5JJM,1673
@@ -20,7 +20,7 @@ arvi/simbad_wrapper.py,sha256=hyMnTeZ4DpnTzyEopkdUfNtJ_roSgdvYPXwYcmXVX2U,8238
 arvi/spectra.py,sha256=ebF1ocodTastLx0CyqLSpE8EZNDXBF8riyfxMr3L6H0,7491
 arvi/stats.py,sha256=ilzzGL9ew-SyVa9eEdrYCpD3DliOAwhoNUg9LIlHjzU,2583
 arvi/stellar.py,sha256=veuL_y9kJvvApU_jqYQqP3EkcRnQffTc8Us6iT5UrFI,3790
-arvi/timeseries.py,sha256=ZHk0SgkzlWELyklcnVi586qAGvHIH7PwTqIE-ScX6u0,87830
+arvi/timeseries.py,sha256=YJ5s3TvQthIdVrZWT3S23DagM4BzT2ol5ENcnwsc_zk,88079
 arvi/translations.py,sha256=PUSrn4zvYO2MqGzUxlFGwev_tBkgJaJrIYs6NKHzbWo,951
 arvi/utils.py,sha256=LImV8iPjG8ZKjPCT9lp25_pDb-51ZZk42Hc8bzZt7M0,6568
 arvi/data/info.svg,sha256=0IMI6W-eFoTD8acnury79WJJakpBwLa4qKS4JWpsXiI,489
@@ -29,8 +29,8 @@ arvi/data/obs_affected_blue_cryostat_issues.dat,sha256=z4AK17xfz8tGTDv1FjRvQFnio
 arvi/data/extra/HD86226_PFS1.rdb,sha256=vfAozbrKHM_j8dYkCBJsuHyD01KEM1asghe2KInwVao,3475
 arvi/data/extra/HD86226_PFS2.rdb,sha256=F2P7dB6gVyzCglUjNheB0hIHVClC5RmARrGwbrY1cfo,4114
 arvi/data/extra/metadata.json,sha256=C69hIw6CohyES6BI9vDWjxwSz7N4VOYX0PCgjXtYFmU,178
-arvi-0.1.29.dist-info/LICENSE,sha256=6JfQgl7SpM55t0EHMFNMnNh-AdkpGW25MwMiTnhdWQg,1068
-arvi-0.1.29.dist-info/METADATA,sha256=aRUdDo4XitNY1xqg7OpHKw1nDGT_mGIyNl4FoEJquYg,1852
-arvi-0.1.29.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-arvi-0.1.29.dist-info/top_level.txt,sha256=4EeiKDVLD45ztuflTGfQ3TU8GVjJg5Y95xS5XjI-utU,5
-arvi-0.1.29.dist-info/RECORD,,
+arvi-0.1.30.dist-info/licenses/LICENSE,sha256=6JfQgl7SpM55t0EHMFNMnNh-AdkpGW25MwMiTnhdWQg,1068
+arvi-0.1.30.dist-info/METADATA,sha256=tNPN97-xtW27OkE_vRHNtN4_VtZvJJzy2gITgy0Cupw,1921
+arvi-0.1.30.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+arvi-0.1.30.dist-info/top_level.txt,sha256=4EeiKDVLD45ztuflTGfQ3TU8GVjJg5Y95xS5XjI-utU,5
+arvi-0.1.30.dist-info/RECORD,,

{arvi-0.1.29.dist-info → arvi-0.1.30.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any