datashare-python 0.12.2__tar.gz → 0.12.5__tar.gz

{datashare_python-0.12.2 → datashare_python-0.12.5}/PKG-INFO

@@ -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 → datashare_python-0.12.5}/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-0.12.2 → datashare_python-0.12.5}/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-0.12.2 → datashare_python-0.12.5}/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 → datashare_python-0.12.5}/pyproject.toml

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