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

datashare_python/config.py

@@ -1,5 +1,6 @@
+from datetime import timedelta
 from enum import StrEnum
-from typing import Literal
+from typing import TYPE_CHECKING, Literal
 
 from icij_common.es import ESClient
 from icij_common.pydantic_utils import ICIJSettings
@@ -12,7 +13,9 @@ import datashare_python
 from .objects import BaseModel, WorkerPaths
 from .task_client import DatashareTaskClient
 from .types_ import TemporalClient
-from .utils import PYDANTIC_DATA_CONVERTER, SharedResources, close_cm_callback
+
+if TYPE_CHECKING:
+    from .utils import SharedResources
 
 _ALL_LOGGERS = [datashare_python.__name__]
 
@@ -63,6 +66,8 @@ class TemporalClientConfig(BaseModel):
     _client: TemporalClient | None = PrivateAttr(default=None)
 
     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:
@@ -70,6 +75,7 @@ class TemporalClientConfig(BaseModel):
                     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,
@@ -97,7 +103,9 @@ class ResourceCacheConfig(BaseModel):
     size: int = 1
     exit_context_managers: bool = True
 
-    def to_resource_cache(self) -> SharedResources:
+    def to_resource_cache(self) -> "SharedResources":
+        from .utils import SharedResources, close_cm_callback  # noqa: PLC0415
+
         eviction_callback = None
         if self.exit_context_managers:
             eviction_callback = close_cm_callback
@@ -134,3 +142,8 @@ class WorkerConfig(ICIJSettings, BaseModel):
 
     async def to_temporal_client(self) -> TemporalClient:
         return await self.temporal.to_client()
+
+
+class ActivityTimeouts(BaseModel):
+    start_to_close: timedelta | None = None
+    heartbeat: timedelta = timedelta(minutes=1)

datashare_python/mimetypes_.py

@@ -418,6 +418,7 @@ def types_map() -> dict[str, set[str]]:
         ".karbon": {"application/vnd.kde.karbon"},
         ".kfo": {"application/vnd.kde.kformula"},
         ".kia": {"application/vnd.kidspiration"},
+        ".key": {"application/x-iwork-keynote-sffkey"},
         ".kml": {"application/vnd.google-earth.kml+xml"},
         ".kmz": {"application/vnd.google-earth.kmz"},
         ".kne": {"application/vnd.kinar"},

datashare_python/utils.py

@@ -21,7 +21,6 @@ from collections.abc import (
 )
 from copy import deepcopy
 from dataclasses import dataclass
-from datetime import timedelta
 from functools import cache, wraps
 from hashlib import sha256
 from io import BytesIO
@@ -47,6 +46,7 @@ from temporalio.converter import (
 )
 from temporalio.exceptions import ApplicationError
 
+from datashare_python.config import ActivityTimeouts
 from datashare_python.types_ import (
     AsyncProgressRateHandler,
     RawSyncProgressHandler,
@@ -166,10 +166,11 @@ async def execute_activity(
     arg: Any = temporalio.common._arg_unset,
     *,
     args: list | None = None,
-    start_to_close_timeout: timedelta | None = None,
-    heartbeat_timeout: timedelta = timedelta(minutes=1),
+    timeouts: ActivityTimeouts | None = None,
     retry_policy: temporalio.common.RetryPolicy | None = None,
 ) -> Any:
+    if timeouts is None:
+        timeouts = ActivityTimeouts()
     if args is None:
         args = []
     retry_policy = _retry_policy_with_default(retry_policy)
@@ -177,10 +178,10 @@ async def execute_activity(
         activity,
         arg=arg,
         args=args,
-        start_to_close_timeout=start_to_close_timeout,
         task_queue=task_queue,
         retry_policy=retry_policy,
-        heartbeat_timeout=heartbeat_timeout,
+        start_to_close_timeout=timeouts.start_to_close,
+        heartbeat_timeout=timeouts.heartbeat,
     )
 
 

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

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

@@ -1,7 +1,7 @@
 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=YybzH9QoILIMbUKGPgbgZj_ZwLFQqCRQ3mq4YSD6NWU,4158
+datashare_python/config.py,sha256=ODJrwrOTZK9D90cUbNYqSUnu5vsyMWw_IVgXpSdDYJs,4464
 datashare_python/conftest.py,sha256=hgBfg5Df9Kf0tMPvrqsrgjR6LZx1jG8WsZiVLQLHhuI,13824
 datashare_python/constants.py,sha256=-Irwd2bbnFGIkLVJi_SiQ7PM2eNW3Ia_co4SE6z4j-A,352
 datashare_python/dependencies.py,sha256=Q-BIhCwWu-GGp9omYNhENZ88cF0QJ8spfaMZX40mmNU,4386
@@ -9,20 +9,20 @@ datashare_python/discovery.py,sha256=3mUck2GUSKu2DSP9-MM1OdVM4FqFKqfBeSQDQZxgh2g
 datashare_python/exceptions.py,sha256=bVHEAXxDPKfxeeMC0hJXEsrJkgsKO2ESAhxWU96GA4M,496
 datashare_python/interceptors.py,sha256=-XC-y_MvGyHlZQ6jItfMRPAmKwQkQzzncpAGxceKlwM,16485
 datashare_python/logging_.py,sha256=96KNXhP-JR5ybu9dld4VLtF7v7PfiphOCR1Nio-mmUs,4483
-datashare_python/mimetypes_.py,sha256=YAtNKewLJIXuTxdYYkprK237IOOw1vUGUVNiyZRdpQU,49874
+datashare_python/mimetypes_.py,sha256=omd2g8JyN-tfZL-lmxbWsjgc987iUe5w87ZpEtbyUK0,49930
 datashare_python/objects.py,sha256=Fy9LVFMTSWsgjJBhZyJrwnWFP0PKcsw3arJ8JwpumGc,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=kiFJgGfGzk5BWugbhjQHONRqk8UVt8eJgKWW2xwbYrg,33231
-datashare_python/worker-template.tar.gz,sha256=Y5b8wrVSBT43PUMq1EzWEj8Off12htSb3TuXbZO-fiY,236089
+datashare_python/utils.py,sha256=Y0rNipGGW4yhOK6GrhXP9cdmHWMis2oFUxRsNK9eBMU,33254
+datashare_python/worker-template.tar.gz,sha256=_bJXK_gbawy0VCpTcFrV0wKp2x0qqoMc0YgFkRuOXpo,281051
 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.0.dist-info/METADATA,sha256=IFM7XeiL67zFPkHxn8oUIPUDwX4KksqSjeMx4sqil4M,1012
-datashare_python-0.12.0.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
-datashare_python-0.12.0.dist-info/entry_points.txt,sha256=ILE7auxabHWiu3GC-AunWnzjhOI_SbZp7D4GqZHlLw4,68
-datashare_python-0.12.0.dist-info/RECORD,,
+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,,