thds.mops 3.9.20251029034848__py3-none-any.whl → 3.10.20251106191559__py3-none-any.whl

thds/mops/pure/_magic/api.py

@@ -51,9 +51,14 @@ class _MagicApi:
         calls: ty.Collection[ty.Callable] = tuple(),
     ) -> ty.Callable[[ty.Callable[P, R]], sauce.Magic[P, R]]:
         """This is the main pure.magic() decorator.  It is designed to be applied directly
-        at the site of function definition, i.e. on the `def`.  We dynamically capture
-        the fully qualified name of the function being decorated and use that to
-        look up the appropriate 'magic' configuration at the time of each call to the function.
+        at the site of function definition, i.e. on the `def`.  We dynamically capture the
+        fully qualified name of the function being decorated and use that to look up the
+        appropriate 'magic' configuration at the time of each call to the function. Any
+        configuration passed here will be entered into the global magic config registry as
+        the 'base case' for this function.
+
+        DO NOT use this decorator multiple times on the same function, as this will overwrite
+        config globally in a way that is very hard to understand.
         """
         return sauce.make_magic(_get_config(), shim_or_builder, blob_root, pipeline_id, calls)
 
@@ -75,6 +80,11 @@ class _MagicApi:
 
         We attempt to detect this and raise an error if it happens. If it does, you should
         provide an explicit unique config_path for each usage.
+
+        NOTE: In many cases, you may be better off using pure.magic.wand instead, which
+        will allow you to prevent any 'outside' configuration from unintentionally
+        affecting your function, because the explicitly-provided configuration is used but
+        not entered into the global 'magic' config registry.
         """
         return ty.cast(
             ty.Callable[[F], F],
@@ -88,6 +98,26 @@ class _MagicApi:
             ),
         )
 
+    @staticmethod
+    def wand(
+        shim_or_builder: ty.Union[ShimName, ShimOrBuilder, None] = None,
+        *,
+        blob_root: uris.UriResolvable = "",
+        pipeline_id: str = "",
+        calls: ty.Collection[ty.Callable] = tuple(),
+    ) -> ty.Callable[[F], F]:
+        """Meant for truly dynamic (i.e. runtime-controlled) use cases. This picks up
+        _current_ magic configuration at the time of wrapping the function, but does not allow
+        further magic configuration at the time of function call, and does not enter any
+        of the supplied configuration into the global 'magic' config registry.
+
+        Suitable for cases where you want to fall back to existing module and config-file
+        configuration at the time of wrapping the function for anything that you don't supply explicitly.
+        """
+        return sauce.wand(
+            _get_config(), shim_or_builder, blob_root=blob_root, pipeline_id=pipeline_id, calls=calls
+        )
+
     @staticmethod
     def blob_root(
         blob_root_uri: uris.UriResolvable, pathable: config_tree.Pathable = None, *, mask: bool = False

thds/mops/pure/_magic/sauce.py

@@ -9,7 +9,7 @@ from typing_extensions import ParamSpec
 from thds.core import futures, log, stack_context
 from thds.mops._utils import config_tree
 
-from ..core import file_blob_store, pipeline_id, pipeline_id_mask, uris
+from .. import core
 from ..core.memo.unique_name_for_function import full_name_and_callable
 from ..core.use_runner import use_runner
 from ..pickling.mprunner import MemoizingPicklingRunner
@@ -18,7 +18,7 @@ from ..runner.simple_shims import samethread_shim
 from ..runner.types import Shim, ShimBuilder
 from .shims import ShimName, ShimOrBuilder, to_shim_builder
 
-_local_root = lambda: f"file://{file_blob_store.MOPS_ROOT()}"  # noqa: E731
+_local_root = lambda: f"file://{core.file_blob_store.MOPS_ROOT()}"  # noqa: E731
 P = ParamSpec("P")
 R = ty.TypeVar("R")
 
@@ -31,7 +31,7 @@ class _MagicConfig:
             "mops.pure.magic.shim", parse=to_shim_builder  # type: ignore
         )
         self.blob_root = config_tree.ConfigTree[ty.Callable[[], str]](
-            "mops.pure.magic.blob_root", parse=uris.to_lazy_uri
+            "mops.pure.magic.blob_root", parse=core.uris.to_lazy_uri
         )
         self.pipeline_id = config_tree.ConfigTree[str]("mops.pure.magic.pipeline_id")
         self.blob_root[""] = _local_root  # default Blob Store
@@ -78,7 +78,7 @@ class Magic(ty.Generic[P, R]):
 
         self.config = config
 
-        if p_id := pipeline_id_mask.extract_from_docstr(func, require=False):
+        if p_id := core.pipeline_id_mask.extract_from_docstr(func, require=False):
             # this allows the docstring pipeline id to become 'the most specific' config.
             self.config.pipeline_id.setv(p_id, self._magic_config_path)
         self._shim = stack_context.StackContext[ty.Union[None, ShimName, ShimOrBuilder]](
@@ -132,12 +132,12 @@ class Magic(ty.Generic[P, R]):
         function call, but returns a PFuture once either a result has been found or a a
         new invocation has been started.
         """
