From f39c6e9ef9eb5544572c407b55ee31b7d702684a Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Fri, 26 Jan 2024 18:01:18 +0100 Subject: [PATCH] formatting changes --- server_addon/applications/server/settings.py | 24 ++++++++++++++----- server_addon/core/server/settings/main.py | 4 +++- .../core/server/settings/publish_plugins.py | 8 ++++--- .../flame/server/settings/publish_plugins.py | 8 ++++--- server_addon/hiero/server/settings/filters.py | 4 +++- server_addon/maya/server/settings/creators.py | 4 +++- server_addon/maya/server/settings/imageio.py | 12 ++++++---- server_addon/maya/server/settings/loaders.py | 4 +++- server_addon/maya/server/settings/main.py | 4 +++- .../maya/server/settings/scriptsmenu.py | 4 +++- .../settings/templated_workfile_settings.py | 4 +++- server_addon/nuke/server/settings/main.py | 2 -- 12 files changed, 57 insertions(+), 25 deletions(-) diff --git a/server_addon/applications/server/settings.py b/server_addon/applications/server/settings.py index 710bbbf9ee..e0a59604c8 100644 --- a/server_addon/applications/server/settings.py +++ b/server_addon/applications/server/settings.py @@ -41,7 +41,9 @@ class AppVariant(BaseSettingsModel): arguments: MultiplatformStrList = SettingsField( default_factory=MultiplatformStrList, title="Arguments" ) - environment: str = SettingsField("{}", title="Environment", widget="textarea") + environment: str = SettingsField( + "{}", title="Environment", widget="textarea" + ) @validator("environment") def validate_json(cls, value): @@ -57,7 +59,9 @@ class AppGroup(BaseSettingsModel): label: str = SettingsField("", title="Label") host_name: str = SettingsField("", title="Host name") icon: str = SettingsField("", title="Icon") - environment: str = SettingsField("{}", title="Environment", widget="textarea") + environment: str = SettingsField( + "{}", title="Environment", widget="textarea" + ) variants: list[AppVariant] = SettingsField( default_factory=list, @@ -87,7 +91,9 @@ class AdditionalAppGroup(BaseSettingsModel): label: str = SettingsField("", title="Label") host_name: str = SettingsField("", title="Host name") icon: str = SettingsField("", title="Icon") - environment: str = SettingsField("{}", title="Environment", widget="textarea") + environment: str = SettingsField( + "{}", title="Environment", widget="textarea" + ) variants: list[AppVariantWithPython] = SettingsField( default_factory=list, @@ -107,8 +113,12 @@ class ToolVariantModel(BaseSettingsModel): label: str = SettingsField("", title="Label") host_names: list[str] = SettingsField(default_factory=list, title="Hosts") # TODO use applications enum if possible - app_variants: list[str] = SettingsField(default_factory=list, title="Applications") - environment: str = SettingsField("{}", title="Environments", widget="textarea") + app_variants: list[str] = SettingsField( + default_factory=list, title="Applications" + ) + environment: str = SettingsField( + "{}", title="Environments", widget="textarea" + ) @validator("environment") def validate_json(cls, value): @@ -118,7 +128,9 @@ class ToolVariantModel(BaseSettingsModel): class ToolGroupModel(BaseSettingsModel): name: str = SettingsField("", title="Name") label: str = SettingsField("", title="Label") - environment: str = SettingsField("{}", title="Environments", widget="textarea") + environment: str = SettingsField( + "{}", title="Environments", widget="textarea" + ) variants: list[ToolVariantModel] = SettingsField(default_factory=list) @validator("environment") diff --git a/server_addon/core/server/settings/main.py b/server_addon/core/server/settings/main.py index 1ebfc5a4ca..1bdfcefe19 100644 --- a/server_addon/core/server/settings/main.py +++ b/server_addon/core/server/settings/main.py @@ -55,7 +55,9 @@ class CoreImageIOFileRulesModel(BaseSettingsModel): class CoreImageIOConfigModel(BaseSettingsModel): - filepath: list[str] = SettingsField(default_factory=list, title="Config path") + filepath: list[str] = SettingsField( + default_factory=list, title="Config path" + ) class CoreImageIOBaseModel(BaseSettingsModel): diff --git a/server_addon/core/server/settings/publish_plugins.py b/server_addon/core/server/settings/publish_plugins.py index 61e35e02d4..7dfb01a215 100644 --- a/server_addon/core/server/settings/publish_plugins.py +++ b/server_addon/core/server/settings/publish_plugins.py @@ -715,9 +715,11 @@ class CleanUpFarmModel(BaseSettingsModel): class PublishPuginsModel(BaseSettingsModel): - CollectAnatomyInstanceData: CollectAnatomyInstanceDataModel = SettingsField( - default_factory=CollectAnatomyInstanceDataModel, - title="Collect Anatomy Instance Data" + CollectAnatomyInstanceData: CollectAnatomyInstanceDataModel = ( + SettingsField( + default_factory=CollectAnatomyInstanceDataModel, + title="Collect Anatomy Instance Data" + ) ) CollectAudio: CollectAudioModel = SettingsField( default_factory=CollectAudioModel, diff --git a/server_addon/flame/server/settings/publish_plugins.py b/server_addon/flame/server/settings/publish_plugins.py index 2c21034c44..decb00fcfa 100644 --- a/server_addon/flame/server/settings/publish_plugins.py +++ b/server_addon/flame/server/settings/publish_plugins.py @@ -32,9 +32,11 @@ class AddTasksModel(BaseSettingsModel): class CollectTimelineInstancesModel(BaseSettingsModel): _isGroup = True - xml_preset_attrs_from_comments: list[XMLPresetAttrsFromCommentsModel] = SettingsField( - default_factory=list, - title="XML presets attributes parsable from segment comments" + xml_preset_attrs_from_comments: list[XMLPresetAttrsFromCommentsModel] = ( + SettingsField( + default_factory=list, + title="XML presets attributes parsable from segment comments" + ) ) add_tasks: list[AddTasksModel] = SettingsField( default_factory=list, diff --git a/server_addon/hiero/server/settings/filters.py b/server_addon/hiero/server/settings/filters.py index 9642f93f7e..095d30a004 100644 --- a/server_addon/hiero/server/settings/filters.py +++ b/server_addon/hiero/server/settings/filters.py @@ -15,7 +15,9 @@ class PublishGUIFilterItemModel(BaseSettingsModel): class PublishGUIFiltersModel(BaseSettingsModel): _layout = "compact" name: str = SettingsField(title="Name") - value: list[PublishGUIFilterItemModel] = SettingsField(default_factory=list) + value: list[PublishGUIFilterItemModel] = SettingsField( + default_factory=list + ) @validator("value") def validate_unique_outputs(cls, value): diff --git a/server_addon/maya/server/settings/creators.py b/server_addon/maya/server/settings/creators.py index 6b5583e726..5f3b850a1f 100644 --- a/server_addon/maya/server/settings/creators.py +++ b/server_addon/maya/server/settings/creators.py @@ -111,7 +111,9 @@ class CreateAssModel(BasicCreatorModel): class CreateReviewModel(BasicCreatorModel): - useMayaTimeline: bool = SettingsField(title="Use Maya Timeline for Frame Range.") + useMayaTimeline: bool = SettingsField( + title="Use Maya Timeline for Frame Range." + ) class CreateVrayProxyModel(BaseSettingsModel): diff --git a/server_addon/maya/server/settings/imageio.py b/server_addon/maya/server/settings/imageio.py index 34338b24e4..f4cdf3fbff 100644 --- a/server_addon/maya/server/settings/imageio.py +++ b/server_addon/maya/server/settings/imageio.py @@ -48,7 +48,9 @@ class ColorManagementPreferenceV2Model(BaseSettingsModel): Please migrate all to 'imageio/workfile' and enable it. """ - enabled: bool = SettingsField(True, title="Use Color Management Preference v2") + enabled: bool = SettingsField( + True, title="Use Color Management Preference v2" + ) renderSpace: str = SettingsField(title="Rendering Space") displayName: str = SettingsField(title="Display") @@ -92,9 +94,11 @@ class ImageIOSettings(BaseSettingsModel): title="Workfile" ) # Deprecated - colorManagementPreference_v2: ColorManagementPreferenceV2Model = SettingsField( - default_factory=ColorManagementPreferenceV2Model, - title="DEPRECATED: Color Management Preference v2 (Maya 2022+)" + colorManagementPreference_v2: ColorManagementPreferenceV2Model = ( + SettingsField( + default_factory=ColorManagementPreferenceV2Model, + title="DEPRECATED: Color Management Preference v2 (Maya 2022+)" + ) ) colorManagementPreference: ColorManagementPreferenceModel = SettingsField( default_factory=ColorManagementPreferenceModel, diff --git a/server_addon/maya/server/settings/loaders.py b/server_addon/maya/server/settings/loaders.py index 1d5b972056..15d4275b80 100644 --- a/server_addon/maya/server/settings/loaders.py +++ b/server_addon/maya/server/settings/loaders.py @@ -40,7 +40,9 @@ class ColorsSetting(BaseSettingsModel): class ReferenceLoaderModel(BaseSettingsModel): namespace: str = SettingsField(title="Namespace") group_name: str = SettingsField(title="Group name") - display_handle: bool = SettingsField(title="Display Handle On Load References") + display_handle: bool = SettingsField( + title="Display Handle On Load References" + ) class ImportLoaderModel(BaseSettingsModel): diff --git a/server_addon/maya/server/settings/main.py b/server_addon/maya/server/settings/main.py index ddfb797f8a..f7f62e219d 100644 --- a/server_addon/maya/server/settings/main.py +++ b/server_addon/maya/server/settings/main.py @@ -37,7 +37,9 @@ class MayaSettings(BaseSettingsModel): title="Explicit Plugins Loading") imageio: ImageIOSettings = SettingsField( default_factory=ImageIOSettings, title="Color Management (imageio)") - mel_workspace: str = SettingsField(title="Maya MEL Workspace", widget="textarea") + mel_workspace: str = SettingsField( + title="Maya MEL Workspace", widget="textarea" + ) ext_mapping: list[ExtMappingItemModel] = SettingsField( default_factory=list, title="Extension Mapping") maya_dirmap: MayaDirmapModel = SettingsField( diff --git a/server_addon/maya/server/settings/scriptsmenu.py b/server_addon/maya/server/settings/scriptsmenu.py index 6de43b5278..d01dff1621 100644 --- a/server_addon/maya/server/settings/scriptsmenu.py +++ b/server_addon/maya/server/settings/scriptsmenu.py @@ -9,7 +9,9 @@ class ScriptsmenuSubmodel(BaseSettingsModel): sourcetype: str = SettingsField(title="Source Type") title: str = SettingsField(title="Title") tooltip: str = SettingsField(title="Tooltip") - tags: list[str] = SettingsField(default_factory=list, title="A list of tags") + tags: list[str] = SettingsField( + default_factory=list, title="A list of tags" + ) class ScriptsmenuModel(BaseSettingsModel): diff --git a/server_addon/maya/server/settings/templated_workfile_settings.py b/server_addon/maya/server/settings/templated_workfile_settings.py index f61f52f9ea..1baa2c895c 100644 --- a/server_addon/maya/server/settings/templated_workfile_settings.py +++ b/server_addon/maya/server/settings/templated_workfile_settings.py @@ -12,7 +12,9 @@ class WorkfileBuildProfilesModel(BaseSettingsModel): title="Task types", enum_resolver=task_types_enum ) - task_names: list[str] = SettingsField(default_factory=list, title="Task names") + task_names: list[str] = SettingsField( + default_factory=list, title="Task names" + ) path: str = SettingsField("", title="Path to template") diff --git a/server_addon/nuke/server/settings/main.py b/server_addon/nuke/server/settings/main.py index 2cfc539e71..2b269f1fce 100644 --- a/server_addon/nuke/server/settings/main.py +++ b/server_addon/nuke/server/settings/main.py @@ -1,5 +1,3 @@ -from pydantic import validator - from ayon_server.settings import ( BaseSettingsModel, SettingsField,