use new sync API endpoints for job/task wait()

Author: josiasmontag

cloudconvert/cloudconvertrestclient.py

@@ -11,7 +11,7 @@
 
 import cloudconvert.utils as util
 from cloudconvert.exceptions import exceptions
-from cloudconvert.config import __version__, __endpoint_map__
+from cloudconvert.config import __version__, __endpoint_map__, __sync_endpoint_map__
 
 log = logging.getLogger(__name__)
 
@@ -40,6 +40,7 @@ def __init__(self, options=None, **kwargs):
                                            "Required: live or sandbox")
 
         self.endpoint = kwargs.get("endpoint", self.default_endpoint())
+        self.sync_endpoint = kwargs.get("sync_endpoint", self.default_sync_endpoint())
         # Mandatory parameter, so not using `dict.get`
         self.proxies = kwargs.get("proxies", None)
         self.token_hash = None
@@ -57,6 +58,9 @@ def __init__(self, options=None, **kwargs):
     def default_endpoint(self):
         return __endpoint_map__.get(self.mode)
 
+    def default_sync_endpoint(self):
+        return __sync_endpoint_map__.get(self.mode)
+
     def request(self, url, method, body=None, headers=None):
         """Make HTTP call, formats response and does error handling. Uses http_call method in CloudConvertRestClient class.
         Usage::
@@ -161,6 +165,15 @@ def get(self, action, headers=None):
         """
         return self.request(util.join_url(self.endpoint, action), 'GET', headers=headers or {})
 
+
+    def get_sync(self, action, headers=None):
+        """Make GET request to sync API
+        Usage::
+            >>> cloudconvertrestclient.get_sync("v2/tasks/TASK-ID")
+            >>> cloudconvertrestclient.get_sync("v2/jobs/JOB-ID")
+        """
+        return self.request(util.join_url(self.sync_endpoint, action), 'GET', headers=headers or {})
+
     def post(self, action, params=None, headers={}):
         """Make POST request
         Usage::

cloudconvert/config.py

@@ -7,4 +7,8 @@
     "live": "https://api.cloudconvert.com",
     "sandbox": "https://api.sandbox.cloudconvert.com"
 }
+__sync_endpoint_map__ = {
+    "live": "https://sync.api.cloudconvert.com",
+    "sandbox": "https://sync.api.sandbox.cloudconvert.com"
+}
 SANDBOX_API_KEY = "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImp0aSI6IjI4YmE3OGQyZjc1NWM5ZGE3Yjg1NDRhMWRkMjg2NWM4N2U0YzI5NWI0NzQ0Zjc4ZDNmMzA3OWM2NjU3ZjI0MjVhOTMyYjIxMjU5ZGU2NWQ4In0.eyJhdWQiOiIxIiwianRpIjoiMjhiYTc4ZDJmNzU1YzlkYTdiODU0NGExZGQyODY1Yzg3ZTRjMjk1YjQ3NDRmNzhkM2YzMDc5YzY2NTdmMjQyNWE5MzJiMjEyNTlkZTY1ZDgiLCJpYXQiOjE1NTkwNjc3NzcsIm5iZiI6MTU1OTA2Nzc3NywiZXhwIjo0NzE0NzQxMzc3LCJzdWIiOiIzNzExNjc4NCIsInNjb3BlcyI6WyJ1c2VyLnJlYWQiLCJ1c2VyLndyaXRlIiwidGFzay5yZWFkIiwidGFzay53cml0ZSIsIndlYmhvb2sucmVhZCIsIndlYmhvb2sud3JpdGUiXX0.IkmkfDVGwouCH-ICFAShQMHyFAHK3y90CSoissUVD8h5HFG4GqN5DEw0IFzlPr1auUKp3H1pAvPutdIQtrDMTmUUmGMUb2dRlCAuQdqxa81Q5KAmcKDgOg2YTWOWEGMy3jETTb7W6vyNGsT_3DFMapMdeOw1jdIUTMZqW3QbSCeGXj3PMRnhI7YynaDtmktjzO9IUDHbeT2HRzzMiep97KvVZNjYtZvgM-kbUjE6Mm68_kA8JMuQeor0Yg7896JPV0YM3-MnHf7elKgoCJbfBCDAbvSX_ZYsSI7IGoLLb0mgJVfFcH_HMYAHhJj5cUEJN2Iml-FkODqrRk72bVxyJs9j1GPQBl4ORXuU9yrjUgHrRaZ5YM__LwsUQB3AuB92oyQseCjULn1sWM1PzIXCcyVjKZSpn9LAAGNf9paCF-_G9ok9tZKccRouCiYl9v5XbmuxV8hXYp6fXZxyaAkj_JN2kErVSkxYzVyyZL1e220aFFnbch6nDvLFHgi-WeTQHFQDzuHsM8RKRixV8uD7pk3de4AEYg0EWqZHCr82qY7TGdSQvuAS0QIy3B89OwQW0ROW4k3Yw0XIKgKSYWyKnc7huc7yPQUIDDDAOa5OojXrVY5ZuL_hwQMIOmejcHTKFdAgzAaVnRkC8_FfVh4wHCPBaHjze9hRp5n4O1pnPFI"

cloudconvert/resource.py

@@ -184,8 +184,8 @@ def wait(cls, id):
         """
         api_client = default_client()
 
-        url = util.join_url(cls.path, str(id), "wait")
-        res = api_client.get(url)
+        url = util.join_url(cls.path, str(id))
+        res = api_client.get_sync(url)
         try:
             return res["data"]
         except:

tests/unit/testJob.py

@@ -70,7 +70,7 @@ def testWaitJob(self):
                 response_json = json.load(f)
 
             job_id = "4c80f1ae-5b3a-43d5-bb58-1a5c4eb4e46b"
-            m.get("https://api.sandbox.cloudconvert.com/v2/jobs/{}/wait".format(job_id), json=response_json)
+            m.get("https://sync.api.sandbox.cloudconvert.com/v2/jobs/{}".format(job_id), json=response_json)
 
             job = self.cloudconvert.Job.wait(id=job_id)
 

tests/unit/testTask.py

@@ -64,7 +64,7 @@ def testWaitTask(self):
                 response_json = json.load(f)
 
             task_id = "4c80f1ae-5b3a-43d5-bb58-1a5c4eb4e46b"
-            m.get("https://api.sandbox.cloudconvert.com/v2/tasks/{}/wait".format(task_id), json=response_json)
+            m.get("https://sync.api.sandbox.cloudconvert.com/v2/tasks/{}".format(task_id), json=response_json)
 
             task = self.cloudconvert.Task.wait(id=task_id)