-        with pipeline_id.set_pipeline_id_for_stack(self._pipeline_id):
+        with core.pipeline_id.set_pipeline_id_for_stack(self._pipeline_id):
             return self.runner.submit(self.__wrapped__, *args, **kwargs)
 
     def __call__(self, *args: P.args, **kwargs: P.kwargs) -> R:
         """This is the wrapped function - call this as though it were the function itself."""
-        with pipeline_id.set_pipeline_id_for_stack(self._pipeline_id):
+        with core.pipeline_id.set_pipeline_id_for_stack(self._pipeline_id):
             return self._func(*args, **kwargs)
 
     def __repr__(self) -> str:
@@ -158,7 +158,7 @@ class MagicReregistrationError(ValueError):
 def make_magic(
     config: _MagicConfig,
     shim_or_builder: ty.Union[ShimName, ShimOrBuilder, None],
-    blob_root: uris.UriResolvable,
+    blob_root: core.uris.UriResolvable,
     pipeline_id: str,
     calls: ty.Collection[ty.Callable],
     *,
@@ -210,7 +210,7 @@ def make_magic(
         if shim_or_builder is not None:
             config.shim_bld[magic_config_path] = to_shim_builder(shim_or_builder)
         if blob_root:  # could be empty string
-            config.blob_root[magic_config_path] = uris.to_lazy_uri(blob_root)
+            config.blob_root[magic_config_path] = core.uris.to_lazy_uri(blob_root)
         if pipeline_id:  # could be empty string
             config.pipeline_id[magic_config_path] = pipeline_id
 
@@ -219,3 +219,44 @@ def make_magic(
         return Magic(func, config, magic_config_path, calls)
 
     return deco
+
+
+F = ty.TypeVar("F", bound=ty.Callable)
+
+
+def wand(
+    config: _MagicConfig,
+    shim_or_builder: ty.Union[ShimName, ShimOrBuilder, None] = None,
+    # None means 'pull from config' - 'off' means off.
+    *,
+    blob_root: core.uris.UriResolvable = "",
+    pipeline_id: str = "",
+    calls: ty.Collection[ty.Callable] = tuple(),
+) -> ty.Callable[[F], F]:
+    """A higher-order function factory that prefers your arguments but falls back to magic
+    config at the time of wrapping the function.
+
+    You are creating a magic wand, not doing magic. In fact, the wand doesn't actually use
+    Magic at all - it resolves things from config as soon as the function is _wrapped_,
+    not at the time of function call.
+    """
+
+    def deco_that_resolves_and_locks_in_config(func: F) -> F:
+        magic_config_path = make_magic_config_path(func)
+        shim_builder = (
+            to_shim_builder(shim_or_builder)
+            if shim_or_builder
+            else config.shim_bld.getv(magic_config_path)
+        )
+        if not shim_builder:  # this means 'off'
+            return func  # just run the function normally
+
+        blob_root_uri = (
+            core.uris.to_lazy_uri(blob_root) if blob_root else config.blob_root.getv(magic_config_path)()
+        )
+
+        return core.pipeline_id.set_pipeline_id_for_stack(
+            pipeline_id or config.pipeline_id.getv(magic_config_path)
+        )(use_runner(MemoizingPicklingRunner(shim_builder, blob_root_uri).calls(func, *calls))(func))
+
+    return deco_that_resolves_and_locks_in_config

{thds_mops-3.9.20251029034848.dist-info → thds_mops-3.10.20251106191559.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: thds.mops
-Version: 3.9.20251029034848
+Version: 3.10.20251106191559
 Summary: ML Ops tools for Trilliant Health
 Author-email: Trilliant Health <info@trillianthealth.com>
 Project-URL: Repository, https://github.com/TrilliantHealth/ds-monorepo

{thds_mops-3.9.20251029034848.dist-info → thds_mops-3.10.20251106191559.dist-info}/RECORD

@@ -39,8 +39,8 @@ thds/mops/k8s/tools/krsync.py,sha256=us7pXX0-bRMwD2oAno7Z6BJcPs6FgaUabHW0STyQJYg
 thds/mops/k8s/tools/krsync.sh,sha256=fWgwkdzWnJeTbzEA_uBiIIi-bNU4nXAYj3dNovyRluU,747
 thds/mops/pure/__init__.py,sha256=3xLimQ2JWdeq1YgPs7bPwlwOspzPRwaR2w2KX7vfJU0,1624
 thds/mops/pure/_magic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-thds/mops/pure/_magic/api.py,sha256=eG1NEl9FR_FE1yLfN0hiLd0uLWu-gKzw1FCIJR5pMbw,6424
-thds/mops/pure/_magic/sauce.py,sha256=BfzQfEnQarcLuTbKyCKLU8F6BtJ-v6kn1SRIf675cTc,9804
+thds/mops/pure/_magic/api.py,sha256=f2lF7_0XzRleYWksD3uxxl_dssl0wW_CLGHIY1WZLUM,8019
+thds/mops/pure/_magic/sauce.py,sha256=lMZ4StInNH7vn1t96Ajo4KKCE99ebw0orGRatMqWrKM,11331
 thds/mops/pure/_magic/shims.py,sha256=CXN8wlHv039oKRzDtp5YFDlwGXmmaheWLCi2I95gSeM,1212
 thds/mops/pure/adls/__init__.py,sha256=fw67xxwnizBurScMa-_zWb94lo5gamEVRt27V4bR0jc,54
 thds/mops/pure/adls/_files.py,sha256=9m35Y4elWF0DjgAXVp4oi5CaY6fXWt8n67PilWxWJns,821
@@ -109,8 +109,8 @@ thds/mops/pure/tools/summarize/cli.py,sha256=7kDtn24ok8oBO3jFjlMmOK3jnZYpMoE_5Y8
 thds/mops/pure/tools/summarize/run_summary.py,sha256=glEN_YxUGADzp2Ofvr4ZDeHvnZ1znNR7HD7EATn1sPI,5644
 thds/mops/testing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 thds/mops/testing/deferred_imports.py,sha256=f0ezCgQAtzTqW1yAOb0OWgsB9ZrlztLB894LtpWDaVw,3780
-thds_mops-3.9.20251029034848.dist-info/METADATA,sha256=IEHnqNgaNRJYpo-vWxapPQ6cmLixZ5KsXAwbDG8npsg,2225
-thds_mops-3.9.20251029034848.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-thds_mops-3.9.20251029034848.dist-info/entry_points.txt,sha256=qKvCAaB80syXfxVR3xx6x9J0YJdaQWkIbVSw-NwFgMw,322
-thds_mops-3.9.20251029034848.dist-info/top_level.txt,sha256=LTZaE5SkWJwv9bwOlMbIhiS-JWQEEIcjVYnJrt-CriY,5
-thds_mops-3.9.20251029034848.dist-info/RECORD,,
+thds_mops-3.10.20251106191559.dist-info/METADATA,sha256=BX_qLAaa6x7Oa20s9H3iEzraK5YKy111k_kcBuiAF6g,2226
+thds_mops-3.10.20251106191559.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+thds_mops-3.10.20251106191559.dist-info/entry_points.txt,sha256=qKvCAaB80syXfxVR3xx6x9J0YJdaQWkIbVSw-NwFgMw,322
+thds_mops-3.10.20251106191559.dist-info/top_level.txt,sha256=LTZaE5SkWJwv9bwOlMbIhiS-JWQEEIcjVYnJrt-CriY,5
+thds_mops-3.10.20251106191559.dist-info/RECORD,,