ayon-python-api 1.2.17__py3-none-any.whl → 1.2.19__py3-none-any.whl

ayon_api/_api_helpers/tasks.py

@@ -9,10 +9,7 @@ from ayon_api.utils import (
     create_entity_id,
     NOT_SET,
 )
-from ayon_api.graphql_queries import (
-    tasks_graphql_query,
-    tasks_by_folder_paths_graphql_query,
-)
+from ayon_api.graphql_queries import tasks_graphql_query
 
 from .base import BaseServerAPI
 
@@ -236,29 +233,21 @@ class TasksAPI(BaseServerAPI):
                 folder path.
 
         """
-        folder_paths = set(folder_paths)
-        if not project_name or not folder_paths:
-            return {}
-
-        graphql_filters = {
-            "projectName": project_name,
-            "folderPaths": list(folder_paths),
+        output = {
+            folder_path: []
+            for folder_path in folder_paths
+        }
+        if not project_name or not output:
+            return output
+
+        folder_path_by_id = {
+            folder["id"]: folder["path"]
+            for folder in self.get_folders(
+                project_name,
+                folder_paths=output.keys(),
+                fields={"id", "path"},
+            )
         }
-
-        if not prepare_list_filters(
-            graphql_filters,
-            ("taskNames", task_names),
-            ("taskTypes", task_types),
-            ("taskAssigneesAny", assignees),
-            ("taskAssigneesAll", assignees_all),
-            ("taskStatuses", statuses),
-            ("taskTags", tags),
-        ):
-            return {}
-
-        filters = self._prepare_advanced_filters(filters)
-        if filters:
-            graphql_filters["filter"] = filters
 
         if not fields:
             fields = self.get_default_fields_for_type("task")
@@ -266,31 +255,25 @@ class TasksAPI(BaseServerAPI):
             fields = set(fields)
             self._prepare_fields("task", fields, own_attributes)
 
-        if active is not None:
-            fields.add("active")
-
-        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)
+        fields.add("folderId")
 
-        output = {
-            folder_path: []
-            for folder_path in folder_paths
-        }
-        for parsed_data in query.continuous_query(self):
-            for folder in parsed_data["project"]["folders"]:
-                folder_path = folder["path"]
-                for task in folder["tasks"]:
-                    if active is not None and active is not task["active"]:
-                        continue
-
-                    self._convert_entity_data(task)
+        for task_entity in self.get_tasks(
+            project_name,
+            folder_ids=folder_path_by_id.keys(),
+            task_names=task_names,
+            task_types=task_types,
+            assignees=assignees,
+            assignees_all=assignees_all,
+            statuses=statuses,
+            tags=tags,
+            active=active,
+            filters=filters,
+            fields=fields,
+        ):
+            folder_id = task_entity["folderId"]
+            folder_path = folder_path_by_id[folder_id]
+            output[folder_path].append(task_entity)
 
-                    if own_attributes:
-                        fill_own_attribs(task)
-                    output[folder_path].append(task)
         return output
 
     def get_tasks_by_folder_path(

ayon_api/exceptions.py

@@ -78,7 +78,11 @@ class HTTPRequestError(RequestError):
     pass
 
 
-class GraphQlQueryFailed(Exception):
+class GraphQlQueryError(Exception):
+    pass
+
+
+class GraphQlQueryFailed(GraphQlQueryError):
     def __init__(self, errors, query, variables):
         if variables is None:
             variables = {}

ayon_api/graphql.py

@@ -6,7 +6,7 @@ from abc import ABC, abstractmethod
 import typing
 from typing import Optional, Iterable, Any, Generator
 
-from .exceptions import GraphQlQueryFailed
+from .exceptions import GraphQlQueryError, GraphQlQueryFailed
 from .utils import SortOrder
 
 if typing.TYPE_CHECKING:
@@ -304,7 +304,7 @@ class GraphQlQuery:
             str: GraphQl string with variables and headers.
 
         Raises:
-            ValueError: Query has no fiels.
+            ValueError: Query has no fields.
 
         """
         if not self._children:
