opener-chained-daemon 3.3.1 → 3.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79cb9c8054d212f2c89a21080c690e644b40a22a3e05faa51db78dfdae187fd8
-  data.tar.gz: b21914d6cbee14b48f15f94c623014bdfee4ddf22a35eb96059e72c1a8cf6b9f
+  metadata.gz: adaeee08b8374c1047c08bed61dc5159ff18178d6f12ccac8715aea05a27019b
+  data.tar.gz: 78e762ec93e9aa6fd19a617690daa19676753d0249727e56b88f299ca60ae2e9
 SHA512:
-  metadata.gz: ba7d21f0ec57b3207da58a7c2b153df79f3d797012fb5e934d82a90ba9cca8ea67a254a009d112572b810ef454bfbc8f5bb07376d2ac3941037c4c97c7bbcd2f
-  data.tar.gz: a17df2a6081b365381d099a75f70e0ac432236082245324922aa822e47d63f5eb1b53845b688bfef4fcec263da8901e9f14e23f0b39bea1af48183d4d2955574
+  metadata.gz: fc2f6223c49f7b4aa78bb4dc1a82f569443c579e3888339067b9faef568c45cfe43854829c0e6256b091fa4b2c6ca2509f8679659f09e66bb5f2614cd521bb91
+  data.tar.gz: cc60b5c3d37a621ebd41608751c2f569aa26af3e36fc1f5a5134168b66bcaf7efb6c0868110e5d69b1a9ae8a50a4b53fb08a3015806fcbf4452eefb19f1f68bb

data/lib/opener/chained_daemon.rb

@@ -12,12 +12,10 @@ require_relative 'sym_mash'
 
 require_relative 'chained_daemon/languages_cache'
 require 'opener/language_identifier'
-require 'opener/tokenizer'
-require 'opener/pos_tagger' if RUBY_ENGINE == 'jruby'
 require 'opener/polarity_tagger'
 require 'opener/property_tagger'
 require 'opener/opinion_detector_basic'
-require 'opener/stanza/tokenizer_pos'
+require 'opener/stanza/processor'
 
 require_relative 'chained_daemon/chained_daemon'
 require_relative 'chained_daemon/cli'

data/lib/opener/chained_daemon/chained_daemon.rb

@@ -1,6 +1,12 @@
 module Opener
   class ChainedDaemon
 
+    class_attribute :http
+    self.http = HTTPClient.new
+    self.http.send_timeout    = 600
+    self.http.receive_timeout = 600
+    self.http.connect_timeout = 600
+
     DEFAULT_OPTIONS = {
     }
 
