diff --git a/addon/flamenco/manager/__init__.py b/addon/flamenco/manager/__init__.py index c661b7ac..effdc5e4 100644 --- a/addon/flamenco/manager/__init__.py +++ b/addon/flamenco/manager/__init__.py @@ -10,7 +10,7 @@ """ -__version__ = "9d9ff77e" +__version__ = "6afb1151" # import ApiClient from flamenco.manager.api_client import ApiClient diff --git a/addon/flamenco/manager/api_client.py b/addon/flamenco/manager/api_client.py index 42d4107f..88646693 100644 --- a/addon/flamenco/manager/api_client.py +++ b/addon/flamenco/manager/api_client.py @@ -76,7 +76,7 @@ class ApiClient(object): self.default_headers[header_name] = header_value self.cookie = cookie # Set default User-Agent. - self.user_agent = 'Flamenco/9d9ff77e (Blender add-on)' + self.user_agent = 'Flamenco/6afb1151 (Blender add-on)' def __enter__(self): return self diff --git a/addon/flamenco/manager/configuration.py b/addon/flamenco/manager/configuration.py index 09420153..973035e8 100644 --- a/addon/flamenco/manager/configuration.py +++ b/addon/flamenco/manager/configuration.py @@ -404,7 +404,7 @@ conf = flamenco.manager.Configuration( "OS: {env}\n"\ "Python Version: {pyversion}\n"\ "Version of the API: 1.0.0\n"\ - "SDK Package Version: 9d9ff77e".\ + "SDK Package Version: 6afb1151".\ format(env=sys.platform, pyversion=sys.version) def get_host_settings(self): diff --git a/addon/flamenco/manager/docs/SocketIOTaskUpdate.md b/addon/flamenco/manager/docs/SocketIOTaskUpdate.md index 065a7632..ea5a0157 100644 --- a/addon/flamenco/manager/docs/SocketIOTaskUpdate.md +++ b/addon/flamenco/manager/docs/SocketIOTaskUpdate.md @@ -10,6 +10,7 @@ Name | Type | Description | Notes **name** | **str** | Name of the task | **updated** | **datetime** | Timestamp of last update | **status** | [**TaskStatus**](TaskStatus.md) | | +**activity** | **str** | | **previous_status** | [**TaskStatus**](TaskStatus.md) | | [optional] **any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional] diff --git a/addon/flamenco/manager/model/socket_io_task_update.py b/addon/flamenco/manager/model/socket_io_task_update.py index 54bfa22b..f08b70c1 100644 --- a/addon/flamenco/manager/model/socket_io_task_update.py +++ b/addon/flamenco/manager/model/socket_io_task_update.py @@ -92,6 +92,7 @@ class SocketIOTaskUpdate(ModelNormal): 'name': (str,), # noqa: E501 'updated': (datetime,), # noqa: E501 'status': (TaskStatus,), # noqa: E501 + 'activity': (str,), # noqa: E501 'previous_status': (TaskStatus,), # noqa: E501 } @@ -106,6 +107,7 @@ class SocketIOTaskUpdate(ModelNormal): 'name': 'name', # noqa: E501 'updated': 'updated', # noqa: E501 'status': 'status', # noqa: E501 + 'activity': 'activity', # noqa: E501 'previous_status': 'previous_status', # noqa: E501 } @@ -116,7 +118,7 @@ class SocketIOTaskUpdate(ModelNormal): @classmethod @convert_js_args_to_python_args - def _from_openapi_data(cls, id, job_id, name, updated, status, *args, **kwargs): # noqa: E501 + def _from_openapi_data(cls, id, job_id, name, updated, status, activity, *args, **kwargs): # noqa: E501 """SocketIOTaskUpdate - a model defined in OpenAPI Args: @@ -125,6 +127,7 @@ class SocketIOTaskUpdate(ModelNormal): name (str): Name of the task updated (datetime): Timestamp of last update status (TaskStatus): + activity (str): Keyword Args: _check_type (bool): if True, values for parameters in openapi_types @@ -190,6 +193,7 @@ class SocketIOTaskUpdate(ModelNormal): self.name = name self.updated = updated self.status = status + self.activity = activity for var_name, var_value in kwargs.items(): if var_name not in self.attribute_map and \ self._configuration is not None and \ @@ -210,7 +214,7 @@ class SocketIOTaskUpdate(ModelNormal): ]) @convert_js_args_to_python_args - def __init__(self, id, job_id, name, updated, status, *args, **kwargs): # noqa: E501 + def __init__(self, id, job_id, name, updated, status, activity, *args, **kwargs): # noqa: E501 """SocketIOTaskUpdate - a model defined in OpenAPI Args: @@ -219,6 +223,7 @@ class SocketIOTaskUpdate(ModelNormal): name (str): Name of the task updated (datetime): Timestamp of last update status (TaskStatus): + activity (str): Keyword Args: _check_type (bool): if True, values for parameters in openapi_types @@ -282,6 +287,7 @@ class SocketIOTaskUpdate(ModelNormal): self.name = name self.updated = updated self.status = status + self.activity = activity for var_name, var_value in kwargs.items(): if var_name not in self.attribute_map and \ self._configuration is not None and \ diff --git a/addon/flamenco/manager_README.md b/addon/flamenco/manager_README.md index 3492052f..e34e457a 100644 --- a/addon/flamenco/manager_README.md +++ b/addon/flamenco/manager_README.md @@ -4,7 +4,7 @@ Render Farm manager API The `flamenco.manager` package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project: - API version: 1.0.0 -- Package version: 9d9ff77e +- Package version: 6afb1151 - Build package: org.openapitools.codegen.languages.PythonClientCodegen For more information, please visit [https://flamenco.io/](https://flamenco.io/) @@ -71,80 +71,80 @@ All URIs are relative to *http://localhost* Class | Method | HTTP request | Description ------------ | ------------- | ------------- | ------------- -*JobsApi* | [**fetch_job**](flamenco/manager/docs/JobsApi.md#fetch_job) | **GET** /api/jobs/{job_id} | Fetch info about the job. -*JobsApi* | [**fetch_job_tasks**](flamenco/manager/docs/JobsApi.md#fetch_job_tasks) | **GET** /api/jobs/{job_id}/tasks | Fetch a summary of all tasks of the given job. -*JobsApi* | [**fetch_task**](flamenco/manager/docs/JobsApi.md#fetch_task) | **GET** /api/tasks/{task_id} | Fetch a single task. -*JobsApi* | [**get_job_type**](flamenco/manager/docs/JobsApi.md#get_job_type) | **GET** /api/jobs/type/{typeName} | Get single job type and its parameters. -*JobsApi* | [**get_job_types**](flamenco/manager/docs/JobsApi.md#get_job_types) | **GET** /api/jobs/types | Get list of job types and their parameters. -*JobsApi* | [**query_jobs**](flamenco/manager/docs/JobsApi.md#query_jobs) | **POST** /api/jobs/query | Fetch list of jobs. -*JobsApi* | [**set_job_status**](flamenco/manager/docs/JobsApi.md#set_job_status) | **POST** /api/jobs/{job_id}/setstatus | -*JobsApi* | [**set_task_status**](flamenco/manager/docs/JobsApi.md#set_task_status) | **POST** /api/tasks/{task_id}/setstatus | -*JobsApi* | [**submit_job**](flamenco/manager/docs/JobsApi.md#submit_job) | **POST** /api/jobs | Submit a new job for Flamenco Manager to execute. -*MetaApi* | [**get_configuration**](flamenco/manager/docs/MetaApi.md#get_configuration) | **GET** /api/configuration | Get the configuration of this Manager. -*MetaApi* | [**get_version**](flamenco/manager/docs/MetaApi.md#get_version) | **GET** /api/version | Get the Flamenco version of this Manager -*ShamanApi* | [**shaman_checkout**](flamenco/manager/docs/ShamanApi.md#shaman_checkout) | **POST** /shaman/checkout/create | Create a directory, and symlink the required files into it. The files must all have been uploaded to Shaman before calling this endpoint. -*ShamanApi* | [**shaman_checkout_requirements**](flamenco/manager/docs/ShamanApi.md#shaman_checkout_requirements) | **POST** /shaman/checkout/requirements | Checks a Shaman Requirements file, and reports which files are unknown. -*ShamanApi* | [**shaman_file_store**](flamenco/manager/docs/ShamanApi.md#shaman_file_store) | **POST** /shaman/files/{checksum}/{filesize} | Store a new file on the Shaman server. Note that the Shaman server can forcibly close the HTTP connection when another client finishes uploading the exact same file, to prevent double uploads. The file's contents should be sent in the request body. -*ShamanApi* | [**shaman_file_store_check**](flamenco/manager/docs/ShamanApi.md#shaman_file_store_check) | **GET** /shaman/files/{checksum}/{filesize} | Check the status of a file on the Shaman server. -*WorkerApi* | [**may_worker_run**](flamenco/manager/docs/WorkerApi.md#may_worker_run) | **GET** /api/worker/task/{task_id}/may-i-run | The response indicates whether the worker is allowed to run / keep running the task. Optionally contains a queued worker status change. -*WorkerApi* | [**register_worker**](flamenco/manager/docs/WorkerApi.md#register_worker) | **POST** /api/worker/register-worker | Register a new worker -*WorkerApi* | [**schedule_task**](flamenco/manager/docs/WorkerApi.md#schedule_task) | **POST** /api/worker/task | Obtain a new task to execute -*WorkerApi* | [**sign_off**](flamenco/manager/docs/WorkerApi.md#sign_off) | **POST** /api/worker/sign-off | Mark the worker as offline -*WorkerApi* | [**sign_on**](flamenco/manager/docs/WorkerApi.md#sign_on) | **POST** /api/worker/sign-on | Authenticate & sign in the worker. -*WorkerApi* | [**task_update**](flamenco/manager/docs/WorkerApi.md#task_update) | **POST** /api/worker/task/{task_id} | Update the task, typically to indicate progress, completion, or failure. -*WorkerApi* | [**worker_state**](flamenco/manager/docs/WorkerApi.md#worker_state) | **GET** /api/worker/state | -*WorkerApi* | [**worker_state_changed**](flamenco/manager/docs/WorkerApi.md#worker_state_changed) | **POST** /api/worker/state-changed | Worker changed state. This could be as acknowledgement of a Manager-requested state change, or in response to worker-local signals. +*JobsApi* | [**fetch_job**](flamenco\manager\docs/JobsApi.md#fetch_job) | **GET** /api/jobs/{job_id} | Fetch info about the job. +*JobsApi* | [**fetch_job_tasks**](flamenco\manager\docs/JobsApi.md#fetch_job_tasks) | **GET** /api/jobs/{job_id}/tasks | Fetch a summary of all tasks of the given job. +*JobsApi* | [**fetch_task**](flamenco\manager\docs/JobsApi.md#fetch_task) | **GET** /api/tasks/{task_id} | Fetch a single task. +*JobsApi* | [**get_job_type**](flamenco\manager\docs/JobsApi.md#get_job_type) | **GET** /api/jobs/type/{typeName} | Get single job type and its parameters. +*JobsApi* | [**get_job_types**](flamenco\manager\docs/JobsApi.md#get_job_types) | **GET** /api/jobs/types | Get list of job types and their parameters. +*JobsApi* | [**query_jobs**](flamenco\manager\docs/JobsApi.md#query_jobs) | **POST** /api/jobs/query | Fetch list of jobs. +*JobsApi* | [**set_job_status**](flamenco\manager\docs/JobsApi.md#set_job_status) | **POST** /api/jobs/{job_id}/setstatus | +*JobsApi* | [**set_task_status**](flamenco\manager\docs/JobsApi.md#set_task_status) | **POST** /api/tasks/{task_id}/setstatus | +*JobsApi* | [**submit_job**](flamenco\manager\docs/JobsApi.md#submit_job) | **POST** /api/jobs | Submit a new job for Flamenco Manager to execute. +*MetaApi* | [**get_configuration**](flamenco\manager\docs/MetaApi.md#get_configuration) | **GET** /api/configuration | Get the configuration of this Manager. +*MetaApi* | [**get_version**](flamenco\manager\docs/MetaApi.md#get_version) | **GET** /api/version | Get the Flamenco version of this Manager +*ShamanApi* | [**shaman_checkout**](flamenco\manager\docs/ShamanApi.md#shaman_checkout) | **POST** /shaman/checkout/create | Create a directory, and symlink the required files into it. The files must all have been uploaded to Shaman before calling this endpoint. +*ShamanApi* | [**shaman_checkout_requirements**](flamenco\manager\docs/ShamanApi.md#shaman_checkout_requirements) | **POST** /shaman/checkout/requirements | Checks a Shaman Requirements file, and reports which files are unknown. +*ShamanApi* | [**shaman_file_store**](flamenco\manager\docs/ShamanApi.md#shaman_file_store) | **POST** /shaman/files/{checksum}/{filesize} | Store a new file on the Shaman server. Note that the Shaman server can forcibly close the HTTP connection when another client finishes uploading the exact same file, to prevent double uploads. The file's contents should be sent in the request body. +*ShamanApi* | [**shaman_file_store_check**](flamenco\manager\docs/ShamanApi.md#shaman_file_store_check) | **GET** /shaman/files/{checksum}/{filesize} | Check the status of a file on the Shaman server. +*WorkerApi* | [**may_worker_run**](flamenco\manager\docs/WorkerApi.md#may_worker_run) | **GET** /api/worker/task/{task_id}/may-i-run | The response indicates whether the worker is allowed to run / keep running the task. Optionally contains a queued worker status change. +*WorkerApi* | [**register_worker**](flamenco\manager\docs/WorkerApi.md#register_worker) | **POST** /api/worker/register-worker | Register a new worker +*WorkerApi* | [**schedule_task**](flamenco\manager\docs/WorkerApi.md#schedule_task) | **POST** /api/worker/task | Obtain a new task to execute +*WorkerApi* | [**sign_off**](flamenco\manager\docs/WorkerApi.md#sign_off) | **POST** /api/worker/sign-off | Mark the worker as offline +*WorkerApi* | [**sign_on**](flamenco\manager\docs/WorkerApi.md#sign_on) | **POST** /api/worker/sign-on | Authenticate & sign in the worker. +*WorkerApi* | [**task_update**](flamenco\manager\docs/WorkerApi.md#task_update) | **POST** /api/worker/task/{task_id} | Update the task, typically to indicate progress, completion, or failure. +*WorkerApi* | [**worker_state**](flamenco\manager\docs/WorkerApi.md#worker_state) | **GET** /api/worker/state | +*WorkerApi* | [**worker_state_changed**](flamenco\manager\docs/WorkerApi.md#worker_state_changed) | **POST** /api/worker/state-changed | Worker changed state. This could be as acknowledgement of a Manager-requested state change, or in response to worker-local signals. ## Documentation For Models - - [AssignedTask](flamenco/manager/docs/AssignedTask.md) - - [AvailableJobSetting](flamenco/manager/docs/AvailableJobSetting.md) - - [AvailableJobSettingSubtype](flamenco/manager/docs/AvailableJobSettingSubtype.md) - - [AvailableJobSettingType](flamenco/manager/docs/AvailableJobSettingType.md) - - [AvailableJobType](flamenco/manager/docs/AvailableJobType.md) - - [AvailableJobTypes](flamenco/manager/docs/AvailableJobTypes.md) - - [Command](flamenco/manager/docs/Command.md) - - [Error](flamenco/manager/docs/Error.md) - - [FlamencoVersion](flamenco/manager/docs/FlamencoVersion.md) - - [Job](flamenco/manager/docs/Job.md) - - [JobAllOf](flamenco/manager/docs/JobAllOf.md) - - [JobMetadata](flamenco/manager/docs/JobMetadata.md) - - [JobSettings](flamenco/manager/docs/JobSettings.md) - - [JobStatus](flamenco/manager/docs/JobStatus.md) - - [JobStatusChange](flamenco/manager/docs/JobStatusChange.md) - - [JobTasksSummary](flamenco/manager/docs/JobTasksSummary.md) - - [JobUpdate](flamenco/manager/docs/JobUpdate.md) - - [JobsQuery](flamenco/manager/docs/JobsQuery.md) - - [JobsQueryResult](flamenco/manager/docs/JobsQueryResult.md) - - [ManagerConfiguration](flamenco/manager/docs/ManagerConfiguration.md) - - [MayKeepRunning](flamenco/manager/docs/MayKeepRunning.md) - - [RegisteredWorker](flamenco/manager/docs/RegisteredWorker.md) - - [SecurityError](flamenco/manager/docs/SecurityError.md) - - [ShamanCheckout](flamenco/manager/docs/ShamanCheckout.md) - - [ShamanCheckoutResult](flamenco/manager/docs/ShamanCheckoutResult.md) - - [ShamanFileSpec](flamenco/manager/docs/ShamanFileSpec.md) - - [ShamanFileSpecWithStatus](flamenco/manager/docs/ShamanFileSpecWithStatus.md) - - [ShamanFileStatus](flamenco/manager/docs/ShamanFileStatus.md) - - [ShamanRequirementsRequest](flamenco/manager/docs/ShamanRequirementsRequest.md) - - [ShamanRequirementsResponse](flamenco/manager/docs/ShamanRequirementsResponse.md) - - [ShamanSingleFileStatus](flamenco/manager/docs/ShamanSingleFileStatus.md) - - [SocketIOSubscription](flamenco/manager/docs/SocketIOSubscription.md) - - [SocketIOSubscriptionOperation](flamenco/manager/docs/SocketIOSubscriptionOperation.md) - - [SocketIOSubscriptionType](flamenco/manager/docs/SocketIOSubscriptionType.md) - - [SocketIOTaskUpdate](flamenco/manager/docs/SocketIOTaskUpdate.md) - - [SubmittedJob](flamenco/manager/docs/SubmittedJob.md) - - [Task](flamenco/manager/docs/Task.md) - - [TaskStatus](flamenco/manager/docs/TaskStatus.md) - - [TaskStatusChange](flamenco/manager/docs/TaskStatusChange.md) - - [TaskSummary](flamenco/manager/docs/TaskSummary.md) - - [TaskUpdate](flamenco/manager/docs/TaskUpdate.md) - - [TaskWorker](flamenco/manager/docs/TaskWorker.md) - - [WorkerRegistration](flamenco/manager/docs/WorkerRegistration.md) - - [WorkerSignOn](flamenco/manager/docs/WorkerSignOn.md) - - [WorkerStateChange](flamenco/manager/docs/WorkerStateChange.md) - - [WorkerStateChanged](flamenco/manager/docs/WorkerStateChanged.md) - - [WorkerStatus](flamenco/manager/docs/WorkerStatus.md) + - [AssignedTask](flamenco\manager\docs/AssignedTask.md) + - [AvailableJobSetting](flamenco\manager\docs/AvailableJobSetting.md) + - [AvailableJobSettingSubtype](flamenco\manager\docs/AvailableJobSettingSubtype.md) + - [AvailableJobSettingType](flamenco\manager\docs/AvailableJobSettingType.md) + - [AvailableJobType](flamenco\manager\docs/AvailableJobType.md) + - [AvailableJobTypes](flamenco\manager\docs/AvailableJobTypes.md) + - [Command](flamenco\manager\docs/Command.md) + - [Error](flamenco\manager\docs/Error.md) + - [FlamencoVersion](flamenco\manager\docs/FlamencoVersion.md) + - [Job](flamenco\manager\docs/Job.md) + - [JobAllOf](flamenco\manager\docs/JobAllOf.md) + - [JobMetadata](flamenco\manager\docs/JobMetadata.md) + - [JobSettings](flamenco\manager\docs/JobSettings.md) + - [JobStatus](flamenco\manager\docs/JobStatus.md) + - [JobStatusChange](flamenco\manager\docs/JobStatusChange.md) + - [JobTasksSummary](flamenco\manager\docs/JobTasksSummary.md) + - [JobUpdate](flamenco\manager\docs/JobUpdate.md) + - [JobsQuery](flamenco\manager\docs/JobsQuery.md) + - [JobsQueryResult](flamenco\manager\docs/JobsQueryResult.md) + - [ManagerConfiguration](flamenco\manager\docs/ManagerConfiguration.md) + - [MayKeepRunning](flamenco\manager\docs/MayKeepRunning.md) + - [RegisteredWorker](flamenco\manager\docs/RegisteredWorker.md) + - [SecurityError](flamenco\manager\docs/SecurityError.md) + - [ShamanCheckout](flamenco\manager\docs/ShamanCheckout.md) + - [ShamanCheckoutResult](flamenco\manager\docs/ShamanCheckoutResult.md) + - [ShamanFileSpec](flamenco\manager\docs/ShamanFileSpec.md) + - [ShamanFileSpecWithStatus](flamenco\manager\docs/ShamanFileSpecWithStatus.md) + - [ShamanFileStatus](flamenco\manager\docs/ShamanFileStatus.md) + - [ShamanRequirementsRequest](flamenco\manager\docs/ShamanRequirementsRequest.md) + - [ShamanRequirementsResponse](flamenco\manager\docs/ShamanRequirementsResponse.md) + - [ShamanSingleFileStatus](flamenco\manager\docs/ShamanSingleFileStatus.md) + - [SocketIOSubscription](flamenco\manager\docs/SocketIOSubscription.md) + - [SocketIOSubscriptionOperation](flamenco\manager\docs/SocketIOSubscriptionOperation.md) + - [SocketIOSubscriptionType](flamenco\manager\docs/SocketIOSubscriptionType.md) + - [SocketIOTaskUpdate](flamenco\manager\docs/SocketIOTaskUpdate.md) + - [SubmittedJob](flamenco\manager\docs/SubmittedJob.md) + - [Task](flamenco\manager\docs/Task.md) + - [TaskStatus](flamenco\manager\docs/TaskStatus.md) + - [TaskStatusChange](flamenco\manager\docs/TaskStatusChange.md) + - [TaskSummary](flamenco\manager\docs/TaskSummary.md) + - [TaskUpdate](flamenco\manager\docs/TaskUpdate.md) + - [TaskWorker](flamenco\manager\docs/TaskWorker.md) + - [WorkerRegistration](flamenco\manager\docs/WorkerRegistration.md) + - [WorkerSignOn](flamenco\manager\docs/WorkerSignOn.md) + - [WorkerStateChange](flamenco\manager\docs/WorkerStateChange.md) + - [WorkerStateChanged](flamenco\manager\docs/WorkerStateChanged.md) + - [WorkerStatus](flamenco\manager\docs/WorkerStatus.md) ## Documentation For Authorization diff --git a/pkg/api/openapi_spec.gen.go b/pkg/api/openapi_spec.gen.go index 38693c2b..7f67fe57 100644 --- a/pkg/api/openapi_spec.gen.go +++ b/pkg/api/openapi_spec.gen.go @@ -79,65 +79,65 @@ var swaggerSpec = []string{ "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", - "dZpofL9fl68v/zsAAP//eNoomAKEAAA=", + "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", + "b/pYG506TTS+36/L15f/HQAA//8MDWjsKoQAAA==", } // 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 0b5fcdbb..d3773c05 100644 --- a/pkg/api/openapi_types.gen.go +++ b/pkg/api/openapi_types.gen.go @@ -408,6 +408,8 @@ type SocketIOSubscriptionType string // Subset of a Task, sent over SocketIO when a task changes. For new tasks, `previous_status` will be excluded. type SocketIOTaskUpdate struct { + Activity string `json:"activity"` + // UUID of the Task Id string `json:"id"` JobId string `json:"job_id"` diff --git a/web/app/src/manager-api/ApiClient.js b/web/app/src/manager-api/ApiClient.js index 7dbb8a0c..816c9e0a 100644 --- a/web/app/src/manager-api/ApiClient.js +++ b/web/app/src/manager-api/ApiClient.js @@ -55,7 +55,7 @@ class ApiClient { * @default {} */ this.defaultHeaders = { - 'User-Agent': 'Flamenco/9d9ff77e / webbrowser' + 'User-Agent': 'Flamenco/6afb1151 / webbrowser' }; /** diff --git a/web/app/src/manager-api/model/SocketIOTaskUpdate.js b/web/app/src/manager-api/model/SocketIOTaskUpdate.js index 25638f1c..7c34734a 100644 --- a/web/app/src/manager-api/model/SocketIOTaskUpdate.js +++ b/web/app/src/manager-api/model/SocketIOTaskUpdate.js @@ -29,10 +29,11 @@ class SocketIOTaskUpdate { * @param name {String} Name of the task * @param updated {Date} Timestamp of last update * @param status {module:model/TaskStatus} + * @param activity {String} */ - constructor(id, jobId, name, updated, status) { + constructor(id, jobId, name, updated, status, activity) { - SocketIOTaskUpdate.initialize(this, id, jobId, name, updated, status); + SocketIOTaskUpdate.initialize(this, id, jobId, name, updated, status, activity); } /** @@ -40,12 +41,13 @@ class SocketIOTaskUpdate { * 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, jobId, name, updated, status) { + static initialize(obj, id, jobId, name, updated, status, activity) { obj['id'] = id; obj['job_id'] = jobId; obj['name'] = name; obj['updated'] = updated; obj['status'] = status; + obj['activity'] = activity; } /** @@ -77,6 +79,9 @@ class SocketIOTaskUpdate { if (data.hasOwnProperty('previous_status')) { obj['previous_status'] = TaskStatus.constructFromObject(data['previous_status']); } + if (data.hasOwnProperty('activity')) { + obj['activity'] = ApiClient.convertToType(data['activity'], 'String'); + } } return obj; } @@ -117,6 +122,11 @@ SocketIOTaskUpdate.prototype['status'] = undefined; */ SocketIOTaskUpdate.prototype['previous_status'] = undefined; +/** + * @member {String} activity + */ +SocketIOTaskUpdate.prototype['activity'] = undefined; +