From effedd82c8ddb511d844dcdef8724c4c63c2355f Mon Sep 17 00:00:00 2001
From: MustafaJafar <mustafataherzaky@outlook.com>
Date: Tue, 23 Apr 2024 21:30:58 +0200
Subject: [PATCH] fix bug with aov_filter

---
 .../plugins/publish/collect_local_render_instances.py    | 9 +++++----
 server_addon/houdini/server/settings/publish.py          | 9 ++++++---
 2 files changed, 11 insertions(+), 7 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 073053188c..5a446fa0d3 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
@@ -25,8 +25,9 @@ class CollectLocalRenderInstances(pyblish.api.InstancePlugin):
     hosts = ["houdini"]
     label = "Collect local render instances"
 
-    override_deadline_aov_filter = False
-    aov_filter = {}
+    use_deadline_aov_filter = False
+    aov_filter = {"host_name": "houdini",
+                  "value": [".*([Bb]eauty).*"]}
 
     @classmethod
     def apply_settings(cls, project_settings):
@@ -37,11 +38,11 @@ class CollectLocalRenderInstances(pyblish.api.InstancePlugin):
                                        category="houdini")
         apply_plugin_settings_automatically(cls, settings, logger=cls.log)
 
-        if not cls.override_deadline_aov_filter:
+        if not cls.use_deadline_aov_filter:
             # get aov_filter from collector settings
             # and restructure it as match_aov_pattern requires.
             cls.aov_filter = {
-                "houdini": cls.aov_filter["value"]
+                cls.aov_filter["host_name"]: cls.aov_filter["value"]
             }
         else:
             # get aov_filter from deadline settings
diff --git a/server_addon/houdini/server/settings/publish.py b/server_addon/houdini/server/settings/publish.py
index 0912ecd997..9e8e796aff 100644
--- a/server_addon/houdini/server/settings/publish.py
+++ b/server_addon/houdini/server/settings/publish.py
@@ -24,6 +24,8 @@ class CollectChunkSizeModel(BaseSettingsModel):
 
 
 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"
@@ -31,9 +33,9 @@ class AOVFilterSubmodel(BaseSettingsModel):
 
 class CollectLocalRenderInstancesModel(BaseSettingsModel):
 
-    override_deadline_aov_filter: bool = SettingsField(
+    use_deadline_aov_filter: bool = SettingsField(
         False,
-        title="Override Deadline AOV Filter"
+        title="Use Deadline AOV Filter"
     )
 
     aov_filter: AOVFilterSubmodel = SettingsField(
@@ -109,8 +111,9 @@ DEFAULT_HOUDINI_PUBLISH_SETTINGS = {
         "chunk_size": 999999
     },
     "CollectLocalRenderInstances": {
-        "override_deadline_aov_filter": False,
+        "use_deadline_aov_filter": False,
         "aov_filter" : {
+            "host_name": "houdini",
             "value": [
                 ".*([Bb]eauty).*"
             ]