watson-conversation 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2142e0e26de065f9e76adbbc272924a0f0526715
-  data.tar.gz: b107b9e65ac9917cf51e1e9b7bcbcc0fa161c7f3
+  metadata.gz: 2f419989bfc6287a190e81de6e29da7137ab1c5a
+  data.tar.gz: 2b8dda9b003b5e96150f6f555f3bb25ee0cf69ae
 SHA512:
-  metadata.gz: b8665af0822c083d99121f15571ce2bfbc104660e2007cffd6e65dcbed2fb91c287980bd44689bb9e4617fbe52a8df5f4aadea38d73053a5886299f44b4cb9df
-  data.tar.gz: 45d8eda8edf46f4513f01eb24b4e003447a131022e895893134ffd541a8aac020d7b4238be07f75a78fcca80dc8c5616cba8edbdd365c3cceea0a17fd00b53e1
+  metadata.gz: b0906c61f4b767df75c3d481dcc225cb6a2e713d18b7ff73b46cdc1883db9565fbf3fd34c4b661e15ac3e79ca12a7920b0e533745f6193719232a0ea0866adb2
+  data.tar.gz: a56a7811d1ccb62d9ebf7803514e15d98354f53da7eaf21274194c6038f07deb7dde5fa24eb0c232a386537e8a9933a8b9992b3afc7ec1f459c6d8e91fa4d189

data/lib/watson/conversation.rb

@@ -1,8 +1,9 @@
 require "watson/conversation/version"
 require 'rest-client'
 require "json"
+require "thread"
+
 
-	
 module Watson
 	module Conversation
 
@@ -13,9 +14,11 @@ module Watson
 				
 				@endpoint = "#{url}/v1/workspaces/#{workspace_id}/message?version=#{version}"
 			end
-		
+
 		
 			def talk(question, context)
+				future_data = FutureData.new()
+
 				if context == ""
 					body = {}.to_json
 				else
@@ -28,22 +31,69 @@ module Watson
 					}.to_json
 				end
 				
-				begin
-					response = RestClient.post @endpoint, body, content_type: :json, accept: :json
-					code = response.code
-					body = JSON.parse(response.body)
-				rescue RestClient::ExceptionWithResponse => e
-					code = e.response.code
-					body = e.response.body
+
+				Thread.start do
+					begin
+						response = RestClient.post @endpoint, body, content_type: :json, accept: :json
+						code = response.code
+						body = JSON.parse(response.body)
+					rescue RestClient::ExceptionWithResponse => e
+						code = e.response.code
+						body = e.response.body
+					end
+					future_data.setRealData(code, body)
 				end
 	
+				return future_data
+			end
+
+
+			def getData()
 				return code, body
 			end
 		end
+
+
+		class FutureData
+			def initialize()
+				@is_ready = false
+				@real_data = nil
+
+				@mutex = Mutex.new
+				@cv = ConditionVariable.new
+			end
+
+
+			def setRealData(code, body)
+				@mutex.synchronize do
+					if (@is_ready == true)
+						return
+					end
+				end
 				
+				@real_data = code, body
+				@is_ready = true
+
+				@cv.broadcast
+			end
+
+
+			def getData()
+				@mutex.synchronize do
+					while (@is_ready == false)
+						@cv.wait(@mutex)
+					end
+				end
+				return @real_data
+			end
+		end
+
 				
+
 		class ManageDialog
 			def initialize(username: "", password: "", workspace_id: "")
+				@mutex = Mutex.new
+
 				@cnv = Dialog.new(
 					username: username,
 					password: password,
@@ -55,24 +105,35 @@ module Watson
 		
 		
 			def talk(user, question)
-				if @users.key?(user) == false
-					code, response = @cnv.talk("", "")
-				else
-					code, response = @cnv.talk(question, context = @users[user])
+				future_data = nil
+				@mutex.synchronize do
+					if @users.key?(user) == false
+						future_data = @cnv.talk("", "")
+					else
+						future_data = @cnv.talk(question, context = @users[user])
+					end
 				end
 
-	
+				code, response = future_data.getData()	
+
+				output_texts = []
 				if code == 200
 					context = response["context"]
-					@users[user] = context
-	
-					output_texts = Array.new
 					response["output"]["text"].each do | output_text |
 						output_texts.push(output_text)
 					end
 				end
 
-				return "{user: #{user}, status_code: #{code}, output: #{output_texts}}"
+
+				@mutex.synchronize do
+					if code == 200
+						@users[user] = context
+					else
+						@users.delete(user)
+					end
+				end
+
+				return {user: user, status_code: code, output: output_texts}.to_json
 			end
 		end
 		

data/lib/watson/conversation/version.rb

@@ -1,5 +1,5 @@
 module Watson
   module Conversation
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   end
 end

data/watson-conversation.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["alpha.netzilla@gmail.com"]
 
   spec.summary       = %q{Client library to use the IBM Watson Conversation service}
-  spec.description   = %q{you can create an application that understands natural-language input and uses machine learning to respond to customers in a way that simulates a conversation between humans.}
+  spec.description   = %q{Client library to use the IBM Watson Conversation service}
   spec.homepage      = "https://github.com/alpha-netzilla/watson-conversation.git"
   spec.license       = "MIT"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watson-conversation
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - alpha.netzilla
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-01 00:00:00.000000000 Z
+date: 2016-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,9 +80,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-description: you can create an application that understands natural-language input
-  and uses machine learning to respond to customers in a way that simulates a conversation
-  between humans.
+description: Client library to use the IBM Watson Conversation service
 email:
 - alpha.netzilla@gmail.com
 executables: []
@@ -99,7 +97,6 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- hoge.rb
 - lib/watson/conversation.rb
 - lib/watson/conversation/version.rb
 - watson-conversation.gemspec

data/hoge.rb

@@ -1,16 +0,0 @@
-require './lib/watson/conversation'
-
-manage = Watson::Conversation::ManageDialog.new(
-  username: "2dc1e553-7caf-42a6-9566-7b09563973b6",
-  password: "scXHOmBTv5Po",
-  workspace_id: "3efc86e6-ba1b-425a-a3f1-3dd69d4f2432"
-)
-
-p response = manage.talk("Smith", "")
-p response = manage.talk("Smith", "料金案内")
-p response = manage.talk("Smith", "当月")
-p response = manage.talk("Smith", "090-1234-1234")
-p response = manage.talk("Smith", "1234")
-p response = manage.talk("Smith2", "")
-p response = manage.talk("Smith", "はい")
-p response = manage.talk("Smith", "はい")