sxs 2025.0.4__tar.gz → 2025.0.6__tar.gz

{sxs-2025.0.4 → sxs-2025.0.6}/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.6
 date-released: 2025-04-11

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sxs
-Version: 2025.0.4
+Version: 2025.0.6
 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.6/sxs/__version__.py

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

{sxs-2025.0.4 → sxs-2025.0.6}/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-2025.0.6}/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.4 → sxs-2025.0.6}/tests/test_waveform_rotations.py

@@ -118,7 +118,7 @@ def test_dpa_rotated_generally(w, Rs):
     # smaller of the two sign options.
     assert (
         max(np.amin(np.vstack((np.linalg.norm(LL1 - LL2, axis=1), np.linalg.norm(LL1 + LL2, axis=1))), axis=0))
-        < 1.0e-12
+        < 4.0e-12
     )
 
 

sxs-2025.0.4/sxs/__version__.py

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