jolt 0.9.449__py3-none-any.whl → 0.9.452__py3-none-any.whl

jolt/config.py

@@ -1,4 +1,5 @@
 from configparser import ConfigParser, NoOptionError, NoSectionError
+from datetime import timedelta
 from urllib.parse import urlparse
 import os
 import re
@@ -152,6 +153,18 @@ def get(section, key, default=None, expand=True, alias=None):
     return utils.expand(val) if expand and val is not None else val
 
 
+def getduration(section, key, default=None, alias=None):
+    value = get(section, key, default=None, alias=alias)
+    if value is None:
+        if type(default) is timedelta:
+            return default
+        elif default is not None:
+            value = str(default)
+        else:
+            return None
+    return utils.parse_duration(value)
+
+
 def getint(section, key, default=None, alias=None):
     value = get(section, key, default=default, alias=alias)
     if value is not None:

jolt/plugins/cache.py

@@ -20,7 +20,7 @@ class Cache(cache.StorageProvider):
     def __init__(self, cache):
         super().__init__()
         self._cache = cache
-        self._uri = config.get(NAME, "uri", "http://cache")
+        self._uri = config.get(NAME, "http_uri", "http://cache")
         self._uri = self._uri.rstrip("/")
         raise_error_if(not self._uri, "Cache Service URI not configured")
         self._file_uri = self._uri + "/files"

jolt/plugins/scheduler.py

@@ -33,6 +33,18 @@ NAME = "scheduler"
 TYPE = "Remote execution"
 
 
+grpc_keepalive_opts = []
+grpc_keepalive_time = config.getduration(NAME, "grpc_keepalive_time")
+grpc_keepalive_timeout = config.getduration(NAME, "grpc_keepalive_timeout")
+grpc_keepalive_without_calls = config.getboolean(NAME, "grpc_keepalive_without_calls", False)
+if grpc_keepalive_time is not None:
+    grpc_keepalive_opts.append(("grpc.keepalive_time_ms", int(grpc_keepalive_time.total_seconds() * 1000)))
+if grpc_keepalive_timeout is not None:
+    grpc_keepalive_opts.append(("grpc.keepalive_timeout_ms", int(grpc_keepalive_timeout.total_seconds() * 1000)))
+if grpc_keepalive_without_calls:
+    grpc_keepalive_opts.append(("grpc.keepalive_permit_without_calls", 1))
+
+
 def locked(func):
     """ Decorator to lock a method. """
     def _f(self, *args, **kwargs):
@@ -394,7 +406,7 @@ class RemoteSession(object):
         self.factory = factory
 
         # Address of the scheduler.
-        self.address = config.geturi(NAME, "uri", "tcp://scheduler.:9090")
+        self.address = config.geturi(NAME, "grpc_uri", "tcp://scheduler.:9090")
         raise_error_if(self.address.scheme not in ["tcp"], "Invalid scheme in scheduler URI config: {}", self.address.scheme)
         raise_error_if(not self.address.netloc, "Invalid network address in scheduler URI config: {}", self.address.netloc)
 
@@ -404,6 +416,7 @@ class RemoteSession(object):
         # GRPC channel.
         self.channel = grpc.insecure_channel(
             target=self.address.netloc,
+            options=grpc_keepalive_opts,
         )
 
         # GRPC stub for the scheduler service.
@@ -559,11 +572,11 @@ log.verbose("[Remote] Loaded")
 @click.argument("request", required=True)
 @click.pass_context
 def executor(ctx, worker, build, request):
-    address = config.geturi(NAME, "uri", "tcp://scheduler.:9090")
+    address = config.geturi(NAME, "grpc_uri", "tcp://scheduler.:9090")
     raise_error_if(address.scheme not in ["tcp"], "Invalid scheme in scheduler URI config: {}", address.scheme)
     raise_error_if(not address.netloc, "Invalid network address in scheduler URI config: {}", address.netloc)
 
-    channel = grpc.insecure_channel(address.netloc)
+    channel = grpc.insecure_channel(address.netloc, options=grpc_keepalive_opts)
     log.verbose("Waiting for GRPC channel to connect")
     grpc.channel_ready_future(channel).result()
     log.verbose("GRPC channel established: {}", address.netloc)

jolt/plugins/selfdeploy.py

@@ -159,7 +159,7 @@ def publish_artifact():
         executor.run(env)
     jolt_url = acache.location(task.artifacts[0])
     raise_error_if(not jolt_url, "Failed to deploy jolt to a remote cache")
-    cacheUrl = config.get("http", "uri", config.get("cache", "uri", "") + "/files")
+    cacheUrl = config.get("http", "uri", config.get("cache", "http_uri", "") + "/files")
     substituteUrl = config.get("selfdeploy", "baseUri")
     if cacheUrl and substituteUrl:
         return task.identity, jolt_url.replace(cacheUrl, substituteUrl)

jolt/utils.py

@@ -1,3 +1,4 @@
+from datetime import timedelta
 import blake3
 import contextlib
 import ctypes
