ajax-cat 1.0.0 → 2.0.1

data/Gemfile

@@ -11,7 +11,8 @@ gem 'colorize', "~> 0.5.8"
 gem "thin", "~> 1.3.1"
 gem "thor", "~> 0.15.2"
 gem "sqlite3", "~> 1.3.3"
-gem "activerecord"
+gem "activerecord", ">= 3.2.3"
+gem "activesupport", ">= 3.2.3"
 
 group :development do
   gem "rdoc", "~> 3.12"

data/Gemfile.lock

@@ -25,8 +25,8 @@ GEM
       git (>= 1.2.5)
       rake
       rdoc
-    json (1.6.6)
-    multi_json (1.3.5)
+    json (1.7.3)
+    multi_json (1.3.6)
     rack (1.4.1)
     rack-protection (1.2.0)
       rack
@@ -55,7 +55,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord
+  activerecord (>= 3.2.3)
+  activesupport (>= 3.2.3)
   bundler (~> 1.0.0)
   colorize (~> 0.5.8)
   curb (~> 0.8.0)

data/README.rdoc

@@ -5,7 +5,7 @@ Ajax-cat is a web server for computer-aided translation build around Moses SMT s
 == Installation
 * Requirements: Moses, Ruby (version at least 1.9), SQLite
 * Then simply <code>gem install ajax-cat</code>
-* Generate sample ini file with <code>ajax-cat exmple</code>
+* Generate sample ini file with <code>ajax-cat example</code>
 * Change path in moses in your <code>ajax-cat.ini.json</code> file
 * Run server with <code>ajax-cat start</code>
 

data/VERSION

@@ -1 +1 @@
-1.0.0
+2.0.1

data/ajax-cat.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ajax-cat"
-  s.version = "1.0.0"
+  s.version = "2.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ondrej Odchazel"]
-  s.date = "2012-05-22"
+  s.date = "2012-08-22"
   s.description = "computer-aided translation backed by machine translation"
   s.email = "odchazel@gmail.com"
   s.executables = ["ajax-cat"]
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "ajax-cat.gemspec",
+    "ajax-cat_old.ini.json",
     "bin/ajax-cat",
     "lib/.DS_Store",
     "lib/ajax-cat.rb",
@@ -43,6 +44,7 @@ Gem::Specification.new do |s|
     "lib/ajax-cat/public/ajax-cat.js",
     "lib/ajax-cat/public/bootstrap.css",
     "lib/ajax-cat/public/bootstrap.js",
+    "lib/ajax-cat/public/cookie.js",
     "lib/ajax-cat/public/index.html",
     "lib/ajax-cat/public/index.js",
     "lib/ajax-cat/public/jquery.js",
@@ -89,7 +91,8 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<thin>, ["~> 1.3.1"])
       s.add_runtime_dependency(%q<thor>, ["~> 0.15.2"])
       s.add_runtime_dependency(%q<sqlite3>, ["~> 1.3.3"])
