blender/flamenco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OAPI: regenerate code

Browse Source
This commit is contained in:
Sybren A. Stüvel 2022-05-19 15:17:09 +02:00
parent 7753e65b03
commit b928896066
13 changed files with 177 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addon/flamenco/manager/__init__.py
View File

@ -10,7 +10,7 @@
""" """
__version__ = "6afb1151" __version__ = "7753e65b"
# import ApiClient # import ApiClient
from flamenco.manager.api_client import ApiClient from flamenco.manager.api_client import ApiClient

2
addon/flamenco/manager/api_client.py
View File

@ -76,7 +76,7 @@ class ApiClient(object):
self.default_headers[header_name] = header_value self.default_headers[header_name] = header_value
self.cookie = cookie self.cookie = cookie
# Set default User-Agent. # Set default User-Agent.
self.user_agent = 'Flamenco/6afb1151 (Blender add-on)' self.user_agent = 'Flamenco/7753e65b (Blender add-on)'
def __enter__(self): def __enter__(self):
return self return self

2
addon/flamenco/manager/configuration.py
View File

@ -404,7 +404,7 @@ conf = flamenco.manager.Configuration(
"OS: {env}\n"\ "OS: {env}\n"\
"Python Version: {pyversion}\n"\ "Python Version: {pyversion}\n"\
"Version of the API: 1.0.0\n"\ "Version of the API: 1.0.0\n"\
"SDK Package Version: 6afb1151".\ "SDK Package Version: 7753e65b".\
format(env=sys.platform, pyversion=sys.version) format(env=sys.platform, pyversion=sys.version)
def get_host_settings(self): def get_host_settings(self):

2
addon/flamenco/manager/docs/JobUpdate.md → addon/flamenco/manager/docs/SocketIOJobUpdate.md
View File

@ -1,4 +1,4 @@
# JobUpdate # SocketIOJobUpdate
Subset of a Job, sent over SocketIO when a job changes. For new jobs, `previous_status` will be excluded. Subset of a Job, sent over SocketIO when a job changes. For new jobs, `previous_status` will be excluded.

6
addon/flamenco/manager/model/job_update.py → addon/flamenco/manager/model/socket_io_job_update.py
View File

@ -34,7 +34,7 @@ def lazy_import():
globals()['JobStatus'] = JobStatus globals()['JobStatus'] = JobStatus
class JobUpdate(ModelNormal): class SocketIOJobUpdate(ModelNormal):
"""NOTE: This class is auto generated by OpenAPI Generator. """NOTE: This class is auto generated by OpenAPI Generator.
Ref: https://openapi-generator.tech Ref: https://openapi-generator.tech
@ -121,7 +121,7 @@ class JobUpdate(ModelNormal):
@classmethod @classmethod
@convert_js_args_to_python_args @convert_js_args_to_python_args
def _from_openapi_data(cls, id, updated, status, type, refresh_tasks, *args, **kwargs): # noqa: E501 def _from_openapi_data(cls, id, updated, status, type, refresh_tasks, *args, **kwargs): # noqa: E501
"""JobUpdate - a model defined in OpenAPI """SocketIOJobUpdate - a model defined in OpenAPI
Args: Args:
id (str): UUID of the Job id (str): UUID of the Job
@ -219,7 +219,7 @@ class JobUpdate(ModelNormal):
@convert_js_args_to_python_args @convert_js_args_to_python_args
def __init__(self, id, updated, status, type, refresh_tasks, *args, **kwargs): # noqa: E501 def __init__(self, id, updated, status, type, refresh_tasks, *args, **kwargs): # noqa: E501
"""JobUpdate - a model defined in OpenAPI """SocketIOJobUpdate - a model defined in OpenAPI
Args: Args:
id (str): UUID of the Job id (str): UUID of the Job

2
addon/flamenco/manager/models/__init__.py
View File

@ -25,7 +25,6 @@ from flamenco.manager.model.job_settings import JobSettings
from flamenco.manager.model.job_status import JobStatus from flamenco.manager.model.job_status import JobStatus
from flamenco.manager.model.job_status_change import JobStatusChange from flamenco.manager.model.job_status_change import JobStatusChange
from flamenco.manager.model.job_tasks_summary import JobTasksSummary from flamenco.manager.model.job_tasks_summary import JobTasksSummary
from flamenco.manager.model.job_update import JobUpdate
from flamenco.manager.model.jobs_query import JobsQuery from flamenco.manager.model.jobs_query import JobsQuery
from flamenco.manager.model.jobs_query_result import JobsQueryResult from flamenco.manager.model.jobs_query_result import JobsQueryResult
from flamenco.manager.model.manager_configuration import ManagerConfiguration from flamenco.manager.model.manager_configuration import ManagerConfiguration
@ -40,6 +39,7 @@ from flamenco.manager.model.shaman_file_status import ShamanFileStatus
from flamenco.manager.model.shaman_requirements_request import ShamanRequirementsRequest from flamenco.manager.model.shaman_requirements_request import ShamanRequirementsRequest
from flamenco.manager.model.shaman_requirements_response import ShamanRequirementsResponse from flamenco.manager.model.shaman_requirements_response import ShamanRequirementsResponse
from flamenco.manager.model.shaman_single_file_status import ShamanSingleFileStatus from flamenco.manager.model.shaman_single_file_status import ShamanSingleFileStatus
from flamenco.manager.model.socket_io_job_update import SocketIOJobUpdate
from flamenco.manager.model.socket_io_subscription import SocketIOSubscription from flamenco.manager.model.socket_io_subscription import SocketIOSubscription
from flamenco.manager.model.socket_io_subscription_operation import SocketIOSubscriptionOperation from flamenco.manager.model.socket_io_subscription_operation import SocketIOSubscriptionOperation
from flamenco.manager.model.socket_io_subscription_type import SocketIOSubscriptionType from flamenco.manager.model.socket_io_subscription_type import SocketIOSubscriptionType

4
addon/flamenco/manager_README.md
View File

@ -4,7 +4,7 @@ Render Farm manager API
The `flamenco.manager` package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project: The `flamenco.manager` package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
- API version: 1.0.0 - API version: 1.0.0
- Package version: 6afb1151 - Package version: 7753e65b
- Build package: org.openapitools.codegen.languages.PythonClientCodegen - Build package: org.openapitools.codegen.languages.PythonClientCodegen
For more information, please visit [https://flamenco.io/](https://flamenco.io/) For more information, please visit [https://flamenco.io/](https://flamenco.io/)
@ -114,7 +114,6 @@ Class | Method | HTTP request | Description
- [JobStatus](flamenco\manager\docs/JobStatus.md) - [JobStatus](flamenco\manager\docs/JobStatus.md)
- [JobStatusChange](flamenco\manager\docs/JobStatusChange.md) - [JobStatusChange](flamenco\manager\docs/JobStatusChange.md)
- [JobTasksSummary](flamenco\manager\docs/JobTasksSummary.md) - [JobTasksSummary](flamenco\manager\docs/JobTasksSummary.md)
- [JobUpdate](flamenco\manager\docs/JobUpdate.md)
- [JobsQuery](flamenco\manager\docs/JobsQuery.md) - [JobsQuery](flamenco\manager\docs/JobsQuery.md)
- [JobsQueryResult](flamenco\manager\docs/JobsQueryResult.md) - [JobsQueryResult](flamenco\manager\docs/JobsQueryResult.md)
- [ManagerConfiguration](flamenco\manager\docs/ManagerConfiguration.md) - [ManagerConfiguration](flamenco\manager\docs/ManagerConfiguration.md)
@ -129,6 +128,7 @@ Class | Method | HTTP request | Description
- [ShamanRequirementsRequest](flamenco\manager\docs/ShamanRequirementsRequest.md) - [ShamanRequirementsRequest](flamenco\manager\docs/ShamanRequirementsRequest.md)
- [ShamanRequirementsResponse](flamenco\manager\docs/ShamanRequirementsResponse.md) - [ShamanRequirementsResponse](flamenco\manager\docs/ShamanRequirementsResponse.md)
- [ShamanSingleFileStatus](flamenco\manager\docs/ShamanSingleFileStatus.md) - [ShamanSingleFileStatus](flamenco\manager\docs/ShamanSingleFileStatus.md)
- [SocketIOJobUpdate](flamenco\manager\docs/SocketIOJobUpdate.md)
- [SocketIOSubscription](flamenco\manager\docs/SocketIOSubscription.md) - [SocketIOSubscription](flamenco\manager\docs/SocketIOSubscription.md)
- [SocketIOSubscriptionOperation](flamenco\manager\docs/SocketIOSubscriptionOperation.md) - [SocketIOSubscriptionOperation](flamenco\manager\docs/SocketIOSubscriptionOperation.md)
- [SocketIOSubscriptionType](flamenco\manager\docs/SocketIOSubscriptionType.md) - [SocketIOSubscriptionType](flamenco\manager\docs/SocketIOSubscriptionType.md)

2
internal/manager/task_state_machine/mocks/interfaces_mock.gen.go
View File

@ -172,7 +172,7 @@ func (m *MockChangeBroadcaster) EXPECT() *MockChangeBroadcasterMockRecorder {
} }
// BroadcastJobUpdate mocks base method. // BroadcastJobUpdate mocks base method.
func (m *MockChangeBroadcaster) BroadcastJobUpdate(arg0 api.JobUpdate) { func (m *MockChangeBroadcaster) BroadcastJobUpdate(arg0 api.SocketIOJobUpdate) {
m.ctrl.T.Helper() m.ctrl.T.Helper()
m.ctrl.Call(m, "BroadcastJobUpdate", arg0) m.ctrl.Call(m, "BroadcastJobUpdate", arg0)
} }

240
pkg/api/openapi_spec.gen.go
View File

@ -18,126 +18,126 @@ import (
// Base64 encoded, gzipped, json marshaled Swagger object // Base64 encoded, gzipped, json marshaled Swagger object
var swaggerSpec = []string{ var swaggerSpec = []string{
"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",
"b/pYG506TTS+36/L15f/HQAA//8MDWjsKoQAAA==", "rt9c//8AAAD//+w6HDYyhAAA",
} }
// GetSwagger returns the content of the embedded swagger specification file // GetSwagger returns the content of the embedded swagger specification file

38
pkg/api/openapi_types.gen.go
View File

@ -248,25 +248,6 @@ type JobTasksSummary struct {
Tasks *[]TaskSummary `json:"tasks,omitempty"` Tasks *[]TaskSummary `json:"tasks,omitempty"`
} }
// Subset of a Job, sent over SocketIO when a job changes. For new jobs, `previous_status` will be excluded.
type JobUpdate struct {
// UUID of the Job
Id string `json:"id"`
// Name of the job
Name *string `json:"name,omitempty"`
PreviousStatus *JobStatus `json:"previous_status,omitempty"`
Priority int `json:"priority"`
// Indicates that the client should refresh all the job's tasks. This is sent for mass updates, where updating each individual task would generate too many updates to be practical.
RefreshTasks bool `json:"refresh_tasks"`
Status JobStatus `json:"status"`
Type string `json:"type"`
// Timestamp of last update
Updated time.Time `json:"updated"`
}
// JobsQuery defines model for JobsQuery. // JobsQuery defines model for JobsQuery.
type JobsQuery struct { type JobsQuery struct {
Limit *int `json:"limit,omitempty"` Limit *int `json:"limit,omitempty"`
@ -389,6 +370,25 @@ type ShamanSingleFileStatus struct {
Status ShamanFileStatus `json:"status"` Status ShamanFileStatus `json:"status"`
} }
// Subset of a Job, sent over SocketIO when a job changes. For new jobs, `previous_status` will be excluded.
type SocketIOJobUpdate struct {
// UUID of the Job
Id string `json:"id"`
// Name of the job
Name *string `json:"name,omitempty"`
PreviousStatus *JobStatus `json:"previous_status,omitempty"`
Priority int `json:"priority"`
// Indicates that the client should refresh all the job's tasks. This is sent for mass updates, where updating each individual task would generate too many updates to be practical.
RefreshTasks bool `json:"refresh_tasks"`
Status JobStatus `json:"status"`
Type string `json:"type"`
// Timestamp of last update
Updated time.Time `json:"updated"`
}
// Send by SocketIO clients as `/subscription` event type, to manage their subscription to job updates. Clients always get job updates, but for task updates or task logs they need to explicitly subscribe. For simplicity, clients can only subscribe to one job (to get task updates for that job) and one task's log at a time. // Send by SocketIO clients as `/subscription` event type, to manage their subscription to job updates. Clients always get job updates, but for task updates or task logs they need to explicitly subscribe. For simplicity, clients can only subscribe to one job (to get task updates for that job) and one task's log at a time.
type SocketIOSubscription struct { type SocketIOSubscription struct {
Op SocketIOSubscriptionOperation `json:"op"` Op SocketIOSubscriptionOperation `json:"op"`

2
web/app/src/manager-api/ApiClient.js
View File

@ -55,7 +55,7 @@ class ApiClient {
* @default {} * @default {}
*/ */
this.defaultHeaders = { this.defaultHeaders = {
'User-Agent': 'Flamenco/6afb1151 / webbrowser' 'User-Agent': 'Flamenco/7753e65b / webbrowser'
}; };
/** /**

14
web/app/src/manager-api/index.js
View File

@ -27,7 +27,6 @@ import JobAllOf from './model/JobAllOf';
import JobStatus from './model/JobStatus'; import JobStatus from './model/JobStatus';
import JobStatusChange from './model/JobStatusChange'; import JobStatusChange from './model/JobStatusChange';
import JobTasksSummary from './model/JobTasksSummary'; import JobTasksSummary from './model/JobTasksSummary';
import JobUpdate from './model/JobUpdate';
import JobsQuery from './model/JobsQuery'; import JobsQuery from './model/JobsQuery';
import JobsQueryResult from './model/JobsQueryResult'; import JobsQueryResult from './model/JobsQueryResult';
import ManagerConfiguration from './model/ManagerConfiguration'; import ManagerConfiguration from './model/ManagerConfiguration';
@ -42,6 +41,7 @@ import ShamanFileStatus from './model/ShamanFileStatus';
import ShamanRequirementsRequest from './model/ShamanRequirementsRequest'; import ShamanRequirementsRequest from './model/ShamanRequirementsRequest';
import ShamanRequirementsResponse from './model/ShamanRequirementsResponse'; import ShamanRequirementsResponse from './model/ShamanRequirementsResponse';
import ShamanSingleFileStatus from './model/ShamanSingleFileStatus'; import ShamanSingleFileStatus from './model/ShamanSingleFileStatus';
import SocketIOJobUpdate from './model/SocketIOJobUpdate';
import SocketIOSubscription from './model/SocketIOSubscription'; import SocketIOSubscription from './model/SocketIOSubscription';
import SocketIOSubscriptionOperation from './model/SocketIOSubscriptionOperation'; import SocketIOSubscriptionOperation from './model/SocketIOSubscriptionOperation';
import SocketIOSubscriptionType from './model/SocketIOSubscriptionType'; import SocketIOSubscriptionType from './model/SocketIOSubscriptionType';
@ -186,12 +186,6 @@ export {
*/ */
JobTasksSummary, JobTasksSummary,
/**
* The JobUpdate model constructor.
* @property {module:model/JobUpdate}
*/
JobUpdate,
/** /**
* The JobsQuery model constructor. * The JobsQuery model constructor.
* @property {module:model/JobsQuery} * @property {module:model/JobsQuery}
@ -276,6 +270,12 @@ export {
*/ */
ShamanSingleFileStatus, ShamanSingleFileStatus,
/**
* The SocketIOJobUpdate model constructor.
* @property {module:model/SocketIOJobUpdate}
*/
SocketIOJobUpdate,
/** /**
* The SocketIOSubscription model constructor. * The SocketIOSubscription model constructor.
* @property {module:model/SocketIOSubscription} * @property {module:model/SocketIOSubscription}

38
web/app/src/manager-api/model/JobUpdate.js → web/app/src/manager-api/model/SocketIOJobUpdate.js
View File

@ -15,15 +15,15 @@ import ApiClient from '../ApiClient';
import JobStatus from './JobStatus'; import JobStatus from './JobStatus';
/** /**
* The JobUpdate model module. * The SocketIOJobUpdate model module.
* @module model/JobUpdate * @module model/SocketIOJobUpdate
* @version 0.0.0 * @version 0.0.0
*/ */
class JobUpdate { class SocketIOJobUpdate {
/** /**
* Constructs a new <code>JobUpdate</code>. * Constructs a new <code>SocketIOJobUpdate</code>.
* Subset of a Job, sent over SocketIO when a job changes. For new jobs, &#x60;previous_status&#x60; will be excluded. * Subset of a Job, sent over SocketIO when a job changes. For new jobs, &#x60;previous_status&#x60; will be excluded.
* @alias module:model/JobUpdate * @alias module:model/SocketIOJobUpdate
* @param id {String} UUID of the Job * @param id {String} UUID of the Job
* @param updated {Date} Timestamp of last update * @param updated {Date} Timestamp of last update
* @param status {module:model/JobStatus} * @param status {module:model/JobStatus}
@ -33,7 +33,7 @@ class JobUpdate {
*/ */
constructor(id, updated, status, type, priority, refreshTasks) { constructor(id, updated, status, type, priority, refreshTasks) {
JobUpdate.initialize(this, id, updated, status, type, priority, refreshTasks); SocketIOJobUpdate.initialize(this, id, updated, status, type, priority, refreshTasks);
} }
/** /**
@ -51,15 +51,15 @@ class JobUpdate {
} }
/** /**
* Constructs a <code>JobUpdate</code> from a plain JavaScript object, optionally creating a new instance. * Constructs a <code>SocketIOJobUpdate</code> from a plain JavaScript object, optionally creating a new instance.
* Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not. * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
* @param {Object} data The plain JavaScript object bearing properties of interest. * @param {Object} data The plain JavaScript object bearing properties of interest.
* @param {module:model/JobUpdate} obj Optional instance to populate. * @param {module:model/SocketIOJobUpdate} obj Optional instance to populate.
* @return {module:model/JobUpdate} The populated <code>JobUpdate</code> instance. * @return {module:model/SocketIOJobUpdate} The populated <code>SocketIOJobUpdate</code> instance.
*/ */
static constructFromObject(data, obj) { static constructFromObject(data, obj) {
if (data) { if (data) {
obj = obj || new JobUpdate(); obj = obj || new SocketIOJobUpdate();
if (data.hasOwnProperty('id')) { if (data.hasOwnProperty('id')) {
obj['id'] = ApiClient.convertToType(data['id'], 'String'); obj['id'] = ApiClient.convertToType(data['id'], 'String');
@ -96,51 +96,51 @@ class JobUpdate {
* UUID of the Job * UUID of the Job
* @member {String} id * @member {String} id
*/ */
JobUpdate.prototype['id'] = undefined; SocketIOJobUpdate.prototype['id'] = undefined;
/** /**
* Name of the job * Name of the job
* @member {String} name * @member {String} name
*/ */
JobUpdate.prototype['name'] = undefined; SocketIOJobUpdate.prototype['name'] = undefined;
/** /**
* Timestamp of last update * Timestamp of last update
* @member {Date} updated * @member {Date} updated
*/ */
JobUpdate.prototype['updated'] = undefined; SocketIOJobUpdate.prototype['updated'] = undefined;
/** /**
* @member {module:model/JobStatus} status * @member {module:model/JobStatus} status
*/ */
JobUpdate.prototype['status'] = undefined; SocketIOJobUpdate.prototype['status'] = undefined;
/** /**
* @member {module:model/JobStatus} previous_status * @member {module:model/JobStatus} previous_status
*/ */
JobUpdate.prototype['previous_status'] = undefined; SocketIOJobUpdate.prototype['previous_status'] = undefined;
/** /**
* @member {String} type * @member {String} type
*/ */
JobUpdate.prototype['type'] = undefined; SocketIOJobUpdate.prototype['type'] = undefined;
/** /**
* @member {Number} priority * @member {Number} priority
* @default 50 * @default 50
*/ */
JobUpdate.prototype['priority'] = 50; SocketIOJobUpdate.prototype['priority'] = 50;
/** /**
* Indicates that the client should refresh all the job's tasks. This is sent for mass updates, where updating each individual task would generate too many updates to be practical. * Indicates that the client should refresh all the job's tasks. This is sent for mass updates, where updating each individual task would generate too many updates to be practical.
* @member {Boolean} refresh_tasks * @member {Boolean} refresh_tasks
*/ */
JobUpdate.prototype['refresh_tasks'] = undefined; SocketIOJobUpdate.prototype['refresh_tasks'] = undefined;
export default JobUpdate; export default SocketIOJobUpdate;