Merge branch 'release/v1.6.7'

CHANGELOG.md

@@ -112,4 +112,7 @@
 * Fixed tests
 
 ## 1.6.6
-* Updated readme
+* Updated readme
+
+## 1.6.7
+* Implemented asynchronous input generation

VERSION

@@ -1 +1 @@
-1.6.6
+1.6.7

bitcodin/api.py

@@ -8,14 +8,17 @@
 import time
 
 
-def create_input(input_obj):
+def create_input(input_obj, async=False):
     """
     Create an Input for bitcodin
     :param input_obj: Input object to create
     :return: Input
     """
-
-    res = RestClient.post(url=get_api_base()+'/input/create', headers=create_headers(), content=input_obj.to_json())
+    if async is False:
+        url = get_api_base()+'/input/create'
+    else:
+        url = get_api_base()+'/input/createasync'
+    res = RestClient.post(url=url, headers=create_headers(), content=input_obj.to_json())
     input_obj = BitcodinObject(res, True)
     return input_obj
 
@@ -33,6 +36,20 @@ def get_input(input_id=None):
     return input_obj
 
 
+def get_async_input_status(async_input_id=None):
+    """
+    Get asynchronous created Input status
+    :param async_input_id: The id of the asynchronous created Input
+    :return: BitcodinObject
+    """
+    url = get_api_base()+'/input/%d' % async_input_id + '/asyncstatus'
+    res = RestClient.get(url=url, headers=create_headers())
+
+    input_obj = BitcodinObject(res, True)
+
+    return input_obj
+
+
 def list_inputs(page=None):
     """
     Get a list of Inputs

bitcodin/test/input/testcase_create_input_async.py

@@ -0,0 +1,46 @@
+from time import sleep
+
+import unittest
+from bitcodin import create_input, get_input, get_async_input_status
+from bitcodin import delete_input
+from bitcodin import S3Input
+from bitcodin.test.settings import s3_input_config
+from bitcodin.test.bitcodin_test_case import BitcodinTestCase
+
+
+class CreateS3InputTestCase(BitcodinTestCase):
+    def setUp(self):
+        super(CreateS3InputTestCase, self).setUp()
+
+    def runTest(self):
+        input = S3Input(
+            access_key=s3_input_config.get('access_key'),
+            secret_key=s3_input_config.get('secret_key'),
+            host=s3_input_config.get('host'),
+            bucket=s3_input_config.get('bucket'),
+            region=s3_input_config.get('region'),
+            object_key=s3_input_config.get('object_key')
+        )
+
+        self.input = create_input(input, True)
+
+        async_input_status = get_async_input_status(self.input.input_id)
+        while async_input_status.status != 'CREATED':
+            async_input_status = get_async_input_status(async_input_status.input_id)
+            self.assertNotEqual(async_input_status.status, 'ERROR')
+            print(async_input_status.to_json())
+            sleep(5)
+
+        self.input = get_input(self.input.input_id)
+        self.assertEquals(self.input.host, input.host)
+        self.assertEquals(self.input.bucket, input.bucket)
+        self.assertEquals(self.input.region, input.region)
+        self.assertEquals(self.input.status, 'CREATED')
+
+    def tearDown(self):
+        delete_input(self.input.input_id)
+        super(CreateS3InputTestCase, self).tearDown()
+
+
+if __name__ == '__main__':
+    unittest.main()

setup.py

@@ -3,7 +3,7 @@
 setup(
     name='bitcodin',
     description='Python interface for bitcodin API',
-    version='1.6.6',
+    version='1.6.7',
     author='David Moser, Dominic Miglar',
     author_email='david.moser@bitmovin.net, dominic.miglar@bitmovin.net',
     packages=['bitcodin'],