-      s.add_runtime_dependency(%q<activerecord>, [">= 0"])
+      s.add_runtime_dependency(%q<activerecord>, [">= 3.2.3"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 3.2.3"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
@@ -101,7 +104,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<thin>, ["~> 1.3.1"])
       s.add_dependency(%q<thor>, ["~> 0.15.2"])
       s.add_dependency(%q<sqlite3>, ["~> 1.3.3"])
-      s.add_dependency(%q<activerecord>, [">= 0"])
+      s.add_dependency(%q<activerecord>, [">= 3.2.3"])
+      s.add_dependency(%q<activesupport>, [">= 3.2.3"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
@@ -114,7 +118,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<thin>, ["~> 1.3.1"])
     s.add_dependency(%q<thor>, ["~> 0.15.2"])
     s.add_dependency(%q<sqlite3>, ["~> 1.3.3"])
-    s.add_dependency(%q<activerecord>, [">= 0"])
+    s.add_dependency(%q<activerecord>, [">= 3.2.3"])
+    s.add_dependency(%q<activesupport>, [">= 3.2.3"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.3"])

data/ajax-cat_old.ini.json

@@ -0,0 +1,15 @@
+{
+  "port": 8585,
+  "pairs": [
+    {
+      "name": "de-en",
+      "moses_path": "moses",
+      "moses_ini_path": "/Users/ondrejodchazel/projects/ajax-cat/ajax-cat-new/lib/../test/fixtures/moses.ini"
+    },
+    {
+      "name": "en-cs",
+      "moses_path": "moses",
+      "moses_ini_path": "/Users/ondrejodchazel/projects/ajax-cat/models/en-cs/moses.ini"
+    }
+  ]
+}

data/lib/ajax-cat.rb

@@ -1,3 +1,5 @@
+#ssh -L 8888:10.10.24.118:80 odchazel@ufallab.ms.mff.cuni.cz
+
 require 'sinatra/base'
 require 'thin'
 require 'json'
@@ -123,3 +125,6 @@ module AjaxCat
 
 end
 
+#AjaxCat::Runner.new(8585)
+
+

data/lib/ajax-cat/ajax_cat_server.rb

@@ -43,11 +43,29 @@ module AjaxCat
 		end
 
 		post '/admin/add_task' do
-			Task.new(pair: params[:pair], sentence: params[:sentence]).save
+			task = Task.new(pair: params[:pair], name: params[:name])
+			task.save
+			params[:users].to_i.times do |i|
+				puts "USER #{i}"
+				options = []
+				params[:sentences].length.times do |j|
+					if j % 2 == i % 2
+						type = 'a'
+					else
+						type = 'b'
+					end
+					sentence_options = {}
+					sentence_options["type"] = type
+					sentence_options["suggestion"] = (params["suggestion-#{type}"] == "on")
+					options.push(sentence_options)
+				end
+				Log.new(task_id: task.id, options: options.to_json, sentences: params[:sentences].to_json).save
+			end
 			redirect '/admin'
 		end
 
 		post '/admin/remove_task' do
+			Log.where(task_id: params[:id]).delete_all
 			Task.find(params[:id]).destroy
 			redirect '/admin'
 		end
@@ -58,28 +76,33 @@ module AjaxCat
 
 			tasks = Task.where(pair: pair)
       tasks = tasks.map {|el| el.id}
-      completed = Log.where(email: email)
-      completed = completed.map {|el| el.task_id}
 
-      pool = tasks - completed
+      free_task_ids = Log.where(email: nil).map {|el| el.task_id}
 
-      #puts "tasks: #{tasks.inspect}, completed: #{completed.inspect}, pool: #{pool.inspect}"
+      completed = Log.where(email: email)
+      completed = completed.map {|el| el.task_id}
 
-			@task = Task.find(pool.first)
-			{
-				task_id: @task.id,
-				pair: @task.pair,
-				sentence: @task.sentence,
-				email: email
-			}.to_json
+      pool = (tasks | free_task_ids) - completed
+
+      puts email
+      puts "t: #{tasks.inspect}, f: #{free_task_ids.inspect}, c: #{completed.inspect}, p: #{pool.inspect}"
+
+				@task = Log.where(task_id: pool.first).first
+				@task.email = email
+				@task.save
+				ret = {
+					task_id: @task.id,
+					pair: @task.task.pair,
+					sentences: @task.sentences,
+					options: @task.options,
+					email: email
+				}.to_json
+			ret
 		end
 
 		post '/admin/save_experiment' do
+			@log = Log.find(params[:log_id])
 			data = JSON.parse(params[:log])
-			@task = Task.find(data["task_id"])
-			@log = Log.new()
-			@log.task_id = @task.id
-			@log.email = data["email"]
 			@log.time = Time.now
 			@log.log = data.to_json
 			@log.save

data/lib/ajax-cat/pairs.rb

@@ -14,7 +14,7 @@ module AjaxCat
          create table tasks (
             id integer primary key,
             pair varchar (30),
-            sentence text
+            name varchar (30)
           )
         SQL
         )
@@ -25,6 +25,8 @@ module AjaxCat
             task_id integer,
             email varchar (60),
             time current_timestamp,
+            sentences text,
+            options text,
             log text
           )
         SQL

data/lib/ajax-cat/public/AjaxCatList.coffee

@@ -28,19 +28,22 @@ class AjaxCatList
     unless filter.test(email)
       alert "Write your email, please."
       return
+    $.cookie("email", email)
     $.ajax "/admin/get_experiment"
       data:
         email: email
         pair: pair
       success: (data) =>
         data = JSON.parse(data)
-        id = @add_translation(data.sentence, "EXPERIMENT ##{data.task_id}, #{data.email}", data.pair, data.task_id, data.email)
+        id = @add_translation(JSON.parse(data.sentences), "EXPERIMENT ##{data.task_id}, #{data.email}", data.pair, data.task_id, data.email, data)
+        #return
         window.location = "/translation.html##{id}"
       error: =>
         alert "Could not find experiment for you."
 
   new_experiment_translation: =>
     $("#new-experiment-pair").html("")
+    $("#new-experiment-email").val($.cookie("email"))
     $.ajax "/api/info"
       success: (data) =>
         data = JSON.parse(data)
@@ -93,7 +96,7 @@ class AjaxCatList
     $('#new-translation-modal').modal('hide')
     @show_translations()
 
-  add_translation: (text, name, pair, task_id = false, email = false) =>
+  add_translation: (text, name, pair, task_id = false, email = false, experiment_data) =>
     if localStorage['ac-data']
       docs = JSON.parse(localStorage['ac-data'])
     else
@@ -104,7 +107,12 @@ class AjaxCatList
     doc.pair = pair
     doc.email = email
     doc.task_id = task_id
-    doc.source = Utils.split_source(text)
+    #is experiment
+    if jQuery.isArray(text)
+      doc.source = text
+      doc.options = JSON.parse(experiment_data.options)
+    else
+      doc.source = Utils.split_source(text)
     doc.target = new Array(doc.source.length)
     docs.push(doc.id)
     localStorage.setItem('ac-data', JSON.stringify(docs))

data/lib/ajax-cat/public/AjaxCatTranslation.coffee

@@ -1,6 +1,8 @@
 class AjaxCatTranslation
 
   cur_position: false
+  experiment: false
+  param_suggestion: true
 
   constructor: ->
     @now = Date.now()
@@ -46,22 +48,34 @@ class AjaxCatTranslation
     $("#time").html(t)
     setTimeout(@time, 10)
 
+  change_experiment_sentence: =>
+    if @cur_position + 1 < @doc.source.length
+      @change_position(@cur_position + 1)
+    else
+      $("#send-experiment").hide()
+      $.ajax "/admin/save_experiment"
+        data:
+          "log_id": @doc.task_id
+          log: JSON.stringify(@doc)
+        type: "post"
+        success: =>
+          alert "Experiment saved."
+          window.location = "/"
+        error: =>
+          alert "Could not save experiment."
+
+
   prepare_test: =>
     AjaxCatList.delete_document(@hash)
+    @experiment = true
     $("#save").hide()
+    $("#experiment-settings").show()
+    $("#top-translations").hide()
+    $("#bottom-translations").hide()
     $("#send-experiment").show()
     $("#send-experiment").click(
       =>
-        $("#send-experiment").hide()
-        $.ajax "/admin/save_experiment"
-          data:
-            log: JSON.stringify(@doc)
-          type: "post"
-          success: =>
-            alert "Experiment saved."
-            window.location = "/"
-          error: =>
-            alert "Could not save experiment."
+        @change_experiment_sentence()
     )
     @doc.log = []
     @time()
@@ -76,7 +90,9 @@ class AjaxCatTranslation
     )
     new_log.type = type if type
     new_log.param = param if param
-    @doc.log.push(new_log)
+    if @doc.log[@cur_position] == undefined
+      @doc.log[@cur_position] = []
+    @doc.log[@cur_position].push(new_log)
     $("#log").append(JSON.stringify(new_log) + "<br>")
 
 
@@ -151,13 +167,14 @@ class AjaxCatTranslation
 
 
   load_translation_table: (sentence) =>
+    @table_request.abort() if @table_request
     sentence = Utils.tokenize(sentence)
     if sentence.match(/^[\ \t]*$/)
       $("#translation-table-container").html("")
       @suggestions.clear()
       return
     $("#translation-table-container").text("")
-    $.ajax "/api/table"
+    @table_request = $.ajax "/api/table"
       data:
         pair: @pair
         q: sentence
@@ -169,6 +186,13 @@ class AjaxCatTranslation
         #alert "failed to load translation table"
 
   change_position: (position) =>
+    if @experiment
+      return if not ((position == 0 and @cur_position == false) or (@cur_position + 1 == position))
+      @param_suggestion = @doc.options[position].suggestion
+      $("#suggestion-panel-is-on").text(@param_suggestion)
+      $("#translated-status").text("translating sentence #{position + 1} out of #{@doc.source.length}")
+      $("#send-experiment").text("Finish experiment") if (position + 1) == @doc.source.length
+    @suggestions.clear()
     @save_target() if @cur_position != false
     $("#source-top").children().slice(0,position).show()
     $("#source-top").children().slice(position,@length).hide()

data/lib/ajax-cat/public/Suggestions.coffee

@@ -23,17 +23,19 @@ class Suggestions
     )
 
   clear: =>
