edit docstrings in client.py and project.py

Author: Alexandra Cota

labelbox/client.py

@@ -32,7 +32,7 @@ class Client:
 
     def __init__(self, api_key=None,
                  endpoint='https://api.labelbox.com/graphql'):
-        """ Create and initialize a Labelbox Client.
+        """ Creates and initializes a Labelbox Client.
 
         Args:
             api_key (str): API key. If None, the key is obtained from
@@ -63,19 +63,20 @@ def execute(self, query, params=None, timeout=10.0):
         in appropriate labelbox.exceptions.LabelboxError subtypes.
 
         Args:
-            query (str): the query to execute.
-            params (dict): query parameters referenced within the query.
+            query (str): The query to execute.
+            params (dict): Query parameters referenced within the query.
             timeout (float): Max allowed time for query execution,
                 in seconds.
-        Return:
+        Returns:
             dict, parsed JSON response.
         Raises:
             labelbox.exceptions.AuthenticationError: If authentication
                 failed.
-            labelbox.exceptions.InvalidQueryError: If `query` is not
+            labelbox.exceptions.InvalidQueryError: If `query` was not
                 syntactically or semantically valid (checked server-side).
             labelbox.exceptions.ApiLimitError: If the server API limit was
-                exceeded. Check Labelbox documentation to see API limits.
+                exceeded. See "How to import data" documentation to see 
+                API limits.
             labelbox.exceptions.TimeoutError: If response was not received
                 in `timeout` seconds.
             labelbox.exceptions.NetworkError: If an unknown error occurred
