indico 0.3.2 → 0.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5c9c674de4496664e06caa095548544c6c9a9ee5
+  data.tar.gz: dc041b9ee95a7179d8879d89f84e9951c06cbf92
+SHA512:
+  metadata.gz: d044d992744aa72502c645840eb7ec9c8848228e994cb71ab008715c265f206cd8af35b45b3636cf3cb2b6384d85f1b97f0c06a7f6adbf67259337b15ed4ff1e
+  data.tar.gz: 4e8f6f03198c4ceedc56c6fd72894e7a4679df19359bec18c7f8b0aae95289757c5dafcd7f3e84616c048d224ed8e1f110ad4ec3d2fe97f61e38556fb2c73e22

data/README.md

@@ -24,7 +24,7 @@ For API key registration and setup, checkout our [quickstart guide](http://docs.
 
 Full Documentation
 ------------
-Detailed documentation and further code examples are available at [indico.readme.io](http://indico.readme.io/v2.0/docs/ruby)
+Detailed documentation, a full list of APIs, and further code examples are available at [indico.readme.io](http://indico.readme.io/v2.0/docs/ruby)
 
 Examples
 ---------
@@ -50,6 +50,11 @@ Examples
 
 => { "food"=>0.3713687833244494, "cars"=>0.0037924017632370586, ...}
 
+> Indico.keywords("Facebook blog posts about Android tech make better journalism than most news outlets.", {top_n: 3})
+
+=> {"android"=>0.10602030910588661, "journalism"=>0.13466866170166855, "outlets"=>0.13930405357808642}
+
+
 ```
 
 Batch API

data/lib/indico.rb

@@ -24,12 +24,12 @@ module Indico
     config['cloud'] = cloud
   end
 
-  def self.political(test_text, config = nil)
-    api_handler(test_text, 'political', config)
+  def self.political(text, config = nil)
+    api_handler(text, 'political', config)
   end
 
-  def self.batch_political(test_text, config = nil)
-    api_handler(test_text, 'political/batch', config)
+  def self.batch_political(text, config = nil)
+    api_handler(text, 'political/batch', config)
   end
 
   def self.posneg(*args)
@@ -40,60 +40,84 @@ module Indico
     batch_sentiment(*args)
   end
 
-  def self.sentiment(test_text, config = nil)
-    api_handler(test_text, 'sentiment', config)
+  def self.sentiment(text, config = nil)
+    api_handler(text, 'sentiment', config)
   end
 
-  def self.batch_sentiment(test_text, config = nil)
-    api_handler(test_text, 'sentiment/batch', config)
+  def self.batch_sentiment(text, config = nil)
+    api_handler(text, 'sentiment/batch', config)
   end
 
-  def self.sentiment_hq(test_text, config = nil)
-    api_handler(test_text, 'sentimenthq', config)
+  def self.sentiment_hq(text, config = nil)
+    api_handler(text, 'sentimenthq', config)
   end
 
-  def self.batch_sentiment_hq(test_text, config = nil)
-    api_handler(test_text, 'sentimenthq/batch', config)
+  def self.batch_sentiment_hq(text, config = nil)
+    api_handler(text, 'sentimenthq/batch', config)
   end
 
-  def self.language(test_text, config = nil)
-    api_handler(test_text, 'language', config)
+  def self.language(text, config = nil)
+    api_handler(text, 'language', config)
   end
 
-  def self.batch_language(test_text, config = nil)
-    api_handler(test_text, 'language/batch', config)
+  def self.batch_language(text, config = nil)
+    api_handler(text, 'language/batch', config)
   end
 
-  def self.text_tags(test_text, config = nil)
-    api_handler(test_text, 'texttags', config)
+  def self.text_tags(text, config = nil)
+    api_handler(text, 'texttags', config)
   end
 
-  def self.batch_text_tags(test_text, config = nil)
-    api_handler(test_text, 'texttags/batch', config)
+  def self.batch_text_tags(text, config = nil)
+    api_handler(text, 'texttags/batch', config)
+  end
+
+  def self.keywords(text, config = nil)
+    api_handler(text, 'keywords', config)
+  end
+
+  def self.batch_keywords(text, config = nil)
+    api_handler(text, 'keywords/batch', config)
+  end
+
+  def self.named_entities(test_text, config = nil)
+    api_handler(test_text, 'namedentities', config)
+  end
+
+  def self.batch_named_entities(test_text, config = nil)
+    api_handler(test_text, 'namedentities/batch', config)
   end
 
   def self.fer(test_image, config = nil)
     api_handler(preprocess(test_image, 48, false), 'fer', config)
   end
 
-  def self.batch_fer(test_image, config = nil)
-    api_handler(preprocess(test_image, 48, true), 'fer/batch', config)
+  def self.batch_fer(image, config = nil)
+    api_handler(preprocess(image, 48, true), 'fer/batch', 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)
+    api_handler(preprocess(image, 48, true), 'facialfeatures/batch', config)
   end
 
-  def self.facial_features(test_image, config = nil)
-    api_handler(preprocess(test_image, 48, false), 'facialfeatures', config)
+  def self.image_features(image, config = nil)
+    api_handler(preprocess(image, 64, false), 'imagefeatures', config)
   end
 
-  def self.batch_facial_features(test_image, config = nil)
-    api_handler(preprocess(test_image, 48, true), 'facialfeatures/batch', config)
+  def self.batch_image_features(image, config = nil)
+    api_handler(preprocess(image, 64, true), 'imagefeatures/batch', config)
   end
 
-  def self.image_features(test_image, config = nil)
-    api_handler(preprocess(test_image, 64, false), 'imagefeatures', config)
+  def self.content_filtering(image, config = nil)
+    api_handler(preprocess(image, 128, false), 'contentfiltering', config)
   end
 
-  def self.batch_image_features(test_image, config = nil)
-    api_handler(preprocess(test_image, 64, true), 'imagefeatures/batch', config)
+  def self.batch_content_filtering(image, config = nil)
+    api_handler(preprocess(image, 128, true), 'contentfiltering/batch', config)
   end
 
   def self.predict_image(face, apis = IMAGE_APIS, config = nil)
@@ -102,9 +126,9 @@ module Indico
   end
 
   # FIXME - use settings TEXT_APIS when sentimenthq is released
-  def self.predict_text(test_text, apis = ['political', 'sentiment', 'language', 'text_tags'], config = nil)
+  def self.predict_text(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)
+    multi(text, "text", apis, TEXT_APIS, config ? config.update(api_hash) : api_hash)
   end
 
   def self.batch_predict_image(face, apis, config = nil)
@@ -113,8 +137,8 @@ module Indico
   end
 
   # FIXME - use settings TEXT_APIS when sentimenthq is released
-  def self.batch_predict_text(test_text, apis = ['political', 'sentiment', 'language', 'text_tags'], config = nil)
+  def self.batch_predict_text(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)
+    multi(text, "text", apis, TEXT_APIS, true, config ? config.update(api_hash) : api_hash)
   end
 end

data/lib/indico/multi.rb

@@ -9,7 +9,8 @@ module Indico
     "text_tags" => "texttags",
     "fer" => "fer",
     "facial_features" => "facialfeatures",
-    "image_features" => "imagefeatures"
+    "image_features" => "imagefeatures",
+    "content_filtering" => "contentfiltering"
   }
 
   SERVER_TO_CLIENT = CLIENT_TO_SERVER.invert

data/lib/indico/settings.rb

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

data/lib/indico/version.rb

@@ -1,3 +1,3 @@
 module Indico
-  VERSION = '0.3.2'
+  VERSION = '0.4.0'
 end

data/spec/indico_batch_spec.rb

@@ -108,6 +108,38 @@ describe Indico do
     expect Set.new(response[1].keys).subset?(Set.new(expected_keys))
   end
 
+  it 'should tag text with correct keywords' do
+    expected_keys = Set.new(%w(people kill guns))
+
+    data = ['Guns don\'t kill people.', 'People kill people.']
+    response = Indico.batch_keywords(data, @config)
+
+    expect Set.new(response[0].keys).subset?(Set.new(expected_keys))
+    expect Set.new(response[1].keys).subset?(Set.new(expected_keys))
+  end
+
+  it 'should return all named entities with category breakdowns' do
+    expected_keys = Set.new(%w(unknown organization location person))
+    response = Indico.batch_named_entities(['I want to move to New York City!'])
+    expect(response.length).to eql(1)
+    response = response[0]
+
+    expect(response.keys.length > 0).to eql(true)
+    expect(response.values[0]['confidence']).to be >= 0.75
+    expect(Set.new(response.values[0]['categories'].keys)).to eql(expected_keys)
+
+    chance_sum = response.values[0]['categories'].values.inject{|sum,x| sum + x }
+    expect(chance_sum).to be > 0.9999
+  end
+
+  it 'should return no named entities when threshold is 1' do
+    config = { threshold: 1 }
+    response = Indico.batch_named_entities(['I want to move to New York City!'], config)
+    expect(response.length).to eql(1)
+    response = response[0]
+    expect(response.keys.length).to eql(0)
+  end
+
   it 'should tag face with correct facial expression' do
     expected_keys = Set.new(%w(Angry Sad Neutral Surprise Fear Happy))
     test_face = Array.new(48) { Array.new(48) { rand(100) / 100.0 } }

data/spec/indico_spec.rb

@@ -37,7 +37,7 @@ describe Indico do
 
   it 'should tag text with correct sentimenthq tags' do
     response = Indico.sentiment_hq('Worst movie ever.')
-  
+
     expect(response < 0.5).to eql(true)
   end
 
@@ -100,6 +100,31 @@ describe Indico do
     expect Set.new(response.keys).subset?(Set.new(expected_keys))
   end
 
+  it 'should tag text with correct keywords' do
+    expected_keys = Set.new(%w(guns kill people))
+    response = Indico.keywords('Guns don\'t kill people. People kill people.')
+
+    expect Set.new(response.keys).subset?(Set.new(expected_keys))
+  end
+
+  it 'should return all named entities with category breakdowns' do
+    expected_keys = Set.new(%w(unknown organization location person))
+    response = Indico.named_entities('I want to move to New York City!')
+
+    expect(response.keys.length > 0).to eql(true)
+    expect(response.values[0]['confidence']).to be >= 0.75
+    expect(Set.new(response.values[0]['categories'].keys)).to eql(expected_keys)
+
+    chance_sum = response.values[0]['categories'].values.inject{|sum,x| sum + x }
+    expect(chance_sum).to be > 0.9999
+  end
+
+  it 'should return no named entities when threshold is 1' do
+    config = { threshold: 1 }
+    response = Indico.named_entities('I want to move to New York City!', config)
+    expect(response.keys.length).to eql(0)
+  end
+
   it 'should tag face with correct facial expression' do
     expected_keys = Set.new(%w(Angry Sad Neutral Surprise Fear Happy))
     test_face = Array.new(48) { Array.new(48) { rand(100) / 100.0 } }
@@ -117,6 +142,14 @@ describe Indico do
     end
   end
 
+  it 'should tag noise as sfw' do
+    test_image = Array.new(48) { Array.new(48) { rand(100) / 100.0 } }
+    silent_warnings do
+      response = Indico.content_filtering(test_image)
+      expect(response).to be < 0.5
+    end
+  end
+
   it 'should tag image with correct image features' do
     test_image = Array.new(48) { Array.new(48) { rand(100) / 100.0 } }
     silent_warnings do

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: indico
 version: !ruby/object:Gem::Version
-  version: 0.3.2
-  prerelease: 
+  version: 0.4.0
 platform: ruby
 authors:
 - Slater Victoroff
@@ -12,12 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-01 00:00:00.000000000 Z
+date: 2015-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inifile
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -25,7 +23,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -33,7 +30,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: oily_png
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,7 +37,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -49,7 +44,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -57,7 +51,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -65,33 +58,29 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A simple Ruby Wrapper for the indico set of APIs.
@@ -129,26 +118,25 @@ files:
 homepage: https://github.com/IndicoDataSolutions/IndicoIo-ruby
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A simple Ruby Wrapper for the indico set of APIs.
 test_files: []