Extract "data" from response in Client.execute().

Author: florijanstamenkovic

labelbox/client.py

@@ -168,7 +168,7 @@ def check_errors(keywords, *path):
             raise labelbox.exceptions.LabelboxError(
                 "Unknown error: %s" % str(errors))
 
-        return response
+        return response["data"]
 
     def upload_data(self, data):
         """ Uploads the given data (bytes) to Labelbox.
@@ -222,8 +222,8 @@ def _get_single(self, db_object_type, uid):
                 `Client.execute` can also be raised by this function.
         """
         query_str, params = query.get_single(db_object_type, uid)
-        res = self.execute(query_str, params)["data"][
-            utils.camel_case(db_object_type.type_name())]
+        res = self.execute(query_str, params)
+        res = res[utils.camel_case(db_object_type.type_name())]
         if res is None:
             raise labelbox.exceptions.ResourceNotFoundError(
                 db_object_type, params)
@@ -347,7 +347,7 @@ def _create(self, db_object_type, data):
 
         query_string, params = query.create(db_object_type, data)
         res = self.execute(query_string, params)
-        res = res["data"]["create%s" % db_object_type.type_name()]
+        res = res["create%s" % db_object_type.type_name()]
         return db_object_type(self, res)
 
     def create_dataset(self, **kwargs):

labelbox/orm/db_object.py

@@ -151,7 +151,7 @@ def _to_one(self):
 
         query_string, params = query.relationship(
             self.source, rel, None, None)
-        result = self.source.client.execute(query_string, params)["data"]
+        result = self.source.client.execute(query_string, params)
         result = result[utils.camel_case(type(self.source).type_name())]
         result = result[rel.graphql_name]
         if result is None:
@@ -192,7 +192,7 @@ def update(self, **kwargs):
 
         query_string, params = query.update_fields(self, values)
         res = self.client.execute(query_string, params)
-        res = res["data"]["update%s" % utils.title_case(self.type_name())]
+        res = res["update%s" % utils.title_case(self.type_name())]
         self._set_field_values(res)
 
 

labelbox/pagination.py

@@ -47,7 +47,7 @@ def __next__(self):
             query = self.query % (self._fetched_pages * _PAGE_SIZE, _PAGE_SIZE)
             self._fetched_pages += 1
 
-            results = self.client.execute(query, self.params)["data"]
+            results = self.client.execute(query, self.params)
             for deref in self.dereferencing:
                 results = results[deref]
 

labelbox/schema/data_row.py

@@ -56,5 +56,4 @@ def create_metadata(self, meta_type, meta_value):
         res = self.client.execute(
             query_str, {meta_type_param: meta_type, meta_value_param: meta_value,
                         data_row_id_param: self.uid})
-        return Entity.AssetMetadata(
-            self.client, res["data"]["createAssetMetadata"])
+        return Entity.AssetMetadata(self.client, res["createAssetMetadata"])

labelbox/schema/dataset.py

@@ -127,7 +127,7 @@ def convert_item(item):
                 dataset_param, url_param, dataset_param, url_param)
         res = self.client.execute(
             query_str, {dataset_param: self.uid, url_param: descriptor_url})
-        res = res["data"]["appendRowsToDataset"]
+        res = res["appendRowsToDataset"]
         if not res["accepted"]:
             raise MalformedRequestError(
                 "Server did not accept DataRow creation request", data)

labelbox/schema/label.py

@@ -53,5 +53,4 @@ def create_benchmark(self):
                 label_id_param, label_id_param,
                 query.results_query_part(Entity.Benchmark))
         res = self.client.execute(query_str, {label_id_param: self.uid})
-        res = res["data"]["createBenchmark"]
-        return Entity.Benchmark(self.client, res)
+        return Entity.Benchmark(self.client, res["createBenchmark"])

labelbox/schema/project.py

@@ -65,8 +65,7 @@ def create_label(self, **kwargs):
         query_str = query_str.replace("data: {",
                                       "data: {type: {connect: {name: \"Any\"}} ")
         res = self.client.execute(query_str, params)
-        res = res["data"]["createLabel"]
-        return Label(self.client, res)
+        return Label(self.client, res["createLabel"])
 
     def labels(self, datasets=None, order_by=None):
         Label = Entity.Label
@@ -112,8 +111,8 @@ def export_labels(self, timeout_seconds=60):
         """ %  (id_param, id_param)
 
         while True:
-            res = self.client.execute(query_str, {id_param: self.uid})[
-                "data"]["exportLabels"]
+            res = self.client.execute(query_str, {id_param: self.uid})
+            res = res["exportLabels"]
             if not res["shouldPoll"]:
                 return res["downloadUrl"]
 
@@ -167,7 +166,7 @@ def review_metrics(self, net_score):
             {reviewMetrics {labelAggregate(netScore: %s) {count}}}
         }""" % (id_param, id_param, net_score_literal)
         res = self.client.execute(query_str, {id_param: self.uid})
-        return res["data"]["project"]["reviewMetrics"]["labelAggregate"]["count"]
+        return res["project"]["reviewMetrics"]["labelAggregate"]["count"]
 
     def setup(self, labeling_frontend, labeling_frontend_options):
         """ Finalizes the Project setup.
@@ -209,7 +208,7 @@ def set_labeling_parameter_overrides(self, data):
             project(where: { id: $%s }) {setLabelingParameterOverrides
             (data: [%s]) {success}}} """ % (id_param, id_param, data_str)
         res = self.client.execute(query_str, {id_param: self.uid})
-        return res["data"]["project"]["setLabelingParameterOverrides"]["success"]
+        return res["project"]["setLabelingParameterOverrides"]["success"]
 
     def unset_labeling_parameter_overrides(self, data_rows):
         """ Removes labeling parameter overrides to this project.
@@ -225,7 +224,7 @@ def unset_labeling_parameter_overrides(self, data_rows):
             id_param, id_param,
             ",\n".join("{dataRowId: \"%s\"}" % row.uid for row in data_rows))
         res = self.client.execute(query_str, {id_param: self.uid})
-        return res["data"]["project"]["unsetLabelingParameterOverrides"]["success"]
+        return res["project"]["unsetLabelingParameterOverrides"]["success"]
 
     def upsert_review_queue(self, quota_factor):
         """ Reinitiate the review queue for this project.
@@ -259,7 +258,7 @@ def extend_reservations(self, queue_type):
             extendReservations(projectId:$%s queueType:%s)}""" % (
                 id_param, id_param, queue_type)
         res = self.client.execute(query_str, {id_param: self.uid})
-        return res["data"]["extendReservations"]
+        return res["extendReservations"]
 
 
 class LabelingParameterOverride(DbObject):

labelbox/schema/webhook.py

@@ -50,8 +50,7 @@ def create(client, topics, url, secret, project):
         } """ % (project_str, " ".join(topics), url, secret,
                 query.results_query_part(Entity.Webhook))
 
-        res = client.execute(query_str)
-        return Webhook(client, res["data"]["createWebhook"])
+        return Webhook(client, client.execute(query_str)["createWebhook"])
 
     created_by = Relationship.ToOne("User", False, "created_by")
     organization = Relationship.ToOne("Organization")
@@ -76,6 +75,4 @@ def update(self, topics=None, url=None, status=None):
             self.uid, ", ".join(filter(None, (topics_str, url_str, status_str))),
             query.results_query_part(Entity.Webhook))
 
-        res = self.client.execute(query_str)
-        res = res["data"]["updateWebhook"]
-        self._set_field_values(res)
+        self._set_field_values(self.client.execute(query_str)["updateWebhook"])