sxs 2025.0.5__py3-none-any.whl → 2025.0.7__py3-none-any.whl

sxs/__version__.py

@@ -1 +1 @@
-__version__ = "2025.0.5"
+__version__ = "2025.0.7"

sxs/simulations/simulation.py

@@ -7,6 +7,32 @@ from ..utilities import (
 )
 
 
+def search_prefixes(file, lev, files, ending=""):
+    """Find the actual filename present in the list of files
+
+    Different versions of Zenodo and CaltechDATA place different
+    restrictions on filenames — and specifically, things I would
+    consider to be directories.  If there are multiple Levs for a
+    simulation, we have to somehow specify the Lev in the filename.
+    The permitted strings for doing so have changed over the years, so
+    the directory separator was allowed to be a "/" for old systems,
+    but must be something else now; we settled on ":".  However, if
+    there is just one Lev in a simulation, and we try to save the
+    files in a consistent way — including the Lev with the appropriate
+    separator, different versions of Zenodo and CaltechDATA will
+    either allow or silently remove that prefix.  The simplest
+    approach is to just search over all possibilities, for which
+    filename is actually present in the data.  That's what this
+    function does.
+    
+    """
+    for prefix in [f"{lev}:", f"{lev}/", ""]:
+        fn = f"{prefix}{file}"
+        if f"{fn}{ending}" in files:
+            return fn
+    raise ValueError(f"{file}{ending} not found in any form in files")
+
+
 def Simulation(location, *args, **kwargs):
     """Construct a Simulation object from a location string
 
@@ -113,8 +139,8 @@ def Simulation(location, *args, **kwargs):
     # Extract the simulation ID, version, and Lev from the location string
     simulation_id, input_version = sxs_id_and_version(location)
     if not simulation_id:
-        if location.split("/Lev")[0] in simulations:
-            simulation_id = location.split("/Lev")[0]
+        if (sim_id := location.split("/Lev")[0]) in simulations:
+            simulation_id = sim_id
             input_version = latest_version
         else:
             raise ValueError(f"Invalid SXS ID in '{simulation_id}'")
@@ -129,7 +155,11 @@ def Simulation(location, *args, **kwargs):
     series = simulations.dataframe.loc[simulation_id]
 
     # If input_version is not the default, remove "files" from metadata
-    if input_version and input_version != max(metadata.get("DOI_versions", []), default=""):
+    version_is_not_default = (
+        input_version
+        and input_version != max(metadata.get("DOI_versions", []), default="")
+    )
+    if version_is_not_default:
         metadata = type(metadata)({
             key: value for key, value in metadata.items() if key != "files"
         })
@@ -211,26 +241,35 @@ def Simulation(location, *args, **kwargs):
     kwargs["deprecated"] = deprecated
 
     # We want to do this *after* deprecation checking, to avoid possibly unnecessary web requests
-    if 1 <= float(version[1:]) < 3.0 and "files" in metadata:
-        # The simulation metadata is points to files with a different version
-        del metadata["files"]
+    if version_is_not_default:
+        # The default metadata points to files with a different version, so delete this info
+        if "files" in metadata:
+            del metadata["files"]
     files = get_file_info(metadata, sxs_id, download=kwargs.get("download_file_info", None))
 
     # If Lev is given as part of `location`, use it; otherwise, use the highest available
-    lev_numbers = sorted({lev for f in files if (lev:=lev_number(f))})
-    if input_lev_number is not None and lev_numbers:
-        if input_lev_number not in lev_numbers:
-            raise ValueError(
-                f"Lev number '{input_lev_number}' not found in simulation files for {sxs_id}"
-            )
-    max_lev_number = max(lev_numbers, default=np.nan)
+    lev_numbers = metadata.get(
+        "lev_numbers",
+        sorted({lev_num for f in metadata.get("files", []) if (lev_num:=lev_number(f))})
+    )
+    if not lev_numbers:
+        raise ValueError(f"Could not find Levs for {location}")
+    if input_lev_number is not None and input_lev_number not in lev_numbers:
+        raise ValueError(
+            f"Lev number '{input_lev_number}' not found in simulation files for {sxs_id}"
+        )
+    max_lev_number = max(lev_numbers)
     output_lev_number = input_lev_number or max_lev_number
+    if output_lev_number is None:
+        raise ValueError(
+            f"No Lev number found for {location}"
+        )
     location = f"{sxs_id_stem}{version}/Lev{output_lev_number}"
 
     # Keep the metadata around unless we're asking for an old version
     # or a less-than-maximal Lev
     if (
-        version != latest_version
+        version_is_not_default
         or (lev_numbers and output_lev_number != max_lev_number)
     ):
         metadata = None
@@ -462,9 +501,9 @@ class SimulationBase:
     def metadata_path(self):
         for separator in [":", "/"]:
             for ending in [".json", ".txt"]:
-                prefix = f"{self.lev}{separator}" if self.lev else ""
-                if (fn := f"{prefix}metadata{ending}") in self.files:
-                    return fn
+                for prefix in ["", f"{self.lev}{separator}" if self.lev else ""]:
+                    if (fn := f"{prefix}metadata{ending}") in self.files:
+                        return fn
         raise ValueError(
             f"Metadata file not found in simulation files for {self.location}"
         )
@@ -758,50 +797,29 @@ class Simulation_v1(SimulationBase):
 
     @property
     def horizons_path(self):
-        prefix = f"{self.lev}/" if self.lev else ""
-        return f"{prefix}Horizons.h5"
-    
-    def load_horizons(self):
-        from .. import load
-        sxs_id_path = Path(self.sxs_id)
-        horizons_path = self.horizons_path
-        if horizons_path in self.files:
-            horizons_location = self.files.get(horizons_path)["link"]
-        else:
-            # Some simulations used the SXS ID as a prefix in file paths
-            # within the Zenodo upload in version 1.x of the catalog.
-            if (extended_horizons_path := f"{self.sxs_id_stem}/{horizons_path}") in self.files:
-                horizons_location = self.files.get(extended_horizons_path)["link"]
-            else:
-                raise ValueError(
-                    f"File '{horizons_path}' not found in simulation files for {self.location}"
-                )
-        horizons_truepath = Path(sxs_path_to_system_path(sxs_id_path / horizons_path))
-        return load(horizons_location, truepath=horizons_truepath)
+        return search_prefixes("Horizons.h5", self.lev, self.files)
 
     @property
     def strain_path(self):
-        prefix = f"{self.lev}/" if self.lev else ""
         extrapolation = (
             f"Extrapolated_{self.extrapolation}.dir"
             if self.extrapolation != "Outer"
             else "OutermostExtraction.dir"
         )
         return (
-            f"{prefix}rhOverM_Asymptotic_GeometricUnits_CoM.h5",
+            search_prefixes("rhOverM_Asymptotic_GeometricUnits_CoM.h5", self.lev, self.files),
             extrapolation
         )
 
     @property
     def psi4_path(self):
-        prefix = f"{self.lev}/" if self.lev else ""
         extrapolation = (
             f"Extrapolated_{self.extrapolation}.dir"
             if self.extrapolation != "Outer"
             else "OutermostExtraction.dir"
         )
         return (
-            f"{prefix}rMPsi4_Asymptotic_GeometricUnits_CoM.h5",
+            search_prefixes("rMPsi4_Asymptotic_GeometricUnits_CoM.h5", self.lev, self.files),
             extrapolation
         )
 
@@ -848,14 +866,12 @@ class Simulation_v2(SimulationBase):
 
     @property
     def horizons_path(self):
-        prefix = f"{self.lev}:" if self.lev else ""
-        return f"{prefix}Horizons.h5"
+        return search_prefixes("Horizons.h5", self.lev, self.files)
 
     @property
     def strain_path(self):
-        prefix = f"{self.lev}:" if self.lev else ""
         return (
-            f"{prefix}Strain_{self.extrapolation}",
+            search_prefixes(f"Strain_{self.extrapolation}", self.lev, self.files, ".h5"),
             "/"
         )
 
@@ -866,9 +882,9 @@ class Simulation_v2(SimulationBase):
             if self.extrapolation != "Outer"
             else "OutermostExtraction.dir"
         )
-        prefix = f"{self.lev}:" if self.lev else ""
+        prefix = f"{self.lev}:" if len(self.lev_numbers)>1 else ""
         return (
-            f"{prefix}ExtraWaveforms",
+            search_prefixes(f"ExtraWaveforms", self.lev, self.files, ".h5"),
             f"/rMPsi4_Asymptotic_GeometricUnits_CoM_Mem/{extrapolation}"
         )
 
@@ -905,20 +921,18 @@ class Simulation_v3(Simulation_v2):
 
     @property
     def strain_path(self):
-        prefix = f"{self.lev}:" if self.lev else ""
         return (
-            f"{prefix}Strain_{self.extrapolation}",
+            search_prefixes(f"Strain_{self.extrapolation}", self.lev, self.files, ".h5"),
             "/"
         ) if self.extrapolation == self.default_extrapolation else (
-            f"{prefix}ExtraWaveforms",
+            search_prefixes("ExtraWaveforms", self.lev, self.files, ".h5"),
             f"/Strain_{self.extrapolation}.dir"
         )
 
     @property
     def psi4_path(self):
-        prefix = f"{self.lev}:" if self.lev else ""
         return (
-            f"{prefix}ExtraWaveforms",
+            search_prefixes("ExtraWaveforms", self.lev, self.files, ".h5"),
             f"/Psi4_{self.extrapolation}.dir"
         )
 

sxs/utilities/inspire.py

@@ -44,7 +44,7 @@ def inspire2doi(inspire_bibtex_key, raise_exceptions=False):
 
 
 def query(
-    query,
+    query_string,
     sort="mostrecent",
     page=1,
     size=1000,
@@ -56,7 +56,7 @@ def query(
 
     Parameters
     ----------
-    query : str
+    query_string : str
         The search query.  For details, see
         https://github.com/inspirehep/rest-api-doc/tree/master#search-query
     fields : str, optional
@@ -93,32 +93,37 @@ def query(
 
     """
     import sys
