tilebox-workflows 0.43.0__py3-none-any.whl → 0.45.0__py3-none-any.whl

tilebox/workflows/runner/task_runner.py

@@ -28,13 +28,19 @@ from _tilebox.grpc.channel import open_channel
 from _tilebox.grpc.error import InternalServerError
 from tilebox.datasets.sync.dataset import DatasetClient
 from tilebox.workflows.cache import JobCache
-from tilebox.workflows.data import ComputedTask, Idling, NextTaskToRun, ProgressBar, Task, TaskLease
+from tilebox.workflows.data import ComputedTask, Idling, NextTaskToRun, ProgressIndicator, Task, TaskLease
 from tilebox.workflows.interceptors import Interceptor, InterceptorType
 from tilebox.workflows.observability.logging import get_logger
 from tilebox.workflows.observability.tracing import WorkflowTracer
 from tilebox.workflows.runner.task_service import TaskService
 from tilebox.workflows.task import ExecutionContext as ExecutionContextBase
-from tilebox.workflows.task import FutureTask, ProgressUpdate, RunnerContext, TaskMeta
+from tilebox.workflows.task import (
+    FutureTask,
+    ProgressUpdate,
+    RunnerContext,
+    TaskMeta,
+    merge_future_tasks_to_submissions,
+)
 from tilebox.workflows.task import Task as TaskInstance
 
 # The time we give a task to finish it's execution when a runner shutdown is requested before we forcefully stop it
@@ -56,7 +62,7 @@ _FALLBACK_POLL_INTERVAL = timedelta(seconds=5)
 _FALLBACK_JITTER_INTERVAL = timedelta(seconds=5)
 
 # Maximum number of progress bars per task, mirroring the limit on the server side
-_MAX_TASK_PROGRESS_BARS = 1000
+_MAX_TASK_PROGRESS_INDICATORS = 1000
 
 WrappedFnReturnT = TypeVar("WrappedFnReturnT")
 
@@ -217,7 +223,7 @@ class _GracefulShutdown:
             if self._task is not None:
                 progress = []
                 if self._context is not None:
