Merge branch 'develop' into enhancement/anatomy_template_enum

server/settings/publish_plugins.py

@@ -938,6 +938,20 @@ class IntegrateHeroVersionModel(BaseSettingsModel):
                     "hero versions.")
 
 
+class CollectRenderedFilesModel(BaseSettingsModel):
+    remove_files: bool = SettingsField(
+        False,
+        title="Remove rendered files",
+        description=(
+            "Remove rendered files and metadata json on publish.\n\n"
+            "Note that when enabled but the render is to a configured "
+            "persistent staging directory the files will not be removed. "
+            "However with this disabled the files will **not** be removed in "
+            "either case."
+        )
+    )
+
+
 class CleanUpModel(BaseSettingsModel):
     _isGroup = True
     paterns: list[str] = SettingsField(  # codespell:ignore paterns
@@ -1050,6 +1064,10 @@ class PublishPuginsModel(BaseSettingsModel):
             "published as a render/review product of its own."
         )
     )
+    CollectRenderedFiles: CollectRenderedFilesModel = SettingsField(
+        default_factory=CollectRenderedFilesModel,
+        title="Clean up farm rendered files"
+    )
     CleanUp: CleanUpModel = SettingsField(
         default_factory=CleanUpModel,
         title="Clean Up"
@@ -1437,6 +1455,9 @@ DEFAULT_PUBLISH_VALUES = {
     "AttachReviewables": {
         "enabled": True,
     },
+    "CollectRenderedFiles": {
+        "remove_files": False
+    },
     "CleanUp": {
         "paterns": [],  # codespell:ignore paterns
         "remove_temp_renders": False