From f2e4607434d283f3e4769495b369839813df28b4 Mon Sep 17 00:00:00 2001
From: Petr Kalis <petr.kalis@gmail.com>
Date: Tue, 18 Jul 2023 16:03:55 +0200
Subject: [PATCH] OP-4845 - add bundle name as a job env var

Ayon must have AYON_BUNDLE_NAME to get proper env variables and addon used.
---
 .../deadline/abstract_submit_deadline.py      | 102 ++----------------
 1 file changed, 11 insertions(+), 91 deletions(-)

diff --git a/openpype/modules/deadline/abstract_submit_deadline.py b/openpype/modules/deadline/abstract_submit_deadline.py
index 85b537360c..9fcff111e6 100644
--- a/openpype/modules/deadline/abstract_submit_deadline.py
+++ b/openpype/modules/deadline/abstract_submit_deadline.py
@@ -22,6 +22,9 @@ from openpype.pipeline.publish import (
     KnownPublishError,
     OpenPypePyblishPluginMixin
 )
+from openpype.pipeline.publish.lib import (
+    replace_with_published_scene_path
+)
 
 JSONDecodeError = getattr(json.decoder, "JSONDecodeError", ValueError)
 
@@ -396,12 +399,12 @@ class DeadlineJobInfo(object):
 
     def add_render_job_env_var(self):
         """Check if in OP or AYON mode and use appropriate env var."""
-        render_job = (
-            "AYON_RENDER_JOB" if os.environ.get("USE_AYON_SERVER") == '1'
-            else "OPENPYPE_RENDER_JOB")
-
-        self.EnvironmentKeyValue[render_job] = "1"
-
+        if os.environ.get("USE_AYON_SERVER") == '1':
+            self.EnvironmentKeyValue["AYON_RENDER_JOB"] = "1"
+            self.EnvironmentKeyValue["AYON_BUNDLE_NAME"] = (
+                os.environ["AYON_BUNDLE_NAME"])
+        else:
+            self.EnvironmentKeyValue["OPENPYPE_RENDER_JOB"] = "1"
 
 
 @six.add_metaclass(AbstractMetaInstancePlugin)
@@ -534,72 +537,8 @@ class AbstractSubmitDeadline(pyblish.api.InstancePlugin,
             published.
 
         """
-        instance = self._instance
-        workfile_instance = self._get_workfile_instance(instance.context)
-        if workfile_instance is None:
-            return
-
-        # determine published path from Anatomy.
-        template_data = workfile_instance.data.get("anatomyData")
-        rep = workfile_instance.data["representations"][0]
-        template_data["representation"] = rep.get("name")
-        template_data["ext"] = rep.get("ext")
-        template_data["comment"] = None
-
-        anatomy = instance.context.data['anatomy']
-        template_obj = anatomy.templates_obj["publish"]["path"]
-        template_filled = template_obj.format_strict(template_data)
-        file_path = os.path.normpath(template_filled)
-
-        self.log.info("Using published scene for render {}".format(file_path))
-
-        if not os.path.exists(file_path):
-            self.log.error("published scene does not exist!")
-            raise
-
-        if not replace_in_path:
-            return file_path
-
-        # now we need to switch scene in expected files
-        # because <scene> token will now point to published
-        # scene file and that might differ from current one
-        def _clean_name(path):
-            return os.path.splitext(os.path.basename(path))[0]
-
-        new_scene = _clean_name(file_path)
-        orig_scene = _clean_name(instance.context.data["currentFile"])
-        expected_files = instance.data.get("expectedFiles")
-
-        if isinstance(expected_files[0], dict):
-            # we have aovs and we need to iterate over them
-            new_exp = {}
-            for aov, files in expected_files[0].items():
-                replaced_files = []
-                for f in files:
-                    replaced_files.append(
-                        str(f).replace(orig_scene, new_scene)
-                    )
-                new_exp[aov] = replaced_files
-            # [] might be too much here, TODO
-            instance.data["expectedFiles"] = [new_exp]
-        else:
-            new_exp = []
-            for f in expected_files:
-                new_exp.append(
-                    str(f).replace(orig_scene, new_scene)
-                )
-            instance.data["expectedFiles"] = new_exp
-
-        metadata_folder = instance.data.get("publishRenderMetadataFolder")
-        if metadata_folder:
-            metadata_folder = metadata_folder.replace(orig_scene,
-                                                      new_scene)
-            instance.data["publishRenderMetadataFolder"] = metadata_folder
-        self.log.info("Scene name was switched {} -> {}".format(
-            orig_scene, new_scene
-        ))
-
-        return file_path
+        return replace_with_published_scene_path(
+            self._instance, replace_in_path=replace_in_path)
 
     def assemble_payload(
             self, job_info=None, plugin_info=None, aux_files=None):
@@ -660,22 +599,3 @@ class AbstractSubmitDeadline(pyblish.api.InstancePlugin,
         self._instance.data["deadlineSubmissionJob"] = result
 
         return result["_id"]
-
-    @staticmethod
-    def _get_workfile_instance(context):
-        """Find workfile instance in context"""
-        for instance in context:
-
-            is_workfile = (
-                "workfile" in instance.data.get("families", []) or
-                instance.data["family"] == "workfile"
-            )
-            if not is_workfile:
-                continue
-
-            # test if there is instance of workfile waiting
-            # to be published.
-            assert instance.data.get("publish", True) is True, (
-                "Workfile (scene) must be published along")
-
-            return instance