clarifai-rails 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bada0ca5c7cc4594a0a449144b13799f4f65973
-  data.tar.gz: 62a997af00984238fc741d4179a6393c5c5470bf
+  metadata.gz: 2c39c147a05f29329235122744b6b83c8d4975cb
+  data.tar.gz: cda67986574fc8a87b27345e9afeb74a0c7e0b24
 SHA512:
-  metadata.gz: f792436b7f7ebdcc9cbdbee7a62e5bd73085a31cd2e158e8ba49576f948fdf1cb6629133ee91d912ae8f8e38f30b3d9e395109ded7ceaa7a6e8f7375a36abfe8
-  data.tar.gz: bce5ac6b6972c60cbe88dcc64219270d8b5a48beba6a8640f5c7dc23a30f6cc35a96e3ceb8649abde8602c4c85a49bd828a70acb8453f656e8478849a41d67c8
+  metadata.gz: 57624358d02d08c999f6bff12bc5a69890d141eb8fd3b4d375b80ded2610d25f5f6e000a8e56ac90a03cc93e6fa04107516add9a2deb813d33b5aa541bf98d83
+  data.tar.gz: 3941691e80d0adad8c2147a23c615116b024faaed1de462b2047c0b795fc406483046c65b7b9eba0f6c52fab339ad9ed1760e5a45f489b3e5c7dd43fe375d433

data/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rest-client', '~> 1.8'
+gem 'rest-client', '2.1.0.rc1'
 
 # Specify your gem's dependencies in clarifai-rails.gemspec
 gemspec

data/clarifai-rails.gemspec

@@ -6,7 +6,7 @@ require 'clarifai/rails/version'
 Gem::Specification.new do |spec|
   spec.name          = "clarifai-rails"
   spec.version       = Clarifai::Rails::VERSION
-  spec.authors       = ["Karl Nguyen"]
+  spec.authors       = ["Khoa Nguyen"]
   spec.email         = ["thanhkhoait@gmail.com"]
 
   spec.summary       = %q{Clarifai API Rails Client}

data/lib/clarifai/rails.rb

@@ -1,7 +1,6 @@
 module Clarifai
   module Rails
 
-    autoload :Token, "clarifai/rails/token"
     autoload :Detector, "clarifai/rails/detector"
     autoload :Image, "clarifai/rails/image"
     autoload :Error, "clarifai/rails/error"
@@ -10,11 +9,11 @@ module Clarifai
       yield self
     end
 
-    mattr_accessor :client_id, :client_secret, :tag_url
+    mattr_accessor :api_key, :tag_url, :model_code
 
-    @@client_id = nil
-    @@client_secret = nil
-    @@tag_url = "https://api.clarifai.com/v1/tag"
+    @@api_key = nil
+    @@tag_url = "https://api.clarifai.com/v2/models"
+    @@model_code = nil
 
   end
 end

data/lib/clarifai/rails/detector.rb

@@ -5,31 +5,25 @@ module Clarifai
   module Rails
     class Detector
 
-      def initialize(urls, download=false)
-        raise "Input data not supported! (String Array or String only)" unless urls.is_a?(Array) || urls.is_a?(String)
-
+      def initialize(urls, opts={})
+        raise 'Input data not supported! (String Array or String only)' unless valid_params?(urls)
         @urls = urls.is_a?(Array) ? urls : [urls]
-        @download = download
-        $clarifai_token_expire ||= Time.current
-      end
-
-      def need_download!
-        @download = true
-        self
+        @model_code = opts[:model] || Clarifai::Rails.model_code
+        raise 'Model need to set' if @model_code.blank?
       end
 
       def to_hash
-        @data_urls = fetch if @data_urls.blank?
+        @data_urls ||= fetch
         @data_urls.is_a?(Hash) ? @data_urls : JSON.parse(@data_urls).symbolize_keys
       end
 
       def results
-        to_hash[:results]
+        to_hash[:outputs]
       end
 
       def images
-        results.map do |json|
-          Clarifai::Rails::Image.new(json)
+        results.map do |image|
+          Clarifai::Rails::Image.new(image)
         end
       end
 
@@ -40,7 +34,7 @@ module Clarifai
       # Status method
 
       def error
-        Clarifai::Rails::Error.detector(to_hash[:status_code])
+        Clarifai::Rails::Error.detector(to_hash[:status])
       end
 
       def error?
@@ -52,34 +46,24 @@ module Clarifai
       end
 
       private
