thds.core 1.32.20250219165944__py3-none-any.whl → 1.32.20250219172103__py3-none-any.whl

thds/core/config.py

@@ -94,6 +94,14 @@ def _type_parser(default: T) -> ty.Callable[[ty.Any], T]:
     return lambda x: x  # we can't infer a type parser, so we'll return the default no-op parser.
 
 
+class ConfigRegistry(ty.Dict[str, "ConfigItem"]):  # noqa: B903
+    def __init__(self, name: str):
+        self.name = name
+
+
+_DEFAULT_REGISTRY = ConfigRegistry("default")
+
+
 class ConfigItem(ty.Generic[T]):
     """Should only ever be constructed at a module level."""
 
@@ -106,12 +114,17 @@ class ConfigItem(ty.Generic[T]):
         *,
         parse: ty.Optional[ty.Callable[[ty.Any], T]] = None,
         secret: bool = False,
+        registry: ConfigRegistry = _DEFAULT_REGISTRY,
+        name_transform: ty.Callable[[str], str] = _fullname,
     ):
+        """parse should be an idempotent parser. In other words, parse(parse(x)) == parse(x)"""
         self.secret = secret
-        name = _fullname(name)
-        if name in _REGISTRY:
-            raise ConfigNameCollisionError(f"Config item {name} has already been registered!")
-        _REGISTRY[name] = self
+        name = name_transform(name)
+        if name in registry:
+            raise ConfigNameCollisionError(
+                f"Config item {name} has already been registered in {registry.name}!"
+            )
+        registry[name] = self
         self.name = name
         self.parse = parse or _type_parser(default)
         raw_resolved_global = _getenv(name, secret=secret)
@@ -156,6 +169,9 @@ class ConfigItem(ty.Generic[T]):
             raise UnconfiguredError(f"Config item '{self.name}' has not been configured!")
         return self.global_value
 
+    def __repr__(self) -> str:
+        return f"ConfigItem('{self.name}', {self()})"
+
 
 def tobool(s_or_b: ty.Union[str, bool]) -> bool:
     """A reasonable implementation that we could expand in the future."""
@@ -171,55 +187,70 @@ item = ConfigItem
 # a short alias
 
 
-_REGISTRY: ty.Dict[str, ConfigItem] = dict()
+def config_by_name(
+    name: str,
+    registry: ConfigRegistry = _DEFAULT_REGISTRY,
+) -> ConfigItem:
+    """This is a dynamic interface - in general, prefer accessing the ConfigItem object directly."""
+    return registry[_fullname(name)]
 
 
-def config_by_name(name: str) -> ConfigItem:
-    """This is a dynamic interface - in general, prefer accessing the ConfigItem object directly."""
-    return _REGISTRY[_fullname(name)]
+def flatten_config(config: ty.Mapping[str, ty.Any]) -> ty.Dict[str, ty.Any]:
+    """This is a helper function to flatten a nested configuration dictionary."""
+    flat = dict()
+    for key, value in config.items():
+        if isinstance(value, dict):
+            for subkey, subvalue in flatten_config(value).items():
+                flat[f"{key}.{subkey}"] = subvalue
+        else:
+            flat[key] = value
+    return flat
 
 
-def set_global_defaults(config: ty.Dict[str, ty.Any]):
+def set_global_defaults(
+    config: ty.Mapping[str, ty.Any],
+    registry: ConfigRegistry = _DEFAULT_REGISTRY,
+):
     """Any config-file parser can create a dictionary of only the
     items it managed to read, and then all of those can be set at once
     via this function.
     """
-    for name, value in config.items():
-        if not isinstance(value, dict):
+    flat_config = flatten_config(config)
+    for name, value in flat_config.items():
+        try:
+            config_item = registry[name]
+            config_item.set_global(config_item.parse(value))
+        except KeyError:
+            # try directly importing a module - this is only best-effort and will not work
+            # if you did not follow standard configuration naming conventions.
+            import importlib
+
+            maybe_module_name = ".".join(name.split(".")[:-1])
+
             try:
-                config_item = _REGISTRY[name]
-                config_item.set_global(config_item.parse(value))
-            except KeyError:
-                # try directly importing a module - this is only best-effort and will not work
-                # if you did not follow standard configuration naming conventions.
-                import importlib
-
-                maybe_module_name = ".".join(name.split(".")[:-1])
+                importlib.import_module(maybe_module_name)
                 try:
