opener-chained-daemon 3.3.3 → 3.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bdd841299458126e66df2dff1857ea3c2d2386efab9f092def36357935e2f9d
-  data.tar.gz: 140ff88d7ddd90a90bc21106bc9a0d3370802969bca20820ee04b45398e975c3
+  metadata.gz: 226ff6ff3b95a801ca07c758a8588a0cf32f97f7c9238c9e0c26cfdc1c56dee9
+  data.tar.gz: bb7f9d673851ea5c06eba8419202331b7f6f0dbf2dd87311e68147faf73a898f
 SHA512:
-  metadata.gz: 7026baaf0c0541725cb3459575bec129354bada59be1aa30174425051d26ff973f4a0359985cb58b1ad70035ba6c6c9db4409b29631cf9b1d8fbe16152a59268
-  data.tar.gz: d947f1bc75e048b56d18b5406ed455a365c406fc1b01bf6e4b6ee0ae4584f2513e45589f93d5e1486c47fe34e1305d4a0105612ec7b17dc5d75e67c0658e0d0a
+  metadata.gz: 6bb51d8f256fc0a2d4146d00f4290389ff30c8bb0ab75a0ab19acc74fd3360fda2c32f08058844ed4dcf84e430161d5394366b56c78c40343ed30cd2e819ce3a
+  data.tar.gz: 70af48950ae3906b4a8560fc6d826b595c9118fb488304e7479a434e81261d0f5f808a0ba367d243f5cf2f6b7785c642126a6c7c832846eebf039142d865b1f9

data/lib/opener/chained_daemon/chained_daemon.rb

@@ -1,6 +1,14 @@
 module Opener
   class ChainedDaemon
 
+    def self.http
+      http = HTTPClient.new
+      http.send_timeout    = 600
+      http.receive_timeout = 600
+      http.connect_timeout = 600
+      http
+    end
+
     DEFAULT_OPTIONS = {
     }
 

data/lib/opener/chained_daemon/languages_cache.rb

@@ -24,22 +24,12 @@ module Opener
       def cache_update
         puts "loading supported languages from url #{@url}" if ENV['DEBUG']
 
-        languages     = SymMash.new JSON.parse http.get(@url).body
+        languages     = SymMash.new JSON.parse ChainedDaemon.http.get(@url).body
         @last_updated = Time.now
         @cache        = languages.data.each.with_object({}){ |l,h| h[l.code] = l }
         @cache
       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/chained_daemon/version.rb

@@ -1,7 +1,7 @@
 module Opener
   class ChainedDaemon
 
-    VERSION = '3.3.3'
+    VERSION = '3.3.8'
 
   end
 end

data/lib/opener/stanza/processor.rb

@@ -41,13 +41,16 @@ module Opener
         kaf      = KAF::Document.from_xml input
         lang     = LANGUAGES_CACHE.get[kaf.language]
         env      = params.cache_keys.environment
-        unless lang&.environments&.include? env or (env == 'staging' and lang&.environments&.include? 'production')
+        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
+        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
         sentences = JSON.parse response.body

data/opener-chained-daemon.gemspec

@@ -28,15 +28,12 @@ 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'
 
   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-property-tagger', '>= 3.4.0'
-  spec.add_dependency 'opener-polarity-tagger', '>= 3.4.0'
+  spec.add_dependency 'opener-property-tagger', '>= 3.4.1'
+  spec.add_dependency 'opener-polarity-tagger', '>= 3.5.1'
   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.3.3
+  version: 3.3.8
 platform: ruby
 authors:
 - development@olery.com
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-23 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
@@ -150,62 +136,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.4.0
-- !ruby/object:Gem::Dependency
-  name: opener-tokenizer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.2.0
-- !ruby/object:Gem::Dependency
-  name: opener-pos-tagger
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: opener-property-tagger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.4.1
 - !ruby/object:Gem::Dependency
   name: opener-polarity-tagger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.5.1
 - !ruby/object:Gem::Dependency
   name: opener-opinion-detector-basic
   requirement: !ruby/object:Gem::Requirement
@@ -307,10 +265,10 @@ dependencies:
 description: OpeNER daemon for processing multiple queues at once
 email:
 executables:
-- chained-daemon-daemon
+- chained-daemon
 - chained-daemon-csv
 - console
-- chained-daemon
+- chained-daemon-daemon
 extensions: []
 extra_rdoc_files: []
 files:
@@ -353,7 +311,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