arvi 0.2.3__py3-none-any.whl → 0.2.4__py3-none-any.whl

arvi/config.py

@@ -8,6 +8,7 @@ def get_config_path():
 
 def get_config():
     config = configparser.ConfigParser()
+    config.add_section('config')
     if (path := get_config_path()).exists():
         config.read(path)
     return config
@@ -33,6 +34,8 @@ class config:
         'request_as_public': False,
         # enable from arvi import star_name
         'fancy_import': True,
+        # use the 'dark_background' matplotlib theme
+        'dark_plots': False,
         # debug
         'debug': False,
     }

arvi/dace_wrapper.py

@@ -47,8 +47,9 @@ def load_spectroscopy(user=None):
         logger.warning('requesting DACE data as public (no .dacerc file found)')
     return default_Spectroscopy
 
-@lru_cache()
-def get_dace_id(star, verbose=True):
+
+@lru_cache(maxsize=1024)
+def get_dace_id(star, verbose=True, raise_error=False):
     logger = setup_logger()
     filters = {"obj_id_catname": {"equal": [star]}}
     try:
@@ -58,8 +59,11 @@ def get_dace_id(star, verbose=True):
     except KeyError:
         if verbose:
             logger.error(f"Could not find DACE ID for {star}")
+        if not raise_error:
+            return None
         raise ValueError from None
 
+
 def get_arrays(result, latest_pipeline=True, ESPRESSO_mode='HR11', NIRPS_mode='HE', verbose=True):
     logger = setup_logger()
     arrays = []