@@ -725,3 +726,40 @@ def platform_os_arch():
             f"Unsupported platform: {uname.system} {uname.machine}"
         ) from None
     return system, architecture
+
+
+def parse_duration(value: str) -> timedelta:
+    """ Parses a duration string into a timedelta object.
+
+    Supported formats are:
+    - Nms (milliseconds)
+    - Ns (seconds)
+    - Nm (minutes)
+    - Nh (hours)
+    - Nd (days)
+    - Nw (weeks)
+
+    Where N is an integer.
+    """
+    pattern = r"^(?P<value>\d+)(?P<unit>s|m|h|d|w)$"
+    match = re.match(pattern, value)
+    if not match:
+        raise ValueError(f"Invalid duration format: {value}")
+
+    value = int(match.group("value"))
+    unit = match.group("unit")
+
+    if unit == "ms":
+        return timedelta(milliseconds=value)
+    elif unit == "s":
+        return timedelta(seconds=value)
+    elif unit == "m":
+        return timedelta(minutes=value)
+    elif unit == "h":
+        return timedelta(hours=value)
+    elif unit == "d":
+        return timedelta(days=value)
+    elif unit == "w":
+        return timedelta(weeks=value)
+
+    raise ValueError(f"Unsupported duration unit: {unit}")

jolt/version.py

@@ -1 +1 @@
-__version__ = "0.9.449"
+__version__ = "0.9.452"

