Merge pull request #15 from JupiterOne/KNO-420

update default URL and headers, add error handling for 504, remove wa…

Author: SeaBlooms

examples/examples.py

@@ -69,7 +69,7 @@
     relationship_type='jupiterone-api-client-python:create_relationship',
     relationship_class='HAS',
     from_entity_id=create_r['entity']['_id'],
-    to_entity_id=create_r_2['entity']['_id']
+    to_entity_id=create_r_2['entity']['_id'],
 )
 print(create_relationship_r)
 
@@ -84,8 +84,7 @@
 delete_entity_r2 = j1.delete_entity(entity_id=create_r_2['entity']['_id'])
 print(delete_entity_r2)
 
-
-q = "FIND (Device | Person)"
+q = "FIND Person"
 cursor_query_r = j1._cursor_query(q)
 print(cursor_query_r)
 print(len(cursor_query_r['data']))

jupiterone/client.py

@@ -7,7 +7,6 @@
 
 import requests
 from retrying import retry
-from warnings import warn
 
 from jupiterone.errors import (
     JupiterOneClientError,
@@ -38,7 +37,7 @@ class JupiterOneClient:
 
     # pylint: disable=too-many-instance-attributes
 
-    DEFAULT_URL = "https://api.us.jupiterone.io"
+    DEFAULT_URL = "https://graphql.us.jupiterone.io"
 
     RETRY_OPTS = {
         "wait_exponential_multiplier": 1000,
@@ -55,7 +54,7 @@ def __init__(self, account: str = None, token: str = None, url: str = DEFAULT_UR
         self.rules_endpoint = self.url + "/rules/graphql"
         self.headers = {
             "Authorization": "Bearer {}".format(self.token),
-            "LifeOmic-Account": self.account,
+            "Jupiterone-Account": self.account,
         }
 
     @property
@@ -120,7 +119,12 @@ def _execute_query(self, query: str, variables: Dict = None) -> Dict:
             )
 
         elif response.status_code in [429, 503]:
-            raise JupiterOneApiRetryError("JupiterOne API rate limit exceeded")
+            print(response.status_code)
+            print(response.content)
+            raise JupiterOneApiRetryError("JupiterOne API rate limit exceeded.")
+
+        elif response.status_code in [504]:
+            raise JupiterOneApiRetryError("Bad Gateway error. Check network route and try again.")
 
         elif response.status_code in [500]:
             raise JupiterOneApiError("JupiterOne API internal server error.")

requirements.txt

@@ -1,3 +1,2 @@
 retrying
 requests
-warnings