sxs 2025.0.4__tar.gz → 2025.0.5__tar.gz

{sxs-2025.0.4 → sxs-2025.0.5}/CITATION.cff

@@ -10,5 +10,5 @@ authors:
 title: "The sxs package"
 license: MIT
 doi: 10.5281/zenodo.4034006
-version: 2025.0.4
+version: 2025.0.5
 date-released: 2025-04-11

{sxs-2025.0.4 → sxs-2025.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sxs
-Version: 2025.0.4
+Version: 2025.0.5
 Summary: Interface to data produced by the Simulating eXtreme Spacetimes collaboration
 Project-URL: Homepage, https://github.com/sxs-collaboration/sxs
 Project-URL: Documentation, https://sxs.readthedocs.io/

sxs-2025.0.5/sxs/__version__.py

@@ -0,0 +1 @@
+__version__ = "2025.0.5"

{sxs-2025.0.4 → sxs-2025.0.5}/sxs/simulations/simulation.py

@@ -924,18 +924,33 @@ class Simulation_v3(Simulation_v2):
 
 
 def get_file_info(metadata, sxs_id, download=None):
-    # TODO: Allow an existing zenodo_metadata.json file to be used
-    from .. import load_via_sxs_id
+    from .. import load, load_via_sxs_id
     if "files" in metadata:
         return metadata["files"]
     truepath = Path(sxs_path_to_system_path(sxs_id)) / "zenodo_metadata.json"
     record = load_via_sxs_id(sxs_id, "export/json", truepath=truepath, download=download)
-    entries = record["files"]["entries"]
-    return {
-        str(filename): {
-            "checksum": entry["checksum"],
-            "size": entry["size"],
-            "link": entry["links"]["content"],
+    if not record.get("files", {}).get("entries", []):
+        # CaltechDATA files should generally be already stored in the `simulations`,
+        # but just in case, we get to this point
+        truepath = Path(sxs_path_to_system_path(sxs_id)) / "caltechdata_files.json"
+        url = record["links"]["files"]
+        record = load(url, truepath=truepath, download=download)
+        entries = record["entries"]
+        return {
+            entry["key"]: {
+                "checksum": entry["checksum"],
+                "size": entry["size"],
+                "link": entry["links"]["content"],
+            }
+            for entry in entries
+        }
+    else:
+        entries = record["files"]["entries"]
+        return {
+            str(filename): {
+                "checksum": entry["checksum"],
+                "size": entry["size"],
+                "link": entry["links"]["content"],
+            }
+            for filename, entry in entries.items()
         }
-        for filename, entry in entries.items()
-    }

sxs-2025.0.4/sxs/__version__.py

@@ -1 +0,0 @@
-__version__ = "2025.0.4"