-    import requests
-    from requests.adapters import HTTPAdapter
-    from urllib3.util.retry import Retry
 
-    session = requests.Session()
+    # Reuse the same session, in case user repeatedly calls query
+    if not hasattr(query, "session"):
+        import requests
+        from requests.adapters import HTTPAdapter
+        from urllib3.util.retry import Retry
+
+        query.session = requests.Session()
+
+        ## Retry automatically on certain types of errors
+        retry = Retry(
+            total=10,
+            backoff_factor=0.1,
+            status_forcelist=[
+                413,  # Request Entity Too Large
+                429,  # Too Many Requests
+                500,  # Internal Server Error
+                502,  # Bad Gateway
+                503,  # Service Unavailable
+                504,  # Gateway Timeout
+            ],
+        )
+        adapter = HTTPAdapter(max_retries=retry)
+        query.session.mount("https://", adapter)
+
+    session = query.session
     collected_results = []
 
-    ## Retry automatically on certain types of errors
-    retry = Retry(
-        total=10,
-        backoff_factor=0.1,
-        status_forcelist=[
-            413,  # Request Entity Too Large
-            429,  # Too Many Requests
-            500,  # Internal Server Error
-            502,  # Bad Gateway
-            503,  # Service Unavailable
-            504,  # Gateway Timeout
-        ],
-    )
-    adapter = HTTPAdapter(max_retries=retry)
-    session.mount("https://", adapter)
-
     url = api_url.format(record_type=record_type)
     params = {
-        "q": query,
+        "q": query_string,
         "sort": sort,
         "size": size,
         "page": page,

{sxs-2025.0.5.dist-info → sxs-2025.0.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sxs
-Version: 2025.0.5
+Version: 2025.0.7
 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/
@@ -47,7 +47,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.12
+Requires-Dist: sxscatalog>=3.0.13
 Requires-Dist: tqdm>=4.63.1
 Requires-Dist: urllib3>=1.25.10
 Provides-Extra: docs

{sxs-2025.0.5.dist-info → sxs-2025.0.7.dist-info}/RECORD

@@ -1,5 +1,5 @@
 sxs/__init__.py,sha256=8PntABL6yx7Ad70hP7WedNAVDTZiwm_2At5xIQGo4k8,2610
-sxs/__version__.py,sha256=pwtaOkpdfJXIYyXjNW6ETF4UXdNETB8v75JGtPKGkQw,25
+sxs/__version__.py,sha256=Sb83Pr0X5dxDLb6m-eW2IPmwgSbc6jBC6oTrW8sZwRE,25
 sxs/handlers.py,sha256=jVV-HK-omzoBx5N2wcpLHvyoWq86hUfWCjnGbPpD91I,18343
 sxs/juliapkg.json,sha256=-baaa3Za_KBmmiGjlh2YYLWmvUvZl6GaKKXwNI4S7qU,178
 sxs/time_series.py,sha256=OKaLg8tFyrtKcef7900ri-a0C6A8wKxA68KovZXvH6I,41081
@@ -18,7 +18,7 @@ sxs/metadata/metric.py,sha256=Tsig1Jm50OO8r89zfjCuQ4i3JAoiazSb4J9qYtPWKgM,41
 sxs/simulations/__init__.py,sha256=eXkheYhRaYyKjul5J1IXpoJ7Wq4nr3Tgwr-HSS3BTek,156
 sxs/simulations/analyze.py,sha256=RaImREx3fWlXgJRCI-Wsq0-LjidL-Mb8SIN3-n-TMqM,10373
 sxs/simulations/local.py,sha256=e77SeaWMl2PWX_EndQtShOXZxcFKhQsUDQ55R2Njcuc,43
-sxs/simulations/simulation.py,sha256=QtGdZDOXgt7C44CqqvdJCCQmEkcXjxPUL-yDrUR13Ps,41741
+sxs/simulations/simulation.py,sha256=tzI1s15mU1CDdst7XZRD4UehtbkRvIao16ONTAA0zfI,42353
 sxs/simulations/simulations.py,sha256=sMle89VoD1CQni1N23Vjo3h2yj9LHHAtuaB_qfD3Wgg,109
 sxs/utilities/__init__.py,sha256=WSStlqljfgQheMxHGfuofSc5LdmASGvO3FNO3f_zaT0,4806
 sxs/utilities/bitwise.py,sha256=G9ZNYgwDQRhq5wbDf-p2HcUqkEP_IRDiQoXW4KyU17k,13205
@@ -26,7 +26,7 @@ sxs/utilities/dicts.py,sha256=CCpm3upG_9SRj9gjawukSUfaJ5asF-XRG2ausEXhYyg,695
 sxs/utilities/downloads.py,sha256=dgQvlpY3DffDX1HrmISb6iThuuIDt9BAPbgXFBrh2PQ,116
 sxs/utilities/files.py,sha256=l7SNOg0ikgqXV3bmPJdXZQMQ_XPGXVUsIJIOjDVp3Mg,4517
 sxs/utilities/formats.py,sha256=EekLcSi-fhFdkPT7R9h10d9_0gZH4EomH5-RVQp-sg8,3867
-sxs/utilities/inspire.py,sha256=5F4KJ2D9qaEArl7dlhMv-K3Dym5S5oQI5RTwZXKhXRw,5298
+sxs/utilities/inspire.py,sha256=Q_N0W3Ta37lpihoF3nbBOFCmVHzmp4CAPuW0YapROGw,5541
 sxs/utilities/monotonicity.py,sha256=YVwj3Tjew8dkpJJ9TReyuISD2ul5HJfkEJgCoiLru5Q,812
 sxs/utilities/pretty_print.py,sha256=ZDHR3uvkzQ3Whk_eIp3BB7Abh796nqyrVsQRa68zgGc,1473
 sxs/utilities/select.py,sha256=UgoEQIvkm8NBe6sD5O2gK0g9Pep-xvWoYQ3b7RxI-Ww,6727
@@ -82,7 +82,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.5.dist-info/METADATA,sha256=SXThR-Zkm64ouogrNf6io6E-nU0oQE6_hnGPlSjIsJQ,9311
-sxs-2025.0.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-sxs-2025.0.5.dist-info/licenses/LICENSE,sha256=ptVOd5m7LDM5ZF0x32cxb8c2Nd5NDmAhy6DX7xt_7VA,1080
-sxs-2025.0.5.dist-info/RECORD,,
+sxs-2025.0.7.dist-info/METADATA,sha256=7S6sizUf1CMLH-B7rsbjpX1rbYTeeJ-0FlClcR07ct0,9311
+sxs-2025.0.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+sxs-2025.0.7.dist-info/licenses/LICENSE,sha256=ptVOd5m7LDM5ZF0x32cxb8c2Nd5NDmAhy6DX7xt_7VA,1080
+sxs-2025.0.7.dist-info/RECORD,,