nano-bots 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19a8bc3b2ea8dcd2703a22efb3ac334485536b602e385c3d5cd69cdb6e1bfa1b
-  data.tar.gz: 76375f04692caacd92d832f843acaf3fb82cf68e0e467674749730a04e30794a
+  metadata.gz: 1ef7d964a5303c4cf07054210b720b5e57eede718ce549cb697331911577e884
+  data.tar.gz: bcfad5aec3b82903fc144d58d37640458bb97e957bddd5deabf46bc890d3a1e7
 SHA512:
-  metadata.gz: 9ddbdc1421ce91117a2d16d94794f6111d2ea72503c24ed0f3597c7522a851e7fd7eef08703c5ba8f68826e51e9b34621591232e2d9a5220efda5d026027d413
-  data.tar.gz: b2a729b278245a971a815c2333cd7676d795a64cdd86aef0d737ad9510c9a78bc8420eaaef9067f305201afbbccaf63e40508832d4cfad7cbf19b91fefc3aa07
+  metadata.gz: 816c65f1d09e912d76dfd5e651e9ae17fa9e0bb4fcbfd0932ef6498922c2c4d20422c329dfd239af90ccdd00dc8d1eb03a15ac723f0907e19fbecc79b4fcb2ad
+  data.tar.gz: b3254fb89ddfc4d69139130388150e986b2f750a3f56e6a068d211bff6db7413ed47b536dcbc84b04fde1c1679ea5968c7cf63e4ba62d72f07c436d64d21b611

data/Gemfile.lock

@@ -1,13 +1,14 @@
 PATH
   remote: .
   specs:
-    nano-bots (0.0.4)
+    nano-bots (0.0.5)
       babosa (~> 2.0)
       dotenv (~> 2.8, >= 2.8.1)
       faraday (~> 2.7, >= 2.7.4)
       pry (~> 0.14.2)
       rainbow (~> 3.1, >= 3.1.1)
       ruby-openai (~> 4.0)
+      sweet-moon (~> 0.0.7)
 
 GEM
   remote: https://rubygems.org/
@@ -23,6 +24,7 @@ GEM
     faraday-multipart (1.0.4)
       multipart-post (~> 2)
     faraday-net_http (3.0.2)
+    ffi (1.15.5)
     json (2.6.3)
     method_source (1.0.0)
     multipart-post (2.3.0)
@@ -73,6 +75,8 @@ GEM
       faraday-multipart (>= 1)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
+    sweet-moon (0.0.7)
+      ffi (~> 1.15, >= 1.15.5)
     unicode-display_width (2.4.2)
 
 PLATFORMS

data/README.md

@@ -23,13 +23,13 @@ https://user-images.githubusercontent.com/113217272/238141567-c58a240c-7b67-4b3b
 For a system usage:
 
 ```sh
-gem install nano-bots -v 0.0.4
+gem install nano-bots -v 0.0.5
 ```
 
 To use it in a project, add it to your `Gemfile`:
 
 ```ruby
-gem 'nano-bots', '~> 0.0.4'
+gem 'nano-bots', '~> 0.0.5'
 ```
 
 ```sh
@@ -76,7 +76,7 @@ version: '3.7'
 services:
   nano-bots:
     image: ruby:3.2.2-slim-bullseye
-    command: sh -c "gem install nano-bots -v 0.0.4 && bash"
+    command: sh -c "gem install nano-bots -v 0.0.5 && bash"
     environment:
       OPENAI_API_ADDRESS: https://api.openai.com
       OPENAI_API_ACCESS_TOKEN: your-token
@@ -254,5 +254,5 @@ gem build nano-bots.gemspec
 
 gem signin
 
-gem push nano-bots-0.0.4.gem
+gem push nano-bots-0.0.5.gem
 ```

data/components/adapter.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'sweet-moon'
+
+module NanoBot
+  module Components
+    class Adapter
+      def self.apply(_direction, params)
+        content = params[:content]
+
+        if params[:fennel] && params[:lua]
+          raise StandardError, 'Adapter conflict: You can only use either Lua or Fennel, not both.'
+        end
+
+        if params[:fennel]
+          content = fennel(content, params[:fennel])
+        elsif params[:lua]
+          content = lua(content, params[:lua])
+        end
+
+        "#{params[:prefix]}#{content}#{params[:suffix]}"
+      end
+
+      def self.fennel(content, expression)
+        path = "#{File.expand_path('../static/fennel', __dir__)}/?.lua"
+        state = SweetMoon::State.new(package_path: path).fennel
+        state.fennel.eval("(set _G.adapter (fn [content] #{expression}))")
+        adapter = state.get(:adapter)
+        adapter.call([content])
+      end
+
+      def self.lua(content, expression)
+        state = SweetMoon::State.new
+        state.eval("adapter = function(content) return #{expression}; end")
+        adapter = state.get(:adapter)
+        adapter.call([content])
+      end
+    end
+  end
+end

