nano-bots 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2597a22180cd4e9feb55c7780fa831b682485c7158c4a562833856a87822f679
-  data.tar.gz: 22c3bcaf6d5c61525b2e26ecc5f70e82d723cf022e7c218ffa1f3e7ce2052a58
+  metadata.gz: 1cfd38c6461b14483fc0478d31b73ed3e4890f1c534b3c7a4ead6f9412466674
+  data.tar.gz: 11f3e82a196f8b27ac1313ee2e653c93521ed7c081ef68bacf15015c8392db34
 SHA512:
-  metadata.gz: 1afd6b0ddb4918b7cc38a1a4db8355653dad04023791c04b5ef5c69b0e69ff42298bbc903972179ebe21e2bb1a8d429928f59df64903ad5d068fa38059a89d21
-  data.tar.gz: 719a91a7351ea0557780ce06a436e1fee35824281c921f74a866a4c51bce8f9605157b7ef5bd27763a693885856bad87499164bb32f742a59a1130bf8879f597
+  metadata.gz: b6a7dbb69afead0f718e2b3c688edb35dfce6f68f138ddd5168c9d72b5eaaedbdcf973b99be873709c4f6b63f71a3f35c9a5d06a0ca4efd32800c52b6de3ccc0
+  data.tar.gz: 24bf5641942d008e7afbad2ae37fec1a4f37d28c68b3ab0ab3f560849f8b427a246f5c9c29ddc9221852bbb3cd5e86bb958c9fbff392a0cca0fab81d9c3b0171

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    nano-bots (2.0.0)
+    nano-bots (2.1.0)
       babosa (~> 2.0)
       concurrent-ruby (~> 1.2, >= 1.2.2)
       dotenv (~> 2.8, >= 2.8.1)
-      gemini-ai (~> 2.0)
+      gemini-ai (~> 2.1)
       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.0.0)
+    gemini-ai (2.1.0)
       event_stream_parser (~> 1.0)
       faraday (~> 2.7, >= 2.7.12)
       googleauth (~> 1.9, >= 1.9.1)
@@ -54,7 +54,7 @@ GEM
     multi_json (1.15.0)
     multipart-post (2.3.0)
     os (1.1.4)
-    parallel (1.23.0)
+    parallel (1.24.0)
     parser (3.2.2.4)
       ast (~> 2.4.1)
       racc
@@ -131,4 +131,4 @@ DEPENDENCIES
   rubocop-rspec (~> 2.25)
 
 BUNDLED WITH
-   2.4.13
+   2.4.22

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.0.0
+gem install nano-bots -v 2.1.0
 ```
 
 To use it in a project, add it to your `Gemfile`:
 
 ```ruby
-gem 'nano-bots', '~> 2.0.0'
+gem 'nano-bots', '~> 2.1.0'
 ```
 
 ```sh
@@ -105,11 +105,10 @@ NANO_BOTS_END_USER=your-user
 # NANO_BOTS_CARTRIDGES_DIRECTORY=/home/user/.local/share/nano-bots/cartridges
 ```
 
-#### Option 2: Service Account (Vertex AI API)
+#### Option 2: Service Account Credentials File (Vertex AI API)
 
 ```sh
 export GOOGLE_CREDENTIALS_FILE_PATH=google-credentials.json
-export GOOGLE_PROJECT_ID=your-project-id
 export GOOGLE_REGION=us-east4
 
 export NANO_BOTS_ENCRYPTION_PASSWORD=UNSAFE
@@ -123,7 +122,6 @@ Alternatively, if your current directory has a `.env` file with the environment
 
 ```sh
 GOOGLE_CREDENTIALS_FILE_PATH=google-credentials.json
-GOOGLE_PROJECT_ID=your-project-id
 GOOGLE_REGION=us-east4
 
 NANO_BOTS_ENCRYPTION_PASSWORD=UNSAFE
@@ -133,6 +131,44 @@ NANO_BOTS_END_USER=your-user
 # NANO_BOTS_CARTRIDGES_DIRECTORY=/home/user/.local/share/nano-bots/cartridges
 ```
 
