From 3b70243adce054b904f4fe61dfcc5beef0f7f54b Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Tue, 19 Mar 2024 14:50:13 +0100 Subject: [PATCH] AY-745 - added Deadline credentials to Settings This provides Site Settings fields for Deadline user name and password. --- server_addon/deadline/server/settings/main.py | 23 +++++++++++++++++++ server_addon/deadline/server/version.py | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/server_addon/deadline/server/settings/main.py b/server_addon/deadline/server/settings/main.py index 9537d6d550..8213268bce 100644 --- a/server_addon/deadline/server/settings/main.py +++ b/server_addon/deadline/server/settings/main.py @@ -18,6 +18,16 @@ class ServerListSubmodel(BaseSettingsModel): value: str = SettingsField(title="Value") +class LocalSubmodel(BaseSettingsModel): + """Select your local and remote site""" + username: str = SettingsField("", + title="Username", + scope=["site"]) + password: str = SettingsField("", + title="Password", + scope=["site"]) + + async def defined_deadline_ws_name_enum_resolver( addon: "BaseServerAddon", settings_variant: str = "production", @@ -48,17 +58,30 @@ class DeadlineSettings(BaseSettingsModel): scope=["project"], enum_resolver=defined_deadline_ws_name_enum_resolver ) + require_authentication: bool = SettingsField( + False, + title="Require Authentication", + scope=["project"], + ) publish: PublishPluginsModel = SettingsField( default_factory=PublishPluginsModel, title="Publish Plugins", ) + local_settings: LocalSubmodel = SettingsField( + default_factory=LocalSubmodel, + title="Local setting", + scope=["site"], + description="This setting is only applicable for artist's site", + ) + @validator("deadline_urls") def validate_unique_names(cls, value): ensure_unique_names(value) return value + DEFAULT_VALUES = { "deadline_urls": [ { diff --git a/server_addon/deadline/server/version.py b/server_addon/deadline/server/version.py index c11f861afb..569b1212f7 100644 --- a/server_addon/deadline/server/version.py +++ b/server_addon/deadline/server/version.py @@ -1 +1 @@ -__version__ = "0.1.9" +__version__ = "0.1.10"