added binary upload

Author: agrandiere

sightengine/check.py

@@ -20,6 +20,7 @@
 """
 
 import requests, json, os
+from io import BytesIO
 
 VERSION = None
 path_version = os.path.join(os.path.dirname(__file__), '../version.py')
@@ -41,7 +42,6 @@ def __init__(self, api_user, api_secret, *args):
 
         if len(args) > 1:
             for arg in args:
-                print(arg)
                 self.modelsType += arg + ','
             self.modelsType = self.modelsType[:-1]
         else:
@@ -51,21 +51,25 @@ def image(self, image):
         numberOfModels = self.modelsType.count(",")
 
         if numberOfModels > 0:
-            if image.lower().startswith(('http://', 'https://')):
-                url = self.endpoint + '1.0/check.json'
+            url = self.endpoint + '1.0/check.json'
+
+            if isinstance(image, bytes):
+                r = requests.post(url, files={'media': BytesIO(image)}, data={'models': self.modelsType,'api_user': self.api_user, 'api_secret': self.api_secret},  headers=headers)
+            elif image.lower().startswith(('http://', 'https://')):
                 r = requests.get(url, params={'models': self.modelsType, 'url': image, 'api_user': self.api_user, 'api_secret': self.api_secret},  headers=headers)
             else:
-                url = self.endpoint + '1.0/check.json'
                 r = requests.post(url, files={'media': open(image, 'rb')}, data={'models': self.modelsType,'api_user': self.api_user, 'api_secret': self.api_secret},  headers=headers)
 
             output = json.loads(r.text)
             return output
         else:
-            if image.lower().startswith(('http://', 'https://')):
-                url = self.endpoint + '1.0' + '/' + self.modelsType + '.json'
+            url = self.endpoint + '1.0' + '/' + self.modelsType + '.json'
+
+            if isinstance(image, bytes):
+                r = requests.post(url, files={'media': BytesIO(image)}, data={'api_user': self.api_user,'api_secret': self.api_secret},  headers=headers)
+            elif image.lower().startswith(('http://', 'https://')):
                 r = requests.get(url, params={'url': image, 'api_user': self.api_user, 'api_secret': self.api_secret},  headers=headers)
             else:
-                url = self.endpoint + '1.0' + '/' + self.modelsType + '.json'
                 r = requests.post(url, files={'media': open(image, 'rb')}, data={'api_user': self.api_user,'api_secret': self.api_secret},  headers=headers)
 
             output = json.loads(r.text)

tests.py

@@ -14,19 +14,30 @@ def test_nudityModel(self):
         output2 = checkNudity.image(image)
         self.assertEqual('success', output2['status'])
 
+        with open(image, mode='rb') as img:
+            imageContent = img.read()
+
+        output3 = checkNudity.image(imageContent)
+        self.assertEqual('success', output3['status'])
+
     def test_allModel(self):
         client = SightengineClient('1234', 'test')
+        checkAll = client.check('nudity','wad','properties','type','face','celebrities')
 
-        checkNudity = client.check('nudity','wad','properties','type','face','celebrities')
-
-        output = checkNudity.image('https://sightengine.com/assets/img/examples/example5.jpg')
+        output = checkAll.image('https://sightengine.com/assets/img/examples/example5.jpg')
         self.assertEqual('success', output['status'])
 
         image = os.path.join(os.path.dirname(__file__), 'assets', 'image.jpg')
 
-        output2 = checkNudity.image(image)
+        output2 = checkAll.image(image)
         self.assertEqual('success', output2['status'])
 
+        with open(image, mode='rb') as img:
+            imageContent = img.read()
+
+        output3 = checkAll.image(imageContent)
+        self.assertEqual('success', output3['status'])
+
     def test_feedback(self):
         client = SightengineClient('1234', 'test')