indico 0.5.4 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de85a9b86534b52b962f7293c6a012ce1beed21f
-  data.tar.gz: bb518f38c4797add87f0cfb24467d960d5df23cb
+  metadata.gz: 4e197cd029719640023170141e26211f2695029a
+  data.tar.gz: f9439e5f00fc3370d49ca7368b806c0f1451bb1f
 SHA512:
-  metadata.gz: bb5111b6aeb42548a2c654c8401d5be53f6c31c09d6916908e247918193b0b55da6fab98d1c58a1345d1912be8400bd8fc6661bdf312b12954079c412379e509
-  data.tar.gz: 9d96c560aa0926b193ab813f5ce5cffa303fb698783a928e94e9857740206629c0690da6c48c05fc27ad0bfd742f6b51dd9cce0cee994fabe0b81c642590a006
+  metadata.gz: bb6c9222db326aec5a02f5d4fcbcfe99fe744439df6f6c5d8cd62536d61ade512fc4009df2ec38735ddbfceffc50b502ca19ac09f3885813266aa3c0ca3887d1
+  data.tar.gz: 47741995eaaf733b88673b745dca5b698843f62be040268d9920657320aecb6abee4cbb8aecf75f2945876569d7f683a76d754ef6fdb384fa4e642bef9540593

data/lib/indico/helper.rb

@@ -10,8 +10,8 @@ module Indico
       Indico.cloud_protocol + root + '.indico.domains/' + api
     end
   end
-
-  def self.api_handler(data, api, config)
+  
+  def self.api_handler(data, api, config, method='predict')
     server = nil
     api_key = nil
     version = nil
@@ -25,6 +25,8 @@ module Indico
       end
     end
 
+    api += (method != "predict" ? ("/" + method) : "")
+
     unless config.nil?
       server = config.delete('cloud')
       api_key = config.delete('api_key')
@@ -48,7 +50,7 @@ module Indico
     response = make_request(url, JSON.dump(d),
                             add_api_key_to_header(api_key))
 
-    response.header.each_header do |key, value|
+    response.each_header do |key, value|
       if key.downcase == 'x-warning'
         warn value
       end

data/lib/indico/multi.rb

@@ -15,7 +15,8 @@ module Indico
     "facial_localization" => "facial_localization",
     "image_features" => "imagefeatures",
     "content_filtering" => "contentfiltering",
-    "twitter_engagement" => "twitterengagement"
+    "twitter_engagement" => "twitterengagement",
+    "myers_briigs" => "myersbriggs"
   }
 
   SERVER_TO_CLIENT = CLIENT_TO_SERVER.invert

data/lib/indico/version.rb

@@ -1,3 +1,3 @@
 module Indico
-  VERSION = '0.5.4'
+  VERSION = '0.6.0'
 end

data/lib/indico.rb

@@ -28,154 +28,63 @@ module Indico
     api_handler(text, 'political', config)
   end
 
-  def self.batch_political(text, config = nil)
-    warn(
-      "The `batch_political` function will be deprecated in the next major upgrade. " +
-      "Please call `political` instead with the same arguments"
-    )
-    self.political(text, config)
-  end
-
   def self.posneg(*args)
     sentiment(*args)
   end
 
-  def self.batch_posneg(text, config = nil)
-    warn(
-      "The `batch_posneg` function will be deprecated in the next major upgrade. " +
-      "Please call `posneg` instead with the same arguments"
-    )
-    self.posneg(text, config)
-  end
-
   def self.sentiment(text, config = nil)
     api_handler(text, 'sentiment', config)
   end
 
-  def self.batch_sentiment(text, config = nil)
-    warn(
-      "The `batch_sentiment` function will be deprecated in the next major upgrade. " +
-      "Please call `sentiment` instead with the same arguments"
-    )
-    self.sentiment(text, config)
+  def self.personality(text, config = nil)
+    api_handler(text, 'personality', config)
   end
 
+  def self.personas(text, config = {'persona'=> true})
+    api_handler(text, 'personality', config)
+  end
 
   def self.twitter_engagement(text, config = nil)
     api_handler(text, 'twitterengagement', config)
   end
 
-  def self.batch_twitter_engagement(text, config = nil)
-    warn(
-      "The `batch_twitter_engagement` function will be deprecated in the next major upgrade. " +
-      "Please call `twitter_engagement` instead with the same arguments"
-    )
-    self.twitter_engagement(text, config)
-  end
-
   def self.sentiment_hq(text, config = nil)
     api_handler(text, 'sentimenthq', config)
   end
 
