lsst-resources 29.2025.1900__py3-none-any.whl → 29.2025.2000__py3-none-any.whl

lsst/resources/http.py

@@ -112,13 +112,6 @@ def _calc_tmpdir_buffer_size(tmpdir: str) -> int:
     return max(10 * fsstats.f_bsize, 256 * 4096)
 
 
-def _dav_to_http(url: str) -> str:
-    """Convert dav scheme in URL to http scheme."""
-    if url.startswith("dav"):
-        url = "http" + url.removeprefix("dav")
-    return url
-
-
 class HttpResourcePathConfig:
     """Configuration class to encapsulate the configurable items used by class
     HttpResourcePath.
@@ -437,7 +430,7 @@ def _get_dav_and_server_headers(path: ResourcePath | str) -> tuple[str | None, s
         config = HttpResourcePathConfig()
         with SessionStore(config=config).get(path) as session:
             resp = session.options(
-                _dav_to_http(str(path)),
+                str(path),
                 stream=False,
                 timeout=config.timeout,
             )
@@ -587,7 +580,7 @@ class SessionStore:
         Note that "https://www.example.org" and "https://www.example.org:12345"
         will have different sessions since the port number is not identical.
         """
-        root_uri = _dav_to_http(str(rpath.root_uri()))
+        root_uri = str(rpath.root_uri())
         if root_uri not in self._sessions:
             # We don't have yet a session for this endpoint: create a new one.
             self._sessions[root_uri] = self._make_session(rpath)
@@ -597,7 +590,7 @@ class SessionStore:
     def _make_session(self, rpath: ResourcePath) -> requests.Session:
         """Make a new session configured from values from the environment."""
         session = requests.Session()
