arvi 0.2.0__py3-none-any.whl → 0.2.1__py3-none-any.whl

arvi/dace_wrapper.py

@@ -47,7 +47,7 @@ def get_dace_id(star, verbose=True):
     try:
         with all_logging_disabled():
             r = load_spectroscopy().query_database(filters=filters, limit=1)
-        return r['obj_id_daceid'][0]
+        return str(r['obj_id_daceid'][0])
     except KeyError:
         if verbose:
             logger.error(f"Could not find DACE ID for {star}")
@@ -323,24 +323,17 @@ def get_observations(star, instrument=None, user=None, main_id=None, verbose=Tru
     def custom_sort_key(s):
         s = s[0]
         # Check for version number pattern (e.g., 3.2.5 or 3.2.5-EGGS)
-        version_match = match(r'^(\d+(?:\.\d+)*)(?:-(.*))?$', s)
+        version_match = match(r'^(\d+(?:\.\d+)*)(?:[-\s](.*))?$', 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))
-        
+            version_parts = list(map(int, version_match.group(1).split('.')))
+            if len(version_parts) == 2:
+                version_parts.insert(1, -1)
+            return (0, 1, 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)
 

{arvi-0.2.0.dist-info → arvi-0.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arvi
-Version: 0.2.0
+Version: 0.2.1
 Summary: The Automated RV Inspector
 Author-email: João Faria <joao.faria@unige.ch>
 License: MIT

{arvi-0.2.0.dist-info → arvi-0.2.1.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=G1b2O7JNhYbfSXorRqqs8oZJ6rtJ1t3KMCE4wjjgJmQ,23446
+arvi/dace_wrapper.py,sha256=EKKBIqxgmbqvyhsLFK65aOP0BcEH3jnuHHNgCOvKYlk,23169
 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
@@ -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.2.0.dist-info/licenses/LICENSE,sha256=6JfQgl7SpM55t0EHMFNMnNh-AdkpGW25MwMiTnhdWQg,1068
-arvi-0.2.0.dist-info/METADATA,sha256=ZBpnSY92f4u9TgpzpM1PxIqPY8u191X2HKhUq8ILEzw,1920
-arvi-0.2.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-arvi-0.2.0.dist-info/top_level.txt,sha256=4EeiKDVLD45ztuflTGfQ3TU8GVjJg5Y95xS5XjI-utU,5
-arvi-0.2.0.dist-info/RECORD,,
+arvi-0.2.1.dist-info/licenses/LICENSE,sha256=6JfQgl7SpM55t0EHMFNMnNh-AdkpGW25MwMiTnhdWQg,1068
+arvi-0.2.1.dist-info/METADATA,sha256=VkJZ7gNuP1IB2IMYxgrU8FBubpRjzCU_av0ZgY5AkH4,1920
+arvi-0.2.1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+arvi-0.2.1.dist-info/top_level.txt,sha256=4EeiKDVLD45ztuflTGfQ3TU8GVjJg5Y95xS5XjI-utU,5
+arvi-0.2.1.dist-info/RECORD,,