fix few issues with attributes

Author: iLLiCiTiT

ayon_api/_api_helpers/lists.py

@@ -53,14 +53,14 @@ def get_entity_lists(
 
         o_fields = tuple(fields)
         fields = set()
-        requires_attrib = False
+        add_all_attrib = False
         for field in o_fields:
             if field == "attrib" or field.startswith("attrib."):
-                requires_attrib = True
+                add_all_attrib = True
             else:
                 fields.add(field)
 
-        if requires_attrib:
+        if add_all_attrib:
             fields.add("allAttrib")
 
         if "items" in fields:
@@ -73,7 +73,7 @@ def get_entity_lists(
             }
 
         available_attribs = {}
-        if requires_attrib:
+        if "allAttrib" in fields:
             available_attribs = self.get_attributes_for_type("list")
 
         if active is not None:
@@ -98,15 +98,13 @@ def get_entity_lists(
                 if isinstance(attributes, str):
                     entity_list["attributes"] = json.loads(attributes)
 
-                if requires_attrib:
-                    attrib = json.loads(entity_list["allAttrib"])
+                self._convert_entity_data(entity_list)
+
+                attrib = entity_list.get("attrib")
+                if attrib is not None:
                     for attrib_name, attrib_data in available_attribs.items():
                         attrib.setdefault(attrib_name, attrib_data["default"])
 
-                    entity_list["attrib"] = attrib
-
-                self._convert_entity_data(entity_list)
-
                 yield entity_list
 
     def get_entity_list_rest(

ayon_api/_api_helpers/projects.py

@@ -164,8 +164,10 @@ def get_rest_project(
             return None
         project = response.data
         attrib = project["attrib"]
-        for attr_name in self.get_attributes_for_type("project"):
-            attrib.setdefault(attr_name, None)
+        for attr_name, attr_data in (
+            self.get_attributes_for_type("project").items()
+        ):
+            attrib.setdefault(attr_name, attr_data["default"])
         self._fill_project_entity_data(project)
         return project
 
@@ -809,6 +811,10 @@ def _get_graphql_projects(
         if project_name is not None:
             query.set_variable_value("projectName", project_name)
 
+        attributes = {}
+        if "allAttrib" in fields:
+            attributes = self.get_attributes_for_type("project")
+
         for parsed_data in query.continuous_query(self):
             for project in parsed_data["projects"]:
                 if active is not None and active is not project["active"]:
@@ -827,9 +833,7 @@ def _get_graphql_projects(
                     #   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()
-                    ):
+                    for name, attr_data in attributes.items():
                         # NOTE 'default' can be 'None'
                         attrib.setdefault(name, attr_data["default"])
 

ayon_api/constants.py

@@ -33,9 +33,6 @@
     "hasPassword",
     "updatedAt",
     "apiKeyPreview",
-    "attrib.avatarUrl",
-    "attrib.email",
-    "attrib.fullName",
 }
 
 # --- Project folder types ---
@@ -104,7 +101,6 @@
     "linkTypes",
     "statuses",
     "tags",
-    "attrib",
 }
 
 # --- Folders ---

ayon_api/server_api.py

@@ -5,6 +5,7 @@
 """
 from __future__ import annotations
 
+import copy
 import os
 import re
 import io
@@ -1007,29 +1008,44 @@ def get_users(
 
         if not fields:
             fields = self.get_default_fields_for_type("user")
+        else:
+            fields = set(fields)
+            add_all_attrib = False
+            for field in tuple(fields):
+                if field == "attrib" or field.startswith("attrib."):
+                    fields.discard(field)
+                    add_all_attrib = True
+
+            if add_all_attrib:
+                fields.add("allAttrib")
 
-        query = users_graphql_query(set(fields))
+        query = users_graphql_query(fields)
         for attr, filter_value in filters.items():
             query.set_variable_value(attr, filter_value)
 
-        attributes = self.get_attributes_for_type("user")
+        attributes = {}
+        if "allAttrib" in fields:
+            attributes = self.get_attributes_for_type("user")
+
         for parsed_data in query.continuous_query(self):
             for user in parsed_data["users"]:
                 access_groups = user.get("accessGroups")
                 if isinstance(access_groups, str):
                     user["accessGroups"] = json.loads(access_groups)
-                all_attrib = user.get("allAttrib")
-                if isinstance(all_attrib, str):
-                    user["allAttrib"] = json.loads(all_attrib)
-                if "attrib" in user:
-                    user["ownAttrib"] = user["attrib"].copy()
-                    attrib = user["attrib"]
-                    for key, value in tuple(attrib.items()):
-                        if value is not None:
-                            continue
-                        attr_def = attributes.get(key)
-                        if attr_def is not None:
-                            attrib[key] = attr_def["default"]
+
+                attrib = user.get("allAttrib")
+                if isinstance(attrib, str):
+                    attrib = json.loads(attrib)
+
+                if attrib is not None:
+                    own_attrib = copy.deepcopy(attrib)
+                    user["ownAttrib"] = own_attrib
+                    for name, attr_data in attributes.items():
+                        attrib.setdefault(name, attr_data["default"])
+                        own_attrib.setdefault(name, None)
+
+                    user["attrib"] = attrib
+
                 yield user
 
     def get_user_by_name(
@@ -1089,10 +1105,9 @@ def get_user(
             response.raise_for_status()
             user = response.data
 
-        # NOTE Server does return only filled attributes right now.
-        #   This would fill all missing attributes with 'None'.
-        # for attr_name in self.get_attributes_for_type("user"):
-        #     user["attrib"].setdefault(attr_name, None)
+        attributes = self.get_attributes_for_type("user")
+        for attr_name, attr_data in attributes.items():
+            user["attrib"].setdefault(attr_name, attr_data["default"])
 
         fill_own_attribs(user)
         return user
@@ -2124,6 +2139,9 @@ def get_default_fields_for_type(self, entity_type: str) -> set[str]:
         if entity_type == "activity":
             return set(DEFAULT_ACTIVITY_FIELDS)
 
+        if entity_type == "productType":
+            return set(DEFAULT_PRODUCT_TYPE_FIELDS)
+
         if entity_type == "project":
             entity_type_defaults = set(DEFAULT_PROJECT_FIELDS)
             maj_v, min_v, patch_v, _, _ = self.server_version_tuple
@@ -2154,9 +2172,6 @@ def get_default_fields_for_type(self, entity_type: str) -> set[str]:
             if not self.graphql_allows_traits_in_representations:
                 entity_type_defaults.discard("traits")
 
-        elif entity_type == "productType":
-            entity_type_defaults = set(DEFAULT_PRODUCT_TYPE_FIELDS)
-
         elif entity_type == "workfile":
             entity_type_defaults = set(DEFAULT_WORKFILE_INFO_FIELDS)
 
@@ -2165,15 +2180,13 @@ def get_default_fields_for_type(self, entity_type: str) -> set[str]:
 
         elif entity_type == "entityList":
             entity_type_defaults = set(DEFAULT_ENTITY_LIST_FIELDS)
-            # Attributes scope is 'list'
-            entity_type = "list"
 
         else:
             raise ValueError(f"Unknown entity type \"{entity_type}\"")
-        return (
-            entity_type_defaults
-            | self.get_attributes_fields_for_type(entity_type)
-        )
+
+        entity_type_defaults.add("allAttrib")
+
+        return entity_type_defaults
 
     def get_rest_entity_by_id(
         self,