sxs 2025.0.4__py3-none-any.whl → 2025.0.6__py3-none-any.whl

sxs/__version__.py

@@ -1 +1 @@
-__version__ = "2025.0.4"
+__version__ = "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/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.dist-info → sxs-2025.0.6.dist-info}/METADATA

@@ -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.4.dist-info → sxs-2025.0.6.dist-info}/RECORD

@@ -1,5 +1,5 @@
 sxs/__init__.py,sha256=8PntABL6yx7Ad70hP7WedNAVDTZiwm_2At5xIQGo4k8,2610
-sxs/__version__.py,sha256=YlOJhL85IYEczUyRNWzDPIj3M_eeb9k05_B0RVtrMMk,25
+sxs/__version__.py,sha256=yvdjudtPjiQebLjJ4Ne10nfyYPrzHlDRMvfyAxij7Mo,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=to8iAofvW_TMIfyO1tYSiCwuVUC7v-2ykGsjN0WvTGY,41104
+sxs/simulations/simulation.py,sha256=QtGdZDOXgt7C44CqqvdJCCQmEkcXjxPUL-yDrUR13Ps,41741
 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.4.dist-info/METADATA,sha256=b28vdu-l2V0319BujaHzvAKWRTrPwB6RrmA6nlfMw00,9311
-sxs-2025.0.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-sxs-2025.0.4.dist-info/licenses/LICENSE,sha256=ptVOd5m7LDM5ZF0x32cxb8c2Nd5NDmAhy6DX7xt_7VA,1080
-sxs-2025.0.4.dist-info/RECORD,,
+sxs-2025.0.6.dist-info/METADATA,sha256=HsKY1bopxuPt9Art9HXqOlYGrIy6l73GU6y5xotFisQ,9311
+sxs-2025.0.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+sxs-2025.0.6.dist-info/licenses/LICENSE,sha256=ptVOd5m7LDM5ZF0x32cxb8c2Nd5NDmAhy6DX7xt_7VA,1080
+sxs-2025.0.6.dist-info/RECORD,,