@@ -370,7 +370,7 @@ class GraphQlQuery:
             variables = self.get_variables_values()
             response = con.query_graphql(
                 query_str,
-                self.get_variables_values()
+                variables
             )
             if response.errors:
                 raise GraphQlQueryFailed(response.errors, query_str, variables)
@@ -396,6 +396,7 @@ class GraphQlQuery:
             while self.need_query:
                 query_str = self.calculate_query()
                 variables = self.get_variables_values()
+
                 response = con.query_graphql(query_str, variables)
                 if response.errors:
                     raise GraphQlQueryFailed(
@@ -902,8 +903,13 @@ class GraphQlQueryEdgeField(BaseGraphQlQueryField):
                 progress_data[cursor_key] = nodes_by_cursor
 
         page_info = value["pageInfo"]
-        new_cursor = page_info["endCursor"]
-        self._need_query = page_info["hasNextPage"]
+        if self._order == SortOrder.ascending:
+            new_cursor = page_info["endCursor"]
+            self._need_query = page_info["hasNextPage"]
+        else:
+            new_cursor = page_info["startCursor"]
+            self._need_query = page_info["hasPreviousPage"]
+
         edges = value["edges"]
         # Fake result parse
         if not edges:
@@ -931,15 +937,18 @@ class GraphQlQueryEdgeField(BaseGraphQlQueryField):
             for child in self._children:
                 child.parse_result(edge["node"], edge_value, progress_data)
 
-        if not self._need_query:
-            return
-
         change_cursor = True
         for child in self._children_iter():
             if child.need_query:
                 change_cursor = False
 
-        if change_cursor:
+        if change_cursor and self._need_query:
+            if new_cursor == self._cursor:
+                raise GraphQlQueryError(
+                    "Cursor didn't change during pagination."
+                    " This can cause infinite loop."
+                )
+
             for child in self._children_iter():
                 child.reset_cursor()
             self._cursor = new_cursor
@@ -949,9 +958,7 @@ class GraphQlQueryEdgeField(BaseGraphQlQueryField):
 
     def get_filters(self) -> dict[str, Any]:
         filters = super().get_filters()
-        limit_key = "first"
-        if self._order == SortOrder.descending:
-            limit_key = "last"
+        limit_key = "first" if self._order == SortOrder.ascending else "last"
 
         limit_amount = 300
         if self._limit:
@@ -959,10 +966,19 @@ class GraphQlQueryEdgeField(BaseGraphQlQueryField):
             if total > self._limit:
                 limit_amount = self._limit - self._fetched_counter
 
+        if self.child_has_edges:
+            # Nested edge fields share a single cursor argument in the query.
+            # Query one parent item at a time so child pagination can't be
+            # overwritten by another parent from the same outer page.
+            limit_amount = 1
+
         filters[limit_key] = limit_amount
 
         if self._cursor:
-            filters["after"] = self._cursor
+            cursor_key = (
+                "after" if self._order == SortOrder.ascending else "before"
+            )
+            filters[cursor_key] = self._cursor
         return filters
 
     def calculate_query(self) -> str:
@@ -1000,8 +1016,16 @@ class GraphQlQueryEdgeField(BaseGraphQlQueryField):
         # Add page information
         output.append(edges_offset + "pageInfo {")
         for page_key in (
-            "endCursor",
-            "hasNextPage",
+            (
+                "endCursor"
+                if self._order == SortOrder.ascending
+                else "startCursor"
+            ),
+            (
+                "hasNextPage"
+                if self._order == SortOrder.ascending
+                else "hasPreviousPage"
+            ),
         ):
             output.append(node_offset + page_key)
         output.append(edges_offset + "}")

ayon_api/graphql_queries.py

@@ -243,56 +243,6 @@ def tasks_graphql_query(fields: set[str]) -> GraphQlQuery:
     return query
 
 
-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!]")
-    task_types_var = query.add_variable("taskTypes", "[String!]")
-    folder_paths_var = query.add_variable("folderPaths", "[String!]")
-    assignees_any_var = query.add_variable("taskAssigneesAny", "[String!]")
-    assignees_all_var = query.add_variable("taskAssigneesAll", "[String!]")
-    statuses_var = query.add_variable("taskStatuses", "[String!]")
-    tags_var = query.add_variable("taskTags", "[String!]")
-    filter_var = query.add_variable("filter", "String!")
-
-    project_field = query.add_field("project")
-    project_field.set_filter("name", project_name_var)
-
-    folders_field = project_field.add_field_with_edges("folders")
-    folders_field.add_field("path")
-    folders_field.set_filter("paths", folder_paths_var)
-
-    tasks_field = folders_field.add_field_with_edges("tasks")
-    # WARNING: At the moment when this been created 'names' filter
-    #   is not supported
-    tasks_field.set_filter("names", task_names_var)
-    tasks_field.set_filter("taskTypes", task_types_var)
-    tasks_field.set_filter("assigneesAny", assignees_any_var)
-    tasks_field.set_filter("assignees", assignees_all_var)
-    tasks_field.set_filter("statuses", statuses_var)
-    tasks_field.set_filter("tags", tags_var)
-    tasks_field.set_filter("filter", filter_var)
-
-    nested_fields = fields_to_dict(fields)
-
-    add_links_fields(tasks_field, nested_fields)
-
-    query_queue = collections.deque()
-    for key, value in nested_fields.items():
-        query_queue.append((key, value, tasks_field))
-
-    while query_queue:
-        item = query_queue.popleft()
-        key, value, parent = item
-        field = parent.add_field(key)
-        if value is FIELD_VALUE:
-            continue
-
-        for k, v in value.items():
-            query_queue.append((k, v, field))
-    return query
-
-
 def products_graphql_query(fields: set[str]) -> GraphQlQuery:
     query = GraphQlQuery("ProductsQuery")
 

