adapt-charyf 0.2.6 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51a5cabed9c862b2c6e06b064f84de2bc985cd5e
-  data.tar.gz: 034a37ea4bb271a25c299100a23cb9a890073451
+  metadata.gz: 0ae0b4187634b74e19145a589d728f4dfbcff32e
+  data.tar.gz: 5aade8cc3b617e4e6943e4d718f7265b7b527d03
 SHA512:
-  metadata.gz: d6879e92a75b1c8287e62ed3d6271c61c3625eec8bcb251fb044dad8efaba76ac11dc9ae6bc23bddd332011aba64a19a54d7e4f451f832404d72f76a80b4b687
-  data.tar.gz: 7903736b38b307a33056dcf57c60934c81a1142a68daaf94c5de0982e3f0e18803a5770887a72ace3227aa9c537f15743c9e8037012c89f6111f607769b1bca7
+  metadata.gz: 2a91885e56eb0ffb1f51331c9ab66135ddba69683127d8bf55d839be9c6f3594622d2b435a1f6711048cc20a756a28477db7341db296edc278caa96e290c2a72
+  data.tar.gz: e29fab6d2614932133f5fb2d3a54ddb06e2e83c57775f7f2244c880ba5f83b555e77ae41305fbdbdf8f3c4ddec9153ae2f3a32f1c0f43957bddb7825c7958693

data/adapt-charyf.gemspec

@@ -34,6 +34,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "charyf", "~> 0.2"
   spec.add_runtime_dependency "pycall", "~> 1.0.3"
+  spec.add_runtime_dependency "i18n", "~> 0.9"
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/adapt/generators/install/install_generator.rb

@@ -0,0 +1,22 @@
+require 'charyf/utils/generator/base'
+
+module Adapt
+  module Generators
+    class InstallGenerator < Charyf::Generators::Base
+
+      source_root File.expand_path('templates', __dir__)
+
+      def initializer
+        template 'config/initializers/adapt.rb.tt'
+      end
+
+      def finalize
+        return unless behavior == :invoke
+
+        say_status 'notice', "Adapt installed" +
+            "\n\t\tDo not forget to set adapt intent processor in application configuration", :green
+      end
+
+    end
+  end
+end

data/lib/adapt/generators/install/templates/config/initializers/adapt.rb.tt

@@ -0,0 +1,2 @@
+# Alternatively set the python path in code
+# ENV['PYTHON'] = 'python3'

data/lib/adapt/helpers/en_parser.rb

@@ -0,0 +1,97 @@
+require_relative 'parser'
+
+module Adapt
+  module Helpers
+    module Parser
+      # noinspection RubyLiteralArrayInspection,RubyQuotedStringsInspection
+      # English string normalization
+      class English < Base
+
+        strategy_name :en
+
+        CONTRACTION = ["ain't", "aren't", "can't", "could've", "couldn't",
+                       "didn't", "doesn't", "don't", "gonna", "gotta",
+                       "hadn't", "hasn't", "haven't", "he'd", "he'll", "he's",
+                       "how'd", "how'll", "how's", "I'd", "I'll", "I'm",
+                       "I've", "isn't", "it'd", "it'll", "it's", "mightn't",
+                       "might've", "mustn't", "must've", "needn't", "oughtn't",
+                       "shan't", "she'd", "she'll", "she's", "shouldn't",
+                       "should've", "somebody's", "someone'd", "someone'll",
+                       "someone's", "that'll", "that's", "that'd", "there'd",
+                       "there're", "there's", "they'd", "they'll", "they're",
+                       "they've", "wasn't", "we'd", "we'll", "we're", "we've",
+                       "weren't", "what'd", "what'll", "what're", "what's",
+                       "whats",
+                       "what've", "when's", "when'd", "where'd", "where's",
+                       "where've", "who'd", "who'd've", "who'll", "who're",
+                       "who's", "who've", "why'd", "why're", "why's", "won't",
+                       "won't've", "would've", "wouldn't", "wouldn't've",
+                       "y'all", "ya'll", "you'd", "you'd've", "you'll",
+                       "y'aint", "y'ain't", "you're", "you've"].map(&:downcase).freeze
+
+        EXPANSION = ["is not", "are not", "can not", "could have",
+                     "could not", "did not", "does not", "do not",
+                     "going to", "got to", "had not", "has not",
+                     "have not", "he would", "he will", "he is", "how did",
+                     "how will", "how is", "I would", "I will", "I am",
+                     "I have", "is not", "it would", "it will", "it is",
+                     "might not", "might have", "must not", "must have",
+                     "need not", "ought not", "shall not", "she would",
+                     "she will", "she is", "should not", "should have",
+                     "somebody is", "someone would", "someone will",
+                     "someone is", "that will", "that is", "that would",
+                     "there would", "there are", "there is", "they would",
+                     "they will", "they are", "they have", "was not",
+                     "we would", "we will", "we are", "we have",
+                     "were not", "what did", "what will", "what are",
+                     "what is",
+                     "what is", "what have", "when is", "when did",
+                     "where did", "where is", "where have", "who would",
+                     "who would have", "who will", "who are", "who is",
+                     "who have", "why did", "why are", "why is",
+                     "will not", "will not have", "would have",
+                     "would not", "would not have", "you all", "you all",
+                     "you would", "you would have", "you will",
+                     "you are not", "you are not", "you are", "you have"].map(&:downcase).freeze
+
+        TEXT_NUMBERS = ["zero", "one", "two", "three", "four", "five", "six",
+                        "seven", "eight", "nine", "ten", "eleven", "twelve",
+                        "thirteen", "fourteen", "fifteen", "sixteen",
+                        "seventeen", "eighteen", "nineteen", "twenty"].map(&:downcase).freeze
+
+        ARTICLES = ["the", "a", "an"].map(&:downcase).freeze
+
+        def self.normalize(text, remove_articles: true)
+          words = text.split
+
+          normalized = ''
+
+          words.each do |word|
+            next if word.empty?
+            next if remove_articles && ARTICLES.include?(word.downcase)
+
+            # Expand common contractions, e.g. "isn't" -> "is not"
+            if CONTRACTION.include?(word.downcase)
+              capitalize = false
+              if word[0] == word[0].upcase
+                capitalize = true
+              end
+              word = EXPANSION[CONTRACTION.index(word.downcase)]
+
+              word.capitalize! if capitalize
+            end
+
+            if TEXT_NUMBERS.include?(word.downcase)
+              word = TEXT_NUMBERS.index(word.downcase)
+            end
+
+            normalized += " " + word
+          end
+
+          normalized.strip
+        end
+
+      end
+    end
+  end
+end

