thds.core 1.40.20250701190355__py3-none-any.whl → 1.41.20250702194312__py3-none-any.whl

thds/core/link.py

@@ -48,6 +48,7 @@ def link(
     src = Path(src).resolve()
     if src == Path(dest).resolve():
         return "same"
+
     assert os.path.exists(src), f"Source {src} does not exist"
 
     dest_parent = _dest_parent(dest)
@@ -63,24 +64,27 @@ def link(
             try:
                 subprocess.check_output(["cp", "-c", str(src), str(tmp_link_dest)])
                 os.rename(tmp_link_dest, dest)
-                logger.debug(f"Created a copy-on-write reflink from {src} to {dest}")
+                logger.debug("Created a copy-on-write reflink from %s to %s", src, dest)
                 return "ref"
+
             except subprocess.CalledProcessError:
                 pass
         if "hard" in attempt_types:
             try:
                 os.link(src, tmp_link_dest)
                 os.rename(tmp_link_dest, dest)
-                logger.debug(f"Created a hardlink from {src} to {dest}")
+                logger.debug("Created a hardlink from %s to %s", src, dest)
                 return "hard"
+
             except OSError as oserr:
                 logger.warning(f"Unable to hard-link {src} to {dest} ({oserr})")
         if "soft" in attempt_types:
             try:
                 os.symlink(src, tmp_link_dest)
                 os.rename(tmp_link_dest, dest)
-                logger.debug(f"Created a softlink from {src} to {dest}")
+                logger.debug("Created a softlink from %s to %s", src, dest)
                 return "soft"
+
             except OSError as oserr:
                 logger.warning(f"Unable to soft-link {src} to {dest}" f" ({oserr})")
 
@@ -112,7 +116,9 @@ def link_or_copy(src: ct.StrOrPath, dest: ct.StrOrPath, *link_types: LinkType) -
         link_success_type = link(src, dest, *link_types)
         if link_success_type:
             return link_success_type
-        logger.info(f"Unable to link {src} to {dest}; falling back to copy.")
+
+        log_at_lvl = logger.debug if link_types == ("ref",) and not _IS_MAC else logger.info
+        log_at_lvl("Unable to link %s to %s using %s; falling back to copy.", src, dest, link_types)
 
     logger.debug("Copying %s to %s", src, dest)
     with tmp.temppath_same_fs(dest) as tmpfile:

thds/core/tmp.py

@@ -4,12 +4,13 @@ Module is given this name partly because we tend not to name other things intern
 the word 'tmp', preferring instead 'temp'. Therefore `tmp` will be a little less ambiguous
 overall.
 """
+
 import contextlib
 import shutil
 import tempfile
 import typing as ty
 from pathlib import Path
-from random import SystemRandom
+from uuid import uuid4
 
 from .home import HOMEDIR
 from .types import StrOrPath
@@ -45,10 +46,7 @@ def temppath_same_fs(lcl_path: StrOrPath = "") -> ty.Iterator[Path]:
         # we would prefer _not_ to reinvent the wheel here, but if the tempfiles are
         # getting created on a different volume, then moves are no longer atomic, and
         # that's a huge pain for lots of reasons.
-        fname_parts = [
-            ".thds-core-tmp-home-fs",
-            str(SystemRandom().random())[2:],  # makes a float look like a numeric string
-        ]
+        fname_parts = [".core-tmp-home-fs", str(uuid4())]
         if basename:
             fname_parts.append(basename)
         dpath = parent_dir / "-".join(fname_parts)
@@ -64,8 +62,10 @@ def temppath_same_fs(lcl_path: StrOrPath = "") -> ty.Iterator[Path]:
     with tempfile.TemporaryDirectory() as tdir:
         # actually check whether we're on the same filesystem.
         if _are_same_fs(parent_dir, Path(tdir)):
-            yield Path(tdir) / "-".join(filter(None, ["thds-core-tmp-def-fs", basename]))
+            # the standard path has us just using a normal temporary directory that we don't create ourselves.
+            yield Path(tdir) / "-".join(filter(None, ["core-tmp", basename]))
         else:
+            # but if we need to do something special... here we are.
             yield from _tempdir_same_filesystem()
 
 

{thds_core-1.40.20250701190355.dist-info → thds_core-1.41.20250702194312.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: thds.core
-Version: 1.40.20250701190355
+Version: 1.41.20250702194312
 Summary: Core utilities.
 Author-email: Trilliant Health <info@trillianthealth.com>
 License: MIT

{thds_core-1.40.20250701190355.dist-info → thds_core-1.41.20250702194312.dist-info}/RECORD

@@ -23,7 +23,7 @@ thds/core/imports.py,sha256=0LVegY8I8_XKZPcqiIp2OVVzEDtyqYA3JETf9OAKNKs,568
 thds/core/inspect.py,sha256=3IY9CSa7zAcAVyBDOYfMtJ2QU5cRc98JaN91XAbaSok,2368
 thds/core/iterators.py,sha256=d3iTQDR0gCW1nMRmknQeodR_4THzR9Ajmp8F8KCCFgg,208
 thds/core/lazy.py,sha256=e1WvG4LsbEydV0igEr_Vl1cq05zlQNIE8MFYT90yglE,3289
-thds/core/link.py,sha256=kmFJIFvEZc16-7S7IGvtTpzwl3VuvFl3yPlE6WJJ03w,5404
+thds/core/link.py,sha256=4-9d22l_oSkKoSzlYEO-rwxO1hvvj6VETY7LwvGcX6M,5534
 thds/core/logical_root.py,sha256=gWkIYRv9kNQfzbpxJaYiwNXVz1neZ2NvnvProtOn9d8,1399
 thds/core/merge_args.py,sha256=7oj7dtO1-XVkfTM3aBlq3QlZbo8tb6X7E3EVIR-60t8,5781
 thds/core/meta.py,sha256=3oX7wTO_SmrVKABFPLHHIVyNBXEil1MdGfc5s88_Isk,12134
@@ -39,7 +39,7 @@ thds/core/source_serde.py,sha256=X4c7LiT3VidejqtTel9YB6dWGB3x-ct39KF9E50Nbx4,139
 thds/core/stack_context.py,sha256=17lPOuYWclUpZ-VXRkPgI4WbiMzq7_ZY6Kj1QK_1oNo,1332
 thds/core/thunks.py,sha256=p1OvMBJ4VGMsD8BVA7zwPeAp0L3y_nxVozBF2E78t3M,1053
 thds/core/timer.py,sha256=aOpNP-wHKaKs6ONK5fOtIOgx00FChVZquG4PeaEYH_k,5376
-thds/core/tmp.py,sha256=KgBAwQCmpm7I762eLRu-3MSfH3dKnqlrJkZ5nmPcRbc,3110
+thds/core/tmp.py,sha256=jA8FwDbXo3hx8o4kRjAlkwpcI77X86GY4Sktkps29ho,3166
 thds/core/types.py,sha256=sFqI_8BsB1u85PSizjBZw8PBtplC7U54E19wZZWCEvI,152
 thds/core/log/__init__.py,sha256=bDbZvlxyymY6VrQzD8lCn0egniLEiA9hpNMAXZ7e7wY,1348
 thds/core/log/basic_config.py,sha256=2Y9U_c4PTrIsCmaN7Ps6Xr90AhJPzdYjeUzUMqO7oFU,6704
@@ -69,8 +69,8 @@ thds/core/sqlite/structured.py,sha256=SvZ67KcVcVdmpR52JSd52vMTW2ALUXmlHEeD-VrzWV
 thds/core/sqlite/types.py,sha256=oUkfoKRYNGDPZRk29s09rc9ha3SCk2SKr_K6WKebBFs,1308
 thds/core/sqlite/upsert.py,sha256=BmKK6fsGVedt43iY-Lp7dnAu8aJ1e9CYlPVEQR2pMj4,5827
 thds/core/sqlite/write.py,sha256=z0219vDkQDCnsV0WLvsj94keItr7H4j7Y_evbcoBrWU,3458
-thds_core-1.40.20250701190355.dist-info/METADATA,sha256=0dIbr5SQsLbx0vRbK1R78no19nLyuBIa0dOCzoUA4RY,2216
-thds_core-1.40.20250701190355.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-thds_core-1.40.20250701190355.dist-info/entry_points.txt,sha256=bOCOVhKZv7azF3FvaWX6uxE6yrjK6FcjqhtxXvLiFY8,161
-thds_core-1.40.20250701190355.dist-info/top_level.txt,sha256=LTZaE5SkWJwv9bwOlMbIhiS-JWQEEIcjVYnJrt-CriY,5
-thds_core-1.40.20250701190355.dist-info/RECORD,,
+thds_core-1.41.20250702194312.dist-info/METADATA,sha256=8IWkjAfNxxRdJ0UlQirpotjr7BxPU_MY7ArfrpJ3Jt8,2216
+thds_core-1.41.20250702194312.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+thds_core-1.41.20250702194312.dist-info/entry_points.txt,sha256=bOCOVhKZv7azF3FvaWX6uxE6yrjK6FcjqhtxXvLiFY8,161
+thds_core-1.41.20250702194312.dist-info/top_level.txt,sha256=LTZaE5SkWJwv9bwOlMbIhiS-JWQEEIcjVYnJrt-CriY,5
+thds_core-1.41.20250702194312.dist-info/RECORD,,