data/components/storage.rb

@@ -43,7 +43,7 @@ module NanoBot
 
           partial = File.join(File.dirname(partial), File.basename(partial, File.extname(partial)))
 
-          partial = path.sub(%r{^\.?/}, '')
+          partial = partial.sub(%r{^\.?/}, '')
 
           candidates << "#{directory}/#{partial}"
           candidates << "#{directory}/#{partial}.yml"
@@ -54,7 +54,7 @@ module NanoBot
 
         partial = File.join(File.dirname(partial), File.basename(partial, File.extname(partial)))
 
-        partial = path.sub(%r{^\.?/}, '')
+        partial = partial.sub(%r{^\.?/}, '')
 
         candidates << "#{directory}/#{partial}"
         candidates << "#{directory}/#{partial}.yml"

data/controllers/instance.rb

@@ -55,7 +55,7 @@ module NanoBot
 
       def load_cartridge!(path)
         elected_path = if path.strip == '-'
-                         File.expand_path('../static/cartridges/default.yml', __dir__)
+                         File.expand_path('../static/cartridges/baseline.yml', __dir__)
                        else
                          Components::Storage.cartridge_path(path)
                        end

data/controllers/interfaces/eval.rb

@@ -4,34 +4,21 @@ require 'pry'
 require 'rainbow'
 
 require_relative '../../logic/helpers/hash'
+require_relative '../../logic/cartridge/affixes'
 
 module NanoBot
   module Controllers
     module Interfaces
       module Eval
         def self.evaluate(input, cartridge, session)
-          prefix = build_prefix(cartridge)
-          postfix = build_postfix(cartridge)
+          prefix = Logic::Cartridge::Affixes.get(cartridge, :eval, :output, :prefix)
+          suffix = Logic::Cartridge::Affixes.get(cartridge, :eval, :output, :suffix)
 
           session.print(prefix) unless prefix.nil?
 
           session.evaluate_and_print(input, mode: 'eval')
 
-          session.print(postfix) unless postfix.nil?
-        end
-
-        def self.build_prefix(cartridge)
-          eval_interface = Logic::Helpers::Hash.fetch(cartridge, %i[interfaces eval])
-          return nil if eval_interface.nil?
-
-          eval_interface[:prefix]
-        end
-
-        def self.build_postfix(cartridge)
-          eval_interface = Logic::Helpers::Hash.fetch(cartridge, %i[interfaces eval])
-          return "\n" if eval_interface.nil? || !eval_interface.key?(:postfix) # default
-
-          eval_interface[:postfix]
+          session.print(suffix) unless suffix.nil?
         end
       end
     end

data/controllers/interfaces/repl.rb

@@ -4,19 +4,20 @@ require 'pry'
 require 'rainbow'
 
 require_relative '../../logic/helpers/hash'
+require_relative '../../logic/cartridge/affixes'
 
 module NanoBot
   module Controllers
     module Interfaces
       module REPL
         def self.start(cartridge, session)
-          prefix = build_prefix(cartridge)
-          postfix = build_postfix(cartridge)
+          prefix = Logic::Cartridge::Affixes.get(cartridge, :repl, :output, :prefix)
+          suffix = Logic::Cartridge::Affixes.get(cartridge, :repl, :output, :suffix)
 
           if Logic::Helpers::Hash.fetch(cartridge, %i[behaviors boot instruction])
             session.print(prefix) unless prefix.nil?
             session.boot(mode: 'repl')
-            session.print(postfix) unless postfix.nil?
+            session.print(suffix) unless suffix.nil?
             session.print("\n")
           end
 
@@ -29,9 +30,9 @@ module NanoBot
           )
 
           Pry.commands.block_command(/(.*)/, 'handler') do |line|
-            session.print(postfix) unless postfix.nil?
+            session.print(prefix) unless prefix.nil?
             session.evaluate_and_print(line, mode: 'repl')
-            session.print(postfix) unless postfix.nil?
+            session.print(suffix) unless suffix.nil?
             session.print("\n")
             session.flush
           end
@@ -39,20 +40,6 @@ module NanoBot
           Pry.start
         end
 
-        def self.build_prefix(cartridge)
-          repl = Logic::Helpers::Hash.fetch(cartridge, %i[interfaces repl])
-          return "\n" if repl.nil? || !repl.key?(:prefix) # default
-
-          repl[:prefix]
-        end
-
-        def self.build_postfix(cartridge)
-          repl = Logic::Helpers::Hash.fetch(cartridge, %i[interfaces repl])
-          return "\n" if repl.nil? || !repl.key?(:postfix) # default
-
-          repl[:postfix]
-        end
-
         def self.build_prompt(prompt)
           result = ''
 

