nano-bots 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e12fcee02d6989ee95b464eb0f7bf6f7da9a72e45cabae5aa97b08ce808f500
-  data.tar.gz: b6e6b6c53be1de5c990b07a0ecceae22378edd01c8a4db1825c030a8757aed15
+  metadata.gz: f6ee7d534a42c2e11bc5a66d81b4a3c6baad7bb9e72ceb8ac4ad4735ac2f9d78
+  data.tar.gz: 8cfaf1303ad1f65b4b50f99c860252c93d2817d6e0a5b3d3ee978d08397ebaa8
 SHA512:
-  metadata.gz: b4869bdde28e1e84f86a2c44adabb92b3265d64ad5b232dbe0dfe93d1953826145548276268b2bca915930da5e2f8104e69411c35924e20d47b98331fca19a3e
-  data.tar.gz: 6a853ba120e634cbe35e6c721a7681a614ba3688a76108fea6f0141014d928e8993760b99642facfafe78c55f1bcbb62cad34569b27912bd6598515395588d65
+  metadata.gz: 114798cb6c752de8d01297c5a6359b25c7d80d6b63b07a5c47f5ed4d677c0454ee0848ba412251f6ef81db02efd3ce285d6aaa08908ff3143d27d80d84315d16
+  data.tar.gz: 6fcbd9a54554b23aff0767fe002e6435d2f09007bf7190c98179b6998512fa003898403a59f025e4c97204e6128877dde52dd48e17b986ab9b8cd1a568dc988f

data/Gemfile

@@ -7,6 +7,6 @@ gemspec
 group :test, :development do
   gem 'pry-byebug', '~> 3.10', '>= 3.10.1'
   gem 'rspec', '~> 3.13'
-  gem 'rubocop', '~> 1.63', '>= 1.63.5'
-  gem 'rubocop-rspec', '~> 2.29', '>= 2.29.2'
+  gem 'rubocop', '~> 1.64', '>= 1.64.1'
+  gem 'rubocop-rspec', '~> 3.0', '>= 3.0.1'
 end

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    nano-bots (3.1.0)
+    nano-bots (3.2.0)
       babosa (~> 2.0)
       cohere-ai (~> 1.1)
-      concurrent-ruby (~> 1.2, >= 1.2.3)
+      concurrent-ruby (~> 1.3, >= 1.3.3)
       dotenv (~> 3.1, >= 3.1.2)
-      faraday (~> 2.9)
+      faraday (~> 2.9, >= 2.9.2)
       faraday-typhoeus (~> 1.1)
       gemini-ai (~> 4.0)
       maritaca-ai (~> 1.2)
@@ -16,15 +16,15 @@ PATH
       rainbow (~> 3.1, >= 3.1.1)
       rbnacl (~> 7.1, >= 7.1.1)
       redcarpet (~> 3.6)
