Merge branch 'develop' of https://github.com/ynput/ayon-silhouette in…

…to bugfix/extractor_support_layered_objects

# Conflicts:
#	client/ayon_silhouette/api/lib.py

client/ayon_silhouette/api/lib.py

@@ -4,11 +4,13 @@
 import logging
 from typing import Optional
 
+from qtpy import QtCore, QtWidgets
+import fx
+import tools.window
+
 from ayon_core.lib import NumberDef
 from ayon_core.pipeline.context_tools import get_current_task_entity
 
-import fx
-import tools.window
 
 AYON_CONTAINERS = "AYON_CONTAINERS"
 JSON_PREFIX = "JSON::"
@@ -251,6 +253,50 @@ def reset_session_settings(session=None, task_entity=None):
         set_frame_range_from_entity(session, task_entity)
 
 
+@contextlib.contextmanager
+def capture_messageboxes(callback):
+    """Capture messageboxes and call a callback with them.
+
+    This is a workaround for Silhouette not allowing the Python code to
+    suppress messageboxes and supply default answers to them. So instead we
+    capture the messageboxes and respond to them through a rapid QTimer.
+    """
+    processed = set()
+    timer = QtCore.QTimer()
+
+    def on_timeout():
+        # Check for dialogs
+        widgets = QtWidgets.QApplication.instance().topLevelWidgets()
+        has_boxes = False
+        for widget in widgets:
+            if isinstance(widget, QtWidgets.QMessageBox):
+                has_boxes = True
+                if widget in processed:
+                    continue
+                processed.add(widget)
+                callback(widget)
+
+        # Stop as soon as possible with our detections. Even with the
+        # QTimer repeating at interval of 0 we should have been able to
+        # capture all the UI events as they happen in the main thread for
+        # each dialog.
+        # Note: Technically this would mean that as soon as there is no
+        # active messagebox we directly stop the timer, and hence would stop
+        # finding messageboxes after. However, with the export methods in
+        # Silhouette this has not been a problem and all boxes were detected
+        # accordingly.
+        if not has_boxes:
+            timer.stop()
+
+    timer.setSingleShot(False)  # Allow to capture multiple boxes
+    timer.timeout.connect(on_timeout)
+    timer.start()
+    try:
+        yield
+    finally:
+        timer.stop()
+
+
 def iter_children(node, prefix=None):
     """Iterate over all children of a node recursively."""
     children = node.children

client/ayon_silhouette/plugins/publish/extract_shapes.py

@@ -1,5 +1,7 @@
 import os
+import contextlib
 
+from qtpy import QtWidgets
 import fx
 
 from ayon_core.pipeline import publish
@@ -16,6 +18,8 @@ class ExtractNukeShapes(publish.Extractor):
     extension = "nk"
     io_module = "Nuke 9+ Shapes"
 
+    capture_messageboxes = False
+
     def process(self, instance):
 
         # Define extract output file path
@@ -37,8 +41,12 @@ def process(self, instance):
 
         with lib.maintained_selection():
             fx.select(shapes)