+    @suggestion_request.abort() if @suggestion_request
     $(".ac-suggestion").text("")
     $(".ac-suggestion").removeClass('suggestion-enabled')
     $(".ac-suggestion").removeClass('suggestion-active')
 
   load_suggestions: =>
     @clear()
+    return unless @translation.param_suggestion
     sentence = $("#source-sentence").text()
     sentence = Utils.tokenize(sentence)
     translated = Utils.tokenize($("#source-target").text())
     covered = @translation.table.covered_vector()
-    $.ajax "/api/suggestion"
+    @suggestion_request = $.ajax "/api/suggestion"
       data:
         pair: @translation.pair
         q: Utils.tokenize(sentence)
@@ -48,8 +50,13 @@ class Suggestions
   take_suggestion: =>
     return if (@get_position() == false)
     text = $(".suggestion-active span").text()
+    
+    from = $(".suggestion-active").data('from')
+    to = $(".suggestion-active").data('to')
     @translation.add_words(text)
-    @translation.table.mark_words(text)
+    #alert "#{from}-#{to}"
+    @translation.table.mark_interval(from, to)
+    #@translation.table.mark_words(text)
 
 
   process_suggestions: (data) =>
@@ -57,7 +64,9 @@ class Suggestions
     for suggestion in data.suggestions
       translation = $("#target-sentence").val()
       el = $(".ac-suggestion").slice(i, (i + 1))
