thds.core 1.34.20250415190329__py3-none-any.whl → 1.35.20250416225746__py3-none-any.whl

thds/core/source/__init__.py

@@ -5,5 +5,6 @@ yet will not be downloaded (if non-local) until it is actually opened or unwrapp
 
 from . import serde, tree  # noqa: F401
 from ._construct import from_file, from_uri, path_from_uri, register_from_uri_handler  # noqa: F401
+from ._construct_tree import tree_from_directory  # noqa: F401
 from ._download import Downloader, register_download_handler  # noqa: F401
 from .src import Source  # noqa: F401

thds/core/source/_construct_tree.py

@@ -0,0 +1,18 @@
+import os
+import typing as ty
+from pathlib import Path
+
+from ..files import path_from_uri
+from ._construct import from_file
+from .tree import SourceTree
+
+
+def tree_from_directory(dirpath: ty.Union[str, os.PathLike]) -> SourceTree:
+    path = path_from_uri(dirpath) if isinstance(dirpath, str) else Path(dirpath)
+
+    if path.exists() and not path.is_dir():
+        raise NotADirectoryError(f"File '{path}' is not a directory")
+    if not path.exists():
+        raise FileNotFoundError(f"Directory '{path}' not found")
+
+    return SourceTree(sources=[from_file(file) for file in path.glob("**/*") if file.is_file()])

thds/core/source/tree.py

@@ -93,8 +93,15 @@ class SourceTree(os.PathLike):
                     )
                 )
             ]
-            local_logical_root = Path(logical_root.find(map(str, local_paths), self.higher_logical_root))
-            assert local_logical_root.is_dir()
+
+            if len(local_paths) == 1:
+                local_logical_root = local_paths[0].parent.resolve()
+            else:
+                local_logical_root = Path(
+                    logical_root.find(map(str, local_paths), self.higher_logical_root)
+                )
+                assert local_logical_root.is_dir()
+
             if not dest_dir:
                 return local_logical_root
 

thds/core/timer.py

@@ -141,11 +141,7 @@ class Timer:
 
     @property
     def secs_per_call(self) -> float:
-        return (self.secs / self.calls) / 60.0 if self.calls > 0 else float("nan")
-
-    @property
-    def mins(self) -> float:
-        return self.secs / 60.0
+        return (self.secs / self.calls) if self.calls > 0 else float("nan")
 
     def pct_of_total(self, total: float) -> float:
         return (self.secs / total) * 100
@@ -200,6 +196,7 @@ class TimeTracker:
 
     def __exit__(self, *args, **kwargs):
         cmpnt = self.tracked_times[self._names.pop()]
+        cmpnt.calls += 1
         cmpnt.secs += time.perf_counter() - self._start_times.pop()
 
     @property

{thds_core-1.34.20250415190329.dist-info → thds_core-1.35.20250416225746.dist-info}/METADATA

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

{thds_core-1.34.20250415190329.dist-info → thds_core-1.35.20250416225746.dist-info}/RECORD

@@ -37,7 +37,7 @@ thds/core/scope.py,sha256=iPRhS-lIe-axDctqxBtEPeF0PM_w-0tRS-9kPweUGBY,7205
 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=1FfcQ4-Gp6WQFXR0GKeT_8jwtamEfnTukdSbDKTAJVM,5432
+thds/core/timer.py,sha256=Ckj2eQzc3Y4yi4FZq1vnZ4WQVgwtrBPiLqi1kxjk_zM,5374
 thds/core/tmp.py,sha256=KgBAwQCmpm7I762eLRu-3MSfH3dKnqlrJkZ5nmPcRbc,3110
 thds/core/types.py,sha256=sFqI_8BsB1u85PSizjBZw8PBtplC7U54E19wZZWCEvI,152
 thds/core/log/__init__.py,sha256=bDbZvlxyymY6VrQzD8lCn0egniLEiA9hpNMAXZ7e7wY,1348
