From 87329306d4a791b90e540ec49054ce187aa6d2df Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Wed, 9 Oct 2024 15:17:45 +0200
Subject: [PATCH] don't set all values unless they are valid for the instance

---
 .../tools/publisher/models/create.py          | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/client/ayon_core/tools/publisher/models/create.py b/client/ayon_core/tools/publisher/models/create.py
index 536e1475ea..493fcc3b01 100644
--- a/client/ayon_core/tools/publisher/models/create.py
+++ b/client/ayon_core/tools/publisher/models/create.py
@@ -333,10 +333,18 @@ def merge_attr_defs(attr_defs: List[List[AbstractAttrDef]]):
     for instance_attr_defs in attr_defs:
         idx = 0
         for attr_idx, attr_def in enumerate(instance_attr_defs):
+            # QUESTION should we merge NumberDef too? Use lowest min and
+            #   biggest max...
             is_enum = isinstance(attr_def, EnumDef)
             match_idx = None
             match_attr = None
             for union_idx, union_def in enumerate(defs_union):
+                if is_enum and (
+                    not isinstance(union_def, EnumDef)
+                    or union_def.multiselection != attr_def.multiselection
+                ):
+                    continue
+
                 if (
                     attr_def.compare_to_def(
                         union_def,
@@ -759,6 +767,18 @@ def set_instances_publish_attr_values(
                 else:
                     instance = self._get_instance_by_id(instance_id)
                 plugin_val = instance.publish_attributes[plugin_name]
+                attr_def = plugin_val.get_attr_def(key)
+                # Ignore if attribute is not available or enabled/visible
+                #   on the instance, or the value is not valid for definition
+                if (
+                    attr_def is None
+                    or not attr_def.is_value_def
+                    or not attr_def.visible
+                    or not attr_def.enabled
+                    or not attr_def.is_value_valid(value)
+                ):
+                    continue
+
                 plugin_val[key] = value
 
     def get_publish_attribute_definitions(