From 0c7bf3bf3b89ff7d77d99ba5a87f8651b7019c1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Thu, 29 Feb 2024 20:27:44 +0100 Subject: [PATCH 01/84] OAPI: add farm status service Add an OpenAPI operation to fetch the overall farm status from the Manager. --- pkg/api/flamenco-openapi.yaml | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/pkg/api/flamenco-openapi.yaml b/pkg/api/flamenco-openapi.yaml index a3f73671..253a841a 100644 --- a/pkg/api/flamenco-openapi.yaml +++ b/pkg/api/flamenco-openapi.yaml @@ -191,6 +191,20 @@ paths: application/json: schema: { $ref: "#/components/schemas/SharedStorageLocation" } + /api/v3/status: + summary: Report the status of the Flamenco farm. + get: + summary: Get the status of this Flamenco farm. + operationId: getFarmStatus + tags: [meta] + responses: + "200": + description: normal response + content: + application/json: + schema: + $ref: "#/components/schemas/FarmStatusReport" + ## Worker /api/v3/worker/register-worker: @@ -1384,6 +1398,26 @@ components: name: Your Manager git: v3.2-76-gdd34d538 + FarmStatusReport: + type: object + properties: + "status": + $ref: "#/components/schemas/FarmStatus" + required: [status] + example: + status: idle + + FarmStatus: + type: string + enum: + - "active" # Actively working on jobs. + - "idle" # Farm could be active, but has no work to do. + - "waiting" # Work has been queued, but all workers are asleep. + - "asleep" # Farm is idle, and all workers are asleep. + - "inoperative" # Cannot work: no workers, or all are offline/error. + - "unknown" # Unexpected configuration of worker and job statuses. + - "starting" # Farm is starting up. + ManagerConfiguration: type: object properties: -- 2.30.2 From d9ffe8a1b61d924ca3604608bdb97fdff5d2b423 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Thu, 29 Feb 2024 20:38:38 +0100 Subject: [PATCH 02/84] OAPI: regenerate code --- addon/flamenco/manager/api/meta_api.py | 115 ++++++ addon/flamenco/manager/docs/FarmStatus.md | 11 + .../flamenco/manager/docs/FarmStatusReport.md | 12 + addon/flamenco/manager/docs/MetaApi.md | 62 +++ addon/flamenco/manager/model/farm_status.py | 287 ++++++++++++++ .../manager/model/farm_status_report.py | 267 +++++++++++++ addon/flamenco/manager/models/__init__.py | 2 + addon/flamenco/manager_README.md | 279 +++++++------- internal/worker/mocks/client.gen.go | 20 + pkg/api/openapi_client.gen.go | 102 +++++ pkg/api/openapi_server.gen.go | 13 + pkg/api/openapi_spec.gen.go | 353 +++++++++--------- pkg/api/openapi_types.gen.go | 25 ++ web/app/src/manager-api/index.js | 14 + web/app/src/manager-api/manager/MetaApi.js | 40 ++ web/app/src/manager-api/model/FarmStatus.js | 81 ++++ .../src/manager-api/model/FarmStatusReport.js | 74 ++++ 17 files changed, 1443 insertions(+), 314 deletions(-) create mode 100644 addon/flamenco/manager/docs/FarmStatus.md create mode 100644 addon/flamenco/manager/docs/FarmStatusReport.md create mode 100644 addon/flamenco/manager/model/farm_status.py create mode 100644 addon/flamenco/manager/model/farm_status_report.py create mode 100644 web/app/src/manager-api/model/FarmStatus.js create mode 100644 web/app/src/manager-api/model/FarmStatusReport.js diff --git a/addon/flamenco/manager/api/meta_api.py b/addon/flamenco/manager/api/meta_api.py index d67e0c96..9627d223 100644 --- a/addon/flamenco/manager/api/meta_api.py +++ b/addon/flamenco/manager/api/meta_api.py @@ -24,6 +24,7 @@ from flamenco.manager.model_utils import ( # noqa: F401 from flamenco.manager.model.blender_path_check_result import BlenderPathCheckResult from flamenco.manager.model.blender_path_find_result import BlenderPathFindResult from flamenco.manager.model.error import Error +from flamenco.manager.model.farm_status_report import FarmStatusReport from flamenco.manager.model.flamenco_version import FlamencoVersion from flamenco.manager.model.manager_configuration import ManagerConfiguration from flamenco.manager.model.manager_variable_audience import ManagerVariableAudience @@ -268,6 +269,48 @@ class MetaApi(object): }, api_client=api_client ) + self.get_farm_status_endpoint = _Endpoint( + settings={ + 'response_type': (FarmStatusReport,), + 'auth': [], + 'endpoint_path': '/api/v3/status', + 'operation_id': 'get_farm_status', + 'http_method': 'GET', + 'servers': None, + }, + params_map={ + 'all': [ + ], + 'required': [], + 'nullable': [ + ], + 'enum': [ + ], + 'validation': [ + ] + }, + root_map={ + 'validations': { + }, + 'allowed_values': { + }, + 'openapi_types': { + }, + 'attribute_map': { + }, + 'location_map': { + }, + 'collection_format_map': { + } + }, + headers_map={ + 'accept': [ + 'application/json' + ], + 'content_type': [], + }, + api_client=api_client + ) self.get_shared_storage_endpoint = _Endpoint( settings={ 'response_type': (SharedStorageLocation,), @@ -831,6 +874,78 @@ class MetaApi(object): kwargs['_host_index'] = kwargs.get('_host_index') return self.get_configuration_file_endpoint.call_with_http_info(**kwargs) + def get_farm_status( + self, + **kwargs + ): + """Get the status of this Flamenco farm. # noqa: E501 + + This method makes a synchronous HTTP request by default. To make an + asynchronous HTTP request, please pass async_req=True + + >>> thread = api.get_farm_status(async_req=True) + >>> result = thread.get() + + + 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: + FarmStatusReport + 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') + return self.get_farm_status_endpoint.call_with_http_info(**kwargs) + def get_shared_storage( self, audience, diff --git a/addon/flamenco/manager/docs/FarmStatus.md b/addon/flamenco/manager/docs/FarmStatus.md new file mode 100644 index 00000000..20c3bdd6 --- /dev/null +++ b/addon/flamenco/manager/docs/FarmStatus.md @@ -0,0 +1,11 @@ +# FarmStatus + + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**value** | **str** | | must be one of ["active", "idle", "waiting", "asleep", "inoperative", "unknown", "starting", ] + +[[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/FarmStatusReport.md b/addon/flamenco/manager/docs/FarmStatusReport.md new file mode 100644 index 00000000..4b8972cf --- /dev/null +++ b/addon/flamenco/manager/docs/FarmStatusReport.md @@ -0,0 +1,12 @@ +# FarmStatusReport + + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**status** | [**FarmStatus**](FarmStatus.md) | | +**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/MetaApi.md b/addon/flamenco/manager/docs/MetaApi.md index 9b778a3f..b4d7b5bb 100644 --- a/addon/flamenco/manager/docs/MetaApi.md +++ b/addon/flamenco/manager/docs/MetaApi.md @@ -9,6 +9,7 @@ Method | HTTP request | Description [**find_blender_exe_path**](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 [**get_configuration**](MetaApi.md#get_configuration) | **GET** /api/v3/configuration | Get the configuration of this Manager. [**get_configuration_file**](MetaApi.md#get_configuration_file) | **GET** /api/v3/configuration/file | Retrieve the configuration of Flamenco Manager. +[**get_farm_status**](MetaApi.md#get_farm_status) | **GET** /api/v3/status | Get the status of this Flamenco farm. [**get_shared_storage**](MetaApi.md#get_shared_storage) | **GET** /api/v3/configuration/shared-storage/{audience}/{platform} | Get the shared storage location of this Manager, adjusted for the given audience and platform. [**get_variables**](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. [**get_version**](MetaApi.md#get_version) | **GET** /api/v3/version | Get the Flamenco version of this Manager @@ -341,6 +342,67 @@ 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) +# **get_farm_status** +> FarmStatusReport get_farm_status() + +Get the status of this Flamenco farm. + +### Example + + +```python +import time +import flamenco.manager +from flamenco.manager.api import meta_api +from flamenco.manager.model.farm_status_report import FarmStatusReport +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 = meta_api.MetaApi(api_client) + + # example, this endpoint has no required or optional parameters + try: + # Get the status of this Flamenco farm. + api_response = api_instance.get_farm_status() + pprint(api_response) + except flamenco.manager.ApiException as e: + print("Exception when calling MetaApi->get_farm_status: %s\n" % e) +``` + + +### Parameters +This endpoint does not need any parameter. + +### Return type + +[**FarmStatusReport**](FarmStatusReport.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 | - | + +[[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) + # **get_shared_storage** > SharedStorageLocation get_shared_storage(audience, platform) diff --git a/addon/flamenco/manager/model/farm_status.py b/addon/flamenco/manager/model/farm_status.py new file mode 100644 index 00000000..7a3211ae --- /dev/null +++ b/addon/flamenco/manager/model/farm_status.py @@ -0,0 +1,287 @@ +""" + 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 FarmStatus(ModelSimple): + """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. + 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 = { + ('value',): { + 'ACTIVE': "active", + 'IDLE': "idle", + 'WAITING': "waiting", + 'ASLEEP': "asleep", + 'INOPERATIVE': "inoperative", + 'UNKNOWN': "unknown", + 'STARTING': "starting", + }, + } + + validations = { + } + + additional_properties_type = None + + _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 { + 'value': (str,), + } + + @cached_property + def discriminator(): + return None + + + attribute_map = {} + + read_only_vars = set() + + _composed_schemas = None + + 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, *args, **kwargs): + """FarmStatus - a model defined in OpenAPI + + Note that value can be passed either in args or in kwargs, but not in both. + + Args: + args[0] (str):, must be one of ["active", "idle", "waiting", "asleep", "inoperative", "unknown", "starting", ] # noqa: E501 + + Keyword Args: + value (str):, must be one of ["active", "idle", "waiting", "asleep", "inoperative", "unknown", "starting", ] # noqa: E501 + _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,) + """ + # required up here when default value is not given + _path_to_item = kwargs.pop('_path_to_item', ()) + + if 'value' in kwargs: + value = kwargs.pop('value') + elif args: + args = list(args) + value = args.pop(0) + else: + raise ApiTypeError( + "value is required, but not passed in args or kwargs and doesn't have default", + path_to_item=_path_to_item, + valid_classes=(self.__class__,), + ) + + _check_type = kwargs.pop('_check_type', True) + _spec_property_naming = kwargs.pop('_spec_property_naming', False) + _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.value = value + if kwargs: + raise ApiTypeError( + "Invalid named arguments=%s passed to %s. Remove those invalid named arguments." % ( + kwargs, + self.__class__.__name__, + ), + path_to_item=_path_to_item, + valid_classes=(self.__class__,), + ) + + @classmethod + @convert_js_args_to_python_args + def _from_openapi_data(cls, *args, **kwargs): + """FarmStatus - a model defined in OpenAPI + + Note that value can be passed either in args or in kwargs, but not in both. + + Args: + args[0] (str):, must be one of ["active", "idle", "waiting", "asleep", "inoperative", "unknown", "starting", ] # noqa: E501 + + Keyword Args: + value (str):, must be one of ["active", "idle", "waiting", "asleep", "inoperative", "unknown", "starting", ] # noqa: E501 + _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,) + """ + # required up here when default value is not given + _path_to_item = kwargs.pop('_path_to_item', ()) + + self = super(OpenApiModel, cls).__new__(cls) + + if 'value' in kwargs: + value = kwargs.pop('value') + elif args: + args = list(args) + value = args.pop(0) + else: + raise ApiTypeError( + "value is required, but not passed in args or kwargs and doesn't have default", + path_to_item=_path_to_item, + valid_classes=(self.__class__,), + ) + + _check_type = kwargs.pop('_check_type', True) + _spec_property_naming = kwargs.pop('_spec_property_naming', False) + _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.value = value + if kwargs: + raise ApiTypeError( + "Invalid named arguments=%s passed to %s. Remove those invalid named arguments." % ( + kwargs, + self.__class__.__name__, + ), + path_to_item=_path_to_item, + valid_classes=(self.__class__,), + ) + + return self diff --git a/addon/flamenco/manager/model/farm_status_report.py b/addon/flamenco/manager/model/farm_status_report.py new file mode 100644 index 00000000..e103b4bf --- /dev/null +++ b/addon/flamenco/manager/model/farm_status_report.py @@ -0,0 +1,267 @@ +""" + 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 + + +def lazy_import(): + from flamenco.manager.model.farm_status import FarmStatus + globals()['FarmStatus'] = FarmStatus + + +class FarmStatusReport(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 + """ + lazy_import() + 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. + """ + lazy_import() + return { + 'status': (FarmStatus,), # noqa: E501 + } + + @cached_property + def discriminator(): + return None + + + attribute_map = { + 'status': 'status', # noqa: E501 + } + + read_only_vars = { + } + + _composed_schemas = {} + + @classmethod + @convert_js_args_to_python_args + def _from_openapi_data(cls, status, *args, **kwargs): # noqa: E501 + """FarmStatusReport - a model defined in OpenAPI + + Args: + status (FarmStatus): + + 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.status = status + 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, status, *args, **kwargs): # noqa: E501 + """FarmStatusReport - a model defined in OpenAPI + + Args: + status (FarmStatus): + + 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.status = status + 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 b2675225..42b8fd19 100644 --- a/addon/flamenco/manager/models/__init__.py +++ b/addon/flamenco/manager/models/__init__.py @@ -29,6 +29,8 @@ from flamenco.manager.model.event_task_log_update import EventTaskLogUpdate from flamenco.manager.model.event_task_update import EventTaskUpdate from flamenco.manager.model.event_worker_tag_update import EventWorkerTagUpdate from flamenco.manager.model.event_worker_update import EventWorkerUpdate +from flamenco.manager.model.farm_status import FarmStatus +from flamenco.manager.model.farm_status_report import FarmStatusReport from flamenco.manager.model.flamenco_version import FlamencoVersion from flamenco.manager.model.job import Job from flamenco.manager.model.job_all_of import JobAllOf diff --git a/addon/flamenco/manager_README.md b/addon/flamenco/manager_README.md index 248073c5..b48a7f1f 100644 --- a/addon/flamenco/manager_README.md +++ b/addon/flamenco/manager_README.md @@ -76,148 +76,151 @@ All URIs are relative to *http://localhost* Class | Method | HTTP request | Description ------------ | ------------- | ------------- | ------------- -*JobsApi* | [**delete_job**](flamenco/manager/docs/JobsApi.md#delete_job) | **DELETE** /api/v3/jobs/{job_id} | Request deletion this job, including its tasks and any log files. The actual deletion may happen in the background. No job files will be deleted (yet). -*JobsApi* | [**delete_job_mass**](flamenco/manager/docs/JobsApi.md#delete_job_mass) | **DELETE** /api/v3/jobs/mass-delete | Mark jobs for deletion, based on certain criteria. -*JobsApi* | [**delete_job_what_would_it_do**](flamenco/manager/docs/JobsApi.md#delete_job_what_would_it_do) | **GET** /api/v3/jobs/{job_id}/what-would-delete-do | Get info about what would be deleted when deleting this job. The job itself, its logs, and the last-rendered images will always be deleted. The job files are only deleted conditionally, and this operation can be used to figure that out. -*JobsApi* | [**fetch_global_last_rendered_info**](flamenco/manager/docs/JobsApi.md#fetch_global_last_rendered_info) | **GET** /api/v3/jobs/last-rendered | Get the URL that serves the last-rendered images. -*JobsApi* | [**fetch_job**](flamenco/manager/docs/JobsApi.md#fetch_job) | **GET** /api/v3/jobs/{job_id} | Fetch info about the job. -*JobsApi* | [**fetch_job_blocklist**](flamenco/manager/docs/JobsApi.md#fetch_job_blocklist) | **GET** /api/v3/jobs/{job_id}/blocklist | Fetch the list of workers that are blocked from doing certain task types on this job. -*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_priority**](flamenco/manager/docs/JobsApi.md#set_job_priority) | **POST** /api/v3/jobs/{job_id}/setpriority | -*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. -*JobsApi* | [**submit_job_check**](flamenco/manager/docs/JobsApi.md#submit_job_check) | **POST** /api/v3/jobs/check | Submit a new job for Flamenco Manager to check. -*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_shared_storage**](flamenco/manager/docs/MetaApi.md#get_shared_storage) | **GET** /api/v3/configuration/shared-storage/{audience}/{platform} | Get the shared storage location of this Manager, adjusted for the given audience and 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_setup_assistant_config**](flamenco/manager/docs/MetaApi.md#save_setup_assistant_config) | **POST** /api/v3/configuration/setup-assistant | 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. -*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_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_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* | [**create_worker_tag**](flamenco/manager/docs/WorkerMgtApi.md#create_worker_tag) | **POST** /api/v3/worker-mgt/tags | Create a new worker tag. -*WorkerMgtApi* | [**delete_worker**](flamenco/manager/docs/WorkerMgtApi.md#delete_worker) | **DELETE** /api/v3/worker-mgt/workers/{worker_id} | Remove the given worker. It is recommended to only call this function when the worker is in `offline` state. If the worker is still running, stop it first. Any task still assigned to the worker will be requeued. -*WorkerMgtApi* | [**delete_worker_tag**](flamenco/manager/docs/WorkerMgtApi.md#delete_worker_tag) | **DELETE** /api/v3/worker-mgt/tag/{tag_id} | Remove this worker tag. This unassigns all workers from the tag and removes it. -*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_worker_tag**](flamenco/manager/docs/WorkerMgtApi.md#fetch_worker_tag) | **GET** /api/v3/worker-mgt/tag/{tag_id} | Get a single worker tag. -*WorkerMgtApi* | [**fetch_worker_tags**](flamenco/manager/docs/WorkerMgtApi.md#fetch_worker_tags) | **GET** /api/v3/worker-mgt/tags | Get list of worker tags. -*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* | [**set_worker_sleep_schedule**](flamenco/manager/docs/WorkerMgtApi.md#set_worker_sleep_schedule) | **POST** /api/v3/worker-mgt/workers/{worker_id}/sleep-schedule | -*WorkerMgtApi* | [**set_worker_tags**](flamenco/manager/docs/WorkerMgtApi.md#set_worker_tags) | **POST** /api/v3/worker-mgt/workers/{worker_id}/settags | -*WorkerMgtApi* | [**update_worker_tag**](flamenco/manager/docs/WorkerMgtApi.md#update_worker_tag) | **PUT** /api/v3/worker-mgt/tag/{tag_id} | Update an existing worker tag. +*JobsApi* | [**delete_job**](flamenco\manager\docs/JobsApi.md#delete_job) | **DELETE** /api/v3/jobs/{job_id} | Request deletion this job, including its tasks and any log files. The actual deletion may happen in the background. No job files will be deleted (yet). +*JobsApi* | [**delete_job_mass**](flamenco\manager\docs/JobsApi.md#delete_job_mass) | **DELETE** /api/v3/jobs/mass-delete | Mark jobs for deletion, based on certain criteria. +*JobsApi* | [**delete_job_what_would_it_do**](flamenco\manager\docs/JobsApi.md#delete_job_what_would_it_do) | **GET** /api/v3/jobs/{job_id}/what-would-delete-do | Get info about what would be deleted when deleting this job. The job itself, its logs, and the last-rendered images will always be deleted. The job files are only deleted conditionally, and this operation can be used to figure that out. +*JobsApi* | [**fetch_global_last_rendered_info**](flamenco\manager\docs/JobsApi.md#fetch_global_last_rendered_info) | **GET** /api/v3/jobs/last-rendered | Get the URL that serves the last-rendered images. +*JobsApi* | [**fetch_job**](flamenco\manager\docs/JobsApi.md#fetch_job) | **GET** /api/v3/jobs/{job_id} | Fetch info about the job. +*JobsApi* | [**fetch_job_blocklist**](flamenco\manager\docs/JobsApi.md#fetch_job_blocklist) | **GET** /api/v3/jobs/{job_id}/blocklist | Fetch the list of workers that are blocked from doing certain task types on this job. +*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_priority**](flamenco\manager\docs/JobsApi.md#set_job_priority) | **POST** /api/v3/jobs/{job_id}/setpriority | +*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. +*JobsApi* | [**submit_job_check**](flamenco\manager\docs/JobsApi.md#submit_job_check) | **POST** /api/v3/jobs/check | Submit a new job for Flamenco Manager to check. +*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_farm_status**](flamenco\manager\docs/MetaApi.md#get_farm_status) | **GET** /api/v3/status | Get the status of this Flamenco farm. +*MetaApi* | [**get_shared_storage**](flamenco\manager\docs/MetaApi.md#get_shared_storage) | **GET** /api/v3/configuration/shared-storage/{audience}/{platform} | Get the shared storage location of this Manager, adjusted for the given audience and 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_setup_assistant_config**](flamenco\manager\docs/MetaApi.md#save_setup_assistant_config) | **POST** /api/v3/configuration/setup-assistant | 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. +*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_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_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* | [**create_worker_tag**](flamenco\manager\docs/WorkerMgtApi.md#create_worker_tag) | **POST** /api/v3/worker-mgt/tags | Create a new worker tag. +*WorkerMgtApi* | [**delete_worker**](flamenco\manager\docs/WorkerMgtApi.md#delete_worker) | **DELETE** /api/v3/worker-mgt/workers/{worker_id} | Remove the given worker. It is recommended to only call this function when the worker is in `offline` state. If the worker is still running, stop it first. Any task still assigned to the worker will be requeued. +*WorkerMgtApi* | [**delete_worker_tag**](flamenco\manager\docs/WorkerMgtApi.md#delete_worker_tag) | **DELETE** /api/v3/worker-mgt/tag/{tag_id} | Remove this worker tag. This unassigns all workers from the tag and removes it. +*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_worker_tag**](flamenco\manager\docs/WorkerMgtApi.md#fetch_worker_tag) | **GET** /api/v3/worker-mgt/tag/{tag_id} | Get a single worker tag. +*WorkerMgtApi* | [**fetch_worker_tags**](flamenco\manager\docs/WorkerMgtApi.md#fetch_worker_tags) | **GET** /api/v3/worker-mgt/tags | Get list of worker tags. +*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* | [**set_worker_sleep_schedule**](flamenco\manager\docs/WorkerMgtApi.md#set_worker_sleep_schedule) | **POST** /api/v3/worker-mgt/workers/{worker_id}/sleep-schedule | +*WorkerMgtApi* | [**set_worker_tags**](flamenco\manager\docs/WorkerMgtApi.md#set_worker_tags) | **POST** /api/v3/worker-mgt/workers/{worker_id}/settags | +*WorkerMgtApi* | [**update_worker_tag**](flamenco\manager\docs/WorkerMgtApi.md#update_worker_tag) | **PUT** /api/v3/worker-mgt/tag/{tag_id} | Update an existing worker tag. ## Documentation For Models - - [AssignedTask](flamenco/manager/docs/AssignedTask.md) - - [AvailableJobSetting](flamenco/manager/docs/AvailableJobSetting.md) - - [AvailableJobSettingEvalInfo](flamenco/manager/docs/AvailableJobSettingEvalInfo.md) - - [AvailableJobSettingSubtype](flamenco/manager/docs/AvailableJobSettingSubtype.md) - - [AvailableJobSettingType](flamenco/manager/docs/AvailableJobSettingType.md) - - [AvailableJobSettingVisibility](flamenco/manager/docs/AvailableJobSettingVisibility.md) - - [AvailableJobType](flamenco/manager/docs/AvailableJobType.md) - - [AvailableJobTypes](flamenco/manager/docs/AvailableJobTypes.md) - - [BlenderPathCheckResult](flamenco/manager/docs/BlenderPathCheckResult.md) - - [BlenderPathFindResult](flamenco/manager/docs/BlenderPathFindResult.md) - - [BlenderPathSource](flamenco/manager/docs/BlenderPathSource.md) - - [Command](flamenco/manager/docs/Command.md) - - [Error](flamenco/manager/docs/Error.md) - - [EventJobUpdate](flamenco/manager/docs/EventJobUpdate.md) - - [EventLastRenderedUpdate](flamenco/manager/docs/EventLastRenderedUpdate.md) - - [EventLifeCycle](flamenco/manager/docs/EventLifeCycle.md) - - [EventTaskLogUpdate](flamenco/manager/docs/EventTaskLogUpdate.md) - - [EventTaskUpdate](flamenco/manager/docs/EventTaskUpdate.md) - - [EventWorkerTagUpdate](flamenco/manager/docs/EventWorkerTagUpdate.md) - - [EventWorkerUpdate](flamenco/manager/docs/EventWorkerUpdate.md) - - [FlamencoVersion](flamenco/manager/docs/FlamencoVersion.md) - - [Job](flamenco/manager/docs/Job.md) - - [JobAllOf](flamenco/manager/docs/JobAllOf.md) - - [JobBlocklist](flamenco/manager/docs/JobBlocklist.md) - - [JobBlocklistEntry](flamenco/manager/docs/JobBlocklistEntry.md) - - [JobDeletionInfo](flamenco/manager/docs/JobDeletionInfo.md) - - [JobLastRenderedImageInfo](flamenco/manager/docs/JobLastRenderedImageInfo.md) - - [JobMassDeletionSelection](flamenco/manager/docs/JobMassDeletionSelection.md) - - [JobMetadata](flamenco/manager/docs/JobMetadata.md) - - [JobPriorityChange](flamenco/manager/docs/JobPriorityChange.md) - - [JobSettings](flamenco/manager/docs/JobSettings.md) - - [JobStatus](flamenco/manager/docs/JobStatus.md) - - [JobStatusChange](flamenco/manager/docs/JobStatusChange.md) - - [JobStorageInfo](flamenco/manager/docs/JobStorageInfo.md) - - [JobTasksSummary](flamenco/manager/docs/JobTasksSummary.md) - - [JobsQuery](flamenco/manager/docs/JobsQuery.md) - - [JobsQueryResult](flamenco/manager/docs/JobsQueryResult.md) - - [LifeCycleEventType](flamenco/manager/docs/LifeCycleEventType.md) - - [ManagerConfiguration](flamenco/manager/docs/ManagerConfiguration.md) - - [ManagerVariable](flamenco/manager/docs/ManagerVariable.md) - - [ManagerVariableAudience](flamenco/manager/docs/ManagerVariableAudience.md) - - [ManagerVariables](flamenco/manager/docs/ManagerVariables.md) - - [MayKeepRunning](flamenco/manager/docs/MayKeepRunning.md) - - [PathCheckInput](flamenco/manager/docs/PathCheckInput.md) - - [PathCheckResult](flamenco/manager/docs/PathCheckResult.md) - - [RegisteredWorker](flamenco/manager/docs/RegisteredWorker.md) - - [SecurityError](flamenco/manager/docs/SecurityError.md) - - [SetupAssistantConfig](flamenco/manager/docs/SetupAssistantConfig.md) - - [ShamanCheckout](flamenco/manager/docs/ShamanCheckout.md) - - [ShamanCheckoutResult](flamenco/manager/docs/ShamanCheckoutResult.md) - - [ShamanFileSpec](flamenco/manager/docs/ShamanFileSpec.md) - - [ShamanFileSpecWithStatus](flamenco/manager/docs/ShamanFileSpecWithStatus.md) - - [ShamanFileStatus](flamenco/manager/docs/ShamanFileStatus.md) - - [ShamanRequirementsRequest](flamenco/manager/docs/ShamanRequirementsRequest.md) - - [ShamanRequirementsResponse](flamenco/manager/docs/ShamanRequirementsResponse.md) - - [ShamanSingleFileStatus](flamenco/manager/docs/ShamanSingleFileStatus.md) - - [SharedStorageLocation](flamenco/manager/docs/SharedStorageLocation.md) - - [SocketIOSubscription](flamenco/manager/docs/SocketIOSubscription.md) - - [SocketIOSubscriptionOperation](flamenco/manager/docs/SocketIOSubscriptionOperation.md) - - [SocketIOSubscriptionType](flamenco/manager/docs/SocketIOSubscriptionType.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) - - [TaskUpdate](flamenco/manager/docs/TaskUpdate.md) - - [TaskWorker](flamenco/manager/docs/TaskWorker.md) - - [Worker](flamenco/manager/docs/Worker.md) - - [WorkerAllOf](flamenco/manager/docs/WorkerAllOf.md) - - [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) - - [WorkerStatusChangeRequest](flamenco/manager/docs/WorkerStatusChangeRequest.md) - - [WorkerSummary](flamenco/manager/docs/WorkerSummary.md) - - [WorkerTag](flamenco/manager/docs/WorkerTag.md) - - [WorkerTagChangeRequest](flamenco/manager/docs/WorkerTagChangeRequest.md) - - [WorkerTagList](flamenco/manager/docs/WorkerTagList.md) - - [WorkerTask](flamenco/manager/docs/WorkerTask.md) - - [WorkerTaskAllOf](flamenco/manager/docs/WorkerTaskAllOf.md) + - [AssignedTask](flamenco\manager\docs/AssignedTask.md) + - [AvailableJobSetting](flamenco\manager\docs/AvailableJobSetting.md) + - [AvailableJobSettingEvalInfo](flamenco\manager\docs/AvailableJobSettingEvalInfo.md) + - [AvailableJobSettingSubtype](flamenco\manager\docs/AvailableJobSettingSubtype.md) + - [AvailableJobSettingType](flamenco\manager\docs/AvailableJobSettingType.md) + - [AvailableJobSettingVisibility](flamenco\manager\docs/AvailableJobSettingVisibility.md) + - [AvailableJobType](flamenco\manager\docs/AvailableJobType.md) + - [AvailableJobTypes](flamenco\manager\docs/AvailableJobTypes.md) + - [BlenderPathCheckResult](flamenco\manager\docs/BlenderPathCheckResult.md) + - [BlenderPathFindResult](flamenco\manager\docs/BlenderPathFindResult.md) + - [BlenderPathSource](flamenco\manager\docs/BlenderPathSource.md) + - [Command](flamenco\manager\docs/Command.md) + - [Error](flamenco\manager\docs/Error.md) + - [EventJobUpdate](flamenco\manager\docs/EventJobUpdate.md) + - [EventLastRenderedUpdate](flamenco\manager\docs/EventLastRenderedUpdate.md) + - [EventLifeCycle](flamenco\manager\docs/EventLifeCycle.md) + - [EventTaskLogUpdate](flamenco\manager\docs/EventTaskLogUpdate.md) + - [EventTaskUpdate](flamenco\manager\docs/EventTaskUpdate.md) + - [EventWorkerTagUpdate](flamenco\manager\docs/EventWorkerTagUpdate.md) + - [EventWorkerUpdate](flamenco\manager\docs/EventWorkerUpdate.md) + - [FarmStatus](flamenco\manager\docs/FarmStatus.md) + - [FarmStatusReport](flamenco\manager\docs/FarmStatusReport.md) + - [FlamencoVersion](flamenco\manager\docs/FlamencoVersion.md) + - [Job](flamenco\manager\docs/Job.md) + - [JobAllOf](flamenco\manager\docs/JobAllOf.md) + - [JobBlocklist](flamenco\manager\docs/JobBlocklist.md) + - [JobBlocklistEntry](flamenco\manager\docs/JobBlocklistEntry.md) + - [JobDeletionInfo](flamenco\manager\docs/JobDeletionInfo.md) + - [JobLastRenderedImageInfo](flamenco\manager\docs/JobLastRenderedImageInfo.md) + - [JobMassDeletionSelection](flamenco\manager\docs/JobMassDeletionSelection.md) + - [JobMetadata](flamenco\manager\docs/JobMetadata.md) + - [JobPriorityChange](flamenco\manager\docs/JobPriorityChange.md) + - [JobSettings](flamenco\manager\docs/JobSettings.md) + - [JobStatus](flamenco\manager\docs/JobStatus.md) + - [JobStatusChange](flamenco\manager\docs/JobStatusChange.md) + - [JobStorageInfo](flamenco\manager\docs/JobStorageInfo.md) + - [JobTasksSummary](flamenco\manager\docs/JobTasksSummary.md) + - [JobsQuery](flamenco\manager\docs/JobsQuery.md) + - [JobsQueryResult](flamenco\manager\docs/JobsQueryResult.md) + - [LifeCycleEventType](flamenco\manager\docs/LifeCycleEventType.md) + - [ManagerConfiguration](flamenco\manager\docs/ManagerConfiguration.md) + - [ManagerVariable](flamenco\manager\docs/ManagerVariable.md) + - [ManagerVariableAudience](flamenco\manager\docs/ManagerVariableAudience.md) + - [ManagerVariables](flamenco\manager\docs/ManagerVariables.md) + - [MayKeepRunning](flamenco\manager\docs/MayKeepRunning.md) + - [PathCheckInput](flamenco\manager\docs/PathCheckInput.md) + - [PathCheckResult](flamenco\manager\docs/PathCheckResult.md) + - [RegisteredWorker](flamenco\manager\docs/RegisteredWorker.md) + - [SecurityError](flamenco\manager\docs/SecurityError.md) + - [SetupAssistantConfig](flamenco\manager\docs/SetupAssistantConfig.md) + - [ShamanCheckout](flamenco\manager\docs/ShamanCheckout.md) + - [ShamanCheckoutResult](flamenco\manager\docs/ShamanCheckoutResult.md) + - [ShamanFileSpec](flamenco\manager\docs/ShamanFileSpec.md) + - [ShamanFileSpecWithStatus](flamenco\manager\docs/ShamanFileSpecWithStatus.md) + - [ShamanFileStatus](flamenco\manager\docs/ShamanFileStatus.md) + - [ShamanRequirementsRequest](flamenco\manager\docs/ShamanRequirementsRequest.md) + - [ShamanRequirementsResponse](flamenco\manager\docs/ShamanRequirementsResponse.md) + - [ShamanSingleFileStatus](flamenco\manager\docs/ShamanSingleFileStatus.md) + - [SharedStorageLocation](flamenco\manager\docs/SharedStorageLocation.md) + - [SocketIOSubscription](flamenco\manager\docs/SocketIOSubscription.md) + - [SocketIOSubscriptionOperation](flamenco\manager\docs/SocketIOSubscriptionOperation.md) + - [SocketIOSubscriptionType](flamenco\manager\docs/SocketIOSubscriptionType.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) + - [TaskUpdate](flamenco\manager\docs/TaskUpdate.md) + - [TaskWorker](flamenco\manager\docs/TaskWorker.md) + - [Worker](flamenco\manager\docs/Worker.md) + - [WorkerAllOf](flamenco\manager\docs/WorkerAllOf.md) + - [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) + - [WorkerStatusChangeRequest](flamenco\manager\docs/WorkerStatusChangeRequest.md) + - [WorkerSummary](flamenco\manager\docs/WorkerSummary.md) + - [WorkerTag](flamenco\manager\docs/WorkerTag.md) + - [WorkerTagChangeRequest](flamenco\manager\docs/WorkerTagChangeRequest.md) + - [WorkerTagList](flamenco\manager\docs/WorkerTagList.md) + - [WorkerTask](flamenco\manager\docs/WorkerTask.md) + - [WorkerTaskAllOf](flamenco\manager\docs/WorkerTaskAllOf.md) ## Documentation For Authorization diff --git a/internal/worker/mocks/client.gen.go b/internal/worker/mocks/client.gen.go index 22f99f23..679769bb 100644 --- a/internal/worker/mocks/client.gen.go +++ b/internal/worker/mocks/client.gen.go @@ -596,6 +596,26 @@ func (mr *MockFlamencoClientMockRecorder) GetConfigurationWithResponse(arg0 inte return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetConfigurationWithResponse", reflect.TypeOf((*MockFlamencoClient)(nil).GetConfigurationWithResponse), varargs...) } +// GetFarmStatusWithResponse mocks base method. +func (m *MockFlamencoClient) GetFarmStatusWithResponse(arg0 context.Context, arg1 ...api.RequestEditorFn) (*api.GetFarmStatusResponse, error) { + m.ctrl.T.Helper() + varargs := []interface{}{arg0} + for _, a := range arg1 { + varargs = append(varargs, a) + } + ret := m.ctrl.Call(m, "GetFarmStatusWithResponse", varargs...) + ret0, _ := ret[0].(*api.GetFarmStatusResponse) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// GetFarmStatusWithResponse indicates an expected call of GetFarmStatusWithResponse. +func (mr *MockFlamencoClientMockRecorder) GetFarmStatusWithResponse(arg0 interface{}, arg1 ...interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + varargs := append([]interface{}{arg0}, arg1...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetFarmStatusWithResponse", reflect.TypeOf((*MockFlamencoClient)(nil).GetFarmStatusWithResponse), varargs...) +} + // GetJobTypeWithResponse mocks base method. func (m *MockFlamencoClient) GetJobTypeWithResponse(arg0 context.Context, arg1 string, arg2 ...api.RequestEditorFn) (*api.GetJobTypeResponse, error) { m.ctrl.T.Helper() diff --git a/pkg/api/openapi_client.gen.go b/pkg/api/openapi_client.gen.go index 01028496..a586636a 100644 --- a/pkg/api/openapi_client.gen.go +++ b/pkg/api/openapi_client.gen.go @@ -200,6 +200,9 @@ type ClientInterface interface { // ShamanFileStore request with any body ShamanFileStoreWithBody(ctx context.Context, checksum string, filesize int, params *ShamanFileStoreParams, contentType string, body io.Reader, reqEditors ...RequestEditorFn) (*http.Response, error) + // GetFarmStatus request + GetFarmStatus(ctx context.Context, reqEditors ...RequestEditorFn) (*http.Response, error) + // FetchTask request FetchTask(ctx context.Context, taskId string, reqEditors ...RequestEditorFn) (*http.Response, error) @@ -779,6 +782,18 @@ func (c *Client) ShamanFileStoreWithBody(ctx context.Context, checksum string, f return c.Client.Do(req) } +func (c *Client) GetFarmStatus(ctx context.Context, reqEditors ...RequestEditorFn) (*http.Response, error) { + req, err := NewGetFarmStatusRequest(c.Server) + 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) FetchTask(ctx context.Context, taskId string, reqEditors ...RequestEditorFn) (*http.Response, error) { req, err := NewFetchTaskRequest(c.Server, taskId) if err != nil { @@ -2273,6 +2288,33 @@ func NewShamanFileStoreRequestWithBody(server string, checksum string, filesize return req, nil } +// NewGetFarmStatusRequest generates requests for GetFarmStatus +func NewGetFarmStatusRequest(server string) (*http.Request, error) { + var err error + + serverURL, err := url.Parse(server) + if err != nil { + return nil, err + } + + operationPath := fmt.Sprintf("/api/v3/status") + 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 +} + // NewFetchTaskRequest generates requests for FetchTask func NewFetchTaskRequest(server string, taskId string) (*http.Request, error) { var err error @@ -3370,6 +3412,9 @@ type ClientWithResponsesInterface interface { // ShamanFileStore request with any body ShamanFileStoreWithBodyWithResponse(ctx context.Context, checksum string, filesize int, params *ShamanFileStoreParams, contentType string, body io.Reader, reqEditors ...RequestEditorFn) (*ShamanFileStoreResponse, error) + // GetFarmStatus request + GetFarmStatusWithResponse(ctx context.Context, reqEditors ...RequestEditorFn) (*GetFarmStatusResponse, error) + // FetchTask request FetchTaskWithResponse(ctx context.Context, taskId string, reqEditors ...RequestEditorFn) (*FetchTaskResponse, error) @@ -4103,6 +4148,28 @@ func (r ShamanFileStoreResponse) StatusCode() int { return 0 } +type GetFarmStatusResponse struct { + Body []byte + HTTPResponse *http.Response + JSON200 *FarmStatusReport +} + +// Status returns HTTPResponse.Status +func (r GetFarmStatusResponse) Status() string { + if r.HTTPResponse != nil { + return r.HTTPResponse.Status + } + return http.StatusText(0) +} + +// StatusCode returns HTTPResponse.StatusCode +func (r GetFarmStatusResponse) StatusCode() int { + if r.HTTPResponse != nil { + return r.HTTPResponse.StatusCode + } + return 0 +} + type FetchTaskResponse struct { Body []byte HTTPResponse *http.Response @@ -5037,6 +5104,15 @@ func (c *ClientWithResponses) ShamanFileStoreWithBodyWithResponse(ctx context.Co return ParseShamanFileStoreResponse(rsp) } +// GetFarmStatusWithResponse request returning *GetFarmStatusResponse +func (c *ClientWithResponses) GetFarmStatusWithResponse(ctx context.Context, reqEditors ...RequestEditorFn) (*GetFarmStatusResponse, error) { + rsp, err := c.GetFarmStatus(ctx, reqEditors...) + if err != nil { + return nil, err + } + return ParseGetFarmStatusResponse(rsp) +} + // FetchTaskWithResponse request returning *FetchTaskResponse func (c *ClientWithResponses) FetchTaskWithResponse(ctx context.Context, taskId string, reqEditors ...RequestEditorFn) (*FetchTaskResponse, error) { rsp, err := c.FetchTask(ctx, taskId, reqEditors...) @@ -6193,6 +6269,32 @@ func ParseShamanFileStoreResponse(rsp *http.Response) (*ShamanFileStoreResponse, return response, nil } +// ParseGetFarmStatusResponse parses an HTTP response from a GetFarmStatusWithResponse call +func ParseGetFarmStatusResponse(rsp *http.Response) (*GetFarmStatusResponse, error) { + bodyBytes, err := ioutil.ReadAll(rsp.Body) + defer func() { _ = rsp.Body.Close() }() + if err != nil { + return nil, err + } + + response := &GetFarmStatusResponse{ + Body: bodyBytes, + HTTPResponse: rsp, + } + + switch { + case strings.Contains(rsp.Header.Get("Content-Type"), "json") && rsp.StatusCode == 200: + var dest FarmStatusReport + if err := json.Unmarshal(bodyBytes, &dest); err != nil { + return nil, err + } + response.JSON200 = &dest + + } + + return response, nil +} + // ParseFetchTaskResponse parses an HTTP response from a FetchTaskWithResponse call func ParseFetchTaskResponse(rsp *http.Response) (*FetchTaskResponse, error) { bodyBytes, err := ioutil.ReadAll(rsp.Body) diff --git a/pkg/api/openapi_server.gen.go b/pkg/api/openapi_server.gen.go index 7c883470..5a492e4b 100644 --- a/pkg/api/openapi_server.gen.go +++ b/pkg/api/openapi_server.gen.go @@ -98,6 +98,9 @@ type ServerInterface interface { // The file's contents should be sent in the request body. // (POST /api/v3/shaman/files/{checksum}/{filesize}) ShamanFileStore(ctx echo.Context, checksum string, filesize int, params ShamanFileStoreParams) error + // Get the status of this Flamenco farm. + // (GET /api/v3/status) + GetFarmStatus(ctx echo.Context) error // Fetch a single task. // (GET /api/v3/tasks/{task_id}) FetchTask(ctx echo.Context, taskId string) error @@ -600,6 +603,15 @@ func (w *ServerInterfaceWrapper) ShamanFileStore(ctx echo.Context) error { return err } +// GetFarmStatus converts echo context to params. +func (w *ServerInterfaceWrapper) GetFarmStatus(ctx echo.Context) error { + var err error + + // Invoke the callback with all the unmarshalled arguments + err = w.Handler.GetFarmStatus(ctx) + return err +} + // FetchTask converts echo context to params. func (w *ServerInterfaceWrapper) FetchTask(ctx echo.Context) error { var err error @@ -1018,6 +1030,7 @@ func RegisterHandlersWithBaseURL(router EchoRouter, si ServerInterface, baseURL router.POST(baseURL+"/api/v3/shaman/checkout/requirements", wrapper.ShamanCheckoutRequirements) router.GET(baseURL+"/api/v3/shaman/files/:checksum/:filesize", wrapper.ShamanFileStoreCheck) router.POST(baseURL+"/api/v3/shaman/files/:checksum/:filesize", wrapper.ShamanFileStore) + router.GET(baseURL+"/api/v3/status", wrapper.GetFarmStatus) router.GET(baseURL+"/api/v3/tasks/:task_id", wrapper.FetchTask) router.GET(baseURL+"/api/v3/tasks/:task_id/log", wrapper.FetchTaskLogInfo) router.GET(baseURL+"/api/v3/tasks/:task_id/logtail", wrapper.FetchTaskLogTail) diff --git a/pkg/api/openapi_spec.gen.go b/pkg/api/openapi_spec.gen.go index 47cc6901..67cee5b6 100644 --- a/pkg/api/openapi_spec.gen.go +++ b/pkg/api/openapi_spec.gen.go @@ -68,182 +68,183 @@ var swaggerSpec = []string{ "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", - "/xMAAP//yoC45FYOAQA=", + "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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 5590d81b..e7cd6aee 100644 --- a/pkg/api/openapi_types.gen.go +++ b/pkg/api/openapi_types.gen.go @@ -55,6 +55,23 @@ const ( BlenderPathSourcePathEnvvar BlenderPathSource = "path_envvar" ) +// Defines values for FarmStatus. +const ( + FarmStatusActive FarmStatus = "active" + + FarmStatusAsleep FarmStatus = "asleep" + + FarmStatusIdle FarmStatus = "idle" + + FarmStatusInoperative FarmStatus = "inoperative" + + FarmStatusStarting FarmStatus = "starting" + + FarmStatusUnknown FarmStatus = "unknown" + + FarmStatusWaiting FarmStatus = "waiting" +) + // Defines values for JobStatus. const ( JobStatusActive JobStatus = "active" @@ -373,6 +390,14 @@ type EventWorkerUpdate struct { Version string `json:"version"` } +// FarmStatus defines model for FarmStatus. +type FarmStatus string + +// FarmStatusReport defines model for FarmStatusReport. +type FarmStatusReport struct { + Status FarmStatus `json:"status"` +} + // FlamencoVersion defines model for FlamencoVersion. type FlamencoVersion struct { Git string `json:"git"` diff --git a/web/app/src/manager-api/index.js b/web/app/src/manager-api/index.js index 4f78c0db..2ffece32 100644 --- a/web/app/src/manager-api/index.js +++ b/web/app/src/manager-api/index.js @@ -32,6 +32,8 @@ import EventTaskLogUpdate from './model/EventTaskLogUpdate'; import EventTaskUpdate from './model/EventTaskUpdate'; import EventWorkerTagUpdate from './model/EventWorkerTagUpdate'; import EventWorkerUpdate from './model/EventWorkerUpdate'; +import FarmStatus from './model/FarmStatus'; +import FarmStatusReport from './model/FarmStatusReport'; import FlamencoVersion from './model/FlamencoVersion'; import Job from './model/Job'; import JobAllOf from './model/JobAllOf'; @@ -251,6 +253,18 @@ export { */ EventWorkerUpdate, + /** + * The FarmStatus model constructor. + * @property {module:model/FarmStatus} + */ + FarmStatus, + + /** + * The FarmStatusReport model constructor. + * @property {module:model/FarmStatusReport} + */ + FarmStatusReport, + /** * The FlamencoVersion model constructor. * @property {module:model/FlamencoVersion} diff --git a/web/app/src/manager-api/manager/MetaApi.js b/web/app/src/manager-api/manager/MetaApi.js index 97beb6de..26f6e97c 100644 --- a/web/app/src/manager-api/manager/MetaApi.js +++ b/web/app/src/manager-api/manager/MetaApi.js @@ -15,6 +15,7 @@ import ApiClient from "../ApiClient"; import BlenderPathCheckResult from '../model/BlenderPathCheckResult'; import Error from '../model/Error'; +import FarmStatusReport from '../model/FarmStatusReport'; import FlamencoVersion from '../model/FlamencoVersion'; import ManagerConfiguration from '../model/ManagerConfiguration'; import ManagerVariable from '../model/ManagerVariable'; @@ -249,6 +250,45 @@ export default class MetaApi { } + /** + * Get the status of this Flamenco farm. + * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing data of type {@link module:model/FarmStatusReport} and HTTP response + */ + getFarmStatusWithHttpInfo() { + let postBody = null; + + let pathParams = { + }; + let queryParams = { + }; + let headerParams = { + }; + let formParams = { + }; + + let authNames = []; + let contentTypes = []; + let accepts = ['application/json']; + let returnType = FarmStatusReport; + return this.apiClient.callApi( + '/api/v3/status', 'GET', + pathParams, queryParams, headerParams, formParams, postBody, + authNames, contentTypes, accepts, returnType, null + ); + } + + /** + * Get the status of this Flamenco farm. + * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with data of type {@link module:model/FarmStatusReport} + */ + getFarmStatus() { + return this.getFarmStatusWithHttpInfo() + .then(function(response_and_data) { + return response_and_data.data; + }); + } + + /** * Get the shared storage location of this Manager, adjusted for the given audience and platform. * @param {module:model/ManagerVariableAudience} audience diff --git a/web/app/src/manager-api/model/FarmStatus.js b/web/app/src/manager-api/model/FarmStatus.js new file mode 100644 index 00000000..b0bc3ec4 --- /dev/null +++ b/web/app/src/manager-api/model/FarmStatus.js @@ -0,0 +1,81 @@ +/** + * 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'; +/** +* Enum class FarmStatus. +* @enum {} +* @readonly +*/ +export default class FarmStatus { + + /** + * value: "active" + * @const + */ + "active" = "active"; + + + /** + * value: "idle" + * @const + */ + "idle" = "idle"; + + + /** + * value: "waiting" + * @const + */ + "waiting" = "waiting"; + + + /** + * value: "asleep" + * @const + */ + "asleep" = "asleep"; + + + /** + * value: "inoperative" + * @const + */ + "inoperative" = "inoperative"; + + + /** + * value: "unknown" + * @const + */ + "unknown" = "unknown"; + + + /** + * value: "starting" + * @const + */ + "starting" = "starting"; + + + + /** + * Returns a FarmStatus enum value from a Javascript object name. + * @param {Object} data The plain JavaScript object containing the name of the enum value. + * @return {module:model/FarmStatus} The enum FarmStatus value. + */ + static constructFromObject(object) { + return object; + } +} + diff --git a/web/app/src/manager-api/model/FarmStatusReport.js b/web/app/src/manager-api/model/FarmStatusReport.js new file mode 100644 index 00000000..8dd05752 --- /dev/null +++ b/web/app/src/manager-api/model/FarmStatusReport.js @@ -0,0 +1,74 @@ +/** + * 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'; +import FarmStatus from './FarmStatus'; + +/** + * The FarmStatusReport model module. + * @module model/FarmStatusReport + * @version 0.0.0 + */ +class FarmStatusReport { + /** + * Constructs a new FarmStatusReport. + * @alias module:model/FarmStatusReport + * @param status {module:model/FarmStatus} + */ + constructor(status) { + + FarmStatusReport.initialize(this, status); + } + + /** + * 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, status) { + obj['status'] = status; + } + + /** + * Constructs a FarmStatusReport 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/FarmStatusReport} obj Optional instance to populate. + * @return {module:model/FarmStatusReport} The populated FarmStatusReport instance. + */ + static constructFromObject(data, obj) { + if (data) { + obj = obj || new FarmStatusReport(); + + if (data.hasOwnProperty('status')) { + obj['status'] = FarmStatus.constructFromObject(data['status']); + } + } + return obj; + } + + +} + +/** + * @member {module:model/FarmStatus} status + */ +FarmStatusReport.prototype['status'] = undefined; + + + + + + +export default FarmStatusReport; + -- 2.30.2 From 61cc8ff04d9156dafac9040723bea317f7a81a7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Thu, 29 Feb 2024 20:40:14 +0100 Subject: [PATCH 03/84] Manager: implement API operation to get the farm status Add a new API operation to get the overall farm status. This is based on the jobs and workers, and their status. The statuses are: - `active`: Actively working on jobs. - `idle`: Farm could be active, but has no work to do. - `waiting`: Work has been queued, but all workers are asleep. - `asleep`: Farm is idle, and all workers are asleep. - `inoperative`: Cannot work: no workers, or all are offline/error. - `starting`: Farm is starting up. - `unknown`: Unexpected configuration of worker and job statuses. --- cmd/flamenco-manager/main.go | 12 +- internal/manager/api_impl/api_impl.go | 3 + internal/manager/api_impl/interfaces.go | 9 +- internal/manager/api_impl/meta.go | 4 + .../api_impl/mocks/api_impl_mock.gen.go | 39 +++- internal/manager/api_impl/support_test.go | 5 +- internal/manager/farmstatus/farmstatus.go | 169 ++++++++++++++ .../manager/farmstatus/farmstatus_test.go | 213 ++++++++++++++++++ internal/manager/farmstatus/interfaces.go | 17 ++ .../farmstatus/mocks/interfaces_mock.gen.go | 66 ++++++ internal/manager/persistence/jobs_query.go | 30 +++ .../manager/persistence/jobs_query_test.go | 58 +++++ internal/manager/persistence/workers.go | 31 +++ internal/manager/persistence/workers_test.go | 63 ++++++ 14 files changed, 715 insertions(+), 4 deletions(-) create mode 100644 internal/manager/farmstatus/farmstatus.go create mode 100644 internal/manager/farmstatus/farmstatus_test.go create mode 100644 internal/manager/farmstatus/interfaces.go create mode 100644 internal/manager/farmstatus/mocks/interfaces_mock.gen.go diff --git a/cmd/flamenco-manager/main.go b/cmd/flamenco-manager/main.go index 8da0198f..c7dd60a5 100644 --- a/cmd/flamenco-manager/main.go +++ b/cmd/flamenco-manager/main.go @@ -27,6 +27,7 @@ import ( "projects.blender.org/studio/flamenco/internal/manager/api_impl/dummy" "projects.blender.org/studio/flamenco/internal/manager/config" "projects.blender.org/studio/flamenco/internal/manager/eventbus" + "projects.blender.org/studio/flamenco/internal/manager/farmstatus" "projects.blender.org/studio/flamenco/internal/manager/job_compilers" "projects.blender.org/studio/flamenco/internal/manager/job_deleter" "projects.blender.org/studio/flamenco/internal/manager/last_rendered" @@ -174,10 +175,12 @@ func runFlamencoManager() bool { shamanServer := buildShamanServer(configService, isFirstRun) jobDeleter := job_deleter.NewService(persist, localStorage, eventBroker, shamanServer) + farmStatus := farmstatus.NewService(persist) + flamenco := api_impl.NewFlamenco( compiler, persist, eventBroker, logStorage, configService, taskStateMachine, shamanServer, timeService, lastRender, - localStorage, sleepScheduler, jobDeleter) + localStorage, sleepScheduler, jobDeleter, farmStatus) e := buildWebService(flamenco, persist, ssdp, socketio, urls, localStorage) @@ -278,6 +281,13 @@ func runFlamencoManager() bool { jobDeleter.Run(mainCtx) }() + // Run the Farm Status service. + wg.Add(1) + go func() { + defer wg.Done() + farmStatus.Run(mainCtx) + }() + // Log the URLs last, hopefully that makes them more visible / encouraging to go to for users. go func() { time.Sleep(100 * time.Millisecond) diff --git a/internal/manager/api_impl/api_impl.go b/internal/manager/api_impl/api_impl.go index 6e109481..b923d3f8 100644 --- a/internal/manager/api_impl/api_impl.go +++ b/internal/manager/api_impl/api_impl.go @@ -28,6 +28,7 @@ type Flamenco struct { localStorage LocalStorage sleepScheduler WorkerSleepScheduler jobDeleter JobDeleter + farmstatus FarmStatusService // The task scheduler can be locked to prevent multiple Workers from getting // the same task. It is also used for certain other queries, like @@ -55,6 +56,7 @@ func NewFlamenco( localStorage LocalStorage, wss WorkerSleepScheduler, jd JobDeleter, + farmstatus FarmStatusService, ) *Flamenco { return &Flamenco{ jobCompiler: jc, @@ -69,6 +71,7 @@ func NewFlamenco( localStorage: localStorage, sleepScheduler: wss, jobDeleter: jd, + farmstatus: farmstatus, done: make(chan struct{}), } diff --git a/internal/manager/api_impl/interfaces.go b/internal/manager/api_impl/interfaces.go index fe549259..d965519f 100644 --- a/internal/manager/api_impl/interfaces.go +++ b/internal/manager/api_impl/interfaces.go @@ -15,6 +15,7 @@ import ( "projects.blender.org/studio/flamenco/internal/manager/config" "projects.blender.org/studio/flamenco/internal/manager/eventbus" + "projects.blender.org/studio/flamenco/internal/manager/farmstatus" "projects.blender.org/studio/flamenco/internal/manager/job_compilers" "projects.blender.org/studio/flamenco/internal/manager/job_deleter" "projects.blender.org/studio/flamenco/internal/manager/last_rendered" @@ -26,7 +27,7 @@ import ( ) // Generate mock implementations of these interfaces. -//go:generate go run github.com/golang/mock/mockgen -destination mocks/api_impl_mock.gen.go -package mocks projects.blender.org/studio/flamenco/internal/manager/api_impl PersistenceService,ChangeBroadcaster,JobCompiler,LogStorage,ConfigService,TaskStateMachine,Shaman,LastRendered,LocalStorage,WorkerSleepScheduler,JobDeleter +//go:generate go run github.com/golang/mock/mockgen -destination mocks/api_impl_mock.gen.go -package mocks projects.blender.org/studio/flamenco/internal/manager/api_impl PersistenceService,ChangeBroadcaster,JobCompiler,LogStorage,ConfigService,TaskStateMachine,Shaman,LastRendered,LocalStorage,WorkerSleepScheduler,JobDeleter,FarmStatusService type PersistenceService interface { StoreAuthoredJob(ctx context.Context, authoredJob job_compilers.AuthoredJob) error @@ -239,3 +240,9 @@ type JobDeleter interface { } var _ JobDeleter = (*job_deleter.Service)(nil) + +type FarmStatusService interface { + Report() api.FarmStatusReport +} + +var _ FarmStatusService = (*farmstatus.Service)(nil) diff --git a/internal/manager/api_impl/meta.go b/internal/manager/api_impl/meta.go index c647270b..000bd5de 100644 --- a/internal/manager/api_impl/meta.go +++ b/internal/manager/api_impl/meta.go @@ -321,6 +321,10 @@ func (f *Flamenco) SaveSetupAssistantConfig(e echo.Context) error { return e.NoContent(http.StatusNoContent) } +func (f *Flamenco) GetFarmStatus(e echo.Context) error { + return e.JSON(http.StatusOK, f.farmstatus.Report()) +} + func flamencoManagerDir() (string, error) { exename, err := os.Executable() if err != nil { diff --git a/internal/manager/api_impl/mocks/api_impl_mock.gen.go b/internal/manager/api_impl/mocks/api_impl_mock.gen.go index ccc776b6..a7360e98 100644 --- a/internal/manager/api_impl/mocks/api_impl_mock.gen.go +++ b/internal/manager/api_impl/mocks/api_impl_mock.gen.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: projects.blender.org/studio/flamenco/internal/manager/api_impl (interfaces: PersistenceService,ChangeBroadcaster,JobCompiler,LogStorage,ConfigService,TaskStateMachine,Shaman,LastRendered,LocalStorage,WorkerSleepScheduler,JobDeleter) +// Source: projects.blender.org/studio/flamenco/internal/manager/api_impl (interfaces: PersistenceService,ChangeBroadcaster,JobCompiler,LogStorage,ConfigService,TaskStateMachine,Shaman,LastRendered,LocalStorage,WorkerSleepScheduler,JobDeleter,FarmStatusService) // Package mocks is a generated GoMock package. package mocks @@ -1413,3 +1413,40 @@ func (mr *MockJobDeleterMockRecorder) WhatWouldBeDeleted(arg0 interface{}) *gomo mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "WhatWouldBeDeleted", reflect.TypeOf((*MockJobDeleter)(nil).WhatWouldBeDeleted), arg0) } + +// MockFarmStatusService is a mock of FarmStatusService interface. +type MockFarmStatusService struct { + ctrl *gomock.Controller + recorder *MockFarmStatusServiceMockRecorder +} + +// MockFarmStatusServiceMockRecorder is the mock recorder for MockFarmStatusService. +type MockFarmStatusServiceMockRecorder struct { + mock *MockFarmStatusService +} + +// NewMockFarmStatusService creates a new mock instance. +func NewMockFarmStatusService(ctrl *gomock.Controller) *MockFarmStatusService { + mock := &MockFarmStatusService{ctrl: ctrl} + mock.recorder = &MockFarmStatusServiceMockRecorder{mock} + return mock +} + +// EXPECT returns an object that allows the caller to indicate expected use. +func (m *MockFarmStatusService) EXPECT() *MockFarmStatusServiceMockRecorder { + return m.recorder +} + +// Report mocks base method. +func (m *MockFarmStatusService) Report() api.FarmStatusReport { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "Report") + ret0, _ := ret[0].(api.FarmStatusReport) + return ret0 +} + +// Report indicates an expected call of Report. +func (mr *MockFarmStatusServiceMockRecorder) Report() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Report", reflect.TypeOf((*MockFarmStatusService)(nil).Report)) +} diff --git a/internal/manager/api_impl/support_test.go b/internal/manager/api_impl/support_test.go index 4a7ea588..33e712fd 100644 --- a/internal/manager/api_impl/support_test.go +++ b/internal/manager/api_impl/support_test.go @@ -37,6 +37,7 @@ type mockedFlamenco struct { localStorage *mocks.MockLocalStorage sleepScheduler *mocks.MockWorkerSleepScheduler jobDeleter *mocks.MockJobDeleter + farmstatus *mocks.MockFarmStatusService // Place for some tests to store a temporary directory. tempdir string @@ -54,6 +55,7 @@ func newMockedFlamenco(mockCtrl *gomock.Controller) mockedFlamenco { localStore := mocks.NewMockLocalStorage(mockCtrl) wss := mocks.NewMockWorkerSleepScheduler(mockCtrl) jd := mocks.NewMockJobDeleter(mockCtrl) + fs := mocks.NewMockFarmStatusService(mockCtrl) clock := clock.NewMock() mockedNow, err := time.Parse(time.RFC3339, "2022-06-09T11:14:41+02:00") @@ -62,7 +64,7 @@ func newMockedFlamenco(mockCtrl *gomock.Controller) mockedFlamenco { } clock.Set(mockedNow) - f := NewFlamenco(jc, ps, cb, logStore, cs, sm, sha, clock, lr, localStore, wss, jd) + f := NewFlamenco(jc, ps, cb, logStore, cs, sm, sha, clock, lr, localStore, wss, jd, fs) return mockedFlamenco{ flamenco: f, @@ -78,6 +80,7 @@ func newMockedFlamenco(mockCtrl *gomock.Controller) mockedFlamenco { localStorage: localStore, sleepScheduler: wss, jobDeleter: jd, + farmstatus: fs, } } diff --git a/internal/manager/farmstatus/farmstatus.go b/internal/manager/farmstatus/farmstatus.go new file mode 100644 index 00000000..69f673fb --- /dev/null +++ b/internal/manager/farmstatus/farmstatus.go @@ -0,0 +1,169 @@ +// package farmstatus provides a status indicator for the entire Flamenco farm. +package farmstatus + +import ( + "context" + "errors" + "slices" + "sync" + "time" + + "github.com/rs/zerolog/log" + "projects.blender.org/studio/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/pkg/website" +) + +const ( + // pollWait determines how often the persistence layer is queried to get the + // counts & statuses of workers and jobs. + // + // Note that this indicates the time between polls, so between a poll + // operation being done, and the next one starting. + pollWait = 5 * time.Second +) + +// Service keeps track of the overall farm status. +type Service struct { + persist PersistenceService + + mutex sync.Mutex + lastReport api.FarmStatusReport +} + +func NewService(persist PersistenceService) *Service { + return &Service{ + persist: persist, + mutex: sync.Mutex{}, + lastReport: api.FarmStatusReport{ + Status: api.FarmStatusStarting, + }, + } +} + +// Run the farm status polling loop. +func (s *Service) Run(ctx context.Context) { + log.Debug().Msg("farm status: polling service running") + defer log.Debug().Msg("farm status: polling service stopped") + + for { + select { + case <-ctx.Done(): + return + case <-time.After(pollWait): + s.poll(ctx) + } + } +} + +// Report returns the last-known farm status report. +// +// It is updated every few seconds, from the Run() function. +func (s *Service) Report() api.FarmStatusReport { + s.mutex.Lock() + defer s.mutex.Unlock() + return s.lastReport +} + +func (s *Service) poll(ctx context.Context) { + report := s.checkFarmStatus(ctx) + if report == nil { + // Already logged, just keep the last known log around for querying. + return + } + + s.mutex.Lock() + s.lastReport = *report + s.mutex.Unlock() +} + +// checkFarmStatus checks the farm status by querying the peristence layer. +// This function does not return an error, but instead logs them as warnings and returns nil. +func (s *Service) checkFarmStatus(ctx context.Context) *api.FarmStatusReport { + log.Trace().Msg("farm status: checking the farm status") + startTime := time.Now() + + defer func() { + duration := time.Since(startTime) + log.Debug().Stringer("duration", duration).Msg("farm status: checked the farm status") + }() + + workerStatuses, err := s.persist.SummarizeWorkerStatuses(ctx) + if err != nil { + logDBError(err, "farm status: could not summarize worker statuses") + return nil + } + + // Check some worker statuses first. When there are no workers and the farm is + // inoperative, there is little use in checking jobs. At least for now. Maybe + // later we want to have some info in the reported status that indicates a + // more pressing matter (as in, inoperative AND a job is queued). + + // Check: inoperative + if len(workerStatuses) == 0 || allIn(workerStatuses, api.WorkerStatusOffline, api.WorkerStatusError) { + return &api.FarmStatusReport{ + Status: api.FarmStatusInoperative, + } + } + + jobStatuses, err := s.persist.SummarizeJobStatuses(ctx) + if err != nil { + logDBError(err, "farm status: could not summarize job statuses") + return nil + } + + anyJobActive := jobStatuses[api.JobStatusActive] > 0 + anyJobQueued := jobStatuses[api.JobStatusQueued] > 0 + isWorkAvailable := anyJobActive || anyJobQueued + + anyWorkerAwake := workerStatuses[api.WorkerStatusAwake] > 0 + anyWorkerAsleep := workerStatuses[api.WorkerStatusAsleep] > 0 + allWorkersAsleep := !anyWorkerAwake && anyWorkerAsleep + + report := api.FarmStatusReport{} + switch { + case anyJobActive && anyWorkerAwake: + // - "active" # Actively working on jobs. + report.Status = api.FarmStatusActive + case isWorkAvailable: + // - "waiting" # Work to be done, but there is no worker awake. + report.Status = api.FarmStatusWaiting + case !isWorkAvailable && allWorkersAsleep: + // - "asleep" # Farm is idle, and all workers are asleep. + report.Status = api.FarmStatusAsleep + case !isWorkAvailable: + // - "idle" # Farm could be active, but has no work to do. + report.Status = api.FarmStatusIdle + default: + log.Warn(). + Interface("workerStatuses", workerStatuses). + Interface("jobStatuses", jobStatuses). + Msgf("farm status: unexpected configuration of worker and job statuses, please report this at %s", website.BugReportURL) + report.Status = api.FarmStatusUnknown + } + + return &report +} + +func logDBError(err error, message string) { + switch { + case errors.Is(err, context.DeadlineExceeded): + log.Warn().Msg(message + " (it took too long)") + case errors.Is(err, context.Canceled): + log.Debug().Msg(message + " (Flamenco is shutting down)") + default: + log.Warn().AnErr("cause", err).Msg(message) + } +} + +func allIn[T comparable](statuses map[T]int, shouldBeIn ...T) bool { + for status, count := range statuses { + if count == 0 { + continue + } + + if !slices.Contains(shouldBeIn, status) { + return false + } + } + return true +} diff --git a/internal/manager/farmstatus/farmstatus_test.go b/internal/manager/farmstatus/farmstatus_test.go new file mode 100644 index 00000000..b7d7532c --- /dev/null +++ b/internal/manager/farmstatus/farmstatus_test.go @@ -0,0 +1,213 @@ +// package farmstatus provides a status indicator for the entire Flamenco farm. +package farmstatus + +import ( + "context" + "testing" + + "github.com/golang/mock/gomock" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "projects.blender.org/studio/flamenco/internal/manager/farmstatus/mocks" + "projects.blender.org/studio/flamenco/internal/manager/persistence" + "projects.blender.org/studio/flamenco/pkg/api" +) + +type Fixtures struct { + service *Service + persist *mocks.MockPersistenceService + ctx context.Context +} + +func TestFarmStatusStarting(t *testing.T) { + f := fixtures(t) + report := f.service.Report() + assert.Equal(t, api.FarmStatusStarting, report.Status) +} + +func TestFarmStatusLoop(t *testing.T) { + f := fixtures(t) + + // Mock an "active" status. + f.mockWorkerStatuses(persistence.WorkerStatusCount{ + api.WorkerStatusOffline: 2, + api.WorkerStatusAsleep: 1, + api.WorkerStatusError: 1, + api.WorkerStatusAwake: 3, + }) + f.mockJobStatuses(persistence.JobStatusCount{ + api.JobStatusActive: 1, + }) + + // Before polling, the status should still be 'starting'. + report := f.service.Report() + assert.Equal(t, api.FarmStatusStarting, report.Status) + + // After a single poll, the report should have been updated. + f.service.poll(f.ctx) + report = f.service.Report() + assert.Equal(t, api.FarmStatusActive, report.Status) +} + +func TestCheckFarmStatusInoperative(t *testing.T) { + f := fixtures(t) + + // "inoperative": no workers. + f.mockWorkerStatuses(persistence.WorkerStatusCount{}) + report := f.service.checkFarmStatus(f.ctx) + require.NotNil(t, report) + assert.Equal(t, api.FarmStatusInoperative, report.Status) + + // "inoperative": all workers offline. + f.mockWorkerStatuses(persistence.WorkerStatusCount{ + api.WorkerStatusOffline: 3, + }) + report = f.service.checkFarmStatus(f.ctx) + require.NotNil(t, report) + assert.Equal(t, api.FarmStatusInoperative, report.Status) + + // "inoperative": some workers offline, some in error, + f.mockWorkerStatuses(persistence.WorkerStatusCount{ + api.WorkerStatusOffline: 2, + api.WorkerStatusError: 1, + }) + report = f.service.checkFarmStatus(f.ctx) + require.NotNil(t, report) + assert.Equal(t, api.FarmStatusInoperative, report.Status) +} + +func TestCheckFarmStatusActive(t *testing.T) { + f := fixtures(t) + + // "active" # Actively working on jobs. + f.mockWorkerStatuses(persistence.WorkerStatusCount{ + api.WorkerStatusOffline: 2, + api.WorkerStatusAsleep: 1, + api.WorkerStatusError: 1, + api.WorkerStatusAwake: 3, + }) + f.mockJobStatuses(persistence.JobStatusCount{ + api.JobStatusActive: 1, + }) + report := f.service.checkFarmStatus(f.ctx) + require.NotNil(t, report) + assert.Equal(t, api.FarmStatusActive, report.Status) +} + +func TestCheckFarmStatusWaiting(t *testing.T) { + f := fixtures(t) + + // "waiting": Active job, and only sleeping workers. + f.mockWorkerStatuses(persistence.WorkerStatusCount{ + api.WorkerStatusAsleep: 1, + }) + f.mockJobStatuses(persistence.JobStatusCount{ + api.JobStatusActive: 1, + }) + report := f.service.checkFarmStatus(f.ctx) + require.NotNil(t, report) + assert.Equal(t, api.FarmStatusWaiting, report.Status) + + // "waiting": Queued job, and awake worker. It could pick up the job any + // second now, but it could also have been blocklisted already. + f.mockWorkerStatuses(persistence.WorkerStatusCount{ + api.WorkerStatusAsleep: 1, + api.WorkerStatusAwake: 1, + }) + f.mockJobStatuses(persistence.JobStatusCount{ + api.JobStatusQueued: 1, + }) + report = f.service.checkFarmStatus(f.ctx) + require.NotNil(t, report) + assert.Equal(t, api.FarmStatusWaiting, report.Status) +} + +func TestCheckFarmStatusIdle(t *testing.T) { + f := fixtures(t) + + // "idle" # Farm could be active, but has no work to do. + f.mockWorkerStatuses(persistence.WorkerStatusCount{ + api.WorkerStatusOffline: 2, + api.WorkerStatusAsleep: 1, + api.WorkerStatusAwake: 1, + }) + f.mockJobStatuses(persistence.JobStatusCount{ + api.JobStatusCompleted: 1, + api.JobStatusCancelRequested: 1, + }) + report := f.service.checkFarmStatus(f.ctx) + require.NotNil(t, report) + assert.Equal(t, api.FarmStatusIdle, report.Status) +} + +func TestCheckFarmStatusAsleep(t *testing.T) { + f := fixtures(t) + + // "asleep": No worker is awake, some are asleep, no work to do. + f.mockWorkerStatuses(persistence.WorkerStatusCount{ + api.WorkerStatusOffline: 2, + api.WorkerStatusAsleep: 2, + }) + f.mockJobStatuses(persistence.JobStatusCount{ + api.JobStatusCanceled: 10, + api.JobStatusCompleted: 4, + api.JobStatusFailed: 2, + }) + report := f.service.checkFarmStatus(f.ctx) + require.NotNil(t, report) + assert.Equal(t, api.FarmStatusAsleep, report.Status) +} + +func Test_allIn(t *testing.T) { + type args struct { + statuses map[api.WorkerStatus]int + shouldBeIn []api.WorkerStatus + } + tests := []struct { + name string + args args + want bool + }{ + {"none", args{map[api.WorkerStatus]int{}, []api.WorkerStatus{api.WorkerStatusAsleep}}, true}, + {"match-only", args{ + map[api.WorkerStatus]int{api.WorkerStatusAsleep: 5}, + []api.WorkerStatus{api.WorkerStatusAsleep}, + }, true}, + {"match-some", args{ + map[api.WorkerStatus]int{api.WorkerStatusAsleep: 5, api.WorkerStatusOffline: 2}, + []api.WorkerStatus{api.WorkerStatusAsleep}, + }, false}, + {"match-all", args{ + map[api.WorkerStatus]int{api.WorkerStatusAsleep: 5, api.WorkerStatusOffline: 2}, + []api.WorkerStatus{api.WorkerStatusAsleep, api.WorkerStatusOffline}, + }, true}, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + if got := allIn(tt.args.statuses, tt.args.shouldBeIn...); got != tt.want { + t.Errorf("allIn() = %v, want %v", got, tt.want) + } + }) + } +} + +func fixtures(t *testing.T) *Fixtures { + mockCtrl := gomock.NewController(t) + + f := Fixtures{ + persist: mocks.NewMockPersistenceService(mockCtrl), + ctx: context.Background(), + } + + f.service = NewService(f.persist) + + return &f +} + +func (f *Fixtures) mockWorkerStatuses(workerStatuses persistence.WorkerStatusCount) { + f.persist.EXPECT().SummarizeWorkerStatuses(f.ctx).Return(workerStatuses, nil) +} + +func (f *Fixtures) mockJobStatuses(jobStatuses persistence.JobStatusCount) { + f.persist.EXPECT().SummarizeJobStatuses(f.ctx).Return(jobStatuses, nil) +} diff --git a/internal/manager/farmstatus/interfaces.go b/internal/manager/farmstatus/interfaces.go new file mode 100644 index 00000000..a5687f56 --- /dev/null +++ b/internal/manager/farmstatus/interfaces.go @@ -0,0 +1,17 @@ +package farmstatus + +import ( + "context" + + "projects.blender.org/studio/flamenco/internal/manager/persistence" +) + +// Generate mock implementations of these interfaces. +//go:generate go run github.com/golang/mock/mockgen -destination mocks/interfaces_mock.gen.go -package mocks projects.blender.org/studio/flamenco/internal/manager/farmstatus PersistenceService + +type PersistenceService interface { + SummarizeJobStatuses(ctx context.Context) (persistence.JobStatusCount, error) + SummarizeWorkerStatuses(ctx context.Context) (persistence.WorkerStatusCount, error) +} + +var _ PersistenceService = (*persistence.DB)(nil) diff --git a/internal/manager/farmstatus/mocks/interfaces_mock.gen.go b/internal/manager/farmstatus/mocks/interfaces_mock.gen.go new file mode 100644 index 00000000..b252b4ea --- /dev/null +++ b/internal/manager/farmstatus/mocks/interfaces_mock.gen.go @@ -0,0 +1,66 @@ +// Code generated by MockGen. DO NOT EDIT. +// Source: projects.blender.org/studio/flamenco/internal/manager/farmstatus (interfaces: PersistenceService) + +// Package mocks is a generated GoMock package. +package mocks + +import ( + context "context" + reflect "reflect" + + gomock "github.com/golang/mock/gomock" + persistence "projects.blender.org/studio/flamenco/internal/manager/persistence" +) + +// MockPersistenceService is a mock of PersistenceService interface. +type MockPersistenceService struct { + ctrl *gomock.Controller + recorder *MockPersistenceServiceMockRecorder +} + +// MockPersistenceServiceMockRecorder is the mock recorder for MockPersistenceService. +type MockPersistenceServiceMockRecorder struct { + mock *MockPersistenceService +} + +// NewMockPersistenceService creates a new mock instance. +func NewMockPersistenceService(ctrl *gomock.Controller) *MockPersistenceService { + mock := &MockPersistenceService{ctrl: ctrl} + mock.recorder = &MockPersistenceServiceMockRecorder{mock} + return mock +} + +// EXPECT returns an object that allows the caller to indicate expected use. +func (m *MockPersistenceService) EXPECT() *MockPersistenceServiceMockRecorder { + return m.recorder +} + +// SummarizeJobStatuses mocks base method. +func (m *MockPersistenceService) SummarizeJobStatuses(arg0 context.Context) (persistence.JobStatusCount, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "SummarizeJobStatuses", arg0) + ret0, _ := ret[0].(persistence.JobStatusCount) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// SummarizeJobStatuses indicates an expected call of SummarizeJobStatuses. +func (mr *MockPersistenceServiceMockRecorder) SummarizeJobStatuses(arg0 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SummarizeJobStatuses", reflect.TypeOf((*MockPersistenceService)(nil).SummarizeJobStatuses), arg0) +} + +// SummarizeWorkerStatuses mocks base method. +func (m *MockPersistenceService) SummarizeWorkerStatuses(arg0 context.Context) (persistence.WorkerStatusCount, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "SummarizeWorkerStatuses", arg0) + ret0, _ := ret[0].(persistence.WorkerStatusCount) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// SummarizeWorkerStatuses indicates an expected call of SummarizeWorkerStatuses. +func (mr *MockPersistenceServiceMockRecorder) SummarizeWorkerStatuses(arg0 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SummarizeWorkerStatuses", reflect.TypeOf((*MockPersistenceService)(nil).SummarizeWorkerStatuses), arg0) +} diff --git a/internal/manager/persistence/jobs_query.go b/internal/manager/persistence/jobs_query.go index c4431b05..fe040aa6 100644 --- a/internal/manager/persistence/jobs_query.go +++ b/internal/manager/persistence/jobs_query.go @@ -86,3 +86,33 @@ func (db *DB) QueryJobTaskSummaries(ctx context.Context, jobUUID string) ([]*Tas return result, tx.Error } + +// JobStatusCount is a mapping from job status to the number of jobs in that status. +type JobStatusCount map[api.JobStatus]int + +func (db *DB) SummarizeJobStatuses(ctx context.Context) (JobStatusCount, error) { + logger := log.Ctx(ctx) + logger.Debug().Msg("database: summarizing job statuses") + + // Query the database using a data structure that's easy to handle in GORM. + type queryResult struct { + Status api.JobStatus + StatusCount int + } + result := []*queryResult{} + tx := db.gormDB.WithContext(ctx).Model(&Job{}). + Select("status as Status", "count(id) as StatusCount"). + Group("status"). + Scan(&result) + if tx.Error != nil { + return nil, jobError(tx.Error, "summarizing job statuses") + } + + // Convert the array-of-structs to a map that's easier to handle by the caller. + statusCounts := make(JobStatusCount) + for _, singleStatusCount := range result { + statusCounts[singleStatusCount.Status] = singleStatusCount.StatusCount + } + + return statusCounts, nil +} diff --git a/internal/manager/persistence/jobs_query_test.go b/internal/manager/persistence/jobs_query_test.go index 6229b799..ad0848fb 100644 --- a/internal/manager/persistence/jobs_query_test.go +++ b/internal/manager/persistence/jobs_query_test.go @@ -4,9 +4,12 @@ package persistence // SPDX-License-Identifier: GPL-3.0-or-later import ( + "context" "testing" + "time" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" "projects.blender.org/studio/flamenco/internal/manager/job_compilers" "projects.blender.org/studio/flamenco/internal/uuid" @@ -141,3 +144,58 @@ func TestQueryJobTaskSummaries(t *testing.T) { assert.True(t, expectTaskUUIDs[summary.UUID], "%q should be in %v", summary.UUID, expectTaskUUIDs) } } + +func TestSummarizeJobStatuses(t *testing.T) { + ctx, close, db, job1, authoredJob1 := jobTasksTestFixtures(t) + defer close() + + // Create another job + authoredJob2 := duplicateJobAndTasks(authoredJob1) + job2 := persistAuthoredJob(t, ctx, db, authoredJob2) + + // Test the summary. + summary, err := db.SummarizeJobStatuses(ctx) + require.NoError(t, err) + assert.Equal(t, JobStatusCount{api.JobStatusUnderConstruction: 2}, summary) + + // Change the jobs so that each has a unique status. + job1.Status = api.JobStatusQueued + require.NoError(t, db.SaveJobStatus(ctx, job1)) + job2.Status = api.JobStatusFailed + require.NoError(t, db.SaveJobStatus(ctx, job2)) + + // Test the summary. + summary, err = db.SummarizeJobStatuses(ctx) + require.NoError(t, err) + assert.Equal(t, JobStatusCount{ + api.JobStatusQueued: 1, + api.JobStatusFailed: 1, + }, summary) + + // Delete all jobs. + require.NoError(t, db.DeleteJob(ctx, job1.UUID)) + require.NoError(t, db.DeleteJob(ctx, job2.UUID)) + + // Test the summary. + summary, err = db.SummarizeJobStatuses(ctx) + require.NoError(t, err) + assert.Equal(t, JobStatusCount{}, summary) +} + +// Check that a context timeout can be detected by inspecting the +// returned error. +func TestSummarizeJobStatusesTimeout(t *testing.T) { + ctx, close, db, _, _ := jobTasksTestFixtures(t) + defer close() + + subCtx, subCtxCancel := context.WithTimeout(ctx, 1*time.Nanosecond) + defer subCtxCancel() + + // Force a timeout of the context. And yes, even when a nanosecond is quite + // short, it is still necessary to wait. + time.Sleep(2 * time.Nanosecond) + + summary, err := db.SummarizeJobStatuses(subCtx) + assert.ErrorIs(t, err, context.DeadlineExceeded) + assert.Nil(t, summary) +} diff --git a/internal/manager/persistence/workers.go b/internal/manager/persistence/workers.go index a8e73d4e..60ec853b 100644 --- a/internal/manager/persistence/workers.go +++ b/internal/manager/persistence/workers.go @@ -8,6 +8,7 @@ import ( "strings" "time" + "github.com/rs/zerolog/log" "gorm.io/gorm" "projects.blender.org/studio/flamenco/pkg/api" ) @@ -176,3 +177,33 @@ func (db *DB) WorkerSeen(ctx context.Context, w *Worker) error { } return nil } + +// WorkerStatusCount is a mapping from job status to the number of jobs in that status. +type WorkerStatusCount map[api.WorkerStatus]int + +func (db *DB) SummarizeWorkerStatuses(ctx context.Context) (WorkerStatusCount, error) { + logger := log.Ctx(ctx) + logger.Debug().Msg("database: summarizing worker statuses") + + // Query the database using a data structure that's easy to handle in GORM. + type queryResult struct { + Status api.WorkerStatus + StatusCount int + } + result := []*queryResult{} + tx := db.gormDB.WithContext(ctx).Model(&Worker{}). + Select("status as Status", "count(id) as StatusCount"). + Group("status"). + Scan(&result) + if tx.Error != nil { + return nil, workerError(tx.Error, "summarizing worker statuses") + } + + // Convert the array-of-structs to a map that's easier to handle by the caller. + statusCounts := make(WorkerStatusCount) + for _, singleStatusCount := range result { + statusCounts[singleStatusCount.Status] = singleStatusCount.StatusCount + } + + return statusCounts, nil +} diff --git a/internal/manager/persistence/workers_test.go b/internal/manager/persistence/workers_test.go index b58db75d..e1f62f1b 100644 --- a/internal/manager/persistence/workers_test.go +++ b/internal/manager/persistence/workers_test.go @@ -4,6 +4,7 @@ package persistence // SPDX-License-Identifier: GPL-3.0-or-later import ( + "context" "testing" "time" @@ -334,3 +335,65 @@ func TestDeleteWorkerWithTagAssigned(t *testing.T) { require.NoError(t, err) assert.Empty(t, tag.Workers) } + +func TestSummarizeWorkerStatuses(t *testing.T) { + f := workerTestFixtures(t, 1*time.Second) + defer f.done() + + // Test the summary. + summary, err := f.db.SummarizeWorkerStatuses(f.ctx) + require.NoError(t, err) + assert.Equal(t, WorkerStatusCount{api.WorkerStatusAwake: 1}, summary) + + // Create more workers. + w1 := Worker{ + UUID: "fd97a35b-a5bd-44b4-ac2b-64c193ca877d", + Name: "Worker 1", + Status: api.WorkerStatusAwake, + } + w2 := Worker{ + UUID: "82b2d176-cb8c-4bfa-8300-41c216d766df", + Name: "Worker 2", + Status: api.WorkerStatusOffline, + } + + require.NoError(t, f.db.CreateWorker(f.ctx, &w1)) + require.NoError(t, f.db.CreateWorker(f.ctx, &w2)) + + // Test the summary. + summary, err = f.db.SummarizeWorkerStatuses(f.ctx) + require.NoError(t, err) + assert.Equal(t, WorkerStatusCount{ + api.WorkerStatusAwake: 2, + api.WorkerStatusOffline: 1, + }, summary) + + // Delete all workers. + require.NoError(t, f.db.DeleteWorker(f.ctx, f.worker.UUID)) + require.NoError(t, f.db.DeleteWorker(f.ctx, w1.UUID)) + require.NoError(t, f.db.DeleteWorker(f.ctx, w2.UUID)) + + // Test the summary. + summary, err = f.db.SummarizeWorkerStatuses(f.ctx) + require.NoError(t, err) + assert.Equal(t, WorkerStatusCount{}, summary) +} + +// Check that a context timeout can be detected by inspecting the +// returned error. +func TestSummarizeWorkerStatusesTimeout(t *testing.T) { + f := workerTestFixtures(t, 1*time.Second) + defer f.done() + + subCtx, subCtxCancel := context.WithTimeout(f.ctx, 1*time.Nanosecond) + defer subCtxCancel() + + // Force a timeout of the context. And yes, even when a nanosecond is quite + // short, it is still necessary to wait. + time.Sleep(2 * time.Nanosecond) + + // Test the summary. + summary, err := f.db.SummarizeWorkerStatuses(subCtx) + assert.ErrorIs(t, err, context.DeadlineExceeded) + assert.Nil(t, summary) +} -- 2.30.2 From 3b1421c2270e82795d60b75b5ff3bcc65a3e3d46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Fri, 1 Mar 2024 08:36:19 +0100 Subject: [PATCH 04/84] OAPI: add farm status events to the event bus --- pkg/api/flamenco-openapi.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/api/flamenco-openapi.yaml b/pkg/api/flamenco-openapi.yaml index 253a841a..c0c8dc50 100644 --- a/pkg/api/flamenco-openapi.yaml +++ b/pkg/api/flamenco-openapi.yaml @@ -2421,6 +2421,9 @@ components: type: string enum: [manager-startup, manager-shutdown] + EventFarmStatus: + $ref: "#/components/schemas/FarmStatusReport" + SocketIOSubscription: type: object description: > -- 2.30.2 From 8cf19876c0126b4e9849eeb758d0a352d711e068 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Fri, 1 Mar 2024 08:36:40 +0100 Subject: [PATCH 05/84] OAPI: regenerate code --- .../flamenco/manager/docs/EventFarmStatus.md | 11 + .../manager/model/event_farm_status.py | 278 +++++++++++++ addon/flamenco/manager/models/__init__.py | 1 + addon/flamenco/manager_README.md | 1 + pkg/api/openapi_spec.gen.go | 383 +++++++++--------- pkg/api/openapi_types.gen.go | 3 + 6 files changed, 486 insertions(+), 191 deletions(-) create mode 100644 addon/flamenco/manager/docs/EventFarmStatus.md create mode 100644 addon/flamenco/manager/model/event_farm_status.py diff --git a/addon/flamenco/manager/docs/EventFarmStatus.md b/addon/flamenco/manager/docs/EventFarmStatus.md new file mode 100644 index 00000000..ba47b032 --- /dev/null +++ b/addon/flamenco/manager/docs/EventFarmStatus.md @@ -0,0 +1,11 @@ +# EventFarmStatus + + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**value** | **FarmStatusReport** | | + +[[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/event_farm_status.py b/addon/flamenco/manager/model/event_farm_status.py new file mode 100644 index 00000000..ca516d18 --- /dev/null +++ b/addon/flamenco/manager/model/event_farm_status.py @@ -0,0 +1,278 @@ +""" + 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 EventFarmStatus(ModelSimple): + """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. + 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 = { + } + + additional_properties_type = None + + _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 { + 'value': (FarmStatusReport,), + } + + @cached_property + def discriminator(): + return None + + + attribute_map = {} + + read_only_vars = set() + + _composed_schemas = None + + 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, *args, **kwargs): + """EventFarmStatus - a model defined in OpenAPI + + Note that value can be passed either in args or in kwargs, but not in both. + + Args: + args[0] (FarmStatusReport): # noqa: E501 + + Keyword Args: + value (FarmStatusReport): # noqa: E501 + _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,) + """ + # required up here when default value is not given + _path_to_item = kwargs.pop('_path_to_item', ()) + + if 'value' in kwargs: + value = kwargs.pop('value') + elif args: + args = list(args) + value = args.pop(0) + else: + raise ApiTypeError( + "value is required, but not passed in args or kwargs and doesn't have default", + path_to_item=_path_to_item, + valid_classes=(self.__class__,), + ) + + _check_type = kwargs.pop('_check_type', True) + _spec_property_naming = kwargs.pop('_spec_property_naming', False) + _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.value = value + if kwargs: + raise ApiTypeError( + "Invalid named arguments=%s passed to %s. Remove those invalid named arguments." % ( + kwargs, + self.__class__.__name__, + ), + path_to_item=_path_to_item, + valid_classes=(self.__class__,), + ) + + @classmethod + @convert_js_args_to_python_args + def _from_openapi_data(cls, *args, **kwargs): + """EventFarmStatus - a model defined in OpenAPI + + Note that value can be passed either in args or in kwargs, but not in both. + + Args: + args[0] (FarmStatusReport): # noqa: E501 + + Keyword Args: + value (FarmStatusReport): # noqa: E501 + _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,) + """ + # required up here when default value is not given + _path_to_item = kwargs.pop('_path_to_item', ()) + + self = super(OpenApiModel, cls).__new__(cls) + + if 'value' in kwargs: + value = kwargs.pop('value') + elif args: + args = list(args) + value = args.pop(0) + else: + raise ApiTypeError( + "value is required, but not passed in args or kwargs and doesn't have default", + path_to_item=_path_to_item, + valid_classes=(self.__class__,), + ) + + _check_type = kwargs.pop('_check_type', True) + _spec_property_naming = kwargs.pop('_spec_property_naming', False) + _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.value = value + if kwargs: + raise ApiTypeError( + "Invalid named arguments=%s passed to %s. Remove those invalid named arguments." % ( + kwargs, + self.__class__.__name__, + ), + path_to_item=_path_to_item, + valid_classes=(self.__class__,), + ) + + return self diff --git a/addon/flamenco/manager/models/__init__.py b/addon/flamenco/manager/models/__init__.py index 42b8fd19..374f2511 100644 --- a/addon/flamenco/manager/models/__init__.py +++ b/addon/flamenco/manager/models/__init__.py @@ -22,6 +22,7 @@ from flamenco.manager.model.blender_path_find_result import BlenderPathFindResul from flamenco.manager.model.blender_path_source import BlenderPathSource from flamenco.manager.model.command import Command from flamenco.manager.model.error import Error +from flamenco.manager.model.event_farm_status import EventFarmStatus from flamenco.manager.model.event_job_update import EventJobUpdate from flamenco.manager.model.event_last_rendered_update import EventLastRenderedUpdate from flamenco.manager.model.event_life_cycle import EventLifeCycle diff --git a/addon/flamenco/manager_README.md b/addon/flamenco/manager_README.md index b48a7f1f..38a4a737 100644 --- a/addon/flamenco/manager_README.md +++ b/addon/flamenco/manager_README.md @@ -148,6 +148,7 @@ Class | Method | HTTP request | Description - [BlenderPathSource](flamenco\manager\docs/BlenderPathSource.md) - [Command](flamenco\manager\docs/Command.md) - [Error](flamenco\manager\docs/Error.md) + - [EventFarmStatus](flamenco\manager\docs/EventFarmStatus.md) - [EventJobUpdate](flamenco\manager\docs/EventJobUpdate.md) - [EventLastRenderedUpdate](flamenco\manager\docs/EventLastRenderedUpdate.md) - [EventLifeCycle](flamenco\manager\docs/EventLifeCycle.md) diff --git a/pkg/api/openapi_spec.gen.go b/pkg/api/openapi_spec.gen.go index 67cee5b6..f0cf7565 100644 --- a/pkg/api/openapi_spec.gen.go +++ b/pkg/api/openapi_spec.gen.go @@ -54,197 +54,198 @@ var swaggerSpec = []string{ "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", + "AQA=", } // 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 e7cd6aee..b1c66999 100644 --- a/pkg/api/openapi_types.gen.go +++ b/pkg/api/openapi_types.gen.go @@ -290,6 +290,9 @@ type Error struct { Message string `json:"message"` } +// EventFarmStatus defines model for EventFarmStatus. +type EventFarmStatus FarmStatusReport + // Subset of a Job, sent over SocketIO/MQTT when a job changes. For new jobs, `previous_status` will be excluded. type EventJobUpdate struct { // If job deletion was requested, this is the timestamp at which that request was stored on Flamenco Manager. -- 2.30.2 From 54f7878045ecb6c95cb4eff74866405289cac350 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Fri, 1 Mar 2024 08:37:07 +0100 Subject: [PATCH 06/84] Manager: add farm status events to the event bus Send an event to the event bus whenever the farm status changes. The event contains a farm status report (like `{status: "active"}`), and is sent to the `/status` topic. Note that at this moment the status is only polled every X seconds, and thus may lag behind other events. --- cmd/flamenco-manager/main.go | 2 +- .../manager/eventbus/events_farmstatus.go | 17 +++++++++ internal/manager/eventbus/topics.go | 1 + internal/manager/farmstatus/farmstatus.go | 31 +++++++++++---- .../manager/farmstatus/farmstatus_test.go | 37 +++++++++++++++--- internal/manager/farmstatus/interfaces.go | 10 ++++- .../farmstatus/mocks/interfaces_mock.gen.go | 38 ++++++++++++++++++- 7 files changed, 120 insertions(+), 16 deletions(-) create mode 100644 internal/manager/eventbus/events_farmstatus.go diff --git a/cmd/flamenco-manager/main.go b/cmd/flamenco-manager/main.go index c7dd60a5..42373bbe 100644 --- a/cmd/flamenco-manager/main.go +++ b/cmd/flamenco-manager/main.go @@ -175,7 +175,7 @@ func runFlamencoManager() bool { shamanServer := buildShamanServer(configService, isFirstRun) jobDeleter := job_deleter.NewService(persist, localStorage, eventBroker, shamanServer) - farmStatus := farmstatus.NewService(persist) + farmStatus := farmstatus.NewService(persist, eventBroker) flamenco := api_impl.NewFlamenco( compiler, persist, eventBroker, logStorage, configService, diff --git a/internal/manager/eventbus/events_farmstatus.go b/internal/manager/eventbus/events_farmstatus.go new file mode 100644 index 00000000..6a03d39a --- /dev/null +++ b/internal/manager/eventbus/events_farmstatus.go @@ -0,0 +1,17 @@ +package eventbus + +// SPDX-License-Identifier: GPL-3.0-or-later + +import ( + "github.com/rs/zerolog/log" + "projects.blender.org/studio/flamenco/pkg/api" +) + +func NewFarmStatusEvent(farmstatus api.FarmStatusReport) api.EventFarmStatus { + return api.EventFarmStatus(farmstatus) +} + +func (b *Broker) BroadcastFarmStatusEvent(event api.EventFarmStatus) { + log.Debug().Interface("event", event).Msg("eventbus: broadcasting FarmStatus event") + b.broadcast(TopicFarmStatus, event) +} diff --git a/internal/manager/eventbus/topics.go b/internal/manager/eventbus/topics.go index ea2b6056..1e0678f8 100644 --- a/internal/manager/eventbus/topics.go +++ b/internal/manager/eventbus/topics.go @@ -7,6 +7,7 @@ import "fmt" const ( // Topics on which events are published. TopicLifeCycle EventTopic = "/lifecycle" // sends api.EventLifeCycle + TopicFarmStatus EventTopic = "/status" // sends api.EventFarmStatus TopicJobUpdate EventTopic = "/jobs" // sends api.EventJobUpdate TopicLastRenderedImage EventTopic = "/last-rendered" // sends api.EventLastRenderedUpdate TopicTaskUpdate EventTopic = "/task" // sends api.EventTaskUpdate diff --git a/internal/manager/farmstatus/farmstatus.go b/internal/manager/farmstatus/farmstatus.go index 69f673fb..0720db48 100644 --- a/internal/manager/farmstatus/farmstatus.go +++ b/internal/manager/farmstatus/farmstatus.go @@ -9,6 +9,7 @@ import ( "time" "github.com/rs/zerolog/log" + "projects.blender.org/studio/flamenco/internal/manager/eventbus" "projects.blender.org/studio/flamenco/pkg/api" "projects.blender.org/studio/flamenco/pkg/website" ) @@ -24,16 +25,18 @@ const ( // Service keeps track of the overall farm status. type Service struct { - persist PersistenceService + persist PersistenceService + eventbus EventBus mutex sync.Mutex lastReport api.FarmStatusReport } -func NewService(persist PersistenceService) *Service { +func NewService(persist PersistenceService, eventbus EventBus) *Service { return &Service{ - persist: persist, - mutex: sync.Mutex{}, + persist: persist, + eventbus: eventbus, + mutex: sync.Mutex{}, lastReport: api.FarmStatusReport{ Status: api.FarmStatusStarting, }, @@ -64,6 +67,18 @@ func (s *Service) Report() api.FarmStatusReport { return s.lastReport } +// updateStatusReport updates the last status report in a thread-safe way. +// It returns whether the report changed. +func (s *Service) updateStatusReport(report api.FarmStatusReport) bool { + s.mutex.Lock() + defer s.mutex.Unlock() + + reportChanged := s.lastReport != report + s.lastReport = report + + return reportChanged +} + func (s *Service) poll(ctx context.Context) { report := s.checkFarmStatus(ctx) if report == nil { @@ -71,9 +86,11 @@ func (s *Service) poll(ctx context.Context) { return } - s.mutex.Lock() - s.lastReport = *report - s.mutex.Unlock() + reportChanged := s.updateStatusReport(*report) + if reportChanged { + event := eventbus.NewFarmStatusEvent(s.lastReport) + s.eventbus.BroadcastFarmStatusEvent(event) + } } // checkFarmStatus checks the farm status by querying the peristence layer. diff --git a/internal/manager/farmstatus/farmstatus_test.go b/internal/manager/farmstatus/farmstatus_test.go index b7d7532c..adf99fda 100644 --- a/internal/manager/farmstatus/farmstatus_test.go +++ b/internal/manager/farmstatus/farmstatus_test.go @@ -14,9 +14,10 @@ import ( ) type Fixtures struct { - service *Service - persist *mocks.MockPersistenceService - ctx context.Context + service *Service + persist *mocks.MockPersistenceService + eventbus *mocks.MockEventBus + ctx context.Context } func TestFarmStatusStarting(t *testing.T) { @@ -158,6 +159,29 @@ func TestCheckFarmStatusAsleep(t *testing.T) { assert.Equal(t, api.FarmStatusAsleep, report.Status) } +func TestFarmStatusEvent(t *testing.T) { + f := fixtures(t) + + // "inoperative": no workers. + f.mockWorkerStatuses(persistence.WorkerStatusCount{}) + f.eventbus.EXPECT().BroadcastFarmStatusEvent(api.EventFarmStatus{ + Status: api.FarmStatusInoperative, + }) + f.service.poll(f.ctx) + + // Re-polling should not trigger any event, as the status doesn't change. + f.mockWorkerStatuses(persistence.WorkerStatusCount{}) + f.service.poll(f.ctx) + + // "active": Actively working on jobs. + f.mockWorkerStatuses(persistence.WorkerStatusCount{api.WorkerStatusAwake: 3}) + f.mockJobStatuses(persistence.JobStatusCount{api.JobStatusActive: 1}) + f.eventbus.EXPECT().BroadcastFarmStatusEvent(api.EventFarmStatus{ + Status: api.FarmStatusActive, + }) + f.service.poll(f.ctx) +} + func Test_allIn(t *testing.T) { type args struct { statuses map[api.WorkerStatus]int @@ -195,11 +219,12 @@ func fixtures(t *testing.T) *Fixtures { mockCtrl := gomock.NewController(t) f := Fixtures{ - persist: mocks.NewMockPersistenceService(mockCtrl), - ctx: context.Background(), + persist: mocks.NewMockPersistenceService(mockCtrl), + eventbus: mocks.NewMockEventBus(mockCtrl), + ctx: context.Background(), } - f.service = NewService(f.persist) + f.service = NewService(f.persist, f.eventbus) return &f } diff --git a/internal/manager/farmstatus/interfaces.go b/internal/manager/farmstatus/interfaces.go index a5687f56..38774a96 100644 --- a/internal/manager/farmstatus/interfaces.go +++ b/internal/manager/farmstatus/interfaces.go @@ -3,11 +3,13 @@ package farmstatus import ( "context" + "projects.blender.org/studio/flamenco/internal/manager/eventbus" "projects.blender.org/studio/flamenco/internal/manager/persistence" + "projects.blender.org/studio/flamenco/pkg/api" ) // Generate mock implementations of these interfaces. -//go:generate go run github.com/golang/mock/mockgen -destination mocks/interfaces_mock.gen.go -package mocks projects.blender.org/studio/flamenco/internal/manager/farmstatus PersistenceService +//go:generate go run github.com/golang/mock/mockgen -destination mocks/interfaces_mock.gen.go -package mocks projects.blender.org/studio/flamenco/internal/manager/farmstatus PersistenceService,EventBus type PersistenceService interface { SummarizeJobStatuses(ctx context.Context) (persistence.JobStatusCount, error) @@ -15,3 +17,9 @@ type PersistenceService interface { } var _ PersistenceService = (*persistence.DB)(nil) + +type EventBus interface { + BroadcastFarmStatusEvent(event api.EventFarmStatus) +} + +var _ EventBus = (*eventbus.Broker)(nil) diff --git a/internal/manager/farmstatus/mocks/interfaces_mock.gen.go b/internal/manager/farmstatus/mocks/interfaces_mock.gen.go index b252b4ea..820b6829 100644 --- a/internal/manager/farmstatus/mocks/interfaces_mock.gen.go +++ b/internal/manager/farmstatus/mocks/interfaces_mock.gen.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: projects.blender.org/studio/flamenco/internal/manager/farmstatus (interfaces: PersistenceService) +// Source: projects.blender.org/studio/flamenco/internal/manager/farmstatus (interfaces: PersistenceService,EventBus) // Package mocks is a generated GoMock package. package mocks @@ -10,6 +10,7 @@ import ( gomock "github.com/golang/mock/gomock" persistence "projects.blender.org/studio/flamenco/internal/manager/persistence" + api "projects.blender.org/studio/flamenco/pkg/api" ) // MockPersistenceService is a mock of PersistenceService interface. @@ -64,3 +65,38 @@ func (mr *MockPersistenceServiceMockRecorder) SummarizeWorkerStatuses(arg0 inter mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SummarizeWorkerStatuses", reflect.TypeOf((*MockPersistenceService)(nil).SummarizeWorkerStatuses), arg0) } + +// MockEventBus is a mock of EventBus interface. +type MockEventBus struct { + ctrl *gomock.Controller + recorder *MockEventBusMockRecorder +} + +// MockEventBusMockRecorder is the mock recorder for MockEventBus. +type MockEventBusMockRecorder struct { + mock *MockEventBus +} + +// NewMockEventBus creates a new mock instance. +func NewMockEventBus(ctrl *gomock.Controller) *MockEventBus { + mock := &MockEventBus{ctrl: ctrl} + mock.recorder = &MockEventBusMockRecorder{mock} + return mock +} + +// EXPECT returns an object that allows the caller to indicate expected use. +func (m *MockEventBus) EXPECT() *MockEventBusMockRecorder { + return m.recorder +} + +// BroadcastFarmStatusEvent mocks base method. +func (m *MockEventBus) BroadcastFarmStatusEvent(arg0 api.EventFarmStatus) { + m.ctrl.T.Helper() + m.ctrl.Call(m, "BroadcastFarmStatusEvent", arg0) +} + +// BroadcastFarmStatusEvent indicates an expected call of BroadcastFarmStatusEvent. +func (mr *MockEventBusMockRecorder) BroadcastFarmStatusEvent(arg0 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BroadcastFarmStatusEvent", reflect.TypeOf((*MockEventBus)(nil).BroadcastFarmStatusEvent), arg0) +} -- 2.30.2 From ee7af297488191b75f38486200e73ac07ef00cca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Fri, 1 Mar 2024 22:36:06 +0100 Subject: [PATCH 07/84] Manager: fix unit test for farm status events --- internal/manager/farmstatus/farmstatus_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/manager/farmstatus/farmstatus_test.go b/internal/manager/farmstatus/farmstatus_test.go index adf99fda..4ccc372a 100644 --- a/internal/manager/farmstatus/farmstatus_test.go +++ b/internal/manager/farmstatus/farmstatus_test.go @@ -45,6 +45,7 @@ func TestFarmStatusLoop(t *testing.T) { assert.Equal(t, api.FarmStatusStarting, report.Status) // After a single poll, the report should have been updated. + f.eventbus.EXPECT().BroadcastFarmStatusEvent(api.EventFarmStatus{Status: api.FarmStatusActive}) f.service.poll(f.ctx) report = f.service.Report() assert.Equal(t, api.FarmStatusActive, report.Status) -- 2.30.2 From 9bfb53a7f6c1dea17e2e6f15c021038711ed3b41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Fri, 1 Mar 2024 22:19:47 +0100 Subject: [PATCH 08/84] Manager: log error when an event doesn't have a SocketIO event type SocketIO has 'rooms' and 'event types'. The 'event type' is set via reflection of the OpenAPI type of the event payload. This has to be set up in a mapping, though, and if that mapping is incomplete, an error will now be logged. --- internal/manager/eventbus/socketio.go | 13 ++++++++++++- internal/manager/eventbus/topics.go | 1 + 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/internal/manager/eventbus/socketio.go b/internal/manager/eventbus/socketio.go index d86c97a4..1ff4e190 100644 --- a/internal/manager/eventbus/socketio.go +++ b/internal/manager/eventbus/socketio.go @@ -14,6 +14,7 @@ import ( "github.com/rs/zerolog/log" "projects.blender.org/studio/flamenco/internal/uuid" "projects.blender.org/studio/flamenco/pkg/api" + "projects.blender.org/studio/flamenco/pkg/website" ) type SocketIOEventType string @@ -59,7 +60,17 @@ func (s *SocketIOForwarder) Broadcast(topic EventTopic, payload interface{}) { // SocketIO has a concept of 'event types'. MQTT doesn't have this, and thus the Flamenco event // system doesn't rely on it. We use the payload type name as event type. payloadType := reflect.TypeOf(payload).Name() - eventType := socketIOEventTypes[payloadType] + + eventType, ok := socketIOEventTypes[payloadType] + if !ok { + log.Error(). + Str("topic", string(topic)). + Str("payloadType", payloadType). + Interface("event", payload). + Msgf("socketIO: payload type does not have an event type, please copy-paste this message into a bug report at %s", website.BugReportURL) + return + } + log.Debug(). Str("topic", string(topic)). Str("eventType", eventType). diff --git a/internal/manager/eventbus/topics.go b/internal/manager/eventbus/topics.go index 1e0678f8..4f00407d 100644 --- a/internal/manager/eventbus/topics.go +++ b/internal/manager/eventbus/topics.go @@ -6,6 +6,7 @@ import "fmt" const ( // Topics on which events are published. + // NOTE: when adding here, also add to socketIOEventTypes in socketio.go. TopicLifeCycle EventTopic = "/lifecycle" // sends api.EventLifeCycle TopicFarmStatus EventTopic = "/status" // sends api.EventFarmStatus TopicJobUpdate EventTopic = "/jobs" // sends api.EventJobUpdate -- 2.30.2 From c1a9b1e877a9c1f983b2dcaa070e325c85c3978a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Fri, 1 Mar 2024 22:26:05 +0100 Subject: [PATCH 09/84] Manager: force a poll of the farm status when a job/worker changes state This introduces the concept of 'event listener', which is now used by the farm status service to respond to events on the event bus. This makes it possible to reduce the regular poll period from 5 to 30 seconds. That's now only necessary as backup, just in case events are missed or otherwise things change without the event bus logic noticing. --- internal/manager/eventbus/eventbus.go | 18 +++++++ internal/manager/eventbus/socketio.go | 6 +++ internal/manager/farmstatus/farmstatus.go | 50 +++++++++++++++++-- .../manager/farmstatus/farmstatus_test.go | 2 + internal/manager/farmstatus/interfaces.go | 1 + .../farmstatus/mocks/interfaces_mock.gen.go | 13 +++++ 6 files changed, 85 insertions(+), 5 deletions(-) diff --git a/internal/manager/eventbus/eventbus.go b/internal/manager/eventbus/eventbus.go index 8d533dd6..27392020 100644 --- a/internal/manager/eventbus/eventbus.go +++ b/internal/manager/eventbus/eventbus.go @@ -10,17 +10,25 @@ type ( EventTopic string ) +// Listener is the interface for internal components that want to respond to events. +type Listener interface { + OnEvent(topic EventTopic, payload interface{}) +} + +// Forwarder is the interface for components that forward events to external systems. type Forwarder interface { Broadcast(topic EventTopic, payload interface{}) } type Broker struct { + listeners []Listener forwarders []Forwarder mutex sync.Mutex } func NewBroker() *Broker { return &Broker{ + listeners: []Listener{}, forwarders: []Forwarder{}, mutex: sync.Mutex{}, } @@ -32,10 +40,20 @@ func (b *Broker) AddForwarder(forwarder Forwarder) { b.forwarders = append(b.forwarders, forwarder) } +func (b *Broker) AddListener(listener Listener) { + b.mutex.Lock() + defer b.mutex.Unlock() + b.listeners = append(b.listeners, listener) +} + func (b *Broker) broadcast(topic EventTopic, payload interface{}) { b.mutex.Lock() defer b.mutex.Unlock() + for _, listener := range b.listeners { + listener.OnEvent(topic, payload) + } + for _, forwarder := range b.forwarders { forwarder.Broadcast(topic, payload) } diff --git a/internal/manager/eventbus/socketio.go b/internal/manager/eventbus/socketio.go index 1ff4e190..57f59405 100644 --- a/internal/manager/eventbus/socketio.go +++ b/internal/manager/eventbus/socketio.go @@ -24,6 +24,8 @@ const ( ) var socketIOEventTypes = map[string]string{ + reflect.TypeOf(api.EventLifeCycle{}).Name(): "/lifecycle", + reflect.TypeOf(api.EventFarmStatus{}).Name(): "/status", reflect.TypeOf(api.EventJobUpdate{}).Name(): "/jobs", reflect.TypeOf(api.EventTaskUpdate{}).Name(): "/task", reflect.TypeOf(api.EventLastRenderedUpdate{}).Name(): "/last-rendered", @@ -91,6 +93,10 @@ func (s *SocketIOForwarder) registerSIOEventHandlers() { _ = sio.On(gosocketio.OnConnection, func(c *gosocketio.Channel) { logger := sioLogger(c) logger.Debug().Msg("socketIO: connected") + + // All SocketIO connections get these events, regardless of their subscription. + _ = c.Join(string(TopicLifeCycle)) + _ = c.Join(string(TopicFarmStatus)) }) // socket disconnection diff --git a/internal/manager/farmstatus/farmstatus.go b/internal/manager/farmstatus/farmstatus.go index 0720db48..82c440fd 100644 --- a/internal/manager/farmstatus/farmstatus.go +++ b/internal/manager/farmstatus/farmstatus.go @@ -20,7 +20,7 @@ const ( // // Note that this indicates the time between polls, so between a poll // operation being done, and the next one starting. - pollWait = 5 * time.Second + pollWait = 30 * time.Second ) // Service keeps track of the overall farm status. @@ -30,17 +30,24 @@ type Service struct { mutex sync.Mutex lastReport api.FarmStatusReport + forcePoll chan struct{} // Send anything here to force a poll, if none is running yet. } +// NewService returns a 'farm status' service. Run its Run() function in a +// goroutine to make it actually do something. func NewService(persist PersistenceService, eventbus EventBus) *Service { - return &Service{ - persist: persist, - eventbus: eventbus, - mutex: sync.Mutex{}, + service := Service{ + persist: persist, + eventbus: eventbus, + mutex: sync.Mutex{}, + forcePoll: make(chan struct{}, 1), lastReport: api.FarmStatusReport{ Status: api.FarmStatusStarting, }, } + + eventbus.AddListener(&service) + return &service } // Run the farm status polling loop. @@ -54,10 +61,43 @@ func (s *Service) Run(ctx context.Context) { return case <-time.After(pollWait): s.poll(ctx) + case <-s.forcePoll: + s.poll(ctx) } } } +func (s *Service) OnEvent(topic eventbus.EventTopic, payload interface{}) { + forcePoll := false + eventSubject := "" + + switch event := payload.(type) { + case api.EventJobUpdate: + forcePoll = event.PreviousStatus != nil && *event.PreviousStatus != event.Status + eventSubject = "job" + case api.EventWorkerUpdate: + forcePoll = event.PreviousStatus != nil && *event.PreviousStatus != event.Status + eventSubject = "worker" + } + + if !forcePoll { + return + } + + log.Debug(). + Str("event", string(topic)). + Msgf("farm status: investigating after %s status change", eventSubject) + + // Polling queries the database, and thus can have a non-trivial duration. + // Better to run in the Run() goroutine. + select { + case s.forcePoll <- struct{}{}: + default: + // If sending to the channel fails, there is already a struct{}{} in + // there, and thus a poll will be triggered ASAP anyway. + } +} + // Report returns the last-known farm status report. // // It is updated every few seconds, from the Run() function. diff --git a/internal/manager/farmstatus/farmstatus_test.go b/internal/manager/farmstatus/farmstatus_test.go index 4ccc372a..f6eb7e52 100644 --- a/internal/manager/farmstatus/farmstatus_test.go +++ b/internal/manager/farmstatus/farmstatus_test.go @@ -225,6 +225,8 @@ func fixtures(t *testing.T) *Fixtures { ctx: context.Background(), } + // calling NewService() immediate registers as a listener with the event bus. + f.eventbus.EXPECT().AddListener(gomock.Any()) f.service = NewService(f.persist, f.eventbus) return &f diff --git a/internal/manager/farmstatus/interfaces.go b/internal/manager/farmstatus/interfaces.go index 38774a96..36798e17 100644 --- a/internal/manager/farmstatus/interfaces.go +++ b/internal/manager/farmstatus/interfaces.go @@ -19,6 +19,7 @@ type PersistenceService interface { var _ PersistenceService = (*persistence.DB)(nil) type EventBus interface { + AddListener(listener eventbus.Listener) BroadcastFarmStatusEvent(event api.EventFarmStatus) } diff --git a/internal/manager/farmstatus/mocks/interfaces_mock.gen.go b/internal/manager/farmstatus/mocks/interfaces_mock.gen.go index 820b6829..55099521 100644 --- a/internal/manager/farmstatus/mocks/interfaces_mock.gen.go +++ b/internal/manager/farmstatus/mocks/interfaces_mock.gen.go @@ -9,6 +9,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" + eventbus "projects.blender.org/studio/flamenco/internal/manager/eventbus" persistence "projects.blender.org/studio/flamenco/internal/manager/persistence" api "projects.blender.org/studio/flamenco/pkg/api" ) @@ -89,6 +90,18 @@ func (m *MockEventBus) EXPECT() *MockEventBusMockRecorder { return m.recorder } +// AddListener mocks base method. +func (m *MockEventBus) AddListener(arg0 eventbus.Listener) { + m.ctrl.T.Helper() + m.ctrl.Call(m, "AddListener", arg0) +} + +// AddListener indicates an expected call of AddListener. +func (mr *MockEventBusMockRecorder) AddListener(arg0 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddListener", reflect.TypeOf((*MockEventBus)(nil).AddListener), arg0) +} + // BroadcastFarmStatusEvent mocks base method. func (m *MockEventBus) BroadcastFarmStatusEvent(arg0 api.EventFarmStatus) { m.ctrl.T.Helper() -- 2.30.2 From 59bf389018793adddd9348143dcfb1e4e0d07bd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Fri, 1 Mar 2024 22:29:00 +0100 Subject: [PATCH 10/84] Webapp: show farm status in header bar Show the farm status in the webapp header bar, and respond to farm status events to update it when necessary. --- web/app/src/App.vue | 14 +++++++++ web/app/src/assets/base.css | 8 ++++++ web/app/src/components/FarmStatus.vue | 35 +++++++++++++++++++++++ web/app/src/components/UpdateListener.vue | 9 ++++++ web/app/src/stores/farmstatus.js | 17 +++++++++++ 5 files changed, 83 insertions(+) create mode 100644 web/app/src/components/FarmStatus.vue create mode 100644 web/app/src/stores/farmstatus.js diff --git a/web/app/src/App.vue b/web/app/src/App.vue index 3e9327ce..4cd53a4e 100644 --- a/web/app/src/App.vue +++ b/web/app/src/App.vue @@ -17,6 +17,7 @@ + add-on @@ -31,8 +32,10 @@ import * as API from '@/manager-api'; import { getAPIClient } from '@/api-client'; import { backendURL } from '@/urls'; import { useSocketStatus } from '@/stores/socket-status'; +import { useFarmStatus } from '@/stores/farmstatus'; import ApiSpinner from '@/components/ApiSpinner.vue'; +import FarmStatus from '@/components/FarmStatus.vue'; const DEFAULT_FLAMENCO_NAME = 'Flamenco'; const DEFAULT_FLAMENCO_VERSION = 'unknown'; @@ -41,15 +44,18 @@ export default { name: 'App', components: { ApiSpinner, + FarmStatus, }, data: () => ({ flamencoName: DEFAULT_FLAMENCO_NAME, flamencoVersion: DEFAULT_FLAMENCO_VERSION, backendURL: backendURL, + farmStatus: useFarmStatus(), }), mounted() { window.app = this; this.fetchManagerInfo(); + this.fetchFarmStatus(); const sockStatus = useSocketStatus(); this.$watch( @@ -71,6 +77,14 @@ export default { }); }, + fetchFarmStatus() { + const metaAPI = new API.MetaApi(getAPIClient()); + metaAPI.getFarmStatus().then((statusReport) => { + const apiStatusReport = API.FarmStatusReport.constructFromObject(statusReport); + this.farmStatus.lastStatusReport = apiStatusReport; + }); + }, + socketIOReconnect() { const metaAPI = new API.MetaApi(getAPIClient()); metaAPI.getVersion().then((version) => { diff --git a/web/app/src/assets/base.css b/web/app/src/assets/base.css index 9e3f1e3e..eddcb115 100644 --- a/web/app/src/assets/base.css +++ b/web/app/src/assets/base.css @@ -82,6 +82,14 @@ --color-worker-status-testing: hsl(166 100% 46%); --color-worker-status-offline: var(--color-status-canceled); + --color-farm-status-starting: hsl(68, 100%, 30%); + --color-farm-status-active: var(--color-status-active); + --color-farm-status-idle: var(--color-status-paused); + --color-farm-status-waiting: var(--color-status-soft-failed); + --color-farm-status-asleep: var(--color-worker-status-asleep); + --color-farm-status-inoperative: var(--color-status-failed); + --color-farm-status-unknown: var(--color-status-failed); + --color-connection-lost-text: hsl(0, 90%, 60%); --color-connection-lost-bg: hsl(0, 50%, 20%); } diff --git a/web/app/src/components/FarmStatus.vue b/web/app/src/components/FarmStatus.vue new file mode 100644 index 00000000..16411dcf --- /dev/null +++ b/web/app/src/components/FarmStatus.vue @@ -0,0 +1,35 @@ + + + + + diff --git a/web/app/src/components/UpdateListener.vue b/web/app/src/components/UpdateListener.vue index 6e385949..b9b966e7 100644 --- a/web/app/src/components/UpdateListener.vue +++ b/web/app/src/components/UpdateListener.vue @@ -7,6 +7,7 @@ import io from 'socket.io-client'; import { ws } from '@/urls'; import * as API from '@/manager-api'; import { useSocketStatus } from '@/stores/socket-status'; +import { useFarmStatus } from '@/stores/farmstatus'; const websocketURL = ws(); @@ -34,6 +35,7 @@ export default { return { socket: null, sockStatus: useSocketStatus(), + farmStatus: useFarmStatus(), }; }, mounted: function () { @@ -182,6 +184,13 @@ export default { this.$emit('workerTagUpdate', apiWorkerTagUpdate); }); + this.socket.on('/status', (farmStatusReport) => { + // Convert to API object, in order to have the same parsing of data as + // when we'd do an API call. + const apiFarmStatusReport = API.FarmStatusReport.constructFromObject(farmStatusReport); + this.farmStatus.lastStatusReport = apiFarmStatusReport; + }); + // Chat system, useful for debugging. this.socket.on('/message', (message) => { this.$emit('message', message); diff --git a/web/app/src/stores/farmstatus.js b/web/app/src/stores/farmstatus.js new file mode 100644 index 00000000..678b513a --- /dev/null +++ b/web/app/src/stores/farmstatus.js @@ -0,0 +1,17 @@ +import { defineStore } from 'pinia'; +import { FarmStatusReport } from '@/manager-api'; + +/** + * Keep track of the farm status. This is updated from UpdateListener.vue. + */ +export const useFarmStatus = defineStore('farmStatus', { + state: () => ({ + lastStatusReport: new FarmStatusReport(), + }), + + actions: { + status() { + return this.lastStatusReport.status; + }, + }, +}); -- 2.30.2 From f763d12cd86de7aeb0677ee6e471dfdd295f0b20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Fri, 1 Mar 2024 22:40:21 +0100 Subject: [PATCH 11/84] Update CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a7884f7..b4cc28fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ bugs in actually-released versions. - Add MQTT support. Flamenco Manager can now send internal events to an MQTT broker. - Simplify the preview video filename when a complex set of frames rendered ([#104285](https://projects.blender.org/studio/flamenco/issues/104285)). Instead of `video-1, 4, 10.mp4` it is now simply `video-1-10.mp4`. - Make the `blendfile` parameter of a `blender-render` command optional. This makes it possible to pass, for example, a Python file that loads/constructs the blend file, instead of loading one straight from disk. +- Show the farm status in the web frontend. This shows whether the farm is actively working on a job, idle, asleep (all workers are sleeping and no work is queued), waiting (all workers are sleeping, and work is queued), or inoperable (no workers, or all workers are offline). This status is also broadcast as event via the event bus, and thus available via SocketIO and MQTT. ## 3.4 - released 2024-01-12 -- 2.30.2 From 7eb5eb68a3a1d6cbcb8bbeacb7b8c14cf568fdc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Fri, 1 Mar 2024 23:42:04 +0100 Subject: [PATCH 12/84] Manager: ensure foreign keys are enabled in periodic integrity check There are still issues with foreign keys getting disabled, so enable them in the periodic database consistency check. A more permanent solution is likely to drop GORM and switch to something else that gives us an on-connect-callback, which can then be used to turn on foreign key constraints for every connection made. --- internal/manager/config/defaults.go | 2 +- internal/manager/persistence/integrity.go | 28 +++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/internal/manager/config/defaults.go b/internal/manager/config/defaults.go index d6182169..896edc04 100644 --- a/internal/manager/config/defaults.go +++ b/internal/manager/config/defaults.go @@ -20,7 +20,7 @@ var defaultConfig = Conf{ Listen: ":8080", // ListenHTTPS: ":8433", DatabaseDSN: "flamenco-manager.sqlite", - DBIntegrityCheck: 1 * time.Hour, + DBIntegrityCheck: 10 * time.Minute, SSDPDiscovery: true, LocalManagerStoragePath: "./flamenco-manager-storage", SharedStoragePath: "", // Empty string means "first run", and should trigger the config setup assistant. diff --git a/internal/manager/persistence/integrity.go b/internal/manager/persistence/integrity.go index dad10501..3ccdf44c 100644 --- a/internal/manager/persistence/integrity.go +++ b/internal/manager/persistence/integrity.go @@ -78,6 +78,8 @@ func (db *DB) performIntegrityCheck(ctx context.Context) (ok bool) { log.Debug().Msg("database: performing integrity check") + db.ensureForeignKeysEnabled() + if !db.pragmaIntegrityCheck(checkCtx) { return false } @@ -159,3 +161,29 @@ func (db *DB) pragmaForeignKeyCheck(ctx context.Context) (ok bool) { return false } + +// ensureForeignKeysEnabled checks whether foreign keys are enabled, and if not, +// tries to enable them. +// +// This is likely caused by either GORM or its embedded SQLite creating a new +// connection to the low-level SQLite driver. Unfortunately the GORM-embedded +// SQLite doesn't have an 'on-connect' callback function to always enable +// foreign keys. +func (db *DB) ensureForeignKeysEnabled() { + fkEnabled, err := db.areForeignKeysEnabled() + + if err != nil { + log.Error().AnErr("cause", err).Msg("database: could not check whether foreign keys are enabled") + return + } + + if fkEnabled { + return + } + + log.Warn().Msg("database: foreign keys are disabled, re-enabling them") + if err := db.pragmaForeignKeys(true); err != nil { + log.Error().AnErr("cause", err).Msg("database: error re-enabling foreign keys") + return + } +} -- 2.30.2 From 1e7c059d128cfac8dd30c3679794e9a86de5eb19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Sat, 2 Mar 2024 22:09:53 +0100 Subject: [PATCH 13/84] Manager: check the farm status quickly after startup The database is polled every 30 seconds to determine the farm status; at startup the first poll is done after 1 second to get a faster status. Note that when jobs and workers change their status, the farm status is always updated. --- internal/manager/farmstatus/farmstatus.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/internal/manager/farmstatus/farmstatus.go b/internal/manager/farmstatus/farmstatus.go index 82c440fd..5fd86d9d 100644 --- a/internal/manager/farmstatus/farmstatus.go +++ b/internal/manager/farmstatus/farmstatus.go @@ -55,15 +55,22 @@ func (s *Service) Run(ctx context.Context) { log.Debug().Msg("farm status: polling service running") defer log.Debug().Msg("farm status: polling service stopped") + // At startup the first poll should happen quickly. + waitTime := 1 * time.Second + for { select { case <-ctx.Done(): return - case <-time.After(pollWait): + case <-time.After(waitTime): s.poll(ctx) case <-s.forcePoll: s.poll(ctx) } + + // After the first poll we can go to a slower pace, as mostly the event bus + // is the main source of poll triggers. + waitTime = pollWait } } -- 2.30.2 From c0c70758c6dfb2210d8be9e7968353d2ff06e570 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Sat, 2 Mar 2024 22:20:01 +0100 Subject: [PATCH 14/84] Webapp: hide farm status when SOcketIO is disconnected Better to not show the farm status if the connection is lost. --- web/app/src/App.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/web/app/src/App.vue b/web/app/src/App.vue index 4cd53a4e..b707f77a 100644 --- a/web/app/src/App.vue +++ b/web/app/src/App.vue @@ -17,7 +17,7 @@ - + add-on @@ -51,6 +51,7 @@ export default { flamencoVersion: DEFAULT_FLAMENCO_VERSION, backendURL: backendURL, farmStatus: useFarmStatus(), + socketIOConnected: false, }), mounted() { window.app = this; @@ -61,6 +62,7 @@ export default { this.$watch( () => sockStatus.isConnected, (isConnected) => { + this.socketIOConnected = isConnected; if (!isConnected) return; if (!sockStatus.wasEverDisconnected) return; this.socketIOReconnect(); -- 2.30.2 From 63e3c8de3714aebe7ca243d27a400dff2e77452b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Sat, 2 Mar 2024 22:20:42 +0100 Subject: [PATCH 15/84] Webapp: make SocketIO reconnect faster The exponential backoff was getting a bit too long, making the webapp sometimes very slow to reconnect. This is now limited to max 3 seconds. --- web/app/src/components/UpdateListener.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/web/app/src/components/UpdateListener.vue b/web/app/src/components/UpdateListener.vue index b9b966e7..68ff345e 100644 --- a/web/app/src/components/UpdateListener.vue +++ b/web/app/src/components/UpdateListener.vue @@ -92,6 +92,9 @@ export default { // console.log("connecting JobsListener to WS", websocketURL); const ws = io(websocketURL, { transports: ['websocket'], + reconnectionDelay: 250, // milliseconds + reconnectionDelayMax: 3000, // milliseconds + timeout: 1000, // milliseconds }); this.socket = ws; -- 2.30.2 From 7bf121e93edd61a923c16f633873108249484362 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Sat, 2 Mar 2024 22:32:02 +0100 Subject: [PATCH 16/84] Webapp: show explanation in farm status tooltip --- web/app/src/components/FarmStatus.vue | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/web/app/src/components/FarmStatus.vue b/web/app/src/components/FarmStatus.vue index 16411dcf..9ccf0eb4 100644 --- a/web/app/src/components/FarmStatus.vue +++ b/web/app/src/components/FarmStatus.vue @@ -1,16 +1,36 @@ + +`broker` +: The URL of the MQTT Broker. Supports `tcp://` and `ws://` URLs. + +`username` & `password` +: The credentials used to connect to the MQTT Broker. For anonymous access, just + remove those two keys. + +`topic_prefix` +: Topic prefix for the MQTT events sent to the broker. Defaults to `flamenco`. + For example, job updates are sent to the `flamenco/jobs` topic. + + + +## MQTT Topics + +The following topics will be used by Flamenco: + +| Description | MQTT topic | JSON event payload | +|----------------------------------|----------------------------------|---------------------------| +| Manager startup/shutdown | `/lifecycle` | `EventLifeCycle` | +| Farm status | `/status` | `EventFarmStatus` | +| Job update | `/jobs` | `EventJobUpdate` | +| Task update | `/jobs/{job UUID}` | `EventTaskUpdate` | +| Worker update | `/workers` | `EventWorkerUpdate` | +| Worker Tag update | `/workertags` | `EventWorkerTagUpdate` | +| Last rendered image | `/last-rendered` | `EventLastRenderedUpdate` | +| Job-specific last rendered image | `/jobs/{job UUID}/last-rendered` | `EventLastRenderedUpdate` | + +For the specification of the JSON sent in the MQTT events, use the above table +and then look up the type description in the [OpenAPI specification][oapi]. + +[oapi]: https://projects.blender.org/studio/flamenco/src/branch/main/pkg/api/flamenco-openapi.yaml -- 2.30.2 From bd3dd903031b2e051b8cb29899240c0d3be0dec9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Wed, 13 Mar 2024 19:13:37 +0100 Subject: [PATCH 39/84] Update CHANGELOG.md Add recent add-on improvements. --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6451bdda..111f84f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ bugs in actually-released versions. - Make the `blendfile` parameter of a `blender-render` command optional. This makes it possible to pass, for example, a Python file that loads/constructs the blend file, instead of loading one straight from disk. - Show the farm status in the web frontend. This shows whether the farm is actively working on a job, idle, asleep (all workers are sleeping and no work is queued), waiting (all workers are sleeping, and work is queued), or inoperable (no workers, or all workers are offline). This status is also broadcast as event via the event bus, and thus available via SocketIO and MQTT. - Fix an issue where the columns in the web interface wouldn't correctly resize when the shown information changed. +- Add-on: replace the different 'refresh' buttons (for Manager info & storage location, job types, and worker tags) with a single button that just refreshes everything in one go. The information obtained from Flamenco Manager is now stored in a JSON file on disk, making it independent from Blender auto-saving the user preferences. ## 3.4 - released 2024-01-12 -- 2.30.2 From 1fee086cef4eede8bdc95a21969c0229d981f86d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Wed, 13 Mar 2024 19:16:40 +0100 Subject: [PATCH 40/84] Website: add MQTT prefix to table of MQTT topics --- .../usage/manager-configuration/mqtt.md | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/web/project-website/content/usage/manager-configuration/mqtt.md b/web/project-website/content/usage/manager-configuration/mqtt.md index 03bbfd84..0a8744eb 100644 --- a/web/project-website/content/usage/manager-configuration/mqtt.md +++ b/web/project-website/content/usage/manager-configuration/mqtt.md @@ -47,18 +47,18 @@ mqtt: ## MQTT Topics -The following topics will be used by Flamenco: +The following topics will be used by Flamenco. The `flamenco` prefix for the topics is configurable. -| Description | MQTT topic | JSON event payload | -|----------------------------------|----------------------------------|---------------------------| -| Manager startup/shutdown | `/lifecycle` | `EventLifeCycle` | -| Farm status | `/status` | `EventFarmStatus` | -| Job update | `/jobs` | `EventJobUpdate` | -| Task update | `/jobs/{job UUID}` | `EventTaskUpdate` | -| Worker update | `/workers` | `EventWorkerUpdate` | -| Worker Tag update | `/workertags` | `EventWorkerTagUpdate` | -| Last rendered image | `/last-rendered` | `EventLastRenderedUpdate` | -| Job-specific last rendered image | `/jobs/{job UUID}/last-rendered` | `EventLastRenderedUpdate` | +| Description | MQTT topic | JSON event payload | +|----------------------------------|------------------------------------------|---------------------------| +| Manager startup/shutdown | `flamenco/lifecycle` | `EventLifeCycle` | +| Farm status | `flamenco/status` | `EventFarmStatus` | +| Job update | `flamenco/jobs` | `EventJobUpdate` | +| Task update | `flamenco/jobs/{job UUID}` | `EventTaskUpdate` | +| Worker update | `flamenco/workers` | `EventWorkerUpdate` | +| Worker Tag update | `flamenco/workertags` | `EventWorkerTagUpdate` | +| Last rendered image | `flamenco/last-rendered` | `EventLastRenderedUpdate` | +| Job-specific last rendered image | `flamenco/jobs/{job UUID}/last-rendered` | `EventLastRenderedUpdate` | For the specification of the JSON sent in the MQTT events, use the above table and then look up the type description in the [OpenAPI specification][oapi]. -- 2.30.2 From 3f4a9025fe3b44d0d585a343363fc9453e00741d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Sat, 16 Mar 2024 11:09:18 +0100 Subject: [PATCH 41/84] Manager tests: replace `assert.NoError()` with `require.NoError()` Back in the days when I wrote the code, I didn't know about the `require` package yet. Using `require.NoError()` makes the test code more straight-forward. No functional changes, except that when tests fail, they now fail without panicking. --- internal/manager/api_impl/jobs_query_test.go | 6 +- internal/manager/api_impl/jobs_test.go | 52 +++---- internal/manager/api_impl/meta_test.go | 30 ++-- internal/manager/api_impl/support_test.go | 17 +-- internal/manager/api_impl/worker_mgt_test.go | 18 +-- .../api_impl/worker_task_updates_test.go | 15 +- internal/manager/api_impl/workers_test.go | 59 ++++---- .../job_compilers/job_compilers_test.go | 16 +-- .../manager/job_compilers/js_globals_test.go | 13 +- .../manager/job_compilers/scripts_test.go | 11 +- .../manager/job_deleter/job_deleter_test.go | 11 +- .../last_rendered/last_rendered_test.go | 19 +-- .../local_storage/local_storage_test.go | 22 ++- .../persistence/jobs_blocklist_test.go | 69 ++++----- .../manager/persistence/jobs_query_test.go | 16 +-- internal/manager/persistence/jobs_test.go | 132 +++++++++--------- .../manager/persistence/last_rendered_test.go | 24 ++-- .../persistence/task_scheduler_test.go | 36 ++--- .../manager/persistence/time_of_day_test.go | 52 +++---- internal/manager/persistence/timeout_test.go | 29 ++-- .../persistence/worker_sleep_schedule_test.go | 83 ++++------- internal/manager/persistence/workers_test.go | 98 ++++++------- .../sleep_scheduler/sleep_scheduler_test.go | 18 +-- .../manager/task_logs/log_rotation_test.go | 23 +-- internal/manager/task_logs/task_logs_test.go | 34 ++--- .../task_state_machine_test.go | 31 ++-- .../task_state_machine/worker_requeue_test.go | 4 +- 27 files changed, 432 insertions(+), 506 deletions(-) diff --git a/internal/manager/api_impl/jobs_query_test.go b/internal/manager/api_impl/jobs_query_test.go index 3fc57158..9be480b1 100644 --- a/internal/manager/api_impl/jobs_query_test.go +++ b/internal/manager/api_impl/jobs_query_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/golang/mock/gomock" - "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" "projects.blender.org/studio/flamenco/internal/manager/persistence" "projects.blender.org/studio/flamenco/pkg/api" ) @@ -52,7 +52,7 @@ func TestQueryJobs(t *testing.T) { Return([]*persistence.Job{&activeJob, &deletionQueuedJob}, nil) err := mf.flamenco.QueryJobs(echoCtx) - assert.NoError(t, err) + require.NoError(t, err) expectedJobs := api.JobsQueryResult{ Jobs: []api.Job{ @@ -160,7 +160,7 @@ func TestFetchTask(t *testing.T) { Return([]*persistence.Worker{&taskWorker}, nil) err := mf.flamenco.FetchTask(echoCtx, taskUUID) - assert.NoError(t, err) + require.NoError(t, err) assertResponseJSON(t, echoCtx, http.StatusOK, expectAPITask) } diff --git a/internal/manager/api_impl/jobs_test.go b/internal/manager/api_impl/jobs_test.go index f75c9861..ea26e9a5 100644 --- a/internal/manager/api_impl/jobs_test.go +++ b/internal/manager/api_impl/jobs_test.go @@ -88,7 +88,7 @@ func TestSubmitJobWithoutSettings(t *testing.T) { echoCtx := mf.prepareMockedJSONRequest(submittedJob) requestWorkerStore(echoCtx, &worker) err := mf.flamenco.SubmitJob(echoCtx) - assert.NoError(t, err) + require.NoError(t, err) } func TestSubmitJobWithSettings(t *testing.T) { @@ -177,7 +177,7 @@ func TestSubmitJobWithSettings(t *testing.T) { echoCtx := mf.prepareMockedJSONRequest(submittedJob) requestWorkerStore(echoCtx, &worker) err := mf.flamenco.SubmitJob(echoCtx) - assert.NoError(t, err) + require.NoError(t, err) } func TestSubmitJobWithEtag(t *testing.T) { @@ -202,7 +202,7 @@ func TestSubmitJobWithEtag(t *testing.T) { { echoCtx := mf.prepareMockedJSONRequest(submittedJob) err := mf.flamenco.SubmitJob(echoCtx) - assert.NoError(t, err) + require.NoError(t, err) assertResponseAPIError(t, echoCtx, http.StatusPreconditionFailed, "rejecting job because its settings are outdated, refresh the job type") } @@ -240,7 +240,7 @@ func TestSubmitJobWithEtag(t *testing.T) { submittedJob.TypeEtag = ptr("correct etag") echoCtx := mf.prepareMockedJSONRequest(submittedJob) err := mf.flamenco.SubmitJob(echoCtx) - assert.NoError(t, err) + require.NoError(t, err) } } @@ -318,7 +318,7 @@ func TestSubmitJobWithShamanCheckoutID(t *testing.T) { echoCtx := mf.prepareMockedJSONRequest(submittedJob) requestWorkerStore(echoCtx, &worker) err := mf.flamenco.SubmitJob(echoCtx) - assert.NoError(t, err) + require.NoError(t, err) } func TestSubmitJobWithWorkerTag(t *testing.T) { @@ -437,7 +437,7 @@ func TestGetJobTypeHappy(t *testing.T) { echoCtx := mf.prepareMockedRequest(nil) err := mf.flamenco.GetJobType(echoCtx, "test-job-type") - assert.NoError(t, err) + require.NoError(t, err) assertResponseJSON(t, echoCtx, http.StatusOK, jt) } @@ -453,7 +453,7 @@ func TestGetJobTypeUnknown(t *testing.T) { echoCtx := mf.prepareMockedRequest(nil) err := mf.flamenco.GetJobType(echoCtx, "nonexistent-type") - assert.NoError(t, err) + require.NoError(t, err) assertResponseJSON(t, echoCtx, http.StatusNotFound, api.Error{ Code: http.StatusNotFound, Message: "no such job type known", @@ -482,7 +482,7 @@ func TestSubmitJobCheckWithEtag(t *testing.T) { { echoCtx := mf.prepareMockedJSONRequest(submittedJob) err := mf.flamenco.SubmitJobCheck(echoCtx) - assert.NoError(t, err) + require.NoError(t, err) assertResponseAPIError(t, echoCtx, http.StatusPreconditionFailed, "rejecting job because its settings are outdated, refresh the job type") } @@ -502,7 +502,7 @@ func TestSubmitJobCheckWithEtag(t *testing.T) { submittedJob.TypeEtag = ptr("correct etag") echoCtx := mf.prepareMockedJSONRequest(submittedJob) err := mf.flamenco.SubmitJobCheck(echoCtx) - assert.NoError(t, err) + require.NoError(t, err) } } @@ -516,7 +516,7 @@ func TestGetJobTypeError(t *testing.T) { Return(api.AvailableJobType{}, errors.New("didn't expect this")) echoCtx := mf.prepareMockedRequest(nil) err := mf.flamenco.GetJobType(echoCtx, "error") - assert.NoError(t, err) + require.NoError(t, err) assertResponseAPIError(t, echoCtx, http.StatusInternalServerError, "error getting job type") } @@ -537,7 +537,7 @@ func TestSetJobStatus_nonexistentJob(t *testing.T) { // Do the call. echoCtx := mf.prepareMockedJSONRequest(statusUpdate) err := mf.flamenco.SetJobStatus(echoCtx, jobID) - assert.NoError(t, err) + require.NoError(t, err) assertResponseAPIError(t, echoCtx, http.StatusNotFound, "no such job") } @@ -571,7 +571,7 @@ func TestSetJobStatus_happy(t *testing.T) { // Do the call. echoCtx := mf.prepareMockedJSONRequest(statusUpdate) err := mf.flamenco.SetJobStatus(echoCtx, jobID) - assert.NoError(t, err) + require.NoError(t, err) assertResponseNoContent(t, echoCtx) } @@ -592,7 +592,7 @@ func TestSetJobPrio_nonexistentJob(t *testing.T) { // Do the call. echoCtx := mf.prepareMockedJSONRequest(prioUpdate) err := mf.flamenco.SetJobStatus(echoCtx, jobID) - assert.NoError(t, err) + require.NoError(t, err) assertResponseAPIError(t, echoCtx, http.StatusNotFound, "no such job") } @@ -634,7 +634,7 @@ func TestSetJobPrio(t *testing.T) { mf.broadcaster.EXPECT().BroadcastJobUpdate(expectUpdate) err := mf.flamenco.SetJobPriority(echoCtx, jobID) - assert.NoError(t, err) + require.NoError(t, err) assertResponseNoContent(t, echoCtx) } @@ -668,7 +668,7 @@ func TestSetJobStatusFailedToRequeueing(t *testing.T) { // Do the call. err := mf.flamenco.SetJobStatus(echoCtx, jobID) - assert.NoError(t, err) + require.NoError(t, err) assertResponseNoContent(t, echoCtx) } @@ -714,7 +714,7 @@ func TestSetTaskStatusQueued(t *testing.T) { // Do the call. err := mf.flamenco.SetTaskStatus(echoCtx, taskID) - assert.NoError(t, err) + require.NoError(t, err) assertResponseNoContent(t, echoCtx) } @@ -748,7 +748,7 @@ func TestFetchTaskLogTail(t *testing.T) { echoCtx := mf.prepareMockedRequest(nil) err := mf.flamenco.FetchTaskLogTail(echoCtx, taskID) - assert.NoError(t, err) + require.NoError(t, err) assertResponseNoContent(t, echoCtx) // Check that a 204 No Content is also returned when the task log file on disk exists, but is empty. @@ -758,7 +758,7 @@ func TestFetchTaskLogTail(t *testing.T) { echoCtx = mf.prepareMockedRequest(nil) err = mf.flamenco.FetchTaskLogTail(echoCtx, taskID) - assert.NoError(t, err) + require.NoError(t, err) assertResponseNoContent(t, echoCtx) } @@ -794,7 +794,7 @@ func TestFetchTaskLogInfo(t *testing.T) { echoCtx := mf.prepareMockedRequest(nil) err := mf.flamenco.FetchTaskLogInfo(echoCtx, taskID) - assert.NoError(t, err) + require.NoError(t, err) assertResponseNoContent(t, echoCtx) // Check that a 204 No Content is also returned when the task log file on disk exists, but is empty. @@ -803,7 +803,7 @@ func TestFetchTaskLogInfo(t *testing.T) { echoCtx = mf.prepareMockedRequest(nil) err = mf.flamenco.FetchTaskLogInfo(echoCtx, taskID) - assert.NoError(t, err) + require.NoError(t, err) assertResponseNoContent(t, echoCtx) // Check that otherwise we actually get the info. @@ -813,7 +813,7 @@ func TestFetchTaskLogInfo(t *testing.T) { echoCtx = mf.prepareMockedRequest(nil) err = mf.flamenco.FetchTaskLogInfo(echoCtx, taskID) - assert.NoError(t, err) + require.NoError(t, err) assertResponseJSON(t, echoCtx, http.StatusOK, api.TaskLogInfo{ JobId: jobID, TaskId: taskID, @@ -842,7 +842,7 @@ func TestFetchJobLastRenderedInfo(t *testing.T) { echoCtx := mf.prepareMockedRequest(nil) err := mf.flamenco.FetchJobLastRenderedInfo(echoCtx, jobID) - assert.NoError(t, err) + require.NoError(t, err) expectBody := api.JobLastRenderedImageInfo{ Base: "/job-files/relative/path", @@ -857,7 +857,7 @@ func TestFetchJobLastRenderedInfo(t *testing.T) { echoCtx := mf.prepareMockedRequest(nil) err := mf.flamenco.FetchJobLastRenderedInfo(echoCtx, jobID) - assert.NoError(t, err) + require.NoError(t, err) assertResponseNoContent(t, echoCtx) } } @@ -876,7 +876,7 @@ func TestFetchGlobalLastRenderedInfo(t *testing.T) { echoCtx := mf.prepareMockedRequest(nil) err := mf.flamenco.FetchGlobalLastRenderedInfo(echoCtx) - assert.NoError(t, err) + require.NoError(t, err) assertResponseNoContent(t, echoCtx) } @@ -893,7 +893,7 @@ func TestFetchGlobalLastRenderedInfo(t *testing.T) { echoCtx := mf.prepareMockedRequest(nil) err := mf.flamenco.FetchGlobalLastRenderedInfo(echoCtx) - assert.NoError(t, err) + require.NoError(t, err) expectBody := api.JobLastRenderedImageInfo{ Base: "/job-files/relative/path", @@ -927,7 +927,7 @@ func TestDeleteJob(t *testing.T) { // Do the call. err := mf.flamenco.DeleteJob(echoCtx, jobID) - assert.NoError(t, err) + require.NoError(t, err) assertResponseNoContent(t, echoCtx) } diff --git a/internal/manager/api_impl/meta_test.go b/internal/manager/api_impl/meta_test.go index ec0d366a..78581804 100644 --- a/internal/manager/api_impl/meta_test.go +++ b/internal/manager/api_impl/meta_test.go @@ -43,7 +43,7 @@ func TestGetVariables(t *testing.T) { echoCtx := mf.prepareMockedRequest(nil) err := mf.flamenco.GetVariables(echoCtx, api.ManagerVariableAudienceWorkers, "linux") - assert.NoError(t, err) + require.NoError(t, err) assertResponseJSON(t, echoCtx, http.StatusOK, api.ManagerVariables{ AdditionalProperties: map[string]api.ManagerVariable{ "blender": {Value: "/usr/local/blender", IsTwoway: false}, @@ -61,7 +61,7 @@ func TestGetVariables(t *testing.T) { echoCtx := mf.prepareMockedRequest(nil) err := mf.flamenco.GetVariables(echoCtx, api.ManagerVariableAudienceUsers, "troll") - assert.NoError(t, err) + require.NoError(t, err) assertResponseJSON(t, echoCtx, http.StatusOK, api.ManagerVariables{}) } } @@ -208,9 +208,7 @@ func TestCheckSharedStoragePath(t *testing.T) { echoCtx := mf.prepareMockedJSONRequest( api.PathCheckInput{Path: path}) err := mf.flamenco.CheckSharedStoragePath(echoCtx) - if !assert.NoError(t, err) { - t.FailNow() - } + require.NoError(t, err) return echoCtx } @@ -230,9 +228,8 @@ func TestCheckSharedStoragePath(t *testing.T) { Cause: "Directory checked successfully", }) files, err := filepath.Glob(filepath.Join(mf.tempdir, "*")) - if assert.NoError(t, err) { - assert.Empty(t, files, "After a query, there should not be any leftovers") - } + require.NoError(t, err) + assert.Empty(t, files, "After a query, there should not be any leftovers") // Test inaccessible path. // For some reason, this doesn't work on Windows, and creating a file in @@ -253,12 +250,9 @@ func TestCheckSharedStoragePath(t *testing.T) { parentPath := filepath.Join(mf.tempdir, "deep") testPath := filepath.Join(parentPath, "nesting") - if err := os.Mkdir(parentPath, fs.ModePerm); !assert.NoError(t, err) { - t.FailNow() - } - if err := os.Mkdir(testPath, fs.FileMode(0)); !assert.NoError(t, err) { - t.FailNow() - } + require.NoError(t, os.Mkdir(parentPath, fs.ModePerm)) + require.NoError(t, os.Mkdir(testPath, fs.FileMode(0))) + echoCtx := doTest(testPath) result := api.PathCheckResult{} getResponseJSON(t, echoCtx, http.StatusOK, &result) @@ -295,9 +289,7 @@ func TestSaveSetupAssistantConfig(t *testing.T) { // Call the API. echoCtx := mf.prepareMockedJSONRequest(body) err := mf.flamenco.SaveSetupAssistantConfig(echoCtx) - if !assert.NoError(t, err) { - t.FailNow() - } + require.NoError(t, err) assertResponseNoContent(t, echoCtx) return savedConfig @@ -378,9 +370,7 @@ func metaTestFixtures(t *testing.T) (mockedFlamenco, func()) { mf := newMockedFlamenco(mockCtrl) tempdir, err := os.MkdirTemp("", "test-temp-dir") - if !assert.NoError(t, err) { - t.FailNow() - } + require.NoError(t, err) mf.tempdir = tempdir finish := func() { diff --git a/internal/manager/api_impl/support_test.go b/internal/manager/api_impl/support_test.go index 33e712fd..23c46553 100644 --- a/internal/manager/api_impl/support_test.go +++ b/internal/manager/api_impl/support_test.go @@ -16,6 +16,7 @@ import ( "github.com/golang/mock/gomock" "github.com/labstack/echo/v4" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" "projects.blender.org/studio/flamenco/internal/manager/api_impl/mocks" "projects.blender.org/studio/flamenco/internal/manager/config" @@ -182,14 +183,10 @@ func getResponseJSON(t *testing.T, echoCtx echo.Context, expectStatusCode int, a } actualJSON, err := io.ReadAll(resp.Body) - if !assert.NoError(t, err) { - t.FailNow() - } + require.NoError(t, err) err = json.Unmarshal(actualJSON, actualPayloadPtr) - if !assert.NoError(t, err) { - t.FailNow() - } + require.NoError(t, err) } // assertResponseJSON asserts that a recorded response is JSON with the given HTTP status code. @@ -204,14 +201,10 @@ func assertResponseJSON(t *testing.T, echoCtx echo.Context, expectStatusCode int } expectJSON, err := json.Marshal(expectBody) - if !assert.NoError(t, err) { - t.FailNow() - } + require.NoError(t, err) actualJSON, err := io.ReadAll(resp.Body) - if !assert.NoError(t, err) { - t.FailNow() - } + require.NoError(t, err) assert.JSONEq(t, string(expectJSON), string(actualJSON)) } diff --git a/internal/manager/api_impl/worker_mgt_test.go b/internal/manager/api_impl/worker_mgt_test.go index 3df92c1a..62942ee3 100644 --- a/internal/manager/api_impl/worker_mgt_test.go +++ b/internal/manager/api_impl/worker_mgt_test.go @@ -33,7 +33,7 @@ func TestFetchWorkers(t *testing.T) { echo := mf.prepareMockedRequest(nil) err := mf.flamenco.FetchWorkers(echo) - assert.NoError(t, err) + require.NoError(t, err) // Check the response workers := api.WorkerList{ @@ -74,7 +74,7 @@ func TestFetchWorker(t *testing.T) { Return(nil, fmt.Errorf("wrapped: %w", persistence.ErrWorkerNotFound)) echo := mf.prepareMockedRequest(nil) err := mf.flamenco.FetchWorker(echo, workerUUID) - assert.NoError(t, err) + require.NoError(t, err) assertResponseAPIError(t, echo, http.StatusNotFound, fmt.Sprintf("worker %q not found", workerUUID)) // Test database error fetching worker. @@ -82,7 +82,7 @@ func TestFetchWorker(t *testing.T) { Return(nil, errors.New("some unknown error")) echo = mf.prepareMockedRequest(nil) err = mf.flamenco.FetchWorker(echo, workerUUID) - assert.NoError(t, err) + require.NoError(t, err) assertResponseAPIError(t, echo, http.StatusInternalServerError, "error fetching worker: some unknown error") // Test with worker that does NOT have a status change requested, and DOES have an assigned task. @@ -97,7 +97,7 @@ func TestFetchWorker(t *testing.T) { echo = mf.prepareMockedRequest(nil) err = mf.flamenco.FetchWorker(echo, workerUUID) - assert.NoError(t, err) + require.NoError(t, err) assertResponseJSON(t, echo, http.StatusOK, api.Worker{ WorkerSummary: api.WorkerSummary{ Id: workerUUID, @@ -126,7 +126,7 @@ func TestFetchWorker(t *testing.T) { echo = mf.prepareMockedRequest(nil) err = mf.flamenco.FetchWorker(echo, worker.UUID) - assert.NoError(t, err) + require.NoError(t, err) assertResponseJSON(t, echo, http.StatusOK, api.Worker{ WorkerSummary: api.WorkerSummary{ Id: workerUUID, @@ -155,7 +155,7 @@ func TestDeleteWorker(t *testing.T) { Return(nil, fmt.Errorf("wrapped: %w", persistence.ErrWorkerNotFound)) echo := mf.prepareMockedRequest(nil) err := mf.flamenco.DeleteWorker(echo, workerUUID) - assert.NoError(t, err) + require.NoError(t, err) assertResponseAPIError(t, echo, http.StatusNotFound, fmt.Sprintf("worker %q not found", workerUUID)) // Test with existing worker. @@ -176,7 +176,7 @@ func TestDeleteWorker(t *testing.T) { echo = mf.prepareMockedRequest(nil) err = mf.flamenco.DeleteWorker(echo, workerUUID) - assert.NoError(t, err) + require.NoError(t, err) assertResponseNoContent(t, echo) } @@ -214,7 +214,7 @@ func TestRequestWorkerStatusChange(t *testing.T) { IsLazy: true, }) err := mf.flamenco.RequestWorkerStatusChange(echo, workerUUID) - assert.NoError(t, err) + require.NoError(t, err) assertResponseNoContent(t, echo) } @@ -258,7 +258,7 @@ func TestRequestWorkerStatusChangeRevert(t *testing.T) { IsLazy: true, }) err := mf.flamenco.RequestWorkerStatusChange(echo, workerUUID) - assert.NoError(t, err) + require.NoError(t, err) assertResponseNoContent(t, echo) } diff --git a/internal/manager/api_impl/worker_task_updates_test.go b/internal/manager/api_impl/worker_task_updates_test.go index df918c24..6810bc7a 100644 --- a/internal/manager/api_impl/worker_task_updates_test.go +++ b/internal/manager/api_impl/worker_task_updates_test.go @@ -8,6 +8,7 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" "projects.blender.org/studio/flamenco/internal/manager/config" "projects.blender.org/studio/flamenco/internal/manager/persistence" @@ -77,7 +78,7 @@ func TestTaskUpdate(t *testing.T) { err := mf.flamenco.TaskUpdate(echoCtx, taskID) // Check the saved task. - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, mockTask.UUID, statusChangedtask.UUID) assert.Equal(t, mockTask.UUID, actUpdatedTask.UUID) assert.Equal(t, mockTask.UUID, touchedTask.UUID) @@ -148,7 +149,7 @@ func TestTaskUpdateFailed(t *testing.T) { echoCtx := mf.prepareMockedJSONRequest(taskUpdate) requestWorkerStore(echoCtx, &worker) err := mf.flamenco.TaskUpdate(echoCtx, taskID) - assert.NoError(t, err) + require.NoError(t, err) assertResponseNoContent(t, echoCtx) } @@ -164,7 +165,7 @@ func TestTaskUpdateFailed(t *testing.T) { echoCtx := mf.prepareMockedJSONRequest(taskUpdate) requestWorkerStore(echoCtx, &worker) err := mf.flamenco.TaskUpdate(echoCtx, taskID) - assert.NoError(t, err) + require.NoError(t, err) assertResponseNoContent(t, echoCtx) } } @@ -248,7 +249,7 @@ func TestBlockingAfterFailure(t *testing.T) { echoCtx := mf.prepareMockedJSONRequest(taskUpdate) requestWorkerStore(echoCtx, &worker) err := mf.flamenco.TaskUpdate(echoCtx, taskID) - assert.NoError(t, err) + require.NoError(t, err) assertResponseNoContent(t, echoCtx) } @@ -279,7 +280,7 @@ func TestBlockingAfterFailure(t *testing.T) { echoCtx := mf.prepareMockedJSONRequest(taskUpdate) requestWorkerStore(echoCtx, &worker) err := mf.flamenco.TaskUpdate(echoCtx, taskID) - assert.NoError(t, err) + require.NoError(t, err) assertResponseNoContent(t, echoCtx) } @@ -314,7 +315,7 @@ func TestBlockingAfterFailure(t *testing.T) { echoCtx := mf.prepareMockedJSONRequest(taskUpdate) requestWorkerStore(echoCtx, &worker) err := mf.flamenco.TaskUpdate(echoCtx, taskID) - assert.NoError(t, err) + require.NoError(t, err) assertResponseNoContent(t, echoCtx) } } @@ -381,6 +382,6 @@ func TestJobFailureAfterWorkerTaskFailure(t *testing.T) { echoCtx := mf.prepareMockedJSONRequest(taskUpdate) requestWorkerStore(echoCtx, &worker) err := mf.flamenco.TaskUpdate(echoCtx, taskID) - assert.NoError(t, err) + require.NoError(t, err) assertResponseNoContent(t, echoCtx) } diff --git a/internal/manager/api_impl/workers_test.go b/internal/manager/api_impl/workers_test.go index c21d8c91..6340441a 100644 --- a/internal/manager/api_impl/workers_test.go +++ b/internal/manager/api_impl/workers_test.go @@ -12,6 +12,7 @@ import ( "github.com/golang/mock/gomock" "github.com/labstack/echo/v4" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" "projects.blender.org/studio/flamenco/internal/manager/config" "projects.blender.org/studio/flamenco/internal/manager/last_rendered" @@ -61,7 +62,7 @@ func TestTaskScheduleHappy(t *testing.T) { mf.broadcaster.EXPECT().BroadcastWorkerUpdate(gomock.Any()) err := mf.flamenco.ScheduleTask(echo) - assert.NoError(t, err) + require.NoError(t, err) // Check the response assignedTask := api.AssignedTask{ @@ -98,7 +99,7 @@ func TestTaskScheduleNoTaskAvailable(t *testing.T) { mf.persistence.EXPECT().WorkerSeen(bgCtx, &worker) err := mf.flamenco.ScheduleTask(echo) - assert.NoError(t, err) + require.NoError(t, err) assertResponseNoContent(t, echo) } @@ -119,7 +120,7 @@ func TestTaskScheduleNonActiveStatus(t *testing.T) { mf.persistence.EXPECT().WorkerSeen(bgCtx, &worker) err := mf.flamenco.ScheduleTask(echoCtx) - assert.NoError(t, err) + require.NoError(t, err) resp := getRecordedResponse(echoCtx) assert.Equal(t, http.StatusConflict, resp.StatusCode) @@ -142,7 +143,7 @@ func TestTaskScheduleOtherStatusRequested(t *testing.T) { mf.persistence.EXPECT().WorkerSeen(bgCtx, &worker) err := mf.flamenco.ScheduleTask(echoCtx) - assert.NoError(t, err) + require.NoError(t, err) expectBody := api.WorkerStateChange{StatusRequested: api.WorkerStatusAsleep} assertResponseJSON(t, echoCtx, http.StatusLocked, expectBody) @@ -169,7 +170,7 @@ func TestTaskScheduleOtherStatusRequestedAndBadState(t *testing.T) { mf.persistence.EXPECT().WorkerSeen(bgCtx, &worker) err := mf.flamenco.ScheduleTask(echoCtx) - assert.NoError(t, err) + require.NoError(t, err) expectBody := api.WorkerStateChange{StatusRequested: api.WorkerStatusAwake} assertResponseJSON(t, echoCtx, http.StatusLocked, expectBody) @@ -206,7 +207,7 @@ func TestWorkerSignOn(t *testing.T) { }) requestWorkerStore(echo, &worker) err := mf.flamenco.SignOn(echo) - assert.NoError(t, err) + require.NoError(t, err) assertResponseJSON(t, echo, http.StatusOK, api.WorkerStateChange{ StatusRequested: api.WorkerStatusAsleep, @@ -253,7 +254,7 @@ func TestWorkerSignoffTaskRequeue(t *testing.T) { }) err := mf.flamenco.SignOff(echo) - assert.NoError(t, err) + require.NoError(t, err) resp := getRecordedResponse(echo) assert.Equal(t, http.StatusNoContent, resp.StatusCode) @@ -292,7 +293,7 @@ func TestWorkerRememberPreviousStatus(t *testing.T) { echo := mf.prepareMockedRequest(nil) requestWorkerStore(echo, &worker) err := mf.flamenco.SignOff(echo) - assert.NoError(t, err) + require.NoError(t, err) assertResponseNoContent(t, echo) assert.Equal(t, api.WorkerStatusAwake, worker.StatusRequested) @@ -329,7 +330,7 @@ func TestWorkerDontRememberPreviousStatus(t *testing.T) { echo := mf.prepareMockedRequest(nil) requestWorkerStore(echo, &worker) err := mf.flamenco.SignOff(echo) - assert.NoError(t, err) + require.NoError(t, err) assertResponseNoContent(t, echo) } @@ -347,9 +348,8 @@ func TestWorkerState(t *testing.T) { echo := mf.prepareMockedRequest(nil) requestWorkerStore(echo, &worker) err := mf.flamenco.WorkerState(echo) - if assert.NoError(t, err) { - assertResponseNoContent(t, echo) - } + require.NoError(t, err) + assertResponseNoContent(t, echo) } // State change requested. @@ -361,11 +361,10 @@ func TestWorkerState(t *testing.T) { requestWorkerStore(echo, &worker) err := mf.flamenco.WorkerState(echo) - if assert.NoError(t, err) { - assertResponseJSON(t, echo, http.StatusOK, api.WorkerStateChange{ - StatusRequested: requestStatus, - }) - } + require.NoError(t, err) + assertResponseJSON(t, echo, http.StatusOK, api.WorkerStateChange{ + StatusRequested: requestStatus, + }) } } @@ -402,7 +401,7 @@ func TestWorkerStateChanged(t *testing.T) { }) requestWorkerStore(echo, &worker) err := mf.flamenco.WorkerStateChanged(echo) - assert.NoError(t, err) + require.NoError(t, err) assertResponseNoContent(t, echo) } @@ -445,7 +444,7 @@ func TestWorkerStateChangedAfterChangeRequest(t *testing.T) { }) requestWorkerStore(echo, &worker) err := mf.flamenco.WorkerStateChanged(echo) - assert.NoError(t, err) + require.NoError(t, err) assertResponseNoContent(t, echo) } @@ -475,7 +474,7 @@ func TestWorkerStateChangedAfterChangeRequest(t *testing.T) { }) requestWorkerStore(echo, &worker) err := mf.flamenco.WorkerStateChanged(echo) - assert.NoError(t, err) + require.NoError(t, err) assertResponseNoContent(t, echo) } } @@ -514,7 +513,7 @@ func TestMayWorkerRun(t *testing.T) { { echo := prepareRequest() err := mf.flamenco.MayWorkerRun(echo, task.UUID) - assert.NoError(t, err) + require.NoError(t, err) assertResponseJSON(t, echo, http.StatusOK, api.MayKeepRunning{ MayKeepRunning: false, Reason: "task not assigned to this worker", @@ -529,7 +528,7 @@ func TestMayWorkerRun(t *testing.T) { echo := prepareRequest() task.WorkerID = &worker.ID err := mf.flamenco.MayWorkerRun(echo, task.UUID) - assert.NoError(t, err) + require.NoError(t, err) assertResponseJSON(t, echo, http.StatusOK, api.MayKeepRunning{ MayKeepRunning: true, }) @@ -541,7 +540,7 @@ func TestMayWorkerRun(t *testing.T) { task.WorkerID = &worker.ID task.Status = api.TaskStatusCanceled err := mf.flamenco.MayWorkerRun(echo, task.UUID) - assert.NoError(t, err) + require.NoError(t, err) assertResponseJSON(t, echo, http.StatusOK, api.MayKeepRunning{ MayKeepRunning: false, Reason: "task is in non-runnable status \"canceled\"", @@ -555,7 +554,7 @@ func TestMayWorkerRun(t *testing.T) { task.WorkerID = &worker.ID task.Status = api.TaskStatusActive err := mf.flamenco.MayWorkerRun(echo, task.UUID) - assert.NoError(t, err) + require.NoError(t, err) assertResponseJSON(t, echo, http.StatusOK, api.MayKeepRunning{ MayKeepRunning: false, Reason: "worker status change requested", @@ -573,7 +572,7 @@ func TestMayWorkerRun(t *testing.T) { task.WorkerID = &worker.ID task.Status = api.TaskStatusActive err := mf.flamenco.MayWorkerRun(echo, task.UUID) - assert.NoError(t, err) + require.NoError(t, err) assertResponseJSON(t, echo, http.StatusOK, api.MayKeepRunning{ MayKeepRunning: true, }) @@ -618,7 +617,7 @@ func TestTaskOutputProduced(t *testing.T) { echo := prepareRequest(nil) err := mf.flamenco.TaskOutputProduced(echo, task.UUID) - assert.NoError(t, err) + require.NoError(t, err) assertResponseAPIError(t, echo, http.StatusLengthRequired, "Content-Length header required") } @@ -633,7 +632,7 @@ func TestTaskOutputProduced(t *testing.T) { echo := prepareRequest(bytes.NewReader(bodyBytes)) err := mf.flamenco.TaskOutputProduced(echo, task.UUID) - assert.NoError(t, err) + require.NoError(t, err) assertResponseAPIError(t, echo, http.StatusRequestEntityTooLarge, "image too large; should be max %v bytes", last_rendered.MaxImageSizeBytes) } @@ -648,7 +647,7 @@ func TestTaskOutputProduced(t *testing.T) { mf.lastRender.EXPECT().QueueImage(gomock.Any()).Return(last_rendered.ErrMimeTypeUnsupported) err := mf.flamenco.TaskOutputProduced(echo, task.UUID) - assert.NoError(t, err) + require.NoError(t, err) assertResponseAPIError(t, echo, http.StatusUnsupportedMediaType, `unsupported mime type "image/openexr"`) } @@ -661,7 +660,7 @@ func TestTaskOutputProduced(t *testing.T) { mf.lastRender.EXPECT().QueueImage(gomock.Any()).Return(last_rendered.ErrQueueFull) err := mf.flamenco.TaskOutputProduced(echo, task.UUID) - assert.NoError(t, err) + require.NoError(t, err) assertResponseAPIError(t, echo, http.StatusTooManyRequests, "image processing queue is full") } @@ -687,7 +686,7 @@ func TestTaskOutputProduced(t *testing.T) { }) err := mf.flamenco.TaskOutputProduced(echo, task.UUID) - assert.NoError(t, err) + require.NoError(t, err) assertResponseNoBody(t, echo, http.StatusAccepted) if assert.NotNil(t, actualPayload) { diff --git a/internal/manager/job_compilers/job_compilers_test.go b/internal/manager/job_compilers/job_compilers_test.go index c6abee44..430d8dbd 100644 --- a/internal/manager/job_compilers/job_compilers_test.go +++ b/internal/manager/job_compilers/job_compilers_test.go @@ -58,7 +58,7 @@ func exampleSubmittedJob() api.SubmittedJob { func mockedClock(t *testing.T) clock.Clock { c := clock.NewMock() now, err := time.ParseInLocation("2006-01-02T15:04:05", "2006-01-02T15:04:05", time.Local) - assert.NoError(t, err) + require.NoError(t, err) c.Set(now) return c } @@ -67,7 +67,7 @@ func TestSimpleBlenderRenderHappy(t *testing.T) { c := mockedClock(t) s, err := Load(c) - assert.NoError(t, err) + require.NoError(t, err) // Compiling a job should be really fast. ctx, cancel := context.WithTimeout(context.Background(), 10*time.Millisecond) @@ -172,7 +172,7 @@ func TestSimpleBlenderRenderWindowsPaths(t *testing.T) { c := mockedClock(t) s, err := Load(c) - assert.NoError(t, err) + require.NoError(t, err) // Compiling a job should be really fast. ctx, cancel := context.WithTimeout(context.Background(), 10*time.Millisecond) @@ -307,9 +307,8 @@ func TestEtag(t *testing.T) { { // Test without etag. aj, err := s.Compile(ctx, sj) - if assert.NoError(t, err, "job without etag should always be accepted") { - assert.NotNil(t, aj) - } + require.NoError(t, err, "job without etag should always be accepted") + assert.NotNil(t, aj) } { // Test with bad etag. @@ -321,9 +320,8 @@ func TestEtag(t *testing.T) { { // Test with correct etag. sj.TypeEtag = ptr(expectEtag) aj, err := s.Compile(ctx, sj) - if assert.NoError(t, err, "job with correct etag should be accepted") { - assert.NotNil(t, aj) - } + require.NoError(t, err, "job with correct etag should be accepted") + assert.NotNil(t, aj) } } diff --git a/internal/manager/job_compilers/js_globals_test.go b/internal/manager/job_compilers/js_globals_test.go index 9ce7eb06..e78b15d8 100644 --- a/internal/manager/job_compilers/js_globals_test.go +++ b/internal/manager/job_compilers/js_globals_test.go @@ -6,11 +6,12 @@ import ( "testing" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestFrameChunkerHappyBlenderStyle(t *testing.T) { chunks, err := jsFrameChunker("1..10,20..25,40,3..8", 4) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, []string{"1-4", "5-8", "9,10,20,21", "22-25", "40"}, chunks) } @@ -21,24 +22,24 @@ func TestFrameChunkerHappySmallInput(t *testing.T) { // Just one frame. chunks, err := jsFrameChunker("47", 4) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, []string{"47"}, chunks) // Just one range of exactly one chunk. chunks, err = jsFrameChunker("1-3", 3) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, []string{"1-3"}, chunks) } func TestFrameChunkerHappyRegularStyle(t *testing.T) { chunks, err := jsFrameChunker("1-10,20-25,40", 4) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, []string{"1-4", "5-8", "9,10,20,21", "22-25", "40"}, chunks) } func TestFrameChunkerHappyExtraWhitespace(t *testing.T) { chunks, err := jsFrameChunker(" 1 .. 10,\t20..25\n,40 ", 4) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, []string{"1-4", "5-8", "9,10,20,21", "22-25", "40"}, chunks) } @@ -50,7 +51,7 @@ func TestFrameChunkerUnhappy(t *testing.T) { func TestFrameRangeExplode(t *testing.T) { frames, err := frameRangeExplode("1..10,20..25,40") - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, []int{ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 20, 21, 22, 23, 24, 25, 40, diff --git a/internal/manager/job_compilers/scripts_test.go b/internal/manager/job_compilers/scripts_test.go index aee41e76..f7f7ec7f 100644 --- a/internal/manager/job_compilers/scripts_test.go +++ b/internal/manager/job_compilers/scripts_test.go @@ -8,12 +8,13 @@ import ( "github.com/rs/zerolog" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestLoadScriptsFrom_skip_nonjs(t *testing.T) { thisDirFS := os.DirFS(".") compilers, err := loadScriptsFrom(thisDirFS) - assert.NoError(t, err, "input without JS files should not cause errors") + require.NoError(t, err, "input without JS files should not cause errors") assert.Empty(t, compilers) } @@ -21,7 +22,7 @@ func TestLoadScriptsFrom_on_disk_js(t *testing.T) { scriptsFS := os.DirFS("scripts-for-unittest") compilers, err := loadScriptsFrom(scriptsFS) - assert.NoError(t, err) + require.NoError(t, err) expectKeys := map[string]bool{ "echo-and-sleep": true, "simple-blender-render": true, @@ -34,7 +35,7 @@ func TestLoadScriptsFrom_embedded(t *testing.T) { initEmbeddedFS() compilers, err := loadScriptsFrom(embeddedScriptsFS) - assert.NoError(t, err) + require.NoError(t, err) expectKeys := map[string]bool{ "echo-sleep-test": true, "simple-blender-render": true, @@ -48,7 +49,7 @@ func BenchmarkLoadScripts_fromEmbedded(b *testing.B) { for i := 0; i < b.N; i++ { compilers, err := loadScriptsFrom(embeddedScriptsFS) - assert.NoError(b, err) + require.NoError(b, err) assert.NotEmpty(b, compilers) } } @@ -59,7 +60,7 @@ func BenchmarkLoadScripts_fromDisk(b *testing.B) { onDiskFS := os.DirFS("scripts-for-unittest") for i := 0; i < b.N; i++ { compilers, err := loadScriptsFrom(onDiskFS) - assert.NoError(b, err) + require.NoError(b, err) assert.NotEmpty(b, compilers) } } diff --git a/internal/manager/job_deleter/job_deleter_test.go b/internal/manager/job_deleter/job_deleter_test.go index 770c45a8..c20d2c2d 100644 --- a/internal/manager/job_deleter/job_deleter_test.go +++ b/internal/manager/job_deleter/job_deleter_test.go @@ -9,6 +9,7 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" "projects.blender.org/studio/flamenco/internal/manager/job_deleter/mocks" "projects.blender.org/studio/flamenco/internal/manager/persistence" "projects.blender.org/studio/flamenco/pkg/shaman" @@ -32,16 +33,16 @@ func TestQueueJobDeletion(t *testing.T) { job1 := &persistence.Job{UUID: "2f7d910f-08a6-4b0f-8ecb-b3946939ed1b"} mocks.persist.EXPECT().RequestJobDeletion(mocks.ctx, job1) - assert.NoError(t, s.QueueJobDeletion(mocks.ctx, job1)) + require.NoError(t, s.QueueJobDeletion(mocks.ctx, job1)) // Call twice more to overflow the queue. job2 := &persistence.Job{UUID: "e8fbe41c-ed24-46df-ba63-8d4f5524071b"} mocks.persist.EXPECT().RequestJobDeletion(mocks.ctx, job2) - assert.NoError(t, s.QueueJobDeletion(mocks.ctx, job2)) + require.NoError(t, s.QueueJobDeletion(mocks.ctx, job2)) job3 := &persistence.Job{UUID: "deeab6ba-02cd-42c0-b7bc-2367a2f04c7d"} mocks.persist.EXPECT().RequestJobDeletion(mocks.ctx, job3) - assert.NoError(t, s.QueueJobDeletion(mocks.ctx, job3)) + require.NoError(t, s.QueueJobDeletion(mocks.ctx, job3)) if assert.Len(t, s.queue, 2, "the first two job UUID should be queued") { assert.Equal(t, job1.UUID, <-s.queue) @@ -111,7 +112,7 @@ func TestDeleteJobWithoutShaman(t *testing.T) { mocks.persist.EXPECT().DeleteJob(mocks.ctx, jobUUID) mocks.persist.EXPECT().RequestIntegrityCheck() mocks.broadcaster.EXPECT().BroadcastJobUpdate(gomock.Any()) - assert.NoError(t, s.deleteJob(mocks.ctx, jobUUID)) + require.NoError(t, s.deleteJob(mocks.ctx, jobUUID)) } func TestDeleteJobWithShaman(t *testing.T) { @@ -163,7 +164,7 @@ func TestDeleteJobWithShaman(t *testing.T) { mocks.persist.EXPECT().DeleteJob(mocks.ctx, jobUUID) mocks.persist.EXPECT().RequestIntegrityCheck() mocks.broadcaster.EXPECT().BroadcastJobUpdate(gomock.Any()) - assert.NoError(t, s.deleteJob(mocks.ctx, jobUUID)) + require.NoError(t, s.deleteJob(mocks.ctx, jobUUID)) } func jobDeleterTestFixtures(t *testing.T) (*Service, func(), *JobDeleterMocks) { diff --git a/internal/manager/last_rendered/last_rendered_test.go b/internal/manager/last_rendered/last_rendered_test.go index f06154c6..7e3142a2 100644 --- a/internal/manager/last_rendered/last_rendered_test.go +++ b/internal/manager/last_rendered/last_rendered_test.go @@ -10,6 +10,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" "projects.blender.org/studio/flamenco/internal/manager/local_storage" ) @@ -38,9 +39,9 @@ func TestQueueImage(t *testing.T) { defer storage.MustErase() lrp := New(storage) - assert.NoError(t, lrp.QueueImage(payload)) - assert.NoError(t, lrp.QueueImage(payload)) - assert.NoError(t, lrp.QueueImage(payload)) + require.NoError(t, lrp.QueueImage(payload)) + require.NoError(t, lrp.QueueImage(payload)) + require.NoError(t, lrp.QueueImage(payload)) assert.ErrorIs(t, lrp.QueueImage(payload), ErrQueueFull) } @@ -48,9 +49,7 @@ func TestProcessImage(t *testing.T) { // Load the test image. Note that this intentionally has an approximate 21:9 // ratio, whereas the thumbnail specs define a 16:9 ratio. imgBytes, err := os.ReadFile("last_rendered_test.jpg") - if !assert.NoError(t, err) { - t.FailNow() - } + require.NoError(t, err) jobID := "e078438b-c9f5-43e6-9e86-52f8be91dd12" payload := Payload{ @@ -87,15 +86,11 @@ func TestProcessImage(t *testing.T) { assertImageSize := func(spec Thumbspec) { path := filepath.Join(jobdir, spec.Filename) file, err := os.Open(path) - if !assert.NoError(t, err, "thumbnail %s should be openable", spec.Filename) { - return - } + require.NoError(t, err, "thumbnail %s should be openable", spec.Filename) defer file.Close() img, format, err := image.Decode(file) - if !assert.NoErrorf(t, err, "thumbnail %s should be decodable", spec.Filename) { - return - } + require.NoErrorf(t, err, "thumbnail %s should be decodable", spec.Filename) assert.Equalf(t, "jpeg", format, "thumbnail %s not written in the expected format", spec.Filename) assert.LessOrEqualf(t, img.Bounds().Dx(), spec.MaxWidth, "thumbnail %s has wrong width", spec.Filename) diff --git a/internal/manager/local_storage/local_storage_test.go b/internal/manager/local_storage/local_storage_test.go index 2d4dd36b..36696147 100644 --- a/internal/manager/local_storage/local_storage_test.go +++ b/internal/manager/local_storage/local_storage_test.go @@ -24,16 +24,14 @@ func TestNewNextToExe(t *testing.T) { func TestNewNextToExe_noSubdir(t *testing.T) { exePath, err := os.Executable() - if !assert.NoError(t, err) { - t.FailNow() - } + require.NoError(t, err) exeName := filepath.Base(exePath) // The filesystem in an empty "subdirectory" next to the executable should // contain the executable. si := NewNextToExe("") _, err = os.Stat(filepath.Join(si.rootPath, exeName)) - assert.NoErrorf(t, err, "should be able to stat this executable %s", exeName) + require.NoErrorf(t, err, "should be able to stat this executable %s", exeName) } func TestForJob(t *testing.T) { @@ -52,10 +50,10 @@ func TestErase(t *testing.T) { jobPath := si.ForJob("08e126ef-d773-468b-8bab-19a8213cf2ff") assert.NoDirExists(t, jobPath, "getting a path should not create it") - assert.NoError(t, os.MkdirAll(jobPath, os.ModePerm)) + require.NoError(t, os.MkdirAll(jobPath, os.ModePerm)) assert.DirExists(t, jobPath, "os.MkdirAll is borked") - assert.NoError(t, si.Erase()) + require.NoError(t, si.Erase()) assert.NoDirExists(t, si.rootPath, "Erase() should erase the root path, and everything in it") } @@ -66,13 +64,13 @@ func TestRemoveJobStorage(t *testing.T) { jobPath := si.ForJob(jobUUID) assert.NoDirExists(t, jobPath, "getting a path should not create it") - assert.NoError(t, os.MkdirAll(jobPath, os.ModePerm)) + require.NoError(t, os.MkdirAll(jobPath, os.ModePerm)) assert.DirExists(t, jobPath, "os.MkdirAll is borked") taskFile := filepath.Join(jobPath, "task-07c33f32-b345-4da9-8834-9c91532cd97e.txt") - assert.NoError(t, os.WriteFile(taskFile, []byte("dummy task log"), 0o777)) + require.NoError(t, os.WriteFile(taskFile, []byte("dummy task log"), 0o777)) - assert.NoError(t, si.RemoveJobStorage(context.Background(), jobUUID)) + require.NoError(t, si.RemoveJobStorage(context.Background(), jobUUID)) assert.NoDirExists(t, jobPath, "RemoveJobStorage() should erase the entire job-specific storage dir, and everything in it") // See if the test assumption (that job dir is in another sub-dir of the root, @@ -91,13 +89,13 @@ func TestRemoveJobStorageWithoutJobUUID(t *testing.T) { jobPath := si.ForJob("") assert.NoDirExists(t, jobPath, "getting a path should not create it") - assert.NoError(t, os.MkdirAll(jobPath, os.ModePerm)) + require.NoError(t, os.MkdirAll(jobPath, os.ModePerm)) assert.DirExists(t, jobPath, "os.MkdirAll is borked") taskFile := filepath.Join(jobPath, "task-07c33f32-b345-4da9-8834-9c91532cd97e.txt") - assert.NoError(t, os.WriteFile(taskFile, []byte("dummy task log"), 0o777)) + require.NoError(t, os.WriteFile(taskFile, []byte("dummy task log"), 0o777)) - assert.NoError(t, si.RemoveJobStorage(context.Background(), "")) + require.NoError(t, si.RemoveJobStorage(context.Background(), "")) assert.NoDirExists(t, jobPath, "RemoveJobStorage() should erase the entire job-specific storage dir, and everything in it") // See if the test assumption (that a jobless dir is directly inside the root) still holds. diff --git a/internal/manager/persistence/jobs_blocklist_test.go b/internal/manager/persistence/jobs_blocklist_test.go index d82a4092..436c5f18 100644 --- a/internal/manager/persistence/jobs_blocklist_test.go +++ b/internal/manager/persistence/jobs_blocklist_test.go @@ -18,11 +18,11 @@ func TestAddWorkerToJobBlocklist(t *testing.T) { { // Add a worker to the block list. err := db.AddWorkerToJobBlocklist(ctx, job, worker, "blender") - assert.NoError(t, err) + require.NoError(t, err) list := []JobBlock{} tx := db.gormDB.Model(&JobBlock{}).Scan(&list) - assert.NoError(t, tx.Error) + require.NoError(t, tx.Error) if assert.Len(t, list, 1) { entry := list[0] assert.Equal(t, entry.JobID, job.ID) @@ -34,11 +34,11 @@ func TestAddWorkerToJobBlocklist(t *testing.T) { { // Adding the same worker again should be a no-op. err := db.AddWorkerToJobBlocklist(ctx, job, worker, "blender") - assert.NoError(t, err) + require.NoError(t, err) list := []JobBlock{} tx := db.gormDB.Model(&JobBlock{}).Scan(&list) - assert.NoError(t, tx.Error) + require.NoError(t, tx.Error) assert.Len(t, list, 1, "No new entry should have been created") } } @@ -50,10 +50,10 @@ func TestFetchJobBlocklist(t *testing.T) { // Add a worker to the block list. worker := createWorker(ctx, t, db) err := db.AddWorkerToJobBlocklist(ctx, job, worker, "blender") - assert.NoError(t, err) + require.NoError(t, err) list, err := db.FetchJobBlocklist(ctx, job.UUID) - assert.NoError(t, err) + require.NoError(t, err) if assert.Len(t, list, 1) { entry := list[0] @@ -73,17 +73,17 @@ func TestClearJobBlocklist(t *testing.T) { // Add a worker and some entries to the block list. worker := createWorker(ctx, t, db) err := db.AddWorkerToJobBlocklist(ctx, job, worker, "blender") - assert.NoError(t, err) + require.NoError(t, err) err = db.AddWorkerToJobBlocklist(ctx, job, worker, "ffmpeg") - assert.NoError(t, err) + require.NoError(t, err) // Clear the blocklist. err = db.ClearJobBlocklist(ctx, job) - assert.NoError(t, err) + require.NoError(t, err) // Check that it is indeed empty. list, err := db.FetchJobBlocklist(ctx, job.UUID) - assert.NoError(t, err) + require.NoError(t, err) assert.Empty(t, list) } @@ -94,17 +94,17 @@ func TestRemoveFromJobBlocklist(t *testing.T) { // Add a worker and some entries to the block list. worker := createWorker(ctx, t, db) err := db.AddWorkerToJobBlocklist(ctx, job, worker, "blender") - assert.NoError(t, err) + require.NoError(t, err) err = db.AddWorkerToJobBlocklist(ctx, job, worker, "ffmpeg") - assert.NoError(t, err) + require.NoError(t, err) // Remove an entry. err = db.RemoveFromJobBlocklist(ctx, job.UUID, worker.UUID, "ffmpeg") - assert.NoError(t, err) + require.NoError(t, err) // Check that the other entry is still there. list, err := db.FetchJobBlocklist(ctx, job.UUID) - assert.NoError(t, err) + require.NoError(t, err) if assert.Len(t, list, 1) { entry := list[0] @@ -120,7 +120,7 @@ func TestWorkersLeftToRun(t *testing.T) { // No workers. left, err := db.WorkersLeftToRun(ctx, job, "blender") - assert.NoError(t, err) + require.NoError(t, err) assert.Empty(t, left) worker1 := createWorker(ctx, t, db) @@ -146,30 +146,27 @@ func TestWorkersLeftToRun(t *testing.T) { // Three workers, no blocklist. left, err = db.WorkersLeftToRun(ctx, job, "blender") - if assert.NoError(t, err) { - assert.Equal(t, uuidMap(worker1, worker2, workerC1), left) - } + require.NoError(t, err) + assert.Equal(t, uuidMap(worker1, worker2, workerC1), left) // Two workers, one blocked. _ = db.AddWorkerToJobBlocklist(ctx, job, worker1, "blender") left, err = db.WorkersLeftToRun(ctx, job, "blender") - if assert.NoError(t, err) { - assert.Equal(t, uuidMap(worker2, workerC1), left) - } + require.NoError(t, err) + assert.Equal(t, uuidMap(worker2, workerC1), left) // All workers blocked. _ = db.AddWorkerToJobBlocklist(ctx, job, worker2, "blender") _ = db.AddWorkerToJobBlocklist(ctx, job, workerC1, "blender") left, err = db.WorkersLeftToRun(ctx, job, "blender") - assert.NoError(t, err) + require.NoError(t, err) assert.Empty(t, left) // Two workers, unknown job. fakeJob := Job{Model: Model{ID: 327}} left, err = db.WorkersLeftToRun(ctx, &fakeJob, "blender") - if assert.NoError(t, err) { - assert.Equal(t, uuidMap(worker1, worker2, workerC1), left) - } + require.NoError(t, err) + assert.Equal(t, uuidMap(worker1, worker2, workerC1), left) } func TestWorkersLeftToRunWithTags(t *testing.T) { @@ -233,7 +230,7 @@ func TestWorkersLeftToRunWithTags(t *testing.T) { // All taged workers blocked. _ = db.AddWorkerToJobBlocklist(ctx, job, workerC13, "blender") left, err = db.WorkersLeftToRun(ctx, job, "blender") - assert.NoError(t, err) + require.NoError(t, err) assert.Empty(t, left) } @@ -261,25 +258,21 @@ func TestCountTaskFailuresOfWorker(t *testing.T) { // Multiple failures. numBlender1, err := db.CountTaskFailuresOfWorker(ctx, dbJob, worker1, "blender") - if assert.NoError(t, err) { - assert.Equal(t, 2, numBlender1) - } + require.NoError(t, err) + assert.Equal(t, 2, numBlender1) // Single failure, but multiple tasks exist of this type. numBlender2, err := db.CountTaskFailuresOfWorker(ctx, dbJob, worker2, "blender") - if assert.NoError(t, err) { - assert.Equal(t, 1, numBlender2) - } + require.NoError(t, err) + assert.Equal(t, 1, numBlender2) // Single failure, only one task of this type exists. numFFMpeg1, err := db.CountTaskFailuresOfWorker(ctx, dbJob, worker1, "ffmpeg") - if assert.NoError(t, err) { - assert.Equal(t, 1, numFFMpeg1) - } + require.NoError(t, err) + assert.Equal(t, 1, numFFMpeg1) // No failure. numFFMpeg2, err := db.CountTaskFailuresOfWorker(ctx, dbJob, worker2, "ffmpeg") - if assert.NoError(t, err) { - assert.Equal(t, 0, numFFMpeg2) - } + require.NoError(t, err) + assert.Equal(t, 0, numFFMpeg2) } diff --git a/internal/manager/persistence/jobs_query_test.go b/internal/manager/persistence/jobs_query_test.go index ad0848fb..87983dc9 100644 --- a/internal/manager/persistence/jobs_query_test.go +++ b/internal/manager/persistence/jobs_query_test.go @@ -29,14 +29,14 @@ func TestSimpleQuery(t *testing.T) { result, err := db.QueryJobs(ctx, api.JobsQuery{ StatusIn: &[]api.JobStatus{api.JobStatusActive, api.JobStatusCanceled}, }) - assert.NoError(t, err) + require.NoError(t, err) assert.Len(t, result, 0) // Check job was returned properly on correct status. result, err = db.QueryJobs(ctx, api.JobsQuery{ StatusIn: &[]api.JobStatus{api.JobStatusUnderConstruction, api.JobStatusCanceled}, }) - assert.NoError(t, err) + require.NoError(t, err) if !assert.Len(t, result, 1) { t.FailNow() } @@ -68,7 +68,7 @@ func TestQueryMetadata(t *testing.T) { AdditionalProperties: map[string]string{ "project": "Secret Future Project", }}}) - assert.NoError(t, err) + require.NoError(t, err) assert.Len(t, result, 0) // Check job was returned properly when querying for the right project. @@ -77,7 +77,7 @@ func TestQueryMetadata(t *testing.T) { AdditionalProperties: map[string]string{ "project": testJob.Metadata["project"], }}}) - assert.NoError(t, err) + require.NoError(t, err) if !assert.Len(t, result, 1) { t.FailNow() } @@ -89,7 +89,7 @@ func TestQueryMetadata(t *testing.T) { AdditionalProperties: map[string]string{ "project": otherJob.Metadata["project"], }}}) - assert.NoError(t, err) + require.NoError(t, err) if !assert.Len(t, result, 1) { t.FailNow() } @@ -100,7 +100,7 @@ func TestQueryMetadata(t *testing.T) { OrderBy: &[]string{"status"}, Metadata: &api.JobsQuery_Metadata{AdditionalProperties: map[string]string{}}, }) - assert.NoError(t, err) + require.NoError(t, err) if !assert.Len(t, result, 2) { t.FailNow() } @@ -132,12 +132,12 @@ func TestQueryJobTaskSummaries(t *testing.T) { // Sanity check for the above code, there should be 6 tasks overall, 3 per job. var numTasks int64 tx := db.gormDB.Model(&Task{}).Count(&numTasks) - assert.NoError(t, tx.Error) + require.NoError(t, tx.Error) assert.Equal(t, int64(6), numTasks) // Get the task summaries of a particular job. summaries, err := db.QueryJobTaskSummaries(ctx, job.UUID) - assert.NoError(t, err) + require.NoError(t, err) assert.Len(t, summaries, len(expectTaskUUIDs)) for _, summary := range summaries { diff --git a/internal/manager/persistence/jobs_test.go b/internal/manager/persistence/jobs_test.go index 5fbc9f9c..d77c5d9e 100644 --- a/internal/manager/persistence/jobs_test.go +++ b/internal/manager/persistence/jobs_test.go @@ -24,10 +24,10 @@ func TestStoreAuthoredJob(t *testing.T) { job := createTestAuthoredJobWithTasks() err := db.StoreAuthoredJob(ctx, job) - assert.NoError(t, err) + require.NoError(t, err) fetchedJob, err := db.FetchJob(ctx, job.JobID) - assert.NoError(t, err) + require.NoError(t, err) assert.NotNil(t, fetchedJob) // Test contents of fetched job @@ -43,10 +43,10 @@ func TestStoreAuthoredJob(t *testing.T) { // Fetch tasks of job. var dbJob Job tx := db.gormDB.Where(&Job{UUID: job.JobID}).Find(&dbJob) - assert.NoError(t, tx.Error) + require.NoError(t, tx.Error) var tasks []Task tx = db.gormDB.Where("job_id = ?", dbJob.ID).Find(&tasks) - assert.NoError(t, tx.Error) + require.NoError(t, tx.Error) if len(tasks) != 3 { t.Fatalf("expected 3 tasks, got %d", len(tasks)) @@ -170,7 +170,7 @@ func TestDeleteJobWithoutFK(t *testing.T) { // Test the deletion did not happen. _, err = db.FetchJob(ctx, authJob.JobID) - assert.NoError(t, err, "job should not have been deleted") + require.NoError(t, err, "job should not have been deleted") } func TestRequestJobDeletion(t *testing.T) { @@ -185,20 +185,20 @@ func TestRequestJobDeletion(t *testing.T) { db.gormDB.NowFunc = func() time.Time { return mockNow } err := db.RequestJobDeletion(ctx, job1) - assert.NoError(t, err) + require.NoError(t, err) assert.True(t, job1.DeleteRequested()) assert.True(t, job1.DeleteRequestedAt.Valid) assert.Equal(t, job1.DeleteRequestedAt.Time, mockNow) dbJob1, err := db.FetchJob(ctx, job1.UUID) - assert.NoError(t, err) + require.NoError(t, err) assert.True(t, job1.DeleteRequested()) assert.True(t, dbJob1.DeleteRequestedAt.Valid) assert.WithinDuration(t, mockNow, dbJob1.DeleteRequestedAt.Time, time.Second) // Other jobs shouldn't be touched. dbJob2, err := db.FetchJob(ctx, authoredJob2.JobID) - assert.NoError(t, err) + require.NoError(t, err) assert.False(t, dbJob2.DeleteRequested()) assert.False(t, dbJob2.DeleteRequestedAt.Valid) } @@ -228,7 +228,7 @@ func TestRequestJobMassDeletion(t *testing.T) { timeOfDeleteRequest := origGormNow() db.gormDB.NowFunc = func() time.Time { return timeOfDeleteRequest } uuids, err := db.RequestJobMassDeletion(ctx, job3.UpdatedAt) - assert.NoError(t, err) + require.NoError(t, err) db.gormDB.NowFunc = origGormNow @@ -301,14 +301,14 @@ func TestFetchJobsDeletionRequested(t *testing.T) { } err := db.RequestJobDeletion(ctx, job1) - assert.NoError(t, err) + require.NoError(t, err) err = db.RequestJobDeletion(ctx, job2) - assert.NoError(t, err) + require.NoError(t, err) err = db.RequestJobDeletion(ctx, job3) - assert.NoError(t, err) + require.NoError(t, err) actualUUIDs, err := db.FetchJobsDeletionRequested(ctx) - assert.NoError(t, err) + require.NoError(t, err) assert.Len(t, actualUUIDs, 3, "3 out of 4 jobs were marked for deletion") // Expect UUIDs in chronological order of deletion requests, so that the @@ -322,11 +322,11 @@ func TestJobHasTasksInStatus(t *testing.T) { defer close() hasTasks, err := db.JobHasTasksInStatus(ctx, job, api.TaskStatusQueued) - assert.NoError(t, err) + require.NoError(t, err) assert.True(t, hasTasks, "expected freshly-created job to have queued tasks") hasTasks, err = db.JobHasTasksInStatus(ctx, job, api.TaskStatusActive) - assert.NoError(t, err) + require.NoError(t, err) assert.False(t, hasTasks, "expected freshly-created job to have no active tasks") } @@ -335,28 +335,28 @@ func TestCountTasksOfJobInStatus(t *testing.T) { defer close() numQueued, numTotal, err := db.CountTasksOfJobInStatus(ctx, job, api.TaskStatusQueued) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, 3, numQueued) assert.Equal(t, 3, numTotal) // Make one task failed. task, err := db.FetchTask(ctx, authoredJob.Tasks[0].UUID) - assert.NoError(t, err) + require.NoError(t, err) task.Status = api.TaskStatusFailed - assert.NoError(t, db.SaveTask(ctx, task)) + require.NoError(t, db.SaveTask(ctx, task)) numQueued, numTotal, err = db.CountTasksOfJobInStatus(ctx, job, api.TaskStatusQueued) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, 2, numQueued) assert.Equal(t, 3, numTotal) numFailed, numTotal, err := db.CountTasksOfJobInStatus(ctx, job, api.TaskStatusFailed) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, 1, numFailed) assert.Equal(t, 3, numTotal) numActive, numTotal, err := db.CountTasksOfJobInStatus(ctx, job, api.TaskStatusActive) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, 0, numActive) assert.Equal(t, 3, numTotal) } @@ -370,7 +370,7 @@ func TestCheckIfJobsHoldLargeNumOfTasks(t *testing.T) { defer close() numQueued, numTotal, err := db.CountTasksOfJobInStatus(ctx, job, api.TaskStatusQueued) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, numtasks, numQueued) assert.Equal(t, numtasks, numTotal) @@ -392,22 +392,22 @@ func TestFetchJobsInStatus(t *testing.T) { // Query single status jobs, err := db.FetchJobsInStatus(ctx, api.JobStatusUnderConstruction) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, []*Job{job1, job2, job3}, jobs) // Query two statuses, where only one matches all jobs. jobs, err = db.FetchJobsInStatus(ctx, api.JobStatusCanceled, api.JobStatusUnderConstruction) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, []*Job{job1, job2, job3}, jobs) // Update a job status, query for two of the three used statuses. job1.Status = api.JobStatusQueued - assert.NoError(t, db.SaveJobStatus(ctx, job1)) + require.NoError(t, db.SaveJobStatus(ctx, job1)) job2.Status = api.JobStatusRequeueing - assert.NoError(t, db.SaveJobStatus(ctx, job2)) + require.NoError(t, db.SaveJobStatus(ctx, job2)) jobs, err = db.FetchJobsInStatus(ctx, api.JobStatusQueued, api.JobStatusUnderConstruction) - assert.NoError(t, err) + require.NoError(t, err) if assert.Len(t, jobs, 2) { assert.Equal(t, job1.UUID, jobs[0].UUID) assert.Equal(t, job3.UUID, jobs[1].UUID) @@ -419,35 +419,33 @@ func TestFetchTasksOfJobInStatus(t *testing.T) { defer close() allTasks, err := db.FetchTasksOfJob(ctx, job) - if !assert.NoError(t, err) { - return - } + require.NoError(t, err) assert.Equal(t, job, allTasks[0].Job, "FetchTasksOfJob should set job pointer") tasks, err := db.FetchTasksOfJobInStatus(ctx, job, api.TaskStatusQueued) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, allTasks, tasks) assert.Equal(t, job, tasks[0].Job, "FetchTasksOfJobInStatus should set job pointer") // Make one task failed. task, err := db.FetchTask(ctx, authoredJob.Tasks[0].UUID) - assert.NoError(t, err) + require.NoError(t, err) task.Status = api.TaskStatusFailed - assert.NoError(t, db.SaveTask(ctx, task)) + require.NoError(t, db.SaveTask(ctx, task)) tasks, err = db.FetchTasksOfJobInStatus(ctx, job, api.TaskStatusQueued) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, []*Task{allTasks[1], allTasks[2]}, tasks) // Check the failed task. This cannot directly compare to `allTasks[0]` // because saving the task above changed some of its fields. tasks, err = db.FetchTasksOfJobInStatus(ctx, job, api.TaskStatusFailed) - assert.NoError(t, err) + require.NoError(t, err) assert.Len(t, tasks, 1) assert.Equal(t, allTasks[0].ID, tasks[0].ID) tasks, err = db.FetchTasksOfJobInStatus(ctx, job, api.TaskStatusActive) - assert.NoError(t, err) + require.NoError(t, err) assert.Empty(t, tasks) } @@ -456,10 +454,10 @@ func TestTaskAssignToWorker(t *testing.T) { defer close() task, err := db.FetchTask(ctx, authoredJob.Tasks[1].UUID) - assert.NoError(t, err) + require.NoError(t, err) w := createWorker(ctx, t, db) - assert.NoError(t, db.TaskAssignToWorker(ctx, task, w)) + require.NoError(t, db.TaskAssignToWorker(ctx, task, w)) if task.Worker == nil { t.Error("task.Worker == nil") @@ -478,20 +476,20 @@ func TestFetchTasksOfWorkerInStatus(t *testing.T) { defer close() task, err := db.FetchTask(ctx, authoredJob.Tasks[1].UUID) - assert.NoError(t, err) + require.NoError(t, err) w := createWorker(ctx, t, db) - assert.NoError(t, db.TaskAssignToWorker(ctx, task, w)) + require.NoError(t, db.TaskAssignToWorker(ctx, task, w)) tasks, err := db.FetchTasksOfWorkerInStatus(ctx, w, task.Status) - assert.NoError(t, err) + require.NoError(t, err) assert.Len(t, tasks, 1, "worker should have one task in status %q", task.Status) assert.Equal(t, task.ID, tasks[0].ID) assert.Equal(t, task.UUID, tasks[0].UUID) assert.NotEqual(t, api.TaskStatusCanceled, task.Status) tasks, err = db.FetchTasksOfWorkerInStatus(ctx, w, api.TaskStatusCanceled) - assert.NoError(t, err) + require.NoError(t, err) assert.Empty(t, tasks, "worker should have no task in status %q", w) } @@ -500,16 +498,16 @@ func TestTaskTouchedByWorker(t *testing.T) { defer close() task, err := db.FetchTask(ctx, authoredJob.Tasks[1].UUID) - assert.NoError(t, err) + require.NoError(t, err) assert.True(t, task.LastTouchedAt.IsZero()) now := db.gormDB.NowFunc() err = db.TaskTouchedByWorker(ctx, task) - assert.NoError(t, err) + require.NoError(t, err) // Test the task instance as well as the database entry. dbTask, err := db.FetchTask(ctx, task.UUID) - assert.NoError(t, err) + require.NoError(t, err) assert.WithinDuration(t, now, task.LastTouchedAt, time.Second) assert.WithinDuration(t, now, dbTask.LastTouchedAt, time.Second) } @@ -519,7 +517,7 @@ func TestAddWorkerToTaskFailedList(t *testing.T) { defer close() task, err := db.FetchTask(ctx, authoredJob.Tasks[1].UUID) - assert.NoError(t, err) + require.NoError(t, err) worker1 := createWorker(ctx, t, db) @@ -528,30 +526,30 @@ func TestAddWorkerToTaskFailedList(t *testing.T) { newWorker.ID = 0 newWorker.UUID = "89ed2b02-b51b-4cd4-b44a-4a1c8d01db85" newWorker.Name = "Worker 2" - assert.NoError(t, db.SaveWorker(ctx, &newWorker)) + require.NoError(t, db.SaveWorker(ctx, &newWorker)) worker2, err := db.FetchWorker(ctx, newWorker.UUID) - assert.NoError(t, err) + require.NoError(t, err) // First failure should be registered just fine. numFailed, err := db.AddWorkerToTaskFailedList(ctx, task, worker1) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, 1, numFailed) // Calling again should be a no-op and not cause any errors. numFailed, err = db.AddWorkerToTaskFailedList(ctx, task, worker1) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, 1, numFailed) // Another worker should be able to fail this task as well. numFailed, err = db.AddWorkerToTaskFailedList(ctx, task, worker2) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, 2, numFailed) // Deleting the task should also delete the failures. - assert.NoError(t, db.DeleteJob(ctx, authoredJob.JobID)) + require.NoError(t, db.DeleteJob(ctx, authoredJob.JobID)) var num int64 tx := db.gormDB.Model(&TaskFailure{}).Count(&num) - assert.NoError(t, tx.Error) + require.NoError(t, tx.Error) assert.Zero(t, num) } @@ -569,9 +567,9 @@ func TestClearFailureListOfTask(t *testing.T) { newWorker.ID = 0 newWorker.UUID = "89ed2b02-b51b-4cd4-b44a-4a1c8d01db85" newWorker.Name = "Worker 2" - assert.NoError(t, db.SaveWorker(ctx, &newWorker)) + require.NoError(t, db.SaveWorker(ctx, &newWorker)) worker2, err := db.FetchWorker(ctx, newWorker.UUID) - assert.NoError(t, err) + require.NoError(t, err) // Store some failures for different tasks. _, _ = db.AddWorkerToTaskFailedList(ctx, task1, worker1) @@ -579,10 +577,10 @@ func TestClearFailureListOfTask(t *testing.T) { _, _ = db.AddWorkerToTaskFailedList(ctx, task2, worker1) // Clearing should just update this one task. - assert.NoError(t, db.ClearFailureListOfTask(ctx, task1)) + require.NoError(t, db.ClearFailureListOfTask(ctx, task1)) var failures = []TaskFailure{} tx := db.gormDB.Model(&TaskFailure{}).Scan(&failures) - assert.NoError(t, tx.Error) + require.NoError(t, tx.Error) if assert.Len(t, failures, 1) { assert.Equal(t, task2.ID, failures[0].TaskID) assert.Equal(t, worker1.ID, failures[0].WorkerID) @@ -615,10 +613,10 @@ func TestClearFailureListOfJob(t *testing.T) { assert.Equal(t, 5, countTaskFailures(db)) // Clearing should be limited to the given job. - assert.NoError(t, db.ClearFailureListOfJob(ctx, dbJob1)) + require.NoError(t, db.ClearFailureListOfJob(ctx, dbJob1)) var failures = []TaskFailure{} tx := db.gormDB.Model(&TaskFailure{}).Scan(&failures) - assert.NoError(t, tx.Error) + require.NoError(t, tx.Error) if assert.Len(t, failures, 2) { assert.Equal(t, task2_1.ID, failures[0].TaskID) assert.Equal(t, worker1.ID, failures[0].WorkerID) @@ -634,7 +632,7 @@ func TestFetchTaskFailureList(t *testing.T) { // Test with non-existing task. fakeTask := Task{Model: Model{ID: 327}} failures, err := db.FetchTaskFailureList(ctx, &fakeTask) - assert.NoError(t, err) + require.NoError(t, err) assert.Empty(t, failures) task1_1, _ := db.FetchTask(ctx, authoredJob1.Tasks[1].UUID) @@ -642,7 +640,7 @@ func TestFetchTaskFailureList(t *testing.T) { // Test without failures. failures, err = db.FetchTaskFailureList(ctx, task1_1) - assert.NoError(t, err) + require.NoError(t, err) assert.Empty(t, failures) worker1 := createWorker(ctx, t, db) @@ -655,7 +653,7 @@ func TestFetchTaskFailureList(t *testing.T) { // Fetch one task's failure list. failures, err = db.FetchTaskFailureList(ctx, task1_1) - assert.NoError(t, err) + require.NoError(t, err) if assert.Len(t, failures, 2) { assert.Equal(t, worker1.UUID, failures[0].UUID) @@ -854,7 +852,7 @@ func createWorker(ctx context.Context, t *testing.T, db *DB, updaters ...func(*W if err != nil { t.Fatalf("error creating worker: %v", err) } - assert.NoError(t, err) + require.NoError(t, err) fetchedWorker, err := db.FetchWorker(ctx, w.UUID) if err != nil { @@ -874,14 +872,10 @@ func createWorkerFrom(ctx context.Context, t *testing.T, db *DB, worker Worker) worker.Name += " (copy)" err := db.SaveWorker(ctx, &worker) - if !assert.NoError(t, err) { - t.FailNow() - } + require.NoError(t, err) dbWorker, err := db.FetchWorker(ctx, worker.UUID) - if !assert.NoError(t, err) { - t.FailNow() - } + require.NoError(t, err) return dbWorker } diff --git a/internal/manager/persistence/last_rendered_test.go b/internal/manager/persistence/last_rendered_test.go index c8cca7f4..adc10a5f 100644 --- a/internal/manager/persistence/last_rendered_test.go +++ b/internal/manager/persistence/last_rendered_test.go @@ -6,6 +6,7 @@ import ( "testing" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestSetLastRendered(t *testing.T) { @@ -15,7 +16,7 @@ func TestSetLastRendered(t *testing.T) { authoredJob2 := authorTestJob("1295757b-e668-4c49-8b89-f73db8270e42", "just-a-job") job2 := persistAuthoredJob(t, ctx, db, authoredJob2) - assert.NoError(t, db.SetLastRendered(ctx, job1)) + require.NoError(t, db.SetLastRendered(ctx, job1)) { entries := []LastRendered{} db.gormDB.Model(&LastRendered{}).Scan(&entries) @@ -24,7 +25,7 @@ func TestSetLastRendered(t *testing.T) { } } - assert.NoError(t, db.SetLastRendered(ctx, job2)) + require.NoError(t, db.SetLastRendered(ctx, job2)) { entries := []LastRendered{} db.gormDB.Model(&LastRendered{}).Scan(&entries) @@ -41,18 +42,16 @@ func TestGetLastRenderedJobUUID(t *testing.T) { { // Test without any renders. lastUUID, err := db.GetLastRenderedJobUUID(ctx) - if assert.NoError(t, err, "absence of renders should not cause an error") { - assert.Empty(t, lastUUID) - } + require.NoError(t, err, "absence of renders should not cause an error") + assert.Empty(t, lastUUID) } { // Test with first render. - assert.NoError(t, db.SetLastRendered(ctx, job1)) + require.NoError(t, db.SetLastRendered(ctx, job1)) lastUUID, err := db.GetLastRenderedJobUUID(ctx) - if assert.NoError(t, err) { - assert.Equal(t, job1.UUID, lastUUID) - } + require.NoError(t, err) + assert.Equal(t, job1.UUID, lastUUID) } { @@ -60,10 +59,9 @@ func TestGetLastRenderedJobUUID(t *testing.T) { authoredJob2 := authorTestJob("1295757b-e668-4c49-8b89-f73db8270e42", "just-a-job") job2 := persistAuthoredJob(t, ctx, db, authoredJob2) - assert.NoError(t, db.SetLastRendered(ctx, job2)) + require.NoError(t, db.SetLastRendered(ctx, job2)) lastUUID, err := db.GetLastRenderedJobUUID(ctx) - if assert.NoError(t, err) { - assert.Equal(t, job2.UUID, lastUUID) - } + require.NoError(t, err) + assert.Equal(t, job2.UUID, lastUUID) } } diff --git a/internal/manager/persistence/task_scheduler_test.go b/internal/manager/persistence/task_scheduler_test.go index 289524a1..1d0ae355 100644 --- a/internal/manager/persistence/task_scheduler_test.go +++ b/internal/manager/persistence/task_scheduler_test.go @@ -26,7 +26,7 @@ func TestNoTasks(t *testing.T) { task, err := db.ScheduleTask(ctx, &w) assert.Nil(t, task) - assert.NoError(t, err) + require.NoError(t, err) } func TestOneJobOneTask(t *testing.T) { @@ -40,7 +40,7 @@ func TestOneJobOneTask(t *testing.T) { job := constructTestJob(ctx, t, db, atj) task, err := db.ScheduleTask(ctx, &w) - assert.NoError(t, err) + require.NoError(t, err) // Check the returned task. if task == nil { @@ -55,7 +55,7 @@ func TestOneJobOneTask(t *testing.T) { // Check the task in the database. now := db.gormDB.NowFunc() dbTask, err := db.FetchTask(context.Background(), authTask.UUID) - assert.NoError(t, err) + require.NoError(t, err) if dbTask == nil { t.Fatal("task cannot be fetched from database") } @@ -84,7 +84,7 @@ func TestOneJobThreeTasksByPrio(t *testing.T) { job := constructTestJob(ctx, t, db, atj) task, err := db.ScheduleTask(ctx, &w) - assert.NoError(t, err) + require.NoError(t, err) if task == nil { t.Fatal("task is nil") } @@ -115,7 +115,7 @@ func TestOneJobThreeTasksByDependencies(t *testing.T) { job := constructTestJob(ctx, t, db, atj) task, err := db.ScheduleTask(ctx, &w) - assert.NoError(t, err) + require.NoError(t, err) if task == nil { t.Fatal("task is nil") } @@ -155,7 +155,7 @@ func TestTwoJobsThreeTasks(t *testing.T) { job2 := constructTestJob(ctx, t, db, atj2) task, err := db.ScheduleTask(ctx, &w) - assert.NoError(t, err) + require.NoError(t, err) if task == nil { t.Fatal("task is nil") } @@ -183,7 +183,7 @@ func TestSomeButNotAllDependenciesCompleted(t *testing.T) { w := linuxWorker(t, db) task, err := db.ScheduleTask(ctx, &w) - assert.NoError(t, err) + require.NoError(t, err) if task != nil { t.Fatalf("there should not be any task assigned, but received %q", task.Name) } @@ -210,14 +210,14 @@ func TestAlreadyAssigned(t *testing.T) { // This should make it get returned by the scheduler, even when there is // another, higher-prio task to be done. dbTask3, err := db.FetchTask(ctx, att3.UUID) - assert.NoError(t, err) + require.NoError(t, err) dbTask3.WorkerID = &w.ID dbTask3.Status = api.TaskStatusActive err = db.SaveTask(ctx, dbTask3) - assert.NoError(t, err) + require.NoError(t, err) task, err := db.ScheduleTask(ctx, &w) - assert.NoError(t, err) + require.NoError(t, err) if task == nil { t.Fatal("task is nil") } @@ -245,14 +245,14 @@ func TestAssignedToOtherWorker(t *testing.T) { // Assign the high-prio task to the other worker. Because the task is queued, // it shouldn't matter which worker it's assigned to. dbTask2, err := db.FetchTask(ctx, att2.UUID) - assert.NoError(t, err) + require.NoError(t, err) dbTask2.WorkerID = &w2.ID dbTask2.Status = api.TaskStatusQueued err = db.SaveTask(ctx, dbTask2) - assert.NoError(t, err) + require.NoError(t, err) task, err := db.ScheduleTask(ctx, &w) - assert.NoError(t, err) + require.NoError(t, err) if task == nil { t.Fatal("task is nil") } @@ -277,14 +277,14 @@ func TestPreviouslyFailed(t *testing.T) { // Mimick that this worker already failed the first task. tasks, err := db.FetchTasksOfJob(ctx, job) - assert.NoError(t, err) + require.NoError(t, err) numFailed, err := db.AddWorkerToTaskFailedList(ctx, tasks[0], &w) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, 1, numFailed) // This should assign the 2nd task. task, err := db.ScheduleTask(ctx, &w) - assert.NoError(t, err) + require.NoError(t, err) if task == nil { t.Fatal("task is nil") } @@ -391,11 +391,11 @@ func TestBlocklisted(t *testing.T) { // Mimick that this worker was already blocked for 'blender' tasks of this job. err := db.AddWorkerToJobBlocklist(ctx, job, &w, "blender") - assert.NoError(t, err) + require.NoError(t, err) // This should assign the 2nd task. task, err := db.ScheduleTask(ctx, &w) - assert.NoError(t, err) + require.NoError(t, err) if task == nil { t.Fatal("task is nil") } diff --git a/internal/manager/persistence/time_of_day_test.go b/internal/manager/persistence/time_of_day_test.go index 01a46876..f4b27f33 100644 --- a/internal/manager/persistence/time_of_day_test.go +++ b/internal/manager/persistence/time_of_day_test.go @@ -7,6 +7,7 @@ import ( "time" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) var emptyToD = TimeOfDay{timeOfDayNoValue, timeOfDayNoValue} @@ -60,53 +61,56 @@ func TestOnDate(t *testing.T) { } func TestValue(t *testing.T) { - // Test zero -> "00:00" - tod := TimeOfDay{} - if value, err := tod.Value(); assert.NoError(t, err) { + { // Test zero -> "00:00" + tod := TimeOfDay{} + value, err := tod.Value() + require.NoError(t, err) assert.Equal(t, "00:00", value) } - // Test 22:47 -> "22:47" - tod = TimeOfDay{22, 47} - if value, err := tod.Value(); assert.NoError(t, err) { + { // Test 22:47 -> "22:47" + tod := TimeOfDay{22, 47} + value, err := tod.Value() + require.NoError(t, err) assert.Equal(t, "22:47", value) } - // Test empty -> "" - tod = emptyToD - if value, err := tod.Value(); assert.NoError(t, err) { + { // Test empty -> "" + tod := emptyToD + value, err := tod.Value() + require.NoError(t, err) assert.Equal(t, "", value) } } func TestScan(t *testing.T) { - // Test zero -> empty - tod := TimeOfDay{} - if assert.NoError(t, tod.Scan("")) { + { // Test zero -> empty + tod := TimeOfDay{} + require.NoError(t, tod.Scan("")) assert.Equal(t, emptyToD, tod) } - // Test 22:47 -> empty - tod = TimeOfDay{22, 47} - if assert.NoError(t, tod.Scan("")) { + { // Test 22:47 -> empty + tod := TimeOfDay{22, 47} + require.NoError(t, tod.Scan("")) assert.Equal(t, emptyToD, tod) } - // Test 22:47 -> 12:34 - tod = TimeOfDay{22, 47} - if assert.NoError(t, tod.Scan("12:34")) { + { // Test 22:47 -> 12:34 + tod := TimeOfDay{22, 47} + require.NoError(t, tod.Scan("12:34")) assert.Equal(t, TimeOfDay{12, 34}, tod) } - // Test empty -> empty - tod = emptyToD - if assert.NoError(t, tod.Scan("")) { + { // Test empty -> empty + tod := emptyToD + require.NoError(t, tod.Scan("")) assert.Equal(t, emptyToD, tod) } - // Test empty -> 12:34 - tod = emptyToD - if assert.NoError(t, tod.Scan("12:34")) { + { // Test empty -> 12:34 + tod := emptyToD + require.NoError(t, tod.Scan("12:34")) assert.Equal(t, TimeOfDay{12, 34}, tod) } } diff --git a/internal/manager/persistence/timeout_test.go b/internal/manager/persistence/timeout_test.go index b2b2f95d..1ddb2435 100644 --- a/internal/manager/persistence/timeout_test.go +++ b/internal/manager/persistence/timeout_test.go @@ -5,6 +5,7 @@ import ( "time" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" "projects.blender.org/studio/flamenco/pkg/api" ) @@ -15,9 +16,7 @@ func TestFetchTimedOutTasks(t *testing.T) { defer close() tasks, err := db.FetchTasksOfJob(ctx, job) - if !assert.NoError(t, err) { - t.FailNow() - } + require.NoError(t, err) now := db.gormDB.NowFunc() deadline := now.Add(-5 * time.Minute) @@ -25,23 +24,23 @@ func TestFetchTimedOutTasks(t *testing.T) { // Mark the task as last touched before the deadline, i.e. old enough for a timeout. task := tasks[0] task.LastTouchedAt = deadline.Add(-1 * time.Minute) - assert.NoError(t, db.SaveTask(ctx, task)) + require.NoError(t, db.SaveTask(ctx, task)) w := createWorker(ctx, t, db) - assert.NoError(t, db.TaskAssignToWorker(ctx, task, w)) + require.NoError(t, db.TaskAssignToWorker(ctx, task, w)) // The task should still not be returned, as it's not in 'active' state. timedout, err := db.FetchTimedOutTasks(ctx, deadline) - assert.NoError(t, err) + require.NoError(t, err) assert.Empty(t, timedout) // Mark as Active: task.Status = api.TaskStatusActive - assert.NoError(t, db.SaveTask(ctx, task)) + require.NoError(t, db.SaveTask(ctx, task)) // Now it should time out: timedout, err = db.FetchTimedOutTasks(ctx, deadline) - assert.NoError(t, err) + require.NoError(t, err) if assert.Len(t, timedout, 1) { // Other fields will be different, like the 'UpdatedAt' field -- this just // tests that the expected task is returned. @@ -92,15 +91,13 @@ func TestFetchTimedOutWorkers(t *testing.T) { workers := []*Worker{&worker0, &worker1, &worker2, &worker3, &worker4} for _, worker := range workers { err := db.CreateWorker(ctx, worker) - if !assert.NoError(t, err) { - t.FailNow() - } + require.NoError(t, err) } timedout, err := db.FetchTimedOutWorkers(ctx, timeoutDeadline) - if assert.NoError(t, err) && assert.Len(t, timedout, 3) { - assert.Equal(t, worker1.UUID, timedout[0].UUID) - assert.Equal(t, worker2.UUID, timedout[1].UUID) - assert.Equal(t, worker3.UUID, timedout[2].UUID) - } + require.NoError(t, err) + require.Len(t, timedout, 3) + assert.Equal(t, worker1.UUID, timedout[0].UUID) + assert.Equal(t, worker2.UUID, timedout[1].UUID) + assert.Equal(t, worker3.UUID, timedout[2].UUID) } diff --git a/internal/manager/persistence/worker_sleep_schedule_test.go b/internal/manager/persistence/worker_sleep_schedule_test.go index fdf83f20..038a6884 100644 --- a/internal/manager/persistence/worker_sleep_schedule_test.go +++ b/internal/manager/persistence/worker_sleep_schedule_test.go @@ -26,18 +26,16 @@ func TestFetchWorkerSleepSchedule(t *testing.T) { SupportedTaskTypes: "blender,ffmpeg,file-management", } err := db.CreateWorker(ctx, &linuxWorker) - if !assert.NoError(t, err) { - t.FailNow() - } + require.NoError(t, err) // Not an existing Worker. fetched, err := db.FetchWorkerSleepSchedule(ctx, "2cf6153a-3d4e-49f4-a5c0-1c9fc176e155") - assert.NoError(t, err, "non-existent worker should not cause an error") + require.NoError(t, err, "non-existent worker should not cause an error") assert.Nil(t, fetched) // No sleep schedule. fetched, err = db.FetchWorkerSleepSchedule(ctx, linuxWorker.UUID) - assert.NoError(t, err, "non-existent schedule should not cause an error") + require.NoError(t, err, "non-existent schedule should not cause an error") assert.Nil(t, fetched) // Create a sleep schedule. @@ -51,12 +49,10 @@ func TestFetchWorkerSleepSchedule(t *testing.T) { EndTime: TimeOfDay{9, 0}, } tx := db.gormDB.Create(&created) - if !assert.NoError(t, tx.Error) { - t.FailNow() - } + require.NoError(t, tx.Error) fetched, err = db.FetchWorkerSleepSchedule(ctx, linuxWorker.UUID) - assert.NoError(t, err) + require.NoError(t, err) assertEqualSleepSchedule(t, linuxWorker.ID, created, *fetched) } @@ -74,9 +70,7 @@ func TestFetchSleepScheduleWorker(t *testing.T) { SupportedTaskTypes: "blender,ffmpeg,file-management", } err := db.CreateWorker(ctx, &linuxWorker) - if !assert.NoError(t, err) { - t.FailNow() - } + require.NoError(t, err) // Create a sleep schedule. created := SleepSchedule{ @@ -89,16 +83,14 @@ func TestFetchSleepScheduleWorker(t *testing.T) { EndTime: TimeOfDay{9, 0}, } tx := db.gormDB.Create(&created) - if !assert.NoError(t, tx.Error) { - t.FailNow() - } + require.NoError(t, tx.Error) dbSchedule, err := db.FetchWorkerSleepSchedule(ctx, linuxWorker.UUID) - assert.NoError(t, err) + require.NoError(t, err) assert.Nil(t, dbSchedule.Worker, "worker should be nil when fetching schedule") err = db.FetchSleepScheduleWorker(ctx, dbSchedule) - assert.NoError(t, err) + require.NoError(t, err) if assert.NotNil(t, dbSchedule.Worker) { // Compare a few fields. If these are good, the correct worker has been fetched. assert.Equal(t, linuxWorker.ID, dbSchedule.Worker.ID) @@ -125,9 +117,7 @@ func TestSetWorkerSleepSchedule(t *testing.T) { SupportedTaskTypes: "blender,ffmpeg,file-management", } err := db.CreateWorker(ctx, &linuxWorker) - if !assert.NoError(t, err) { - t.FailNow() - } + require.NoError(t, err) schedule := SleepSchedule{ WorkerID: linuxWorker.ID, @@ -145,13 +135,9 @@ func TestSetWorkerSleepSchedule(t *testing.T) { // Create the sleep schedule. err = db.SetWorkerSleepSchedule(ctx, linuxWorker.UUID, &schedule) - if !assert.NoError(t, err) { - t.FailNow() - } + require.NoError(t, err) fetched, err := db.FetchWorkerSleepSchedule(ctx, linuxWorker.UUID) - if !assert.NoError(t, err) { - t.FailNow() - } + require.NoError(t, err) assertEqualSleepSchedule(t, linuxWorker.ID, schedule, *fetched) // Overwrite the schedule with one that already has a database ID. @@ -161,13 +147,9 @@ func TestSetWorkerSleepSchedule(t *testing.T) { newSchedule.StartTime = TimeOfDay{2, 0} newSchedule.EndTime = TimeOfDay{6, 0} err = db.SetWorkerSleepSchedule(ctx, linuxWorker.UUID, &newSchedule) - if !assert.NoError(t, err) { - t.FailNow() - } + require.NoError(t, err) fetched, err = db.FetchWorkerSleepSchedule(ctx, linuxWorker.UUID) - if !assert.NoError(t, err) { - t.FailNow() - } + require.NoError(t, err) assertEqualSleepSchedule(t, linuxWorker.ID, newSchedule, *fetched) // Overwrite the schedule with a freshly constructed one. @@ -181,13 +163,9 @@ func TestSetWorkerSleepSchedule(t *testing.T) { EndTime: TimeOfDay{15, 0}, } err = db.SetWorkerSleepSchedule(ctx, linuxWorker.UUID, &newerSchedule) - if !assert.NoError(t, err) { - t.FailNow() - } + require.NoError(t, err) fetched, err = db.FetchWorkerSleepSchedule(ctx, linuxWorker.UUID) - if !assert.NoError(t, err) { - t.FailNow() - } + require.NoError(t, err) assertEqualSleepSchedule(t, linuxWorker.ID, newerSchedule, *fetched) // Clear the sleep schedule. @@ -201,13 +179,9 @@ func TestSetWorkerSleepSchedule(t *testing.T) { EndTime: emptyToD, } err = db.SetWorkerSleepSchedule(ctx, linuxWorker.UUID, &emptySchedule) - if !assert.NoError(t, err) { - t.FailNow() - } + require.NoError(t, err) fetched, err = db.FetchWorkerSleepSchedule(ctx, linuxWorker.UUID) - if !assert.NoError(t, err) { - t.FailNow() - } + require.NoError(t, err) assertEqualSleepSchedule(t, linuxWorker.ID, emptySchedule, *fetched) } @@ -236,14 +210,10 @@ func TestSetWorkerSleepScheduleNextCheck(t *testing.T) { schedule.NextCheck = future err := db.SetWorkerSleepScheduleNextCheck(ctx, &schedule) - if !assert.NoError(t, err) { - t.FailNow() - } + require.NoError(t, err) fetched, err := db.FetchWorkerSleepSchedule(ctx, schedule.Worker.UUID) - if !assert.NoError(t, err) { - t.FailNow() - } + require.NoError(t, err) assertEqualSleepSchedule(t, schedule.Worker.ID, schedule, *fetched) } @@ -322,12 +292,13 @@ func TestFetchSleepSchedulesToCheck(t *testing.T) { } toCheck, err := db.FetchSleepSchedulesToCheck(ctx) - if assert.NoError(t, err) && assert.Len(t, toCheck, 2) { - assertEqualSleepSchedule(t, schedule0.Worker.ID, schedule0, *toCheck[0]) - assert.Nil(t, toCheck[0].Worker, "the Worker should NOT be fetched") - assertEqualSleepSchedule(t, schedule2.Worker.ID, schedule1, *toCheck[1]) - assert.Nil(t, toCheck[1].Worker, "the Worker should NOT be fetched") - } + require.NoError(t, err) + require.Len(t, toCheck, 2) + + assertEqualSleepSchedule(t, schedule0.Worker.ID, schedule0, *toCheck[0]) + assert.Nil(t, toCheck[0].Worker, "the Worker should NOT be fetched") + assertEqualSleepSchedule(t, schedule2.Worker.ID, schedule1, *toCheck[1]) + assert.Nil(t, toCheck[1].Worker, "the Worker should NOT be fetched") } func assertEqualSleepSchedule(t *testing.T, workerID uint, expect, actual SleepSchedule) { diff --git a/internal/manager/persistence/workers_test.go b/internal/manager/persistence/workers_test.go index e1f62f1b..1336d0b3 100644 --- a/internal/manager/persistence/workers_test.go +++ b/internal/manager/persistence/workers_test.go @@ -36,10 +36,10 @@ func TestCreateFetchWorker(t *testing.T) { } err = db.CreateWorker(ctx, &w) - assert.NoError(t, err) + require.NoError(t, err) fetchedWorker, err = db.FetchWorker(ctx, w.UUID) - assert.NoError(t, err) + require.NoError(t, err) assert.NotNil(t, fetchedWorker) // Test contents of fetched job @@ -69,15 +69,12 @@ func TestFetchWorkerTask(t *testing.T) { } err := db.CreateWorker(ctx, &w) - if !assert.NoError(t, err) { - t.FailNow() - } + require.NoError(t, err) { // Test without any task assigned. task, err := db.FetchWorkerTask(ctx, &w) - if assert.NoError(t, err) { - assert.Nil(t, task) - } + require.NoError(t, err) + assert.Nil(t, task) } // Create a job with tasks. @@ -88,52 +85,51 @@ func TestFetchWorkerTask(t *testing.T) { constructTestJob(ctx, t, db, atj) assignedTask, err := db.ScheduleTask(ctx, &w) - assert.NoError(t, err) + require.NoError(t, err) { // Assigned task should be returned. foundTask, err := db.FetchWorkerTask(ctx, &w) - if assert.NoError(t, err) && assert.NotNil(t, foundTask) { - assert.Equal(t, assignedTask.UUID, foundTask.UUID) - assert.Equal(t, jobUUID, foundTask.Job.UUID, "the job UUID should be returned as well") - } + require.NoError(t, err) + require.NotNil(t, foundTask) + assert.Equal(t, assignedTask.UUID, foundTask.UUID) + assert.Equal(t, jobUUID, foundTask.Job.UUID, "the job UUID should be returned as well") } // Set the task to 'completed'. assignedTask.Status = api.TaskStatusCompleted - assert.NoError(t, db.SaveTaskStatus(ctx, assignedTask)) + require.NoError(t, db.SaveTaskStatus(ctx, assignedTask)) { // Completed-but-last-assigned task should be returned. foundTask, err := db.FetchWorkerTask(ctx, &w) - if assert.NoError(t, err) && assert.NotNil(t, foundTask) { - assert.Equal(t, assignedTask.UUID, foundTask.UUID) - assert.Equal(t, jobUUID, foundTask.Job.UUID, "the job UUID should be returned as well") - } + require.NoError(t, err) + require.NotNil(t, foundTask) + assert.Equal(t, assignedTask.UUID, foundTask.UUID) + assert.Equal(t, jobUUID, foundTask.Job.UUID, "the job UUID should be returned as well") } // Assign another task. newlyAssignedTask, err := db.ScheduleTask(ctx, &w) - if !assert.NoError(t, err) || !assert.NotNil(t, newlyAssignedTask) { - t.FailNow() - } + require.NoError(t, err) + require.NotNil(t, newlyAssignedTask) { // Newly assigned task should be returned. foundTask, err := db.FetchWorkerTask(ctx, &w) - if assert.NoError(t, err) && assert.NotNil(t, foundTask) { - assert.Equal(t, newlyAssignedTask.UUID, foundTask.UUID) - assert.Equal(t, jobUUID, foundTask.Job.UUID, "the job UUID should be returned as well") - } + require.NoError(t, err) + require.NotNil(t, foundTask) + assert.Equal(t, newlyAssignedTask.UUID, foundTask.UUID) + assert.Equal(t, jobUUID, foundTask.Job.UUID, "the job UUID should be returned as well") } // Set the new task to 'completed'. newlyAssignedTask.Status = api.TaskStatusCompleted - assert.NoError(t, db.SaveTaskStatus(ctx, newlyAssignedTask)) + require.NoError(t, db.SaveTaskStatus(ctx, newlyAssignedTask)) { // Completed-but-last-assigned task should be returned. foundTask, err := db.FetchWorkerTask(ctx, &w) - if assert.NoError(t, err) && assert.NotNil(t, foundTask) { - assert.Equal(t, newlyAssignedTask.UUID, foundTask.UUID) - assert.Equal(t, jobUUID, foundTask.Job.UUID, "the job UUID should be returned as well") - } + require.NoError(t, err) + require.NotNil(t, foundTask) + assert.Equal(t, newlyAssignedTask.UUID, foundTask.UUID) + assert.Equal(t, jobUUID, foundTask.Job.UUID, "the job UUID should be returned as well") } } @@ -153,10 +149,10 @@ func TestSaveWorker(t *testing.T) { } err := db.CreateWorker(ctx, &w) - assert.NoError(t, err) + require.NoError(t, err) fetchedWorker, err := db.FetchWorker(ctx, w.UUID) - assert.NoError(t, err) + require.NoError(t, err) assert.NotNil(t, fetchedWorker) // Update all updatable fields of the Worker @@ -170,23 +166,23 @@ func TestSaveWorker(t *testing.T) { // Saving only the status should just do that. err = db.SaveWorkerStatus(ctx, &updatedWorker) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "7 မှ 9", updatedWorker.Name, "Saving status should not touch the name") // Check saved worker fetchedWorker, err = db.FetchWorker(ctx, w.UUID) - assert.NoError(t, err) + require.NoError(t, err) assert.NotNil(t, fetchedWorker) assert.Equal(t, updatedWorker.Status, fetchedWorker.Status, "new status should have been saved") assert.NotEqual(t, updatedWorker.Name, fetchedWorker.Name, "non-status fields should not have been updated") // Saving the entire worker should save everything. err = db.SaveWorker(ctx, &updatedWorker) - assert.NoError(t, err) + require.NoError(t, err) // Check saved worker fetchedWorker, err = db.FetchWorker(ctx, w.UUID) - assert.NoError(t, err) + require.NoError(t, err) assert.NotNil(t, fetchedWorker) assert.Equal(t, updatedWorker.Status, fetchedWorker.Status, "new status should have been saved") assert.Equal(t, updatedWorker.Name, fetchedWorker.Name, "non-status fields should also have been updated") @@ -199,10 +195,8 @@ func TestFetchWorkers(t *testing.T) { // No workers workers, err := db.FetchWorkers(ctx) - if !assert.NoError(t, err) { - t.Fatal("error fetching empty list of workers, no use in continuing the test") - } - assert.Empty(t, workers) + require.NoError(t, err) + require.Empty(t, workers) linuxWorker := Worker{ UUID: uuid.New(), @@ -216,12 +210,12 @@ func TestFetchWorkers(t *testing.T) { // One worker: err = db.CreateWorker(ctx, &linuxWorker) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, time.Now().UTC().Location(), linuxWorker.CreatedAt.Location(), "Timestamps should be using UTC timezone") workers, err = db.FetchWorkers(ctx) - assert.NoError(t, err) + require.NoError(t, err) if assert.Len(t, workers, 1) { // FIXME: this fails, because the fetched timestamps have nil location instead of UTC. // assert.Equal(t, time.Now().UTC().Location(), workers[0].CreatedAt.Location(), @@ -245,10 +239,10 @@ func TestFetchWorkers(t *testing.T) { SupportedTaskTypes: "blender,ffmpeg,file-management", } err = db.CreateWorker(ctx, &windowsWorker) - assert.NoError(t, err) + require.NoError(t, err) workers, err = db.FetchWorkers(ctx) - assert.NoError(t, err) + require.NoError(t, err) if assert.Len(t, workers, 2) { assert.Equal(t, linuxWorker.UUID, workers[0].UUID) assert.Equal(t, windowsWorker.UUID, workers[1].UUID) @@ -275,11 +269,11 @@ func TestDeleteWorker(t *testing.T) { Status: api.WorkerStatusOffline, } - assert.NoError(t, db.CreateWorker(ctx, &w1)) - assert.NoError(t, db.CreateWorker(ctx, &w2)) + require.NoError(t, db.CreateWorker(ctx, &w1)) + require.NoError(t, db.CreateWorker(ctx, &w2)) // Delete the 2nd worker, just to have a test with ID != 1. - assert.NoError(t, db.DeleteWorker(ctx, w2.UUID)) + require.NoError(t, db.DeleteWorker(ctx, w2.UUID)) // The deleted worker should now no longer be found. { @@ -291,7 +285,7 @@ func TestDeleteWorker(t *testing.T) { // The other worker should still exist. { fetchedWorker, err := db.FetchWorker(ctx, w1.UUID) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, w1.UUID, fetchedWorker.UUID) } @@ -301,18 +295,18 @@ func TestDeleteWorker(t *testing.T) { taskUUID := authJob.Tasks[0].UUID { task, err := db.FetchTask(ctx, taskUUID) - assert.NoError(t, err) + require.NoError(t, err) task.Worker = &w1 - assert.NoError(t, db.SaveTask(ctx, task)) + require.NoError(t, db.SaveTask(ctx, task)) } // Delete the worker. - assert.NoError(t, db.DeleteWorker(ctx, w1.UUID)) + require.NoError(t, db.DeleteWorker(ctx, w1.UUID)) // Check the task after deletion of the Worker. { fetchedTask, err := db.FetchTask(ctx, taskUUID) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, taskUUID, fetchedTask.UUID) assert.Equal(t, w1.UUID, fetchedTask.Worker.UUID) assert.NotZero(t, fetchedTask.Worker.DeletedAt.Time) diff --git a/internal/manager/sleep_scheduler/sleep_scheduler_test.go b/internal/manager/sleep_scheduler/sleep_scheduler_test.go index 409ca11a..378d489b 100644 --- a/internal/manager/sleep_scheduler/sleep_scheduler_test.go +++ b/internal/manager/sleep_scheduler/sleep_scheduler_test.go @@ -10,6 +10,7 @@ import ( "github.com/benbjohnson/clock" "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" "projects.blender.org/studio/flamenco/internal/manager/persistence" "projects.blender.org/studio/flamenco/internal/manager/sleep_scheduler/mocks" @@ -24,9 +25,8 @@ func TestFetchSchedule(t *testing.T) { mocks.persist.EXPECT().FetchWorkerSleepSchedule(ctx, workerUUID).Return(&dbSched, nil) sched, err := ss.FetchSchedule(ctx, workerUUID) - if assert.NoError(t, err) { - assert.Equal(t, &dbSched, sched) - } + require.NoError(t, err) + assert.Equal(t, &dbSched, sched) } func TestSetSchedule(t *testing.T) { @@ -59,7 +59,7 @@ func TestSetSchedule(t *testing.T) { mocks.broadcaster.EXPECT().BroadcastWorkerUpdate(gomock.Any()) err := ss.SetSchedule(ctx, workerUUID, &sched) - assert.NoError(t, err) + require.NoError(t, err) } func TestSetScheduleSwappedStartEnd(t *testing.T) { @@ -92,7 +92,7 @@ func TestSetScheduleSwappedStartEnd(t *testing.T) { mocks.persist.EXPECT().SetWorkerSleepSchedule(ctx, workerUUID, &expectSavedSchedule) err := ss.SetSchedule(ctx, workerUUID, &sched) - assert.NoError(t, err) + require.NoError(t, err) } // Test that a sleep check that happens at shutdown of the Manager doesn't cause any panics. @@ -157,9 +157,7 @@ func TestApplySleepSchedule(t *testing.T) { // Actually apply the sleep schedule. err := ss.ApplySleepSchedule(ctx, &testSchedule) - if !assert.NoError(t, err) { - t.FailNow() - } + require.NoError(t, err) // Check the SocketIO broadcast. if sioUpdate.Id != "" { @@ -220,9 +218,7 @@ func TestApplySleepScheduleNoStatusChange(t *testing.T) { // Apply the sleep schedule. This should not trigger any persistence or broadcasts. err := ss.ApplySleepSchedule(ctx, &testSchedule) - if !assert.NoError(t, err) { - t.FailNow() - } + require.NoError(t, err) } // Move the clock to the middle of the sleep schedule, so the schedule always diff --git a/internal/manager/task_logs/log_rotation_test.go b/internal/manager/task_logs/log_rotation_test.go index 972e8ae1..67ce7b67 100644 --- a/internal/manager/task_logs/log_rotation_test.go +++ b/internal/manager/task_logs/log_rotation_test.go @@ -12,11 +12,12 @@ import ( "github.com/rs/zerolog" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func setUpTest(t *testing.T) string { temppath, err := ioutil.TempDir("", "testlogs") - assert.NoError(t, err) + require.NoError(t, err) return temppath } @@ -55,7 +56,7 @@ func TestNoFiles(t *testing.T) { filepath := filepath.Join(temppath, "nonexisting.txt") err := rotateLogFile(zerolog.Nop(), filepath) - assert.NoError(t, err) + require.NoError(t, err) assert.False(t, fileExists(filepath)) } @@ -67,7 +68,7 @@ func TestOneFile(t *testing.T) { fileTouch(filepath) err := rotateLogFile(zerolog.Nop(), filepath) - assert.NoError(t, err) + require.NoError(t, err) assert.False(t, fileExists(filepath)) assert.True(t, fileExists(filepath+".1")) } @@ -77,16 +78,16 @@ func TestMultipleFilesWithHoles(t *testing.T) { defer tearDownTest(temppath) filepath := filepath.Join(temppath, "existing.txt") - assert.NoError(t, ioutil.WriteFile(filepath, []byte("thefile"), 0666)) - assert.NoError(t, ioutil.WriteFile(filepath+".1", []byte("file .1"), 0666)) - assert.NoError(t, ioutil.WriteFile(filepath+".2", []byte("file .2"), 0666)) - assert.NoError(t, ioutil.WriteFile(filepath+".3", []byte("file .3"), 0666)) - assert.NoError(t, ioutil.WriteFile(filepath+".5", []byte("file .5"), 0666)) - assert.NoError(t, ioutil.WriteFile(filepath+".7", []byte("file .7"), 0666)) + require.NoError(t, ioutil.WriteFile(filepath, []byte("thefile"), 0666)) + require.NoError(t, ioutil.WriteFile(filepath+".1", []byte("file .1"), 0666)) + require.NoError(t, ioutil.WriteFile(filepath+".2", []byte("file .2"), 0666)) + require.NoError(t, ioutil.WriteFile(filepath+".3", []byte("file .3"), 0666)) + require.NoError(t, ioutil.WriteFile(filepath+".5", []byte("file .5"), 0666)) + require.NoError(t, ioutil.WriteFile(filepath+".7", []byte("file .7"), 0666)) err := rotateLogFile(zerolog.Nop(), filepath) - assert.NoError(t, err) + require.NoError(t, err) assert.False(t, fileExists(filepath)) assert.True(t, fileExists(filepath+".1")) assert.True(t, fileExists(filepath+".2")) @@ -100,7 +101,7 @@ func TestMultipleFilesWithHoles(t *testing.T) { read := func(filename string) string { content, err := ioutil.ReadFile(filename) - assert.NoError(t, err) + require.NoError(t, err) return string(content) } diff --git a/internal/manager/task_logs/task_logs_test.go b/internal/manager/task_logs/task_logs_test.go index d1d0c74e..17e35794 100644 --- a/internal/manager/task_logs/task_logs_test.go +++ b/internal/manager/task_logs/task_logs_test.go @@ -19,6 +19,7 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" "projects.blender.org/studio/flamenco/internal/manager/task_logs/mocks" ) @@ -36,14 +37,14 @@ func TestLogWriting(t *testing.T) { mocks.localStorage.EXPECT().ForJob(jobUUID).Times(numWriteCalls).Return(jobDir) err := s.Write(zerolog.Nop(), jobUUID, taskUUID, "Ovo je priča") - assert.NoError(t, err) + require.NoError(t, err) err = s.Write(zerolog.Nop(), jobUUID, taskUUID, "Ima dvije linije") - assert.NoError(t, err) + require.NoError(t, err) filename := filepath.Join(jobDir, "task-20ff9d06-53ec-4019-9e2e-1774f05f170a.txt") contents, err := ioutil.ReadFile(filename) - assert.NoError(t, err, "the log file should exist") + require.NoError(t, err, "the log file should exist") assert.Equal(t, "Ovo je priča\nIma dvije linije\n", string(contents)) } @@ -59,7 +60,7 @@ func TestLogRotation(t *testing.T) { mocks.localStorage.EXPECT().ForJob(jobUUID).Return(jobDir).AnyTimes() err := s.Write(zerolog.Nop(), jobUUID, taskUUID, "Ovo je priča") - assert.NoError(t, err) + require.NoError(t, err) s.RotateFile(zerolog.Nop(), jobUUID, taskUUID) @@ -67,7 +68,7 @@ func TestLogRotation(t *testing.T) { rotatedFilename := filename + ".1" contents, err := ioutil.ReadFile(rotatedFilename) - assert.NoError(t, err, "the rotated log file should exist") + require.NoError(t, err, "the rotated log file should exist") assert.Equal(t, "Ovo je priča\n", string(contents)) _, err = os.Stat(filename) @@ -97,16 +98,16 @@ func TestLogTailAndSize(t *testing.T) { // Test a single line. err = s.Write(zerolog.Nop(), jobID, taskID, "Just a single line") - assert.NoError(t, err) + require.NoError(t, err) contents, err = s.Tail(jobID, taskID) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "Just a single line\n", string(contents)) // A short file shouldn't do any line stripping. err = s.Write(zerolog.Nop(), jobID, taskID, "And another line!") - assert.NoError(t, err) + require.NoError(t, err) contents, err = s.Tail(jobID, taskID) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "Just a single line\nAnd another line!\n", string(contents)) bigString := "" @@ -114,18 +115,17 @@ func TestLogTailAndSize(t *testing.T) { bigString += fmt.Sprintf("This is line #%d\n", lineNum) } err = s.Write(zerolog.Nop(), jobID, taskID, bigString) - assert.NoError(t, err) + require.NoError(t, err) // Check the log size, it should be the entire bigString plus what was written before that. size, err = s.TaskLogSize(jobID, taskID) - if assert.NoError(t, err) { - expect := int64(len("Just a single line\nAnd another line!\n" + bigString)) - assert.Equal(t, expect, size) - } + require.NoError(t, err) + expect := int64(len("Just a single line\nAnd another line!\n" + bigString)) + assert.Equal(t, expect, size) // Check the tail, it should only be the few last lines of bigString. contents, err = s.Tail(jobID, taskID) - assert.NoError(t, err) + require.NoError(t, err) assert.Equal(t, "This is line #887\nThis is line #888\nThis is line #889\nThis is line #890\nThis is line #891\n"+ "This is line #892\nThis is line #893\nThis is line #894\nThis is line #895\nThis is line #896\n"+ @@ -183,7 +183,7 @@ func TestLogWritingParallel(t *testing.T) { } logText := strings.Repeat(string(letter), runLength) - assert.NoError(t, s.Write(logger, jobID, taskID, logText)) + require.NoError(t, s.Write(logger, jobID, taskID, logText)) }(int32(i)) } wg.Wait() @@ -191,7 +191,7 @@ func TestLogWritingParallel(t *testing.T) { // Test that the final log contains 1000 lines of of 100 characters, without // any run getting interrupted by another one. contents, err := os.ReadFile(s.Filepath(jobID, taskID)) - assert.NoError(t, err) + require.NoError(t, err) lines := strings.Split(string(contents), "\n") assert.Equal(t, numGoroutines+1, len(lines), "each goroutine should have written a single line, and the file should have a newline at the end") diff --git a/internal/manager/task_state_machine/task_state_machine_test.go b/internal/manager/task_state_machine/task_state_machine_test.go index 7374696f..d9df1b3a 100644 --- a/internal/manager/task_state_machine/task_state_machine_test.go +++ b/internal/manager/task_state_machine/task_state_machine_test.go @@ -10,6 +10,7 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" "projects.blender.org/studio/flamenco/internal/manager/persistence" "projects.blender.org/studio/flamenco/internal/manager/task_state_machine/mocks" @@ -37,7 +38,7 @@ func TestTaskStatusChangeQueuedToActive(t *testing.T) { mocks.expectBroadcastJobChange(task.Job, api.JobStatusQueued, api.JobStatusActive) mocks.expectBroadcastTaskChange(task, api.TaskStatusQueued, api.TaskStatusActive) - assert.NoError(t, sm.TaskStatusChange(ctx, task, api.TaskStatusActive)) + require.NoError(t, sm.TaskStatusChange(ctx, task, api.TaskStatusActive)) } func TestTaskStatusChangeSaveTaskAfterJobChangeFailure(t *testing.T) { @@ -75,20 +76,20 @@ func TestTaskStatusChangeActiveToCompleted(t *testing.T) { mocks.expectWriteTaskLogTimestamped(t, task, "task changed status active -> completed") mocks.expectBroadcastTaskChange(task, api.TaskStatusActive, api.TaskStatusCompleted) mocks.persist.EXPECT().CountTasksOfJobInStatus(ctx, task.Job, api.TaskStatusCompleted).Return(1, 3, nil) // 1 of 3 complete. - assert.NoError(t, sm.TaskStatusChange(ctx, task, api.TaskStatusCompleted)) + require.NoError(t, sm.TaskStatusChange(ctx, task, api.TaskStatusCompleted)) // Second task hickup: T: active > soft-failed --> J: active > active mocks.expectSaveTaskWithStatus(t, task2, api.TaskStatusSoftFailed) mocks.expectWriteTaskLogTimestamped(t, task2, "task changed status active -> soft-failed") mocks.expectBroadcastTaskChange(task2, api.TaskStatusActive, api.TaskStatusSoftFailed) - assert.NoError(t, sm.TaskStatusChange(ctx, task2, api.TaskStatusSoftFailed)) + require.NoError(t, sm.TaskStatusChange(ctx, task2, api.TaskStatusSoftFailed)) // Second task completing: T: soft-failed > completed --> J: active > active mocks.expectSaveTaskWithStatus(t, task2, api.TaskStatusCompleted) mocks.expectWriteTaskLogTimestamped(t, task2, "task changed status soft-failed -> completed") mocks.expectBroadcastTaskChange(task2, api.TaskStatusSoftFailed, api.TaskStatusCompleted) mocks.persist.EXPECT().CountTasksOfJobInStatus(ctx, task.Job, api.TaskStatusCompleted).Return(2, 3, nil) // 2 of 3 complete. - assert.NoError(t, sm.TaskStatusChange(ctx, task2, api.TaskStatusCompleted)) + require.NoError(t, sm.TaskStatusChange(ctx, task2, api.TaskStatusCompleted)) // Third task completing: T: active > completed --> J: active > completed mocks.expectSaveTaskWithStatus(t, task3, api.TaskStatusCompleted) @@ -98,7 +99,7 @@ func TestTaskStatusChangeActiveToCompleted(t *testing.T) { mocks.expectSaveJobWithStatus(t, task.Job, api.JobStatusCompleted) mocks.expectBroadcastJobChange(task.Job, api.JobStatusActive, api.JobStatusCompleted) - assert.NoError(t, sm.TaskStatusChange(ctx, task3, api.TaskStatusCompleted)) + require.NoError(t, sm.TaskStatusChange(ctx, task3, api.TaskStatusCompleted)) } func TestTaskStatusChangeQueuedToFailed(t *testing.T) { @@ -114,7 +115,7 @@ func TestTaskStatusChangeQueuedToFailed(t *testing.T) { mocks.persist.EXPECT().CountTasksOfJobInStatus(ctx, task.Job, api.TaskStatusFailed).Return(1, 100, nil) // 1 out of 100 failed. mocks.expectBroadcastJobChange(task.Job, api.JobStatusQueued, api.JobStatusActive) - assert.NoError(t, sm.TaskStatusChange(ctx, task, api.TaskStatusFailed)) + require.NoError(t, sm.TaskStatusChange(ctx, task, api.TaskStatusFailed)) } func TestTaskStatusChangeActiveToFailedFailJob(t *testing.T) { @@ -144,7 +145,7 @@ func TestTaskStatusChangeActiveToFailedFailJob(t *testing.T) { "Manager cancelled this task because the job got status \"failed\".", ) - assert.NoError(t, sm.TaskStatusChange(ctx, task1, api.TaskStatusFailed)) + require.NoError(t, sm.TaskStatusChange(ctx, task1, api.TaskStatusFailed)) } func TestTaskStatusChangeRequeueOnCompletedJob(t *testing.T) { @@ -168,7 +169,7 @@ func TestTaskStatusChangeRequeueOnCompletedJob(t *testing.T) { ) mocks.expectSaveJobWithStatus(t, task.Job, api.JobStatusQueued) - assert.NoError(t, sm.TaskStatusChange(ctx, task, api.TaskStatusQueued)) + require.NoError(t, sm.TaskStatusChange(ctx, task, api.TaskStatusQueued)) } func TestTaskStatusChangeCancelSingleTask(t *testing.T) { @@ -186,7 +187,7 @@ func TestTaskStatusChangeCancelSingleTask(t *testing.T) { mocks.persist.EXPECT().CountTasksOfJobInStatus(ctx, job, api.TaskStatusActive, api.TaskStatusQueued, api.TaskStatusSoftFailed). Return(1, 2, nil) - assert.NoError(t, sm.TaskStatusChange(ctx, task, api.TaskStatusCanceled)) + require.NoError(t, sm.TaskStatusChange(ctx, task, api.TaskStatusCanceled)) // T2: queued > cancelled --> J: cancel-requested > canceled mocks.expectSaveTaskWithStatus(t, task2, api.TaskStatusCanceled) @@ -198,7 +199,7 @@ func TestTaskStatusChangeCancelSingleTask(t *testing.T) { mocks.expectSaveJobWithStatus(t, job, api.JobStatusCanceled) mocks.expectBroadcastJobChange(task.Job, api.JobStatusCancelRequested, api.JobStatusCanceled) - assert.NoError(t, sm.TaskStatusChange(ctx, task2, api.TaskStatusCanceled)) + require.NoError(t, sm.TaskStatusChange(ctx, task2, api.TaskStatusCanceled)) } func TestTaskStatusChangeCancelSingleTaskWithOtherFailed(t *testing.T) { @@ -222,7 +223,7 @@ func TestTaskStatusChangeCancelSingleTaskWithOtherFailed(t *testing.T) { // The paused task just stays paused, so don't expectBroadcastTaskChange(task3). - assert.NoError(t, sm.TaskStatusChange(ctx, task1, api.TaskStatusCanceled)) + require.NoError(t, sm.TaskStatusChange(ctx, task1, api.TaskStatusCanceled)) } func TestTaskStatusChangeUnknownStatus(t *testing.T) { @@ -235,7 +236,7 @@ func TestTaskStatusChangeUnknownStatus(t *testing.T) { mocks.expectWriteTaskLogTimestamped(t, task, "task changed status queued -> borked") mocks.expectBroadcastTaskChange(task, api.TaskStatusQueued, api.TaskStatus("borked")) - assert.NoError(t, sm.TaskStatusChange(ctx, task, api.TaskStatus("borked"))) + require.NoError(t, sm.TaskStatusChange(ctx, task, api.TaskStatus("borked"))) } func TestJobRequeueWithSomeCompletedTasks(t *testing.T) { @@ -269,7 +270,7 @@ func TestJobRequeueWithSomeCompletedTasks(t *testing.T) { mocks.expectBroadcastJobChangeWithTaskRefresh(job, api.JobStatusActive, api.JobStatusRequeueing) mocks.expectBroadcastJobChangeWithTaskRefresh(job, api.JobStatusRequeueing, api.JobStatusQueued) - assert.NoError(t, sm.JobStatusChange(ctx, job, api.JobStatusRequeueing, "someone wrote a unittest")) + require.NoError(t, sm.JobStatusChange(ctx, job, api.JobStatusRequeueing, "someone wrote a unittest")) } func TestJobRequeueWithAllCompletedTasks(t *testing.T) { @@ -301,7 +302,7 @@ func TestJobRequeueWithAllCompletedTasks(t *testing.T) { mocks.expectBroadcastJobChangeWithTaskRefresh(job, api.JobStatusCompleted, api.JobStatusRequeueing) mocks.expectBroadcastJobChangeWithTaskRefresh(job, api.JobStatusRequeueing, api.JobStatusQueued) - assert.NoError(t, sm.JobStatusChange(ctx, job, api.JobStatusRequeueing, "someone wrote a unit test")) + require.NoError(t, sm.JobStatusChange(ctx, job, api.JobStatusRequeueing, "someone wrote a unit test")) } func TestJobCancelWithSomeCompletedTasks(t *testing.T) { @@ -332,7 +333,7 @@ func TestJobCancelWithSomeCompletedTasks(t *testing.T) { mocks.expectBroadcastJobChangeWithTaskRefresh(job, api.JobStatusActive, api.JobStatusCancelRequested) mocks.expectBroadcastJobChange(job, api.JobStatusCancelRequested, api.JobStatusCanceled) - assert.NoError(t, sm.JobStatusChange(ctx, job, api.JobStatusCancelRequested, "someone wrote a unittest")) + require.NoError(t, sm.JobStatusChange(ctx, job, api.JobStatusCancelRequested, "someone wrote a unittest")) } func TestCheckStuck(t *testing.T) { diff --git a/internal/manager/task_state_machine/worker_requeue_test.go b/internal/manager/task_state_machine/worker_requeue_test.go index 2bfb351a..2cef414b 100644 --- a/internal/manager/task_state_machine/worker_requeue_test.go +++ b/internal/manager/task_state_machine/worker_requeue_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/golang/mock/gomock" - "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" "projects.blender.org/studio/flamenco/internal/manager/persistence" "projects.blender.org/studio/flamenco/pkg/api" ) @@ -66,5 +66,5 @@ func TestRequeueActiveTasksOfWorker(t *testing.T) { }) err := sm.RequeueActiveTasksOfWorker(ctx, &worker, "worker had to test") - assert.NoError(t, err) + require.NoError(t, err) } -- 2.30.2 From b219f9b1c2bcd7a62cfae473fce93c51ffc006d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Sat, 16 Mar 2024 11:09:18 +0100 Subject: [PATCH 42/84] Manager tests: replace `assert.NoError()` with `require.NoError()` Back in the days when I wrote the code, I didn't know about the `require` package yet. Using `require.NoError()` makes the test code more straight-forward. No functional changes, except that when tests fail, they now fail without panicking. --- internal/manager/persistence/jobs_test.go | 26 ++++----------- .../persistence/task_scheduler_test.go | 32 ++++--------------- .../sleep_scheduler/sleep_scheduler_test.go | 5 ++- internal/manager/task_logs/task_logs_test.go | 9 ++---- .../timeout_checker/timeout_checker_test.go | 5 ++- 5 files changed, 21 insertions(+), 56 deletions(-) diff --git a/internal/manager/persistence/jobs_test.go b/internal/manager/persistence/jobs_test.go index d77c5d9e..06aed199 100644 --- a/internal/manager/persistence/jobs_test.go +++ b/internal/manager/persistence/jobs_test.go @@ -762,17 +762,12 @@ func createTestAuthoredJob(jobID string, tasks ...job_compilers.AuthoredTask) jo func persistAuthoredJob(t *testing.T, ctx context.Context, db *DB, authoredJob job_compilers.AuthoredJob) *Job { err := db.StoreAuthoredJob(ctx, authoredJob) - if err != nil { - t.Fatalf("error storing authored job in DB: %v", err) - } + require.NoError(t, err, "error storing authored job in DB") dbJob, err := db.FetchJob(ctx, authoredJob.JobID) - if err != nil { - t.Fatalf("error fetching job from DB: %v", err) - } - if dbJob == nil { - t.Fatalf("nil job obtained from DB but with no error!") - } + require.NoError(t, err, "error fetching job from DB") + require.NotNil(t, dbJob, "nil job obtained from DB but with no error!") + return dbJob } @@ -849,18 +844,11 @@ func createWorker(ctx context.Context, t *testing.T, db *DB, updaters ...func(*W } err := db.CreateWorker(ctx, &w) - if err != nil { - t.Fatalf("error creating worker: %v", err) - } - require.NoError(t, err) + require.NoError(t, err, "error creating worker") fetchedWorker, err := db.FetchWorker(ctx, w.UUID) - if err != nil { - t.Fatalf("error fetching worker: %v", err) - } - if fetchedWorker == nil { - t.Fatal("fetched worker is nil, but no error returned") - } + require.NoError(t, err, "error fetching worker") + require.NotNil(t, fetchedWorker, "fetched worker is nil, but no error returned") return fetchedWorker } diff --git a/internal/manager/persistence/task_scheduler_test.go b/internal/manager/persistence/task_scheduler_test.go index 1d0ae355..640b867f 100644 --- a/internal/manager/persistence/task_scheduler_test.go +++ b/internal/manager/persistence/task_scheduler_test.go @@ -410,21 +410,15 @@ func constructTestJob( ctx context.Context, t *testing.T, db *DB, authoredJob job_compilers.AuthoredJob, ) *Job { err := db.StoreAuthoredJob(ctx, authoredJob) - if err != nil { - t.Fatalf("storing authored job: %v", err) - } + require.NoError(t, err, "storing authored job") dbJob, err := db.FetchJob(ctx, authoredJob.JobID) - if err != nil { - t.Fatalf("fetching authored job: %v", err) - } + require.NoError(t, err, "fetching authored job") // Queue the job. dbJob.Status = api.JobStatusQueued err = db.SaveJobStatus(ctx, dbJob) - if err != nil { - t.Fatalf("queueing job: %v", err) - } + require.NoError(t, err, "queueing job") return dbJob } @@ -457,16 +451,11 @@ func authorTestTask(name, taskType string, dependencies ...*job_compilers.Author func setTaskStatus(t *testing.T, db *DB, taskUUID string, status api.TaskStatus) { ctx := context.Background() task, err := db.FetchTask(ctx, taskUUID) - if err != nil { - t.Fatal(err) - } + require.NoError(t, err) task.Status = status - err = db.SaveTask(ctx, task) - if err != nil { - t.Fatal(err) - } + require.NoError(t, db.SaveTask(ctx, task)) } func linuxWorker(t *testing.T, db *DB, updaters ...func(worker *Worker)) Worker { @@ -483,10 +472,7 @@ func linuxWorker(t *testing.T, db *DB, updaters ...func(worker *Worker)) Worker } err := db.gormDB.Save(&w).Error - if err != nil { - t.Logf("cannot save Linux worker: %v", err) - t.FailNow() - } + require.NoError(t, err, "cannot save Linux worker") return w } @@ -501,10 +487,6 @@ func windowsWorker(t *testing.T, db *DB) Worker { } err := db.gormDB.Save(&w).Error - if err != nil { - t.Logf("cannot save Windows worker: %v", err) - t.FailNow() - } - + require.NoError(t, err, "cannot save Windows worker") return w } diff --git a/internal/manager/sleep_scheduler/sleep_scheduler_test.go b/internal/manager/sleep_scheduler/sleep_scheduler_test.go index 378d489b..e02d1d94 100644 --- a/internal/manager/sleep_scheduler/sleep_scheduler_test.go +++ b/internal/manager/sleep_scheduler/sleep_scheduler_test.go @@ -267,9 +267,8 @@ func testFixtures(t *testing.T) (*SleepScheduler, TestMocks, context.Context) { mockedClock := clock.NewMock() mockedNow, err := time.Parse(time.RFC3339, "2022-06-07T11:14:47+02:00") - if err != nil { - panic(err) - } + require.NoError(t, err) + mockedClock.Set(mockedNow) if !assert.Equal(t, time.Tuesday.String(), mockedNow.Weekday().String()) { t.Fatal("tests assume 'now' is a Tuesday") diff --git a/internal/manager/task_logs/task_logs_test.go b/internal/manager/task_logs/task_logs_test.go index 17e35794..8fc4f512 100644 --- a/internal/manager/task_logs/task_logs_test.go +++ b/internal/manager/task_logs/task_logs_test.go @@ -217,9 +217,7 @@ func taskLogsTestFixtures(t *testing.T) (*Storage, func(), *TaskLogsMocks) { mockCtrl := gomock.NewController(t) temppath, err := ioutil.TempDir("", "testlogs") - if err != nil { - panic(err) - } + require.NoError(t, err) mocks := &TaskLogsMocks{ temppath: temppath, @@ -229,9 +227,8 @@ func taskLogsTestFixtures(t *testing.T) (*Storage, func(), *TaskLogsMocks) { } mockedNow, err := time.Parse(time.RFC3339, "2022-06-09T16:52:04+02:00") - if err != nil { - panic(err) - } + require.NoError(t, err) + mocks.clock.Set(mockedNow) // This should be called at the end of each unit test. diff --git a/internal/manager/timeout_checker/timeout_checker_test.go b/internal/manager/timeout_checker/timeout_checker_test.go index f0a3ed9a..d24cbef2 100644 --- a/internal/manager/timeout_checker/timeout_checker_test.go +++ b/internal/manager/timeout_checker/timeout_checker_test.go @@ -11,6 +11,7 @@ import ( "github.com/benbjohnson/clock" "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" "projects.blender.org/studio/flamenco/internal/manager/timeout_checker/mocks" ) @@ -50,9 +51,7 @@ func timeoutCheckerTestFixtures(t *testing.T) (*TimeoutChecker, func(), *Timeout } mockedNow, err := time.Parse(time.RFC3339, "2022-06-09T12:00:00+00:00") - if err != nil { - panic(err) - } + require.NoError(t, err) mocks.clock.Set(mockedNow) ctx, cancel := context.WithCancel(context.Background()) -- 2.30.2 From 63a578688e9e3b930f99db423067fd08b1a4b08b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Sat, 16 Mar 2024 12:12:31 +0100 Subject: [PATCH 43/84] Make `make test` fail fast Pass `-failfast` to the `go test` command, so that it immediately stops on test failure. This prevents the need to scroll back to see the actual error, at the expense of only seeing one failure at a time. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1dc4efdf..2e204677 100644 --- a/Makefile +++ b/Makefile @@ -240,7 +240,7 @@ swagger-ui: test: # Ensure the web-static directory exists, so that `web/web_app.go` can embed something. mkdir -p ${WEB_STATIC} - go test -short ./... + go test -short -failfast ./... clean: @go clean -i -x -- 2.30.2 From 00dfbc10b68be08ed7e2858f9ff6af9235739253 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Mon, 18 Mar 2024 22:38:20 +0100 Subject: [PATCH 44/84] Worker: link to FAQ entry when the worker cannot be found --- cmd/flamenco-worker/main.go | 7 +++++-- pkg/website/urls.go | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cmd/flamenco-worker/main.go b/cmd/flamenco-worker/main.go index d42be507..0cfd6393 100644 --- a/cmd/flamenco-worker/main.go +++ b/cmd/flamenco-worker/main.go @@ -24,6 +24,7 @@ import ( "projects.blender.org/studio/flamenco/internal/worker" "projects.blender.org/studio/flamenco/internal/worker/cli_runner" "projects.blender.org/studio/flamenco/pkg/sysinfo" + "projects.blender.org/studio/flamenco/pkg/website" ) var ( @@ -296,8 +297,10 @@ func upstreamBufferOrDie(client worker.FlamencoClient, timeService clock.Clock) func logFatalManagerDiscoveryError(err error, discoverTimeout time.Duration) { if errors.Is(err, context.DeadlineExceeded) { - log.Fatal().Str("timeout", discoverTimeout.String()).Msg("could not discover Manager in time") + log.Fatal().Stringer("timeout", discoverTimeout). + Msgf("could not discover Manager in time, see %s", website.CannotFindManagerHelpURL) } else { - log.Fatal().Err(err).Msg("auto-discovery error") + log.Fatal().Err(err). + Msgf("auto-discovery error, see %s", website.CannotFindManagerHelpURL) } } diff --git a/pkg/website/urls.go b/pkg/website/urls.go index 1b0df789..a8285cf7 100644 --- a/pkg/website/urls.go +++ b/pkg/website/urls.go @@ -5,6 +5,7 @@ package website const ( DocVariablesURL = "https://flamenco.blender.org/usage/variables/blender/" WorkerCredsUnknownHelpURL = "https://flamenco.blender.org/faq/#what-does-unknown-worker-is-trying-to-communicate-mean" + CannotFindManagerHelpURL = "https://flamenco.blender.org/faq/#my-worker-cannot-find-my-manager-what-do-i-do" BugReportURL = "https://flamenco.blender.org/get-involved" ShamanRequirementsURL = "https://flamenco.blender.org/usage/shared-storage/shaman/#requirements" WorkerConfigURL = "https://flamenco.blender.org/usage/worker-configuration/" -- 2.30.2 From c3b8707390c0d61c6f9247c4e960f1cd871d2cd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Mon, 18 Mar 2024 22:39:55 +0100 Subject: [PATCH 45/84] Worker: reduce log level of 'Blender could not be found' to info level There's still some confusion that this is a thing to solve, whereas it can usually safely be ignored. Reduced the log level from Warn to Info to make the message look more innocent. --- cmd/flamenco-worker/find_exes.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/flamenco-worker/find_exes.go b/cmd/flamenco-worker/find_exes.go index d14333ed..cfe14da6 100644 --- a/cmd/flamenco-worker/find_exes.go +++ b/cmd/flamenco-worker/find_exes.go @@ -38,7 +38,7 @@ func findBlender() { result, err := find_blender.Find(ctx) switch { case errors.Is(err, fs.ErrNotExist), errors.Is(err, exec.ErrNotFound): - log.Warn().Msg("Blender could not be found. " + helpMsg) + log.Info().Msg("Blender could not be found. " + helpMsg) case err != nil: log.Warn().AnErr("cause", err).Msg("There was an error finding Blender on this system. " + helpMsg) default: -- 2.30.2 From 43a452e940116ef28061906c737652128f8aebaf Mon Sep 17 00:00:00 2001 From: Mateus Abelli Date: Mon, 25 Mar 2024 14:36:54 +0100 Subject: [PATCH 46/84] Website: Update the required Go version to Latest --- .../content/development/getting-started/_index.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/project-website/content/development/getting-started/_index.md b/web/project-website/content/development/getting-started/_index.md index f979ae1c..32eaf02e 100644 --- a/web/project-website/content/development/getting-started/_index.md +++ b/web/project-website/content/development/getting-started/_index.md @@ -18,7 +18,8 @@ Then follow the steps below to get everything up & running. Most of Flamenco is made in Go. -1. Install [Go 1.21 or newer](https://go.dev/). +1. Install [the latest Go release](https://go.dev/). If you want to know specifically which version in required, check the + [go.mod](https://projects.blender.org/studio/flamenco/src/branch/main/go.mod) file. 2. Optional: set the environment variable `GOPATH` to where you want Go to put its packages. Go will use `$HOME/go` by default. 3. Ensure `$GOPATH/bin` is included in your `$PATH` environment variable. Run `go env GOPATH` if you're not sure what path to use. -- 2.30.2 From bce84bf175af727ff16544a1a680eed929aab774 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Thu, 4 Apr 2024 10:38:42 +0200 Subject: [PATCH 47/84] Bumped version to 3.5-beta0 --- Makefile | 4 +- addon/flamenco/__init__.py | 2 +- addon/flamenco/manager/__init__.py | 2 +- addon/flamenco/manager/api_client.py | 2 +- addon/flamenco/manager/configuration.py | 2 +- addon/flamenco/manager_README.md | 286 ++++++++++++------------ web/app/src/manager-api/ApiClient.js | 2 +- 7 files changed, 150 insertions(+), 150 deletions(-) diff --git a/Makefile b/Makefile index 2e204677..5e0ae9ba 100644 --- a/Makefile +++ b/Makefile @@ -4,9 +4,9 @@ PKG := projects.blender.org/studio/flamenco # To update the version number in all the relevant places, update the VERSION # variable below and run `make update-version`. -VERSION := 3.5-alpha1 +VERSION := 3.5-beta0 # "alpha", "beta", or "release". -RELEASE_CYCLE := alpha +RELEASE_CYCLE := beta # _GIT_DESCRIPTION_OR_TAG is either something like '16-123abc' (when we're 16 # commits since the last tag) or it's something like `v3.0-beta2` (when exactly diff --git a/addon/flamenco/__init__.py b/addon/flamenco/__init__.py index 3a2f2296..ba04cb53 100644 --- a/addon/flamenco/__init__.py +++ b/addon/flamenco/__init__.py @@ -12,7 +12,7 @@ bl_info = { "doc_url": "https://flamenco.blender.org/", "category": "System", "support": "COMMUNITY", - "warning": "This is version 3.5-alpha1 of the add-on, which is not a stable release", + "warning": "This is version 3.5-beta0 of the add-on, which is not a stable release", } from pathlib import Path diff --git a/addon/flamenco/manager/__init__.py b/addon/flamenco/manager/__init__.py index 50885729..f16438a5 100644 --- a/addon/flamenco/manager/__init__.py +++ b/addon/flamenco/manager/__init__.py @@ -10,7 +10,7 @@ """ -__version__ = "3.5-alpha1" +__version__ = "3.5-beta0" # import ApiClient from flamenco.manager.api_client import ApiClient diff --git a/addon/flamenco/manager/api_client.py b/addon/flamenco/manager/api_client.py index 08599db8..80320df4 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/3.5-alpha1 (Blender add-on)' + self.user_agent = 'Flamenco/3.5-beta0 (Blender add-on)' def __enter__(self): return self diff --git a/addon/flamenco/manager/configuration.py b/addon/flamenco/manager/configuration.py index 58b78a7d..37660313 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: 3.5-alpha1".\ + "SDK Package Version: 3.5-beta0".\ format(env=sys.platform, pyversion=sys.version) def get_host_settings(self): diff --git a/addon/flamenco/manager_README.md b/addon/flamenco/manager_README.md index 38a4a737..f9002fa4 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: 3.5-alpha1 +- Package version: 3.5-beta0 - Build package: org.openapitools.codegen.languages.PythonClientCodegen For more information, please visit [https://flamenco.io/](https://flamenco.io/) @@ -76,152 +76,152 @@ All URIs are relative to *http://localhost* Class | Method | HTTP request | Description ------------ | ------------- | ------------- | ------------- -*JobsApi* | [**delete_job**](flamenco\manager\docs/JobsApi.md#delete_job) | **DELETE** /api/v3/jobs/{job_id} | Request deletion this job, including its tasks and any log files. The actual deletion may happen in the background. No job files will be deleted (yet). -*JobsApi* | [**delete_job_mass**](flamenco\manager\docs/JobsApi.md#delete_job_mass) | **DELETE** /api/v3/jobs/mass-delete | Mark jobs for deletion, based on certain criteria. -*JobsApi* | [**delete_job_what_would_it_do**](flamenco\manager\docs/JobsApi.md#delete_job_what_would_it_do) | **GET** /api/v3/jobs/{job_id}/what-would-delete-do | Get info about what would be deleted when deleting this job. The job itself, its logs, and the last-rendered images will always be deleted. The job files are only deleted conditionally, and this operation can be used to figure that out. -*JobsApi* | [**fetch_global_last_rendered_info**](flamenco\manager\docs/JobsApi.md#fetch_global_last_rendered_info) | **GET** /api/v3/jobs/last-rendered | Get the URL that serves the last-rendered images. -*JobsApi* | [**fetch_job**](flamenco\manager\docs/JobsApi.md#fetch_job) | **GET** /api/v3/jobs/{job_id} | Fetch info about the job. -*JobsApi* | [**fetch_job_blocklist**](flamenco\manager\docs/JobsApi.md#fetch_job_blocklist) | **GET** /api/v3/jobs/{job_id}/blocklist | Fetch the list of workers that are blocked from doing certain task types on this job. -*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_priority**](flamenco\manager\docs/JobsApi.md#set_job_priority) | **POST** /api/v3/jobs/{job_id}/setpriority | -*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. -*JobsApi* | [**submit_job_check**](flamenco\manager\docs/JobsApi.md#submit_job_check) | **POST** /api/v3/jobs/check | Submit a new job for Flamenco Manager to check. -*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_farm_status**](flamenco\manager\docs/MetaApi.md#get_farm_status) | **GET** /api/v3/status | Get the status of this Flamenco farm. -*MetaApi* | [**get_shared_storage**](flamenco\manager\docs/MetaApi.md#get_shared_storage) | **GET** /api/v3/configuration/shared-storage/{audience}/{platform} | Get the shared storage location of this Manager, adjusted for the given audience and 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_setup_assistant_config**](flamenco\manager\docs/MetaApi.md#save_setup_assistant_config) | **POST** /api/v3/configuration/setup-assistant | 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. -*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_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_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* | [**create_worker_tag**](flamenco\manager\docs/WorkerMgtApi.md#create_worker_tag) | **POST** /api/v3/worker-mgt/tags | Create a new worker tag. -*WorkerMgtApi* | [**delete_worker**](flamenco\manager\docs/WorkerMgtApi.md#delete_worker) | **DELETE** /api/v3/worker-mgt/workers/{worker_id} | Remove the given worker. It is recommended to only call this function when the worker is in `offline` state. If the worker is still running, stop it first. Any task still assigned to the worker will be requeued. -*WorkerMgtApi* | [**delete_worker_tag**](flamenco\manager\docs/WorkerMgtApi.md#delete_worker_tag) | **DELETE** /api/v3/worker-mgt/tag/{tag_id} | Remove this worker tag. This unassigns all workers from the tag and removes it. -*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_worker_tag**](flamenco\manager\docs/WorkerMgtApi.md#fetch_worker_tag) | **GET** /api/v3/worker-mgt/tag/{tag_id} | Get a single worker tag. -*WorkerMgtApi* | [**fetch_worker_tags**](flamenco\manager\docs/WorkerMgtApi.md#fetch_worker_tags) | **GET** /api/v3/worker-mgt/tags | Get list of worker tags. -*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* | [**set_worker_sleep_schedule**](flamenco\manager\docs/WorkerMgtApi.md#set_worker_sleep_schedule) | **POST** /api/v3/worker-mgt/workers/{worker_id}/sleep-schedule | -*WorkerMgtApi* | [**set_worker_tags**](flamenco\manager\docs/WorkerMgtApi.md#set_worker_tags) | **POST** /api/v3/worker-mgt/workers/{worker_id}/settags | -*WorkerMgtApi* | [**update_worker_tag**](flamenco\manager\docs/WorkerMgtApi.md#update_worker_tag) | **PUT** /api/v3/worker-mgt/tag/{tag_id} | Update an existing worker tag. +*JobsApi* | [**delete_job**](flamenco/manager/docs/JobsApi.md#delete_job) | **DELETE** /api/v3/jobs/{job_id} | Request deletion this job, including its tasks and any log files. The actual deletion may happen in the background. No job files will be deleted (yet). +*JobsApi* | [**delete_job_mass**](flamenco/manager/docs/JobsApi.md#delete_job_mass) | **DELETE** /api/v3/jobs/mass-delete | Mark jobs for deletion, based on certain criteria. +*JobsApi* | [**delete_job_what_would_it_do**](flamenco/manager/docs/JobsApi.md#delete_job_what_would_it_do) | **GET** /api/v3/jobs/{job_id}/what-would-delete-do | Get info about what would be deleted when deleting this job. The job itself, its logs, and the last-rendered images will always be deleted. The job files are only deleted conditionally, and this operation can be used to figure that out. +*JobsApi* | [**fetch_global_last_rendered_info**](flamenco/manager/docs/JobsApi.md#fetch_global_last_rendered_info) | **GET** /api/v3/jobs/last-rendered | Get the URL that serves the last-rendered images. +*JobsApi* | [**fetch_job**](flamenco/manager/docs/JobsApi.md#fetch_job) | **GET** /api/v3/jobs/{job_id} | Fetch info about the job. +*JobsApi* | [**fetch_job_blocklist**](flamenco/manager/docs/JobsApi.md#fetch_job_blocklist) | **GET** /api/v3/jobs/{job_id}/blocklist | Fetch the list of workers that are blocked from doing certain task types on this job. +*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_priority**](flamenco/manager/docs/JobsApi.md#set_job_priority) | **POST** /api/v3/jobs/{job_id}/setpriority | +*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. +*JobsApi* | [**submit_job_check**](flamenco/manager/docs/JobsApi.md#submit_job_check) | **POST** /api/v3/jobs/check | Submit a new job for Flamenco Manager to check. +*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_farm_status**](flamenco/manager/docs/MetaApi.md#get_farm_status) | **GET** /api/v3/status | Get the status of this Flamenco farm. +*MetaApi* | [**get_shared_storage**](flamenco/manager/docs/MetaApi.md#get_shared_storage) | **GET** /api/v3/configuration/shared-storage/{audience}/{platform} | Get the shared storage location of this Manager, adjusted for the given audience and 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_setup_assistant_config**](flamenco/manager/docs/MetaApi.md#save_setup_assistant_config) | **POST** /api/v3/configuration/setup-assistant | 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. +*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_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_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* | [**create_worker_tag**](flamenco/manager/docs/WorkerMgtApi.md#create_worker_tag) | **POST** /api/v3/worker-mgt/tags | Create a new worker tag. +*WorkerMgtApi* | [**delete_worker**](flamenco/manager/docs/WorkerMgtApi.md#delete_worker) | **DELETE** /api/v3/worker-mgt/workers/{worker_id} | Remove the given worker. It is recommended to only call this function when the worker is in `offline` state. If the worker is still running, stop it first. Any task still assigned to the worker will be requeued. +*WorkerMgtApi* | [**delete_worker_tag**](flamenco/manager/docs/WorkerMgtApi.md#delete_worker_tag) | **DELETE** /api/v3/worker-mgt/tag/{tag_id} | Remove this worker tag. This unassigns all workers from the tag and removes it. +*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_worker_tag**](flamenco/manager/docs/WorkerMgtApi.md#fetch_worker_tag) | **GET** /api/v3/worker-mgt/tag/{tag_id} | Get a single worker tag. +*WorkerMgtApi* | [**fetch_worker_tags**](flamenco/manager/docs/WorkerMgtApi.md#fetch_worker_tags) | **GET** /api/v3/worker-mgt/tags | Get list of worker tags. +*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* | [**set_worker_sleep_schedule**](flamenco/manager/docs/WorkerMgtApi.md#set_worker_sleep_schedule) | **POST** /api/v3/worker-mgt/workers/{worker_id}/sleep-schedule | +*WorkerMgtApi* | [**set_worker_tags**](flamenco/manager/docs/WorkerMgtApi.md#set_worker_tags) | **POST** /api/v3/worker-mgt/workers/{worker_id}/settags | +*WorkerMgtApi* | [**update_worker_tag**](flamenco/manager/docs/WorkerMgtApi.md#update_worker_tag) | **PUT** /api/v3/worker-mgt/tag/{tag_id} | Update an existing worker tag. ## Documentation For Models - - [AssignedTask](flamenco\manager\docs/AssignedTask.md) - - [AvailableJobSetting](flamenco\manager\docs/AvailableJobSetting.md) - - [AvailableJobSettingEvalInfo](flamenco\manager\docs/AvailableJobSettingEvalInfo.md) - - [AvailableJobSettingSubtype](flamenco\manager\docs/AvailableJobSettingSubtype.md) - - [AvailableJobSettingType](flamenco\manager\docs/AvailableJobSettingType.md) - - [AvailableJobSettingVisibility](flamenco\manager\docs/AvailableJobSettingVisibility.md) - - [AvailableJobType](flamenco\manager\docs/AvailableJobType.md) - - [AvailableJobTypes](flamenco\manager\docs/AvailableJobTypes.md) - - [BlenderPathCheckResult](flamenco\manager\docs/BlenderPathCheckResult.md) - - [BlenderPathFindResult](flamenco\manager\docs/BlenderPathFindResult.md) - - [BlenderPathSource](flamenco\manager\docs/BlenderPathSource.md) - - [Command](flamenco\manager\docs/Command.md) - - [Error](flamenco\manager\docs/Error.md) - - [EventFarmStatus](flamenco\manager\docs/EventFarmStatus.md) - - [EventJobUpdate](flamenco\manager\docs/EventJobUpdate.md) - - [EventLastRenderedUpdate](flamenco\manager\docs/EventLastRenderedUpdate.md) - - [EventLifeCycle](flamenco\manager\docs/EventLifeCycle.md) - - [EventTaskLogUpdate](flamenco\manager\docs/EventTaskLogUpdate.md) - - [EventTaskUpdate](flamenco\manager\docs/EventTaskUpdate.md) - - [EventWorkerTagUpdate](flamenco\manager\docs/EventWorkerTagUpdate.md) - - [EventWorkerUpdate](flamenco\manager\docs/EventWorkerUpdate.md) - - [FarmStatus](flamenco\manager\docs/FarmStatus.md) - - [FarmStatusReport](flamenco\manager\docs/FarmStatusReport.md) - - [FlamencoVersion](flamenco\manager\docs/FlamencoVersion.md) - - [Job](flamenco\manager\docs/Job.md) - - [JobAllOf](flamenco\manager\docs/JobAllOf.md) - - [JobBlocklist](flamenco\manager\docs/JobBlocklist.md) - - [JobBlocklistEntry](flamenco\manager\docs/JobBlocklistEntry.md) - - [JobDeletionInfo](flamenco\manager\docs/JobDeletionInfo.md) - - [JobLastRenderedImageInfo](flamenco\manager\docs/JobLastRenderedImageInfo.md) - - [JobMassDeletionSelection](flamenco\manager\docs/JobMassDeletionSelection.md) - - [JobMetadata](flamenco\manager\docs/JobMetadata.md) - - [JobPriorityChange](flamenco\manager\docs/JobPriorityChange.md) - - [JobSettings](flamenco\manager\docs/JobSettings.md) - - [JobStatus](flamenco\manager\docs/JobStatus.md) - - [JobStatusChange](flamenco\manager\docs/JobStatusChange.md) - - [JobStorageInfo](flamenco\manager\docs/JobStorageInfo.md) - - [JobTasksSummary](flamenco\manager\docs/JobTasksSummary.md) - - [JobsQuery](flamenco\manager\docs/JobsQuery.md) - - [JobsQueryResult](flamenco\manager\docs/JobsQueryResult.md) - - [LifeCycleEventType](flamenco\manager\docs/LifeCycleEventType.md) - - [ManagerConfiguration](flamenco\manager\docs/ManagerConfiguration.md) - - [ManagerVariable](flamenco\manager\docs/ManagerVariable.md) - - [ManagerVariableAudience](flamenco\manager\docs/ManagerVariableAudience.md) - - [ManagerVariables](flamenco\manager\docs/ManagerVariables.md) - - [MayKeepRunning](flamenco\manager\docs/MayKeepRunning.md) - - [PathCheckInput](flamenco\manager\docs/PathCheckInput.md) - - [PathCheckResult](flamenco\manager\docs/PathCheckResult.md) - - [RegisteredWorker](flamenco\manager\docs/RegisteredWorker.md) - - [SecurityError](flamenco\manager\docs/SecurityError.md) - - [SetupAssistantConfig](flamenco\manager\docs/SetupAssistantConfig.md) - - [ShamanCheckout](flamenco\manager\docs/ShamanCheckout.md) - - [ShamanCheckoutResult](flamenco\manager\docs/ShamanCheckoutResult.md) - - [ShamanFileSpec](flamenco\manager\docs/ShamanFileSpec.md) - - [ShamanFileSpecWithStatus](flamenco\manager\docs/ShamanFileSpecWithStatus.md) - - [ShamanFileStatus](flamenco\manager\docs/ShamanFileStatus.md) - - [ShamanRequirementsRequest](flamenco\manager\docs/ShamanRequirementsRequest.md) - - [ShamanRequirementsResponse](flamenco\manager\docs/ShamanRequirementsResponse.md) - - [ShamanSingleFileStatus](flamenco\manager\docs/ShamanSingleFileStatus.md) - - [SharedStorageLocation](flamenco\manager\docs/SharedStorageLocation.md) - - [SocketIOSubscription](flamenco\manager\docs/SocketIOSubscription.md) - - [SocketIOSubscriptionOperation](flamenco\manager\docs/SocketIOSubscriptionOperation.md) - - [SocketIOSubscriptionType](flamenco\manager\docs/SocketIOSubscriptionType.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) - - [TaskUpdate](flamenco\manager\docs/TaskUpdate.md) - - [TaskWorker](flamenco\manager\docs/TaskWorker.md) - - [Worker](flamenco\manager\docs/Worker.md) - - [WorkerAllOf](flamenco\manager\docs/WorkerAllOf.md) - - [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) - - [WorkerStatusChangeRequest](flamenco\manager\docs/WorkerStatusChangeRequest.md) - - [WorkerSummary](flamenco\manager\docs/WorkerSummary.md) - - [WorkerTag](flamenco\manager\docs/WorkerTag.md) - - [WorkerTagChangeRequest](flamenco\manager\docs/WorkerTagChangeRequest.md) - - [WorkerTagList](flamenco\manager\docs/WorkerTagList.md) - - [WorkerTask](flamenco\manager\docs/WorkerTask.md) - - [WorkerTaskAllOf](flamenco\manager\docs/WorkerTaskAllOf.md) + - [AssignedTask](flamenco/manager/docs/AssignedTask.md) + - [AvailableJobSetting](flamenco/manager/docs/AvailableJobSetting.md) + - [AvailableJobSettingEvalInfo](flamenco/manager/docs/AvailableJobSettingEvalInfo.md) + - [AvailableJobSettingSubtype](flamenco/manager/docs/AvailableJobSettingSubtype.md) + - [AvailableJobSettingType](flamenco/manager/docs/AvailableJobSettingType.md) + - [AvailableJobSettingVisibility](flamenco/manager/docs/AvailableJobSettingVisibility.md) + - [AvailableJobType](flamenco/manager/docs/AvailableJobType.md) + - [AvailableJobTypes](flamenco/manager/docs/AvailableJobTypes.md) + - [BlenderPathCheckResult](flamenco/manager/docs/BlenderPathCheckResult.md) + - [BlenderPathFindResult](flamenco/manager/docs/BlenderPathFindResult.md) + - [BlenderPathSource](flamenco/manager/docs/BlenderPathSource.md) + - [Command](flamenco/manager/docs/Command.md) + - [Error](flamenco/manager/docs/Error.md) + - [EventFarmStatus](flamenco/manager/docs/EventFarmStatus.md) + - [EventJobUpdate](flamenco/manager/docs/EventJobUpdate.md) + - [EventLastRenderedUpdate](flamenco/manager/docs/EventLastRenderedUpdate.md) + - [EventLifeCycle](flamenco/manager/docs/EventLifeCycle.md) + - [EventTaskLogUpdate](flamenco/manager/docs/EventTaskLogUpdate.md) + - [EventTaskUpdate](flamenco/manager/docs/EventTaskUpdate.md) + - [EventWorkerTagUpdate](flamenco/manager/docs/EventWorkerTagUpdate.md) + - [EventWorkerUpdate](flamenco/manager/docs/EventWorkerUpdate.md) + - [FarmStatus](flamenco/manager/docs/FarmStatus.md) + - [FarmStatusReport](flamenco/manager/docs/FarmStatusReport.md) + - [FlamencoVersion](flamenco/manager/docs/FlamencoVersion.md) + - [Job](flamenco/manager/docs/Job.md) + - [JobAllOf](flamenco/manager/docs/JobAllOf.md) + - [JobBlocklist](flamenco/manager/docs/JobBlocklist.md) + - [JobBlocklistEntry](flamenco/manager/docs/JobBlocklistEntry.md) + - [JobDeletionInfo](flamenco/manager/docs/JobDeletionInfo.md) + - [JobLastRenderedImageInfo](flamenco/manager/docs/JobLastRenderedImageInfo.md) + - [JobMassDeletionSelection](flamenco/manager/docs/JobMassDeletionSelection.md) + - [JobMetadata](flamenco/manager/docs/JobMetadata.md) + - [JobPriorityChange](flamenco/manager/docs/JobPriorityChange.md) + - [JobSettings](flamenco/manager/docs/JobSettings.md) + - [JobStatus](flamenco/manager/docs/JobStatus.md) + - [JobStatusChange](flamenco/manager/docs/JobStatusChange.md) + - [JobStorageInfo](flamenco/manager/docs/JobStorageInfo.md) + - [JobTasksSummary](flamenco/manager/docs/JobTasksSummary.md) + - [JobsQuery](flamenco/manager/docs/JobsQuery.md) + - [JobsQueryResult](flamenco/manager/docs/JobsQueryResult.md) + - [LifeCycleEventType](flamenco/manager/docs/LifeCycleEventType.md) + - [ManagerConfiguration](flamenco/manager/docs/ManagerConfiguration.md) + - [ManagerVariable](flamenco/manager/docs/ManagerVariable.md) + - [ManagerVariableAudience](flamenco/manager/docs/ManagerVariableAudience.md) + - [ManagerVariables](flamenco/manager/docs/ManagerVariables.md) + - [MayKeepRunning](flamenco/manager/docs/MayKeepRunning.md) + - [PathCheckInput](flamenco/manager/docs/PathCheckInput.md) + - [PathCheckResult](flamenco/manager/docs/PathCheckResult.md) + - [RegisteredWorker](flamenco/manager/docs/RegisteredWorker.md) + - [SecurityError](flamenco/manager/docs/SecurityError.md) + - [SetupAssistantConfig](flamenco/manager/docs/SetupAssistantConfig.md) + - [ShamanCheckout](flamenco/manager/docs/ShamanCheckout.md) + - [ShamanCheckoutResult](flamenco/manager/docs/ShamanCheckoutResult.md) + - [ShamanFileSpec](flamenco/manager/docs/ShamanFileSpec.md) + - [ShamanFileSpecWithStatus](flamenco/manager/docs/ShamanFileSpecWithStatus.md) + - [ShamanFileStatus](flamenco/manager/docs/ShamanFileStatus.md) + - [ShamanRequirementsRequest](flamenco/manager/docs/ShamanRequirementsRequest.md) + - [ShamanRequirementsResponse](flamenco/manager/docs/ShamanRequirementsResponse.md) + - [ShamanSingleFileStatus](flamenco/manager/docs/ShamanSingleFileStatus.md) + - [SharedStorageLocation](flamenco/manager/docs/SharedStorageLocation.md) + - [SocketIOSubscription](flamenco/manager/docs/SocketIOSubscription.md) + - [SocketIOSubscriptionOperation](flamenco/manager/docs/SocketIOSubscriptionOperation.md) + - [SocketIOSubscriptionType](flamenco/manager/docs/SocketIOSubscriptionType.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) + - [TaskUpdate](flamenco/manager/docs/TaskUpdate.md) + - [TaskWorker](flamenco/manager/docs/TaskWorker.md) + - [Worker](flamenco/manager/docs/Worker.md) + - [WorkerAllOf](flamenco/manager/docs/WorkerAllOf.md) + - [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) + - [WorkerStatusChangeRequest](flamenco/manager/docs/WorkerStatusChangeRequest.md) + - [WorkerSummary](flamenco/manager/docs/WorkerSummary.md) + - [WorkerTag](flamenco/manager/docs/WorkerTag.md) + - [WorkerTagChangeRequest](flamenco/manager/docs/WorkerTagChangeRequest.md) + - [WorkerTagList](flamenco/manager/docs/WorkerTagList.md) + - [WorkerTask](flamenco/manager/docs/WorkerTask.md) + - [WorkerTaskAllOf](flamenco/manager/docs/WorkerTaskAllOf.md) ## Documentation For Authorization diff --git a/web/app/src/manager-api/ApiClient.js b/web/app/src/manager-api/ApiClient.js index 2a8c99a2..f0bea527 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/3.5-alpha1 / webbrowser' + 'User-Agent': 'Flamenco/3.5-beta0 / webbrowser' }; /** -- 2.30.2 From f757deee6ac95c3fdd66aac4522428e04a677937 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Thu, 4 Apr 2024 10:44:53 +0200 Subject: [PATCH 48/84] Security: Bump Go version 1.22.2 and golang.org/x/net package Fix a bunch of security issues by upgrading to Go 1.22.2 and bumping a few packages to their secure versions. - [Incorrect forwarding of sensitive headers and cookies on HTTP redirect in net/http](https://pkg.go.dev/vuln/GO-2024-2600) - [Memory exhaustion in multipart form parsing in net/textproto and net/http](https://pkg.go.dev/vuln/GO-2024-2599) - [Verify panics on certificates with an unknown public key algorithm in crypto/x509](https://pkg.go.dev/vuln/GO-2024-2600) - [HTTP/2 CONTINUATION flood in net/http](https://pkg.go.dev/vuln/GO-2024-2687) --- CHANGELOG.md | 5 +++++ go.mod | 8 ++++---- go.sum | 6 ++++++ 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 111f84f2..fea57b51 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,11 @@ bugs in actually-released versions. - Show the farm status in the web frontend. This shows whether the farm is actively working on a job, idle, asleep (all workers are sleeping and no work is queued), waiting (all workers are sleeping, and work is queued), or inoperable (no workers, or all workers are offline). This status is also broadcast as event via the event bus, and thus available via SocketIO and MQTT. - Fix an issue where the columns in the web interface wouldn't correctly resize when the shown information changed. - Add-on: replace the different 'refresh' buttons (for Manager info & storage location, job types, and worker tags) with a single button that just refreshes everything in one go. The information obtained from Flamenco Manager is now stored in a JSON file on disk, making it independent from Blender auto-saving the user preferences. +- Security updates of some dependencies: + - [Incorrect forwarding of sensitive headers and cookies on HTTP redirect in net/http](https://pkg.go.dev/vuln/GO-2024-2600) + - [Memory exhaustion in multipart form parsing in net/textproto and net/http](https://pkg.go.dev/vuln/GO-2024-2599) + - [Verify panics on certificates with an unknown public key algorithm in crypto/x509](https://pkg.go.dev/vuln/GO-2024-2600) + - [HTTP/2 CONTINUATION flood in net/http](https://pkg.go.dev/vuln/GO-2024-2687) ## 3.4 - released 2024-01-12 diff --git a/go.mod b/go.mod index 5f989ad1..c4b1fe36 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module projects.blender.org/studio/flamenco -go 1.22 +go 1.22.2 require ( github.com/adrg/xdg v0.4.0 @@ -28,10 +28,10 @@ require ( github.com/stretchr/testify v1.8.4 github.com/zcalusic/sysinfo v1.0.1 github.com/ziflex/lecho/v3 v3.1.0 - golang.org/x/crypto v0.16.0 + golang.org/x/crypto v0.21.0 golang.org/x/image v0.10.0 - golang.org/x/net v0.19.0 - golang.org/x/sys v0.15.0 + golang.org/x/net v0.23.0 + golang.org/x/sys v0.18.0 gopkg.in/yaml.v2 v2.4.0 gorm.io/gorm v1.25.5 modernc.org/sqlite v1.28.0 diff --git a/go.sum b/go.sum index ccd57485..2bdf9506 100644 --- a/go.sum +++ b/go.sum @@ -201,6 +201,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20211215165025-cf75a172585e/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY= golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= +golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= +golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.10.0 h1:gXjUUtwtx5yOE0VKWq1CH4IJAClq4UGgUA3i+rpON9M= golang.org/x/image v0.10.0/go.mod h1:jtrku+n79PfroUbvDdeUWMAI+heR786BofxrbiSF+J0= @@ -223,6 +225,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= +golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= +golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -262,6 +266,8 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= +golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -- 2.30.2 From 3b2143777650a7aa05a2a275abf20c1913f0b728 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Thu, 4 Apr 2024 10:47:23 +0200 Subject: [PATCH 49/84] Website: bump experimental version to 3.5-beta0 --- web/project-website/data/flamenco.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/project-website/data/flamenco.yaml b/web/project-website/data/flamenco.yaml index cce272e2..7afaaa3c 100644 --- a/web/project-website/data/flamenco.yaml +++ b/web/project-website/data/flamenco.yaml @@ -1,2 +1,2 @@ latestVersion: "3.4" -latestExperimentalVersion: "3.5-alpha0" +latestExperimentalVersion: "3.5-beta0" -- 2.30.2 From cfad4e73f937e199e89e5b4da087cd06a57f4493 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Thu, 4 Apr 2024 10:54:53 +0200 Subject: [PATCH 50/84] Bumped version to 3.5-beta1 --- Makefile | 2 +- addon/flamenco/__init__.py | 2 +- addon/flamenco/manager/__init__.py | 2 +- addon/flamenco/manager/api_client.py | 2 +- addon/flamenco/manager/configuration.py | 2 +- addon/flamenco/manager_README.md | 2 +- web/app/src/manager-api/ApiClient.js | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 5e0ae9ba..ac57a708 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ PKG := projects.blender.org/studio/flamenco # To update the version number in all the relevant places, update the VERSION # variable below and run `make update-version`. -VERSION := 3.5-beta0 +VERSION := 3.5-beta1 # "alpha", "beta", or "release". RELEASE_CYCLE := beta diff --git a/addon/flamenco/__init__.py b/addon/flamenco/__init__.py index ba04cb53..7b014801 100644 --- a/addon/flamenco/__init__.py +++ b/addon/flamenco/__init__.py @@ -12,7 +12,7 @@ bl_info = { "doc_url": "https://flamenco.blender.org/", "category": "System", "support": "COMMUNITY", - "warning": "This is version 3.5-beta0 of the add-on, which is not a stable release", + "warning": "This is version 3.5-beta1 of the add-on, which is not a stable release", } from pathlib import Path diff --git a/addon/flamenco/manager/__init__.py b/addon/flamenco/manager/__init__.py index f16438a5..643de81a 100644 --- a/addon/flamenco/manager/__init__.py +++ b/addon/flamenco/manager/__init__.py @@ -10,7 +10,7 @@ """ -__version__ = "3.5-beta0" +__version__ = "3.5-beta1" # import ApiClient from flamenco.manager.api_client import ApiClient diff --git a/addon/flamenco/manager/api_client.py b/addon/flamenco/manager/api_client.py index 80320df4..bee2d129 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/3.5-beta0 (Blender add-on)' + self.user_agent = 'Flamenco/3.5-beta1 (Blender add-on)' def __enter__(self): return self diff --git a/addon/flamenco/manager/configuration.py b/addon/flamenco/manager/configuration.py index 37660313..52148f33 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: 3.5-beta0".\ + "SDK Package Version: 3.5-beta1".\ format(env=sys.platform, pyversion=sys.version) def get_host_settings(self): diff --git a/addon/flamenco/manager_README.md b/addon/flamenco/manager_README.md index f9002fa4..c6fb580a 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: 3.5-beta0 +- Package version: 3.5-beta1 - Build package: org.openapitools.codegen.languages.PythonClientCodegen For more information, please visit [https://flamenco.io/](https://flamenco.io/) diff --git a/web/app/src/manager-api/ApiClient.js b/web/app/src/manager-api/ApiClient.js index f0bea527..82a9d30d 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/3.5-beta0 / webbrowser' + 'User-Agent': 'Flamenco/3.5-beta1 / webbrowser' }; /** -- 2.30.2 From 03a889345d6c032d62d7ed3a3441878d5a683304 Mon Sep 17 00:00:00 2001 From: Taylor Wiebe Date: Sat, 18 Nov 2023 18:08:29 -0600 Subject: [PATCH 51/84] OAPI: add optional description to job types This description will be shown as a tooltip in the job submission UI. --- pkg/api/flamenco-openapi.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/api/flamenco-openapi.yaml b/pkg/api/flamenco-openapi.yaml index c0c8dc50..72f6a5dc 100644 --- a/pkg/api/flamenco-openapi.yaml +++ b/pkg/api/flamenco-openapi.yaml @@ -1719,6 +1719,9 @@ components: properties: "name": { type: string } "label": { type: string } + "description": + type: string + description: The description/tooltip shown in the user interface. "settings": type: array items: { $ref: "#/components/schemas/AvailableJobSetting" } -- 2.30.2 From 2bbb7b48d2ac08f491b54a9745ecba3c1f92f6e3 Mon Sep 17 00:00:00 2001 From: Taylor Wiebe Date: Thu, 4 Apr 2024 11:09:47 +0200 Subject: [PATCH 52/84] OAPI: regenerate code --- .../flamenco/manager/docs/AvailableJobType.md | 1 + .../manager/model/available_job_type.py | 4 + pkg/api/openapi_spec.gen.go | 404 +++++++++--------- pkg/api/openapi_types.gen.go | 3 + .../src/manager-api/model/AvailableJobType.js | 9 + 5 files changed, 219 insertions(+), 202 deletions(-) diff --git a/addon/flamenco/manager/docs/AvailableJobType.md b/addon/flamenco/manager/docs/AvailableJobType.md index d2e6b305..5360020c 100644 --- a/addon/flamenco/manager/docs/AvailableJobType.md +++ b/addon/flamenco/manager/docs/AvailableJobType.md @@ -9,6 +9,7 @@ Name | Type | Description | Notes **label** | **str** | | **settings** | [**[AvailableJobSetting]**](AvailableJobSetting.md) | | **etag** | **str** | Hash of the job type. If the job settings or the label change, this etag will change. This is used on job submission to ensure that the submitted job settings are up to date. | +**description** | **str** | The description/tooltip shown in the user interface. | [optional] **any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional] [[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/available_job_type.py b/addon/flamenco/manager/model/available_job_type.py index 2a4015c8..b55af5d1 100644 --- a/addon/flamenco/manager/model/available_job_type.py +++ b/addon/flamenco/manager/model/available_job_type.py @@ -91,6 +91,7 @@ class AvailableJobType(ModelNormal): 'label': (str,), # noqa: E501 'settings': ([AvailableJobSetting],), # noqa: E501 'etag': (str,), # noqa: E501 + 'description': (str,), # noqa: E501 } @cached_property @@ -103,6 +104,7 @@ class AvailableJobType(ModelNormal): 'label': 'label', # noqa: E501 'settings': 'settings', # noqa: E501 'etag': 'etag', # noqa: E501 + 'description': 'description', # noqa: E501 } read_only_vars = { @@ -152,6 +154,7 @@ class AvailableJobType(ModelNormal): Animal class but this time we won't travel through its discriminator because we passed in _visited_composed_classes = (Animal,) + description (str): The description/tooltip shown in the user interface.. [optional] # noqa: E501 """ _check_type = kwargs.pop('_check_type', True) @@ -243,6 +246,7 @@ class AvailableJobType(ModelNormal): Animal class but this time we won't travel through its discriminator because we passed in _visited_composed_classes = (Animal,) + description (str): The description/tooltip shown in the user interface.. [optional] # noqa: E501 """ _check_type = kwargs.pop('_check_type', True) diff --git a/pkg/api/openapi_spec.gen.go b/pkg/api/openapi_spec.gen.go index f0cf7565..3401a109 100644 --- a/pkg/api/openapi_spec.gen.go +++ b/pkg/api/openapi_spec.gen.go @@ -44,208 +44,208 @@ var swaggerSpec = []string{ "ZKnbW7eLHxqZ//DAbDqTVA+GgNfbbjJAnQard8g4jAm9jj03OdjEfjM5IjRb0hXS9DGZ1PxqcoToAV9b", "0vXuGEVwAKgV3EryXcYvGaEOaISm6UiK78dksmTT2DBLNq25IWBdTgWdM0PUkNYLqZGo21kcY3svp2My", "QVlickQEu2IlDP2nNi5b0mhWirKheRGAA3qnmV3QrElr3GnVAMWZBkB0LFwGw8GSTTeeWRwjne5S4wlK", - "OVwZRk7nrLSMWQNFpLlh/hFFh2ka0ZZ+omoR3njgMuS4QwIUsdwqo1OWkWSBTBaWYUZGwQN/HpMz8zNX", - "yEekqA/fS8tMqKo0nMWKlF6mb05q7kdVgBRNNeuR6GBJu6nWboKtzQIx1bOjtbWIsyVQuLxgziGexSaC", - "bdAhwtRfcaUdhQKS248YXSRwWvf1Nn7W4IQ9u66niG3QXvgTqhfPFiy5fMuU1XJbarmR+Lub72gkKycK", - "6IVBuO+E1N9bOh0VlkBgjWu8KMsCRi6pQtXfYN6MixRncSQ+OrC6wGmjlgQUeRbML9SyElkaujWOCi3A", - "zKIrhUH8QmeyEml0TUpWZbJR4giO5BQ/aB8pAs2uyA8b7nloD2zDkb/kIq1PfCv860GYiMWkuw9D9UJB", - "giolE041kmSzmwsmrq5oObCI0S9AOLNg5zzsA1Iyo4OBiE2JQhuUNWYBvfvAkkqzTebKflugp+zBYwfj", - "ON0JPokdy4uylGV3Pz8ywUqeEGYek5KpQgrFYobVNILqP52dnRC0/hHzhhff/UDk2LDSJKtSNJPgpVhl", - "kqZEScRqD0BcbQO2WWaXxgXaKbk0euUzM9nD/UPPdbxtIaWaTinqmtNKrQx3YgQW6hZlmZcUmnJBKLn3", - "lulyNXo606y8h68uGAXzhVkeFylPqGbKGqhQQ9U8R33bHAVTXvksmS45S8fkJWiqTiyxA3IFgotBE2qE", - "Y8fL7ynL98y7ScaZALNJKomSOTOK4ZyUjCoJ1gkC4hT7gJeH04xMaXIpZzPkmN6g60TJrjU5Z0rReQz3", - "WsgF516/H8WsKyb0S1rmp1uZqOs33zLDx/wQP8vpu8Lw/aiyopj2xt0hMdgBej45lckl08dv9l7/29kZ", - "ogFKnyicKHMQJRFsaX5UQzIpSnbFZaUuEG8n3jbDPiCaIhDbRrSMaXZhz5qlFzTCVY5nVp3NGHAsQ639", - "F1Z4chYQnjOlaV4QQ9URoQyuOWQynyotS5SnXmY0ZyKRntE3j9nAbGRGjDKqCBF79+74uZMCfwZD/gYf", - "QC1aNQf6heahAhk3VzTAvQk7jLzl/RehR8QrMw/3YwhdslnJ1OIC7L+Ro/F32Iug9papBdiU7fdAcOxu", - "7im0JtfyLWAdKiPKXFgDeDU0SAdya0pBC2E0WQDRuOJpRTP0ZC1hlrmhtmBikdIQgZUbxFqUi5ImYOnq", - "tWzsDsR+/w9MHUGPM4+cckYyqrRd5dY4t6TqAm9M2uNowStqsPy9Ubbty/UdMbddSzLRZcUmVkGxTwqW", - "8Bk3L4M+B1ZInt6r7ciK6aGlzOYmududF3q1leUPLoADTuDcsi6rwKnVRLpe2viKKv3WGjv7KJxFUFnW", - "CGogXxtJeU7nNX910LPLjEv+W7n3hgO9qPKpoDzbAq3CrRybFYGjIqYT4FxUXdp/+Un6wcRn7NkqiYnU", - "ngBmfMZGiXmJsCuwBVjbu9EegSuqRYXGgFQuxdAIJyX8WRVDwnQSI+7bWPr84mCpqBm1dt1rlsNPqLp8", - "Jed95w+O70zOSbKoxKVlcFoSSoCvaVnwZM/xOlJKmZOUIU1L8T0rQxmQD+GXK8lTM04KMkiL4MTgkMmI", - "xeCZWY+j8dquckxe05WXoPIq07wAsUQwBe+yDzqqojiEWMuSIERguKNfukY1s421x7CNlHEGYNwgZgA4", - "OnIGUIPrChqG/l81gwC25+XbAW64C3HYzPc1Tvq5jL8ZuXCdb26Kn8XYg6dwVvmKsAt/kr24iFrhGe0l", - "CvgCOaPzDajItUfDGH1DS+A6SPqlbMu+wQa4JfvezHL77GMBmLa5tPjmxmu7RLCugVhCxYWRHmip19l3", - "uLJTgvJHKy1H9qu4icfCKao8OBkTTeFM1xqtXa6Bth1g/MWkf1z+NjTD3JsLxVgkfsQIBU4f5ipcr3nf", - "2UACI+V2a99MepZu9Z9LfBAMu5Kf+FcXiFe7fPwMvniLut/NiuZXrFQ2EmQLMtdP3dw4w8Zdid3hpmXA", - "GeiAOoJRMQV74pJCbIKhmypjrAATnbmS1L5XiUshlwLXACJd1HDXsS6YOTECAQIS7UJw2k/te692tGB0", - "owbw5ygcrAz71/oEgoXNOfjpDscHo8ePRvM0PXyQPjz8wZ3B0eD/lVXp7tAAwlpK7Q9zcDg+HNGsWND9", - "4GzCn8l3nbG/7+4fVrGTY6WxjI9r8a2JyRYMXqPxzq2cUatlL6qcCiNlqiqHz1DGKlnGqGJkWvEsdQGi", - "4FQypIEqMglXNUEVQQLJrj+BiCVrmMSvJ3OuJ8R+BebGqP+pdeD1PWiAwl8dA9EYNvyMwaU0y97MBkd/", - "W49wp85bZr76NPy4RmZc6z9xWiVxXxApvD4ZldcxIiRmBzcPwLnnKNLWJOif3pZ2DSPOzgxh/BnCrTv0", - "DWLtp98Qj/+cyeQy40r3Oy+RUVvjGy0ZGMEhEpSlJGElqJGgTaGLUxoxzVp6EoecW/mPwvW8ELpcxVxH", - "3Zc6Dsn1odO4n211KPt2DxFtnUA9dBgp3UNCntvrEQ8XNb8SOpWVxlhOp39aKdJJmNacxBviZYsvLmhO", - "xUWyYMmlrPR6n+cpvEzcy0EkkFtAyXJ5xVJCMynmGDjtQje2CcxrrqUHNHFLVWfhL4Ss5ovQuwTsggZO", - "mIKzhBEt57jFlM9mrATTMZwg2G7N14SShQSTXQZCC3n39pVz6URseWNyJoG5QdQQBs+8fTU0PyVUM0E1", - "I+eDj1Oq2Ke9j1J4qVdVsxn/wNSn80FMdzEfNNGyzKJUyA7TcM1uiFNvHQVMFYzUcxSvqVIOU09ZxpJ4", - "GPqJd2BiGLV5NmWWor+XU+Vs9TUKG3QJhCjQUSzNusjph8HR4GD/4HC0/2i0f//s/uHR/QdH9x/+6/7B", - "0f5+V/jpft0JsMwyXAg641nJQpJrFjaTJXj5HV+teVPr8u1An6MgZZqmVFNg/2kKwZM0O4mYNRuMt7GZ", - "csp1ScsVye1gDqHH5LXZhqGuGfsQhrVZH2cuzS4g/qRSXMzJhI6n42RiyHp9hwyuXrJV64yKUsI+jgan", - "Rck1Iy9LPl9ow2wUK8csB0P0QK2mJRP/99SGYMhy7t6w8vApvEBO9f/+X1csG/TA6cQa6595nax55qGH", - "KacfeG60k/v7+8NBzgX+FXE3ta6BH6QH/0+D6KP4YemyYj3f9mtOCRWJOQZMoynQXjMczCjHHwtaKfjH", - "3ytW4WvwxcjLUQPcB6sYql6VgfXI06RmpHONR35ZfVBFT3U8mAWfBSHzNnoAQ8m+iLgU18mGbll9p6Rl", - "2csm7EPgEz7A0QWre5HSXI9KQWQhsjjzFvIDlpIZz5hCpitYwpSi5SpGwFsMLmouv/fMcdfj5/eCCAgQ", - "3VzMQZsRh1kxY/KUG01I4ErdJzGm7exQVkhwzHtWytxvvU9VigH6jKpLdVrlOS1XsXyuvMjAwUcyKz1i", - "To+D+pg8Q78DRodYa7sLCTU/uUMCR6x5Po6YRK2beCuhEuzMdsFbxMP1MkL1bxXDPYdMi+dG6344HOQB", - "Ue8jk5+GA8g0upiuIBvPsiuIFK6ND9YSxUWDYHg6YEnEb10WiGv5WFO/+/Hokc/mPi95po1CXnOfoeMl", - "r47/8qJmJdH8AzmbKdZcaDQqoAbVxx1y8dSW9LpvR2FI6y67Ck6tfSveMl2VAo3DIIGA0Ewd9eRW3IAt", - "7KIrtcMEAqTuR+C+IE5A/W3vFJoyrnmXIt7YgENiqHg5AkNhVQyG9S+LSqdyGWdr1iDwTIoZn1cldVJq", - "c5NcveSl0m8rscEzwBVI9xxFfkNAZ+bDOnDMzkfKSgQxJj6ZC8QrSmZsSWbUkGI1JDaMXkgxgoxHo4Uk", - "4XqByRgB1CnVPrR6yiA2JS+0IenmLb1gKytSi3uaTFlv0AnwEUyMS7fS/WAVuqRCzVhJnp4cQ06ICy0e", - "94S2AIt9JRMa1w+ee5YE/M5wM3PTYC778XijgaM9S3t3w/CAY6hnT+2vtOQu/LeNIBd6KZc0wtveCDZa", - "0hW5sh9jwDtkREqlIX5Umktuc+8gW4RD8lzJIKsyhwAkw3gnH40c/GliFUxeYrafE0kWkF+jnMfLpdX7", - "IGfnKxuTs6WMrAnMo3bStJNn4aUfZpdfZFQbbWbkbTaY7wrigh1kuvKL7kM0+GizicSaVmtAuy+3OK+n", - "VcqZaAYLW+uUVTDUOuLghlHrWN86stdGnw5jfE2LwsAYTtkdCjFbhhw67TPzOKa3Rza8+gtjxdtKiGjC", - "fB0KtwwurnXa5XRFLhkrDFESTiiMi1B5Z57ugdaKQI9U3/B8xYhLK3CPNvWF2iTsNc6lxetjH9oHEvmC", - "kcnSu9zYhFjfEqan1Bm0eH3MJADvuTT/FeyDbgShoWN7SCZNIEzI63enZ0ZDnkAy5GSreLMWID3U+mAU", - "w3IfL3/sEh5aeq5NLlh/sVrh8JHhbz1/46ulWYAmxNLNHMVmSWyXHPGWzQ3bLllqPe8dSNI0LZlSO5YO", - "sfQ3ftPkTC9pydZcw5093S4F6cKbqNVuMvZnFR+xDMCBKixA4gAxHCSYw3ph45M8FHpWHzutU5ZUJdcr", - "nzvRooDbBtGvi54/ZboqnirFlaZCo/AZSzsJhTw5NbKd08FB7jKjED9Ml1pbQ9oLyEuhWyQm9yfifC1B", - "rbuFKDxBnHvW66k4xWAha4yxrgdektOfnh48fITXXlX5kCj+D0j0na4gyNsIZLZ+AMnsolxCS9dq0jJ6", - "wmzg5kXyM6hT3sdziULo4Ghw+HC6/+DJ/eTg8XT/8PAwvT+bPng4S/Yf//CE3j9I6P6j6f300YP99ODh", - "oyePf9if/rD/OGUP9x+kj/cPnrB9MxD/Bxsc3X9w8AD8xDhbJudzLubhVI8Op48PkkeH0ycPDh7M0vuH", - "0yeHj/dn00f7+4+e7P+wnxzS+w8f33+czA5p+uDBwaPDh9P7PzxOHtEfnjzcf/yknurg8aeuIcFB5CRK", - "bc2vgfToFCHLr8MqBG4cV2jE+1asX6Vt4gIaTpVXitDnG4YfkWNBsDaJ9dUr51exY2EMkwttMw/O/XbI", - "8fPzARqbnMrtAwZ8BhDFVYCuNrF2nJHKqvkeFKwYGeq1h0UfRsfPJz1ZrhZlttSmce0vecZOC5ZsVKxx", - "8GHzmDbfppr7x+y65hla6VqnEqvCdA30sG7pNmKA4mxBX/vm9IIK6/VsRg5Q1RgU3DI2O5m6Uhz1NSZn", - "gXTx+ci3RUDJlkfij7pL4KwKRp3URZHyWlplFx3Q4bik2HLky3o8NGXUI3pPbLT6Do2ssElqwzGjYwCd", - "+dg1t7EmjR5sdNSY1djxhv3CbhPAv3K9qJ0wW4HaKeGJ81ZGQT+0YuqQpKywUfpAR5xP5Bs/m21lz+A4", - "evw7nVMdrovD64wXWALqIMOqyCRNUR/D4KGoWQAHe4urgYo7LorzuoIHCBoN2PXKEjckNNyKgHAL7K3/", - "8JvnhUnBca6GpwViNiVl8JljKcPwKK1tQjavOyuvjNzxkmcsiIACRDOcxL5mfnOJIbVcHyZk3xYO1BfT", - "34ebQYtwIn/dvjCuBOT7c7EGK002CUfbS4znvyvP/VKEcC3RK1l6uklza7MSBZ/VHIumRii2Ol0QoUet", - "VZWcV/v7B4+8PdhKZ5UymN8xNGtpB4zMhcKUvwdWgLqnmu6OaAZVYOHdwRLrDcOfhoMsANCOtpZbcJW0", - "Tj2rNWS/9YYhpLmmKHbYLJnTarqmTOgpE2DF91mIGCKnIOR6TwXfTjA50xZx09IWb3JUMnjTPHwvpz4r", - "kTxzY2LNqTnT4XNUvcDUS9WlT552f2dyrtCtJRizdTiKjCdcZys37ZRhFDk4Vsyj1dBvxGgRmH/j3jVj", - "SIGxD99pCetpTD1zGbvv5fR74N3mdfPKPQX5nGC01jxn43PhfHxCajSNTFeQ3glaieUjVJOilFomMnOV", - "kjy00DeDwPSlkCGzaVpKyHwyIzdjMpqXQxYbqUwEF944W/m2dfFig7hqQs7y1x9GjeUutGwewx6pRP2D", - "oQzjnZNEZbGufN76rQdiol8GxEzVf0UlxD5QRIgD1eSSi9TmRGwNAx8ZlmU/yykEaWfZr96pZQszUHWZ", - "yTk+DINjw9fP6Dzu/mpkIERrltUWraC4l5Y1NjYlmG1iXT4/JNA+OPz9/yP/9e+//8fv//n7//j9P/7r", - "33//n7//5+//f5jLD1UlwrgPmAW0nqPBHgbu7qnZ3ns5VWjGuX9wOIaXwIxSicsLlGsOA5w8+eVHg6KF", - "GhwZsQrqnBpp5/7o/j6WMryARDW2VL58JsQGY3lD9kEzYTN5xoV1DZmVXMhK+/JFjfXhFH6Fe/Gd2zqM", - "nfFKKfXa8WxxTazqd1FzwkHGRfUhuH7gtR7Zo7KBz92I2xAJNsSK+IDXbSuob6gXEp71phgZ92pt+94q", - "sqYOJ+yBWic8AGmNmBO1UprldcC3/bZVaQ/CDBM5F1yxrnhlX65jpinJ5JKVo4Qq5s2Wdgq3KBtico4H", - "ej4YkvPBkotULhX+kdJyyQX+WxZMTFVq/mA6GZNTP5XMC6q5r4r+o7ynyKSsBPDBH9+8OZ38iZSVIBPw", - "r8qMpFxpiPeDgAbDZakP/3MFif0i1fhcPFVO/qQZMTsaNvZBzl3Mz/nAGQdtcXe0zbhwbCjzWJSQD0EV", - "OR80pU033vmghn0ulZEnQKy5ZEQzpfdSNq3mtnqkIowqDnUarTTi4kLRe80TksoE6vNCokuWNXYWLZvQ", - "l4hifrjYvtTjkCSy4KGCOWkX/Bub0Sa+/G+3WOSZ/atO5jDEm6WEW/84FmJJJVPiniY51Qmmd9BEVzTz", - "I3UM82dYdhhER9WuIQl4JLM0CKxrlotvl/D05cJdiZRzcdxYIFdE5sinhrWtDMqGrQqqVKtOdCedJwp0", - "mw6u6RxFOXv7XDm4Ovo2SKM/fu5Dc2xNG8u7UX2kmviCm1NGDIlJqwyvv1kKGg0hPAGju2QZbMxgl8u+", - "MmjovvAraaa/bSVFWfdrtx5OhMjF5Kx4C5AzV18Em35AfJtyGrQz17vqbkPCx2zsEi58mEwQJjXerbTG", - "l2wcchNJkxiyezFdXbhopV2Cl22wQWStW6aw7VAxBNJotKwMnm7IV8ToNLHyJQPM/6V18oyNO9qtXMDX", - "76tyU7majvTscuLb5ne2C5rEWrqEjVv8ZdrQw8WWPdqYoAhJctL2bwlKGX1WZau4d8IQGjCwt4oaDRsW", - "9y6mBLWLNs5clVl84ndvX4VpyvXshGvFspn3ZMqlyCRNt4lAqksf+VPEnD/Yf9+pfEZmkU8kUHKmR+2E", - "o5j+WE94l3KGwlt9jaShMC2kqxNXShPWzS6t0R3znWWj7nlddhDE3y7271i26S4Rw+umo29JkdxMfSe1", - "rvIaPvMlHiHw3oly0lJpVMUQ86yZG+yNQLHgxKCMK4p62ATGSPb+9MB2JwsMGP4TkdZE0nqBzwVUKvgO", - "5BvpIq4njt7aKmJCasJKaiNbfTmHttRulvX9pjJj3Rj1jAvbssNG30IkxT1FEt8XAgPMeZi+DeSavLli", - "5bLkmqEsz2WloKCRCKpOuDzTqPgQK0L3Ss5tcTlPA7DOnZOKXTsJs2g4FZiQ0TLjPQW8dYME7kAloshV", - "R3NG9YGSQVhKwkAnBOWdC4zKx3Eizv51gaCfRwXWXDI3aewS1XvcrmqJDRr1eXOdRIniIthjSzI4IfZZ", - "p1LVWofMdgaV/rE+P7BV01hrnjOKlMLx/bpyGDRLyVk+RTzdSqRvVGvrLgC1q20GUJfbkdzgqBqupaD6", - "TTSm9tNvw0gKfZcdOmpbo9mrbeqJdC/NrspRG0fXe4jd6P23A+O7A49BbfG2tmj7y8jXLotYURVLSgac", - "Uo6E1CPNsmxExUoKFkYyHw0Oxwd9sD/6mwuYNZLbLC/Y3HbSGdWtVAbDQc5VEskEvWaouV34xy9/s9ry", - "Gc7UdHTGprDI3H9kp3wu3rQPq1EA0Frm7QE+PTmGhnPBSVzUFbfUks7nrBxV/IYOplWasJvg0F+rq7Pa", - "mz8mR0jiJ9NZ0ZpTyhgrTq3tK+KbNo+9bcyFJ6Aa6TLdTg3MwEXLRIppmF6+cXWkfNp4SldNPc2PbQg2", - "KEpj8rQoMs5szUbMk5fmQw52q0lKV+pCzi6WjF1OINwP3mn+bl52takjKwSZUJCDB6OFrEry009Hr1/X", - "WcTYk6hG23DkwdEgl0RXBOIowE2YXoDUfTS4/8PR/j4mrVilz6Y0A165t/afROukNCfpxkTShI0UK2iJ", - "0bpLOcoYdIFy9XIs1KFIM10hX2TssgfM5LvzQS7R46Ar52z4fkxegLUzZ1Qocj5gV6xcmfFcVZxuX02/", - "/0B0AoD2ZB450HyMF2L3gNo8XJvH+rGHTWg2xg1WvOZeaKpZn05tE8rLML1u+zSfqEYcDLbVotK+Aox0", - "SS+vXYFxi4VuWF7T8uFLSg7tuoIylNB+xBwpU/YVOZsZZQSMA+26lzUC9Rf4jGT3Y6U6JFu14mmTHOuQ", - "YCiqa8tJR2wD6iKj/1itDztq5k9a/wRqc2GHRiBXtYcFpZVaA7QKryIzLrha9PXUHH7B8xz6/a052T5r", - "zJ+p4skawXP8GSWAl7uUAN7FiP5Vqu1+qQzBL1YLd5sKor4CT0uzKn1O7TXsTNuXuK31sZjiFyos5Ck6", - "K6nwpqBsZeMoV07aoHPCdeC4h6osYNsYe9egNRMXRmCQs7oEv1E/ieLmbyoYGF+6UkJHI2vUZzRDp5L8", - "ePKOYOCGt/K8ePHXFy/GdU3aH0/ejeC3iJDQ7Dq9cylNTedj8sz287XezFaJI2qr7aPh3qZcUHCzl1Sk", - "MicwoDcRKcXnwlGqL2Q72aBbnNH5lqS/pvYeCVTHTmB3YBCheaKazi94CrrFg8P7B+mjH5IRo4/S0YOH", - "jx6Nnkxnj0bsyWz/yZQ9+CFh04ha4UcIRP3NnUPWif5uxLXQcWp+ZzG7qvBRY8inNVOjkWQ7S1az/tPH", - "6zqk4l1SIkaSM3SD+9MO2NQn1LIhLdmoQ3lo97igVSxB6J1iJRSQsAVzLcs4fj4kBVVqKcvUl1AGtdrW", - "CTH6j7Nf1mYNg3oAGOBshq/WO11oXQw+fYLGi+jwgx4hiQ4MIJ5WnzGaW1cVfqmO9vZmLlyQy71ucQyM", - "WSQvaZnbMFgImR4MBxlPmM3i8MTp1dVhZ/zlcjmei2osy/me/UbtzYtsdDjeHzMxXugciwlynTVWm/vS", - "27Wyf3+8PwYFSRZM0IKDRcb8hHlIcDJ7tOB7V4d7Sbus0BwNJb4OxXEK7fh0s/4QyJiQAgKjHezvO6gy", - "Ad9To4NiBPjee+tBQ7zdMgC+OR8cXhPowmB15lNREAWdoGVWjNEzzQz1WaczKV7qv0HQHxCgeowXIi0k", - "t1W/57YzfWfATuVmA/koePcglGfPmVn6gP2Si/TPPqn8BDPHbgzc8b6YEXi/lJWoc8xBPfadSOFlG9j4", - "hdaFxQ0i6zj1nQeXRuJfllLMx63Tf8ltxLssSS5LRp69OnZ9MNFZA3FviiwpRMyBDOW2E0OKQqrISUEC", - "cuSogHf+WaarLwaNViGVCFhcB1BZWl8fRB5h8RCJQWRY+ubm8ahRmKG70l+aF3eIi8QwNzjSGRfs7uHU", - "X2nGweFKQ2y6DjK18NR6ba/q8V0/8vogNxIVTFMaBYHAa1C2kXb1VbH25Nbw858CMTE7rcbIZvLaBna3", - "wzi9yIipCVtKES8xe/uzjnyHwsWfho2xVjTPmmO15eJNCNI+iLfQY/eKxQWPrpyw9jSeJglTyvfejVRT", - "jAxJwlQu3Ng98Om/KZh4enLsEtWyTC5texGINBc027OSpD3QCSlocmkO+1z0H7diuipG1NX36Sc7p/SK", - "RUsK3QzhiU4VZZohWA3tpleI3i2kfBDp+NRCBohAX7IpLQpnJEmNijSrsqzu46ptpTEjV949UvKuDinq", - "SW3FikPW6gRNbgTscEVmlUjwJkIh9g3obRAihtm9laP6cbDB+fY+umzTT3sfnRP20zqS1GCGzYblRgHn", - "Bna2fINV4YJ81lpxto6qXVScbo6v0eIjEwbO5P4J29TrtxtkpvG87d0pptPSWknWWSPfO+zC1Mj0Nl9a", - "k4BL9DbI6bO80fa/o363bjmN2uK9yd/9qOqToHbH0rrC539j6DU2oD4DOevKAG3zAXmn6oRnJ7TTNB0h", - "M1mTBYdk1BcHZVPM+JpRaOliGEcseYRMqaqrN01LuVSNdLDrY3y9x91x3NXX7uH8kHyDLahuhNU3mpB1", - "D/lnObX5yjnXHfS8SY1jzYLALVYZCQ95p80SM6KaDW8NmrQrgPaD+wc3LyOceYrq0+GYpnPImgOZsk6b", - "a74QTZrj2Ps6W5G08tXJbAOjhCYLh3x+KLgPUpLMiCbn4lbFI3hAXEnMJiVAHLOeHagZKcvOHcG6DpBQ", - "F8o+WCy+MdzPzRxCZi9l51Khar/F1QK99uveryRYwrrr9SCepr/jhfDZnoaKYh+OhREof3lzhtmVtrGe", - "TV+o0/P0QlbzxX9fqD/KhQK02nCdAPv9vs1IYEqDEipLbk5c195ZHrlmjS5o/WZ5ppPFj5mc0kadCkgh", - "u1kuEu8Zt5VAM4xfuTPXXc+lQ8PtoWIV7QjXIxdBHznIJmblle1WGvlcbTi+N1A1GLvj1FlIcwB0z3Ja", - "55dTpUbYwAy36v7VPEDo9cZs47cbopa9beWits9mY7lmrXds6CZtY7bxtUmrwoZwIXHNKeSzmpviGpla", - "ivjoVihiyXBNQgZt62pCaM9lfGeo1WtaXuJKQ5ANa2ncdTVJSq5ZyekGjIfxcnPbdhoUeYCTFuqEKyxg", - "YJgCoIqjhLYqFRQyMydufs+bh94luTBoUUq0PS6Yf9envE9pcjkvZSXS8bn4RcJ8FO/spN2qcEK8qgph", - "T+YrlpKqAFlJaF6Ca1+K1JUFySmiJ3rtOuDB+rkrWRH2oWCJHmJ1B8ZLMql7Tk3qRHZla+8aJS3DPVFo", - "4gqztmybQEz+7nphxWUu6DRkyxndEAGx7bhiJrx2YdcmqZgzPb5tDafReqmfJQFUA8+KjRPDyhBQUYXP", - "DDKDCAOkwDYngg/vDikAIcCXgDGA34671c2xZtCPCwLFREqUhADfLk8z4tveR/PfX2jO1pqGbIWUrQxD", - "bsA7Y6dp13npVTHwWVsOsbkUXuA1MIVmNB4SG84nyPVvtnbGsjLRc1FbnIYa3CLQotYt/5LfjYoAMEBl", - "2+QaVCogqVsDsZ7KMxQ/XheEHzHC7NNWstpWWO3rC/Tj9KYYuN+2EaeeIwkK6JhnTL6ujy75fG6k1dsl", - "Wu8EckSWEsgM6PomMaAz4KSoAgwJF0lWpagcKatNQ58vow7IORYbRpXb1krygxh27YL0O+IB+UX6Bhuq", - "0+X7uxXT3zcNlh6z+vWvr4oRt2Ia5KjbdZlOS0FyXcnXm5nwI5GSIIev7z7uTZsd8+M38y30WW3017/N", - "A7kRiaveSkxhqQqDv99hzOnQ1sdYFex7I3MFbeO979LDcUtPsrubNElYAeWxmNAlZ9aoBWTFTnLXiAp0", - "E3artfXIzZ0PQLDr/f46eHVzF30tcoEtZQ2CGdVqLjXCM6hBBbf/LqEC0igwATWT4evS8m4PgCaphGBa", - "q+P6LavmDtdLHRgh41HNu+cccOJUbgdrX9v2hqa+bwEp/+AmxeZRX8O8GB200Yi8H4EU02G5oh7fDGgC", - "J3VNoD84i3Q7sTm9Pa4OwZbEweaaJks3kc87osozRrRSHhz0leNyTTfdElwkHH7v42i/MtFcg6xeEqi3", - "YMHQjHfZiKB1duQ69Dz1tav+2MjZKOHWg5rNBGOIzrBm5muh6WljuOsgaXNBFlPBc+UP22U1K9/Aw0v+", - "fxA0bm5yFyQGPXQjez6Dt74Nngx78fl8cVkRYcyZCkupqY7kc8fEQmrXDQXgaJaFq25gwzbyXnzHcSRa", - "LqgeLWWVpdY/OEplL055m9OvC6p/NR8d6+ffisDnPJJ9ch72SrBmnYgNwiBfIENhC0OXCe5sOpAIjaNA", - "JIKrKu2iNbCW6BDsTJmc2yi4XnkMTEa240o9Sz0cGpagfqHw7q+UJFK4nIBs5abgKmitbb0Prlo9dkVE", - "wVNWusco9WVgEeIqdsDZc83w9rAA7hqm3ewhe0PxPs1JYl6osGOci9EgtqHm7Tmfoj1AYzH+rg8mtM+2", - "zToDdzjy6/0nN08s/UpoVjKarmwxcSswPLhV3zueHoSgiTkEspKJakG0bis3Ca4JojxPFkQKa96/NXZT", - "tdhNi0g9wxa9tO6UitdfrfKMi0sfXQDdkhECGF+mkahYoFRGdMmywPqGfeCQWtgGWbbGe0KzzF/wOpKv", - "ph8I1Hb2g10QJSq8TLCYRudmWjK6lmaEzf+2pRzhyd4oFYk1oNyWoHwFWhLtvxhbbzW1xwa9PSSI8+FB", - "DMNaYuYd27DQulLu1JWB/p51c+QQBrZrLCb8FLLUyl78mvHajW1E+KeYcUZdtKJnG+0BfYs5FwGJfSpx", - "FTXZgXeVNgKCX0L3lsCwex9dD9NPex/hF/6PNQ71sJ2hLJkLrW3JgFt3p4XiqV2B0b26kx9+2Jk3KBfv", - "Gjv6SvGRWd3ut5m1blb8241fvE4Lyy0NkXfqEoVlzOpWm9Gmqw0BM7gv64i3x8h/bmQcxowqlqi4spnW", - "52Bb36dsxkriO7m6XjuZzdg8Hxzs/3A+8IhVx9WBUgH+PV2Vwon09faUl+MwrNK3zu0cOEbi0UxJHEPJ", - "nEnBCMsUjFPXL48tE7AFALhgFEsKWBD+PyOcZvSMitFzs8/ROxhgEIFh0KgzBkNZ8jkXNIM5zfjQugcL", - "pGcyLKjuWwxzHfSrsi2CeUi1rZLnamAJQjm8AW2p5hxj0jft7Y1d2OilXdhgY6zSNvKMTDTTI6VLRvMm", - "hfCa+pQLc7+HmxPDn+EcqtWX/Bp2RSeGdk2KB/s/bHrdomMDES3Jwfjex9ERSvu5UQcwDHfK9JJZZLfg", - "DKKBvNZuw0Fmvq+6LDt0x4vODpdB2XkY6UKEl9ilTq+/te4G1jfHIp6LXZUzMmXmQz//dNW4dyhRTHqv", - "0BExZzaxFQyBujSik285m2IDBwLOYPMp+vkOacbrNh7C/ZzJMuHTbEWSTNomDj+dnZ2QRAqBgeyuOZKE", - "QpOW8Npqm6pxXoywDzTRRNGcWUlSS9dIjaSyMkIefqCgCS2+hamGeJvqWoOREyBTma56WWmY026mqLWL", - "LlgakqN3nPQF+L2kZX5at2G5IcGonuUtiN7Xr4AVOg+4qiP0ZrTMNyTp49SdUVh7kAB+YJ3d+2h7/3xa", - "b8CHcndbha36VkJ308BqWxZEHU9YklbM5B21zDebWq0xe0a+WHPye7ZjyvrTdz24vhUkcPtZhwvQVcvh", - "Q09AWFvihA8XVBEBjWTIium7hU5hBEengRlGuucMszpw7xsciLaSTitsww053oB4Glozb4F8Z+bFu4N8", - "mn3Qe0VGudixMtFZGzjfCl4FcWVUaTJjS9txKUAybGm/FfUKP/HjuS5Oa7Fqu6CKoCnTrWLVl7fgdlrj", - "ffNxFcgCv4HACux45vPpwI3BZjOWaKcWQBdjHIEqsmRZ1s4uNN8yaiuFLKqcCoUx5CDcgwv+itNu9ZK6", - "FLi5I9AYwN0oDAiFi1XfqwnhQmlG27l4QXn13pI4vhD6zUnhVs51U11bCPcCc6PBeV1KZr0cjqqx8g27", - "sdOcM6FrWxrA54HSerqIhoPHMMrnek/TuTmJ+XbZOHVF620NGZrO68SYuxzBHrYsgBLvcBkqgcWuVaNd", - "tQ/zN7tD34gZQ0FpgfoYazBvCHlfA9Yvh8hBNfI4GQ82H0FhL/SHr/XudRu+N/8CbK+oIjDFEnZNoH55", - "7rgRnjYbuQWwaxoEDabZbp/+OmGFk7uTGWtLB1KBUQ1QZ3AbZGkg2tBuE9q82HR22sTNPkK2IVbQH5i6", - "lWv2qiffo27Er8ZrsjGX4Wv99yxe4ReCIL76BdgN8W+R0pnLFIQCoT3ZxQVBkxPlXT5DomRtL01olllD", - "6aWQSwhje/fu+PnduYQ+AEaw5a7XDyWRJurFb1vQzXLThbuF29Z31f4CXhC31k13TW0FI5tM4j51om7D", - "4RJrA9AF3t5H2xtjB9FrK5XSD3vz6dCdetkWdzyPsrGQd1Pic9rS0vZhPNZ48xOZ575pM/iAEwhZBgeU", - "rXFbG1CWvg0OF2RiW7BNQLlCD2rzJQxZsf2fhoaJF4RrMuOl0mPyVKzQIoOvha1WgmGczxXIeuV7nF1P", - "7vyqOPWlScEajrttWvXS913bRl4hKdMU6tQt62l2uPnbWJWszt9tRnbbR3dTQkS0wdpdMDbdETtQLwJu", - "Zw1yGL0TUjqButfQ2ZCnvwk07DRF68HBroxOjp+rhgmh9lu7HupEzv45cTSoKG8ghdBQC154C9ivu+Nn", - "xlgxUkHX5U1crtmm+Vtiec2dbdPUBLz5jb7U65K6WSjUCRn78m6i4AbK9VUx4sY46SZkcDna7VO8tmXK", - "98X+qnapa9ImI8DJ0lnWGv2EI2jecmNg70FWjvDvdfIbvujl7Zs7/7dBP8R11idJ3Opv1TTjIMHSfnG9", - "4065OzF2bvkN80pHUejIaPWRGJZXf6kiSGX0vZGczdaIXnwu3sxmW7lg7h4sbYdQILGN3qB/g3ajrRKp", - "gc5LFanbm68F+DOaZRjt6awzWpLMuuFcmVMw3+kFW90rGZlDKRo7/Lj3VMSGQxE3erXtFP2XOmeaplTT", - "r2BsDZv9/yGu9NZo+LTSCyY0ZBW4Pn0GG1woap+14LNxEgO5tYQZbA6zDDgVrw88irHaJhJHBePg1AZf", - "GzlgpU678UEcvQKpkKT/i7uNVbtjiMuQc039WYlZJ2LVA4ReVBjhm2k/CescVjq4aZuPnyimtdT+C+Xx", - "dGcJ9Q9MeSxVt+fm7MkQlpB444IiNDFkI2Mp1nbExDNLUUbNmCiHLuBb5aJOeLJUhpWjTCY0AwJHM/Wl", - "qdoVa+ymirmXIDhoDZ+18riNG7+5+rrW8N4b1g3l6oJ2L33k6hfp6qn6tFZfZCywezzYP/yCrQ8RxXoR", - "84SVrvPMcyY4kk5b/yBuOscQOsvyaKL5FVpiGbhHXY2tLJNL9FVYsNitl3y+0ETIpQ3gO7xdBuMuEhWQ", - "04cOPCOFw+owMw8y/ucSWtrbzBa8cDteWusepH78ABqbbhPglFM4y3hToGgEXf91MUOi/e1bCEa1O+m7", - "jlY24gKX6AIDr2XVsGN1o09jt6TO8VANj53DJFfWU0mbD+fHrkvT3bbB5DOZU8Ooqy6HRK8KnkDsoe3W", - "BAJzUcp5yZQaQjsn1+BClmRGeVaVbCOHcXxFMZE2HHUG3G50qL7NSrb5puzldDXio7LqDyt9TVfWlFKJ", - "byIp5TVd/YWx4i16nL8x9QwDv60YU2d/BxJz4HoPGFRZCbJHLhkrnCu+DgAnbwpXOwoSESkXilCCrvZQ", - "JvVOmZj/vQeROxI9KHvBylpr4qqOSl+P2rLSRaVHRSnTKlkn6Bti+QZePnHv3gnmADW/9t4XbL5rNvbQ", - "fluI+ddK5D7YMpEbpD+bouzafjy4f//mL9orJuZ64Ysf/SnsHJfyFPuFGypLiQXByH6Cefl2pYc3v9IT", - "uoJ8XWhbR0vb7+vB/Ye34UZQVVHI0hzUa5ZySs5WhfWYAYoRxCgnTE59unndBTaM/npw8OR2Ogy6+hfI", - "KYF0SIkdpmbmYttCe9YtrRel1DpjthzfH0rywDx3A+hcKk1KlmD2vy8dCPtFeSDIducAHOw7ZT6uHSFM", - "KKz9hzkUIL3bUzZf3lMk5XOmoHhw+4zJM199AOLETn75EeD888mLH4lFJTNokVEh4nFa6wQevajyqaA8", - "U3tFya44WzqyxEssmOioPUHq78QggGh55ah5VWaDo8HeIDBCtYnVcTMIqtMWzGGKZweQpNItJPKznDoz", - "Kchof69YyQ361e1Oh612FONGFU0VGfTpyXGzP2RoIpN5XgkUN6FASXvp47YDNzKBxYbXfk3k6cnxsL87", - "MzazMtswd6WUmVtRZzJwOkZK5WD5AT8L8Im6doKFoO9Z+V5OfUW4cA5b7uDTb5/+TwAAAP//ah7ySOEQ", - "AQA=", + "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", + "Qwu3RhEBAA==", } // 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 b1c66999..037e6d38 100644 --- a/pkg/api/openapi_types.gen.go +++ b/pkg/api/openapi_types.gen.go @@ -242,6 +242,9 @@ type AvailableJobSettingVisibility string // Job type supported by this Manager, and its parameters. type AvailableJobType struct { + // The description/tooltip shown in the user interface. + Description *string `json:"description,omitempty"` + // Hash of the job type. If the job settings or the label change, this etag will change. This is used on job submission to ensure that the submitted job settings are up to date. Etag string `json:"etag"` Label string `json:"label"` diff --git a/web/app/src/manager-api/model/AvailableJobType.js b/web/app/src/manager-api/model/AvailableJobType.js index 938c7b3a..1d1c1f4c 100644 --- a/web/app/src/manager-api/model/AvailableJobType.js +++ b/web/app/src/manager-api/model/AvailableJobType.js @@ -63,6 +63,9 @@ class AvailableJobType { if (data.hasOwnProperty('label')) { obj['label'] = ApiClient.convertToType(data['label'], 'String'); } + if (data.hasOwnProperty('description')) { + obj['description'] = ApiClient.convertToType(data['description'], 'String'); + } if (data.hasOwnProperty('settings')) { obj['settings'] = ApiClient.convertToType(data['settings'], [AvailableJobSetting]); } @@ -86,6 +89,12 @@ AvailableJobType.prototype['name'] = undefined; */ AvailableJobType.prototype['label'] = undefined; +/** + * The description/tooltip shown in the user interface. + * @member {String} description + */ +AvailableJobType.prototype['description'] = undefined; + /** * @member {Array.} settings */ -- 2.30.2 From a0cb8735c9dcc48eaacdf7bc9c59a3810c197229 Mon Sep 17 00:00:00 2001 From: Taylor Wiebe Date: Thu, 4 Apr 2024 11:10:22 +0200 Subject: [PATCH 53/84] Manager: add optional description to job types This description will be shown as a tooltip in the job submission UI. --- addon/flamenco/job_types.py | 3 ++- internal/manager/api_impl/jobs_test.go | 26 +++++++++++++++++++ .../simple_blender_render.js | 1 + .../scripts/simple_blender_render.js | 1 + 4 files changed, 30 insertions(+), 1 deletion(-) diff --git a/addon/flamenco/job_types.py b/addon/flamenco/job_types.py index 0b89c70d..69a855bd 100644 --- a/addon/flamenco/job_types.py +++ b/addon/flamenco/job_types.py @@ -116,7 +116,8 @@ def _store_available_job_types(available_job_types: _AvailableJobTypes) -> None: else: # Convert from API response type to list suitable for an EnumProperty. _job_type_enum_items = [ - (job_type.name, job_type.label, "") for job_type in job_types + (job_type.name, job_type.label, getattr(job_type, "description", "")) + for job_type in job_types ] _job_type_enum_items.insert(0, _JOB_TYPE_NOT_SELECTED_ENUM_ITEM) diff --git a/internal/manager/api_impl/jobs_test.go b/internal/manager/api_impl/jobs_test.go index ea26e9a5..61b52327 100644 --- a/internal/manager/api_impl/jobs_test.go +++ b/internal/manager/api_impl/jobs_test.go @@ -442,6 +442,32 @@ func TestGetJobTypeHappy(t *testing.T) { assertResponseJSON(t, echoCtx, http.StatusOK, jt) } +func TestGetJobTypeWithDescriptionHappy(t *testing.T) { + mockCtrl := gomock.NewController(t) + defer mockCtrl.Finish() + mf := newMockedFlamenco(mockCtrl) + + // Get an existing job type with a description. + description := "This is a test job type" + jt := api.AvailableJobType{ + Description: &description, + Etag: "some etag", + Name: "test-job-type", + Label: "Test Job Type", + Settings: []api.AvailableJobSetting{ + {Key: "setting", Type: api.AvailableJobSettingTypeString}, + }, + } + mf.jobCompiler.EXPECT().GetJobType("test-job-type"). + Return(jt, nil) + + echoCtx := mf.prepareMockedRequest(nil) + err := mf.flamenco.GetJobType(echoCtx, "test-job-type") + require.NoError(t, err) + + assertResponseJSON(t, echoCtx, http.StatusOK, jt) +} + func TestGetJobTypeUnknown(t *testing.T) { mockCtrl := gomock.NewController(t) defer mockCtrl.Finish() diff --git a/internal/manager/job_compilers/scripts-for-unittest/simple_blender_render.js b/internal/manager/job_compilers/scripts-for-unittest/simple_blender_render.js index cbe73256..157e534b 100644 --- a/internal/manager/job_compilers/scripts-for-unittest/simple_blender_render.js +++ b/internal/manager/job_compilers/scripts-for-unittest/simple_blender_render.js @@ -2,6 +2,7 @@ const JOB_TYPE = { label: "Simple Blender Render", + description: "Render a sequence of frames, and create a preview video file", settings: [ // Settings for artists to determine: { key: "frames", type: "string", required: true, eval: "f'{C.scene.frame_start}-{C.scene.frame_end}'", diff --git a/internal/manager/job_compilers/scripts/simple_blender_render.js b/internal/manager/job_compilers/scripts/simple_blender_render.js index d4a18672..3c6f4123 100644 --- a/internal/manager/job_compilers/scripts/simple_blender_render.js +++ b/internal/manager/job_compilers/scripts/simple_blender_render.js @@ -2,6 +2,7 @@ const JOB_TYPE = { label: "Simple Blender Render", + description: "Render a sequence of frames, and create a preview video file", settings: [ // Settings for artists to determine: { key: "frames", type: "string", required: true, -- 2.30.2 From d799372639b11b0981556a069d829193a3bfa082 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Thu, 4 Apr 2024 11:18:03 +0200 Subject: [PATCH 54/84] Website: bump experimental version to 3.5-beta1 --- web/project-website/data/flamenco.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/project-website/data/flamenco.yaml b/web/project-website/data/flamenco.yaml index 7afaaa3c..43ed76ec 100644 --- a/web/project-website/data/flamenco.yaml +++ b/web/project-website/data/flamenco.yaml @@ -1,2 +1,2 @@ latestVersion: "3.4" -latestExperimentalVersion: "3.5-beta0" +latestExperimentalVersion: "3.5-beta1" -- 2.30.2 From 7b139be605a50377428ac6727c2f5c3bbfa51b3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Thu, 4 Apr 2024 20:37:48 +0200 Subject: [PATCH 55/84] Website: remove link to old Flamenco v2 documentation The documentation itself has disappeared from the website, and it already was obsolete for a long time anyway. --- web/project-website/content/_index.md | 8 -------- 1 file changed, 8 deletions(-) diff --git a/web/project-website/content/_index.md b/web/project-website/content/_index.md index 8d8c33ca..09258d36 100644 --- a/web/project-website/content/_index.md +++ b/web/project-website/content/_index.md @@ -74,11 +74,3 @@ Flamenco v3 is in active development at Blender Studio. Join [the chat](https://blender.chat/channel/flamenco) to see what's happening! {{< /columns >}} - - - -------------------- - -Looking for the old [Flamenco v2 documentation][F2]? - -[F2]: /v2/ -- 2.30.2 From e83db45192279274b9c336a9c8a0c88f09d21e71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Sat, 6 Apr 2024 10:19:38 +0200 Subject: [PATCH 56/84] Website: sillicon builds are included, not "will be" included --- web/project-website/content/download/_index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/project-website/content/download/_index.md b/web/project-website/content/download/_index.md index d57514db..33a32bb5 100644 --- a/web/project-website/content/download/_index.md +++ b/web/project-website/content/download/_index.md @@ -68,8 +68,8 @@ start afresh with the following steps: The macOS "Silicon" build does not ship with FFmpeg, because a trusted build for this architecture is not provided by the FFmpeg project. This is why Flamenco v3 -did not ship macOS/ARM64 builds. As of v3.3 this architecture will be included -in the official Flamenco builds, but still without FFmpeg binary. +did not ship macOS/ARM64 builds. As of v3.3 this architecture is included in the +official Flamenco builds, but still without FFmpeg binary. You can install FFmpeg using [the ffmpeg Homebrew formula][brew] or any other method. Once installed Flamenco Worker should find it automatically. If not, -- 2.30.2 From 9ee9c07e76ea4ae94fe1c612d71baf6e488ff4ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Thu, 11 Apr 2024 10:55:00 +0200 Subject: [PATCH 57/84] Website: link to 3rd party bug tracker for 3rd party scripts 3rd part job compiler scripts should have their own tracker and handle their own bug reports. --- .../content/third-party-jobs/compositor-script.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/project-website/content/third-party-jobs/compositor-script.md b/web/project-website/content/third-party-jobs/compositor-script.md index bfadc682..497455b1 100644 --- a/web/project-website/content/third-party-jobs/compositor-script.md +++ b/web/project-website/content/third-party-jobs/compositor-script.md @@ -3,9 +3,10 @@ title: Compositor Nodes weight: 10 --- -*Job type documented and maintained by: [Dylan Blanqué][author].* +*Job type documented and maintained by: [Dylan Blanqué][author]. Please report any issues at [the script's Github project][github].* [author]: https://projects.blender.org/Dylan-Blanque +[github]: https://github.com/dblanque/flamenco-compositor-script/issues {{< hint >}} -- 2.30.2 From ea68faa57785895b9348dfe4f21506829bc19227 Mon Sep 17 00:00:00 2001 From: William Gardner Date: Thu, 11 Apr 2024 15:00:48 +0200 Subject: [PATCH 58/84] Web: improve URL handling to allow for TLS/SSL MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Explicitly use the `--mode` flag for the webapp development server (`vite`) to make the web frontend choose the appropriate HTTP and WebSocket port to communicate with the backend. This also makes sure that when accessing the frontend via `https://`, the websocket connection uses `wss://`. As a side-effect, this also makes port `:8081` usable in production environments; it would assume it was the development server and try to access the backend on port `:8080`. Reviewed-on: https://projects.blender.org/studio/flamenco/pulls/104296 Reviewed-by: Sybren A. Stüvel --- web/app/package.json | 2 +- web/app/src/urls.js | 17 +++++++---------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/web/app/package.json b/web/app/package.json index be3bcd85..0d1d6bab 100644 --- a/web/app/package.json +++ b/web/app/package.json @@ -12,7 +12,7 @@ } ], "scripts": { - "dev": "vite --port 8081 --base /app/", + "dev": "vite --port 8081 --base /app/ --mode development", "build": "vite build", "preview": "vite preview --port 5050", "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs --fix --ignore-path .gitignore" diff --git a/web/app/src/urls.js b/web/app/src/urls.js index 9f15d7e0..9ac3b689 100644 --- a/web/app/src/urls.js +++ b/web/app/src/urls.js @@ -1,18 +1,15 @@ let url = new URL(window.location.href); -// Uncomment this when the web interface is running on a different port than the -// API, for example when using the Vite devserver. Set the API port here. -if (url.port == '8081') { + +// When the web interface is running on a different port than the API, for +// example when using the Vite devserver, setting the Vite --mode flag to +// "development" will force port 8080 for the API. +if (import.meta.env.MODE == 'development') { url.port = '8080'; } -url.pathname = '/'; -const flamencoAPIURL = url.href; - -url.protocol = 'ws:'; -const websocketURL = url.href; const URLs = { - api: flamencoAPIURL, - ws: websocketURL, + api: `${url.protocol}//${url.hostname}:${url.port}/`, + ws: `${url.protocol.replace('http', 'ws')}//${url.hostname}:${url.port}/`, }; // console.log("Flamenco API:", URLs.api); -- 2.30.2 From 05e35a1cc57056e0b9fd1f252d00663b9a17c2f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Thu, 11 Apr 2024 15:02:11 +0200 Subject: [PATCH 59/84] Update Changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fea57b51..0da38d44 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ bugs in actually-released versions. - Show the farm status in the web frontend. This shows whether the farm is actively working on a job, idle, asleep (all workers are sleeping and no work is queued), waiting (all workers are sleeping, and work is queued), or inoperable (no workers, or all workers are offline). This status is also broadcast as event via the event bus, and thus available via SocketIO and MQTT. - Fix an issue where the columns in the web interface wouldn't correctly resize when the shown information changed. - Add-on: replace the different 'refresh' buttons (for Manager info & storage location, job types, and worker tags) with a single button that just refreshes everything in one go. The information obtained from Flamenco Manager is now stored in a JSON file on disk, making it independent from Blender auto-saving the user preferences. +- Ensure the web frontend connects to the backend correctly when served over HTTPS ([#104296](https://projects.blender.org/studio/flamenco/pulls/104296)). - Security updates of some dependencies: - [Incorrect forwarding of sensitive headers and cookies on HTTP redirect in net/http](https://pkg.go.dev/vuln/GO-2024-2600) - [Memory exhaustion in multipart form parsing in net/textproto and net/http](https://pkg.go.dev/vuln/GO-2024-2599) -- 2.30.2 From b313a2020d871e497a383d45563179c5086377fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Fri, 12 Apr 2024 08:37:29 +0200 Subject: [PATCH 60/84] Refactor: Manager, move some test code into a function of its own Move some of the Worker Tags test code into a function of its own, to have a clearer separation between 'the test' and 'what needs to happen to do this part of the test'. Also it'll make an upcoming change easier to implement. No functional changes. --- .../manager/persistence/worker_tag_test.go | 35 ++++++++++--------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/internal/manager/persistence/worker_tag_test.go b/internal/manager/persistence/worker_tag_test.go index f4872cd6..609de145 100644 --- a/internal/manager/persistence/worker_tag_test.go +++ b/internal/manager/persistence/worker_tag_test.go @@ -3,6 +3,7 @@ package persistence // SPDX-License-Identifier: GPL-3.0-or-later import ( + "slices" "testing" "time" @@ -50,17 +51,7 @@ func TestFetchDeleteTags(t *testing.T) { } require.NoError(t, f.db.CreateWorkerTag(f.ctx, &secondTag)) - - allTags, err := f.db.FetchWorkerTags(f.ctx) - require.NoError(t, err) - - require.Len(t, allTags, 2) - var allTagIDs [2]string - for idx := range allTags { - allTagIDs[idx] = allTags[idx].UUID - } - assert.Contains(t, allTagIDs, f.tag.UUID) - assert.Contains(t, allTagIDs, secondTag.UUID) + assertTagsMatch(t, f, f.tag.UUID, secondTag.UUID) has, err = f.db.HasWorkerTags(f.ctx) require.NoError(t, err) @@ -68,11 +59,7 @@ func TestFetchDeleteTags(t *testing.T) { // Test deleting the 2nd tag. require.NoError(t, f.db.DeleteWorkerTag(f.ctx, secondTag.UUID)) - - allTags, err = f.db.FetchWorkerTags(f.ctx) - require.NoError(t, err) - require.Len(t, allTags, 1) - assert.Equal(t, f.tag.UUID, allTags[0].UUID) + assertTagsMatch(t, f, f.tag.UUID) // Test deleting the 1st tag. require.NoError(t, f.db.DeleteWorkerTag(f.ctx, f.tag.UUID)) @@ -163,3 +150,19 @@ func TestDeleteWorkerTagWithWorkersAssigned(t *testing.T) { require.NoError(t, err) assert.Empty(t, w.Tags) } + +func assertTagsMatch(t *testing.T, f WorkerTestFixture, expectUUIDs ...string) { + allTags, err := f.db.FetchWorkerTags(f.ctx) + require.NoError(t, err) + + require.Len(t, allTags, len(expectUUIDs)) + var actualUUIDs []string + for idx := range allTags { + actualUUIDs = append(actualUUIDs, allTags[idx].UUID) + } + + slices.Sort(expectUUIDs) + slices.Sort(actualUUIDs) + + assert.Equal(t, actualUUIDs, expectUUIDs) +} -- 2.30.2 From 6c28db780fd2c413c4b6260f3204cd256cff4c4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Fri, 12 Apr 2024 10:46:08 +0200 Subject: [PATCH 61/84] Manager: refuse to delete worker tags without foreign key constraints Before deleting a Worker Tag, check that foreign key constraints are active for the current database connection. Sometimes GORM decides to create a new database connection by itself, without telling us, and then foreign key constraints are not active on it. This commit is a workaround to avoid database corruption. --- internal/manager/persistence/worker_tag.go | 9 +++++++ .../manager/persistence/worker_tag_test.go | 25 +++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/internal/manager/persistence/worker_tag.go b/internal/manager/persistence/worker_tag.go index 6e0c1506..ed318a81 100644 --- a/internal/manager/persistence/worker_tag.go +++ b/internal/manager/persistence/worker_tag.go @@ -62,6 +62,15 @@ func (db *DB) SaveWorkerTag(ctx context.Context, tag *WorkerTag) error { // DeleteWorkerTag deletes the given tag, after unassigning all workers from it. func (db *DB) DeleteWorkerTag(ctx context.Context, uuid string) error { + // As a safety measure, refuse to delete unless foreign key constraints are active. + fkEnabled, err := db.areForeignKeysEnabled() + if err != nil { + return fmt.Errorf("checking whether foreign keys are enabled: %w", err) + } + if !fkEnabled { + return ErrDeletingWithoutFK + } + tx := db.gormDB.WithContext(ctx). Where("uuid = ?", uuid). Delete(&WorkerTag{}) diff --git a/internal/manager/persistence/worker_tag_test.go b/internal/manager/persistence/worker_tag_test.go index 609de145..f754cfa6 100644 --- a/internal/manager/persistence/worker_tag_test.go +++ b/internal/manager/persistence/worker_tag_test.go @@ -68,6 +68,31 @@ func TestFetchDeleteTags(t *testing.T) { assert.False(t, has, "expecting HasWorkerTags to return false") } +func TestDeleteTagsWithoutFK(t *testing.T) { + f := workerTestFixtures(t, 1*time.Second) + defer f.done() + + // Single tag was created by fixture. + has, err := f.db.HasWorkerTags(f.ctx) + require.NoError(t, err) + assert.True(t, has, "expecting HasWorkerTags to return true") + + secondTag := WorkerTag{ + UUID: uuid.New(), + Name: "arbeiderskaartje", + Description: "Worker tag in Dutch", + } + require.NoError(t, f.db.CreateWorkerTag(f.ctx, &secondTag)) + + // Try deleting with foreign key constraints disabled. + require.NoError(t, f.db.pragmaForeignKeys(false)) + err = f.db.DeleteWorkerTag(f.ctx, f.tag.UUID) + require.ErrorIs(t, err, ErrDeletingWithoutFK) + + // Test the deletion did not happen. + assertTagsMatch(t, f, f.tag.UUID, secondTag.UUID) +} + func TestAssignUnassignWorkerTags(t *testing.T) { f := workerTestFixtures(t, 1*time.Second) defer f.done() -- 2.30.2 From 3974770f369abf9c337fa1b62bfcacfc2977c22e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Fri, 12 Apr 2024 10:45:51 +0200 Subject: [PATCH 62/84] Manager: refuse to delete workers without foreign key constraints As a safety measure, refuse to delete Workers from the Manager's database when foreign key constraints are disabled. In the long term, the underlying problem should be solved. This is a stop- gap measure to ensure database consistency. --- internal/manager/persistence/workers.go | 9 ++++++++ internal/manager/persistence/workers_test.go | 24 ++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/internal/manager/persistence/workers.go b/internal/manager/persistence/workers.go index 60ec853b..a9637d54 100644 --- a/internal/manager/persistence/workers.go +++ b/internal/manager/persistence/workers.go @@ -88,6 +88,15 @@ func (db *DB) FetchWorker(ctx context.Context, uuid string) (*Worker, error) { } func (db *DB) DeleteWorker(ctx context.Context, uuid string) error { + // As a safety measure, refuse to delete unless foreign key constraints are active. + fkEnabled, err := db.areForeignKeysEnabled() + if err != nil { + return fmt.Errorf("checking whether foreign keys are enabled: %w", err) + } + if !fkEnabled { + return ErrDeletingWithoutFK + } + tx := db.gormDB.WithContext(ctx). Where("uuid = ?", uuid). Delete(&Worker{}) diff --git a/internal/manager/persistence/workers_test.go b/internal/manager/persistence/workers_test.go index 1336d0b3..8bd6ab94 100644 --- a/internal/manager/persistence/workers_test.go +++ b/internal/manager/persistence/workers_test.go @@ -314,6 +314,30 @@ func TestDeleteWorker(t *testing.T) { } } +func TestDeleteWorkerNoForeignKeys(t *testing.T) { + ctx, cancel, db := persistenceTestFixtures(t, 1*time.Second) + defer cancel() + + // Create a Worker to delete. + w1 := Worker{ + UUID: "fd97a35b-a5bd-44b4-ac2b-64c193ca877d", + Name: "Worker 1", + Status: api.WorkerStatusAwake, + } + require.NoError(t, db.CreateWorker(ctx, &w1)) + + // Try deleting with foreign key constraints disabled. + require.NoError(t, db.pragmaForeignKeys(false)) + require.ErrorIs(t, ErrDeletingWithoutFK, db.DeleteWorker(ctx, w1.UUID)) + + // The worker should still exist. + { + fetchedWorker, err := db.FetchWorker(ctx, w1.UUID) + require.NoError(t, err) + assert.Equal(t, w1.UUID, fetchedWorker.UUID) + } +} + func TestDeleteWorkerWithTagAssigned(t *testing.T) { f := workerTestFixtures(t, 1*time.Second) defer f.done() -- 2.30.2 From e2bca9ad618e8acbce775729ca34eab17e3eb71b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Mon, 15 Apr 2024 17:21:11 +0200 Subject: [PATCH 63/84] Worker: add configuration for Linux out-of-memory killer Add a Worker configuration option to configure the Linux out-of-memory behaviour. Add `oom_score_adjust=500` to `flamenco-worker.yaml` to increase the chance that Blender gets killed when the machine runs out of memory, instead of Flamenco Worker itself. --- CHANGELOG.md | 1 + cmd/flamenco-worker/main.go | 30 ++++++- internal/worker/cli_runner/cli_runner.go | 21 ++++- internal/worker/config.go | 12 +++ pkg/oomscore/oomscore.go | 86 +++++++++++++++++++ pkg/oomscore/oomscore_linux.go | 66 ++++++++++++++ pkg/oomscore/oomscore_nonlinux.go | 19 ++++ pkg/website/urls.go | 1 + .../usage/worker-configuration/_index.md | 10 +++ 9 files changed, 244 insertions(+), 2 deletions(-) create mode 100644 pkg/oomscore/oomscore.go create mode 100644 pkg/oomscore/oomscore_linux.go create mode 100644 pkg/oomscore/oomscore_nonlinux.go diff --git a/CHANGELOG.md b/CHANGELOG.md index 0da38d44..36080c0f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ bugs in actually-released versions. - Fix an issue where the columns in the web interface wouldn't correctly resize when the shown information changed. - Add-on: replace the different 'refresh' buttons (for Manager info & storage location, job types, and worker tags) with a single button that just refreshes everything in one go. The information obtained from Flamenco Manager is now stored in a JSON file on disk, making it independent from Blender auto-saving the user preferences. - Ensure the web frontend connects to the backend correctly when served over HTTPS ([#104296](https://projects.blender.org/studio/flamenco/pulls/104296)). +- For Workers running on Linux, it is now possible to configure the "OOM score adjustment" for sub-processes. This makes it possible for the out-of-memory killer to target Blender, and not Flamenco Worker itself. - Security updates of some dependencies: - [Incorrect forwarding of sensitive headers and cookies on HTTP redirect in net/http](https://pkg.go.dev/vuln/GO-2024-2600) - [Memory exhaustion in multipart form parsing in net/textproto and net/http](https://pkg.go.dev/vuln/GO-2024-2599) diff --git a/cmd/flamenco-worker/main.go b/cmd/flamenco-worker/main.go index 0cfd6393..b4d1ee46 100644 --- a/cmd/flamenco-worker/main.go +++ b/cmd/flamenco-worker/main.go @@ -23,6 +23,7 @@ import ( "projects.blender.org/studio/flamenco/internal/appinfo" "projects.blender.org/studio/flamenco/internal/worker" "projects.blender.org/studio/flamenco/internal/worker/cli_runner" + "projects.blender.org/studio/flamenco/pkg/oomscore" "projects.blender.org/studio/flamenco/pkg/sysinfo" "projects.blender.org/studio/flamenco/pkg/website" ) @@ -114,6 +115,10 @@ func main() { findBlender() findFFmpeg() + // Create the CLI runner before the auto-discovery, to make any configuration + // problems clear before waiting for the Manager to respond. + cliRunner := createCLIRunner(&configWrangler) + // Give the auto-discovery some time to find a Manager. discoverTimeout := 10 * time.Minute discoverCtx, discoverCancel := context.WithTimeout(context.Background(), discoverTimeout) @@ -149,7 +154,6 @@ func main() { return } - cliRunner := cli_runner.NewCLIRunner() listener = worker.NewListener(client, buffer) cmdRunner := worker.NewCommandExecutor(cliRunner, listener, timeService) taskRunner := worker.NewTaskExecutor(cmdRunner, listener) @@ -304,3 +308,27 @@ func logFatalManagerDiscoveryError(err error, discoverTimeout time.Duration) { Msgf("auto-discovery error, see %s", website.CannotFindManagerHelpURL) } } + +func createCLIRunner(configWrangler *worker.FileConfigWrangler) *cli_runner.CLIRunner { + config, err := configWrangler.WorkerConfig() + if err != nil { + log.Fatal().Err(err).Msg("error loading worker configuration") + } + + if config.LinuxOOMScoreAdjust == nil { + log.Debug().Msg("executables will be run without OOM score adjustment") + return cli_runner.NewCLIRunner() + } + + if !oomscore.Available() { + log.Warn(). + Msgf("config: oom_score_adjust configured, but that is only available on Linux, not this platform. See %s for more information.", + website.OOMScoreAdjURL) + return cli_runner.NewCLIRunner() + } + + adjustment := *config.LinuxOOMScoreAdjust + log.Info().Int("oom_score_adjust", adjustment).Msg("executables will be run with OOM score adjustment") + + return cli_runner.NewCLIRunnerWithOOMScoreAdjuster(adjustment) +} diff --git a/internal/worker/cli_runner/cli_runner.go b/internal/worker/cli_runner/cli_runner.go index 7fe843b7..9369c3cf 100644 --- a/internal/worker/cli_runner/cli_runner.go +++ b/internal/worker/cli_runner/cli_runner.go @@ -11,6 +11,7 @@ import ( "github.com/alessio/shellescape" "github.com/rs/zerolog" + "projects.blender.org/studio/flamenco/pkg/oomscore" ) // The buffer size used to read stdout/stderr output from subprocesses, in @@ -20,11 +21,19 @@ const StdoutBufferSize = 40 * 1024 // CLIRunner is a wrapper around exec.CommandContext() to allow mocking. type CLIRunner struct { + oomScoreAdjust int + useOOMScoreAdjust bool } func NewCLIRunner() *CLIRunner { return &CLIRunner{} } +func NewCLIRunnerWithOOMScoreAdjuster(oomScoreAdjust int) *CLIRunner { + return &CLIRunner{ + oomScoreAdjust: oomScoreAdjust, + useOOMScoreAdjust: true, + } +} func (cli *CLIRunner) CommandContext(ctx context.Context, name string, arg ...string) *exec.Cmd { return exec.CommandContext(ctx, name, arg...) @@ -55,7 +64,7 @@ func (cli *CLIRunner) RunWithTextOutput( return err } - if err := execCmd.Start(); err != nil { + if err := cli.startWithOOMAdjust(execCmd); err != nil { logger.Error().Err(err).Msg("error starting CLI execution") return err } @@ -171,3 +180,13 @@ func (cli *CLIRunner) logCmd( } return nil } + +// startWithOOMAdjust runs the command with its OOM score adjusted. +func (cli *CLIRunner) startWithOOMAdjust(execCmd *exec.Cmd) error { + if cli.useOOMScoreAdjust { + oomScoreRestore := oomscore.Adjust(cli.oomScoreAdjust) + defer oomScoreRestore() + } + + return execCmd.Start() +} diff --git a/internal/worker/config.go b/internal/worker/config.go index 0ad0d6eb..e786cbb8 100644 --- a/internal/worker/config.go +++ b/internal/worker/config.go @@ -58,6 +58,18 @@ type WorkerConfig struct { TaskTypes []string `yaml:"task_types"` RestartExitCode int `yaml:"restart_exit_code"` + + // LinuxOOMScoreAdjust controls the Linux out-of-memory killer. Is used when + // spawning a sub-process, to adjust the likelyness that that subprocess is + // killed rather than Flamenco Worker itself. That way Flamenco Worker can + // report the failure to the Manager. + // + // If the Worker itself would be OOM-killed, it would just be restarted and + // get the task it was already working on, causing an infinite OOM-loop. + // + // If this value is not specified in the configuration file, Flamenco Worker + // will not attempt to adjust its OOM score. + LinuxOOMScoreAdjust *int `yaml:"oom_score_adjust"` } type WorkerCredentials struct { diff --git a/pkg/oomscore/oomscore.go b/pkg/oomscore/oomscore.go new file mode 100644 index 00000000..30ac61f4 --- /dev/null +++ b/pkg/oomscore/oomscore.go @@ -0,0 +1,86 @@ +// package oomscore provides some functions to adjust the Linux +// out-of-memory (OOM) score, i.e. the number that determines how likely it is +// that a process is killed in an out-of-memory situation. +// +// It is available only on Linux. On other platforms ErrNotImplemented will be returned. +package oomscore + +import ( + "errors" + + "github.com/rs/zerolog/log" +) + +var ErrNotImplemented = errors.New("OOM score functionality not implemented on this platform") + +// Available returns whether the functionality in this package is available for +// the current platform. +func Available() bool { + return available +} + +// GetOOMScore returns the current process' OOM score. +func GetOOMScore() (int, error) { + return getOOMScore() +} + +// GetOOMScoreAdj returns the current process' OOM score adjustment. +func GetOOMScoreAdj() (int, error) { + return getOOMScoreAdj() +} + +// SetOOMScoreAdj sets the current process' OOM score adjustment. +func SetOOMScoreAdj(score int) error { + return setOOMScoreAdj(score) +} + +type ScoreRestoreFunc func() + +var emptyRestoreFunc ScoreRestoreFunc = func() {} + +// Adjust temporarily sets the OOM score adjustment. +// The returned function MUST be called to restore the original value. +// Any problems changing the score are logged, but not otherwise returned. +func Adjust(score int) (restoreFunc ScoreRestoreFunc) { + restoreFunc = emptyRestoreFunc + + if !Available() { + return + } + + origScore, err := getOOMScoreAdj() + if err != nil { + log.Error(). + AnErr("cause", err). + Msg("could not get the current process' oom_score_adj value") + return + } + + log.Trace(). + Int("oom_score_adj", score). + Msg("setting oom_score_adj") + + err = setOOMScoreAdj(score) + if err != nil { + log.Error(). + Int("oom_score_adj", score). + AnErr("cause", err). + Msg("could not set the current process' oom_score_adj value") + return + } + + return func() { + log.Trace(). + Int("oom_score_adj", origScore). + Msg("restoring oom_score_adj") + + err = setOOMScoreAdj(origScore) + if err != nil { + log.Error(). + Int("oom_score_adj", origScore). + AnErr("cause", err). + Msg("could not restore the current process' oom_score_adj value") + return + } + } +} diff --git a/pkg/oomscore/oomscore_linux.go b/pkg/oomscore/oomscore_linux.go new file mode 100644 index 00000000..225925fd --- /dev/null +++ b/pkg/oomscore/oomscore_linux.go @@ -0,0 +1,66 @@ +//go:build linux + +package oomscore + +import ( + "fmt" + "os" + "path/filepath" +) + +const ( + available = true +) + +// getOOMScore returns the current process' OOM score. +func getOOMScore() (int, error) { + return readInt("oom_score") +} + +// getOOMScoreAdj returns the current process' OOM score adjustment. +func getOOMScoreAdj() (int, error) { + return readInt("oom_score_adj") +} + +// setOOMScoreAdj sets the current process' OOM score adjustment. +func setOOMScoreAdj(newScore int) error { + return writeInt(newScore, "oom_score_adj") +} + +// readInt reads an integer from /proc/{pid}/{filename} +func readInt(filename string) (int, error) { + fullPath := procPidPath(filename) + + file, err := os.Open(fullPath) + if err != nil { + return 0, fmt.Errorf("opening %s: %w", fullPath, err) + } + + var valueInFile int + n, err := fmt.Fscan(file, &valueInFile) + if err != nil { + return 0, fmt.Errorf("reading %s: %w", fullPath, err) + } + if n < 1 { + return 0, fmt.Errorf("reading %s: did not find a number", fullPath) + } + + return valueInFile, nil +} + +// writeInt writes an integer to /proc/{pid}/{filename} +func writeInt(value int, filename string) error { + fullPath := procPidPath(filename) + contents := fmt.Sprint(value) + err := os.WriteFile(fullPath, []byte(contents), os.ModePerm) + if err != nil { + return fmt.Errorf("writing %s: %w", fullPath, err) + } + return nil +} + +// procPidPath returns "/proc/{pid}/{filename}". +func procPidPath(filename string) string { + pid := os.Getpid() + return filepath.Join("/proc", fmt.Sprint(pid), filename) +} diff --git a/pkg/oomscore/oomscore_nonlinux.go b/pkg/oomscore/oomscore_nonlinux.go new file mode 100644 index 00000000..be9d56a8 --- /dev/null +++ b/pkg/oomscore/oomscore_nonlinux.go @@ -0,0 +1,19 @@ +//go:build !linux + +package oomscore + +const ( + available = false +) + +func getOOMScore() (int, error) { + return 0, ErrNotImplemented +} + +func getOOMScoreAdj() (int, error) { + return 0, ErrNotImplemented +} + +func setOOMScoreAdj(int) error { + return ErrNotImplemented +} diff --git a/pkg/website/urls.go b/pkg/website/urls.go index a8285cf7..bccd4d2c 100644 --- a/pkg/website/urls.go +++ b/pkg/website/urls.go @@ -9,4 +9,5 @@ const ( BugReportURL = "https://flamenco.blender.org/get-involved" ShamanRequirementsURL = "https://flamenco.blender.org/usage/shared-storage/shaman/#requirements" WorkerConfigURL = "https://flamenco.blender.org/usage/worker-configuration/" + OOMScoreAdjURL = WorkerConfigURL ) diff --git a/web/project-website/content/usage/worker-configuration/_index.md b/web/project-website/content/usage/worker-configuration/_index.md index a3272b67..6a2d345f 100644 --- a/web/project-website/content/usage/worker-configuration/_index.md +++ b/web/project-website/content/usage/worker-configuration/_index.md @@ -19,6 +19,9 @@ This is an example of such a configuration file: manager_url: http://flamenco.local:8080/ task_types: [blender, ffmpeg, file-management, misc] restart_exit_code: 47 + +# Optional advanced option, available on Linux only: +oom_score_adjust: 500 ``` - `manager_url`: The URL of the Manager to connect to. If the setting is blank @@ -31,10 +34,17 @@ restart_exit_code: 47 - `restart_exit_code`: Having this set to a non-zero value will mark this Worker as 'restartable'. See [Shut Down & Restart Actions][restarting] for more information. +- `oom_score_adjust`: an optional value between 0 and 1000, only available on + Linux. It configures the Out Of Memory behaviour of the Linux kernel. This is + the `oom_score_adj` value for all sub-processes started by the Worker. Set + this to a high value, so that when the machine runs out of memory when + rendering, it is Blender that gets killed, and not Flamenco Worker itself. For + more information, see [Linux Kernel: Per-Process Parameters][per-process-proc]. [scripts]: {{< ref "usage/job-types" >}} [task-types]: {{< ref "usage/job-types" >}}#task-types [restarting]: {{< ref "usage/worker-actions" >}}#shut-down--restart-actions +[per-process-proc]: https://docs.kernel.org/filesystems/proc.html#chapter-3-per-process-parameters ## Worker-Specific Files -- 2.30.2 From 30c92d285461a8b4656b247c4f5d42e65ef503a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Tue, 16 Apr 2024 10:46:04 +0200 Subject: [PATCH 64/84] Website: document when the oom_score_adjust option was added --- web/project-website/content/usage/worker-configuration/_index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/web/project-website/content/usage/worker-configuration/_index.md b/web/project-website/content/usage/worker-configuration/_index.md index 6a2d345f..f1272d9e 100644 --- a/web/project-website/content/usage/worker-configuration/_index.md +++ b/web/project-website/content/usage/worker-configuration/_index.md @@ -40,6 +40,7 @@ oom_score_adjust: 500 this to a high value, so that when the machine runs out of memory when rendering, it is Blender that gets killed, and not Flamenco Worker itself. For more information, see [Linux Kernel: Per-Process Parameters][per-process-proc]. + *This option was introduced in Flamenco v3.5.* [scripts]: {{< ref "usage/job-types" >}} [task-types]: {{< ref "usage/job-types" >}}#task-types -- 2.30.2 From 94fba20ef625716717fb2611d7b7781cf4510ff2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Tue, 16 Apr 2024 10:53:29 +0200 Subject: [PATCH 65/84] Worker: reduce log level of some internal components Reduce the log level from 'info' to 'debug' on some internal components of Flamenco Worker. This makes the console output slightly less noisy, and it's unlikely that these particular messages are commonly needed. --- internal/worker/output_uploader.go | 4 ++-- internal/worker/upstream_buffer.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/worker/output_uploader.go b/internal/worker/output_uploader.go index d6112219..c1c4cf73 100644 --- a/internal/worker/output_uploader.go +++ b/internal/worker/output_uploader.go @@ -52,8 +52,8 @@ func (ou *OutputUploader) OutputProduced(taskID, filename string) { } func (ou *OutputUploader) Run(ctx context.Context) { - log.Info().Msg("output uploader: running") - defer log.Info().Msg("output uploader: shutting down") + log.Debug().Msg("output uploader: running") + defer log.Debug().Msg("output uploader: shutting down") wg := sync.WaitGroup{} wg.Add(1) diff --git a/internal/worker/upstream_buffer.go b/internal/worker/upstream_buffer.go index 50d7da8e..43e8d353 100644 --- a/internal/worker/upstream_buffer.go +++ b/internal/worker/upstream_buffer.go @@ -133,7 +133,7 @@ func (ub *UpstreamBufferDB) Close() error { ub.wg.Wait() // Attempt one final flush, if it's fast enough: - log.Info().Msg("upstream buffer shutting down, doing one final flush") + log.Debug().Msg("upstream buffer shutting down, doing one final flush") flushCtx, ctxCancel := context.WithTimeout(context.Background(), flushOnShutdownTimeout) defer ctxCancel() if err := ub.Flush(flushCtx); err != nil { -- 2.30.2 From c90c1c12607aaee08cbf2557a071e89341c7acdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Tue, 16 Apr 2024 11:02:40 +0200 Subject: [PATCH 66/84] Website: bump available download version to 3.5 --- web/project-website/data/flamenco.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/project-website/data/flamenco.yaml b/web/project-website/data/flamenco.yaml index 43ed76ec..8e89f6cd 100644 --- a/web/project-website/data/flamenco.yaml +++ b/web/project-website/data/flamenco.yaml @@ -1,2 +1,2 @@ -latestVersion: "3.4" +latestVersion: "3.5" latestExperimentalVersion: "3.5-beta1" -- 2.30.2 From 81de246b484fb020d4db68eaa9624aa32e9a6620 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Tue, 16 Apr 2024 11:03:27 +0200 Subject: [PATCH 67/84] Bumped version to 3.5 --- Makefile | 4 ++-- addon/flamenco/__init__.py | 2 +- addon/flamenco/manager/__init__.py | 2 +- addon/flamenco/manager/api_client.py | 2 +- addon/flamenco/manager/configuration.py | 2 +- addon/flamenco/manager_README.md | 2 +- web/app/src/manager-api/ApiClient.js | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index ac57a708..1acc8bc2 100644 --- a/Makefile +++ b/Makefile @@ -4,9 +4,9 @@ PKG := projects.blender.org/studio/flamenco # To update the version number in all the relevant places, update the VERSION # variable below and run `make update-version`. -VERSION := 3.5-beta1 +VERSION := 3.5 # "alpha", "beta", or "release". -RELEASE_CYCLE := beta +RELEASE_CYCLE := release # _GIT_DESCRIPTION_OR_TAG is either something like '16-123abc' (when we're 16 # commits since the last tag) or it's something like `v3.0-beta2` (when exactly diff --git a/addon/flamenco/__init__.py b/addon/flamenco/__init__.py index 7b014801..1ac3ac4e 100644 --- a/addon/flamenco/__init__.py +++ b/addon/flamenco/__init__.py @@ -12,7 +12,7 @@ bl_info = { "doc_url": "https://flamenco.blender.org/", "category": "System", "support": "COMMUNITY", - "warning": "This is version 3.5-beta1 of the add-on, which is not a stable release", + "warning": "", } from pathlib import Path diff --git a/addon/flamenco/manager/__init__.py b/addon/flamenco/manager/__init__.py index 643de81a..efee2c7e 100644 --- a/addon/flamenco/manager/__init__.py +++ b/addon/flamenco/manager/__init__.py @@ -10,7 +10,7 @@ """ -__version__ = "3.5-beta1" +__version__ = "3.5" # import ApiClient from flamenco.manager.api_client import ApiClient diff --git a/addon/flamenco/manager/api_client.py b/addon/flamenco/manager/api_client.py index bee2d129..25c3342b 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/3.5-beta1 (Blender add-on)' + self.user_agent = 'Flamenco/3.5 (Blender add-on)' def __enter__(self): return self diff --git a/addon/flamenco/manager/configuration.py b/addon/flamenco/manager/configuration.py index 52148f33..3f63577f 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: 3.5-beta1".\ + "SDK Package Version: 3.5".\ format(env=sys.platform, pyversion=sys.version) def get_host_settings(self): diff --git a/addon/flamenco/manager_README.md b/addon/flamenco/manager_README.md index c6fb580a..92a13423 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: 3.5-beta1 +- Package version: 3.5 - Build package: org.openapitools.codegen.languages.PythonClientCodegen For more information, please visit [https://flamenco.io/](https://flamenco.io/) diff --git a/web/app/src/manager-api/ApiClient.js b/web/app/src/manager-api/ApiClient.js index 82a9d30d..401a1a55 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/3.5-beta1 / webbrowser' + 'User-Agent': 'Flamenco/3.5 / webbrowser' }; /** -- 2.30.2 From 7f14e6705d69d05e1bcae3a9ff64dbf2541c47b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Tue, 16 Apr 2024 11:11:54 +0200 Subject: [PATCH 68/84] Bumped version to 3.6-alpha0 --- Makefile | 4 ++-- addon/flamenco/__init__.py | 4 ++-- addon/flamenco/manager/__init__.py | 2 +- addon/flamenco/manager/api_client.py | 2 +- addon/flamenco/manager/configuration.py | 2 +- addon/flamenco/manager_README.md | 2 +- web/app/src/manager-api/ApiClient.js | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 1acc8bc2..da8f9ce0 100644 --- a/Makefile +++ b/Makefile @@ -4,9 +4,9 @@ PKG := projects.blender.org/studio/flamenco # To update the version number in all the relevant places, update the VERSION # variable below and run `make update-version`. -VERSION := 3.5 +VERSION := 3.6-alpha0 # "alpha", "beta", or "release". -RELEASE_CYCLE := release +RELEASE_CYCLE := alpha # _GIT_DESCRIPTION_OR_TAG is either something like '16-123abc' (when we're 16 # commits since the last tag) or it's something like `v3.0-beta2` (when exactly diff --git a/addon/flamenco/__init__.py b/addon/flamenco/__init__.py index 1ac3ac4e..3666df3e 100644 --- a/addon/flamenco/__init__.py +++ b/addon/flamenco/__init__.py @@ -5,14 +5,14 @@ bl_info = { "name": "Flamenco 3", "author": "Sybren A. Stüvel", - "version": (3, 5), + "version": (3, 6), "blender": (3, 1, 0), "description": "Flamenco client for Blender.", "location": "Output Properties > Flamenco", "doc_url": "https://flamenco.blender.org/", "category": "System", "support": "COMMUNITY", - "warning": "", + "warning": "This is version 3.6-alpha0 of the add-on, which is not a stable release", } from pathlib import Path diff --git a/addon/flamenco/manager/__init__.py b/addon/flamenco/manager/__init__.py index efee2c7e..543f5756 100644 --- a/addon/flamenco/manager/__init__.py +++ b/addon/flamenco/manager/__init__.py @@ -10,7 +10,7 @@ """ -__version__ = "3.5" +__version__ = "3.6-alpha0" # import ApiClient from flamenco.manager.api_client import ApiClient diff --git a/addon/flamenco/manager/api_client.py b/addon/flamenco/manager/api_client.py index 25c3342b..7d65fe25 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/3.5 (Blender add-on)' + self.user_agent = 'Flamenco/3.6-alpha0 (Blender add-on)' def __enter__(self): return self diff --git a/addon/flamenco/manager/configuration.py b/addon/flamenco/manager/configuration.py index 3f63577f..4f6b9715 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: 3.5".\ + "SDK Package Version: 3.6-alpha0".\ format(env=sys.platform, pyversion=sys.version) def get_host_settings(self): diff --git a/addon/flamenco/manager_README.md b/addon/flamenco/manager_README.md index 92a13423..4208db5f 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: 3.5 +- Package version: 3.6-alpha0 - Build package: org.openapitools.codegen.languages.PythonClientCodegen For more information, please visit [https://flamenco.io/](https://flamenco.io/) diff --git a/web/app/src/manager-api/ApiClient.js b/web/app/src/manager-api/ApiClient.js index 401a1a55..004f5136 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/3.5 / webbrowser' + 'User-Agent': 'Flamenco/3.6-alpha0 / webbrowser' }; /** -- 2.30.2 From bb772841b7f320232798a81fceb01cac20122fbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Tue, 16 Apr 2024 11:12:48 +0200 Subject: [PATCH 69/84] Revert "Bumped version to 3.6-alpha0" This reverts commit 7f14e6705d69d05e1bcae3a9ff64dbf2541c47b5. v3.5 still needs today's date as release date in the changelog. --- Makefile | 4 ++-- addon/flamenco/__init__.py | 4 ++-- addon/flamenco/manager/__init__.py | 2 +- addon/flamenco/manager/api_client.py | 2 +- addon/flamenco/manager/configuration.py | 2 +- addon/flamenco/manager_README.md | 2 +- web/app/src/manager-api/ApiClient.js | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index da8f9ce0..1acc8bc2 100644 --- a/Makefile +++ b/Makefile @@ -4,9 +4,9 @@ PKG := projects.blender.org/studio/flamenco # To update the version number in all the relevant places, update the VERSION # variable below and run `make update-version`. -VERSION := 3.6-alpha0 +VERSION := 3.5 # "alpha", "beta", or "release". -RELEASE_CYCLE := alpha +RELEASE_CYCLE := release # _GIT_DESCRIPTION_OR_TAG is either something like '16-123abc' (when we're 16 # commits since the last tag) or it's something like `v3.0-beta2` (when exactly diff --git a/addon/flamenco/__init__.py b/addon/flamenco/__init__.py index 3666df3e..1ac3ac4e 100644 --- a/addon/flamenco/__init__.py +++ b/addon/flamenco/__init__.py @@ -5,14 +5,14 @@ bl_info = { "name": "Flamenco 3", "author": "Sybren A. Stüvel", - "version": (3, 6), + "version": (3, 5), "blender": (3, 1, 0), "description": "Flamenco client for Blender.", "location": "Output Properties > Flamenco", "doc_url": "https://flamenco.blender.org/", "category": "System", "support": "COMMUNITY", - "warning": "This is version 3.6-alpha0 of the add-on, which is not a stable release", + "warning": "", } from pathlib import Path diff --git a/addon/flamenco/manager/__init__.py b/addon/flamenco/manager/__init__.py index 543f5756..efee2c7e 100644 --- a/addon/flamenco/manager/__init__.py +++ b/addon/flamenco/manager/__init__.py @@ -10,7 +10,7 @@ """ -__version__ = "3.6-alpha0" +__version__ = "3.5" # import ApiClient from flamenco.manager.api_client import ApiClient diff --git a/addon/flamenco/manager/api_client.py b/addon/flamenco/manager/api_client.py index 7d65fe25..25c3342b 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/3.6-alpha0 (Blender add-on)' + self.user_agent = 'Flamenco/3.5 (Blender add-on)' def __enter__(self): return self diff --git a/addon/flamenco/manager/configuration.py b/addon/flamenco/manager/configuration.py index 4f6b9715..3f63577f 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: 3.6-alpha0".\ + "SDK Package Version: 3.5".\ format(env=sys.platform, pyversion=sys.version) def get_host_settings(self): diff --git a/addon/flamenco/manager_README.md b/addon/flamenco/manager_README.md index 4208db5f..92a13423 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: 3.6-alpha0 +- Package version: 3.5 - Build package: org.openapitools.codegen.languages.PythonClientCodegen For more information, please visit [https://flamenco.io/](https://flamenco.io/) diff --git a/web/app/src/manager-api/ApiClient.js b/web/app/src/manager-api/ApiClient.js index 004f5136..401a1a55 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/3.6-alpha0 / webbrowser' + 'User-Agent': 'Flamenco/3.5 / webbrowser' }; /** -- 2.30.2 From b4cc9db2db27ea174d78ea076c681576d2e69388 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Tue, 16 Apr 2024 11:13:45 +0200 Subject: [PATCH 70/84] Mark 3.5 as released today --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 36080c0f..8a77b4e2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ This file contains the history of changes to Flamenco. Only changes that might be interesting for users are listed here, such as new features and fixes for bugs in actually-released versions. -## 3.5 - in development +## 3.5 - released 2024-04-16 - Add MQTT support. Flamenco Manager can now send internal events to an MQTT broker. - Simplify the preview video filename when a complex set of frames rendered ([#104285](https://projects.blender.org/studio/flamenco/issues/104285)). Instead of `video-1, 4, 10.mp4` it is now simply `video-1-10.mp4`. -- 2.30.2 From f7aef5bfca068e3885f8000d24226ce47a2f0b38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Tue, 16 Apr 2024 11:16:27 +0200 Subject: [PATCH 71/84] Changelog: add link to MQTT documentation --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a77b4e2..f657ebe5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ bugs in actually-released versions. ## 3.5 - released 2024-04-16 -- Add MQTT support. Flamenco Manager can now send internal events to an MQTT broker. +- Add MQTT support ([docs](https://flamenco.blender.org/usage/manager-configuration/mqtt/)). Flamenco Manager can now send internal events to an MQTT broker. - Simplify the preview video filename when a complex set of frames rendered ([#104285](https://projects.blender.org/studio/flamenco/issues/104285)). Instead of `video-1, 4, 10.mp4` it is now simply `video-1-10.mp4`. - Make the `blendfile` parameter of a `blender-render` command optional. This makes it possible to pass, for example, a Python file that loads/constructs the blend file, instead of loading one straight from disk. - Show the farm status in the web frontend. This shows whether the farm is actively working on a job, idle, asleep (all workers are sleeping and no work is queued), waiting (all workers are sleeping, and work is queued), or inoperable (no workers, or all workers are offline). This status is also broadcast as event via the event bus, and thus available via SocketIO and MQTT. -- 2.30.2 From d279f91549a56bee5fdf87a648ffd3358e8ccd4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Wed, 24 Apr 2024 17:31:44 +0200 Subject: [PATCH 72/84] Bumped version to 3.6-alpha0 --- Makefile | 4 +- addon/flamenco/__init__.py | 4 +- addon/flamenco/manager/__init__.py | 2 +- addon/flamenco/manager/api_client.py | 2 +- addon/flamenco/manager/configuration.py | 2 +- addon/flamenco/manager_README.md | 286 ++++++++++++------------ web/app/src/manager-api/ApiClient.js | 2 +- 7 files changed, 151 insertions(+), 151 deletions(-) diff --git a/Makefile b/Makefile index 1acc8bc2..da8f9ce0 100644 --- a/Makefile +++ b/Makefile @@ -4,9 +4,9 @@ PKG := projects.blender.org/studio/flamenco # To update the version number in all the relevant places, update the VERSION # variable below and run `make update-version`. -VERSION := 3.5 +VERSION := 3.6-alpha0 # "alpha", "beta", or "release". -RELEASE_CYCLE := release +RELEASE_CYCLE := alpha # _GIT_DESCRIPTION_OR_TAG is either something like '16-123abc' (when we're 16 # commits since the last tag) or it's something like `v3.0-beta2` (when exactly diff --git a/addon/flamenco/__init__.py b/addon/flamenco/__init__.py index 1ac3ac4e..3666df3e 100644 --- a/addon/flamenco/__init__.py +++ b/addon/flamenco/__init__.py @@ -5,14 +5,14 @@ bl_info = { "name": "Flamenco 3", "author": "Sybren A. Stüvel", - "version": (3, 5), + "version": (3, 6), "blender": (3, 1, 0), "description": "Flamenco client for Blender.", "location": "Output Properties > Flamenco", "doc_url": "https://flamenco.blender.org/", "category": "System", "support": "COMMUNITY", - "warning": "", + "warning": "This is version 3.6-alpha0 of the add-on, which is not a stable release", } from pathlib import Path diff --git a/addon/flamenco/manager/__init__.py b/addon/flamenco/manager/__init__.py index efee2c7e..543f5756 100644 --- a/addon/flamenco/manager/__init__.py +++ b/addon/flamenco/manager/__init__.py @@ -10,7 +10,7 @@ """ -__version__ = "3.5" +__version__ = "3.6-alpha0" # import ApiClient from flamenco.manager.api_client import ApiClient diff --git a/addon/flamenco/manager/api_client.py b/addon/flamenco/manager/api_client.py index 25c3342b..7d65fe25 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/3.5 (Blender add-on)' + self.user_agent = 'Flamenco/3.6-alpha0 (Blender add-on)' def __enter__(self): return self diff --git a/addon/flamenco/manager/configuration.py b/addon/flamenco/manager/configuration.py index 3f63577f..4f6b9715 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: 3.5".\ + "SDK Package Version: 3.6-alpha0".\ format(env=sys.platform, pyversion=sys.version) def get_host_settings(self): diff --git a/addon/flamenco/manager_README.md b/addon/flamenco/manager_README.md index 92a13423..b780fb9d 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: 3.5 +- Package version: 3.6-alpha0 - Build package: org.openapitools.codegen.languages.PythonClientCodegen For more information, please visit [https://flamenco.io/](https://flamenco.io/) @@ -76,152 +76,152 @@ All URIs are relative to *http://localhost* Class | Method | HTTP request | Description ------------ | ------------- | ------------- | ------------- -*JobsApi* | [**delete_job**](flamenco/manager/docs/JobsApi.md#delete_job) | **DELETE** /api/v3/jobs/{job_id} | Request deletion this job, including its tasks and any log files. The actual deletion may happen in the background. No job files will be deleted (yet). -*JobsApi* | [**delete_job_mass**](flamenco/manager/docs/JobsApi.md#delete_job_mass) | **DELETE** /api/v3/jobs/mass-delete | Mark jobs for deletion, based on certain criteria. -*JobsApi* | [**delete_job_what_would_it_do**](flamenco/manager/docs/JobsApi.md#delete_job_what_would_it_do) | **GET** /api/v3/jobs/{job_id}/what-would-delete-do | Get info about what would be deleted when deleting this job. The job itself, its logs, and the last-rendered images will always be deleted. The job files are only deleted conditionally, and this operation can be used to figure that out. -*JobsApi* | [**fetch_global_last_rendered_info**](flamenco/manager/docs/JobsApi.md#fetch_global_last_rendered_info) | **GET** /api/v3/jobs/last-rendered | Get the URL that serves the last-rendered images. -*JobsApi* | [**fetch_job**](flamenco/manager/docs/JobsApi.md#fetch_job) | **GET** /api/v3/jobs/{job_id} | Fetch info about the job. -*JobsApi* | [**fetch_job_blocklist**](flamenco/manager/docs/JobsApi.md#fetch_job_blocklist) | **GET** /api/v3/jobs/{job_id}/blocklist | Fetch the list of workers that are blocked from doing certain task types on this job. -*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_priority**](flamenco/manager/docs/JobsApi.md#set_job_priority) | **POST** /api/v3/jobs/{job_id}/setpriority | -*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. -*JobsApi* | [**submit_job_check**](flamenco/manager/docs/JobsApi.md#submit_job_check) | **POST** /api/v3/jobs/check | Submit a new job for Flamenco Manager to check. -*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_farm_status**](flamenco/manager/docs/MetaApi.md#get_farm_status) | **GET** /api/v3/status | Get the status of this Flamenco farm. -*MetaApi* | [**get_shared_storage**](flamenco/manager/docs/MetaApi.md#get_shared_storage) | **GET** /api/v3/configuration/shared-storage/{audience}/{platform} | Get the shared storage location of this Manager, adjusted for the given audience and 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_setup_assistant_config**](flamenco/manager/docs/MetaApi.md#save_setup_assistant_config) | **POST** /api/v3/configuration/setup-assistant | 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. -*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_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_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* | [**create_worker_tag**](flamenco/manager/docs/WorkerMgtApi.md#create_worker_tag) | **POST** /api/v3/worker-mgt/tags | Create a new worker tag. -*WorkerMgtApi* | [**delete_worker**](flamenco/manager/docs/WorkerMgtApi.md#delete_worker) | **DELETE** /api/v3/worker-mgt/workers/{worker_id} | Remove the given worker. It is recommended to only call this function when the worker is in `offline` state. If the worker is still running, stop it first. Any task still assigned to the worker will be requeued. -*WorkerMgtApi* | [**delete_worker_tag**](flamenco/manager/docs/WorkerMgtApi.md#delete_worker_tag) | **DELETE** /api/v3/worker-mgt/tag/{tag_id} | Remove this worker tag. This unassigns all workers from the tag and removes it. -*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_worker_tag**](flamenco/manager/docs/WorkerMgtApi.md#fetch_worker_tag) | **GET** /api/v3/worker-mgt/tag/{tag_id} | Get a single worker tag. -*WorkerMgtApi* | [**fetch_worker_tags**](flamenco/manager/docs/WorkerMgtApi.md#fetch_worker_tags) | **GET** /api/v3/worker-mgt/tags | Get list of worker tags. -*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* | [**set_worker_sleep_schedule**](flamenco/manager/docs/WorkerMgtApi.md#set_worker_sleep_schedule) | **POST** /api/v3/worker-mgt/workers/{worker_id}/sleep-schedule | -*WorkerMgtApi* | [**set_worker_tags**](flamenco/manager/docs/WorkerMgtApi.md#set_worker_tags) | **POST** /api/v3/worker-mgt/workers/{worker_id}/settags | -*WorkerMgtApi* | [**update_worker_tag**](flamenco/manager/docs/WorkerMgtApi.md#update_worker_tag) | **PUT** /api/v3/worker-mgt/tag/{tag_id} | Update an existing worker tag. +*JobsApi* | [**delete_job**](flamenco\manager\docs/JobsApi.md#delete_job) | **DELETE** /api/v3/jobs/{job_id} | Request deletion this job, including its tasks and any log files. The actual deletion may happen in the background. No job files will be deleted (yet). +*JobsApi* | [**delete_job_mass**](flamenco\manager\docs/JobsApi.md#delete_job_mass) | **DELETE** /api/v3/jobs/mass-delete | Mark jobs for deletion, based on certain criteria. +*JobsApi* | [**delete_job_what_would_it_do**](flamenco\manager\docs/JobsApi.md#delete_job_what_would_it_do) | **GET** /api/v3/jobs/{job_id}/what-would-delete-do | Get info about what would be deleted when deleting this job. The job itself, its logs, and the last-rendered images will always be deleted. The job files are only deleted conditionally, and this operation can be used to figure that out. +*JobsApi* | [**fetch_global_last_rendered_info**](flamenco\manager\docs/JobsApi.md#fetch_global_last_rendered_info) | **GET** /api/v3/jobs/last-rendered | Get the URL that serves the last-rendered images. +*JobsApi* | [**fetch_job**](flamenco\manager\docs/JobsApi.md#fetch_job) | **GET** /api/v3/jobs/{job_id} | Fetch info about the job. +*JobsApi* | [**fetch_job_blocklist**](flamenco\manager\docs/JobsApi.md#fetch_job_blocklist) | **GET** /api/v3/jobs/{job_id}/blocklist | Fetch the list of workers that are blocked from doing certain task types on this job. +*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_priority**](flamenco\manager\docs/JobsApi.md#set_job_priority) | **POST** /api/v3/jobs/{job_id}/setpriority | +*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. +*JobsApi* | [**submit_job_check**](flamenco\manager\docs/JobsApi.md#submit_job_check) | **POST** /api/v3/jobs/check | Submit a new job for Flamenco Manager to check. +*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_farm_status**](flamenco\manager\docs/MetaApi.md#get_farm_status) | **GET** /api/v3/status | Get the status of this Flamenco farm. +*MetaApi* | [**get_shared_storage**](flamenco\manager\docs/MetaApi.md#get_shared_storage) | **GET** /api/v3/configuration/shared-storage/{audience}/{platform} | Get the shared storage location of this Manager, adjusted for the given audience and 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_setup_assistant_config**](flamenco\manager\docs/MetaApi.md#save_setup_assistant_config) | **POST** /api/v3/configuration/setup-assistant | 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. +*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_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_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* | [**create_worker_tag**](flamenco\manager\docs/WorkerMgtApi.md#create_worker_tag) | **POST** /api/v3/worker-mgt/tags | Create a new worker tag. +*WorkerMgtApi* | [**delete_worker**](flamenco\manager\docs/WorkerMgtApi.md#delete_worker) | **DELETE** /api/v3/worker-mgt/workers/{worker_id} | Remove the given worker. It is recommended to only call this function when the worker is in `offline` state. If the worker is still running, stop it first. Any task still assigned to the worker will be requeued. +*WorkerMgtApi* | [**delete_worker_tag**](flamenco\manager\docs/WorkerMgtApi.md#delete_worker_tag) | **DELETE** /api/v3/worker-mgt/tag/{tag_id} | Remove this worker tag. This unassigns all workers from the tag and removes it. +*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_worker_tag**](flamenco\manager\docs/WorkerMgtApi.md#fetch_worker_tag) | **GET** /api/v3/worker-mgt/tag/{tag_id} | Get a single worker tag. +*WorkerMgtApi* | [**fetch_worker_tags**](flamenco\manager\docs/WorkerMgtApi.md#fetch_worker_tags) | **GET** /api/v3/worker-mgt/tags | Get list of worker tags. +*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* | [**set_worker_sleep_schedule**](flamenco\manager\docs/WorkerMgtApi.md#set_worker_sleep_schedule) | **POST** /api/v3/worker-mgt/workers/{worker_id}/sleep-schedule | +*WorkerMgtApi* | [**set_worker_tags**](flamenco\manager\docs/WorkerMgtApi.md#set_worker_tags) | **POST** /api/v3/worker-mgt/workers/{worker_id}/settags | +*WorkerMgtApi* | [**update_worker_tag**](flamenco\manager\docs/WorkerMgtApi.md#update_worker_tag) | **PUT** /api/v3/worker-mgt/tag/{tag_id} | Update an existing worker tag. ## Documentation For Models - - [AssignedTask](flamenco/manager/docs/AssignedTask.md) - - [AvailableJobSetting](flamenco/manager/docs/AvailableJobSetting.md) - - [AvailableJobSettingEvalInfo](flamenco/manager/docs/AvailableJobSettingEvalInfo.md) - - [AvailableJobSettingSubtype](flamenco/manager/docs/AvailableJobSettingSubtype.md) - - [AvailableJobSettingType](flamenco/manager/docs/AvailableJobSettingType.md) - - [AvailableJobSettingVisibility](flamenco/manager/docs/AvailableJobSettingVisibility.md) - - [AvailableJobType](flamenco/manager/docs/AvailableJobType.md) - - [AvailableJobTypes](flamenco/manager/docs/AvailableJobTypes.md) - - [BlenderPathCheckResult](flamenco/manager/docs/BlenderPathCheckResult.md) - - [BlenderPathFindResult](flamenco/manager/docs/BlenderPathFindResult.md) - - [BlenderPathSource](flamenco/manager/docs/BlenderPathSource.md) - - [Command](flamenco/manager/docs/Command.md) - - [Error](flamenco/manager/docs/Error.md) - - [EventFarmStatus](flamenco/manager/docs/EventFarmStatus.md) - - [EventJobUpdate](flamenco/manager/docs/EventJobUpdate.md) - - [EventLastRenderedUpdate](flamenco/manager/docs/EventLastRenderedUpdate.md) - - [EventLifeCycle](flamenco/manager/docs/EventLifeCycle.md) - - [EventTaskLogUpdate](flamenco/manager/docs/EventTaskLogUpdate.md) - - [EventTaskUpdate](flamenco/manager/docs/EventTaskUpdate.md) - - [EventWorkerTagUpdate](flamenco/manager/docs/EventWorkerTagUpdate.md) - - [EventWorkerUpdate](flamenco/manager/docs/EventWorkerUpdate.md) - - [FarmStatus](flamenco/manager/docs/FarmStatus.md) - - [FarmStatusReport](flamenco/manager/docs/FarmStatusReport.md) - - [FlamencoVersion](flamenco/manager/docs/FlamencoVersion.md) - - [Job](flamenco/manager/docs/Job.md) - - [JobAllOf](flamenco/manager/docs/JobAllOf.md) - - [JobBlocklist](flamenco/manager/docs/JobBlocklist.md) - - [JobBlocklistEntry](flamenco/manager/docs/JobBlocklistEntry.md) - - [JobDeletionInfo](flamenco/manager/docs/JobDeletionInfo.md) - - [JobLastRenderedImageInfo](flamenco/manager/docs/JobLastRenderedImageInfo.md) - - [JobMassDeletionSelection](flamenco/manager/docs/JobMassDeletionSelection.md) - - [JobMetadata](flamenco/manager/docs/JobMetadata.md) - - [JobPriorityChange](flamenco/manager/docs/JobPriorityChange.md) - - [JobSettings](flamenco/manager/docs/JobSettings.md) - - [JobStatus](flamenco/manager/docs/JobStatus.md) - - [JobStatusChange](flamenco/manager/docs/JobStatusChange.md) - - [JobStorageInfo](flamenco/manager/docs/JobStorageInfo.md) - - [JobTasksSummary](flamenco/manager/docs/JobTasksSummary.md) - - [JobsQuery](flamenco/manager/docs/JobsQuery.md) - - [JobsQueryResult](flamenco/manager/docs/JobsQueryResult.md) - - [LifeCycleEventType](flamenco/manager/docs/LifeCycleEventType.md) - - [ManagerConfiguration](flamenco/manager/docs/ManagerConfiguration.md) - - [ManagerVariable](flamenco/manager/docs/ManagerVariable.md) - - [ManagerVariableAudience](flamenco/manager/docs/ManagerVariableAudience.md) - - [ManagerVariables](flamenco/manager/docs/ManagerVariables.md) - - [MayKeepRunning](flamenco/manager/docs/MayKeepRunning.md) - - [PathCheckInput](flamenco/manager/docs/PathCheckInput.md) - - [PathCheckResult](flamenco/manager/docs/PathCheckResult.md) - - [RegisteredWorker](flamenco/manager/docs/RegisteredWorker.md) - - [SecurityError](flamenco/manager/docs/SecurityError.md) - - [SetupAssistantConfig](flamenco/manager/docs/SetupAssistantConfig.md) - - [ShamanCheckout](flamenco/manager/docs/ShamanCheckout.md) - - [ShamanCheckoutResult](flamenco/manager/docs/ShamanCheckoutResult.md) - - [ShamanFileSpec](flamenco/manager/docs/ShamanFileSpec.md) - - [ShamanFileSpecWithStatus](flamenco/manager/docs/ShamanFileSpecWithStatus.md) - - [ShamanFileStatus](flamenco/manager/docs/ShamanFileStatus.md) - - [ShamanRequirementsRequest](flamenco/manager/docs/ShamanRequirementsRequest.md) - - [ShamanRequirementsResponse](flamenco/manager/docs/ShamanRequirementsResponse.md) - - [ShamanSingleFileStatus](flamenco/manager/docs/ShamanSingleFileStatus.md) - - [SharedStorageLocation](flamenco/manager/docs/SharedStorageLocation.md) - - [SocketIOSubscription](flamenco/manager/docs/SocketIOSubscription.md) - - [SocketIOSubscriptionOperation](flamenco/manager/docs/SocketIOSubscriptionOperation.md) - - [SocketIOSubscriptionType](flamenco/manager/docs/SocketIOSubscriptionType.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) - - [TaskUpdate](flamenco/manager/docs/TaskUpdate.md) - - [TaskWorker](flamenco/manager/docs/TaskWorker.md) - - [Worker](flamenco/manager/docs/Worker.md) - - [WorkerAllOf](flamenco/manager/docs/WorkerAllOf.md) - - [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) - - [WorkerStatusChangeRequest](flamenco/manager/docs/WorkerStatusChangeRequest.md) - - [WorkerSummary](flamenco/manager/docs/WorkerSummary.md) - - [WorkerTag](flamenco/manager/docs/WorkerTag.md) - - [WorkerTagChangeRequest](flamenco/manager/docs/WorkerTagChangeRequest.md) - - [WorkerTagList](flamenco/manager/docs/WorkerTagList.md) - - [WorkerTask](flamenco/manager/docs/WorkerTask.md) - - [WorkerTaskAllOf](flamenco/manager/docs/WorkerTaskAllOf.md) + - [AssignedTask](flamenco\manager\docs/AssignedTask.md) + - [AvailableJobSetting](flamenco\manager\docs/AvailableJobSetting.md) + - [AvailableJobSettingEvalInfo](flamenco\manager\docs/AvailableJobSettingEvalInfo.md) + - [AvailableJobSettingSubtype](flamenco\manager\docs/AvailableJobSettingSubtype.md) + - [AvailableJobSettingType](flamenco\manager\docs/AvailableJobSettingType.md) + - [AvailableJobSettingVisibility](flamenco\manager\docs/AvailableJobSettingVisibility.md) + - [AvailableJobType](flamenco\manager\docs/AvailableJobType.md) + - [AvailableJobTypes](flamenco\manager\docs/AvailableJobTypes.md) + - [BlenderPathCheckResult](flamenco\manager\docs/BlenderPathCheckResult.md) + - [BlenderPathFindResult](flamenco\manager\docs/BlenderPathFindResult.md) + - [BlenderPathSource](flamenco\manager\docs/BlenderPathSource.md) + - [Command](flamenco\manager\docs/Command.md) + - [Error](flamenco\manager\docs/Error.md) + - [EventFarmStatus](flamenco\manager\docs/EventFarmStatus.md) + - [EventJobUpdate](flamenco\manager\docs/EventJobUpdate.md) + - [EventLastRenderedUpdate](flamenco\manager\docs/EventLastRenderedUpdate.md) + - [EventLifeCycle](flamenco\manager\docs/EventLifeCycle.md) + - [EventTaskLogUpdate](flamenco\manager\docs/EventTaskLogUpdate.md) + - [EventTaskUpdate](flamenco\manager\docs/EventTaskUpdate.md) + - [EventWorkerTagUpdate](flamenco\manager\docs/EventWorkerTagUpdate.md) + - [EventWorkerUpdate](flamenco\manager\docs/EventWorkerUpdate.md) + - [FarmStatus](flamenco\manager\docs/FarmStatus.md) + - [FarmStatusReport](flamenco\manager\docs/FarmStatusReport.md) + - [FlamencoVersion](flamenco\manager\docs/FlamencoVersion.md) + - [Job](flamenco\manager\docs/Job.md) + - [JobAllOf](flamenco\manager\docs/JobAllOf.md) + - [JobBlocklist](flamenco\manager\docs/JobBlocklist.md) + - [JobBlocklistEntry](flamenco\manager\docs/JobBlocklistEntry.md) + - [JobDeletionInfo](flamenco\manager\docs/JobDeletionInfo.md) + - [JobLastRenderedImageInfo](flamenco\manager\docs/JobLastRenderedImageInfo.md) + - [JobMassDeletionSelection](flamenco\manager\docs/JobMassDeletionSelection.md) + - [JobMetadata](flamenco\manager\docs/JobMetadata.md) + - [JobPriorityChange](flamenco\manager\docs/JobPriorityChange.md) + - [JobSettings](flamenco\manager\docs/JobSettings.md) + - [JobStatus](flamenco\manager\docs/JobStatus.md) + - [JobStatusChange](flamenco\manager\docs/JobStatusChange.md) + - [JobStorageInfo](flamenco\manager\docs/JobStorageInfo.md) + - [JobTasksSummary](flamenco\manager\docs/JobTasksSummary.md) + - [JobsQuery](flamenco\manager\docs/JobsQuery.md) + - [JobsQueryResult](flamenco\manager\docs/JobsQueryResult.md) + - [LifeCycleEventType](flamenco\manager\docs/LifeCycleEventType.md) + - [ManagerConfiguration](flamenco\manager\docs/ManagerConfiguration.md) + - [ManagerVariable](flamenco\manager\docs/ManagerVariable.md) + - [ManagerVariableAudience](flamenco\manager\docs/ManagerVariableAudience.md) + - [ManagerVariables](flamenco\manager\docs/ManagerVariables.md) + - [MayKeepRunning](flamenco\manager\docs/MayKeepRunning.md) + - [PathCheckInput](flamenco\manager\docs/PathCheckInput.md) + - [PathCheckResult](flamenco\manager\docs/PathCheckResult.md) + - [RegisteredWorker](flamenco\manager\docs/RegisteredWorker.md) + - [SecurityError](flamenco\manager\docs/SecurityError.md) + - [SetupAssistantConfig](flamenco\manager\docs/SetupAssistantConfig.md) + - [ShamanCheckout](flamenco\manager\docs/ShamanCheckout.md) + - [ShamanCheckoutResult](flamenco\manager\docs/ShamanCheckoutResult.md) + - [ShamanFileSpec](flamenco\manager\docs/ShamanFileSpec.md) + - [ShamanFileSpecWithStatus](flamenco\manager\docs/ShamanFileSpecWithStatus.md) + - [ShamanFileStatus](flamenco\manager\docs/ShamanFileStatus.md) + - [ShamanRequirementsRequest](flamenco\manager\docs/ShamanRequirementsRequest.md) + - [ShamanRequirementsResponse](flamenco\manager\docs/ShamanRequirementsResponse.md) + - [ShamanSingleFileStatus](flamenco\manager\docs/ShamanSingleFileStatus.md) + - [SharedStorageLocation](flamenco\manager\docs/SharedStorageLocation.md) + - [SocketIOSubscription](flamenco\manager\docs/SocketIOSubscription.md) + - [SocketIOSubscriptionOperation](flamenco\manager\docs/SocketIOSubscriptionOperation.md) + - [SocketIOSubscriptionType](flamenco\manager\docs/SocketIOSubscriptionType.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) + - [TaskUpdate](flamenco\manager\docs/TaskUpdate.md) + - [TaskWorker](flamenco\manager\docs/TaskWorker.md) + - [Worker](flamenco\manager\docs/Worker.md) + - [WorkerAllOf](flamenco\manager\docs/WorkerAllOf.md) + - [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) + - [WorkerStatusChangeRequest](flamenco\manager\docs/WorkerStatusChangeRequest.md) + - [WorkerSummary](flamenco\manager\docs/WorkerSummary.md) + - [WorkerTag](flamenco\manager\docs/WorkerTag.md) + - [WorkerTagChangeRequest](flamenco\manager\docs/WorkerTagChangeRequest.md) + - [WorkerTagList](flamenco\manager\docs/WorkerTagList.md) + - [WorkerTask](flamenco\manager\docs/WorkerTask.md) + - [WorkerTaskAllOf](flamenco\manager\docs/WorkerTaskAllOf.md) ## Documentation For Authorization diff --git a/web/app/src/manager-api/ApiClient.js b/web/app/src/manager-api/ApiClient.js index 401a1a55..004f5136 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/3.5 / webbrowser' + 'User-Agent': 'Flamenco/3.6-alpha0 / webbrowser' }; /** -- 2.30.2 From 68ac3c03e335e1fd6f732c5abb4cdb5f4c0f96d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Wed, 24 Apr 2024 17:30:45 +0200 Subject: [PATCH 73/84] Add-on: compatibility with Python 3.9 Remove some Python 3.10 features to make the add-on compatible with py39. This is the Python version that's bundled with Blender 2.93 LTS, for which I got a request to see if it could be supported. The Blender version still isn't officially supported, but this should make things at least not immediately fail. --- addon/flamenco/bat/shaman.py | 81 ++++++++++++++++------------------ addon/flamenco/manager_info.py | 4 +- addon/flamenco/projects.py | 4 +- 3 files changed, 43 insertions(+), 46 deletions(-) diff --git a/addon/flamenco/bat/shaman.py b/addon/flamenco/bat/shaman.py index dba0aa60..4a45a499 100644 --- a/addon/flamenco/bat/shaman.py +++ b/addon/flamenco/bat/shaman.py @@ -286,16 +286,16 @@ class Transferrer(submodules.transfer.FileTransferer): # type: ignore return None self.log.debug(" %s: %s", file_spec.status, file_spec.path) - match file_spec.status.value: - case "unknown": - to_upload.appendleft(file_spec) - case "uploading": - to_upload.append(file_spec) - case _: - msg = "Unknown status in response from Shaman: %r" % file_spec - self.log.error(msg) - self.error_set(msg) - return None + status = file_spec.status.value + if status == "unknown": + to_upload.appendleft(file_spec) + elif status == "uploading": + to_upload.append(file_spec) + else: + msg = "Unknown status in response from Shaman: %r" % file_spec + self.log.error(msg) + self.error_set(msg) + return None return to_upload def _upload_files( @@ -375,25 +375,26 @@ class Transferrer(submodules.transfer.FileTransferer): # type: ignore x_shaman_original_filename=file_spec.path, ) except ApiException as ex: - match ex.status: - case 425: # Too Early, i.e. defer uploading this file. - self.log.info( - " %s: someone else is uploading this file, deferring", - file_spec.path, - ) - defer(file_spec) - continue - case 417: # Expectation Failed; mismatch of checksum or file size. - msg = "Error from Shaman uploading %s, code %d: %s" % ( - file_spec.path, - ex.status, - ex.body, - ) - case _: # Unknown error - msg = "API exception\nHeaders: %s\nBody: %s\n" % ( - ex.headers, - ex.body, - ) + if ex.status == 425: + # Too Early, i.e. defer uploading this file. + self.log.info( + " %s: someone else is uploading this file, deferring", + file_spec.path, + ) + defer(file_spec) + continue + elif ex.status == 417: + # Expectation Failed; mismatch of checksum or file size. + msg = "Error from Shaman uploading %s, code %d: %s" % ( + file_spec.path, + ex.status, + ex.body, + ) + else: # Unknown error + msg = "API exception\nHeaders: %s\nBody: %s\n" % ( + ex.headers, + ex.body, + ) self.log.error(msg) self.error_set(msg) @@ -453,19 +454,15 @@ class Transferrer(submodules.transfer.FileTransferer): # type: ignore checkoutRequest ) except ApiException as ex: - match ex.status: - case 424: # Files were missing - msg = "We did not upload some files, checkout aborted" - case 409: # Checkout already exists - msg = ( - "There is already an existing checkout at %s" - % self.checkout_path - ) - case _: # Unknown error - msg = "API exception\nHeaders: %s\nBody: %s\n" % ( - ex.headers, - ex.body, - ) + if ex.status == 424: # Files were missing + msg = "We did not upload some files, checkout aborted" + elif ex.status == 409: # Checkout already exists + msg = "There is already an existing checkout at %s" % self.checkout_path + else: # Unknown error + msg = "API exception\nHeaders: %s\nBody: %s\n" % ( + ex.headers, + ex.body, + ) self.log.error(msg) self.error_set(msg) return None diff --git a/addon/flamenco/manager_info.py b/addon/flamenco/manager_info.py index aa17d797..10c2bf68 100644 --- a/addon/flamenco/manager_info.py +++ b/addon/flamenco/manager_info.py @@ -5,7 +5,7 @@ import dataclasses import json import platform from pathlib import Path -from typing import TYPE_CHECKING, Optional +from typing import TYPE_CHECKING, Optional, Union from urllib3.exceptions import HTTPError, MaxRetryError @@ -133,7 +133,7 @@ def _to_json(info: ManagerInfo) -> str: return json.dumps(info, indent=" ", cls=Encoder) -def _from_json(contents: str | bytes) -> ManagerInfo: +def _from_json(contents: Union[str, bytes]) -> ManagerInfo: # Do a late import, so that the API is only imported when actually used. from flamenco.manager.configuration import Configuration from flamenco.manager.model_utils import validate_and_convert_types diff --git a/addon/flamenco/projects.py b/addon/flamenco/projects.py index 6d4281d8..246a8ba7 100644 --- a/addon/flamenco/projects.py +++ b/addon/flamenco/projects.py @@ -2,7 +2,7 @@ # from pathlib import Path -from typing import Callable, TypeAlias +from typing import Callable import dataclasses from .bat.submodules import bpathlib @@ -64,7 +64,7 @@ def _search_path_marker(blendfile: Path, marker_path: str) -> Path: return blendfile_dir -Finder: TypeAlias = Callable[[Path], Path] +Finder = Callable[[Path], Path] @dataclasses.dataclass -- 2.30.2 From 85d7cb07e7e3f86540d665f5e933217bf517bbcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Wed, 24 Apr 2024 17:46:05 +0200 Subject: [PATCH 74/84] Website: bump experimental version to 3.6-alpha0 --- web/project-website/data/flamenco.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/project-website/data/flamenco.yaml b/web/project-website/data/flamenco.yaml index 8e89f6cd..16901f4f 100644 --- a/web/project-website/data/flamenco.yaml +++ b/web/project-website/data/flamenco.yaml @@ -1,2 +1,2 @@ latestVersion: "3.5" -latestExperimentalVersion: "3.5-beta1" +latestExperimentalVersion: "3.6-alpha0" -- 2.30.2 From fde20af852e14b9bc476d0a6645b2c09cdf5dd24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Wed, 24 Apr 2024 17:52:17 +0200 Subject: [PATCH 75/84] Changelog: mark 3.6 as 'in development' --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f657ebe5..c7107796 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ This file contains the history of changes to Flamenco. Only changes that might be interesting for users are listed here, such as new features and fixes for bugs in actually-released versions. +## 3.6 - in development + ## 3.5 - released 2024-04-16 - Add MQTT support ([docs](https://flamenco.blender.org/usage/manager-configuration/mqtt/)). Flamenco Manager can now send internal events to an MQTT broker. -- 2.30.2 From 153cfe7b5c3b51d0966cea35c7e9f1a69286f674 Mon Sep 17 00:00:00 2001 From: MrJW Date: Sat, 4 May 2024 18:19:44 +0200 Subject: [PATCH 76/84] Improve Troubleshooting FAQ: Add firewall and antivirus check Updated the troubleshooting section of the FAQ to include guidance on checking the firewall and potential third-party antivirus issues when the Worker cannot connect to the Manager. This enhances the user experience by addressing common connectivity issues more comprehensively. --- web/project-website/content/faq/_index.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/project-website/content/faq/_index.md b/web/project-website/content/faq/_index.md index 098629e3..44a0f1dc 100644 --- a/web/project-website/content/faq/_index.md +++ b/web/project-website/content/faq/_index.md @@ -134,9 +134,9 @@ Storage Services][cloud-storage]. ### My Worker cannot find my Manager, what do I do? -First check the Manager output on the terminal, to see if it shows any messages -about "auto-discovery" or "UPnP/SSDP". Most of the time it's actually Spotify -getting in the way, so make sure to close that before you start the Manager. +First, ensure that the Manager port is open in your firewall. On Windows, you should be prompted by the system during the initial setup. If you're using a third-party antivirus, you may need to create a custom rule manually. + +If you're still experiencing issues, check the Manager output on the terminal for any messages related to "auto-discovery" or "UPnP/SSDP". Often, Spotify can interfere, so try closing it before starting the Manager. If that doesn't help, you'll have to tell the Worker where it can find the Manager. This can be done on the commandline, by running it like -- 2.30.2 From 2146388abee42da7f8deba25247c2192bb3289cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Mon, 6 May 2024 11:16:01 +0200 Subject: [PATCH 77/84] Website: reword the 'worker cannot find manager' FAQ entry Reword so that the section starts with the suggestion that each problem has a solution. And make it an enumerated list to clarify the structure of the answer. --- web/project-website/content/faq/_index.md | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/web/project-website/content/faq/_index.md b/web/project-website/content/faq/_index.md index 44a0f1dc..a2c56a1d 100644 --- a/web/project-website/content/faq/_index.md +++ b/web/project-website/content/faq/_index.md @@ -134,17 +134,14 @@ Storage Services][cloud-storage]. ### My Worker cannot find my Manager, what do I do? -First, ensure that the Manager port is open in your firewall. On Windows, you should be prompted by the system during the initial setup. If you're using a third-party antivirus, you may need to create a custom rule manually. +There can be a few causes for this, each with their own solution. -If you're still experiencing issues, check the Manager output on the terminal for any messages related to "auto-discovery" or "UPnP/SSDP". Often, Spotify can interfere, so try closing it before starting the Manager. - -If that doesn't help, you'll have to tell the Worker where it can find the -Manager. This can be done on the commandline, by running it like -`flamenco-worker -manager http://192.168.0.1:8080/` (adjust the address to your -situation) or more permanently by [editing the worker configuration -file][workercfg]. +1. **Check the Manager output on the terminal** for any messages related to "auto-discovery" or "UPnP/SSDP". Older versions of Spotify can interfere, so make sure to close that before you start the Manager. +2. Ensure that the **Manager port is open** in your firewall. On Windows, the system will prompt you for this during the initial setup. If you're using a third-party firewall (sometimes presenting itself as anti-virus software), you may need to create a custom rule manually. The default port is `8080`, which can be changed in [the Manager configuration file][managercfg]. +3. If that doesn't help, you'll have to **tell the Worker where it can find the Manager**. This can be done on the commandline, by running it like `flamenco-worker -manager http://192.168.0.1:8080/` (adjust the address to your situation) or more permanently by editing [the worker configuration file][workercfg]. [workercfg]: {{< ref "usage/worker-configuration" >}} +[managercfg]: {{< ref "usage/manager-configuration" >}} ### My Worker cannot find Blender, what do I do? -- 2.30.2 From e712e9450c31e555fba71b0f88abf00a59c4b8ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Tue, 7 May 2024 11:54:49 +0200 Subject: [PATCH 78/84] OAPI: add `label` to `AvailableJobSetting` --- pkg/api/flamenco-openapi.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkg/api/flamenco-openapi.yaml b/pkg/api/flamenco-openapi.yaml index 72f6a5dc..22b64271 100644 --- a/pkg/api/flamenco-openapi.yaml +++ b/pkg/api/flamenco-openapi.yaml @@ -1751,6 +1751,8 @@ components: type: object "description": description: The description/tooltip shown in the user interface. + "label": + description: Label for displaying this setting. If not specified, the key is used to generate a reasonable label. "default": description: The default value shown to the user when determining this setting. "eval": -- 2.30.2 From 5ee4871e394a9f1b0fd951f501b2103b3d19d02f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Tue, 7 May 2024 11:55:56 +0200 Subject: [PATCH 79/84] OAPI: regenerate code --- .../manager/docs/AvailableJobSetting.md | 1 + .../manager/model/available_job_setting.py | 4 + addon/flamenco/manager_README.md | 284 +++++------ pkg/api/openapi_spec.gen.go | 454 +++++++++--------- pkg/api/openapi_types.gen.go | 3 + .../manager-api/model/AvailableJobSetting.js | 9 + 6 files changed, 386 insertions(+), 369 deletions(-) diff --git a/addon/flamenco/manager/docs/AvailableJobSetting.md b/addon/flamenco/manager/docs/AvailableJobSetting.md index 8f0ab931..da61a737 100644 --- a/addon/flamenco/manager/docs/AvailableJobSetting.md +++ b/addon/flamenco/manager/docs/AvailableJobSetting.md @@ -11,6 +11,7 @@ Name | Type | Description | Notes **choices** | **[str]** | When given, limit the valid values to these choices. Only usable with string type. | [optional] **propargs** | **{str: (bool, date, datetime, dict, float, int, list, str, none_type)}** | Any extra arguments to the bpy.props.SomeProperty() call used to create this property. | [optional] **description** | **bool, date, datetime, dict, float, int, list, str, none_type** | The description/tooltip shown in the user interface. | [optional] +**label** | **bool, date, datetime, dict, float, int, list, str, none_type** | Label for displaying this setting. If not specified, the key is used to generate a reasonable label. | [optional] **default** | **bool, date, datetime, dict, float, int, list, str, none_type** | The default value shown to the user when determining this setting. | [optional] **eval** | **str** | Python expression to be evaluated in order to determine the default value for this setting. | [optional] **eval_info** | [**AvailableJobSettingEvalInfo**](AvailableJobSettingEvalInfo.md) | | [optional] diff --git a/addon/flamenco/manager/model/available_job_setting.py b/addon/flamenco/manager/model/available_job_setting.py index dd023102..40c21ea0 100644 --- a/addon/flamenco/manager/model/available_job_setting.py +++ b/addon/flamenco/manager/model/available_job_setting.py @@ -99,6 +99,7 @@ class AvailableJobSetting(ModelNormal): 'choices': ([str],), # noqa: E501 'propargs': ({str: (bool, date, datetime, dict, float, int, list, str, none_type)},), # noqa: E501 'description': (bool, date, datetime, dict, float, int, list, str, none_type,), # noqa: E501 + 'label': (bool, date, datetime, dict, float, int, list, str, none_type,), # noqa: E501 'default': (bool, date, datetime, dict, float, int, list, str, none_type,), # noqa: E501 'eval': (str,), # noqa: E501 'eval_info': (AvailableJobSettingEvalInfo,), # noqa: E501 @@ -119,6 +120,7 @@ class AvailableJobSetting(ModelNormal): 'choices': 'choices', # noqa: E501 'propargs': 'propargs', # noqa: E501 'description': 'description', # noqa: E501 + 'label': 'label', # noqa: E501 'default': 'default', # noqa: E501 'eval': 'eval', # noqa: E501 'eval_info': 'evalInfo', # noqa: E501 @@ -176,6 +178,7 @@ class AvailableJobSetting(ModelNormal): choices ([str]): When given, limit the valid values to these choices. Only usable with string type.. [optional] # noqa: E501 propargs ({str: (bool, date, datetime, dict, float, int, list, str, none_type)}): Any extra arguments to the bpy.props.SomeProperty() call used to create this property.. [optional] # noqa: E501 description (bool, date, datetime, dict, float, int, list, str, none_type): The description/tooltip shown in the user interface.. [optional] # noqa: E501 + label (bool, date, datetime, dict, float, int, list, str, none_type): Label for displaying this setting. If not specified, the key is used to generate a reasonable label.. [optional] # noqa: E501 default (bool, date, datetime, dict, float, int, list, str, none_type): The default value shown to the user when determining this setting.. [optional] # noqa: E501 eval (str): Python expression to be evaluated in order to determine the default value for this setting.. [optional] # noqa: E501 eval_info (AvailableJobSettingEvalInfo): [optional] # noqa: E501 @@ -273,6 +276,7 @@ class AvailableJobSetting(ModelNormal): choices ([str]): When given, limit the valid values to these choices. Only usable with string type.. [optional] # noqa: E501 propargs ({str: (bool, date, datetime, dict, float, int, list, str, none_type)}): Any extra arguments to the bpy.props.SomeProperty() call used to create this property.. [optional] # noqa: E501 description (bool, date, datetime, dict, float, int, list, str, none_type): The description/tooltip shown in the user interface.. [optional] # noqa: E501 + label (bool, date, datetime, dict, float, int, list, str, none_type): Label for displaying this setting. If not specified, the key is used to generate a reasonable label.. [optional] # noqa: E501 default (bool, date, datetime, dict, float, int, list, str, none_type): The default value shown to the user when determining this setting.. [optional] # noqa: E501 eval (str): Python expression to be evaluated in order to determine the default value for this setting.. [optional] # noqa: E501 eval_info (AvailableJobSettingEvalInfo): [optional] # noqa: E501 diff --git a/addon/flamenco/manager_README.md b/addon/flamenco/manager_README.md index b780fb9d..4208db5f 100644 --- a/addon/flamenco/manager_README.md +++ b/addon/flamenco/manager_README.md @@ -76,152 +76,152 @@ All URIs are relative to *http://localhost* Class | Method | HTTP request | Description ------------ | ------------- | ------------- | ------------- -*JobsApi* | [**delete_job**](flamenco\manager\docs/JobsApi.md#delete_job) | **DELETE** /api/v3/jobs/{job_id} | Request deletion this job, including its tasks and any log files. The actual deletion may happen in the background. No job files will be deleted (yet). -*JobsApi* | [**delete_job_mass**](flamenco\manager\docs/JobsApi.md#delete_job_mass) | **DELETE** /api/v3/jobs/mass-delete | Mark jobs for deletion, based on certain criteria. -*JobsApi* | [**delete_job_what_would_it_do**](flamenco\manager\docs/JobsApi.md#delete_job_what_would_it_do) | **GET** /api/v3/jobs/{job_id}/what-would-delete-do | Get info about what would be deleted when deleting this job. The job itself, its logs, and the last-rendered images will always be deleted. The job files are only deleted conditionally, and this operation can be used to figure that out. -*JobsApi* | [**fetch_global_last_rendered_info**](flamenco\manager\docs/JobsApi.md#fetch_global_last_rendered_info) | **GET** /api/v3/jobs/last-rendered | Get the URL that serves the last-rendered images. -*JobsApi* | [**fetch_job**](flamenco\manager\docs/JobsApi.md#fetch_job) | **GET** /api/v3/jobs/{job_id} | Fetch info about the job. -*JobsApi* | [**fetch_job_blocklist**](flamenco\manager\docs/JobsApi.md#fetch_job_blocklist) | **GET** /api/v3/jobs/{job_id}/blocklist | Fetch the list of workers that are blocked from doing certain task types on this job. -*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_priority**](flamenco\manager\docs/JobsApi.md#set_job_priority) | **POST** /api/v3/jobs/{job_id}/setpriority | -*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. -*JobsApi* | [**submit_job_check**](flamenco\manager\docs/JobsApi.md#submit_job_check) | **POST** /api/v3/jobs/check | Submit a new job for Flamenco Manager to check. -*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_farm_status**](flamenco\manager\docs/MetaApi.md#get_farm_status) | **GET** /api/v3/status | Get the status of this Flamenco farm. -*MetaApi* | [**get_shared_storage**](flamenco\manager\docs/MetaApi.md#get_shared_storage) | **GET** /api/v3/configuration/shared-storage/{audience}/{platform} | Get the shared storage location of this Manager, adjusted for the given audience and 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_setup_assistant_config**](flamenco\manager\docs/MetaApi.md#save_setup_assistant_config) | **POST** /api/v3/configuration/setup-assistant | 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. -*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_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_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* | [**create_worker_tag**](flamenco\manager\docs/WorkerMgtApi.md#create_worker_tag) | **POST** /api/v3/worker-mgt/tags | Create a new worker tag. -*WorkerMgtApi* | [**delete_worker**](flamenco\manager\docs/WorkerMgtApi.md#delete_worker) | **DELETE** /api/v3/worker-mgt/workers/{worker_id} | Remove the given worker. It is recommended to only call this function when the worker is in `offline` state. If the worker is still running, stop it first. Any task still assigned to the worker will be requeued. -*WorkerMgtApi* | [**delete_worker_tag**](flamenco\manager\docs/WorkerMgtApi.md#delete_worker_tag) | **DELETE** /api/v3/worker-mgt/tag/{tag_id} | Remove this worker tag. This unassigns all workers from the tag and removes it. -*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_worker_tag**](flamenco\manager\docs/WorkerMgtApi.md#fetch_worker_tag) | **GET** /api/v3/worker-mgt/tag/{tag_id} | Get a single worker tag. -*WorkerMgtApi* | [**fetch_worker_tags**](flamenco\manager\docs/WorkerMgtApi.md#fetch_worker_tags) | **GET** /api/v3/worker-mgt/tags | Get list of worker tags. -*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* | [**set_worker_sleep_schedule**](flamenco\manager\docs/WorkerMgtApi.md#set_worker_sleep_schedule) | **POST** /api/v3/worker-mgt/workers/{worker_id}/sleep-schedule | -*WorkerMgtApi* | [**set_worker_tags**](flamenco\manager\docs/WorkerMgtApi.md#set_worker_tags) | **POST** /api/v3/worker-mgt/workers/{worker_id}/settags | -*WorkerMgtApi* | [**update_worker_tag**](flamenco\manager\docs/WorkerMgtApi.md#update_worker_tag) | **PUT** /api/v3/worker-mgt/tag/{tag_id} | Update an existing worker tag. +*JobsApi* | [**delete_job**](flamenco/manager/docs/JobsApi.md#delete_job) | **DELETE** /api/v3/jobs/{job_id} | Request deletion this job, including its tasks and any log files. The actual deletion may happen in the background. No job files will be deleted (yet). +*JobsApi* | [**delete_job_mass**](flamenco/manager/docs/JobsApi.md#delete_job_mass) | **DELETE** /api/v3/jobs/mass-delete | Mark jobs for deletion, based on certain criteria. +*JobsApi* | [**delete_job_what_would_it_do**](flamenco/manager/docs/JobsApi.md#delete_job_what_would_it_do) | **GET** /api/v3/jobs/{job_id}/what-would-delete-do | Get info about what would be deleted when deleting this job. The job itself, its logs, and the last-rendered images will always be deleted. The job files are only deleted conditionally, and this operation can be used to figure that out. +*JobsApi* | [**fetch_global_last_rendered_info**](flamenco/manager/docs/JobsApi.md#fetch_global_last_rendered_info) | **GET** /api/v3/jobs/last-rendered | Get the URL that serves the last-rendered images. +*JobsApi* | [**fetch_job**](flamenco/manager/docs/JobsApi.md#fetch_job) | **GET** /api/v3/jobs/{job_id} | Fetch info about the job. +*JobsApi* | [**fetch_job_blocklist**](flamenco/manager/docs/JobsApi.md#fetch_job_blocklist) | **GET** /api/v3/jobs/{job_id}/blocklist | Fetch the list of workers that are blocked from doing certain task types on this job. +*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_priority**](flamenco/manager/docs/JobsApi.md#set_job_priority) | **POST** /api/v3/jobs/{job_id}/setpriority | +*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. +*JobsApi* | [**submit_job_check**](flamenco/manager/docs/JobsApi.md#submit_job_check) | **POST** /api/v3/jobs/check | Submit a new job for Flamenco Manager to check. +*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_farm_status**](flamenco/manager/docs/MetaApi.md#get_farm_status) | **GET** /api/v3/status | Get the status of this Flamenco farm. +*MetaApi* | [**get_shared_storage**](flamenco/manager/docs/MetaApi.md#get_shared_storage) | **GET** /api/v3/configuration/shared-storage/{audience}/{platform} | Get the shared storage location of this Manager, adjusted for the given audience and 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_setup_assistant_config**](flamenco/manager/docs/MetaApi.md#save_setup_assistant_config) | **POST** /api/v3/configuration/setup-assistant | 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. +*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_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_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* | [**create_worker_tag**](flamenco/manager/docs/WorkerMgtApi.md#create_worker_tag) | **POST** /api/v3/worker-mgt/tags | Create a new worker tag. +*WorkerMgtApi* | [**delete_worker**](flamenco/manager/docs/WorkerMgtApi.md#delete_worker) | **DELETE** /api/v3/worker-mgt/workers/{worker_id} | Remove the given worker. It is recommended to only call this function when the worker is in `offline` state. If the worker is still running, stop it first. Any task still assigned to the worker will be requeued. +*WorkerMgtApi* | [**delete_worker_tag**](flamenco/manager/docs/WorkerMgtApi.md#delete_worker_tag) | **DELETE** /api/v3/worker-mgt/tag/{tag_id} | Remove this worker tag. This unassigns all workers from the tag and removes it. +*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_worker_tag**](flamenco/manager/docs/WorkerMgtApi.md#fetch_worker_tag) | **GET** /api/v3/worker-mgt/tag/{tag_id} | Get a single worker tag. +*WorkerMgtApi* | [**fetch_worker_tags**](flamenco/manager/docs/WorkerMgtApi.md#fetch_worker_tags) | **GET** /api/v3/worker-mgt/tags | Get list of worker tags. +*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* | [**set_worker_sleep_schedule**](flamenco/manager/docs/WorkerMgtApi.md#set_worker_sleep_schedule) | **POST** /api/v3/worker-mgt/workers/{worker_id}/sleep-schedule | +*WorkerMgtApi* | [**set_worker_tags**](flamenco/manager/docs/WorkerMgtApi.md#set_worker_tags) | **POST** /api/v3/worker-mgt/workers/{worker_id}/settags | +*WorkerMgtApi* | [**update_worker_tag**](flamenco/manager/docs/WorkerMgtApi.md#update_worker_tag) | **PUT** /api/v3/worker-mgt/tag/{tag_id} | Update an existing worker tag. ## Documentation For Models - - [AssignedTask](flamenco\manager\docs/AssignedTask.md) - - [AvailableJobSetting](flamenco\manager\docs/AvailableJobSetting.md) - - [AvailableJobSettingEvalInfo](flamenco\manager\docs/AvailableJobSettingEvalInfo.md) - - [AvailableJobSettingSubtype](flamenco\manager\docs/AvailableJobSettingSubtype.md) - - [AvailableJobSettingType](flamenco\manager\docs/AvailableJobSettingType.md) - - [AvailableJobSettingVisibility](flamenco\manager\docs/AvailableJobSettingVisibility.md) - - [AvailableJobType](flamenco\manager\docs/AvailableJobType.md) - - [AvailableJobTypes](flamenco\manager\docs/AvailableJobTypes.md) - - [BlenderPathCheckResult](flamenco\manager\docs/BlenderPathCheckResult.md) - - [BlenderPathFindResult](flamenco\manager\docs/BlenderPathFindResult.md) - - [BlenderPathSource](flamenco\manager\docs/BlenderPathSource.md) - - [Command](flamenco\manager\docs/Command.md) - - [Error](flamenco\manager\docs/Error.md) - - [EventFarmStatus](flamenco\manager\docs/EventFarmStatus.md) - - [EventJobUpdate](flamenco\manager\docs/EventJobUpdate.md) - - [EventLastRenderedUpdate](flamenco\manager\docs/EventLastRenderedUpdate.md) - - [EventLifeCycle](flamenco\manager\docs/EventLifeCycle.md) - - [EventTaskLogUpdate](flamenco\manager\docs/EventTaskLogUpdate.md) - - [EventTaskUpdate](flamenco\manager\docs/EventTaskUpdate.md) - - [EventWorkerTagUpdate](flamenco\manager\docs/EventWorkerTagUpdate.md) - - [EventWorkerUpdate](flamenco\manager\docs/EventWorkerUpdate.md) - - [FarmStatus](flamenco\manager\docs/FarmStatus.md) - - [FarmStatusReport](flamenco\manager\docs/FarmStatusReport.md) - - [FlamencoVersion](flamenco\manager\docs/FlamencoVersion.md) - - [Job](flamenco\manager\docs/Job.md) - - [JobAllOf](flamenco\manager\docs/JobAllOf.md) - - [JobBlocklist](flamenco\manager\docs/JobBlocklist.md) - - [JobBlocklistEntry](flamenco\manager\docs/JobBlocklistEntry.md) - - [JobDeletionInfo](flamenco\manager\docs/JobDeletionInfo.md) - - [JobLastRenderedImageInfo](flamenco\manager\docs/JobLastRenderedImageInfo.md) - - [JobMassDeletionSelection](flamenco\manager\docs/JobMassDeletionSelection.md) - - [JobMetadata](flamenco\manager\docs/JobMetadata.md) - - [JobPriorityChange](flamenco\manager\docs/JobPriorityChange.md) - - [JobSettings](flamenco\manager\docs/JobSettings.md) - - [JobStatus](flamenco\manager\docs/JobStatus.md) - - [JobStatusChange](flamenco\manager\docs/JobStatusChange.md) - - [JobStorageInfo](flamenco\manager\docs/JobStorageInfo.md) - - [JobTasksSummary](flamenco\manager\docs/JobTasksSummary.md) - - [JobsQuery](flamenco\manager\docs/JobsQuery.md) - - [JobsQueryResult](flamenco\manager\docs/JobsQueryResult.md) - - [LifeCycleEventType](flamenco\manager\docs/LifeCycleEventType.md) - - [ManagerConfiguration](flamenco\manager\docs/ManagerConfiguration.md) - - [ManagerVariable](flamenco\manager\docs/ManagerVariable.md) - - [ManagerVariableAudience](flamenco\manager\docs/ManagerVariableAudience.md) - - [ManagerVariables](flamenco\manager\docs/ManagerVariables.md) - - [MayKeepRunning](flamenco\manager\docs/MayKeepRunning.md) - - [PathCheckInput](flamenco\manager\docs/PathCheckInput.md) - - [PathCheckResult](flamenco\manager\docs/PathCheckResult.md) - - [RegisteredWorker](flamenco\manager\docs/RegisteredWorker.md) - - [SecurityError](flamenco\manager\docs/SecurityError.md) - - [SetupAssistantConfig](flamenco\manager\docs/SetupAssistantConfig.md) - - [ShamanCheckout](flamenco\manager\docs/ShamanCheckout.md) - - [ShamanCheckoutResult](flamenco\manager\docs/ShamanCheckoutResult.md) - - [ShamanFileSpec](flamenco\manager\docs/ShamanFileSpec.md) - - [ShamanFileSpecWithStatus](flamenco\manager\docs/ShamanFileSpecWithStatus.md) - - [ShamanFileStatus](flamenco\manager\docs/ShamanFileStatus.md) - - [ShamanRequirementsRequest](flamenco\manager\docs/ShamanRequirementsRequest.md) - - [ShamanRequirementsResponse](flamenco\manager\docs/ShamanRequirementsResponse.md) - - [ShamanSingleFileStatus](flamenco\manager\docs/ShamanSingleFileStatus.md) - - [SharedStorageLocation](flamenco\manager\docs/SharedStorageLocation.md) - - [SocketIOSubscription](flamenco\manager\docs/SocketIOSubscription.md) - - [SocketIOSubscriptionOperation](flamenco\manager\docs/SocketIOSubscriptionOperation.md) - - [SocketIOSubscriptionType](flamenco\manager\docs/SocketIOSubscriptionType.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) - - [TaskUpdate](flamenco\manager\docs/TaskUpdate.md) - - [TaskWorker](flamenco\manager\docs/TaskWorker.md) - - [Worker](flamenco\manager\docs/Worker.md) - - [WorkerAllOf](flamenco\manager\docs/WorkerAllOf.md) - - [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) - - [WorkerStatusChangeRequest](flamenco\manager\docs/WorkerStatusChangeRequest.md) - - [WorkerSummary](flamenco\manager\docs/WorkerSummary.md) - - [WorkerTag](flamenco\manager\docs/WorkerTag.md) - - [WorkerTagChangeRequest](flamenco\manager\docs/WorkerTagChangeRequest.md) - - [WorkerTagList](flamenco\manager\docs/WorkerTagList.md) - - [WorkerTask](flamenco\manager\docs/WorkerTask.md) - - [WorkerTaskAllOf](flamenco\manager\docs/WorkerTaskAllOf.md) + - [AssignedTask](flamenco/manager/docs/AssignedTask.md) + - [AvailableJobSetting](flamenco/manager/docs/AvailableJobSetting.md) + - [AvailableJobSettingEvalInfo](flamenco/manager/docs/AvailableJobSettingEvalInfo.md) + - [AvailableJobSettingSubtype](flamenco/manager/docs/AvailableJobSettingSubtype.md) + - [AvailableJobSettingType](flamenco/manager/docs/AvailableJobSettingType.md) + - [AvailableJobSettingVisibility](flamenco/manager/docs/AvailableJobSettingVisibility.md) + - [AvailableJobType](flamenco/manager/docs/AvailableJobType.md) + - [AvailableJobTypes](flamenco/manager/docs/AvailableJobTypes.md) + - [BlenderPathCheckResult](flamenco/manager/docs/BlenderPathCheckResult.md) + - [BlenderPathFindResult](flamenco/manager/docs/BlenderPathFindResult.md) + - [BlenderPathSource](flamenco/manager/docs/BlenderPathSource.md) + - [Command](flamenco/manager/docs/Command.md) + - [Error](flamenco/manager/docs/Error.md) + - [EventFarmStatus](flamenco/manager/docs/EventFarmStatus.md) + - [EventJobUpdate](flamenco/manager/docs/EventJobUpdate.md) + - [EventLastRenderedUpdate](flamenco/manager/docs/EventLastRenderedUpdate.md) + - [EventLifeCycle](flamenco/manager/docs/EventLifeCycle.md) + - [EventTaskLogUpdate](flamenco/manager/docs/EventTaskLogUpdate.md) + - [EventTaskUpdate](flamenco/manager/docs/EventTaskUpdate.md) + - [EventWorkerTagUpdate](flamenco/manager/docs/EventWorkerTagUpdate.md) + - [EventWorkerUpdate](flamenco/manager/docs/EventWorkerUpdate.md) + - [FarmStatus](flamenco/manager/docs/FarmStatus.md) + - [FarmStatusReport](flamenco/manager/docs/FarmStatusReport.md) + - [FlamencoVersion](flamenco/manager/docs/FlamencoVersion.md) + - [Job](flamenco/manager/docs/Job.md) + - [JobAllOf](flamenco/manager/docs/JobAllOf.md) + - [JobBlocklist](flamenco/manager/docs/JobBlocklist.md) + - [JobBlocklistEntry](flamenco/manager/docs/JobBlocklistEntry.md) + - [JobDeletionInfo](flamenco/manager/docs/JobDeletionInfo.md) + - [JobLastRenderedImageInfo](flamenco/manager/docs/JobLastRenderedImageInfo.md) + - [JobMassDeletionSelection](flamenco/manager/docs/JobMassDeletionSelection.md) + - [JobMetadata](flamenco/manager/docs/JobMetadata.md) + - [JobPriorityChange](flamenco/manager/docs/JobPriorityChange.md) + - [JobSettings](flamenco/manager/docs/JobSettings.md) + - [JobStatus](flamenco/manager/docs/JobStatus.md) + - [JobStatusChange](flamenco/manager/docs/JobStatusChange.md) + - [JobStorageInfo](flamenco/manager/docs/JobStorageInfo.md) + - [JobTasksSummary](flamenco/manager/docs/JobTasksSummary.md) + - [JobsQuery](flamenco/manager/docs/JobsQuery.md) + - [JobsQueryResult](flamenco/manager/docs/JobsQueryResult.md) + - [LifeCycleEventType](flamenco/manager/docs/LifeCycleEventType.md) + - [ManagerConfiguration](flamenco/manager/docs/ManagerConfiguration.md) + - [ManagerVariable](flamenco/manager/docs/ManagerVariable.md) + - [ManagerVariableAudience](flamenco/manager/docs/ManagerVariableAudience.md) + - [ManagerVariables](flamenco/manager/docs/ManagerVariables.md) + - [MayKeepRunning](flamenco/manager/docs/MayKeepRunning.md) + - [PathCheckInput](flamenco/manager/docs/PathCheckInput.md) + - [PathCheckResult](flamenco/manager/docs/PathCheckResult.md) + - [RegisteredWorker](flamenco/manager/docs/RegisteredWorker.md) + - [SecurityError](flamenco/manager/docs/SecurityError.md) + - [SetupAssistantConfig](flamenco/manager/docs/SetupAssistantConfig.md) + - [ShamanCheckout](flamenco/manager/docs/ShamanCheckout.md) + - [ShamanCheckoutResult](flamenco/manager/docs/ShamanCheckoutResult.md) + - [ShamanFileSpec](flamenco/manager/docs/ShamanFileSpec.md) + - [ShamanFileSpecWithStatus](flamenco/manager/docs/ShamanFileSpecWithStatus.md) + - [ShamanFileStatus](flamenco/manager/docs/ShamanFileStatus.md) + - [ShamanRequirementsRequest](flamenco/manager/docs/ShamanRequirementsRequest.md) + - [ShamanRequirementsResponse](flamenco/manager/docs/ShamanRequirementsResponse.md) + - [ShamanSingleFileStatus](flamenco/manager/docs/ShamanSingleFileStatus.md) + - [SharedStorageLocation](flamenco/manager/docs/SharedStorageLocation.md) + - [SocketIOSubscription](flamenco/manager/docs/SocketIOSubscription.md) + - [SocketIOSubscriptionOperation](flamenco/manager/docs/SocketIOSubscriptionOperation.md) + - [SocketIOSubscriptionType](flamenco/manager/docs/SocketIOSubscriptionType.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) + - [TaskUpdate](flamenco/manager/docs/TaskUpdate.md) + - [TaskWorker](flamenco/manager/docs/TaskWorker.md) + - [Worker](flamenco/manager/docs/Worker.md) + - [WorkerAllOf](flamenco/manager/docs/WorkerAllOf.md) + - [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) + - [WorkerStatusChangeRequest](flamenco/manager/docs/WorkerStatusChangeRequest.md) + - [WorkerSummary](flamenco/manager/docs/WorkerSummary.md) + - [WorkerTag](flamenco/manager/docs/WorkerTag.md) + - [WorkerTagChangeRequest](flamenco/manager/docs/WorkerTagChangeRequest.md) + - [WorkerTagList](flamenco/manager/docs/WorkerTagList.md) + - [WorkerTask](flamenco/manager/docs/WorkerTask.md) + - [WorkerTaskAllOf](flamenco/manager/docs/WorkerTaskAllOf.md) ## Documentation For Authorization diff --git a/pkg/api/openapi_spec.gen.go b/pkg/api/openapi_spec.gen.go index 3401a109..11a214c4 100644 --- a/pkg/api/openapi_spec.gen.go +++ b/pkg/api/openapi_spec.gen.go @@ -19,233 +19,233 @@ import ( var swaggerSpec = []string{ "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", - "Qwu3RhEBAA==", + "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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 037e6d38..80b49695 100644 --- a/pkg/api/openapi_types.gen.go +++ b/pkg/api/openapi_types.gen.go @@ -215,6 +215,9 @@ type AvailableJobSetting struct { // Identifier for the setting, must be unique within the job type. Key string `json:"key"` + // Label for displaying this setting. If not specified, the key is used to generate a reasonable label. + Label *interface{} `json:"label,omitempty"` + // Any extra arguments to the bpy.props.SomeProperty() call used to create this property. Propargs *map[string]interface{} `json:"propargs,omitempty"` diff --git a/web/app/src/manager-api/model/AvailableJobSetting.js b/web/app/src/manager-api/model/AvailableJobSetting.js index eb066413..60d5ebc9 100644 --- a/web/app/src/manager-api/model/AvailableJobSetting.js +++ b/web/app/src/manager-api/model/AvailableJobSetting.js @@ -74,6 +74,9 @@ class AvailableJobSetting { if (data.hasOwnProperty('description')) { obj['description'] = ApiClient.convertToType(data['description'], Object); } + if (data.hasOwnProperty('label')) { + obj['label'] = ApiClient.convertToType(data['label'], Object); + } if (data.hasOwnProperty('default')) { obj['default'] = ApiClient.convertToType(data['default'], Object); } @@ -133,6 +136,12 @@ AvailableJobSetting.prototype['propargs'] = undefined; */ AvailableJobSetting.prototype['description'] = undefined; +/** + * Label for displaying this setting. If not specified, the key is used to generate a reasonable label. + * @member {Object} label + */ +AvailableJobSetting.prototype['label'] = undefined; + /** * The default value shown to the user when determining this setting. * @member {Object} default -- 2.30.2 From c5ae2916dbaf37f9a335656c7d650f7a9b82a2b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Tue, 7 May 2024 11:56:49 +0200 Subject: [PATCH 80/84] Add `label` to job settings This gives job type authors more control over how settings are presented in Blender's job submission GUI. If a job setting does not define a label, its `key` is used to generate one (like Flamenco 3.5 and older). Note that this isn't used in the web interface yet. --- CHANGELOG.md | 2 ++ addon/flamenco/job_types_propgroup.py | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c7107796..c8ce6529 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ bugs in actually-released versions. ## 3.6 - in development +- Add `label` to job settings, to have full control over how they are presented in Blender's job submission GUI. If a job setting does not define a label, its `key` is used to generate one (like Flamenco 3.5 and older). + ## 3.5 - released 2024-04-16 - Add MQTT support ([docs](https://flamenco.blender.org/usage/manager-configuration/mqtt/)). Flamenco Manager can now send internal events to an MQTT broker. diff --git a/addon/flamenco/job_types_propgroup.py b/addon/flamenco/job_types_propgroup.py index e5de0ce2..48e2c3a9 100644 --- a/addon/flamenco/job_types_propgroup.py +++ b/addon/flamenco/job_types_propgroup.py @@ -304,8 +304,8 @@ def _create_property(job_type: _AvailableJobType, setting: _AvailableJobSetting) if not setting.get("editable", True): prop_kwargs["get"] = _create_prop_getter(job_type, setting) - prop_name = _job_setting_key_to_label(setting.key) - prop = prop_type(name=prop_name, **prop_kwargs) + prop_label = _job_setting_label(setting) + prop = prop_type(name=prop_label, **prop_kwargs) return prop @@ -316,10 +316,10 @@ def _create_autoeval_property( assert isinstance(setting, AvailableJobSetting) - setting_name = _job_setting_key_to_label(setting.key) + setting_label = _job_setting_label(setting) prop_descr = ( "Automatically determine the value for %r when the job gets submitted" - % setting_name + % setting_label ) prop = bpy.props.BoolProperty( @@ -379,13 +379,13 @@ def _job_type_to_class_name(job_type_name: str) -> str: return job_type_name.title().replace("-", "") -def _job_setting_key_to_label(setting_key: str) -> str: - """Change 'some_setting_key' to 'Some Setting Key'. +def _job_setting_label(setting: _AvailableJobSetting) -> str: + """Return a suitable label for this job setting.""" - >>> _job_setting_key_to_label('some_setting_key') - 'Some Setting Key' - """ - return setting_key.title().replace("_", " ") + label = setting.get("label", default="") + if label: + return label + return setting.key.title().replace("_", " ") def _set_if_available( -- 2.30.2 From df334deca53aabdad1a5464ac24c418b4626ca6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Tue, 7 May 2024 11:58:39 +0200 Subject: [PATCH 81/84] Add `shellSplit(someString)` function to the job compiler scripts Add a function `shellSplit(string)` to the global namespace of job compiler scripts. It splits a string into an array of strings using shell/CLI semantics. For example: `shellSplit("--python-expr 'print(1 + 1)'")` will return `["--python-expr", "print(1 + 1)"]`. --- CHANGELOG.md | 1 + internal/manager/job_compilers/js_globals.go | 14 ++++++++++++++ .../manager/job_compilers/js_globals_test.go | 18 ++++++++++++++++++ internal/manager/job_compilers/scripts.go | 3 +++ 4 files changed, 36 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c8ce6529..ef5bf445 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ bugs in actually-released versions. ## 3.6 - in development - Add `label` to job settings, to have full control over how they are presented in Blender's job submission GUI. If a job setting does not define a label, its `key` is used to generate one (like Flamenco 3.5 and older). +- Add `shellSplit(someString)` function to the job compiler scripts. This splits a string into an array of strings using shell/CLI semantics. ## 3.5 - released 2024-04-16 diff --git a/internal/manager/job_compilers/js_globals.go b/internal/manager/job_compilers/js_globals.go index de9dddf9..9628a988 100644 --- a/internal/manager/job_compilers/js_globals.go +++ b/internal/manager/job_compilers/js_globals.go @@ -10,6 +10,7 @@ import ( "time" "github.com/dop251/goja" + "github.com/google/shlex" "github.com/rs/zerolog/log" ) @@ -33,6 +34,19 @@ func jsFormatTimestampLocal(timestamp time.Time) string { return timestamp.Local().Format("2006-01-02_150405") } +// jsShellSplit splits a string into its parts, using CLI/shell semantics. +func jsShellSplit(vm *goja.Runtime, someCLIArgs string) []string { + split, err := shlex.Split(someCLIArgs) + + if err != nil { + // Generate a JS exception by panicing with a Goja Value. + exception := vm.ToValue(err) + panic(exception) + } + + return split +} + type ErrInvalidRange struct { Range string // The frame range that was invalid. Message string // The error message diff --git a/internal/manager/job_compilers/js_globals_test.go b/internal/manager/job_compilers/js_globals_test.go index e78b15d8..4029f1ef 100644 --- a/internal/manager/job_compilers/js_globals_test.go +++ b/internal/manager/job_compilers/js_globals_test.go @@ -5,10 +5,28 @@ package job_compilers import ( "testing" + "github.com/dop251/goja" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) +func TestShellSplitHappy(t *testing.T) { + expect := []string{"--python-expr", "print(1 + 1)"} + actual := jsShellSplit(nil, "--python-expr 'print(1 + 1)'") + assert.Equal(t, expect, actual) +} + +func TestShellSplitFailure(t *testing.T) { + vm := goja.New() + + testFunc := func() { + jsShellSplit(vm, "--python-expr invalid_quoting(1 + 1)'") + } + // Testing that a goja.Value is used for the panic is a bit tricky, so just + // test that the function panics. + assert.Panics(t, testFunc) +} + func TestFrameChunkerHappyBlenderStyle(t *testing.T) { chunks, err := jsFrameChunker("1..10,20..25,40,3..8", 4) require.NoError(t, err) diff --git a/internal/manager/job_compilers/scripts.go b/internal/manager/job_compilers/scripts.go index efba10e9..92ad4e83 100644 --- a/internal/manager/job_compilers/scripts.go +++ b/internal/manager/job_compilers/scripts.go @@ -140,6 +140,9 @@ func newGojaVM(registry *require.Registry) *goja.Runtime { mustSet("alert", jsAlert) mustSet("frameChunker", jsFrameChunker) mustSet("formatTimestampLocal", jsFormatTimestampLocal) + mustSet("shellSplit", func(cliArgs string) []string { + return jsShellSplit(vm, cliArgs) + }) // Pre-import some useful modules. registry.Enable(vm) -- 2.30.2 From ae0774b440d558744e894d6da9aa367f2d6a590d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Sat, 11 May 2024 10:35:17 +0200 Subject: [PATCH 82/84] Manager: add unit tests Add a few more unit tests for the persistence layer. The goal is to have 100% coverage of the happy flow, to aid in conversion from GORM to sqlc. No functional changes. --- internal/manager/persistence/jobs_test.go | 97 +++++++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/internal/manager/persistence/jobs_test.go b/internal/manager/persistence/jobs_test.go index 06aed199..20053085 100644 --- a/internal/manager/persistence/jobs_test.go +++ b/internal/manager/persistence/jobs_test.go @@ -108,6 +108,30 @@ func TestSaveJobStorageInfo(t *testing.T) { assert.Equal(t, startTime, updatedJob.UpdatedAt, "SaveJobStorageInfo should not touch UpdatedAt") } +func TestSaveJobPriority(t *testing.T) { + ctx, cancel, db := persistenceTestFixtures(t, 1*time.Second) + defer cancel() + + // Create test job. + authoredJob := createTestAuthoredJobWithTasks() + err := db.StoreAuthoredJob(ctx, authoredJob) + require.NoError(t, err) + + // Set a new priority. + newPriority := 47 + dbJob, err := db.FetchJob(ctx, authoredJob.JobID) + require.NoError(t, err) + require.NotEqual(t, newPriority, dbJob.Priority, + "Initial priority should not be the same as what this test changes it to") + dbJob.Priority = newPriority + require.NoError(t, db.SaveJobPriority(ctx, dbJob)) + + // Check the result. + dbJob, err = db.FetchJob(ctx, authoredJob.JobID) + require.NoError(t, err) + assert.EqualValues(t, newPriority, dbJob.Priority) +} + func TestDeleteJob(t *testing.T) { ctx, cancel, db := persistenceTestFixtures(t, 1*time.Second) defer cancel() @@ -493,6 +517,79 @@ func TestFetchTasksOfWorkerInStatus(t *testing.T) { assert.Empty(t, tasks, "worker should have no task in status %q", w) } +func TestFetchTasksOfWorkerInStatusOfJob(t *testing.T) { + ctx, close, db, dbJob, authoredJob := jobTasksTestFixtures(t) + defer close() + + // Create multiple Workers, to test the function doesn't return tasks from + // other Workers. + worker := createWorker(ctx, t, db, func(worker *Worker) { + worker.UUID = "43300628-5f3b-4724-ab30-9821af8bda86" + }) + otherWorker := createWorker(ctx, t, db, func(worker *Worker) { + worker.UUID = "2327350f-75ec-4b0e-bd28-31a7b045c85c" + }) + + // Create another job, to make sure the function under test doesn't return + // tasks from other jobs. + otherJob := duplicateJobAndTasks(authoredJob) + otherJob.Name = "The other job" + persistAuthoredJob(t, ctx, db, otherJob) + + // Assign a task from each job to each Worker. + // Also double-check the test precondition that all tasks have the same status. + { // Job / Worker. + task1, err := db.FetchTask(ctx, authoredJob.Tasks[1].UUID) + require.NoError(t, err) + require.NoError(t, db.TaskAssignToWorker(ctx, task1, worker)) + require.Equal(t, task1.Status, api.TaskStatusQueued) + + task2, err := db.FetchTask(ctx, authoredJob.Tasks[0].UUID) + require.NoError(t, err) + require.NoError(t, db.TaskAssignToWorker(ctx, task2, worker)) + require.Equal(t, task2.Status, api.TaskStatusQueued) + } + { // Job / Other Worker. + task, err := db.FetchTask(ctx, authoredJob.Tasks[2].UUID) + require.NoError(t, err) + require.NoError(t, db.TaskAssignToWorker(ctx, task, otherWorker)) + require.Equal(t, task.Status, api.TaskStatusQueued) + } + { // Other Job / Worker. + task, err := db.FetchTask(ctx, otherJob.Tasks[1].UUID) + require.NoError(t, err) + require.NoError(t, db.TaskAssignToWorker(ctx, task, worker)) + require.Equal(t, task.Status, api.TaskStatusQueued) + } + { // Other Job / Other Worker. + task, err := db.FetchTask(ctx, otherJob.Tasks[2].UUID) + require.NoError(t, err) + require.NoError(t, db.TaskAssignToWorker(ctx, task, otherWorker)) + require.Equal(t, task.Status, api.TaskStatusQueued) + } + + { // Test active tasks, should be none. + tasks, err := db.FetchTasksOfWorkerInStatusOfJob(ctx, worker, api.TaskStatusActive, dbJob) + require.NoError(t, err) + require.Len(t, tasks, 0) + } + { // Test queued tasks, should be two. + tasks, err := db.FetchTasksOfWorkerInStatusOfJob(ctx, worker, api.TaskStatusQueued, dbJob) + require.NoError(t, err) + require.Len(t, tasks, 2) + assert.Equal(t, authoredJob.Tasks[0].UUID, tasks[0].UUID) + assert.Equal(t, authoredJob.Tasks[1].UUID, tasks[1].UUID) + } + { // Test queued tasks for worker without tasks, should be none. + worker := createWorker(ctx, t, db, func(worker *Worker) { + worker.UUID = "6534a1d4-f58e-4f2c-8925-4b2cd6caac22" + }) + tasks, err := db.FetchTasksOfWorkerInStatusOfJob(ctx, worker, api.TaskStatusQueued, dbJob) + require.NoError(t, err) + require.Len(t, tasks, 0) + } +} + func TestTaskTouchedByWorker(t *testing.T) { ctx, close, db, _, authoredJob := jobTasksTestFixtures(t) defer close() -- 2.30.2 From 0f8e5152d2fb2a2eeeb0d14e79048bac447bae39 Mon Sep 17 00:00:00 2001 From: Mateus Abelli Date: Sun, 12 May 2024 11:14:36 -0300 Subject: [PATCH 83/84] Sync deps with go mod tidy --- go.mod | 12 +++++++----- go.sum | 36 ++++++++++++++++-------------------- 2 files changed, 23 insertions(+), 25 deletions(-) diff --git a/go.mod b/go.mod index a58fde87..a608c7ce 100644 --- a/go.mod +++ b/go.mod @@ -30,10 +30,12 @@ require ( github.com/tc-hib/go-winres v0.3.1 github.com/zcalusic/sysinfo v1.0.1 github.com/ziflex/lecho/v3 v3.1.0 - golang.org/x/crypto v0.21.0 + golang.org/x/crypto v0.22.0 golang.org/x/image v0.10.0 - golang.org/x/net v0.23.0 - golang.org/x/sys v0.18.0 + golang.org/x/net v0.24.0 + golang.org/x/sync v0.7.0 + golang.org/x/sys v0.19.0 + golang.org/x/vuln v1.1.0 gopkg.in/yaml.v2 v2.4.0 gorm.io/gorm v1.25.5 honnef.co/go/tools v0.4.2 @@ -69,10 +71,10 @@ require ( github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasttemplate v1.2.1 // indirect golang.org/x/exp/typeparams v0.0.0-20221208152030-732eee02a75a // indirect - golang.org/x/mod v0.14.0 // indirect + golang.org/x/mod v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect - golang.org/x/tools v0.17.0 // indirect + golang.org/x/tools v0.20.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect lukechampine.com/uint128 v1.3.0 // indirect modernc.org/cc/v3 v3.41.0 // indirect diff --git a/go.sum b/go.sum index a3dd8d6a..866062dc 100644 --- a/go.sum +++ b/go.sum @@ -223,10 +223,10 @@ golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211215165025-cf75a172585e/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= -golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY= -golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= -golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= -golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= +golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30= +golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= +golang.org/x/exp/typeparams v0.0.0-20221208152030-732eee02a75a h1:Jw5wfR+h9mnIYH+OtGT2im5wV1YGGDora5vTv/aa5bE= +golang.org/x/exp/typeparams v0.0.0-20221208152030-732eee02a75a/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.0.0-20201208152932-35266b937fa6/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.0.0-20210220032944-ac19c3e999fb/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= @@ -237,8 +237,8 @@ golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= -golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= +golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= @@ -249,18 +249,16 @@ golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20210913180222-943fd674d43e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= -golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= -golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= -golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= +golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= -golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= +golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -290,10 +288,8 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= -golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= -golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= +golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -319,10 +315,10 @@ golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc= -golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps= -golang.org/x/vuln v1.0.4 h1:SP0mPeg2PmGCu03V+61EcQiOjmpri2XijexKdzv8Z1I= -golang.org/x/vuln v1.0.4/go.mod h1:NbJdUQhX8jY++FtuhrXs2Eyx0yePo9pF7nPlIjo9aaQ= +golang.org/x/tools v0.20.0 h1:hz/CVckiOxybQvFw6h7b/q80NTr9IUQb4s1IIzW7KNY= +golang.org/x/tools v0.20.0/go.mod h1:WvitBU7JJf6A4jOdg4S1tviW9bhUxkgeCui/0JHctQg= +golang.org/x/vuln v1.1.0 h1:ECEdI+aEtjpF90eqEcDL5Q11DWSZAw5PJQWlp0+gWqc= +golang.org/x/vuln v1.1.0/go.mod h1:HT/Ar8fE34tbxWG2s7PYjVl+iIE4Er36/940Z+K540Y= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -- 2.30.2 From b8b1f8dcad74b763742bf84e27b315a9f387d23d Mon Sep 17 00:00:00 2001 From: Mateus Abelli Date: Sun, 12 May 2024 11:14:57 -0300 Subject: [PATCH 84/84] Sync version --- magefiles/version.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/magefiles/version.go b/magefiles/version.go index 666a1355..e2dd0b46 100644 --- a/magefiles/version.go +++ b/magefiles/version.go @@ -11,8 +11,8 @@ import ( // To update the version number in all the relevant places, update the VERSION // variable below and run `mage update-version`. const ( - version = "3.3-beta0" - releaseCycle = "beta" + version = "3.6-alpha0" + releaseCycle = "alpha" ) func gitHash() (string, error) { -- 2.30.2