lsst-resources 29.2025.1300__py3-none-any.whl → 29.2025.1500__py3-none-any.whl

lsst/resources/_resourceHandles/_httpResourceHandle.py

@@ -29,6 +29,15 @@ if TYPE_CHECKING:
     from ..http import HttpResourcePath
 
 
+# Prevent circular import by copying this code. Can be removed as soon
+# as separate dav implementation is implemented.
+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 HttpReadResourceHandle(BaseResourceHandle[bytes]):
     """HTTP-based specialization of `.BaseResourceHandle`.
 
@@ -159,7 +168,7 @@ class HttpReadResourceHandle(BaseResourceHandle[bytes]):
             # return the result
             self._completeBuffer = io.BytesIO()
             with time_this(self._log, msg="Read from remote resource %s", args=(self._url,)):
-                resp = self._session.get(self._url, stream=False, timeout=self._timeout)
+                resp = self._session.get(_dav_to_http(self._url), stream=False, timeout=self._timeout)
             if (code := resp.status_code) not in (requests.codes.ok, requests.codes.partial):
                 raise FileNotFoundError(f"Unable to read resource {self._url}; status code: {code}")
             self._completeBuffer.write(resp.content)
@@ -181,7 +190,9 @@ class HttpReadResourceHandle(BaseResourceHandle[bytes]):
         with time_this(
             self._log, msg="Read from remote resource %s using headers %s", args=(self._url, headers)
         ):
-            resp = self._session.get(self._url, stream=False, timeout=self._timeout, headers=headers)
+            resp = self._session.get(
+                _dav_to_http(self._url), stream=False, timeout=self._timeout, headers=headers
+            )
 
         if resp.status_code == requests.codes.range_not_satisfiable:
             # Must have run off the end of the file. A standard file handle

lsst/resources/_resourcePath.py

@@ -23,8 +23,6 @@ import multiprocessing
 import os
 import posixpath
 import re
-import shutil
-import tempfile
 import urllib.parse
 from functools import cache
 from pathlib import Path, PurePath, PurePosixPath
@@ -41,7 +39,7 @@ from collections.abc import Iterable, Iterator
 from typing import TYPE_CHECKING, Any, Literal, NamedTuple, overload
 
 from ._resourceHandles._baseResourceHandle import ResourceHandleProtocol
-from .utils import ensure_directory_is_writeable
+from .utils import get_tempdir
 
 if TYPE_CHECKING:
     from .utils import TransactionProtocol
@@ -336,6 +334,10 @@ class ResourcePath:  # numpydoc ignore=PR02
             elif parsed.scheme.startswith("http"):
                 from .http import HttpResourcePath
 
+                subclass = HttpResourcePath
+            elif parsed.scheme in {"dav", "davs"}:
+                from .http import HttpResourcePath
+
                 subclass = HttpResourcePath
             elif parsed.scheme == "gs":
                 from .gs import GSResourcePath
@@ -1136,35 +1138,23 @@ class ResourcePath:  # numpydoc ignore=PR02
         prefix : `ResourcePath`, optional
             Temporary directory to use (can be any scheme). Without this the
             path will be formed as a local file URI in a temporary directory
-            created by `tempfile.mkdtemp`. Ensuring that the prefix
-            location exists is the responsibility of the caller.
+            obtained from `lsst.resources.utils.get_tempdir`. Ensuring that the
+            prefix location exists is the responsibility of the caller.
         suffix : `str`, optional
             A file suffix to be used. The ``.`` should be included in this
             suffix.
         delete : `bool`, optional
             By default the resource will be deleted when the context manager
             is exited. Setting this flag to `False` will leave the resource
-            alone. `False` will also retain any directories that may have
-            been created.
+            alone.
 
         Yields
         ------
         uri : `ResourcePath`
             The temporary URI. Will be removed when the context is completed.
         """
-        use_tempdir = False
         if prefix is None:
-            directory = tempfile.mkdtemp()
-            # If the user has set a umask that restricts the owner-write bit,
-            # the directory returned from mkdtemp may not initially be
-            # writeable by us
-            ensure_directory_is_writeable(directory)
-
-            prefix = ResourcePath(directory, forceDirectory=True, isTemporary=True)
-            # Record that we need to delete this directory. Can not rely
-            # on isTemporary flag since an external prefix may have that
-            # set as well.
-            use_tempdir = True
+            prefix = ResourcePath(get_tempdir(), forceDirectory=True)
 
         # Need to create a randomized file name. For consistency do not
         # use mkstemp for local and something else for remote. Additionally
