From 735a35010fb9e667d3191a54cee5e01a24f2ab6a Mon Sep 17 00:00:00 2001
From: Toke Stuart Jepsen <tokejepsen@gmail.com>
Date: Thu, 2 Feb 2023 09:55:45 +0000
Subject: [PATCH 01/11] Fix assembly job submission

---
 .../plugins/publish/submit_maya_deadline.py   | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py b/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py
index 070d4eab18..230dc52618 100644
--- a/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py
+++ b/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py
@@ -410,8 +410,10 @@ class MayaSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline):
         assembly_job_info.Name += " - Tile Assembly Job"
         assembly_job_info.Frames = 1
         assembly_job_info.MachineLimit = 1
-        assembly_job_info.Priority = instance.data.get("tile_priority",
-                                                       self.tile_priority)
+        assembly_job_info.Priority = instance.data.get(
+            "tile_priority", self.tile_priority
+        )
+        assembly_job_info.TileJob = False
 
         assembly_plugin_info = {
             "CleanupTiles": 1,
@@ -438,13 +440,11 @@ class MayaSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline):
             frame_assembly_job_info.JobDependencies = tile_job_id
 
             # write assembly job config files
-            now = datetime.now()
-
             config_file = os.path.join(
                 output_dir,
                 "{}_config_{}.txt".format(
                     os.path.splitext(file)[0],
-                    now.strftime("%Y_%m_%d_%H_%M_%S")
+                    datetime.now().strftime("%Y_%m_%d_%H_%M_%S")
                 )
             )
             try:
@@ -455,6 +455,8 @@ class MayaSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline):
                 self.log.warning("Path is unreachable: "
                                  "`{}`".format(output_dir))
 
+            assembly_plugin_info["ConfigFile"] = config_file
+
             with open(config_file, "w") as cf:
                 print("TileCount={}".format(tiles_count), file=cf)
                 print("ImageFileName={}".format(file), file=cf)
@@ -463,6 +465,7 @@ class MayaSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline):
                 print("ImageHeight={}".format(
                     instance.data.get("resolutionHeight")), file=cf)
 
+            with open(config_file, "a") as cf:
                 tiles = _format_tiles(
                     file, 0,
                     instance.data.get("tilesX"),
@@ -474,14 +477,12 @@ class MayaSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline):
                 for k, v in sorted(tiles.items()):
                     print("{}={}".format(k, v), file=cf)
 
-            payload = self.assemble_payload(
-                job_info=frame_assembly_job_info,
-                plugin_info=assembly_plugin_info.copy(),
-                # todo: aux file transfers don't work with deadline webservice
-                # add config file as job auxFile
-                # aux_files=[config_file]
+            assembly_payloads.append(
+                self.assemble_payload(
+                    job_info=frame_assembly_job_info,
+                    plugin_info=assembly_plugin_info.copy(),
+                )
             )
-            assembly_payloads.append(payload)
 
         # Submit assembly jobs
         assembly_job_ids = []
@@ -491,6 +492,7 @@ class MayaSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline):
                 "submitting assembly job {} of {}".format(i + 1,
                                                           num_assemblies)
             )
+            self.log.info(payload)
             assembly_job_id = self.submit(payload)
             assembly_job_ids.append(assembly_job_id)
 

From 0223d94552dda376548e8446bcea88b33de9dd19 Mon Sep 17 00:00:00 2001
From: Toke Stuart Jepsen <tokejepsen@gmail.com>
Date: Thu, 2 Feb 2023 12:50:52 +0000
Subject: [PATCH 02/11] Fix OpenPypeTileAssembler

---
 .../OpenPypeTileAssembler.py                  | 92 +------------------
 1 file changed, 5 insertions(+), 87 deletions(-)

