opener-polarity-tagger 3.1.2 → 3.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee937e14a2da85b39cc76765d221ac23f9df4d713953482cd58bee4acebd1f0d
-  data.tar.gz: d86cd682deb902951b93a3c217a9ccfff677956c39adc4b21a29597483f4b28b
+  metadata.gz: 062fd54795d572d62bb63481dbce896c918f9b9e80a55df36b5e19f2a0be97ad
+  data.tar.gz: 6a4ff6d3ef761a22d044b7301064bc7eb0e2f75df8f806d6359aa5e5a01c42f4
 SHA512:
-  metadata.gz: d400f873a98d0426b4090f4155339ab2e2bb6743218d65dde59ed40d3ae61a5f66c836fb2f4bd197058e12c1646f473bbc7fc460ba83c1accfc6b27778d2259d
-  data.tar.gz: 5957d89cce03e50eb7d554aac1c39cd06c80d9f9381142ec7e0fc40931e3910b06a7298a9c9a3f1fcac58332edca175afe7fd2e26271f60b2c672471c05f2ebd
+  metadata.gz: f40d2703af5e936a3f2c747c2fc5938606ec4a8d8d65bfc8b7bd5aeaa2836de9090912c91d7f699b978d324be921128d743bfb69367539947e3202dca50abcb7
+  data.tar.gz: 884bbe39961248e5158f0b3b4c8c84ebc46bdce1fc7292a7b27eb4737fac7497a273f3a9fa91706aa283f2a814bf88b92439df3bd2dcfb8cfe0991461061b06d

data/core/poltagger-basic-multi.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 ##############################
 #                            

data/lib/opener/polarity_tagger.rb

@@ -2,6 +2,7 @@ require 'open3'
 require 'opener/core'
 require 'nokogiri'
 require 'hashie'
+require 'active_support/all'
 
 require_relative 'polarity_tagger/version'
 require_relative 'polarity_tagger/cli'
@@ -19,8 +20,12 @@ module Opener
       @proc    = @klass.new args: @args
     end
 
-    def run input
-      @proc.run input
+    def clear_cache params = {}
+      @proc.clear_cache(**params)
+    end
+
+    def run input, params = {}
+      @proc.run input, params
     end
 
   end

data/lib/opener/polarity_tagger/external.rb

@@ -32,7 +32,7 @@ module Opener
       # @return [String]
       #
       def command
-        return "#{adjust_python_path} python -E #{kernel} #{lexicon_path} #{args.join(" ")}"
+        "#{adjust_python_path} python2 -E #{kernel} #{lexicon_path} #{args.join(" ")}"
       end
 
       ##
@@ -52,7 +52,7 @@ module Opener
       # @param [String] input The text of which to detect the language.
       # @return [Array]
       #
-      def run(input)
+      def run input, params
         stdout, stderr, process = capture(input)
 
         raise stderr unless process.success?

data/lib/opener/polarity_tagger/internal.rb

@@ -16,11 +16,16 @@ module Opener
         @ignore_pos = ignore_pos
       end
 
-      def run input
+      def clear_cache lang: nil, environment:
+      end
+
+      def run input, params = {}
         @kaf = KAF::Document.from_xml input
-        @map = @kaf.map = CACHE[@kaf.language]
 
-        negators = 0
+        @cache_keys = params[:cache_keys] ||= {}
+        @cache_keys.merge! lang: @kaf.language
+        @map = @kaf.map = CACHE[**@cache_keys].lexicons
+
         @kaf.terms.each do |t|
           lemma = t.lemma&.downcase
           pos   = if @ignore_pos then nil else t.pos end
@@ -32,7 +37,6 @@ module Opener
             attrs.polarity = lexicon.polarity
           end
           if l = @map.by_negator(lemma)
-            negators += 1
             lexicon, polarity_pos = l, nil
             attrs.sentiment_modifier = 'shifter'
           end

data/lib/opener/polarity_tagger/kaf/document.rb

@@ -26,9 +26,9 @@ module Opener
       end
 
       def add_linguistic_processor name, version, layer, timestamp: false
-        header  = @document.at('kafHeader') || @document.root.add_child('<kafHeader/>')
+        header  = @document.at('kafHeader') || @document.root.add_child('<kafHeader/>').first
         procs   = header.css('linguisticProcessors').find{ |l| l.attr(:layer) == layer }
