grant fetch annotation_import updates

Author: GrantEating

README.md

@@ -35,9 +35,14 @@ If the installation completes with a warning re: pip not being in your path, you
 export PATH=/Users/<your-macOS-username>/Library/Python/3.8/bin:$PATH
 ```
 
-Install using Python's Pip manager.
+Install SDK locally, using Python's Pip manager
 ```
-pip install labelbox
+pip3 install -e .
+```
+
+Install dependencies
+```
+pip3 install -r requirements.txt
 ```
 
 ## Documentation
@@ -55,7 +60,7 @@ user@machine:~$ export LABELBOX_API_KEY="<your api key here>"
 user@machine:~$ python3
 
 from labelbox import Client
-client = Client()
+client = Client(api_key="your_key_here", endpoint="http://localhost:8080/_gql")
 ```
 
 ## Contribution

labelbox/client.py

@@ -192,6 +192,9 @@ def check_errors(keywords, *path):
                 if obj in keywords:
                     return error
             return None
+        
+        def get_error_status_code(error):
+            return error["extensions"]["exception"]["status"]
 
         if check_errors(["AUTHENTICATION_ERROR"], "extensions",
                         "code") is not None:
@@ -240,7 +243,7 @@ def check_errors(keywords, *path):
         if internal_server_error is not None:
             message = internal_server_error.get("message")
 
-            if message.startswith(("Syntax Error", "Invite(s) cannot be sent")):
+            if get_error_status_code(internal_server_error) == 400:
                 raise labelbox.exceptions.InvalidQueryError(message)
             else:
                 raise labelbox.exceptions.InternalServerError(message)

labelbox/schema/annotation_import.py

@@ -118,35 +118,6 @@ def _fetch_remote_ndjson(self, url: str) -> List[Dict[str, Any]]:
         response.raise_for_status()
         return ndjson.loads(response.text)
 
-    @classmethod
-    def _from_name(cls,
-                   client: "labelbox.Client",
-                   parent_id: str,
-                   name: str,
-                   raw=False
-                  ) -> Union["MEAPredictionImport", "MALPredictionImport"]:
-        query_str = """query getImportPyApi($parent_id : ID!, $name: String!) {
-            annotationImport(
-                where: {%s: $parent_id, name: $name}){
-                    __typename
-                ... on ModelAssistedLabelingPredictionImport {%s}
-                ... on ModelErrorAnalysisPredictionImport {%s}
-                }}""" % \
-                (
-                    cls._parent_id_field,
-                    query.results_query_part(MALPredictionImport),
-                    query.results_query_part(MEAPredictionImport)
-        )
-
-        response = client.execute(query_str, {
-            'name': name,
-            'parent_id': parent_id
-        })
-        if raw:
-            return response['annotationImport']
-
-        return cls(client, response['annotationImport'])
-
     @staticmethod
     def _make_file_name(parent_id: str, name: str) -> str:
         return f"{parent_id}__{name}.ndjson"
@@ -269,12 +240,26 @@ def create_from_url(cls, client: "labelbox.Client", model_run_id: str,
                                     parent_id=model_run_id,
                                     name=name,
                                     url=url)
-
+                                    
     @classmethod
     def from_name(
             cls, client: "labelbox.Client", model_run_id: str,
-            name: str) -> Union["MEAPredictionImport", "MALPredictionImport"]:
-        return cls._from_name(client, model_run_id, name)
+            name: str) -> "MEAPredictionImport":
+
+        query_str = """query getModelErrorAnalysisPredictionImportPyApi($modelRunId : ID!, $name: String!) {
+            modelErrorAnalysisPredictionImport(
+                where: {modelRunId: $modelRunId, name: $name}){
+                    %s
+                }}""" % query.results_query_part(cls)
+        params = {
+            "modelRunId": model_run_id,
+            "name": name,
+        }
+        response = client.execute(query_str, params)
+        if response is None: 
+           raise labelbox.exceptions.ResourceNotFoundError(MEAPredictionImport, params)
+
+        return response
 
 
 class MALPredictionImport(AnnotationImport):
@@ -310,5 +295,19 @@ def create_from_url(cls, client: "labelbox.Client", project_id: str,
     @classmethod
     def from_name(
             cls, client: "labelbox.Client", project_id: str,
-            name: str) -> Union["MEAPredictionImport", "MALPredictionImport"]:
-        return cls._from_name(client, project_id, name)
+            name: str) -> "MALPredictionImport":
+
+        query_str = """query getModelAssistedLabelingPredictionImportPyApi($projectId : ID!, $name: String!) {
+            modelAssistedLabelingPredictionImport(
+                where: {projectId: $projectId, name: $name}){
+                    %s
+                }}""" % query.results_query_part(cls)
+        params = {
+            "projectId": project_id,
+            "name": name,
+        }
+        response = client.execute(query_str, params)
+        if response is None: 
+           raise labelbox.exceptions.ResourceNotFoundError(MALPredictionImport, params)
+
+        return response