+#### Option 3: Application Default Credentials (Vertex AI API)
+
+```sh
+export GOOGLE_REGION=us-east4
+
+export NANO_BOTS_ENCRYPTION_PASSWORD=UNSAFE
+export NANO_BOTS_END_USER=your-user
+
+# export NANO_BOTS_STATE_DIRECTORY=/home/user/.local/state/nano-bots
+# export NANO_BOTS_CARTRIDGES_DIRECTORY=/home/user/.local/share/nano-bots/cartridges
+```
+
+Alternatively, if your current directory has a `.env` file with the environment variables, they will be automatically loaded:
+
+```sh
+GOOGLE_REGION=us-east4
+
+NANO_BOTS_ENCRYPTION_PASSWORD=UNSAFE
+NANO_BOTS_END_USER=your-user
+
+# NANO_BOTS_STATE_DIRECTORY=/home/user/.local/state/nano-bots
+# NANO_BOTS_CARTRIDGES_DIRECTORY=/home/user/.local/share/nano-bots/cartridges
+```
+
+#### Custom Project ID
+
+If you need to manually set a Google Project ID:
+
+```sh
+export GOOGLE_PROJECT_ID=your-project-id
+```
+
+Alternatively, if your current directory has a `.env` file with the environment variables, they will be automatically loaded:
+
+```sh
+GOOGLE_PROJECT_ID=your-project-id
+```
+
 ## Docker
 
 Clone the repository and copy the Docker Compose template:
@@ -152,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.0.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.1.0 && bash"
     environment:
       OPENAI_API_ADDRESS: https://api.openai.com
       OPENAI_API_KEY: your-access-token
@@ -172,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.0.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.1.0 && bash"
     environment:
       GOOGLE_API_KEY: your-api-key
       NANO_BOTS_ENCRYPTION_PASSWORD: UNSAFE
@@ -182,17 +218,16 @@ services:
       - ./your-state-path:/root/.local/state/nano-bots
 ```
 
-#### Option 2: Service Account (Vertex AI API)
+#### Option 2: Service Account Credentials File (Vertex AI API)
 
 ```yaml
 ---
 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.0.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.1.0 && bash"
     environment:
       GOOGLE_CREDENTIALS_FILE_PATH: /root/.config/google-credentials.json
-      GOOGLE_PROJECT_ID: your-project-id
       GOOGLE_REGION: us-east4
       NANO_BOTS_ENCRYPTION_PASSWORD: UNSAFE
       NANO_BOTS_END_USER: your-user
@@ -202,6 +237,31 @@ services:
       - ./your-state-path:/root/.local/state/nano-bots
 ```
 
+#### Option 3: Application Default Credentials (Vertex AI API)
+
+```yaml
+---
+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"
+    environment:
+      GOOGLE_REGION: us-east4
+      NANO_BOTS_ENCRYPTION_PASSWORD: UNSAFE
+      NANO_BOTS_END_USER: your-user
+    volumes:
+      - ./your-cartridges:/root/.local/share/nano-bots/cartridges
+      - ./your-state-path:/root/.local/state/nano-bots
+```
+
+#### Custom Project ID
+If you need to manually set a Google Project ID:
+
+```yaml
+environment:
+  GOOGLE_PROJECT_ID=your-project-id
+```
+
 ### Container
 
 Enter the container:
@@ -416,7 +476,7 @@ provider:
     model: gemini-pro
 ```
 
-#### Option 2: Service Account (Vertex AI API)
+#### Option 2: Service Account Credentials File (Vertex AI API)
 
 ```yaml
 ---
@@ -437,12 +497,48 @@ provider:
   credentials:
     service: vertex-ai-api
     file-path: ENV/GOOGLE_CREDENTIALS_FILE_PATH
-    project-id: ENV/GOOGLE_PROJECT_ID
     region: ENV/GOOGLE_REGION
   options:
     model: gemini-pro
 ```
 
