datashare-python 0.8.17__tar.gz → 0.8.19__tar.gz

{datashare_python-0.8.17 → datashare_python-0.8.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datashare-python
-Version: 0.8.17
+Version: 0.8.19
 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.17 → datashare_python-0.8.19}/datashare_python/config.py

@@ -13,6 +13,7 @@ from temporalio.converter import (
     DefaultPayloadConverter,
     JSONPlainPayloadConverter,
 )
+from temporalio.runtime import PrometheusConfig, Runtime, TelemetryConfig
 
 import datashare_python
 
@@ -64,13 +65,22 @@ class DatashareClientConfig(BaseModel):
 class TemporalClientConfig(BaseModel):
     host: str = "temporal:7233"
     namespace: str = "datashare-default"
+    prometheus_host: str | None = None
+
     _client: TemporalClient | None = PrivateAttr(default=None)
 
     async def to_client(self) -> TemporalClient:
         if self._client is None:
+            runtime = None
+            if self.prometheus_host is not None:
+                telemetry_config = TelemetryConfig(
+                    metrics=PrometheusConfig(bind_address="0.0.0.0:9000")
+                )
+                runtime = Runtime(telemetry=telemetry_config)
             self._client = await TemporalClient.connect(
                 target_host=self.host,
                 namespace=self.namespace,
+                runtime=runtime,
                 data_converter=PYDANTIC_DATA_CONVERTER,
             )
         return self._client

{datashare_python-0.8.17 → datashare_python-0.8.19}/datashare_python/utils.py

@@ -470,7 +470,7 @@ def _metadata_path(doc_id: str, *, project: str) -> Path:
 
 
 def _read_artifact_metadata(root: Path, artifact: DocArtifact) -> dict:
-    m_path = root / _metadata_path(artifact.filename, project=artifact.project)
+    m_path = root / _metadata_path(artifact.doc_id, project=artifact.project)
     return json.loads(m_path.read_text())
 
 
@@ -502,7 +502,7 @@ def debuggable_name(
     return f"{uuid}-{'--'.join(displayable_file_name)}"
 
 
-def activity_contextual_id(
+def contextual_id(
     *, wf_context: bool = True, act_context: bool = False, run_context: bool = False
 ) -> str:
     contextual_id = []
@@ -519,3 +519,41 @@ def activity_contextual_id(
         if run_context:
             contextual_id.append(act_info.activity_run_id)
     return "-".join(contextual_id)
+
+
+# TODO: deprecated, remove me at the next breaking
+activity_contextual_id = contextual_id
+
+
+def _contextual_path(
+    *, wf_context: bool = True, act_context: bool = True, run_context: bool = False
+) -> Path:
+    act_info = activity.info()
+    path = []
+    if not wf_context and not act_context:
+        raise ValueError("at least one of wf_context and act_context must be True")
+    if wf_context:
+        path = [act_info.workflow_type]
+        path.append(act_info.workflow_id)
+        if run_context:
+            path.append(act_info.workflow_run_id)
+    if act_context:
+        path.append(act_info.activity_type)
+        path.append(act_info.activity_id)
+        if run_context:
+            path.append(act_info.activity_run_id)
+    return Path(*path)
+
+
+def activity_workdir(
+    workdir: Path,
+    project: str,
+    *,
+    wf_context: bool = True,
+    act_context: bool = True,
+    run_context: bool = False,
+) -> Path:
+    ctx_path = _contextual_path(
+        wf_context=wf_context, act_context=act_context, run_context=run_context
+    )
+    return workdir.joinpath(project, ctx_path)

{datashare_python-0.8.17 → datashare_python-0.8.19}/pyproject.toml

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