-      el.html("#{translation} <span>#{suggestion}</span>")
+      el.html("#{translation} <span>#{suggestion.text}</span>")
+      el.data('from', suggestion.from)
+      el.data('to', suggestion.to)
       el.addClass('suggestion-enabled')
       i += 1
 

data/lib/ajax-cat/public/TranslationTable.coffee

@@ -63,7 +63,26 @@ class TranslationTable
     return true if $("th.ac-source").slice(position, (position + 1)).hasClass('ac-selected')
     return false
 
-  mark_words: (words) =>
+  #use edit distance to mark written words
+  mark_words: (word) =>
+    word = Utils.trim word
+    best_result = 10000
+    best_element = null
+    maximal_acceptable_distance = 1
+    maximal_acceptable_distance = 0 if word.length < 5
+    maximal_acceptable_distance = 2 if word.length > 10
+    for el in $(".ac-word div")
+      element_text = Utils.trim($(el).text())
+      result = Utils.edit_distance(word, element_text)
+      if result < best_result
+        best_result = result
+        best_element = $(el)
+    if best_element != null and best_result <= maximal_acceptable_distance
+      @mark_interval(best_element.data('position-from'), best_element.data('position-to'))
+
+  #when more words, there should be fix on server side giving most likely continuation
+  mark_words_OLD: (words) =>
+    console.log "MARKING WORDS: #{words}"
     words = "#{words} "
     for el in $(".ac-word div")
       el_text = Utils.trim $(el).text()