diff --git a/openpype/modules/deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.py b/openpype/modules/deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.py
index 625a3f1a28..674938e641 100644
--- a/openpype/modules/deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.py
+++ b/openpype/modules/deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.py
@@ -320,12 +320,7 @@ class OpenPypeTileAssembler(DeadlinePlugin):
         output_file = data["ImageFileName"]
         output_file = RepositoryUtils.CheckPathMapping(output_file)
         output_file = self.process_path(output_file)
-        """
-        _, ext = os.path.splitext(output_file)
-        if "exr" not in ext:
-            self.FailRender(
-                "[{}] Only EXR format is supported for now.".format(ext))
-        """
+
         tile_info = []
         for tile in range(int(data["TileCount"])):
             tile_info.append({
@@ -336,11 +331,6 @@ class OpenPypeTileAssembler(DeadlinePlugin):
                 "width": int(data["Tile{}Width".format(tile)])
             })
 
-        # FFMpeg doesn't support tile coordinates at the moment.
-        # arguments = self.tile_completer_ffmpeg_args(
-        #     int(data["ImageWidth"]), int(data["ImageHeight"]),
-        #     tile_info, output_file)
-
         arguments = self.tile_oiio_args(
             int(data["ImageWidth"]), int(data["ImageHeight"]),
             tile_info, output_file)
@@ -362,20 +352,20 @@ class OpenPypeTileAssembler(DeadlinePlugin):
     def pre_render_tasks(self):
         """Load config file and do remapping."""
         self.LogInfo("OpenPype Tile Assembler starting...")
-        scene_filename = self.GetDataFilename()
+        config_file = self.GetPluginInfoEntry("ConfigFile")
 
         temp_scene_directory = self.CreateTempDirectory(
             "thread" + str(self.GetThreadNumber()))
-        temp_scene_filename = Path.GetFileName(scene_filename)
+        temp_scene_filename = Path.GetFileName(config_file)
         self.config_file = Path.Combine(
             temp_scene_directory, temp_scene_filename)
 
         if SystemUtils.IsRunningOnWindows():
             RepositoryUtils.CheckPathMappingInFileAndReplaceSeparator(
-                scene_filename, self.config_file, "/", "\\")
+                config_file, self.config_file, "/", "\\")
         else:
             RepositoryUtils.CheckPathMappingInFileAndReplaceSeparator(
-                scene_filename, self.config_file, "\\", "/")
+                config_file, self.config_file, "\\", "/")
             os.chmod(self.config_file, os.stat(self.config_file).st_mode)
 
     def post_render_tasks(self):
@@ -459,75 +449,3 @@ class OpenPypeTileAssembler(DeadlinePlugin):
         args.append(output_path)
 
         return args
-
-    def tile_completer_ffmpeg_args(
-            self, output_width, output_height, tiles_info, output_path):
-        """Generate ffmpeg arguments for tile assembly.
-
-        Expected inputs are tiled images.
-
-        Args:
-            output_width (int): Width of output image.
-            output_height (int): Height of output image.
-            tiles_info (list): List of tile items, each item must be
-                dictionary with `filepath`, `pos_x` and `pos_y` keys
-                representing path to file and x, y coordinates on output
-                image where top-left point of tile item should start.
-            output_path (str): Path to file where should be output stored.
-
-        Returns:
-            (list): ffmpeg arguments.
-
-        """
-        previous_name = "base"
-        ffmpeg_args = []
-        filter_complex_strs = []
-
-        filter_complex_strs.append("nullsrc=size={}x{}[{}]".format(
-            output_width, output_height, previous_name
-        ))
-
-        new_tiles_info = {}
-        for idx, tile_info in enumerate(tiles_info):
-            # Add input and store input index
-            filepath = tile_info["filepath"]
-            ffmpeg_args.append("-i \"{}\"".format(filepath.replace("\\", "/")))
-
-            # Prepare initial filter complex arguments
-            index_name = "input{}".format(idx)
-            filter_complex_strs.append(
-                "[{}]setpts=PTS-STARTPTS[{}]".format(idx, index_name)
-            )
-            tile_info["index"] = idx
-            new_tiles_info[index_name] = tile_info
-
-        # Set frames to 1
-        ffmpeg_args.append("-frames 1")
-
-        # Concatenation filter complex arguments
-        global_index = 1
-        total_index = len(new_tiles_info)
-        for index_name, tile_info in new_tiles_info.items():
-            item_str = (
-                "[{previous_name}][{index_name}]overlay={pos_x}:{pos_y}"
-            ).format(
-                previous_name=previous_name,
-                index_name=index_name,
-                pos_x=tile_info["pos_x"],
-                pos_y=tile_info["pos_y"]
-            )
-            new_previous = "tmp{}".format(global_index)
-            if global_index != total_index:
-                item_str += "[{}]".format(new_previous)
-            filter_complex_strs.append(item_str)
-            previous_name = new_previous
-            global_index += 1
-
-        joined_parts = ";".join(filter_complex_strs)
-        filter_complex_str = "-filter_complex \"{}\"".format(joined_parts)
-
-        ffmpeg_args.append(filter_complex_str)
-        ffmpeg_args.append("-y")
-        ffmpeg_args.append("\"{}\"".format(output_path))
-
-        return ffmpeg_args

