diff --git a/addon/flamenco/manager/__init__.py b/addon/flamenco/manager/__init__.py index 6977bf24..920ae60b 100644 --- a/addon/flamenco/manager/__init__.py +++ b/addon/flamenco/manager/__init__.py @@ -10,7 +10,7 @@ """ -__version__ = "c8479294" +__version__ = "9dd9d816" # import ApiClient from flamenco.manager.api_client import ApiClient diff --git a/addon/flamenco/manager/api/worker_api.py b/addon/flamenco/manager/api/worker_api.py index d8aa6955..3fcaed1d 100644 --- a/addon/flamenco/manager/api/worker_api.py +++ b/addon/flamenco/manager/api/worker_api.py @@ -23,6 +23,7 @@ from flamenco.manager.model_utils import ( # noqa: F401 ) from flamenco.manager.model.assigned_task import AssignedTask from flamenco.manager.model.error import Error +from flamenco.manager.model.may_keep_running import MayKeepRunning from flamenco.manager.model.registered_worker import RegisteredWorker from flamenco.manager.model.security_error import SecurityError from flamenco.manager.model.task_update import TaskUpdate @@ -43,6 +44,57 @@ class WorkerApi(object): if api_client is None: api_client = ApiClient() self.api_client = api_client + self.may_worker_run_endpoint = _Endpoint( + settings={ + 'response_type': (MayKeepRunning,), + 'auth': [ + 'worker_auth' + ], + 'endpoint_path': '/api/worker/task/{task_id}/may-i-run', + 'operation_id': 'may_worker_run', + 'http_method': 'GET', + 'servers': None, + }, + params_map={ + 'all': [ + 'task_id', + ], + 'required': [ + 'task_id', + ], + 'nullable': [ + ], + 'enum': [ + ], + 'validation': [ + ] + }, + root_map={ + 'validations': { + }, + 'allowed_values': { + }, + 'openapi_types': { + 'task_id': + (str,), + }, + 'attribute_map': { + 'task_id': 'task_id', + }, + 'location_map': { + 'task_id': 'path', + }, + 'collection_format_map': { + } + }, + headers_map={ + 'accept': [ + 'application/json' + ], + 'content_type': [], + }, + api_client=api_client + ) self.register_worker_endpoint = _Endpoint( settings={ 'response_type': (RegisteredWorker,), @@ -388,6 +440,83 @@ class WorkerApi(object): api_client=api_client ) + def may_worker_run( + self, + task_id, + **kwargs + ): + """The response indicates whether the worker is allowed to run / keep running the task. Optionally contains a queued worker status change. # noqa: E501 + + This method makes a synchronous HTTP request by default. To make an + asynchronous HTTP request, please pass async_req=True + + >>> thread = api.may_worker_run(task_id, async_req=True) + >>> result = thread.get() + + Args: + task_id (str): + + Keyword Args: + _return_http_data_only (bool): response data without head status + code and headers. Default is True. + _preload_content (bool): if False, the urllib3.HTTPResponse object + will be returned without reading/decoding response data. + Default is True. + _request_timeout (int/float/tuple): timeout setting for this request. If + one number provided, it will be total request timeout. It can also + be a pair (tuple) of (connection, read) timeouts. + Default is None. + _check_input_type (bool): specifies if type checking + should be done one the data sent to the server. + Default is True. + _check_return_type (bool): specifies if type checking + should be done one the data received from the server. + Default is True. + _spec_property_naming (bool): True if the variable names in the input data + are serialized names, as specified in the OpenAPI document. + False if the variable names in the input data + are pythonic names, e.g. snake case (default) + _content_type (str/None): force body content-type. + Default is None and content-type will be predicted by allowed + content-types and body. + _host_index (int/None): specifies the index of the server + that we want to use. + Default is read from the configuration. + async_req (bool): execute request asynchronously + + Returns: + MayKeepRunning + If the method is called asynchronously, returns the request + thread. + """ + kwargs['async_req'] = kwargs.get( + 'async_req', False + ) + kwargs['_return_http_data_only'] = kwargs.get( + '_return_http_data_only', True + ) + kwargs['_preload_content'] = kwargs.get( + '_preload_content', True + ) + kwargs['_request_timeout'] = kwargs.get( + '_request_timeout', None + ) + kwargs['_check_input_type'] = kwargs.get( + '_check_input_type', True + ) + kwargs['_check_return_type'] = kwargs.get( + '_check_return_type', True + ) + kwargs['_spec_property_naming'] = kwargs.get( + '_spec_property_naming', False + ) + kwargs['_content_type'] = kwargs.get( + '_content_type') + kwargs['_host_index'] = kwargs.get('_host_index') + kwargs['task_id'] = \ + task_id + return self.may_worker_run_endpoint.call_with_http_info(**kwargs) + def register_worker( self, worker_registration, diff --git a/addon/flamenco/manager/api_client.py b/addon/flamenco/manager/api_client.py index 70639843..baa5be3e 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/c8479294 (Blender add-on)' + self.user_agent = 'Flamenco/9dd9d816 (Blender add-on)' def __enter__(self): return self diff --git a/addon/flamenco/manager/configuration.py b/addon/flamenco/manager/configuration.py index 4b512449..03098b9f 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: c8479294".\ + "SDK Package Version: 9dd9d816".\ format(env=sys.platform, pyversion=sys.version) def get_host_settings(self): diff --git a/addon/flamenco/manager/docs/MayKeepRunning.md b/addon/flamenco/manager/docs/MayKeepRunning.md new file mode 100644 index 00000000..7d8e3dc0 --- /dev/null +++ b/addon/flamenco/manager/docs/MayKeepRunning.md @@ -0,0 +1,15 @@ +# MayKeepRunning + +Indicates whether the worker may keep running the task. + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**may_keep_running** | **bool** | | +**reason** | **str** | | +**status_change_requested** | **bool** | Indicates that a status change requested for the worker. It should use the `workerState` operation to determine which state to go to next. If this is `true`, `mayKeepRunning` MUST be `false`. | +**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] + +[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) + + diff --git a/addon/flamenco/manager/docs/WorkerApi.md b/addon/flamenco/manager/docs/WorkerApi.md index 59ba64b3..a6e0637d 100644 --- a/addon/flamenco/manager/docs/WorkerApi.md +++ b/addon/flamenco/manager/docs/WorkerApi.md @@ -4,6 +4,7 @@ All URIs are relative to *http://localhost* Method | HTTP request | Description ------------- | ------------- | ------------- +[**may_worker_run**](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. [**register_worker**](WorkerApi.md#register_worker) | **POST** /api/worker/register-worker | Register a new worker [**schedule_task**](WorkerApi.md#schedule_task) | **POST** /api/worker/task | Obtain a new task to execute [**sign_off**](WorkerApi.md#sign_off) | **POST** /api/worker/sign-off | Mark the worker as offline @@ -13,6 +14,84 @@ Method | HTTP request | Description [**worker_state_changed**](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. +# **may_worker_run** +> MayKeepRunning may_worker_run(task_id) + +The response indicates whether the worker is allowed to run / keep running the task. Optionally contains a queued worker status change. + +### Example + +* Basic Authentication (worker_auth): + +```python +import time +import flamenco.manager +from flamenco.manager.api import worker_api +from flamenco.manager.model.error import Error +from flamenco.manager.model.may_keep_running import MayKeepRunning +from pprint import pprint +# Defining the host is optional and defaults to http://localhost +# See configuration.py for a list of all supported configuration parameters. +configuration = flamenco.manager.Configuration( + host = "http://localhost" +) + +# The client must configure the authentication and authorization parameters +# in accordance with the API server security policy. +# Examples for each auth method are provided below, use the example that +# satisfies your auth use case. + +# Configure HTTP basic authorization: worker_auth +configuration = flamenco.manager.Configuration( + username = 'YOUR_USERNAME', + password = 'YOUR_PASSWORD' +) + +# Enter a context with an instance of the API client +with flamenco.manager.ApiClient(configuration) as api_client: + # Create an instance of the API class + api_instance = worker_api.WorkerApi(api_client) + task_id = "task_id_example" # str | + + # example passing only required values which don't have defaults set + try: + # The response indicates whether the worker is allowed to run / keep running the task. Optionally contains a queued worker status change. + api_response = api_instance.may_worker_run(task_id) + pprint(api_response) + except flamenco.manager.ApiException as e: + print("Exception when calling WorkerApi->may_worker_run: %s\n" % e) +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **task_id** | **str**| | + +### Return type + +[**MayKeepRunning**](MayKeepRunning.md) + +### Authorization + +[worker_auth](../README.md#worker_auth) + +### HTTP request headers + + - **Content-Type**: Not defined + - **Accept**: application/json + + +### HTTP response details + +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | normal response | - | +**0** | unexpected error | - | + +[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) + # **register_worker** > RegisteredWorker register_worker(worker_registration) diff --git a/addon/flamenco/manager/model/may_keep_running.py b/addon/flamenco/manager/model/may_keep_running.py new file mode 100644 index 00000000..df517fee --- /dev/null +++ b/addon/flamenco/manager/model/may_keep_running.py @@ -0,0 +1,273 @@ +""" + Flamenco manager + + Render Farm manager API # noqa: E501 + + The version of the OpenAPI document: 1.0.0 + Generated by: https://openapi-generator.tech +""" + + +import re # noqa: F401 +import sys # noqa: F401 + +from flamenco.manager.model_utils import ( # noqa: F401 + ApiTypeError, + ModelComposed, + ModelNormal, + ModelSimple, + cached_property, + change_keys_js_to_python, + convert_js_args_to_python_args, + date, + datetime, + file_type, + none_type, + validate_get_composed_info, + OpenApiModel +) +from flamenco.manager.exceptions import ApiAttributeError + + + +class MayKeepRunning(ModelNormal): + """NOTE: This class is auto generated by OpenAPI Generator. + Ref: https://openapi-generator.tech + + Do not edit the class manually. + + Attributes: + allowed_values (dict): The key is the tuple path to the attribute + and the for var_name this is (var_name,). The value is a dict + with a capitalized key describing the allowed value and an allowed + value. These dicts store the allowed enum values. + attribute_map (dict): The key is attribute name + and the value is json key in definition. + discriminator_value_class_map (dict): A dict to go from the discriminator + variable value to the discriminator class name. + validations (dict): The key is the tuple path to the attribute + and the for var_name this is (var_name,). The value is a dict + that stores validations for max_length, min_length, max_items, + min_items, exclusive_maximum, inclusive_maximum, exclusive_minimum, + inclusive_minimum, and regex. + additional_properties_type (tuple): A tuple of classes accepted + as additional properties values. + """ + + allowed_values = { + } + + validations = { + } + + @cached_property + def additional_properties_type(): + """ + This must be a method because a model may have properties that are + of type self, this must run after the class is loaded + """ + return (bool, date, datetime, dict, float, int, list, str, none_type,) # noqa: E501 + + _nullable = False + + @cached_property + def openapi_types(): + """ + This must be a method because a model may have properties that are + of type self, this must run after the class is loaded + + Returns + openapi_types (dict): The key is attribute name + and the value is attribute type. + """ + return { + 'may_keep_running': (bool,), # noqa: E501 + 'reason': (str,), # noqa: E501 + 'status_change_requested': (bool,), # noqa: E501 + } + + @cached_property + def discriminator(): + return None + + + attribute_map = { + 'may_keep_running': 'mayKeepRunning', # noqa: E501 + 'reason': 'reason', # noqa: E501 + 'status_change_requested': 'statusChangeRequested', # noqa: E501 + } + + read_only_vars = { + } + + _composed_schemas = {} + + @classmethod + @convert_js_args_to_python_args + def _from_openapi_data(cls, may_keep_running, reason, status_change_requested, *args, **kwargs): # noqa: E501 + """MayKeepRunning - a model defined in OpenAPI + + Args: + may_keep_running (bool): + reason (str): + status_change_requested (bool): Indicates that a status change requested for the worker. It should use the `workerState` operation to determine which state to go to next. If this is `true`, `mayKeepRunning` MUST be `false`. + + Keyword Args: + _check_type (bool): if True, values for parameters in openapi_types + will be type checked and a TypeError will be + raised if the wrong type is input. + Defaults to True + _path_to_item (tuple/list): This is a list of keys or values to + drill down to the model in received_data + when deserializing a response + _spec_property_naming (bool): True if the variable names in the input data + are serialized names, as specified in the OpenAPI document. + False if the variable names in the input data + are pythonic names, e.g. snake case (default) + _configuration (Configuration): the instance to use when + deserializing a file_type parameter. + If passed, type conversion is attempted + If omitted no type conversion is done. + _visited_composed_classes (tuple): This stores a tuple of + classes that we have traveled through so that + if we see that class again we will not use its + discriminator again. + When traveling through a discriminator, the + composed schema that is + is traveled through is added to this set. + For example if Animal has a discriminator + petType and we pass in "Dog", and the class Dog + allOf includes Animal, we move through Animal + once using the discriminator, and pick Dog. + Then in Dog, we will make an instance of the + Animal class but this time we won't travel + through its discriminator because we passed in + _visited_composed_classes = (Animal,) + """ + + _check_type = kwargs.pop('_check_type', True) + _spec_property_naming = kwargs.pop('_spec_property_naming', False) + _path_to_item = kwargs.pop('_path_to_item', ()) + _configuration = kwargs.pop('_configuration', None) + _visited_composed_classes = kwargs.pop('_visited_composed_classes', ()) + + self = super(OpenApiModel, cls).__new__(cls) + + if args: + raise ApiTypeError( + "Invalid positional arguments=%s passed to %s. Remove those invalid positional arguments." % ( + args, + self.__class__.__name__, + ), + path_to_item=_path_to_item, + valid_classes=(self.__class__,), + ) + + self._data_store = {} + self._check_type = _check_type + self._spec_property_naming = _spec_property_naming + self._path_to_item = _path_to_item + self._configuration = _configuration + self._visited_composed_classes = _visited_composed_classes + (self.__class__,) + + self.may_keep_running = may_keep_running + self.reason = reason + self.status_change_requested = status_change_requested + for var_name, var_value in kwargs.items(): + if var_name not in self.attribute_map and \ + self._configuration is not None and \ + self._configuration.discard_unknown_keys and \ + self.additional_properties_type is None: + # discard variable. + continue + setattr(self, var_name, var_value) + return self + + required_properties = set([ + '_data_store', + '_check_type', + '_spec_property_naming', + '_path_to_item', + '_configuration', + '_visited_composed_classes', + ]) + + @convert_js_args_to_python_args + def __init__(self, may_keep_running, reason, status_change_requested, *args, **kwargs): # noqa: E501 + """MayKeepRunning - a model defined in OpenAPI + + Args: + may_keep_running (bool): + reason (str): + status_change_requested (bool): Indicates that a status change requested for the worker. It should use the `workerState` operation to determine which state to go to next. If this is `true`, `mayKeepRunning` MUST be `false`. + + Keyword Args: + _check_type (bool): if True, values for parameters in openapi_types + will be type checked and a TypeError will be + raised if the wrong type is input. + Defaults to True + _path_to_item (tuple/list): This is a list of keys or values to + drill down to the model in received_data + when deserializing a response + _spec_property_naming (bool): True if the variable names in the input data + are serialized names, as specified in the OpenAPI document. + False if the variable names in the input data + are pythonic names, e.g. snake case (default) + _configuration (Configuration): the instance to use when + deserializing a file_type parameter. + If passed, type conversion is attempted + If omitted no type conversion is done. + _visited_composed_classes (tuple): This stores a tuple of + classes that we have traveled through so that + if we see that class again we will not use its + discriminator again. + When traveling through a discriminator, the + composed schema that is + is traveled through is added to this set. + For example if Animal has a discriminator + petType and we pass in "Dog", and the class Dog + allOf includes Animal, we move through Animal + once using the discriminator, and pick Dog. + Then in Dog, we will make an instance of the + Animal class but this time we won't travel + through its discriminator because we passed in + _visited_composed_classes = (Animal,) + """ + + _check_type = kwargs.pop('_check_type', True) + _spec_property_naming = kwargs.pop('_spec_property_naming', False) + _path_to_item = kwargs.pop('_path_to_item', ()) + _configuration = kwargs.pop('_configuration', None) + _visited_composed_classes = kwargs.pop('_visited_composed_classes', ()) + + if args: + raise ApiTypeError( + "Invalid positional arguments=%s passed to %s. Remove those invalid positional arguments." % ( + args, + self.__class__.__name__, + ), + path_to_item=_path_to_item, + valid_classes=(self.__class__,), + ) + + self._data_store = {} + self._check_type = _check_type + self._spec_property_naming = _spec_property_naming + self._path_to_item = _path_to_item + self._configuration = _configuration + self._visited_composed_classes = _visited_composed_classes + (self.__class__,) + + self.may_keep_running = may_keep_running + self.reason = reason + self.status_change_requested = status_change_requested + for var_name, var_value in kwargs.items(): + if var_name not in self.attribute_map and \ + self._configuration is not None and \ + self._configuration.discard_unknown_keys and \ + self.additional_properties_type is None: + # discard variable. + continue + setattr(self, var_name, var_value) + if var_name in self.read_only_vars: + raise ApiAttributeError(f"`{var_name}` is a read-only attribute. Use `from_openapi_data` to instantiate " + f"class with read only attributes.") diff --git a/addon/flamenco/manager/models/__init__.py b/addon/flamenco/manager/models/__init__.py index 9a958df2..b559ffae 100644 --- a/addon/flamenco/manager/models/__init__.py +++ b/addon/flamenco/manager/models/__init__.py @@ -29,6 +29,7 @@ from flamenco.manager.model.job_update import JobUpdate from flamenco.manager.model.jobs_query import JobsQuery from flamenco.manager.model.jobs_query_result import JobsQueryResult from flamenco.manager.model.manager_configuration import ManagerConfiguration +from flamenco.manager.model.may_keep_running import MayKeepRunning from flamenco.manager.model.registered_worker import RegisteredWorker from flamenco.manager.model.security_error import SecurityError from flamenco.manager.model.shaman_checkout import ShamanCheckout diff --git a/addon/flamenco/manager_README.md b/addon/flamenco/manager_README.md index a7c5ddfe..c0e0d3bb 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: c8479294 +- Package version: 9dd9d816 - Build package: org.openapitools.codegen.languages.PythonClientCodegen For more information, please visit [https://flamenco.io/](https://flamenco.io/) @@ -86,6 +86,7 @@ Class | Method | HTTP request | Description *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 @@ -117,6 +118,7 @@ Class | Method | HTTP request | Description - [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) diff --git a/internal/worker/mocks/client.gen.go b/internal/worker/mocks/client.gen.go index f4ecf42a..222e2e9d 100644 --- a/internal/worker/mocks/client.gen.go +++ b/internal/worker/mocks/client.gen.go @@ -176,6 +176,26 @@ func (mr *MockFlamencoClientMockRecorder) GetVersionWithResponse(arg0 interface{ return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetVersionWithResponse", reflect.TypeOf((*MockFlamencoClient)(nil).GetVersionWithResponse), varargs...) } +// MayWorkerRunWithResponse mocks base method. +func (m *MockFlamencoClient) MayWorkerRunWithResponse(arg0 context.Context, arg1 string, arg2 ...api.RequestEditorFn) (*api.MayWorkerRunResponse, error) { + m.ctrl.T.Helper() + varargs := []interface{}{arg0, arg1} + for _, a := range arg2 { + varargs = append(varargs, a) + } + ret := m.ctrl.Call(m, "MayWorkerRunWithResponse", varargs...) + ret0, _ := ret[0].(*api.MayWorkerRunResponse) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// MayWorkerRunWithResponse indicates an expected call of MayWorkerRunWithResponse. +func (mr *MockFlamencoClientMockRecorder) MayWorkerRunWithResponse(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + varargs := append([]interface{}{arg0, arg1}, arg2...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "MayWorkerRunWithResponse", reflect.TypeOf((*MockFlamencoClient)(nil).MayWorkerRunWithResponse), varargs...) +} + // QueryJobsWithBodyWithResponse mocks base method. func (m *MockFlamencoClient) QueryJobsWithBodyWithResponse(arg0 context.Context, arg1 string, arg2 io.Reader, arg3 ...api.RequestEditorFn) (*api.QueryJobsResponse, error) { m.ctrl.T.Helper() diff --git a/pkg/api/openapi_client.gen.go b/pkg/api/openapi_client.gen.go index a4c410b7..6633e6af 100644 --- a/pkg/api/openapi_client.gen.go +++ b/pkg/api/openapi_client.gen.go @@ -160,6 +160,9 @@ type ClientInterface interface { TaskUpdate(ctx context.Context, taskId string, body TaskUpdateJSONRequestBody, reqEditors ...RequestEditorFn) (*http.Response, error) + // MayWorkerRun request + MayWorkerRun(ctx context.Context, taskId string, reqEditors ...RequestEditorFn) (*http.Response, error) + // ShamanCheckout request with any body ShamanCheckoutWithBody(ctx context.Context, contentType string, body io.Reader, reqEditors ...RequestEditorFn) (*http.Response, error) @@ -489,6 +492,18 @@ func (c *Client) TaskUpdate(ctx context.Context, taskId string, body TaskUpdateJ return c.Client.Do(req) } +func (c *Client) MayWorkerRun(ctx context.Context, taskId string, reqEditors ...RequestEditorFn) (*http.Response, error) { + req, err := NewMayWorkerRunRequest(c.Server, taskId) + if err != nil { + return nil, err + } + req = req.WithContext(ctx) + if err := c.applyEditors(ctx, req, reqEditors); err != nil { + return nil, err + } + return c.Client.Do(req) +} + func (c *Client) ShamanCheckoutWithBody(ctx context.Context, contentType string, body io.Reader, reqEditors ...RequestEditorFn) (*http.Response, error) { req, err := NewShamanCheckoutRequestWithBody(c.Server, contentType, body) if err != nil { @@ -1200,6 +1215,40 @@ func NewTaskUpdateRequestWithBody(server string, taskId string, contentType stri return req, nil } +// NewMayWorkerRunRequest generates requests for MayWorkerRun +func NewMayWorkerRunRequest(server string, taskId string) (*http.Request, error) { + var err error + + var pathParam0 string + + pathParam0, err = runtime.StyleParamWithLocation("simple", false, "task_id", runtime.ParamLocationPath, taskId) + if err != nil { + return nil, err + } + + serverURL, err := url.Parse(server) + if err != nil { + return nil, err + } + + operationPath := fmt.Sprintf("/api/worker/task/%s/may-i-run", pathParam0) + if operationPath[0] == '/' { + operationPath = "." + operationPath + } + + queryURL, err := serverURL.Parse(operationPath) + if err != nil { + return nil, err + } + + req, err := http.NewRequest("GET", queryURL.String(), nil) + if err != nil { + return nil, err + } + + return req, nil +} + // NewShamanCheckoutRequest calls the generic ShamanCheckout builder with application/json body func NewShamanCheckoutRequest(server string, body ShamanCheckoutJSONRequestBody) (*http.Request, error) { var bodyReader io.Reader @@ -1499,6 +1548,9 @@ type ClientWithResponsesInterface interface { TaskUpdateWithResponse(ctx context.Context, taskId string, body TaskUpdateJSONRequestBody, reqEditors ...RequestEditorFn) (*TaskUpdateResponse, error) + // MayWorkerRun request + MayWorkerRunWithResponse(ctx context.Context, taskId string, reqEditors ...RequestEditorFn) (*MayWorkerRunResponse, error) + // ShamanCheckout request with any body ShamanCheckoutWithBodyWithResponse(ctx context.Context, contentType string, body io.Reader, reqEditors ...RequestEditorFn) (*ShamanCheckoutResponse, error) @@ -1921,6 +1973,29 @@ func (r TaskUpdateResponse) StatusCode() int { return 0 } +type MayWorkerRunResponse struct { + Body []byte + HTTPResponse *http.Response + JSON200 *MayKeepRunning + JSONDefault *Error +} + +// Status returns HTTPResponse.Status +func (r MayWorkerRunResponse) Status() string { + if r.HTTPResponse != nil { + return r.HTTPResponse.Status + } + return http.StatusText(0) +} + +// StatusCode returns HTTPResponse.StatusCode +func (r MayWorkerRunResponse) StatusCode() int { + if r.HTTPResponse != nil { + return r.HTTPResponse.StatusCode + } + return 0 +} + type ShamanCheckoutResponse struct { Body []byte HTTPResponse *http.Response @@ -2240,6 +2315,15 @@ func (c *ClientWithResponses) TaskUpdateWithResponse(ctx context.Context, taskId return ParseTaskUpdateResponse(rsp) } +// MayWorkerRunWithResponse request returning *MayWorkerRunResponse +func (c *ClientWithResponses) MayWorkerRunWithResponse(ctx context.Context, taskId string, reqEditors ...RequestEditorFn) (*MayWorkerRunResponse, error) { + rsp, err := c.MayWorkerRun(ctx, taskId, reqEditors...) + if err != nil { + return nil, err + } + return ParseMayWorkerRunResponse(rsp) +} + // ShamanCheckoutWithBodyWithResponse request with arbitrary body returning *ShamanCheckoutResponse func (c *ClientWithResponses) ShamanCheckoutWithBodyWithResponse(ctx context.Context, contentType string, body io.Reader, reqEditors ...RequestEditorFn) (*ShamanCheckoutResponse, error) { rsp, err := c.ShamanCheckoutWithBody(ctx, contentType, body, reqEditors...) @@ -2823,6 +2907,39 @@ func ParseTaskUpdateResponse(rsp *http.Response) (*TaskUpdateResponse, error) { return response, nil } +// ParseMayWorkerRunResponse parses an HTTP response from a MayWorkerRunWithResponse call +func ParseMayWorkerRunResponse(rsp *http.Response) (*MayWorkerRunResponse, error) { + bodyBytes, err := ioutil.ReadAll(rsp.Body) + defer func() { _ = rsp.Body.Close() }() + if err != nil { + return nil, err + } + + response := &MayWorkerRunResponse{ + Body: bodyBytes, + HTTPResponse: rsp, + } + + switch { + case strings.Contains(rsp.Header.Get("Content-Type"), "json") && rsp.StatusCode == 200: + var dest MayKeepRunning + if err := json.Unmarshal(bodyBytes, &dest); err != nil { + return nil, err + } + response.JSON200 = &dest + + case strings.Contains(rsp.Header.Get("Content-Type"), "json") && true: + var dest Error + if err := json.Unmarshal(bodyBytes, &dest); err != nil { + return nil, err + } + response.JSONDefault = &dest + + } + + return response, nil +} + // ParseShamanCheckoutResponse parses an HTTP response from a ShamanCheckoutWithResponse call func ParseShamanCheckoutResponse(rsp *http.Response) (*ShamanCheckoutResponse, error) { bodyBytes, err := ioutil.ReadAll(rsp.Body) diff --git a/pkg/api/openapi_server.gen.go b/pkg/api/openapi_server.gen.go index c11f604a..38807bcb 100644 --- a/pkg/api/openapi_server.gen.go +++ b/pkg/api/openapi_server.gen.go @@ -67,6 +67,9 @@ type ServerInterface interface { // Update the task, typically to indicate progress, completion, or failure. // (POST /api/worker/task/{task_id}) TaskUpdate(ctx echo.Context, taskId string) error + // The response indicates whether the worker is allowed to run / keep running the task. Optionally contains a queued worker status change. + // (GET /api/worker/task/{task_id}/may-i-run) + MayWorkerRun(ctx echo.Context, taskId string) error // Create a directory, and symlink the required files into it. The files must all have been uploaded to Shaman before calling this endpoint. // (POST /shaman/checkout/create) ShamanCheckout(ctx echo.Context) error @@ -310,6 +313,24 @@ func (w *ServerInterfaceWrapper) TaskUpdate(ctx echo.Context) error { return err } +// MayWorkerRun converts echo context to params. +func (w *ServerInterfaceWrapper) MayWorkerRun(ctx echo.Context) error { + var err error + // ------------- Path parameter "task_id" ------------- + var taskId string + + err = runtime.BindStyledParameterWithLocation("simple", false, "task_id", runtime.ParamLocationPath, ctx.Param("task_id"), &taskId) + if err != nil { + return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Invalid format for parameter task_id: %s", err)) + } + + ctx.Set(Worker_authScopes, []string{""}) + + // Invoke the callback with all the unmarshalled arguments + err = w.Handler.MayWorkerRun(ctx, taskId) + return err +} + // ShamanCheckout converts echo context to params. func (w *ServerInterfaceWrapper) ShamanCheckout(ctx echo.Context) error { var err error @@ -457,6 +478,7 @@ func RegisterHandlersWithBaseURL(router EchoRouter, si ServerInterface, baseURL router.POST(baseURL+"/api/worker/state-changed", wrapper.WorkerStateChanged) router.POST(baseURL+"/api/worker/task", wrapper.ScheduleTask) router.POST(baseURL+"/api/worker/task/:task_id", wrapper.TaskUpdate) + router.GET(baseURL+"/api/worker/task/:task_id/may-i-run", wrapper.MayWorkerRun) router.POST(baseURL+"/shaman/checkout/create", wrapper.ShamanCheckout) router.POST(baseURL+"/shaman/checkout/requirements", wrapper.ShamanCheckoutRequirements) router.GET(baseURL+"/shaman/files/:checksum/:filesize", wrapper.ShamanFileStoreCheck) diff --git a/pkg/api/openapi_spec.gen.go b/pkg/api/openapi_spec.gen.go index 4a1442e0..94cfbc0e 100644 --- a/pkg/api/openapi_spec.gen.go +++ b/pkg/api/openapi_spec.gen.go @@ -18,121 +18,124 @@ import ( // Base64 encoded, gzipped, json marshaled Swagger object var swaggerSpec = []string{ - "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", - "1eur/wkAAP//4wfCnT5+AAA=", + "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", } // 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 e1d202ae..7009c5e4 100644 --- a/pkg/api/openapi_types.gen.go +++ b/pkg/api/openapi_types.gen.go @@ -304,6 +304,15 @@ type ManagerConfiguration struct { StorageLocation string `json:"storageLocation"` } +// Indicates whether the worker may keep running the task. +type MayKeepRunning struct { + MayKeepRunning bool `json:"mayKeepRunning"` + Reason string `json:"reason"` + + // Indicates that a status change requested for the worker. It should use the `workerState` operation to determine which state to go to next. If this is `true`, `mayKeepRunning` MUST be `false`. + StatusChangeRequested bool `json:"statusChangeRequested"` +} + // RegisteredWorker defines model for RegisteredWorker. type RegisteredWorker struct { Address string `json:"address"` diff --git a/web/app/src/manager-api/ApiClient.js b/web/app/src/manager-api/ApiClient.js index 09b09750..a3d30722 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/c8479294 / webbrowser' + 'User-Agent': 'Flamenco/9dd9d816 / webbrowser' }; /** diff --git a/web/app/src/manager-api/index.js b/web/app/src/manager-api/index.js index 4c794f4b..200e5464 100644 --- a/web/app/src/manager-api/index.js +++ b/web/app/src/manager-api/index.js @@ -31,6 +31,7 @@ import JobUpdate from './model/JobUpdate'; import JobsQuery from './model/JobsQuery'; import JobsQueryResult from './model/JobsQueryResult'; import ManagerConfiguration from './model/ManagerConfiguration'; +import MayKeepRunning from './model/MayKeepRunning'; import RegisteredWorker from './model/RegisteredWorker'; import SecurityError from './model/SecurityError'; import ShamanCheckout from './model/ShamanCheckout'; @@ -209,6 +210,12 @@ export { */ ManagerConfiguration, + /** + * The MayKeepRunning model constructor. + * @property {module:model/MayKeepRunning} + */ + MayKeepRunning, + /** * The RegisteredWorker model constructor. * @property {module:model/RegisteredWorker} diff --git a/web/app/src/manager-api/manager/WorkerApi.js b/web/app/src/manager-api/manager/WorkerApi.js index 918d7fb6..e603d16c 100644 --- a/web/app/src/manager-api/manager/WorkerApi.js +++ b/web/app/src/manager-api/manager/WorkerApi.js @@ -15,6 +15,7 @@ import ApiClient from "../ApiClient"; import AssignedTask from '../model/AssignedTask'; import Error from '../model/Error'; +import MayKeepRunning from '../model/MayKeepRunning'; import RegisteredWorker from '../model/RegisteredWorker'; import SecurityError from '../model/SecurityError'; import TaskUpdate from '../model/TaskUpdate'; @@ -43,6 +44,52 @@ export default class WorkerApi { + /** + * The response indicates whether the worker is allowed to run / keep running the task. Optionally contains a queued worker status change. + * @param {String} taskId + * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing data of type {@link module:model/MayKeepRunning} and HTTP response + */ + mayWorkerRunWithHttpInfo(taskId) { + let postBody = null; + // verify the required parameter 'taskId' is set + if (taskId === undefined || taskId === null) { + throw new Error("Missing the required parameter 'taskId' when calling mayWorkerRun"); + } + + let pathParams = { + 'task_id': taskId + }; + let queryParams = { + }; + let headerParams = { + }; + let formParams = { + }; + + let authNames = ['worker_auth']; + let contentTypes = []; + let accepts = ['application/json']; + let returnType = MayKeepRunning; + return this.apiClient.callApi( + '/api/worker/task/{task_id}/may-i-run', 'GET', + pathParams, queryParams, headerParams, formParams, postBody, + authNames, contentTypes, accepts, returnType, null + ); + } + + /** + * The response indicates whether the worker is allowed to run / keep running the task. Optionally contains a queued worker status change. + * @param {String} taskId + * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with data of type {@link module:model/MayKeepRunning} + */ + mayWorkerRun(taskId) { + return this.mayWorkerRunWithHttpInfo(taskId) + .then(function(response_and_data) { + return response_and_data.data; + }); + } + + /** * Register a new worker * @param {module:model/WorkerRegistration} workerRegistration Worker to register diff --git a/web/app/src/manager-api/model/MayKeepRunning.js b/web/app/src/manager-api/model/MayKeepRunning.js new file mode 100644 index 00000000..7004ef1a --- /dev/null +++ b/web/app/src/manager-api/model/MayKeepRunning.js @@ -0,0 +1,95 @@ +/** + * Flamenco manager + * Render Farm manager API + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + * + */ + +import ApiClient from '../ApiClient'; + +/** + * The MayKeepRunning model module. + * @module model/MayKeepRunning + * @version 0.0.0 + */ +class MayKeepRunning { + /** + * Constructs a new MayKeepRunning. + * Indicates whether the worker may keep running the task. + * @alias module:model/MayKeepRunning + * @param mayKeepRunning {Boolean} + * @param reason {String} + * @param statusChangeRequested {Boolean} Indicates that a status change requested for the worker. It should use the `workerState` operation to determine which state to go to next. If this is `true`, `mayKeepRunning` MUST be `false`. + */ + constructor(mayKeepRunning, reason, statusChangeRequested) { + + MayKeepRunning.initialize(this, mayKeepRunning, reason, statusChangeRequested); + } + + /** + * Initializes the fields of this object. + * 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, mayKeepRunning, reason, statusChangeRequested) { + obj['mayKeepRunning'] = mayKeepRunning; + obj['reason'] = reason; + obj['statusChangeRequested'] = statusChangeRequested; + } + + /** + * Constructs a MayKeepRunning from a plain JavaScript object, optionally creating a new instance. + * Copies all relevant properties from data to obj if supplied or a new instance if not. + * @param {Object} data The plain JavaScript object bearing properties of interest. + * @param {module:model/MayKeepRunning} obj Optional instance to populate. + * @return {module:model/MayKeepRunning} The populated MayKeepRunning instance. + */ + static constructFromObject(data, obj) { + if (data) { + obj = obj || new MayKeepRunning(); + + if (data.hasOwnProperty('mayKeepRunning')) { + obj['mayKeepRunning'] = ApiClient.convertToType(data['mayKeepRunning'], 'Boolean'); + } + if (data.hasOwnProperty('reason')) { + obj['reason'] = ApiClient.convertToType(data['reason'], 'String'); + } + if (data.hasOwnProperty('statusChangeRequested')) { + obj['statusChangeRequested'] = ApiClient.convertToType(data['statusChangeRequested'], 'Boolean'); + } + } + return obj; + } + + +} + +/** + * @member {Boolean} mayKeepRunning + */ +MayKeepRunning.prototype['mayKeepRunning'] = undefined; + +/** + * @member {String} reason + */ +MayKeepRunning.prototype['reason'] = undefined; + +/** + * Indicates that a status change requested for the worker. It should use the `workerState` operation to determine which state to go to next. If this is `true`, `mayKeepRunning` MUST be `false`. + * @member {Boolean} statusChangeRequested + */ +MayKeepRunning.prototype['statusChangeRequested'] = undefined; + + + + + + +export default MayKeepRunning; +