@@ -172,12 +173,13 @@ def check_errors(keywords, *path):
 
     def upload_data(self, data):
         """ Uploads the given data (bytes) to Labelbox.
+        
         Args:
-            data (bytes): the data to upload.
-        Return:
+            data (bytes): The data to upload.
+        Returns:
             str, the URL of uploaded data.
         Raises:
-            labelbox.exceptions.LabelboxError: if upload failes.
+            labelbox.exceptions.LabelboxError: If upload failed.
         """
         request_data = {
             "operations": json.dumps({
@@ -213,7 +215,7 @@ def _get_single(self, db_object_type, uid):
         Args:
             db_object_type (type): DbObject subclass.
             uid (str): Unique ID of the row.
-        Return:
+        Returns:
             Object of `db_object_type`.
         Raises:
             labelbox.exceptions.ResourceNotFoundError: If there is no object
@@ -230,9 +232,10 @@ def _get_single(self, db_object_type, uid):
 
     def get_project(self, project_id):
         """ Gets a single Project with the given ID.
+
         Args:
             project_id (str): Unique ID of the Project.
-        Return:
+        Returns:
             The sought Project.
         Raises:
             labelbox.exceptions.ResourceNotFoundError: If there is no
@@ -242,9 +245,10 @@ def get_project(self, project_id):
 
     def get_dataset(self, dataset_id):
         """ Gets a single Dataset with the given ID.
+
         Args:
             dataset_id (str): Unique ID of the Dataset.
-        Return:
+        Returns:
             The sought Dataset.
         Raises:
             labelbox.exceptions.ResourceNotFoundError: If there is no
@@ -267,7 +271,7 @@ def _get_all(self, db_object_type, where):
             db_object_type (type): DbObject subclass.
             where (Comparison, LogicalOperation or None): The `where` clause
                 for filtering.
-        Return:
+        Returns:
             An iterable of `db_object_type` instances.
         """
         not_deleted = db_object_type.deleted == False
@@ -284,7 +288,7 @@ def get_projects(self, where=None):
         Args:
             where (Comparison, LogicalOperation or None): The `where` clause
                 for filtering.
-        Return:
+        Returns:
             An iterable of Projects (typically a PaginatedCollection).
         """
         return self._get_all(Project, where)
@@ -295,7 +299,7 @@ def get_datasets(self, where=None):
         Args:
             where (Comparison, LogicalOperation or None): The `where` clause
                 for filtering.
-        Return:
+        Returns:
             An iterable of Datasets (typically a PaginatedCollection).
         """
         return self._get_all(Dataset, where)
@@ -306,23 +310,23 @@ def get_labeling_frontends(self, where=None):
         Args:
             where (Comparison, LogicalOperation or None): The `where` clause
                 for filtering.
-        Return:
+        Returns:
             An iterable of LabelingFrontends (typically a PaginatedCollection).
         """
         return self._get_all(LabelingFrontend, where)
 
     def _create(self, db_object_type, data):
-        """ Creates a object on the server. Attribute values are
+        """ Creates an object on the server. Attribute values are
             passed as keyword arguments:
 
         Args:
             db_object_type (type): A DbObjectType subtype.
             data (dict): Keys are attributes or their names (in Python,
                 snake-case convention) and values are desired attribute values.
-        Return:
-            a new object of the given DB object type.
+        Returns:
+            A new object of the given DB object type.
         Raises:
-            InvalidAttributeError: in case the DB object type does not contain
+            InvalidAttributeError: If the DB object type does not contain
                 any of the attribute names given in `data`.
         """
         # Convert string attribute names to Field or Relationship objects.
@@ -347,10 +351,10 @@ def create_dataset(self, **kwargs):
             Keyword arguments with new Dataset attribute values.
             Keys are attribute names (in Python, snake-case convention) and
             values are desired attribute values.
-        Return:
-            a new Dataset object.
+        Returns:
+            A new Dataset object.
         Raises:
-            InvalidAttributeError: in case the Dataset type does not contain
+            InvalidAttributeError: If the Dataset type does not contain
                 any of the attribute names given in kwargs.
         """
         return self._create(Dataset, kwargs)
@@ -364,10 +368,10 @@ def create_project(self, **kwargs):
             Keyword arguments with new Project attribute values.
             Keys are attribute names (in Python, snake-case convention) and
             values are desired attribute values.
-        Return:
-            a new Project object.
+        Returns:
+            A new Project object.
         Raises:
-            InvalidAttributeError: in case the Project type does not contain
+            InvalidAttributeError: If the Project type does not contain
                 any of the attribute names given in kwargs.
         """
         return self._create(Project, kwargs)

labelbox/schema/project.py

@@ -43,6 +43,7 @@ class Project(DbObject, Updateable, Deletable):
 
     def create_label(self, **kwargs):
         """ Creates a label on this Project.
+
         Kwargs:
             Label attributes. At the minimum the label `DataRow`.
         """
@@ -107,9 +108,10 @@ def labels(self, datasets=None, order_by=None):
     def export_labels(self, timeout_seconds=60):
         """ Calls the server-side Label exporting that generates a JSON
         payload, and returns the URL to that payload.
+
         Args:
             timeout_seconds (float): Max waiting time, in seconds.
-        Return:
+        Returns:
             URL of the data file with this Project's labels. If the server
                 didn't generate during the `timeout_seconds` period, None
                 is returned.
@@ -136,6 +138,7 @@ def export_labels(self, timeout_seconds=60):
 
     def labeler_performance(self):
         """ Returns the labeler performances for this Project.
+
         Returns:
             A PaginatedCollection of LabelerPerformance objects.
         """
@@ -161,9 +164,10 @@ def create_labeler_performance(client, result):
 
     def review_metrics(self, net_score):
         """ Returns this Project's review metrics.
+
         Args:
             net_score (None or Review.NetScore): Indicates desired metric.
-        Return:
+        Returns:
             int, aggregation count of reviews for given net_score.
         """
         if net_score not in (None,) + tuple(Entity.Review.NetScore):
@@ -180,8 +184,10 @@ def review_metrics(self, net_score):
 
     def setup(self, labeling_frontend, labeling_frontend_options):
         """ Finalizes the Project setup.
+
         Args:
-            labeling_frontend (LabelingFrontend): The labeling frontend to use.
+            labeling_frontend (LabelingFrontend): Which UI to use to label the 
+                data.
             labeling_frontend_options (dict or str): Labeling frontend options,
                 a.k.a. project ontology. If given a `dict` it will be converted
                 to `str` using `json.dumps`.
@@ -210,8 +216,8 @@ def set_labeling_parameter_overrides(self, data):
         Args:
             data (iterable): An iterable of tuples. Each tuple must contain
                 (DataRow, priority, numberOfLabels) for the new override.
-        Return:
-            bool indicating if the operation was a success.
+        Returns:
+            bool, indicates if the operation was a success.
         """
         data_str = ",\n".join(
             "{dataRow: {id: \"%s\"}, priority: %d, numLabels: %d }" % (
@@ -226,10 +232,11 @@ def set_labeling_parameter_overrides(self, data):
 
     def unset_labeling_parameter_overrides(self, data_rows):
         """ Removes labeling parameter overrides to this project.
+
         Args:
             data_rows (iterable): An iterable of DataRows.
-        Return:
-            bool indicating if the operation was a success.
+        Returns:
+            bool, indicates if the operation was a success.
         """
         id_param = "projectId"
         query_str = """mutation UnsetLabelingParameterOverridesPyApi($%s: ID!){
@@ -241,7 +248,8 @@ def unset_labeling_parameter_overrides(self, data_rows):
         return res["project"]["unsetLabelingParameterOverrides"]["success"]
 
     def upsert_review_queue(self, quota_factor):
-        """ Reinitiate the review queue for this project.
+        """ Reinitiates the review queue for this project.
+
         Args:
             quota_factor (float): Which part (percentage) of the queue
                 to reinitiate. Between 0 and 1.
@@ -257,11 +265,12 @@ def upsert_review_queue(self, quota_factor):
 
 
     def extend_reservations(self, queue_type):
-        """ Extend all the current reservations for the current user on the given
+        """ Extends all the current reservations for the current user on the given
         queue type.
+
         Args:
             queue_type (str): Either "LabelingQueue" or "ReviewQueue"
-        Return:
+        Returns:
             int, the number of reservations that were extended.
         """
         if queue_type not in ("LabelingQueue", "ReviewQueue"):