-      ruby-openai (~> 7.0, >= 7.0.1)
-      sweet-moon (~> 0.0.7)
+      ruby-openai (~> 7.1)
+      sweet-moon (~> 1.0)
       typhoeus (~> 1.4, >= 1.4.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     ast (2.4.2)
     babosa (2.0.0)
     base64 (0.2.0)
@@ -33,13 +33,13 @@ GEM
     cohere-ai (1.1.0)
       faraday (~> 2.9)
       faraday-typhoeus (~> 1.1)
-    concurrent-ruby (1.2.3)
+    concurrent-ruby (1.3.3)
     diff-lcs (1.5.1)
     dotenv (3.1.2)
     ethon (0.16.0)
       ffi (>= 1.15.0)
     event_stream_parser (1.0.0)
-    faraday (2.9.0)
+    faraday (2.9.2)
       faraday-net_http (>= 2.0, < 3.2)
     faraday-multipart (1.0.4)
       multipart-post (~> 2)
@@ -48,7 +48,7 @@ GEM
     faraday-typhoeus (1.1.0)
       faraday (~> 2.0)
       typhoeus (~> 1.4)
-    ffi (1.16.3)
+    ffi (1.17.0)
     gemini-ai (4.0.0)
       event_stream_parser (~> 1.0)
       faraday (~> 2.9)
@@ -65,7 +65,7 @@ GEM
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
     json (2.7.2)
-    jwt (2.8.1)
+    jwt (2.8.2)
       base64
     language_server-protocol (3.17.0.3)
     maritaca-ai (1.2.0)
@@ -85,8 +85,8 @@ GEM
       faraday (~> 2.9)
       faraday-typhoeus (~> 1.1)
     os (1.1.4)
-    parallel (1.24.0)
-    parser (3.3.1.0)
+    parallel (1.25.1)
+    parser (3.3.3.0)
       ast (~> 2.4.1)
       racc
     pry (0.14.2)
@@ -95,29 +95,29 @@ GEM
     pry-byebug (3.10.1)
       byebug (~> 11.0)
       pry (>= 0.13, < 0.15)
-    public_suffix (5.0.5)
-    racc (1.7.3)
+    public_suffix (6.0.0)
+    racc (1.8.0)
     rainbow (3.1.1)
     rbnacl (7.1.1)
       ffi
     redcarpet (3.6.0)
     regexp_parser (2.9.2)
-    rexml (3.2.8)
-      strscan (>= 3.0.9)
+    rexml (3.3.0)
+      strscan
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
     rspec-core (3.13.0)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.0)
+    rspec-expectations (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.1)
-    rubocop (1.63.5)
+    rubocop (1.64.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -130,18 +130,9 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.31.3)
       parser (>= 3.3.1.0)
-    rubocop-capybara (2.20.0)
-      rubocop (~> 1.41)
-    rubocop-factory_bot (2.25.1)
-      rubocop (~> 1.41)
-    rubocop-rspec (2.29.2)
-      rubocop (~> 1.40)
-      rubocop-capybara (~> 2.17)
-      rubocop-factory_bot (~> 2.22)
-      rubocop-rspec_rails (~> 2.28)
-    rubocop-rspec_rails (2.28.3)
-      rubocop (~> 1.40)
-    ruby-openai (7.0.1)
+    rubocop-rspec (3.0.1)
+      rubocop (~> 1.61)
+    ruby-openai (7.1.0)
       event_stream_parser (>= 0.3.0, < 2.0.0)
       faraday (>= 1)
       faraday-multipart (>= 1)
@@ -152,8 +143,8 @@ GEM
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
     strscan (3.1.0)
-    sweet-moon (0.0.7)
-      ffi (~> 1.15, >= 1.15.5)
+    sweet-moon (1.0.0)
+      ffi (~> 1.17)
     typhoeus (1.4.1)
       ethon (>= 0.9.0)
     unicode-display_width (2.5.0)
@@ -166,8 +157,8 @@ DEPENDENCIES
   nano-bots!
   pry-byebug (~> 3.10, >= 3.10.1)
   rspec (~> 3.13)
-  rubocop (~> 1.63, >= 1.63.5)
-  rubocop-rspec (~> 2.29, >= 2.29.2)
+  rubocop (~> 1.64, >= 1.64.1)
+  rubocop-rspec (~> 3.0, >= 3.0.1)
 
 BUNDLED WITH
    2.4.22

data/README.md

@@ -9,7 +9,7 @@ https://user-images.githubusercontent.com/113217272/238141567-c58a240c-7b67-4b3b
 ## TL;DR and Quick Start
 
 ```sh
-gem install nano-bots -v 3.1.0
+gem install nano-bots -v 3.2.0
 ```
 
 ```bash
@@ -59,7 +59,7 @@ nb gpt.yml - eval "hi"
 ```
 
 ```ruby
-gem 'nano-bots', '~> 3.1.0'
+gem 'nano-bots', '~> 3.2.0'
 ```
 
 ```ruby
@@ -250,13 +250,13 @@ end
 To install the CLI on your system:
 
 ```sh
