datashare-python 0.10.6__py3-none-any.whl → 0.10.7__py3-none-any.whl

datashare_python/objects.py

@@ -1,3 +1,5 @@
+import hashlib
+import json
 import logging
 import os
 from abc import ABC
@@ -63,6 +65,12 @@ Predicate = Callable[[T], bool] | Callable[[T], Awaitable[bool]]
 class BaseModel(_BaseModel):
     model_config = merge_configs(icij_config(), no_enum_values_config())
 
+    def __hash__(self) -> int:
+        digest = hashlib.md5(
+            json.dumps(self.model_dump(mode="json"), sort_keys=True).encode()
+        ).digest()
+        return int.from_bytes(digest[:8])
+
 
 class DatashareModel(BaseModel):
     model_config = merge_configs(BaseModel.model_config, lowercamel_case_config())

datashare_python/utils.py

@@ -32,6 +32,7 @@ import temporalio
 from aiofile import async_open
 from lru import LRU
 from pydantic import ValidationError
+from pydantic.alias_generators import to_snake
 from temporalio import activity, workflow
 from temporalio.api.common.v1 import Payload
 from temporalio.client import Client
@@ -62,6 +63,8 @@ from .objects import (
 )
 from .types_ import RawAsyncProgressHandler
 
+_CACHE_DIR = "__cache__"
+
 logger = logging.getLogger(__name__)
 
 DependencyLabel = str | None
@@ -533,7 +536,11 @@ activity_contextual_id = contextual_id
 
 
 def _contextual_path(
-    *, wf_context: bool = True, act_context: bool = True, run_context: bool = False
+    *,
+    wf_context: bool = True,
+    act_context: bool = True,
+    run_context: bool = False,
+    caching_key: str | None = None,
 ) -> Path:
     act_info = activity.info()
     path = []
@@ -541,14 +548,18 @@ def _contextual_path(
         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 not caching_key:
+            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)
+        if not caching_key:
+            path.append(act_info.activity_id)
+            if run_context:
+                path.append(act_info.activity_run_id)
+    if caching_key:
+        path += [_CACHE_DIR, caching_key]
     return Path(*path)
 
 
@@ -559,9 +570,13 @@ def activity_workdir(
     wf_context: bool = True,
     act_context: bool = True,
     run_context: bool = False,
+    caching_key: str | None = None,
 ) -> Path:
     ctx_path = _contextual_path(
-        wf_context=wf_context, act_context=act_context, run_context=run_context
+        wf_context=wf_context,
+        act_context=act_context,
+        run_context=run_context,
+        caching_key=caching_key,
     )
     return workdir.joinpath(project, ctx_path)
 
@@ -808,4 +823,10 @@ def async_enter_cm(
 
 
 def config_cache_key(config: BaseModel) -> str:
-    return str(hash(config))
+    # BaseModel support deterministic hash we can call hash on it
+    config_label = (
+        to_snake(config.__class__.__name__.replace("Config", ""))
+        .lower()
+        .replace("_", "-")
+    )
+    return f"{config_label}-{str(hash(config))}"

{datashare_python-0.10.6.dist-info → datashare_python-0.10.7.dist-info}/METADATA

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

@@ -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=mjQgaqnSFZEcl3LoLDGBaBBjTTzwYfSNZND9Fmkk2zs,49682
-datashare_python/objects.py,sha256=93-GeH-lX6vTVlHHhvftXKRd6l5kJggDR-kV3IQz_1Q,16434
+datashare_python/objects.py,sha256=F5x7kdYOiXhdk1k9wqrN2Jpy89Fki9_jx5w1kVIgqsE,16662
 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=fRQGNG1OR80S2y7VMnh6FLpwQfyFRdJl9EhaXUkfHEY,26772
-datashare_python/worker-template.tar.gz,sha256=NjG5Ds1-TW_QwG31yYYROfNurHu2U8fv2A57O85TEnU,280872
+datashare_python/utils.py,sha256=NrQFMGzpp_r59zIS7CJcPbVo73SzZuNThYS-xL_yeoY,27345
+datashare_python/worker-template.tar.gz,sha256=yAD952Qhc0NG5NwWkqZXiwENB-5UeFeE_k2BTgdWdaU,280874
 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.10.6.dist-info/METADATA,sha256=eO-0j7ZIjMv6q6FBoP9-EQLhj88cn8zwLorTgqhm53Y,1012
-datashare_python-0.10.6.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
-datashare_python-0.10.6.dist-info/entry_points.txt,sha256=ILE7auxabHWiu3GC-AunWnzjhOI_SbZp7D4GqZHlLw4,68
-datashare_python-0.10.6.dist-info/RECORD,,
+datashare_python-0.10.7.dist-info/METADATA,sha256=VDBO1jkZX_4Vjp6iQUi_PnhGmuT9yfFw5nMB3q5725k,1012
+datashare_python-0.10.7.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
+datashare_python-0.10.7.dist-info/entry_points.txt,sha256=ILE7auxabHWiu3GC-AunWnzjhOI_SbZp7D4GqZHlLw4,68
+datashare_python-0.10.7.dist-info/RECORD,,