Merge branch 'dev'

Author: agrandiere

examples/all.py

@@ -4,7 +4,7 @@
 
 ####### check image
 
-checkAll = client.check('nudity', 'wad', 'properties', 'face', 'type')
+checkAll = client.check('nudity', 'wad', 'properties', 'faces', 'type')
 
 output = checkAll.set_file('/path/to/local/file.jpg')
 output2 = checkAll.set_url('https://d3m9459r9kwism.cloudfront.net/img/examples/example7.jpg')

examples/nudity.py

@@ -26,5 +26,7 @@
 
 ####### check video
 
-checkNudity = client.check('nudity')
-checkNudity.video('http://www.quirksmode.org/html5/videos/big_buck_bunny.webm', 'http://requestb.in/1nm1vw11')
+check = client.check('nudity', 'wad')
+output = check.video('http://www.quirksmode.org/html5/videos/big_buck_bunny.webm', 'http://requestb.in/1nm1vw11')
+
+print(output)

setup.py

@@ -3,7 +3,7 @@
 setup(
   name = 'sightengine',
   packages = ['sightengine'],
-  version = '1.2.1',
+  version = '1.2.2',
   description = 'Sightengine Python client',
   author = 'Sightengine',
   author_email='[email protected]',

sightengine/__init__.py

@@ -1 +1 @@
-__version__ = '1.2.1'
+__version__ = '1.2.2'

sightengine/check.py

@@ -64,8 +64,7 @@ def set_bytes(self, binaryImage):
         return output
 
     def video(self, videoUrl, callbackUrl):
-        url =  self.endpoint + 'video/moderation.json?stream_url=' + videoUrl + '&callback_url=' + callbackUrl + '&api_user=' + self.api_user + '&api_secret=' + self.api_secret
-        r = requests.get(url,  headers=headers)
+        r = requests.get(self.endpoint + 'video/check.json', params={'models': self.modelsType, 'callback_url': callbackUrl, 'stream_url': videoUrl, 'api_user': self.api_user, 'api_secret': self.api_secret}, headers=headers)
 
         output = json.loads(r.text)
         return output

tests.py

@@ -22,7 +22,7 @@ def test_nudityModel(self):
 
     def test_allModel(self):
         client = SightengineClient('1234', 'test')
-        checkAll = client.check('nudity','wad','properties','type','face','celebrities')
+        checkAll = client.check('nudity','wad','properties','type','faces','celebrities')
 
         image = os.path.join(os.path.dirname(__file__), 'assets', 'image.jpg')
 
@@ -56,5 +56,12 @@ def test_feedback(self):
         self.assertEqual('failure', feedback4['status'])
         self.assertEqual('argument_error', feedback4['error']['type'])
 
+    def test_video(self):
+        client = SightengineClient('1234', 'test')
+        check = client.check('wad','nudity','properties','type','faces','celebrities')
+
+        video_output = check.video('https://sightengine.com/assets/stream/examples/funfair.mp4', 'http://requestb.in/1nm1vw11')
+        self.assertEqual('success', video_output['status'])
+
 if __name__ == '__main__':
     unittest.main()