From ce44ceb1fdd65be4451922b1e8ca0096923dd29f Mon Sep 17 00:00:00 2001
From: Toke Stuart Jepsen <tokejepsen@gmail.com>
Date: Thu, 2 Feb 2023 12:51:09 +0000
Subject: [PATCH 03/11] Fix y tiles ordering.

---
 .../plugins/publish/submit_maya_deadline.py   | 38 ++++++++++++++-----
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py b/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py
index 230dc52618..6261a69706 100644
--- a/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py
+++ b/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py
@@ -466,13 +466,16 @@ class MayaSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline):
                     instance.data.get("resolutionHeight")), file=cf)
 
             with open(config_file, "a") as cf:
+                # Need to reverse the order of the y tiles, because image
+                # coordinates are calculated from bottom left corner.
                 tiles = _format_tiles(
                     file, 0,
                     instance.data.get("tilesX"),
                     instance.data.get("tilesY"),
                     instance.data.get("resolutionWidth"),
                     instance.data.get("resolutionHeight"),
-                    payload_plugin_info["OutputFilePrefix"]
+                    payload_plugin_info["OutputFilePrefix"],
+                    reversed_y=True
                 )[1]
                 for k, v in sorted(tiles.items()):
                     print("{}={}".format(k, v), file=cf)