-  def self.batch_sentiment_hq(text, config = nil)
-    warn(
-      "The `batch_sentiment_hq` function will be deprecated in the next major upgrade. " +
-      "Please call `sentiment_hq` instead with the same arguments"
-    )
-    self.sentiment_hq(text, config)
-  end
-
-
   def self.language(text, config = nil)
     api_handler(text, 'language', config)
   end
 
-  def self.batch_language(text, config = nil)
-    warn(
-      "The `batch_language` function will be deprecated in the next major upgrade. " +
-      "Please call `language` instead with the same arguments"
-    )
-    self.language(text, config)
-  end
-
-
   def self.text_tags(text, config = nil)
     api_handler(text, 'texttags', config)
   end
 
-  def self.batch_text_tags(text, config = nil)
-    warn(
-      "The `batch_text_tags` function will be deprecated in the next major upgrade. " +
-      "Please call `text_tags` instead with the same arguments"
-    )
-    self.text_tags(text, config)
-  end
-
-
   def self.keywords(text, config = nil)
     api_handler(text, 'keywords', config)
   end
 
-  def self.batch_keywords(text, config = nil)
-    warn(
-      "The `batch_keywords` function will be deprecated in the next major upgrade. " +
-      "Please call `keywords` instead with the same arguments"
-    )
-    self.keywords(text, config)
-  end
-
-
   def self.named_entities(test_text, config = nil)
     api_handler(test_text, 'namedentities', config)
   end
 
-  def self.batch_named_entities(text, config = nil)
-    warn(
-      "The `batch_named_entities` function will be deprecated in the next major upgrade. " +
-      "Please call `named_entities` instead with the same arguments"
-    )
-    self.named_entities(text, config)
-  end
-
   def self.fer(image, config = nil)
     size = (config != nil and config["detect"] == true) ? false : 48
     api_handler(preprocess(image, size, false), 'fer', config)
   end
 
-  def self.batch_fer(image, config = nil)
-    warn(
-      "The `batch_fer` function will be deprecated in the next major upgrade. " +
-      "Please call `fer` instead with the same arguments"
-    )
-    self.fer(image, config)
-  end
-
-
   def self.facial_features(image, config = nil)
     api_handler(preprocess(image, 48, false), 'facialfeatures', config)
   end
 
-  def self.batch_facial_features(image, config = nil)
-    warn(
-      "The `batch_facial_features` function will be deprecated in the next major upgrade. " +
-      "Please call `facial_features` instead with the same arguments"
-    )
-    self.facial_features(image, config)
-  end
-
   def self.facial_localization(image, config = nil)
     api_handler(preprocess(image, false, false), 'faciallocalization', config)
   end
 
-  def self.batch_facial_localization(image, config = nil)
-    warn(
-      "The `batch_facial_localization` function will be deprecated in the next major upgrade. " +
-      "Please call `facial_localization` instead with the same arguments"
-    )
-    self.facial_localization(image, config)
-  end
-
-  def self.image_features(image, config = nil)
+  def self.image_features(image, config = {})
+    unless config.key?(:v) or config.key?(:version)
+      config[:version] = "3"
+    end
     api_handler(preprocess(image, 144, true), 'imagefeatures', config)
   end
 
@@ -183,50 +92,95 @@ module Indico
     api_handler(preprocess(image, 144, true), 'imagerecognition', config)
   end
 
-  def self.batch_image_features(image, config = nil)
-    warn(
-      "The `batch_image_features` function will be deprecated in the next major upgrade. " +
-      "Please call `image_features` instead with the same arguments"
-    )
-    self.image_features(image, config)
-  end
 
   def self.content_filtering(image, config = nil)
     api_handler(preprocess(image, 128, true), 'contentfiltering', config)
   end
 
-  def self.batch_content_filtering(image, config = nil)
-    warn(
-      "The `batch_content_filtering` function will be deprecated in the next major upgrade. " +
-      "Please call `content_filtering` instead with the same arguments"
-    )
-    self.content_filtering(image, config)
-  end
-
   def self.analyze_image(face, apis = IMAGE_APIS, config = nil)
     api_hash = {apis:apis}
     multi(preprocess(face, 48, false), "image", apis, IMAGE_APIS, config ? config.update(api_hash) : api_hash)
   end
 
-  def self.batch_analyze_image(image, apis = IMAGE_APIS, config = nil)
-    warn(
-      "The `batch_analyze_image` function will be deprecated in the next major upgrade. " +
-      "Please call `analyze_image` instead with the same arguments"
-    )
-    self.analyze_image(image, apis, config)
-  end
-
   def self.analyze_text(text, apis = TEXT_APIS, config = nil)
     api_hash = {apis:apis}
     multi(text, "text", apis, TEXT_APIS, config ? config.update(api_hash) : api_hash)
   end
 
