datashare-python 0.12.2__py3-none-any.whl → 0.12.5__py3-none-any.whl

datashare_python/config.py

@@ -1,10 +1,10 @@
 from datetime import timedelta
 from enum import StrEnum
-from typing import TYPE_CHECKING, Literal
+from typing import TYPE_CHECKING, Any, Literal
 
 from icij_common.es import ESClient
 from icij_common.pydantic_utils import ICIJSettings
-from pydantic import PrivateAttr
+from pydantic import PrivateAttr, model_validator
 from pydantic_settings import SettingsConfigDict
 from temporalio.runtime import PrometheusConfig, Runtime, TelemetryConfig
 
@@ -61,18 +61,31 @@ class DatashareClientConfig(BaseModel):
 class TemporalClientConfig(BaseModel):
     host: str = "temporal:7233"
     namespace: str = "datashare-default"
-    prometheus_host: str | None = None
+    prometheus_address: str | None = None
 
     _client: TemporalClient | None = PrivateAttr(default=None)
 
+    @model_validator(mode="before")
+    @classmethod
+    def _prometheus_host_backward_compatibility(cls, v: Any) -> Any:
+        # the combination of nested_model_default_partial_update=True in the
+        # WorkerConfig with extra="forbid" makes alias fail when loading from envvars.
+        # We can't use field aliases...
+        if not isinstance(v, dict):
+            return v
+        prometheus_address = v.pop("prometheus_host", v.pop("PROMETHEUS_HOST", None))
+        if prometheus_address is not None:
+            v["prometheus_address"] = prometheus_address
+        return v
+
     async def to_client(self) -> TemporalClient:
         from .utils import PYDANTIC_DATA_CONVERTER  # noqa: PLC0415
 
         if self._client is None:
             runtime = None
-            if self.prometheus_host is not None:
+            if self.prometheus_address is not None:
                 telemetry_config = TelemetryConfig(
-                    metrics=PrometheusConfig(bind_address="0.0.0.0:9000")
+                    metrics=PrometheusConfig(bind_address=self.prometheus_address)
                 )
                 runtime = Runtime(telemetry=telemetry_config)
 
@@ -145,5 +158,5 @@ class WorkerConfig(ICIJSettings, BaseModel):
 
 
 class ActivityTimeouts(BaseModel):
-    start_to_close: timedelta | None = None
+    start_to_close: timedelta = timedelta(minutes=10)
     heartbeat: timedelta = timedelta(minutes=1)

datashare_python/conftest.py