-            self.log.debug(f"Exporting '{self.io_module}' to: {path}")
-            fx.io_modules[self.io_module].export(path)
+            with contextlib.ExitStack() as stack:
+                self.log.debug(f"Exporting '{self.io_module}' to: {path}")
+                if self.capture_messageboxes:
+                    stack.enter_context(
+                        lib.capture_messageboxes(self.on_captured_messagebox))
+                fx.io_modules[self.io_module].export(path)
 
         representation = {
             "name": self.extension,
@@ -50,6 +58,9 @@ def process(self, instance):
 
         self.log.debug(f"Extracted instance '{instance.name}' to: {path}")
 
+    def on_captured_messagebox(self, messagebox: QtWidgets.QMessageBox):
+        pass
+
 
 class ExtractFusionShapes(ExtractNukeShapes):
     """Extract node as Fusion Shapes."""
@@ -59,6 +70,27 @@ class ExtractFusionShapes(ExtractNukeShapes):
     extension = "setting"
     io_module = "Fusion Shapes"
 
+    capture_messageboxes = True
+
+    def on_captured_messagebox(self, messagebox):
+        # Suppress pop-up dialogs
+        self.log.debug(f"Detected messagebox: {messagebox.text()}")
+
+        def click(messagebox: QtWidgets.QMessageBox, text: str):
+            """Click QMessageBox button with matching text."""
+            self.log.debug(f"Accepting messagebox with '{text}'")
+            button = next(
+                button for button in messagebox.buttons()
+                if button.text() == text
+            )
+            button.click()
+
+        messagebox_text = messagebox.text()
+        if messagebox_text == "Output Fusion Groups?":
+            click(messagebox, "&Yes")
+        elif messagebox_text == "Link Shapes?":
+            click(messagebox, "&Yes")
+
 
 class ExtractSilhouetteShapes(ExtractNukeShapes):
     """Extract node as Silhouette Shapes."""

client/ayon_silhouette/plugins/publish/extract_track.py

@@ -1,5 +1,8 @@
+import contextlib
 import os
 
+from qtpy import QtWidgets
+
 import fx
 
 from ayon_core.pipeline import publish
@@ -15,6 +18,8 @@ class SilhouetteExtractAfterEffectsTrack(publish.Extractor):
     extension = "txt"
     io_module = "After Effects"
 
+    capture_messageboxes = True
+
     def process(self, instance):
 
         # Define extract output file path
@@ -25,7 +30,6 @@ def process(self, instance):
         # Node should be a node that contains 'tracker' children
         node = instance.data["transientData"]["instance_node"]
 
-
         # Use selection, if any specified, otherwise use all children shapes
         tracker_ids = instance.data.get(
             "creator_attributes", {}).get("trackers")
@@ -41,8 +45,12 @@ def process(self, instance):
 
         with lib.maintained_selection():
             fx.select(trackers)
-            self.log.debug(f"Exporting '{self.io_module}' to: {path}")
-            fx.io_modules[self.io_module].export(path)
+            with contextlib.ExitStack() as stack:
+                self.log.debug(f"Exporting '{self.io_module}' to: {path}")
+                if self.capture_messageboxes:
+                    stack.enter_context(
+                        lib.capture_messageboxes(self.on_captured_messagebox))
+                fx.io_modules[self.io_module].export(path)
 
         representation = {
             "name": self.extension,
@@ -54,6 +62,25 @@ def process(self, instance):
 
         self.log.debug(f"Extracted instance '{instance.name}' to: {path}")
 
+    def on_captured_messagebox(self, messagebox: QtWidgets.QMessageBox):
+        self.log.debug(f"Detected messagebox: {messagebox.text()}")
+        button_texts = [button.text() for button in messagebox.buttons()]
+        self.log.debug(f"Buttons: {button_texts}")
+        # Continue if messagebox is just confirmation dialog about After
+        # Effects being unable to keyframe Match Size, Search Offset and Search
+        # Size.
+        if "After Effects cannot keyframe" in messagebox.text():
+            self.click(messagebox, "&Yes")
+
+    def click(self, messagebox: QtWidgets.QMessageBox, text: str):
+        """Click QMessageBox button with matching text."""
+        self.log.debug(f"Accepting messagebox with '{text}'")
+        button = next(
+            button for button in messagebox.buttons()
+            if button.text() == text
+        )
+        button.click()
+
 
 class SilhouetteExtractNuke5Track(SilhouetteExtractAfterEffectsTrack):
     """Extract Nuke 5 .nk trackers from Silhouette."""
@@ -63,3 +90,16 @@ class SilhouetteExtractNuke5Track(SilhouetteExtractAfterEffectsTrack):
 
     extension = "nk"
     io_module = "Nuke 5"
+
+    # Whether or not to merge up to four trackers in a single Nuke Tracker node
+    # or otherwise export as multiple single point tracker nodes
+    merge_up_to_four = True
+
+    def on_captured_messagebox(self, messagebox: QtWidgets.QMessageBox):
+        self.log.debug(f"Detected messagebox: {messagebox.text()}")
+        button_texts = [button.text() for button in messagebox.buttons()]
+        self.log.debug(f"Buttons: {button_texts}")
+        # Merge up to four tracker
+        if "Select Yes to merge." in messagebox.text():
+            button = "&Yes" if self.merge_up_to_four else "&No"
+            self.click(messagebox, button)