sxs 2024.0.44__py3-none-any.whl → 2025.0.2__py3-none-any.whl

sxs/__init__.py

@@ -28,7 +28,7 @@ from .waveforms import WaveformModes, WaveformModesDict, to_lvc_conventions #, W
 from .waveforms import rotating_paired_xor_multishuffle_bzip2 as rpxmb
 from .waveforms import rotating_paired_diff_multishuffle_bzip2 as rpdmb
 from .waveforms import spectre_cce_v1
-from . import catalog, metadata, horizons, waveforms, zenodo, caltechdata
+from . import catalog, metadata, horizons, waveforms, zenodo
 from .simulations import Simulation, Simulations, write_local_simulations, local_simulations
 from .handlers import load, load_via_sxs_id, loadcontext, load_lvc
 

sxs/__version__.py

@@ -1 +1 @@
-__version__ = "2024.0.44"
+__version__ = "2025.0.2"

sxs/handlers.py

@@ -1,6 +1,7 @@
 """Functions to facilitate generic handling of SXS-format data files"""
 
 import contextlib
+import sxscatalog
 from . import waveforms, doi_url
 
 
@@ -236,7 +237,7 @@ def load(location, download=None, cache=None, progress=None, truepath=None, **kw
     import pathlib
     import urllib.request
     from . import Simulations, Simulation, read_config, sxs_directory, Catalog
-    from .utilities import url, download_file, sxs_path_to_system_path, sxs_id_version_lev_exact_re, lev_path_re
+    from .utilities import url, download_file, sxs_path_to_system_path, sxs_id_version_lev_exact_re, lev_path_re, sxs_identifier_re
 
     # Note: `download` and/or `cache` may still be `None` after this
     if download is None:
@@ -280,25 +281,8 @@ def load(location, download=None, cache=None, progress=None, truepath=None, **kw
         elif location == "catalog":
             return Catalog.load(download=download)
 
-        elif location == "simulations":
-            return Simulations.load(
-                download=download,
-                local=kwargs.get("local", False),
-                annex_dir=kwargs.get("annex_dir", None),
-                output_file=kwargs.get("output_file", None),
-                compute_md5=kwargs.get("compute_md5", False),
-                show_progress=kwargs.get("show_progress", False)
-            )
-
-        elif location == "dataframe":
-            return Simulations.load(
-                download=download,
-                local=kwargs.get("local", False),
-                annex_dir=kwargs.get("annex_dir", None),
-                output_file=kwargs.get("output_file", None),
-                compute_md5=kwargs.get("compute_md5", False),
-                show_progress=kwargs.get("show_progress", False)
-            ).dataframe
+        elif location in ["simulations", "dataframe"]:
+            return sxscatalog.load(location, download=download, **kwargs)
 
         elif sxs_id_version_lev_exact_re.match(location):
             return Simulation(location, download=download, cache=cache, progress=progress, **kwargs)
@@ -310,11 +294,30 @@ def load(location, download=None, cache=None, progress=None, truepath=None, **kw
                 local=kwargs.get("local", False),
                 annex_dir=kwargs.get("annex_dir", None)
             )
+            # If we chop off any "/LevN", and it's in the simulations, load it as a simulation
             if lev_path_re.sub("", location) in simulations:
                 return Simulation(
                     location, download=download, cache=cache, progress=progress, **kwargs
                 )
 
+            # Now we look for a file in `simulations`
+            if sxs_identifier_re.match(location):
+                split_location = sxs_identifier_re.split(location)
+                # Currently we can only handle unversioned SXS ID files
+                if split_location[5] is None:
+                    sxs_id = split_location[1]
+                    file = split_location[-1].lstrip("/").lstrip("\\")
+                    if sxs_id in simulations:
+                        simulation = simulations[sxs_id]
+                        if "files" in simulation:
+                            file_info = simulation["files"][file]
+                            location = file_info["link"]
+                            truepath = truepath or (pathlib.Path(sxs_id) / file)
+                            return load(
+                                location, truepath=truepath,
+                                download=download, cache=cache, progress=progress, **kwargs
+                            )
+
             # Try to find an appropriate SXS file in the catalog
             catalog = Catalog.load(download=download)
             selections = catalog.select_files(location)

sxs/metadata/__init__.py

@@ -1,10 +1,2 @@
 """Interface to SXS metadata files"""
-
-from .metadata import Metadata
-from .metric import MetadataMetric
-
-formats = {
-    None: Metadata,
-    "": Metadata,
-    "metadata": Metadata,
-}
+from sxscatalog.metadata import *