From b51e374efacefd76671088cb727a74bfdcc2ace5 Mon Sep 17 00:00:00 2001 From: Madison May Date: Tue, 28 Jul 2015 17:11:30 -0400 Subject: [PATCH] UPDATE: version number, README, CHANGES.txt --- .eggs/README.txt | 6 ------ CHANGES.txt | 3 ++- README.md | 12 ++++++------ README.rst | 16 ++++++++-------- indicoio/__init__.py | 2 +- setup.py | 2 +- 6 files changed, 18 insertions(+), 23 deletions(-) delete mode 100644 .eggs/README.txt diff --git a/.eggs/README.txt b/.eggs/README.txt deleted file mode 100644 index 5d01668..0000000 --- a/.eggs/README.txt +++ /dev/null @@ -1,6 +0,0 @@ -This directory contains eggs that were downloaded by setuptools to build, test, and run plug-ins. - -This directory caches those eggs to prevent repeated downloads. - -However, it is safe to delete this directory. - diff --git a/CHANGES.txt b/CHANGES.txt index 581a418..fa5f937 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -31,4 +31,5 @@ v0.7.4 Mon Jun 22 -- Fix for setup.py issues v0.7.5 Wed Jul 1 -- Public access to sentimentHQ api v0.7.6 Tue Jul 7 -- Add Keywords API v0.8.0 Fri Jul 10 -- Add Content Filtering API, Named Entities API, Facial Emotion with Localization -v0.8.1 Wed Fri 22 -- Add Sentiment HQ to predict_text API +v0.8.1 Wed Jul 22 -- Add Sentiment HQ to predict_text API +v0.9.0 Tue Jul 28 -- Deprecate batch function calls in favor of type inference diff --git a/README.md b/README.md index b90a5ad..f01b5ef 100644 --- a/README.md +++ b/README.md @@ -83,11 +83,11 @@ Examples Batch API --------- -Each `indicoio` function has a corresponding batch function for analyzing many examples with a single request. Simply pass in a list of inputs and receive a list of results in return. +Each `indicoio` function can process many examples with a single request. Simply pass in a list of inputs and receive a list of results in return. ```python ->>> from indicoio import batch_sentiment +>>> from indicoio import sentiment ->>> batch_sentiment(['Best day ever', 'Worst day ever']) +>>> sentiment(['Best day ever', 'Worst day ever']) [0.9899001220871786, 0.005709885173415242] ``` @@ -101,12 +101,12 @@ Accepted text API names: `text_tags, political, sentiment, language` Accepted image API names: `fer, facial_features, image_features` ```python ->>> from indicoio import predict_text, predict_image, batch_predict_text, batch_predict_image +>>> from indicoio import predict_text, predict_image, predict_text, predict_image >>> predict_text('Best day ever', apis=["sentiment", "language"]) {'sentiment': 0.9899001220871786, 'language': {u'Swedish': 0.0022464881013042294, u'Vietnamese': 9.887170914498351e-05, ...}} ->>> batch_predict_text(['Best day ever', 'Worst day ever'], apis=["sentiment", "language"]) +>>> predict_text(['Best day ever', 'Worst day ever'], apis=["sentiment", "language"]) {'sentiment': [0.9899001220871786, 0.005709885173415242], 'language': [{u'Swedish': 0.0022464881013042294, u'Vietnamese': 9.887170914498351e-05, u'Romanian': 0.00010661175919993216, ...}, {u'Swedish': 0.4924352805804646, u'Vietnamese': 0.028574824174911372, u'Romanian': 0.004185623723173551, u'Dutch': 0.000717033819689362, u'Korean': 0.0030093489153785826, ...}]} >>> import numpy as np @@ -116,6 +116,6 @@ Accepted image API names: `fer, facial_features, image_features` >>> predict_image(test_face, apis=["fer", "facial_features"]) {'facial_features': [0.0, -0.026176479280200796, 0.20707644777495776, ...], 'fer': {u'Angry': 0.08877494466353497, u'Sad': 0.3933999409104264, u'Neutral': 0.1910612654566151, u'Surprise': 0.0346146405941845, u'Fear': 0.17682159820518667, u'Happy': 0.11532761017005204}} ->>> batch_predict_image([test_face, test_face], apis=["fer", "facial_features"]) +>>> predict_image([test_face, test_face], apis=["fer", "facial_features"]) {'facial_features': [[0.0, -0.026176479280200796, 0.20707644777495776, ...], [0.0, -0.026176479280200796, 0.20707644777495776, ...]], 'fer': [{u'Angry': 0.08877494466353497, u'Sad': 0.3933999409104264, u'Neutral': 0.1910612654566151, u'Surprise': 0.0346146405941845, u'Fear': 0.17682159820518667, u'Happy': 0.11532761017005204}, { u'Angry': 0.08877494466353497, u'Sad': 0.3933999409104264, u'Neutral': 0.1910612654566151, u'Surprise': 0.0346146405941845, u'Fear': 0.17682159820518667, u'Happy': 0.11532761017005204}]} ``` diff --git a/README.rst b/README.rst index 0ea9ef4..c3cde27 100644 --- a/README.rst +++ b/README.rst @@ -91,15 +91,15 @@ Examples Batch API --------- -Each ``indicoio`` function has a corresponding batch function for -analyzing many examples with a single request. Simply pass in a list of -inputs and receive a list of results in return. +Each ``indicoio`` function can process many examples with a single +request. Simply pass in a list of inputs and receive a list of results +in return. .. code:: python - >>> from indicoio import batch_sentiment + >>> from indicoio import sentiment - >>> batch_sentiment(['Best day ever', 'Worst day ever']) + >>> sentiment(['Best day ever', 'Worst day ever']) [0.9899001220871786, 0.005709885173415242] Calling multiple APIs with a single function @@ -119,12 +119,12 @@ Accepted image API names: ``fer, facial_features, image_features`` .. code:: python - >>> from indicoio import predict_text, predict_image, batch_predict_text, batch_predict_image + >>> from indicoio import predict_text, predict_image, predict_text, predict_image >>> predict_text('Best day ever', apis=["sentiment", "language"]) {'sentiment': 0.9899001220871786, 'language': {u'Swedish': 0.0022464881013042294, u'Vietnamese': 9.887170914498351e-05, ...}} - >>> batch_predict_text(['Best day ever', 'Worst day ever'], apis=["sentiment", "language"]) + >>> predict_text(['Best day ever', 'Worst day ever'], apis=["sentiment", "language"]) {'sentiment': [0.9899001220871786, 0.005709885173415242], 'language': [{u'Swedish': 0.0022464881013042294, u'Vietnamese': 9.887170914498351e-05, u'Romanian': 0.00010661175919993216, ...}, {u'Swedish': 0.4924352805804646, u'Vietnamese': 0.028574824174911372, u'Romanian': 0.004185623723173551, u'Dutch': 0.000717033819689362, u'Korean': 0.0030093489153785826, ...}]} >>> import numpy as np @@ -134,6 +134,6 @@ Accepted image API names: ``fer, facial_features, image_features`` >>> predict_image(test_face, apis=["fer", "facial_features"]) {'facial_features': [0.0, -0.026176479280200796, 0.20707644777495776, ...], 'fer': {u'Angry': 0.08877494466353497, u'Sad': 0.3933999409104264, u'Neutral': 0.1910612654566151, u'Surprise': 0.0346146405941845, u'Fear': 0.17682159820518667, u'Happy': 0.11532761017005204}} - >>> batch_predict_image([test_face, test_face], apis=["fer", "facial_features"]) + >>> predict_image([test_face, test_face], apis=["fer", "facial_features"]) {'facial_features': [[0.0, -0.026176479280200796, 0.20707644777495776, ...], [0.0, -0.026176479280200796, 0.20707644777495776, ...]], 'fer': [{u'Angry': 0.08877494466353497, u'Sad': 0.3933999409104264, u'Neutral': 0.1910612654566151, u'Surprise': 0.0346146405941845, u'Fear': 0.17682159820518667, u'Happy': 0.11532761017005204}, { u'Angry': 0.08877494466353497, u'Sad': 0.3933999409104264, u'Neutral': 0.1910612654566151, u'Surprise': 0.0346146405941845, u'Fear': 0.17682159820518667, u'Happy': 0.11532761017005204}]} diff --git a/indicoio/__init__.py b/indicoio/__init__.py index 8bfa3e3..1225c9c 100644 --- a/indicoio/__init__.py +++ b/indicoio/__init__.py @@ -1,7 +1,7 @@ from functools import wraps, partial import warnings -Version, version, __version__, VERSION = ('0.8.1',) * 4 +Version, version, __version__, VERSION = ('0.9.0',) * 4 JSON_HEADERS = { 'Content-type': 'application/json', diff --git a/setup.py b/setup.py index b34cec7..cbdc19d 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ except ImportError: setup( name="IndicoIo", - version="0.8.1", + version="0.9.0", packages=[ "indicoio", "indicoio.text",