-        root_uri = _dav_to_http(str(rpath.root_uri()))
+        root_uri = str(rpath.root_uri())
         log.debug("Creating new HTTP session for endpoint %s ...", root_uri)
         retries = Retry(
             # Total number of retries to allow. Takes precedence over other
@@ -657,9 +650,8 @@ class SessionStore:
         # from request to request. Systematically persisting connections to
         # those servers may exhaust their capabilities when there are thousands
         # of simultaneous clients.
-        scheme = _dav_to_http(rpath.scheme)
         session.mount(
-            f"{scheme}://",
+            f"{rpath.scheme}://",
             HTTPAdapter(
                 pool_connections=self._num_pools,
                 pool_maxsize=0,
@@ -1127,7 +1119,7 @@ class HttpResourcePath(ResourcePath):
         stream = size > 0
         with self.data_session as session:
             with time_this(log, msg="GET %s", args=(self,)):
-                resp = session.get(_dav_to_http(self.geturl()), stream=stream, timeout=self._config.timeout)
+                resp = session.get(self.geturl(), stream=stream, timeout=self._config.timeout)
 
             if resp.status_code != requests.codes.ok:  # 200
                 raise FileNotFoundError(
@@ -1350,7 +1342,7 @@ class HttpResourcePath(ResourcePath):
         ):
             if self.scheme.startswith("dav") and fsspec:
                 # Not webdav so convert to http.
-                return fsspec.url_to_fs(_dav_to_http(self.geturl()))
+                return fsspec.url_to_fs(self.geturl())
             return super().to_fsspec()
 
         if self.isdir():
@@ -1520,7 +1512,7 @@ class HttpResourcePath(ResourcePath):
         # to both the front end and back end servers are closed after the
         # download operation is finished.
         with self.data_session as session:
-            resp = session.get(_dav_to_http(self.geturl()), stream=True, timeout=self._config.timeout)
+            resp = session.get(self.geturl(), stream=True, timeout=self._config.timeout)
             if resp.status_code != requests.codes.ok:
                 raise FileNotFoundError(
                     f"Unable to download resource {self}; status: {resp.status_code} {resp.reason}"
@@ -1633,7 +1625,7 @@ class HttpResourcePath(ResourcePath):
             for _ in range(max_redirects := 5):
                 resp = session.request(
                     method,
-                    _dav_to_http(url),
+                    url,
                     data=body,
                     headers=headers,
                     stream=False,
@@ -1791,7 +1783,7 @@ class HttpResourcePath(ResourcePath):
         src : `HttpResourcePath`
             The source of the contents to move to `self`.
         """
-        headers = {"Destination": _dav_to_http(self.geturl())}
+        headers = {"Destination": self.geturl()}
         resp = self._send_webdav_request(method, url=src.geturl(), headers=headers, session=self.data_session)
         if resp.status_code in (requests.codes.created, requests.codes.no_content):
             return
@@ -1898,7 +1890,7 @@ class HttpResourcePath(ResourcePath):
         if self._config.send_expect_on_put or self.server == "dcache":
             headers["Expect"] = "100-continue"
 
-        url = _dav_to_http(self.geturl())
+        url = self.geturl()
 
         # Use the session as a context manager to ensure the underlying
         # connections are closed after finishing uploading the data.

lsst/resources/s3.py

@@ -251,6 +251,7 @@ class S3ResourcePath(ResourcePath):
             # URIs.
             first_uri = related_uris[0]
             # API requires no more than 1000 per call.
+            chunk_num = 0
             for chunk in chunk_iterable(related_uris, chunk_size=1_000):
                 key_to_uri: dict[str, ResourcePath] = {}
                 keys: list[dict[str, str]] = []
@@ -260,7 +261,13 @@ class S3ResourcePath(ResourcePath):
                     keys.append({"Key": key})
                     # Default to assuming everything worked.
                     results[uri] = MBulkResult(True, None)
-                errored = cls._delete_related_objects(first_uri.client, first_uri._bucket, keys)
+                chunk_num += 1
+                with time_this(
+                    log,
+                    msg="Bulk delete; chunk number %d; %d dataset%s",
+                    args=(chunk_num, len(chunk), "s" if len(chunk) != 1 else ""),
+                ):
+                    errored = cls._delete_related_objects(first_uri.client, first_uri._bucket, keys)
 
                 # Update with error information.
                 for key, bulk_result in errored.items():

lsst/resources/version.py

@@ -1,2 +1,2 @@
 __all__ = ["__version__"]
-__version__ = "29.2025.1900"
+__version__ = "29.2025.2000"

{lsst_resources-29.2025.1900.dist-info → lsst_resources-29.2025.2000.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lsst-resources
-Version: 29.2025.1900
+Version: 29.2025.2000
 Summary: An abstraction layer for reading and writing from URI file resources.
 Author-email: Rubin Observatory Data Management <dm-admin@lists.lsst.org>
 License: BSD 3-Clause License

{lsst_resources-29.2025.1900.dist-info → lsst_resources-29.2025.2000.dist-info}/RECORD

@@ -1,28 +1,31 @@
 lsst/__init__.py,sha256=9I6UQ9gj-ZcPlvsa0OPBo76UujxXVehVzw9yMAOQvyM,466
 lsst/resources/__init__.py,sha256=BDj6uokvd0ZQNGl-Xgz5gZd83Z0L2gFqGSk0KJpylP8,778
-lsst/resources/_resourcePath.py,sha256=AnyqWz6TVgDjuZO4DjFj6q4J0-zbIduCFuxwopSS6Nk,73905
+lsst/resources/_resourcePath.py,sha256=neuZ-QNGIqwBavEq4xEBUnQveHeqACIuhVi4COhJI0A,73902
+lsst/resources/dav.py,sha256=XQMAZgthvtJ4hUXZ0avBAHnAYjMYU3m2DPHDyQVT7a8,31547
+lsst/resources/davutils.py,sha256=xALuMRSvYroqn_Jz6bjnj43b4OgOgCJtNW49kyTtuiw,97983
 lsst/resources/file.py,sha256=-jPuoHvTEtx5tnDyNkfwhWAyX0cTwkuMd-JvJn9EGdE,23226
 lsst/resources/gs.py,sha256=Lpo5GAzH7R7HG8E5RMGOdP4j4hjWJn-k6M3OXj0nHQM,12783
-lsst/resources/http.py,sha256=9a_VadSabznPC0FTQtDtfV041zH25wZgXFtJ7HkvHp0,88275
+lsst/resources/http.py,sha256=Oa6YlTnHLd0ifkvBNhduI67oiRHE-iQupAL9TEbxyQo,87930
 lsst/resources/location.py,sha256=x3Tq0x5o1OXYmZDxYBenUG1N71wtDhnjVAr3s2ZEiu8,7937
 lsst/resources/mem.py,sha256=VOWh7XxJPfqKcFdLZSjKEAfORQ2AHZHpxmjT8LniV60,1008
 lsst/resources/packageresource.py,sha256=vnfeRlpVwpC5cDQZE6Lnh8EH6oZy1sH2vLz9ONYjJ4k,6817
 lsst/resources/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lsst/resources/s3.py,sha256=KH9oPThUMG6bvkE_gEgJU3KXY8RgIVbKsLu0orgv1Mo,26634
+lsst/resources/s3.py,sha256=n9m4BHEVJgj2_4yAMydwX-w5hmnOPZTihWEItHi0kQI,26923
 lsst/resources/s3utils.py,sha256=ojWf9BPrK9mhGQ8jvs4_8Nsqf9360e79U5FnPTxe24A,14576
 lsst/resources/schemeless.py,sha256=GfJcKzZ0XIeepfQdW4HPZWiZlSp_ej0SEtSiJTrDUQs,10666
 lsst/resources/tests.py,sha256=SqYLbDG6QkZTB-0UvrsiPtfmdL1TcglGeqBTPQxu9GE,44027
 lsst/resources/utils.py,sha256=6O3Mq7JbPEtqyD2lM77pRpwcPMfV5SxiNMknw-F2vNs,8097
-lsst/resources/version.py,sha256=duakYcQBT5t4KBaOX14WCtq_sSvpoXvNcxi3sUb8GvI,55
+lsst/resources/version.py,sha256=bT9RvvieKvOl5VImh838xbe0jWwzezTNwq19FWhF5NU,55
 lsst/resources/_resourceHandles/__init__.py,sha256=zOcZ8gVEBdAWcHJaZabA8Vdq-wAVcxjbmA_1b1IWM6M,76
 lsst/resources/_resourceHandles/_baseResourceHandle.py,sha256=lQwxDOmFUNJndTxsjpz-HxrQBL0L-z4aXQocHdOEI7c,4676
+lsst/resources/_resourceHandles/_davResourceHandle.py,sha256=12X5-K5KqzG4EV78ZkIIrjcZcFroXy3Y2JQ_N-SDqF0,6616
 lsst/resources/_resourceHandles/_fileResourceHandle.py,sha256=A7_WQPzD0ZlOzNmaI_TPdZybrNxrXPkNHWVla3UFxfs,3676
 lsst/resources/_resourceHandles/_httpResourceHandle.py,sha256=Yami8IVGeru4bLQCag-OvGG0ltz1qyEg57FY4IEB87Y,10995
 lsst/resources/_resourceHandles/_s3ResourceHandle.py,sha256=NkDmPb9bm_zMvr6mMnb-tBmqJDt0yUJrt2gZXR8l7ok,12923
-lsst_resources-29.2025.1900.dist-info/licenses/COPYRIGHT,sha256=yazVsoMmFwhiw5itGrdT4YPmXbpsQyUFjlpOyZIa77M,148
-lsst_resources-29.2025.1900.dist-info/licenses/LICENSE,sha256=7wrtgl8meQ0_RIuv2TjIKpAnNrl-ODH-QLwyHe9citI,1516
-lsst_resources-29.2025.1900.dist-info/METADATA,sha256=AsHgImBvDFy_E373VzU-E3sARIx2y1E7-gfLP-991is,2237
-lsst_resources-29.2025.1900.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-lsst_resources-29.2025.1900.dist-info/top_level.txt,sha256=eUWiOuVVm9wwTrnAgiJT6tp6HQHXxIhj2QSZ7NYZH80,5
-lsst_resources-29.2025.1900.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-lsst_resources-29.2025.1900.dist-info/RECORD,,
+lsst_resources-29.2025.2000.dist-info/licenses/COPYRIGHT,sha256=yazVsoMmFwhiw5itGrdT4YPmXbpsQyUFjlpOyZIa77M,148
+lsst_resources-29.2025.2000.dist-info/licenses/LICENSE,sha256=7wrtgl8meQ0_RIuv2TjIKpAnNrl-ODH-QLwyHe9citI,1516
+lsst_resources-29.2025.2000.dist-info/METADATA,sha256=47lnuHxjeCYuBH9Kj_2545yFIgE5DkwUy6AWnUox_ws,2237
+lsst_resources-29.2025.2000.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+lsst_resources-29.2025.2000.dist-info/top_level.txt,sha256=eUWiOuVVm9wwTrnAgiJT6tp6HQHXxIhj2QSZ7NYZH80,5
+lsst_resources-29.2025.2000.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+lsst_resources-29.2025.2000.dist-info/RECORD,,

{lsst_resources-29.2025.1900.dist-info → lsst_resources-29.2025.2000.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.3.1)
+Generator: setuptools (80.7.1)
 Root-Is-Purelib: true
 Tag: py3-none-any