use allAttrib instead of attrib

Author: iLLiCiTiT

ayon_api/_api_helpers/projects.py

@@ -816,15 +816,15 @@ def _get_graphql_projects(
                 if library is not None and library is not project["library"]:
                     continue
 
+                attrib = None
                 all_attrib = project.get("allAttrib")
                 if isinstance(all_attrib, str):
-                    all_attrib = json.loads(all_attrib)
-                    project["allAttrib"] = all_attrib
+                    attrib = json.loads(all_attrib)
 
-                if all_attrib is not None:
-                    project["ownAttrib"] = list(all_attrib)
-
-                    attrib = copy.deepcopy(all_attrib)
+                if attrib is not None:
+                    # NOTE 'ownAttrib' logic might change in the future if
+                    #   allAttrib would return all attribute values.
+                    project["ownAttrib"] = list(attrib)
                     project["attrib"] = attrib
                     for name, attr_data in (
                         self.get_attributes_for_type("project").items()

ayon_api/server_api.py

@@ -2424,16 +2424,21 @@ def _prepare_fields(
         if not fields:
             return
 
-        if "attrib" in fields:
-            fields.remove("attrib")
-            fields |= self.get_attributes_fields_for_type(entity_type)
+        add_all_attrib = False
+        for field in tuple(fields):
+            if field == "attrib" or field.startswith("attrib."):
+                fields.discard(field)
+                add_all_attrib = True
 
         if own_attributes:
             if entity_type == "project":
-                fields.add("allAttrib")
+                add_all_attrib = True
             elif entity_type in {"folder", "task"}:
                 fields.add("ownAttrib")
 
+        if add_all_attrib:
+            fields.add("allAttrib")
+
         if entity_type != "project":
             return
 
@@ -2499,11 +2504,18 @@ def _prepare_advanced_filters(
         return filters
 
     def _convert_entity_data(self, entity: AnyEntityDict):
-        if not entity or "data" not in entity:
+        if not entity:
             return
 
-        entity_data = entity["data"] or {}
-        if isinstance(entity_data, str):
-            entity_data = json.loads(entity_data)
+        if "data" in entity:
+            entity_data = entity["data"] or {}
+            if isinstance(entity_data, str):
+                entity_data = json.loads(entity_data)
+
+            entity["data"] = entity_data
 
-        entity["data"] = entity_data
+        all_attrib = entity.get("allAttrib")
+        if isinstance(all_attrib, str):
+            # NOTE: This expects server returns all attributes available for
+            #   the entity type.
+            entity["attrib"] = json.loads(all_attrib)