mirror of
https://github.com/ynput/ayon-core.git
synced 2025-12-25 05:14:40 +01:00
🚨 hound fixes
This commit is contained in:
parent
e49cbf34f6
commit
8ebef523bc
7 changed files with 27 additions and 23 deletions
|
|
@ -279,7 +279,7 @@ class CreateRender(plugin.Creator):
|
|||
|
||||
if deadline_enabled and muster_enabled and royalrender_enabled:
|
||||
self.log.error(
|
||||
("Multiple render farm support (Deadline/RoyalRender/Muster) "
|
||||
("Multiple render farm support (Deadline/RoyalRender/Muster) "
|
||||
"is enabled. We support only one at time.")
|
||||
)
|
||||
raise RuntimeError("Both Deadline and Muster are enabled")
|
||||
|
|
|
|||
|
|
@ -2,9 +2,7 @@
|
|||
"""Wrapper around Royal Render API."""
|
||||
import sys
|
||||
import os
|
||||
import platform
|
||||
|
||||
from openpype.settings import get_project_settings
|
||||
from openpype.lib.local_settings import OpenPypeSettingsRegistry
|
||||
from openpype.lib import Logger, run_subprocess
|
||||
from .rr_job import RRJob, SubmitFile, SubmitterParameter
|
||||
|
|
|
|||
|
|
@ -44,6 +44,4 @@ class CollectRRPathFromInstance(pyblish.api.InstancePlugin):
|
|||
# Handle situation were we had only one url for royal render.
|
||||
return rr_settings["rr_paths"]["default"]
|
||||
|
||||
return list(rr_servers.keys())[
|
||||
int(instance.data.get("rrPaths"))
|
||||
]
|
||||
return list(rr_servers.keys())[int(instance.data.get("rrPaths"))]
|
||||
|
|
|
|||
|
|
@ -47,11 +47,14 @@ class CreateMayaRoyalRenderJob(InstancePlugin):
|
|||
output_dir = os.path.dirname(first_file)
|
||||
self._instance.data["outputDir"] = output_dir
|
||||
workspace = self._instance.context.data["workspaceDir"]
|
||||
default_render_file = self._instance.context.data.get('project_settings') \
|
||||
.get('maya') \
|
||||
.get('RenderSettings') \
|
||||
.get('default_render_image_folder')
|
||||
file_name = os.path.basename(self.scene_path)
|
||||
default_render_file = (
|
||||
self._instance.context.data
|
||||
['project_settings']
|
||||
['maya']
|
||||
['RenderSettings']
|
||||
['default_render_image_folder']
|
||||
)
|
||||
# file_name = os.path.basename(self.scene_path)
|
||||
dir_name = os.path.join(workspace, default_render_file)
|
||||
layer = self._instance.data["setMembers"] # type: str
|
||||
layer_name = layer.removeprefix("rs_")
|
||||
|
|
@ -86,7 +89,6 @@ class CreateMayaRoyalRenderJob(InstancePlugin):
|
|||
"""Plugin entry point."""
|
||||
self._instance = instance
|
||||
context = instance.context
|
||||
from pprint import pformat
|
||||
|
||||
self._rr_root = self._resolve_rr_path(context, instance.data.get("rrPathName")) # noqa
|
||||
self.log.debug(self._rr_root)
|
||||
|
|
|
|||
|
|
@ -26,12 +26,10 @@ class CreatePublishRoyalRenderJob(InstancePlugin):
|
|||
self.context = context
|
||||
self.anatomy = instance.context.data["anatomy"]
|
||||
|
||||
asset = data.get("asset")
|
||||
subset = data.get("subset")
|
||||
source = self._remap_source(
|
||||
data.get("source") or context.data["source"])
|
||||
|
||||
|
||||
# asset = data.get("asset")
|
||||
# subset = data.get("subset")
|
||||
# source = self._remap_source(
|
||||
# data.get("source") or context.data["source"])
|
||||
|
||||
def _remap_source(self, source):
|
||||
success, rootless_path = (
|
||||
|
|
@ -175,4 +173,4 @@ class CreatePublishRoyalRenderJob(InstancePlugin):
|
|||
url = "{}/api/jobs".format(self.deadline_url)
|
||||
response = requests.post(url, json=payload, timeout=10)
|
||||
if not response.ok:
|
||||
raise Exception(response.text)
|
||||
raise Exception(response.text)
|
||||
|
|
|
|||
|
|
@ -38,7 +38,9 @@ class SubmitJobsToRoyalRender(ContextPlugin):
|
|||
if isinstance(instance.data.get("rrJob"), RRJob):
|
||||
jobs.append(instance.data.get("rrJob"))
|
||||
if instance.data.get("rrJobs"):
|
||||
if all(isinstance(job, RRJob) for job in instance.data.get("rrJobs")):
|
||||
if all(
|
||||
isinstance(job, RRJob)
|
||||
for job in instance.data.get("rrJobs")):
|
||||
jobs += instance.data.get("rrJobs")
|
||||
|
||||
if jobs:
|
||||
|
|
|
|||
|
|
@ -4,7 +4,9 @@ import attr
|
|||
|
||||
@attr.s
|
||||
class InstanceSkeleton(object):
|
||||
family = attr.ib(factory=)
|
||||
# family = attr.ib(factory=)
|
||||
pass
|
||||
|
||||
|
||||
def remap_source(source, anatomy):
|
||||
success, rootless_path = (
|
||||
|
|
@ -21,7 +23,9 @@ def remap_source(source, anatomy):
|
|||
).format(source))
|
||||
return source
|
||||
|
||||
def get_skeleton_instance()
|
||||
|
||||
def get_skeleton_instance():
|
||||
"""
|
||||
instance_skeleton_data = {
|
||||
"family": family,
|
||||
"subset": subset,
|
||||
|
|
@ -46,4 +50,6 @@ def get_skeleton_instance()
|
|||
"useSequenceForReview": data.get("useSequenceForReview", True),
|
||||
# map inputVersions `ObjectId` -> `str` so json supports it
|
||||
"inputVersions": list(map(str, data.get("inputVersions", [])))
|
||||
}
|
||||
}
|
||||
"""
|
||||
pass
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue