datashare-python 0.8.0__py3-none-any.whl → 0.8.2__py3-none-any.whl

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/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": self.workflow_id,
+                "workflow_type": self.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.dist-info → datashare_python-0.8.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datashare-python
-Version: 0.8.0
+Version: 0.8.2
 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.dist-info → datashare_python-0.8.2.dist-info}/RECORD

@@ -4,24 +4,24 @@ datashare_python/__main__.py,sha256=g-fvS46zl9umKmGrSpl-OG-8PSuZgjqvTCqjpsZtSps,
 datashare_python/config.py,sha256=kgrj--t8aH4TKQpcak6f8H5Zny13LwPwvFDJDQk5K10,4137
 datashare_python/conftest.py,sha256=SiAVEwK5odlDljwyQMDxHlD-WEIem7oR04wAEoNH6jA,8673
 datashare_python/constants.py,sha256=a8-ceZKBVMXydcoNQ35fSjFjxeJ7dt-N6eAvqtPpf9g,320
-datashare_python/dependencies.py,sha256=ZqIT-LmMMsx3QWf5WSgIY4LsY9bJ6TFJtKQKrHHt2_s,4135
+datashare_python/dependencies.py,sha256=5aM6v_WUfIn6SmYMEECh8os1aZOJjuOOCIuk-Y7a6Ak,4139
 datashare_python/discovery.py,sha256=d8fpY9AUSH7WP6600TTmm1Cjr1TKOYBoO50cN61dPdU,6999
 datashare_python/exceptions.py,sha256=bVHEAXxDPKfxeeMC0hJXEsrJkgsKO2ESAhxWU96GA4M,496
 datashare_python/interceptors.py,sha256=Pl7GodPO4KbfflmacpW-vOUgLazjlXSlDNENbpOUt1c,6725
-datashare_python/logging_.py,sha256=uSTNr6Een9zXNisirPZxJQsbOXMIADLgIPJp370lXng,4252
+datashare_python/logging_.py,sha256=KaKL6kHVPNtjPDacL5odlaA2Wcrl3RlM1qMHKioK0Bs,4480
 datashare_python/objects.py,sha256=pE0DGNNkl1etxz5ed7T-EaGo1o9TONjH2Lg9u1qdAWU,7571
 datashare_python/task_client.py,sha256=oTmP8bvZW0UyhLNMi1AV3XIAx7hrdbxNRss2Mw2azEc,8435
 datashare_python/template.py,sha256=RxKTYLXoS_EQ8Jc41JkBXppPdbCFqDWfP3BmC0gvB5o,4024
 datashare_python/types_.py,sha256=9Hk1XqpdXbM1TnEzwvJ5G9ABbaCZW9KgBTtiPBVn_7k,649
 datashare_python/utils.py,sha256=gX3_RJEJS0sAYBNVfBLoWJu7_hIANhylSAohzXVW-yQ,17982
-datashare_python/worker-template.tar.gz,sha256=g28XncbDlgLr1LS4WviGWZCS4V2jnrIt6ZlaXDI2ahs,287088
+datashare_python/worker-template.tar.gz,sha256=v7LKWTE05wdQ8XQMO6DrWEuu7IQ_YKfVivu6JW9DcTk,287093
 datashare_python/worker.py,sha256=czrN9Z0fPFX-6KHinX8Orx4vb9tpta2e7Qs6H0NiYyE,7534
 datashare_python/cli/__init__.py,sha256=9BPWtssDgsVfWMsZ1TtZCla0EC_kai4RHttr8oNLYOE,1401
 datashare_python/cli/project.py,sha256=w32Gy9AOL5B00uDT4in7YUCt2g68FnNbvwg2M3a8G6o,946
 datashare_python/cli/task.py,sha256=8mvKGS21bZ14BgZ0Uo-dfameljkaI2ZBha80ywCy-E8,5822
 datashare_python/cli/utils.py,sha256=p69CQb0zfixuyBkiZprhdMCc_NuYwXyAn6vC9H1UzAw,911
 datashare_python/cli/worker.py,sha256=I4KTpFIpXFowioFn72Rm6LBCYlY-Dhp4NBIPvtRgUXE,5283
-datashare_python-0.8.0.dist-info/METADATA,sha256=FDdSE58wp8Z4wHXQF8FVngy279LWO4vRTj6wgfpzGxc,921
-datashare_python-0.8.0.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-datashare_python-0.8.0.dist-info/entry_points.txt,sha256=ILE7auxabHWiu3GC-AunWnzjhOI_SbZp7D4GqZHlLw4,68
-datashare_python-0.8.0.dist-info/RECORD,,
+datashare_python-0.8.2.dist-info/METADATA,sha256=FCK0AzNmH9tA0rAr5QN6e49xJjM7tc1suklR7BDNer4,921
+datashare_python-0.8.2.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
+datashare_python-0.8.2.dist-info/entry_points.txt,sha256=ILE7auxabHWiu3GC-AunWnzjhOI_SbZp7D4GqZHlLw4,68
+datashare_python-0.8.2.dist-info/RECORD,,