+#### Option 3: Application Default Credentials (Vertex AI API)
+
+```yaml
+---
+meta:
+  symbol: 🤖
+  name: Nano Bot Name
+  author: Your Name
+  version: 1.0.0
+  license: CC0-1.0
+  description: A helpful assistant.
+
+behaviors:
+  interaction:
+    directive: You are a helpful assistant.
+
+provider:
+  id: google
+  credentials:
+    service: vertex-ai-api
+    region: ENV/GOOGLE_REGION
+  options:
+    model: gemini-pro
+```
+
+#### Custom Project ID
+
+If you need to manually set a Google Project ID:
+
+```yaml
+---
+provider:
+  id: google
+  credentials:
+    project-id: ENV/GOOGLE_PROJECT_ID
+```
+
 ### Tools (Functions)
 
 Nano Bots can also be powered by _Tools_ (Functions):
@@ -649,5 +745,5 @@ gem build nano-bots.gemspec
 
 gem signin
 
-gem push nano-bots-2.0.0.gem
+gem push nano-bots-2.1.0.gem
 ```

data/components/providers/google.rb

@@ -26,25 +26,9 @@ module NanoBot
         def initialize(options, settings, credentials, _environment)
           @settings = settings
 
-          gemini_credentials = if credentials[:'api-key']
-                                 {
-                                   service: credentials[:service],
-                                   api_key: credentials[:'api-key'],
-                                   project_id: credentials[:'project-id'],
-                                   region: credentials[:region]
-                                 }
-                               else
-                                 {
-                                   service: credentials[:service],
-                                   file_path: credentials[:'file-path'],
-                                   project_id: credentials[:'project-id'],
-                                   region: credentials[:region]
-                                 }
-                               end
-
           @client = Gemini.new(
-            credentials: gemini_credentials,
-            options: { model: options[:model], stream: options[:stream] }
+            credentials: credentials.transform_keys { |key| key.to_s.gsub('-', '_').to_sym },
+            options: options.transform_keys { |key| key.to_s.gsub('-', '_').to_sym }
           )
         end
 
@@ -70,6 +54,7 @@ module NanoBot
             end
           end
 
+          # TODO: Does Gemini have system messages?
           %i[backdrop directive].each do |key|
             next unless input[:behavior][key]
 
@@ -79,7 +64,6 @@ module NanoBot
                 _meta: { at: Time.now } }
             )
 
-            # TODO: Does Gemini have system messages?
             messages.prepend(
               { role: 'user',
                 parts: { text: input[:behavior][key] },
@@ -140,24 +124,9 @@ module NanoBot
               end
 
               if event.dig('candidates', 0, 'finishReason')
-                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
-
-                feedback.call(
-                  { should_be_stored: !(content.nil? || content == ''),
-                    interaction: content.nil? || content == '' ? nil : { who: 'AI', message: content },
-                    finished: true }
-                )
+                # 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?
               end
             end
 
@@ -166,6 +135,25 @@ module NanoBot
                 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
+
+              feedback.call(
+                { should_be_stored: !(content.nil? || content == ''),
+                  interaction: content.nil? || content == '' ? nil : { who: 'AI', message: content },
+                  finished: true }
+              )
             rescue StandardError => e
               raise e.class, e.response[:body] if e.response && e.response[:body]
 

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.0.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.1.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.0'
+  spec.add_dependency 'gemini-ai', '~> 2.1'
   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/ports/dsl/nano-bots.rb

@@ -40,4 +40,8 @@ module NanoBot
   def self.version
     NanoBot::GEM[:version]
   end
+
+  def self.specification
+    NanoBot::GEM[:specification]
+  end
 end

data/static/gem.rb

@@ -3,7 +3,8 @@
 module NanoBot
   GEM = {
     name: 'nano-bots',
-    version: '2.0.0',
+    version: '2.1.0',
+    specification: '2.0.1',
     author: 'icebaker',
     summary: 'Ruby Implementation of Nano Bots: small, AI-powered bots for OpenAI ChatGPT and Google Gemini.',
     description: 'Ruby Implementation of Nano Bots: small, AI-powered bots that can be easily shared as a single file, designed to support multiple providers such as OpenAI ChatGPT and Google Gemini, with support for calling Tools (Functions).',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nano-bots
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - icebaker
@@ -70,14 +70,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !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.4.22
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
 summary: 'Ruby Implementation of Nano Bots: small, AI-powered bots for OpenAI ChatGPT