From 63fc013c897ffe5f8986473df74aa3faccf7a686 Mon Sep 17 00:00:00 2001
From: Ondrej Samohel <ondrej.samohel@pype.club>
Date: Tue, 17 Nov 2020 00:36:29 +0100
Subject: [PATCH] fix how render instance is created

---
 pype/lib/abstract_collect_render.py  | 27 +++++----------------------
 pype/lib/abstract_submit_deadline.py |  7 ++++---
 2 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/pype/lib/abstract_collect_render.py b/pype/lib/abstract_collect_render.py
index 098788430b..cd53715763 100644
--- a/pype/lib/abstract_collect_render.py
+++ b/pype/lib/abstract_collect_render.py
@@ -124,6 +124,8 @@ class AbstractCollectRender(pyblish.api.ContextPlugin):
             try:
                 if "workfile" in instance.data["families"]:
                     instance.data["publish"] = True
+                if "renderFarm" in instance.data["families"]:
+                    instance.data["remove"] = True
             except KeyError:
                 # be tolerant if 'families' is missing.
                 pass
@@ -165,13 +167,6 @@ class AbstractCollectRender(pyblish.api.ContextPlugin):
                 frame_end_handle = frame_end_render
 
             data = {
-                "subset": render_instance.subset,
-                "attachTo": render_instance.attachTo,
-                "setMembers": render_instance.setMembers,
-                "multipartExr": render_instance.multipartExr,
-                "review": render_instance.review or False,
-                "publish": True,
-
                 "handleStart": handle_start,
                 "handleEnd": handle_end,
                 "frameStart": frame_start,
@@ -179,34 +174,22 @@ class AbstractCollectRender(pyblish.api.ContextPlugin):
                 "frameStartHandle": frame_start_handle,
                 "frameEndHandle": frame_end_handle,
                 "byFrameStep": int(render_instance.frameStep),
-                "renderer": render_instance.renderer,
-                # instance subset
-                "family": render_instance.family,
-                "families": render_instance.families,
-                "asset": render_instance.asset,
-                "time": render_instance.time,
+
                 "author": context.data["user"],
                 # Add source to allow tracing back to the scene from
                 # which was submitted originally
-                "source": render_instance.source,
                 "expectedFiles": exp_files,
-                "resolutionWidth": render_instance.resolutionWidth,
-                "resolutionHeight": render_instance.resolutionHeight,
-                "pixelAspect": render_instance.pixelAspect,
-                "tileRendering": render_instance.tileRendering or False,
-                "tilesX": render_instance.tilesX or 2,
-                "tilesY": render_instance.tilesY or 2,
-                "priority": render_instance.priority,
-                "convertToScanline": render_instance.convertToScanline or False
             }
             if self.sync_workfile_version:
                 data["version"] = context.data["version"]
 
             # add additional data
             data = self.add_additional_data(data)
+            render_instance_dict = attr.asdict(render_instance)
 
             instance = context.create_instance(render_instance.name)
             instance.data["label"] = render_instance.label
+            instance.data.update(render_instance_dict)
             instance.data.update(data)
 
         self.post_collecting_action()
diff --git a/pype/lib/abstract_submit_deadline.py b/pype/lib/abstract_submit_deadline.py
index 44ee9ce436..3337860508 100644
--- a/pype/lib/abstract_submit_deadline.py
+++ b/pype/lib/abstract_submit_deadline.py
@@ -19,7 +19,7 @@ from .abstract_metaplugins import AbstractMetaInstancePlugin
 
 
 @attr.s
-class DeadlineJobInfo:
+class DeadlineJobInfo(object):
     """Mapping of all Deadline *JobInfo* attributes.
 
     This contains all JobInfo attributes plus their default values.
@@ -474,14 +474,15 @@ class AbstractSubmitDeadline(pyblish.api.InstancePlugin):
         anatomy = self._instance.context.data['anatomy']
         file_path = None
         for i in self._instance.context:
-            if "workfile" in i.data["families"]:
+            if "workfile" in i.data["families"] \
+                    or i.data["family"] == "workfile":
                 # test if there is instance of workfile waiting
                 # to be published.
                 assert i.data["publish"] is True, (
                     "Workfile (scene) must be published along")
                 # determine published path from Anatomy.
                 template_data = i.data.get("anatomyData")
-                rep = i.data.get("representations")[0].get("name")
+                rep = i.data.get("representations")[0].get("ext")
                 template_data["representation"] = rep
                 template_data["ext"] = rep
                 template_data["comment"] = None