adapt-charyf 0.2.2 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58675ed86d6a65dde20735ccc22f933b2ecd7c39
-  data.tar.gz: 4581a150ab87359a8c126ed5666a56c0e2dd4abd
+  metadata.gz: 8dec5de8819127266f5e2f2dfac6d62d3e5dbcdd
+  data.tar.gz: 5ab85c234384a3ef92a3f9ad47500c2fd463fa24
 SHA512:
-  metadata.gz: 570418b35b9a1ba545eea34bbd33334d942364e0795b9a06f7ef00f630508e85860fb499df121af6f78603eaeed29438359ce0279c1fb2fb51ef617415cf7252
-  data.tar.gz: 7ba6374978dada5577c75b93808cfd9bf866203f335de1543868d9c10f61b3eadfeae4a7f7ab87ec3be18578e6086bbc1e59283ec7e5631f9c1378e653ffc3b9
+  metadata.gz: e941870d9ade1edf90918bf8838924fd90d824323a679b55792cc3fb82ae636c13f94141bdc1a089176f8840f7cb79807f7351ae384bde424f68309f0d583577
+  data.tar.gz: bf1928a2ffbe8fcda1084759bc84cdee237cbedd9232d8f6a9ec14a962459fafe230efd83eb2b67d81b3140564a539369cfaf1f5f400301412531ae8a0a06786

data/adapt-charyf.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "charyf", "~> 0"
+  spec.add_runtime_dependency "charyf", "~> 0.2"
   spec.add_runtime_dependency "pycall", "~> 1.0.3"
 
   spec.add_development_dependency "bundler", "~> 1.15"

data/lib/adapt-charyf.rb

@@ -11,4 +11,11 @@ module Adapt
     config.generators.skill_hooks :intents, :adapt => true
 
   end
+
+  extend self
+
+  def lookup_paths
+    @lookup_paths ||= []
+  end
+
 end

data/lib/adapt/generators/intent/intent_generator.rb

@@ -7,13 +7,9 @@ module Adapt
       source_root File.expand_path('templates', __dir__)
 
       def public_routing
-        template 'intents/adapt_public.rb', File.join('app/skills', skill_content_path, 'intents', 'adapt_public.rb')
+        template 'intents/adapt/routing.adapt.rb', File.join('app/skills', skill_content_path, 'intents', 'adapt', 'default_routing.adapt.rb')
       end
 
-      # def private_routing
-      #   template 'intents/adapt_private.rb', File.join('app/skills', skill_content_path, 'intents', 'adapt_private.rb')
-      # end
-
     end
   end
 end

data/lib/adapt/generators/intent/templates/intents/adapt/routing.adapt.rb.tt

@@ -0,0 +1,8 @@
+Adapt.instance.load do |routing|
+
+  routing.register_keywords 'skill_name', '<%= class_name.gsub("::", " ") -%>'
+
+  routing.intent('<%= class_name.gsub("::", "/") -%>/example')
+      .required('skill_name')
+
+end

data/lib/adapt/processor.rb

@@ -6,60 +6,72 @@ module Adapt
   module Intent
     class Processor < Charyf::Engine::Intent::Processor::Base
 
-      strategy_name :adapt
+      class NameCollisionError < StandardError; end
 
-      MUTEX = Mutex.new.freeze
-      private_constant :MUTEX
+      strategy_name :adapt
 
       class << self
         include PyCall::Import
 
-        def get_for(skill_name = nil)
-          engine = engine(skill_name)
-
-          self.new(skill_name, engine)
-        end
-
-        def engine(skill_name = nil)
-          MUTEX.synchronize {
-            return _engines[skill_name] ||= init_engine
-          }
-        end
-
-        def init_engine
+        def engine
           unless @_python_loaded
-            pyfrom 'adapt.intent', import: :IntentBuilder
-            pyfrom 'adapt.engine', import: :IntentDeterminationEngine
+            self.pyfrom 'adapt.intent', import: :IntentBuilder
+            self.pyfrom 'adapt.engine', import: :IntentDeterminationEngine
             @_python_loaded = true
           end
 
-          IntentDeterminationEngine.new
-        end
-
-        def _engines
-          @engines ||= {}
+          @engine ||= IntentDeterminationEngine.new
         end
 
         def _intents
           @intents ||= {}
         end
 
+        def setup
+          return if @initialized
+          @initialized = true
+
+          load_files
+        end
+
+        private
+
+        def load_files
+          # Seek skill folders
+          Charyf::Skill.list.each do |skill_klass|
+            root = skill_klass.skill_root
+
+            Dir[root.join('intents', '**', '*.adapt.rb')].each do |intent_definition_file|
+              require intent_definition_file
+            end
+          end
+
+          # Load additional paths
+          Adapt.lookup_paths.each do |path|
+            Dir[Pathname.new(path.to_s).join('**', '*.adapt.rb')].each do |intent_definition_file|
+              require intent_definition_file
+            end
+          end
+
+        end
       end
 
-      def initialize(skill_name, engine)
-        @skill_name = skill_name
-        @engine = engine
+      def initialize
+        self.class.setup
+        @engine = self.class.engine
       end
 
