Deadline: Use query functions

openpype/modules/deadline/plugins/publish/submit_houdini_remote_publish.py

@@ -55,7 +55,7 @@ def process(self, context):
  scenename = os.path.basename(scene)
 
  # Get project code
- project = legacy_io.find_one({"type": "project"})
+ project = context.data["projectEntity"]
  code = project["data"].get("code", project["name"])
 
  job_name = "{scene} [PUBLISH]".format(scene=scenename)

openpype/modules/deadline/plugins/publish/submit_publish_job.py

@@ -11,22 +11,31 @@
 import pyblish.api
 
 import openpype.api
+from openpype.client import get_representations
 from openpype.pipeline import (
  get_representation_path,
  legacy_io,
 )
 from openpype.pipeline.farm.patterning import match_aov_pattern
 
 
-def get_resources(version, extension=None):
+def get_resources(project_name, version, extension=None):
  """Get the files from the specific version."""
- query = {"type": "representation", "parent": version["_id"]}
- if extension:
- query["name"] = extension
 
- representation = legacy_io.find_one(query)
- assert representation, "This is a bug"
+ # TODO this functions seems to be weird
+ # - it's looking for representation with one extension or first (any)
+ # representation from a version?
+ # - not sure how this should work, maybe it does for specific use cases
+ # but probably can't be used for all resources from 2D workflows
+ extensions = None
+ if extension:
+ extensions = [extension]
+ repre_docs = list(get_representations(
+ project_name, version_ids=[version["_id"]], extensions=extensions
+ ))
+ assert repre_docs, "This is a bug"
 
+ representation = repre_docs[0]
  directory = get_representation_path(representation)
  print("Source: ", directory)
  resources = sorted(
@@ -330,13 +339,16 @@ def _copy_extend_frames(self, instance, representation):
  self.log.info("Preparing to copy ...")
  start = instance.data.get("frameStart")
  end = instance.data.get("frameEnd")
+ project_name = legacy_io.active_project()
 
  # get latest version of subset
  # this will stop if subset wasn't published yet
  version = openpype.api.get_latest_version(instance.data.get("asset"),
  instance.data.get("subset"))
  # get its files based on extension
- subset_resources = get_resources(version, representation.get("ext"))
+ subset_resources = get_resources(
+ project_name, version, representation.get("ext")
+ )
  r_col, _ = clique.assemble(subset_resources)
 
  # if override remove all frames we are expecting to be rendered