earthkit-workflows 0.3.1__py3-none-any.whl → 0.3.3__py3-none-any.whl

cascade/gateway/router.py

@@ -186,6 +186,8 @@ class JobRouter:
         for job_id, proc in self.procs.items():
             logger.debug(f"awaiting job {job_id}")
             try:
+                proc.terminate()
                 proc.wait(2)
             except subprocess.TimeoutExpired:
-                logger.error(f"{job_id=} failed to terminate")
+                logger.error(f"{job_id=} failed to terminate, killing")
+                proc.kill()

cascade/low/func.py

@@ -17,6 +17,7 @@ from typing import (
     Generic,
     Iterable,
     Iterator,
+    Mapping,
     NoReturn,
     Optional,
     Protocol,
@@ -155,3 +156,39 @@ def resolve_callable(s: str) -> Callable:
         module_name, function_name = s.rsplit(".", 1)
         module = importlib.import_module(module_name)
         return module.__dict__[function_name]
+
+
+def pydantic_recursive_collect(
+    base: BaseModel | Iterable, attr: str, prefix: str = "."
+) -> list[tuple[str, Any]]:
+    """Recurse into base, visiting each sub-model, list, dictionary, etc, invoking `attr` if present
+    and collecting results. Assumes the `attr` has signature `Callable[[self], list[T]]`. The collected
+    results are (source, item), where item is returned by `attr` and source is the dot-separated path
+    of the issuer -- eg if base has BaseModel field `x` whose `attr` yields [1, 2], then this returns
+    [(.x, 1), (.x, 2)]
+    """
+
+    # NOTE a bit ugly, instead of attr it would be better to accept a signature/protocol type
+
+    results: list[str] = []
+    if hasattr(base, attr):
+        results.extend((prefix, e) for e in getattr(base, attr)())
+    generator: Iterable[tuple[Any, Any]]
+    if isinstance(base, BaseModel):
+        generator = base
+        formatter = lambda k: f"{k}."
+    elif isinstance(base, Mapping):
+        generator = base.items()
+        formatter = lambda k: f"{k}."
+    elif isinstance(base, Iterable):
+        generator = enumerate(base)
+        formatter = lambda k: f"[{k}]."
+    else:
+        return results
+    for k, v in generator:
+        # we exclude the string as a circuit-breaker optimisation
+        if isinstance(v, str):
+            continue
+        if isinstance(v, BaseModel) or isinstance(v, Iterable):
+            results.extend(pydantic_recursive_collect(v, attr, prefix + formatter(k)))
+    return results

earthkit/workflows/_version.py

@@ -1,2 +1,2 @@
 # Do not change! Do not track in version control!
-__version__ = "0.3.1"
+__version__ = "0.3.3"

{earthkit_workflows-0.3.1.dist-info → earthkit_workflows-0.3.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: earthkit-workflows
-Version: 0.3.1
+Version: 0.3.3
 Summary: Earthkit Workflows is a Python library for declaring earthkit task DAGs, as well as scheduling and executing them on heterogeneous computing systems.
 Author-email: "European Centre for Medium-Range Weather Forecasts (ECMWF)" <software.support@ecmwf.int>
 License-Expression: Apache-2.0

{earthkit_workflows-0.3.1.dist-info → earthkit_workflows-0.3.3.dist-info}/RECORD

@@ -29,13 +29,13 @@ cascade/gateway/__init__.py,sha256=1EzMKdLFXEucj0YWOlyVqLx4suOntitwM03T_rRubIk,8
 cascade/gateway/__main__.py,sha256=OcT5Amo0tE1-3StHuTOeQCaABmMBO3XLDK4t4b8oeeQ,647
 cascade/gateway/api.py,sha256=-7HTUhK9idszVCwiVwyHMcNx7n6qRcyPWsLx2e19n3A,2511
 cascade/gateway/client.py,sha256=tc-BXDXb0h7gjLMveATR8yOFqFT9fd7fXdx3PjIcTHs,4022
-cascade/gateway/router.py,sha256=vbTeHpvorGnTR3LU_j_GG0exOHZDCbDPtAHDuaPSBXU,7084
+cascade/gateway/router.py,sha256=p1QT7cMAzLgmfvNYqEtENsnHPPzDbIXcnNuWoI5aejM,7154
 cascade/gateway/server.py,sha256=srqmtOuzzon5GV5jR1wUVh744Ct336BQs5Gzd3mhsPA,3733
 cascade/low/__init__.py,sha256=5cw2taOGITK_gFbICftzK2YLdEAnLUY5OzblFzdHss4,769
 cascade/low/builders.py,sha256=_u5X8G_EF00hFt8Anv9AXo6yPf1O8MHDmqs2kKmREl0,7073
 cascade/low/core.py,sha256=txya9rgks2b1ze9yLvFvrZCs8sCCtDUlfNwz4sHgybM,5994
 cascade/low/execution_context.py,sha256=BJ9rc-vpm9eOLpAFFexEliUawr6r-DCDtFgTEKYftCA,6215
-cascade/low/func.py,sha256=w2X9irSOwbkSgwRbpAXps8YpISoSlhWU_Df4DN82KEc,3708
+cascade/low/func.py,sha256=ihL5n3cK-IJnATgP4Dub2m-Mp_jHMxJzCA1v4uMEsi8,5211
 cascade/low/into.py,sha256=QvjrcBuHfu7qpEkeB0EJu1EAaRxOEZskUnyjkRJ_9gA,3391
 cascade/low/tracing.py,sha256=qvGVKB1huwcYoyvMYN-2wQ92pLQTErocTjpIjWv9glA,4511
 cascade/low/views.py,sha256=UwafO2EQHre17GjG8hdzO8b6qBRtTRtDlhOc1pTf8Io,1822
@@ -53,7 +53,7 @@ cascade/shm/disk.py,sha256=Fdl_pKOseaXroRp01OwqWVsdI-sSmiFizIFCdxBuMWM,2653
 cascade/shm/func.py,sha256=ZWikgnSLCmbSoW2LDRJwtjxdwTxkR00OUHAsIRQ-ChE,638
 cascade/shm/server.py,sha256=5Ub9bnBmDto9BwfjX3h3sJeiLzZN4lawgtLfvK-vcMU,5036
 earthkit/workflows/__init__.py,sha256=f17AdiV9g4eRN8m4dUnSU58RoLRqk1e6iMRrQiBUSKk,1880
-earthkit/workflows/_version.py,sha256=9hFWBL09VYa_AGad8HlcImH1F5wocwnWBbYnJeWTiQU,72
+earthkit/workflows/_version.py,sha256=JTDTUt1BYSv9yiR48Riwpm5YvK2xpFLe9Yl8KX1W8i0,72
 earthkit/workflows/decorators.py,sha256=DM4QAtQ2glUUcDecwPkXcdlu4dio7MvgpcdmU5LYvD8,937
 earthkit/workflows/fluent.py,sha256=OpN2ncU0UeIyvDcdMe4woH7ZGtUhxFMB3ZQTU0nCshU,30141
 earthkit/workflows/mark.py,sha256=PdsXmRfhw1SyyJ74mzFPsLRqMCdlYv556fFX4bqlh9Y,1319
@@ -83,8 +83,8 @@ earthkit/workflows/graph/split.py,sha256=t-Sji5eZb01QO1szqmDNTodDDALqdo-0R0x1ESs
 earthkit/workflows/graph/transform.py,sha256=BZ8n7ePUnuGgoHkMqZC3SLzifu4oq6q6t6vka0khFtg,3842
 earthkit/workflows/graph/visit.py,sha256=MP-aFSqOl7aqJY2i7QTgY4epqb6yM7_lK3ofvOqfahw,1755
 earthkit/workflows/plugins/__init__.py,sha256=WcX4qbEhgTXabIbogydtzNmZ2tB_SuW6NzNkOYQfS-Y,61
-earthkit_workflows-0.3.1.dist-info/licenses/LICENSE,sha256=73MJ7twXMKnWwmzmrMiFwUeY7c6JTvxphVggeUq9Sq4,11381
-earthkit_workflows-0.3.1.dist-info/METADATA,sha256=M2OT8EmhpvrAqW26_aiWpptmQb8lQSp8DyA8W8Cina0,1571
-earthkit_workflows-0.3.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-earthkit_workflows-0.3.1.dist-info/top_level.txt,sha256=oNrH3Km3hK5kDkTOiM-8G8OQglvZcy-gUKy7rlooWXs,17
-earthkit_workflows-0.3.1.dist-info/RECORD,,
+earthkit_workflows-0.3.3.dist-info/licenses/LICENSE,sha256=73MJ7twXMKnWwmzmrMiFwUeY7c6JTvxphVggeUq9Sq4,11381
+earthkit_workflows-0.3.3.dist-info/METADATA,sha256=DVMvtcARGr5s402T0-LXONNHc-OZyZgT-8fkT6s-sVg,1571
+earthkit_workflows-0.3.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+earthkit_workflows-0.3.3.dist-info/top_level.txt,sha256=oNrH3Km3hK5kDkTOiM-8G8OQglvZcy-gUKy7rlooWXs,17
+earthkit_workflows-0.3.3.dist-info/RECORD,,