@@ -752,8 +755,15 @@ class MayaSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline):
 
 
 def _format_tiles(
-        filename, index, tiles_x, tiles_y,
-        width, height, prefix):
+        filename,
+        index,
+        tiles_x,
+        tiles_y,
+        width,
+        height,
+        prefix,
+        reversed_y=False
+):
     """Generate tile entries for Deadline tile job.
 
     Returns two dictionaries - one that can be directly used in Deadline
@@ -790,6 +800,7 @@ def _format_tiles(
         width (int): Width resolution of final image.
         height (int):  Height resolution of final image.
         prefix (str): Image prefix.
+        reversed_y (bool): Reverses the order of the y tiles.
 
     Returns:
         (dict, dict): Tuple of two dictionaries - first can be used to
@@ -812,12 +823,16 @@ def _format_tiles(
     cfg["TilesCropped"] = "False"
 
     tile = 0
+    range_y = range(1, tiles_y + 1)
+    reversed_y_range = list(reversed(range_y))
     for tile_x in range(1, tiles_x + 1):
-        for tile_y in reversed(range(1, tiles_y + 1)):
+        for i, tile_y in enumerate(range_y):
+            tile_y_index = tile_y
+            if reversed_y:
+                tile_y_index = reversed_y_range[i]
+
             tile_prefix = "_tile_{}x{}_{}x{}_".format(
-                tile_x, tile_y,
-                tiles_x,
-                tiles_y
+                tile_x, tile_y_index, tiles_x, tiles_y
             )
 
             new_filename = "{}/{}{}".format(
@@ -832,11 +847,14 @@ def _format_tiles(
             right = (tile_x * w_space) - 1
 
             # Job info
-            out["JobInfo"]["OutputFilename{}Tile{}".format(index, tile)] = new_filename  # noqa: E501
+            key = "OutputFilename{}Tile{}".format(index, tile)
+            out["JobInfo"][key] = new_filename
 
             # Plugin Info
-            out["PluginInfo"]["RegionPrefix{}".format(str(tile))] = \
-                "/{}".format(tile_prefix).join(prefix.rsplit("/", 1))
+            key = "RegionPrefix{}".format(str(tile))
+            out["PluginInfo"][key] = "/{}".format(
+                tile_prefix
+            ).join(prefix.rsplit("/", 1))
             out["PluginInfo"]["RegionTop{}".format(tile)] = top
             out["PluginInfo"]["RegionBottom{}".format(tile)] = bottom
             out["PluginInfo"]["RegionLeft{}".format(tile)] = left

From 5b961887a392f3f99a829562634701d2b8961fe4 Mon Sep 17 00:00:00 2001
From: Toke Stuart Jepsen <tokejepsen@gmail.com>
Date: Thu, 2 Feb 2023 18:08:09 +0000
Subject: [PATCH 04/11] Add plugin version.

---
 .../plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.py   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/openpype/modules/deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.py b/openpype/modules/deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.py
index 674938e641..f9c5db1800 100644
--- a/openpype/modules/deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.py
+++ b/openpype/modules/deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.py
@@ -16,6 +16,10 @@ from Deadline.Scripting import (
     FileUtils, RepositoryUtils, SystemUtils)
 
 
+version_major = 1
+version_minor = 0
+version_patch = 0
+version_string = ".".join([version_major, version_minor, version_patch])
 STRING_TAGS = {
     "format"
 }
@@ -264,6 +268,7 @@ class OpenPypeTileAssembler(DeadlinePlugin):
 
     def initialize_process(self):
         """Initialization."""
+        print("Plugin version: {}".format(version_string))
         self.SingleFramesOnly = True
         self.StdoutHandling = True
         self.renderer = self.GetPluginInfoEntryWithDefault(

From 97ff180d039c22dce44f5f53e0ecf6177363705e Mon Sep 17 00:00:00 2001
From: Toke Stuart Jepsen <tokejepsen@gmail.com>
Date: Thu, 2 Feb 2023 18:20:05 +0000
Subject: [PATCH 05/11] Fix plugin version

---
 .../plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.py    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openpype/modules/deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.py b/openpype/modules/deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.py
index f9c5db1800..ef76937b5a 100644
--- a/openpype/modules/deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.py
+++ b/openpype/modules/deadline/repository/custom/plugins/OpenPypeTileAssembler/OpenPypeTileAssembler.py
@@ -19,7 +19,7 @@ from Deadline.Scripting import (
 version_major = 1
 version_minor = 0
 version_patch = 0
-version_string = ".".join([version_major, version_minor, version_patch])
+version_string = "{}.{}.{}".format(version_major, version_minor, version_patch)
 STRING_TAGS = {
     "format"
 }
@@ -268,7 +268,7 @@ class OpenPypeTileAssembler(DeadlinePlugin):
 
     def initialize_process(self):
         """Initialization."""
-        print("Plugin version: {}".format(version_string))
+        self.LogInfo("Plugin version: {}".format(version_string))
         self.SingleFramesOnly = True
         self.StdoutHandling = True
         self.renderer = self.GetPluginInfoEntryWithDefault(

From 9d8eb7383581b3dc48d378db7ef65986a24118e2 Mon Sep 17 00:00:00 2001
From: Toke Stuart Jepsen <tokejepsen@gmail.com>
Date: Fri, 3 Feb 2023 12:16:47 +0000
Subject: [PATCH 06/11] Documentation

---
 website/docs/artist_hosts_maya.md | 16 ++++++++++++++++
 website/docs/module_deadline.md   | 28 ++++++++++++++++------------
 2 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/website/docs/artist_hosts_maya.md b/website/docs/artist_hosts_maya.md
index 5cd8efa153..81164eefad 100644
--- a/website/docs/artist_hosts_maya.md
+++ b/website/docs/artist_hosts_maya.md
@@ -504,6 +504,22 @@ In the scene from where you want to publish your model create *Render subset*. P
 model subset (Maya set node) under corresponding `LAYER_` set under *Render instance*. During publish, it will submit this render to farm and
 after it is rendered, it will be attached to your model subset.
 
+### Tile Rendering
+:::note Deadline
+This feature is only supported when using Deadline. See [here](module_deadline#openpypetileassembler-plugin) for setup.
+:::
+On the render instance objectset you'll find:
+
+* `Tile Rendering` - for enabling tile rendering.
+* `Tile X` - number of tiles in the X axis.
+* `Tile Y` - number of tiles in the Y axis.
+
+When submittig to Deadline, you'll get:
+
+- for each frame a tile rendering job, to render each from Maya.
+- for each frame a tile assembly job, to assemble the rendered tiles.
+- job to publish the assembled frames.
+
 ## Render Setups
 
 ### Publishing Render Setups
diff --git a/website/docs/module_deadline.md b/website/docs/module_deadline.md
index c96da91909..2c02530b79 100644
--- a/website/docs/module_deadline.md
+++ b/website/docs/module_deadline.md
@@ -28,16 +28,16 @@ For [AWS Thinkbox Deadline](https://www.awsthinkbox.com/deadline) support you ne
 OpenPype integration for Deadline consists of two parts:
 
 - The `OpenPype` Deadline Plug-in
-- A `GlobalJobPreLoad` Deadline Script (this gets triggered for each deadline job) 
+- A `GlobalJobPreLoad` Deadline Script (this gets triggered for each deadline job)
 
 The `GlobalJobPreLoad` handles populating render and publish jobs with proper environment variables using settings from the `OpenPype` Deadline Plug-in.
 
-The `OpenPype` Deadline Plug-in must be configured to point to a valid OpenPype executable location. The executable need to be installed to 
+The `OpenPype` Deadline Plug-in must be configured to point to a valid OpenPype executable location. The executable need to be installed to
 destinations accessible by DL process. Check permissions (must be executable and accessible by Deadline process)
 
 - Enable `Tools > Super User Mode` in Deadline Monitor
 
-- Go to `Tools > Configure Plugins...`, find `OpenPype` in the list on the left side, find location of OpenPype 
+- Go to `Tools > Configure Plugins...`, find `OpenPype` in the list on the left side, find location of OpenPype
 executable. It is recommended to use the `openpype_console` executable as it provides a bit more logging.
 
 - In case of multi OS farms, provide multiple locations, each Deadline Worker goes through the list and tries to find the first accessible
@@ -45,12 +45,16 @@ executable. It is recommended to use the `openpype_console` executable as it pro
 
 ![Configure plugin](assets/deadline_configure_plugin.png)
 
+### OpenPypeTileAssembler Plugin
+To setup tile rendering copy the `OpenPypeTileAssembler` plugin to the repository;
+`[OpenPype]\openpype\modules\deadline\repository\custom\plugins\OpenPypeTileAssembler` > `[DeadlineRepository]\custom\plugins\OpenPypeTileAssembler`
+
 ## Troubleshooting
 
 #### Publishing jobs fail directly in DCCs
 
 - Double check that all previously described steps were finished
-- Check that `deadlinewebservice` is running on DL server 
+- Check that `deadlinewebservice` is running on DL server
 - Check that user's machine has access to deadline server on configured port
 
 #### Jobs are failing on DL side
@@ -61,40 +65,40 @@ Each publishing from OpenPype consists of 2 jobs, first one is rendering, second
 
 - Jobs are failing with `OpenPype executable was not found` error
 
-    Check if OpenPype is installed on the Worker handling this job and ensure `OpenPype` Deadline Plug-in is properly [configured](#configuration) 
+    Check if OpenPype is installed on the Worker handling this job and ensure `OpenPype` Deadline Plug-in is properly [configured](#configuration)
 
 
 - Publishing job is failing with `ffmpeg not installed` error
- 
+
     OpenPype executable has to have access to `ffmpeg` executable, check OpenPype `Setting > General`
 
     ![FFmpeg setting](assets/ffmpeg_path.png)
 
 - Both jobs finished successfully, but there is no review on Ftrack
 
-    Make sure that you correctly set published family to be send to Ftrack. 
+    Make sure that you correctly set published family to be send to Ftrack.
 
     ![Ftrack Family](assets/ftrack/ftrack-collect-main.png)
 
     Example: I want send to Ftrack review of rendered images from Harmony :
         - `Host names`: "harmony"
-        - `Families`: "render" 
+        - `Families`: "render"
         - `Add Ftrack Family` to "Enabled"
-  
+
     Make sure that you actually configured to create review for published subset in `project_settings/ftrack/publish/CollectFtrackFamily`
 
     ![Ftrack Family](assets/deadline_review.png)
 
-    Example: I want to create review for all reviewable subsets in Harmony : 
+    Example: I want to create review for all reviewable subsets in Harmony :
       - Add "harmony" as a new key an ".*" as a value.
 
 
 - Rendering jobs are stuck in 'Queued' state or failing
 
     Make sure that your Deadline is not limiting specific jobs to be run only on specific machines. (Eg. only some machines have installed particular application.)
-    
+
     Check `project_settings/deadline`
-  
+
     ![Deadline group](assets/deadline_group.png)
 
     Example: I have separated machines with "Harmony" installed into "harmony" group on Deadline. I want rendering jobs published from Harmony to run only on those machines.

From b5a4fb59a578309b9f94914546acf97606c271f4 Mon Sep 17 00:00:00 2001
From: Toke Stuart Jepsen <tokejepsen@gmail.com>
Date: Fri, 3 Feb 2023 12:42:27 +0000
Subject: [PATCH 07/11] Change default settings to Draft Tile Assembler.

---
 openpype/settings/defaults/project_settings/deadline.json     | 4 ++--
 .../schemas/projects_schema/schema_project_deadline.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/openpype/settings/defaults/project_settings/deadline.json b/openpype/settings/defaults/project_settings/deadline.json
index ceb0b2e39a..c4c3d413d1 100644
--- a/openpype/settings/defaults/project_settings/deadline.json
+++ b/openpype/settings/defaults/project_settings/deadline.json
@@ -23,7 +23,7 @@
             "enabled": true,
             "optional": false,
             "active": true,
-            "tile_assembler_plugin": "OpenPypeTileAssembler",
+            "tile_assembler_plugin": "DraftTileAssembler",
             "use_published": true,
             "import_reference": false,
             "asset_dependencies": true,
@@ -106,4 +106,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json b/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json
index 08a505bd47..87b375bc9f 100644
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json
@@ -121,7 +121,7 @@
                                     "DraftTileAssembler": "Draft Tile Assembler"
                                 },
                                 {
-                                    "OpenPypeTileAssembler": "Open Image IO"
+                                    "OpenPypeTileAssembler": "OpenPype Tile Assembler"
                                 }
                             ]
                         },

From 25b4907b35894641930bbb86d9a583fcf82d5dbe Mon Sep 17 00:00:00 2001
From: Toke Stuart Jepsen <tokejepsen@gmail.com>
Date: Fri, 3 Feb 2023 15:56:45 +0000
Subject: [PATCH 08/11] Fix for Draft Tile Assembler

---
 .../modules/deadline/plugins/publish/submit_maya_deadline.py   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py b/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py
index 6261a69706..972e1810be 100644
--- a/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py
+++ b/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py
@@ -484,6 +484,9 @@ class MayaSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline):
                 self.assemble_payload(
                     job_info=frame_assembly_job_info,
                     plugin_info=assembly_plugin_info.copy(),
+                    # This would fail if the client machine and webserice are
+                    # using different storage paths.
+                    aux_files=[config_file]
                 )
             )
 

From da183c2199f6eadb567c0bf4db400124a2583674 Mon Sep 17 00:00:00 2001
From: Toke Stuart Jepsen <tokejepsen@gmail.com>
Date: Thu, 16 Feb 2023 16:30:16 +0000
Subject: [PATCH 09/11] Saving with default settings properly.

---
 openpype/settings/defaults/project_settings/deadline.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/settings/defaults/project_settings/deadline.json b/openpype/settings/defaults/project_settings/deadline.json
index c563531b39..e55f33bb41 100644
--- a/openpype/settings/defaults/project_settings/deadline.json
+++ b/openpype/settings/defaults/project_settings/deadline.json
@@ -107,4 +107,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file

From 63eee639f7a3f01ad15d6e9b8bc5b7608e21084b Mon Sep 17 00:00:00 2001
From: Toke Stuart Jepsen <tokejepsen@gmail.com>
Date: Thu, 16 Feb 2023 18:35:23 +0000
Subject: [PATCH 10/11] Fix frames issues.

---
 .../deadline/plugins/publish/submit_maya_deadline.py  |  1 +
 .../publish/validate_expected_and_rendered_files.py   | 11 +++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py b/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py
index cb47c854a8..19e8a258f4 100644
--- a/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py
+++ b/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py
@@ -442,6 +442,7 @@ class MayaSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline):
             frame_assembly_job_info.ExtraInfo[0] = file_hash
             frame_assembly_job_info.ExtraInfo[1] = file
             frame_assembly_job_info.JobDependencies = tile_job_id
+            frame_assembly_job_info.Frames = frame
 
             # write assembly job config files
             config_file = os.path.join(
diff --git a/openpype/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py b/openpype/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py
index f0a3ddd246..9311a9d64a 100644
--- a/openpype/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py
+++ b/openpype/modules/deadline/plugins/publish/validate_expected_and_rendered_files.py
@@ -68,8 +68,15 @@ class ValidateExpectedFiles(pyblish.api.InstancePlugin):
             # files to be in the folder that we might not want to use.
             missing = expected_files - existing_files
             if missing:
-                raise RuntimeError("Missing expected files: {}".format(
-                    sorted(missing)))
+                raise RuntimeError(
+                    "Missing expected files: {}\n"
+                    "Expected files: {}\n"
+                    "Existing files: {}".format(
+                        sorted(missing),
+                        sorted(expected_files),
+                        sorted(existing_files)
+                    )
+                )
 
     def _get_frame_list(self, original_job_id):
         """Returns list of frame ranges from all render job.

From f1b39494be1027d757b359336dda4a7869c8764c Mon Sep 17 00:00:00 2001
From: Toke Jepsen <tokejepsen@gmail.com>
Date: Tue, 14 Mar 2023 14:50:15 +0000
Subject: [PATCH 11/11] Update
 openpype/modules/deadline/plugins/publish/submit_maya_deadline.py

Co-authored-by: Kayla Man <64118225+moonyuet@users.noreply.github.com>
---
 .../modules/deadline/plugins/publish/submit_maya_deadline.py    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py b/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py
index f7fc608f30..53ecb9063b 100644
--- a/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py
+++ b/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py
@@ -860,7 +860,7 @@ def _format_tiles(
             right = (tile_x * w_space) - 1
 
             # Job info
-            key = "OutputFilename{}Tile{}".format(index, tile)
+            key = "OutputFilename{}".format(index)
             out["JobInfo"][key] = new_filename
 
             # Plugin Info