nano-bots 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1cfd38c6461b14483fc0478d31b73ed3e4890f1c534b3c7a4ead6f9412466674
-  data.tar.gz: 11f3e82a196f8b27ac1313ee2e653c93521ed7c081ef68bacf15015c8392db34
+  metadata.gz: d87686427ed075d44e4c4b21e41de70047adf4ce56eb73c50f77fb695e63a562
+  data.tar.gz: 8bc004c9dfe2a004fa8e6f7bbcc946e461c54daf7b9b58b7e416c9f3c8ebe734
 SHA512:
-  metadata.gz: b6a7dbb69afead0f718e2b3c688edb35dfce6f68f138ddd5168c9d72b5eaaedbdcf973b99be873709c4f6b63f71a3f35c9a5d06a0ca4efd32800c52b6de3ccc0
-  data.tar.gz: 24bf5641942d008e7afbad2ae37fec1a4f37d28c68b3ab0ab3f560849f8b427a246f5c9c29ddc9221852bbb3cd5e86bb958c9fbff392a0cca0fab81d9c3b0171
+  metadata.gz: 0ce8acc93fbd5eedaaaae2dc271ab64998fad38e3e2f5f40e9a0a51e4cbed01e25787ff77ebf02663e88786c01ede5a70127052aeb2fcf6dfcb58c22bb004620
+  data.tar.gz: c46e9cfcbbb2d871191153c48760cd4625216b6dbbff598c2921635df7af02fdca8923b806fc9fdbe35ee86ab6c6217a63b287b3bf65c42d5281aff9c91e8878

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    nano-bots (2.1.0)
+    nano-bots (2.2.0)
       babosa (~> 2.0)
       concurrent-ruby (~> 1.2, >= 1.2.2)
       dotenv (~> 2.8, >= 2.8.1)
-      gemini-ai (~> 2.1)
+      gemini-ai (~> 2.2)
       pry (~> 0.14.2)
       rainbow (~> 3.1, >= 3.1.1)
       rbnacl (~> 7.1, >= 7.1.1)
@@ -34,7 +34,7 @@ GEM
       multipart-post (~> 2)
     faraday-net_http (3.0.2)
     ffi (1.16.3)
-    gemini-ai (2.1.0)
+    gemini-ai (2.2.0)
       event_stream_parser (~> 1.0)
       faraday (~> 2.7, >= 2.7.12)
       googleauth (~> 1.9, >= 1.9.1)

data/README.md

@@ -36,13 +36,13 @@ https://user-images.githubusercontent.com/113217272/238141567-c58a240c-7b67-4b3b
 For a system usage:
 
 ```sh
-gem install nano-bots -v 2.1.0
+gem install nano-bots -v 2.2.0
 ```
 
 To use it in a project, add it to your `Gemfile`:
 
 ```ruby
-gem 'nano-bots', '~> 2.1.0'
+gem 'nano-bots', '~> 2.2.0'
 ```
 
 ```sh
@@ -174,7 +174,7 @@ GOOGLE_PROJECT_ID=your-project-id
 Clone the repository and copy the Docker Compose template:
 
 ```
