charyf 0.1.1 → 0.2.5

data/lib/charyf/utils/commands/server/server_command.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+require_relative '../../command/base'
+require_relative '../../command/environment_argument'
+
+module Charyf
+
+  module Command
+
+    class ServerCommand < Base # :nodoc:
+
+      include EnvironmentArgument
+
+      hide_command!
+
+      def perform
+        extract_environment_option
+
+        # CHARYF_ENV needs to be set before application is required.
+        ENV["CHARYF_ENV"] = options[:environment]
+
+        require_application_and_environment!
+
+        start_interfaces!
+
+        start_pipeline!
+
+      end
+
+    end
+  end
+end

data/lib/charyf/utils/generators/app/app_generator.rb

@@ -80,6 +80,7 @@ module Charyf
           template "boot.rb"
           template "chapp.rb"
           template "load.rb"
+          template "routes.rb"
 
           directory "environments"
           empty_directory_with_keep_file "initializers"

data/lib/charyf/utils/generators/app/templates/app/skill_controller.rb.tt

@@ -5,4 +5,9 @@ class SkillController < Charyf::Controller::Base
     reply(text: "I am sorry, I can't help you with that.")
   end
 
-end
+  def invalid
+    logger.warn("Unknown intent routing for request: #{request.inspect}")
+    reply(text: "Don't know where to route intent '#{intent.name}'")
+  end
+
+end

data/lib/charyf/utils/generators/app/templates/config/routes.rb.tt

@@ -0,0 +1,6 @@
+Charyf.application.routes.draw do
+
+  # This is dont automatically, override to change
+  # route 'charyf/unknown', to: {skill: nil, controller: 'skill', action: 'unknown'}
+
+end

data/lib/charyf/utils/generators/defaults.rb

@@ -24,13 +24,22 @@ Should not be used on production environments as it is not persisted.
       INTENT_PROCESSORS = {
           adapt: {
               gem: 'adapt-charyf',
-              gem_version: ['>= 0.2'],
+              gem_version: ['>= 0.2.4'],
               require: 'adapt-charyf',
               desc: <<-EOM
-Ruby wrapper around python library from mycroft [adapt]
+Ruby wrapper around python library from mycroft [adapt]. Works offline.
 It uses building blocks as regexps or small expressions to define and determine intents.
 see more at: https://github.com/Charyf/charyf-adapt-processor
               EOM
+          },
+          wit: {
+              gem: 'witai-charyf',
+              gem_version: ['>= 0.2'],
+              require: 'witai/charyf',
+              desc: <<-EOM
+Charyf wrapper around WIT.ai service. Utilizes powerful NLP (works online as service).
+Supports builtin entity tagging like datetimes, amounts, locations and more.
+              EOM
           }
       }
 

data/lib/charyf/utils/generators/intents/intents_generator.rb

@@ -29,7 +29,7 @@ module Charyf
       private
 
       def intent_generators
-        Charyf::Generators.options[:intents].keys.map(&:downcase)
+        (Charyf::Generators.options[:intents] || {}).keys.map(&:downcase)
       end
 
       def generator_name(intent_processor_name)

data/lib/charyf/utils/parser/parser.rb

@@ -1,15 +1,16 @@
 require_relative '../../support/string'
-require_relative '../strategy'
+require_relative '../strategy/base_class'
+require_relative '../strategy/owner_class'
 
 module Charyf
   module Utils
     module Parser
+
+      extend Charyf::Strategy::OwnerClass
+
       class Base
 
-        include Charyf::Strategy
-        def self.base
-          Base
-        end
+        include Charyf::Strategy::BaseClass
 
         # TODO sig
         def self.normalize(text, remove_articles: true)
@@ -18,14 +19,6 @@ module Charyf
 
       end # End of base
 
-      def self.known
-        Base.known
-      end
-
-      def self.list
-        Base.list
-      end
-
       # TODO sig
       def self.get(language)
         # TODO implement

data/lib/charyf/utils/pipeline.rb