-                    importlib.import_module(maybe_module_name)
-                    try:
-                        config_item = _REGISTRY[name]
-                        config_item.set_global(config_item.parse(value))
-                    except KeyError as kerr:
-                        raise KeyError(
-                            f"Config item {name} is not registered"
-                            f" and no module with the name {maybe_module_name} was importable."
-                            " Please double-check your configuration."
-                        ) from kerr
-                except ModuleNotFoundError:
-                    # create a new, dynamic config item that will only be accessible via
-                    # its name.
-                    ConfigItem(name, value)  # return value not needed since it self-registers.
-                    getLogger(__name__).debug(
-                        "Created dynamic config item '%s' with value '%s'", name, value
-                    )
-
-        else:  # recurse
-            set_global_defaults({f"{name}.{key}": val for key, val in value.items()})
-
-
-def get_all_config() -> ty.Dict[str, ty.Any]:
-    return {k: v() if not v.secret else "***SECRET***" for k, v in _REGISTRY.items()}
+                    config_item = registry[name]
+                    config_item.set_global(config_item.parse(value))
+                except KeyError as kerr:
+                    raise KeyError(
+                        f"Config item {name} is not registered"
+                        f" and no module with the name {maybe_module_name} was importable."
+                        " Please double-check your configuration."
+                    ) from kerr
+            except ModuleNotFoundError:
+                # create a new, dynamic config item that will only be accessible via
+                # its name.
+                ConfigItem(
+                    name, value, registry=registry
+                )  # return value not needed since it self-registers.
+                getLogger(__name__).debug(
+                    "Created dynamic config item '%s' with value '%s'", name, value
+                )
+
+
+def get_all_config(registry: ty.Dict[str, ConfigItem] = _DEFAULT_REGISTRY) -> ty.Dict[str, ty.Any]:
+    return {k: v() if not v.secret else "***SECRET***" for k, v in registry.items()}
 
 
 def show_config_cli():

thds/core/files.py

@@ -36,7 +36,7 @@ def path_from_uri(uri: str) -> Path:
     str_path = remove_file_scheme(uri)
     if not str_path:
         raise ValueError('Cannot convert an empty string to a Path. Did you mean to use "."?')
-    return Path(str_path)
+    return Path(str_path).expanduser().resolve()
 
 
 def to_uri(path: Path) -> str:

thds/core/meta.json

@@ -1,8 +1,8 @@
 {
   "git_commit": "affac0a04726de27f8065525d193df4cd6376b9c",
-  "git_branch": "main",
+  "git_branch": "task/dbxtend/use-pure-magic",
   "git_is_clean": true,
-  "pyproject_version": "1.32.20250219165944",
-  "thds_user": "runner",
+  "pyproject_version": "1.32.20250219172103",
+  "thds_user": "peter.gaultney",
   "misc": {}
 }

thds/core/source/src.py

@@ -3,7 +3,7 @@ import typing as ty
 from dataclasses import dataclass
 from pathlib import Path
 
-from .. import hashing
+from .. import hashing, types
 from . import _download
 
 
@@ -84,3 +84,17 @@ class Source(os.PathLike):
 
     def __fspath__(self) -> str:
         return os.fspath(self.path())
+
+    @staticmethod
+    def from_file(
+        filename: types.StrOrPath, hash: ty.Optional[hashing.Hash] = None, uri: str = ""
+    ) -> "Source":
+        from ._construct import from_file
+
+        return from_file(filename, hash, uri)
+
+    @staticmethod
+    def from_uri(uri: str, hash: ty.Optional[hashing.Hash] = None) -> "Source":
+        from ._construct import from_uri
+
+        return from_uri(uri, hash)