data/lib/adapt/helpers/parser.rb

@@ -0,0 +1,28 @@
+require 'charyf/utils/strategy/base_class'
+require 'charyf/utils/strategy/owner_class'
+
+module Adapt
+  module Helpers
+    module Parser
+
+      extend Charyf::Strategy::OwnerClass
+
+      class Base
+
+        include Charyf::Strategy::BaseClass
+
+        def self.normalize(text, remove_articles: true)
+          raise Charyf::Utils::NotImplemented.new
+        end
+
+      end # End of base
+
+      def self.get(language)
+        list[language]
+      end
+
+    end
+  end
+end
+
+require_relative 'en_parser'

data/lib/adapt/processor.rb

@@ -1,6 +1,7 @@
 require 'pycall/import'
 
 require_relative 'routing_builder'
+require_relative 'helpers/parser'
 
 module Adapt
   module Intent
@@ -20,20 +21,28 @@ module Adapt
             @_python_loaded = true
           end
 
-          @engine ||= IntentDeterminationEngine.new
+          @_engine ||= IntentDeterminationEngine.new
         end
 
         def _intents
-          @intents ||= {}
+          @_intents ||= {}
         end
 
         def setup
-          return if @initialized
-          @initialized = true
+          return if @_initialized
+          @_initialized = true
 
           load_files
         end
 
+        def parser
+          return @_parser if @_parser_initialized
+
+          @_parser = Adapt::Helpers::Parser.get(Adapt.config.locale)
+          @_parser_initialized = true
+          puts "No language helper for locale '#{Adapt.config.locale}' available" if @_parser.nil?
+        end
+
         private
 
         def load_files
@@ -47,7 +56,7 @@ module Adapt
           end
 
           # Load additional paths
-          Adapt.lookup_paths.each do |path|
+          Adapt.config.lookup_paths.each do |path|
             Dir[Pathname.new(path.to_s).join('**', '*.adapt.rb')].each do |intent_definition_file|
               require intent_definition_file
             end
@@ -59,6 +68,8 @@ module Adapt
       def initialize
         self.class.setup
         @engine = self.class.engine
+
+        @parser = self.class.parser
       end
 
       def define(&block)
@@ -78,7 +89,10 @@ module Adapt
 
       def determine(request)
         adapt_intent = nil
-        text = Charyf.application.parser.normalize(request.text)
+
+        # Normalize text
+        text = @parser ? @parser.normalize(request.text) : request.text
+
         generator = @engine.determine_intent(text)
         begin
           adapt_intent = PyCall.builtins.next(generator)
@@ -93,7 +107,10 @@ module Adapt
 
 
         entities = app_intent.entities.map { |e| e.keys.first }.inject({}) do |h, entity|
-          h[entity] = adapt_intent[entity]
+          h[entity] = {
+              value: adapt_intent[entity]
+          }
+
           h
         end
 

data/lib/adapt/version.rb

@@ -1,3 +1,3 @@
 module Adapt
-  VERSION = '0.2.6'
+  VERSION = '0.3.0'
 end

data/lib/adapt-charyf.rb

@@ -1,4 +1,6 @@
 require 'charyf'
+require 'i18n'
+
 require_relative 'adapt/processor'
 
 module Adapt
@@ -6,16 +8,21 @@ module Adapt
 
     generators do
       require_relative 'adapt/generators/intent/intent_generator'
+      require_relative 'adapt/generators/install/install_generator'
     end
 
     config.generators.skill_hooks :intents, :adapt => true
 
+    # If unset, I18n locale will be used
+    config.locale = nil
+    config.lookup_paths = []
+
   end
 
   extend self
 
-  def lookup_paths
-    @lookup_paths ||= []
+  def config
+    Extension.config
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adapt-charyf
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.0
 platform: ruby
 authors:
 - Richard Ludvigh
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-31 00:00:00.000000000 Z
+date: 2018-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: charyf
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.3
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -113,8 +127,12 @@ files:
 - bin/console
 - bin/setup
 - lib/adapt-charyf.rb
+- lib/adapt/generators/install/install_generator.rb
+- lib/adapt/generators/install/templates/config/initializers/adapt.rb.tt
 - lib/adapt/generators/intent/intent_generator.rb
 - lib/adapt/generators/intent/templates/intents/adapt/routing.adapt.rb.tt
+- lib/adapt/helpers/en_parser.rb
+- lib/adapt/helpers/parser.rb
 - lib/adapt/processor.rb
 - lib/adapt/routing_builder.rb
 - lib/adapt/version.rb