@@ -0,0 +1,28 @@
+require 'thread'
+
+module Charyf
+  module Pipeline
+
+    class << self
+
+      #
+      # This method si blocking
+      #
+      def dequeue
+        _pipeline.deq
+      end
+
+      def enqueue(request)
+        _pipeline.enq(request)
+      end
+
+      private
+
+      def _pipeline
+        @pipeline ||= Queue.new
+      end
+
+    end
+
+  end
+end

data/lib/charyf/utils/storage/provider.rb

@@ -1,14 +1,14 @@
-require_relative '../strategy'
+require_relative '../strategy/base_class'
 
 module Charyf
   module Utils
     module StorageProvider
+
+      extend Charyf::Strategy::OwnerClass
+
       class Base
 
-        include Charyf::Strategy
-        def self.base
-          Base
-        end
+        include Charyf::Strategy::BaseClass
 
         sig_self [['Module', 'String']], ['Charyf::Utils::StorageProvider::Base'],
         def self.get_for(klass)
@@ -31,14 +31,6 @@ module Charyf
         end
 
       end # End of Base
-
-      def self.known
-        Base.known
-      end
-
-      def self.list
-        Base.list
-      end
     end
   end
 end

data/lib/charyf/utils/strategy/base_class.rb

@@ -0,0 +1,50 @@
+module Charyf
+  module Strategy
+    module BaseClass
+
+      class << self
+        def included(base)
+          base.extend(ClassMethods)
+          base.instance_variable_set('@_base_class', base)
+        end
+      end
+
+      module ClassMethods
+        def inherited(subclass)
+          base._subclasses << subclass
+          subclass.instance_variable_set('@_base_class', base)
+        end
+
+        def strategy_name(name = nil)
+          if name
+            @_strategy_name = name
+            base._aliases[name] = self
+          end
+
+          @_strategy_name
+        end
+
+        def _subclasses
+          @_subclasses ||= []
+        end
+
+        def _aliases
+          @_aliases ||= Hash.new
+        end
+
+        def known
+          base._subclasses
+        end
+
+        def list
+          base._aliases
+        end
+
+        def base
+          @_base_class
+        end
+      end
+
+    end
+  end
+end

data/lib/charyf/utils/strategy/owner_class.rb

@@ -0,0 +1,23 @@
+module Charyf
+  module Strategy
+    module OwnerClass
+
+      def known
+        base_class.known
+      end
+
+      def list
+        base_class.list
+      end
+
+      def base_class(name = nil)
+        if name
+          @_base_class = name
+        end
+
+        self.const_get(@_base_class || :Base)
+      end
+
+    end
+  end
+end

data/lib/charyf/version.rb

@@ -10,8 +10,8 @@ module Charyf
 
   module VERSION
     MAJOR = 0
-    MINOR = 1
-    TINY  = 1
+    MINOR = 2
+    TINY  = 5
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

data/todo.md

@@ -1,3 +1,8 @@
-* check that dispatcher can handle namespaces
-* inject namespace to controller name
-  * can result to Weather::ForecastSkill::ForecastController
+* remove all imports, everything should import what is needed
+* remove sig -> too many problems
+* dispatcher - sync vs async
+* only one reply, however allow sends to the same interface
+  * this should add a message id to request
+  * reply will be part of the return value -> wrap in hash with meta info
+  * messages will be send to the interface with conversation + request message id
+  * async interfaces will receive {async: true} return value

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: charyf
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.5
 platform: ruby
 authors:
 - Richard Ludvigh
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-13 00:00:00.000000000 Z
+date: 2018-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: charyf_sig
@@ -167,11 +167,13 @@ files:
 - lib/charyf/engine/interface/program.rb
 - lib/charyf/engine/request.rb
 - lib/charyf/engine/response.rb
+- lib/charyf/engine/routing/default.rb
+- lib/charyf/engine/routing/result.rb
+- lib/charyf/engine/routing/router.rb
 - lib/charyf/engine/session/processors/default.rb
 - lib/charyf/engine/session/processors/processor.rb
 - lib/charyf/engine/session/session.rb
 - lib/charyf/engine/skill/info.rb