{jolt-0.9.449.dist-info → jolt-0.9.452.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jolt
-Version: 0.9.449
+Version: 0.9.452
 Summary: A task executor
 Home-page: https://github.com/srand/jolt
 Author: Robert Andersson

{jolt-0.9.449.dist-info → jolt-0.9.452.dist-info}/RECORD

@@ -6,7 +6,7 @@ jolt/cli.py,sha256=9swmWPDaGpJom0aYtaoPBppKGc9EcGWC7zkrsd1aC-E,43090
 jolt/colors.py,sha256=P6vhaILGoOn8odEwQ6-z871YQoTe3HRLgS6clavwVHs,737
 jolt/common_pb2.py,sha256=Oe9cyZ4qNyS2aTunjiO7tAO3XVw8XkZ1M7TaTmss3bs,6335
 jolt/common_pb2_grpc.py,sha256=1oboBPFxaTEXt9Aw7EAj8gXHDCNMhZD2VXqocC9l_gk,159
-jolt/config.py,sha256=khzo4BNfNZoClTHVJGTWLhLBLAWH7lWj5cIdxr73Phg,9981
+jolt/config.py,sha256=flnB3Ux7hUUY6jtIcKjP2tXJfVeU8t2qyBK3Dnke574,10360
 jolt/error.py,sha256=wbYU_ip3zGHlhmjQWjEeLlmLdTpiqIeFM5zJndVQdj4,2399
 jolt/expires.py,sha256=GDagfgJOlX_z2LLIFhKHBaXI96jo1S3ca2OGWQi1oj4,2330
 jolt/filesystem.py,sha256=_e4tEvtRESUaaPAhkA1dwVXjllAkJnOVoj2bfA7ur-Y,5941
@@ -22,8 +22,8 @@ jolt/scheduler.py,sha256=2xehPvoJDLdv211UdP2cqqQs2M2L5Ozw2_GuE556Tjg,32513
 jolt/tasks.py,sha256=aB_W7jAXQ6tSFRTKjYtRqUWP4yHG_DW63VW25e_UjAk,118823
 jolt/timer.py,sha256=PE-7vmsqZpF73e_cKSsrhd36-A7fJ9_XGYI_oBWJn5w,644
 jolt/tools.py,sha256=C8cOmnxQ08NoYxLdwA8vfDTPnOdlJ6MoXFpwT2NRI24,82508
-jolt/utils.py,sha256=XkAIdiEzv8yWJnyx2H6_0L7Wy7HJB-6BtaSObmq1uOQ,19710
-jolt/version.py,sha256=g0nt1ve0ZDcY6rT7-EKeTacBTtSwRblQj1SdwoNDrIE,24
+jolt/utils.py,sha256=2pS9W3wCPoRjnqBohrjwaBnEelF_0FrJZHxtxfRlXgU,20693
+jolt/version.py,sha256=Fg1HfEWEMUadBCisnRaI9WfEC1Q385vVRIaaa85X79o,24
 jolt/version_utils.py,sha256=tNCGT6ZmSGFHW1aw2Hx1l19m-RR1UnTN6xJV1I54KRw,3900
 jolt/xmldom.py,sha256=SbygiDUMYczzWGxXa60ZguWS6Nztg8gDAirdbtjT15I,5982
 jolt/bin/fstree-darwin-x86_64,sha256=i4Ppbdr7CxsEhJzWpy3GMB5Gn5ikmskh41MyUwQS3-o,29549000
@@ -147,7 +147,7 @@ jolt/plugins/alias.py,sha256=8BXRTh1N6rGjEPk484Grelw2KPa4kLKX7LUt7bUArFI,399
 jolt/plugins/allure.py,sha256=gT46-L6ADsngemHzptALlDksp2VPRLj-0wAgPpH8qfM,10266
 jolt/plugins/autotools.py,sha256=ZIKMsmCspZbfmoDx3enelrLidXvFruAYaY2FB2k1xM4,1813
 jolt/plugins/autoweight.py,sha256=LTpma3HM1jsAx1PatDIWcddAkRw1SPhHA4Dl9H9p2lo,1245
-jolt/plugins/cache.py,sha256=8voIlVS4fjJnQE1uMA4BvHJ2B4CQQXUF93IW-_if7fs,4242
+jolt/plugins/cache.py,sha256=ADDHwsqL1hU0vSN9DATBQTGi9UFCXudWcM6ScCIrpok,4247
 jolt/plugins/cmake.py,sha256=uW314RSuoh-j6HVW8ghTJjsh3tj2K18PZr6nBeelSBU,4674
 jolt/plugins/conan.py,sha256=5d7TdQBV1dcwTFfyW-U3jrfJDTpLbnp08Ltra1zTZyc,16259
 jolt/plugins/cxx.py,sha256=UqcBIcjCphRB2ojknU4v5vRv_6i3CmIAFZS1T3dXWVc,30487
@@ -178,8 +178,8 @@ jolt/plugins/podman.py,sha256=7xrPWaJvSzsBSsEUaCwBfVtMfzx5pLUrZB7pxf8hLzs,22487
 jolt/plugins/python.py,sha256=DnouYOl2x2iZ_bnUmx5XesNIOUqSCzSg_NC6KgOZW4A,7769
 jolt/plugins/report.py,sha256=EiPuZSoxEM-fXDsHBQuRTf1xtvN_gPBodMej3E9CGx0,2695
 jolt/plugins/rust.py,sha256=xPhiUmKtAnr9RbQwkAiyFdXc3KyMrqSmo98kYtHI0rc,713
-jolt/plugins/scheduler.py,sha256=SJdRb0taOF4zhKkPfc9zg8UyvDn7rJYtbyMPC93XXsk,24560
-jolt/plugins/selfdeploy.py,sha256=oYeBefUfabf-ACEVbdyJi2n9SfAuXLK1Q12D35obZsw,6952
+jolt/plugins/scheduler.py,sha256=EzJtTUYv9bqjiDoUNX1fD1NWvXfwbm6X_BVw_vtpGLM,25312
+jolt/plugins/selfdeploy.py,sha256=nK8d4wsenenEzNE6jcPCVI2yl_C3amYx8-2MIrSYxCY,6957
 jolt/plugins/strings.py,sha256=sHDroW0srlQI1aRwu_WANkmR35sUxPvZGO28CYo-ClY,1783
 jolt/plugins/symlinks.py,sha256=u4lTcpkepf0_mr_RI85uiSkI_WAUGebAOsbH5WlAnzo,2399
 jolt/plugins/telemetry.py,sha256=xHgJVbSVRaPy67kblL4wj86mDESlFS1z3NGDJ2uDXZ8,3572
@@ -202,8 +202,8 @@ jolt/templates/cxxexecutable.cmake.template,sha256=f0dg1VOFlamlF8fuHFTki5dsJ2ssS
 jolt/templates/cxxlibrary.cmake.template,sha256=GMEG2G3QoY3E5fsNer52zOqgM221-abeCkV__mVbZ94,1750
 jolt/templates/export.sh.template,sha256=PKkflGXFbq70EIsowqcnLvzbnEDnqh_WgC4E_JNT0VE,1937
 jolt/templates/timeline.html.template,sha256=xdqvFBmhE8XRQaWgcIFBVbd__9HdRq6O-U0o276PyjU,1222
-jolt-0.9.449.dist-info/METADATA,sha256=HvB1XTqSfPlHzv6XXzWoYxHBqqgrsOY109i8TynNYoE,7252
-jolt-0.9.449.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-jolt-0.9.449.dist-info/entry_points.txt,sha256=VZ-QH38Z9HJc1O57wfzr-soHn6exwc3N0TSrRum4tYg,44
-jolt-0.9.449.dist-info/top_level.txt,sha256=HwzVmAwUrvCUUHRi3zUfcpdKTsdNrZmPCvsrsWSFyqE,5
-jolt-0.9.449.dist-info/RECORD,,
+jolt-0.9.452.dist-info/METADATA,sha256=AhCjkI9aq4fssBUdAPNsNrMiI19Q-JhQ4J000RX6_RQ,7252
+jolt-0.9.452.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+jolt-0.9.452.dist-info/entry_points.txt,sha256=VZ-QH38Z9HJc1O57wfzr-soHn6exwc3N0TSrRum4tYg,44
+jolt-0.9.452.dist-info/top_level.txt,sha256=HwzVmAwUrvCUUHRi3zUfcpdKTsdNrZmPCvsrsWSFyqE,5
+jolt-0.9.452.dist-info/RECORD,,