@@ -1183,13 +1173,10 @@ class ResourcePath:  # numpydoc ignore=PR02
             yield temporary_uri
         finally:
             if delete:
-                if use_tempdir:
-                    shutil.rmtree(prefix.ospath, ignore_errors=True)
-                else:
-                    with contextlib.suppress(FileNotFoundError):
-                        # It's okay if this does not work because the user
-                        # removed the file.
-                        temporary_uri.remove()
+                with contextlib.suppress(FileNotFoundError):
+                    # It's okay if this does not work because the user
+                    # removed the file.
+                    temporary_uri.remove()
 
     def read(self, size: int = -1) -> bytes:
         """Open the resource and return the contents in bytes.

lsst/resources/http.py

@@ -26,7 +26,6 @@ import random
 import re
 import ssl
 import stat
-import tempfile
 from collections.abc import Iterator
 from typing import TYPE_CHECKING, Any, BinaryIO, cast
 
@@ -60,6 +59,7 @@ from lsst.utils.timer import time_this
 from ._resourceHandles import ResourceHandleProtocol
 from ._resourceHandles._httpResourceHandle import HttpReadResourceHandle, parse_content_range_header
 from ._resourcePath import ResourcePath
+from .utils import get_tempdir
 
 if TYPE_CHECKING:
     from .utils import TransactionProtocol
@@ -112,6 +112,13 @@ 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.
@@ -377,18 +384,7 @@ class HttpResourcePathConfig:
         if self._tmpdir_buffersize is not None:
             return self._tmpdir_buffersize
 
-        # Use the value of environment variables 'LSST_RESOURCES_TMPDIR' or
-        # 'TMPDIR', if defined. Otherwise use the system temporary directory,
-        # with a last-resort fallback to the current working directory if
-        # nothing else is available.
-        tmpdir = None
-        for dir in (os.getenv(v) for v in ("LSST_RESOURCES_TMPDIR", "TMPDIR")):
-            if dir and os.path.isdir(dir):
-                tmpdir = dir
-                break
-
-        if tmpdir is None:
-            tmpdir = tempfile.gettempdir()
+        tmpdir = get_tempdir()
 
         # Compute the block size as 256 blocks of typical size
         # (i.e. 4096 bytes) or 10 times the file system block size,
@@ -441,7 +437,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(
-                str(path),
+                _dav_to_http(str(path)),
                 stream=False,
                 timeout=config.timeout,
             )
@@ -601,7 +597,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 = str(rpath.root_uri())
+        root_uri = _dav_to_http(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
@@ -661,8 +657,9 @@ 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"{rpath.scheme}://",
+            f"{scheme}://",
             HTTPAdapter(
                 pool_connections=self._num_pools,
                 pool_maxsize=0,
@@ -1130,7 +1127,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(self.geturl(), stream=stream, timeout=self._config.timeout)
+                resp = session.get(_dav_to_http(self.geturl()), stream=stream, timeout=self._config.timeout)
 
             if resp.status_code != requests.codes.ok:  # 200
                 raise FileNotFoundError(
@@ -1351,6 +1348,9 @@ class HttpResourcePath(ResourcePath):
             or not self.is_webdav_endpoint
             or self.server not in HttpResourcePath.SUPPORTED_URL_SIGNERS
         ):
+            if self.scheme.startswith("dav") and fsspec:
+                # Not webdav so convert to http.
+                return fsspec.url_to_fs(_dav_to_http(self.geturl()))
             return super().to_fsspec()
 
         if self.isdir():
@@ -1520,7 +1520,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(self.geturl(), stream=True, timeout=self._config.timeout)
+            resp = session.get(_dav_to_http(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 +1633,7 @@ class HttpResourcePath(ResourcePath):
             for _ in range(max_redirects := 5):
                 resp = session.request(
                     method,
-                    url,
+                    _dav_to_http(url),
                     data=body,
                     headers=headers,
                     stream=False,
@@ -1791,7 +1791,7 @@ class HttpResourcePath(ResourcePath):
         src : `HttpResourcePath`
             The source of the contents to move to `self`.
         """
