datashare-python 0.8.0__tar.gz → 0.8.3__tar.gz

{datashare_python-0.8.0 → datashare_python-0.8.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datashare-python
-Version: 0.8.0
+Version: 0.8.3
 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.8.0 → datashare_python-0.8.3}/datashare_python/dependencies.py

@@ -40,7 +40,7 @@ def set_loggers(
     worker_config: WorkerConfig, worker_id: str, loggers: dict[str, LogLevel]
 ) -> None:
     setup_worker_loggers(
-        loggers=loggers, worker_id=worker_id, format=worker_config.logging.format
+        loggers=loggers, worker_id=worker_id, log_format=worker_config.logging.format
     )
     logger.info("worker loggers ready to log 💬")
 

{datashare_python-0.8.0 → datashare_python-0.8.3}/datashare_python/logging_.py

@@ -47,7 +47,7 @@ _STREAM_HANDLER_FMT_WITH_WORKER_ID = (
 
 
 def setup_worker_loggers(
-    loggers: dict[str, LogLevel], *, worker_id: str | None, format: LogFormat
+    loggers: dict[str, LogLevel], *, worker_id: str | None, log_format: LogFormat
 ) -> None:
     worker_filter = WorkerFilter(worker_id)
     for logger_name, level_str in loggers.items():
@@ -55,7 +55,9 @@ def setup_worker_loggers(
         logger = logging.getLogger(logger_name)
         logger.setLevel(level)
         logger.handlers = []
-        for handler in _get_worker_handlers(level, worker_filter, format=format):
+        for handler in _get_worker_handlers(
+            level, worker_filter, log_format=log_format
+        ):
             logger.addHandler(handler)
 
 
@@ -69,8 +71,13 @@ class WorkerFilter(logging.Filter):
             record.worker_id = self.worker_id
         if workflow.in_workflow():
             wf_info = workflow.info()
+            wf_info = {
+                "workflow_run_id": wf_info.run_id,
+                "workflow_id": wf_info.workflow_id,
+                "workflow_type": wf_info.workflow_type,
+            }
             for attr in _WF_LOGGED_ATTRS:
-                setattr(record, attr, getattr(wf_info, attr))
+                setattr(record, attr, wf_info[attr])
         if activity.in_activity():
             act_info = activity.info()
             for attr in _ACT_LOGGER_ATTRS:
@@ -83,10 +90,10 @@ class WorkerFilter(logging.Filter):
 
 
 def _get_worker_handlers(
-    level: int, worker_filter: WorkerFilter, *, format: LogFormat
+    level: int, worker_filter: WorkerFilter, *, log_format: LogFormat
 ) -> list[logging.Handler]:
     stream_handler = logging.StreamHandler(sys.stderr)
-    match format:
+    match log_format:
         case LogFormat.JSON:
             fmt = _json_formatter(datefmt=DATE_FMT)
         case LogFormat.LOGFMT:
@@ -98,7 +105,7 @@ def _get_worker_handlers(
                 fmt = STREAM_HANDLER_FMT
             fmt = logging.Formatter(fmt, DATE_FMT)
         case _:
-            raise NotImplementedError(f"invalid log format: {format}")
+            raise NotImplementedError(f"invalid log format: {log_format}")
     stream_handler.setFormatter(fmt)
     stream_handler.setLevel(level)
     stream_handler.addFilter(worker_filter)

{datashare_python-0.8.0 → datashare_python-0.8.3}/pyproject.toml

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