-        procs ||= header.add_child("<linguisticProcessors layer='#{layer}'/>")
+        procs ||= header.add_child("<linguisticProcessors layer='#{layer}'/>").first
         lp      = procs.add_child('<lp/>')
         lp.attr(
           timestamp: if timestamp then Time.now.iso8601 else '*' end,

data/lib/opener/polarity_tagger/lexicon_map.rb

@@ -7,21 +7,10 @@ module Opener
       attr_reader :intensifiers
       attr_reader :with_polarity
 
-      POS_ORDER = 'NRVGAO'
-      UNKNOWN   = Hashie::Mash.new polarity: 'unknown'
-
-      def initialize lang:, lexicons:
-        @lang          = lang
-        @lexicons      = lexicons
-
-        @negators      = {}
-        @intensifiers  = {}
-        @with_polarity = {}
-        map lexicons
-      end
-
-      DEFAULT_POS = 'O'
+      UNKNOWN = Hashie::Mash.new polarity: 'unknown'
 
+      POS_ORDER     = 'NRVGAO'
+      DEFAULT_POS   = 'O'
       POS_SHORT_MAP = {
         adj:         'G',
         adv:         'A',
@@ -34,6 +23,20 @@ module Opener
         multi_word_expression: 'O',
       }
 
+      def initialize lang:, lexicons:
+        @lang          = lang
+        @lexicons      = lexicons
+
+        @negators      = {}
+        @intensifiers  = {}
+        @with_polarity = {}
+        map lexicons
+      end
+
+      def blank?
+        @lexicons.blank?
+      end
+
       def by_negator lemma
         @negators[lemma]
       end
@@ -58,6 +61,8 @@ module Opener
       protected
 
       def map lexicons
+        return if blank?
+
         lexicons.each do |l|
           next if l.lemma.nil?
 

data/lib/opener/polarity_tagger/lexicons_cache.rb

@@ -4,6 +4,8 @@ module Opener
 
       include MonitorMixin
 
+      UPDATE_INTERVAL = (ENV['CACHE_EXPIRE_MINS']&.to_i || 5).minutes
+
       def initialize
         super #MonitorMixin
 
@@ -12,28 +14,47 @@ module Opener
         @cache = {}
       end
 
-      def [] lang
+      def [] **params
         synchronize do
-          @cache[lang] ||= load_lexicons lang
+          existing = @cache[params]
+          break existing if existing and existing.from > UPDATE_INTERVAL.ago
+          @cache[params] = cache_update existing, **params
         end
       end
       alias_method :get, :[]
 
-      def load_lexicons lang
-        lexicons = if @url then load_from_url lang else load_from_path lang end
+      def cache_update existing = nil, **params
+        from     = Time.now
+        lexicons = load_lexicons cache: existing, **params
+
+        if existing and lexicons.blank?
+          existing.from = from
+          return existing
+        end
+
+        Hashie::Mash.new(
+          lexicons: lexicons,
+          from:     from,
+        )
+      end
+
+      def load_lexicons lang:, **params
+        lexicons = if @url then load_from_url lang: lang, **params else load_from_path lang: lang, **params end
 
         LexiconMap.new lang: lang, lexicons: lexicons
       end
 
-      def load_from_url lang
-        url      = "#{@url}&language_code=#{lang}"
+      def load_from_url lang:, cache:, **params
+        url  = "#{@url}&language_code=#{lang}&#{params.to_query}"
+        url += "&if_updated_since=#{cache.from.utc.iso8601}" if cache
         puts "#{lang}: loading lexicons from url #{url}"
-        lexicons = JSON.parse HTTPClient.new.get(url).body
+
+        lexicons = JSON.parse http.get(url).body
         lexicons = lexicons['data'].map{ |l| Hashie::Mash.new l }
         lexicons
       end
 
-      def load_from_path lang
+      def load_from_path lang:, **params
         @path  ||= 'core/general-lexicons'
         dir      = "#{@path}/#{lang.upcase}-lexicon"
         config   = Nokogiri::XML File.read "#{dir}/config.xml"
@@ -64,6 +85,16 @@ module Opener
         lexicons
       end
 
+      def http
+        return @http if @http
+
+        @http = HTTPClient.new
+        @http.send_timeout    = 120
+        @http.receive_timeout = 120
+        @http.connect_timeout = 120
+        @http
+      end
+
     end
   end
 end

data/lib/opener/polarity_tagger/version.rb

@@ -1,7 +1,7 @@
 module Opener
   class PolarityTagger
 
-    VERSION = '3.1.2'
+    VERSION = '3.2.4'
 
   end
 end

data/opener-polarity-tagger.gemspec

@@ -33,6 +33,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'opener-webservice', '~> 2.1'
   gem.add_dependency 'opener-core', '~> 2.2'
 
+  gem.add_dependency 'activesupport'
   gem.add_dependency 'hashie'
   gem.add_dependency 'rake'
   gem.add_dependency 'nokogiri'

data/task/requirements.rake

@@ -2,6 +2,6 @@ desc 'Verifies the requirements'
 task :requirements do
   require 'cliver'
 
-  Cliver.detect!('python', '~> 2.6')
-  Cliver.detect!('pip', '>= 1.3')
+  Cliver.detect! 'python2', '~> 2.6'
+  Cliver.detect! 'pip2', '>= 1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opener-polarity-tagger
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.2.4
 platform: ruby
 authors:
 - development@olery.com
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-23 00:00:00.000000000 Z
+date: 2020-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opener-daemons
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  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: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -167,10 +181,10 @@ dependencies:
 description: Polarity tagger for various languages.
 email:
 executables:
-- polarity-tagger
-- polarity-tagger-daemon
 - polarity-tagger-server
 - console
+- polarity-tagger
+- polarity-tagger-daemon
 extensions:
 - ext/hack/Rakefile
 extra_rdoc_files: []