@@ -46,12 +46,13 @@ thds/core/log/json_formatter.py,sha256=C5bRsSbAqaQqfTm88jc3mYe3vwKZZLAxET8s7_u7a
 thds/core/log/kw_formatter.py,sha256=9-MVOd2r5NEkYNne9qWyFMeR5lac3w7mjHXsDa681i0,3379
 thds/core/log/kw_logger.py,sha256=CyZVPnkUMtrUL2Lyk261AIEPmoP-buf_suFAhQlU1io,4063
 thds/core/log/logfmt.py,sha256=i66zoG2oERnE1P_0TVXdlfJ1YgUmvtMjqRtdV5u2SvU,10366
-thds/core/source/__init__.py,sha256=RiaUHNunoaw4XJUrwR5vJzSS6HGxOUKUONR_ipX5654,424
+thds/core/source/__init__.py,sha256=0Zy3mwJgwLtc4jq14Cwu6d_Rq-aZOMIlu4zaADeKgmo,487
 thds/core/source/_construct.py,sha256=plSyQZRe8h0X7PpbfMjhm1qkFgrcyuSrReyWQo28YfA,3121
+thds/core/source/_construct_tree.py,sha256=5Zk3a5a0uVxklWw6q4JOvI_bErqwlBngUz4TyEAWn1g,616
 thds/core/source/_download.py,sha256=pUhkphHdB7y4ZpxZZ6ITIS5giXMHuRf420yYAJwx6aE,2924
 thds/core/source/serde.py,sha256=wXCfuv_Dv3QvJJr-uebGmTrfhCU_1a8VX3VJnXhVHfU,3539
 thds/core/source/src.py,sha256=9A_8kSBUc5k6OLAYe5EW_VogpXFIqofow7Rxl8xv-eg,4559
-thds/core/source/tree.py,sha256=vjAqnQXGE0XiI0WvlLyXGqEAZbyjq6XmdUeWAR0HI4M,4144
+thds/core/source/tree.py,sha256=iNCoCE655MwXQwc2Y0IIm1HMVk5Inj0NGVU9U8Wl_90,4317
 thds/core/sqlite/__init__.py,sha256=tDMzuO76qTtckJHldPQ6nPZ6kcvhhoJrVuuW42JtaSQ,606
 thds/core/sqlite/connect.py,sha256=l4QaSAI8RjP7Qh2FjmJ3EwRgfGf65Z3-LjtC9ocHM_U,977
 thds/core/sqlite/copy.py,sha256=y3IRQTBrWDfKuVIfW7fYuEgwRCRKHjN0rxVFkIb9VrQ,1155
@@ -67,8 +68,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.34.20250415190329.dist-info/METADATA,sha256=ATjxGZMWVMD5MREh7zsQytsJwNCsc0RiQSoJ8o4HJJg,2275
-thds_core-1.34.20250415190329.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-thds_core-1.34.20250415190329.dist-info/entry_points.txt,sha256=bOCOVhKZv7azF3FvaWX6uxE6yrjK6FcjqhtxXvLiFY8,161
-thds_core-1.34.20250415190329.dist-info/top_level.txt,sha256=LTZaE5SkWJwv9bwOlMbIhiS-JWQEEIcjVYnJrt-CriY,5
-thds_core-1.34.20250415190329.dist-info/RECORD,,
+thds_core-1.35.20250416225746.dist-info/METADATA,sha256=xVzJ2UiMPzXTwONBhzvYWubU1Z8cxPpp3PIJhpj_McY,2275
+thds_core-1.35.20250416225746.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+thds_core-1.35.20250416225746.dist-info/entry_points.txt,sha256=bOCOVhKZv7azF3FvaWX6uxE6yrjK6FcjqhtxXvLiFY8,161
+thds_core-1.35.20250416225746.dist-info/top_level.txt,sha256=LTZaE5SkWJwv9bwOlMbIhiS-JWQEEIcjVYnJrt-CriY,5
+thds_core-1.35.20250416225746.dist-info/RECORD,,