-  def self.batch_analyze_text(text, apis = TEXT_APIS, config = nil)
-    warn(
-      "The `batch_analyze_text` function will be deprecated in the next major upgrade. " +
-      "Please call `analyze_text` instead with the same arguments"
-    )
-    self.analyze_text(text, apis, config)
+  def self.collections(config = nil)
+    Indico.api_handler(nil, 'custom', config, 'collections')
+  end
+
+  class Collection
+
+      def initialize(collection)
+        if collection.kind_of?(String)
+          @collection = collection
+        else
+          raise TypeError, "Collection must be initialized with a String name"
+        end
+      end
+
+      def add_data(data, config = nil)
+
+        is_batch = data[0].kind_of?(Array)
+        if is_batch
+          x, y = data.transpose
+          x = Indico::preprocess(x, 144, true)
+          data = x.zip(y)
+        else
+          data[0] = Indico::preprocess(data[0], 144, true)
+        end
+
+        if config.nil?
+          config = Hash.new()
+        end
+        config[:collection] = @collection
+        Indico.api_handler(data, 'custom', config, 'add_data')
+      end
+
+      def train(config = nil)
+        if config.nil?
+          config = Hash.new()
+        end
+        config[:collection] = @collection
+        Indico.api_handler(nil, 'custom', config, 'train')
+      end
+
+      def wait(interval = 1)
+        while info()['status'] != "ready" do
+          sleep(interval)
+        end
+      end
+
+      def info(interval = 1)
+        Indico.collections()[@collection]
+      end
+
+      def predict(data, config = nil)
+        data = Indico::preprocess(data, 144, true)
+        if config.nil?
+          config = Hash.new()
+        end
+        config[:collection] = @collection
+        Indico.api_handler(data, 'custom', config, 'predict')
+      end
+
+      def remove_example(data, config = nil)
+        data = Indico::preprocess(data, 144, true)
+        if config.nil?
+          config = Hash.new()
+        end
+        config[:collection] = @collection
+        Indico.api_handler(data, 'custom', config, 'remove_example')
+      end
+
+      def clear(config = nil)
+        if config.nil?
+          config = Hash.new()
+        end
+        config[:collection] = @collection
+        Indico.api_handler(nil, 'custom', config, 'clear_collection')
+      end
   end
-
 end

data/spec/custom_spec.rb

@@ -0,0 +1,68 @@
+require 'spec_helper'
+require 'set'
+
+test_data = [['input 1', 'label 1'], ['input 2', 'label 2'], ['input 3', 'label 3'], ['input 4', 'label 4']]
+text_collection = '__test_ruby_text__'
+
+describe Indico do
+  before do
+    api_key = ENV['INDICO_API_KEY']
+    @config = { api_key: api_key}
+  end
+
+  after(:each) do
+    begin
+      collection = Indico::Collection.new(text_collection)
+      collection.clear()
+    rescue 
+      # no op -- collection doesn't
+    end
+  end
+
+  it 'should instantiate a Collection object and add data to the collection' do
+    collection = Indico::Collection.new(text_collection)
+    collection.add_data(test_data)
+  end
+
+  it "should add data, train, and predict" do
+    collection = Indico::Collection.new(text_collection)
+    collection.add_data(test_data)
+    collection.train()
+    collection.wait()
+    result = collection.predict(test_data[0][0])
+    expect(result).to have_key(test_data[0][1])
+  end
+
+  it "should list collections" do
+      collection = Indico::Collection.new(text_collection)
+      collection.add_data(test_data)
+      collection.train()
+      collection.wait()
+      expect(Indico::collections()).to have_key(text_collection)
+  end
+
+  it "should clear an example" do
+    collection = Indico::Collection.new(text_collection)
+    collection.add_data(test_data)
+    collection.train()
+    collection.wait()
+    result = collection.predict(test_data[0][0])
+    expect(result).to have_key(test_data[0][1])
+    collection.remove_example(test_data[0][0])
+    collection.train()
+    collection.wait()
+    result = collection.predict(test_data[0][0])
+    expect(result).to_not have_key(test_data[0][1])
+  end
+
+  it "should clear a collection" do
+    collection = Indico::Collection.new(text_collection)
+    collection.add_data(test_data)
+    collection.train()
+    collection.wait()
+    expect(Indico::collections()).to have_key(text_collection)
+    collection.clear()
+    expect(Indico::collections()).to_not have_key(text_collection)
+  end 
+
+end

data/spec/indico_batch_spec.rb

