datashare-python 0.10.4__py3-none-any.whl → 0.10.6__py3-none-any.whl

datashare_python/interceptors.py

@@ -8,7 +8,7 @@ from contextlib import contextmanager
 from contextvars import ContextVar
 from copy import deepcopy
 from functools import wraps
-from inspect import signature
+from inspect import iscoroutinefunction, signature
 from types import UnionType
 from typing import (
     Annotated,
@@ -28,6 +28,7 @@ from temporalio.activity import _Definition
 from temporalio.api.common.v1 import Payload
 from temporalio.client import WorkflowHandle
 from temporalio.converter import DataConverter
+from temporalio.service import RPCError
 from temporalio.worker import (
     ActivityInboundInterceptor,
     ActivityOutboundInterceptor,
@@ -332,7 +333,8 @@ def _get_progress_handler(
         weight=weight,
         min_progress_interval_s=min_progress_interval_s,
     )
-    return handler.progress
+    handler = _fail_safe(handler.progress, "emit progress", excs=(RPCError,))
+    return handler
 
 
 def _is_progress(t: type) -> bool:
@@ -438,7 +440,7 @@ class _HeartbeatInboundInterceptor(ActivityInboundInterceptor):
             period = heartbeat_timeout.total_seconds() / self._n_missed_before_timeout
             # We don't want a failing hearbeat to fail the worker task so we just
             # ignore any exception
-            heartbeat_fn = _fail_safe(self._outbound.heartbeat)
+            heartbeat_fn = _fail_safe(self._outbound.heartbeat, "heartbeat")
             heartbeat_task = asyncio.create_task(_heartbeat_every(heartbeat_fn, period))
         try:
             activity.heartbeat()
@@ -449,19 +451,32 @@ class _HeartbeatInboundInterceptor(ActivityInboundInterceptor):
                 await asyncio.wait([heartbeat_task])
 
 
-def _fail_safe(
-    fn: Callable[[Any], None], excs: tuple[type[Exception]] | None = None
-) -> Callable[[Any], None]:
+def _fail_safe[**P, T](
+    fn: Callable[P, T],
+    action: str,
+    excs: tuple[type[Exception]] | None = None,
+) -> Callable[P, T]:
     if excs is None:
         excs = (Exception,)
+    if iscoroutinefunction(fn):
 
-    @wraps(fn)
-    def wrapper(*args, **kwargs) -> None:
-        try:
-            fn(*args, **kwargs)
-        except excs as exc:
-            msg = f"failed to heartbeat due to {exc}"
-            logger.exception(msg)
+        @wraps(fn)
+        async def wrapper(*args: P.args, **kwargs: P.kwargs) -> None:
+            try:
+                return await fn(*args, **kwargs)
+            except excs as exc:
+                msg = f"failed to {action} due to {exc}"
+                logger.exception(msg)
+
+    else:
+
+        @wraps(fn)
+        def wrapper(*args: P.args, **kwargs: P.kwargs) -> None:
+            try:
+                return fn(*args, **kwargs)
+            except excs as exc:
+                msg = f"failed to {action} due to {exc}"
+                logger.exception(msg)
 
     return wrapper
 

{datashare_python-0.10.4.dist-info → datashare_python-0.10.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: datashare-python
-Version: 0.10.4
+Version: 0.10.6
 Summary: Manage Python tasks and local resources in Datashare
 Project-URL: Homepage, https://icij.github.io/datashare-python/
 Project-URL: Documentation, https://icij.github.io/datashare-python/

{datashare_python-0.10.4.dist-info → datashare_python-0.10.6.dist-info}/RECORD

@@ -7,7 +7,7 @@ datashare_python/constants.py,sha256=-Irwd2bbnFGIkLVJi_SiQ7PM2eNW3Ia_co4SE6z4j-A
 datashare_python/dependencies.py,sha256=Q-BIhCwWu-GGp9omYNhENZ88cF0QJ8spfaMZX40mmNU,4386
 datashare_python/discovery.py,sha256=3mUck2GUSKu2DSP9-MM1OdVM4FqFKqfBeSQDQZxgh2g,7177
 datashare_python/exceptions.py,sha256=bVHEAXxDPKfxeeMC0hJXEsrJkgsKO2ESAhxWU96GA4M,496
-datashare_python/interceptors.py,sha256=2EvXsFUv3VbVhUYNc1_tjqTEBZUKGQoQsDkRJr7Uu94,15948
+datashare_python/interceptors.py,sha256=-XC-y_MvGyHlZQ6jItfMRPAmKwQkQzzncpAGxceKlwM,16485
 datashare_python/logging_.py,sha256=96KNXhP-JR5ybu9dld4VLtF7v7PfiphOCR1Nio-mmUs,4483
 datashare_python/mimetypes_.py,sha256=mjQgaqnSFZEcl3LoLDGBaBBjTTzwYfSNZND9Fmkk2zs,49682
 datashare_python/objects.py,sha256=93-GeH-lX6vTVlHHhvftXKRd6l5kJggDR-kV3IQz_1Q,16434
@@ -15,14 +15,14 @@ datashare_python/task_client.py,sha256=oTmP8bvZW0UyhLNMi1AV3XIAx7hrdbxNRss2Mw2az
 datashare_python/template.py,sha256=N1uM8TRXh5tQPV7BC1oJj-Pdm2Gs_SkjaXv50RnNYso,4682
 datashare_python/types_.py,sha256=cPcCkIk6ecILrKetPnAsrb0njHYuWJU3eZicUXy2lF8,1278
 datashare_python/utils.py,sha256=fRQGNG1OR80S2y7VMnh6FLpwQfyFRdJl9EhaXUkfHEY,26772
-datashare_python/worker-template.tar.gz,sha256=CEnZOXCCwABJMjbB2k0bXpKDM8tMMX-vl9aYm8lrGB0,280857
+datashare_python/worker-template.tar.gz,sha256=NjG5Ds1-TW_QwG31yYYROfNurHu2U8fv2A57O85TEnU,280872
 datashare_python/worker.py,sha256=ad36_yJOgwtj8KBheWndGkqaP_2aXTPSrYaHrbCXTvg,8389
 datashare_python/cli/__init__.py,sha256=9BPWtssDgsVfWMsZ1TtZCla0EC_kai4RHttr8oNLYOE,1401
 datashare_python/cli/project.py,sha256=w32Gy9AOL5B00uDT4in7YUCt2g68FnNbvwg2M3a8G6o,946
 datashare_python/cli/task.py,sha256=GsyR5o0fN4Pd8tJKAUgivAvCBKT3L4Ay5j_BCW1XBHk,5828
 datashare_python/cli/utils.py,sha256=p69CQb0zfixuyBkiZprhdMCc_NuYwXyAn6vC9H1UzAw,911
 datashare_python/cli/worker.py,sha256=x0p3a1_NsZPbmV7-WSVMRyW3_iadYcgyZKbDvWgymQc,5790
-datashare_python-0.10.4.dist-info/METADATA,sha256=RJhsOTO4hxU063lYAZajC-1XGiaPVEDtEsO5-7uy4Nc,1012
-datashare_python-0.10.4.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
-datashare_python-0.10.4.dist-info/entry_points.txt,sha256=ILE7auxabHWiu3GC-AunWnzjhOI_SbZp7D4GqZHlLw4,68
-datashare_python-0.10.4.dist-info/RECORD,,
+datashare_python-0.10.6.dist-info/METADATA,sha256=eO-0j7ZIjMv6q6FBoP9-EQLhj88cn8zwLorTgqhm53Y,1012
+datashare_python-0.10.6.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
+datashare_python-0.10.6.dist-info/entry_points.txt,sha256=ILE7auxabHWiu3GC-AunWnzjhOI_SbZp7D4GqZHlLw4,68
+datashare_python-0.10.6.dist-info/RECORD,,