fix: pagination rebase error (#359)

Author: thearchitector

indico/client/request.py

@@ -99,21 +99,23 @@ def __init__(self, query: str, variables: "Optional[AnyDict]" = None):
         self.has_next_page = True
         super().__init__(query, variables=variables)
 
-    def process_response(
+    def parse_payload(
         self, response: "AnyDict", nested_keys: "Optional[List[str]]" = None
     ) -> "Any":
-        raw_response: "AnyDict" = cast("AnyDict", super().process_response(response))
+        raw_response: "AnyDict" = cast("AnyDict", super().parse_payload(response))
+
         if nested_keys:
-            _pg = raw_response
+            composite = raw_response
             for key in nested_keys:
-                if key not in _pg.keys():
+                if key not in composite.keys():
                     raise IndicoInputError(
                         f"Nested key not found in response: {key}",
                     )
-                _pg = _pg[key]
-            _pg = _pg["pageInfo"]
+                composite = composite[key]
+
+            _pg = composite.get("pageInfo")
         else:
-            _pg = next(iter(response.values()))["pageInfo"]
+            _pg = next(iter(raw_response.values())).get("pageInfo")
 
         if not _pg:
             raise ValueError("The supplied GraphQL must include 'pageInfo'.")

indico/queries/datasets.py

@@ -88,9 +88,7 @@ def __init__(
             },
         )
 
-    def process_response(
-        self, response: "Payload", _: "Optional[List[str]]" = None
-    ) -> "List[Dataset]":
+    def process_response(self, response: "Payload") -> "List[Dataset]":
         response = super().parse_payload(response)
         return [Dataset(**dataset) for dataset in response["datasetsPage"]["datasets"]]
 

indico/queries/document_report.py

@@ -70,9 +70,7 @@ def __init__(
         }
         super().__init__(self.query, variables=variables)
 
-    def process_response(
-        self, response: "Payload", _: "Optional[List[str]]" = None
-    ) -> "List[DocumentReport]":
+    def process_response(self, response: "Payload") -> "List[DocumentReport]":
         return _DocumentReportList(
             **super().parse_payload(response)["submissionsLog"]
         ).submissions

indico/queries/example.py

@@ -73,8 +73,6 @@ def __init__(
             variables=variables,
         )
 
-    def process_response(
-        self, response: "Payload", _: "Optional[List[str]]" = None
-    ) -> "List[Example]":
+    def process_response(self, response: "Payload") -> "List[Example]":
         example_page = super().parse_payload(response)["modelGroups"]["modelGroups"][0]
         return [Example(**s) for s in example_page["pagedExamples"]["examples"]]

indico/queries/gallery.py

@@ -1,10 +1,10 @@
-from typing import TYPE_CHECKING, cast
+from typing import TYPE_CHECKING
 
 from indico.client.request import GraphQLRequest, PagedRequest
 from indico.types.component_blueprint import BlueprintPage, BlueprintTags
 
 if TYPE_CHECKING:  # pragma: no cover
-    from typing import Any, List, Optional
+    from typing import Any, Optional
 
     from indico.filters import ComponentBlueprintFilter
     from indico.typing import Payload
@@ -76,10 +76,8 @@ def __init__(
             },
         )
 
-    def process_response(
-        self, response: "Payload", _: "Optional[List[str]]" = None
-    ) -> "BlueprintPage":
-        response = super().process_response(
+    def process_response(self, response: "Payload") -> "BlueprintPage":
+        response = super().parse_payload(
             response, nested_keys=["gallery", "component", "blueprintsPage"]
         )
         return BlueprintPage(
@@ -121,7 +119,11 @@ def __init__(self, component_family: "Optional[str]" = None):
         )
 
     def process_response(self, response: "Payload") -> "BlueprintTags":
-        response = cast(Payload, super().process_response(response))
         return BlueprintTags(
-            tags=[tag for tag in response["gallery"]["component"]["availableTags"]]
+            tags=[
+                tag
+                for tag in super().parse_payload(response)["gallery"]["component"][
+                    "availableTags"
+                ]
+            ]
         )

indico/queries/model_groups/metrics.py

@@ -106,7 +106,7 @@ def __init__(self, model_group_id: int):
 
     def process_response(self, response: "Payload") -> "AnyDict":
         raw_response: "AnyDict" = json.loads(
-            super().process_response(response)["modelGroups"]["modelGroups"][0][
+            super().parse_payload(response)["modelGroups"]["modelGroups"][0][
                 "selectedModel"
             ]["evaluation"]["metrics"]
         )

indico/queries/submission.py

@@ -149,9 +149,7 @@ def __init__(
             },
         )
 
-    def process_response(
-        self, response: "Payload", _: "Optional[List[str]]" = None
-    ) -> "List[Submission]":
+    def process_response(self, response: "Payload") -> "List[Submission]":
         return [
             Submission(**s)
             for s in super().parse_payload(response)["submissions"]["submissions"]

indico/queries/usermetrics.py

@@ -118,9 +118,7 @@ def __init__(
         }
         super().__init__(self.query, variables=variables)
 
-    def process_response(
-        self, response: "Payload", _: "Optional[List[str]]" = None
-    ) -> "List[UserSnapshot]":
+    def process_response(self, response: "Payload") -> "List[UserSnapshot]":
         return _PagedUserSnapshots(
             **super().parse_payload(response)["userSnapshot"]
         ).results
@@ -180,9 +178,7 @@ def __init__(
         }
         super().__init__(self.query, variables=variables)
 
-    def process_response(
-        self, response: "Payload", _: "Optional[List[str]]" = None
-    ) -> "List[UserChangelog]":
+    def process_response(self, response: "Payload") -> "List[UserChangelog]":
         return _PagedUserChangelog(
             **super().parse_payload(response)["userChangelog"]
         ).results