From 7a7fa49347f8c4324d6a776a8836a5eb47c8d7f9 Mon Sep 17 00:00:00 2001 From: Martin Traverse Date: Thu, 31 Oct 2024 02:03:23 +0000 Subject: [PATCH] Minor fixes and tidy-ups --- .../tracdap-metadata/src/main/proto/tracdap/metadata/job.proto | 2 +- tracdap-runtime/python/src/tracdap/rt/_exec/dev_mode.py | 2 +- tracdap-runtime/python/src/tracdap/rt/_exec/functions.py | 2 +- tracdap-runtime/python/src/tracdap/rt/_exec/graph.py | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tracdap-api/tracdap-metadata/src/main/proto/tracdap/metadata/job.proto b/tracdap-api/tracdap-metadata/src/main/proto/tracdap/metadata/job.proto index d364ce36b..9f7761b4f 100644 --- a/tracdap-api/tracdap-metadata/src/main/proto/tracdap/metadata/job.proto +++ b/tracdap-api/tracdap-metadata/src/main/proto/tracdap/metadata/job.proto @@ -197,7 +197,7 @@ message ExportDataJob { * Specify the group type for a JOB_GROUP job */ enum JobGroupType { - EMPTY_JOB_GROUP = 0; + JOB_GROUP_TYPE_NOT_SET = 0; SEQUENTIAL_JOB_GROUP = 1; PARALLEL_JOB_GROUP = 2; } diff --git a/tracdap-runtime/python/src/tracdap/rt/_exec/dev_mode.py b/tracdap-runtime/python/src/tracdap/rt/_exec/dev_mode.py index 7c6cadba3..94a8cb8d9 100644 --- a/tracdap-runtime/python/src/tracdap/rt/_exec/dev_mode.py +++ b/tracdap-runtime/python/src/tracdap/rt/_exec/dev_mode.py @@ -199,7 +199,7 @@ def translate_job_group( job_group = job_def.jobGroup - if job_group.jobGroupType is None or job_group.jobGroupType == _meta.JobGroupType.EMPTY_JOB_GROUP: + if job_group.jobGroupType is None or job_group.jobGroupType == _meta.JobGroupType.JOB_GROUP_TYPE_NOT_SET: job_group = self._process_job_group_type(job_group) group_details = self._get_job_group_detail(job_group) diff --git a/tracdap-runtime/python/src/tracdap/rt/_exec/functions.py b/tracdap-runtime/python/src/tracdap/rt/_exec/functions.py index 132ff23a8..17ee04790 100644 --- a/tracdap-runtime/python/src/tracdap/rt/_exec/functions.py +++ b/tracdap-runtime/python/src/tracdap/rt/_exec/functions.py @@ -715,7 +715,7 @@ def __init__(self, node: ChildJobNode): def _execute(self, ctx: NodeContext): # This node should never execute, the engine intercepts child job nodes and provides special handling - raise _ex.ETracInternal("Child job was not processed correctly(this is a bug)") + raise _ex.ETracInternal("Child job was not processed correctly (this is a bug)") diff --git a/tracdap-runtime/python/src/tracdap/rt/_exec/graph.py b/tracdap-runtime/python/src/tracdap/rt/_exec/graph.py index d01ac24d6..0d008d895 100644 --- a/tracdap-runtime/python/src/tracdap/rt/_exec/graph.py +++ b/tracdap-runtime/python/src/tracdap/rt/_exec/graph.py @@ -20,6 +20,7 @@ import tracdap.rt.metadata as meta import tracdap.rt.config as cfg + _T = tp.TypeVar('_T')