change how links fields are handled

Author: iLLiCiTiT

ayon_api/_api_helpers/folders.py

@@ -331,10 +331,9 @@ def get_folders(
         if own_attributes:
             fields.add("ownAttrib")
 
-        query = folders_graphql_query(
-            fields,
-            links_support_data=self.links_graphql_support_data(),
-        )
+        self._prepare_link_fields(fields)
+
+        query = folders_graphql_query(fields)
         for attr, filter_value in graphql_filters.items():
             query.set_variable_value(attr, filter_value)
 
@@ -481,10 +480,7 @@ def get_folder_ids_with_products(
             if not folder_ids:
                 return set()
 
-        query = folders_graphql_query(
-            {"id"},
-            links_support_data=self.links_graphql_support_data(),
-        )
+        query = folders_graphql_query({"id"})
         query.set_variable_value("projectName", project_name)
         query.set_variable_value("folderHasProducts", True)
         if folder_ids:

ayon_api/_api_helpers/products.py

@@ -179,10 +179,9 @@ def get_products(
             if filter_value:
                 graphql_filters[filter_key] = filter_value
 
-        query = products_graphql_query(
-            fields,
-            links_support_data=self.links_graphql_support_data(),
-        )
+        self._prepare_link_fields(fields)
+
+        query = products_graphql_query(fields)
         for attr, filter_value in graphql_filters.items():
             query.set_variable_value(attr, filter_value)
 

ayon_api/_api_helpers/representations.py

@@ -108,6 +108,8 @@ def get_representations(
             fields.discard("files")
             fields |= REPRESENTATION_FILES_FIELDS
 
+        self._prepare_link_fields(fields)
+
         graphql_filters = {
             "projectName": project_name
         }
@@ -168,10 +170,7 @@ def get_representations(
         if filters:
             graphql_filters["filter"] = filters
 
-        query = representations_graphql_query(
-            fields,
-            links_support_data=self.links_graphql_support_data(),
-        )
+        query = representations_graphql_query(fields)
 
         for attr, filter_value in graphql_filters.items():
             query.set_variable_value(attr, filter_value)

ayon_api/_api_helpers/tasks.py

@@ -106,10 +106,9 @@ def get_tasks(
         if active is not None:
             fields.add("active")
 
-        query = tasks_graphql_query(
-            fields,
-            links_support_data=self.links_graphql_support_data(),
-        )
+        self._prepare_link_fields(fields)
+
+        query = tasks_graphql_query(fields)
         for attr, filter_value in graphql_filters.items():
             query.set_variable_value(attr, filter_value)
 
@@ -270,10 +269,9 @@ def get_tasks_by_folder_paths(
         if active is not None:
             fields.add("active")
 
-        query = tasks_by_folder_paths_graphql_query(
-            fields,
-            links_support_data=self.links_graphql_support_data(),
-        )
+        self._prepare_link_fields(fields)
+
+        query = tasks_by_folder_paths_graphql_query(fields)
         for attr, filter_value in graphql_filters.items():
             query.set_variable_value(attr, filter_value)
 

ayon_api/_api_helpers/versions.py

@@ -87,6 +87,8 @@ def get_versions(
         if active is not None:
             fields.add("active")
 
+        self._prepare_link_fields(fields)
+
         if own_attributes is not _PLACEHOLDER:
             warnings.warn(
                 (
@@ -116,7 +118,6 @@ def get_versions(
         ):
             return
 
-
         filters = self._prepare_advanced_filters(filters)
         if filters:
             graphql_filters["filter"] = filters
@@ -130,31 +131,22 @@ def get_versions(
         if standard and not latest:
             # This query all versions standard + hero
             # - hero must be filtered out if is not enabled during loop
-            query = versions_graphql_query(
-                fields,
-                links_support_data=self.links_graphql_support_data(),
-            )
+            query = versions_graphql_query(fields)
             for attr, filter_value in graphql_filters.items():
                 query.set_variable_value(attr, filter_value)
             queries.append(query)
         else:
             if hero:
                 # Add hero query if hero is enabled
-                hero_query = versions_graphql_query(
-                    fields,
-                    links_support_data=self.links_graphql_support_data(),
-                )
+                hero_query = versions_graphql_query(fields)
                 for attr, filter_value in graphql_filters.items():
                     hero_query.set_variable_value(attr, filter_value)
 
                 hero_query.set_variable_value("heroOnly", True)
                 queries.append(hero_query)
 
             if standard:
-                standard_query = versions_graphql_query(
-                    fields,
-                    links_support_data=self.links_graphql_support_data(),
-                )
+                standard_query = versions_graphql_query(fields)
                 for attr, filter_value in graphql_filters.items():
                     standard_query.set_variable_value(attr, filter_value)
 

ayon_api/_api_helpers/workfiles.py

@@ -93,10 +93,9 @@ def get_workfile_entities(
             fields = set(fields)
             self._prepare_fields("workfile", fields)
 
-        query = workfiles_info_graphql_query(
-            fields,
-            links_support_data=self.links_graphql_support_data(),
-        )
+        self._prepare_link_fields(fields)
+
+        query = workfiles_info_graphql_query(fields)
 
         for attr, filter_value in filters.items():
             query.set_variable_value(attr, filter_value)

ayon_api/graphql_queries.py

@@ -15,20 +15,17 @@
 def add_links_fields(
     entity_field: GraphQlQueryEdgeField,
     nested_fields: dict | None,
-    *,
-    supports_data: bool = False,
 ) -> None:
     if "links" not in nested_fields:
         return
     links_fields = nested_fields.pop("links")
-
     link_edge_fields = set(DEFAULT_LINK_FIELDS)
-    if supports_data:
-        link_edge_fields.add("data")
 
     if isinstance(links_fields, dict):
         simple_fields = set(links_fields)
-        simple_variant = len(simple_fields - link_edge_fields) == 0
+        diff = simple_fields - link_edge_fields
+        diff.discard("data")
+        simple_variant = len(diff) == 0
     else:
         simple_variant = True
         simple_fields = link_edge_fields
@@ -137,11 +134,7 @@ def product_types_query(fields):
     return query
 
 
-def folders_graphql_query(
-    fields: set[str],
-    *,
-    links_support_data: bool = False,
-) -> GraphQlQuery:
+def folders_graphql_query(fields: set[str]) -> GraphQlQuery:
     query = GraphQlQuery("FoldersQuery")
     project_name_var = query.add_variable("projectName", "String!")
     folder_ids_var = query.add_variable("folderIds", "[String!]")
@@ -181,11 +174,8 @@ def folders_graphql_query(
     folders_field.set_filter("filter", filter_var)
 
     nested_fields = fields_to_dict(fields)
-    add_links_fields(
-        folders_field,
-        nested_fields,
-        supports_data=links_support_data,
-    )
+
+    add_links_fields(folders_field, nested_fields)
 
     query_queue = collections.deque()
     for key, value in nested_fields.items():
@@ -203,11 +193,7 @@ def folders_graphql_query(
     return query
 
 
-def tasks_graphql_query(
-    fields: set[str],
-    *,
-    links_support_data: bool = False,
-) -> GraphQlQuery:
+def tasks_graphql_query(fields: set[str]) -> GraphQlQuery:
     query = GraphQlQuery("TasksQuery")
     project_name_var = query.add_variable("projectName", "String!")
     task_ids_var = query.add_variable("taskIds", "[String!]")
@@ -237,11 +223,7 @@ def tasks_graphql_query(
     tasks_field.set_filter("filter", filter_var)
 
     nested_fields = fields_to_dict(fields)
-    add_links_fields(
-        tasks_field,
-        nested_fields,
-        supports_data=links_support_data,
-    )
+    add_links_fields(tasks_field, nested_fields)
 
     query_queue = collections.deque()
     for key, value in nested_fields.items():
@@ -259,11 +241,7 @@ def tasks_graphql_query(
     return query
 
 
-def tasks_by_folder_paths_graphql_query(
-    fields: set[str],
-    *,
-    links_support_data: bool = False,
-) -> GraphQlQuery:
+def tasks_by_folder_paths_graphql_query(fields: set[str]) -> GraphQlQuery:
     query = GraphQlQuery("TasksByFolderPathQuery")
     project_name_var = query.add_variable("projectName", "String!")
     task_names_var = query.add_variable("taskNames", "[String!]")
@@ -294,11 +272,8 @@ def tasks_by_folder_paths_graphql_query(
     tasks_field.set_filter("filter", filter_var)
 
     nested_fields = fields_to_dict(fields)
-    add_links_fields(
-        tasks_field,
-        nested_fields,
-        supports_data=links_support_data,
-    )
+
+    add_links_fields(tasks_field, nested_fields)
 
     query_queue = collections.deque()
     for key, value in nested_fields.items():
@@ -316,11 +291,7 @@ def tasks_by_folder_paths_graphql_query(
     return query
 
 
-def products_graphql_query(
-    fields: set[str],
-    *,
-    links_support_data: bool = False,
-) -> GraphQlQuery:
+def products_graphql_query(fields: set[str]) -> GraphQlQuery:
     query = GraphQlQuery("ProductsQuery")
 
     project_name_var = query.add_variable("projectName", "String!")
@@ -352,11 +323,7 @@ def products_graphql_query(
     products_field.set_filter("filter", filter_var)
 
     nested_fields = fields_to_dict(set(fields))
-    add_links_fields(
-        products_field,
-        nested_fields,
-        supports_data=links_support_data,
-    )
+    add_links_fields(products_field, nested_fields)
 
     query_queue = collections.deque()
     for key, value in nested_fields.items():
@@ -374,11 +341,7 @@ def products_graphql_query(
     return query
 
 
-def versions_graphql_query(
-    fields: set[str],
-    *,
-    links_support_data: bool = False,
-) -> GraphQlQuery:
+def versions_graphql_query(fields: set[str]) -> GraphQlQuery:
     query = GraphQlQuery("VersionsQuery")
 
     project_name_var = query.add_variable("projectName", "String!")
@@ -411,11 +374,7 @@ def versions_graphql_query(
     versions_field.set_filter("filter", filter_var)
 
     nested_fields = fields_to_dict(set(fields))
-    add_links_fields(
-        versions_field,
-        nested_fields,
-        supports_data=links_support_data,
-    )
+    add_links_fields(versions_field, nested_fields)
 
     query_queue = collections.deque()
     for key, value in nested_fields.items():
@@ -433,11 +392,7 @@ def versions_graphql_query(
     return query
 
 
-def representations_graphql_query(
-    fields: set[str],
-    *,
-    links_support_data: bool = False,
-) -> GraphQlQuery:
+def representations_graphql_query(fields: set[str]) -> GraphQlQuery:
     query = GraphQlQuery("RepresentationsQuery")
 
     project_name_var = query.add_variable("projectName", "String!")
@@ -468,11 +423,7 @@ def representations_graphql_query(
     repres_field.set_filter("filter", filter_var)
 
     nested_fields = fields_to_dict(set(fields))
-    add_links_fields(
-        repres_field,
-        nested_fields,
-        supports_data=links_support_data,
-    )
+    add_links_fields(repres_field, nested_fields)
 
     query_queue = collections.deque()
     for key, value in nested_fields.items():
@@ -589,11 +540,7 @@ def representations_hierarchy_qraphql_query(
     return query
 
 
-def workfiles_info_graphql_query(
-    fields: set[str],
-    *,
-    links_support_data: bool = False,
-) -> GraphQlQuery:
+def workfiles_info_graphql_query(fields: set[str]) -> GraphQlQuery:
     query = GraphQlQuery("WorkfilesInfo")
     project_name_var = query.add_variable("projectName", "String!")
     workfiles_info_ids = query.add_variable("workfileIds", "[String!]")
@@ -617,11 +564,7 @@ def workfiles_info_graphql_query(
     workfiles_field.set_filter("tags", tags_var)
 
     nested_fields = fields_to_dict(set(fields))
-    add_links_fields(
-        workfiles_field,
-        nested_fields,
-        supports_data=links_support_data,
-    )
+    add_links_fields(workfiles_field, nested_fields)
 
     query_queue = collections.deque()
     for key, value in nested_fields.items():