Merge pull request #317 from Labelbox/ms/update-experimental

msokoloff1 · web-flow · commit a05802248a04 · 2021-10-21T12:16:55.000-04:00
update experimental functions
diff --git a/labelbox/client.py b/labelbox/client.py
@@ -78,9 +78,7 @@ def __init__(self,
 
         logger.info("Initializing Labelbox client at '%s'", endpoint)
         self.app_url = app_url
-
-        # TODO: Make endpoints non-internal or support them as experimental
-        self.endpoint = endpoint.replace('/graphql', '/_gql')
+        self.endpoint = endpoint
         self.headers = {
             'Accept': 'application/json',
             'Content-Type': 'application/json',
@@ -149,9 +147,11 @@ def convert_value(value):
         elif data is None:
             raise ValueError("query and data cannot both be none")
 
+        endpoint = self.endpoint if not experimental else self.endpoint.replace(
+            "/graphql", "/_gql")
         try:
             request = {
-                'url': self.endpoint,
+                'url': endpoint,
                 'data': data,
                 'headers': self.headers,
                 'timeout': timeout
diff --git a/labelbox/schema/organization.py b/labelbox/schema/organization.py
@@ -42,7 +42,6 @@ def __init__(self, *args, **kwargs):
     projects = Relationship.ToMany("Project", True)
     webhooks = Relationship.ToMany("Webhook", False)
 
-    @experimental
     def invite_user(
             self,
             email: str,
@@ -83,22 +82,21 @@ def invite_user(
             "projectRoleId": project_role.role.uid
         } for project_role in project_roles or []]
 
-        res = self.client.execute(query_str, {
-            data_param: [{
-                "inviterId": self.client.get_user().uid,
-                "inviteeEmail": email,
-                "organizationId": self.uid,
-                "organizationRoleId": role.uid,
-                "projects": projects
-            }]
-        },
-                                  experimental=True)
+        res = self.client.execute(
+            query_str, {
+                data_param: [{
+                    "inviterId": self.client.get_user().uid,
+                    "inviteeEmail": email,
+                    "organizationId": self.uid,
+                    "organizationRoleId": role.uid,
+                    "projects": projects
+                }]
+            })
         invite_response = res['createInvites'][0]['invite']
         if not invite_response:
             raise LabelboxError(f"Unable to send invite for email {email}")
         return Invite(self.client, invite_response)
 
-    @experimental
     def invite_limit(self) -> InviteLimit:
         """ Retrieve invite limits for the org
         This already accounts for users currently in the org
@@ -109,10 +107,10 @@ def invite_limit(self) -> InviteLimit:
 
         """
         org_id_param = "organizationId"
-        res = self.client.execute("""query InvitesLimitPyApi($%s: ID!) {
+        res = self.client.execute(
+            """query InvitesLimitPyApi($%s: ID!) {
             invitesLimit(where: {id: $%s}) { used limit remaining }
-        }""" % (org_id_param, org_id_param), {org_id_param: self.uid},
-                                  experimental=True)
+        }""" % (org_id_param, org_id_param), {org_id_param: self.uid})
         return InviteLimit(
             **{utils.snake_case(k): v for k, v in res['invitesLimit'].items()})
 
diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py
@@ -118,7 +118,6 @@ def __init__(self, environ: str) -> None:
         api_url = graphql_url(environ)
         api_key = testing_api_key(environ)
         super().__init__(api_key, api_url, enable_experimental=True)
-
         self.queries = []
 
     def execute(self, query=None, params=None, check_naming=True, **kwargs):
@@ -223,9 +222,10 @@ def label_pack(project, rand_gen, image_url):
 
 @pytest.fixture
 def iframe_url(environ) -> str:
-    if environ == Environ.PROD:
+    if environ in [Environ.PROD, Environ.LOCAL]:
         return 'https://editor.labelbox.com'
-    return 'https://staging.labelbox.dev/editor'
+    elif environ == Environ.STAGING:
+        return 'https://staging.labelbox.dev/editor'
 
 
 @pytest.fixture
diff --git a/tests/integration/test_user_management.py b/tests/integration/test_user_management.py
@@ -10,9 +10,8 @@ def test_org_invite(client, organization, environ, queries):
     if environ.value == "prod":
         assert invite_limit.remaining > 0, "No invites available for the account associated with this key."
     elif environ.value != "staging":
-        raise ValueError(
-            f"Expected tests to run against either prod or staging. Found {environ}"
-        )
+        # Cannot run against local
+        return
 
     invite = organization.invite_user(dummy_email, role)
 