-      def load(skill_name, block)
-        builder = Adapt::RoutingBuilder.new(skill_name)
+      def define(&block)
+        builder = Adapt::RoutingBuilder.new
 
         block.call(builder)
 
         intents = builder.build(@engine, IntentBuilder)
 
-        # TODO handle already existing
         intents.each do |intent|
+          # TODO handle already existing
+          raise NameCollisionError.new("Intent name '#{intent.name}' already in use.") if self.class._intents[intent.name]
+
           self.class._intents[intent.name] = intent
         end
       end
@@ -80,15 +92,14 @@ module Adapt
         app_intent = self.class._intents[adapt_intent['intent_type']]
 
 
-        matches =  app_intent.entities.map { |e| e.keys.first }.inject({}) do |h, entity|
-          h[self.class.unscope_name(app_intent.skill_name, entity)] = adapt_intent[entity]
+        entities = app_intent.entities.map { |e| e.keys.first }.inject({}) do |h, entity|
+          h[entity] = adapt_intent[entity]
           h
         end
 
-        Charyf::Engine::Intent.new(app_intent.skill_name, app_intent.controller, app_intent.action, confidence, matches)
+        return Charyf::Engine::Intent.new(app_intent.name, confidence, entities)
       end
 
-
     end
   end
 end

data/lib/adapt/routing_builder.rb

@@ -4,40 +4,29 @@ module Adapt
     class InvalidState < StandardError; end
 
     class Intent
-      attr_reader :skill_name, :name, :controller, :action, :entities
+      attr_reader :name, :entities
 
-      def initialize(skill_name, name)
-        @skill_name = skill_name
+      def initialize(name)
         @name = name
-        @controller = nil
-        @action = nil
 
         @entities = []
       end
 
       def required(entity)
-        entity = Adapt::Intent::Processor.scoped_name(@skill_name, entity)
         @entities << {entity => :required}
 
         return self
       end
 
       def optional(entity)
-        entity = Adapt::Intent::Processor.scoped_name(@skill_name, entity)
         @entities << {entity => :optional}
 
         return self
       end
 
-      def route_to(controller, action)
-        @controller = controller
-        @action = action
-      end
     end # End of Intent.class
 
-    def initialize(skill_name)
-      @skill_name = skill_name
-
+    def initialize
       @keywords = {}
       @regexps = []
       @intents = []
@@ -46,22 +35,21 @@ module Adapt
     def register_keywords(category, word, *words)
       words = [word] + words
 
-      (@keywords[Adapt::Intent::Processor.scoped_name(@skill_name, category)] ||= []).push(words).flatten!
+      (@keywords[category] ||= []).push(words).flatten!
     end
 
     def register_regex(regex)
-      @regexps << scope_regex(regex)
-
+      @regexps << regex
     end
 
     def intent(name)
-      intent = Intent.new(@skill_name, Adapt::Intent::Processor.scoped_name(@skill_name,name.to_s.gsub(' ', '')))
+      intent = Intent.new(name)
       @intents << intent
 
       intent
     end
 
-    def build(engine, intent_builder_class)
+    def build(engine, python_builder)
       @keywords.each do |group, words|
         words.each do |word|
           engine.register_entity(word, group)
@@ -73,7 +61,7 @@ module Adapt
       end
 
       @intents.each do |intent|
-        builder = intent_builder_class.new(intent.name)
+        builder = python_builder.new(intent.name)
 
         intent.entities.each do |entity|
           entity, method = entity.first
@@ -94,11 +82,5 @@ module Adapt
       @intents
     end
 
-    private
-
-    def scope_regex(regex)
-      regex.to_s.gsub(/\(\?P\<(.*)\>/, "(?P<#{Adapt::Intent::Processor.scoped_name(@skill_name, '\1').gsub('.', '_')}>")
-    end
-
   end
 end

data/lib/adapt/version.rb

@@ -1,3 +1,3 @@
 module Adapt
-  VERSION = '0.2.2'
+  VERSION = '0.2.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adapt-charyf
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.5
 platform: ruby
 authors:
 - Richard Ludvigh
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-02 00:00:00.000000000 Z
+date: 2018-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: charyf
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: pycall
   requirement: !ruby/object:Gem::Requirement
@@ -114,8 +114,7 @@ files:
 - bin/setup
 - lib/adapt-charyf.rb
 - lib/adapt/generators/intent/intent_generator.rb
-- lib/adapt/generators/intent/templates/intents/adapt_private.rb.tt
-- lib/adapt/generators/intent/templates/intents/adapt_public.rb.tt
+- lib/adapt/generators/intent/templates/intents/adapt/routing.adapt.rb.tt
 - lib/adapt/processor.rb
 - lib/adapt/routing_builder.rb
 - lib/adapt/version.rb

data/lib/adapt/generators/intent/templates/intents/adapt_private.rb.tt

@@ -1,3 +0,0 @@
-<%= class_name -%>.private_routing_for :adapt do |routing|
-
-end

data/lib/adapt/generators/intent/templates/intents/adapt_public.rb.tt

@@ -1,9 +0,0 @@
-<%= class_name -%>.public_routing_for :adapt do |routing|
-
-  routing.register_keywords 'skill_name', '<%= class_name.gsub("::", " ") -%>'
-
-  routing.intent('Example')
-      .required('skill_name')
-      .route_to('base', 'example')
-
-end