fix cursor pagination bug

Author: Matt Sokoloff

labelbox/pagination.py

@@ -115,7 +115,7 @@ def increment_page(self, results: Dict[str, Any]):
         self.next_cursor = results
 
     def fetched_all(self) -> bool:
-        return bool(self.next_cursor)
+        return not self.next_cursor
 
     def fetch_results(self) -> Dict[str, Any]:
         self.params.update({'from': self.next_cursor, 'first': _PAGE_SIZE})
@@ -141,9 +141,7 @@ def increment_page(self):
         self._fetched_pages += 1
 
     def fetched_all(self, n_items: int) -> bool:
-        if n_items < _PAGE_SIZE:
-            return True
-        return False
+        return n_items < _PAGE_SIZE
 
     def fetch_results(self) -> Dict[str, Any]:
         query = self.query % (self._fetched_pages * _PAGE_SIZE, _PAGE_SIZE)

tests/integration/conftest.py

@@ -1,6 +1,7 @@
 from collections import namedtuple
 from enum import Enum
 from datetime import datetime
+from labelbox.orm.db_object import experimental
 from random import randint
 from string import ascii_letters
 from types import SimpleNamespace
@@ -50,29 +51,15 @@ def testing_api_key(environ: str) -> str:
     return os.environ["LABELBOX_TEST_API_KEY_STAGING"]
 
 
-def experimental_endpoint(fn):
-
-    def experimental(client, *args, **kwargs):
-        try:
-            client.endpoint = client.endpoint.replace("/graphql", "/_gql")
-            return fn(client, *args, **kwargs)
-        finally:
-            client.endpoint = client.endpoint.replace("/_gql", "/graphql")
-
-    return experimental
-
-
-@experimental_endpoint
 def cancel_invite(client, invite_id):
     """
     Do not use. Only for testing.
     """
     query_str = """mutation CancelInvitePyApi($where: WhereUniqueIdInput!) {
             cancelInvite(where: $where) {id}}"""
-    client.execute(query_str, {'where': {'id': invite_id}})
+    client.execute(query_str, {'where': {'id': invite_id}}, experimental=True)
 
 
-@experimental_endpoint
 def get_project_invites(client, project_id):
     """
     Do not use. Only for testing.
@@ -83,15 +70,14 @@ def get_project_invites(client, project_id):
         invites(from: $from, first: $first) { nodes { %s
         projectInvites { projectId projectRoleName } } nextCursor}}}
     """ % (id_param, id_param, results_query_part(Invite))
-    return list(
-        PaginatedCollection(client,
-                            query_str, {id_param: project_id},
-                            ['project', 'invites', 'nodes'],
-                            Invite,
-                            cursor_path=['project', 'invites', 'nextCursor']))
+    return PaginatedCollection(client,
+                               query_str, {id_param: project_id},
+                               ['project', 'invites', 'nodes'],
+                               Invite,
+                               cursor_path=['project', 'invites', 'nextCursor'],
+                               experimental=True)
 
 
-@experimental_endpoint
 def get_invites(client):
     """
     Do not use. Only for testing.
@@ -103,9 +89,9 @@ def get_invites(client):
         client,
         query_str, {}, ['organization', 'invites', 'nodes'],
         Invite,
-        cursor_path=['organization', 'invites', 'nextCursor'])
-    return list(
-        invites)  # list() so that it makes the request to the right endpoint.
+        cursor_path=['organization', 'invites', 'nextCursor'],
+        experimental=True)
+    return invites
 
 
 @pytest.fixture
@@ -199,6 +185,10 @@ def sample_video() -> str:
 def organization(client):
     # Must have at least one seat open in your org to run these tests
     org = client.get_organization()
+    # Clean up before and after incase this wasn't run for some reason.
+    for invite in get_invites(client):
+        if "@labelbox.com" in invite.email:
+            cancel_invite(client, invite.uid)
     yield org
     for invite in get_invites(client):
         if "@labelbox.com" in invite.email:

tests/integration/test_user_management.py

@@ -12,16 +12,19 @@ def test_org_invite(client, organization, environ, queries):
         raise ValueError(
             f"Expected tests to run against either prod or staging. Found {environ}"
         )
+
     invite = organization.invite_user(dummy_email, role)
 
     if environ.value == "prod":
+
         invite_limit_after = organization.invite_limit()
         # One user added
         assert invite_limit.remaining - invite_limit_after.remaining == 1
         # An invite shouldn't effect the user count until after it is accepted
 
     outstanding_invites = queries.get_invites(client)
     in_list = False
+
     for invite in outstanding_invites:
         if invite.uid == invite.uid:
             in_list = True
@@ -44,7 +47,7 @@ def test_project_invite(client, organization, project_pack, queries):
         roles['NONE'],
         project_roles=[project_role_1, project_role_2])
 
-    project_invite = queries.get_project_invites(client, project_1.uid)[0]
+    project_invite = next(queries.get_project_invites(client, project_1.uid))
 
     assert set([(proj_invite.project.uid, proj_invite.role.uid)
                 for proj_invite in project_invite.project_roles