data/controllers/session.rb

@@ -5,7 +5,10 @@ require 'babosa'
 require 'fileutils'
 
 require_relative '../logic/helpers/hash'
+require_relative '../logic/cartridge/streaming'
+require_relative '../logic/cartridge/interaction'
 require_relative '../components/storage'
+require_relative '../components/adapter'
 
 module NanoBot
   module Controllers
@@ -56,24 +59,22 @@ module NanoBot
       def evaluate_and_print(message, mode:)
         behavior = Logic::Helpers::Hash.fetch(@cartridge, %i[behaviors interaction]) || {}
 
-        @state[:history] << ({ who: 'user', message: })
+        @state[:history] << {
+          who: 'user',
+          message: Components::Adapter.apply(
+            :input, Logic::Cartridge::Interaction.input(@cartridge, mode.to_sym, message)
+          )
+        }
 
         input = { behavior:, history: @state[:history] }
 
         process(input, mode:)
       end
 
-      def streaming(interface)
-        provider = @provider.settings.key?(:stream) ? @provider.settings[:stream] : true
-        interface = interface.key?(:stream) ? interface[:stream] : true
-
-        provider && interface
-      end
-
       def process(input, mode:)
         interface = Logic::Helpers::Hash.fetch(@cartridge, [:interfaces, mode.to_sym]) || {}
 
-        streaming = streaming(interface)
+        streaming = Logic::Cartridge::Streaming.enabled?(@cartridge, mode.to_sym)
 
         input[:interface] = interface
 
@@ -82,9 +83,18 @@ module NanoBot
         ready = false
         @provider.evaluate(input) do |output, finished|
           updated_at = Time.now
+
           if finished
-            @state[:history] << output
+            @state[:history] << Marshal.load(Marshal.dump(output))
+
+            output = Logic::Cartridge::Interaction.output(
+              @cartridge, mode.to_sym, output, streaming, finished
+            )
+
+            output[:message] = Components::Adapter.apply(:output, output[:message])
+
             self.print(output[:message]) unless streaming
+
             ready = true
             flush
           elsif streaming

data/docker-compose.example.yml

@@ -3,7 +3,7 @@ version: '3.7'
 services:
   nano-bots:
     image: ruby:3.2.2-slim-bullseye
-    command: sh -c "gem install nano-bots -v 0.0.4 && bash"
+    command: sh -c "apt-get update && apt-get install -y --no-install-recommends build-essential libffi-dev lua5.4-dev && gem install nano-bots -v 0.0.5 && bash"
     environment:
       OPENAI_API_ADDRESS: https://api.openai.com
       OPENAI_API_ACCESS_TOKEN: your-token

data/logic/cartridge/adapters.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require_relative '../helpers/hash'
+require_relative './default'
+
+module NanoBot
+  module Logic
+    module Cartridge
+      module Adapter
+        def self.expression(cartridge, interface, direction, language)
+          adapter = [
+            {
+              exists: (Helpers::Hash.fetch(cartridge, [:interfaces, direction, :adapter]) || {}).key?(language),
+              value: Helpers::Hash.fetch(cartridge, [:interfaces, direction, :adapter, language])
+            },
+            {
+              exists: (Helpers::Hash.fetch(cartridge,
+                                           [:interfaces, interface, direction, :adapter]) || {}).key?(language),
+              value: Helpers::Hash.fetch(cartridge, [:interfaces, interface, direction, :adapter, language])
+            }
+          ].filter { |candidate| candidate[:exists] }.last
+
+          return nil if adapter.nil?
+
+          adapter[:value]
+        end
+      end
+    end
+  end
+end

data/logic/cartridge/affixes.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require_relative '../helpers/hash'
+require_relative './default'
+
+module NanoBot
+  module Logic
+    module Cartridge
+      module Affixes
+        def self.get(cartridge, interface, direction, kind)
+          affix = [
+            {
+              exists: (Helpers::Hash.fetch(cartridge, [:interfaces, direction]) || {}).key?(kind),
+              value: Helpers::Hash.fetch(cartridge, [:interfaces, direction, kind])
+            },
+            {
+              exists: (Helpers::Hash.fetch(cartridge, [:interfaces, interface, direction]) || {}).key?(kind),
+              value: Helpers::Hash.fetch(cartridge, [:interfaces, interface, direction, kind])
+            }
+          ].filter { |candidate| candidate[:exists] }.last
+
+          if affix.nil?
+            return Helpers::Hash.fetch(
+              Default.instance.values, [:interfaces, interface, direction, kind]
+            )
+          end
+
+          affix[:value]
+        end
+      end
+    end
+  end
+end