-git clone git@github.com:icebaker/ruby-nano-bots.git
+git clone https://github.com/icebaker/ruby-nano-bots.git
 cd ruby-nano-bots
 cp docker-compose.example.yml docker-compose.yml
 ```
@@ -188,7 +188,7 @@ Set your provider credentials and choose your desired directory for the cartridg
 services:
   nano-bots:
     image: ruby:3.2.2-slim-bookworm
-    command: sh -c "apt-get update && apt-get install -y --no-install-recommends build-essential libffi-dev libsodium-dev lua5.4-dev curl && curl -s https://raw.githubusercontent.com/babashka/babashka/master/install | bash && gem install nano-bots -v 2.1.0 && bash"
+    command: sh -c "apt-get update && apt-get install -y --no-install-recommends build-essential libffi-dev libsodium-dev lua5.4-dev curl && curl -s https://raw.githubusercontent.com/babashka/babashka/master/install | bash && gem install nano-bots -v 2.2.0 && bash"
     environment:
       OPENAI_API_ADDRESS: https://api.openai.com
       OPENAI_API_KEY: your-access-token
@@ -208,7 +208,7 @@ services:
 services:
   nano-bots:
     image: ruby:3.2.2-slim-bookworm
-    command: sh -c "apt-get update && apt-get install -y --no-install-recommends build-essential libffi-dev libsodium-dev lua5.4-dev curl && curl -s https://raw.githubusercontent.com/babashka/babashka/master/install | bash && gem install nano-bots -v 2.1.0 && bash"
+    command: sh -c "apt-get update && apt-get install -y --no-install-recommends build-essential libffi-dev libsodium-dev lua5.4-dev curl && curl -s https://raw.githubusercontent.com/babashka/babashka/master/install | bash && gem install nano-bots -v 2.2.0 && bash"
     environment:
       GOOGLE_API_KEY: your-api-key
       NANO_BOTS_ENCRYPTION_PASSWORD: UNSAFE
@@ -225,7 +225,7 @@ services:
 services:
   nano-bots:
     image: ruby:3.2.2-slim-bookworm
-    command: sh -c "apt-get update && apt-get install -y --no-install-recommends build-essential libffi-dev libsodium-dev lua5.4-dev curl && curl -s https://raw.githubusercontent.com/babashka/babashka/master/install | bash && gem install nano-bots -v 2.1.0 && bash"
+    command: sh -c "apt-get update && apt-get install -y --no-install-recommends build-essential libffi-dev libsodium-dev lua5.4-dev curl && curl -s https://raw.githubusercontent.com/babashka/babashka/master/install | bash && gem install nano-bots -v 2.2.0 && bash"
     environment:
       GOOGLE_CREDENTIALS_FILE_PATH: /root/.config/google-credentials.json
       GOOGLE_REGION: us-east4
@@ -244,7 +244,7 @@ services:
 services:
   nano-bots:
     image: ruby:3.2.2-slim-bookworm
-    command: sh -c "apt-get update && apt-get install -y --no-install-recommends build-essential libffi-dev libsodium-dev lua5.4-dev curl && curl -s https://raw.githubusercontent.com/babashka/babashka/master/install | bash && gem install nano-bots -v 2.1.0 && bash"
+    command: sh -c "apt-get update && apt-get install -y --no-install-recommends build-essential libffi-dev libsodium-dev lua5.4-dev curl && curl -s https://raw.githubusercontent.com/babashka/babashka/master/install | bash && gem install nano-bots -v 2.2.0 && bash"
     environment:
       GOOGLE_REGION: us-east4
       NANO_BOTS_ENCRYPTION_PASSWORD: UNSAFE
@@ -745,5 +745,5 @@ gem build nano-bots.gemspec
 
 gem signin
 
-gem push nano-bots-2.1.0.gem
+gem push nano-bots-2.2.0.gem
 ```

data/components/providers/google.rb

@@ -130,46 +130,34 @@ module NanoBot
               end
             end
 
-            begin
-              @client.stream_generate_content(
-                Logic::Google::Tokens.apply_policies!(cartridge, payload),
-                stream: true, &stream_call_back
-              )
-
-              if tools&.size&.positive?
-                feedback.call(
-                  { should_be_stored: true,
-                    needs_another_round: true,
-                    interaction: { who: 'AI', message: nil, meta: { tool_calls: tools } } }
-                )
-                Tools.apply(
-                  cartridge, input[:tools], tools, feedback, Logic::Google::Tools
-                ).each do |interaction|
-                  feedback.call({ should_be_stored: true, needs_another_round: true, interaction: })
-                end
-              end
+            @client.stream_generate_content(
+              Logic::Google::Tokens.apply_policies!(cartridge, payload),
+              stream: true, &stream_call_back
+            )
 
