indico 0.7.1 → 0.8.0

data/lib/indico/version.rb

@@ -1,3 +1,3 @@
 module Indico
-  VERSION = '0.7.1'
+  VERSION = '0.8.0'
 end

data/lib/indico.rb

@@ -3,6 +3,7 @@ require 'indico/helper'
 require 'indico/image'
 require 'indico/multi'
 require 'indico/settings'
+require 'indico/errors'
 require 'uri'
 require 'json'
 require 'net/https'
@@ -56,12 +57,23 @@ module Indico
     api_handler(text, 'language', config)
   end
 
+  def self.emotion(text, config = nil)
+    api_handler(text, 'emotion', config)
+  end
+
   def self.text_tags(text, config = nil)
     api_handler(text, 'texttags', config)
   end
 
   def self.keywords(text, config = nil)
+    unless !config or config.key?(:v) or config.key?(:version)
+      config[:version] = "2"
+    end
+    if config and config.key?(:language) and config[:language] != "english"
+      config[:version] = "1"
+    end
     api_handler(text, 'keywords', config)
+
   end
 
   def self.named_entities(test_text, config = nil)
@@ -137,9 +149,10 @@ module Indico
 
   class Collection
 
-      def initialize(collection)
+      def initialize(collection, config = nil)
         if collection.kind_of?(String)
           @collection = collection
+          @domain = config.nil? ? nil : config["domain"]
         else
           raise TypeError, "Collection must be initialized with a String name"
         end
@@ -150,16 +163,17 @@ module Indico
         is_batch = data[0].kind_of?(Array)
         if is_batch
           x, y = data.transpose
-          x = Indico::preprocess(x, 144, true)
+          x = Indico::preprocess(x, 512, true)
           data = x.zip(y)
         else
-          data[0] = Indico::preprocess(data[0], 144, true)
+          data[0] = Indico::preprocess(data[0], 512, true)
         end
 
         if config.nil?
           config = Hash.new()
         end
         config[:collection] = @collection
+        config[:domain] = @domain || config["domain"]
         Indico.api_handler(data, 'custom', config, 'add_data')
       end
 
@@ -172,7 +186,14 @@ module Indico
       end
 
       def wait(interval = 1)
-        while info()['status'] != "ready" do
+        while true do
+          status = info()['status']
+          if status == "ready"
+            break
+          elsif status != "training"
+            raise IndicoError, "Collection training ended with failure: " + status
+            break
+          end
           sleep(interval)
         end
       end
@@ -182,16 +203,17 @@ module Indico
       end
 
       def predict(data, config = nil)
-        data = Indico::preprocess(data, 144, true)
+        data = Indico::preprocess(data, 512, true)
         if config.nil?
           config = Hash.new()
         end
         config[:collection] = @collection
+        config[:domain] = @domain || config["domain"]
         Indico.api_handler(data, 'custom', config, 'predict')
       end
 
       def remove_example(data, config = nil)
-        data = Indico::preprocess(data, 144, true)
+        data = Indico::preprocess(data, 512, true)
         if config.nil?
           config = Hash.new()
         end

data/spec/indico_batch_spec.rb

@@ -21,6 +21,15 @@ describe Indico do
     expect(Set.new(response[1].keys)).to eql(expected_keys)
   end
 
+  it 'should tag text with correct emotion tags' do
+    expected_keys = Set.new(%w(anger fear joy sadness surprise))
+    data = "I did it. I got into Grad School. Not just any program, but a GREAT program. :-)"
+
+    response = Indico.emotion([data, data])
+    expect(Set.new(response[0].keys)).to eql(expected_keys)
+    expect(Set.new(response[1].keys)).to eql(expected_keys)
+  end
+
   it 'should return personality values for text' do
     expected_keys = Set.new(%w(openness extraversion conscientiousness agreeableness))
     

data/spec/indico_spec.rb

@@ -43,6 +43,14 @@ describe Indico do
     expect(Set.new(response.keys)).to eql(expected_keys)
   end
 
+  it 'should tag text with correct emotion tags' do
+    expected_keys = Set.new(%w(anger fear joy sadness surprise))
+    data = "I did it. I got into Grad School. Not just any program, but a GREAT program. :-)"
+
+    response = Indico.emotion(data)
+    expect(Set.new(response.keys)).to eql(expected_keys)
+  end
+
   it 'should tag text with correct sentiment tags' do
     response = Indico.sentiment('Worst movie ever.')
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: indico
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-11 00:00:00.000000000 Z
+date: 2016-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inifile