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

sxs/__version__.py

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

sxs/handlers.py

@@ -237,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:
@@ -294,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/waveforms/format_handlers/lvc.py

@@ -36,11 +36,12 @@ def to_lvc_conventions(
 ):
     r"""Return SXS waveform in LVC conventions.
 
-    This is the function underpinning `sxs.load_lvc`.  Essentially,
-    that function is a fairly thin wrapper around this one; it just
-    loads the `h` and `horizons` data and passes it to this function.
-    For explanation of what this function does, the inputs, and
-    outputs, see that function's docstring.
+    This is the function underpinning the `to_lvk` method of the
+    various `Simulation` types.  Essentially, that function is a
+    fairly thin wrapper around this one; it just loads the `h` and
+    `horizons` data and passes it to this function.  For explanation
+    of what this function does, the inputs, and outputs, see that
+    function's docstring.
 
     """
     if t_ref is None and f_ref is None:

sxs/waveforms/format_handlers/rotating_paired_diff_multishuffle_bzip2.py

@@ -413,6 +413,12 @@ def load(
             raise ValueError(message)
 
     file_name_str = str(file_name)
+    if file_name_str.endswith(".json"):
+        # This is just a JSON file with the "sxs_format" key, not an H5 file
+        # with the data in it.  Just return the JSON data.
+        from ...handlers import JSONHandler
+        return JSONHandler.load(file_name_str)
+
     group = kwargs.get("group", None)
     if ".h5" in file_name_str and not file_name_str.endswith(".h5"):
         file_name_str, group = file_name_str.split(".h5")

{sxs-2025.0.1.dist-info → sxs-2025.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sxs
-Version: 2025.0.1
+Version: 2025.0.2
 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/
@@ -46,7 +46,7 @@ Requires-Dist: quaternionic>=1.0.15
 Requires-Dist: requests>=2.24.0
 Requires-Dist: scipy>=1.13
 Requires-Dist: spherical>=1.0.15
-Requires-Dist: sxscatalog>=3.0.0a1
+Requires-Dist: sxscatalog>=3.0.0a26
 Requires-Dist: tqdm>=4.63.1
 Requires-Dist: urllib3>=1.25.10
 Provides-Extra: docs

{sxs-2025.0.1.dist-info → sxs-2025.0.2.dist-info}/RECORD

@@ -1,6 +1,6 @@
 sxs/__init__.py,sha256=8PntABL6yx7Ad70hP7WedNAVDTZiwm_2At5xIQGo4k8,2610
-sxs/__version__.py,sha256=Bm-_JhTS0PjYQZLvzOzJamRZy3Sq8gy04rjMiv45GLE,25
-sxs/handlers.py,sha256=12a14BjxsAgTHoEj0MrKtuv7wV1Y4chNr1oF9rha3DY,17205
+sxs/__version__.py,sha256=00CnSIbrBDJK1w5pLXr3qrweMV-XKl67exMRg7gte3Q,25
+sxs/handlers.py,sha256=Rhj6HAKPKSCJYwpWcz2eUkd6yuQZdCndQjZhq71QQ1A,18308
 sxs/juliapkg.json,sha256=-baaa3Za_KBmmiGjlh2YYLWmvUvZl6GaKKXwNI4S7qU,178
 sxs/time_series.py,sha256=OKaLg8tFyrtKcef7900ri-a0C6A8wKxA68KovZXvH6I,41081
 sxs/catalog/__init__.py,sha256=9-WTMTPDmqqkFyIHOtEbPA6etXm3_RSRrLWvHtLrjLg,205
@@ -65,9 +65,9 @@ sxs/waveforms/waveform_modes.py,sha256=NousbAeSedN1RNh21g_5LAh0K82ikIumHPELKf9X_
 sxs/waveforms/waveform_signal.py,sha256=Ojrt6DSDdleB0qmu6UwjjPnYdaWsrjnpBA_8dhnM_q4,182
 sxs/waveforms/format_handlers/__init__.py,sha256=0wsnuBYCYsCkN19L2ipga7BtigvPyBcqiy_4qrzmLpE,50
 sxs/waveforms/format_handlers/grathena.py,sha256=5NrHL3K0mRHApnFx5YsMUufDKUD1A_dZu8mGQqOdBeE,3622
-sxs/waveforms/format_handlers/lvc.py,sha256=gdXYqa8Bn8jCSIRIshMP399WO9ZMtkNtkAQiuzqhH_0,7817
+sxs/waveforms/format_handlers/lvc.py,sha256=8hGyjSaXRfS1RPiknbACi6mSLDU-xoD3EiDG2CqEit4,7861
 sxs/waveforms/format_handlers/nrar.py,sha256=3ycVoqQcWAAixV3mKp58_wUhYBHt6QeLv2YGSvy-EGM,21538
-sxs/waveforms/format_handlers/rotating_paired_diff_multishuffle_bzip2.py,sha256=C19-9VkQ5dt9I7GHkeFrF56k_BbFPHXIMX_xmmBj7ww,27477
+sxs/waveforms/format_handlers/rotating_paired_diff_multishuffle_bzip2.py,sha256=7XgXnroQ-3dHCYnN6KrDkz8z9EVl57f8W6iOX6bUemA,27745
 sxs/waveforms/format_handlers/rotating_paired_xor_multishuffle_bzip2.py,sha256=pFEJIlb6OQQNhv6r48ALFnZMKNZjuQY55ydWBADCDgU,2348
 sxs/waveforms/format_handlers/spectre_cce_v1.py,sha256=nh57zbG_uWJZQVhMrz7H05fpsjl1X6oaita8aTRcWxU,3963
 sxs/zenodo/__init__.py,sha256=rgFd1jN7IVcZEeed7iAoht1DitbLj31-8EtA0pd_e3c,25996
@@ -79,7 +79,7 @@ sxs/zenodo/api/__init__.py,sha256=EM_eh4Q8R5E0vIfMhyIR1IYFfOBu6vA0UTasgX9gHys,21
 sxs/zenodo/api/deposit.py,sha256=J4RGvGjh0cEOrN4bBZWEDcPAhNscqB2fzLlvRZ5HTHM,36948
 sxs/zenodo/api/login.py,sha256=Yz0ytgi81_5BpDzhrS0WPMXlvU2qUaCK8yn8zxfEbko,18007
 sxs/zenodo/api/records.py,sha256=nKkhoHZ95CTztHF9Zzaug5p7IiUCJG4Em1i-l-WqH6U,3689
-sxs-2025.0.1.dist-info/METADATA,sha256=UVgzRlHmWBxbE04NKD4p5fvpo3I7u8uFJp-DWxzhzA0,9287
-sxs-2025.0.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-sxs-2025.0.1.dist-info/licenses/LICENSE,sha256=ptVOd5m7LDM5ZF0x32cxb8c2Nd5NDmAhy6DX7xt_7VA,1080
-sxs-2025.0.1.dist-info/RECORD,,
+sxs-2025.0.2.dist-info/METADATA,sha256=1LSOQXL_n4JZSL1Z_EW-ShJ5JLvurIp2WbHYBFuHHqY,9288
+sxs-2025.0.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+sxs-2025.0.2.dist-info/licenses/LICENSE,sha256=ptVOd5m7LDM5ZF0x32cxb8c2Nd5NDmAhy6DX7xt_7VA,1080
+sxs-2025.0.2.dist-info/RECORD,,