indico 0.3.0 → 0.3.1

data/lib/indico/helper.rb

@@ -21,12 +21,20 @@ module Indico
     unless config.nil?
       server = config[:cloud]
       api_key = config[:api_key]
-      apis = config["apis"]
+      apis = config[:apis]
       d = d.merge(config)
     end
 
-    url = url_join((server or Indico.config['cloud']), api) +
-          (apis ? "?apis=" + apis.join(",") : "")
+    server = server or Indico.config['cloud']
+
+    #FIXME Remove when sentimenthq is publicly released
+    if !server
+        if api == 'sentimenthq' || (apis && apis.include?('sentimenthq'))
+            raise IndicoError, 'The high quality sentiment API is currently in private beta.'
+        end
+    end
+
+    url = url_join(server, api) + (apis ? "?apis=" + apis.join(",") : "")
 
     response = make_request(url, JSON.dump(d),
                             add_api_key_to_header((api_key or Indico.config['auth'])))

data/lib/indico/multi.rb

@@ -4,6 +4,7 @@ module Indico
   CLIENT_TO_SERVER = {
     "political" => "political",
     "sentiment" => "sentiment",
+    "sentiment_hq" => "sentimenthq",
     "language" => "language",
     "text_tags" => "texttags",
     "fer" => "fer",
@@ -26,7 +27,7 @@ module Indico
       config = {}
     end
 
-    config["apis"] = converted_apis
+    config[:apis] = converted_apis
     response = api_handler(data, batch ? "apis/batch" : "apis", config)
     results = handle_multi(response)
 
@@ -39,7 +40,7 @@ module Indico
       if value.is_a?(Hash) && value.has_key?("results")
         converted_results[SERVER_TO_CLIENT[key]] = value["results"]
       else
-        raise IndicoError, 'unexpected result from ' + key + '\n\t' + value.fetch("error", "")
+        raise IndicoError, 'unexpected result from ' + key + '. ' + value.fetch("error", "")
       end
     end
     converted_results

data/lib/indico/settings.rb

@@ -6,7 +6,7 @@ HEADERS = { 'Content-Type' => 'application/json',
             'client-lib' => 'ruby',
             'version-number' => Indico::VERSION }
 # APIS
-TEXT_APIS = ["political", "sentiment", "language", "text_tags"]
+TEXT_APIS = ["political", "sentiment", "sentiment_hq", "language", "text_tags"]
 IMAGE_APIS = ["fer", "facial_features", "image_features"]
 
 module Indico

data/lib/indico/version.rb

@@ -1,3 +1,3 @@
 module Indico
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/lib/indico.rb

@@ -32,20 +32,28 @@ module Indico
     api_handler(test_text, 'political/batch', config)
   end
 
-  def self.posneg(test_text, config = nil)
+  def self.posneg(*args)
+    sentiment(*args)
+  end
+
+  def self.batch_posneg(*args)
+    batch_sentiment(*args)
+  end
+
+  def self.sentiment(test_text, config = nil)
     api_handler(test_text, 'sentiment', config)
   end
 
-  def self.batch_posneg(test_text, config = nil)
+  def self.batch_sentiment(test_text, config = nil)
     api_handler(test_text, 'sentiment/batch', config)
   end
 
-  def self.sentiment(*args)
-    posneg(*args)
+  def self.sentiment_hq(test_text, config = nil)
+    api_handler(test_text, 'sentimenthq', config)
   end
 
-  def self.batch_sentiment(*args)
-    batch_posneg(*args)
+  def self.batch_sentiment_hq(test_text, config = nil)
+    api_handler(test_text, 'sentimenthq/batch', config)
   end
 
   def self.language(test_text, config = nil)
@@ -89,22 +97,24 @@ module Indico
   end
 
   def self.predict_image(face, apis = IMAGE_APIS, config = nil)
-    api_hash = {"apis" => apis}
+    api_hash = {apis:apis}
     multi(preprocess(face, 48, false), "image", apis, IMAGE_APIS, config ? config.update(api_hash) : api_hash)
   end
 
-  def self.predict_text(test_text, apis = TEXT_APIS, config = nil)
-    api_hash = {"apis" => apis}
+  # FIXME - use settings TEXT_APIS when sentimenthq is released
+  def self.predict_text(test_text, apis = ['political', 'sentiment', 'language', 'text_tags'], config = nil)
+    api_hash = {apis:apis}
     multi(test_text, "text", apis, TEXT_APIS, config ? config.update(api_hash) : api_hash)
   end
 
   def self.batch_predict_image(face, apis, config = nil)
-    api_hash = {"apis" => apis}
+    api_hash = {apis:apis}
     multi(preprocess(face, 48, true), "image", apis, IMAGE_APIS, true, config ? config.update(api_hash) : api_hash)
   end
 
-  def self.batch_predict_text(test_text, apis, config = nil)
-    api_hash = {"apis" => apis}
+  # FIXME - use settings TEXT_APIS when sentimenthq is released
+  def self.batch_predict_text(test_text, apis = ['political', 'sentiment', 'language', 'text_tags'], config = nil)
+    api_hash = {apis:apis}
     multi(test_text, "text", apis, TEXT_APIS, true, config ? config.update(api_hash) : api_hash)
   end
 end

data/spec/indico_batch_spec.rb

@@ -7,6 +7,8 @@ describe Indico do
     private_cloud = 'indico-test'
     @config_private_cloud = { api_key: api_key, cloud: private_cloud}
     @config = { api_key: api_key}
+    # FIXME Remove when sentiment_hq is released
+    TEXT_APIS.delete("sentiment_hq")
   end
 
   it 'should tag text with correct political tags' do
@@ -36,6 +38,11 @@ describe Indico do
     expect(response[0] < 0.5).to eql(true)
   end
 
+  # it 'should tag text with correct sentiment_hq tags' do
+  #   response = Indico.batch_sentiment_hq(['Worst movie ever.'], @config)
+  #   expect(response[0] < 0.5).to eql(true)
+  # end
+
   it 'should tag text with correct language tags' do
     expected_keys = Set.new([
       'English',

data/spec/indico_spec.rb

@@ -6,6 +6,8 @@ describe Indico do
   before do
     api_key = ENV['INDICO_API_KEY']
     private_cloud = 'indico-test'
+    # FIXME - REMOVE WHEN SENTIMENTHQ RELEASE
+    TEXT_APIS.delete("sentiment_hq")
     @config = { api_key: api_key, cloud: private_cloud}
   end
 
@@ -33,6 +35,12 @@ describe Indico do
     expect(response < 0.5).to eql(true)
   end
 
+  # it 'should tag text with correct sentimenthq tags' do
+  #   response = Indico.sentiment_hq('Worst movie ever.')
+  #
+  #   expect(response < 0.5).to eql(true)
+  # end
+
   it 'should tag text with correct language tags' do
     expected_keys = Set.new([
       'English',
@@ -151,7 +159,7 @@ describe Indico do
 
   it "should respond with all text apis called by default" do
     expected_keys = Set.new(TEXT_APIS)
-    response = Indico.predict_text("Worst movie ever.")
+    response = Indico.predict_text("Worst movie ever.", TEXT_APIS)
 
     expect(response.class).to eql(Hash)
     expect(Set.new(response.keys)).to eql(expected_keys)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: indico
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-11 00:00:00.000000000 Z
+date: 2015-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inifile