From 9012e52a4b8652e43c4ea1584fee82a2ab82e3e9 Mon Sep 17 00:00:00 2001 From: MustafaJafar Date: Wed, 22 May 2024 21:49:21 +0300 Subject: [PATCH 1/3] add renderlayer and aov_name to dynamic_data of get_product_name --- .../publish/collect_local_render_instances.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_local_render_instances.py b/client/ayon_core/hosts/houdini/plugins/publish/collect_local_render_instances.py index 474002e1ee..a6235ae78c 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/collect_local_render_instances.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/collect_local_render_instances.py @@ -74,10 +74,18 @@ class CollectLocalRenderInstances(pyblish.api.InstancePlugin): ) for aov_name, aov_filepaths in expectedFiles.items(): - product_name = product_group - - if aov_name: - product_name = "{}_{}".format(product_name, aov_name) + product_name = get_product_name( + context.data["projectName"], + context.data["taskEntity"]["name"], + context.data["taskEntity"]["taskType"], + context.data["hostName"], + product_type, + instance.data["productName"], + dynamic_data={ + "renderlayer": instance.data["renderlayer"], + "aov": aov_name + } + ) # Create instance for each AOV aov_instance = context.create_instance(product_name) From cba100a21e9de16ea64f01c9bd13b5a502976974 Mon Sep 17 00:00:00 2001 From: MustafaJafar Date: Wed, 22 May 2024 21:51:42 +0300 Subject: [PATCH 2/3] add renderlayer and aov keys to created runtime render instances --- .../houdini/plugins/publish/collect_local_render_instances.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_local_render_instances.py b/client/ayon_core/hosts/houdini/plugins/publish/collect_local_render_instances.py index a6235ae78c..04dfefd009 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/collect_local_render_instances.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/collect_local_render_instances.py @@ -127,6 +127,8 @@ class CollectLocalRenderInstances(pyblish.api.InstancePlugin): "productGroup": product_group, "families": ["render.local.hou", "review"], "instance_node": instance.data["instance_node"], + "renderlayer": instance.data["renderlayer"], + "aov": aov_name, "representations": [ { "stagingDir": staging_dir, From 62870f239b6d137923adc1fd13d89077063cc830 Mon Sep 17 00:00:00 2001 From: MustafaJafar Date: Wed, 22 May 2024 21:54:33 +0300 Subject: [PATCH 3/3] add TODO about product_group value --- .../houdini/plugins/publish/collect_local_render_instances.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_local_render_instances.py b/client/ayon_core/hosts/houdini/plugins/publish/collect_local_render_instances.py index 04dfefd009..39f6f4c470 100644 --- a/client/ayon_core/hosts/houdini/plugins/publish/collect_local_render_instances.py +++ b/client/ayon_core/hosts/houdini/plugins/publish/collect_local_render_instances.py @@ -64,6 +64,8 @@ class CollectLocalRenderInstances(pyblish.api.InstancePlugin): expectedFiles = next(iter(instance.data["expectedFiles"]), {}) product_type = "render" # is always render + # TODO: Match the value of product_group with the value of + # group_name in farm pyblish functions. product_group = get_product_name( context.data["projectName"], context.data["taskEntity"]["name"],