From 2f98c006b2c80ab798b39cf5593cc9f27bc80b5d Mon Sep 17 00:00:00 2001
From: Simone Barbieri <me@barbierisimone.com>
Date: Fri, 10 May 2024 16:45:05 +0100
Subject: [PATCH] Implemented deadline file dependencies for Blender

---
 .../publish/collect_file_dependencies.py      | 36 +++++++++++++++++++
 .../publish/submit_blender_deadline.py        | 13 ++++++-
 server_addon/deadline/package.py              |  2 +-
 .../server/settings/publish_plugins.py        |  2 ++
 4 files changed, 51 insertions(+), 2 deletions(-)
 create mode 100644 client/ayon_core/hosts/blender/plugins/publish/collect_file_dependencies.py

diff --git a/client/ayon_core/hosts/blender/plugins/publish/collect_file_dependencies.py b/client/ayon_core/hosts/blender/plugins/publish/collect_file_dependencies.py
new file mode 100644
index 0000000000..ea36ab459c
--- /dev/null
+++ b/client/ayon_core/hosts/blender/plugins/publish/collect_file_dependencies.py
@@ -0,0 +1,36 @@
+from pathlib import Path
+
+import pyblish.api
+
+import bpy
+
+
+class CollectFileDependencies(pyblish.api.ContextPlugin):
+    """Gather all files referenced in this scene."""
+
+    label = "Collect File Dependencies"
+    order = pyblish.api.CollectorOrder - 0.49
+    hosts = ["blender"]
+    families = ["render"]
+
+    @classmethod
+    def apply_settings(cls, project_settings):
+        # Disable plug-in if not used for deadline submission anyway
+        settings = project_settings["deadline"]["publish"]["BlenderSubmitDeadline"]  # noqa
+        cls.enabled = settings.get("asset_dependencies", True)
+
+    def process(self, context):
+        dependencies = set()
+
+        # Add alembic files as dependencies
+        for cache in bpy.data.cache_files:
+            dependencies.add(
+                Path(bpy.path.abspath(cache.filepath)).resolve().as_posix())
+
+        # Add image files as dependencies
+        for image in bpy.data.images:
+            if image.filepath:
+                dependencies.add(Path(
+                    bpy.path.abspath(image.filepath)).resolve().as_posix())
+
+        context.data["fileDependencies"] = list(dependencies)
diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_blender_deadline.py b/client/ayon_core/modules/deadline/plugins/publish/submit_blender_deadline.py
index f5805beb5c..94fc8ed96d 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/submit_blender_deadline.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/submit_blender_deadline.py
@@ -40,6 +40,17 @@ class BlenderSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
     group = None
     job_delay = "00:00:00:00"
 
+    @classmethod
+    def apply_settings(cls, project_settings):
+        settings = project_settings["deadline"]["publish"]["BlenderSubmitDeadline"]  # noqa
+
+        # Take some defaults from settings
+        cls.asset_dependencies = settings.get("asset_dependencies",
+                                              cls.asset_dependencies)
+        cls.use_published = settings.get("use_published", cls.use_published)
+        cls.priority = settings.get("priority", cls.priority)
+        cls.group = settings.get("group", cls.group)
+
     def get_job_info(self):
         job_info = DeadlineJobInfo(Plugin="Blender")
 
@@ -161,7 +172,7 @@ class BlenderSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
 
         return plugin_payload
 
-    def process_submission(self):
+    def process_submission(self, auth=None):
         instance = self._instance
 
         expected_files = instance.data["expectedFiles"]
diff --git a/server_addon/deadline/package.py b/server_addon/deadline/package.py
index 25ba1c1166..e26734c813 100644
--- a/server_addon/deadline/package.py
+++ b/server_addon/deadline/package.py
@@ -1,3 +1,3 @@
 name = "deadline"
 title = "Deadline"
-version = "0.1.11"
+version = "0.1.12"
diff --git a/server_addon/deadline/server/settings/publish_plugins.py b/server_addon/deadline/server/settings/publish_plugins.py
index 784ad2560b..85a93d49cd 100644
--- a/server_addon/deadline/server/settings/publish_plugins.py
+++ b/server_addon/deadline/server/settings/publish_plugins.py
@@ -270,6 +270,7 @@ class BlenderSubmitDeadlineModel(BaseSettingsModel):
     optional: bool = SettingsField(title="Optional")
     active: bool = SettingsField(title="Active")
     use_published: bool = SettingsField(title="Use Published scene")
+    asset_dependencies: bool = SettingsField(title="Use Asset dependencies")
     priority: int = SettingsField(title="Priority")
     chunk_size: int = SettingsField(title="Frame per Task")
     group: str = SettingsField("", title="Group Name")
@@ -413,6 +414,7 @@ DEFAULT_DEADLINE_PLUGINS_SETTINGS = {
         "optional": False,
         "active": True,
         "use_published": True,
+        "asset_dependencies": True,
         "priority": 50,
         "chunk_size": 10,
         "group": "none",