opener-polarity-tagger 3.1.3 → 3.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4362832bbbb35ee32747d662b0ed336a4999281474b7866c748f392cd7e4850
-  data.tar.gz: 6882049bcdf93c02dec34023f472691d760f6f200370ba551d59036bf3f3e26b
+  metadata.gz: 8a00842dc62bfbc1a0a931ff6a6ebfc547d7beee4ef1b6fda17d7b55448bf480
+  data.tar.gz: f3104f7ad025703773ba242e85718ae5a1a69c825884e7603ce757d22158fa7e
 SHA512:
-  metadata.gz: af13174d0deb82c077403daadb9ad046e945eae79e24f7cf2a1e50961b1e901ec94553da428057a9eeccaa2c0e5a8e007b28f685874ea21253a8e36701bb7599
-  data.tar.gz: 3cd67f602a84d8674203579dc8e4bbba271ee49a57c5a34969e0cbef4bc29f32b25393ea0a45c77cff0d518e4355196734055d3f7774140d713bf675d0486fc0
+  metadata.gz: ea222d26e37687dd4cba7b6a99990501f282650261aa61ea2d1ca9fe9d77f11331b4b2f8d9db4daa566393a6154c8ba63320373e2d62611619c81242a26a6476
+  data.tar.gz: 30fed6d4308d3ee100b017dcd8eff05a04a797bc7c553bd624400e4f8908de42624641fe15475189783033a9fe9d14505d9ce2c0716d006587d7d1deae70200b

data/core/LexiconMod.py

@@ -45,7 +45,9 @@ def load_lexicons(language, path=None):
 def show_lexicons(language, path=None):
     if path is None:
       path = __module_dir
-    lexicons, default_id, this_folder, folder_per_lang = load_lexicons(language, path)
+    #lexicons, default_id, this_folder, folder_per_lang = load_lexicons(language, path)
+    LexiconSent(language,None,path)
+
     print
     print '#'*30
     print 'Available lexicons for',language

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,18 @@ 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
+
+        raise Opener::Core::UnsupportedLanguageError, kaf.language if @map.blank?
+
         @kaf.terms.each do |t|
           lemma = t.lemma&.downcase
           pos   = if @ignore_pos then nil else t.pos end
@@ -32,7 +39,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/lexicon_map.rb

@@ -7,8 +7,21 @@ module Opener
       attr_reader :intensifiers
       attr_reader :with_polarity
 
-      POS_ORDER = 'NRVGAO'
-      UNKNOWN   = Hashie::Mash.new polarity: 'unknown'
+      UNKNOWN = Hashie::Mash.new polarity: 'unknown'
+
+      POS_ORDER     = 'NRVGAO'
+      DEFAULT_POS   = 'O'
+      POS_SHORT_MAP = {
+        adj:         'G',
+        adv:         'A',
+        noun:        'N',
+        propernoun:  'N',
+        prep:        'P',
+        verb:        'V',
+        other:       DEFAULT_POS,
+        nil =>       DEFAULT_POS,
+        multi_word_expression: DEFAULT_POS,
+      }
 
       def initialize lang:, lexicons:
         @lang          = lang
@@ -20,19 +33,9 @@ module Opener
         map lexicons
       end
 
-      DEFAULT_POS = 'O'
-
-      POS_SHORT_MAP = {
-        adj:         'G',
-        adv:         'A',
-        noun:        'N',
-        propernoun:  'N',
-        other:       'O',
-        prep:        'P',
-        verb:        'V',
-        nil =>       DEFAULT_POS,
-        multi_word_expression: 'O',
-      }
+      def blank?
+        @lexicons.blank?
+      end
 
       def by_negator lemma
         @negators[lemma]
@@ -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.3'
+    VERSION = '3.2.5'
 
   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.3
+  version: 3.2.5
 platform: ruby
 authors:
 - development@olery.com
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-23 00:00:00.000000000 Z
+date: 2020-11-04 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