-                    progress = _mutable_progress_bars_to_progress_updates(self._context._progress_bars)  # noqa: SLF001
+                    progress = _finalize_mutable_progress_trackers(self._context._progress_indicators)  # noqa: SLF001
                 self._service.task_failed(
                     self._task,
                     RunnerShutdown("Task was interrupted"),
@@ -431,7 +437,7 @@ class TaskRunner:
 
             task_failed_retry = _retry_backoff(self._service.task_failed, stop=shutdown_context.stop_if_shutting_down())
             cancel_job = True
-            progress_updates = _mutable_progress_bars_to_progress_updates(context._progress_bars)  # noqa: SLF001
+            progress_updates = _finalize_mutable_progress_trackers(context._progress_indicators)  # noqa: SLF001
             task_failed_retry(task, e, cancel_job, progress_updates)
 
         return None
@@ -489,11 +495,13 @@ class TaskRunner:
                 computed_task = ComputedTask(
                     id=task.id,
                     display=task.display,
-                    sub_tasks=[
-                        task.to_submission(self.tasks_to_run.cluster_slug)
-                        for task in context._sub_tasks  # noqa: SLF001
-                    ],
-                    progress_updates=_mutable_progress_bars_to_progress_updates(context._progress_bars),  # noqa: SLF001
+                    sub_tasks=merge_future_tasks_to_submissions(
+                        context._sub_tasks,  # noqa: SLF001
+                        # if not otherwise specified, we use the cluster of the runner for all subtasks, which is also
+                        # the cluster of the parent task
+                        self.tasks_to_run.cluster_slug,
+                    ),
+                    progress_updates=_finalize_mutable_progress_trackers(context._progress_indicators),  # noqa: SLF001
                 )
 
                 next_task_retry = _retry_backoff(self._service.next_task, stop=shutdown_context.stop_if_shutting_down())
@@ -513,20 +521,35 @@ class ExecutionContext(ExecutionContextBase):
         self.current_task = task
         self.job_cache = job_cache
         self._sub_tasks: list[FutureTask] = []
-        self._progress_bars: dict[str | None, ProgressUpdate] = {}
+        self._progress_indicators: dict[str | None, ProgressUpdate] = {}
 
     def submit_subtask(
         self,
         task: TaskInstance,
-        depends_on: list[FutureTask] | None = None,
+        depends_on: FutureTask | list[FutureTask] | None = None,
         cluster: str | None = None,
         max_retries: int = 0,
     ) -> FutureTask:
+        dependencies: list[int] = []
+
+        if depends_on is None:
+            depends_on = []
+        elif isinstance(depends_on, FutureTask):
+            depends_on = [depends_on]
+        elif not isinstance(depends_on, list):
+            raise TypeError(f"Invalid dependency. Expected FutureTask or list[FutureTask], got {type(depends_on)}")
+
+        for dep in depends_on:
+            if not isinstance(dep, FutureTask):
+                raise TypeError(f"Invalid dependency. Expected FutureTask, got {type(dep)}")
+            if dep.index >= len(self._sub_tasks):
+                raise ValueError(f"Dependent task {dep.index} does not exist")
+            dependencies.append(dep.index)
         subtask = FutureTask(
             index=len(self._sub_tasks),
             task=task,
             # cyclic dependencies are not allowed, they are detected by the server and will result in an error
-            depends_on=[d.index for d in depends_on] if depends_on is not None else [],
+            depends_on=dependencies,
             cluster=cluster,
             max_retries=max_retries,
         )
@@ -534,9 +557,15 @@ class ExecutionContext(ExecutionContextBase):
         return subtask
 
     def submit_subtasks(
-        self, tasks: Sequence[TaskInstance], cluster: str | None = None, max_retries: int = 0
+        self,
+        tasks: Sequence[TaskInstance],
+        cluster: str | None = None,
+        max_retries: int = 0,
+        depends_on: FutureTask | list[FutureTask] | None = None,
     ) -> list[FutureTask]:
-        return [self.submit_subtask(task, cluster=cluster, max_retries=max_retries) for task in tasks]
+        return [
+            self.submit_subtask(task, cluster=cluster, max_retries=max_retries, depends_on=depends_on) for task in tasks
+        ]
 
     def submit_batch(
         self, tasks: Sequence[TaskInstance], cluster: str | None = None, max_retries: int = 0
@@ -548,20 +577,20 @@ class ExecutionContext(ExecutionContextBase):
         )
         return self.submit_subtasks(tasks, cluster, max_retries)
 
-    def progress(self, label: str | None) -> ProgressUpdate:
+    def progress(self, label: str | None = None) -> ProgressUpdate:
         if label == "":
             label = None
 
-        if label in self._progress_bars:
-            return self._progress_bars[label]
+        if label in self._progress_indicators:
+            return self._progress_indicators[label]
 
         # this is our server side limit to prevent mistakes / abuse, so let's not allow to go beyond that already
         # client side
-        if len(self._progress_bars) > _MAX_TASK_PROGRESS_BARS:
-            raise ValueError(f"Cannot create more than {_MAX_TASK_PROGRESS_BARS} progress bars per task.")
+        if len(self._progress_indicators) > _MAX_TASK_PROGRESS_INDICATORS:
+            raise ValueError(f"Cannot create more than {_MAX_TASK_PROGRESS_INDICATORS} progress indicators per task.")
 
         progress_bar = ProgressUpdate(label)
-        self._progress_bars[label] = progress_bar
+        self._progress_indicators[label] = progress_bar
         return progress_bar
 
     @property
@@ -577,8 +606,10 @@ class ExecutionContext(ExecutionContextBase):
         return client.dataset(dataset_id)
 
 
-def _mutable_progress_bars_to_progress_updates(progress_bars: dict[str | None, ProgressUpdate]) -> list[ProgressBar]:
-    return [ProgressBar(label, bar._total, bar._done) for label, bar in progress_bars.items()]  # noqa: SLF001
+def _finalize_mutable_progress_trackers(
+    progress_bars: dict[str | None, ProgressUpdate],
+) -> list[ProgressIndicator]:
+    return [ProgressIndicator(label, bar._total, bar._done) for label, bar in progress_bars.items()]  # noqa: SLF001
 
 
 def _execute(task: TaskInstance, context: ExecutionContext, additional_interceptors: list[Interceptor]) -> None:

tilebox/workflows/runner/task_service.py

@@ -8,7 +8,7 @@ from tilebox.workflows.data import (
     ComputedTask,
     Idling,
     NextTaskToRun,
-    ProgressBar,
+    ProgressIndicator,
     Task,
     TaskLease,
     uuid_to_uuid_message,
@@ -48,7 +48,9 @@ class TaskService:
             return Idling.from_message(response.idling)
         return None
 
-    def task_failed(self, task: Task, error: Exception, cancel_job: bool, progress_updates: list[ProgressBar]) -> None:
+    def task_failed(
+        self, task: Task, error: Exception, cancel_job: bool, progress_updates: list[ProgressIndicator]
+    ) -> None:
         # job ouptut is limited to 1KB, so truncate the error message if necessary
         error_message = repr(error)[: (1024 - len(task.display or "None") - 1)]
         display = f"{task.display}" if error_message == "" else f"{task.display}\n{error_message}"

tilebox/workflows/task.py

@@ -4,15 +4,16 @@ import json
 import typing
 from abc import ABC, ABCMeta, abstractmethod
 from base64 import b64decode, b64encode
+from collections import defaultdict
 from collections.abc import Sequence
 from dataclasses import dataclass, field, fields, is_dataclass
 from types import NoneType, UnionType
-from typing import Any, cast, get_args, get_origin
+from typing import Any, Generic, TypeVar, cast, get_args, get_origin
 
 # from python 3.11 onwards this is available as typing.dataclass_transform:
 from typing_extensions import dataclass_transform
 
-from tilebox.workflows.data import RunnerContext, TaskIdentifier, TaskSubmission
+from tilebox.workflows.data import RunnerContext, TaskIdentifier, TaskSubmissionGroup, TaskSubmissions
 
 META_ATTR = "__tilebox_task_meta__"  # the name of the attribute we use to store task metadata on the class
 
@@ -236,16 +237,96 @@ class FutureTask:
     def display(self) -> str:
         return self.task.__class__.__name__
 
-    def to_submission(self, fallback_cluster: str = "") -> TaskSubmission:
-        return TaskSubmission(
-            cluster_slug=self.cluster or fallback_cluster,
-            identifier=self.identifier(),
-            input=self.input(),
-            display=self.display(),
-            dependencies=self.depends_on,
-            max_retries=self.max_retries,
+
+_T = TypeVar("_T")
+
+
+class _FastIndexLookupList(Generic[_T]):
+    """A list that provides fast lookup by index."""
+
+    def __init__(self) -> None:
+        super().__init__()
+        self.values = []
+        self._index_lookup: dict[_T, int] = {}
+
+    def __contains__(self, key: _T) -> bool:
+        return key in self._index_lookup
+
+    def __getitem__(self, key: _T) -> _T:
+        index = self._index_lookup[key]
+        return self.values[index]
+
+    def append_if_unique(self, value: _T) -> int:
+        if value in self._index_lookup:
+            return self._index_lookup[value]
+        index = len(self.values)
+        self.values.append(value)
+        self._index_lookup[value] = index
+        return index
+
+
+def merge_future_tasks_to_submissions(future_tasks: list[FutureTask], fallback_cluster: str) -> TaskSubmissions | None:
+    if len(future_tasks) == 0:
+        return None
+
+    dependants = defaultdict(set)
+    for task in future_tasks:
+        for dep in task.depends_on:
+            dependants[dep].add(task.index)
+
+    dependants = {k: frozenset(v) for k, v in dependants.items()}
+
+    # we keep track of which task ends up in which group, so we can convert task dependencies to group dependencies
+    task_index_to_group = {}
+
+    group_keys = _FastIndexLookupList[_TaskGroupUniqueKey]()
+    groups: list[TaskSubmissionGroup] = []
+    # even though in python dicts preserve insertion order, we explicitly keep a list and an explicit lookup dict, to
+    # make the intent clear. This also allows us to more easily port this code to Tilebox clients in other languages.
+    cluster_slugs = _FastIndexLookupList[str]()
+    identifiers = _FastIndexLookupList[TaskIdentifier]()
+    displays = _FastIndexLookupList[str]()
+
+    for task in future_tasks:
+        group_key = _TaskGroupUniqueKey(
+            dependencies=frozenset(task.depends_on),
+            dependants=dependants.get(task.index, frozenset()),
+        )
+        group_index = group_keys.append_if_unique(group_key)
+        if group_index == len(groups):  # it was a new unique group
+            groups.append(TaskSubmissionGroup(dependencies_on_other_groups=task.depends_on))
+        task_index_to_group[task.index] = group_index
+
+    for i in range(len(groups)):
+        group = groups[i]
+        group.dependencies_on_other_groups = list(
+            # convert the task dependencies to group dependencies, deduplicate and sort them
+            {task_index_to_group[dep] for dep in group.dependencies_on_other_groups}
         )
 
+    for task in future_tasks:
+        group_index = task_index_to_group[task.index]
+        group = groups[group_index]
+
+        group.inputs.append(task.input())
+        group.identifier_pointers.append(identifiers.append_if_unique(task.identifier()))
+        group.cluster_slug_pointers.append(cluster_slugs.append_if_unique(task.cluster or fallback_cluster))
+        group.display_pointers.append(displays.append_if_unique(task.display()))
+        group.max_retries_values.append(task.max_retries)
+
+    return TaskSubmissions(
+        task_groups=groups,
+        cluster_slug_lookup=cluster_slugs.values,
+        identifier_lookup=identifiers.values,
+        display_lookup=displays.values,
+    )
+
+
+@dataclass(frozen=True, unsafe_hash=True)
+class _TaskGroupUniqueKey:
+    dependencies: frozenset[int]
+    dependants: frozenset[int]
+
 
 class ProgressUpdate:
     def __init__(self, label: str | None) -> None:
@@ -254,10 +335,10 @@ class ProgressUpdate:
         self._done = 0
 
     def add(self, count: int) -> None:
-        """Add a given amount of total work to be done to the progress bar.
+        """Add a given amount of total work to be done to the progress indicator.
 
         Args:
-            count: The amount of work to add to the progress bar.
+            count: The amount of work to add to the progress indicator.
         """
         self._total += count
 
@@ -307,8 +388,8 @@ class ExecutionContext(ABC):
         """Get the runner context for the task runner executing the task."""
 
     @abstractmethod
-    def progress(self, label: str | None) -> ProgressUpdate:
-        """Get a progress bar instance for tracking job progress."""
+    def progress(self, label: str | None = None) -> ProgressUpdate:
+        """Get a progress indicator instance for tracking job progress."""
 
 
 def serialize_task(task: Task) -> bytes:

tilebox/workflows/workflows/v1/automation_pb2.py

@@ -29,7 +29,7 @@ from tilebox.datasets.tilebox.v1 import id_pb2 as tilebox_dot_v1_dot_id__pb2
 from tilebox.workflows.workflows.v1 import core_pb2 as workflows_dot_v1_dot_core__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1dworkflows/v1/automation.proto\x12\x0cworkflows.v1\x1a\x1b\x62uf/validate/validate.proto\x1a\x1bgoogle/protobuf/empty.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x13tilebox/v1/id.proto\x1a\x17workflows/v1/core.proto\"\x9c\x01\n\x0fStorageLocation\x12&\n\x02id\x18\x01 \x01(\x0b\x32\x0e.tilebox.v1.IDB\x06\xbaH\x03\xc8\x01\x01R\x02id\x12&\n\x08location\x18\x02 \x01(\tB\n\xbaH\x07r\x05 \x01(\x80\x04R\x08location\x12\x39\n\x04type\x18\x03 \x01(\x0e\x32\x19.workflows.v1.StorageTypeB\n\xbaH\x07\x82\x01\x04\x10\x01 \x00R\x04type\"O\n\x10StorageLocations\x12;\n\tlocations\x18\x01 \x03(\x0b\x32\x1d.workflows.v1.StorageLocationR\tlocations\"\x8a\x03\n\x13\x41utomationPrototype\x12\x1e\n\x02id\x18\x01 \x01(\x0b\x32\x0e.tilebox.v1.IDR\x02id\x12\x1e\n\x04name\x18\x02 \x01(\tB\n\xbaH\x07r\x05 \x01(\x80\x08R\x04name\x12:\n\tprototype\x18\x03 \x01(\x0b\x32\x1c.workflows.v1.TaskSubmissionR\tprototype\x12\x61\n\x16storage_event_triggers\x18\x04 \x03(\x0b\x32!.workflows.v1.StorageEventTriggerB\x08\xbaH\x05\x92\x01\x02\x10 R\x14storageEventTriggers\x12H\n\rcron_triggers\x18\x05 \x03(\x0b\x32\x19.workflows.v1.CronTriggerB\x08\xbaH\x05\x92\x01\x02\x10 R\x0c\x63ronTriggers\x12\x1a\n\x08\x64isabled\x18\x06 \x01(\x08R\x08\x64isabled:.\xbaH+\")\n\x16storage_event_triggers\n\rcron_triggers\x10\x01\"R\n\x0b\x41utomations\x12\x43\n\x0b\x61utomations\x18\x01 \x03(\x0b\x32!.workflows.v1.AutomationPrototypeR\x0b\x61utomations\"\xab\x01\n\x13StorageEventTrigger\x12\x1e\n\x02id\x18\x01 \x01(\x0b\x32\x0e.tilebox.v1.IDR\x02id\x12H\n\x10storage_location\x18\x02 \x01(\x0b\x32\x1d.workflows.v1.StorageLocationR\x0fstorageLocation\x12*\n\x0cglob_pattern\x18\x03 \x01(\tB\x07\xbaH\x04r\x02\x10\x01R\x0bglobPattern\"R\n\x0b\x43ronTrigger\x12\x1e\n\x02id\x18\x01 \x01(\x0b\x32\x0e.tilebox.v1.IDR\x02id\x12#\n\x08schedule\x18\x02 \x01(\tB\x07\xbaH\x04r\x02\x10\x01R\x08schedule\"E\n\nAutomation\x12#\n\rtrigger_event\x18\x01 \x01(\x0cR\x0ctriggerEvent\x12\x12\n\x04\x61rgs\x18\x02 \x01(\x0cR\x04\x61rgs\"\xa7\x01\n\x15TriggeredStorageEvent\x12>\n\x13storage_location_id\x18\x01 \x01(\x0b\x32\x0e.tilebox.v1.IDR\x11storageLocationId\x12\x32\n\x04type\x18\x02 \x01(\x0e\x32\x1e.workflows.v1.StorageEventTypeR\x04type\x12\x1a\n\x08location\x18\x03 \x01(\tR\x08location\"S\n\x12TriggeredCronEvent\x12=\n\x0ctrigger_time\x18\x01 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x0btriggerTime\"w\n\x17\x44\x65leteAutomationRequest\x12;\n\rautomation_id\x18\x01 \x01(\x0b\x32\x0e.tilebox.v1.IDB\x06\xbaH\x03\xc8\x01\x01R\x0c\x61utomationId\x12\x1f\n\x0b\x63\x61ncel_jobs\x18\x02 \x01(\x08R\ncancelJobs*k\n\x0bStorageType\x12\x1c\n\x18STORAGE_TYPE_UNSPECIFIED\x10\x00\x12\x14\n\x10STORAGE_TYPE_GCS\x10\x01\x12\x13\n\x0fSTORAGE_TYPE_S3\x10\x02\x12\x13\n\x0fSTORAGE_TYPE_FS\x10\x03*V\n\x10StorageEventType\x12\"\n\x1eSTORAGE_EVENT_TYPE_UNSPECIFIED\x10\x00\x12\x1e\n\x1aSTORAGE_EVENT_TYPE_CREATED\x10\x01\x32\xd1\x05\n\x11\x41utomationService\x12N\n\x14ListStorageLocations\x12\x16.google.protobuf.Empty\x1a\x1e.workflows.v1.StorageLocations\x12\x43\n\x12GetStorageLocation\x12\x0e.tilebox.v1.ID\x1a\x1d.workflows.v1.StorageLocation\x12U\n\x15\x43reateStorageLocation\x12\x1d.workflows.v1.StorageLocation\x1a\x1d.workflows.v1.StorageLocation\x12?\n\x15\x44\x65leteStorageLocation\x12\x0e.tilebox.v1.ID\x1a\x16.google.protobuf.Empty\x12\x44\n\x0fListAutomations\x12\x16.google.protobuf.Empty\x1a\x19.workflows.v1.Automations\x12\x42\n\rGetAutomation\x12\x0e.tilebox.v1.ID\x1a!.workflows.v1.AutomationPrototype\x12X\n\x10\x43reateAutomation\x12!.workflows.v1.AutomationPrototype\x1a!.workflows.v1.AutomationPrototype\x12X\n\x10UpdateAutomation\x12!.workflows.v1.AutomationPrototype\x1a!.workflows.v1.AutomationPrototype\x12Q\n\x10\x44\x65leteAutomation\x12%.workflows.v1.DeleteAutomationRequest\x1a\x16.google.protobuf.EmptyBy\n\x10\x63om.workflows.v1B\x0f\x41utomationProtoP\x01\xa2\x02\x03WXX\xaa\x02\x0cWorkflows.V1\xca\x02\x0cWorkflows\\V1\xe2\x02\x18Workflows\\V1\\GPBMetadata\xea\x02\rWorkflows::V1\x92\x03\x02\x08\x02\x62\x08\x65\x64itionsp\xe8\x07')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1dworkflows/v1/automation.proto\x12\x0cworkflows.v1\x1a\x1b\x62uf/validate/validate.proto\x1a\x1bgoogle/protobuf/empty.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x13tilebox/v1/id.proto\x1a\x17workflows/v1/core.proto\"\x9c\x01\n\x0fStorageLocation\x12&\n\x02id\x18\x01 \x01(\x0b\x32\x0e.tilebox.v1.IDB\x06\xbaH\x03\xc8\x01\x01R\x02id\x12&\n\x08location\x18\x02 \x01(\tB\n\xbaH\x07r\x05 \x01(\x80\x04R\x08location\x12\x39\n\x04type\x18\x03 \x01(\x0e\x32\x19.workflows.v1.StorageTypeB\n\xbaH\x07\x82\x01\x04\x10\x01 \x00R\x04type\"O\n\x10StorageLocations\x12;\n\tlocations\x18\x01 \x03(\x0b\x32\x1d.workflows.v1.StorageLocationR\tlocations\"\x90\x03\n\x13\x41utomationPrototype\x12\x1e\n\x02id\x18\x01 \x01(\x0b\x32\x0e.tilebox.v1.IDR\x02id\x12\x1e\n\x04name\x18\x02 \x01(\tB\n\xbaH\x07r\x05 \x01(\x80\x08R\x04name\x12@\n\tprototype\x18\x03 \x01(\x0b\x32\".workflows.v1.SingleTaskSubmissionR\tprototype\x12\x61\n\x16storage_event_triggers\x18\x04 \x03(\x0b\x32!.workflows.v1.StorageEventTriggerB\x08\xbaH\x05\x92\x01\x02\x10 R\x14storageEventTriggers\x12H\n\rcron_triggers\x18\x05 \x03(\x0b\x32\x19.workflows.v1.CronTriggerB\x08\xbaH\x05\x92\x01\x02\x10 R\x0c\x63ronTriggers\x12\x1a\n\x08\x64isabled\x18\x06 \x01(\x08R\x08\x64isabled:.\xbaH+\")\n\x16storage_event_triggers\n\rcron_triggers\x10\x01\"R\n\x0b\x41utomations\x12\x43\n\x0b\x61utomations\x18\x01 \x03(\x0b\x32!.workflows.v1.AutomationPrototypeR\x0b\x61utomations\"\xab\x01\n\x13StorageEventTrigger\x12\x1e\n\x02id\x18\x01 \x01(\x0b\x32\x0e.tilebox.v1.IDR\x02id\x12H\n\x10storage_location\x18\x02 \x01(\x0b\x32\x1d.workflows.v1.StorageLocationR\x0fstorageLocation\x12*\n\x0cglob_pattern\x18\x03 \x01(\tB\x07\xbaH\x04r\x02\x10\x01R\x0bglobPattern\"R\n\x0b\x43ronTrigger\x12\x1e\n\x02id\x18\x01 \x01(\x0b\x32\x0e.tilebox.v1.IDR\x02id\x12#\n\x08schedule\x18\x02 \x01(\tB\x07\xbaH\x04r\x02\x10\x01R\x08schedule\"E\n\nAutomation\x12#\n\rtrigger_event\x18\x01 \x01(\x0cR\x0ctriggerEvent\x12\x12\n\x04\x61rgs\x18\x02 \x01(\x0cR\x04\x61rgs\"\xa7\x01\n\x15TriggeredStorageEvent\x12>\n\x13storage_location_id\x18\x01 \x01(\x0b\x32\x0e.tilebox.v1.IDR\x11storageLocationId\x12\x32\n\x04type\x18\x02 \x01(\x0e\x32\x1e.workflows.v1.StorageEventTypeR\x04type\x12\x1a\n\x08location\x18\x03 \x01(\tR\x08location\"S\n\x12TriggeredCronEvent\x12=\n\x0ctrigger_time\x18\x01 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x0btriggerTime\"w\n\x17\x44\x65leteAutomationRequest\x12;\n\rautomation_id\x18\x01 \x01(\x0b\x32\x0e.tilebox.v1.IDB\x06\xbaH\x03\xc8\x01\x01R\x0c\x61utomationId\x12\x1f\n\x0b\x63\x61ncel_jobs\x18\x02 \x01(\x08R\ncancelJobs*k\n\x0bStorageType\x12\x1c\n\x18STORAGE_TYPE_UNSPECIFIED\x10\x00\x12\x14\n\x10STORAGE_TYPE_GCS\x10\x01\x12\x13\n\x0fSTORAGE_TYPE_S3\x10\x02\x12\x13\n\x0fSTORAGE_TYPE_FS\x10\x03*V\n\x10StorageEventType\x12\"\n\x1eSTORAGE_EVENT_TYPE_UNSPECIFIED\x10\x00\x12\x1e\n\x1aSTORAGE_EVENT_TYPE_CREATED\x10\x01\x32\xd1\x05\n\x11\x41utomationService\x12N\n\x14ListStorageLocations\x12\x16.google.protobuf.Empty\x1a\x1e.workflows.v1.StorageLocations\x12\x43\n\x12GetStorageLocation\x12\x0e.tilebox.v1.ID\x1a\x1d.workflows.v1.StorageLocation\x12U\n\x15\x43reateStorageLocation\x12\x1d.workflows.v1.StorageLocation\x1a\x1d.workflows.v1.StorageLocation\x12?\n\x15\x44\x65leteStorageLocation\x12\x0e.tilebox.v1.ID\x1a\x16.google.protobuf.Empty\x12\x44\n\x0fListAutomations\x12\x16.google.protobuf.Empty\x1a\x19.workflows.v1.Automations\x12\x42\n\rGetAutomation\x12\x0e.tilebox.v1.ID\x1a!.workflows.v1.AutomationPrototype\x12X\n\x10\x43reateAutomation\x12!.workflows.v1.AutomationPrototype\x1a!.workflows.v1.AutomationPrototype\x12X\n\x10UpdateAutomation\x12!.workflows.v1.AutomationPrototype\x1a!.workflows.v1.AutomationPrototype\x12Q\n\x10\x44\x65leteAutomation\x12%.workflows.v1.DeleteAutomationRequest\x1a\x16.google.protobuf.EmptyBy\n\x10\x63om.workflows.v1B\x0f\x41utomationProtoP\x01\xa2\x02\x03WXX\xaa\x02\x0cWorkflows.V1\xca\x02\x0cWorkflows\\V1\xe2\x02\x18Workflows\\V1\\GPBMetadata\xea\x02\rWorkflows::V1\x92\x03\x02\x08\x02\x62\x08\x65\x64itionsp\xe8\x07')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -57,30 +57,30 @@ if not _descriptor._USE_C_DESCRIPTORS:
   _globals['_CRONTRIGGER'].fields_by_name['schedule']._serialized_options = b'\272H\004r\002\020\001'
   _globals['_DELETEAUTOMATIONREQUEST'].fields_by_name['automation_id']._loaded_options = None
   _globals['_DELETEAUTOMATIONREQUEST'].fields_by_name['automation_id']._serialized_options = b'\272H\003\310\001\001'
-  _globals['_STORAGETYPE']._serialized_start=1610
-  _globals['_STORAGETYPE']._serialized_end=1717
-  _globals['_STORAGEEVENTTYPE']._serialized_start=1719
-  _globals['_STORAGEEVENTTYPE']._serialized_end=1805
+  _globals['_STORAGETYPE']._serialized_start=1616
+  _globals['_STORAGETYPE']._serialized_end=1723
+  _globals['_STORAGEEVENTTYPE']._serialized_start=1725
+  _globals['_STORAGEEVENTTYPE']._serialized_end=1811
   _globals['_STORAGELOCATION']._serialized_start=185
   _globals['_STORAGELOCATION']._serialized_end=341
   _globals['_STORAGELOCATIONS']._serialized_start=343
   _globals['_STORAGELOCATIONS']._serialized_end=422
   _globals['_AUTOMATIONPROTOTYPE']._serialized_start=425
-  _globals['_AUTOMATIONPROTOTYPE']._serialized_end=819
-  _globals['_AUTOMATIONS']._serialized_start=821
-  _globals['_AUTOMATIONS']._serialized_end=903
-  _globals['_STORAGEEVENTTRIGGER']._serialized_start=906
-  _globals['_STORAGEEVENTTRIGGER']._serialized_end=1077
-  _globals['_CRONTRIGGER']._serialized_start=1079
-  _globals['_CRONTRIGGER']._serialized_end=1161
-  _globals['_AUTOMATION']._serialized_start=1163
-  _globals['_AUTOMATION']._serialized_end=1232
-  _globals['_TRIGGEREDSTORAGEEVENT']._serialized_start=1235
-  _globals['_TRIGGEREDSTORAGEEVENT']._serialized_end=1402
-  _globals['_TRIGGEREDCRONEVENT']._serialized_start=1404
-  _globals['_TRIGGEREDCRONEVENT']._serialized_end=1487
-  _globals['_DELETEAUTOMATIONREQUEST']._serialized_start=1489
-  _globals['_DELETEAUTOMATIONREQUEST']._serialized_end=1608
-  _globals['_AUTOMATIONSERVICE']._serialized_start=1808
-  _globals['_AUTOMATIONSERVICE']._serialized_end=2529
+  _globals['_AUTOMATIONPROTOTYPE']._serialized_end=825
+  _globals['_AUTOMATIONS']._serialized_start=827
+  _globals['_AUTOMATIONS']._serialized_end=909
+  _globals['_STORAGEEVENTTRIGGER']._serialized_start=912
+  _globals['_STORAGEEVENTTRIGGER']._serialized_end=1083
+  _globals['_CRONTRIGGER']._serialized_start=1085
+  _globals['_CRONTRIGGER']._serialized_end=1167
+  _globals['_AUTOMATION']._serialized_start=1169
+  _globals['_AUTOMATION']._serialized_end=1238
+  _globals['_TRIGGEREDSTORAGEEVENT']._serialized_start=1241
+  _globals['_TRIGGEREDSTORAGEEVENT']._serialized_end=1408
+  _globals['_TRIGGEREDCRONEVENT']._serialized_start=1410
+  _globals['_TRIGGEREDCRONEVENT']._serialized_end=1493
+  _globals['_DELETEAUTOMATIONREQUEST']._serialized_start=1495
+  _globals['_DELETEAUTOMATIONREQUEST']._serialized_end=1614
+  _globals['_AUTOMATIONSERVICE']._serialized_start=1814
+  _globals['_AUTOMATIONSERVICE']._serialized_end=2535
 # @@protoc_insertion_point(module_scope)

tilebox/workflows/workflows/v1/automation_pb2.pyi

@@ -56,11 +56,11 @@ class AutomationPrototype(_message.Message):
     DISABLED_FIELD_NUMBER: _ClassVar[int]
     id: _id_pb2.ID
     name: str
-    prototype: _core_pb2.TaskSubmission
+    prototype: _core_pb2.SingleTaskSubmission
     storage_event_triggers: _containers.RepeatedCompositeFieldContainer[StorageEventTrigger]
     cron_triggers: _containers.RepeatedCompositeFieldContainer[CronTrigger]
     disabled: bool
-    def __init__(self, id: _Optional[_Union[_id_pb2.ID, _Mapping]] = ..., name: _Optional[str] = ..., prototype: _Optional[_Union[_core_pb2.TaskSubmission, _Mapping]] = ..., storage_event_triggers: _Optional[_Iterable[_Union[StorageEventTrigger, _Mapping]]] = ..., cron_triggers: _Optional[_Iterable[_Union[CronTrigger, _Mapping]]] = ..., disabled: bool = ...) -> None: ...
+    def __init__(self, id: _Optional[_Union[_id_pb2.ID, _Mapping]] = ..., name: _Optional[str] = ..., prototype: _Optional[_Union[_core_pb2.SingleTaskSubmission, _Mapping]] = ..., storage_event_triggers: _Optional[_Iterable[_Union[StorageEventTrigger, _Mapping]]] = ..., cron_triggers: _Optional[_Iterable[_Union[CronTrigger, _Mapping]]] = ..., disabled: bool = ...) -> None: ...
 
 class Automations(_message.Message):
     __slots__ = ("automations",)

tilebox/workflows/workflows/v1/core_pb2.py

@@ -28,7 +28,7 @@ from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__
 from tilebox.datasets.tilebox.v1 import id_pb2 as tilebox_dot_v1_dot_id__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x17workflows/v1/core.proto\x12\x0cworkflows.v1\x1a\x1b\x62uf/validate/validate.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x13tilebox/v1/id.proto\"^\n\x07\x43luster\x12\x12\n\x04slug\x18\x02 \x01(\tR\x04slug\x12!\n\x0c\x64isplay_name\x18\x03 \x01(\tR\x0b\x64isplayName\x12\x1c\n\tdeletable\x18\x04 \x01(\x08R\tdeletable\"\xdd\x03\n\x03Job\x12\x1e\n\x02id\x18\x01 \x01(\x0b\x32\x0e.tilebox.v1.IDR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12!\n\x0ctrace_parent\x18\x03 \x01(\tR\x0btraceParent\x12\x1a\n\x08\x63\x61nceled\x18\x05 \x01(\x08R\x08\x63\x61nceled\x12,\n\x05state\x18\x06 \x01(\x0e\x32\x16.workflows.v1.JobStateR\x05state\x12=\n\x0csubmitted_at\x18\x07 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x0bsubmittedAt\x12\x39\n\nstarted_at\x18\x08 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tstartedAt\x12@\n\x0etask_summaries\x18\t \x03(\x0b\x32\x19.workflows.v1.TaskSummaryR\rtaskSummaries\x12\x33\n\rautomation_id\x18\n \x01(\x0b\x32\x0e.tilebox.v1.IDR\x0c\x61utomationId\x12>\n\rprogress_bars\x18\x0b \x03(\x0b\x32\x19.workflows.v1.ProgressBarR\x0cprogressBarsJ\x04\x08\x04\x10\x05\"\x9f\x02\n\x0bTaskSummary\x12\x1e\n\x02id\x18\x01 \x01(\x0b\x32\x0e.tilebox.v1.IDR\x02id\x12\x18\n\x07\x64isplay\x18\x02 \x01(\tR\x07\x64isplay\x12-\n\x05state\x18\x03 \x01(\x0e\x32\x17.workflows.v1.TaskStateR\x05state\x12+\n\tparent_id\x18\x04 \x01(\x0b\x32\x0e.tilebox.v1.IDR\x08parentId\x12\x39\n\nstarted_at\x18\x06 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tstartedAt\x12\x39\n\nstopped_at\x18\x07 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tstoppedAtJ\x04\x08\x05\x10\x06\"V\n\x0bProgressBar\x12\x1d\n\x05label\x18\x01 \x01(\tB\x07\xbaH\x04r\x02\x18\x64R\x05label\x12\x14\n\x05total\x18\x02 \x01(\x04R\x05total\x12\x12\n\x04\x64one\x18\x03 \x01(\x04R\x04\x64one\"\xa2\x03\n\x04Task\x12\x1e\n\x02id\x18\x01 \x01(\x0b\x32\x0e.tilebox.v1.IDR\x02id\x12<\n\nidentifier\x18\x02 \x01(\x0b\x32\x1c.workflows.v1.TaskIdentifierR\nidentifier\x12-\n\x05state\x18\x03 \x01(\x0e\x32\x17.workflows.v1.TaskStateR\x05state\x12\x1b\n\x05input\x18\x04 \x01(\x0c\x42\x05\xaa\x01\x02\x08\x01R\x05input\x12\x1f\n\x07\x64isplay\x18\x05 \x01(\tB\x05\xaa\x01\x02\x08\x01R\x07\x64isplay\x12#\n\x03job\x18\x06 \x01(\x0b\x32\x11.workflows.v1.JobR\x03job\x12+\n\tparent_id\x18\x07 \x01(\x0b\x32\x0e.tilebox.v1.IDR\x08parentId\x12-\n\ndepends_on\x18\x08 \x03(\x0b\x32\x0e.tilebox.v1.IDR\tdependsOn\x12-\n\x05lease\x18\t \x01(\x0b\x32\x17.workflows.v1.TaskLeaseR\x05lease\x12\x1f\n\x0bretry_count\x18\n \x01(\x03R\nretryCount\"d\n\x0eTaskIdentifier\x12\x1e\n\x04name\x18\x01 \x01(\tB\n\xbaH\x07r\x05 \x01(\x80\x02R\x04name\x12\x32\n\x07version\x18\x02 \x01(\tB\x18\xbaH\x15r\x13 \x01\x32\x0f^v(\\d+)\\.(\\d+)$R\x07version\"1\n\x05Tasks\x12(\n\x05tasks\x18\x01 \x03(\x0b\x32\x12.workflows.v1.TaskR\x05tasks\"\x92\x02\n\x0eTaskSubmission\x12!\n\x0c\x63luster_slug\x18\x01 \x01(\tR\x0b\x63lusterSlug\x12<\n\nidentifier\x18\x02 \x01(\x0b\x32\x1c.workflows.v1.TaskIdentifierR\nidentifier\x12\x1e\n\x05input\x18\x03 \x01(\x0c\x42\x08\xbaH\x05z\x03\x18\x80\x08R\x05input\x12!\n\x07\x64isplay\x18\x04 \x01(\tB\x07\xbaH\x04r\x02\x10\x01R\x07\x64isplay\x12\x32\n\x0c\x64\x65pendencies\x18\x05 \x03(\x03\x42\x0e\xbaH\x0b\x92\x01\x08\"\x06\"\x04\x18?(\x00R\x0c\x64\x65pendencies\x12(\n\x0bmax_retries\x18\x06 \x01(\x03\x42\x07\xbaH\x04\"\x02(\x00R\nmaxRetries\"\xa9\x01\n\tTaskLease\x12/\n\x05lease\x18\x01 \x01(\x0b\x32\x19.google.protobuf.DurationR\x05lease\x12k\n%recommended_wait_until_next_extension\x18\x02 \x01(\x0b\x32\x19.google.protobuf.DurationR!recommendedWaitUntilNextExtension*k\n\x08JobState\x12\x19\n\x15JOB_STATE_UNSPECIFIED\x10\x00\x12\x14\n\x10JOB_STATE_QUEUED\x10\x01\x12\x15\n\x11JOB_STATE_STARTED\x10\x02\x12\x17\n\x13JOB_STATE_COMPLETED\x10\x03*\xa0\x01\n\tTaskState\x12\x1a\n\x16TASK_STATE_UNSPECIFIED\x10\x00\x12\x15\n\x11TASK_STATE_QUEUED\x10\x01\x12\x16\n\x12TASK_STATE_RUNNING\x10\x02\x12\x17\n\x13TASK_STATE_COMPUTED\x10\x03\x12\x15\n\x11TASK_STATE_FAILED\x10\x04\x12\x18\n\x14TASK_STATE_CANCELLED\x10\x05\x42s\n\x10\x63om.workflows.v1B\tCoreProtoP\x01\xa2\x02\x03WXX\xaa\x02\x0cWorkflows.V1\xca\x02\x0cWorkflows\\V1\xe2\x02\x18Workflows\\V1\\GPBMetadata\xea\x02\rWorkflows::V1\x92\x03\x02\x08\x02\x62\x08\x65\x64itionsp\xe8\x07')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x17workflows/v1/core.proto\x12\x0cworkflows.v1\x1a\x1b\x62uf/validate/validate.proto\x1a\x1egoogle/protobuf/duration.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x13tilebox/v1/id.proto\"^\n\x07\x43luster\x12\x12\n\x04slug\x18\x02 \x01(\tR\x04slug\x12!\n\x0c\x64isplay_name\x18\x03 \x01(\tR\x0b\x64isplayName\x12\x1c\n\tdeletable\x18\x04 \x01(\x08R\tdeletable\"\xe5\x04\n\x03Job\x12\x1e\n\x02id\x18\x01 \x01(\x0b\x32\x0e.tilebox.v1.IDR\x02id\x12\x12\n\x04name\x18\x02 \x01(\tR\x04name\x12!\n\x0ctrace_parent\x18\x03 \x01(\tR\x0btraceParent\x12\x1e\n\x08\x63\x61nceled\x18\x05 \x01(\x08\x42\x02\x18\x01R\x08\x63\x61nceled\x12\x43\n\x0clegacy_state\x18\x06 \x01(\x0e\x32\x1c.workflows.v1.LegacyJobStateB\x02\x18\x01R\x0blegacyState\x12=\n\x0csubmitted_at\x18\x07 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x0bsubmittedAt\x12=\n\nstarted_at\x18\x08 \x01(\x0b\x32\x1a.google.protobuf.TimestampB\x02\x18\x01R\tstartedAt\x12@\n\x0etask_summaries\x18\t \x03(\x0b\x32\x19.workflows.v1.TaskSummaryR\rtaskSummaries\x12\x33\n\rautomation_id\x18\n \x01(\x0b\x32\x0e.tilebox.v1.IDR\x0c\x61utomationId\x12\x32\n\x08progress\x18\x0b \x03(\x0b\x32\x16.workflows.v1.ProgressR\x08progress\x12,\n\x05state\x18\x0c \x01(\x0e\x32\x16.workflows.v1.JobStateR\x05state\x12\x45\n\x0f\x65xecution_stats\x18\r \x01(\x0b\x32\x1c.workflows.v1.ExecutionStatsR\x0e\x65xecutionStatsJ\x04\x08\x04\x10\x05\"\xaf\x03\n\x0e\x45xecutionStats\x12M\n\x15\x66irst_task_started_at\x18\x01 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x12\x66irstTaskStartedAt\x12K\n\x14last_task_stopped_at\x18\x02 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\x11lastTaskStoppedAt\x12<\n\x0c\x63ompute_time\x18\x03 \x01(\x0b\x32\x19.google.protobuf.DurationR\x0b\x63omputeTime\x12<\n\x0c\x65lapsed_time\x18\x04 \x01(\x0b\x32\x19.google.protobuf.DurationR\x0b\x65lapsedTime\x12 \n\x0bparallelism\x18\x05 \x01(\x01R\x0bparallelism\x12\x1f\n\x0btotal_tasks\x18\x06 \x01(\x04R\ntotalTasks\x12\x42\n\x0etasks_by_state\x18\x07 \x03(\x0b\x32\x1c.workflows.v1.TaskStateCountR\x0ctasksByState\"U\n\x0eTaskStateCount\x12-\n\x05state\x18\x01 \x01(\x0e\x32\x17.workflows.v1.TaskStateR\x05state\x12\x14\n\x05\x63ount\x18\x02 \x01(\x04R\x05\x63ount\"\x9f\x02\n\x0bTaskSummary\x12\x1e\n\x02id\x18\x01 \x01(\x0b\x32\x0e.tilebox.v1.IDR\x02id\x12\x18\n\x07\x64isplay\x18\x02 \x01(\tR\x07\x64isplay\x12-\n\x05state\x18\x03 \x01(\x0e\x32\x17.workflows.v1.TaskStateR\x05state\x12+\n\tparent_id\x18\x04 \x01(\x0b\x32\x0e.tilebox.v1.IDR\x08parentId\x12\x39\n\nstarted_at\x18\x06 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tstartedAt\x12\x39\n\nstopped_at\x18\x07 \x01(\x0b\x32\x1a.google.protobuf.TimestampR\tstoppedAtJ\x04\x08\x05\x10\x06\"S\n\x08Progress\x12\x1d\n\x05label\x18\x01 \x01(\tB\x07\xbaH\x04r\x02\x18\x64R\x05label\x12\x14\n\x05total\x18\x02 \x01(\x04R\x05total\x12\x12\n\x04\x64one\x18\x03 \x01(\x04R\x04\x64one\"\xa2\x03\n\x04Task\x12\x1e\n\x02id\x18\x01 \x01(\x0b\x32\x0e.tilebox.v1.IDR\x02id\x12<\n\nidentifier\x18\x02 \x01(\x0b\x32\x1c.workflows.v1.TaskIdentifierR\nidentifier\x12-\n\x05state\x18\x03 \x01(\x0e\x32\x17.workflows.v1.TaskStateR\x05state\x12\x1b\n\x05input\x18\x04 \x01(\x0c\x42\x05\xaa\x01\x02\x08\x01R\x05input\x12\x1f\n\x07\x64isplay\x18\x05 \x01(\tB\x05\xaa\x01\x02\x08\x01R\x07\x64isplay\x12#\n\x03job\x18\x06 \x01(\x0b\x32\x11.workflows.v1.JobR\x03job\x12+\n\tparent_id\x18\x07 \x01(\x0b\x32\x0e.tilebox.v1.IDR\x08parentId\x12-\n\ndepends_on\x18\x08 \x03(\x0b\x32\x0e.tilebox.v1.IDR\tdependsOn\x12-\n\x05lease\x18\t \x01(\x0b\x32\x17.workflows.v1.TaskLeaseR\x05lease\x12\x1f\n\x0bretry_count\x18\n \x01(\x03R\nretryCount\"d\n\x0eTaskIdentifier\x12\x1e\n\x04name\x18\x01 \x01(\tB\n\xbaH\x07r\x05 \x01(\x80\x02R\x04name\x12\x32\n\x07version\x18\x02 \x01(\tB\x18\xbaH\x15r\x13 \x01\x32\x0f^v(\\d+)\\.(\\d+)$R\x07version\"1\n\x05Tasks\x12(\n\x05tasks\x18\x01 \x03(\x0b\x32\x12.workflows.v1.TaskR\x05tasks\"\x98\x02\n\x14SingleTaskSubmission\x12!\n\x0c\x63luster_slug\x18\x01 \x01(\tR\x0b\x63lusterSlug\x12<\n\nidentifier\x18\x02 \x01(\x0b\x32\x1c.workflows.v1.TaskIdentifierR\nidentifier\x12!\n\x07\x64isplay\x18\x04 \x01(\tB\x07\xbaH\x04r\x02\x10\x01R\x07\x64isplay\x12\x32\n\x0c\x64\x65pendencies\x18\x05 \x03(\x03\x42\x0e\xbaH\x0b\x92\x01\x08\"\x06\"\x04\x18?(\x00R\x0c\x64\x65pendencies\x12(\n\x0bmax_retries\x18\x06 \x01(\x03\x42\x07\xbaH\x04\"\x02(\x00R\nmaxRetries\x12\x1e\n\x05input\x18\x03 \x01(\x0c\x42\x08\xbaH\x05z\x03\x18\x80\x10R\x05input\"\x91\x02\n\x0fTaskSubmissions\x12N\n\x0btask_groups\x18\x01 \x03(\x0b\x32!.workflows.v1.TaskSubmissionGroupB\n\xbaH\x07\x92\x01\x04\x08\x01\x10@R\ntaskGroups\x12.\n\x13\x63luster_slug_lookup\x18\x02 \x03(\tR\x11\x63lusterSlugLookup\x12I\n\x11identifier_lookup\x18\x03 \x03(\x0b\x32\x1c.workflows.v1.TaskIdentifierR\x10identifierLookup\x12\x33\n\x0e\x64isplay_lookup\x18\x04 \x03(\tB\x0c\xbaH\t\x92\x01\x06\"\x04r\x02\x10\x01R\rdisplayLookup\"\xe2\x07\n\x13TaskSubmissionGroup\x12?\n\x1c\x64\x65pendencies_on_other_groups\x18\x01 \x03(\rR\x19\x64\x65pendenciesOnOtherGroups\x12%\n\x06inputs\x18\x02 \x03(\x0c\x42\r\xbaH\n\x92\x01\x07\"\x05z\x03\x18\x80\x10R\x06inputs\x12/\n\x13identifier_pointers\x18\x03 \x03(\x04R\x12identifierPointers\x12\x32\n\x15\x63luster_slug_pointers\x18\x04 \x03(\x04R\x13\x63lusterSlugPointers\x12)\n\x10\x64isplay_pointers\x18\x05 \x03(\x04R\x0f\x64isplayPointers\x12,\n\x12max_retries_values\x18\x06 \x03(\x03R\x10maxRetriesValues:\xa4\x05\xbaH\xa0\x05\x1a\xa6\x01\n,task_submission_group.identifiers_size_match\x12?The number of inputs must match the number of task identifiers.\x1a\x35this.inputs.size() == this.identifier_pointers.size()\x1a\xa7\x01\n.task_submission_group.cluster_slugs_size_match\x12<The number of cluster slugs must match the number of inputs.\x1a\x37this.inputs.size() == this.cluster_slug_pointers.size()\x1a\xa0\x01\n)task_submission_group.displays_size_match\x12?The number of display pointers must match the number of inputs.\x1a\x32this.inputs.size() == this.display_pointers.size()\x1a\xa7\x01\n,task_submission_group.max_retries_size_match\x12\x41The number of max_retries_values must match the number of inputs.\x1a\x34this.inputs.size() == this.max_retries_values.size()\"\xa9\x01\n\tTaskLease\x12/\n\x05lease\x18\x01 \x01(\x0b\x32\x19.google.protobuf.DurationR\x05lease\x12k\n%recommended_wait_until_next_extension\x18\x02 \x01(\x0b\x32\x19.google.protobuf.DurationR!recommendedWaitUntilNextExtension*\x8d\x01\n\x0eLegacyJobState\x12 \n\x1cLEGACY_JOB_STATE_UNSPECIFIED\x10\x00\x12\x1b\n\x17LEGACY_JOB_STATE_QUEUED\x10\x01\x12\x1c\n\x18LEGACY_JOB_STATE_STARTED\x10\x02\x12\x1e\n\x1aLEGACY_JOB_STATE_COMPLETED\x10\x03*\xb3\x01\n\x08JobState\x12\x19\n\x15JOB_STATE_UNSPECIFIED\x10\x00\x12\x17\n\x13JOB_STATE_SUBMITTED\x10\x01\x12\x15\n\x11JOB_STATE_RUNNING\x10\x02\x12\x15\n\x11JOB_STATE_STARTED\x10\x03\x12\x17\n\x13JOB_STATE_COMPLETED\x10\x04\x12\x14\n\x10JOB_STATE_FAILED\x10\x05\x12\x16\n\x12JOB_STATE_CANCELED\x10\x06*\x86\x01\n\tTaskState\x12\x1a\n\x16TASK_STATE_UNSPECIFIED\x10\x00\x12\x15\n\x11TASK_STATE_QUEUED\x10\x01\x12\x16\n\x12TASK_STATE_RUNNING\x10\x02\x12\x17\n\x13TASK_STATE_COMPUTED\x10\x03\x12\x15\n\x11TASK_STATE_FAILED\x10\x04\x42s\n\x10\x63om.workflows.v1B\tCoreProtoP\x01\xa2\x02\x03WXX\xaa\x02\x0cWorkflows.V1\xca\x02\x0cWorkflows\\V1\xe2\x02\x18Workflows\\V1\\GPBMetadata\xea\x02\rWorkflows::V1\x92\x03\x02\x08\x02\x62\x08\x65\x64itionsp\xe8\x07')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -36,8 +36,14 @@ _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'workflows.v1.core_pb2', _gl
 if not _descriptor._USE_C_DESCRIPTORS:
   _globals['DESCRIPTOR']._loaded_options = None
   _globals['DESCRIPTOR']._serialized_options = b'\n\020com.workflows.v1B\tCoreProtoP\001\242\002\003WXX\252\002\014Workflows.V1\312\002\014Workflows\\V1\342\002\030Workflows\\V1\\GPBMetadata\352\002\rWorkflows::V1\222\003\002\010\002'
-  _globals['_PROGRESSBAR'].fields_by_name['label']._loaded_options = None
-  _globals['_PROGRESSBAR'].fields_by_name['label']._serialized_options = b'\272H\004r\002\030d'
+  _globals['_JOB'].fields_by_name['canceled']._loaded_options = None
+  _globals['_JOB'].fields_by_name['canceled']._serialized_options = b'\030\001'
+  _globals['_JOB'].fields_by_name['legacy_state']._loaded_options = None
+  _globals['_JOB'].fields_by_name['legacy_state']._serialized_options = b'\030\001'
+  _globals['_JOB'].fields_by_name['started_at']._loaded_options = None
+  _globals['_JOB'].fields_by_name['started_at']._serialized_options = b'\030\001'
+  _globals['_PROGRESS'].fields_by_name['label']._loaded_options = None
+  _globals['_PROGRESS'].fields_by_name['label']._serialized_options = b'\272H\004r\002\030d'
   _globals['_TASK'].fields_by_name['input']._loaded_options = None
   _globals['_TASK'].fields_by_name['input']._serialized_options = b'\252\001\002\010\001'
   _globals['_TASK'].fields_by_name['display']._loaded_options = None
@@ -46,34 +52,52 @@ if not _descriptor._USE_C_DESCRIPTORS:
   _globals['_TASKIDENTIFIER'].fields_by_name['name']._serialized_options = b'\272H\007r\005 \001(\200\002'
   _globals['_TASKIDENTIFIER'].fields_by_name['version']._loaded_options = None
   _globals['_TASKIDENTIFIER'].fields_by_name['version']._serialized_options = b'\272H\025r\023 \0012\017^v(\\d+)\\.(\\d+)$'
-  _globals['_TASKSUBMISSION'].fields_by_name['input']._loaded_options = None
-  _globals['_TASKSUBMISSION'].fields_by_name['input']._serialized_options = b'\272H\005z\003\030\200\010'
-  _globals['_TASKSUBMISSION'].fields_by_name['display']._loaded_options = None
-  _globals['_TASKSUBMISSION'].fields_by_name['display']._serialized_options = b'\272H\004r\002\020\001'
-  _globals['_TASKSUBMISSION'].fields_by_name['dependencies']._loaded_options = None
-  _globals['_TASKSUBMISSION'].fields_by_name['dependencies']._serialized_options = b'\272H\013\222\001\010\"\006\"\004\030?(\000'
-  _globals['_TASKSUBMISSION'].fields_by_name['max_retries']._loaded_options = None
-  _globals['_TASKSUBMISSION'].fields_by_name['max_retries']._serialized_options = b'\272H\004\"\002(\000'
-  _globals['_JOBSTATE']._serialized_start=2133
-  _globals['_JOBSTATE']._serialized_end=2240
-  _globals['_TASKSTATE']._serialized_start=2243
-  _globals['_TASKSTATE']._serialized_end=2403
+  _globals['_SINGLETASKSUBMISSION'].fields_by_name['display']._loaded_options = None
+  _globals['_SINGLETASKSUBMISSION'].fields_by_name['display']._serialized_options = b'\272H\004r\002\020\001'
+  _globals['_SINGLETASKSUBMISSION'].fields_by_name['dependencies']._loaded_options = None
+  _globals['_SINGLETASKSUBMISSION'].fields_by_name['dependencies']._serialized_options = b'\272H\013\222\001\010\"\006\"\004\030?(\000'
+  _globals['_SINGLETASKSUBMISSION'].fields_by_name['max_retries']._loaded_options = None
+  _globals['_SINGLETASKSUBMISSION'].fields_by_name['max_retries']._serialized_options = b'\272H\004\"\002(\000'
+  _globals['_SINGLETASKSUBMISSION'].fields_by_name['input']._loaded_options = None
+  _globals['_SINGLETASKSUBMISSION'].fields_by_name['input']._serialized_options = b'\272H\005z\003\030\200\020'
+  _globals['_TASKSUBMISSIONS'].fields_by_name['task_groups']._loaded_options = None
+  _globals['_TASKSUBMISSIONS'].fields_by_name['task_groups']._serialized_options = b'\272H\007\222\001\004\010\001\020@'
+  _globals['_TASKSUBMISSIONS'].fields_by_name['display_lookup']._loaded_options = None
+  _globals['_TASKSUBMISSIONS'].fields_by_name['display_lookup']._serialized_options = b'\272H\t\222\001\006\"\004r\002\020\001'
+  _globals['_TASKSUBMISSIONGROUP'].fields_by_name['inputs']._loaded_options = None
+  _globals['_TASKSUBMISSIONGROUP'].fields_by_name['inputs']._serialized_options = b'\272H\n\222\001\007\"\005z\003\030\200\020'
+  _globals['_TASKSUBMISSIONGROUP']._loaded_options = None
+  _globals['_TASKSUBMISSIONGROUP']._serialized_options = b'\272H\240\005\032\246\001\n,task_submission_group.identifiers_size_match\022?The number of inputs must match the number of task identifiers.\0325this.inputs.size() == this.identifier_pointers.size()\032\247\001\n.task_submission_group.cluster_slugs_size_match\022<The number of cluster slugs must match the number of inputs.\0327this.inputs.size() == this.cluster_slug_pointers.size()\032\240\001\n)task_submission_group.displays_size_match\022?The number of display pointers must match the number of inputs.\0322this.inputs.size() == this.display_pointers.size()\032\247\001\n,task_submission_group.max_retries_size_match\022AThe number of max_retries_values must match the number of inputs.\0324this.inputs.size() == this.max_retries_values.size()'
+  _globals['_LEGACYJOBSTATE']._serialized_start=4067
+  _globals['_LEGACYJOBSTATE']._serialized_end=4208
+  _globals['_JOBSTATE']._serialized_start=4211
+  _globals['_JOBSTATE']._serialized_end=4390
+  _globals['_TASKSTATE']._serialized_start=4393
+  _globals['_TASKSTATE']._serialized_end=4527
   _globals['_CLUSTER']._serialized_start=156
   _globals['_CLUSTER']._serialized_end=250
   _globals['_JOB']._serialized_start=253
-  _globals['_JOB']._serialized_end=730
-  _globals['_TASKSUMMARY']._serialized_start=733
-  _globals['_TASKSUMMARY']._serialized_end=1020
-  _globals['_PROGRESSBAR']._serialized_start=1022
-  _globals['_PROGRESSBAR']._serialized_end=1108
-  _globals['_TASK']._serialized_start=1111
-  _globals['_TASK']._serialized_end=1529
-  _globals['_TASKIDENTIFIER']._serialized_start=1531
-  _globals['_TASKIDENTIFIER']._serialized_end=1631
-  _globals['_TASKS']._serialized_start=1633
-  _globals['_TASKS']._serialized_end=1682
-  _globals['_TASKSUBMISSION']._serialized_start=1685
-  _globals['_TASKSUBMISSION']._serialized_end=1959
-  _globals['_TASKLEASE']._serialized_start=1962
-  _globals['_TASKLEASE']._serialized_end=2131
+  _globals['_JOB']._serialized_end=866
+  _globals['_EXECUTIONSTATS']._serialized_start=869
+  _globals['_EXECUTIONSTATS']._serialized_end=1300
+  _globals['_TASKSTATECOUNT']._serialized_start=1302
+  _globals['_TASKSTATECOUNT']._serialized_end=1387
+  _globals['_TASKSUMMARY']._serialized_start=1390
+  _globals['_TASKSUMMARY']._serialized_end=1677
+  _globals['_PROGRESS']._serialized_start=1679
+  _globals['_PROGRESS']._serialized_end=1762
+  _globals['_TASK']._serialized_start=1765
+  _globals['_TASK']._serialized_end=2183
+  _globals['_TASKIDENTIFIER']._serialized_start=2185
+  _globals['_TASKIDENTIFIER']._serialized_end=2285
+  _globals['_TASKS']._serialized_start=2287
+  _globals['_TASKS']._serialized_end=2336
+  _globals['_SINGLETASKSUBMISSION']._serialized_start=2339
+  _globals['_SINGLETASKSUBMISSION']._serialized_end=2619
+  _globals['_TASKSUBMISSIONS']._serialized_start=2622
+  _globals['_TASKSUBMISSIONS']._serialized_end=2895
+  _globals['_TASKSUBMISSIONGROUP']._serialized_start=2898
+  _globals['_TASKSUBMISSIONGROUP']._serialized_end=3892
+  _globals['_TASKLEASE']._serialized_start=3895
+  _globals['_TASKLEASE']._serialized_end=4064
 # @@protoc_insertion_point(module_scope)