ayon_api/version.py

@@ -1,2 +1,2 @@
 """Package declaring Python API for AYON server."""
-__version__ = "1.2.17"
+__version__ = "1.2.19"

{ayon_python_api-1.2.17.dist-info → ayon_python_api-1.2.19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ayon_python_api
-Version: 1.2.17
+Version: 1.2.19
 Summary: AYON Python API
 Home-page: https://github.com/ynput/ayon-python-api
 Author: ynput.io

{ayon_python_api-1.2.17.dist-info → ayon_python_api-1.2.19.dist-info}/RECORD

@@ -3,14 +3,14 @@ ayon_api/_api.py,sha256=Ka6a8RNAbMUa_bWodK4nuHBM-3sK6mSKZZKiWgILMHo,254429
 ayon_api/constants.py,sha256=K8RGj9pdDwhXB2gj8W8djsFdVlvAYAUzILSADVUOVCc,4143
 ayon_api/entity_hub.py,sha256=-evWrJsGqbuuL8yqGXuxT2ygjzTbodfURgwfc3xIJ-o,119610
 ayon_api/events.py,sha256=RQ_ct_GTb3KbZ6QWBkYn5m-ZUc6NJDAFFsoy2P_w3dQ,1370
-ayon_api/exceptions.py,sha256=3IU0KSyFO4nacdPp5YKh9PIFi7Kw346y1guNDdLDBF0,3637
-ayon_api/graphql.py,sha256=PgsdNVAwZymEOoFqUuTtnswv8bjtV0IIfBij2R9WKPU,29749
-ayon_api/graphql_queries.py,sha256=8h1AJZA0SMkt5vOYrU1mk5O_W49n2ZobWovN9ciweAI,28499
+ayon_api/exceptions.py,sha256=9inI-TkAGMKuhF84O3FwikW2esgmCdPIeRhbj2ithQU,3692
+ayon_api/graphql.py,sha256=haowWM_TvfotVvz11iD8Wg6ey9TPW-aJTHgSmp2_lm0,30741
+ayon_api/graphql_queries.py,sha256=atupD5oe9t6WCyHy3YSY_0_uR8_c4ysb7d8SxbfZAvk,26455
 ayon_api/operations.py,sha256=BL9r5V8wXqHx63FhQOUpayceuMd0A5B-vJIb5TcKynQ,55501
 ayon_api/server_api.py,sha256=RRH4fuHVAtGcKRuosEizWEPfAwXmWWdGkAoSKASYVtc,86233
 ayon_api/typing.py,sha256=fcdLZAbx_IThJeDQ44TeQLkpoJ6Sj0wpHPtCEFJb4N8,12010
 ayon_api/utils.py,sha256=OGBjRaCCeQLksZ2XrOL5J2timrulDlNNCni3dx0yi8w,32765
-ayon_api/version.py,sha256=vezsPRcgfh6NKVmIYDOqvuXt3Zv4BaXwsgWyopjZmms,75
+ayon_api/version.py,sha256=Kb9pAkFReP_cr8Jeap3qlCcCPJYnMjBvXM_GFpTm3aU,75
 ayon_api/_api_helpers/__init__.py,sha256=15wxNshWe1htzZhFnwTTflBfQ3tYJzTe6-0hrEUCQbw,1076
 ayon_api/_api_helpers/actions.py,sha256=OBRAEJSVnhGP0xf8ktQL3M7Ubz64nDmn957qZehaRQ0,10578
 ayon_api/_api_helpers/activities.py,sha256=Svk3DbXRoIOxdlBpfmerPqNSG4d8M5i4QtxdPNqJ_lM,13831
@@ -27,12 +27,12 @@ ayon_api/_api_helpers/products.py,sha256=fX9Ez_2RGRhDmZU02ucULZzfe8FGZAOFK7Qze1B
 ayon_api/_api_helpers/projects.py,sha256=ROb7MCzuFg5cRz_Nn7sgHCFnwkocnvJBoe7eQjGSi9c,33830
 ayon_api/_api_helpers/representations.py,sha256=BU0Oq_JOh6F6zIoiEtTGhRoHdr9WwMXMiaDDs-Oc7Yg,27736
 ayon_api/_api_helpers/secrets.py,sha256=L74qN38Bp22tDs9CQHWdgw3gsJm7GbnHKU75mCaWuj8,1955
-ayon_api/_api_helpers/tasks.py,sha256=1bqGOFbbtM_RSHWIirzj1201MsJfe1WAD2zZkVW9UTg,18770
+ayon_api/_api_helpers/tasks.py,sha256=gW8QbC2V7fNQeirViKyQVugnxfnYkQGGxiv3btYRn30,18135
 ayon_api/_api_helpers/thumbnails.py,sha256=2mQWU4cSY98J18ImYYt_5CRpm7DyOCO2wCmcLXwtdhk,12281
 ayon_api/_api_helpers/versions.py,sha256=c9ebZdM9i3J24B4bs2BRRoH937JWvRTWlJ3cFRscdug,22413
 ayon_api/_api_helpers/workfiles.py,sha256=8ksjCZ5xn7nEAKX792PeIwFNF5flslQwzbcHnJZwcu8,17679
-ayon_python_api-1.2.17.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-ayon_python_api-1.2.17.dist-info/METADATA,sha256=sWSxKm6d4JBLDwQpTIL8LHkgoQ_lb6YVndu7v4LWllM,16266
-ayon_python_api-1.2.17.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-ayon_python_api-1.2.17.dist-info/top_level.txt,sha256=PKrQbX5Cz53_UmSTR_nIySnBkGyHcBTS88SCw9tuVlc,9
-ayon_python_api-1.2.17.dist-info/RECORD,,
+ayon_python_api-1.2.19.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+ayon_python_api-1.2.19.dist-info/METADATA,sha256=-QmipQecdAPbKkXgWBKFClnIPjPm26HkTnfuwxvRo3U,16266
+ayon_python_api-1.2.19.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+ayon_python_api-1.2.19.dist-info/top_level.txt,sha256=PKrQbX5Cz53_UmSTR_nIySnBkGyHcBTS88SCw9tuVlc,9
+ayon_python_api-1.2.19.dist-info/RECORD,,