From fd87751c36dc2c1fe1565dc8d782d8dcd786bf3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Samohel?= <ondrej.samohel@ynput.io>
Date: Sat, 6 Jan 2024 00:01:14 +0100
Subject: [PATCH] :art: add split export support for redshift

---
 .../plugins/publish/collect_redshift_rop.py   | 19 +++++++++++++++++++
 .../publish/submit_houdini_render_deadline.py | 10 ++++++++++
 server_addon/deadline/server/version.py       |  2 +-
 server_addon/houdini/server/version.py        |  2 +-
 4 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/openpype/hosts/houdini/plugins/publish/collect_redshift_rop.py b/openpype/hosts/houdini/plugins/publish/collect_redshift_rop.py
index 0acddab011..cd3bb2bb7a 100644
--- a/openpype/hosts/houdini/plugins/publish/collect_redshift_rop.py
+++ b/openpype/hosts/houdini/plugins/publish/collect_redshift_rop.py
@@ -45,6 +45,25 @@ class CollectRedshiftROPRenderProducts(pyblish.api.InstancePlugin):
         beauty_suffix = rop.evalParm("RS_outputBeautyAOVSuffix")
         render_products = []
 
+        # Store whether we are splitting the render job (export + render)
+        split_render = bool(rop.parm("RS_archive_enable").eval())
+        instance.data["splitRender"] = split_render
+        export_prefix = None
+        export_products = []
+        if split_render:
+            export_prefix = evalParmNoFrame(
+                rop, "RS_archive_file", pad_character="0"
+            )
+            beauty_export_product = self.get_render_product_name(
+                prefix=export_prefix,
+                suffix=None)
+            export_products.append(beauty_export_product)
+            self.log.debug(
+                "Found export product: {}".format(beauty_export_product)
+            )
+            instance.data["ifdFile"] = beauty_export_product
+            instance.data["exportFiles"] = list(export_products)
+
         # Default beauty AOV
         beauty_product = self.get_render_product_name(
             prefix=default_prefix, suffix=beauty_suffix
diff --git a/openpype/modules/deadline/plugins/publish/submit_houdini_render_deadline.py b/openpype/modules/deadline/plugins/publish/submit_houdini_render_deadline.py
index c8960185b2..0bfb37ee1c 100644
--- a/openpype/modules/deadline/plugins/publish/submit_houdini_render_deadline.py
+++ b/openpype/modules/deadline/plugins/publish/submit_houdini_render_deadline.py
@@ -41,6 +41,11 @@ class VrayRenderPluginInfo():
     SeparateFilesPerFrame = attr.ib(default=True)
 
 
+@attr.s
+class RedshiftRenderPluginInfo():
+    SceneFile = attr.ib(default=None)
+    Version = attr.ib(default=None)
+
 class HoudiniSubmitDeadline(
     abstract_submit_deadline.AbstractSubmitDeadline,
     OpenPypePyblishPluginMixin
@@ -262,6 +267,11 @@ class HoudiniSubmitDeadline(
                 plugin_info = VrayRenderPluginInfo(
                     InputFilename=instance.data["ifdFile"],
                 )
+            elif family == "redshift_rop":
+                plugin_info = RedshiftRenderPluginInfo(
+                    SceneFile=instance.data["ifdFile"],
+                    Version=os.getenv("REDSHIFT_VERSION", "3.5.22"),
+                )
             else:
                 self.log.error(
                     "Family '%s' not supported yet to split render job",
diff --git a/server_addon/deadline/server/version.py b/server_addon/deadline/server/version.py
index 1276d0254f..0a8da88258 100644
--- a/server_addon/deadline/server/version.py
+++ b/server_addon/deadline/server/version.py
@@ -1 +1 @@
-__version__ = "0.1.5"
+__version__ = "0.1.6"
diff --git a/server_addon/houdini/server/version.py b/server_addon/houdini/server/version.py
index 6232f7ab18..5635676f6b 100644
--- a/server_addon/houdini/server/version.py
+++ b/server_addon/houdini/server/version.py
@@ -1 +1 @@
-__version__ = "0.2.10"
+__version__ = "0.2.11"