-- lib/charyf/engine/skill/routing.rb
 - lib/charyf/engine/skill/skill.rb
 - lib/charyf/support.rb
 - lib/charyf/support/all.rb
@@ -203,6 +205,7 @@ files:
 - lib/charyf/utils/commands/generate/generate_command.rb
 - lib/charyf/utils/commands/help/USAGE
 - lib/charyf/utils/commands/help/help.rb
+- lib/charyf/utils/commands/server/server_command.rb
 - lib/charyf/utils/configuration.rb
 - lib/charyf/utils/error_handler.rb
 - lib/charyf/utils/extension.rb
@@ -224,6 +227,7 @@ files:
 - lib/charyf/utils/generators/app/templates/config/environments/production.rb.tt
 - lib/charyf/utils/generators/app/templates/config/environments/test.rb.tt
 - lib/charyf/utils/generators/app/templates/config/load.rb.tt
+- lib/charyf/utils/generators/app/templates/config/routes.rb.tt
 - lib/charyf/utils/generators/app/templates/gitignore
 - lib/charyf/utils/generators/app_base.rb
 - lib/charyf/utils/generators/defaults.rb
@@ -238,9 +242,11 @@ files:
 - lib/charyf/utils/machine.rb
 - lib/charyf/utils/parser/en_parser.rb
 - lib/charyf/utils/parser/parser.rb
+- lib/charyf/utils/pipeline.rb
 - lib/charyf/utils/ruby_version_check.rb
 - lib/charyf/utils/storage/provider.rb
-- lib/charyf/utils/strategy.rb
+- lib/charyf/utils/strategy/base_class.rb
+- lib/charyf/utils/strategy/owner_class.rb
 - lib/charyf/utils/utils.rb
 - lib/charyf/version.rb
 - lib/locale/en.yml

data/lib/charyf/engine/skill/routing.rb

@@ -1,57 +0,0 @@
-module Charyf
-  module Skill
-    module Routing
-
-      def self.included(base)
-        base.extend(ClassMethods)
-      end
-
-      module ClassMethods
-
-        sig ['Pathname'], ['Pathname'],
-        def routing_source_dir(abs_path = nil)
-          if abs_path
-            @_routing_source_dir = abs_path
-          end
-
-          @_routing_source_dir || skill_root.join('intents')
-        end
-
-        def public_routing_for(processor_name)
-          _public_routing(processor_name) << Proc.new
-
-          nil
-        end
-
-        def private_routing_for(processor_name)
-          _private_routing(processor_name) << Proc.new
-
-          nil
-        end
-
-
-        def _public_routing(processor)
-          processor = processor.to_sym
-
-          @_public_routing ||= Hash.new
-
-          @_public_routing[processor] ||= []
-
-          @_public_routing[processor]
-        end
-
-        def _private_routing(processor)
-          processor = processor.to_sym
-
-          @_public_routing ||= Hash.new
-
-          @_public_routing[processor] ||= []
-
-          @_public_routing[processor]
-        end
-
-      end # End of ClassMethods
-
-    end
-  end
-end

data/lib/charyf/utils/strategy.rb

@@ -1,44 +0,0 @@
-module Charyf
-  module Strategy
-
-    def self.included(base)
-      base.extend(ClassMethods)
-    end
-
-    module ClassMethods
-      def inherited(subclass)
-        base._subclasses << subclass
-      end
-
-      def strategy_name(name = nil)
-        if name
-          @_strategy_name = name
-          base._aliases[name] = self
-        end
-
-        @_strategy_name
-      end
-
-      def _subclasses
-        @_subclasses ||= []
-      end
-
-      def _aliases
-        @_aliases ||= Hash.new
-      end
-
-      def known
-        base._subclasses
-      end
-
-      def list
-        base._aliases
-      end
-
-      def base
-        raise Charyf::Utils::NotImplemented.new("No base class found for #{self}")
-      end
-    end
-
-  end
-end