-gem install nano-bots -v 3.1.0
+gem install nano-bots -v 3.2.0
 ```
 
 To use it in a Ruby project as a library, add to your `Gemfile`:
 
 ```ruby
-gem 'nano-bots', '~> 3.1.0'
+gem 'nano-bots', '~> 3.2.0'
 ```
 
 ```sh
@@ -971,8 +971,8 @@ Set your provider credentials and choose your desired path for the cartridges fi
 ---
 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 3.1.0 && bash"
+    image: ruby:3.3.3-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 3.2.0 && bash"
     environment:
       COHERE_API_KEY: your-api-key
       NANO_BOTS_ENCRYPTION_PASSWORD: UNSAFE
@@ -988,8 +988,8 @@ 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 3.1.0 && bash"
+    image: ruby:3.3.3-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 3.2.0 && bash"
     environment:
       MARITACA_API_KEY: your-api-key
       NANO_BOTS_ENCRYPTION_PASSWORD: UNSAFE
@@ -1005,8 +1005,8 @@ 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 3.1.0 && bash"
+    image: ruby:3.3.3-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 3.2.0 && bash"
     environment:
       MISTRAL_API_KEY: your-api-key
       NANO_BOTS_ENCRYPTION_PASSWORD: UNSAFE
@@ -1024,8 +1024,8 @@ Remember that your `localhost` is by default inaccessible from inside Docker. Yo
 ---
 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 3.1.0 && bash"
+    image: ruby:3.3.3-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 3.2.0 && bash"
     environment:
       OLLAMA_API_ADDRESS: http://localhost:11434
       NANO_BOTS_ENCRYPTION_PASSWORD: UNSAFE
@@ -1043,8 +1043,8 @@ 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 3.1.0 && bash"
+    image: ruby:3.3.3-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 3.2.0 && bash"
     environment:
       OPENAI_API_KEY: your-access-token
       NANO_BOTS_ENCRYPTION_PASSWORD: UNSAFE
@@ -1062,8 +1062,8 @@ 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 3.1.0 && bash"
+    image: ruby:3.3.3-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 3.2.0 && bash"
     environment:
       GOOGLE_API_KEY: your-api-key
       NANO_BOTS_ENCRYPTION_PASSWORD: UNSAFE
@@ -1079,8 +1079,8 @@ 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 3.1.0 && bash"
+    image: ruby:3.3.3-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 3.2.0 && bash"
     environment:
       GOOGLE_CREDENTIALS_FILE_PATH: /root/.config/google-credentials.json
       GOOGLE_REGION: us-east4
@@ -1098,8 +1098,8 @@ 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 3.1.0 && bash"
+    image: ruby:3.3.3-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 3.2.0 && bash"
     environment:
       GOOGLE_REGION: us-east4
       NANO_BOTS_ENCRYPTION_PASSWORD: UNSAFE
@@ -1161,5 +1161,5 @@ gem build nano-bots.gemspec
 
 gem signin
 
