diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 244eb1a363..4d7d06a2c8 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -35,6 +35,8 @@ body:
label: Version
description: What version are you running? Look to OpenPype Tray
options:
+ - 3.15.8
+ - 3.15.8-nightly.3
- 3.15.8-nightly.2
- 3.15.8-nightly.1
- 3.15.7
@@ -133,8 +135,6 @@ body:
- 3.14.2-nightly.4
- 3.14.2-nightly.3
- 3.14.2-nightly.2
- - 3.14.2-nightly.1
- - 3.14.1
validations:
required: true
- type: dropdown
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bba6b64bfe..a33904735b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,304 @@
# Changelog
+## [3.15.8](https://github.com/ynput/OpenPype/tree/3.15.8)
+
+
+[Full Changelog](https://github.com/ynput/OpenPype/compare/3.15.7...3.15.8)
+
+### **π New features**
+
+
+
+Publisher: Show instances in report page #4915
+
+Show publish instances in report page. Also added basic log view with logs grouped by instance. Validation error detail now have 2 colums, one with erro details second with logs. Crashed state shows fast access to report action buttons. Success will show only logs. Publish frame is shrunked automatically on publish stop.
+
+
+___
+
+
+
+
+
+Fusion - Loader plugins updates #4920
+
+Update to some Fusion loader plugins:The sequence loader can now load footage from the image and online family.The FBX loader can now import all formats Fusions FBX node can read.You can now import the content of another workfile into your current comp with the workfile loader.
+
+
+___
+
+
+
+
+
+Fusion: deadline farm rendering #4955
+
+Enabling Fusion for deadline farm rendering.
+
+
+___
+
+
+
+
+
+AfterEffects: set frame range and resolution #4983
+
+Frame information (frame start, duration, fps) and resolution (width and height) is applied to selected composition from Asset Management System (Ftrack or DB) automatically when published instance is created.It is also possible explicitly propagate both values from DB to selected composition by newly added menu buttons.
+
+
+___
+
+
+
+
+
+Publish: Enhance automated publish plugin settings #4986
+
+Added plugins option to define settings category where to look for settings of a plugin and added public helper functions to apply settings `get_plugin_settings` and `apply_plugin_settings_automatically`.
+
+
+___
+
+
+
+### **π Enhancements**
+
+
+
+Load Rig References - Change Rig to Animation in Animation instance #4877
+
+We are using the template builder to build an animation scene. All the rig placeholders are imported correctly, but the automatically created animation instances retain the rig family in their names and subsets. In our example, we need animationMain instead of rigMain, because this name will be used in the following steps like lighting.Here is the result we need. I checked, and it's not a template builder problem, because even if I load a rig as a reference, the result is the same. For me, since we are in the animation instance, it makes more sense to have animation instead of rig in the name. The naming is just fine if we use create from the Openpype menu.
+
+
+___
+
+
+
+
+
+Enhancement: Resolve prelaunch code refactoring and update defaults #4916
+
+The main reason of this PR is wrong default settings in `openpype/settings/defaults/system_settings/applications.json` for Resolve host. The `bin` folder should not be a part of the macos and Linux `RESOLVE_PYTHON3_PATH` variable.The rest of this PR is some code cleanups for Resolve prelaunch hook to simplify further development.Also added a .gitignore for vscode workspace files.
+
+
+___
+
+
+
+
+
+Unreal: π move Unreal plugin to separate repository #4980
+
+To support Epic Marketplace have to move AYON Unreal integration plugins to separate repository. This is replacing current files with git submodule, so the change should be functionally without impact.New repository lives here: https://github.com/ynput/ayon-unreal-plugin
+
+
+___
+
+
+
+
+
+General: Lib code cleanup #5003
+
+Small cleanup in lib files in openpype.
+
+
+___
+
+
+
+
+
+Allow to open with djv by extension instead of representation name #5004
+
+Filter open in djv action by extension instead of representation.
+
+
+___
+
+
+
+
+
+DJV open action `extensions` as `set` #5005
+
+Change `extensions` attribute to `set`.
+
+
+___
+
+
+
+
+
+Nuke: extract thumbnail with multiple reposition nodes #5011
+
+Added support for multiple reposition nodes.
+
+
+___
+
+
+
+
+
+Enhancement: Improve logging levels and messages for artist facing publish reports #5018
+
+Tweak the logging levels and messages to try and only show those logs that an artist should see and could understand. Move anything that's slightly more involved into a "debug" message instead.
+
+
+___
+
+
+
+### **π Bug fixes**
+
+
+
+Bugfix/frame variable fix #4978
+
+Renamed variables to match OpenPype terminology to reduce confusion and add consistency.
+___
+
+
+
+
+
+Global: plugins cleanup plugin will leave beauty rendered files #4790
+
+Attempt to mark more files to be cleaned up explicitly in intermediate `renders` folder in work area for farm jobs.
+
+
+___
+
+
+
+
+
+Fix: Download last workfile doesn't work if not already downloaded #4942
+
+Some optimization condition is messing with the feature: if the published workfile is not already downloaded, it won't download it...
+
+
+___
+
+
+
+
+
+Unreal: Fix transform when loading layout to match existing assets #4972
+
+Fixed transform when loading layout to match existing assets.
+
+
+___
+
+
+
+
+
+fix the bug of fbx loaders in Max #4977
+
+bug fix of fbx loaders for not being able to parent to the CON instances while importing cameras(and models) which is published from other DCCs such as Maya.
+
+
+___
+
+
+
+
+
+AfterEffects: allow returning stub with not saved workfile #4984
+
+Allows to use Workfile app to Save first empty workfile.
+
+
+___
+
+
+
+
+
+Blender: Fix Alembic loading #4985
+
+Fixed problem occurring when trying to load an Alembic model in Blender.
+
+
+___
+
+
+
+
+
+Unreal: Addon Py2 compatibility #4994
+
+Fixed Python 2 compatibility of unreal addon.
+
+
+___
+
+
+
+
+
+Nuke: fixed missing files key in representation #4999
+
+Issue with missing keys once rendering target set to existing frames is fixed. Instance has to be evaluated in validation for missing files.
+
+
+___
+
+
+
+
+
+Unreal: Fix the frame range when loading camera #5002
+
+The keyframes of the camera, when loaded, were not using the correct frame range.
+
+
+___
+
+
+
+
+
+Fusion: fixing frame range targeting #5013
+
+Frame range targeting at Rendering instances is now following configured options.
+
+
+___
+
+
+
+
+
+Deadline: fix selection from multiple webservices #5015
+
+Multiple different DL webservice could be configured. First they must by configured in System Settings., then they could be configured per project in `project_settings/deadline/deadline_servers`.Only single webservice could be a target of publish though.
+
+
+___
+
+
+
+### **Merged pull requests**
+
+
+
+3dsmax: Refactored publish plugins to use proper implementation of pymxs #4988
+
+
+___
+
+
+
+
+
+
## [3.15.7](https://github.com/ynput/OpenPype/tree/3.15.7)
diff --git a/openpype/hosts/fusion/api/lib.py b/openpype/hosts/fusion/api/lib.py
index c33209823e..cba8c38c2f 100644
--- a/openpype/hosts/fusion/api/lib.py
+++ b/openpype/hosts/fusion/api/lib.py
@@ -256,8 +256,11 @@ def switch_item(container,
@contextlib.contextmanager
-def maintained_selection():
- comp = get_current_comp()
+def maintained_selection(comp=None):
+ """Reset comp selection from before the context after the context"""
+ if comp is None:
+ comp = get_current_comp()
+
previous_selection = comp.GetToolList(True).values()
try:
yield
@@ -269,6 +272,33 @@ def maintained_selection():
flow.Select(tool, True)
+@contextlib.contextmanager
+def maintained_comp_range(comp=None,
+ global_start=True,
+ global_end=True,
+ render_start=True,
+ render_end=True):
+ """Reset comp frame ranges from before the context after the context"""
+ if comp is None:
+ comp = get_current_comp()
+
+ comp_attrs = comp.GetAttrs()
+ preserve_attrs = {}
+ if global_start:
+ preserve_attrs["COMPN_GlobalStart"] = comp_attrs["COMPN_GlobalStart"]
+ if global_end:
+ preserve_attrs["COMPN_GlobalEnd"] = comp_attrs["COMPN_GlobalEnd"]
+ if render_start:
+ preserve_attrs["COMPN_RenderStart"] = comp_attrs["COMPN_RenderStart"]
+ if render_end:
+ preserve_attrs["COMPN_RenderEnd"] = comp_attrs["COMPN_RenderEnd"]
+
+ try:
+ yield
+ finally:
+ comp.SetAttrs(preserve_attrs)
+
+
def get_frame_path(path):
"""Get filename for the Fusion Saver with padded number as '#'
diff --git a/openpype/hosts/fusion/plugins/create/create_saver.py b/openpype/hosts/fusion/plugins/create/create_saver.py
index 13836aa1a0..04898d0a45 100644
--- a/openpype/hosts/fusion/plugins/create/create_saver.py
+++ b/openpype/hosts/fusion/plugins/create/create_saver.py
@@ -40,6 +40,11 @@ class CreateSaver(NewCreator):
"{workdir}/renders/fusion/{subset}/{subset}.{frame}.{ext}")
def create(self, subset_name, instance_data, pre_create_data):
+ self.pass_pre_attributes_to_instance(
+ instance_data,
+ pre_create_data
+ )
+
instance_data.update({
"id": "pyblish.avalon.instance",
"subset": subset_name
@@ -194,20 +199,25 @@ class CreateSaver(NewCreator):
attr_defs = [
self._get_render_target_enum(),
self._get_reviewable_bool(),
+ self._get_frame_range_enum()
]
return attr_defs
def get_instance_attr_defs(self):
"""Settings for publish page"""
- attr_defs = [
- self._get_render_target_enum(),
- self._get_reviewable_bool(),
- ]
- return attr_defs
+ return self.get_pre_create_attr_defs()
+
+ def pass_pre_attributes_to_instance(
+ self,
+ instance_data,
+ pre_create_data
+ ):
+ creator_attrs = instance_data["creator_attributes"] = {}
+ for pass_key in pre_create_data.keys():
+ creator_attrs[pass_key] = pre_create_data[pass_key]
# These functions below should be moved to another file
# so it can be used by other plugins. plugin.py ?
-
def _get_render_target_enum(self):
rendering_targets = {
"local": "Local machine rendering",
@@ -220,6 +230,19 @@ class CreateSaver(NewCreator):
"render_target", items=rendering_targets, label="Render target"
)
+ def _get_frame_range_enum(self):
+ frame_range_options = {
+ "asset_db": "Current asset context",
+ "render_range": "From render in/out",
+ "comp_range": "From composition timeline"
+ }
+
+ return EnumDef(
+ "frame_range_source",
+ items=frame_range_options,
+ label="Frame range source"
+ )
+
def _get_reviewable_bool(self):
return BoolDef(
"review",
diff --git a/openpype/hosts/fusion/plugins/publish/collect_comp_frame_range.py b/openpype/hosts/fusion/plugins/publish/collect_comp_frame_range.py
index fbd7606cd7..24a9a92337 100644
--- a/openpype/hosts/fusion/plugins/publish/collect_comp_frame_range.py
+++ b/openpype/hosts/fusion/plugins/publish/collect_comp_frame_range.py
@@ -35,9 +35,10 @@ class CollectFusionCompFrameRanges(pyblish.api.ContextPlugin):
# Store comp render ranges
start, end, global_start, global_end = get_comp_render_range(comp)
- context.data["frameStart"] = int(start)
- context.data["frameEnd"] = int(end)
- context.data["frameStartHandle"] = int(global_start)
- context.data["frameEndHandle"] = int(global_end)
- context.data["handleStart"] = int(start) - int(global_start)
- context.data["handleEnd"] = int(global_end) - int(end)
+
+ context.data.update({
+ "renderFrameStart": int(start),
+ "renderFrameEnd": int(end),
+ "compFrameStart": int(global_start),
+ "compFrameEnd": int(global_end)
+ })
diff --git a/openpype/hosts/fusion/plugins/publish/collect_expected_frames.py b/openpype/hosts/fusion/plugins/publish/collect_expected_frames.py
deleted file mode 100644
index 0ba777629f..0000000000
--- a/openpype/hosts/fusion/plugins/publish/collect_expected_frames.py
+++ /dev/null
@@ -1,50 +0,0 @@
-import pyblish.api
-from openpype.pipeline import publish
-import os
-
-
-class CollectFusionExpectedFrames(
- pyblish.api.InstancePlugin, publish.ColormanagedPyblishPluginMixin
-):
- """Collect all frames needed to publish expected frames"""
-
- order = pyblish.api.CollectorOrder + 0.5
- label = "Collect Expected Frames"
- hosts = ["fusion"]
- families = ["render"]
-
- def process(self, instance):
- context = instance.context
-
- frame_start = context.data["frameStartHandle"]
- frame_end = context.data["frameEndHandle"]
- path = instance.data["path"]
- output_dir = instance.data["outputDir"]
-
- basename = os.path.basename(path)
- head, ext = os.path.splitext(basename)
- files = [
- f"{head}{str(frame).zfill(4)}{ext}"
- for frame in range(frame_start, frame_end + 1)
- ]
- repre = {
- "name": ext[1:],
- "ext": ext[1:],
- "frameStart": f"%0{len(str(frame_end))}d" % frame_start,
- "files": files,
- "stagingDir": output_dir,
- }
-
- self.set_representation_colorspace(
- representation=repre,
- context=context,
- )
-
- # review representation
- if instance.data.get("review", False):
- repre["tags"] = ["review"]
-
- # add the repre to the instance
- if "representations" not in instance.data:
- instance.data["representations"] = []
- instance.data["representations"].append(repre)
diff --git a/openpype/hosts/fusion/plugins/publish/collect_fusion_version.py b/openpype/hosts/fusion/plugins/publish/collect_fusion_version.py
deleted file mode 100644
index 65d8386f33..0000000000
--- a/openpype/hosts/fusion/plugins/publish/collect_fusion_version.py
+++ /dev/null
@@ -1,22 +0,0 @@
-import pyblish.api
-
-
-class CollectFusionVersion(pyblish.api.ContextPlugin):
- """Collect current comp"""
-
- order = pyblish.api.CollectorOrder
- label = "Collect Fusion Version"
- hosts = ["fusion"]
-
- def process(self, context):
- """Collect all image sequence tools"""
-
- comp = context.data.get("currentComp")
- if not comp:
- raise RuntimeError("No comp previously collected, unable to "
- "retrieve Fusion version.")
-
- version = comp.GetApp().Version
- context.data["fusionVersion"] = version
-
- self.log.info("Fusion version: %s" % version)
diff --git a/openpype/hosts/fusion/plugins/publish/collect_inputs.py b/openpype/hosts/fusion/plugins/publish/collect_inputs.py
index 1bb3cd1220..a6628300db 100644
--- a/openpype/hosts/fusion/plugins/publish/collect_inputs.py
+++ b/openpype/hosts/fusion/plugins/publish/collect_inputs.py
@@ -113,4 +113,4 @@ class CollectUpstreamInputs(pyblish.api.InstancePlugin):
inputs = [c["representation"] for c in containers]
instance.data["inputRepresentations"] = inputs
- self.log.info("Collected inputs: %s" % inputs)
+ self.log.debug("Collected inputs: %s" % inputs)
diff --git a/openpype/hosts/fusion/plugins/publish/collect_instances.py b/openpype/hosts/fusion/plugins/publish/collect_instances.py
index af227f03db..6016baa2a9 100644
--- a/openpype/hosts/fusion/plugins/publish/collect_instances.py
+++ b/openpype/hosts/fusion/plugins/publish/collect_instances.py
@@ -1,5 +1,3 @@
-import os
-
import pyblish.api
@@ -24,23 +22,63 @@ class CollectInstanceData(pyblish.api.InstancePlugin):
creator_attributes = instance.data["creator_attributes"]
instance.data.update(creator_attributes)
- # Include start and end render frame in label
- subset = instance.data["subset"]
+ frame_range_source = creator_attributes.get("frame_range_source")
+ instance.data["frame_range_source"] = frame_range_source
+
+ # get asset frame ranges to all instances
+ # render family instances `asset_db` render target
start = context.data["frameStart"]
end = context.data["frameEnd"]
- label = "{subset} ({start}-{end})".format(subset=subset,
- start=int(start),
- end=int(end))
+ handle_start = context.data["handleStart"]
+ handle_end = context.data["handleEnd"]
+ start_with_handle = start - handle_start
+ end_with_handle = end + handle_end
+
+ # conditions for render family instances
+ if frame_range_source == "render_range":
+ # set comp render frame ranges
+ start = context.data["renderFrameStart"]
+ end = context.data["renderFrameEnd"]
+ handle_start = 0
+ handle_end = 0
+ start_with_handle = start
+ end_with_handle = end
+
+ if frame_range_source == "comp_range":
+ comp_start = context.data["compFrameStart"]
+ comp_end = context.data["compFrameEnd"]
+ render_start = context.data["renderFrameStart"]
+ render_end = context.data["renderFrameEnd"]
+ # set comp frame ranges
+ start = render_start
+ end = render_end
+ handle_start = render_start - comp_start
+ handle_end = comp_end - render_end
+ start_with_handle = comp_start
+ end_with_handle = comp_end
+
+ # Include start and end render frame in label
+ subset = instance.data["subset"]
+ label = (
+ "{subset} ({start}-{end}) [{handle_start}-{handle_end}]"
+ ).format(
+ subset=subset,
+ start=int(start),
+ end=int(end),
+ handle_start=int(handle_start),
+ handle_end=int(handle_end)
+ )
+
instance.data.update({
"label": label,
# todo: Allow custom frame range per instance
- "frameStart": context.data["frameStart"],
- "frameEnd": context.data["frameEnd"],
- "frameStartHandle": context.data["frameStartHandle"],
- "frameEndHandle": context.data["frameStartHandle"],
- "handleStart": context.data["handleStart"],
- "handleEnd": context.data["handleEnd"],
+ "frameStart": start,
+ "frameEnd": end,
+ "frameStartHandle": start_with_handle,
+ "frameEndHandle": end_with_handle,
+ "handleStart": handle_start,
+ "handleEnd": handle_end,
"fps": context.data["fps"],
})
@@ -49,31 +87,3 @@ class CollectInstanceData(pyblish.api.InstancePlugin):
if instance.data.get("review", False):
self.log.info("Adding review family..")
instance.data["families"].append("review")
-
- if instance.data["family"] == "render":
- # TODO: This should probably move into a collector of
- # its own for the "render" family
- from openpype.hosts.fusion.api.lib import get_frame_path
- comp = context.data["currentComp"]
-
- # This is only the case for savers currently but not
- # for workfile instances. So we assume saver here.
- tool = instance.data["transientData"]["tool"]
- path = tool["Clip"][comp.TIME_UNDEFINED]
-
- filename = os.path.basename(path)
- head, padding, tail = get_frame_path(filename)
- ext = os.path.splitext(path)[1]
- assert tail == ext, ("Tail does not match %s" % ext)
-
- instance.data.update({
- "path": path,
- "outputDir": os.path.dirname(path),
- "ext": ext, # todo: should be redundant?
-
- # Backwards compatibility: embed tool in instance.data
- "tool": tool
- })
-
- # Add tool itself as member
- instance.append(tool)
diff --git a/openpype/hosts/fusion/plugins/publish/collect_render.py b/openpype/hosts/fusion/plugins/publish/collect_render.py
new file mode 100644
index 0000000000..a20a142701
--- /dev/null
+++ b/openpype/hosts/fusion/plugins/publish/collect_render.py
@@ -0,0 +1,209 @@
+import os
+import attr
+import pyblish.api
+
+from openpype.pipeline import publish
+from openpype.pipeline.publish import RenderInstance
+from openpype.hosts.fusion.api.lib import get_frame_path
+
+
+@attr.s
+class FusionRenderInstance(RenderInstance):
+ # extend generic, composition name is needed
+ fps = attr.ib(default=None)
+ projectEntity = attr.ib(default=None)
+ stagingDir = attr.ib(default=None)
+ app_version = attr.ib(default=None)
+ tool = attr.ib(default=None)
+ workfileComp = attr.ib(default=None)
+ publish_attributes = attr.ib(default={})
+ frameStartHandle = attr.ib(default=None)
+ frameEndHandle = attr.ib(default=None)
+
+
+class CollectFusionRender(
+ publish.AbstractCollectRender,
+ publish.ColormanagedPyblishPluginMixin
+):
+
+ order = pyblish.api.CollectorOrder + 0.09
+ label = "Collect Fusion Render"
+ hosts = ["fusion"]
+
+ def get_instances(self, context):
+
+ comp = context.data.get("currentComp")
+ comp_frame_format_prefs = comp.GetPrefs("Comp.FrameFormat")
+ aspect_x = comp_frame_format_prefs["AspectX"]
+ aspect_y = comp_frame_format_prefs["AspectY"]
+
+ instances = []
+ instances_to_remove = []
+
+ current_file = context.data["currentFile"]
+ version = context.data["version"]
+
+ project_entity = context.data["projectEntity"]
+
+ for inst in context:
+ if not inst.data.get("active", True):
+ continue
+
+ family = inst.data["family"]
+ if family != "render":
+ continue
+
+ task_name = context.data["task"]
+ tool = inst.data["transientData"]["tool"]
+
+ instance_families = inst.data.get("families", [])
+ subset_name = inst.data["subset"]
+ instance = FusionRenderInstance(
+ family="render",
+ tool=tool,
+ workfileComp=comp,
+ families=instance_families,
+ version=version,
+ time="",
+ source=current_file,
+ label=inst.data["label"],
+ subset=subset_name,
+ asset=inst.data["asset"],
+ task=task_name,
+ attachTo=False,
+ setMembers='',
+ publish=True,
+ name=subset_name,
+ resolutionWidth=comp_frame_format_prefs.get("Width"),
+ resolutionHeight=comp_frame_format_prefs.get("Height"),
+ pixelAspect=aspect_x / aspect_y,
+ tileRendering=False,
+ tilesX=0,
+ tilesY=0,
+ review="review" in instance_families,
+ frameStart=inst.data["frameStart"],
+ frameEnd=inst.data["frameEnd"],
+ handleStart=inst.data["handleStart"],
+ handleEnd=inst.data["handleEnd"],
+ frameStartHandle=inst.data["frameStartHandle"],
+ frameEndHandle=inst.data["frameEndHandle"],
+ frameStep=1,
+ fps=comp_frame_format_prefs.get("Rate"),
+ app_version=comp.GetApp().Version,
+ publish_attributes=inst.data.get("publish_attributes", {})
+ )
+
+ render_target = inst.data["creator_attributes"]["render_target"]
+
+ # Add render target family
+ render_target_family = f"render.{render_target}"
+ if render_target_family not in instance.families:
+ instance.families.append(render_target_family)
+
+ # Add render target specific data
+ if render_target in {"local", "frames"}:
+ instance.projectEntity = project_entity
+
+ if render_target == "farm":
+ fam = "render.farm"
+ if fam not in instance.families:
+ instance.families.append(fam)
+ instance.toBeRenderedOn = "deadline"
+ instance.farm = True # to skip integrate
+ if "review" in instance.families:
+ # to skip ExtractReview locally
+ instance.families.remove("review")
+
+ # add new instance to the list and remove the original
+ # instance since it is not needed anymore
+ instances.append(instance)
+ instances_to_remove.append(inst)
+
+ for instance in instances_to_remove:
+ context.remove(instance)
+
+ return instances
+
+ def post_collecting_action(self):
+ for instance in self._context:
+ if "render.frames" in instance.data.get("families", []):
+ # adding representation data to the instance
+ self._update_for_frames(instance)
+
+ def get_expected_files(self, render_instance):
+ """
+ Returns list of rendered files that should be created by
+ Deadline. These are not published directly, they are source
+ for later 'submit_publish_job'.
+
+ Args:
+ render_instance (RenderInstance): to pull anatomy and parts used
+ in url
+
+ Returns:
+ (list) of absolute urls to rendered file
+ """
+ start = render_instance.frameStart - render_instance.handleStart
+ end = render_instance.frameEnd + render_instance.handleEnd
+
+ path = (
+ render_instance.tool["Clip"]
+ [render_instance.workfileComp.TIME_UNDEFINED]
+ )
+ output_dir = os.path.dirname(path)
+ render_instance.outputDir = output_dir
+
+ basename = os.path.basename(path)
+
+ head, padding, ext = get_frame_path(basename)
+
+ expected_files = []
+ for frame in range(start, end + 1):
+ expected_files.append(
+ os.path.join(
+ output_dir,
+ f"{head}{str(frame).zfill(padding)}{ext}"
+ )
+ )
+
+ return expected_files
+
+ def _update_for_frames(self, instance):
+ """Updating instance for render.frames family
+
+ Adding representation data to the instance. Also setting
+ colorspaceData to the representation based on file rules.
+ """
+
+ expected_files = instance.data["expectedFiles"]
+
+ start = instance.data["frameStart"] - instance.data["handleStart"]
+
+ path = expected_files[0]
+ basename = os.path.basename(path)
+ staging_dir = os.path.dirname(path)
+ _, padding, ext = get_frame_path(basename)
+
+ repre = {
+ "name": ext[1:],
+ "ext": ext[1:],
+ "frameStart": f"%0{padding}d" % start,
+ "files": [os.path.basename(f) for f in expected_files],
+ "stagingDir": staging_dir,
+ }
+
+ self.set_representation_colorspace(
+ representation=repre,
+ context=instance.context,
+ )
+
+ # review representation
+ if instance.data.get("review", False):
+ repre["tags"] = ["review"]
+
+ # add the repre to the instance
+ if "representations" not in instance.data:
+ instance.data["representations"] = []
+ instance.data["representations"].append(repre)
+
+ return instance
diff --git a/openpype/hosts/fusion/plugins/publish/collect_renders.py b/openpype/hosts/fusion/plugins/publish/collect_renders.py
deleted file mode 100644
index 7f38e68447..0000000000
--- a/openpype/hosts/fusion/plugins/publish/collect_renders.py
+++ /dev/null
@@ -1,25 +0,0 @@
-import pyblish.api
-
-
-class CollectFusionRenders(pyblish.api.InstancePlugin):
- """Collect current saver node's render Mode
-
- Options:
- local (Render locally)
- frames (Use existing frames)
-
- """
-
- order = pyblish.api.CollectorOrder + 0.4
- label = "Collect Renders"
- hosts = ["fusion"]
- families = ["render"]
-
- def process(self, instance):
- render_target = instance.data["render_target"]
- family = instance.data["family"]
-
- # add targeted family to families
- instance.data["families"].append(
- "{}.{}".format(family, render_target)
- )
diff --git a/openpype/hosts/fusion/plugins/publish/extract_render_local.py b/openpype/hosts/fusion/plugins/publish/extract_render_local.py
index 5a0140c525..25c101cf00 100644
--- a/openpype/hosts/fusion/plugins/publish/extract_render_local.py
+++ b/openpype/hosts/fusion/plugins/publish/extract_render_local.py
@@ -1,8 +1,12 @@
+import os
import logging
import contextlib
+import collections
import pyblish.api
-from openpype.hosts.fusion.api import comp_lock_and_undo_chunk
+from openpype.pipeline import publish
+from openpype.hosts.fusion.api import comp_lock_and_undo_chunk
+from openpype.hosts.fusion.api.lib import get_frame_path, maintained_comp_range
log = logging.getLogger(__name__)
@@ -38,7 +42,10 @@ def enabled_savers(comp, savers):
saver.SetAttrs({"TOOLB_PassThrough": original_state})
-class FusionRenderLocal(pyblish.api.InstancePlugin):
+class FusionRenderLocal(
+ pyblish.api.InstancePlugin,
+ publish.ColormanagedPyblishPluginMixin
+):
"""Render the current Fusion composition locally."""
order = pyblish.api.ExtractorOrder - 0.2
@@ -46,11 +53,16 @@ class FusionRenderLocal(pyblish.api.InstancePlugin):
hosts = ["fusion"]
families = ["render.local"]
+ is_rendered_key = "_fusionrenderlocal_has_rendered"
+
def process(self, instance):
- context = instance.context
# Start render
- self.render_once(context)
+ result = self.render(instance)
+ if result is False:
+ raise RuntimeError(f"Comp render failed for {instance}")
+
+ self._add_representation(instance)
# Log render status
self.log.info(
@@ -61,39 +73,48 @@ class FusionRenderLocal(pyblish.api.InstancePlugin):
)
)
- def render_once(self, context):
- """Render context comp only once, even with more render instances"""
+ def render(self, instance):
+ """Render instance.
- # This plug-in assumes all render nodes get rendered at the same time
- # to speed up the rendering. The check below makes sure that we only
- # execute the rendering once and not for each instance.
- key = f"__hasRun{self.__class__.__name__}"
+ We try to render the minimal amount of times by combining the instances
+ that have a matching frame range in one Fusion render. Then for the
+ batch of instances we store whether the render succeeded or failed.
- savers_to_render = [
- # Get the saver tool from the instance
- instance[0] for instance in context if
- # Only active instances
- instance.data.get("publish", True) and
- # Only render.local instances
- "render.local" in instance.data["families"]
- ]
+ """
- if key not in context.data:
- # We initialize as false to indicate it wasn't successful yet
- # so we can keep track of whether Fusion succeeded
- context.data[key] = False
+ if self.is_rendered_key in instance.data:
+ # This instance was already processed in batch with another
+ # instance, so we just return the render result directly
+ self.log.debug(f"Instance {instance} was already rendered")
+ return instance.data[self.is_rendered_key]
- current_comp = context.data["currentComp"]
- frame_start = context.data["frameStartHandle"]
- frame_end = context.data["frameEndHandle"]
+ instances_by_frame_range = self.get_render_instances_by_frame_range(
+ instance.context
+ )
- self.log.info("Starting Fusion render")
- self.log.info(f"Start frame: {frame_start}")
- self.log.info(f"End frame: {frame_end}")
- saver_names = ", ".join(saver.Name for saver in savers_to_render)
- self.log.info(f"Rendering tools: {saver_names}")
+ # Render matching batch of instances that share the same frame range
+ frame_range = self.get_instance_render_frame_range(instance)
+ render_instances = instances_by_frame_range[frame_range]
- with comp_lock_and_undo_chunk(current_comp):
+ # We initialize render state false to indicate it wasn't successful
+ # yet to keep track of whether Fusion succeeded. This is for cases
+ # where an error below this might cause the comp render result not
+ # to be stored for the instances of this batch
+ for render_instance in render_instances:
+ render_instance.data[self.is_rendered_key] = False
+
+ savers_to_render = [inst.data["tool"] for inst in render_instances]
+ current_comp = instance.context.data["currentComp"]
+ frame_start, frame_end = frame_range
+
+ self.log.info(
+ f"Starting Fusion render frame range {frame_start}-{frame_end}"
+ )
+ saver_names = ", ".join(saver.Name for saver in savers_to_render)
+ self.log.info(f"Rendering tools: {saver_names}")
+
+ with comp_lock_and_undo_chunk(current_comp):
+ with maintained_comp_range(current_comp):
with enabled_savers(current_comp, savers_to_render):
result = current_comp.Render(
{
@@ -103,7 +124,76 @@ class FusionRenderLocal(pyblish.api.InstancePlugin):
}
)
- context.data[key] = bool(result)
+ # Store the render state for all the rendered instances
+ for render_instance in render_instances:
+ render_instance.data[self.is_rendered_key] = bool(result)
- if context.data[key] is False:
- raise RuntimeError("Comp render failed")
+ return result
+
+ def _add_representation(self, instance):
+ """Add representation to instance"""
+
+ expected_files = instance.data["expectedFiles"]
+
+ start = instance.data["frameStart"] - instance.data["handleStart"]
+
+ path = expected_files[0]
+ _, padding, ext = get_frame_path(path)
+
+ staging_dir = os.path.dirname(path)
+
+ repre = {
+ "name": ext[1:],
+ "ext": ext[1:],
+ "frameStart": f"%0{padding}d" % start,
+ "files": [os.path.basename(f) for f in expected_files],
+ "stagingDir": staging_dir,
+ }
+
+ self.set_representation_colorspace(
+ representation=repre,
+ context=instance.context,
+ )
+
+ # review representation
+ if instance.data.get("review", False):
+ repre["tags"] = ["review"]
+
+ # add the repre to the instance
+ if "representations" not in instance.data:
+ instance.data["representations"] = []
+ instance.data["representations"].append(repre)
+
+ return instance
+
+ def get_render_instances_by_frame_range(self, context):
+ """Return enabled render.local instances grouped by their frame range.
+
+ Arguments:
+ context (pyblish.Context): The pyblish context
+
+ Returns:
+ dict: (start, end): instances mapping
+
+ """
+
+ instances_to_render = [
+ instance for instance in context if
+ # Only active instances
+ instance.data.get("publish", True) and
+ # Only render.local instances
+ "render.local" in instance.data.get("families", [])
+ ]
+
+ # Instances by frame ranges
+ instances_by_frame_range = collections.defaultdict(list)
+ for instance in instances_to_render:
+ start, end = self.get_instance_render_frame_range(instance)
+ instances_by_frame_range[(start, end)].append(instance)
+
+ return dict(instances_by_frame_range)
+
+ def get_instance_render_frame_range(self, instance):
+ start = instance.data["frameStartHandle"]
+ end = instance.data["frameEndHandle"]
+ return start, end
diff --git a/openpype/hosts/fusion/plugins/publish/save_scene.py b/openpype/hosts/fusion/plugins/publish/save_scene.py
index a249c453d8..0798e7c8b7 100644
--- a/openpype/hosts/fusion/plugins/publish/save_scene.py
+++ b/openpype/hosts/fusion/plugins/publish/save_scene.py
@@ -17,5 +17,5 @@ class FusionSaveComp(pyblish.api.ContextPlugin):
current = comp.GetAttrs().get("COMPS_FileName", "")
assert context.data['currentFile'] == current
- self.log.info("Saving current file..")
+ self.log.info("Saving current file: {}".format(current))
comp.Save()
diff --git a/openpype/hosts/fusion/plugins/publish/validate_create_folder_checked.py b/openpype/hosts/fusion/plugins/publish/validate_create_folder_checked.py
index 8a91f23578..35c92163eb 100644
--- a/openpype/hosts/fusion/plugins/publish/validate_create_folder_checked.py
+++ b/openpype/hosts/fusion/plugins/publish/validate_create_folder_checked.py
@@ -21,7 +21,7 @@ class ValidateCreateFolderChecked(pyblish.api.InstancePlugin):
@classmethod
def get_invalid(cls, instance):
- tool = instance[0]
+ tool = instance.data["tool"]
create_dir = tool.GetInput("CreateDir")
if create_dir == 0.0:
cls.log.error(
diff --git a/openpype/hosts/fusion/plugins/publish/validate_expected_frames_existence.py b/openpype/hosts/fusion/plugins/publish/validate_expected_frames_existence.py
index c208b8ef15..3f84f59678 100644
--- a/openpype/hosts/fusion/plugins/publish/validate_expected_frames_existence.py
+++ b/openpype/hosts/fusion/plugins/publish/validate_expected_frames_existence.py
@@ -14,7 +14,7 @@ class ValidateLocalFramesExistence(pyblish.api.InstancePlugin):
order = pyblish.api.ValidatorOrder
label = "Validate Expected Frames Exists"
- families = ["render"]
+ families = ["render.frames"]
hosts = ["fusion"]
actions = [RepairAction, SelectInvalidAction]
@@ -23,31 +23,20 @@ class ValidateLocalFramesExistence(pyblish.api.InstancePlugin):
if non_existing_frames is None:
non_existing_frames = []
- if instance.data.get("render_target") == "frames":
- tool = instance[0]
+ tool = instance.data["tool"]
- frame_start = instance.data["frameStart"]
- frame_end = instance.data["frameEnd"]
- path = instance.data["path"]
- output_dir = instance.data["outputDir"]
+ expected_files = instance.data["expectedFiles"]
- basename = os.path.basename(path)
- head, ext = os.path.splitext(basename)
- files = [
- f"{head}{str(frame).zfill(4)}{ext}"
- for frame in range(frame_start, frame_end + 1)
- ]
+ for file in expected_files:
+ if not os.path.exists(file):
+ cls.log.error(
+ f"Missing file: {file}"
+ )
+ non_existing_frames.append(file)
- for file in files:
- if not os.path.exists(os.path.join(output_dir, file)):
- cls.log.error(
- f"Missing file: {os.path.join(output_dir, file)}"
- )
- non_existing_frames.append(file)
-
- if len(non_existing_frames) > 0:
- cls.log.error(f"Some of {tool.Name}'s files does not exist")
- return [tool]
+ if len(non_existing_frames) > 0:
+ cls.log.error(f"Some of {tool.Name}'s files does not exist")
+ return [tool]
def process(self, instance):
non_existing_frames = []
@@ -67,8 +56,7 @@ class ValidateLocalFramesExistence(pyblish.api.InstancePlugin):
def repair(cls, instance):
invalid = cls.get_invalid(instance)
if invalid:
- tool = invalid[0]
-
+ tool = instance.data["tool"]
# Change render target to local to render locally
tool.SetData("openpype.creator_attributes.render_target", "local")
diff --git a/openpype/hosts/fusion/plugins/publish/validate_filename_has_extension.py b/openpype/hosts/fusion/plugins/publish/validate_filename_has_extension.py
index bbba2dde6e..537e43c875 100644
--- a/openpype/hosts/fusion/plugins/publish/validate_filename_has_extension.py
+++ b/openpype/hosts/fusion/plugins/publish/validate_filename_has_extension.py
@@ -30,11 +30,11 @@ class ValidateFilenameHasExtension(pyblish.api.InstancePlugin):
@classmethod
def get_invalid(cls, instance):
- path = instance.data["path"]
+ path = instance.data["expectedFiles"][0]
fname, ext = os.path.splitext(path)
if not ext:
- tool = instance[0]
+ tool = instance.data["tool"]
cls.log.error("%s has no extension specified" % tool.Name)
return [tool]
diff --git a/openpype/hosts/fusion/plugins/publish/validate_instance_frame_range.py b/openpype/hosts/fusion/plugins/publish/validate_instance_frame_range.py
new file mode 100644
index 0000000000..06cd0ca186
--- /dev/null
+++ b/openpype/hosts/fusion/plugins/publish/validate_instance_frame_range.py
@@ -0,0 +1,41 @@
+import pyblish.api
+
+from openpype.pipeline import PublishValidationError
+
+
+class ValidateInstanceFrameRange(pyblish.api.InstancePlugin):
+ """Validate instance frame range is within comp's global render range."""
+
+ order = pyblish.api.ValidatorOrder
+ label = "Validate Filename Has Extension"
+ families = ["render"]
+ hosts = ["fusion"]
+
+ def process(self, instance):
+
+ context = instance.context
+ global_start = context.data["compFrameStart"]
+ global_end = context.data["compFrameEnd"]
+
+ render_start = instance.data["frameStartHandle"]
+ render_end = instance.data["frameEndHandle"]
+
+ if render_start < global_start or render_end > global_end:
+
+ message = (
+ f"Instance {instance} render frame range "
+ f"({render_start}-{render_end}) is outside of the comp's "
+ f"global render range ({global_start}-{global_end}) and thus "
+ f"can't be rendered. "
+ )
+ description = (
+ f"{message}\n\n"
+ f"Either update the comp's global range or the instance's "
+ f"frame range to ensure the comp's frame range includes the "
+ f"to render frame range for the instance."
+ )
+ raise PublishValidationError(
+ title="Frame range outside of comp range",
+ message=message,
+ description=description
+ )
diff --git a/openpype/hosts/fusion/plugins/publish/validate_saver_has_input.py b/openpype/hosts/fusion/plugins/publish/validate_saver_has_input.py
index e02125f531..faf2102a8b 100644
--- a/openpype/hosts/fusion/plugins/publish/validate_saver_has_input.py
+++ b/openpype/hosts/fusion/plugins/publish/validate_saver_has_input.py
@@ -20,7 +20,7 @@ class ValidateSaverHasInput(pyblish.api.InstancePlugin):
@classmethod
def get_invalid(cls, instance):
- saver = instance[0]
+ saver = instance.data["tool"]
if not saver.Input.GetConnectedOutput():
return [saver]
diff --git a/openpype/hosts/fusion/plugins/publish/validate_saver_passthrough.py b/openpype/hosts/fusion/plugins/publish/validate_saver_passthrough.py
index 56f2e7e6b8..9004976dc5 100644
--- a/openpype/hosts/fusion/plugins/publish/validate_saver_passthrough.py
+++ b/openpype/hosts/fusion/plugins/publish/validate_saver_passthrough.py
@@ -37,7 +37,7 @@ class ValidateSaverPassthrough(pyblish.api.ContextPlugin):
def is_invalid(self, instance):
- saver = instance[0]
+ saver = instance.data["tool"]
attr = saver.GetAttrs()
active = not attr["TOOLB_PassThrough"]
diff --git a/openpype/hosts/houdini/plugins/publish/collect_frames.py b/openpype/hosts/houdini/plugins/publish/collect_frames.py
index 6c695f64e9..059793e3c5 100644
--- a/openpype/hosts/houdini/plugins/publish/collect_frames.py
+++ b/openpype/hosts/houdini/plugins/publish/collect_frames.py
@@ -8,7 +8,6 @@ import pyblish.api
from openpype.hosts.houdini.api import lib
-
class CollectFrames(pyblish.api.InstancePlugin):
"""Collect all frames which would be saved from the ROP nodes"""
@@ -34,8 +33,10 @@ class CollectFrames(pyblish.api.InstancePlugin):
self.log.warning("Using current frame: {}".format(hou.frame()))
output = output_parm.eval()
- _, ext = lib.splitext(output,
- allowed_multidot_extensions=[".ass.gz"])
+ _, ext = lib.splitext(
+ output,
+ allowed_multidot_extensions=[".ass.gz"]
+ )
file_name = os.path.basename(output)
result = file_name
diff --git a/openpype/hosts/houdini/plugins/publish/collect_inputs.py b/openpype/hosts/houdini/plugins/publish/collect_inputs.py
index 6411376ea3..e92a42f2e8 100644
--- a/openpype/hosts/houdini/plugins/publish/collect_inputs.py
+++ b/openpype/hosts/houdini/plugins/publish/collect_inputs.py
@@ -117,4 +117,4 @@ class CollectUpstreamInputs(pyblish.api.InstancePlugin):
inputs = [c["representation"] for c in containers]
instance.data["inputRepresentations"] = inputs
- self.log.info("Collected inputs: %s" % inputs)
+ self.log.debug("Collected inputs: %s" % inputs)
diff --git a/openpype/hosts/houdini/plugins/publish/collect_instances.py b/openpype/hosts/houdini/plugins/publish/collect_instances.py
index bb85630552..5d5347f96e 100644
--- a/openpype/hosts/houdini/plugins/publish/collect_instances.py
+++ b/openpype/hosts/houdini/plugins/publish/collect_instances.py
@@ -55,7 +55,9 @@ class CollectInstances(pyblish.api.ContextPlugin):
has_family = node.evalParm("family")
assert has_family, "'%s' is missing 'family'" % node.name()
- self.log.info("processing {}".format(node))
+ self.log.info(
+ "Processing legacy instance node {}".format(node.path())
+ )
data = lib.read(node)
# Check bypass state and reverse
diff --git a/openpype/hosts/houdini/plugins/publish/collect_workfile.py b/openpype/hosts/houdini/plugins/publish/collect_workfile.py
index a6e94ec29e..aa533bcf1b 100644
--- a/openpype/hosts/houdini/plugins/publish/collect_workfile.py
+++ b/openpype/hosts/houdini/plugins/publish/collect_workfile.py
@@ -32,5 +32,4 @@ class CollectWorkfile(pyblish.api.InstancePlugin):
"stagingDir": folder,
}]
- self.log.info('Collected instance: {}'.format(file))
- self.log.info('staging Dir: {}'.format(folder))
+ self.log.debug('Collected workfile instance: {}'.format(file))
diff --git a/openpype/hosts/houdini/plugins/publish/save_scene.py b/openpype/hosts/houdini/plugins/publish/save_scene.py
index d6e07ccab0..703d3e4895 100644
--- a/openpype/hosts/houdini/plugins/publish/save_scene.py
+++ b/openpype/hosts/houdini/plugins/publish/save_scene.py
@@ -20,7 +20,7 @@ class SaveCurrentScene(pyblish.api.ContextPlugin):
)
if host.has_unsaved_changes():
- self.log.info("Saving current file {}...".format(current_file))
+ self.log.info("Saving current file: {}".format(current_file))
host.save_workfile(current_file)
else:
self.log.debug("No unsaved changes, skipping file save..")
diff --git a/openpype/hosts/houdini/plugins/publish/validate_workfile_paths.py b/openpype/hosts/houdini/plugins/publish/validate_workfile_paths.py
index 7707cc2dba..543c8e1407 100644
--- a/openpype/hosts/houdini/plugins/publish/validate_workfile_paths.py
+++ b/openpype/hosts/houdini/plugins/publish/validate_workfile_paths.py
@@ -28,18 +28,37 @@ class ValidateWorkfilePaths(
if not self.is_active(instance.data):
return
invalid = self.get_invalid()
- self.log.info(
- "node types to check: {}".format(", ".join(self.node_types)))
- self.log.info(
- "prohibited vars: {}".format(", ".join(self.prohibited_vars))
+ self.log.debug(
+ "Checking node types: {}".format(", ".join(self.node_types)))
+ self.log.debug(
+ "Searching prohibited vars: {}".format(
+ ", ".join(self.prohibited_vars)
+ )
)
- if invalid:
- for param in invalid:
- self.log.error(
- "{}: {}".format(param.path(), param.unexpandedString()))
- raise PublishValidationError(
- "Invalid paths found", title=self.label)
+ if invalid:
+ all_container_vars = set()
+ for param in invalid:
+ value = param.unexpandedString()
+ contained_vars = [
+ var for var in self.prohibited_vars
+ if var in value
+ ]
+ all_container_vars.update(contained_vars)
+
+ self.log.error(
+ "Parm {} contains prohibited vars {}: {}".format(
+ param.path(),
+ ", ".join(contained_vars),
+ value)
+ )
+
+ message = (
+ "Prohibited vars {} found in parameter values".format(
+ ", ".join(all_container_vars)
+ )
+ )
+ raise PublishValidationError(message, title=self.label)
@classmethod
def get_invalid(cls):
@@ -63,7 +82,7 @@ class ValidateWorkfilePaths(
def repair(cls, instance):
invalid = cls.get_invalid()
for param in invalid:
- cls.log.info("processing: {}".format(param.path()))
+ cls.log.info("Processing: {}".format(param.path()))
cls.log.info("Replacing {} for {}".format(
param.unexpandedString(),
hou.text.expandString(param.unexpandedString())))
diff --git a/openpype/hosts/maya/plugins/publish/collect_inputs.py b/openpype/hosts/maya/plugins/publish/collect_inputs.py
index 9c3f0f5efa..895c92762b 100644
--- a/openpype/hosts/maya/plugins/publish/collect_inputs.py
+++ b/openpype/hosts/maya/plugins/publish/collect_inputs.py
@@ -166,7 +166,7 @@ class CollectUpstreamInputs(pyblish.api.InstancePlugin):
inputs = [c["representation"] for c in containers]
instance.data["inputRepresentations"] = inputs
- self.log.info("Collected inputs: %s" % inputs)
+ self.log.debug("Collected inputs: %s" % inputs)
def _collect_renderlayer_inputs(self, scene_containers, instance):
"""Collects inputs from nodes in renderlayer, incl. shaders + camera"""
diff --git a/openpype/hosts/maya/plugins/publish/save_scene.py b/openpype/hosts/maya/plugins/publish/save_scene.py
index 45e62e7b44..495c339731 100644
--- a/openpype/hosts/maya/plugins/publish/save_scene.py
+++ b/openpype/hosts/maya/plugins/publish/save_scene.py
@@ -31,5 +31,5 @@ class SaveCurrentScene(pyblish.api.ContextPlugin):
# remove lockfile before saving
if is_workfile_lock_enabled("maya", project_name, project_settings):
remove_workfile_lock(current)
- self.log.info("Saving current file..")
+ self.log.info("Saving current file: {}".format(current))
cmds.file(save=True, force=True)
diff --git a/openpype/hosts/nuke/plugins/publish/collect_writes.py b/openpype/hosts/nuke/plugins/publish/collect_writes.py
index 6697a1e59a..2d1caacdc3 100644
--- a/openpype/hosts/nuke/plugins/publish/collect_writes.py
+++ b/openpype/hosts/nuke/plugins/publish/collect_writes.py
@@ -133,11 +133,11 @@ class CollectNukeWrites(pyblish.api.InstancePlugin,
else:
representation['files'] = collected_frames
- # inject colorspace data
- self.set_representation_colorspace(
- representation, instance.context,
- colorspace=colorspace
- )
+ # inject colorspace data
+ self.set_representation_colorspace(
+ representation, instance.context,
+ colorspace=colorspace
+ )
instance.data["representations"].append(representation)
self.log.info("Publishing rendered frames ...")
diff --git a/openpype/hosts/nuke/plugins/publish/extract_thumbnail.py b/openpype/hosts/nuke/plugins/publish/extract_thumbnail.py
index f391ca1e7c..21eefda249 100644
--- a/openpype/hosts/nuke/plugins/publish/extract_thumbnail.py
+++ b/openpype/hosts/nuke/plugins/publish/extract_thumbnail.py
@@ -5,6 +5,8 @@ import pyblish.api
from openpype.pipeline import publish
from openpype.hosts.nuke import api as napi
+from openpype.hosts.nuke.api.lib import set_node_knobs_from_settings
+
if sys.version_info[0] >= 3:
unicode = str
@@ -28,7 +30,7 @@ class ExtractThumbnail(publish.Extractor):
bake_viewer_process = True
bake_viewer_input_process = True
nodes = {}
-
+ reposition_nodes = None
def process(self, instance):
if instance.data.get("farm"):
@@ -123,18 +125,32 @@ class ExtractThumbnail(publish.Extractor):
temporary_nodes.append(rnode)
previous_node = rnode
- reformat_node = nuke.createNode("Reformat")
- ref_node = self.nodes.get("Reformat", None)
- if ref_node:
- for k, v in ref_node:
- self.log.debug("k, v: {0}:{1}".format(k, v))
- if isinstance(v, unicode):
- v = str(v)
- reformat_node[k].setValue(v)
+ if self.reposition_nodes is None:
+ # [deprecated] create reformat node old way
+ reformat_node = nuke.createNode("Reformat")
+ ref_node = self.nodes.get("Reformat", None)
+ if ref_node:
+ for k, v in ref_node:
+ self.log.debug("k, v: {0}:{1}".format(k, v))
+ if isinstance(v, unicode):
+ v = str(v)
+ reformat_node[k].setValue(v)
- reformat_node.setInput(0, previous_node)
- previous_node = reformat_node
- temporary_nodes.append(reformat_node)
+ reformat_node.setInput(0, previous_node)
+ previous_node = reformat_node
+ temporary_nodes.append(reformat_node)
+ else:
+ # create reformat node new way
+ for repo_node in self.reposition_nodes:
+ node_class = repo_node["node_class"]
+ knobs = repo_node["knobs"]
+ node = nuke.createNode(node_class)
+ set_node_knobs_from_settings(node, knobs)
+
+ # connect in order
+ node.setInput(0, previous_node)
+ previous_node = node
+ temporary_nodes.append(node)
# only create colorspace baking if toggled on
if bake_viewer_process:
diff --git a/openpype/hosts/resolve/hooks/pre_resolve_setup.py b/openpype/hosts/resolve/hooks/pre_resolve_setup.py
index 8574b3ad01..d066fc2da2 100644
--- a/openpype/hosts/resolve/hooks/pre_resolve_setup.py
+++ b/openpype/hosts/resolve/hooks/pre_resolve_setup.py
@@ -1,4 +1,5 @@
import os
+from pathlib import Path
import platform
from openpype.lib import PreLaunchHook
from openpype.hosts.resolve.utils import setup
@@ -6,33 +7,57 @@ from openpype.hosts.resolve.utils import setup
class ResolvePrelaunch(PreLaunchHook):
"""
- This hook will check if current workfile path has Resolve
- project inside. IF not, it initialize it and finally it pass
- path to the project by environment variable to Premiere launcher
- shell script.
+ This hook will set up the Resolve scripting environment as described in
+ Resolve's documentation found with the installed application at
+ {resolve}/Support/Developer/Scripting/README.txt
+
+ Prepares the following environment variables:
+ - `RESOLVE_SCRIPT_API`
+ - `RESOLVE_SCRIPT_LIB`
+
+ It adds $RESOLVE_SCRIPT_API/Modules to PYTHONPATH.
+
+ Additionally it sets up the Python home for Python 3 based on the
+ RESOLVE_PYTHON3_HOME in the environment (usually defined in OpenPype's
+ Application environment for Resolve by the admin). For this it sets
+ PYTHONHOME and PATH variables.
+
+ It also defines:
+ - `RESOLVE_UTILITY_SCRIPTS_DIR`: Destination directory for OpenPype
+ Fusion scripts to be copied to for Resolve to pick them up.
+ - `OPENPYPE_LOG_NO_COLORS` to True to ensure OP doesn't try to
+ use logging with terminal colors as it fails in Resolve.
+
"""
+
app_groups = ["resolve"]
def execute(self):
current_platform = platform.system().lower()
- PROGRAMDATA = self.launch_context.env.get("PROGRAMDATA", "")
- RESOLVE_SCRIPT_API_ = {
+ programdata = self.launch_context.env.get("PROGRAMDATA", "")
+ resolve_script_api_locations = {
"windows": (
- f"{PROGRAMDATA}/Blackmagic Design/"
+ f"{programdata}/Blackmagic Design/"
"DaVinci Resolve/Support/Developer/Scripting"
),
"darwin": (
"/Library/Application Support/Blackmagic Design"
"/DaVinci Resolve/Developer/Scripting"
),
- "linux": "/opt/resolve/Developer/Scripting"
+ "linux": "/opt/resolve/Developer/Scripting",
}
- RESOLVE_SCRIPT_API = os.path.normpath(
- RESOLVE_SCRIPT_API_[current_platform])
- self.launch_context.env["RESOLVE_SCRIPT_API"] = RESOLVE_SCRIPT_API
+ resolve_script_api = Path(
+ resolve_script_api_locations[current_platform]
+ )
+ self.log.info(
+ f"setting RESOLVE_SCRIPT_API variable to {resolve_script_api}"
+ )
+ self.launch_context.env[
+ "RESOLVE_SCRIPT_API"
+ ] = resolve_script_api.as_posix()
- RESOLVE_SCRIPT_LIB_ = {
+ resolve_script_lib_dirs = {
"windows": (
"C:/Program Files/Blackmagic Design"
"/DaVinci Resolve/fusionscript.dll"
@@ -41,61 +66,69 @@ class ResolvePrelaunch(PreLaunchHook):
"/Applications/DaVinci Resolve/DaVinci Resolve.app"
"/Contents/Libraries/Fusion/fusionscript.so"
),
- "linux": "/opt/resolve/libs/Fusion/fusionscript.so"
+ "linux": "/opt/resolve/libs/Fusion/fusionscript.so",
}
- RESOLVE_SCRIPT_LIB = os.path.normpath(
- RESOLVE_SCRIPT_LIB_[current_platform])
- self.launch_context.env["RESOLVE_SCRIPT_LIB"] = RESOLVE_SCRIPT_LIB
+ resolve_script_lib = Path(resolve_script_lib_dirs[current_platform])
+ self.launch_context.env[
+ "RESOLVE_SCRIPT_LIB"
+ ] = resolve_script_lib.as_posix()
+ self.log.info(
+ f"setting RESOLVE_SCRIPT_LIB variable to {resolve_script_lib}"
+ )
- # TODO: add OTIO installation from `openpype/requirements.py`
+ # TODO: add OTIO installation from `openpype/requirements.py`
# making sure python <3.9.* is installed at provided path
- python3_home = os.path.normpath(
- self.launch_context.env.get("RESOLVE_PYTHON3_HOME", ""))
+ python3_home = Path(
+ self.launch_context.env.get("RESOLVE_PYTHON3_HOME", "")
+ )
- assert os.path.isdir(python3_home), (
+ assert python3_home.is_dir(), (
"Python 3 is not installed at the provided folder path. Either "
"make sure the `environments\resolve.json` is having correctly "
"set `RESOLVE_PYTHON3_HOME` or make sure Python 3 is installed "
f"in given path. \nRESOLVE_PYTHON3_HOME: `{python3_home}`"
)
- self.launch_context.env["PYTHONHOME"] = python3_home
- self.log.info(f"Path to Resolve Python folder: `{python3_home}`...")
-
- # add to the python path to path
- env_path = self.launch_context.env["PATH"]
- self.launch_context.env["PATH"] = os.pathsep.join([
- python3_home,
- os.path.join(python3_home, "Scripts")
- ] + env_path.split(os.pathsep))
-
- self.log.debug(f"PATH: {self.launch_context.env['PATH']}")
+ python3_home_str = python3_home.as_posix()
+ self.launch_context.env["PYTHONHOME"] = python3_home_str
+ self.log.info(f"Path to Resolve Python folder: `{python3_home_str}`")
# add to the PYTHONPATH
env_pythonpath = self.launch_context.env["PYTHONPATH"]
- self.launch_context.env["PYTHONPATH"] = os.pathsep.join([
- os.path.join(python3_home, "Lib", "site-packages"),
- os.path.join(RESOLVE_SCRIPT_API, "Modules"),
- ] + env_pythonpath.split(os.pathsep))
+ modules_path = Path(resolve_script_api, "Modules").as_posix()
+ self.launch_context.env[
+ "PYTHONPATH"
+ ] = f"{modules_path}{os.pathsep}{env_pythonpath}"
self.log.debug(f"PYTHONPATH: {self.launch_context.env['PYTHONPATH']}")
- RESOLVE_UTILITY_SCRIPTS_DIR_ = {
+ # add the pythonhome folder to PATH because on Windows
+ # this is needed for Py3 to be correctly detected within Resolve
+ env_path = self.launch_context.env["PATH"]
+ self.log.info(f"Adding `{python3_home_str}` to the PATH variable")
+ self.launch_context.env[
+ "PATH"
+ ] = f"{python3_home_str}{os.pathsep}{env_path}"
+
+ self.log.debug(f"PATH: {self.launch_context.env['PATH']}")
+
+ resolve_utility_scripts_dirs = {
"windows": (
- f"{PROGRAMDATA}/Blackmagic Design"
+ f"{programdata}/Blackmagic Design"
"/DaVinci Resolve/Fusion/Scripts/Comp"
),
"darwin": (
"/Library/Application Support/Blackmagic Design"
"/DaVinci Resolve/Fusion/Scripts/Comp"
),
- "linux": "/opt/resolve/Fusion/Scripts/Comp"
+ "linux": "/opt/resolve/Fusion/Scripts/Comp",
}
- RESOLVE_UTILITY_SCRIPTS_DIR = os.path.normpath(
- RESOLVE_UTILITY_SCRIPTS_DIR_[current_platform]
+ resolve_utility_scripts_dir = Path(
+ resolve_utility_scripts_dirs[current_platform]
)
# setting utility scripts dir for scripts syncing
- self.launch_context.env["RESOLVE_UTILITY_SCRIPTS_DIR"] = (
- RESOLVE_UTILITY_SCRIPTS_DIR)
+ self.launch_context.env[
+ "RESOLVE_UTILITY_SCRIPTS_DIR"
+ ] = resolve_utility_scripts_dir.as_posix()
# remove terminal coloring tags
self.launch_context.env["OPENPYPE_LOG_NO_COLORS"] = "True"
diff --git a/openpype/hosts/resolve/utils.py b/openpype/hosts/resolve/utils.py
index 5881f153ae..8e5dd9a188 100644
--- a/openpype/hosts/resolve/utils.py
+++ b/openpype/hosts/resolve/utils.py
@@ -8,30 +8,30 @@ RESOLVE_ROOT_DIR = os.path.dirname(os.path.abspath(__file__))
def setup(env):
log = Logger.get_logger("ResolveSetup")
scripts = {}
- us_env = env.get("RESOLVE_UTILITY_SCRIPTS_SOURCE_DIR")
- us_dir = env["RESOLVE_UTILITY_SCRIPTS_DIR"]
+ util_scripts_env = env.get("RESOLVE_UTILITY_SCRIPTS_SOURCE_DIR")
+ util_scripts_dir = env["RESOLVE_UTILITY_SCRIPTS_DIR"]
- us_paths = [os.path.join(
+ util_scripts_paths = [os.path.join(
RESOLVE_ROOT_DIR,
"utility_scripts"
)]
# collect script dirs
- if us_env:
- log.info("Utility Scripts Env: `{}`".format(us_env))
- us_paths = us_env.split(
- os.pathsep) + us_paths
+ if util_scripts_env:
+ log.info("Utility Scripts Env: `{}`".format(util_scripts_env))
+ util_scripts_paths = util_scripts_env.split(
+ os.pathsep) + util_scripts_paths
# collect scripts from dirs
- for path in us_paths:
+ for path in util_scripts_paths:
scripts.update({path: os.listdir(path)})
- log.info("Utility Scripts Dir: `{}`".format(us_paths))
+ log.info("Utility Scripts Dir: `{}`".format(util_scripts_paths))
log.info("Utility Scripts: `{}`".format(scripts))
# make sure no script file is in folder
- for s in os.listdir(us_dir):
- path = os.path.join(us_dir, s)
+ for script in os.listdir(util_scripts_dir):
+ path = os.path.join(util_scripts_dir, script)
log.info("Removing `{}`...".format(path))
if os.path.isdir(path):
shutil.rmtree(path, onerror=None)
@@ -39,12 +39,10 @@ def setup(env):
os.remove(path)
# copy scripts into Resolve's utility scripts dir
- for d, sl in scripts.items():
- # directory and scripts list
- for s in sl:
- # script in script list
- src = os.path.join(d, s)
- dst = os.path.join(us_dir, s)
+ for directory, scripts in scripts.items():
+ for script in scripts:
+ src = os.path.join(directory, script)
+ dst = os.path.join(util_scripts_dir, script)
log.info("Copying `{}` to `{}`...".format(src, dst))
if os.path.isdir(src):
shutil.copytree(
diff --git a/openpype/hosts/substancepainter/plugins/publish/save_workfile.py b/openpype/hosts/substancepainter/plugins/publish/save_workfile.py
index 4874b5e5c7..9662f31922 100644
--- a/openpype/hosts/substancepainter/plugins/publish/save_workfile.py
+++ b/openpype/hosts/substancepainter/plugins/publish/save_workfile.py
@@ -16,11 +16,12 @@ class SaveCurrentWorkfile(pyblish.api.ContextPlugin):
def process(self, context):
host = registered_host()
- if context.data["currentFile"] != host.get_current_workfile():
+ current = host.get_current_workfile()
+ if context.data["currentFile"] != current:
raise KnownPublishError("Workfile has changed during publishing!")
if host.has_unsaved_changes():
- self.log.info("Saving current file..")
+ self.log.info("Saving current file: {}".format(current))
host.save_workfile()
else:
self.log.debug("Skipping workfile save because there are no "
diff --git a/openpype/hosts/unreal/plugins/load/load_animation.py b/openpype/hosts/unreal/plugins/load/load_animation.py
index 778ddf693d..a5ecb677e8 100644
--- a/openpype/hosts/unreal/plugins/load/load_animation.py
+++ b/openpype/hosts/unreal/plugins/load/load_animation.py
@@ -156,7 +156,7 @@ class AnimationFBXLoader(plugin.Loader):
package_paths=[f"{root}/{hierarchy[0]}"],
recursive_paths=False)
levels = ar.get_assets(_filter)
- master_level = levels[0].get_full_name()
+ master_level = levels[0].get_asset().get_path_name()
hierarchy_dir = root
for h in hierarchy:
@@ -168,7 +168,7 @@ class AnimationFBXLoader(plugin.Loader):
package_paths=[f"{hierarchy_dir}/"],
recursive_paths=True)
levels = ar.get_assets(_filter)
- level = levels[0].get_full_name()
+ level = levels[0].get_asset().get_path_name()
unreal.EditorLevelLibrary.save_all_dirty_levels()
unreal.EditorLevelLibrary.load_level(level)
diff --git a/openpype/hosts/unreal/plugins/load/load_camera.py b/openpype/hosts/unreal/plugins/load/load_camera.py
index 2303ed1ffc..072b3b1467 100644
--- a/openpype/hosts/unreal/plugins/load/load_camera.py
+++ b/openpype/hosts/unreal/plugins/load/load_camera.py
@@ -286,6 +286,26 @@ class CameraLoader(plugin.Loader):
self.fname
)
+ # Set range of all sections
+ # Changing the range of the section is not enough. We need to change
+ # the frame of all the keys in the section.
+ for possessable in cam_seq.get_possessables():
+ for tracks in possessable.get_tracks():
+ for section in tracks.get_sections():
+ section.set_range(
+ data.get('clipIn'),
+ data.get('clipOut') + 1)
+ for channel in section.get_all_channels():
+ for key in channel.get_keys():
+ old_time = key.get_time().get_editor_property(
+ 'frame_number')
+ old_time_value = old_time.get_editor_property(
+ 'value')
+ new_time = old_time_value + (
+ data.get('clipIn') - data.get('frameStart')
+ )
+ key.set_time(unreal.FrameNumber(value=new_time))
+
# Create Asset Container
unreal_pipeline.create_container(
container=container_name, path=asset_dir)
@@ -345,7 +365,7 @@ class CameraLoader(plugin.Loader):
maps = ar.get_assets(filter)
# There should be only one map in the list
- EditorLevelLibrary.load_level(maps[0].get_full_name())
+ EditorLevelLibrary.load_level(maps[0].get_asset().get_path_name())
level_sequence = sequences[0].get_asset()
@@ -493,7 +513,7 @@ class CameraLoader(plugin.Loader):
map = maps[0]
EditorLevelLibrary.save_all_dirty_levels()
- EditorLevelLibrary.load_level(map.get_full_name())
+ EditorLevelLibrary.load_level(map.get_asset().get_path_name())
# Remove the camera from the level.
actors = EditorLevelLibrary.get_all_level_actors()
@@ -503,7 +523,7 @@ class CameraLoader(plugin.Loader):
EditorLevelLibrary.destroy_actor(a)
EditorLevelLibrary.save_all_dirty_levels()
- EditorLevelLibrary.load_level(world.get_full_name())
+ EditorLevelLibrary.load_level(world.get_asset().get_path_name())
# There should be only one sequence in the path.
sequence_name = sequences[0].asset_name
diff --git a/openpype/hosts/unreal/plugins/load/load_layout.py b/openpype/hosts/unreal/plugins/load/load_layout.py
index e5f32c3412..d94e6e5837 100644
--- a/openpype/hosts/unreal/plugins/load/load_layout.py
+++ b/openpype/hosts/unreal/plugins/load/load_layout.py
@@ -740,7 +740,7 @@ class LayoutLoader(plugin.Loader):
loaded_assets = self._process(self.fname, asset_dir, shot)
for s in sequences:
- EditorAssetLibrary.save_asset(s.get_full_name())
+ EditorAssetLibrary.save_asset(s.get_path_name())
EditorLevelLibrary.save_current_level()
@@ -819,7 +819,7 @@ class LayoutLoader(plugin.Loader):
recursive_paths=False)
levels = ar.get_assets(filter)
- layout_level = levels[0].get_full_name()
+ layout_level = levels[0].get_asset().get_path_name()
EditorLevelLibrary.save_all_dirty_levels()
EditorLevelLibrary.load_level(layout_level)
@@ -919,7 +919,7 @@ class LayoutLoader(plugin.Loader):
package_paths=[f"{root}/{ms_asset}"],
recursive_paths=False)
levels = ar.get_assets(_filter)
- master_level = levels[0].get_full_name()
+ master_level = levels[0].get_asset().get_path_name()
sequences = [master_sequence]
diff --git a/openpype/hosts/unreal/plugins/publish/collect_render_instances.py b/openpype/hosts/unreal/plugins/publish/collect_render_instances.py
index a352b2c3f3..dad0310dfc 100644
--- a/openpype/hosts/unreal/plugins/publish/collect_render_instances.py
+++ b/openpype/hosts/unreal/plugins/publish/collect_render_instances.py
@@ -103,8 +103,8 @@ class CollectRenderInstances(pyblish.api.InstancePlugin):
new_instance.data["representations"] = []
repr = {
- 'frameStart': s.get('frame_range')[0],
- 'frameEnd': s.get('frame_range')[1],
+ 'frameStart': instance.data["frameStart"],
+ 'frameEnd': instance.data["frameEnd"],
'name': 'png',
'ext': 'png',
'files': frames,
diff --git a/openpype/hosts/unreal/plugins/publish/validate_sequence_frames.py b/openpype/hosts/unreal/plugins/publish/validate_sequence_frames.py
index e6584e130f..76bb25fac3 100644
--- a/openpype/hosts/unreal/plugins/publish/validate_sequence_frames.py
+++ b/openpype/hosts/unreal/plugins/publish/validate_sequence_frames.py
@@ -31,8 +31,8 @@ class ValidateSequenceFrames(pyblish.api.InstancePlugin):
frames = list(collection.indexes)
current_range = (frames[0], frames[-1])
- required_range = (data["frameStart"],
- data["frameEnd"])
+ required_range = (data["clipIn"],
+ data["clipOut"])
if current_range != required_range:
raise ValueError(f"Invalid frame range: {current_range} - "
diff --git a/openpype/lib/__init__.py b/openpype/lib/__init__.py
index 9eb7724a60..06de486f2e 100644
--- a/openpype/lib/__init__.py
+++ b/openpype/lib/__init__.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# flake8: noqa E402
-"""Pype module API."""
+"""OpenPype lib functions."""
# add vendor to sys path based on Python version
import sys
import os
@@ -94,7 +94,8 @@ from .python_module_tools import (
modules_from_path,
recursive_bases_from_class,
classes_from_module,
- import_module_from_dirpath
+ import_module_from_dirpath,
+ is_func_signature_supported,
)
from .profiles_filtering import (
@@ -243,6 +244,7 @@ __all__ = [
"recursive_bases_from_class",
"classes_from_module",
"import_module_from_dirpath",
+ "is_func_signature_supported",
"get_transcode_temp_directory",
"should_convert_for_ffmpeg",
diff --git a/openpype/lib/events.py b/openpype/lib/events.py
index bed00fe659..dca58fcf93 100644
--- a/openpype/lib/events.py
+++ b/openpype/lib/events.py
@@ -6,10 +6,9 @@ import inspect
import logging
import weakref
from uuid import uuid4
-try:
- from weakref import WeakMethod
-except Exception:
- from openpype.lib.python_2_comp import WeakMethod
+
+from .python_2_comp import WeakMethod
+from .python_module_tools import is_func_signature_supported
class MissingEventSystem(Exception):
@@ -80,40 +79,8 @@ class EventCallback(object):
# Get expected arguments from function spec
# - positional arguments are always preferred
- expect_args = False
- expect_kwargs = False
- fake_event = "fake"
- if hasattr(inspect, "signature"):
- # Python 3 using 'Signature' object where we try to bind arg
- # or kwarg. Using signature is recommended approach based on
- # documentation.
- sig = inspect.signature(func)
- try:
- sig.bind(fake_event)
- expect_args = True
- except TypeError:
- pass
-
- try:
- sig.bind(event=fake_event)
- expect_kwargs = True
- except TypeError:
- pass
-
- else:
- # In Python 2 'signature' is not available so 'getcallargs' is used
- # - 'getcallargs' is marked as deprecated since Python 3.0
- try:
- inspect.getcallargs(func, fake_event)
- expect_args = True
- except TypeError:
- pass
-
- try:
- inspect.getcallargs(func, event=fake_event)
- expect_kwargs = True
- except TypeError:
- pass
+ expect_args = is_func_signature_supported(func, "fake")
+ expect_kwargs = is_func_signature_supported(func, event="fake")
self._func_ref = func_ref
self._func_name = func_name
diff --git a/openpype/lib/execute.py b/openpype/lib/execute.py
index ef456395e7..6f52efdfcc 100644
--- a/openpype/lib/execute.py
+++ b/openpype/lib/execute.py
@@ -190,7 +190,7 @@ def run_openpype_process(*args, **kwargs):
Example:
```
- run_openpype_process("run", "")
+ run_detached_process("run", "")
```
Args:
diff --git a/openpype/lib/python_2_comp.py b/openpype/lib/python_2_comp.py
index d7137dbe9c..091c51a6f6 100644
--- a/openpype/lib/python_2_comp.py
+++ b/openpype/lib/python_2_comp.py
@@ -1,41 +1,44 @@
import weakref
-class _weak_callable:
- def __init__(self, obj, func):
- self.im_self = obj
- self.im_func = func
+WeakMethod = getattr(weakref, "WeakMethod", None)
- def __call__(self, *args, **kws):
- if self.im_self is None:
- return self.im_func(*args, **kws)
- else:
- return self.im_func(self.im_self, *args, **kws)
+if WeakMethod is None:
+ class _WeakCallable:
+ def __init__(self, obj, func):
+ self.im_self = obj
+ self.im_func = func
+
+ def __call__(self, *args, **kws):
+ if self.im_self is None:
+ return self.im_func(*args, **kws)
+ else:
+ return self.im_func(self.im_self, *args, **kws)
-class WeakMethod:
- """ Wraps a function or, more importantly, a bound method in
- a way that allows a bound method's object to be GCed, while
- providing the same interface as a normal weak reference. """
+ class WeakMethod:
+ """ Wraps a function or, more importantly, a bound method in
+ a way that allows a bound method's object to be GCed, while
+ providing the same interface as a normal weak reference. """
- def __init__(self, fn):
- try:
- self._obj = weakref.ref(fn.im_self)
- self._meth = fn.im_func
- except AttributeError:
- # It's not a bound method
- self._obj = None
- self._meth = fn
+ def __init__(self, fn):
+ try:
+ self._obj = weakref.ref(fn.im_self)
+ self._meth = fn.im_func
+ except AttributeError:
+ # It's not a bound method
+ self._obj = None
+ self._meth = fn
- def __call__(self):
- if self._dead():
- return None
- return _weak_callable(self._getobj(), self._meth)
+ def __call__(self):
+ if self._dead():
+ return None
+ return _WeakCallable(self._getobj(), self._meth)
- def _dead(self):
- return self._obj is not None and self._obj() is None
+ def _dead(self):
+ return self._obj is not None and self._obj() is None
- def _getobj(self):
- if self._obj is None:
- return None
- return self._obj()
+ def _getobj(self):
+ if self._obj is None:
+ return None
+ return self._obj()
diff --git a/openpype/lib/python_module_tools.py b/openpype/lib/python_module_tools.py
index 9e8e94842c..a10263f991 100644
--- a/openpype/lib/python_module_tools.py
+++ b/openpype/lib/python_module_tools.py
@@ -230,3 +230,70 @@ def import_module_from_dirpath(dirpath, folder_name, dst_module_name=None):
dirpath, folder_name, dst_module_name
)
return module
+
+
+def is_func_signature_supported(func, *args, **kwargs):
+ """Check if a function signature supports passed args and kwargs.
+
+ This check does not actually call the function, just look if function can
+ be called with the arguments.
+
+ Notes:
+ This does NOT check if the function would work with passed arguments
+ only if they can be passed in. If function have *args, **kwargs
+ in paramaters, this will always return 'True'.
+
+ Example:
+ >>> def my_function(my_number):
+ ... return my_number + 1
+ ...
+ >>> is_func_signature_supported(my_function, 1)
+ True
+ >>> is_func_signature_supported(my_function, 1, 2)
+ False
+ >>> is_func_signature_supported(my_function, my_number=1)
+ True
+ >>> is_func_signature_supported(my_function, number=1)
+ False
+ >>> is_func_signature_supported(my_function, "string")
+ True
+ >>> def my_other_function(*args, **kwargs):
+ ... my_function(*args, **kwargs)
+ ...
+ >>> is_func_signature_supported(
+ ... my_other_function,
+ ... "string",
+ ... 1,
+ ... other=None
+ ... )
+ True
+
+ Args:
+ func (function): A function where the signature should be tested.
+ *args (tuple[Any]): Positional arguments for function signature.
+ **kwargs (dict[str, Any]): Keyword arguments for function signature.
+
+ Returns:
+ bool: Function can pass in arguments.
+ """
+
+ if hasattr(inspect, "signature"):
+ # Python 3 using 'Signature' object where we try to bind arg
+ # or kwarg. Using signature is recommended approach based on
+ # documentation.
+ sig = inspect.signature(func)
+ try:
+ sig.bind(*args, **kwargs)
+ return True
+ except TypeError:
+ pass
+
+ else:
+ # In Python 2 'signature' is not available so 'getcallargs' is used
+ # - 'getcallargs' is marked as deprecated since Python 3.0
+ try:
+ inspect.getcallargs(func, *args, **kwargs)
+ return True
+ except TypeError:
+ pass
+ return False
diff --git a/openpype/modules/deadline/plugins/publish/collect_default_deadline_server.py b/openpype/modules/deadline/plugins/publish/collect_default_deadline_server.py
index e6ad6a9aa1..cb2b0cf156 100644
--- a/openpype/modules/deadline/plugins/publish/collect_default_deadline_server.py
+++ b/openpype/modules/deadline/plugins/publish/collect_default_deadline_server.py
@@ -4,7 +4,18 @@ import pyblish.api
class CollectDefaultDeadlineServer(pyblish.api.ContextPlugin):
- """Collect default Deadline Webservice URL."""
+ """Collect default Deadline Webservice URL.
+
+ DL webservice addresses must be configured first in System Settings for
+ project settings enum to work.
+
+ Default webservice could be overriden by
+ `project_settings/deadline/deadline_servers`. Currently only single url
+ is expected.
+
+ This url could be overriden by some hosts directly on instances with
+ `CollectDeadlineServerFromInstance`.
+ """
order = pyblish.api.CollectorOrder + 0.410
label = "Default Deadline Webservice"
@@ -23,3 +34,16 @@ class CollectDefaultDeadlineServer(pyblish.api.ContextPlugin):
context.data["defaultDeadline"] = deadline_module.deadline_urls["default"] # noqa: E501
context.data["deadlinePassMongoUrl"] = self.pass_mongo_url
+
+ deadline_servers = (context.data
+ ["project_settings"]
+ ["deadline"]
+ ["deadline_servers"])
+ if deadline_servers:
+ deadline_server_name = deadline_servers[0]
+ deadline_webservice = deadline_module.deadline_urls.get(
+ deadline_server_name)
+ if deadline_webservice:
+ context.data["defaultDeadline"] = deadline_webservice
+ self.log.debug("Overriding from project settings with {}".format( # noqa: E501
+ deadline_webservice))
diff --git a/openpype/modules/deadline/plugins/publish/submit_fusion_deadline.py b/openpype/modules/deadline/plugins/publish/submit_fusion_deadline.py
index 8570c759bc..a48596c6bf 100644
--- a/openpype/modules/deadline/plugins/publish/submit_fusion_deadline.py
+++ b/openpype/modules/deadline/plugins/publish/submit_fusion_deadline.py
@@ -7,9 +7,19 @@ import requests
import pyblish.api
from openpype.pipeline import legacy_io
+from openpype.pipeline.publish import (
+ OpenPypePyblishPluginMixin
+)
+from openpype.lib import (
+ BoolDef,
+ NumberDef
+)
-class FusionSubmitDeadline(pyblish.api.InstancePlugin):
+class FusionSubmitDeadline(
+ pyblish.api.InstancePlugin,
+ OpenPypePyblishPluginMixin
+):
"""Submit current Comp to Deadline
Renders are submitted to a Deadline Web Service as
@@ -17,12 +27,62 @@ class FusionSubmitDeadline(pyblish.api.InstancePlugin):
"""
- label = "Submit to Deadline"
+ label = "Submit Fusion to Deadline"
order = pyblish.api.IntegratorOrder
hosts = ["fusion"]
- families = ["render.farm"]
+ families = ["render"]
+ targets = ["local"]
+
+ # presets
+ priority = 50
+ chunk_size = 1
+ concurrent_tasks = 1
+ group = ""
+
+ @classmethod
+ def get_attribute_defs(cls):
+ return [
+ NumberDef(
+ "priority",
+ label="Priority",
+ default=cls.priority,
+ decimals=0
+ ),
+ NumberDef(
+ "chunk",
+ label="Frames Per Task",
+ default=cls.chunk_size,
+ decimals=0,
+ minimum=1,
+ maximum=1000
+ ),
+ NumberDef(
+ "concurrency",
+ label="Concurrency",
+ default=cls.concurrent_tasks,
+ decimals=0,
+ minimum=1,
+ maximum=10
+ ),
+ BoolDef(
+ "suspend_publish",
+ default=False,
+ label="Suspend publish"
+ )
+ ]
def process(self, instance):
+ if not instance.data.get("farm"):
+ self.log.debug("Skipping local instance.")
+ return
+
+ attribute_values = self.get_attr_values_from_data(
+ instance.data)
+
+ # add suspend_publish attributeValue to instance data
+ instance.data["suspend_publish"] = attribute_values[
+ "suspend_publish"]
+
context = instance.context
key = "__hasRun{}".format(self.__class__.__name__)
@@ -33,36 +93,55 @@ class FusionSubmitDeadline(pyblish.api.InstancePlugin):
from openpype.hosts.fusion.api.lib import get_frame_path
- deadline_url = (
- context.data["system_settings"]
- ["modules"]
- ["deadline"]
- ["DEADLINE_REST_URL"]
- )
- assert deadline_url, "Requires DEADLINE_REST_URL"
+ # get default deadline webservice url from deadline module
+ deadline_url = instance.context.data["defaultDeadline"]
+ # if custom one is set in instance, use that
+ if instance.data.get("deadlineUrl"):
+ deadline_url = instance.data.get("deadlineUrl")
+ assert deadline_url, "Requires Deadline Webservice URL"
# Collect all saver instances in context that are to be rendered
saver_instances = []
- for instance in context[:]:
- if not self.families[0] in instance.data.get("families"):
+ for instance in context:
+ if instance.data["family"] != "render":
# Allow only saver family instances
continue
if not instance.data.get("publish", True):
# Skip inactive instances
continue
+
self.log.debug(instance.data["name"])
saver_instances.append(instance)
if not saver_instances:
- raise RuntimeError("No instances found for Deadline submittion")
+ raise RuntimeError("No instances found for Deadline submission")
- fusion_version = int(context.data["fusionVersion"])
- filepath = context.data["currentFile"]
- filename = os.path.basename(filepath)
- comment = context.data.get("comment", "")
+ comment = instance.data.get("comment", "")
deadline_user = context.data.get("deadlineUser", getpass.getuser())
+ script_path = context.data["currentFile"]
+
+ for item in context:
+ if "workfile" in item.data["families"]:
+ msg = "Workfile (scene) must be published along"
+ assert item.data["publish"] is True, msg
+
+ template_data = item.data.get("anatomyData")
+ rep = item.data.get("representations")[0].get("name")
+ template_data["representation"] = rep
+ template_data["ext"] = rep
+ template_data["comment"] = None
+ anatomy_filled = context.data["anatomy"].format(template_data)
+ template_filled = anatomy_filled["publish"]["path"]
+ script_path = os.path.normpath(template_filled)
+
+ self.log.info(
+ "Using published scene for render {}".format(script_path)
+ )
+
+ filename = os.path.basename(script_path)
+
# Documentation for keys available at:
# https://docs.thinkboxsoftware.com
# /products/deadline/8.0/1_User%20Manual/manual
@@ -73,31 +152,41 @@ class FusionSubmitDeadline(pyblish.api.InstancePlugin):
"BatchName": filename,
# Asset dependency to wait for at least the scene file to sync.
- "AssetDependency0": filepath,
+ "AssetDependency0": script_path,
# Job name, as seen in Monitor
"Name": filename,
+ "Priority": attribute_values.get(
+ "priority", self.priority),
+ "ChunkSize": attribute_values.get(
+ "chunk", self.chunk_size),
+ "ConcurrentTasks": attribute_values.get(
+ "concurrency",
+ self.concurrent_tasks
+ ),
+
# User, as seen in Monitor
"UserName": deadline_user,
- # Use a default submission pool for Fusion
- "Pool": "fusion",
+ "Pool": instance.data.get("primaryPool"),
+ "SecondaryPool": instance.data.get("secondaryPool"),
+ "Group": self.group,
"Plugin": "Fusion",
"Frames": "{start}-{end}".format(
- start=int(context.data["frameStart"]),
- end=int(context.data["frameEnd"])
+ start=int(instance.data["frameStartHandle"]),
+ end=int(instance.data["frameEndHandle"])
),
"Comment": comment,
},
"PluginInfo": {
# Input
- "FlowFile": filepath,
+ "FlowFile": script_path,
# Mandatory for Deadline
- "Version": str(fusion_version),
+ "Version": str(instance.data["app_version"]),
# Render in high quality
"HighQuality": True,
@@ -108,7 +197,7 @@ class FusionSubmitDeadline(pyblish.api.InstancePlugin):
# Proxy: higher numbers smaller images for faster test renders
# 1 = no proxy quality
- "Proxy": 1,
+ "Proxy": 1
},
# Mandatory for Deadline, may be empty
@@ -117,7 +206,9 @@ class FusionSubmitDeadline(pyblish.api.InstancePlugin):
# Enable going to rendered frames from Deadline Monitor
for index, instance in enumerate(saver_instances):
- head, padding, tail = get_frame_path(instance.data["path"])
+ head, padding, tail = get_frame_path(
+ instance.data["expectedFiles"][0]
+ )
path = "{}{}{}".format(head, "#" * padding, tail)
folder, filename = os.path.split(path)
payload["JobInfo"]["OutputDirectory%d" % index] = folder
diff --git a/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py b/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py
index 5c598df94b..4900231783 100644
--- a/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py
+++ b/openpype/modules/deadline/plugins/publish/submit_nuke_deadline.py
@@ -86,7 +86,7 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin,
def process(self, instance):
if not instance.data.get("farm"):
- self.log.info("Skipping local instance.")
+ self.log.debug("Skipping local instance.")
return
instance.data["attributeValues"] = self.get_attr_values_from_data(
diff --git a/openpype/modules/deadline/plugins/publish/submit_publish_job.py b/openpype/modules/deadline/plugins/publish/submit_publish_job.py
index eeb813cb62..68eb0a437d 100644
--- a/openpype/modules/deadline/plugins/publish/submit_publish_job.py
+++ b/openpype/modules/deadline/plugins/publish/submit_publish_job.py
@@ -762,7 +762,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin):
"""
if not instance.data.get("farm"):
- self.log.info("Skipping local instance.")
+ self.log.debug("Skipping local instance.")
return
data = instance.data.copy()
diff --git a/openpype/modules/deadline/plugins/publish/validate_deadline_pools.py b/openpype/modules/deadline/plugins/publish/validate_deadline_pools.py
index 7c8ab62d4d..e1c0595830 100644
--- a/openpype/modules/deadline/plugins/publish/validate_deadline_pools.py
+++ b/openpype/modules/deadline/plugins/publish/validate_deadline_pools.py
@@ -26,7 +26,7 @@ class ValidateDeadlinePools(OptionalPyblishPluginMixin,
def process(self, instance):
if not instance.data.get("farm"):
- self.log.info("Skipping local instance.")
+ self.log.debug("Skipping local instance.")
return
# get default deadline webservice url from deadline module
diff --git a/openpype/modules/ftrack/ftrack_server/lib.py b/openpype/modules/ftrack/ftrack_server/lib.py
index eb64063fab..2226c85ef9 100644
--- a/openpype/modules/ftrack/ftrack_server/lib.py
+++ b/openpype/modules/ftrack/ftrack_server/lib.py
@@ -196,7 +196,7 @@ class ProcessEventHub(SocketBaseEventHub):
{"pype_data.is_processed": False}
).sort(
[("pype_data.stored", pymongo.ASCENDING)]
- )
+ ).limit(100)
found = False
for event_data in not_processed_events:
diff --git a/openpype/pipeline/publish/__init__.py b/openpype/pipeline/publish/__init__.py
index 72f3774e1a..0c57915c05 100644
--- a/openpype/pipeline/publish/__init__.py
+++ b/openpype/pipeline/publish/__init__.py
@@ -39,6 +39,7 @@ from .lib import (
apply_plugin_settings_automatically,
get_plugin_settings,
+ get_publish_instance_label,
)
from .abstract_expected_files import ExpectedFiles
@@ -85,6 +86,7 @@ __all__ = (
"apply_plugin_settings_automatically",
"get_plugin_settings",
+ "get_publish_instance_label",
"ExpectedFiles",
diff --git a/openpype/pipeline/publish/abstract_collect_render.py b/openpype/pipeline/publish/abstract_collect_render.py
index fd35ddb719..6877d556c3 100644
--- a/openpype/pipeline/publish/abstract_collect_render.py
+++ b/openpype/pipeline/publish/abstract_collect_render.py
@@ -167,16 +167,25 @@ class AbstractCollectRender(pyblish.api.ContextPlugin):
frame_start_render = int(render_instance.frameStart)
frame_end_render = int(render_instance.frameEnd)
+ # TODO: Refactor hacky frame range workaround below
if (render_instance.ignoreFrameHandleCheck or
int(context.data['frameStartHandle']) == frame_start_render
and int(context.data['frameEndHandle']) == frame_end_render): # noqa: W503, E501
-
+ # only for Harmony where frame range cannot be set by DB
handle_start = context.data['handleStart']
handle_end = context.data['handleEnd']
frame_start = context.data['frameStart']
frame_end = context.data['frameEnd']
frame_start_handle = context.data['frameStartHandle']
frame_end_handle = context.data['frameEndHandle']
+ elif (hasattr(render_instance, "frameStartHandle")
+ and hasattr(render_instance, "frameEndHandle")):
+ handle_start = int(render_instance.handleStart)
+ handle_end = int(render_instance.handleEnd)
+ frame_start = int(render_instance.frameStart)
+ frame_end = int(render_instance.frameEnd)
+ frame_start_handle = int(render_instance.frameStartHandle)
+ frame_end_handle = int(render_instance.frameEndHandle)
else:
handle_start = 0
handle_end = 0
diff --git a/openpype/pipeline/publish/lib.py b/openpype/pipeline/publish/lib.py
index 080f93e514..e87b865dce 100644
--- a/openpype/pipeline/publish/lib.py
+++ b/openpype/pipeline/publish/lib.py
@@ -1,12 +1,10 @@
import os
import sys
-import types
import inspect
import copy
import tempfile
import xml.etree.ElementTree
-import six
import pyblish.util
import pyblish.plugin
import pyblish.api
@@ -32,6 +30,8 @@ from .contants import (
TRANSIENT_DIR_TEMPLATE
)
+_ARG_PLACEHOLDER = object()
+
def get_template_name_profiles(
project_name, project_settings=None, logger=None
@@ -42,7 +42,9 @@ def get_template_name_profiles(
Args:
project_name (str): Name of project where to look for templates.
- project_settings(Dic[str, Any]): Prepared project settings.
+ project_settings (Dict[str, Any]): Prepared project settings.
+ logger (Optional[logging.Logger]): Logger object to be used instead
+ of default logger.
Returns:
List[Dict[str, Any]]: Publish template profiles.
@@ -103,7 +105,9 @@ def get_hero_template_name_profiles(
Args:
project_name (str): Name of project where to look for templates.
- project_settings(Dic[str, Any]): Prepared project settings.
+ project_settings (Dict[str, Any]): Prepared project settings.
+ logger (Optional[logging.Logger]): Logger object to be used instead
+ of default logger.
Returns:
List[Dict[str, Any]]: Publish template profiles.
@@ -172,9 +176,10 @@ def get_publish_template_name(
project_name (str): Name of project where to look for settings.
host_name (str): Name of host integration.
family (str): Family for which should be found template.
- task_name (str): Task name on which is intance working.
- task_type (str): Task type on which is intance working.
- project_setting (Dict[str, Any]): Prepared project settings.
+ task_name (str): Task name on which is instance working.
+ task_type (str): Task type on which is instance working.
+ project_settings (Dict[str, Any]): Prepared project settings.
+ hero (bool): Template is for hero version publishing.
logger (logging.Logger): Custom logger used for 'filter_profiles'
function.
@@ -264,19 +269,18 @@ def load_help_content_from_plugin(plugin):
def publish_plugins_discover(paths=None):
"""Find and return available pyblish plug-ins
- Overridden function from `pyblish` module to be able collect crashed files
- and reason of their crash.
+ Overridden function from `pyblish` module to be able to collect
+ crashed files and reason of their crash.
Arguments:
paths (list, optional): Paths to discover plug-ins from.
If no paths are provided, all paths are searched.
-
"""
# The only difference with `pyblish.api.discover`
result = DiscoverResult(pyblish.api.Plugin)
- plugins = dict()
+ plugins = {}
plugin_names = []
allow_duplicates = pyblish.plugin.ALLOW_DUPLICATES
@@ -302,7 +306,7 @@ def publish_plugins_discover(paths=None):
mod_name, mod_ext = os.path.splitext(fname)
- if not mod_ext == ".py":
+ if mod_ext != ".py":
continue
try:
@@ -320,6 +324,14 @@ def publish_plugins_discover(paths=None):
continue
for plugin in pyblish.plugin.plugins_from_module(module):
+ # Ignore base plugin classes
+ # NOTE 'pyblish.api.discover' does not ignore them!
+ if (
+ plugin is pyblish.api.Plugin
+ or plugin is pyblish.api.ContextPlugin
+ or plugin is pyblish.api.InstancePlugin
+ ):
+ continue
if not allow_duplicates and plugin.__name__ in plugin_names:
result.duplicated_plugins.append(plugin)
log.debug("Duplicate plug-in found: %s", plugin)
@@ -525,10 +537,10 @@ def find_close_plugin(close_plugin_name, log):
def remote_publish(log, close_plugin_name=None, raise_error=False):
"""Loops through all plugins, logs to console. Used for tests.
- Args:
- log (openpype.lib.Logger)
- close_plugin_name (str): name of plugin with responsibility to
- close host app
+ Args:
+ log (Logger)
+ close_plugin_name (str): name of plugin with responsibility to
+ close host app
"""
# Error exit as soon as any error occurs.
error_format = "Failed {plugin.__name__}: {error} -- {error.traceback}"
@@ -837,3 +849,52 @@ def _validate_transient_template(project_name, template_name, anatomy):
raise ValueError(("There is not set \"folder\" template in \"{}\" anatomy" # noqa
" for project \"{}\"."
).format(template_name, project_name))
+
+
+def add_repre_files_for_cleanup(instance, repre):
+ """ Explicitly mark repre files to be deleted.
+
+ Should be used on intermediate files (eg. review, thumbnails) to be
+ explicitly deleted.
+ """
+ files = repre["files"]
+ staging_dir = repre.get("stagingDir")
+ if not staging_dir:
+ return
+
+ if isinstance(files, str):
+ files = [files]
+
+ for file_name in files:
+ expected_file = os.path.join(staging_dir, file_name)
+ instance.context.data["cleanupFullPaths"].append(expected_file)
+
+
+def get_publish_instance_label(instance, default=_ARG_PLACEHOLDER):
+ """Try to get label from pyblish instance.
+
+ First are checked 'label' and 'name' keys in instance data. If are not set
+ a default value is returned. Instance object is converted to string
+ if default value is not specific.
+
+ Todos:
+ Maybe 'subset' key could be used too.
+
+ Args:
+ instance (pyblish.api.Instance): Pyblish instance.
+ default (Optional[Any]): Default value to return if any
+
+ Returns:
+ Union[Any]: Instance label or default label.
+ """
+
+ label = (
+ instance.data.get("label")
+ or instance.data.get("name")
+ )
+ if label:
+ return label
+
+ if default is _ARG_PLACEHOLDER:
+ return str(instance)
+ return default
diff --git a/openpype/pipeline/publish/publish_plugins.py b/openpype/pipeline/publish/publish_plugins.py
index a38896ec8e..a67c8397b1 100644
--- a/openpype/pipeline/publish/publish_plugins.py
+++ b/openpype/pipeline/publish/publish_plugins.py
@@ -379,7 +379,9 @@ class ColormanagedPyblishPluginMixin(object):
# check if ext in lower case is in self.allowed_ext
if ext.lstrip(".").lower() not in self.allowed_ext:
- self.log.debug("Extension is not in allowed extensions.")
+ self.log.debug(
+ "Extension '{}' is not in allowed extensions.".format(ext)
+ )
return
if colorspace_settings is None:
@@ -393,8 +395,7 @@ class ColormanagedPyblishPluginMixin(object):
self.log.warning("No colorspace management was defined")
return
- self.log.info("Config data is : `{}`".format(
- config_data))
+ self.log.debug("Config data is: `{}`".format(config_data))
project_name = context.data["projectName"]
host_name = context.data["hostName"]
@@ -405,8 +406,7 @@ class ColormanagedPyblishPluginMixin(object):
if isinstance(filename, list):
filename = filename[0]
- self.log.debug("__ filename: `{}`".format(
- filename))
+ self.log.debug("__ filename: `{}`".format(filename))
# get matching colorspace from rules
colorspace = colorspace or get_imageio_colorspace_from_filepath(
@@ -415,8 +415,7 @@ class ColormanagedPyblishPluginMixin(object):
file_rules=file_rules,
project_settings=project_settings
)
- self.log.debug("__ colorspace: `{}`".format(
- colorspace))
+ self.log.debug("__ colorspace: `{}`".format(colorspace))
# infuse data to representation
if colorspace:
diff --git a/openpype/pipeline/workfile/workfile_template_builder.py b/openpype/pipeline/workfile/workfile_template_builder.py
index a3d7340367..896ed40f2d 100644
--- a/openpype/pipeline/workfile/workfile_template_builder.py
+++ b/openpype/pipeline/workfile/workfile_template_builder.py
@@ -43,6 +43,7 @@ from openpype.pipeline.load import (
get_contexts_for_repre_docs,
load_with_repre_context,
)
+
from openpype.pipeline.create import (
discover_legacy_creator_plugins,
CreateContext,
@@ -1246,6 +1247,16 @@ class PlaceholderLoadMixin(object):
loader_items = list(sorted(loader_items, key=lambda i: i["label"]))
options = options or {}
+
+ # Get families from all loaders excluding "*"
+ families = set()
+ for loader in loaders_by_name.values():
+ families.update(loader.families)
+ families.discard("*")
+
+ # Sort for readability
+ families = list(sorted(families))
+
return [
attribute_definitions.UISeparatorDef(),
attribute_definitions.UILabelDef("Main attributes"),
@@ -1272,11 +1283,11 @@ class PlaceholderLoadMixin(object):
" field \"inputLinks\""
)
),
- attribute_definitions.TextDef(
+ attribute_definitions.EnumDef(
"family",
label="Family",
default=options.get("family"),
- placeholder="model, look, ..."
+ items=families
),
attribute_definitions.TextDef(
"representation",
diff --git a/openpype/plugins/load/open_djv.py b/openpype/plugins/load/open_djv.py
index bc5fd64b87..9c36e7f405 100644
--- a/openpype/plugins/load/open_djv.py
+++ b/openpype/plugins/load/open_djv.py
@@ -19,12 +19,13 @@ class OpenInDJV(load.LoaderPlugin):
djv_list = existing_djv_path()
families = ["*"] if djv_list else []
- representations = [
+ representations = ["*"]
+ extensions = {
"cin", "dpx", "avi", "dv", "gif", "flv", "mkv", "mov", "mpg", "mpeg",
"mp4", "m4v", "mxf", "iff", "z", "ifl", "jpeg", "jpg", "jfif", "lut",
"1dl", "exr", "pic", "png", "ppm", "pnm", "pgm", "pbm", "rla", "rpf",
"sgi", "rgba", "rgb", "bw", "tga", "tiff", "tif", "img", "h264",
- ]
+ }
label = "Open in DJV"
order = -10
diff --git a/openpype/plugins/publish/cleanup.py b/openpype/plugins/publish/cleanup.py
index b90c88890d..57cc9c0ab5 100644
--- a/openpype/plugins/publish/cleanup.py
+++ b/openpype/plugins/publish/cleanup.py
@@ -81,7 +81,8 @@ class CleanUp(pyblish.api.InstancePlugin):
staging_dir = instance.data.get("stagingDir", None)
if not staging_dir:
- self.log.info("Staging dir not set.")
+ self.log.debug("Skipping cleanup. Staging dir not set "
+ "on instance: {}.".format(instance))
return
if not os.path.normpath(staging_dir).startswith(temp_root):
@@ -90,7 +91,7 @@ class CleanUp(pyblish.api.InstancePlugin):
return
if not os.path.exists(staging_dir):
- self.log.info("No staging directory found: %s" % staging_dir)
+ self.log.debug("No staging directory found at: %s" % staging_dir)
return
if instance.data.get("stagingDir_persistent"):
@@ -131,7 +132,9 @@ class CleanUp(pyblish.api.InstancePlugin):
try:
os.remove(src)
except PermissionError:
- self.log.warning("Insufficient permission to delete {}".format(src))
+ self.log.warning(
+ "Insufficient permission to delete {}".format(src)
+ )
continue
# add dir for cleanup
diff --git a/openpype/plugins/publish/collect_anatomy_context_data.py b/openpype/plugins/publish/collect_anatomy_context_data.py
index 55ce8e06f4..508b01447b 100644
--- a/openpype/plugins/publish/collect_anatomy_context_data.py
+++ b/openpype/plugins/publish/collect_anatomy_context_data.py
@@ -67,5 +67,6 @@ class CollectAnatomyContextData(pyblish.api.ContextPlugin):
# Store
context.data["anatomyData"] = anatomy_data
- self.log.info("Global anatomy Data collected")
- self.log.debug(json.dumps(anatomy_data, indent=4))
+ self.log.debug("Global Anatomy Context Data collected:\n{}".format(
+ json.dumps(anatomy_data, indent=4)
+ ))
diff --git a/openpype/plugins/publish/collect_anatomy_instance_data.py b/openpype/plugins/publish/collect_anatomy_instance_data.py
index 4fbb93324b..128ad90b4f 100644
--- a/openpype/plugins/publish/collect_anatomy_instance_data.py
+++ b/openpype/plugins/publish/collect_anatomy_instance_data.py
@@ -46,17 +46,17 @@ class CollectAnatomyInstanceData(pyblish.api.ContextPlugin):
follow_workfile_version = False
def process(self, context):
- self.log.info("Collecting anatomy data for all instances.")
+ self.log.debug("Collecting anatomy data for all instances.")
project_name = context.data["projectName"]
self.fill_missing_asset_docs(context, project_name)
self.fill_latest_versions(context, project_name)
self.fill_anatomy_data(context)
- self.log.info("Anatomy Data collection finished.")
+ self.log.debug("Anatomy Data collection finished.")
def fill_missing_asset_docs(self, context, project_name):
- self.log.debug("Qeurying asset documents for instances.")
+ self.log.debug("Querying asset documents for instances.")
context_asset_doc = context.data.get("assetEntity")
@@ -271,7 +271,7 @@ class CollectAnatomyInstanceData(pyblish.api.ContextPlugin):
instance_name = instance.data["name"]
instance_label = instance.data.get("label")
if instance_label:
- instance_name += "({})".format(instance_label)
+ instance_name += " ({})".format(instance_label)
self.log.debug("Anatomy data for instance {}: {}".format(
instance_name,
json.dumps(anatomy_data, indent=4)
diff --git a/openpype/plugins/publish/collect_anatomy_object.py b/openpype/plugins/publish/collect_anatomy_object.py
index 725cae2b14..f792cf3abd 100644
--- a/openpype/plugins/publish/collect_anatomy_object.py
+++ b/openpype/plugins/publish/collect_anatomy_object.py
@@ -30,6 +30,6 @@ class CollectAnatomyObject(pyblish.api.ContextPlugin):
context.data["anatomy"] = Anatomy(project_name)
- self.log.info(
+ self.log.debug(
"Anatomy object collected for project \"{}\".".format(project_name)
)
diff --git a/openpype/plugins/publish/collect_custom_staging_dir.py b/openpype/plugins/publish/collect_custom_staging_dir.py
index b749b251c0..669c4873e0 100644
--- a/openpype/plugins/publish/collect_custom_staging_dir.py
+++ b/openpype/plugins/publish/collect_custom_staging_dir.py
@@ -65,6 +65,6 @@ class CollectCustomStagingDir(pyblish.api.InstancePlugin):
else:
result_str = "Not adding"
- self.log.info("{} custom staging dir for instance with '{}'".format(
+ self.log.debug("{} custom staging dir for instance with '{}'".format(
result_str, family
))
diff --git a/openpype/plugins/publish/collect_from_create_context.py b/openpype/plugins/publish/collect_from_create_context.py
index 5fcf8feb56..4888476fff 100644
--- a/openpype/plugins/publish/collect_from_create_context.py
+++ b/openpype/plugins/publish/collect_from_create_context.py
@@ -92,5 +92,5 @@ class CollectFromCreateContext(pyblish.api.ContextPlugin):
instance.data["transientData"] = transient_data
- self.log.info("collected instance: {}".format(instance.data))
- self.log.info("parsing data: {}".format(in_data))
+ self.log.debug("collected instance: {}".format(instance.data))
+ self.log.debug("parsing data: {}".format(in_data))
diff --git a/openpype/plugins/publish/collect_rendered_files.py b/openpype/plugins/publish/collect_rendered_files.py
index 8f8d0a5eeb..6c8d1e9ca5 100644
--- a/openpype/plugins/publish/collect_rendered_files.py
+++ b/openpype/plugins/publish/collect_rendered_files.py
@@ -13,6 +13,7 @@ import json
import pyblish.api
from openpype.pipeline import legacy_io, KnownPublishError
+from openpype.pipeline.publish.lib import add_repre_files_for_cleanup
class CollectRenderedFiles(pyblish.api.ContextPlugin):
@@ -89,6 +90,7 @@ class CollectRenderedFiles(pyblish.api.ContextPlugin):
# now we can just add instances from json file and we are done
for instance_data in data.get("instances"):
+
self.log.info(" - processing instance for {}".format(
instance_data.get("subset")))
instance = self._context.create_instance(
@@ -107,6 +109,8 @@ class CollectRenderedFiles(pyblish.api.ContextPlugin):
self._fill_staging_dir(repre_data, anatomy)
representations.append(repre_data)
+ add_repre_files_for_cleanup(instance, repre_data)
+
instance.data["representations"] = representations
# add audio if in metadata data
@@ -157,6 +161,8 @@ class CollectRenderedFiles(pyblish.api.ContextPlugin):
os.environ.update(session_data)
session_is_set = True
self._process_path(data, anatomy)
+ context.data["cleanupFullPaths"].append(path)
+ context.data["cleanupEmptyDirs"].append(os.path.dirname(path))
except Exception as e:
self.log.error(e, exc_info=True)
raise Exception("Error") from e
diff --git a/openpype/plugins/publish/collect_scene_version.py b/openpype/plugins/publish/collect_scene_version.py
index fdbcb3cb9d..cd3231a07d 100644
--- a/openpype/plugins/publish/collect_scene_version.py
+++ b/openpype/plugins/publish/collect_scene_version.py
@@ -48,10 +48,13 @@ class CollectSceneVersion(pyblish.api.ContextPlugin):
if '' in filename:
return
+ self.log.debug(
+ "Collecting scene version from filename: {}".format(filename)
+ )
+
version = get_version_from_path(filename)
assert version, "Cannot determine version"
rootVersion = int(version)
context.data['version'] = rootVersion
- self.log.info("{}".format(type(rootVersion)))
self.log.info('Scene Version: %s' % context.data.get('version'))
diff --git a/openpype/plugins/publish/extract_burnin.py b/openpype/plugins/publish/extract_burnin.py
index 61961ce4ae..5552e2543a 100644
--- a/openpype/plugins/publish/extract_burnin.py
+++ b/openpype/plugins/publish/extract_burnin.py
@@ -19,6 +19,7 @@ from openpype.lib import (
should_convert_for_ffmpeg
)
from openpype.lib.profiles_filtering import filter_profiles
+from openpype.pipeline.publish.lib import add_repre_files_for_cleanup
class ExtractBurnin(publish.Extractor):
@@ -354,6 +355,8 @@ class ExtractBurnin(publish.Extractor):
# Add new representation to instance
instance.data["representations"].append(new_repre)
+ add_repre_files_for_cleanup(instance, new_repre)
+
# Cleanup temp staging dir after procesisng of output definitions
if do_convert:
temp_dir = repre["stagingDir"]
@@ -518,8 +521,8 @@ class ExtractBurnin(publish.Extractor):
"""
if "burnin" not in (repre.get("tags") or []):
- self.log.info((
- "Representation \"{}\" don't have \"burnin\" tag. Skipped."
+ self.log.debug((
+ "Representation \"{}\" does not have \"burnin\" tag. Skipped."
).format(repre["name"]))
return False
diff --git a/openpype/plugins/publish/extract_color_transcode.py b/openpype/plugins/publish/extract_color_transcode.py
index 58e0350a2e..45b10620d1 100644
--- a/openpype/plugins/publish/extract_color_transcode.py
+++ b/openpype/plugins/publish/extract_color_transcode.py
@@ -336,13 +336,13 @@ class ExtractOIIOTranscode(publish.Extractor):
if repre.get("ext") not in self.supported_exts:
self.log.debug((
- "Representation '{}' of unsupported extension. Skipped."
- ).format(repre["name"]))
+ "Representation '{}' has unsupported extension: '{}'. Skipped."
+ ).format(repre["name"], repre.get("ext")))
return False
if not repre.get("files"):
self.log.debug((
- "Representation '{}' have empty files. Skipped."
+ "Representation '{}' has empty files. Skipped."
).format(repre["name"]))
return False
diff --git a/openpype/plugins/publish/extract_review.py b/openpype/plugins/publish/extract_review.py
index d397ce8812..f053d1b500 100644
--- a/openpype/plugins/publish/extract_review.py
+++ b/openpype/plugins/publish/extract_review.py
@@ -23,7 +23,11 @@ from openpype.lib.transcoding import (
convert_input_paths_for_ffmpeg,
get_transcode_temp_directory,
)
-from openpype.pipeline.publish import KnownPublishError
+from openpype.pipeline.publish import (
+ KnownPublishError,
+ get_publish_instance_label,
+)
+from openpype.pipeline.publish.lib import add_repre_files_for_cleanup
class ExtractReview(pyblish.api.InstancePlugin):
@@ -93,8 +97,8 @@ class ExtractReview(pyblish.api.InstancePlugin):
host_name = instance.context.data["hostName"]
family = self.main_family_from_instance(instance)
- self.log.info("Host: \"{}\"".format(host_name))
- self.log.info("Family: \"{}\"".format(family))
+ self.log.debug("Host: \"{}\"".format(host_name))
+ self.log.debug("Family: \"{}\"".format(family))
profile = filter_profiles(
self.profiles,
@@ -203,17 +207,8 @@ class ExtractReview(pyblish.api.InstancePlugin):
return filtered_defs
- @staticmethod
- def get_instance_label(instance):
- return (
- getattr(instance, "label", None)
- or instance.data.get("label")
- or instance.data.get("name")
- or str(instance)
- )
-
def main_process(self, instance):
- instance_label = self.get_instance_label(instance)
+ instance_label = get_publish_instance_label(instance)
self.log.debug("Processing instance \"{}\"".format(instance_label))
profile_outputs = self._get_outputs_for_instance(instance)
if not profile_outputs:
@@ -352,7 +347,7 @@ class ExtractReview(pyblish.api.InstancePlugin):
temp_data = self.prepare_temp_data(instance, repre, output_def)
files_to_clean = []
if temp_data["input_is_sequence"]:
- self.log.info("Filling gaps in sequence.")
+ self.log.debug("Checking sequence to fill gaps in sequence..")
files_to_clean = self.fill_sequence_gaps(
files=temp_data["origin_repre"]["files"],
staging_dir=new_repre["stagingDir"],
@@ -426,6 +421,8 @@ class ExtractReview(pyblish.api.InstancePlugin):
)
instance.data["representations"].append(new_repre)
+ add_repre_files_for_cleanup(instance, new_repre)
+
def input_is_sequence(self, repre):
"""Deduce from representation data if input is sequence."""
# TODO GLOBAL ISSUE - Find better way how to find out if input
diff --git a/openpype/plugins/publish/extract_thumbnail.py b/openpype/plugins/publish/extract_thumbnail.py
index 54b933a76d..b98ab64f56 100644
--- a/openpype/plugins/publish/extract_thumbnail.py
+++ b/openpype/plugins/publish/extract_thumbnail.py
@@ -36,7 +36,7 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
).format(subset_name))
return
- self.log.info(
+ self.log.debug(
"Processing instance with subset name {}".format(subset_name)
)
@@ -89,13 +89,13 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
src_staging = os.path.normpath(repre["stagingDir"])
full_input_path = os.path.join(src_staging, input_file)
- self.log.info("input {}".format(full_input_path))
+ self.log.debug("input {}".format(full_input_path))
filename = os.path.splitext(input_file)[0]
jpeg_file = filename + "_thumb.jpg"
full_output_path = os.path.join(dst_staging, jpeg_file)
if oiio_supported:
- self.log.info("Trying to convert with OIIO")
+ self.log.debug("Trying to convert with OIIO")
# If the input can read by OIIO then use OIIO method for
# conversion otherwise use ffmpeg
thumbnail_created = self.create_thumbnail_oiio(
@@ -148,7 +148,7 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
def _already_has_thumbnail(self, repres):
for repre in repres:
- self.log.info("repre {}".format(repre))
+ self.log.debug("repre {}".format(repre))
if repre["name"] == "thumbnail":
return True
return False
@@ -173,20 +173,20 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
return filtered_repres
def create_thumbnail_oiio(self, src_path, dst_path):
- self.log.info("outputting {}".format(dst_path))
+ self.log.info("Extracting thumbnail {}".format(dst_path))
oiio_tool_path = get_oiio_tools_path()
oiio_cmd = [
oiio_tool_path,
"-a", src_path,
"-o", dst_path
]
- self.log.info("running: {}".format(" ".join(oiio_cmd)))
+ self.log.debug("running: {}".format(" ".join(oiio_cmd)))
try:
run_subprocess(oiio_cmd, logger=self.log)
return True
except Exception:
self.log.warning(
- "Failed to create thubmnail using oiiotool",
+ "Failed to create thumbnail using oiiotool",
exc_info=True
)
return False
diff --git a/openpype/plugins/publish/extract_thumbnail_from_source.py b/openpype/plugins/publish/extract_thumbnail_from_source.py
index a92f762cde..a9c95d6065 100644
--- a/openpype/plugins/publish/extract_thumbnail_from_source.py
+++ b/openpype/plugins/publish/extract_thumbnail_from_source.py
@@ -39,7 +39,7 @@ class ExtractThumbnailFromSource(pyblish.api.InstancePlugin):
self._create_context_thumbnail(instance.context)
subset_name = instance.data["subset"]
- self.log.info(
+ self.log.debug(
"Processing instance with subset name {}".format(subset_name)
)
thumbnail_source = instance.data.get("thumbnailSource")
@@ -104,7 +104,7 @@ class ExtractThumbnailFromSource(pyblish.api.InstancePlugin):
full_output_path = os.path.join(dst_staging, dst_filename)
if oiio_supported:
- self.log.info("Trying to convert with OIIO")
+ self.log.debug("Trying to convert with OIIO")
# If the input can read by OIIO then use OIIO method for
# conversion otherwise use ffmpeg
thumbnail_created = self.create_thumbnail_oiio(
diff --git a/openpype/plugins/publish/integrate.py b/openpype/plugins/publish/integrate.py
index 8e984a9e97..f392cf67f7 100644
--- a/openpype/plugins/publish/integrate.py
+++ b/openpype/plugins/publish/integrate.py
@@ -267,7 +267,7 @@ class IntegrateAsset(pyblish.api.InstancePlugin):
instance_stagingdir = instance.data.get("stagingDir")
if not instance_stagingdir:
- self.log.info((
+ self.log.debug((
"{0} is missing reference to staging directory."
" Will try to get it from representation."
).format(instance))
@@ -480,7 +480,7 @@ class IntegrateAsset(pyblish.api.InstancePlugin):
update_data
)
- self.log.info("Prepared subset: {}".format(subset_name))
+ self.log.debug("Prepared subset: {}".format(subset_name))
return subset_doc
def prepare_version(self, instance, op_session, subset_doc, project_name):
@@ -521,7 +521,9 @@ class IntegrateAsset(pyblish.api.InstancePlugin):
project_name, version_doc["type"], version_doc
)
- self.log.info("Prepared version: v{0:03d}".format(version_doc["name"]))
+ self.log.debug(
+ "Prepared version: v{0:03d}".format(version_doc["name"])
+ )
return version_doc
diff --git a/openpype/plugins/publish/integrate_legacy.py b/openpype/plugins/publish/integrate_legacy.py
index c67ce62bf6..c238cca633 100644
--- a/openpype/plugins/publish/integrate_legacy.py
+++ b/openpype/plugins/publish/integrate_legacy.py
@@ -147,7 +147,9 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin):
def process(self, instance):
if instance.data.get("processedWithNewIntegrator"):
- self.log.info("Instance was already processed with new integrator")
+ self.log.debug(
+ "Instance was already processed with new integrator"
+ )
return
for ef in self.exclude_families:
@@ -274,7 +276,7 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin):
stagingdir = instance.data.get("stagingDir")
if not stagingdir:
- self.log.info((
+ self.log.debug((
"{0} is missing reference to staging directory."
" Will try to get it from representation."
).format(instance))
diff --git a/openpype/plugins/publish/integrate_thumbnail.py b/openpype/plugins/publish/integrate_thumbnail.py
index 16cc47d432..2e87d8fc86 100644
--- a/openpype/plugins/publish/integrate_thumbnail.py
+++ b/openpype/plugins/publish/integrate_thumbnail.py
@@ -20,6 +20,7 @@ import pyblish.api
from openpype.client import get_versions
from openpype.client.operations import OperationsSession, new_thumbnail_doc
+from openpype.pipeline.publish import get_publish_instance_label
InstanceFilterResult = collections.namedtuple(
"InstanceFilterResult",
@@ -41,7 +42,7 @@ class IntegrateThumbnails(pyblish.api.ContextPlugin):
# Filter instances which can be used for integration
filtered_instance_items = self._prepare_instances(context)
if not filtered_instance_items:
- self.log.info(
+ self.log.debug(
"All instances were filtered. Thumbnail integration skipped."
)
return
@@ -133,7 +134,7 @@ class IntegrateThumbnails(pyblish.api.ContextPlugin):
filtered_instances = []
for instance in context:
- instance_label = self._get_instance_label(instance)
+ instance_label = get_publish_instance_label(instance)
# Skip instances without published representations
# - there is no place where to put the thumbnail
published_repres = instance.data.get("published_representations")
@@ -162,7 +163,7 @@ class IntegrateThumbnails(pyblish.api.ContextPlugin):
# Skip instance if thumbnail path is not available for it
if not thumbnail_path:
- self.log.info((
+ self.log.debug((
"Skipping thumbnail integration for instance \"{}\"."
" Instance and context"
" thumbnail paths are not available."
@@ -248,7 +249,7 @@ class IntegrateThumbnails(pyblish.api.ContextPlugin):
for instance_item in filtered_instance_items:
instance, thumbnail_path, version_id = instance_item
- instance_label = self._get_instance_label(instance)
+ instance_label = get_publish_instance_label(instance)
version_doc = version_docs_by_str_id.get(version_id)
if not version_doc:
self.log.warning((
@@ -339,10 +340,3 @@ class IntegrateThumbnails(pyblish.api.ContextPlugin):
))
op_session.commit()
-
- def _get_instance_label(self, instance):
- return (
- instance.data.get("label")
- or instance.data.get("name")
- or "N/A"
- )
diff --git a/openpype/settings/defaults/project_settings/deadline.json b/openpype/settings/defaults/project_settings/deadline.json
index fdd70f1a44..1b8c8397d7 100644
--- a/openpype/settings/defaults/project_settings/deadline.json
+++ b/openpype/settings/defaults/project_settings/deadline.json
@@ -45,6 +45,15 @@
"chunk_size": 10,
"group": "none"
},
+ "FusionSubmitDeadline": {
+ "enabled": true,
+ "optional": false,
+ "active": true,
+ "priority": 50,
+ "chunk_size": 10,
+ "concurrent_tasks": 1,
+ "group": ""
+ },
"NukeSubmitDeadline": {
"enabled": true,
"optional": false,
@@ -114,6 +123,9 @@
],
"max": [
".*"
+ ],
+ "fusion": [
+ ".*"
]
}
}
diff --git a/openpype/settings/defaults/project_settings/nuke.json b/openpype/settings/defaults/project_settings/nuke.json
index 85dee73176..f01bdf7d50 100644
--- a/openpype/settings/defaults/project_settings/nuke.json
+++ b/openpype/settings/defaults/project_settings/nuke.json
@@ -358,12 +358,12 @@
"optional": true,
"active": true
},
- "ValidateGizmo": {
+ "ValidateBackdrop": {
"enabled": true,
"optional": true,
"active": true
},
- "ValidateBackdrop": {
+ "ValidateGizmo": {
"enabled": true,
"optional": true,
"active": true
@@ -401,7 +401,39 @@
false
]
]
- }
+ },
+ "reposition_nodes": [
+ {
+ "node_class": "Reformat",
+ "knobs": [
+ {
+ "type": "text",
+ "name": "type",
+ "value": "to format"
+ },
+ {
+ "type": "text",
+ "name": "format",
+ "value": "HD_1080"
+ },
+ {
+ "type": "text",
+ "name": "filter",
+ "value": "Lanczos6"
+ },
+ {
+ "type": "bool",
+ "name": "black_outside",
+ "value": true
+ },
+ {
+ "type": "bool",
+ "name": "pbb",
+ "value": false
+ }
+ ]
+ }
+ ]
},
"ExtractReviewData": {
"enabled": false
diff --git a/openpype/settings/defaults/system_settings/applications.json b/openpype/settings/defaults/system_settings/applications.json
index b492bb9321..f2fc7d933a 100644
--- a/openpype/settings/defaults/system_settings/applications.json
+++ b/openpype/settings/defaults/system_settings/applications.json
@@ -1069,8 +1069,8 @@
"RESOLVE_UTILITY_SCRIPTS_SOURCE_DIR": [],
"RESOLVE_PYTHON3_HOME": {
"windows": "{LOCALAPPDATA}/Programs/Python/Python36",
- "darwin": "~/Library/Python/3.6/bin",
- "linux": "/opt/Python/3.6/bin"
+ "darwin": "/Library/Frameworks/Python.framework/Versions/3.6",
+ "linux": "/opt/Python/3.6"
}
},
"variants": {
diff --git a/openpype/settings/entities/lib.py b/openpype/settings/entities/lib.py
index 1c7dc9bed0..93abc27b0e 100644
--- a/openpype/settings/entities/lib.py
+++ b/openpype/settings/entities/lib.py
@@ -323,7 +323,10 @@ class SchemasHub:
filled_template = self._fill_template(
schema_data, template_def
)
- return filled_template
+ new_template_def = []
+ for item in filled_template:
+ new_template_def.extend(self.resolve_schema_data(item))
+ return new_template_def
def create_schema_object(self, schema_data, *args, **kwargs):
"""Create entity for passed schema data.
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 d8b5e4dc1f..6d59b5a92b 100644
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json
@@ -248,6 +248,50 @@
}
]
},
+ {
+ "type": "dict",
+ "collapsible": true,
+ "key": "FusionSubmitDeadline",
+ "label": "Fusion submit to Deadline",
+ "checkbox_key": "enabled",
+ "children": [
+ {
+ "type": "boolean",
+ "key": "enabled",
+ "label": "Enabled"
+ },
+ {
+ "type": "boolean",
+ "key": "optional",
+ "label": "Optional"
+ },
+ {
+ "type": "boolean",
+ "key": "active",
+ "label": "Active"
+ },
+ {
+ "type": "number",
+ "key": "priority",
+ "label": "Priority"
+ },
+ {
+ "type": "number",
+ "key": "chunk_size",
+ "label": "Frame per Task"
+ },
+ {
+ "type": "number",
+ "key": "concurrent_tasks",
+ "label": "Number of concurrent tasks"
+ },
+ {
+ "type": "text",
+ "key": "group",
+ "label": "Group Name"
+ }
+ ]
+ },
{
"type": "dict",
"collapsible": true,
diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_nuke_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_nuke_publish.json
index ce9fa04c6a..3019c9b1b5 100644
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_nuke_publish.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_nuke_publish.json
@@ -158,10 +158,43 @@
"label": "Nodes",
"collapsible": true,
"children": [
+ {
+ "type": "label",
+ "label": "Nodes attribute will be deprecated in future releases. Use reposition_nodes instead."
+ },
{
"type": "raw-json",
"key": "nodes",
- "label": "Nodes"
+ "label": "Nodes [depricated]"
+ },
+ {
+ "type": "label",
+ "label": "Reposition knobs supported only. You can add multiple reformat nodes
and set their knobs. Order of reformat nodes is important. First reformat node
will be applied first and last reformat node will be applied last."
+ },
+ {
+ "key": "reposition_nodes",
+ "type": "list",
+ "label": "Reposition nodes",
+ "object_type": {
+ "type": "dict",
+ "children": [
+ {
+ "key": "node_class",
+ "label": "Node class",
+ "type": "text"
+ },
+ {
+ "type": "schema_template",
+ "name": "template_nuke_knob_inputs",
+ "template_data": [
+ {
+ "label": "Node knobs",
+ "key": "knobs"
+ }
+ ]
+ }
+ ]
+ }
}
]
}
diff --git a/openpype/style/data.json b/openpype/style/data.json
index bea2a3d407..7389387d97 100644
--- a/openpype/style/data.json
+++ b/openpype/style/data.json
@@ -26,8 +26,8 @@
"bg": "#2C313A",
"bg-inputs": "#21252B",
- "bg-buttons": "#434a56",
- "bg-button-hover": "rgb(81, 86, 97)",
+ "bg-buttons": "rgb(67, 74, 86)",
+ "bg-buttons-hover": "rgb(81, 86, 97)",
"bg-inputs-disabled": "#2C313A",
"bg-buttons-disabled": "#434a56",
@@ -66,7 +66,9 @@
"bg-success": "#458056",
"bg-success-hover": "#55a066",
"bg-error": "#AD2E2E",
- "bg-error-hover": "#C93636"
+ "bg-error-hover": "#C93636",
+ "bg-info": "rgb(63, 98, 121)",
+ "bg-info-hover": "rgb(81, 146, 181)"
},
"tab-widget": {
"bg": "#21252B",
@@ -94,6 +96,7 @@
"crash": "#FF6432",
"success": "#458056",
"warning": "#ffc671",
+ "progress": "rgb(194, 226, 236)",
"tab-bg": "#16191d",
"list-view-group": {
"bg": "#434a56",
diff --git a/openpype/style/style.css b/openpype/style/style.css
index 827b103f94..5ce55aa658 100644
--- a/openpype/style/style.css
+++ b/openpype/style/style.css
@@ -136,7 +136,7 @@ QPushButton {
}
QPushButton:hover {
- background: {color:bg-button-hover};
+ background: {color:bg-buttons-hover};
color: {color:font-hover};
}
@@ -166,7 +166,7 @@ QToolButton {
}
QToolButton:hover {
- background: {color:bg-button-hover};
+ background: {color:bg-buttons-hover};
color: {color:font-hover};
}
@@ -722,6 +722,13 @@ OverlayMessageWidget[type="error"]:hover {
background: {color:overlay-messages:bg-error-hover};
}
+OverlayMessageWidget[type="info"] {
+ background: {color:overlay-messages:bg-info};
+}
+OverlayMessageWidget[type="info"]:hover {
+ background: {color:overlay-messages:bg-info-hover};
+}
+
OverlayMessageWidget QWidget {
background: transparent;
}
@@ -749,10 +756,11 @@ OverlayMessageWidget QWidget {
}
#InfoText {
- padding-left: 30px;
- padding-top: 20px;
+ padding-left: 0px;
+ padding-top: 0px;
+ padding-right: 20px;
background: transparent;
- border: 1px solid {color:border};
+ border: none;
}
#TypeEditor, #ToolEditor, #NameEditor, #NumberEditor {
@@ -914,7 +922,7 @@ PixmapButton{
background: {color:bg-buttons};
}
PixmapButton:hover {
- background: {color:bg-button-hover};
+ background: {color:bg-buttons-hover};
}
PixmapButton:disabled {
background: {color:bg-buttons-disabled};
@@ -925,7 +933,7 @@ PixmapButton:disabled {
background: {color:bg-view};
}
#ThumbnailPixmapHoverButton:hover {
- background: {color:bg-button-hover};
+ background: {color:bg-buttons-hover};
}
#CreatorDetailedDescription {
@@ -946,7 +954,7 @@ PixmapButton:disabled {
}
#CreateDialogHelpButton:hover {
- background: {color:bg-button-hover};
+ background: {color:bg-buttons-hover};
}
#CreateDialogHelpButton QWidget {
background: transparent;
@@ -1005,7 +1013,7 @@ PixmapButton:disabled {
border-radius: 0.2em;
}
#CardViewWidget:hover {
- background: {color:bg-button-hover};
+ background: {color:bg-buttons-hover};
}
#CardViewWidget[state="selected"] {
background: {color:bg-view-selection};
@@ -1032,7 +1040,7 @@ PixmapButton:disabled {
}
#PublishInfoFrame[state="3"], #PublishInfoFrame[state="4"] {
- background: rgb(194, 226, 236);
+ background: {color:publisher:progress};
}
#PublishInfoFrame QLabel {
@@ -1040,6 +1048,11 @@ PixmapButton:disabled {
font-style: bold;
}
+#PublishReportHeader {
+ font-size: 14pt;
+ font-weight: bold;
+}
+
#PublishInfoMainLabel {
font-size: 12pt;
}
@@ -1060,7 +1073,7 @@ ValidationArtistMessage QLabel {
}
#ValidationActionButton:hover {
- background: {color:bg-button-hover};
+ background: {color:bg-buttons-hover};
color: {color:font-hover};
}
@@ -1090,6 +1103,35 @@ ValidationArtistMessage QLabel {
border-left: 1px solid {color:border};
}
+#PublishInstancesDetails {
+ border: 1px solid {color:border};
+ border-radius: 0.3em;
+}
+
+#InstancesLogsView {
+ border: 1px solid {color:border};
+ background: {color:bg-view};
+ border-radius: 0.3em;
+}
+
+#PublishLogMessage {
+ font-family: "Noto Sans Mono";
+}
+
+#PublishInstanceLogsLabel {
+ font-weight: bold;
+}
+
+#PublishCrashMainLabel{
+ font-weight: bold;
+ font-size: 16pt;
+}
+
+#PublishCrashReportLabel {
+ font-weight: bold;
+ font-size: 13pt;
+}
+
#AssetNameInputWidget {
background: {color:bg-inputs};
border: 1px solid {color:border};
diff --git a/openpype/tools/attribute_defs/files_widget.py b/openpype/tools/attribute_defs/files_widget.py
index 067866035f..076b33fb7c 100644
--- a/openpype/tools/attribute_defs/files_widget.py
+++ b/openpype/tools/attribute_defs/files_widget.py
@@ -198,29 +198,33 @@ class DropEmpty(QtWidgets.QWidget):
def paintEvent(self, event):
super(DropEmpty, self).paintEvent(event)
- painter = QtGui.QPainter(self)
+
pen = QtGui.QPen()
- pen.setWidth(1)
pen.setBrush(QtCore.Qt.darkGray)
pen.setStyle(QtCore.Qt.DashLine)
- painter.setPen(pen)
- content_margins = self.layout().contentsMargins()
+ pen.setWidth(1)
- left_m = content_margins.left()
- top_m = content_margins.top()
- rect = QtCore.QRect(
+ content_margins = self.layout().contentsMargins()
+ rect = self.rect()
+ left_m = content_margins.left() + pen.width()
+ top_m = content_margins.top() + pen.width()
+ new_rect = QtCore.QRect(
left_m,
top_m,
(
- self.rect().width()
+ rect.width()
- (left_m + content_margins.right() + pen.width())
),
(
- self.rect().height()
+ rect.height()
- (top_m + content_margins.bottom() + pen.width())
)
)
- painter.drawRect(rect)
+
+ painter = QtGui.QPainter(self)
+ painter.setRenderHint(QtGui.QPainter.Antialiasing)
+ painter.setPen(pen)
+ painter.drawRect(new_rect)
class FilesModel(QtGui.QStandardItemModel):
diff --git a/openpype/tools/publisher/constants.py b/openpype/tools/publisher/constants.py
index 660fccecf1..4630eb144b 100644
--- a/openpype/tools/publisher/constants.py
+++ b/openpype/tools/publisher/constants.py
@@ -35,9 +35,13 @@ ResetKeySequence = QtGui.QKeySequence(
__all__ = (
"CONTEXT_ID",
+ "CONTEXT_LABEL",
"VARIANT_TOOLTIP",
+ "INPUTS_LAYOUT_HSPACING",
+ "INPUTS_LAYOUT_VSPACING",
+
"INSTANCE_ID_ROLE",
"SORT_VALUE_ROLE",
"IS_GROUP_ROLE",
@@ -47,4 +51,6 @@ __all__ = (
"FAMILY_ROLE",
"GROUP_ROLE",
"CONVERTER_IDENTIFIER_ROLE",
+
+ "ResetKeySequence",
)
diff --git a/openpype/tools/publisher/control.py b/openpype/tools/publisher/control.py
index 4b083d4bc8..89c2343ef7 100644
--- a/openpype/tools/publisher/control.py
+++ b/openpype/tools/publisher/control.py
@@ -40,6 +40,7 @@ from openpype.pipeline.create.context import (
CreatorsOperationFailed,
ConvertorsOperationFailed,
)
+from openpype.pipeline.publish import get_publish_instance_label
# Define constant for plugin orders offset
PLUGIN_ORDER_OFFSET = 0.5
@@ -47,6 +48,7 @@ PLUGIN_ORDER_OFFSET = 0.5
class CardMessageTypes:
standard = None
+ info = "info"
error = "error"
@@ -220,7 +222,12 @@ class PublishReportMaker:
def _add_plugin_data_item(self, plugin):
if plugin in self._stored_plugins:
- raise ValueError("Plugin is already stored")
+ # A plugin would be processed more than once. What can cause it:
+ # - there is a bug in controller
+ # - plugin class is imported into multiple files
+ # - this can happen even with base classes from 'pyblish'
+ raise ValueError(
+ "Plugin '{}' is already stored".format(str(plugin)))
self._stored_plugins.append(plugin)
@@ -239,6 +246,7 @@ class PublishReportMaker:
label = plugin.label
return {
+ "id": plugin.id,
"name": plugin.__name__,
"label": label,
"order": plugin.order,
@@ -324,7 +332,7 @@ class PublishReportMaker:
"instances": instances_details,
"context": self._extract_context_data(self._current_context),
"crashed_file_paths": crashed_file_paths,
- "id": str(uuid.uuid4()),
+ "id": uuid.uuid4().hex,
"report_version": "1.0.0"
}
@@ -339,10 +347,12 @@ class PublishReportMaker:
def _extract_instance_data(self, instance, exists):
return {
"name": instance.data.get("name"),
- "label": instance.data.get("label"),
+ "label": get_publish_instance_label(instance),
"family": instance.data["family"],
"families": instance.data.get("families") or [],
- "exists": exists
+ "exists": exists,
+ "creator_identifier": instance.data.get("creator_identifier"),
+ "instance_id": instance.data.get("instance_id"),
}
def _extract_instance_log_items(self, result):
@@ -388,8 +398,11 @@ class PublishReportMaker:
exception = result.get("error")
if exception:
fname, line_no, func, exc = exception.traceback
+ # Action result does not have 'is_validation_error'
+ is_validation_error = result.get("is_validation_error", False)
output.append({
"type": "error",
+ "is_validation_error": is_validation_error,
"msg": str(exception),
"filename": str(fname),
"lineno": str(line_no),
@@ -426,13 +439,15 @@ class PublishPluginsProxy:
plugin_id = plugin.id
plugins_by_id[plugin_id] = plugin
- action_ids = set()
+ action_ids = []
action_ids_by_plugin_id[plugin_id] = action_ids
actions = getattr(plugin, "actions", None) or []
for action in actions:
action_id = action.id
- action_ids.add(action_id)
+ if action_id in actions_by_id:
+ continue
+ action_ids.append(action_id)
actions_by_id[action_id] = action
self._plugins_by_id = plugins_by_id
@@ -461,7 +476,7 @@ class PublishPluginsProxy:
return plugin.id
def get_plugin_action_items(self, plugin_id):
- """Get plugin action items for plugin by it's id.
+ """Get plugin action items for plugin by its id.
Args:
plugin_id (str): Publish plugin id.
@@ -568,7 +583,7 @@ class ValidationErrorItem:
context_validation,
title,
description,
- detail,
+ detail
):
self.instance_id = instance_id
self.instance_label = instance_label
@@ -677,6 +692,8 @@ class PublishValidationErrorsReport:
for title in titles:
grouped_error_items.append({
+ "id": uuid.uuid4().hex,
+ "plugin_id": plugin_id,
"plugin_action_items": list(plugin_action_items),
"error_items": error_items_by_title[title],
"title": title
@@ -2379,7 +2396,8 @@ class PublisherController(BasePublisherController):
yield MainThreadItem(self.stop_publish)
# Add plugin to publish report
- self._publish_report.add_plugin_iter(plugin, self._publish_context)
+ self._publish_report.add_plugin_iter(
+ plugin, self._publish_context)
# WARNING This is hack fix for optional plugins
if not self._is_publish_plugin_active(plugin):
@@ -2461,14 +2479,14 @@ class PublisherController(BasePublisherController):
plugin, self._publish_context, instance
)
- self._publish_report.add_result(result)
-
exception = result.get("error")
if exception:
+ has_validation_error = False
if (
isinstance(exception, PublishValidationError)
and not self.publish_has_validated
):
+ has_validation_error = True
self._add_validation_error(result)
else:
@@ -2482,6 +2500,10 @@ class PublisherController(BasePublisherController):
self.publish_error_msg = msg
self.publish_has_crashed = True
+ result["is_validation_error"] = has_validation_error
+
+ self._publish_report.add_result(result)
+
self._publish_next_process()
diff --git a/openpype/tools/publisher/publish_report_viewer/widgets.py b/openpype/tools/publisher/publish_report_viewer/widgets.py
index dc449b6b69..02c9b63a4e 100644
--- a/openpype/tools/publisher/publish_report_viewer/widgets.py
+++ b/openpype/tools/publisher/publish_report_viewer/widgets.py
@@ -163,7 +163,11 @@ class ZoomPlainText(QtWidgets.QPlainTextEdit):
super(ZoomPlainText, self).wheelEvent(event)
return
- degrees = float(event.delta()) / 8
+ if hasattr(event, "angleDelta"):
+ delta = event.angleDelta().y()
+ else:
+ delta = event.delta()
+ degrees = float(delta) / 8
steps = int(ceil(degrees / 5))
self._scheduled_scalings += steps
if (self._scheduled_scalings * steps < 0):
diff --git a/openpype/tools/publisher/widgets/__init__.py b/openpype/tools/publisher/widgets/__init__.py
index f18e6cc61e..87a5f3914a 100644
--- a/openpype/tools/publisher/widgets/__init__.py
+++ b/openpype/tools/publisher/widgets/__init__.py
@@ -18,7 +18,7 @@ from .help_widget import (
from .publish_frame import PublishFrame
from .tabs_widget import PublisherTabsWidget
from .overview_widget import OverviewWidget
-from .validations_widget import ValidationsWidget
+from .report_page import ReportPageWidget
__all__ = (
@@ -40,5 +40,5 @@ __all__ = (
"PublisherTabsWidget",
"OverviewWidget",
- "ValidationsWidget",
+ "ReportPageWidget",
)
diff --git a/openpype/tools/publisher/widgets/card_view_widgets.py b/openpype/tools/publisher/widgets/card_view_widgets.py
index 13715bc73c..eae8e0420a 100644
--- a/openpype/tools/publisher/widgets/card_view_widgets.py
+++ b/openpype/tools/publisher/widgets/card_view_widgets.py
@@ -93,7 +93,7 @@ class BaseGroupWidget(QtWidgets.QWidget):
return self._group
def get_widget_by_item_id(self, item_id):
- """Get instance widget by it's id."""
+ """Get instance widget by its id."""
return self._widgets_by_id.get(item_id)
@@ -702,8 +702,8 @@ class InstanceCardView(AbstractInstanceView):
for group_name in sorted_group_names:
group_icons = {
- idenfier: self._controller.get_creator_icon(idenfier)
- for idenfier in identifiers_by_group[group_name]
+ identifier: self._controller.get_creator_icon(identifier)
+ for identifier in identifiers_by_group[group_name]
}
if group_name in self._widgets_by_group:
group_widget = self._widgets_by_group[group_name]
diff --git a/openpype/tools/publisher/widgets/images/error.png b/openpype/tools/publisher/widgets/images/error.png
new file mode 100644
index 0000000000..7b09a57d7d
Binary files /dev/null and b/openpype/tools/publisher/widgets/images/error.png differ
diff --git a/openpype/tools/publisher/widgets/images/success.png b/openpype/tools/publisher/widgets/images/success.png
new file mode 100644
index 0000000000..291b442df4
Binary files /dev/null and b/openpype/tools/publisher/widgets/images/success.png differ
diff --git a/openpype/tools/publisher/widgets/images/warning.png b/openpype/tools/publisher/widgets/images/warning.png
index 76d1e34b6c..531f62b741 100644
Binary files a/openpype/tools/publisher/widgets/images/warning.png and b/openpype/tools/publisher/widgets/images/warning.png differ
diff --git a/openpype/tools/publisher/widgets/publish_frame.py b/openpype/tools/publisher/widgets/publish_frame.py
index e4e6740532..d423f97047 100644
--- a/openpype/tools/publisher/widgets/publish_frame.py
+++ b/openpype/tools/publisher/widgets/publish_frame.py
@@ -310,7 +310,7 @@ class PublishFrame(QtWidgets.QWidget):
self._set_success_property()
self._set_progress_visibility(True)
- self._main_label.setText("Hit publish (play button)! If you want")
+ self._main_label.setText("")
self._message_label_top.setText("")
self._reset_btn.setEnabled(True)
@@ -331,6 +331,7 @@ class PublishFrame(QtWidgets.QWidget):
self._set_success_property(3)
self._set_progress_visibility(True)
self._set_main_label("Publishing...")
+ self._message_label_top.setText("")
self._reset_btn.setEnabled(False)
self._stop_btn.setEnabled(True)
@@ -468,45 +469,14 @@ class PublishFrame(QtWidgets.QWidget):
widget.setProperty("state", state)
widget.style().polish(widget)
- def _copy_report(self):
- logs = self._controller.get_publish_report()
- logs_string = json.dumps(logs, indent=4)
-
- mime_data = QtCore.QMimeData()
- mime_data.setText(logs_string)
- QtWidgets.QApplication.instance().clipboard().setMimeData(
- mime_data
- )
-
- def _export_report(self):
- default_filename = "publish-report-{}".format(
- time.strftime("%y%m%d-%H-%M")
- )
- default_filepath = os.path.join(
- os.path.expanduser("~"),
- default_filename
- )
- new_filepath, ext = QtWidgets.QFileDialog.getSaveFileName(
- self, "Save report", default_filepath, ".json"
- )
- if not ext or not new_filepath:
- return
-
- logs = self._controller.get_publish_report()
- full_path = new_filepath + ext
- dir_path = os.path.dirname(full_path)
- if not os.path.exists(dir_path):
- os.makedirs(dir_path)
-
- with open(full_path, "w") as file_stream:
- json.dump(logs, file_stream)
-
def _on_report_triggered(self, identifier):
if identifier == "export_report":
- self._export_report()
+ self._controller.event_system.emit(
+ "export_report.request", {}, "publish_frame")
elif identifier == "copy_report":
- self._copy_report()
+ self._controller.event_system.emit(
+ "copy_report.request", {}, "publish_frame")
elif identifier == "go_to_report":
self.details_page_requested.emit()
diff --git a/openpype/tools/publisher/widgets/report_page.py b/openpype/tools/publisher/widgets/report_page.py
new file mode 100644
index 0000000000..50a619f0a8
--- /dev/null
+++ b/openpype/tools/publisher/widgets/report_page.py
@@ -0,0 +1,1876 @@
+# -*- coding: utf-8 -*-
+import collections
+import logging
+
+try:
+ import commonmark
+except Exception:
+ commonmark = None
+
+from qtpy import QtWidgets, QtCore, QtGui
+
+from openpype.style import get_objected_colors
+from openpype.tools.utils import (
+ BaseClickableFrame,
+ ClickableFrame,
+ ExpandingTextEdit,
+ FlowLayout,
+ ClassicExpandBtn,
+ paint_image_with_color,
+ SeparatorWidget,
+)
+from .widgets import IconValuePixmapLabel
+from .icons import (
+ get_pixmap,
+ get_image,
+)
+from ..constants import (
+ INSTANCE_ID_ROLE,
+ CONTEXT_ID,
+ CONTEXT_LABEL,
+)
+
+LOG_DEBUG_VISIBLE = 1 << 0
+LOG_INFO_VISIBLE = 1 << 1
+LOG_WARNING_VISIBLE = 1 << 2
+LOG_ERROR_VISIBLE = 1 << 3
+LOG_CRITICAL_VISIBLE = 1 << 4
+ERROR_VISIBLE = 1 << 5
+INFO_VISIBLE = 1 << 6
+
+
+class VerticalScrollArea(QtWidgets.QScrollArea):
+ """Scroll area for validation error titles.
+
+ The biggest difference is that the scroll area has scroll bar on left side
+ and resize of content will also resize scrollarea itself.
+
+ Resize if deferred by 100ms because at the moment of resize are not yet
+ propagated sizes and visibility of scroll bars.
+ """
+
+ def __init__(self, *args, **kwargs):
+ super(VerticalScrollArea, self).__init__(*args, **kwargs)
+
+ self.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
+ self.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded)
+ self.setLayoutDirection(QtCore.Qt.RightToLeft)
+
+ self.setAttribute(QtCore.Qt.WA_TranslucentBackground)
+ # Background of scrollbar will be transparent
+ scrollbar_bg = self.verticalScrollBar().parent()
+ if scrollbar_bg:
+ scrollbar_bg.setAttribute(QtCore.Qt.WA_TranslucentBackground)
+ self.setViewportMargins(0, 0, 0, 0)
+
+ self.verticalScrollBar().installEventFilter(self)
+
+ # Timer with 100ms offset after changing size
+ size_changed_timer = QtCore.QTimer()
+ size_changed_timer.setInterval(100)
+ size_changed_timer.setSingleShot(True)
+
+ size_changed_timer.timeout.connect(self._on_timer_timeout)
+ self._size_changed_timer = size_changed_timer
+
+ def setVerticalScrollBar(self, widget):
+ old_widget = self.verticalScrollBar()
+ if old_widget:
+ old_widget.removeEventFilter(self)
+
+ super(VerticalScrollArea, self).setVerticalScrollBar(widget)
+ if widget:
+ widget.installEventFilter(self)
+
+ def setWidget(self, widget):
+ old_widget = self.widget()
+ if old_widget:
+ old_widget.removeEventFilter(self)
+
+ super(VerticalScrollArea, self).setWidget(widget)
+ if widget:
+ widget.installEventFilter(self)
+
+ def _on_timer_timeout(self):
+ width = self.widget().width()
+ if self.verticalScrollBar().isVisible():
+ width += self.verticalScrollBar().width()
+ self.setMinimumWidth(width)
+
+ def eventFilter(self, obj, event):
+ if (
+ event.type() == QtCore.QEvent.Resize
+ and (obj is self.widget() or obj is self.verticalScrollBar())
+ ):
+ self._size_changed_timer.start()
+ return super(VerticalScrollArea, self).eventFilter(obj, event)
+
+
+# --- Publish actions widget ---
+class ActionButton(BaseClickableFrame):
+ """Plugin's action callback button.
+
+ Action may have label or icon or both.
+
+ Args:
+ plugin_action_item (PublishPluginActionItem): Action item that can be
+ triggered by its id.
+ """
+
+ action_clicked = QtCore.Signal(str, str)
+
+ def __init__(self, plugin_action_item, parent):
+ super(ActionButton, self).__init__(parent)
+
+ self.setObjectName("ValidationActionButton")
+
+ self.plugin_action_item = plugin_action_item
+
+ action_label = plugin_action_item.label
+ action_icon = plugin_action_item.icon
+ label_widget = QtWidgets.QLabel(action_label, self)
+ icon_label = None
+ if action_icon:
+ icon_label = IconValuePixmapLabel(action_icon, self)
+
+ layout = QtWidgets.QHBoxLayout(self)
+ layout.setContentsMargins(5, 0, 5, 0)
+ layout.addWidget(label_widget, 1)
+ if icon_label:
+ layout.addWidget(icon_label, 0)
+
+ self.setSizePolicy(
+ QtWidgets.QSizePolicy.Minimum,
+ self.sizePolicy().verticalPolicy()
+ )
+
+ def _mouse_release_callback(self):
+ self.action_clicked.emit(
+ self.plugin_action_item.plugin_id,
+ self.plugin_action_item.action_id
+ )
+
+
+class ValidateActionsWidget(QtWidgets.QFrame):
+ """Wrapper widget for plugin actions.
+
+ Change actions based on selected validation error.
+ """
+
+ def __init__(self, controller, parent):
+ super(ValidateActionsWidget, self).__init__(parent)
+
+ self.setAttribute(QtCore.Qt.WA_TranslucentBackground)
+
+ content_widget = QtWidgets.QWidget(self)
+ content_layout = FlowLayout(content_widget)
+ content_layout.setContentsMargins(0, 0, 0, 0)
+
+ layout = QtWidgets.QHBoxLayout(self)
+ layout.setContentsMargins(0, 0, 0, 0)
+ layout.addWidget(content_widget)
+
+ self._controller = controller
+ self._content_widget = content_widget
+ self._content_layout = content_layout
+
+ self._actions_mapping = {}
+
+ self._visible_mode = True
+
+ def _update_visibility(self):
+ self.setVisible(
+ self._visible_mode
+ and self._content_layout.count() > 0
+ )
+
+ def set_visible_mode(self, visible):
+ if self._visible_mode is visible:
+ return
+ self._visible_mode = visible
+ self._update_visibility()
+
+ def _clear(self):
+ """Remove actions from widget."""
+ while self._content_layout.count():
+ item = self._content_layout.takeAt(0)
+ widget = item.widget()
+ if widget:
+ widget.setVisible(False)
+ widget.deleteLater()
+ self._actions_mapping = {}
+
+ def set_error_info(self, error_info):
+ """Set selected plugin and show it's actions.
+
+ Clears current actions from widget and recreate them from the plugin.
+
+ Args:
+ Dict[str, Any]: Object holding error items, title and possible
+ actions to run.
+ """
+
+ self._clear()
+
+ if not error_info:
+ self.setVisible(False)
+ return
+
+ plugin_action_items = error_info["plugin_action_items"]
+ for plugin_action_item in plugin_action_items:
+ if not plugin_action_item.active:
+ continue
+
+ if plugin_action_item.on_filter not in ("failed", "all"):
+ continue
+
+ action_id = plugin_action_item.action_id
+ self._actions_mapping[action_id] = plugin_action_item
+
+ action_btn = ActionButton(plugin_action_item, self._content_widget)
+ action_btn.action_clicked.connect(self._on_action_click)
+ self._content_layout.addWidget(action_btn)
+
+ self._update_visibility()
+
+ def _on_action_click(self, plugin_id, action_id):
+ self._controller.run_action(plugin_id, action_id)
+
+
+# --- Validation error titles ---
+class ValidationErrorInstanceList(QtWidgets.QListView):
+ """List of publish instances that caused a validation error.
+
+ Instances are collected per plugin's validation error title.
+ """
+ def __init__(self, *args, **kwargs):
+ super(ValidationErrorInstanceList, self).__init__(*args, **kwargs)
+
+ self.setObjectName("ValidationErrorInstanceList")
+
+ self.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
+ self.setSelectionMode(QtWidgets.QAbstractItemView.ExtendedSelection)
+
+ def minimumSizeHint(self):
+ return self.sizeHint()
+
+ def sizeHint(self):
+ result = super(ValidationErrorInstanceList, self).sizeHint()
+ row_count = self.model().rowCount()
+ height = 0
+ if row_count > 0:
+ height = self.sizeHintForRow(0) * row_count
+ result.setHeight(height)
+ return result
+
+
+class ValidationErrorTitleWidget(QtWidgets.QWidget):
+ """Title of validation error.
+
+ Widget is used as radio button so requires clickable functionality and
+ changing style on selection/deselection.
+
+ Has toggle button to show/hide instances on which validation error happened
+ if there is a list (Valdation error may happen on context).
+ """
+
+ selected = QtCore.Signal(str)
+ instance_changed = QtCore.Signal(str)
+
+ def __init__(self, title_id, error_info, parent):
+ super(ValidationErrorTitleWidget, self).__init__(parent)
+
+ self._title_id = title_id
+ self._error_info = error_info
+ self._selected = False
+
+ title_frame = ClickableFrame(self)
+ title_frame.setObjectName("ValidationErrorTitleFrame")
+
+ toggle_instance_btn = QtWidgets.QToolButton(title_frame)
+ toggle_instance_btn.setObjectName("ArrowBtn")
+ toggle_instance_btn.setArrowType(QtCore.Qt.RightArrow)
+ toggle_instance_btn.setMaximumWidth(14)
+
+ label_widget = QtWidgets.QLabel(error_info["title"], title_frame)
+
+ title_frame_layout = QtWidgets.QHBoxLayout(title_frame)
+ title_frame_layout.addWidget(label_widget, 1)
+ title_frame_layout.addWidget(toggle_instance_btn, 0)
+
+ instances_model = QtGui.QStandardItemModel()
+
+ instance_ids = []
+
+ items = []
+ context_validation = False
+ for error_item in error_info["error_items"]:
+ context_validation = error_item.context_validation
+ if context_validation:
+ toggle_instance_btn.setArrowType(QtCore.Qt.NoArrow)
+ instance_ids.append(CONTEXT_ID)
+ # Add fake item to have minimum size hint of view widget
+ items.append(QtGui.QStandardItem(CONTEXT_LABEL))
+ continue
+
+ label = error_item.instance_label
+ item = QtGui.QStandardItem(label)
+ item.setFlags(
+ QtCore.Qt.ItemIsEnabled | QtCore.Qt.ItemIsSelectable
+ )
+ item.setData(label, QtCore.Qt.ToolTipRole)
+ item.setData(error_item.instance_id, INSTANCE_ID_ROLE)
+ items.append(item)
+ instance_ids.append(error_item.instance_id)
+
+ if items:
+ root_item = instances_model.invisibleRootItem()
+ root_item.appendRows(items)
+
+ instances_view = ValidationErrorInstanceList(self)
+ instances_view.setModel(instances_model)
+
+ self.setLayoutDirection(QtCore.Qt.LeftToRight)
+
+ view_widget = QtWidgets.QWidget(self)
+ view_layout = QtWidgets.QHBoxLayout(view_widget)
+ view_layout.setContentsMargins(0, 0, 0, 0)
+ view_layout.setSpacing(0)
+ view_layout.addSpacing(14)
+ view_layout.addWidget(instances_view, 0)
+
+ layout = QtWidgets.QVBoxLayout(self)
+ layout.setSpacing(0)
+ layout.setContentsMargins(0, 0, 0, 0)
+ layout.addWidget(title_frame, 0)
+ layout.addWidget(view_widget, 0)
+ view_widget.setVisible(False)
+
+ if not context_validation:
+ toggle_instance_btn.clicked.connect(self._on_toggle_btn_click)
+
+ title_frame.clicked.connect(self._mouse_release_callback)
+ instances_view.selectionModel().selectionChanged.connect(
+ self._on_selection_change
+ )
+
+ self._title_frame = title_frame
+
+ self._toggle_instance_btn = toggle_instance_btn
+
+ self._view_widget = view_widget
+
+ self._instances_model = instances_model
+ self._instances_view = instances_view
+
+ self._context_validation = context_validation
+
+ self._instance_ids = instance_ids
+ self._expanded = False
+
+ def sizeHint(self):
+ result = super(ValidationErrorTitleWidget, self).sizeHint()
+ expected_width = max(
+ self._view_widget.minimumSizeHint().width(),
+ self._view_widget.sizeHint().width()
+ )
+
+ if expected_width < 200:
+ expected_width = 200
+
+ if result.width() < expected_width:
+ result.setWidth(expected_width)
+
+ return result
+
+ def minimumSizeHint(self):
+ return self.sizeHint()
+
+ def _mouse_release_callback(self):
+ """Mark this widget as selected on click."""
+
+ self.set_selected(True)
+
+ @property
+ def is_selected(self):
+ """Is widget marked a selected.
+
+ Returns:
+ bool: Item is selected or not.
+ """
+
+ return self._selected
+
+ @property
+ def id(self):
+ return self._title_id
+
+ def _change_style_property(self, selected):
+ """Change style of widget based on selection."""
+
+ value = "1" if selected else ""
+ self._title_frame.setProperty("selected", value)
+ self._title_frame.style().polish(self._title_frame)
+
+ def set_selected(self, selected=None):
+ """Change selected state of widget."""
+
+ if selected is None:
+ selected = not self._selected
+
+ # Clear instance view selection on deselect
+ if not selected:
+ self._instances_view.clearSelection()
+
+ # Skip if has same value
+ if selected == self._selected:
+ return
+
+ self._selected = selected
+ self._change_style_property(selected)
+ if selected:
+ self.selected.emit(self._title_id)
+ self._set_expanded(True)
+
+ def _on_toggle_btn_click(self):
+ """Show/hide instances list."""
+
+ self._set_expanded()
+
+ def _set_expanded(self, expanded=None):
+ if expanded is None:
+ expanded = not self._expanded
+
+ elif expanded is self._expanded:
+ return
+
+ if expanded and self._context_validation:
+ return
+
+ self._expanded = expanded
+ self._view_widget.setVisible(expanded)
+ if expanded:
+ self._toggle_instance_btn.setArrowType(QtCore.Qt.DownArrow)
+ else:
+ self._toggle_instance_btn.setArrowType(QtCore.Qt.RightArrow)
+
+ def _on_selection_change(self):
+ self.instance_changed.emit(self._title_id)
+
+ def get_selected_instances(self):
+ if self._context_validation:
+ return [CONTEXT_ID]
+ sel_model = self._instances_view.selectionModel()
+ return [
+ index.data(INSTANCE_ID_ROLE)
+ for index in sel_model.selectedIndexes()
+ if index.isValid()
+ ]
+
+ def get_available_instances(self):
+ return list(self._instance_ids)
+
+
+class ValidationArtistMessage(QtWidgets.QWidget):
+ def __init__(self, message, parent):
+ super(ValidationArtistMessage, self).__init__(parent)
+
+ artist_msg_label = QtWidgets.QLabel(message, self)
+ artist_msg_label.setAlignment(QtCore.Qt.AlignCenter)
+
+ main_layout = QtWidgets.QHBoxLayout(self)
+ main_layout.setContentsMargins(0, 0, 0, 0)
+ main_layout.addWidget(
+ artist_msg_label, 1, QtCore.Qt.AlignCenter
+ )
+
+
+class ValidationErrorsView(QtWidgets.QWidget):
+ selection_changed = QtCore.Signal()
+
+ def __init__(self, parent):
+ super(ValidationErrorsView, self).__init__(parent)
+
+ errors_scroll = VerticalScrollArea(self)
+ errors_scroll.setWidgetResizable(True)
+
+ errors_widget = QtWidgets.QWidget(errors_scroll)
+ errors_widget.setAttribute(QtCore.Qt.WA_TranslucentBackground)
+
+ errors_scroll.setWidget(errors_widget)
+
+ errors_layout = QtWidgets.QVBoxLayout(errors_widget)
+ errors_layout.setContentsMargins(0, 0, 0, 0)
+
+ layout = QtWidgets.QVBoxLayout(self)
+ layout.addWidget(errors_scroll, 1)
+
+ self._errors_widget = errors_widget
+ self._errors_layout = errors_layout
+ self._title_widgets = {}
+ self._previous_select = None
+
+ def _clear(self):
+ """Delete all dynamic widgets and hide all wrappers."""
+
+ self._title_widgets = {}
+ self._previous_select = None
+ while self._errors_layout.count():
+ item = self._errors_layout.takeAt(0)
+ widget = item.widget()
+ if widget:
+ widget.deleteLater()
+
+ def set_errors(self, grouped_error_items):
+ """Set errors into context and created titles.
+
+ Args:
+ validation_error_report (PublishValidationErrorsReport): Report
+ with information about validation errors and publish plugin
+ actions.
+ """
+
+ self._clear()
+
+ first_id = None
+ for title_item in grouped_error_items:
+ title_id = title_item["id"]
+ if first_id is None:
+ first_id = title_id
+ widget = ValidationErrorTitleWidget(title_id, title_item, self)
+ widget.selected.connect(self._on_select)
+ widget.instance_changed.connect(self._on_instance_change)
+ self._errors_layout.addWidget(widget)
+ self._title_widgets[title_id] = widget
+
+ self._errors_layout.addStretch(1)
+
+ if first_id:
+ self._title_widgets[first_id].set_selected(True)
+ else:
+ self.selection_changed.emit()
+
+ self.updateGeometry()
+
+ def _on_select(self, title_id):
+ if self._previous_select:
+ if self._previous_select.id == title_id:
+ return
+ self._previous_select.set_selected(False)
+
+ self._previous_select = self._title_widgets[title_id]
+ self.selection_changed.emit()
+
+ def _on_instance_change(self, title_id):
+ if self._previous_select and self._previous_select.id != title_id:
+ self._title_widgets[title_id].set_selected(True)
+ else:
+ self.selection_changed.emit()
+
+ def get_selected_items(self):
+ if not self._previous_select:
+ return None, []
+
+ title_id = self._previous_select.id
+ instance_ids = self._previous_select.get_selected_instances()
+ if not instance_ids:
+ instance_ids = self._previous_select.get_available_instances()
+ return title_id, instance_ids
+
+
+# ----- Publish instance report -----
+class _InstanceItem:
+ """Publish instance item for report UI.
+
+ Contains only data related to an instance in publishing. Has implemented
+ sorting methods and prepares information, e.g. if contains error or
+ warnings.
+ """
+
+ _attrs = (
+ "creator_identifier",
+ "family",
+ "label",
+ "name",
+ )
+
+ def __init__(
+ self,
+ instance_id,
+ creator_identifier,
+ family,
+ name,
+ label,
+ exists,
+ logs,
+ errored,
+ warned
+ ):
+ self.id = instance_id
+ self.creator_identifier = creator_identifier
+ self.family = family
+ self.name = name
+ self.label = label
+ self.exists = exists
+ self.logs = logs
+ self.errored = errored
+ self.warned = warned
+
+ def __eq__(self, other):
+ for attr in self._attrs:
+ if getattr(self, attr) != getattr(other, attr):
+ return False
+ return True
+
+ def __ne__(self, other):
+ return not self.__eq__(other)
+
+ def __gt__(self, other):
+ for attr in self._attrs:
+ self_value = getattr(self, attr)
+ other_value = getattr(other, attr)
+ if self_value == other_value:
+ continue
+ values = [self_value, other_value]
+ values.sort()
+ return values[0] == other_value
+ return None
+
+ def __lt__(self, other):
+ for attr in self._attrs:
+ self_value = getattr(self, attr)
+ other_value = getattr(other, attr)
+ if self_value == other_value:
+ continue
+ if self_value is None:
+ return False
+ if other_value is None:
+ return True
+ values = [self_value, other_value]
+ values.sort()
+ return values[0] == self_value
+ return None
+
+ def __ge__(self, other):
+ if self == other:
+ return True
+ return self.__gt__(other)
+
+ def __le__(self, other):
+ if self == other:
+ return True
+ return self.__lt__(other)
+
+ @classmethod
+ def from_report(cls, instance_id, instance_data, logs):
+ errored, warned = cls.extract_basic_log_info(logs)
+
+ return cls(
+ instance_id,
+ instance_data["creator_identifier"],
+ instance_data["family"],
+ instance_data["name"],
+ instance_data["label"],
+ instance_data["exists"],
+ logs,
+ errored,
+ warned,
+ )
+
+ @classmethod
+ def create_context_item(cls, context_label, logs):
+ errored, warned = cls.extract_basic_log_info(logs)
+ return cls(
+ CONTEXT_ID,
+ None,
+ "",
+ CONTEXT_LABEL,
+ context_label,
+ True,
+ logs,
+ errored,
+ warned
+ )
+
+ @staticmethod
+ def extract_basic_log_info(logs):
+ warned = False
+ errored = False
+ for log in logs:
+ if log["type"] == "error":
+ errored = True
+ elif log["type"] == "record":
+ level_no = log["levelno"]
+ if level_no and level_no >= logging.WARNING:
+ warned = True
+
+ if warned and errored:
+ break
+ return errored, warned
+
+
+class FamilyGroupLabel(QtWidgets.QWidget):
+ def __init__(self, family, parent):
+ super(FamilyGroupLabel, self).__init__(parent)
+
+ self.setLayoutDirection(QtCore.Qt.LeftToRight)
+
+ label_widget = QtWidgets.QLabel(family, self)
+
+ line_widget = QtWidgets.QWidget(self)
+ line_widget.setObjectName("Separator")
+ line_widget.setMinimumHeight(2)
+ line_widget.setMaximumHeight(2)
+
+ main_layout = QtWidgets.QHBoxLayout(self)
+ main_layout.setAlignment(QtCore.Qt.AlignVCenter)
+ main_layout.setSpacing(10)
+ main_layout.setContentsMargins(0, 0, 0, 0)
+ main_layout.addWidget(label_widget, 0)
+ main_layout.addWidget(line_widget, 1)
+
+
+class PublishInstanceCardWidget(BaseClickableFrame):
+ selection_requested = QtCore.Signal(str)
+
+ _warning_pix = None
+ _error_pix = None
+ _success_pix = None
+ _in_progress_pix = None
+
+ def __init__(self, instance, icon, publish_finished, parent):
+ super(PublishInstanceCardWidget, self).__init__(parent)
+
+ self.setObjectName("CardViewWidget")
+
+ icon_widget = IconValuePixmapLabel(icon, self)
+ icon_widget.setObjectName("FamilyIconLabel")
+
+ label_widget = QtWidgets.QLabel(instance.label, self)
+
+ if instance.errored:
+ state_pix = self.get_error_pix()
+ elif instance.warned:
+ state_pix = self.get_warning_pix()
+ elif publish_finished:
+ state_pix = self.get_success_pix()
+ else:
+ state_pix = self.get_in_progress_pix()
+
+ state_label = IconValuePixmapLabel(state_pix, self)
+
+ layout = QtWidgets.QHBoxLayout(self)
+ layout.setContentsMargins(10, 7, 10, 7)
+ layout.addWidget(icon_widget, 0)
+ layout.addWidget(label_widget, 1)
+ layout.addWidget(state_label, 0)
+
+ # Change direction -> parent is scroll area where scrolls are on
+ # left side
+ self.setLayoutDirection(QtCore.Qt.LeftToRight)
+
+ self._id = instance.id
+
+ self._selected = False
+
+ self._update_style_state()
+
+ @classmethod
+ def _prepare_pixes(cls):
+ publisher_colors = get_objected_colors("publisher")
+ cls._warning_pix = paint_image_with_color(
+ get_image("warning"),
+ publisher_colors["warning"].get_qcolor()
+ )
+ cls._error_pix = paint_image_with_color(
+ get_image("error"),
+ publisher_colors["error"].get_qcolor()
+ )
+ cls._success_pix = paint_image_with_color(
+ get_image("success"),
+ publisher_colors["success"].get_qcolor()
+ )
+ cls._in_progress_pix = paint_image_with_color(
+ get_image("success"),
+ publisher_colors["progress"].get_qcolor()
+ )
+
+ @classmethod
+ def get_warning_pix(cls):
+ if cls._warning_pix is None:
+ cls._prepare_pixes()
+ return cls._warning_pix
+
+ @classmethod
+ def get_error_pix(cls):
+ if cls._error_pix is None:
+ cls._prepare_pixes()
+ return cls._error_pix
+
+ @classmethod
+ def get_success_pix(cls):
+ if cls._success_pix is None:
+ cls._prepare_pixes()
+ return cls._success_pix
+
+ @classmethod
+ def get_in_progress_pix(cls):
+ if cls._in_progress_pix is None:
+ cls._prepare_pixes()
+ return cls._in_progress_pix
+
+ @property
+ def id(self):
+ """Id of card.
+
+ Returns:
+ str: Id of item.
+ """
+
+ return self._id
+
+ @property
+ def is_selected(self):
+ """Is card selected.
+
+ Returns:
+ bool: Item widget is marked as selected.
+ """
+
+ return self._selected
+
+ def set_selected(self, selected):
+ """Set card as selected.
+
+ Args:
+ selected (bool): Item should be marked as selected.
+ """
+
+ if selected == self._selected:
+ return
+ self._selected = selected
+ self._update_style_state()
+
+ def _update_style_state(self):
+ state = ""
+ if self._selected:
+ state = "selected"
+
+ self.setProperty("state", state)
+ self.style().polish(self)
+
+ def _mouse_release_callback(self):
+ """Trigger selected signal."""
+
+ self.selection_requested.emit(self.id)
+
+
+class PublishInstancesViewWidget(QtWidgets.QWidget):
+ # Sane minimum width of instance cards - size calulated using font metrics
+ _min_width_measure_string = 24 * "O"
+ selection_changed = QtCore.Signal()
+
+ def __init__(self, controller, parent):
+ super(PublishInstancesViewWidget, self).__init__(parent)
+
+ scroll_area = VerticalScrollArea(self)
+ scroll_area.setWidgetResizable(True)
+ scroll_area.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
+ scroll_area.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded)
+ scrollbar_bg = scroll_area.verticalScrollBar().parent()
+ if scrollbar_bg:
+ scrollbar_bg.setAttribute(QtCore.Qt.WA_TranslucentBackground)
+ scroll_area.setViewportMargins(0, 0, 0, 0)
+
+ instance_view = QtWidgets.QWidget(scroll_area)
+
+ scroll_area.setWidget(instance_view)
+
+ instance_layout = QtWidgets.QVBoxLayout(instance_view)
+ instance_layout.setContentsMargins(0, 0, 0, 0)
+ instance_layout.addStretch(1)
+
+ layout = QtWidgets.QVBoxLayout(self)
+ layout.setContentsMargins(0, 0, 0, 0)
+ layout.addWidget(scroll_area, 1)
+
+ self._controller = controller
+ self._scroll_area = scroll_area
+ self._instance_view = instance_view
+ self._instance_layout = instance_layout
+
+ self._context_widget = None
+
+ self._widgets_by_instance_id = {}
+ self._group_widgets = []
+ self._ordered_widgets = []
+
+ self._explicitly_selected_instance_ids = []
+
+ self.setSizePolicy(
+ QtWidgets.QSizePolicy.Minimum,
+ self.sizePolicy().verticalPolicy()
+ )
+
+ def sizeHint(self):
+ """Modify sizeHint based on visibility of scroll bars."""
+ # Calculate width hint by content widget and vertical scroll bar
+ scroll_bar = self._scroll_area.verticalScrollBar()
+ view_size = self._instance_view.sizeHint().width()
+ fm = self._instance_view.fontMetrics()
+ width = (
+ max(view_size, fm.width(self._min_width_measure_string))
+ + scroll_bar.sizeHint().width()
+ )
+
+ result = super(PublishInstancesViewWidget, self).sizeHint()
+ result.setWidth(width)
+ return result
+
+ def _get_selected_widgets(self):
+ return [
+ widget
+ for widget in self._ordered_widgets
+ if widget.is_selected
+ ]
+
+ def get_selected_instance_ids(self):
+ return [
+ widget.id
+ for widget in self._get_selected_widgets()
+ ]
+
+ def clear(self):
+ """Remove actions from widget."""
+ while self._instance_layout.count():
+ item = self._instance_layout.takeAt(0)
+ widget = item.widget()
+ if widget:
+ widget.setVisible(False)
+ widget.deleteLater()
+ self._ordered_widgets = []
+ self._group_widgets = []
+ self._widgets_by_instance_id = {}
+
+ def update_instances(self, instance_items):
+ self.clear()
+ identifiers = {
+ instance_item.creator_identifier
+ for instance_item in instance_items
+ }
+ identifier_icons = {
+ identifier: self._controller.get_creator_icon(identifier)
+ for identifier in identifiers
+ }
+
+ widgets = []
+ group_widgets = []
+
+ publish_finished = (
+ self._controller.publish_has_crashed
+ or self._controller.publish_has_validation_errors
+ or self._controller.publish_has_finished
+ )
+ instances_by_family = collections.defaultdict(list)
+ for instance_item in instance_items:
+ if not instance_item.exists:
+ continue
+ instances_by_family[instance_item.family].append(instance_item)
+
+ sorted_by_family = sorted(
+ instances_by_family.items(), key=lambda i: i[0]
+ )
+ for family, instance_items in sorted_by_family:
+ # Only instance without family is context
+ if family:
+ group_widget = FamilyGroupLabel(family, self._instance_view)
+ self._instance_layout.addWidget(group_widget, 0)
+ group_widgets.append(group_widget)
+
+ sorted_items = sorted(instance_items, key=lambda i: i.label)
+ for instance_item in sorted_items:
+ icon = identifier_icons[instance_item.creator_identifier]
+
+ widget = PublishInstanceCardWidget(
+ instance_item, icon, publish_finished, self._instance_view
+ )
+ widget.selection_requested.connect(self._on_selection_request)
+ self._instance_layout.addWidget(widget, 0)
+
+ widgets.append(widget)
+ self._widgets_by_instance_id[widget.id] = widget
+ self._instance_layout.addStretch(1)
+ self._ordered_widgets = widgets
+ self._group_widgets = group_widgets
+
+ def _on_selection_request(self, instance_id):
+ instance_widget = self._widgets_by_instance_id[instance_id]
+ selected_widgets = self._get_selected_widgets()
+ if instance_widget in selected_widgets:
+ instance_widget.set_selected(False)
+ else:
+ instance_widget.set_selected(True)
+ for widget in selected_widgets:
+ widget.set_selected(False)
+ self.selection_changed.emit()
+
+
+class LogIconFrame(QtWidgets.QFrame):
+ """Draw log item icon next to message.
+
+ Todos:
+ Paint event could be slow, maybe we could cache the image into pixmaps
+ so each item does not have to redraw it again.
+ """
+
+ info_color = QtGui.QColor("#ffffff")
+ error_color = QtGui.QColor("#ff4a4a")
+ level_to_color = dict((
+ (10, QtGui.QColor("#ff66e8")),
+ (20, QtGui.QColor("#66abff")),
+ (30, QtGui.QColor("#ffba66")),
+ (40, QtGui.QColor("#ff4d58")),
+ (50, QtGui.QColor("#ff4f75")),
+ ))
+ _error_pix = None
+ _validation_error_pix = None
+
+ def __init__(self, parent, log_type, log_level, is_validation_error):
+ super(LogIconFrame, self).__init__(parent)
+
+ self.setAttribute(QtCore.Qt.WA_TranslucentBackground)
+
+ self._is_record = log_type == "record"
+ self._is_error = log_type == "error"
+ self._is_validation_error = bool(is_validation_error)
+ self._log_color = self.level_to_color.get(log_level)
+
+ @classmethod
+ def get_validation_error_icon(cls):
+ if cls._validation_error_pix is None:
+ cls._validation_error_pix = get_pixmap("warning")
+ return cls._validation_error_pix
+
+ @classmethod
+ def get_error_icon(cls):
+ if cls._error_pix is None:
+ cls._error_pix = get_pixmap("error")
+ return cls._error_pix
+
+ def minimumSizeHint(self):
+ fm = self.fontMetrics()
+ size = fm.height()
+ return QtCore.QSize(size, size)
+
+ def paintEvent(self, event):
+ painter = QtGui.QPainter(self)
+ painter.setRenderHints(
+ QtGui.QPainter.Antialiasing
+ | QtGui.QPainter.SmoothPixmapTransform
+ )
+ painter.setPen(QtCore.Qt.NoPen)
+ rect = self.rect()
+ new_size = min(rect.width(), rect.height())
+ new_rect = QtCore.QRect(1, 1, new_size - 2, new_size - 2)
+ if self._is_error:
+ if self._is_validation_error:
+ error_icon = self.get_validation_error_icon()
+ else:
+ error_icon = self.get_error_icon()
+ scaled_error_icon = error_icon.scaled(
+ new_rect.size(),
+ QtCore.Qt.KeepAspectRatio,
+ QtCore.Qt.SmoothTransformation
+ )
+ painter.drawPixmap(new_rect, scaled_error_icon)
+
+ else:
+ if self._is_record:
+ color = self._log_color
+ else:
+ color = QtGui.QColor(255, 255, 255)
+ painter.setBrush(color)
+ painter.drawEllipse(new_rect)
+ painter.end()
+
+
+class LogItemWidget(QtWidgets.QWidget):
+ log_level_to_flag = {
+ 10: LOG_DEBUG_VISIBLE,
+ 20: LOG_INFO_VISIBLE,
+ 30: LOG_WARNING_VISIBLE,
+ 40: LOG_ERROR_VISIBLE,
+ 50: LOG_CRITICAL_VISIBLE,
+ }
+
+ def __init__(self, log, parent):
+ super(LogItemWidget, self).__init__(parent)
+
+ type_flag, level_n = self._get_log_info(log)
+ icon_label = LogIconFrame(
+ self, log["type"], level_n, log.get("is_validation_error"))
+ message_label = QtWidgets.QLabel(log["msg"].rstrip(), self)
+ message_label.setObjectName("PublishLogMessage")
+ message_label.setTextInteractionFlags(
+ QtCore.Qt.TextBrowserInteraction)
+ message_label.setCursor(QtGui.QCursor(QtCore.Qt.IBeamCursor))
+ message_label.setWordWrap(True)
+
+ main_layout = QtWidgets.QHBoxLayout(self)
+ main_layout.setContentsMargins(0, 0, 0, 0)
+ main_layout.setSpacing(8)
+ main_layout.addWidget(icon_label, 0)
+ main_layout.addWidget(message_label, 1)
+
+ self._type_flag = type_flag
+ self._plugin_id = log["plugin_id"]
+ self._log_type_filtered = False
+ self._plugin_filtered = False
+
+ @property
+ def type_flag(self):
+ return self._type_flag
+
+ @property
+ def plugin_id(self):
+ return self._plugin_id
+
+ def _get_log_info(self, log):
+ log_type = log["type"]
+ if log_type == "error":
+ return ERROR_VISIBLE, None
+
+ if log_type != "record":
+ return INFO_VISIBLE, None
+
+ level_n = log["levelno"]
+ if level_n < 10:
+ level_n = 10
+ elif level_n % 10 != 0:
+ level_n -= (level_n % 10) + 10
+
+ flag = self.log_level_to_flag.get(level_n, LOG_CRITICAL_VISIBLE)
+ return flag, level_n
+
+ def _update_visibility(self):
+ self.setVisible(
+ not self._log_type_filtered
+ and not self._plugin_filtered
+ )
+
+ def set_log_type_filtered(self, filtered):
+ if filtered is self._log_type_filtered:
+ return
+ self._log_type_filtered = filtered
+ self._update_visibility()
+
+ def set_plugin_filtered(self, filtered):
+ if filtered is self._plugin_filtered:
+ return
+ self._plugin_filtered = filtered
+ self._update_visibility()
+
+
+class LogsWithIconsView(QtWidgets.QWidget):
+ """Show logs in a grid with 2 columns.
+
+ First column is for icon second is for message.
+
+ Todos:
+ Add filtering by type (exception, debug, info, etc.).
+ """
+
+ def __init__(self, logs, parent):
+ super(LogsWithIconsView, self).__init__(parent)
+ self.setAttribute(QtCore.Qt.WA_TranslucentBackground)
+
+ logs_layout = QtWidgets.QVBoxLayout(self)
+ logs_layout.setContentsMargins(0, 0, 0, 0)
+ logs_layout.setSpacing(4)
+
+ widgets_by_flag = collections.defaultdict(list)
+ widgets_by_plugins_id = collections.defaultdict(list)
+
+ for log in logs:
+ widget = LogItemWidget(log, self)
+ widgets_by_flag[widget.type_flag].append(widget)
+ widgets_by_plugins_id[widget.plugin_id].append(widget)
+ logs_layout.addWidget(widget, 0)
+
+ self._widgets_by_flag = widgets_by_flag
+ self._widgets_by_plugins_id = widgets_by_plugins_id
+
+ self._visibility_by_flags = {
+ LOG_DEBUG_VISIBLE: True,
+ LOG_INFO_VISIBLE: True,
+ LOG_WARNING_VISIBLE: True,
+ LOG_ERROR_VISIBLE: True,
+ LOG_CRITICAL_VISIBLE: True,
+ ERROR_VISIBLE: True,
+ INFO_VISIBLE: True,
+ }
+ self._flags_filter = sum(self._visibility_by_flags.keys())
+ self._plugin_ids_filter = None
+
+ def _update_flags_filtering(self):
+ for flag in (
+ LOG_DEBUG_VISIBLE,
+ LOG_INFO_VISIBLE,
+ LOG_WARNING_VISIBLE,
+ LOG_ERROR_VISIBLE,
+ LOG_CRITICAL_VISIBLE,
+ ERROR_VISIBLE,
+ INFO_VISIBLE,
+ ):
+ visible = (self._flags_filter & flag) != 0
+ if visible is not self._visibility_by_flags[flag]:
+ self._visibility_by_flags[flag] = visible
+ for widget in self._widgets_by_flag[flag]:
+ widget.set_log_type_filtered(not visible)
+
+ def _update_plugin_filtering(self):
+ if self._plugin_ids_filter is None:
+ for widgets in self._widgets_by_plugins_id.values():
+ for widget in widgets:
+ widget.set_plugin_filtered(False)
+
+ else:
+ for plugin_id, widgets in self._widgets_by_plugins_id.items():
+ filtered = plugin_id not in self._plugin_ids_filter
+ for widget in widgets:
+ widget.set_plugin_filtered(filtered)
+
+ def set_log_filters(self, visibility_filter, plugin_ids):
+ if self._flags_filter != visibility_filter:
+ self._flags_filter = visibility_filter
+ self._update_flags_filtering()
+
+ if self._plugin_ids_filter != plugin_ids:
+ if plugin_ids is not None:
+ plugin_ids = set(plugin_ids)
+ self._plugin_ids_filter = plugin_ids
+ self._update_plugin_filtering()
+
+
+class InstanceLogsWidget(QtWidgets.QWidget):
+ """Widget showing logs of one publish instance.
+
+ Args:
+ instance (_InstanceItem): Item of instance used as data source.
+ parent (QtWidgets.QWidget): Parent widget.
+ """
+
+ def __init__(self, instance, parent):
+ super(InstanceLogsWidget, self).__init__(parent)
+
+ self.setAttribute(QtCore.Qt.WA_TranslucentBackground)
+
+ label_widget = QtWidgets.QLabel(instance.label, self)
+ label_widget.setObjectName("PublishInstanceLogsLabel")
+ logs_grid = LogsWithIconsView(instance.logs, self)
+
+ layout = QtWidgets.QVBoxLayout(self)
+ layout.setContentsMargins(0, 0, 0, 0)
+ layout.addWidget(label_widget, 0)
+ layout.addWidget(logs_grid, 0)
+
+ self._logs_grid = logs_grid
+
+ def set_log_filters(self, visibility_filter, plugin_ids):
+ """Change logs filter.
+
+ Args:
+ visibility_filter (int): Number contained of flags for each log
+ type and level.
+ plugin_ids (Iterable[str]): Plugin ids to which are logs filtered.
+ """
+
+ self._logs_grid.set_log_filters(visibility_filter, plugin_ids)
+
+
+class InstancesLogsView(QtWidgets.QFrame):
+ """Publish instances logs view widget."""
+
+ def __init__(self, parent):
+ super(InstancesLogsView, self).__init__(parent)
+ self.setObjectName("InstancesLogsView")
+
+ scroll_area = QtWidgets.QScrollArea(self)
+ scroll_area.setWidgetResizable(True)
+ scroll_area.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
+ scroll_area.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded)
+ scroll_area.setAttribute(QtCore.Qt.WA_TranslucentBackground)
+ scrollbar_bg = scroll_area.verticalScrollBar().parent()
+ if scrollbar_bg:
+ scrollbar_bg.setAttribute(QtCore.Qt.WA_TranslucentBackground)
+
+ content_wrap_widget = QtWidgets.QWidget(scroll_area)
+ content_wrap_widget.setAttribute(QtCore.Qt.WA_TranslucentBackground)
+
+ content_widget = QtWidgets.QWidget(content_wrap_widget)
+ content_widget.setAttribute(QtCore.Qt.WA_TranslucentBackground)
+ content_layout = QtWidgets.QVBoxLayout(content_widget)
+ content_layout.setSpacing(15)
+
+ scroll_area.setWidget(content_wrap_widget)
+
+ content_wrap_layout = QtWidgets.QVBoxLayout(content_wrap_widget)
+ content_wrap_layout.setContentsMargins(0, 0, 0, 0)
+ content_wrap_layout.addWidget(content_widget, 0)
+ content_wrap_layout.addStretch(1)
+
+ layout = QtWidgets.QVBoxLayout(self)
+ layout.setContentsMargins(0, 0, 0, 0)
+ layout.addWidget(scroll_area, 1)
+
+ self._visible_filters = (
+ LOG_INFO_VISIBLE
+ | LOG_WARNING_VISIBLE
+ | LOG_ERROR_VISIBLE
+ | LOG_CRITICAL_VISIBLE
+ | ERROR_VISIBLE
+ | INFO_VISIBLE
+ )
+
+ self._content_widget = content_widget
+ self._content_layout = content_layout
+
+ self._instances_order = []
+ self._instances_by_id = {}
+ self._views_by_instance_id = {}
+ self._is_showed = False
+ self._clear_needed = False
+ self._update_needed = False
+ self._instance_ids_filter = []
+ self._plugin_ids_filter = None
+
+ def showEvent(self, event):
+ super(InstancesLogsView, self).showEvent(event)
+ self._is_showed = True
+ self._update_instances()
+
+ def hideEvent(self, event):
+ super(InstancesLogsView, self).hideEvent(event)
+ self._is_showed = False
+
+ def closeEvent(self, event):
+ super(InstancesLogsView, self).closeEvent(event)
+ self._is_showed = False
+
+ def _update_instances(self):
+ if not self._is_showed:
+ return
+
+ if self._clear_needed:
+ self._clear_widgets()
+ self._clear_needed = False
+
+ if not self._update_needed:
+ return
+ self._update_needed = False
+
+ instance_ids = self._instance_ids_filter
+ to_hide = set()
+ if not instance_ids:
+ instance_ids = self._instances_by_id
+ else:
+ to_hide = set(self._instances_by_id) - set(instance_ids)
+
+ for instance_id in instance_ids:
+ widget = self._views_by_instance_id.get(instance_id)
+ if widget is None:
+ instance = self._instances_by_id[instance_id]
+ widget = InstanceLogsWidget(instance, self._content_widget)
+ self._views_by_instance_id[instance_id] = widget
+ self._content_layout.addWidget(widget, 0)
+
+ widget.setVisible(True)
+ widget.set_log_filters(
+ self._visible_filters, self._plugin_ids_filter
+ )
+
+ for instance_id in to_hide:
+ widget = self._views_by_instance_id.get(instance_id)
+ if widget is not None:
+ widget.setVisible(False)
+
+ def _clear_widgets(self):
+ """Remove all widgets from layout and from cache."""
+
+ while self._content_layout.count():
+ item = self._content_layout.takeAt(0)
+ widget = item.widget()
+ if widget:
+ widget.setVisible(False)
+ widget.deleteLater()
+ self._views_by_instance_id = {}
+
+ def update_instances(self, instances):
+ """Update publish instance from report.
+
+ Args:
+ instances (list[_InstanceItem]): Instance data from report.
+ """
+
+ self._instances_order = [
+ instance.id for instance in instances
+ ]
+ self._instances_by_id = {
+ instance.id: instance
+ for instance in instances
+ }
+ self._instance_ids_filter = []
+ self._plugin_ids_filter = None
+ self._clear_needed = True
+ self._update_needed = True
+ self._update_instances()
+
+ def set_instances_filter(self, instance_ids=None):
+ """Set instance filter.
+
+ Args:
+ instance_ids (Optional[list[str]]): List of instances to keep
+ visible. Pass empty list to hide all items.
+ """
+
+ self._instance_ids_filter = instance_ids
+ self._update_needed = True
+ self._update_instances()
+
+ def set_plugins_filter(self, plugin_ids=None):
+ if self._plugin_ids_filter == plugin_ids:
+ return
+ self._plugin_ids_filter = plugin_ids
+ self._update_needed = True
+ self._update_instances()
+
+
+class CrashWidget(QtWidgets.QWidget):
+ """Widget shown when publishing crashes.
+
+ Contains only minimal information for artist with easy access to report
+ actions.
+ """
+
+ def __init__(self, controller, parent):
+ super(CrashWidget, self).__init__(parent)
+
+ main_label = QtWidgets.QLabel("This is not your fault", self)
+ main_label.setAlignment(QtCore.Qt.AlignCenter)
+ main_label.setObjectName("PublishCrashMainLabel")
+
+ report_label = QtWidgets.QLabel(
+ (
+ "Please report the error to your pipeline support"
+ " using one of the options below."
+ ),
+ self
+ )
+ report_label.setAlignment(QtCore.Qt.AlignCenter)
+ report_label.setWordWrap(True)
+ report_label.setObjectName("PublishCrashReportLabel")
+
+ btns_widget = QtWidgets.QWidget(self)
+ copy_clipboard_btn = QtWidgets.QPushButton(
+ "Copy to clipboard", btns_widget)
+ save_to_disk_btn = QtWidgets.QPushButton(
+ "Save to disk", btns_widget)
+
+ btns_layout = QtWidgets.QHBoxLayout(btns_widget)
+ btns_layout.addStretch(1)
+ btns_layout.addWidget(copy_clipboard_btn, 0)
+ btns_layout.addSpacing(20)
+ btns_layout.addWidget(save_to_disk_btn, 0)
+ btns_layout.addStretch(1)
+
+ layout = QtWidgets.QVBoxLayout(self)
+ layout.addStretch(1)
+ layout.addWidget(main_label, 0)
+ layout.addSpacing(20)
+ layout.addWidget(report_label, 0)
+ layout.addSpacing(20)
+ layout.addWidget(btns_widget, 0)
+ layout.addStretch(2)
+
+ copy_clipboard_btn.clicked.connect(self._on_copy_to_clipboard)
+ save_to_disk_btn.clicked.connect(self._on_save_to_disk_click)
+
+ self._controller = controller
+
+ def _on_copy_to_clipboard(self):
+ self._controller.event_system.emit(
+ "copy_report.request", {}, "report_page")
+
+ def _on_save_to_disk_click(self):
+ self._controller.event_system.emit(
+ "export_report.request", {}, "report_page")
+
+
+class ErrorDetailsWidget(QtWidgets.QWidget):
+ def __init__(self, parent):
+ super(ErrorDetailsWidget, self).__init__(parent)
+
+ inputs_widget = QtWidgets.QWidget(self)
+ # Error 'Description' input
+ error_description_input = ExpandingTextEdit(inputs_widget)
+ error_description_input.setObjectName("InfoText")
+ error_description_input.setTextInteractionFlags(
+ QtCore.Qt.TextBrowserInteraction
+ )
+
+ # Error 'Details' widget -> Collapsible
+ error_details_widget = QtWidgets.QWidget(inputs_widget)
+
+ error_details_top = ClickableFrame(error_details_widget)
+
+ error_details_expand_btn = ClassicExpandBtn(error_details_top)
+ error_details_expand_label = QtWidgets.QLabel(
+ "Details", error_details_top)
+
+ line_widget = SeparatorWidget(1, parent=error_details_top)
+
+ error_details_top_l = QtWidgets.QHBoxLayout(error_details_top)
+ error_details_top_l.setContentsMargins(0, 0, 10, 0)
+ error_details_top_l.addWidget(error_details_expand_btn, 0)
+ error_details_top_l.addWidget(error_details_expand_label, 0)
+ error_details_top_l.addWidget(line_widget, 1)
+
+ error_details_input = ExpandingTextEdit(error_details_widget)
+ error_details_input.setObjectName("InfoText")
+ error_details_input.setTextInteractionFlags(
+ QtCore.Qt.TextBrowserInteraction
+ )
+ error_details_input.setVisible(not error_details_expand_btn.collapsed)
+
+ error_details_layout = QtWidgets.QVBoxLayout(error_details_widget)
+ error_details_layout.setContentsMargins(0, 0, 0, 0)
+ error_details_layout.addWidget(error_details_top, 0)
+ error_details_layout.addWidget(error_details_input, 0)
+ error_details_layout.addStretch(1)
+
+ # Description and Details layout
+ inputs_layout = QtWidgets.QVBoxLayout(inputs_widget)
+ inputs_layout.setContentsMargins(0, 0, 0, 0)
+ inputs_layout.setSpacing(10)
+ inputs_layout.addWidget(error_description_input, 0)
+ inputs_layout.addWidget(error_details_widget, 1)
+
+ main_layout = QtWidgets.QHBoxLayout(self)
+ main_layout.setContentsMargins(0, 0, 0, 0)
+ main_layout.addWidget(inputs_widget, 1)
+
+ error_details_top.clicked.connect(self._on_detail_toggle)
+
+ self._error_details_widget = error_details_widget
+ self._error_description_input = error_description_input
+ self._error_details_expand_btn = error_details_expand_btn
+ self._error_details_input = error_details_input
+
+ def _on_detail_toggle(self):
+ self._error_details_expand_btn.set_collapsed()
+ self._error_details_input.setVisible(
+ not self._error_details_expand_btn.collapsed)
+
+ def set_error_item(self, error_item):
+ detail = ""
+ description = ""
+ if error_item:
+ description = error_item.description or description
+ detail = error_item.detail or detail
+
+ if commonmark:
+ self._error_description_input.setHtml(
+ commonmark.commonmark(description)
+ )
+ self._error_details_input.setHtml(
+ commonmark.commonmark(detail)
+ )
+
+ elif hasattr(self._error_details_input, "setMarkdown"):
+ self._error_description_input.setMarkdown(description)
+ self._error_details_input.setMarkdown(detail)
+
+ else:
+ self._error_description_input.setText(description)
+ self._error_details_input.setText(detail)
+
+ self._error_details_widget.setVisible(bool(detail))
+
+
+class ReportsWidget(QtWidgets.QWidget):
+ """
+ # Crash layout
+ ββββββββ¬ββββββββββ¬ββββββββββ
+ βViews β Logs β Details β
+ β β β β
+ β β β β
+ ββββββββ΄ββββββββββ΄ββββββββββ
+ # Success layout
+ ββββββββ¬ββββββββββββββββββββ
+ βView β Logs β
+ β β β
+ β β β
+ ββββββββ΄ββββββββββββββββββββ
+ # Validation errors layout
+ ββββββββ¬ββββββββββ¬ββββββββββ
+ βViews β Actions β β
+ β βββββββββββ€ Details β
+ β β Logs β β
+ β β β β
+ ββββββββ΄ββββββββββ΄ββββββββββ
+ """
+
+ def __init__(self, controller, parent):
+ super(ReportsWidget, self).__init__(parent)
+
+ # Instances view
+ views_widget = QtWidgets.QWidget(self)
+
+ instances_view = PublishInstancesViewWidget(controller, views_widget)
+
+ validation_error_view = ValidationErrorsView(views_widget)
+
+ views_layout = QtWidgets.QStackedLayout(views_widget)
+ views_layout.setContentsMargins(0, 0, 0, 0)
+ views_layout.addWidget(instances_view)
+ views_layout.addWidget(validation_error_view)
+
+ views_layout.setCurrentWidget(instances_view)
+
+ # Error description with actions and optional detail
+ details_widget = QtWidgets.QFrame(self)
+ details_widget.setObjectName("PublishInstancesDetails")
+
+ # Actions widget
+ actions_widget = ValidateActionsWidget(controller, details_widget)
+
+ pages_widget = QtWidgets.QWidget(details_widget)
+
+ # Logs view
+ logs_view = InstancesLogsView(pages_widget)
+
+ # Validation details
+ # Description and details inputs are in scroll
+ # - single scroll for both inputs, they are forced to not use theirs
+ detail_inputs_spacer = QtWidgets.QWidget(pages_widget)
+ detail_inputs_spacer.setMinimumWidth(30)
+ detail_inputs_spacer.setMaximumWidth(30)
+
+ detail_input_scroll = QtWidgets.QScrollArea(pages_widget)
+
+ detail_inputs_widget = ErrorDetailsWidget(detail_input_scroll)
+ detail_inputs_widget.setAttribute(QtCore.Qt.WA_TranslucentBackground)
+
+ detail_input_scroll.setWidget(detail_inputs_widget)
+ detail_input_scroll.setWidgetResizable(True)
+ detail_input_scroll.setViewportMargins(0, 0, 0, 0)
+
+ # Crash information
+ crash_widget = CrashWidget(controller, details_widget)
+
+ # Layout pages
+ pages_layout = QtWidgets.QHBoxLayout(pages_widget)
+ pages_layout.setContentsMargins(0, 0, 0, 0)
+ pages_layout.addWidget(logs_view, 1)
+ pages_layout.addWidget(detail_inputs_spacer, 0)
+ pages_layout.addWidget(detail_input_scroll, 1)
+ pages_layout.addWidget(crash_widget, 1)
+
+ details_layout = QtWidgets.QVBoxLayout(details_widget)
+ margins = details_layout.contentsMargins()
+ margins.setTop(margins.top() * 2)
+ margins.setBottom(margins.bottom() * 2)
+ details_layout.setContentsMargins(margins)
+ details_layout.setSpacing(margins.top())
+ details_layout.addWidget(actions_widget, 0)
+ details_layout.addWidget(pages_widget, 1)
+
+ content_layout = QtWidgets.QHBoxLayout(self)
+ content_layout.setContentsMargins(0, 0, 0, 0)
+ content_layout.addWidget(views_widget, 0)
+ content_layout.addWidget(details_widget, 1)
+
+ instances_view.selection_changed.connect(self._on_instance_selection)
+ validation_error_view.selection_changed.connect(
+ self._on_error_selection)
+
+ self._views_layout = views_layout
+ self._instances_view = instances_view
+ self._validation_error_view = validation_error_view
+
+ self._actions_widget = actions_widget
+ self._detail_inputs_widget = detail_inputs_widget
+ self._logs_view = logs_view
+ self._detail_inputs_spacer = detail_inputs_spacer
+ self._detail_input_scroll = detail_input_scroll
+ self._crash_widget = crash_widget
+
+ self._controller = controller
+
+ self._validation_errors_by_id = {}
+
+ def _get_instance_items(self):
+ report = self._controller.get_publish_report()
+ context_label = report["context"]["label"] or CONTEXT_LABEL
+ instances_by_id = report["instances"]
+ plugins_info = report["plugins_data"]
+ logs_by_instance_id = collections.defaultdict(list)
+ for plugin_info in plugins_info:
+ plugin_id = plugin_info["id"]
+ for instance_info in plugin_info["instances_data"]:
+ instance_id = instance_info["id"] or CONTEXT_ID
+ for log in instance_info["logs"]:
+ log["plugin_id"] = plugin_id
+ logs_by_instance_id[instance_id].extend(instance_info["logs"])
+
+ context_item = _InstanceItem.create_context_item(
+ context_label, logs_by_instance_id[CONTEXT_ID])
+ instance_items = [
+ _InstanceItem.from_report(
+ instance_id, instance, logs_by_instance_id[instance_id]
+ )
+ for instance_id, instance in instances_by_id.items()
+ if instance["exists"]
+ ]
+ instance_items.sort()
+ instance_items.insert(0, context_item)
+ return instance_items
+
+ def update_data(self):
+ view = self._instances_view
+ validation_error_mode = False
+ if (
+ not self._controller.publish_has_crashed
+ and self._controller.publish_has_validation_errors
+ ):
+ view = self._validation_error_view
+ validation_error_mode = True
+
+ self._actions_widget.set_visible_mode(validation_error_mode)
+ self._detail_inputs_spacer.setVisible(validation_error_mode)
+ self._detail_input_scroll.setVisible(validation_error_mode)
+ self._views_layout.setCurrentWidget(view)
+
+ self._crash_widget.setVisible(self._controller.publish_has_crashed)
+ self._logs_view.setVisible(not self._controller.publish_has_crashed)
+
+ # Instance view & logs update
+ instance_items = self._get_instance_items()
+ self._instances_view.update_instances(instance_items)
+ self._logs_view.update_instances(instance_items)
+
+ # Validation errors
+ validation_errors = self._controller.get_validation_errors()
+ grouped_error_items = validation_errors.group_items_by_title()
+
+ validation_errors_by_id = {
+ title_item["id"]: title_item
+ for title_item in grouped_error_items
+ }
+
+ self._validation_errors_by_id = validation_errors_by_id
+ self._validation_error_view.set_errors(grouped_error_items)
+
+ def _on_instance_selection(self):
+ instance_ids = self._instances_view.get_selected_instance_ids()
+ self._logs_view.set_instances_filter(instance_ids)
+
+ def _on_error_selection(self):
+ title_id, instance_ids = (
+ self._validation_error_view.get_selected_items())
+ error_info = self._validation_errors_by_id.get(title_id)
+ if error_info is None:
+ self._actions_widget.set_error_info(None)
+ self._detail_inputs_widget.set_error_item(None)
+ return
+
+ self._logs_view.set_instances_filter(instance_ids)
+ self._logs_view.set_plugins_filter([error_info["plugin_id"]])
+
+ match_error_item = None
+ for error_item in error_info["error_items"]:
+ instance_id = error_item.instance_id or CONTEXT_ID
+ if instance_id in instance_ids:
+ match_error_item = error_item
+ break
+
+ self._actions_widget.set_error_info(error_info)
+ self._detail_inputs_widget.set_error_item(match_error_item)
+
+
+class ReportPageWidget(QtWidgets.QFrame):
+ """Widgets showing report for artis.
+
+ There are 5 possible states:
+ 1. Publishing did not start yet. > Only label.
+ 2. Publishing is paused. β
+ 3. Publishing successfully finished. β> Instances with logs.
+ 4. Publishing crashed. β
+ 5. Crashed because of validation error. > Errors with logs.
+
+ This widget is shown if validation errors happened during validation part.
+
+ Shows validation error titles with instances on which they happened
+ and validation error detail with possible actions (repair).
+ """
+
+ def __init__(self, controller, parent):
+ super(ReportPageWidget, self).__init__(parent)
+
+ header_label = QtWidgets.QLabel(self)
+ header_label.setAlignment(QtCore.Qt.AlignCenter)
+ header_label.setObjectName("PublishReportHeader")
+
+ publish_instances_widget = ReportsWidget(controller, self)
+
+ layout = QtWidgets.QVBoxLayout(self)
+ layout.setContentsMargins(0, 0, 0, 0)
+ layout.addWidget(header_label, 0)
+ layout.addWidget(publish_instances_widget, 0)
+
+ controller.event_system.add_callback(
+ "publish.process.started", self._on_publish_start
+ )
+ controller.event_system.add_callback(
+ "publish.reset.finished", self._on_publish_reset
+ )
+ controller.event_system.add_callback(
+ "publish.process.stopped", self._on_publish_stop
+ )
+
+ self._header_label = header_label
+ self._publish_instances_widget = publish_instances_widget
+
+ self._controller = controller
+
+ def _update_label(self):
+ if not self._controller.publish_has_started:
+ # This probably never happen when this widget is visible
+ header_label = "Nothing to report until you run publish"
+ elif self._controller.publish_has_crashed:
+ header_label = "Publish error report"
+ elif self._controller.publish_has_validation_errors:
+ header_label = "Publish validation report"
+ elif self._controller.publish_has_finished:
+ header_label = "Publish success report"
+ else:
+ header_label = "Publish report"
+ self._header_label.setText(header_label)
+
+ def _update_state(self):
+ self._update_label()
+ publish_started = self._controller.publish_has_started
+ self._publish_instances_widget.setVisible(publish_started)
+ if publish_started:
+ self._publish_instances_widget.update_data()
+
+ self.updateGeometry()
+
+ def _on_publish_start(self):
+ self._update_state()
+
+ def _on_publish_reset(self):
+ self._update_state()
+
+ def _on_publish_stop(self):
+ self._update_state()
diff --git a/openpype/tools/publisher/widgets/thumbnail_widget.py b/openpype/tools/publisher/widgets/thumbnail_widget.py
index e234f4cdc1..b17ca0adc8 100644
--- a/openpype/tools/publisher/widgets/thumbnail_widget.py
+++ b/openpype/tools/publisher/widgets/thumbnail_widget.py
@@ -75,6 +75,7 @@ class ThumbnailPainterWidget(QtWidgets.QWidget):
painter = QtGui.QPainter()
painter.begin(self)
+ painter.setRenderHint(QtGui.QPainter.Antialiasing)
painter.drawPixmap(0, 0, self._cached_pix)
painter.end()
@@ -183,6 +184,18 @@ class ThumbnailPainterWidget(QtWidgets.QWidget):
backgrounded_images.append(new_pix)
return backgrounded_images
+ def _paint_dash_line(self, painter, rect):
+ pen = QtGui.QPen()
+ pen.setWidth(1)
+ pen.setBrush(QtCore.Qt.darkGray)
+ pen.setStyle(QtCore.Qt.DashLine)
+
+ new_rect = rect.adjusted(1, 1, -1, -1)
+ painter.setPen(pen)
+ painter.setBrush(QtCore.Qt.transparent)
+ # painter.drawRect(rect)
+ painter.drawRect(new_rect)
+
def _cache_pix(self):
rect = self.rect()
rect_width = rect.width()
@@ -264,13 +277,7 @@ class ThumbnailPainterWidget(QtWidgets.QWidget):
# Draw drop enabled dashes
if used_default_pix:
- pen = QtGui.QPen()
- pen.setWidth(1)
- pen.setBrush(QtCore.Qt.darkGray)
- pen.setStyle(QtCore.Qt.DashLine)
- final_painter.setPen(pen)
- final_painter.setBrush(QtCore.Qt.transparent)
- final_painter.drawRect(rect)
+ self._paint_dash_line(final_painter, rect)
final_painter.end()
diff --git a/openpype/tools/publisher/widgets/validations_widget.py b/openpype/tools/publisher/widgets/validations_widget.py
deleted file mode 100644
index 0abe85c0b8..0000000000
--- a/openpype/tools/publisher/widgets/validations_widget.py
+++ /dev/null
@@ -1,715 +0,0 @@
-# -*- coding: utf-8 -*-
-try:
- import commonmark
-except Exception:
- commonmark = None
-
-from qtpy import QtWidgets, QtCore, QtGui
-
-from openpype.tools.utils import BaseClickableFrame, ClickableFrame
-from .widgets import (
- IconValuePixmapLabel
-)
-from ..constants import (
- INSTANCE_ID_ROLE
-)
-
-
-class ValidationErrorInstanceList(QtWidgets.QListView):
- """List of publish instances that caused a validation error.
-
- Instances are collected per plugin's validation error title.
- """
- def __init__(self, *args, **kwargs):
- super(ValidationErrorInstanceList, self).__init__(*args, **kwargs)
-
- self.setObjectName("ValidationErrorInstanceList")
-
- self.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
- self.setSelectionMode(QtWidgets.QAbstractItemView.ExtendedSelection)
-
- def minimumSizeHint(self):
- return self.sizeHint()
-
- def sizeHint(self):
- result = super(ValidationErrorInstanceList, self).sizeHint()
- row_count = self.model().rowCount()
- height = 0
- if row_count > 0:
- height = self.sizeHintForRow(0) * row_count
- result.setHeight(height)
- return result
-
-
-class ValidationErrorTitleWidget(QtWidgets.QWidget):
- """Title of validation error.
-
- Widget is used as radio button so requires clickable functionality and
- changing style on selection/deselection.
-
- Has toggle button to show/hide instances on which validation error happened
- if there is a list (Valdation error may happen on context).
- """
-
- selected = QtCore.Signal(int)
- instance_changed = QtCore.Signal(int)
-
- def __init__(self, index, error_info, parent):
- super(ValidationErrorTitleWidget, self).__init__(parent)
-
- self._index = index
- self._error_info = error_info
- self._selected = False
-
- title_frame = ClickableFrame(self)
- title_frame.setObjectName("ValidationErrorTitleFrame")
-
- toggle_instance_btn = QtWidgets.QToolButton(title_frame)
- toggle_instance_btn.setObjectName("ArrowBtn")
- toggle_instance_btn.setArrowType(QtCore.Qt.RightArrow)
- toggle_instance_btn.setMaximumWidth(14)
-
- label_widget = QtWidgets.QLabel(error_info["title"], title_frame)
-
- title_frame_layout = QtWidgets.QHBoxLayout(title_frame)
- title_frame_layout.addWidget(label_widget, 1)
- title_frame_layout.addWidget(toggle_instance_btn, 0)
-
- instances_model = QtGui.QStandardItemModel()
-
- help_text_by_instance_id = {}
-
- items = []
- context_validation = False
- for error_item in error_info["error_items"]:
- context_validation = error_item.context_validation
- if context_validation:
- toggle_instance_btn.setArrowType(QtCore.Qt.NoArrow)
- description = self._prepare_description(error_item)
- help_text_by_instance_id[None] = description
- # Add fake item to have minimum size hint of view widget
- items.append(QtGui.QStandardItem("Context"))
- continue
-
- label = error_item.instance_label
- item = QtGui.QStandardItem(label)
- item.setFlags(
- QtCore.Qt.ItemIsEnabled | QtCore.Qt.ItemIsSelectable
- )
- item.setData(label, QtCore.Qt.ToolTipRole)
- item.setData(error_item.instance_id, INSTANCE_ID_ROLE)
- items.append(item)
- description = self._prepare_description(error_item)
- help_text_by_instance_id[error_item.instance_id] = description
-
- if items:
- root_item = instances_model.invisibleRootItem()
- root_item.appendRows(items)
-
- instances_view = ValidationErrorInstanceList(self)
- instances_view.setModel(instances_model)
-
- self.setLayoutDirection(QtCore.Qt.LeftToRight)
-
- view_widget = QtWidgets.QWidget(self)
- view_layout = QtWidgets.QHBoxLayout(view_widget)
- view_layout.setContentsMargins(0, 0, 0, 0)
- view_layout.setSpacing(0)
- view_layout.addSpacing(14)
- view_layout.addWidget(instances_view, 0)
-
- layout = QtWidgets.QVBoxLayout(self)
- layout.setSpacing(0)
- layout.setContentsMargins(0, 0, 0, 0)
- layout.addWidget(title_frame, 0)
- layout.addWidget(view_widget, 0)
- view_widget.setVisible(False)
-
- if not context_validation:
- toggle_instance_btn.clicked.connect(self._on_toggle_btn_click)
-
- title_frame.clicked.connect(self._mouse_release_callback)
- instances_view.selectionModel().selectionChanged.connect(
- self._on_seleciton_change
- )
-
- self._title_frame = title_frame
-
- self._toggle_instance_btn = toggle_instance_btn
-
- self._view_widget = view_widget
-
- self._instances_model = instances_model
- self._instances_view = instances_view
-
- self._context_validation = context_validation
- self._help_text_by_instance_id = help_text_by_instance_id
-
- self._expanded = False
-
- def sizeHint(self):
- result = super(ValidationErrorTitleWidget, self).sizeHint()
- expected_width = max(
- self._view_widget.minimumSizeHint().width(),
- self._view_widget.sizeHint().width()
- )
-
- if expected_width < 200:
- expected_width = 200
-
- if result.width() < expected_width:
- result.setWidth(expected_width)
-
- return result
-
- def minimumSizeHint(self):
- return self.sizeHint()
-
- def _prepare_description(self, error_item):
- """Prepare description text for detail intput.
-
- Args:
- error_item (ValidationErrorItem): Item which hold information about
- validation error.
-
- Returns:
- str: Prepared detailed description.
- """
-
- dsc = error_item.description
- detail = error_item.detail
- if detail:
- dsc += "
{}".format(detail)
-
- description = dsc
- if commonmark:
- description = commonmark.commonmark(dsc)
- return description
-
- def _mouse_release_callback(self):
- """Mark this widget as selected on click."""
-
- self.set_selected(True)
-
- def current_description_text(self):
- if self._context_validation:
- return self._help_text_by_instance_id[None]
- index = self._instances_view.currentIndex()
- # TODO make sure instance is selected
- if not index.isValid():
- index = self._instances_model.index(0, 0)
-
- indence_id = index.data(INSTANCE_ID_ROLE)
- return self._help_text_by_instance_id[indence_id]
-
- @property
- def is_selected(self):
- """Is widget marked a selected.
-
- Returns:
- bool: Item is selected or not.
- """
-
- return self._selected
-
- @property
- def index(self):
- """Widget's index set by parent.
-
- Returns:
- int: Index of widget.
- """
-
- return self._index
-
- def set_index(self, index):
- """Set index of widget (called by parent).
-
- Args:
- int: New index of widget.
- """
-
- self._index = index
-
- def _change_style_property(self, selected):
- """Change style of widget based on selection."""
-
- value = "1" if selected else ""
- self._title_frame.setProperty("selected", value)
- self._title_frame.style().polish(self._title_frame)
-
- def set_selected(self, selected=None):
- """Change selected state of widget."""
-
- if selected is None:
- selected = not self._selected
-
- # Clear instance view selection on deselect
- if not selected:
- self._instances_view.clearSelection()
-
- # Skip if has same value
- if selected == self._selected:
- return
-
- self._selected = selected
- self._change_style_property(selected)
- if selected:
- self.selected.emit(self._index)
- self._set_expanded(True)
-
- def _on_toggle_btn_click(self):
- """Show/hide instances list."""
-
- self._set_expanded()
-
- def _set_expanded(self, expanded=None):
- if expanded is None:
- expanded = not self._expanded
-
- elif expanded is self._expanded:
- return
-
- if expanded and self._context_validation:
- return
-
- self._expanded = expanded
- self._view_widget.setVisible(expanded)
- if expanded:
- self._toggle_instance_btn.setArrowType(QtCore.Qt.DownArrow)
- else:
- self._toggle_instance_btn.setArrowType(QtCore.Qt.RightArrow)
-
- def _on_seleciton_change(self):
- sel_model = self._instances_view.selectionModel()
- if sel_model.selectedIndexes():
- self.instance_changed.emit(self._index)
-
-
-class ActionButton(BaseClickableFrame):
- """Plugin's action callback button.
-
- Action may have label or icon or both.
-
- Args:
- plugin_action_item (PublishPluginActionItem): Action item that can be
- triggered by it's id.
- """
-
- action_clicked = QtCore.Signal(str, str)
-
- def __init__(self, plugin_action_item, parent):
- super(ActionButton, self).__init__(parent)
-
- self.setObjectName("ValidationActionButton")
-
- self.plugin_action_item = plugin_action_item
-
- action_label = plugin_action_item.label
- action_icon = plugin_action_item.icon
- label_widget = QtWidgets.QLabel(action_label, self)
- icon_label = None
- if action_icon:
- icon_label = IconValuePixmapLabel(action_icon, self)
-
- layout = QtWidgets.QHBoxLayout(self)
- layout.setContentsMargins(5, 0, 5, 0)
- layout.addWidget(label_widget, 1)
- if icon_label:
- layout.addWidget(icon_label, 0)
-
- self.setSizePolicy(
- QtWidgets.QSizePolicy.Minimum,
- self.sizePolicy().verticalPolicy()
- )
-
- def _mouse_release_callback(self):
- self.action_clicked.emit(
- self.plugin_action_item.plugin_id,
- self.plugin_action_item.action_id
- )
-
-
-class ValidateActionsWidget(QtWidgets.QFrame):
- """Wrapper widget for plugin actions.
-
- Change actions based on selected validation error.
- """
-
- def __init__(self, controller, parent):
- super(ValidateActionsWidget, self).__init__(parent)
-
- self.setAttribute(QtCore.Qt.WA_TranslucentBackground)
-
- content_widget = QtWidgets.QWidget(self)
- content_layout = QtWidgets.QVBoxLayout(content_widget)
-
- layout = QtWidgets.QHBoxLayout(self)
- layout.setContentsMargins(0, 0, 0, 0)
- layout.addWidget(content_widget)
-
- self._controller = controller
- self._content_widget = content_widget
- self._content_layout = content_layout
- self._actions_mapping = {}
-
- def clear(self):
- """Remove actions from widget."""
- while self._content_layout.count():
- item = self._content_layout.takeAt(0)
- widget = item.widget()
- if widget:
- widget.setVisible(False)
- widget.deleteLater()
- self._actions_mapping = {}
-
- def set_error_item(self, error_item):
- """Set selected plugin and show it's actions.
-
- Clears current actions from widget and recreate them from the plugin.
-
- Args:
- Dict[str, Any]: Object holding error items, title and possible
- actions to run.
- """
-
- self.clear()
-
- if not error_item:
- self.setVisible(False)
- return
-
- plugin_action_items = error_item["plugin_action_items"]
- for plugin_action_item in plugin_action_items:
- if not plugin_action_item.active:
- continue
-
- if plugin_action_item.on_filter not in ("failed", "all"):
- continue
-
- action_id = plugin_action_item.action_id
- self._actions_mapping[action_id] = plugin_action_item
-
- action_btn = ActionButton(plugin_action_item, self._content_widget)
- action_btn.action_clicked.connect(self._on_action_click)
- self._content_layout.addWidget(action_btn)
-
- if self._content_layout.count() > 0:
- self.setVisible(True)
- self._content_layout.addStretch(1)
- else:
- self.setVisible(False)
-
- def _on_action_click(self, plugin_id, action_id):
- self._controller.run_action(plugin_id, action_id)
-
-
-class VerticallScrollArea(QtWidgets.QScrollArea):
- """Scroll area for validation error titles.
-
- The biggest difference is that the scroll area has scroll bar on left side
- and resize of content will also resize scrollarea itself.
-
- Resize if deferred by 100ms because at the moment of resize are not yet
- propagated sizes and visibility of scroll bars.
- """
-
- def __init__(self, *args, **kwargs):
- super(VerticallScrollArea, self).__init__(*args, **kwargs)
-
- self.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
- self.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded)
- self.setLayoutDirection(QtCore.Qt.RightToLeft)
-
- self.setAttribute(QtCore.Qt.WA_TranslucentBackground)
- # Background of scrollbar will be transparent
- scrollbar_bg = self.verticalScrollBar().parent()
- if scrollbar_bg:
- scrollbar_bg.setAttribute(QtCore.Qt.WA_TranslucentBackground)
- self.setViewportMargins(0, 0, 0, 0)
-
- self.verticalScrollBar().installEventFilter(self)
-
- # Timer with 100ms offset after changing size
- size_changed_timer = QtCore.QTimer()
- size_changed_timer.setInterval(100)
- size_changed_timer.setSingleShot(True)
-
- size_changed_timer.timeout.connect(self._on_timer_timeout)
- self._size_changed_timer = size_changed_timer
-
- def setVerticalScrollBar(self, widget):
- old_widget = self.verticalScrollBar()
- if old_widget:
- old_widget.removeEventFilter(self)
-
- super(VerticallScrollArea, self).setVerticalScrollBar(widget)
- if widget:
- widget.installEventFilter(self)
-
- def setWidget(self, widget):
- old_widget = self.widget()
- if old_widget:
- old_widget.removeEventFilter(self)
-
- super(VerticallScrollArea, self).setWidget(widget)
- if widget:
- widget.installEventFilter(self)
-
- def _on_timer_timeout(self):
- width = self.widget().width()
- if self.verticalScrollBar().isVisible():
- width += self.verticalScrollBar().width()
- self.setMinimumWidth(width)
-
- def eventFilter(self, obj, event):
- if (
- event.type() == QtCore.QEvent.Resize
- and (obj is self.widget() or obj is self.verticalScrollBar())
- ):
- self._size_changed_timer.start()
- return super(VerticallScrollArea, self).eventFilter(obj, event)
-
-
-class ValidationArtistMessage(QtWidgets.QWidget):
- def __init__(self, message, parent):
- super(ValidationArtistMessage, self).__init__(parent)
-
- artist_msg_label = QtWidgets.QLabel(message, self)
- artist_msg_label.setAlignment(QtCore.Qt.AlignCenter)
-
- main_layout = QtWidgets.QHBoxLayout(self)
- main_layout.setContentsMargins(0, 0, 0, 0)
- main_layout.addWidget(
- artist_msg_label, 1, QtCore.Qt.AlignCenter
- )
-
-
-class ValidationsWidget(QtWidgets.QFrame):
- """Widgets showing validation error.
-
- This widget is shown if validation error/s happened during validation part.
-
- Shows validation error titles with instances on which happened and
- validation error detail with possible actions (repair).
-
- ββββββββ¬βββββββββββββββββ¬ββββββββ
- βtitlesβ βactionsβ
- β β β β
- β β Error detail β β
- β β β β
- β β β β
- ββββββββ΄βββββββββββββββββ΄ββββββββ
- """
-
- def __init__(self, controller, parent):
- super(ValidationsWidget, self).__init__(parent)
-
- # Before publishing
- before_publish_widget = ValidationArtistMessage(
- "Nothing to report until you run publish", self
- )
- # After success publishing
- publish_started_widget = ValidationArtistMessage(
- "So far so good", self
- )
- # After success publishing
- publish_stop_ok_widget = ValidationArtistMessage(
- "Publishing finished successfully", self
- )
- # After failed publishing (not with validation error)
- publish_stop_fail_widget = ValidationArtistMessage(
- "This is not your fault...", self
- )
-
- # Validation errors
- validations_widget = QtWidgets.QWidget(self)
-
- content_widget = QtWidgets.QWidget(validations_widget)
-
- errors_scroll = VerticallScrollArea(content_widget)
- errors_scroll.setWidgetResizable(True)
-
- errors_widget = QtWidgets.QWidget(errors_scroll)
- errors_widget.setAttribute(QtCore.Qt.WA_TranslucentBackground)
- errors_layout = QtWidgets.QVBoxLayout(errors_widget)
- errors_layout.setContentsMargins(0, 0, 0, 0)
-
- errors_scroll.setWidget(errors_widget)
-
- error_details_frame = QtWidgets.QFrame(content_widget)
- error_details_input = QtWidgets.QTextEdit(error_details_frame)
- error_details_input.setObjectName("InfoText")
- error_details_input.setTextInteractionFlags(
- QtCore.Qt.TextBrowserInteraction
- )
-
- actions_widget = ValidateActionsWidget(controller, content_widget)
- actions_widget.setMinimumWidth(140)
-
- error_details_layout = QtWidgets.QHBoxLayout(error_details_frame)
- error_details_layout.addWidget(error_details_input, 1)
- error_details_layout.addWidget(actions_widget, 0)
-
- content_layout = QtWidgets.QHBoxLayout(content_widget)
- content_layout.setSpacing(0)
- content_layout.setContentsMargins(0, 0, 0, 0)
-
- content_layout.addWidget(errors_scroll, 0)
- content_layout.addWidget(error_details_frame, 1)
-
- top_label = QtWidgets.QLabel(
- "Publish validation report", content_widget
- )
- top_label.setObjectName("PublishInfoMainLabel")
- top_label.setAlignment(QtCore.Qt.AlignCenter)
-
- validation_layout = QtWidgets.QVBoxLayout(validations_widget)
- validation_layout.setContentsMargins(0, 0, 0, 0)
- validation_layout.addWidget(top_label, 0)
- validation_layout.addWidget(content_widget, 1)
-
- main_layout = QtWidgets.QStackedLayout(self)
- main_layout.addWidget(before_publish_widget)
- main_layout.addWidget(publish_started_widget)
- main_layout.addWidget(publish_stop_ok_widget)
- main_layout.addWidget(publish_stop_fail_widget)
- main_layout.addWidget(validations_widget)
-
- main_layout.setCurrentWidget(before_publish_widget)
-
- controller.event_system.add_callback(
- "publish.process.started", self._on_publish_start
- )
- controller.event_system.add_callback(
- "publish.reset.finished", self._on_publish_reset
- )
- controller.event_system.add_callback(
- "publish.process.stopped", self._on_publish_stop
- )
-
- self._main_layout = main_layout
-
- self._before_publish_widget = before_publish_widget
- self._publish_started_widget = publish_started_widget
- self._publish_stop_ok_widget = publish_stop_ok_widget
- self._publish_stop_fail_widget = publish_stop_fail_widget
- self._validations_widget = validations_widget
-
- self._top_label = top_label
- self._errors_widget = errors_widget
- self._errors_layout = errors_layout
- self._error_details_frame = error_details_frame
- self._error_details_input = error_details_input
- self._actions_widget = actions_widget
-
- self._title_widgets = {}
- self._error_info = {}
- self._previous_select = None
-
- self._controller = controller
-
- def clear(self):
- """Delete all dynamic widgets and hide all wrappers."""
- self._title_widgets = {}
- self._error_info = {}
- self._previous_select = None
- while self._errors_layout.count():
- item = self._errors_layout.takeAt(0)
- widget = item.widget()
- if widget:
- widget.deleteLater()
-
- self._top_label.setVisible(False)
- self._error_details_frame.setVisible(False)
- self._errors_widget.setVisible(False)
- self._actions_widget.setVisible(False)
-
- def _set_errors(self, validation_error_report):
- """Set errors into context and created titles.
-
- Args:
- validation_error_report (PublishValidationErrorsReport): Report
- with information about validation errors and publish plugin
- actions.
- """
-
- self.clear()
- if not validation_error_report:
- return
-
- self._top_label.setVisible(True)
- self._error_details_frame.setVisible(True)
- self._errors_widget.setVisible(True)
-
- grouped_error_items = validation_error_report.group_items_by_title()
- for idx, error_info in enumerate(grouped_error_items):
- widget = ValidationErrorTitleWidget(idx, error_info, self)
- widget.selected.connect(self._on_select)
- widget.instance_changed.connect(self._on_instance_change)
- self._errors_layout.addWidget(widget)
- self._title_widgets[idx] = widget
- self._error_info[idx] = error_info
-
- self._errors_layout.addStretch(1)
-
- if self._title_widgets:
- self._title_widgets[0].set_selected(True)
-
- self.updateGeometry()
-
- def _set_current_widget(self, widget):
- self._main_layout.setCurrentWidget(widget)
-
- def _on_publish_start(self):
- self._set_current_widget(self._publish_started_widget)
-
- def _on_publish_reset(self):
- self._set_current_widget(self._before_publish_widget)
-
- def _on_publish_stop(self):
- if self._controller.publish_has_crashed:
- self._set_current_widget(self._publish_stop_fail_widget)
- return
-
- if self._controller.publish_has_validation_errors:
- validation_errors = self._controller.get_validation_errors()
- self._set_current_widget(self._validations_widget)
- self._set_errors(validation_errors)
- return
-
- if self._controller.publish_has_finished:
- self._set_current_widget(self._publish_stop_ok_widget)
- return
-
- self._set_current_widget(self._publish_started_widget)
-
- def _on_select(self, index):
- if self._previous_select:
- if self._previous_select.index == index:
- return
- self._previous_select.set_selected(False)
-
- self._previous_select = self._title_widgets[index]
-
- error_item = self._error_info[index]
-
- self._actions_widget.set_error_item(error_item)
-
- self._update_description()
-
- def _on_instance_change(self, index):
- if self._previous_select and self._previous_select.index != index:
- self._title_widgets[index].set_selected(True)
- else:
- self._update_description()
-
- def _update_description(self):
- description = self._previous_select.current_description_text()
- if commonmark:
- html = commonmark.commonmark(description)
- self._error_details_input.setHtml(html)
- elif hasattr(self._error_details_input, "setMarkdown"):
- self._error_details_input.setMarkdown(description)
- else:
- self._error_details_input.setText(description)
diff --git a/openpype/tools/publisher/widgets/widgets.py b/openpype/tools/publisher/widgets/widgets.py
index cd1f1f5a96..0b13f26d57 100644
--- a/openpype/tools/publisher/widgets/widgets.py
+++ b/openpype/tools/publisher/widgets/widgets.py
@@ -40,6 +40,41 @@ from ..constants import (
INPUTS_LAYOUT_VSPACING,
)
+FA_PREFIXES = ["", "fa.", "fa5.", "fa5b.", "fa5s.", "ei.", "mdi."]
+
+
+def parse_icon_def(
+ icon_def, default_width=None, default_height=None, color=None
+):
+ if not icon_def:
+ return None
+
+ if isinstance(icon_def, QtGui.QPixmap):
+ return icon_def
+
+ color = color or "white"
+ default_width = default_width or 512
+ default_height = default_height or 512
+
+ if isinstance(icon_def, QtGui.QIcon):
+ return icon_def.pixmap(default_width, default_height)
+
+ try:
+ if os.path.exists(icon_def):
+ return QtGui.QPixmap(icon_def)
+ except Exception:
+ # TODO logging
+ pass
+
+ for prefix in FA_PREFIXES:
+ try:
+ icon_name = "{}{}".format(prefix, icon_def)
+ icon = qtawesome.icon(icon_name, color=color)
+ return icon.pixmap(default_width, default_height)
+ except Exception:
+ # TODO logging
+ continue
+
class PublishPixmapLabel(PixmapLabel):
def _get_pix_size(self):
@@ -54,7 +89,6 @@ class IconValuePixmapLabel(PublishPixmapLabel):
Handle icon parsing from creators/instances. Using of QAwesome module
of path to images.
"""
- fa_prefixes = ["", "fa."]
default_size = 200
def __init__(self, icon_def, parent):
@@ -77,31 +111,9 @@ class IconValuePixmapLabel(PublishPixmapLabel):
return pix
def _parse_icon_def(self, icon_def):
- if not icon_def:
- return self._default_pixmap()
-
- if isinstance(icon_def, QtGui.QPixmap):
- return icon_def
-
- if isinstance(icon_def, QtGui.QIcon):
- return icon_def.pixmap(self.default_size, self.default_size)
-
- try:
- if os.path.exists(icon_def):
- return QtGui.QPixmap(icon_def)
- except Exception:
- # TODO logging
- pass
-
- for prefix in self.fa_prefixes:
- try:
- icon_name = "{}{}".format(prefix, icon_def)
- icon = qtawesome.icon(icon_name, color="white")
- return icon.pixmap(self.default_size, self.default_size)
- except Exception:
- # TODO logging
- continue
-
+ icon = parse_icon_def(icon_def, self.default_size, self.default_size)
+ if icon:
+ return icon
return self._default_pixmap()
@@ -692,6 +704,7 @@ class TasksCombobox(QtWidgets.QComboBox):
style.drawControl(
QtWidgets.QStyle.CE_ComboBoxLabel, opt, painter, self
)
+ painter.end()
def is_valid(self):
"""Are all selected items valid."""
diff --git a/openpype/tools/publisher/window.py b/openpype/tools/publisher/window.py
index b3471163ae..fc90e66f21 100644
--- a/openpype/tools/publisher/window.py
+++ b/openpype/tools/publisher/window.py
@@ -1,3 +1,6 @@
+import os
+import json
+import time
import collections
import copy
from qtpy import QtWidgets, QtCore, QtGui
@@ -15,10 +18,11 @@ from openpype.tools.utils import (
from .constants import ResetKeySequence
from .publish_report_viewer import PublishReportViewerWidget
+from .control import CardMessageTypes
from .control_qt import QtPublisherController
from .widgets import (
OverviewWidget,
- ValidationsWidget,
+ ReportPageWidget,
PublishFrame,
PublisherTabsWidget,
@@ -182,7 +186,7 @@ class PublisherWindow(QtWidgets.QDialog):
controller, content_stacked_widget
)
- report_widget = ValidationsWidget(controller, parent)
+ report_widget = ReportPageWidget(controller, parent)
# Details - Publish details
publish_details_widget = PublishReportViewerWidget(
@@ -313,6 +317,13 @@ class PublisherWindow(QtWidgets.QDialog):
controller.event_system.add_callback(
"convertors.find.failed", self._on_convertor_error
)
+ controller.event_system.add_callback(
+ "export_report.request", self._export_report
+ )
+ controller.event_system.add_callback(
+ "copy_report.request", self._copy_report
+ )
+
# Store extra header widget for TrayPublisher
# - can be used to add additional widgets to header between context
@@ -825,6 +836,9 @@ class PublisherWindow(QtWidgets.QDialog):
self._validate_btn.setEnabled(validate_enabled)
self._publish_btn.setEnabled(publish_enabled)
+ if not publish_enabled:
+ self._publish_frame.set_shrunk_state(True)
+
self._update_publish_details_widget()
def _validate_create_instances(self):
@@ -941,6 +955,46 @@ class PublisherWindow(QtWidgets.QDialog):
under_mouse = widget_x < global_pos.x()
self._create_overlay_button.set_under_mouse(under_mouse)
+ def _copy_report(self):
+ logs = self._controller.get_publish_report()
+ logs_string = json.dumps(logs, indent=4)
+
+ mime_data = QtCore.QMimeData()
+ mime_data.setText(logs_string)
+ QtWidgets.QApplication.instance().clipboard().setMimeData(
+ mime_data
+ )
+ self._controller.emit_card_message(
+ "Report added to clipboard",
+ CardMessageTypes.info)
+
+ def _export_report(self):
+ default_filename = "publish-report-{}".format(
+ time.strftime("%y%m%d-%H-%M")
+ )
+ default_filepath = os.path.join(
+ os.path.expanduser("~"),
+ default_filename
+ )
+ new_filepath, ext = QtWidgets.QFileDialog.getSaveFileName(
+ self, "Save report", default_filepath, ".json"
+ )
+ if not ext or not new_filepath:
+ return
+
+ logs = self._controller.get_publish_report()
+ full_path = new_filepath + ext
+ dir_path = os.path.dirname(full_path)
+ if not os.path.exists(dir_path):
+ os.makedirs(dir_path)
+
+ with open(full_path, "w") as file_stream:
+ json.dump(logs, file_stream)
+
+ self._controller.emit_card_message(
+ "Report saved",
+ CardMessageTypes.info)
+
class ErrorsMessageBox(ErrorMessageBox):
def __init__(self, error_title, failed_info, message_start, parent):
diff --git a/openpype/tools/utils/__init__.py b/openpype/tools/utils/__init__.py
index 4149763f80..10bd527692 100644
--- a/openpype/tools/utils/__init__.py
+++ b/openpype/tools/utils/__init__.py
@@ -1,13 +1,16 @@
+from .layouts import FlowLayout
from .widgets import (
FocusSpinBox,
FocusDoubleSpinBox,
ComboBox,
CustomTextComboBox,
PlaceholderLineEdit,
+ ExpandingTextEdit,
BaseClickableFrame,
ClickableFrame,
ClickableLabel,
ExpandBtn,
+ ClassicExpandBtn,
PixmapLabel,
IconButton,
PixmapButton,
@@ -37,15 +40,19 @@ from .overlay_messages import (
__all__ = (
+ "FlowLayout",
+
"FocusSpinBox",
"FocusDoubleSpinBox",
"ComboBox",
"CustomTextComboBox",
"PlaceholderLineEdit",
+ "ExpandingTextEdit",
"BaseClickableFrame",
"ClickableFrame",
"ClickableLabel",
"ExpandBtn",
+ "ClassicExpandBtn",
"PixmapLabel",
"IconButton",
"PixmapButton",
diff --git a/openpype/tools/utils/layouts.py b/openpype/tools/utils/layouts.py
new file mode 100644
index 0000000000..65ea087c27
--- /dev/null
+++ b/openpype/tools/utils/layouts.py
@@ -0,0 +1,150 @@
+from qtpy import QtWidgets, QtCore
+
+
+class FlowLayout(QtWidgets.QLayout):
+ """Layout that organize widgets by minimum size into a flow layout.
+
+ Layout is putting widget from left to right and top to bottom. When widget
+ can't fit a row it is added to next line. Minimum size matches widget with
+ biggest 'sizeHint' width and height using calculated geometry.
+
+ Content margins are part of calculations. It is possible to define
+ horizontal and vertical spacing.
+
+ Layout does not support stretch and spacing items.
+
+ Todos:
+ Unified width concept -> use width of largest item so all of them are
+ same. This could allow to have minimum columns option too.
+ """
+
+ def __init__(self, parent=None):
+ super(FlowLayout, self).__init__(parent)
+
+ # spaces between each item
+ self._horizontal_spacing = 5
+ self._vertical_spacing = 5
+
+ self._items = []
+
+ def __del__(self):
+ while self.count():
+ self.takeAt(0, False)
+
+ def isEmpty(self):
+ for item in self._items:
+ if not item.isEmpty():
+ return False
+ return True
+
+ def setSpacing(self, spacing):
+ self._horizontal_spacing = spacing
+ self._vertical_spacing = spacing
+ self.invalidate()
+
+ def setHorizontalSpacing(self, spacing):
+ self._horizontal_spacing = spacing
+ self.invalidate()
+
+ def setVerticalSpacing(self, spacing):
+ self._vertical_spacing = spacing
+ self.invalidate()
+
+ def addItem(self, item):
+ self._items.append(item)
+ self.invalidate()
+
+ def count(self):
+ return len(self._items)
+
+ def itemAt(self, index):
+ if 0 <= index < len(self._items):
+ return self._items[index]
+ return None
+
+ def takeAt(self, index, invalidate=True):
+ if 0 <= index < len(self._items):
+ item = self._items.pop(index)
+ if invalidate:
+ self.invalidate()
+ return item
+ return None
+
+ def expandingDirections(self):
+ return QtCore.Qt.Orientations(QtCore.Qt.Vertical)
+
+ def hasHeightForWidth(self):
+ return True
+
+ def heightForWidth(self, width):
+ return self._setup_geometry(QtCore.QRect(0, 0, width, 0), True)
+
+ def setGeometry(self, rect):
+ super(FlowLayout, self).setGeometry(rect)
+ self._setup_geometry(rect)
+
+ def sizeHint(self):
+ return self.minimumSize()
+
+ def minimumSize(self):
+ size = QtCore.QSize(0, 0)
+ for item in self._items:
+ widget = item.widget()
+ if widget is not None:
+ parent = widget.parent()
+ if not widget.isVisibleTo(parent):
+ continue
+ size = size.expandedTo(item.minimumSize())
+
+ if size.width() < 1 or size.height() < 1:
+ return size
+ l_margin, t_margin, r_margin, b_margin = self.getContentsMargins()
+ size += QtCore.QSize(l_margin + r_margin, t_margin + b_margin)
+ return size
+
+ def _setup_geometry(self, rect, only_calculate=False):
+ h_spacing = self._horizontal_spacing
+ v_spacing = self._vertical_spacing
+ l_margin, t_margin, r_margin, b_margin = self.getContentsMargins()
+
+ left_x = rect.x() + l_margin
+ top_y = rect.y() + t_margin
+ pos_x = left_x
+ pos_y = top_y
+ row_height = 0
+ for item in self._items:
+ item_hint = item.sizeHint()
+ item_width = item_hint.width()
+ item_height = item_hint.height()
+ if item_width < 1 or item_height < 1:
+ continue
+
+ end_x = pos_x + item_width
+
+ wrap = (
+ row_height > 0
+ and (
+ end_x > rect.right()
+ or (end_x + r_margin) > rect.right()
+ )
+ )
+ if not wrap:
+ next_pos_x = end_x + h_spacing
+ else:
+ pos_x = left_x
+ pos_y += row_height + v_spacing
+ next_pos_x = pos_x + item_width + h_spacing
+ row_height = 0
+
+ if not only_calculate:
+ item.setGeometry(
+ QtCore.QRect(pos_x, pos_y, item_width, item_height)
+ )
+
+ pos_x = next_pos_x
+ row_height = max(row_height, item_height)
+
+ height = (pos_y - top_y) + row_height
+ if height > 0:
+ height += b_margin
+ return height
diff --git a/openpype/tools/utils/widgets.py b/openpype/tools/utils/widgets.py
index bae89aeb09..5a8104611b 100644
--- a/openpype/tools/utils/widgets.py
+++ b/openpype/tools/utils/widgets.py
@@ -101,6 +101,46 @@ class PlaceholderLineEdit(QtWidgets.QLineEdit):
self.setPalette(filter_palette)
+class ExpandingTextEdit(QtWidgets.QTextEdit):
+ """QTextEdit which does not have sroll area but expands height."""
+
+ def __init__(self, parent=None):
+ super(ExpandingTextEdit, self).__init__(parent)
+
+ size_policy = self.sizePolicy()
+ size_policy.setHeightForWidth(True)
+ size_policy.setVerticalPolicy(QtWidgets.QSizePolicy.Preferred)
+ self.setSizePolicy(size_policy)
+
+ self.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
+ self.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
+
+ doc = self.document()
+ doc.contentsChanged.connect(self._on_doc_change)
+
+ def _on_doc_change(self):
+ self.updateGeometry()
+
+ def hasHeightForWidth(self):
+ return True
+
+ def heightForWidth(self, width):
+ margins = self.contentsMargins()
+
+ document_width = 0
+ if width >= margins.left() + margins.right():
+ document_width = width - margins.left() - margins.right()
+
+ document = self.document().clone()
+ document.setTextWidth(document_width)
+
+ return margins.top() + document.size().height() + margins.bottom()
+
+ def sizeHint(self):
+ width = super(ExpandingTextEdit, self).sizeHint().width()
+ return QtCore.QSize(width, self.heightForWidth(width))
+
+
class BaseClickableFrame(QtWidgets.QFrame):
"""Widget that catch left mouse click and can trigger a callback.
@@ -161,19 +201,34 @@ class ClickableLabel(QtWidgets.QLabel):
class ExpandBtnLabel(QtWidgets.QLabel):
"""Label showing expand icon meant for ExpandBtn."""
+ state_changed = QtCore.Signal()
+
+
def __init__(self, parent):
super(ExpandBtnLabel, self).__init__(parent)
- self._source_collapsed_pix = QtGui.QPixmap(
- get_style_image_path("branch_closed")
- )
- self._source_expanded_pix = QtGui.QPixmap(
- get_style_image_path("branch_open")
- )
+ self._source_collapsed_pix = self._create_collapsed_pixmap()
+ self._source_expanded_pix = self._create_expanded_pixmap()
self._current_image = self._source_collapsed_pix
self._collapsed = True
- def set_collapsed(self, collapsed):
+ def _create_collapsed_pixmap(self):
+ return QtGui.QPixmap(
+ get_style_image_path("branch_closed")
+ )
+
+ def _create_expanded_pixmap(self):
+ return QtGui.QPixmap(
+ get_style_image_path("branch_open")
+ )
+
+ @property
+ def collapsed(self):
+ return self._collapsed
+
+ def set_collapsed(self, collapsed=None):
+ if collapsed is None:
+ collapsed = not self._collapsed
if self._collapsed == collapsed:
return
self._collapsed = collapsed
@@ -182,6 +237,7 @@ class ExpandBtnLabel(QtWidgets.QLabel):
else:
self._current_image = self._source_expanded_pix
self._set_resized_pix()
+ self.state_changed.emit()
def resizeEvent(self, event):
self._set_resized_pix()
@@ -203,21 +259,55 @@ class ExpandBtnLabel(QtWidgets.QLabel):
class ExpandBtn(ClickableFrame):
+ state_changed = QtCore.Signal()
+
def __init__(self, parent=None):
super(ExpandBtn, self).__init__(parent)
- pixmap_label = ExpandBtnLabel(self)
+ pixmap_label = self._create_pix_widget(self)
layout = QtWidgets.QHBoxLayout(self)
layout.setContentsMargins(0, 0, 0, 0)
layout.addWidget(pixmap_label)
+ pixmap_label.state_changed.connect(self.state_changed)
+
self._pixmap_label = pixmap_label
- def set_collapsed(self, collapsed):
+ def _create_pix_widget(self, parent=None):
+ if parent is None:
+ parent = self
+ return ExpandBtnLabel(parent)
+
+ @property
+ def collapsed(self):
+ return self._pixmap_label.collapsed
+
+ def set_collapsed(self, collapsed=None):
self._pixmap_label.set_collapsed(collapsed)
+class ClassicExpandBtnLabel(ExpandBtnLabel):
+ def _create_collapsed_pixmap(self):
+ return QtGui.QPixmap(
+ get_style_image_path("right_arrow")
+ )
+
+ def _create_expanded_pixmap(self):
+ return QtGui.QPixmap(
+ get_style_image_path("down_arrow")
+ )
+
+
+class ClassicExpandBtn(ExpandBtn):
+ """Same as 'ExpandBtn' but with arrow images."""
+
+ def _create_pix_widget(self, parent=None):
+ if parent is None:
+ parent = self
+ return ClassicExpandBtnLabel(parent)
+
+
class ImageButton(QtWidgets.QPushButton):
"""PushButton with icon and size of font.
diff --git a/openpype/version.py b/openpype/version.py
index 8874eb510d..342bbfc85a 100644
--- a/openpype/version.py
+++ b/openpype/version.py
@@ -1,3 +1,3 @@
# -*- coding: utf-8 -*-
"""Package declaring Pype version."""
-__version__ = "3.15.8-nightly.2"
+__version__ = "3.15.8"
diff --git a/pyproject.toml b/pyproject.toml
index 190ecb9329..a72a3d66d7 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
[tool.poetry]
name = "OpenPype"
-version = "3.15.7" # OpenPype
+version = "3.15.8" # OpenPype
description = "Open VFX and Animation pipeline with support."
authors = ["OpenPype Team "]
license = "MIT License"
diff --git a/website/docs/module_deadline.md b/website/docs/module_deadline.md
index 94b6a381c2..bca2a83936 100644
--- a/website/docs/module_deadline.md
+++ b/website/docs/module_deadline.md
@@ -22,6 +22,9 @@ For [AWS Thinkbox Deadline](https://www.awsthinkbox.com/deadline) support you ne
5. Install our custom plugin and scripts to your deadline repository. It should be as simple as copying content of `openpype/modules/deadline/repository/custom` to `path/to/your/deadline/repository/custom`.
+Multiple different DL webservice could be configured. First set them in point 4., then they could be configured per project in `project_settings/deadline/deadline_servers`.
+Only single webservice could be a target of publish though.
+
## Configuration