@@ -70,7 +74,6 @@ def get_arrays(result, latest_pipeline=True, ESPRESSO_mode='HR11', NIRPS_mode='H
 
         # select ESPRESSO mode, which is defined at the level of the pipeline
         if 'ESPRESSO' in inst:
-
             find_mode = [ESPRESSO_mode in pipe for pipe in pipelines]
             # the mode was not found
             if not any(find_mode):
@@ -164,12 +167,12 @@ def get_observations_from_instrument(star, instrument, user=None, main_id=None,
 
     found_dace_id = False
     try:
-        dace_id = get_dace_id(star, verbose=verbose)
+        dace_id = get_dace_id(star, verbose=verbose, raise_error=True)
         found_dace_id = True
     except ValueError as e:
         if main_id is not None:
             try:
-                dace_id = get_dace_id(main_id, verbose=verbose)
+                dace_id = get_dace_id(main_id, verbose=verbose, raise_error=True)
                 found_dace_id = True
             except ValueError:
                 pass

arvi/plots.py

@@ -13,10 +13,12 @@ from .utils import lazy_import
 plt = lazy_import('matplotlib.pyplot')
 
 
-def plot_fast(func):
+def plot_settings(func):
     @wraps(func)
     def wrapper(*args, **kwargs):
-        with plt.style.context('fast'):
+        # with plt.style.context('fast'):
+        theme = 'dark_background' if config.dark_plots else 'fast'
+        with plt.style.context(theme):
             return func(*args, **kwargs)
     return wrapper
 
@@ -135,7 +137,7 @@ def clickable_legend(fig, ax, leg):
                 pass
     return on_pick_legend
 
-# @plot_fast
+@plot_settings
 def plot(self, ax=None, show_masked=False, instrument=None, time_offset=0,
          remove_50000=False, tooltips=True, show_title=False, show_legend=True, label=None, 
          jitter=None, N_in_label=False, versus_n=False, show_histogram=False, bw=False, **kwargs):
@@ -403,7 +405,7 @@ def plot(self, ax=None, show_masked=False, instrument=None, time_offset=0,
     return fig, ax
 
 
-@plot_fast
+# @plot_fast
 def plot_quantity(self, quantity, ax=None, show_masked=False, instrument=None,
                   time_offset=0, remove_50000=False, tooltips=False, show_legend=True,
                   N_in_label=False, **kwargs):
@@ -506,7 +508,88 @@ plot_rhk = partialmethod(plot_quantity, quantity='rhk')
 plot_berv = partialmethod(plot_quantity, quantity='berv')
 
 
-@plot_fast
+def plot_xy(self, x, y, ax=None, instrument=None, show_legend=True, **kwargs):
+    logger = setup_logger()
+    if self.N == 0:
+        if self.verbose:
+            logger.error('no data to plot')
+        return
+
+    if ax is None:
+        fig, ax = plt.subplots(1, 1, constrained_layout=True)
+    else:
+        fig = ax.figure
+
+    kwargs.setdefault('marker', 'o')
+    kwargs.setdefault('ls', '')
+    kwargs.setdefault('capsize', 0)
+    kwargs.setdefault('ms', 4)
+
+    instruments = self._check_instrument(instrument)
+
+    for inst in instruments:
+        s = self if self._child else getattr(self, inst)
+        label = inst
+
+        missing = False
+        try:
+            xdata = getattr(s, x).copy()
+        except AttributeError:
+            missing = True
+        try:
+            e_xdata = getattr(s, x + '_err').copy()
+        except AttributeError:
+            e_xdata = np.zeros_like(xdata)
+
+        try:
+            ydata = getattr(s, y).copy()
+        except AttributeError:
+            missing = True
+        try:
+            e_ydata = getattr(s, y + '_err').copy()
+        except AttributeError:
+            e_ydata = np.zeros_like(ydata)
+
+        if missing:
+            lines, *_ = ax.errorbar([], [], [],
+                                    label=label, picker=True, **kwargs)
+            continue
+
+        ax.errorbar(xdata[s.mask], ydata[s.mask], e_xdata[s.mask], e_ydata[s.mask],
+                    label=label, **kwargs)
+
+    # if show_masked:
+    #     ax.errorbar(self.time[~self.mask] - time_offset,
+    #                 getattr(self, quantity)[~self.mask],
+    #                 getattr(self, quantity + '_err')[~self.mask],
+    #                 label='masked', fmt='x', ms=10, color='k', zorder=-2)
+
+    if show_legend:
+        leg = ax.legend()
+        on_pick_legend = clickable_legend(fig, ax, leg)
+        plt.connect('pick_event', on_pick_legend)
+
+    ax.minorticks_on()
+
+    delta = 'Δ' if self._did_adjust_means else ''
+
+    # ylabel = {
+    #     quantity.lower(): quantity,
+    #     'fwhm': f'{delta}FWHM [{self.units}]',
+    #     'bispan': f'{delta}BIS [{self.units}]',
+    #     'rhk': r"$\log$ R'$_{HK}$",
+    #     'berv': 'BERV [km/s]',
+    # }
+
+    # ax.set_ylabel(ylabel[quantity.lower()])
+
+    if config.return_self:
+        return self
+    else:
+        return fig, ax
+
+
+# @plot_fast
 def gls(self, ax=None, label=None, instrument=None, 
         fap=True, fap_method='baluev', adjust_means=config.adjust_means_gls,
         picker=True, **kwargs):

arvi/setup_logger.py

@@ -6,7 +6,7 @@ def setup_logger():
         import marimo as mo
         if mo.running_in_notebook():
             raise NotImplementedError
-    except NotImplementedError:
+    except (NotImplementedError, AttributeError):
         pass
     except (ImportError, ModuleNotFoundError):
         logger.remove()

{arvi-0.2.3.dist-info → arvi-0.2.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arvi
-Version: 0.2.3
+Version: 0.2.4
 Summary: The Automated RV Inspector
 Author-email: João Faria <joao.faria@unige.ch>
 License: MIT
@@ -23,7 +23,7 @@ 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"/>
+  <img width = "140" src="https://raw.githubusercontent.com/j-faria/arvi/refs/heads/main/docs/logo/logo.png"/>
 </p>
 
 This package sits alongside [DACE](https://dace.unige.ch/) to help with the

{arvi-0.2.3.dist-info → arvi-0.2.4.dist-info}/RECORD

@@ -3,8 +3,8 @@ arvi/__init__.py,sha256=8IeHbu8LR1H3MxVi9aJHNpBU6SDbmzj9FZGKsiF0AKE,740
 arvi/ariadne_wrapper.py,sha256=YvilopJa9T4NwPcj3Nah_U8smSeSAU5-HYZMb_GJ-BQ,2232
 arvi/berv.py,sha256=eKnpuPC1w45UrUEyFRbs9F9j3bXz3kxYzNXbnRgvFQM,17596
 arvi/binning.py,sha256=NK9y9bUrdyWCbh79LkcRABHG-n5MtlETMHMvLj1z-OM,15437
-arvi/config.py,sha256=mqDYcxd8RLQz2L8x4GM6jGX8uG7FRFfz-yHGDmB08I8,2222
-arvi/dace_wrapper.py,sha256=TxHEtAKLhlrtQyEpZuDqa-CCT0Vz8UisvF1BTpHrnpw,23516
+arvi/config.py,sha256=JkHSwF-EEqwwbcc8thGgbFc9udDZPjQH-9XFjqDepBY,2337
+arvi/dace_wrapper.py,sha256=uUiHHqyU8T74cmgGtVVoJKbVnTGLjNYYIUkR2BeAtvk,23636
 arvi/exofop_wrapper.py,sha256=8S7UEcrBAgANIweMV0-CvaWaVTPgGVo8vQQk_KRa0nU,2414
 arvi/extra_data.py,sha256=Xi65pI5kkzqlMmHGl9xFoumtH699611pJJ5PV-a_IfU,3397
 arvi/gaia_wrapper.py,sha256=jfBdK9N9ZOqHIzE5MRFmXNyN3PAOT_uzXM23MIy0POY,4371
@@ -13,10 +13,10 @@ arvi/instrument_specific.py,sha256=StRcHVDszm2a4yMWkO1pYYCsEWvXsS2ZtYTrSGD9JHM,1
 arvi/kima_wrapper.py,sha256=BvNTVqzM4lMNhLCyBFVh3T84hHfGKAFpgiYiOi4lh0g,2731
 arvi/lbl_wrapper.py,sha256=_ViGVkpakvuBR_xhu9XJRV5EKHpj5Go6jBZGJZMIS2Y,11850
 arvi/nasaexo_wrapper.py,sha256=mWt7eHgSZe4MBKCmUvMPTyUPGuiwGTqKugNBvmjOg9s,7306
-arvi/plots.py,sha256=4_xTrUFlR_6YyyVGlouoO1k9kndPa0s45mXGlXHjIF0,32839
+arvi/plots.py,sha256=fHc6ScATCzvM4KQ77TYfHYmY6HSZ4N4oMYsLEUvxJpU,35279
 arvi/programs.py,sha256=BW7xBNKLei7NVLLW3_lsVskwzkaIoNRiHK2jn9Tn2ZM,8879
 arvi/reports.py,sha256=CKmtg5rewMyT26gbWeoZDYrL0z5Sbb6cTJry0HWk_rs,7445
-arvi/setup_logger.py,sha256=cdy2nG33TgcD-aRrDN8rbe0b3Kk-vwXhIe4hqQ-21fo,597
+arvi/setup_logger.py,sha256=dHzO2gPjw6CaKWpYZd2f83z09tmxgi--qpp7k1jROjI,615
 arvi/simbad_wrapper.py,sha256=U1XmOR7bg_mq4KSutTgEsusjBph8BfEqHh-8YuHNMog,8629
 arvi/spectra.py,sha256=ebF1ocodTastLx0CyqLSpE8EZNDXBF8riyfxMr3L6H0,7491
 arvi/stats.py,sha256=ilzzGL9ew-SyVa9eEdrYCpD3DliOAwhoNUg9LIlHjzU,2583
@@ -30,8 +30,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.3.dist-info/licenses/LICENSE,sha256=6JfQgl7SpM55t0EHMFNMnNh-AdkpGW25MwMiTnhdWQg,1068
-arvi-0.2.3.dist-info/METADATA,sha256=vG_p_Iz1b4javtEhxs16KG-osWfRH6T2VjI0Q4dE6MI,1920
-arvi-0.2.3.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-arvi-0.2.3.dist-info/top_level.txt,sha256=4EeiKDVLD45ztuflTGfQ3TU8GVjJg5Y95xS5XjI-utU,5
-arvi-0.2.3.dist-info/RECORD,,
+arvi-0.2.4.dist-info/licenses/LICENSE,sha256=6JfQgl7SpM55t0EHMFNMnNh-AdkpGW25MwMiTnhdWQg,1068
+arvi-0.2.4.dist-info/METADATA,sha256=LCnkFQigSAvVBAB-5yy53uPgFSw13sdbGYX_qreIf9s,1932
+arvi-0.2.4.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+arvi-0.2.4.dist-info/top_level.txt,sha256=4EeiKDVLD45ztuflTGfQ3TU8GVjJg5Y95xS5XjI-utU,5
+arvi-0.2.4.dist-info/RECORD,,

{arvi-0.2.3.dist-info → arvi-0.2.4.dist-info}/WHEEL

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