From adf8295f82adee9e679c3ad342d6d39cb5dbe258 Mon Sep 17 00:00:00 2001 From: Chris Lee Date: Wed, 3 Jun 2015 15:37:01 -0400 Subject: [PATCH] ADD: default apis for text/image with tests --- indicoio/utils/multi.py | 4 ++-- tests/test_remote.py | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/indicoio/utils/multi.py b/indicoio/utils/multi.py index fab8098..a947e05 100644 --- a/indicoio/utils/multi.py +++ b/indicoio/utils/multi.py @@ -46,7 +46,7 @@ def handle_response(result): raise Exception("Sorry, %s API returned an unexpected response:\n%s" % (api, result[api])) -def predict_text(input_text, apis, cloud=None, batch=False, api_key=None, **kwargs): +def predict_text(input_text, apis=TEXT_APIS, cloud=None, batch=False, api_key=None, **kwargs): """ Given input text, returns the results of specified text apis. Possible apis include: [ 'text_tags', 'political', 'sentiment', 'language' ] @@ -80,7 +80,7 @@ def predict_text(input_text, apis, cloud=None, batch=False, api_key=None, **kwar **kwargs) -def predict_image(image, apis, cloud=None, batch=False, api_key=None, **kwargs): +def predict_image(image, apis=IMAGE_APIS, cloud=None, batch=False, api_key=None, **kwargs): """ Given input image, returns the results of specified image apis. Possible apis include: ['fer', 'facial_features', 'image_features'] diff --git a/tests/test_remote.py b/tests/test_remote.py index b9f85bd..3b50c55 100644 --- a/tests/test_remote.py +++ b/tests/test_remote.py @@ -136,6 +136,13 @@ class BatchAPIRun(unittest.TestCase): self.assertTrue(isinstance(response, list)) self.assertTrue(set(response[0].keys()) == set(config.TEXT_APIS)) + def test_default_multi_api_text(self): + test_data = ['clearly an english sentence'] + response = batch_predict_text(test_data, api_key=self.api_key) + + self.assertTrue(isinstance(response, list)) + self.assertTrue(set(response[0].keys()) == set(config.TEXT_APIS)) + def test_multi_api_bad_api(self): self.assertRaises(ValueError, batch_predict_text,