Merge branch 'develop' into enhancement/AY-5186_3dsmax-project-creation

server_addon/houdini/package.py

@@ -1,3 +1,3 @@
 name = "houdini"
 title = "Houdini"
-version = "0.2.13"
+version = "0.2.14"

server_addon/houdini/server/settings/publish.py

@@ -1,4 +1,7 @@
-from ayon_server.settings import BaseSettingsModel, SettingsField
+from ayon_server.settings import (
+    BaseSettingsModel,
+    SettingsField
+)
 
 
 # Publish Plugins
@@ -20,6 +23,27 @@ class CollectChunkSizeModel(BaseSettingsModel):
         title="Frames Per Task")
 
 
+class AOVFilterSubmodel(BaseSettingsModel):
+    """You should use the same host name you are using for Houdini."""
+    host_name: str = SettingsField("", title="Houdini Host name")
+    value: list[str] = SettingsField(
+        default_factory=list,
+        title="AOV regex"
+    )
+
+class CollectLocalRenderInstancesModel(BaseSettingsModel):
+
+    use_deadline_aov_filter: bool = SettingsField(
+        False,
+        title="Use Deadline AOV Filter"
+    )
+
+    aov_filter: AOVFilterSubmodel = SettingsField(
+        default_factory=AOVFilterSubmodel,
+        title="Reviewable products filter"
+    )
+
+
 class ValidateWorkfilePathsModel(BaseSettingsModel):
     enabled: bool = SettingsField(title="Enabled")
     optional: bool = SettingsField(title="Optional")
@@ -49,6 +73,10 @@ class PublishPluginsModel(BaseSettingsModel):
         default_factory=CollectChunkSizeModel,
         title="Collect Chunk Size."
     )
+    CollectLocalRenderInstances: CollectLocalRenderInstancesModel = SettingsField(
+        default_factory=CollectLocalRenderInstancesModel,
+        title="Collect Local Render Instances."
+    )
     ValidateContainers: BasicValidateModel = SettingsField(
         default_factory=BasicValidateModel,
         title="Validate Latest Containers.",
@@ -82,6 +110,15 @@ DEFAULT_HOUDINI_PUBLISH_SETTINGS = {
         "optional": True,
         "chunk_size": 999999
     },
+    "CollectLocalRenderInstances": {
+        "use_deadline_aov_filter": False,
+        "aov_filter" : {
+            "host_name": "houdini",
+            "value": [
+                ".*([Bb]eauty).*"
+            ]
+        }
+    },
     "ValidateContainers": {
         "enabled": True,
         "optional": True,

server_addon/traypublisher/package.py

@@ -1,3 +1,3 @@
 name = "traypublisher"
 title = "TrayPublisher"
-version = "0.1.4"
+version = "0.1.5"

server_addon/traypublisher/server/settings/publish_plugins.py

@@ -1,4 +1,7 @@
-from ayon_server.settings import BaseSettingsModel, SettingsField
+from ayon_server.settings import (
+    BaseSettingsModel,
+    SettingsField,
+)
 
 
 class ValidatePluginModel(BaseSettingsModel):
@@ -14,6 +17,45 @@ class ValidateFrameRangeModel(ValidatePluginModel):
      'my_asset_to_publish.mov')"""
 
 
+class ExtractEditorialPckgFFmpegModel(BaseSettingsModel):
+    video_filters: list[str] = SettingsField(
+        default_factory=list,
+        title="Video filters"
+    )
+    audio_filters: list[str] = SettingsField(
+        default_factory=list,
+        title="Audio filters"
+    )
+    input: list[str] = SettingsField(
+        default_factory=list,
+        title="Input arguments"
+    )
+    output: list[str] = SettingsField(
+        default_factory=list,
+        title="Output arguments"
+    )
+
+
+class ExtractEditorialPckgOutputDefModel(BaseSettingsModel):
+    _layout = "expanded"
+    ext: str = SettingsField("", title="Output extension")
+
+    ffmpeg_args: ExtractEditorialPckgFFmpegModel = SettingsField(
+        default_factory=ExtractEditorialPckgFFmpegModel,
+        title="FFmpeg arguments"
+    )
+
+
+class ExtractEditorialPckgConversionModel(BaseSettingsModel):
+    """Set output definition if resource files should be converted."""
+    conversion_enabled: bool = SettingsField(True,
+                                             title="Conversion enabled")
+    output: ExtractEditorialPckgOutputDefModel = SettingsField(
+        default_factory=ExtractEditorialPckgOutputDefModel,
+        title="Output Definitions",
+    )
+
+
 class TrayPublisherPublishPlugins(BaseSettingsModel):
     CollectFrameDataFromAssetEntity: ValidatePluginModel = SettingsField(
         default_factory=ValidatePluginModel,
@@ -28,6 +70,13 @@ class TrayPublisherPublishPlugins(BaseSettingsModel):
         default_factory=ValidatePluginModel,
     )
 
+    ExtractEditorialPckgConversion: ExtractEditorialPckgConversionModel = (
+        SettingsField(
+            default_factory=ExtractEditorialPckgConversionModel,
+            title="Extract Editorial Package Conversion"
+        )
+    )
+
 
 DEFAULT_PUBLISH_PLUGINS = {
     "CollectFrameDataFromAssetEntity": {
@@ -44,5 +93,24 @@ DEFAULT_PUBLISH_PLUGINS = {
         "enabled": True,
         "optional": True,
         "active": True
+    },
+    "ExtractEditorialPckgConversion": {
+        "optional": False,
+        "conversion_enabled": True,
+        "output": {
+            "ext": "",
+            "ffmpeg_args": {
+              "video_filters": [],
+              "audio_filters": [],
+              "input": [
+                "-apply_trc gamma22"
+              ],
+              "output": [
+                "-pix_fmt yuv420p",
+                "-crf 18",
+                "-intra"
+              ]
+            }
+        }
     }
 }