+      attr_reader :urls, :model_code
 
-      def fetch
-        new_token if $clarifai_token_expire <= Time.current
-        @download ? urls_protected : urls_unprotected
+      def endpoint
+        "#{Clarifai::Rails.tag_url}/#{model_code}/outputs"
       end
 
-      def urls_unprotected
-        params_string = @urls.join("&url=")
-        response = open("#{Clarifai::Rails.tag_url}?url=#{params_string}", "Authorization" => "Bearer #{$clarifai_token[:access_token]}")
-        response.read
+      def valid_params?(urls)
+        urls.is_a?(Array) || urls.is_a?(String)
       end
 
-      def urls_protected
-        data = { results: [], status_code: nil }
-        @urls.each do |url|
-          result = RestClient.post( Clarifai::Rails.tag_url,
-                                   { encoded_data: File.new(open(url)) },
-                                   Authorization: "Bearer #{$clarifai_token[:access_token]}")
-          json = JSON.parse(result).symbolize_keys
-          data[:results] << json[:results].first
-          data[:status_code] = json[:status_code]
-        end
-        data
+      def fetch
+        params = { inputs: urls.map{ |url| url_data(url) } }
+        result = RestClient.post(endpoint, params.to_json, Authorization: "Key #{Clarifai::Rails.api_key}")
+        JSON.parse(result).symbolize_keys
       end
 
-      def new_token
-        $clarifai_token = Clarifai::Rails::Token.new.create.symbolize_keys
-        $clarifai_token_expire = Time.current + $clarifai_token[:expires_in]
+      def url_data(url)
+        { data: { image: { url: url } } }
       end
 
     end

data/lib/clarifai/rails/image.rb

@@ -14,29 +14,27 @@ module Clarifai
         json[:url]
       end
 
-      def tags
+      def concepts
         raise error if error?
-        result["tag"]["classes"]
+        data[:concepts].map{ |item| item['name'] }
       end
 
-      def tags_with_percent
-        tags_hash = {}
-        tags.each_with_index do |tag, index|
-          tags_hash["#{tag}"] = result["tag"]["probs"][index]
-        end
-        tags_hash.symbolize_keys
+      def concepts_with_percent
+        data[:concepts].map do |item|
+          [item['name'], item['value']]
+        end.to_h
       end
 
       def status_code
-        json[:status_code]
+        status[:code]
       end
 
       def status_messages
-        json[:status_msg]
+        status[:description]
       end
 
       def docid_str
-        result["docid_str"]
+        data[:docid_str]
       end
 
       def error
@@ -55,8 +53,12 @@ module Clarifai
 
       attr_reader :json
 
-      def result
-        json[:result]
+      def data
+        json[:data].symbolize_keys
+      end
+
+      def status
+        json[:status].symbolize_keys
       end
 
     end

data/lib/clarifai/rails/version.rb

@@ -1,5 +1,5 @@
 module Clarifai
   module Rails
-    VERSION = "0.1.4"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clarifai-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
-- Karl Nguyen
+- Khoa Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-01 00:00:00.000000000 Z
+date: 2017-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -74,7 +74,6 @@ files:
 - lib/clarifai/rails/detector.rb
 - lib/clarifai/rails/error.rb
 - lib/clarifai/rails/image.rb
-- lib/clarifai/rails/token.rb
 - lib/clarifai/rails/version.rb
 - lib/generators/clarifai/install_generator.rb
 - lib/generators/templates/clarifai.rb
@@ -98,9 +97,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Clarifai API Rails Client
 test_files: []
-has_rdoc: 

data/lib/clarifai/rails/token.rb

@@ -1,32 +0,0 @@
-module Clarifai
-  module Rails
-
-    private
-
-    class Token
-
-      def initialize
-        if Clarifai::Rails.client_id.blank? || Clarifai::Rails.client_secret.blank?
-          raise "You need config client_id and client_secret for Application!"
-        end
-      end
-
-      def create
-        params = {
-          grant_type: :client_credentials,
-          client_id: Clarifai::Rails.client_id,
-          client_secret: Clarifai::Rails.client_secret
-        }
-        token_uri = URI("https://api.clarifai.com/v1/token")
-
-        https = Net::HTTP.new(token_uri.host, token_uri.port)
-        https.use_ssl = true
-        request = Net::HTTP::Post.new(token_uri.request_uri)
-        request.set_form_data(params)
-        body = https.request(request).body
-        JSON.parse(body)
-      end
-
-    end
-  end
-end