data/logic/cartridge/default.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'yaml'
+require 'singleton'
+
+require_relative '../helpers/hash'
+
+module NanoBot
+  module Logic
+    module Cartridge
+      class Default
+        include Singleton
+
+        def values
+          return @values if @values
+
+          path = File.expand_path('../../static/cartridges/default.yml', __dir__)
+          cartridge = YAML.safe_load(File.read(path), permitted_classes: [Symbol])
+          @values = Logic::Helpers::Hash.symbolize_keys(cartridge)
+          @values
+        end
+
+        def baseline
+          return @baseline if @baseline
+
+          path = File.expand_path('../../static/cartridges/baseline.yml', __dir__)
+          cartridge = YAML.safe_load(File.read(path), permitted_classes: [Symbol])
+          @baseline = Logic::Helpers::Hash.symbolize_keys(cartridge)
+          @baseline
+        end
+      end
+    end
+  end
+end

data/logic/cartridge/interaction.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'sweet-moon'
+
+require_relative './affixes'
+require_relative './adapters'
+
+module NanoBot
+  module Logic
+    module Cartridge
+      module Interaction
+        def self.input(cartridge, interface, content)
+          lua = Adapter.expression(cartridge, interface, :input, :lua)
+          fennel = Adapter.expression(cartridge, interface, :input, :fennel)
+
+          prefix = Affixes.get(cartridge, interface, :input, :prefix)
+          suffix = Affixes.get(cartridge, interface, :input, :suffix)
+
+          { content:, prefix:, suffix:, lua:, fennel: }
+        end
+
+        def self.output(cartridge, interface, result, streaming, _finished)
+          if streaming
+            result[:message] = { content: result[:message], lua: nil, fennel: nil }
+            return result
+          end
+
+          lua = Adapter.expression(cartridge, interface, :output, :lua)
+          fennel = Adapter.expression(cartridge, interface, :output, :fennel)
+
+          result[:message] = { content: result[:message], lua:, fennel: }
+
+          result
+        end
+      end
+    end
+  end
+end

data/logic/cartridge/streaming.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require_relative '../helpers/hash'
+
+module NanoBot
+  module Logic
+    module Cartridge
+      module Streaming
+        def self.enabled?(cartridge, interface)
+          return false if Helpers::Hash.fetch(cartridge, %i[provider settings stream]) == false
+
+          specific_interface = Helpers::Hash.fetch(cartridge, [:interfaces, interface, :output, :stream])
+
+          return specific_interface unless specific_interface.nil?
+
+          interface = Helpers::Hash.fetch(cartridge, %i[interfaces output stream])
+
+          return interface unless interface.nil?
+
+          true
+        end
+      end
+    end
+  end
+end

data/logic/helpers/hash.rb

@@ -23,6 +23,10 @@ module NanoBot
           return nil unless node
 
           path.each do |key|
+            unless node.is_a?(::Hash)
+              node = nil
+              break
+            end
             node = node[key]
             break if node.nil?
           end

data/nano-bots.gemspec

@@ -37,6 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'pry', '~> 0.14.2'
   spec.add_dependency 'rainbow', '~> 3.1', '>= 3.1.1'
   spec.add_dependency 'ruby-openai', '~> 4.0'
+  spec.add_dependency 'sweet-moon', '~> 0.0.7'
 
   spec.metadata['rubygems_mfa_required'] = 'true'
 end

data/static/cartridges/baseline.yml

@@ -0,0 +1,14 @@
+---
+meta:
+  name: Unknown
+  author: Nobody
+  version: 0.0.0
+
+provider:
+  name: openai
+  settings:
+    model: gpt-3.5-turbo
+    credentials:
+      address: ENV/OPENAI_API_ADDRESS
+      access-token: ENV/OPENAI_API_ACCESS_TOKEN
+      user-identifier: ENV/OPENAI_API_USER_IDENTIFIER

data/static/cartridges/default.yml

@@ -1,14 +1,19 @@
 ---
-meta:
-  name: Unknown
-  author: Nobody
-  version: 0.0.0
+interfaces:
+  repl:
+    output:
+      stream: true
+      suffix: "\n"
+      prefix: "\n"
+    prompt:
+      - text: '🤖'
+      - text: '> '
+        color: blue
+  eval:
+    output:
+      stream: true
+      suffix: "\n"
 
 provider:
-  name: openai
   settings:
-    model: gpt-3.5-turbo
-    credentials:
-      address: ENV/OPENAI_API_ADDRESS
-      access-token: ENV/OPENAI_API_ACCESS_TOKEN
-      user-identifier: ENV/OPENAI_API_USER_IDENTIFIER
+    stream: true