From 3cf203e46580d88c842bd931177ebdb159690f89 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Fri, 22 Sep 2023 10:48:31 +0200
Subject: [PATCH] AYON settings: Extract OIIO transcode settings (#5639)

* added name to ExtractOIIOTranscode output definition

* convert outputs of 'ExtractOIIOTranscode' to 'dict'
---
 openpype/settings/ayon_settings.py            | 23 ++++++++++++++++++-
 .../core/server/settings/publish_plugins.py   |  7 ++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/openpype/settings/ayon_settings.py b/openpype/settings/ayon_settings.py
index 9a4f0607e0..3be8ac8ae5 100644
--- a/openpype/settings/ayon_settings.py
+++ b/openpype/settings/ayon_settings.py
@@ -1102,7 +1102,7 @@ def _convert_global_project_settings(ayon_settings, output, default_settings):
         "studio_name",
         "studio_code",
     ):
-        ayon_core.pop(key)
+        ayon_core.pop(key, None)
 
     # Publish conversion
     ayon_publish = ayon_core["publish"]
@@ -1140,6 +1140,27 @@ def _convert_global_project_settings(ayon_settings, output, default_settings):
 
         profile["outputs"] = new_outputs
 
+    # ExtractOIIOTranscode plugin
+    extract_oiio_transcode = ayon_publish["ExtractOIIOTranscode"]
+    extract_oiio_transcode_profiles = extract_oiio_transcode["profiles"]
+    for profile in extract_oiio_transcode_profiles:
+        new_outputs = {}
+        name_counter = {}
+        for output in profile["outputs"]:
+            if "name" in output:
+                name = output.pop("name")
+            else:
+                # Backwards compatibility for setting without 'name' in model
+                name = output["extension"]
+                if name in new_outputs:
+                    name_counter[name] += 1
+                    name = "{}_{}".format(name, name_counter[name])
+                else:
+                    name_counter[name] = 0
+
+            new_outputs[name] = output
+        profile["outputs"] = new_outputs
+
     # Extract Burnin plugin
     extract_burnin = ayon_publish["ExtractBurnin"]
     extract_burnin_options = extract_burnin["options"]
diff --git a/server_addon/core/server/settings/publish_plugins.py b/server_addon/core/server/settings/publish_plugins.py
index c012312579..69a759465e 100644
--- a/server_addon/core/server/settings/publish_plugins.py
+++ b/server_addon/core/server/settings/publish_plugins.py
@@ -116,6 +116,8 @@ class OIIOToolArgumentsModel(BaseSettingsModel):
 
 
 class ExtractOIIOTranscodeOutputModel(BaseSettingsModel):
+    _layout = "expanded"
+    name: str = Field("", title="Name")
     extension: str = Field("", title="Extension")
     transcoding_type: str = Field(
         "colorspace",
@@ -164,6 +166,11 @@ class ExtractOIIOTranscodeProfileModel(BaseSettingsModel):
         title="Output Definitions",
     )
 
+    @validator("outputs")
+    def validate_unique_outputs(cls, value):
+        ensure_unique_names(value)
+        return value
+
 
 class ExtractOIIOTranscodeModel(BaseSettingsModel):
     enabled: bool = Field(True)