improve index storage, fix index receiving logic

Author: michaelaye

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "planetarypy"
-version = "0.2.0"
+version = "0.2.1"
 description = "Core package for planetary data tools. Includes PDS index utilities, SPICE integrations, and more."
 readme = "README.md"
 requires-python = ">= 3.9, <4"
@@ -116,4 +116,4 @@ extend-ignore = ["E203", "E701"]
 [tool.bumpversion]
 current_version = "0.2.0"
 commit = true
-tag = true
+tag = true

src/planetarypy/__init__.py

@@ -2,4 +2,4 @@
 
 __author__ = """PlanetaryPy Developers"""
 __email__ = "kmichael.aye@gmail.com"
-__version__ = "0.2.0"
+__version__ = "0.2.1"

src/planetarypy/pds/__init__.py

@@ -7,13 +7,7 @@
 from .index_config import access_log, urls_config
 from .index_labels import IndexLabel
 from .indexes import Index
-from .utils import (
-    get_index,
-    list_indexes,
-    list_instruments,
-    list_missions,
-    print_pds_tree,
-)
+from .utils import *
 
 __all__ = [
     "Index",
@@ -23,6 +17,6 @@
     "list_missions",
     "list_instruments",
     "list_indexes",
-    "print_pds_tree",
+    "list_available_indexes",
     "get_index",
 ]

src/planetarypy/pds/indexes.py

@@ -132,7 +132,10 @@ def table_url(self):
 
     @property
     def local_dir(self):
-        p = storage_root / str(self.key).replace(".", "/")
+        # squeeze in an indexes subfolder
+        key_path = Path(str(self.key).replace(".", "/"))
+        indexes_path = key_path.parent / Path("indexes") / key_path.name
+        p = storage_root / indexes_path
         p.mkdir(parents=True, exist_ok=True)
         return p
 

src/planetarypy/pds/utils.py

@@ -7,15 +7,15 @@
     "list_missions",
     "list_instruments",
     "list_indexes",
-    "print_pds_tree",
+    "list_available_indexes",
     "get_index",
 ]
 
 from typing import Optional
 
 import pandas as pd
 
-from .indexes import Index
+from planetarypy.pds.indexes import Index
 
 
 def list_missions() -> list[str]:
@@ -116,7 +116,7 @@ def list_indexes(mission_instrument: str) -> list[str]:
     return sorted(indexes)
 
 
-def print_pds_tree(
+def list_available_indexes(
     filter_mission: Optional[str] = None, filter_instrument: Optional[str] = None
 ) -> None:
     """Print an ASCII tree diagram of all missions, instruments, and indexes.
@@ -226,8 +226,9 @@ def get_index(
         >>> df = get_index('mro.ctx.edr')
     """
     index = Index(dotted_index_key)
+    if not index.local_label_path.is_file():
+        index.download()
     # only do time-consuming update check if refresh is True
-    if refresh:
-        if index.update_available:
-            index.download()
+    if (refresh and index.update_available) or force:
+        index.download()
     return index.parquet