-        headers = {"Destination": self.geturl()}
+        headers = {"Destination": _dav_to_http(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 +1898,7 @@ class HttpResourcePath(ResourcePath):
         if self._config.send_expect_on_put or self.server == "dcache":
             headers["Expect"] = "100-continue"
 
-        url = self.geturl()
+        url = _dav_to_http(self.geturl())
 
         # Use the session as a context manager to ensure the underlying
         # connections are closed after finishing uploading the data.

lsst/resources/utils.py

@@ -11,7 +11,7 @@
 
 from __future__ import annotations
 
-__all__ = ("NoTransaction", "TransactionProtocol", "os2posix", "posix2os")
+__all__ = ("NoTransaction", "TransactionProtocol", "get_tempdir", "os2posix", "posix2os")
 
 import contextlib
 import logging
@@ -21,6 +21,7 @@ import shutil
 import stat
 import tempfile
 from collections.abc import Callable, Iterator
+from functools import cache
 from pathlib import Path, PurePath, PurePosixPath
 from typing import Any, Protocol
 
@@ -93,6 +94,35 @@ def posix2os(posix: PurePath | str) -> str:
     return os.path.join(*paths)
 
 
+@cache
+def get_tempdir() -> str:
+    """Get POSIX path to temporary directory.
+
+    Returns
+    -------
+    tmpdir : `str`
+        Path to the default temporary directory location.
+
+    Notes
+    -----
+    Uses the value of environment variables ``LSST_RESOURCES_TMPDIR`` or
+    ``TMPDIR``, if defined. Otherwise use the system temporary directory,
+    with a last-resort fallback to the current working directory if
+    nothing else is available.
+    """
+    tmpdir = None
+    # $TMPDIR is also checked with getttempdir() below.
+    for dir in (os.getenv(v) for v in ("LSST_RESOURCES_TMPDIR", "TMPDIR")):
+        if dir and os.path.isdir(dir):
+            tmpdir = dir
+            break
+
+    if tmpdir is None:
+        tmpdir = tempfile.gettempdir()
+
+    return tmpdir
+
+
 class NoTransaction:
     """A simple emulation of the
     `~lsst.daf.butler.core.datastore.DatastoreTransaction` class.

lsst/resources/version.py

@@ -1,2 +1,2 @@
 __all__ = ["__version__"]
-__version__ = "29.2025.1300"
+__version__ = "29.2025.1500"

{lsst_resources-29.2025.1300.dist-info → lsst_resources-29.2025.1500.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lsst-resources
-Version: 29.2025.1300
+Version: 29.2025.1500
 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.1300.dist-info → lsst_resources-29.2025.1500.dist-info}/RECORD

@@ -1,9 +1,9 @@
 lsst/__init__.py,sha256=9I6UQ9gj-ZcPlvsa0OPBo76UujxXVehVzw9yMAOQvyM,466
 lsst/resources/__init__.py,sha256=BDj6uokvd0ZQNGl-Xgz5gZd83Z0L2gFqGSk0KJpylP8,778
-lsst/resources/_resourcePath.py,sha256=cx7Cxcgt9fK5mvo1IX2KSSaiSP5ifzocxgknCnlKggI,65550
+lsst/resources/_resourcePath.py,sha256=xTVyDHD-UHlF5FeDvSXXnsmOuoSFnORZD_wMksxiFfA,64926
 lsst/resources/file.py,sha256=-jPuoHvTEtx5tnDyNkfwhWAyX0cTwkuMd-JvJn9EGdE,23226
 lsst/resources/gs.py,sha256=Lpo5GAzH7R7HG8E5RMGOdP4j4hjWJn-k6M3OXj0nHQM,12783
-lsst/resources/http.py,sha256=U4gv-IZsqNJ7NmAhVlOIY84slqpuHnl1bWgP6h6MssU,88221
+lsst/resources/http.py,sha256=JW3cBe4MERyjopFKkELui1BRr4b4Mkgp0Iqt9YFIxuc,88227
 lsst/resources/location.py,sha256=x3Tq0x5o1OXYmZDxYBenUG1N71wtDhnjVAr3s2ZEiu8,7937
 lsst/resources/mem.py,sha256=VOWh7XxJPfqKcFdLZSjKEAfORQ2AHZHpxmjT8LniV60,1008
 lsst/resources/packageresource.py,sha256=vnfeRlpVwpC5cDQZE6Lnh8EH6oZy1sH2vLz9ONYjJ4k,6817
@@ -12,17 +12,17 @@ lsst/resources/s3.py,sha256=wrOMdFWltxpGEWeL--kPCbk5Le_viCIsEn4lOPZbXhM,24124
 lsst/resources/s3utils.py,sha256=cKJ9GWHETHhn1djezyikWwAaw4k1B3hFvfif96THHDQ,14355
 lsst/resources/schemeless.py,sha256=GfJcKzZ0XIeepfQdW4HPZWiZlSp_ej0SEtSiJTrDUQs,10666
 lsst/resources/tests.py,sha256=MLB8hERKuNredzzg3Qq9M_U7IesV3xrbcjFwKuMp3Ok,43513
-lsst/resources/utils.py,sha256=D2J0d0n5-jotQ3AWFotXTi2PFN0S9C6HK41G1uO-Y3Q,5891
-lsst/resources/version.py,sha256=tryL-NT2fHNIinBXQOOXxLFsVaDOMR53wZgDt_5tYb0,55
+lsst/resources/utils.py,sha256=IHVrOdj0szNWxiXk-jbZu1RhTR8WXks1vI9JCpBxeBA,6706
+lsst/resources/version.py,sha256=altncYankWkwG1F2OVHhPl0np72lUhdVRAOSqBtd-kc,55
 lsst/resources/_resourceHandles/__init__.py,sha256=zOcZ8gVEBdAWcHJaZabA8Vdq-wAVcxjbmA_1b1IWM6M,76
 lsst/resources/_resourceHandles/_baseResourceHandle.py,sha256=lQwxDOmFUNJndTxsjpz-HxrQBL0L-z4aXQocHdOEI7c,4676
 lsst/resources/_resourceHandles/_fileResourceHandle.py,sha256=A7_WQPzD0ZlOzNmaI_TPdZybrNxrXPkNHWVla3UFxfs,3676
-lsst/resources/_resourceHandles/_httpResourceHandle.py,sha256=w14dnwez4E1Kjo2Yxr0DsUUAja9cyBfkHzqI4WdKW3o,10541
+lsst/resources/_resourceHandles/_httpResourceHandle.py,sha256=JRjpE-ZQfgKX5OyVLulIbzW38FdhovcoOd1D4rhb5vk,10900
 lsst/resources/_resourceHandles/_s3ResourceHandle.py,sha256=NkDmPb9bm_zMvr6mMnb-tBmqJDt0yUJrt2gZXR8l7ok,12923
-lsst_resources-29.2025.1300.dist-info/licenses/COPYRIGHT,sha256=yazVsoMmFwhiw5itGrdT4YPmXbpsQyUFjlpOyZIa77M,148
-lsst_resources-29.2025.1300.dist-info/licenses/LICENSE,sha256=7wrtgl8meQ0_RIuv2TjIKpAnNrl-ODH-QLwyHe9citI,1516
-lsst_resources-29.2025.1300.dist-info/METADATA,sha256=AMSEcW0mFiy-IXMseM2_Cpp9xgThvJnDtLbbG32WNjg,2237
-lsst_resources-29.2025.1300.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-lsst_resources-29.2025.1300.dist-info/top_level.txt,sha256=eUWiOuVVm9wwTrnAgiJT6tp6HQHXxIhj2QSZ7NYZH80,5
-lsst_resources-29.2025.1300.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-lsst_resources-29.2025.1300.dist-info/RECORD,,
+lsst_resources-29.2025.1500.dist-info/licenses/COPYRIGHT,sha256=yazVsoMmFwhiw5itGrdT4YPmXbpsQyUFjlpOyZIa77M,148
+lsst_resources-29.2025.1500.dist-info/licenses/LICENSE,sha256=7wrtgl8meQ0_RIuv2TjIKpAnNrl-ODH-QLwyHe9citI,1516
+lsst_resources-29.2025.1500.dist-info/METADATA,sha256=8tmxas_i8S1F0lwXkFr7MwlERU1h1TArUW-xUqp4FwE,2237
+lsst_resources-29.2025.1500.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+lsst_resources-29.2025.1500.dist-info/top_level.txt,sha256=eUWiOuVVm9wwTrnAgiJT6tp6HQHXxIhj2QSZ7NYZH80,5
+lsst_resources-29.2025.1500.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+lsst_resources-29.2025.1500.dist-info/RECORD,,