{thds.core-1.32.20250219165944.dist-info → thds.core-1.32.20250219172103.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: thds.core
-Version: 1.32.20250219165944
+Version: 1.32.20250219172103
 Summary: Core utilities.
 Author: Trilliant Health
 Description-Content-Type: text/markdown

{thds.core-1.32.20250219165944.dist-info → thds.core-1.32.20250219172103.dist-info}/RECORD

@@ -4,12 +4,12 @@ thds/core/cache.py,sha256=nL0oAyZrhPqyBBLevnOWSWVoEBrftaG3aE6Qq6tvmAA,7153
 thds/core/calgitver.py,sha256=HklIz-SczK92Vm2rXtTSDiVxAcxUW_GPVCRRGt4BmBA,2324
 thds/core/cm.py,sha256=WZB8eQU0DaBYj9s97nc3PuCtai9guovfyiQH68zhLzY,1086
 thds/core/concurrency.py,sha256=NQunF_tJ_z8cfVyhzkTPlb-nZrgu-vIk9_3XffgscKQ,3520
-thds/core/config.py,sha256=N-WVpPDrfTSFKz0m7WrqZPBdd17dycpDx9nhbATkf3c,9092
+thds/core/config.py,sha256=VWymw6pqPRvX7wwsJ0Y-D2gLoCclAHhARmTnuUw7kb0,10014
 thds/core/decos.py,sha256=VpFTKTArXepICxN4U8C8J6Z5KDq-yVjFZQzqs2jeVAk,1341
 thds/core/dict_utils.py,sha256=MAVkGJg4KQN1UGBLEKuPdQucZaXg_jJakujQ-GUrYzw,6471
 thds/core/env.py,sha256=M36CYkPZ5AUf_-n8EqjsMGwWOzaKEn0KgRwnqUK7jS4,1094
 thds/core/exit_after.py,sha256=0lz63nz2NTiIdyBDYyRa9bQShxQKe7eISy8VhXeW4HU,3485
-thds/core/files.py,sha256=35vhbaDv4OkL_n1PCM-ki54708aibFMrnURpth_5UsA,4556
+thds/core/files.py,sha256=NJlPXj7BejKd_Pa06MOywVv_YapT4bVedfsJHrWX8nI,4579
 thds/core/fretry.py,sha256=Tui2q6vXV6c7mjTa1czLrXiugHUEwQp-sZdiwXfxvmM,3829
 thds/core/generators.py,sha256=rcdFpPj0NMJWSaSZTnBfTeZxTTORNB633Lng-BW1284,1939
 thds/core/git.py,sha256=I6kaEvwcvVxCLYHhTTfnHle-GkmgOR9_fHs03QxgBfI,2792
@@ -24,7 +24,7 @@ thds/core/lazy.py,sha256=e1WvG4LsbEydV0igEr_Vl1cq05zlQNIE8MFYT90yglE,3289
 thds/core/link.py,sha256=kmFJIFvEZc16-7S7IGvtTpzwl3VuvFl3yPlE6WJJ03w,5404
 thds/core/logical_root.py,sha256=gWkIYRv9kNQfzbpxJaYiwNXVz1neZ2NvnvProtOn9d8,1399
 thds/core/merge_args.py,sha256=7oj7dtO1-XVkfTM3aBlq3QlZbo8tb6X7E3EVIR-60t8,5781
-thds/core/meta.json,sha256=8W_-XoFSxLU_TCVyOLAH5tBlGCDKqPiVxds08-bxUTs,196
+thds/core/meta.json,sha256=dKSxAvJfyiieovIECa_e5kibVmRg29mmOmqqHGS5Mfs,227
 thds/core/meta.py,sha256=IPLAKrH06HooPMNf5FeqJvUcM-JljTGXddrAQ5oAX8E,16896
 thds/core/parallel.py,sha256=HXAn9aIYqNE5rnRN5ypxR6CUucdfzE5T5rJ_MUv-pFk,7590
 thds/core/pickle_visit.py,sha256=QNMWIi5buvk2zsvx1-D-FKL7tkrFUFDs387vxgGebgU,833
@@ -50,7 +50,7 @@ thds/core/source/__init__.py,sha256=RiaUHNunoaw4XJUrwR5vJzSS6HGxOUKUONR_ipX5654,
 thds/core/source/_construct.py,sha256=klN6-fSJrsbbUhp92wzhJcF73h_PKKJItNLC__vwlIs,3122
 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=A1PSR5vANLwnUWLsFNVLkkeUdaidzRAzq8vri_a5w9E,4141
+thds/core/source/src.py,sha256=9A_8kSBUc5k6OLAYe5EW_VogpXFIqofow7Rxl8xv-eg,4559
 thds/core/source/tree.py,sha256=vjAqnQXGE0XiI0WvlLyXGqEAZbyjq6XmdUeWAR0HI4M,4144
 thds/core/sqlite/__init__.py,sha256=tDMzuO76qTtckJHldPQ6nPZ6kcvhhoJrVuuW42JtaSQ,606
 thds/core/sqlite/connect.py,sha256=l4QaSAI8RjP7Qh2FjmJ3EwRgfGf65Z3-LjtC9ocHM_U,977
@@ -67,8 +67,8 @@ thds/core/sqlite/structured.py,sha256=swCbDoyVT6cE7Kl79Wh_rg5Z1-yrUDJbiVJF4bjset
 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.32.20250219165944.dist-info/METADATA,sha256=a_qO5xgSI8sxxMLy0Zw0nxFXI33RhRkeQwYw_XSmYoY,2123
-thds.core-1.32.20250219165944.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-thds.core-1.32.20250219165944.dist-info/entry_points.txt,sha256=bOCOVhKZv7azF3FvaWX6uxE6yrjK6FcjqhtxXvLiFY8,161
-thds.core-1.32.20250219165944.dist-info/top_level.txt,sha256=LTZaE5SkWJwv9bwOlMbIhiS-JWQEEIcjVYnJrt-CriY,5
-thds.core-1.32.20250219165944.dist-info/RECORD,,
+thds.core-1.32.20250219172103.dist-info/METADATA,sha256=BVFThCu8DvjqINHhfNv2Ztt8jraXEiQKAj0h3wLzQdg,2123
+thds.core-1.32.20250219172103.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+thds.core-1.32.20250219172103.dist-info/entry_points.txt,sha256=bOCOVhKZv7azF3FvaWX6uxE6yrjK6FcjqhtxXvLiFY8,161
+thds.core-1.32.20250219172103.dist-info/top_level.txt,sha256=LTZaE5SkWJwv9bwOlMbIhiS-JWQEEIcjVYnJrt-CriY,5
+thds.core-1.32.20250219172103.dist-info/RECORD,,