+            if tools&.size&.positive?
               feedback.call(
-                { should_be_stored: !(content.nil? || content == ''),
-                  interaction: content.nil? || content == '' ? nil : { who: 'AI', message: content },
-                  finished: true }
+                { should_be_stored: true,
+                  needs_another_round: true,
+                  interaction: { who: 'AI', message: nil, meta: { tool_calls: tools } } }
               )
-            rescue StandardError => e
-              raise e.class, e.response[:body] if e.response && e.response[:body]
-
-              raise e
+              Tools.apply(
+                cartridge, input[:tools], tools, feedback, Logic::Google::Tools
+              ).each do |interaction|
+                feedback.call({ should_be_stored: true, needs_another_round: true, interaction: })
+              end
             end
-          else
-            begin
-              result = @client.stream_generate_content(
-                Logic::Google::Tokens.apply_policies!(cartridge, payload),
-                stream: false
-              )
-            rescue StandardError => e
-              raise e.class, e.response[:body] if e.response && e.response[:body]
 
-              raise e
-            end
+            feedback.call(
+              { should_be_stored: !(content.nil? || content == ''),
+                interaction: content.nil? || content == '' ? nil : { who: 'AI', message: content },
+                finished: true }
+            )
+          else
+            result = @client.stream_generate_content(
+              Logic::Google::Tokens.apply_policies!(cartridge, payload),
+              stream: false
+            )
 
             tools = result.dig(0, 'candidates', 0, 'content', 'parts').filter do |part|
               part.key?('functionCall')

data/controllers/interfaces/cli.rb

@@ -12,6 +12,9 @@ module NanoBot
           when 'version'
             puts NanoBot::GEM[:version]
             exit
+          when 'specification'
+            puts NanoBot::GEM[:specification]
+            exit
           when 'security'
             result = NanoBot.security.check
 
@@ -57,6 +60,7 @@ module NanoBot
             puts '  nb cartridge.yml STATE-KEY state'
             puts ''
             puts '  nb security'
+            puts '  nb specification'
             puts '  nb version'
             puts '  nb help'
             puts ''

data/controllers/interfaces/repl.rb

@@ -10,6 +10,21 @@ module NanoBot
   module Controllers
     module Interfaces
       module REPL
+        COMMANDS_TO_BE_REMOVED = [
+          'help', 'cd', 'find-method', 'ls', 'pry-backtrace', 'raise-up', 'reset', 'watch',
+          'whereami', 'wtf?', '!', 'amend-line', 'edit', 'hist', 'show-input', 'ri', 'show-doc',
+          'show-source', 'stat', 'import-set', 'play', '!!!', '!!@', '$', '?', '@', 'file-mode',
+          'history', 'quit', 'quit-program', 'reload-method', 'show-method', 'cat',
+          'change-inspector', 'change-prompt', 'clear-screen', 'fix-indent', 'list-inspectors',
+          'save-file', 'shell-mode', 'pry-version', 'reload-code', 'toggle-color', '!pry',
+          'disable-pry', 'jump-to', 'nesting', 'switch-to',
+          'pry-theme'
+        ].freeze
+
+        COMMANDS_TO_KEEP = [
+          '/whereami[!?]+/', '.<shell command>', 'exit', 'exit-all', 'exit-program'
+        ].freeze
+
         def self.boot(cartridge, session, prefix = nil, suffix = nil, as: 'repl')
           return unless Logic::Helpers::Hash.fetch(cartridge, %i[behaviors boot instruction])
 
@@ -31,13 +46,7 @@ module NanoBot
 
           prompt = self.prompt(cartridge)
 
