thds.mops 3.9.20250902211636__py3-none-any.whl → 3.9.20250902220321__py3-none-any.whl

thds/mops/pure/runner/get_results.py

@@ -99,6 +99,9 @@ def lock_maintaining_future(
 ) -> concurrent.futures.Future[futures.R1]:
     """Create a Future that will be used to retrieve the result of a shim invocation.
 
+    Most commonly, this will be partially applied and only lazily invoked
+    when the user calls `.result()` or some other method on the Future.
+
     This Future will be used to retrieve the result of a shim invocation, and will
     maintain the lock while it is being retrieved.
     """

thds/mops/pure/runner/local.py

@@ -193,34 +193,43 @@ def invoke_via_shim_or_return_memoized(  # noqa: C901
         # If something about our invocation fails,
         # we fail just as we would have previously, without any attempt to go
         # 'back' to waiting for someone else to compute the result.
-        lock.maintain_to_release(lock_owned)
-        # we don't actually need the release_lock here, because it will get
-        # 'recreated' in the PostShimResultGetter below, which is also where it gets called
+        release_lock_in_current_process = lock.maintain_to_release(lock_owned)
 
-        future_result_getter = PostShimResultGetter[T](memo_uri, p_unwrap_value_or_error)
-
-        with _BEFORE_INVOCATION_SEMAPHORE:
-            log_invocation(f"Invoking {memo_uri}")
-            upload_invocation_and_deps()
-
-        # can't hold the semaphore while we block on the shim, though.
-        shim = shim_builder(func, args_, kwargs_)
-        future_or_shim_result = shim(  # ACTUAL INVOCATION (handoff to remote shim) HAPPENS HERE
-            (
-                memo_uri,
-                *metadata.format_invocation_cli_args(
-                    metadata.InvocationMetadata.new(pipeline_id, invoked_at, lock_owned.writer_id)
-                ),
-            )
-        )
-        if hasattr(future_or_shim_result, "add_done_callback"):
-            # if the shim returns a Future, we wrap it.
-            logger.debug("Shim returned a Future; wrapping it for post-shim result retrieval.")
-            return futures.make_lazy(lock_maintaining_future)(
-                lock_owned, future_result_getter, future_or_shim_result
+        try:
+            with _BEFORE_INVOCATION_SEMAPHORE:
+                log_invocation(f"Invoking {memo_uri}")
+                upload_invocation_and_deps()
+
+            # can't hold the semaphore while we block on the shim, though.
+            shim = shim_builder(func, args_, kwargs_)
+            future_or_shim_result = shim(  # ACTUAL INVOCATION (handoff to remote shim) HAPPENS HERE
+                (
+                    memo_uri,
+                    *metadata.format_invocation_cli_args(
+                        metadata.InvocationMetadata.new(pipeline_id, invoked_at, lock_owned.writer_id)
+                    ),
+                )
             )
-        else:  # it's a synchronous shim - just process the result directly.
-            future_result_getter.release_lock = lock.maintain_to_release(lock_owned)
-            return futures.resolved(future_result_getter(future_or_shim_result))
+
+            future_result_getter = PostShimResultGetter[T](memo_uri, p_unwrap_value_or_error)
+            if hasattr(future_or_shim_result, "add_done_callback"):
+                # if the shim returns a Future, we wrap it.
+                logger.debug("Shim returned a Future; wrapping it for post-shim result retrieval.")
+                return futures.make_lazy(lock_maintaining_future)(
+                    lock_owned, future_result_getter, future_or_shim_result
+                )
+
+            else:  # it's a synchronous shim - just process the result directly.
+                future_result_getter.release_lock = release_lock_in_current_process
+                return futures.resolved(future_result_getter(future_or_shim_result))
+
+        except Exception:
+            try:
+                release_lock_in_current_process()
+            except Exception:
+                logger.exception(
+                    f"Failed to release lock {lock_owned.writer_id} after failed invocation."
+                )
+            raise
 
     return create_invocation_and_result_future

{thds_mops-3.9.20250902211636.dist-info → thds_mops-3.9.20250902220321.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: thds.mops
-Version: 3.9.20250902211636
+Version: 3.9.20250902220321
 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.20250902211636.dist-info → thds_mops-3.9.20250902220321.dist-info}/RECORD

@@ -92,8 +92,8 @@ thds/mops/pure/pickling/pickles.py,sha256=CSlnjLssE0Ad8YzqyaKqWCSNyW5LiMFKiXO6hW
 thds/mops/pure/pickling/remote.py,sha256=7JXZRGnLI5y5dqElIDrhIlaRv6Q_zQ_78aqNhO7O4KY,8478
 thds/mops/pure/pickling/sha256_b64.py,sha256=HL0cPixHPZYuZDVDBscxsnI-3a2amWEfw-LseOX-PyY,2916
 thds/mops/pure/runner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-thds/mops/pure/runner/get_results.py,sha256=1K6qf_Vg2YfUPfUuu103WyYsfS3e_ju6W7Z_PV01-pU,4053
-thds/mops/pure/runner/local.py,sha256=0DN1iafxJdnXx0vKZ1jD6dh34aAWK2pgdKUFvK9wDLY,11023
+thds/mops/pure/runner/get_results.py,sha256=4pUlUJiwxKaFYFlQpgJ2sS1jeYlf-HlTLfRzrhvQdW8,4200
+thds/mops/pure/runner/local.py,sha256=CFlhqHdd2JpmpdVrKHuugJ7tfeKhwTIKCizuqMMxpQI,11278
 thds/mops/pure/runner/shim_builder.py,sha256=obs2-NipAB8w0NR8o90UQX_bmHYS69c-raL2JPw8yM4,821
 thds/mops/pure/runner/simple_shims.py,sha256=r-kLmpSCwzjfzF-Ku43YKvrHMLpZR5jDmweo4Vk07O4,1069
 thds/mops/pure/runner/strings.py,sha256=PYAYMxZ2ehgahKIBXJilENNE6OrdNkueNBel8LPsoh8,26
@@ -109,8 +109,8 @@ thds/mops/pure/tools/summarize/cli.py,sha256=7kDtn24ok8oBO3jFjlMmOK3jnZYpMoE_5Y8
 thds/mops/pure/tools/summarize/run_summary.py,sha256=w45qiQr7elrHDiK9Hgs85gtU3gwLuXa447ih1Y23BBY,5776
 thds/mops/testing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 thds/mops/testing/deferred_imports.py,sha256=f0ezCgQAtzTqW1yAOb0OWgsB9ZrlztLB894LtpWDaVw,3780
-thds_mops-3.9.20250902211636.dist-info/METADATA,sha256=xeI_ctQwD-R1yRroSMwmb1WZoP2djwjHFj0fG1q75bg,2225
-thds_mops-3.9.20250902211636.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-thds_mops-3.9.20250902211636.dist-info/entry_points.txt,sha256=qKvCAaB80syXfxVR3xx6x9J0YJdaQWkIbVSw-NwFgMw,322
-thds_mops-3.9.20250902211636.dist-info/top_level.txt,sha256=LTZaE5SkWJwv9bwOlMbIhiS-JWQEEIcjVYnJrt-CriY,5
-thds_mops-3.9.20250902211636.dist-info/RECORD,,
+thds_mops-3.9.20250902220321.dist-info/METADATA,sha256=9ikxjI9losOmD74Vmv62sZfISIloyiRycqkfMWBjEQw,2225
+thds_mops-3.9.20250902220321.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+thds_mops-3.9.20250902220321.dist-info/entry_points.txt,sha256=qKvCAaB80syXfxVR3xx6x9J0YJdaQWkIbVSw-NwFgMw,322
+thds_mops-3.9.20250902220321.dist-info/top_level.txt,sha256=LTZaE5SkWJwv9bwOlMbIhiS-JWQEEIcjVYnJrt-CriY,5
+thds_mops-3.9.20250902220321.dist-info/RECORD,,