planetarypy 0.76.2__tar.gz → 0.76.3__tar.gz

{planetarypy-0.76.2 → planetarypy-0.76.3}/CHANGELOG.md

@@ -5,6 +5,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.76.3] - 2026-06-17
+
+### Fixed
+
+- **PDS registry search: multi-filter queries no longer fail with HTTP 400.** `planetarypy.search` built its query string by joining clauses with ` and `, but the NASA PDS registry API requires the whole query wrapped in outer parentheses — so any search combining two or more filters (e.g. `target` + `observationals`, or a spatial bounding-box) returned `400 UnparsableQParamException` and only single-clause lookups worked. The query builder now wraps the joined clauses in `(...)`, matching what `pds.peppi` does. This also unblocks spatial searches via the `cart:Bounding_Coordinates.cart:*_bounding_coordinate` fields.
+- **Archived SPICE metakernels with non-`'./data'` path conventions now load.** `archived_kernels.get_metakernel()` rewrote kernel paths by matching the literal `'./data'` in `PATH_VALUES`, which most NAIF archives use — but some (e.g. Hayabusa2's PDS4 archive) ship `'..'` instead. The rewrite silently no-opped on those, leaving an unresolvable relative path that broke `furnsh`. The rewrite is now convention-agnostic: it repoints whatever value the `PATH_VALUES` block holds to the absolute local kernel directory, leaving `KERNELS_TO_LOAD` symbol references intact.
+- **`plotting.add_sun_indicator` no longer rescales the image.** The sun-direction glyph was drawn in data coordinates anchored in a corner; for any azimuth pointing past that corner, plotting the off-bounds marker triggered matplotlib autoscale, adding whitespace and pushing the indicator outside the frame. It is now drawn in axes-fraction coordinates with an inset anchor, so it stays inside the panel for any azimuth and never touches the data limits (this also removes a latent `origin='upper'`-only assumption).
+
+### Changed
+
+- **`plotting.add_sun_indicator` / `imshow_with_sun` are marked experimental.** They now carry an experimental note and emit a one-shot `UserWarning`. The azimuth-convention handoff is not yet validated end-to-end: these helpers expect azimuth clockwise-from-image-top (PDS `SUB_SOLAR_AZIMUTH`), whereas `Spicer.solar_azimuth_at` returns clockwise-from-north — they agree only when image-north points up.
+
 ## [0.76.2] - 2026-06-12
 
 ### Fixed

{planetarypy-0.76.2 → planetarypy-0.76.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: planetarypy
-Version: 0.76.2
+Version: 0.76.3
 Summary: Core package for planetary data tools. Includes PDS index utilities, SPICE integrations, and more.
 Project-URL: Homepage, https://github.com/planetarypy/planetarypy
 Project-URL: Repository, https://github.com/planetarypy/planetarypy

{planetarypy-0.76.2 → planetarypy-0.76.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "planetarypy"
-version = "0.76.2"
+version = "0.76.3"
 description = "Core package for planetary data tools. Includes PDS index utilities, SPICE integrations, and more."
 readme = "README.md"
 requires-python = ">= 3.11, <4"
@@ -185,6 +185,7 @@ DEP001 = [
 # DEP002 = "declared dependency is not used in the codebase"
 DEP002 = [
     "lxml",          # used at call time by pandas.read_html in spice/archived_kernels.py
+    "pyarrow",       # parquet engine loaded internally by pandas to_parquet/read_parquet; never imported directly
     "pytest",        # CLI tool used in CI / dev; not imported from src
     "pytest-cov",
     "pytest-xdist",
@@ -201,7 +202,7 @@ DEP003 = [
 ]
 
 [tool.bumpversion]
-current_version = "0.76.2"
+current_version = "0.76.3"
 commit = true
 tag = true
 

{planetarypy-0.76.2 → planetarypy-0.76.3}/src/planetarypy/__init__.py

@@ -2,7 +2,7 @@
 
 __author__ = """PlanetaryPy Developers"""
 __email__ = "kmichael.aye@gmail.com"
-__version__ = "0.76.2"
+__version__ = "0.76.3"
 
 __all__ = [
     "enable_logging",

{planetarypy-0.76.2 → planetarypy-0.76.3}/src/planetarypy/instruments/mro/hirise.py

@@ -398,6 +398,14 @@ try:
 except ImportError:
     pass  # catalog not available
 
+# Register the HiRISE meta-display handler with the PDS meta dispatcher
+try:
+    from planetarypy.pds.meta_display import register_meta_handler
+    register_meta_handler("mro.hirise.edr", format_meta)
+    register_meta_handler("mro.hirise.rdr", format_meta)
+except ImportError:
+    pass  # pds.meta_display not available
+
 
 def _edr_base_url() -> URL:
     """Resolve EDR base URL from config."""

{planetarypy-0.76.2 → planetarypy-0.76.3}/src/planetarypy/plotting.py

@@ -4,8 +4,14 @@ Provides common visualization helpers for planetary science:
 percentile stretching, grayscale image display, sun direction indicators.
 """
 
+import warnings
+
 import numpy as np
 
+# One-shot guard so a multi-panel figure doesn't emit the experimental
+# warning once per subplot.
+_SUN_INDICATOR_WARNED = False
+
 
 def percentile_stretch(image, lo=1, hi=99):
     """Compute display limits from percentiles, ignoring zeros and NaN.
@@ -76,27 +82,34 @@ def imshow_gray(image, stretch="1,99", title=None, ax=None, **imshow_kwargs):
 
 def add_sun_indicator(ax, sun_azimuth_deg, position="upper right",
                       length=0.12, color="yellow", inner_color="orange"):
-    """Add a sun direction indicator to an image plot.
+    """Add a sun direction indicator to an image plot. **Experimental.**
+
+    .. warning::
+
+       Experimental. The azimuth-convention handoff is not fully validated:
+       this function expects **clockwise-from-image-top** (the PDS
+       ``SUB_SOLAR_AZIMUTH`` convention for *unprojected* images), but
+       :meth:`planetarypy.spice.spicer.Spicer.solar_azimuth_at` returns
+       **clockwise-from-north** (geographic). They agree only when image-north
+       points up; otherwise you must rotate by the image's north azimuth before
+       passing the value here. Placement and appearance may change.
 
-    The indicator shows a circle (sun) with a line pointing in the
-    direction of illumination. The azimuth is measured clockwise from
-    the top of the image.
+    The indicator is a small compass glyph (sun ball + arrow) drawn in a corner,
+    pointing toward the sun. It is rendered in **axes-fraction coordinates**, so
+    it neither rescales the image nor depends on the image's ``origin``.
 
     Parameters
     ----------
     ax : matplotlib.axes.Axes
         The axes containing the image.
     sun_azimuth_deg : float
-        Solar azimuth in degrees, clockwise from image top.
-        This matches the PDS `SUB_SOLAR_AZIMUTH` convention for
-        unprojected images.
+        Solar azimuth in degrees, clockwise from image top (see warning).
     position : str
-        Where to place the indicator: "upper right", "upper left",
-        "lower right", "lower left".
+        "upper right", "upper left", "lower right", "lower left".
     length : float
-        Line length as fraction of image size (default 0.12).
+        Arrow length as a fraction of the axes (default 0.12).
     color : str
-        Outer circle and line color.
+        Outer circle and arrow color.
     inner_color : str
         Inner circle color (smaller, overlaid on outer).
 
@@ -104,56 +117,62 @@ def add_sun_indicator(ax, sun_azimuth_deg, position="upper right",
     -------
     ax : matplotlib.axes.Axes
     """
-    xlim = ax.get_xlim()
-    ylim = ax.get_ylim()
-    # Image extent (works for both origin='upper' and data coords)
-    width = abs(xlim[1] - xlim[0])
-    height = abs(ylim[1] - ylim[0])
-
-    # Position the indicator
-    margin = 0.08
-    positions = {
-        "upper right": (xlim[0] + width * (1 - margin), min(ylim) + height * margin),
-        "upper left":  (xlim[0] + width * margin, min(ylim) + height * margin),
-        "lower right": (xlim[0] + width * (1 - margin), min(ylim) + height * (1 - margin)),
-        "lower left":  (xlim[0] + width * margin, min(ylim) + height * (1 - margin)),
+    global _SUN_INDICATOR_WARNED
+    if not _SUN_INDICATOR_WARNED:
+        warnings.warn(
+            "add_sun_indicator is experimental: the azimuth convention "
+            "(clockwise-from-top vs Spicer's clockwise-from-north) is not fully "
+            "validated, and placement/appearance may change.",
+            UserWarning,
+            stacklevel=2,
+        )
+        _SUN_INDICATOR_WARNED = True
+
+    L = float(length)
+    # Inset the anchor by at least the arrow length so the glyph stays inside the
+    # axes for *any* azimuth. Axes-fraction coords (y up, independent of image
+    # origin); drawing here never touches the data limits, so the image is not
+    # rescaled — the bug the old data-coordinate corner placement had.
+    inset = L + 0.06
+    corners = {
+        "upper right": (1 - inset, 1 - inset),
+        "upper left":  (inset,     1 - inset),
+        "lower right": (1 - inset, inset),
+        "lower left":  (inset,     inset),
     }
-    cx, cy = positions.get(position, positions["upper right"])
-
-    line_len = length * max(width, height)
-    az_rad = np.radians(sun_azimuth_deg)
-    # CW from top: dx = sin(az), dy = -cos(az) for origin='upper'
-    dx = line_len * np.sin(az_rad)
-    dy = -line_len * np.cos(az_rad)
+    cx, cy = corners.get(position, corners["upper right"])
 
-    # Sun circle in the sun direction, arrow points outward toward sun
+    az = np.radians(sun_azimuth_deg)
+    # Clockwise from top in axes-fraction space (y increases upward):
+    # 0deg -> up (+y), 90deg -> right (+x).
+    dx = L * np.sin(az)
+    dy = L * np.cos(az)
     sx, sy = cx + dx, cy + dy
 
-    # Shorten arrow slightly so the tip doesn't overlap the sun ball
-    shrink = 0.08 * line_len
-    norm = np.hypot(dx, dy)
-    ax_dx = dx / norm * shrink
-    ax_dy = dy / norm * shrink
+    # Stop the arrow just short of the sun ball.
+    shrink = 0.12 * L
+    norm = np.hypot(dx, dy) or 1.0
+    tipx, tipy = sx - dx / norm * shrink, sy - dy / norm * shrink
 
     ax.annotate("",
-                xy=(sx - ax_dx, sy - ax_dy),  # arrow tip (gap before sun ball)
-                xytext=(cx, cy),               # arrow tail (interior)
+                xy=(tipx, tipy), xytext=(cx, cy),
+                xycoords="axes fraction", textcoords="axes fraction",
                 arrowprops=dict(arrowstyle="-|>", color=color, lw=2.5,
                                 mutation_scale=20),
-                zorder=5)
-
-    # Sun symbol just past the arrow tip
-    ax.plot(sx, sy, "o", color=color, markersize=14, zorder=8)
-    ax.plot(sx, sy, "o", color=inner_color, markersize=9, zorder=9)
-
+                zorder=5, annotation_clip=False)
+    ax.plot(sx, sy, "o", color=color, markersize=14, zorder=8,
+            transform=ax.transAxes, clip_on=False)
+    ax.plot(sx, sy, "o", color=inner_color, markersize=9, zorder=9,
+            transform=ax.transAxes, clip_on=False)
     return ax
 
 
 def imshow_with_sun(image, sun_azimuth_deg, title=None, ax=None,
                     stretch="1,99", sun_position="upper right", **imshow_kwargs):
-    """Display a grayscale image with a sun direction indicator.
+    """Display a grayscale image with a sun direction indicator. **Experimental.**
 
-    Combines `imshow_gray` with `add_sun_indicator`.
+    Combines `imshow_gray` with `add_sun_indicator` (see that function's
+    experimental warning about the azimuth convention).
 
     Parameters
     ----------

{planetarypy-0.76.2 → planetarypy-0.76.3}/src/planetarypy/search.py

@@ -119,7 +119,11 @@ def _build_q(
         clauses.append(query)
     if not clauses:
         return None
-    return " and ".join(clauses)
+    # The PDS registry API requires the whole q wrapped in outer parentheses:
+    # a bare ``A and B`` returns HTTP 400 (UnparsableQParamException), while
+    # ``(A and B)`` parses. (peppi does the same in its ResultSet before sending.)
+    # Wrapping a single clause is harmless.
+    return "(" + " and ".join(clauses) + ")"
 
 
 def _flatten(value: Any) -> Any:

{planetarypy-0.76.2 → planetarypy-0.76.3}/src/planetarypy/spice/archived_kernels.py

@@ -20,6 +20,7 @@ __all__ = [
     "list_cached_kernels",
 ]
 
+import re
 import zipfile
 from datetime import timedelta
 from io import BytesIO
@@ -516,18 +517,35 @@ class Subsetter:
             else self.save_location
         )
         savepath = basepath / self.metakernel_file
-        with (
-            open(savepath, "w") as outfile,
-            self.z.open(self.metakernel_file) as infile,
-        ):
-            for line in infile:
-                linestr = line.decode()
-                if "'./data'" in linestr:
-                    linestr = linestr.replace("'./data'", f"'{savepath.parent}'")
-                outfile.write(linestr)
+        text = self.z.read(self.metakernel_file).decode()
+        savepath.write_text(_repoint_path_values(text, str(savepath.parent)))
         return savepath
 
 
+def _repoint_path_values(text: str, abspath: str) -> str:
+    """Rewrite a metakernel's ``PATH_VALUES`` to the local kernel directory.
+
+    NAIF archive metakernels use different relative conventions for
+    ``PATH_VALUES`` — most missions ship ``'./data'``, but some (e.g. Hayabusa2's
+    PDS4 archive) ship ``'..'``. Replace whatever single-quoted value the
+    ``PATH_VALUES = ( … )`` block holds with ``abspath``, leaving every other line
+    (notably ``KERNELS_TO_LOAD``'s ``$SYMBOL/…`` references) untouched. The old
+    code matched the ``'./data'`` literal only, so it silently no-opped on ``'..'``
+    and left an unresolvable path that broke ``furnsh``.
+    """
+    out = []
+    in_path_values = False
+    for line in text.splitlines(keepends=True):
+        if "PATH_VALUES" in line:
+            in_path_values = True
+        if in_path_values:
+            line = re.sub(r"'[^']*'", f"'{abspath}'", line)
+            if ")" in line:
+                in_path_values = False
+        out.append(line)
+    return "".join(out)
+
+
 def get_metakernel_and_files(
     mission: str, start: str, stop: str, save_location: str = None, quiet: bool = False
 ) -> str: