opener-chained-daemon 3.1.1 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cda918cea3b32b5594da20fa7cd5bdb413ff348334cc25eb15b6ab20dbf4b216
-  data.tar.gz: 674c6ac04294fee2c944f8e25ac9387499f84a5943badc2eb9958ce2a7fa8a33
+  metadata.gz: ccbd3019511ea9dd574ac013aeadb58f5c480e5a71a641320b047f6220c5288a
+  data.tar.gz: 5dfa19e0fc0d176bd9bfe5cdbc04740ebf1ee2c15165f99454552d6686f751fe
 SHA512:
-  metadata.gz: 1feb41b8c8a9b8a9c2f18cc9eadedbb5ba81f1a23c6585f75c948f7a1f9b1cd56d34b812190a6cd07ef7dd747b5bf3dc8cd3e51f17c0ecc23e850dc7202bd3e4
-  data.tar.gz: 4f0bc3aa4a330906ccd547dc5ae434c6f7da9fdba6300ef553869e931dbf5ffe4d89ef75d5d359329ac1a3a82b91b9bcf740fff29413250273a57ff53f4329b5
+  metadata.gz: 3d2b23910cdb755ac043ea9143716a18fa305f7dfcb381914dc8387fd94ce72de7bf4a6bca163280c5b2ef14298191aa21604ae0fca01a7e5f77153c0cf63fa6
+  data.tar.gz: 8c56eb7b23ad95e7d6a50f059154f870fd3b6cd16a3f4ffa2532ea5898e2ff52f903b71138eba3e06e679ce77a03c03972bb1df1cb5238305ddff764d4918274

data/lib/opener/chained_daemon.rb

@@ -8,6 +8,8 @@ require 'rexml/formatters/pretty'
 
 require 'opener/daemons'
 
+require_relative 'sym_mash'
+
 require_relative 'chained_daemon/languages_cache'
 require 'opener/language_identifier'
 require 'opener/tokenizer'

data/lib/opener/chained_daemon/chained_daemon.rb

@@ -11,17 +11,19 @@ module Opener
         '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,
-        'opener-polarity-tagger':        Opener::PolarityTagger.new,
         'opener-property-tagger':        Opener::PropertyTagger.new,
+        'opener-polarity-tagger':        Opener::PolarityTagger.new,
         'opener-opinion-detector-basic': Opener::OpinionDetectorBasic.new,
       }
     end
 
-    def run input, params = {}
-      params ||= {}
-      params.deep_symbolize_keys!
-      params[:translate_languages] ||= []
-      params[:cache_keys] = params[:cache_keys]&.sort&.to_h || {}
+    def run input, _params = {}
+      params = SymMash.new _params
+      params.translate_languages ||= []
+      params.cache_keys = SymMash.new params.cache_keys&.to_h&.sort&.to_h || {}
+      if params.filter_vertical and params.property_type.present?
+        params.cache_keys.property_type = params.property_type
+      end
 
       lang     = nil
       output   = nil
@@ -34,7 +36,7 @@ module Opener
       rescue Core::UnsupportedLanguageError
         xml  = Nokogiri.parse input
         lang = xml.root.attr('xml:lang')
-        raise unless lang.in? params[:translate_languages]
+        raise unless lang.in? params.translate_languages
 
         input = translate xml, params
         retry
@@ -47,7 +49,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
@@ -84,7 +86,7 @@ module Opener
     protected
 
     def translate_service params
-      params[:translate_service]&.to_sym || :google
+      params.translate_service&.to_sym || :google
     end
 
     def google_translator

data/lib/opener/chained_daemon/cli.rb

@@ -47,12 +47,7 @@ Example:
           run do |opts, args|
             daemon = ChainedDaemon.new args: args
             input  = STDIN.tty? ? nil : STDIN.read
-
-            params = if ENV['PARAMS']
-                       JSON.parse ENV['PARAMS']
-                     else
-                       {}
-                     end
+            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 }
 

data/lib/opener/chained_daemon/version.rb

@@ -1,7 +1,7 @@
 module Opener
   class ChainedDaemon
 
-    VERSION = '3.1.1'
+    VERSION = '3.2.0'
 
   end
 end

data/lib/opener/stanza/tokenizer_pos.rb

@@ -43,33 +43,42 @@ module Opener
           raise Core::UnsupportedLanguageError.new kaf.language
         end
 
-        response = Faraday.post BASE_URL, {lang: kaf.language, input: kaf.raw}.to_query
+        input    = kaf.raw
+        input    = input.gsub(/\,[^\ ]/, ', ')
+        response = Faraday.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
 
         w_index = 0
 
+        miscs = {}
+        tokens.each_with_index do |t, i|
+          miscs[i] = {}
+          t.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|
-          miscs = {}
           sentence.each_with_index do |word|
             w_index += 1
             # save misc for later usase in a MWT case
-            if word['id'].is_a? Array
-              miscs['id'].each { |id| miscs[id] = word['misc'] }
-              next
-            end
-            misc = word['misc'] || miscs[word['id']]
+            next if word['id'].is_a? Array
+
+            misc = word['misc'] || miscs[s_index][word['id']]
+
+            Rollbar.scoped({ input: input, params: params, tokens: tokens, 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']
             pos    = POS[u_pos]
-            Rollbar.scoped({ input: input, params: params, tokens: tokens }) do
-              raise "Didn't find a map for #{u_pos}"
-            end if pos.nil?
+            raise "Didn't find a map for #{u_pos}" if pos.nil?
             type   = if POS_OPEN.include? pos then 'open' else 'close' end
 
             params = {

data/lib/opener/sym_mash.rb

@@ -0,0 +1,14 @@
+class SymMash < ::Hashie::Mash
+
+  disable_warnings
+
+  include Hashie::Extensions::Mash::SymbolizeKeys
+
+  def inspect
+    map do |k,v|
+      v = "{#{v.inspect}}" if v.is_a? SymMash
+      "#{k}=#{v}"
+    end.join ' '
+  end
+
+end

data/opener-chained-daemon.gemspec

@@ -35,8 +35,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'opener-language-identifier', '>= 4.4.0'
   spec.add_dependency 'opener-tokenizer',  '>= 2.2.0'
   spec.add_dependency 'opener-pos-tagger', '>= 3.2.0'
-  spec.add_dependency 'opener-polarity-tagger', '>= 3.2.7'
-  spec.add_dependency 'opener-property-tagger', '>= 3.3.5'
+  spec.add_dependency 'opener-property-tagger', '>= 3.3.6'
+  spec.add_dependency 'opener-polarity-tagger', '>= 3.3.0'
   spec.add_dependency 'opener-opinion-detector-basic', '>= 3.2.3'
 
   spec.add_development_dependency 'bundler', '~> 1.3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opener-chained-daemon
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.2.0
 platform: ruby
 authors:
 - development@olery.com
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-16 00:00:00.000000000 Z
+date: 2021-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -179,33 +179,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
-  name: opener-polarity-tagger
+  name: opener-property-tagger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.7
+        version: 3.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.7
+        version: 3.3.6
 - !ruby/object:Gem::Dependency
-  name: opener-property-tagger
+  name: opener-polarity-tagger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.5
+        version: 3.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.5
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: opener-opinion-detector-basic
   requirement: !ruby/object:Gem::Requirement
@@ -308,9 +308,9 @@ description: OpeNER daemon for processing multiple queues at once
 email:
 executables:
 - chained-daemon
-- chained-daemon-daemon
 - chained-daemon-csv
 - console
+- chained-daemon-daemon
 extensions: []
 extra_rdoc_files: []
 files:
@@ -331,6 +331,7 @@ files:
 - lib/opener/kaf/term.rb
 - lib/opener/kaf/text.rb
 - lib/opener/stanza/tokenizer_pos.rb
+- lib/opener/sym_mash.rb
 - opener-chained-daemon.gemspec
 homepage:
 licenses:
@@ -352,7 +353,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.7.6.2
+rubygems_version: 2.7.8
 signing_key:
 specification_version: 4
 summary: OpeNER daemon for processing multiple queues at once