@@ -430,7 +430,7 @@ def _run_worker_process(
         runtime = Runtime(telemetry=TelemetryConfig())
         # We don't use config.to_temporal_client since we get a problem with the
         # temporal runtime not being properly recreated, we create it explicitely
-        if temporal_config.prometheus_host is not None:
+        if temporal_config.prometheus_address is not None:
             telemetry_config = TelemetryConfig(
                 metrics=PrometheusConfig(bind_address="0.0.0.0:9000")
             )

datashare_python/objects.py

@@ -718,7 +718,7 @@ class ErrorReportWithPages(ProcessingReportWithPages, ABC):
         return ErrorReportWithPages(
             n_docs=other.n_docs + self.n_docs,
             n_pages=other.n_pages + self.n_pages,
-            errors=self.errors + other.errors,
+            errors=other.errors + self.errors,
         )
 
     @classmethod

{datashare_python-0.12.2.dist-info → datashare_python-0.12.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: datashare-python
-Version: 0.12.2
+Version: 0.12.5
 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.12.2.dist-info → datashare_python-0.12.5.dist-info}/RECORD

@@ -1,8 +1,8 @@
 datashare_python/.gitignore,sha256=e-SRgnvGGdsjRrqgKsTzALz6Obx8IYiOjr0yaAxT6v8,22
 datashare_python/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 datashare_python/__main__.py,sha256=g-fvS46zl9umKmGrSpl-OG-8PSuZgjqvTCqjpsZtSps,101
-datashare_python/config.py,sha256=ODJrwrOTZK9D90cUbNYqSUnu5vsyMWw_IVgXpSdDYJs,4464
-datashare_python/conftest.py,sha256=hgBfg5Df9Kf0tMPvrqsrgjR6LZx1jG8WsZiVLQLHhuI,13824
+datashare_python/config.py,sha256=MXw9Y6H90OPBE7GqOgtSl8MJ50EAF_u6uWotiAVj2fg,5098
+datashare_python/conftest.py,sha256=fpjgOBBKzwtIArcyC4qbcyTpMtr2nf0N2p-8WKkRvgs,13827
 datashare_python/constants.py,sha256=-Irwd2bbnFGIkLVJi_SiQ7PM2eNW3Ia_co4SE6z4j-A,352
 datashare_python/dependencies.py,sha256=Q-BIhCwWu-GGp9omYNhENZ88cF0QJ8spfaMZX40mmNU,4386
 datashare_python/discovery.py,sha256=3mUck2GUSKu2DSP9-MM1OdVM4FqFKqfBeSQDQZxgh2g,7177
@@ -10,19 +10,19 @@ datashare_python/exceptions.py,sha256=bVHEAXxDPKfxeeMC0hJXEsrJkgsKO2ESAhxWU96GA4
 datashare_python/interceptors.py,sha256=-XC-y_MvGyHlZQ6jItfMRPAmKwQkQzzncpAGxceKlwM,16485
 datashare_python/logging_.py,sha256=96KNXhP-JR5ybu9dld4VLtF7v7PfiphOCR1Nio-mmUs,4483
 datashare_python/mimetypes_.py,sha256=omd2g8JyN-tfZL-lmxbWsjgc987iUe5w87ZpEtbyUK0,49930
-datashare_python/objects.py,sha256=Fy9LVFMTSWsgjJBhZyJrwnWFP0PKcsw3arJ8JwpumGc,26878
+datashare_python/objects.py,sha256=oFAbqrAMHDWITOp9uNJkTOV7l0XXzfWCn964unb_DU4,26878
 datashare_python/task_client.py,sha256=oTmP8bvZW0UyhLNMi1AV3XIAx7hrdbxNRss2Mw2azEc,8435
 datashare_python/template.py,sha256=N1uM8TRXh5tQPV7BC1oJj-Pdm2Gs_SkjaXv50RnNYso,4682
 datashare_python/types_.py,sha256=cPcCkIk6ecILrKetPnAsrb0njHYuWJU3eZicUXy2lF8,1278
 datashare_python/utils.py,sha256=Y0rNipGGW4yhOK6GrhXP9cdmHWMis2oFUxRsNK9eBMU,33254
-datashare_python/worker-template.tar.gz,sha256=_bJXK_gbawy0VCpTcFrV0wKp2x0qqoMc0YgFkRuOXpo,281051
+datashare_python/worker-template.tar.gz,sha256=0zaBIGRlxWW9pZPnaA8_XFZhIAGfk58uCEE_67BWq5U,281032
 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.12.2.dist-info/METADATA,sha256=EXfeGH0IZ915StdeUAYdd8b5D8E8J7xlR8iRHINN5g4,1012
-datashare_python-0.12.2.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
-datashare_python-0.12.2.dist-info/entry_points.txt,sha256=ILE7auxabHWiu3GC-AunWnzjhOI_SbZp7D4GqZHlLw4,68
-datashare_python-0.12.2.dist-info/RECORD,,
+datashare_python-0.12.5.dist-info/METADATA,sha256=VOiUCXh8AJ3yxhgj52fioQpB6iMtmRVURTcAHvU0JJk,1012
+datashare_python-0.12.5.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
+datashare_python-0.12.5.dist-info/entry_points.txt,sha256=ILE7auxabHWiu3GC-AunWnzjhOI_SbZp7D4GqZHlLw4,68
+datashare_python-0.12.5.dist-info/RECORD,,