-          Pry.config.prompt = Pry::Prompt.new(
-            'REPL',
-            'REPL Prompt',
-            [proc { prompt }, proc { 'MISSING INPUT' }]
-          )
-
-          Pry.commands.block_command(/(.*)/, 'handler') do |line|
+          handler = proc do |line|
             session.print(prefix) unless prefix.nil?
             session.evaluate_and_print(line, mode: 'repl')
             session.print(suffix) unless suffix.nil?
@@ -45,7 +54,43 @@ module NanoBot
             session.flush
           end
 
-          Pry.start
+          pry_prompt = Pry::Prompt.new(
+            'REPL',
+            'REPL Prompt',
+            [proc { prompt }, proc { 'MISSING INPUT' }]
+          )
+
+          pry_instance = Pry.new({ prompt: pry_prompt })
+
+          pry_instance.config.correct_indent = false
+
+          pry_instance.config.completer = Struct.new(:initialize, :call) do
+            def initialize(...); end
+            def call(...); end
+          end
+
+          first_whereami = true
+
+          pry_instance.config.commands.block_command(/whereami --quiet(.*)/, '/whereami[!?]+/') do |line|
+            unless first_whereami
+              handler.call(line.nil? ? 'whereami --quiet' : "whereami --quiet#{line}")
+            end
+            first_whereami = false
+          end
+
+          pry_instance.config.commands.block_command(/\.(.*)/, '.<shell command>') do |line|
+            handler.call(line.nil? ? '.' : ".#{line}")
+          end
+
+          COMMANDS_TO_BE_REMOVED.each do |command|
+            pry_instance.config.commands.block_command(command, 'handler') do |line|
+              handler.call(line.nil? ? command : "#{command} #{line}")
+            end
+          end
+
+          pry_instance.commands.block_command(/(.*)/, 'handler', &handler)
+
+          Pry::REPL.new(pry_instance).start
         end
 
         def self.prompt(cartridge)

data/docker-compose.example.yml

@@ -2,7 +2,7 @@
 services:
   nano-bots:
     image: ruby:3.2.2-slim-bookworm
-    command: sh -c "apt-get update && apt-get install -y --no-install-recommends build-essential libffi-dev libsodium-dev lua5.4-dev curl && curl -s https://raw.githubusercontent.com/babashka/babashka/master/install | bash && gem install nano-bots -v 2.1.0 && bash"
+    command: sh -c "apt-get update && apt-get install -y --no-install-recommends build-essential libffi-dev libsodium-dev lua5.4-dev curl && curl -s https://raw.githubusercontent.com/babashka/babashka/master/install | bash && gem install nano-bots -v 2.2.0 && bash"
     environment:
       OPENAI_API_ADDRESS: https://api.openai.com
       OPENAI_API_KEY: your-access-token

data/nano-bots.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'babosa', '~> 2.0'
   spec.add_dependency 'concurrent-ruby', '~> 1.2', '>= 1.2.2'
   spec.add_dependency 'dotenv', '~> 2.8', '>= 2.8.1'
-  spec.add_dependency 'gemini-ai', '~> 2.1'
+  spec.add_dependency 'gemini-ai', '~> 2.2'
   spec.add_dependency 'pry', '~> 0.14.2'
   spec.add_dependency 'rainbow', '~> 3.1', '>= 3.1.1'
   spec.add_dependency 'rbnacl', '~> 7.1', '>= 7.1.1'

data/static/gem.rb

@@ -3,7 +3,7 @@
 module NanoBot
   GEM = {
     name: 'nano-bots',
-    version: '2.1.0',
+    version: '2.2.0',
     specification: '2.0.1',
     author: 'icebaker',
     summary: 'Ruby Implementation of Nano Bots: small, AI-powered bots for OpenAI ChatGPT and Google Gemini.',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nano-bots
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - icebaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-16 00:00:00.000000000 Z
+date: 2023-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: babosa
@@ -70,14 +70,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -248,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.4.22
 signing_key: 
 specification_version: 4
 summary: 'Ruby Implementation of Nano Bots: small, AI-powered bots for OpenAI ChatGPT