datashare-python 0.10.7__tar.gz → 0.10.9__tar.gz

{datashare_python-0.10.7 → datashare_python-0.10.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: datashare-python
-Version: 0.10.7
+Version: 0.10.9
 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.7 → datashare_python-0.10.9}/datashare_python/utils.py

@@ -228,7 +228,7 @@ def _unpack_positional_args(
 
 
 def with_retriables[**P, T](
-    retriables: set[type[Exception]] = None,
+    logger: logging.Logger, retriables: set[type[Exception]] = None
 ) -> Callable[[Callable[P, T]], Callable[P, T]]:
     if retriables is None:
 
@@ -240,6 +240,7 @@ def with_retriables[**P, T](
                     try:
                         return await activity_fn(*args, **kwargs)
                     except Exception as e:
+                        logger.exception("failing activity due to non retriable error")
                         raise fatal_error_from_exception(e) from e
             else:
 
@@ -248,6 +249,7 @@ def with_retriables[**P, T](
                     try:
                         return activity_fn(*args, **kwargs)
                     except Exception as e:
+                        logger.exception("failing activity due to non retriable error")
                         raise fatal_error_from_exception(e) from e
 
             return wrapper
@@ -262,8 +264,12 @@ def with_retriables[**P, T](
                 try:
                     return await activity_fn(*args, **kwargs)
                 except retriables:
+                    logger.exception(
+                        "retriable error occurred during activity, will retry !"
+                    )
                     raise
                 except Exception as e:
+                    logger.exception("failing activity due to non retriable error")
                     raise fatal_error_from_exception(e) from e
 
         else:
@@ -273,8 +279,12 @@ def with_retriables[**P, T](
                 try:
                     return activity_fn(*args, **kwargs)
                 except retriables:
+                    logger.exception(
+                        "retriable error occurred during activity, will retry !"
+                    )
                     raise
                 except Exception as e:
+                    logger.exception("failing activity due to non retriable error")
                     raise fatal_error_from_exception(e) from e
 
         return wrapper
@@ -283,12 +293,19 @@ def with_retriables[**P, T](
 
 
 def activity_defn[**P, T](
-    name: str, retriables: set[type[Exception]] = None
+    name: str,
+    retriables: set[type[Exception]] = None,
+    logger: logging.Logger | None = None,
 ) -> Callable[[Callable[P, T]], Callable[P, T]]:
 
+    if logger is None:
+        frame = inspect.stack()[1]
+        caller_module = inspect.getmodule(frame[0])
+        logger = logging.getLogger(caller_module.__name__)
+
     def decorator(activity_fn: Callable[P, T]) -> Callable[P, T]:
         activity_fn = positional_args_only(activity_fn)
-        activity_fn = with_retriables(retriables)(activity_fn)
+        activity_fn = with_retriables(logger, retriables)(activity_fn)
         activity_fn = activity.defn(activity_fn, name=name)
 
         is_async = inspect.iscoroutinefunction(activity_fn)
@@ -718,12 +735,14 @@ class _PydanticPayloadConverter(CompositePayloadConverter):
         try:
             return super().from_payloads(payloads, type_hints)
         except (TypeError, ValidationError) as e:
+            logger.exception("failing activity due to non retriable error")
             raise fatal_error_from_exception(e) from e
 
     def to_payloads(self, values: Sequence[Any]) -> list[Payload]:
         try:
             return super().to_payloads(values)
         except (TypeError, ValidationError) as e:
+            logger.exception("failing activity due to non retriable error")
             raise fatal_error_from_exception(e) from e
 
 

{datashare_python-0.10.7 → datashare_python-0.10.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "datashare-python"
-version = "0.10.7"
+version = "0.10.9"
 description = "Manage Python tasks and local resources in Datashare"
 authors = [
   { name = "Clément Doumouro", email = "cdoumouro@icij.org" },