@@ -21,6 +21,27 @@ describe Indico do
     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 = ['I love my friends!', 'I like to be alone']
+    response = Indico.personality(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 personas for text' do
+    expected_keys = Set.new(%w(architect mediator executive entertainer))
+    data = ['I love my friends!', 'I like to be alone']
+    response = Indico.personas(data)
+
+    expected_keys.each do |key|
+      expect(Set.new(response[0].keys)).to include(key)
+      expect(Set.new(response[1].keys)).to include(key)
+    end
+  end
+
   it 'should access a private cloud' do
     expected_keys = Set.new(%w(Conservative Green Liberal Libertarian))
     data = ['Guns don\'t kill people.', ' People kill people.']
@@ -172,8 +193,8 @@ describe Indico do
     test_image = File.dirname(__FILE__) + "/data/happy.png"
     silent_warnings do
       response = Indico.image_features([test_image, test_image], @config)
-      expect(response[0].length).to eql(2048)
-      expect(response[1].length).to eql(2048)
+      expect(response[0].length).to eql(4096)
+      expect(response[1].length).to eql(4096)
     end
   end
 
@@ -217,15 +238,13 @@ describe Indico do
     end
   end
 
+  it "should accept image urls" do
+    test_image = 'http://icons.iconarchive.com/icons/oxygen-icons.org/' +
+                 'oxygen/48/Emotes-face-smile-icon.png'
+    response = Indico.image_features([test_image, test_image],
+                                           @config)
 
-  # Uncomment when frontend updated to accept image urls
-  # it "should accept image urls" do
-  #   test_image = 'http://icons.iconarchive.com/icons/oxygen-icons.org/' +
-  #                'oxygen/48/Emotes-face-smile-icon.png'
-  #   response = Indico.image_features([test_image, test_image],
-  #                                          @config)
-
-  #   expect(response[0].length).to eql(2048)
-  #   expect(response[1].length).to eql(2048)
-  # end
+    expect(response[0].length).to eql(4096)
+    expect(response[1].length).to eql(4096)
+  end
 end

data/spec/indico_spec.rb

@@ -16,6 +16,22 @@ describe Indico do
     expect(Set.new(response.keys)).to eql(expected_keys)
   end
 
+  it 'should return personality values for text' do
+    expected_keys = Set.new(%w(openness extraversion conscientiousness agreeableness))
+    response = Indico.personality('I love my friends!')
+
+    expect(Set.new(response.keys)).to eql(expected_keys)
+  end
+
+  it 'should return personas for text' do
+    expected_keys = Set.new(%w(architect mediator executive entertainer))
+    response = Indico.personas('I love my friends!')
+
+    expected_keys.each do |key|
+      expect(Set.new(response.keys)).to include(key)
+    end
+  end
+
   it 'should tag text with correct political tags' do
     expected_keys = Set.new(%w(Conservative Green Liberal Libertarian))
     data = 'Guns don\'t kill people. People kill people.'
@@ -180,7 +196,7 @@ describe Indico do
     test_image= File.dirname(__FILE__) + "/data/happy.png"
     silent_warnings do
       response = Indico.image_features(test_image)
-      expect(response.length).to eql(2048)
+      expect(response.length).to eql(4096)
     end
   end
 
@@ -188,7 +204,7 @@ describe Indico do
     test_image= File.dirname(__FILE__) + "/data/dog.jpg"
     silent_warnings do
       response = Indico.image_features(test_image)
-      expect(response.length).to eql(2048)
+      expect(response.length).to eql(4096)
     end
   end
 
@@ -196,7 +212,7 @@ describe Indico do
     test_image = File.open(File.dirname(__FILE__) + "/data/happy64.txt", 'rb') { |f| f.read }
     silent_warnings do
       response = Indico.image_features(test_image)
-      expect(response.length).to eql(2048)
+      expect(response.length).to eql(4096)
     end
   end
 
@@ -282,7 +298,7 @@ describe Indico do
     response = Indico.image_features('http://icons.iconarchive.com/icons/' +
                                      'oxygen-icons.org/oxygen/48/' +
                                      'Emotes-face-smile-icon.png')
-  
-    expect(response.length).to eql(2048)
+
+    expect(response.length).to eql(4096)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: indico
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.6.0
 platform: ruby
 authors:
 - Slater Victoroff
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-30 00:00:00.000000000 Z
+date: 2015-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inifile
@@ -109,6 +109,7 @@ files:
 - lib/indico/version.rb
 - spec/config/.indicorc.test
 - spec/config/.indicorc.test.2
+- spec/custom_spec.rb
 - spec/data/dog.jpg
 - spec/data/happy.png
 - spec/data/happy64.txt