diff --git a/addon/flamenco/manager/__init__.py b/addon/flamenco/manager/__init__.py index 9d8c260c..75974f54 100644 --- a/addon/flamenco/manager/__init__.py +++ b/addon/flamenco/manager/__init__.py @@ -10,7 +10,7 @@ """ -__version__ = "d170cda3" +__version__ = "26f92503" # import ApiClient from flamenco.manager.api_client import ApiClient diff --git a/addon/flamenco/manager/api/worker_mgt_api.py b/addon/flamenco/manager/api/worker_mgt_api.py index a831ef3f..ffe9f4d5 100644 --- a/addon/flamenco/manager/api/worker_mgt_api.py +++ b/addon/flamenco/manager/api/worker_mgt_api.py @@ -24,6 +24,7 @@ from flamenco.manager.model_utils import ( # noqa: F401 from flamenco.manager.model.error import Error from flamenco.manager.model.worker import Worker from flamenco.manager.model.worker_list import WorkerList +from flamenco.manager.model.worker_sleep_schedule import WorkerSleepSchedule from flamenco.manager.model.worker_status_change_request import WorkerStatusChangeRequest @@ -87,6 +88,55 @@ class WorkerMgtApi(object): }, api_client=api_client ) + self.fetch_worker_sleep_schedule_endpoint = _Endpoint( + settings={ + 'response_type': (WorkerSleepSchedule,), + 'auth': [], + 'endpoint_path': '/api/v3/worker-mgt/workers/{worker_id}/sleep-schedule', + 'operation_id': 'fetch_worker_sleep_schedule', + 'http_method': 'GET', + 'servers': None, + }, + params_map={ + 'all': [ + 'worker_id', + ], + 'required': [ + 'worker_id', + ], + 'nullable': [ + ], + 'enum': [ + ], + 'validation': [ + ] + }, + root_map={ + 'validations': { + }, + 'allowed_values': { + }, + 'openapi_types': { + 'worker_id': + (str,), + }, + 'attribute_map': { + 'worker_id': 'worker_id', + }, + 'location_map': { + 'worker_id': 'path', + }, + 'collection_format_map': { + } + }, + headers_map={ + 'accept': [ + 'application/json' + ], + 'content_type': [], + }, + api_client=api_client + ) self.fetch_workers_endpoint = _Endpoint( settings={ 'response_type': (WorkerList,), @@ -185,6 +235,62 @@ class WorkerMgtApi(object): }, api_client=api_client ) + self.set_worker_sleep_schedule_endpoint = _Endpoint( + settings={ + 'response_type': None, + 'auth': [], + 'endpoint_path': '/api/v3/worker-mgt/workers/{worker_id}/sleep-schedule', + 'operation_id': 'set_worker_sleep_schedule', + 'http_method': 'POST', + 'servers': None, + }, + params_map={ + 'all': [ + 'worker_id', + 'worker_sleep_schedule', + ], + 'required': [ + 'worker_id', + 'worker_sleep_schedule', + ], + 'nullable': [ + ], + 'enum': [ + ], + 'validation': [ + ] + }, + root_map={ + 'validations': { + }, + 'allowed_values': { + }, + 'openapi_types': { + 'worker_id': + (str,), + 'worker_sleep_schedule': + (WorkerSleepSchedule,), + }, + 'attribute_map': { + 'worker_id': 'worker_id', + }, + 'location_map': { + 'worker_id': 'path', + 'worker_sleep_schedule': 'body', + }, + 'collection_format_map': { + } + }, + headers_map={ + 'accept': [ + 'application/json' + ], + 'content_type': [ + 'application/json' + ] + }, + api_client=api_client + ) def fetch_worker( self, @@ -263,6 +369,83 @@ class WorkerMgtApi(object): worker_id return self.fetch_worker_endpoint.call_with_http_info(**kwargs) + def fetch_worker_sleep_schedule( + self, + worker_id, + **kwargs + ): + """fetch_worker_sleep_schedule # noqa: E501 + + This method makes a synchronous HTTP request by default. To make an + asynchronous HTTP request, please pass async_req=True + + >>> thread = api.fetch_worker_sleep_schedule(worker_id, async_req=True) + >>> result = thread.get() + + Args: + worker_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: + WorkerSleepSchedule + 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['worker_id'] = \ + worker_id + return self.fetch_worker_sleep_schedule_endpoint.call_with_http_info(**kwargs) + def fetch_workers( self, **kwargs @@ -416,3 +599,84 @@ class WorkerMgtApi(object): worker_status_change_request return self.request_worker_status_change_endpoint.call_with_http_info(**kwargs) + def set_worker_sleep_schedule( + self, + worker_id, + worker_sleep_schedule, + **kwargs + ): + """set_worker_sleep_schedule # noqa: E501 + + This method makes a synchronous HTTP request by default. To make an + asynchronous HTTP request, please pass async_req=True + + >>> thread = api.set_worker_sleep_schedule(worker_id, worker_sleep_schedule, async_req=True) + >>> result = thread.get() + + Args: + worker_id (str): + worker_sleep_schedule (WorkerSleepSchedule): The new sleep schedule. + + 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: + None + 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['worker_id'] = \ + worker_id + kwargs['worker_sleep_schedule'] = \ + worker_sleep_schedule + return self.set_worker_sleep_schedule_endpoint.call_with_http_info(**kwargs) + diff --git a/addon/flamenco/manager/api_client.py b/addon/flamenco/manager/api_client.py index f44e09e0..2cbbcbd8 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/d170cda3 (Blender add-on)' + self.user_agent = 'Flamenco/26f92503 (Blender add-on)' def __enter__(self): return self diff --git a/addon/flamenco/manager/configuration.py b/addon/flamenco/manager/configuration.py index 2210fa08..fe657460 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: d170cda3".\ + "SDK Package Version: 26f92503".\ format(env=sys.platform, pyversion=sys.version) def get_host_settings(self): diff --git a/addon/flamenco/manager/docs/WorkerMgtApi.md b/addon/flamenco/manager/docs/WorkerMgtApi.md index d7625a7d..421943b1 100644 --- a/addon/flamenco/manager/docs/WorkerMgtApi.md +++ b/addon/flamenco/manager/docs/WorkerMgtApi.md @@ -5,8 +5,10 @@ All URIs are relative to *http://localhost* Method | HTTP request | Description ------------- | ------------- | ------------- [**fetch_worker**](WorkerMgtApi.md#fetch_worker) | **GET** /api/v3/worker-mgt/workers/{worker_id} | Fetch info about the worker. +[**fetch_worker_sleep_schedule**](WorkerMgtApi.md#fetch_worker_sleep_schedule) | **GET** /api/v3/worker-mgt/workers/{worker_id}/sleep-schedule | [**fetch_workers**](WorkerMgtApi.md#fetch_workers) | **GET** /api/v3/worker-mgt/workers | Get list of workers. [**request_worker_status_change**](WorkerMgtApi.md#request_worker_status_change) | **POST** /api/v3/worker-mgt/workers/{worker_id}/setstatus | +[**set_worker_sleep_schedule**](WorkerMgtApi.md#set_worker_sleep_schedule) | **POST** /api/v3/worker-mgt/workers/{worker_id}/sleep-schedule | # **fetch_worker** @@ -74,6 +76,73 @@ No authorization required [[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) +# **fetch_worker_sleep_schedule** +> WorkerSleepSchedule fetch_worker_sleep_schedule(worker_id) + + + +### Example + + +```python +import time +import flamenco.manager +from flamenco.manager.api import worker_mgt_api +from flamenco.manager.model.error import Error +from flamenco.manager.model.worker_sleep_schedule import WorkerSleepSchedule +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" +) + + +# Enter a context with an instance of the API client +with flamenco.manager.ApiClient() as api_client: + # Create an instance of the API class + api_instance = worker_mgt_api.WorkerMgtApi(api_client) + worker_id = "worker_id_example" # str | + + # example passing only required values which don't have defaults set + try: + api_response = api_instance.fetch_worker_sleep_schedule(worker_id) + pprint(api_response) + except flamenco.manager.ApiException as e: + print("Exception when calling WorkerMgtApi->fetch_worker_sleep_schedule: %s\n" % e) +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **worker_id** | **str**| | + +### Return type + +[**WorkerSleepSchedule**](WorkerSleepSchedule.md) + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: Not defined + - **Accept**: application/json + + +### HTTP response details + +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**200** | Normal response, the sleep schedule. | - | +**204** | The worker has no sleep schedule. | - | +**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) + # **fetch_workers** > WorkerList fetch_workers() @@ -205,3 +274,75 @@ No authorization required [[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) +# **set_worker_sleep_schedule** +> set_worker_sleep_schedule(worker_id, worker_sleep_schedule) + + + +### Example + + +```python +import time +import flamenco.manager +from flamenco.manager.api import worker_mgt_api +from flamenco.manager.model.error import Error +from flamenco.manager.model.worker_sleep_schedule import WorkerSleepSchedule +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" +) + + +# Enter a context with an instance of the API client +with flamenco.manager.ApiClient() as api_client: + # Create an instance of the API class + api_instance = worker_mgt_api.WorkerMgtApi(api_client) + worker_id = "worker_id_example" # str | + worker_sleep_schedule = WorkerSleepSchedule( + is_active=True, + days_of_week="days_of_week_example", + start_time="start_time_example", + end_time="end_time_example", + ) # WorkerSleepSchedule | The new sleep schedule. + + # example passing only required values which don't have defaults set + try: + api_instance.set_worker_sleep_schedule(worker_id, worker_sleep_schedule) + except flamenco.manager.ApiException as e: + print("Exception when calling WorkerMgtApi->set_worker_sleep_schedule: %s\n" % e) +``` + + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **worker_id** | **str**| | + **worker_sleep_schedule** | [**WorkerSleepSchedule**](WorkerSleepSchedule.md)| The new sleep schedule. | + +### Return type + +void (empty response body) + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: application/json + - **Accept**: application/json + + +### HTTP response details + +| Status code | Description | Response headers | +|-------------|-------------|------------------| +**204** | The schedule has been stored. | - | +**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) + diff --git a/addon/flamenco/manager/docs/WorkerSleepSchedule.md b/addon/flamenco/manager/docs/WorkerSleepSchedule.md new file mode 100644 index 00000000..c5955bfe --- /dev/null +++ b/addon/flamenco/manager/docs/WorkerSleepSchedule.md @@ -0,0 +1,16 @@ +# WorkerSleepSchedule + +Sleep schedule for a single Worker. Start and end time indicate the time of each day at which the schedule is active. Applies only when today is in `days_of_week`, or when `days_of_week` is empty. Start and end time are in 24-hour HH:MM notation. + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**is_active** | **bool** | | +**days_of_week** | **str** | Space-separated two-letter strings indicating days of week the schedule is active (\"mo\", \"tu\", etc.). Empty means \"every day\". | +**start_time** | **str** | | +**end_time** | **str** | | +**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/model/worker_sleep_schedule.py b/addon/flamenco/manager/model/worker_sleep_schedule.py new file mode 100644 index 00000000..a65bd976 --- /dev/null +++ b/addon/flamenco/manager/model/worker_sleep_schedule.py @@ -0,0 +1,279 @@ +""" + 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 WorkerSleepSchedule(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 { + 'is_active': (bool,), # noqa: E501 + 'days_of_week': (str,), # noqa: E501 + 'start_time': (str,), # noqa: E501 + 'end_time': (str,), # noqa: E501 + } + + @cached_property + def discriminator(): + return None + + + attribute_map = { + 'is_active': 'is_active', # noqa: E501 + 'days_of_week': 'days_of_week', # noqa: E501 + 'start_time': 'start_time', # noqa: E501 + 'end_time': 'end_time', # noqa: E501 + } + + read_only_vars = { + } + + _composed_schemas = {} + + @classmethod + @convert_js_args_to_python_args + def _from_openapi_data(cls, is_active, days_of_week, start_time, end_time, *args, **kwargs): # noqa: E501 + """WorkerSleepSchedule - a model defined in OpenAPI + + Args: + is_active (bool): + days_of_week (str): Space-separated two-letter strings indicating days of week the schedule is active (\"mo\", \"tu\", etc.). Empty means \"every day\". + start_time (str): + end_time (str): + + 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.is_active = is_active + self.days_of_week = days_of_week + self.start_time = start_time + self.end_time = end_time + 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, is_active, days_of_week, start_time, end_time, *args, **kwargs): # noqa: E501 + """WorkerSleepSchedule - a model defined in OpenAPI + + Args: + is_active (bool): + days_of_week (str): Space-separated two-letter strings indicating days of week the schedule is active (\"mo\", \"tu\", etc.). Empty means \"every day\". + start_time (str): + end_time (str): + + 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.is_active = is_active + self.days_of_week = days_of_week + self.start_time = start_time + self.end_time = end_time + 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 35e94457..31880d83 100644 --- a/addon/flamenco/manager/models/__init__.py +++ b/addon/flamenco/manager/models/__init__.py @@ -73,6 +73,7 @@ from flamenco.manager.model.worker_all_of import WorkerAllOf from flamenco.manager.model.worker_list import WorkerList from flamenco.manager.model.worker_registration import WorkerRegistration from flamenco.manager.model.worker_sign_on import WorkerSignOn +from flamenco.manager.model.worker_sleep_schedule import WorkerSleepSchedule from flamenco.manager.model.worker_state_change import WorkerStateChange from flamenco.manager.model.worker_state_changed import WorkerStateChanged from flamenco.manager.model.worker_status import WorkerStatus diff --git a/addon/flamenco/manager_README.md b/addon/flamenco/manager_README.md index d1a15c8e..8a0ab99d 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: d170cda3 +- Package version: 26f92503 - Build package: org.openapitools.codegen.languages.PythonClientCodegen For more information, please visit [https://flamenco.io/](https://flamenco.io/) @@ -58,13 +58,13 @@ configuration = flamenco.manager.Configuration( with flamenco.manager.ApiClient(configuration) as api_client: # Create an instance of the API class api_instance = jobs_api.JobsApi(api_client) - + try: # Get the URL that serves the last-rendered images. api_response = api_instance.fetch_global_last_rendered_info() pprint(api_response) except flamenco.manager.ApiException as e: - print("Exception when calling JobsApi->fetch_global_last_rendered_info: %s\n" % e) + print("Exception when calling JobsApi->fetch_global_last_rendered_info: %s/n" % e) ``` ## Documentation for API Endpoints @@ -79,38 +79,41 @@ Class | Method | HTTP request | Description *JobsApi* | [**fetch_job_last_rendered_info**](flamenco/manager/docs/JobsApi.md#fetch_job_last_rendered_info) | **GET** /api/v3/jobs/{job_id}/last-rendered | Get the URL that serves the last-rendered images of this job. *JobsApi* | [**fetch_job_tasks**](flamenco/manager/docs/JobsApi.md#fetch_job_tasks) | **GET** /api/v3/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/v3/tasks/{task_id} | Fetch a single task. +*JobsApi* | [**fetch_task_log_info**](flamenco/manager/docs/JobsApi.md#fetch_task_log_info) | **GET** /api/v3/tasks/{task_id}/log | Get the URL of the task log, and some more info. *JobsApi* | [**fetch_task_log_tail**](flamenco/manager/docs/JobsApi.md#fetch_task_log_tail) | **GET** /api/v3/tasks/{task_id}/logtail | Fetch the last few lines of the task's log. *JobsApi* | [**get_job_type**](flamenco/manager/docs/JobsApi.md#get_job_type) | **GET** /api/v3/jobs/type/{typeName} | Get single job type and its parameters. *JobsApi* | [**get_job_types**](flamenco/manager/docs/JobsApi.md#get_job_types) | **GET** /api/v3/jobs/types | Get list of job types and their parameters. *JobsApi* | [**query_jobs**](flamenco/manager/docs/JobsApi.md#query_jobs) | **POST** /api/v3/jobs/query | Fetch list of jobs. *JobsApi* | [**remove_job_blocklist**](flamenco/manager/docs/JobsApi.md#remove_job_blocklist) | **DELETE** /api/v3/jobs/{job_id}/blocklist | Remove entries from a job blocklist. -*JobsApi* | [**set_job_status**](flamenco/manager/docs/JobsApi.md#set_job_status) | **POST** /api/v3/jobs/{job_id}/setstatus | -*JobsApi* | [**set_task_status**](flamenco/manager/docs/JobsApi.md#set_task_status) | **POST** /api/v3/tasks/{task_id}/setstatus | +*JobsApi* | [**set_job_status**](flamenco/manager/docs/JobsApi.md#set_job_status) | **POST** /api/v3/jobs/{job_id}/setstatus | +*JobsApi* | [**set_task_status**](flamenco/manager/docs/JobsApi.md#set_task_status) | **POST** /api/v3/tasks/{task_id}/setstatus | *JobsApi* | [**submit_job**](flamenco/manager/docs/JobsApi.md#submit_job) | **POST** /api/v3/jobs | Submit a new job for Flamenco Manager to execute. *MetaApi* | [**check_blender_exe_path**](flamenco/manager/docs/MetaApi.md#check_blender_exe_path) | **POST** /api/v3/configuration/check/blender | Validate a CLI command for use as way to start Blender *MetaApi* | [**check_shared_storage_path**](flamenco/manager/docs/MetaApi.md#check_shared_storage_path) | **POST** /api/v3/configuration/check/shared-storage | Validate a path for use as shared storage. *MetaApi* | [**find_blender_exe_path**](flamenco/manager/docs/MetaApi.md#find_blender_exe_path) | **GET** /api/v3/configuration/check/blender | Find one or more CLI commands for use as way to start Blender *MetaApi* | [**get_configuration**](flamenco/manager/docs/MetaApi.md#get_configuration) | **GET** /api/v3/configuration | Get the configuration of this Manager. *MetaApi* | [**get_configuration_file**](flamenco/manager/docs/MetaApi.md#get_configuration_file) | **GET** /api/v3/configuration/file | Retrieve the configuration of Flamenco Manager. -*MetaApi* | [**get_variables**](flamenco/manager/docs/MetaApi.md#get_variables) | **GET** /api/v3/configuration/variables/{audience}/{platform} | Get the variables of this Manager. Used by the Blender add-on to recognise two-way variables, and for the web interface to do variable replacement based on the browser's platform. +*MetaApi* | [**get_variables**](flamenco/manager/docs/MetaApi.md#get_variables) | **GET** /api/v3/configuration/variables/{audience}/{platform} | Get the variables of this Manager. Used by the Blender add-on to recognise two-way variables, and for the web interface to do variable replacement based on the browser's platform. *MetaApi* | [**get_version**](flamenco/manager/docs/MetaApi.md#get_version) | **GET** /api/v3/version | Get the Flamenco version of this Manager *MetaApi* | [**save_wizard_config**](flamenco/manager/docs/MetaApi.md#save_wizard_config) | **POST** /api/v3/configuration/wizard | Update the Manager's configuration, and restart it in fully functional mode. *ShamanApi* | [**shaman_checkout**](flamenco/manager/docs/ShamanApi.md#shaman_checkout) | **POST** /api/v3/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** /api/v3/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** /api/v3/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** /api/v3/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/v3/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. +*ShamanApi* | [**shaman_file_store**](flamenco/manager/docs/ShamanApi.md#shaman_file_store) | **POST** /api/v3/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** /api/v3/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/v3/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/v3/worker/register-worker | Register a new worker *WorkerApi* | [**schedule_task**](flamenco/manager/docs/WorkerApi.md#schedule_task) | **POST** /api/v3/worker/task | Obtain a new task to execute *WorkerApi* | [**sign_off**](flamenco/manager/docs/WorkerApi.md#sign_off) | **POST** /api/v3/worker/sign-off | Mark the worker as offline *WorkerApi* | [**sign_on**](flamenco/manager/docs/WorkerApi.md#sign_on) | **POST** /api/v3/worker/sign-on | Authenticate & sign in the worker. -*WorkerApi* | [**task_output_produced**](flamenco/manager/docs/WorkerApi.md#task_output_produced) | **POST** /api/v3/worker/task/{task_id}/output-produced | Store the most recently rendered frame here. Note that it is up to the Worker to ensure this is in a format that's digestable by the Manager. Currently only PNG and JPEG support is planned. +*WorkerApi* | [**task_output_produced**](flamenco/manager/docs/WorkerApi.md#task_output_produced) | **POST** /api/v3/worker/task/{task_id}/output-produced | Store the most recently rendered frame here. Note that it is up to the Worker to ensure this is in a format that's digestable by the Manager. Currently only PNG and JPEG support is planned. *WorkerApi* | [**task_update**](flamenco/manager/docs/WorkerApi.md#task_update) | **POST** /api/v3/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/v3/worker/state | +*WorkerApi* | [**worker_state**](flamenco/manager/docs/WorkerApi.md#worker_state) | **GET** /api/v3/worker/state | *WorkerApi* | [**worker_state_changed**](flamenco/manager/docs/WorkerApi.md#worker_state_changed) | **POST** /api/v3/worker/state-changed | Worker changed state. This could be as acknowledgement of a Manager-requested state change, or in response to worker-local signals. *WorkerMgtApi* | [**fetch_worker**](flamenco/manager/docs/WorkerMgtApi.md#fetch_worker) | **GET** /api/v3/worker-mgt/workers/{worker_id} | Fetch info about the worker. +*WorkerMgtApi* | [**fetch_worker_sleep_schedule**](flamenco/manager/docs/WorkerMgtApi.md#fetch_worker_sleep_schedule) | **GET** /api/v3/worker-mgt/workers/{worker_id}/sleep-schedule | *WorkerMgtApi* | [**fetch_workers**](flamenco/manager/docs/WorkerMgtApi.md#fetch_workers) | **GET** /api/v3/worker-mgt/workers | Get list of workers. -*WorkerMgtApi* | [**request_worker_status_change**](flamenco/manager/docs/WorkerMgtApi.md#request_worker_status_change) | **POST** /api/v3/worker-mgt/workers/{worker_id}/setstatus | +*WorkerMgtApi* | [**request_worker_status_change**](flamenco/manager/docs/WorkerMgtApi.md#request_worker_status_change) | **POST** /api/v3/worker-mgt/workers/{worker_id}/setstatus | +*WorkerMgtApi* | [**set_worker_sleep_schedule**](flamenco/manager/docs/WorkerMgtApi.md#set_worker_sleep_schedule) | **POST** /api/v3/worker-mgt/workers/{worker_id}/sleep-schedule | ## Documentation For Models @@ -167,6 +170,7 @@ Class | Method | HTTP request | Description - [SocketIOWorkerUpdate](flamenco/manager/docs/SocketIOWorkerUpdate.md) - [SubmittedJob](flamenco/manager/docs/SubmittedJob.md) - [Task](flamenco/manager/docs/Task.md) + - [TaskLogInfo](flamenco/manager/docs/TaskLogInfo.md) - [TaskStatus](flamenco/manager/docs/TaskStatus.md) - [TaskStatusChange](flamenco/manager/docs/TaskStatusChange.md) - [TaskSummary](flamenco/manager/docs/TaskSummary.md) @@ -178,6 +182,7 @@ Class | Method | HTTP request | Description - [WorkerList](flamenco/manager/docs/WorkerList.md) - [WorkerRegistration](flamenco/manager/docs/WorkerRegistration.md) - [WorkerSignOn](flamenco/manager/docs/WorkerSignOn.md) + - [WorkerSleepSchedule](flamenco/manager/docs/WorkerSleepSchedule.md) - [WorkerStateChange](flamenco/manager/docs/WorkerStateChange.md) - [WorkerStateChanged](flamenco/manager/docs/WorkerStateChanged.md) - [WorkerStatus](flamenco/manager/docs/WorkerStatus.md) @@ -216,4 +221,3 @@ import flamenco.manager from flamenco.manager.apis import * from flamenco.manager.models import * ``` - diff --git a/internal/worker/mocks/client.gen.go b/internal/worker/mocks/client.gen.go index 76d718da..b735284e 100644 --- a/internal/worker/mocks/client.gen.go +++ b/internal/worker/mocks/client.gen.go @@ -276,6 +276,26 @@ func (mr *MockFlamencoClientMockRecorder) FetchTaskWithResponse(arg0, arg1 inter return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FetchTaskWithResponse", reflect.TypeOf((*MockFlamencoClient)(nil).FetchTaskWithResponse), varargs...) } +// FetchWorkerSleepScheduleWithResponse mocks base method. +func (m *MockFlamencoClient) FetchWorkerSleepScheduleWithResponse(arg0 context.Context, arg1 string, arg2 ...api.RequestEditorFn) (*api.FetchWorkerSleepScheduleResponse, error) { + m.ctrl.T.Helper() + varargs := []interface{}{arg0, arg1} + for _, a := range arg2 { + varargs = append(varargs, a) + } + ret := m.ctrl.Call(m, "FetchWorkerSleepScheduleWithResponse", varargs...) + ret0, _ := ret[0].(*api.FetchWorkerSleepScheduleResponse) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// FetchWorkerSleepScheduleWithResponse indicates an expected call of FetchWorkerSleepScheduleWithResponse. +func (mr *MockFlamencoClientMockRecorder) FetchWorkerSleepScheduleWithResponse(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, "FetchWorkerSleepScheduleWithResponse", reflect.TypeOf((*MockFlamencoClient)(nil).FetchWorkerSleepScheduleWithResponse), varargs...) +} + // FetchWorkerWithResponse mocks base method. func (m *MockFlamencoClient) FetchWorkerWithResponse(arg0 context.Context, arg1 string, arg2 ...api.RequestEditorFn) (*api.FetchWorkerResponse, error) { m.ctrl.T.Helper() @@ -776,6 +796,46 @@ func (mr *MockFlamencoClientMockRecorder) SetTaskStatusWithResponse(arg0, arg1, return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetTaskStatusWithResponse", reflect.TypeOf((*MockFlamencoClient)(nil).SetTaskStatusWithResponse), varargs...) } +// SetWorkerSleepScheduleWithBodyWithResponse mocks base method. +func (m *MockFlamencoClient) SetWorkerSleepScheduleWithBodyWithResponse(arg0 context.Context, arg1, arg2 string, arg3 io.Reader, arg4 ...api.RequestEditorFn) (*api.SetWorkerSleepScheduleResponse, error) { + m.ctrl.T.Helper() + varargs := []interface{}{arg0, arg1, arg2, arg3} + for _, a := range arg4 { + varargs = append(varargs, a) + } + ret := m.ctrl.Call(m, "SetWorkerSleepScheduleWithBodyWithResponse", varargs...) + ret0, _ := ret[0].(*api.SetWorkerSleepScheduleResponse) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// SetWorkerSleepScheduleWithBodyWithResponse indicates an expected call of SetWorkerSleepScheduleWithBodyWithResponse. +func (mr *MockFlamencoClientMockRecorder) SetWorkerSleepScheduleWithBodyWithResponse(arg0, arg1, arg2, arg3 interface{}, arg4 ...interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + varargs := append([]interface{}{arg0, arg1, arg2, arg3}, arg4...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetWorkerSleepScheduleWithBodyWithResponse", reflect.TypeOf((*MockFlamencoClient)(nil).SetWorkerSleepScheduleWithBodyWithResponse), varargs...) +} + +// SetWorkerSleepScheduleWithResponse mocks base method. +func (m *MockFlamencoClient) SetWorkerSleepScheduleWithResponse(arg0 context.Context, arg1 string, arg2 api.SetWorkerSleepScheduleJSONRequestBody, arg3 ...api.RequestEditorFn) (*api.SetWorkerSleepScheduleResponse, error) { + m.ctrl.T.Helper() + varargs := []interface{}{arg0, arg1, arg2} + for _, a := range arg3 { + varargs = append(varargs, a) + } + ret := m.ctrl.Call(m, "SetWorkerSleepScheduleWithResponse", varargs...) + ret0, _ := ret[0].(*api.SetWorkerSleepScheduleResponse) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// SetWorkerSleepScheduleWithResponse indicates an expected call of SetWorkerSleepScheduleWithResponse. +func (mr *MockFlamencoClientMockRecorder) SetWorkerSleepScheduleWithResponse(arg0, arg1, arg2 interface{}, arg3 ...interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + varargs := append([]interface{}{arg0, arg1, arg2}, arg3...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetWorkerSleepScheduleWithResponse", reflect.TypeOf((*MockFlamencoClient)(nil).SetWorkerSleepScheduleWithResponse), varargs...) +} + // ShamanCheckoutRequirementsWithBodyWithResponse mocks base method. func (m *MockFlamencoClient) ShamanCheckoutRequirementsWithBodyWithResponse(arg0 context.Context, arg1 string, arg2 io.Reader, arg3 ...api.RequestEditorFn) (*api.ShamanCheckoutRequirementsResponse, error) { m.ctrl.T.Helper() diff --git a/pkg/api/openapi_client.gen.go b/pkg/api/openapi_client.gen.go index f47598a1..33af3386 100644 --- a/pkg/api/openapi_client.gen.go +++ b/pkg/api/openapi_client.gen.go @@ -204,6 +204,14 @@ type ClientInterface interface { RequestWorkerStatusChange(ctx context.Context, workerId string, body RequestWorkerStatusChangeJSONRequestBody, reqEditors ...RequestEditorFn) (*http.Response, error) + // FetchWorkerSleepSchedule request + FetchWorkerSleepSchedule(ctx context.Context, workerId string, reqEditors ...RequestEditorFn) (*http.Response, error) + + // SetWorkerSleepSchedule request with any body + SetWorkerSleepScheduleWithBody(ctx context.Context, workerId string, contentType string, body io.Reader, reqEditors ...RequestEditorFn) (*http.Response, error) + + SetWorkerSleepSchedule(ctx context.Context, workerId string, body SetWorkerSleepScheduleJSONRequestBody, reqEditors ...RequestEditorFn) (*http.Response, error) + // RegisterWorker request with any body RegisterWorkerWithBody(ctx context.Context, contentType string, body io.Reader, reqEditors ...RequestEditorFn) (*http.Response, error) @@ -732,6 +740,42 @@ func (c *Client) RequestWorkerStatusChange(ctx context.Context, workerId string, return c.Client.Do(req) } +func (c *Client) FetchWorkerSleepSchedule(ctx context.Context, workerId string, reqEditors ...RequestEditorFn) (*http.Response, error) { + req, err := NewFetchWorkerSleepScheduleRequest(c.Server, workerId) + 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) SetWorkerSleepScheduleWithBody(ctx context.Context, workerId string, contentType string, body io.Reader, reqEditors ...RequestEditorFn) (*http.Response, error) { + req, err := NewSetWorkerSleepScheduleRequestWithBody(c.Server, workerId, contentType, body) + 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) SetWorkerSleepSchedule(ctx context.Context, workerId string, body SetWorkerSleepScheduleJSONRequestBody, reqEditors ...RequestEditorFn) (*http.Response, error) { + req, err := NewSetWorkerSleepScheduleRequest(c.Server, workerId, body) + 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) RegisterWorkerWithBody(ctx context.Context, contentType string, body io.Reader, reqEditors ...RequestEditorFn) (*http.Response, error) { req, err := NewRegisterWorkerRequestWithBody(c.Server, contentType, body) if err != nil { @@ -1998,6 +2042,87 @@ func NewRequestWorkerStatusChangeRequestWithBody(server string, workerId string, return req, nil } +// NewFetchWorkerSleepScheduleRequest generates requests for FetchWorkerSleepSchedule +func NewFetchWorkerSleepScheduleRequest(server string, workerId string) (*http.Request, error) { + var err error + + var pathParam0 string + + pathParam0, err = runtime.StyleParamWithLocation("simple", false, "worker_id", runtime.ParamLocationPath, workerId) + if err != nil { + return nil, err + } + + serverURL, err := url.Parse(server) + if err != nil { + return nil, err + } + + operationPath := fmt.Sprintf("/api/v3/worker-mgt/workers/%s/sleep-schedule", 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 +} + +// NewSetWorkerSleepScheduleRequest calls the generic SetWorkerSleepSchedule builder with application/json body +func NewSetWorkerSleepScheduleRequest(server string, workerId string, body SetWorkerSleepScheduleJSONRequestBody) (*http.Request, error) { + var bodyReader io.Reader + buf, err := json.Marshal(body) + if err != nil { + return nil, err + } + bodyReader = bytes.NewReader(buf) + return NewSetWorkerSleepScheduleRequestWithBody(server, workerId, "application/json", bodyReader) +} + +// NewSetWorkerSleepScheduleRequestWithBody generates requests for SetWorkerSleepSchedule with any type of body +func NewSetWorkerSleepScheduleRequestWithBody(server string, workerId string, contentType string, body io.Reader) (*http.Request, error) { + var err error + + var pathParam0 string + + pathParam0, err = runtime.StyleParamWithLocation("simple", false, "worker_id", runtime.ParamLocationPath, workerId) + if err != nil { + return nil, err + } + + serverURL, err := url.Parse(server) + if err != nil { + return nil, err + } + + operationPath := fmt.Sprintf("/api/v3/worker-mgt/workers/%s/sleep-schedule", pathParam0) + if operationPath[0] == '/' { + operationPath = "." + operationPath + } + + queryURL, err := serverURL.Parse(operationPath) + if err != nil { + return nil, err + } + + req, err := http.NewRequest("POST", queryURL.String(), body) + if err != nil { + return nil, err + } + + req.Header.Add("Content-Type", contentType) + + return req, nil +} + // NewRegisterWorkerRequest calls the generic RegisterWorker builder with application/json body func NewRegisterWorkerRequest(server string, body RegisterWorkerJSONRequestBody) (*http.Request, error) { var bodyReader io.Reader @@ -2471,6 +2596,14 @@ type ClientWithResponsesInterface interface { RequestWorkerStatusChangeWithResponse(ctx context.Context, workerId string, body RequestWorkerStatusChangeJSONRequestBody, reqEditors ...RequestEditorFn) (*RequestWorkerStatusChangeResponse, error) + // FetchWorkerSleepSchedule request + FetchWorkerSleepScheduleWithResponse(ctx context.Context, workerId string, reqEditors ...RequestEditorFn) (*FetchWorkerSleepScheduleResponse, error) + + // SetWorkerSleepSchedule request with any body + SetWorkerSleepScheduleWithBodyWithResponse(ctx context.Context, workerId string, contentType string, body io.Reader, reqEditors ...RequestEditorFn) (*SetWorkerSleepScheduleResponse, error) + + SetWorkerSleepScheduleWithResponse(ctx context.Context, workerId string, body SetWorkerSleepScheduleJSONRequestBody, reqEditors ...RequestEditorFn) (*SetWorkerSleepScheduleResponse, error) + // RegisterWorker request with any body RegisterWorkerWithBodyWithResponse(ctx context.Context, contentType string, body io.Reader, reqEditors ...RequestEditorFn) (*RegisterWorkerResponse, error) @@ -3184,6 +3317,51 @@ func (r RequestWorkerStatusChangeResponse) StatusCode() int { return 0 } +type FetchWorkerSleepScheduleResponse struct { + Body []byte + HTTPResponse *http.Response + JSON200 *WorkerSleepSchedule + JSONDefault *Error +} + +// Status returns HTTPResponse.Status +func (r FetchWorkerSleepScheduleResponse) Status() string { + if r.HTTPResponse != nil { + return r.HTTPResponse.Status + } + return http.StatusText(0) +} + +// StatusCode returns HTTPResponse.StatusCode +func (r FetchWorkerSleepScheduleResponse) StatusCode() int { + if r.HTTPResponse != nil { + return r.HTTPResponse.StatusCode + } + return 0 +} + +type SetWorkerSleepScheduleResponse struct { + Body []byte + HTTPResponse *http.Response + JSONDefault *Error +} + +// Status returns HTTPResponse.Status +func (r SetWorkerSleepScheduleResponse) Status() string { + if r.HTTPResponse != nil { + return r.HTTPResponse.Status + } + return http.StatusText(0) +} + +// StatusCode returns HTTPResponse.StatusCode +func (r SetWorkerSleepScheduleResponse) StatusCode() int { + if r.HTTPResponse != nil { + return r.HTTPResponse.StatusCode + } + return 0 +} + type RegisterWorkerResponse struct { Body []byte HTTPResponse *http.Response @@ -3750,6 +3928,32 @@ func (c *ClientWithResponses) RequestWorkerStatusChangeWithResponse(ctx context. return ParseRequestWorkerStatusChangeResponse(rsp) } +// FetchWorkerSleepScheduleWithResponse request returning *FetchWorkerSleepScheduleResponse +func (c *ClientWithResponses) FetchWorkerSleepScheduleWithResponse(ctx context.Context, workerId string, reqEditors ...RequestEditorFn) (*FetchWorkerSleepScheduleResponse, error) { + rsp, err := c.FetchWorkerSleepSchedule(ctx, workerId, reqEditors...) + if err != nil { + return nil, err + } + return ParseFetchWorkerSleepScheduleResponse(rsp) +} + +// SetWorkerSleepScheduleWithBodyWithResponse request with arbitrary body returning *SetWorkerSleepScheduleResponse +func (c *ClientWithResponses) SetWorkerSleepScheduleWithBodyWithResponse(ctx context.Context, workerId string, contentType string, body io.Reader, reqEditors ...RequestEditorFn) (*SetWorkerSleepScheduleResponse, error) { + rsp, err := c.SetWorkerSleepScheduleWithBody(ctx, workerId, contentType, body, reqEditors...) + if err != nil { + return nil, err + } + return ParseSetWorkerSleepScheduleResponse(rsp) +} + +func (c *ClientWithResponses) SetWorkerSleepScheduleWithResponse(ctx context.Context, workerId string, body SetWorkerSleepScheduleJSONRequestBody, reqEditors ...RequestEditorFn) (*SetWorkerSleepScheduleResponse, error) { + rsp, err := c.SetWorkerSleepSchedule(ctx, workerId, body, reqEditors...) + if err != nil { + return nil, err + } + return ParseSetWorkerSleepScheduleResponse(rsp) +} + // RegisterWorkerWithBodyWithResponse request with arbitrary body returning *RegisterWorkerResponse func (c *ClientWithResponses) RegisterWorkerWithBodyWithResponse(ctx context.Context, contentType string, body io.Reader, reqEditors ...RequestEditorFn) (*RegisterWorkerResponse, error) { rsp, err := c.RegisterWorkerWithBody(ctx, contentType, body, reqEditors...) @@ -4750,6 +4954,65 @@ func ParseRequestWorkerStatusChangeResponse(rsp *http.Response) (*RequestWorkerS return response, nil } +// ParseFetchWorkerSleepScheduleResponse parses an HTTP response from a FetchWorkerSleepScheduleWithResponse call +func ParseFetchWorkerSleepScheduleResponse(rsp *http.Response) (*FetchWorkerSleepScheduleResponse, error) { + bodyBytes, err := ioutil.ReadAll(rsp.Body) + defer func() { _ = rsp.Body.Close() }() + if err != nil { + return nil, err + } + + response := &FetchWorkerSleepScheduleResponse{ + Body: bodyBytes, + HTTPResponse: rsp, + } + + switch { + case strings.Contains(rsp.Header.Get("Content-Type"), "json") && rsp.StatusCode == 200: + var dest WorkerSleepSchedule + 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 +} + +// ParseSetWorkerSleepScheduleResponse parses an HTTP response from a SetWorkerSleepScheduleWithResponse call +func ParseSetWorkerSleepScheduleResponse(rsp *http.Response) (*SetWorkerSleepScheduleResponse, error) { + bodyBytes, err := ioutil.ReadAll(rsp.Body) + defer func() { _ = rsp.Body.Close() }() + if err != nil { + return nil, err + } + + response := &SetWorkerSleepScheduleResponse{ + Body: bodyBytes, + HTTPResponse: rsp, + } + + switch { + 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 +} + // ParseRegisterWorkerResponse parses an HTTP response from a RegisterWorkerWithResponse call func ParseRegisterWorkerResponse(rsp *http.Response) (*RegisterWorkerResponse, error) { bodyBytes, err := ioutil.ReadAll(rsp.Body) diff --git a/pkg/api/openapi_server.gen.go b/pkg/api/openapi_server.gen.go index aec3728c..1ec784ff 100644 --- a/pkg/api/openapi_server.gen.go +++ b/pkg/api/openapi_server.gen.go @@ -104,6 +104,12 @@ type ServerInterface interface { // (POST /api/v3/worker-mgt/workers/{worker_id}/setstatus) RequestWorkerStatusChange(ctx echo.Context, workerId string) error + + // (GET /api/v3/worker-mgt/workers/{worker_id}/sleep-schedule) + FetchWorkerSleepSchedule(ctx echo.Context, workerId string) error + + // (POST /api/v3/worker-mgt/workers/{worker_id}/sleep-schedule) + SetWorkerSleepSchedule(ctx echo.Context, workerId string) error // Register a new worker // (POST /api/v3/worker/register-worker) RegisterWorker(ctx echo.Context) error @@ -579,6 +585,38 @@ func (w *ServerInterfaceWrapper) RequestWorkerStatusChange(ctx echo.Context) err return err } +// FetchWorkerSleepSchedule converts echo context to params. +func (w *ServerInterfaceWrapper) FetchWorkerSleepSchedule(ctx echo.Context) error { + var err error + // ------------- Path parameter "worker_id" ------------- + var workerId string + + err = runtime.BindStyledParameterWithLocation("simple", false, "worker_id", runtime.ParamLocationPath, ctx.Param("worker_id"), &workerId) + if err != nil { + return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Invalid format for parameter worker_id: %s", err)) + } + + // Invoke the callback with all the unmarshalled arguments + err = w.Handler.FetchWorkerSleepSchedule(ctx, workerId) + return err +} + +// SetWorkerSleepSchedule converts echo context to params. +func (w *ServerInterfaceWrapper) SetWorkerSleepSchedule(ctx echo.Context) error { + var err error + // ------------- Path parameter "worker_id" ------------- + var workerId string + + err = runtime.BindStyledParameterWithLocation("simple", false, "worker_id", runtime.ParamLocationPath, ctx.Param("worker_id"), &workerId) + if err != nil { + return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Invalid format for parameter worker_id: %s", err)) + } + + // Invoke the callback with all the unmarshalled arguments + err = w.Handler.SetWorkerSleepSchedule(ctx, workerId) + return err +} + // RegisterWorker converts echo context to params. func (w *ServerInterfaceWrapper) RegisterWorker(ctx echo.Context) error { var err error @@ -755,6 +793,8 @@ func RegisterHandlersWithBaseURL(router EchoRouter, si ServerInterface, baseURL router.GET(baseURL+"/api/v3/worker-mgt/workers", wrapper.FetchWorkers) router.GET(baseURL+"/api/v3/worker-mgt/workers/:worker_id", wrapper.FetchWorker) router.POST(baseURL+"/api/v3/worker-mgt/workers/:worker_id/setstatus", wrapper.RequestWorkerStatusChange) + router.GET(baseURL+"/api/v3/worker-mgt/workers/:worker_id/sleep-schedule", wrapper.FetchWorkerSleepSchedule) + router.POST(baseURL+"/api/v3/worker-mgt/workers/:worker_id/sleep-schedule", wrapper.SetWorkerSleepSchedule) router.POST(baseURL+"/api/v3/worker/register-worker", wrapper.RegisterWorker) router.POST(baseURL+"/api/v3/worker/sign-off", wrapper.SignOff) router.POST(baseURL+"/api/v3/worker/sign-on", wrapper.SignOn) diff --git a/pkg/api/openapi_spec.gen.go b/pkg/api/openapi_spec.gen.go index d0d96df9..a41cc418 100644 --- a/pkg/api/openapi_spec.gen.go +++ b/pkg/api/openapi_spec.gen.go @@ -18,173 +18,179 @@ import ( // Base64 encoded, gzipped, json marshaled Swagger object var swaggerSpec = []string{ - "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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 20f5ab70..aa7f79e5 100644 --- a/pkg/api/openapi_types.gen.go +++ b/pkg/api/openapi_types.gen.go @@ -693,6 +693,16 @@ type WorkerSignOn struct { SupportedTaskTypes []string `json:"supported_task_types"` } +// Sleep schedule for a single Worker. Start and end time indicate the time of each day at which the schedule is active. Applies only when today is in `days_of_week`, or when `days_of_week` is empty. +// Start and end time are in 24-hour HH:MM notation. +type WorkerSleepSchedule struct { + // Space-separated two-letter strings indicating days of week the schedule is active ("mo", "tu", etc.). Empty means "every day". + DaysOfWeek string `json:"days_of_week"` + EndTime string `json:"end_time"` + IsActive bool `json:"is_active"` + StartTime string `json:"start_time"` +} + // WorkerStateChange defines model for WorkerStateChange. type WorkerStateChange struct { StatusRequested WorkerStatus `json:"status_requested"` @@ -771,6 +781,9 @@ type SetTaskStatusJSONBody TaskStatusChange // RequestWorkerStatusChangeJSONBody defines parameters for RequestWorkerStatusChange. type RequestWorkerStatusChangeJSONBody WorkerStatusChangeRequest +// SetWorkerSleepScheduleJSONBody defines parameters for SetWorkerSleepSchedule. +type SetWorkerSleepScheduleJSONBody WorkerSleepSchedule + // RegisterWorkerJSONBody defines parameters for RegisterWorker. type RegisterWorkerJSONBody WorkerRegistration @@ -816,6 +829,9 @@ type SetTaskStatusJSONRequestBody SetTaskStatusJSONBody // RequestWorkerStatusChangeJSONRequestBody defines body for RequestWorkerStatusChange for application/json ContentType. type RequestWorkerStatusChangeJSONRequestBody RequestWorkerStatusChangeJSONBody +// SetWorkerSleepScheduleJSONRequestBody defines body for SetWorkerSleepSchedule for application/json ContentType. +type SetWorkerSleepScheduleJSONRequestBody SetWorkerSleepScheduleJSONBody + // RegisterWorkerJSONRequestBody defines body for RegisterWorker for application/json ContentType. type RegisterWorkerJSONRequestBody RegisterWorkerJSONBody diff --git a/web/app/src/manager-api/ApiClient.js b/web/app/src/manager-api/ApiClient.js index 305417ea..3713dfa6 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/d170cda3 / webbrowser' + 'User-Agent': 'Flamenco/26f92503 / webbrowser' }; /** diff --git a/web/app/src/manager-api/index.js b/web/app/src/manager-api/index.js index 3e216e28..cf62b624 100644 --- a/web/app/src/manager-api/index.js +++ b/web/app/src/manager-api/index.js @@ -72,6 +72,7 @@ import WorkerAllOf from './model/WorkerAllOf'; import WorkerList from './model/WorkerList'; import WorkerRegistration from './model/WorkerRegistration'; import WorkerSignOn from './model/WorkerSignOn'; +import WorkerSleepSchedule from './model/WorkerSleepSchedule'; import WorkerStateChange from './model/WorkerStateChange'; import WorkerStateChanged from './model/WorkerStateChanged'; import WorkerStatus from './model/WorkerStatus'; @@ -476,6 +477,12 @@ export { */ WorkerSignOn, + /** + * The WorkerSleepSchedule model constructor. + * @property {module:model/WorkerSleepSchedule} + */ + WorkerSleepSchedule, + /** * The WorkerStateChange model constructor. * @property {module:model/WorkerStateChange} diff --git a/web/app/src/manager-api/manager/WorkerMgtApi.js b/web/app/src/manager-api/manager/WorkerMgtApi.js index fe05d6c7..97089b65 100644 --- a/web/app/src/manager-api/manager/WorkerMgtApi.js +++ b/web/app/src/manager-api/manager/WorkerMgtApi.js @@ -16,6 +16,7 @@ import ApiClient from "../ApiClient"; import Error from '../model/Error'; import Worker from '../model/Worker'; import WorkerList from '../model/WorkerList'; +import WorkerSleepSchedule from '../model/WorkerSleepSchedule'; import WorkerStatusChangeRequest from '../model/WorkerStatusChangeRequest'; /** @@ -84,6 +85,50 @@ export default class WorkerMgtApi { } + /** + * @param {String} workerId + * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing data of type {@link module:model/WorkerSleepSchedule} and HTTP response + */ + fetchWorkerSleepScheduleWithHttpInfo(workerId) { + let postBody = null; + // verify the required parameter 'workerId' is set + if (workerId === undefined || workerId === null) { + throw new Error("Missing the required parameter 'workerId' when calling fetchWorkerSleepSchedule"); + } + + let pathParams = { + 'worker_id': workerId + }; + let queryParams = { + }; + let headerParams = { + }; + let formParams = { + }; + + let authNames = []; + let contentTypes = []; + let accepts = ['application/json']; + let returnType = WorkerSleepSchedule; + return this.apiClient.callApi( + '/api/v3/worker-mgt/workers/{worker_id}/sleep-schedule', 'GET', + pathParams, queryParams, headerParams, formParams, postBody, + authNames, contentTypes, accepts, returnType, null + ); + } + + /** + * @param {String} workerId + * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with data of type {@link module:model/WorkerSleepSchedule} + */ + fetchWorkerSleepSchedule(workerId) { + return this.fetchWorkerSleepScheduleWithHttpInfo(workerId) + .then(function(response_and_data) { + return response_and_data.data; + }); + } + + /** * Get list of workers. * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing data of type {@link module:model/WorkerList} and HTTP response @@ -173,4 +218,54 @@ export default class WorkerMgtApi { } + /** + * @param {String} workerId + * @param {module:model/WorkerSleepSchedule} workerSleepSchedule The new sleep schedule. + * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing HTTP response + */ + setWorkerSleepScheduleWithHttpInfo(workerId, workerSleepSchedule) { + let postBody = workerSleepSchedule; + // verify the required parameter 'workerId' is set + if (workerId === undefined || workerId === null) { + throw new Error("Missing the required parameter 'workerId' when calling setWorkerSleepSchedule"); + } + // verify the required parameter 'workerSleepSchedule' is set + if (workerSleepSchedule === undefined || workerSleepSchedule === null) { + throw new Error("Missing the required parameter 'workerSleepSchedule' when calling setWorkerSleepSchedule"); + } + + let pathParams = { + 'worker_id': workerId + }; + let queryParams = { + }; + let headerParams = { + }; + let formParams = { + }; + + let authNames = []; + let contentTypes = ['application/json']; + let accepts = ['application/json']; + let returnType = null; + return this.apiClient.callApi( + '/api/v3/worker-mgt/workers/{worker_id}/sleep-schedule', 'POST', + pathParams, queryParams, headerParams, formParams, postBody, + authNames, contentTypes, accepts, returnType, null + ); + } + + /** + * @param {String} workerId + * @param {module:model/WorkerSleepSchedule} workerSleepSchedule The new sleep schedule. + * @return {Promise} a {@link https://www.promisejs.org/|Promise} + */ + setWorkerSleepSchedule(workerId, workerSleepSchedule) { + return this.setWorkerSleepScheduleWithHttpInfo(workerId, workerSleepSchedule) + .then(function(response_and_data) { + return response_and_data.data; + }); + } + + } diff --git a/web/app/src/manager-api/model/WorkerSleepSchedule.js b/web/app/src/manager-api/model/WorkerSleepSchedule.js new file mode 100644 index 00000000..210d59ba --- /dev/null +++ b/web/app/src/manager-api/model/WorkerSleepSchedule.js @@ -0,0 +1,105 @@ +/** + * 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 WorkerSleepSchedule model module. + * @module model/WorkerSleepSchedule + * @version 0.0.0 + */ +class WorkerSleepSchedule { + /** + * Constructs a new WorkerSleepSchedule. + * Sleep schedule for a single Worker. Start and end time indicate the time of each day at which the schedule is active. Applies only when today is in `days_of_week`, or when `days_of_week` is empty. Start and end time are in 24-hour HH:MM notation. + * @alias module:model/WorkerSleepSchedule + * @param isActive {Boolean} + * @param daysOfWeek {String} Space-separated two-letter strings indicating days of week the schedule is active (\"mo\", \"tu\", etc.). Empty means \"every day\". + * @param startTime {String} + * @param endTime {String} + */ + constructor(isActive, daysOfWeek, startTime, endTime) { + + WorkerSleepSchedule.initialize(this, isActive, daysOfWeek, startTime, endTime); + } + + /** + * 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, isActive, daysOfWeek, startTime, endTime) { + obj['is_active'] = isActive; + obj['days_of_week'] = daysOfWeek; + obj['start_time'] = startTime; + obj['end_time'] = endTime; + } + + /** + * Constructs a WorkerSleepSchedule 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/WorkerSleepSchedule} obj Optional instance to populate. + * @return {module:model/WorkerSleepSchedule} The populated WorkerSleepSchedule instance. + */ + static constructFromObject(data, obj) { + if (data) { + obj = obj || new WorkerSleepSchedule(); + + if (data.hasOwnProperty('is_active')) { + obj['is_active'] = ApiClient.convertToType(data['is_active'], 'Boolean'); + } + if (data.hasOwnProperty('days_of_week')) { + obj['days_of_week'] = ApiClient.convertToType(data['days_of_week'], 'String'); + } + if (data.hasOwnProperty('start_time')) { + obj['start_time'] = ApiClient.convertToType(data['start_time'], 'String'); + } + if (data.hasOwnProperty('end_time')) { + obj['end_time'] = ApiClient.convertToType(data['end_time'], 'String'); + } + } + return obj; + } + + +} + +/** + * @member {Boolean} is_active + */ +WorkerSleepSchedule.prototype['is_active'] = undefined; + +/** + * Space-separated two-letter strings indicating days of week the schedule is active (\"mo\", \"tu\", etc.). Empty means \"every day\". + * @member {String} days_of_week + */ +WorkerSleepSchedule.prototype['days_of_week'] = undefined; + +/** + * @member {String} start_time + */ +WorkerSleepSchedule.prototype['start_time'] = undefined; + +/** + * @member {String} end_time + */ +WorkerSleepSchedule.prototype['end_time'] = undefined; + + + + + + +export default WorkerSleepSchedule; +