From 431406a301e9da4ede7aec22e3d9e17fdc6e9120 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Tue, 31 May 2022 10:43:57 +0200 Subject: [PATCH] OAPI: regenerate code --- addon/flamenco/manager/__init__.py | 2 +- addon/flamenco/manager/api_client.py | 2 +- addon/flamenco/manager/configuration.py | 2 +- .../flamenco/manager/docs/RegisteredWorker.md | 1 - .../manager/model/registered_worker.py | 10 +- addon/flamenco/manager_README.md | 2 +- pkg/api/openapi_spec.gen.go | 254 +++++++++--------- pkg/api/openapi_types.gen.go | 1 - web/app/src/manager-api/ApiClient.js | 2 +- .../src/manager-api/model/RegisteredWorker.js | 16 +- 10 files changed, 137 insertions(+), 155 deletions(-) diff --git a/addon/flamenco/manager/__init__.py b/addon/flamenco/manager/__init__.py index fdd481a5..80861e3f 100644 --- a/addon/flamenco/manager/__init__.py +++ b/addon/flamenco/manager/__init__.py @@ -10,7 +10,7 @@ """ -__version__ = "3ae9d5f0" +__version__ = "4f8fd14d" # 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 14dc8417..9c4649ab 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/3ae9d5f0 (Blender add-on)' + self.user_agent = 'Flamenco/4f8fd14d (Blender add-on)' def __enter__(self): return self diff --git a/addon/flamenco/manager/configuration.py b/addon/flamenco/manager/configuration.py index 0fd62bb1..cef48c86 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: 3ae9d5f0".\ + "SDK Package Version: 4f8fd14d".\ format(env=sys.platform, pyversion=sys.version) def get_host_settings(self): diff --git a/addon/flamenco/manager/docs/RegisteredWorker.md b/addon/flamenco/manager/docs/RegisteredWorker.md index 55d669c8..08ad012a 100644 --- a/addon/flamenco/manager/docs/RegisteredWorker.md +++ b/addon/flamenco/manager/docs/RegisteredWorker.md @@ -9,7 +9,6 @@ Name | Type | Description | Notes **address** | **str** | | **status** | [**WorkerStatus**](WorkerStatus.md) | | **platform** | **str** | | -**last_activity** | **str** | | **software** | **str** | | **supported_task_types** | **[str]** | | **any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional] diff --git a/addon/flamenco/manager/model/registered_worker.py b/addon/flamenco/manager/model/registered_worker.py index 2936365a..4624e8ab 100644 --- a/addon/flamenco/manager/model/registered_worker.py +++ b/addon/flamenco/manager/model/registered_worker.py @@ -92,7 +92,6 @@ class RegisteredWorker(ModelNormal): 'address': (str,), # noqa: E501 'status': (WorkerStatus,), # noqa: E501 'platform': (str,), # noqa: E501 - 'last_activity': (str,), # noqa: E501 'software': (str,), # noqa: E501 'supported_task_types': ([str],), # noqa: E501 } @@ -108,7 +107,6 @@ class RegisteredWorker(ModelNormal): 'address': 'address', # noqa: E501 'status': 'status', # noqa: E501 'platform': 'platform', # noqa: E501 - 'last_activity': 'last_activity', # noqa: E501 'software': 'software', # noqa: E501 'supported_task_types': 'supported_task_types', # noqa: E501 } @@ -120,7 +118,7 @@ class RegisteredWorker(ModelNormal): @classmethod @convert_js_args_to_python_args - def _from_openapi_data(cls, uuid, nickname, address, status, platform, last_activity, software, supported_task_types, *args, **kwargs): # noqa: E501 + def _from_openapi_data(cls, uuid, nickname, address, status, platform, software, supported_task_types, *args, **kwargs): # noqa: E501 """RegisteredWorker - a model defined in OpenAPI Args: @@ -129,7 +127,6 @@ class RegisteredWorker(ModelNormal): address (str): status (WorkerStatus): platform (str): - last_activity (str): software (str): supported_task_types ([str]): @@ -196,7 +193,6 @@ class RegisteredWorker(ModelNormal): self.address = address self.status = status self.platform = platform - self.last_activity = last_activity self.software = software self.supported_task_types = supported_task_types for var_name, var_value in kwargs.items(): @@ -219,7 +215,7 @@ class RegisteredWorker(ModelNormal): ]) @convert_js_args_to_python_args - def __init__(self, uuid, nickname, address, status, platform, last_activity, software, supported_task_types, *args, **kwargs): # noqa: E501 + def __init__(self, uuid, nickname, address, status, platform, software, supported_task_types, *args, **kwargs): # noqa: E501 """RegisteredWorker - a model defined in OpenAPI Args: @@ -228,7 +224,6 @@ class RegisteredWorker(ModelNormal): address (str): status (WorkerStatus): platform (str): - last_activity (str): software (str): supported_task_types ([str]): @@ -293,7 +288,6 @@ class RegisteredWorker(ModelNormal): self.address = address self.status = status self.platform = platform - self.last_activity = last_activity self.software = software self.supported_task_types = supported_task_types for var_name, var_value in kwargs.items(): diff --git a/addon/flamenco/manager_README.md b/addon/flamenco/manager_README.md index 4d434be8..21887c93 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: 3ae9d5f0 +- Package version: 4f8fd14d - Build package: org.openapitools.codegen.languages.PythonClientCodegen For more information, please visit [https://flamenco.io/](https://flamenco.io/) diff --git a/pkg/api/openapi_spec.gen.go b/pkg/api/openapi_spec.gen.go index e75bf690..471bc07c 100644 --- a/pkg/api/openapi_spec.gen.go +++ b/pkg/api/openapi_spec.gen.go @@ -18,133 +18,133 @@ import ( // Base64 encoded, gzipped, json marshaled Swagger object var swaggerSpec = []string{ - "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", } // GetSwagger returns the content of the embedded swagger specification file diff --git a/pkg/api/openapi_types.gen.go b/pkg/api/openapi_types.gen.go index b8853f29..a4bffca8 100644 --- a/pkg/api/openapi_types.gen.go +++ b/pkg/api/openapi_types.gen.go @@ -316,7 +316,6 @@ type MayKeepRunning struct { // RegisteredWorker defines model for RegisteredWorker. type RegisteredWorker struct { Address string `json:"address"` - LastActivity string `json:"last_activity"` Nickname string `json:"nickname"` Platform string `json:"platform"` Software string `json:"software"` diff --git a/web/app/src/manager-api/ApiClient.js b/web/app/src/manager-api/ApiClient.js index 82abd081..959de790 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/3ae9d5f0 / webbrowser' + 'User-Agent': 'Flamenco/4f8fd14d / webbrowser' }; /** diff --git a/web/app/src/manager-api/model/RegisteredWorker.js b/web/app/src/manager-api/model/RegisteredWorker.js index 92a03dc0..13fcb3ff 100644 --- a/web/app/src/manager-api/model/RegisteredWorker.js +++ b/web/app/src/manager-api/model/RegisteredWorker.js @@ -28,13 +28,12 @@ class RegisteredWorker { * @param address {String} * @param status {module:model/WorkerStatus} * @param platform {String} - * @param lastActivity {String} * @param software {String} * @param supportedTaskTypes {Array.} */ - constructor(uuid, nickname, address, status, platform, lastActivity, software, supportedTaskTypes) { + constructor(uuid, nickname, address, status, platform, software, supportedTaskTypes) { - RegisteredWorker.initialize(this, uuid, nickname, address, status, platform, lastActivity, software, supportedTaskTypes); + RegisteredWorker.initialize(this, uuid, nickname, address, status, platform, software, supportedTaskTypes); } /** @@ -42,13 +41,12 @@ class RegisteredWorker { * 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, uuid, nickname, address, status, platform, lastActivity, software, supportedTaskTypes) { + static initialize(obj, uuid, nickname, address, status, platform, software, supportedTaskTypes) { obj['uuid'] = uuid; obj['nickname'] = nickname; obj['address'] = address; obj['status'] = status; obj['platform'] = platform; - obj['last_activity'] = lastActivity; obj['software'] = software; obj['supported_task_types'] = supportedTaskTypes; } @@ -79,9 +77,6 @@ class RegisteredWorker { if (data.hasOwnProperty('platform')) { obj['platform'] = ApiClient.convertToType(data['platform'], 'String'); } - if (data.hasOwnProperty('last_activity')) { - obj['last_activity'] = ApiClient.convertToType(data['last_activity'], 'String'); - } if (data.hasOwnProperty('software')) { obj['software'] = ApiClient.convertToType(data['software'], 'String'); } @@ -120,11 +115,6 @@ RegisteredWorker.prototype['status'] = undefined; */ RegisteredWorker.prototype['platform'] = undefined; -/** - * @member {String} last_activity - */ -RegisteredWorker.prototype['last_activity'] = undefined; - /** * @member {String} software */