diff --git a/addon/flamenco/manager/docs/Task.md b/addon/flamenco/manager/docs/Task.md index 768d2c86..bd6865ba 100644 --- a/addon/flamenco/manager/docs/Task.md +++ b/addon/flamenco/manager/docs/Task.md @@ -9,6 +9,7 @@ Name | Type | Description | Notes **created** | **datetime** | Creation timestamp | **updated** | **datetime** | Timestamp of last update. | **job_id** | **str** | | +**index_in_job** | **int** | | **name** | **str** | | **status** | [**TaskStatus**](TaskStatus.md) | | **priority** | **int** | | diff --git a/addon/flamenco/manager/docs/TaskSummary.md b/addon/flamenco/manager/docs/TaskSummary.md index ffc6bd46..d265fdfb 100644 --- a/addon/flamenco/manager/docs/TaskSummary.md +++ b/addon/flamenco/manager/docs/TaskSummary.md @@ -8,6 +8,7 @@ Name | Type | Description | Notes **id** | **str** | | **name** | **str** | | **status** | [**TaskStatus**](TaskStatus.md) | | +**index_in_job** | **int** | | **priority** | **int** | | **task_type** | **str** | | **updated** | **datetime** | | diff --git a/addon/flamenco/manager/docs/WorkerTask.md b/addon/flamenco/manager/docs/WorkerTask.md index 6db5148f..8daa8348 100644 --- a/addon/flamenco/manager/docs/WorkerTask.md +++ b/addon/flamenco/manager/docs/WorkerTask.md @@ -8,6 +8,7 @@ Name | Type | Description | Notes **id** | **str** | | **name** | **str** | | **status** | [**TaskStatus**](TaskStatus.md) | | +**index_in_job** | **int** | | **priority** | **int** | | **task_type** | **str** | | **updated** | **datetime** | | diff --git a/addon/flamenco/manager/model/task.py b/addon/flamenco/manager/model/task.py index 15f83399..84319e2c 100644 --- a/addon/flamenco/manager/model/task.py +++ b/addon/flamenco/manager/model/task.py @@ -95,6 +95,7 @@ class Task(ModelNormal): 'created': (datetime,), # noqa: E501 'updated': (datetime,), # noqa: E501 'job_id': (str,), # noqa: E501 + 'index_in_job': (int,), # noqa: E501 'name': (str,), # noqa: E501 'status': (TaskStatus,), # noqa: E501 'priority': (int,), # noqa: E501 @@ -116,6 +117,7 @@ class Task(ModelNormal): 'created': 'created', # noqa: E501 'updated': 'updated', # noqa: E501 'job_id': 'job_id', # noqa: E501 + 'index_in_job': 'index_in_job', # noqa: E501 'name': 'name', # noqa: E501 'status': 'status', # noqa: E501 'priority': 'priority', # noqa: E501 @@ -134,7 +136,7 @@ class Task(ModelNormal): @classmethod @convert_js_args_to_python_args - def _from_openapi_data(cls, id, created, updated, job_id, name, status, priority, task_type, activity, commands, *args, **kwargs): # noqa: E501 + def _from_openapi_data(cls, id, created, updated, job_id, index_in_job, name, status, priority, task_type, activity, commands, *args, **kwargs): # noqa: E501 """Task - a model defined in OpenAPI Args: @@ -142,6 +144,7 @@ class Task(ModelNormal): created (datetime): Creation timestamp updated (datetime): Timestamp of last update. job_id (str): + index_in_job (int): name (str): status (TaskStatus): priority (int): @@ -214,6 +217,7 @@ class Task(ModelNormal): self.created = created self.updated = updated self.job_id = job_id + self.index_in_job = index_in_job self.name = name self.status = status self.priority = priority @@ -240,7 +244,7 @@ class Task(ModelNormal): ]) @convert_js_args_to_python_args - def __init__(self, id, created, updated, job_id, name, status, priority, task_type, activity, commands, *args, **kwargs): # noqa: E501 + def __init__(self, id, created, updated, job_id, index_in_job, name, status, priority, task_type, activity, commands, *args, **kwargs): # noqa: E501 """Task - a model defined in OpenAPI Args: @@ -248,6 +252,7 @@ class Task(ModelNormal): created (datetime): Creation timestamp updated (datetime): Timestamp of last update. job_id (str): + index_in_job (int): name (str): status (TaskStatus): priority (int): @@ -318,6 +323,7 @@ class Task(ModelNormal): self.created = created self.updated = updated self.job_id = job_id + self.index_in_job = index_in_job self.name = name self.status = status self.priority = priority diff --git a/addon/flamenco/manager/model/task_summary.py b/addon/flamenco/manager/model/task_summary.py index 81029867..5daeb1c7 100644 --- a/addon/flamenco/manager/model/task_summary.py +++ b/addon/flamenco/manager/model/task_summary.py @@ -90,6 +90,7 @@ class TaskSummary(ModelNormal): 'id': (str,), # noqa: E501 'name': (str,), # noqa: E501 'status': (TaskStatus,), # noqa: E501 + 'index_in_job': (int,), # noqa: E501 'priority': (int,), # noqa: E501 'task_type': (str,), # noqa: E501 'updated': (datetime,), # noqa: E501 @@ -104,6 +105,7 @@ class TaskSummary(ModelNormal): 'id': 'id', # noqa: E501 'name': 'name', # noqa: E501 'status': 'status', # noqa: E501 + 'index_in_job': 'index_in_job', # noqa: E501 'priority': 'priority', # noqa: E501 'task_type': 'task_type', # noqa: E501 'updated': 'updated', # noqa: E501 @@ -116,13 +118,14 @@ class TaskSummary(ModelNormal): @classmethod @convert_js_args_to_python_args - def _from_openapi_data(cls, id, name, status, priority, task_type, updated, *args, **kwargs): # noqa: E501 + def _from_openapi_data(cls, id, name, status, index_in_job, priority, task_type, updated, *args, **kwargs): # noqa: E501 """TaskSummary - a model defined in OpenAPI Args: id (str): name (str): status (TaskStatus): + index_in_job (int): priority (int): task_type (str): updated (datetime): @@ -188,6 +191,7 @@ class TaskSummary(ModelNormal): self.id = id self.name = name self.status = status + self.index_in_job = index_in_job self.priority = priority self.task_type = task_type self.updated = updated @@ -211,13 +215,14 @@ class TaskSummary(ModelNormal): ]) @convert_js_args_to_python_args - def __init__(self, id, name, status, priority, task_type, updated, *args, **kwargs): # noqa: E501 + def __init__(self, id, name, status, index_in_job, priority, task_type, updated, *args, **kwargs): # noqa: E501 """TaskSummary - a model defined in OpenAPI Args: id (str): name (str): status (TaskStatus): + index_in_job (int): priority (int): task_type (str): updated (datetime): @@ -281,6 +286,7 @@ class TaskSummary(ModelNormal): self.id = id self.name = name self.status = status + self.index_in_job = index_in_job self.priority = priority self.task_type = task_type self.updated = updated diff --git a/addon/flamenco/manager/model/worker_task.py b/addon/flamenco/manager/model/worker_task.py index ce3b02f3..b5641abc 100644 --- a/addon/flamenco/manager/model/worker_task.py +++ b/addon/flamenco/manager/model/worker_task.py @@ -94,6 +94,7 @@ class WorkerTask(ModelComposed): 'id': (str,), # noqa: E501 'name': (str,), # noqa: E501 'status': (TaskStatus,), # noqa: E501 + 'index_in_job': (int,), # noqa: E501 'priority': (int,), # noqa: E501 'task_type': (str,), # noqa: E501 'updated': (datetime,), # noqa: E501 @@ -109,6 +110,7 @@ class WorkerTask(ModelComposed): 'id': 'id', # noqa: E501 'name': 'name', # noqa: E501 'status': 'status', # noqa: E501 + 'index_in_job': 'index_in_job', # noqa: E501 'priority': 'priority', # noqa: E501 'task_type': 'task_type', # noqa: E501 'updated': 'updated', # noqa: E501 @@ -127,6 +129,7 @@ class WorkerTask(ModelComposed): id (str): name (str): status (TaskStatus): + index_in_job (int): priority (int): task_type (str): updated (datetime): @@ -233,6 +236,7 @@ class WorkerTask(ModelComposed): id (str): name (str): status (TaskStatus): + index_in_job (int): priority (int): task_type (str): updated (datetime): diff --git a/pkg/api/openapi_spec.gen.go b/pkg/api/openapi_spec.gen.go index d17b80c2..5f21b7e2 100644 --- a/pkg/api/openapi_spec.gen.go +++ b/pkg/api/openapi_spec.gen.go @@ -133,120 +133,121 @@ var swaggerSpec = []string{ "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", + "AA==", } // GetSwagger returns the content of the embedded swagger specification file diff --git a/pkg/api/openapi_types.gen.go b/pkg/api/openapi_types.gen.go index 8b02b1e9..712da0f5 100644 --- a/pkg/api/openapi_types.gen.go +++ b/pkg/api/openapi_types.gen.go @@ -739,6 +739,7 @@ type Task struct { Created time.Time `json:"created"` FailedByWorkers *[]TaskWorker `json:"failed_by_workers,omitempty"` Id string `json:"id"` + IndexInJob int `json:"index_in_job"` JobId string `json:"job_id"` // Timestamp of when any worker worked on this task. @@ -779,12 +780,13 @@ type TaskStatusChange struct { // Just enough information about the task to show in the job's task list. type TaskSummary struct { - Id string `json:"id"` - Name string `json:"name"` - Priority int `json:"priority"` - Status TaskStatus `json:"status"` - TaskType string `json:"task_type"` - Updated time.Time `json:"updated"` + Id string `json:"id"` + IndexInJob int `json:"index_in_job"` + Name string `json:"name"` + Priority int `json:"priority"` + Status TaskStatus `json:"status"` + TaskType string `json:"task_type"` + Updated time.Time `json:"updated"` } // TaskUpdate is sent by a Worker to update the status & logs of a task it's executing. All properties are optional; omitted properties are ignored (i.e. omitting `activity` will not erase the activity property of the task). diff --git a/web/app/src/manager-api/model/Task.js b/web/app/src/manager-api/model/Task.js index eb8cd28a..9376c90d 100644 --- a/web/app/src/manager-api/model/Task.js +++ b/web/app/src/manager-api/model/Task.js @@ -30,6 +30,7 @@ class Task { * @param created {Date} Creation timestamp * @param updated {Date} Timestamp of last update. * @param jobId {String} + * @param indexInJob {Number} * @param name {String} * @param status {module:model/TaskStatus} * @param priority {Number} @@ -37,9 +38,9 @@ class Task { * @param activity {String} * @param commands {Array.} */ - constructor(id, created, updated, jobId, name, status, priority, taskType, activity, commands) { + constructor(id, created, updated, jobId, indexInJob, name, status, priority, taskType, activity, commands) { - Task.initialize(this, id, created, updated, jobId, name, status, priority, taskType, activity, commands); + Task.initialize(this, id, created, updated, jobId, indexInJob, name, status, priority, taskType, activity, commands); } /** @@ -47,11 +48,12 @@ class Task { * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins). * Only for internal use. */ - static initialize(obj, id, created, updated, jobId, name, status, priority, taskType, activity, commands) { + static initialize(obj, id, created, updated, jobId, indexInJob, name, status, priority, taskType, activity, commands) { obj['id'] = id; obj['created'] = created; obj['updated'] = updated; obj['job_id'] = jobId; + obj['index_in_job'] = indexInJob; obj['name'] = name; obj['status'] = status; obj['priority'] = priority; @@ -83,6 +85,9 @@ class Task { if (data.hasOwnProperty('job_id')) { obj['job_id'] = ApiClient.convertToType(data['job_id'], 'String'); } + if (data.hasOwnProperty('index_in_job')) { + obj['index_in_job'] = ApiClient.convertToType(data['index_in_job'], 'Number'); + } if (data.hasOwnProperty('name')) { obj['name'] = ApiClient.convertToType(data['name'], 'String'); } @@ -139,6 +144,11 @@ Task.prototype['updated'] = undefined; */ Task.prototype['job_id'] = undefined; +/** + * @member {Number} index_in_job + */ +Task.prototype['index_in_job'] = undefined; + /** * @member {String} name */ diff --git a/web/app/src/manager-api/model/TaskSummary.js b/web/app/src/manager-api/model/TaskSummary.js index 3f3c64a8..a58f3c4a 100644 --- a/web/app/src/manager-api/model/TaskSummary.js +++ b/web/app/src/manager-api/model/TaskSummary.js @@ -27,13 +27,14 @@ class TaskSummary { * @param id {String} * @param name {String} * @param status {module:model/TaskStatus} + * @param indexInJob {Number} * @param priority {Number} * @param taskType {String} * @param updated {Date} */ - constructor(id, name, status, priority, taskType, updated) { + constructor(id, name, status, indexInJob, priority, taskType, updated) { - TaskSummary.initialize(this, id, name, status, priority, taskType, updated); + TaskSummary.initialize(this, id, name, status, indexInJob, priority, taskType, updated); } /** @@ -41,10 +42,11 @@ class TaskSummary { * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins). * Only for internal use. */ - static initialize(obj, id, name, status, priority, taskType, updated) { + static initialize(obj, id, name, status, indexInJob, priority, taskType, updated) { obj['id'] = id; obj['name'] = name; obj['status'] = status; + obj['index_in_job'] = indexInJob; obj['priority'] = priority; obj['task_type'] = taskType; obj['updated'] = updated; @@ -70,6 +72,9 @@ class TaskSummary { if (data.hasOwnProperty('status')) { obj['status'] = TaskStatus.constructFromObject(data['status']); } + if (data.hasOwnProperty('index_in_job')) { + obj['index_in_job'] = ApiClient.convertToType(data['index_in_job'], 'Number'); + } if (data.hasOwnProperty('priority')) { obj['priority'] = ApiClient.convertToType(data['priority'], 'Number'); } @@ -101,6 +106,11 @@ TaskSummary.prototype['name'] = undefined; */ TaskSummary.prototype['status'] = undefined; +/** + * @member {Number} index_in_job + */ +TaskSummary.prototype['index_in_job'] = undefined; + /** * @member {Number} priority */ diff --git a/web/app/src/manager-api/model/WorkerTask.js b/web/app/src/manager-api/model/WorkerTask.js index 06c5193e..4b2a85c8 100644 --- a/web/app/src/manager-api/model/WorkerTask.js +++ b/web/app/src/manager-api/model/WorkerTask.js @@ -31,14 +31,15 @@ class WorkerTask { * @param id {String} * @param name {String} * @param status {module:model/TaskStatus} + * @param indexInJob {Number} * @param priority {Number} * @param taskType {String} * @param updated {Date} * @param jobId {String} */ - constructor(id, name, status, priority, taskType, updated, jobId) { - TaskSummary.initialize(this, id, name, status, priority, taskType, updated);WorkerTaskAllOf.initialize(this, jobId); - WorkerTask.initialize(this, id, name, status, priority, taskType, updated, jobId); + constructor(id, name, status, indexInJob, priority, taskType, updated, jobId) { + TaskSummary.initialize(this, id, name, status, indexInJob, priority, taskType, updated);WorkerTaskAllOf.initialize(this, jobId); + WorkerTask.initialize(this, id, name, status, indexInJob, priority, taskType, updated, jobId); } /** @@ -46,10 +47,11 @@ class WorkerTask { * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins). * Only for internal use. */ - static initialize(obj, id, name, status, priority, taskType, updated, jobId) { + static initialize(obj, id, name, status, indexInJob, priority, taskType, updated, jobId) { obj['id'] = id; obj['name'] = name; obj['status'] = status; + obj['index_in_job'] = indexInJob; obj['priority'] = priority; obj['task_type'] = taskType; obj['updated'] = updated; @@ -78,6 +80,9 @@ class WorkerTask { if (data.hasOwnProperty('status')) { obj['status'] = TaskStatus.constructFromObject(data['status']); } + if (data.hasOwnProperty('index_in_job')) { + obj['index_in_job'] = ApiClient.convertToType(data['index_in_job'], 'Number'); + } if (data.hasOwnProperty('priority')) { obj['priority'] = ApiClient.convertToType(data['priority'], 'Number'); } @@ -112,6 +117,11 @@ WorkerTask.prototype['name'] = undefined; */ WorkerTask.prototype['status'] = undefined; +/** + * @member {Number} index_in_job + */ +WorkerTask.prototype['index_in_job'] = undefined; + /** * @member {Number} priority */ @@ -146,6 +156,10 @@ TaskSummary.prototype['name'] = undefined; * @member {module:model/TaskStatus} status */ TaskSummary.prototype['status'] = undefined; +/** + * @member {Number} index_in_job + */ +TaskSummary.prototype['index_in_job'] = undefined; /** * @member {Number} priority */