-gem push nano-bots-3.1.0.gem
+gem push nano-bots-3.2.0.gem
 ```

data/components/providers/google.rb

@@ -28,6 +28,8 @@ module NanoBot
         def initialize(options, settings, credentials, _environment)
           @settings = settings
 
+          @service = credentials[:service]
+
           gemini_options = options.transform_keys { |key| key.to_s.gsub('-', '_').to_sym }
 
           unless gemini_options.key?(:stream)
@@ -82,11 +84,18 @@ module NanoBot
 
           payload = { contents: messages, generationConfig: { candidateCount: 1 } }
 
-          if input[:behavior][:directive]
+          if input[:behavior][:directive] && @service == 'vertex-ai-api'
             payload[:system_instruction] = {
               role: 'user',
               parts: { text: input[:behavior][:directive] }
             }
+          elsif input[:behavior][:directive]
+            # TODO: Will generative-language-api support system instructions?
+            messages.prepend(
+              { role: 'user',
+                parts: { text: input[:behavior][:directive] },
+                _meta: { at: Time.now } }
+            )
           end
 
           if @settings
@@ -124,13 +133,13 @@ module NanoBot
               # TODO: How to better handle finishReason == 'OTHER'?
               return if event.dig('candidates', 0, 'finishReason') == 'OTHER'
 
-              partial_content = event.dig('candidates', 0, 'content', 'parts').filter do |part|
+              partial_content = event.dig('candidates', 0, 'content', 'parts')&.filter do |part|
                 part.key?('text')
-              end.map { |part| part['text'] }.join
+              end&.map { |part| part['text'] }&.join || ''
 
-              partial_tools = event.dig('candidates', 0, 'content', 'parts').filter do |part|
+              partial_tools = event.dig('candidates', 0, 'content', 'parts')&.filter do |part|
                 part.key?('functionCall')
-              end
+              end || []
 
               tools.concat(partial_tools) if partial_tools.size.positive?
 
@@ -142,10 +151,9 @@ module NanoBot
                 )
               end
 
-              if event.dig('candidates', 0, 'finishReason')
-                # TODO: This does not have the same behavior as OpenAI, so you should
-                #       not use it as a reference for the end of the streaming.
-                #       Is this a bug from the Google Gemini REST API or expected behavior?
+              if event.dig('candidates', 0, 'finishReason') == 'SAFETY'
+                reasons = event.dig('candidates', 0, 'safetyRatings')
+                raise StandardError, "Generation stopped for safety reasons: #{reasons}"
               end
             end
 

data/docker-compose.example.yml

@@ -1,8 +1,8 @@
 ---
 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 3.1.0 && bash"
+    image: ruby:3.3.3-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 3.2.0 && bash"
     environment:
       COHERE_API_KEY: your-api-key
 

data/logic/cartridge/parser.rb

@@ -94,7 +94,7 @@ module NanoBot
           LANGUAGES = LANGUAGES_MAP.keys.freeze
 
           def initialize(...)
-            super(...)
+            super
             @_nano_bots_blocks = []
           end
 

data/nano-bots.gemspec

@@ -32,22 +32,22 @@ Gem::Specification.new do |spec|
   spec.executables = ['nb']
 
   spec.add_dependency 'babosa', '~> 2.0'
-  spec.add_dependency 'concurrent-ruby', '~> 1.2', '>= 1.2.3'
+  spec.add_dependency 'concurrent-ruby', '~> 1.3', '>= 1.3.3'
   spec.add_dependency 'dotenv', '~> 3.1', '>= 3.1.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'
   spec.add_dependency 'redcarpet', '~> 3.6'
-  spec.add_dependency 'sweet-moon', '~> 0.0.7'
+  spec.add_dependency 'sweet-moon', '~> 1.0'
 
   spec.add_dependency 'cohere-ai', '~> 1.1'
   spec.add_dependency 'gemini-ai', '~> 4.0'
   spec.add_dependency 'maritaca-ai', '~> 1.2'
   spec.add_dependency 'mistral-ai', '~> 1.2'
   spec.add_dependency 'ollama-ai', '~> 1.2', '>= 1.2.1'
-  spec.add_dependency 'ruby-openai', '~> 7.0', '>= 7.0.1'
+  spec.add_dependency 'ruby-openai', '~> 7.1'
 
-  spec.add_dependency 'faraday', '~> 2.9'
+  spec.add_dependency 'faraday', '~> 2.9', '>= 2.9.2'
   spec.add_dependency 'faraday-typhoeus', '~> 1.1'
   spec.add_dependency 'typhoeus', '~> 1.4', '>= 1.4.1'