@@ -8,9 +14,7 @@ module Opener
       @options   = DEFAULT_OPTIONS.merge options
       @queue_map = {
         'opener-language-identifier':    Opener::LanguageIdentifier.new,
-        'stanza-tokenizer-pos':          Stanza::TokenizerPos.new, # replace this tokenizer-pos with both below with you dont have a stanza server
-        #'opener-tokenizer':              Opener::Tokenizer.new,
-        #'opener-pos-tagger':             Opener::POSTagger.new,
+        'stanza-processor':              Stanza::Processor.new,
         'opener-property-tagger':        Opener::PropertyTagger.new,
         'opener-polarity-tagger':        Opener::PolarityTagger.new,
         'opener-opinion-detector-basic': Opener::OpinionDetectorBasic.new,
@@ -24,6 +28,7 @@ module Opener
       if params.filter_vertical and params.property_type.present?
         params.cache_keys.property_type = params.property_type
       end
+      params.cache_keys.environment ||= 'production'
 
       lang     = nil
       output   = nil
@@ -49,7 +54,7 @@ module Opener
         output = xml.to_s
       end
 
-      output = pretty_print output if params.cache_keys&.environment == 'staging'
+      output = pretty_print output if params.cache_keys.environment == 'staging'
       output
 
     rescue Core::UnsupportedLanguageError

data/lib/opener/chained_daemon/cli.rb

@@ -48,10 +48,18 @@ Example:
             daemon = ChainedDaemon.new args: args
             input  = STDIN.tty? ? nil : STDIN.read
             params = if ENV['PARAMS'] then JSON.parse ENV['PARAMS'] else {} end
+
             # Set environment as staging from console for testing purposes
-            params[:cache_keys] = { environment: 'staging', merged: true }
+            env = ENV['LEXICONS_ENV'] || 'staging'
+            pt  = ENV['LEXICONS_PROPERTY_TYPE']
+            params[:cache_keys] = {
+              environment:   env,
+              property_type: pt,
+              merged:        (true if env == 'staging'),
+            }
 
-            puts daemon.run input, params || {}
+            output = daemon.run input, params
+            puts output
           end
         end
       end

data/lib/opener/chained_daemon/languages_cache.rb

@@ -19,25 +19,15 @@ module Opener
           break @cache if @last_updated and @last_updated > UPDATE_INTERVAL.ago
           cache_update
         end
-        @cache
       end
 
       def cache_update
         puts "loading supported languages from url #{@url}" if ENV['DEBUG']
 
-        languages     = JSON.parse http.get(@url).body
-        @cache        = languages['data'].map { |l| l['code'] }
+        languages     = SymMash.new JSON.parse ChainedDaemon.http.get(@url).body
         @last_updated = Time.now
-      end
-
-      def http
-        return @http if @http
-
-        @http = HTTPClient.new
-        @http.send_timeout    = 120
-        @http.receive_timeout = 120
-        @http.connect_timeout = 120
-        @http
+        @cache        = languages.data.each.with_object({}){ |l,h| h[l.code] = l }
+        @cache
       end
 
     end

data/lib/opener/chained_daemon/version.rb

@@ -1,7 +1,7 @@
 module Opener
   class ChainedDaemon
 
-    VERSION = '3.3.1'
+    VERSION = '3.3.6'
 
   end
 end

data/lib/opener/kaf/document.rb

@@ -48,13 +48,14 @@ module Opener
 
       def add_word_form params
         text = @document.at('text') || @document.root.add_child('<text/>').first
-        wf   = text.add_child("<wf>#{params[:text]}</wf>")
+        wf   = text.add_child("<wf>#{params.text}</wf>")
         attrs = {
-          wid:    "w#{params[:wid]}",
-          sent:   params[:sid],
-          para:   params[:para],
-          offset: params[:offset],
-          length: params[:length],
+          wid:    "w#{params.wid}",
+          sent:   params.sid,
+          para:   params.para,
+          offset: params.offset,
+          length: params.length,
+          head:   params.head,
         }
         wf.attr attrs
       end
@@ -63,15 +64,16 @@ module Opener
         text  = @document.at('terms') || @document.root.add_child('<terms/>').first
         term  = text.add_child("<term/>")
         attrs = {
-          tid:        "t#{params[:tid]}",
-          type:       params[:type],
-          lemma:      params[:lemma],
-          text:       params[:text],
-          pos:        params[:pos],
-          morphofeat: params[:morphofeat],
+          tid:        "t#{params.tid}",
+          type:       params.type,
+          lemma:      params.lemma,
+          text:       params.text,
+          pos:        params.pos,
+          morphofeat: params.morphofeat,
+          head:       params.head,
         }
         term.attr attrs
-        term.first.add_child("<span><target id='w#{params[:wid]}' /></span>")
+        term.first.add_child("<span><target id='w#{params.wid}'/></span>")
       end
 
       def to_xml

data/lib/opener/kaf/text.rb

@@ -1,6 +1,7 @@
 module Opener
   module KAF
     class WordForm
+
       def initialize(document, xml_node)
         @document = document
         @xml_node = xml_node
@@ -25,6 +26,7 @@ module Opener
       def paragraph
         return @paragraph ||= @xml_node.attr('para').to_i
       end
+
     end
   end
 end

data/lib/opener/stanza/{tokenizer_pos.rb → processor.rb}

@@ -1,6 +1,6 @@
 module Opener
   module Stanza
-    class TokenizerPos
+    class Processor
 
       DESC            = 'Tokenizer / POS by Stanza'
       VERSION         = '1.0'
@@ -8,8 +8,10 @@ module Opener
       BASE_URL        = ENV['STANZA_SERVER']
       LANGUAGES_CACHE = Opener::ChainedDaemon::LanguagesCache.new
 
-      RTL_LANGUAGES   = [ "ar", "ara", "arc", "ae", "ave", "egy", "he", "heb", "nqo", "pal", "phn", "sam",
-                          "syc", "syr", "fa", "per", "fas", "ku", "kur", "ur", "urd" ]
+      RTL_LANGUAGES   = %w[
+        ar ara arc ae ave egy he heb nqo pal phn sam
+        syc syr fa per fas ku kur ur urd
+      ]
 
       POS             = {
         'DET'   => 'D',
@@ -37,63 +39,68 @@ module Opener
         raise 'missing Stanza server' if ENV['STANZA_SERVER'].blank?
 
         kaf      = KAF::Document.from_xml input
-
-        prod     = params[:cache_keys][:environment] == 'production'
-        if prod and !LANGUAGES_CACHE.get.include?(kaf.language)
+        lang     = LANGUAGES_CACHE.get[kaf.language]
+        env      = params.cache_keys.environment
+        unless lang&.environments&.include? env or (params.cache_keys.merged and lang&.environments&.include? 'production')
+          raise Core::UnsupportedLanguageError.new kaf.language
+        end
+        if env == 'production' and !lang.supported_by_opener
           raise Core::UnsupportedLanguageError.new kaf.language
         end
 
-        input    = kaf.raw
-        input    = input.gsub(/\,[^\ ]/, ', ')
-        response = Faraday.post BASE_URL, {lang: kaf.language, input: input}.to_query
+        input     = kaf.raw
+        input     = input.gsub(/\,[^\ ]/, ', ')
+        response  = ChainedDaemon.http.post BASE_URL, {lang: kaf.language, input: input}.to_query
         raise Core::UnsupportedLanguageError, kaf.language if response.status == 406
         raise response.body if response.status >= 400
-        tokens   = JSON.parse response.body
+        sentences = JSON.parse response.body
+        sentences.each{ |s| s.map!{ |t| Hashie::Mash.new t } }
 
         w_index = 0
 
         miscs = {}
-        tokens.each_with_index do |t, i|
+        sentences.each.with_index do |s, i|
           miscs[i] = {}
-          t.each do |word|
-            word['id'].is_a?(Array) && word['id'].each { |id| miscs[i][id] = word['misc'] }
+          s.each do |word|
+            word.id.is_a?(Array) && word.id.each{ |id| miscs[i][id] = word.misc }
           end
         end
 
-        tokens.map{ |t| t.reverse! } if RTL_LANGUAGES.include? kaf.language
-        tokens.each_with_index do |sentence, s_index|
-          sentence.each_with_index do |word|
+        sentences.map{ |s| s.reverse! } if RTL_LANGUAGES.include? kaf.language
+        sentences.each.with_index do |s, s_index|
+          s.each do |word|
             w_index += 1
             # save misc for later usase in a MWT case
-            next if word['id'].is_a? Array
+            next if word.id.is_a? Array
 
-            misc = word['misc'] || miscs[s_index][word['id']]
+            misc = word.misc || miscs[s_index][word.id]
 
-            Rollbar.scoped({ input: input, params: params, tokens: tokens, word: word }) do
+            Rollbar.scoped({ input: input, params: params, sentences: sentences, word: word }) do
               raise 'Missing misc'
             end if misc.nil?
 
             offset = misc.match(/start_char=(\d+)|/)[1].to_i
             length = misc.match(/end_char=(\d+)/)[1].to_i - offset
 
-            u_pos  = word['upos']
+            u_pos  = word.upos
             pos    = POS[u_pos]
             raise "Didn't find a map for #{u_pos}" if pos.nil?
             type   = if POS_OPEN.include? pos then 'open' else 'close' end
 
-            params = {
+            params = Hashie::Mash.new(
               wid:        w_index,
               sid:        s_index + 1,
               tid:        w_index,
               para:       1,
               offset:     offset,
               length:     length,
-              text:       word['text'],
-              lemma:      word['lemma'],
+              text:       word.text,
+              lemma:      word.lemma,
               morphofeat: u_pos,
               pos:        pos,
               type:       type,
-            }
+              head:       word.head,
+            )
 
             kaf.add_word_form params
             kaf.add_term params

data/opener-chained-daemon.gemspec

@@ -28,7 +28,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'roda'
   spec.add_dependency 'rack-timeout'
-  spec.add_dependency 'faraday'
   spec.add_dependency 'opener-daemons', '~> 2.7.2'
   spec.add_dependency 'opener-callback-handler', '~> 1.0'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opener-chained-daemon
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.6
 platform: ruby
 authors:
 - development@olery.com
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-04 00:00:00.000000000 Z
+date: 2021-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -94,20 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: opener-daemons
   requirement: !ruby/object:Gem::Requirement
@@ -330,7 +316,7 @@ files:
 - lib/opener/kaf/document.rb
 - lib/opener/kaf/term.rb
 - lib/opener/kaf/text.rb
-- lib/opener/stanza/tokenizer_pos.rb
+- lib/opener/stanza/processor.rb
 - lib/opener/sym_mash.rb
 - opener-chained-daemon.gemspec
 homepage: