nano-bots 2.5.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 077e36f5c1311458df59a5bd3d25f2f9acc91743d170fdb85977d1bdf7dfe340
-  data.tar.gz: 8075322ca00d6d948326d6283dd958a456978f731bef75e82c20dd1cc6f4ac86
+  metadata.gz: e8c2efff966a76151fb23a83f4c77bc5af780f31898194747c53d8ddd2ff2877
+  data.tar.gz: 94642cd59c39f0f9d308e97fe3736bb3d89f529928d3e3896f4c1351a2f10fed
 SHA512:
-  metadata.gz: 10cb687eb3cce616701032bb91b298e3ae6567d1ae69bdb5a78964af4f5d1dd575e09c792b06d7710b0abba06ce2597bb4df4fd0c0b3e58575965f9d601416de
-  data.tar.gz: 5e33d292187460bc88bf4e857d1d8fb0147098b62b8b1e91efe229ce556855185bb2fb370064f87f8b240a2cba38538c8f8eddf1e7f923fbaff10e8683ee123b
+  metadata.gz: ff0d2f67a1126a43443cd231184ad3dd02dea9c34178d6aa5da4c49cfdcceb137ab24af7bbaaad83d3e9c61d7019b2ba2950c15b7c1c7d072abc24de8eb8a5a7
+  data.tar.gz: 6850151d3af95c232c800e891e4c6ef8ee610030e6f9e45d24c623d497b1d61804f4b709e35b682ad89781fbb5b304d2e9b1048ae0150abaffdec9a0b2084f03

data/Gemfile

@@ -8,5 +8,5 @@ group :test, :development do
   gem 'pry-byebug', '~> 3.10', '>= 3.10.1'
   gem 'rspec', '~> 3.12'
   gem 'rubocop', '~> 1.59'
-  gem 'rubocop-rspec', '~> 2.25'
+  gem 'rubocop-rspec', '~> 2.26', '>= 2.26.1'
 end

data/Gemfile.lock

@@ -1,18 +1,19 @@
 PATH
   remote: .
   specs:
-    nano-bots (2.5.0)
+    nano-bots (3.0.0)
       babosa (~> 2.0)
       cohere-ai (~> 1.0, >= 1.0.1)
       concurrent-ruby (~> 1.2, >= 1.2.2)
       dotenv (~> 2.8, >= 2.8.1)
       gemini-ai (~> 3.1, >= 3.1.2)
       maritaca-ai (~> 1.0)
-      mistral-ai (~> 1.1)
+      mistral-ai (~> 1.1, >= 1.1.1)
       ollama-ai (~> 1.0)
       pry (~> 0.14.2)
       rainbow (~> 3.1, >= 3.1.1)
       rbnacl (~> 7.1, >= 7.1.1)
+      redcarpet (~> 3.6)
       ruby-openai (~> 6.3, >= 6.3.1)
       sweet-moon (~> 0.0.7)
 
@@ -23,7 +24,6 @@ GEM
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     babosa (2.0.0)
-    base64 (0.2.0)
     byebug (11.1.3)
     coderay (1.1.3)
     cohere-ai (1.0.1)
@@ -32,13 +32,12 @@ GEM
     diff-lcs (1.5.0)
     dotenv (2.8.1)
     event_stream_parser (1.0.0)
-    faraday (2.8.1)
-      base64
-      faraday-net_http (>= 2.0, < 3.1)
-      ruby2_keywords (>= 0.0.4)
+    faraday (2.9.0)
+      faraday-net_http (>= 2.0, < 3.2)
     faraday-multipart (1.0.4)
       multipart-post (~> 2)
-    faraday-net_http (3.0.2)
+    faraday-net_http (3.1.0)
+      net-http
     ffi (1.16.3)
     gemini-ai (3.1.2)
       event_stream_parser (~> 1.0)
@@ -59,16 +58,18 @@ GEM
     maritaca-ai (1.0.0)
       faraday (~> 2.8, >= 2.8.1)
     method_source (1.0.0)
-    mistral-ai (1.1.0)
+    mistral-ai (1.1.1)
       event_stream_parser (~> 1.0)
       faraday (~> 2.8, >= 2.8.1)
     multi_json (1.15.0)
     multipart-post (2.3.0)
+    net-http (0.4.1)
+      uri
     ollama-ai (1.0.0)
       faraday (~> 2.8)
     os (1.1.4)
     parallel (1.24.0)
-    parser (3.3.0.0)
+    parser (3.3.0.2)
       ast (~> 2.4.1)
       racc
     pry (0.14.2)
@@ -82,7 +83,8 @@ GEM
     rainbow (3.1.1)
     rbnacl (7.1.1)
       ffi
-    regexp_parser (2.8.3)
+    redcarpet (3.6.0)
+    regexp_parser (2.9.0)
     rexml (3.2.6)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
@@ -112,8 +114,8 @@ GEM
       parser (>= 3.2.1.0)
     rubocop-capybara (2.20.0)
       rubocop (~> 1.41)
-    rubocop-factory_bot (2.25.0)
-      rubocop (~> 1.33)
+    rubocop-factory_bot (2.25.1)
+      rubocop (~> 1.41)
     rubocop-rspec (2.26.1)
       rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
@@ -123,7 +125,6 @@ GEM
       faraday (>= 1)
       faraday-multipart (>= 1)
     ruby-progressbar (1.13.0)
-    ruby2_keywords (0.0.5)
     signet (0.18.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
@@ -132,6 +133,7 @@ GEM
     sweet-moon (0.0.7)
       ffi (~> 1.15, >= 1.15.5)
     unicode-display_width (2.5.0)
+    uri (0.13.0)
 
 PLATFORMS
   x86_64-linux
@@ -141,7 +143,7 @@ DEPENDENCIES
   pry-byebug (~> 3.10, >= 3.10.1)
   rspec (~> 3.12)
   rubocop (~> 1.59)
-  rubocop-rspec (~> 2.25)
+  rubocop-rspec (~> 2.26, >= 2.26.1)
 
 BUNDLED WITH
    2.4.22

data/README.md

@@ -1,6 +1,6 @@
 # Nano Bots 💎 🤖
 
-An implementation of the [Nano Bots](https://spec.nbots.io) specification with support for [Cohere Command](https://cohere.com), [Google Gemini](https://deepmind.google/technologies/gemini), [Maritaca AI MariTalk](https://www.maritaca.ai), [Mistral AI](https://mistral.ai), [Ollama](https://ollama.ai), [OpenAI ChatGPT](https://openai.com/chatgpt), and others.
+An implementation of the [Nano Bots](https://spec.nbots.io) specification with support for [Cohere Command](https://cohere.com), [Google Gemini](https://deepmind.google/technologies/gemini), [Maritaca AI MariTalk](https://www.maritaca.ai), [Mistral AI](https://mistral.ai), [Ollama](https://ollama.ai), [OpenAI ChatGPT](https://openai.com/chatgpt), and others, with support for calling tools (functions).
 
 ![Ruby Nano Bots](https://raw.githubusercontent.com/icebaker/assets/main/nano-bots/ruby-nano-bots-canvas.png)
 
@@ -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 2.5.0
+gem install nano-bots -v 3.0.0
 ```
 
 ```bash
@@ -34,13 +34,22 @@ well. How can I assist you?
 ---
 meta:
   symbol: 🤖
-  name: ChatGPT
+  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: openai
   credentials:
     access-token: ENV/OPENAI_API_KEY
   settings:
+    user: ENV/NANO_BOTS_END_USER
     model: gpt-4-1106-preview
 ```
 
@@ -50,7 +59,7 @@ nb gpt.yml - eval "hi"
 ```
 
 ```ruby
-gem 'nano-bots', '~> 2.5.0'
+gem 'nano-bots', '~> 3.0.0'
 ```
 
 ```ruby
@@ -241,13 +250,13 @@ end
 To install the CLI on your system:
 
 ```sh
-gem install nano-bots -v 2.5.0
+gem install nano-bots -v 3.0.0
 ```
 
 To use it in a Ruby project as a library, add to your `Gemfile`:
 
 ```ruby
-gem 'nano-bots', '~> 2.5.0'
+gem 'nano-bots', '~> 3.0.0'
 ```
 
 ```sh
@@ -260,8 +269,8 @@ For credentials and configurations, relevant environment variables can be set in
 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
+# export NANO_BOTS_STATE_PATH=/home/user/.local/state/nano-bots
+# export NANO_BOTS_CARTRIDGES_PATH=/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:
@@ -270,8 +279,8 @@ Alternatively, if your current directory has a `.env` file with the environment
 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
+# NANO_BOTS_STATE_PATH=/home/user/.local/state/nano-bots
+# NANO_BOTS_CARTRIDGES_PATH=/home/user/.local/share/nano-bots/cartridges
 ```
 
 ### Cohere Command
@@ -954,7 +963,7 @@ cd ruby-nano-bots
 cp docker-compose.example.yml docker-compose.yml
 ```
 
-Set your provider credentials and choose your desired directory for the cartridges files:
+Set your provider credentials and choose your desired path for the cartridges files:
 
 ### Cohere Command Container
 
@@ -963,7 +972,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.5.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 3.0.0 && bash"
     environment:
       COHERE_API_KEY: your-api-key
       NANO_BOTS_ENCRYPTION_PASSWORD: UNSAFE
@@ -980,7 +989,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.5.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 3.0.0 && bash"
     environment:
       MARITACA_API_KEY: your-api-key
       NANO_BOTS_ENCRYPTION_PASSWORD: UNSAFE
@@ -997,7 +1006,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.5.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 3.0.0 && bash"
     environment:
       MISTRAL_API_KEY: your-api-key
       NANO_BOTS_ENCRYPTION_PASSWORD: UNSAFE
@@ -1009,21 +1018,23 @@ services:
 
 ### Ollama Container
 
-Remember that your `localhost` is inaccessible from inside Docker. You need to either establish [inter-container networking](https://docs.docker.com/compose/networking/) or use the [host's address](https://docs.docker.com/desktop/networking/#i-want-to-connect-from-a-container-to-a-service-on-the-host), depending on where the Ollama server is running.
+Remember that your `localhost` is by default inaccessible from inside Docker. You need to either establish [inter-container networking](https://docs.docker.com/compose/networking/), use the [host's address](https://docs.docker.com/desktop/networking/#i-want-to-connect-from-a-container-to-a-service-on-the-host), or use the [host network](https://docs.docker.com/network/network-tutorial-host/), depending on where the Ollama server is running and your preferences.
 
 ```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.5.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 3.0.0 && bash"
     environment:
-      OLLAMA_API_ADDRESS: http://host.docker.internal:11434
+      OLLAMA_API_ADDRESS: http://localhost:11434
       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
+    # If you are running the Ollama server on your localhost:
+    network_mode: host # WARNING: Be careful, this may be a security risk.
 ```
 
 ### OpenAI ChatGPT Container
@@ -1033,7 +1044,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.5.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 3.0.0 && bash"
     environment:
       OPENAI_API_KEY: your-access-token
       NANO_BOTS_ENCRYPTION_PASSWORD: UNSAFE
@@ -1052,7 +1063,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.5.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 3.0.0 && bash"
     environment:
       GOOGLE_API_KEY: your-api-key
       NANO_BOTS_ENCRYPTION_PASSWORD: UNSAFE
@@ -1069,7 +1080,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.5.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 3.0.0 && bash"
     environment:
       GOOGLE_CREDENTIALS_FILE_PATH: /root/.config/google-credentials.json
       GOOGLE_REGION: us-east4
@@ -1088,7 +1099,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.5.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 3.0.0 && bash"
     environment:
       GOOGLE_REGION: us-east4
       NANO_BOTS_ENCRYPTION_PASSWORD: UNSAFE
@@ -1137,6 +1148,12 @@ bundle exec ruby spec/tasks/run-model.rb spec/data/cartridges/models/openai/gpt-
 bundle exec ruby spec/tasks/run-model.rb spec/data/cartridges/models/openai/gpt-4-turbo.yml stream
 ```
 
+If you face issues upgrading gem versions:
+
+```sh
+bundle install --full-index
+```
+
 ### Publish to RubyGems
 
 ```bash
@@ -1144,5 +1161,5 @@ gem build nano-bots.gemspec
 
 gem signin
 
-gem push nano-bots-2.5.0.gem
+gem push nano-bots-3.0.0.gem
 ```

data/components/embedding.rb

@@ -45,7 +45,7 @@ module NanoBot
       def self.clojure(source:, parameters:, values:, safety:)
         ensure_safety!(safety)
 
-        raise 'TODO: sandboxed Clojure through Babashka not implemented' if safety[:sandboxed]
+        raise 'Sandboxed Clojure not supported.' if safety[:sandboxed]
 
         raise 'invalid Clojure parameter name' if parameters.include?('injected-parameters')
 

data/components/providers/openai.rb

@@ -140,7 +140,7 @@ module NanoBot
             begin
               @client.chat(parameters: Logic::OpenAI::Tokens.apply_policies!(cartridge, payload))
             rescue StandardError => e
-              raise e.class, e.response[:body] if e.response && e.response[:body]
+              raise e.class, e.response[:body] if e.respond_to?(:response) && e.response && e.response[:body]
 
               raise e
             end
@@ -148,7 +148,7 @@ module NanoBot
             begin
               result = @client.chat(parameters: Logic::OpenAI::Tokens.apply_policies!(cartridge, payload))
             rescue StandardError => e
-              raise e.class, e.response[:body] if e.response && e.response[:body]
+              raise e.class, e.response[:body] if e.respond_to?(:response) && e.response && e.response[:body]
 
               raise e
             end

data/components/storage.rb

@@ -8,6 +8,8 @@ require_relative 'crypto'
 module NanoBot
   module Components
     class Storage
+      EXTENSIONS = %w[yml yaml markdown mdown mkdn md].freeze
+
       def self.end_user(cartridge, environment)
         user = ENV.fetch('NANO_BOTS_END_USER', nil)
 
@@ -35,7 +37,9 @@ module NanoBot
 
       def self.build_path_and_ensure_state_file!(key, cartridge, environment: {})
         path = [
+          Logic::Helpers::Hash.fetch(cartridge, %i[state path]),
           Logic::Helpers::Hash.fetch(cartridge, %i[state directory]),
+          ENV.fetch('NANO_BOTS_STATE_PATH', nil),
           ENV.fetch('NANO_BOTS_STATE_DIRECTORY', nil)
         ].find do |candidate|
           !candidate.nil? && !candidate.empty?
@@ -64,32 +68,59 @@ module NanoBot
         path
       end
 
-      def self.cartridges_path
-        [
-          ENV.fetch('NANO_BOTS_CARTRIDGES_DIRECTORY', nil),
-          "#{user_home!.sub(%r{/$}, '')}/.local/share/nano-bots/cartridges"
-        ].compact.uniq.filter { |path| File.directory?(path) }.compact.first
+      def self.cartridges_path(components: {})
+        components[:directory?] = ->(path) { File.directory?(path) } unless components.key?(:directory?)
+        components[:ENV] = ENV unless components.key?(:ENV)
+
+        default = "#{user_home!(components:).sub(%r{/$}, '')}/.local/share/nano-bots/cartridges"
+
+        from_environment = [
+          components[:ENV].fetch('NANO_BOTS_CARTRIDGES_PATH', nil),
+          components[:ENV].fetch('NANO_BOTS_CARTRIDGES_DIRECTORY', nil)
+        ].compact
+
+        elected = [
+          from_environment.empty? ? nil : from_environment.join(':'),
+          default
+        ].compact.uniq.filter do |path|
+          path.split(':').any? { |candidate| components[:directory?].call(candidate) }
+        end.compact.first
+
+        return default unless elected
+
+        elected = elected.split(':').filter do |path|
+          components[:directory?].call(path)
+        end.compact
+
+        elected.size.positive? ? elected.join(':') : default
       end
 
       def self.cartridge_path(path)
         partial = File.join(File.dirname(path), File.basename(path, File.extname(path)))
 
-        candidates = [
-          path,
-          "#{partial}.yml",
-          "#{partial}.yaml"
-        ]
+        candidates = [path]
 
-        unless ENV.fetch('NANO_BOTS_CARTRIDGES_DIRECTORY', nil).nil?
-          directory = ENV.fetch('NANO_BOTS_CARTRIDGES_DIRECTORY').sub(%r{/$}, '')
+        EXTENSIONS.each do |extension|
+          candidates << "#{partial}.#{extension}"
+        end
+
+        directories = [
+          ENV.fetch('NANO_BOTS_CARTRIDGES_PATH', nil),
+          ENV.fetch('NANO_BOTS_CARTRIDGES_DIRECTORY', nil)
+        ].compact.map do |directory|
+          directory.split(':')
+        end.flatten.map { |directory| directory.sub(%r{/$}, '') }
 
+        directories.each do |directory|
           partial = File.join(File.dirname(partial), File.basename(partial, File.extname(partial)))
 
           partial = partial.sub(%r{^\.?/}, '')
 
           candidates << "#{directory}/#{partial}"
-          candidates << "#{directory}/#{partial}.yml"
-          candidates << "#{directory}/#{partial}.yaml"
+
+          EXTENSIONS.each do |extension|
+            candidates << "#{directory}/#{partial}.#{extension}"
+          end
         end
 
         directory = "#{user_home!.sub(%r{/$}, '')}/.local/share/nano-bots/cartridges"
@@ -99,8 +130,10 @@ module NanoBot
         partial = partial.sub(%r{^\.?/}, '')
 
         candidates << "#{directory}/#{partial}"
-        candidates << "#{directory}/#{partial}.yml"
-        candidates << "#{directory}/#{partial}.yaml"
+
+        EXTENSIONS.each do |extension|
+          candidates << "#{directory}/#{partial}.#{extension}"
+        end
 
         candidates = candidates.uniq
 
@@ -109,7 +142,9 @@ module NanoBot
         end
       end
 
-      def self.user_home!
+      def self.user_home!(components: {})
+        return components[:home] if components[:home]
+
         [Dir.home, `echo ~`.strip, '~'].find do |candidate|
           !candidate.nil? && !candidate.empty?
         end

data/controllers/cartridges.rb

@@ -3,35 +3,43 @@
 require_relative '../components/storage'
 require_relative '../logic/helpers/hash'
 require_relative '../logic/cartridge/default'
+require_relative '../logic/cartridge/parser'
 
 module NanoBot
   module Controllers
     class Cartridges
-      def self.all
+      def self.load(path)
+        Logic::Cartridge::Parser.parse(File.read(path), format: File.extname(path))
+      end
+
+      def self.all(components: {})
         files = {}
 
-        path = Components::Storage.cartridges_path
+        paths = Components::Storage.cartridges_path(components:)
 
-        Dir.glob("#{path}/**/*.{yml,yaml}").each do |file|
-          files[Pathname.new(file).realpath] = {
-            base: path,
-            path: Pathname.new(file).realpath
-          }
+        paths.split(':').each do |path|
+          Dir.glob("#{path}/**/*.{yml,yaml,markdown,mdown,mkdn,md}").each do |file|
+            files[Pathname.new(file).realpath] = {
+              base: path,
+              path: Pathname.new(file).realpath
+            }
+          end
         end
 
         cartridges = []
 
         files.values.uniq.map do |file|
-          cartridge = Logic::Helpers::Hash.symbolize_keys(
-            YAML.safe_load_file(file[:path], permitted_classes: [Symbol])
-          ).merge({
-                    system: {
-                      id: file[:path].to_s.sub(/^#{Regexp.escape(file[:base])}/, '').sub(%r{^/}, '').sub(/\.[^.]+\z/,
-                                                                                                         ''),
-                      path: file[:path],
-                      base: file[:base]
-                    }
-                  })
+          cartridge = load(file[:path]).merge(
+            {
+              system: {
+                id: file[:path].to_s.sub(
+                  /^#{Regexp.escape(file[:base])}/, ''
+                ).sub(%r{^/}, '').sub(/\.[^.]+\z/, ''),
+                path: file[:path],
+                base: file[:base]
+              }
+            }
+          )
 
           next if cartridge[:meta][:name].nil?
 

data/controllers/instance.rb

@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
-require 'yaml'
-
 require_relative '../logic/helpers/hash'
 require_relative '../components/provider'
 require_relative '../components/storage'
 require_relative '../components/stream'
+require_relative 'cartridges'
 require_relative 'interfaces/repl'
 require_relative 'interfaces/eval'
 require_relative 'session'
@@ -83,13 +82,11 @@ module NanoBot
             raise StandardError, "Cartridge file not found: \"#{path}\""
           end
 
-          @cartridge = YAML.safe_load_file(elected_path, permitted_classes: [Symbol])
+          @cartridge = Cartridges.load(elected_path)
         end
 
         @safe_cartridge = Marshal.load(Marshal.dump(@cartridge))
 
-        @cartridge = Logic::Helpers::Hash.symbolize_keys(@cartridge)
-
         inject_environment_variables!(@cartridge)
       end
 

data/docker-compose.example.yml

@@ -2,27 +2,31 @@
 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.5.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 3.0.0 && bash"
     environment:
       COHERE_API_KEY: your-api-key
 
-      GOOGLE_API_KEY: your-api-key
+      # GOOGLE_API_KEY: your-api-key
 
-      GOOGLE_CREDENTIALS_FILE_PATH: /root/.config/google-credentials.json
-      GOOGLE_PROJECT_ID: your-project-id
+      # GOOGLE_CREDENTIALS_FILE_PATH: /root/.config/google-credentials.json
+      # GOOGLE_PROJECT_ID: your-project-id
       GOOGLE_REGION: us-east4
 
       MARITACA_API_KEY: 'your-api-key'
 
       MISTRAL_API_KEY: your-api-key
 
-      OLLAMA_API_ADDRESS: http://host.docker.internal:11434
+      OLLAMA_API_ADDRESS: http://localhost:11434
 
       OPENAI_API_KEY: your-access-token
 
       NANO_BOTS_ENCRYPTION_PASSWORD: UNSAFE
       NANO_BOTS_END_USER: your-user
+
     volumes:
       - ./google-credentials.json:/root/.config/google-credentials.json
       - ./your-cartridges:/root/.local/share/nano-bots/cartridges
       - ./your-state-path:/root/.local/state/nano-bots
+
+    # If you are running the Ollama server on your localhost:
+    # network_mode: host # WARNING: Be careful, this may be a security risk.

data/logic/cartridge/parser.rb

@@ -0,0 +1,134 @@
+# frozen_string_literal: true
+
+require 'singleton'
+
+require 'redcarpet'
+require 'redcarpet/render_strip'
+
+module NanoBot
+  module Logic
+    module Cartridge
+      module Parser
+        def self.parse(raw, format:)
+          normalized = format.to_s.downcase.gsub('.', '').strip
+
+          if %w[yml yaml].include?(normalized)
+            yaml(raw)
+          elsif %w[markdown mdown mkdn md].include?(normalized)
+            markdown(raw)
+          else
+            raise "Unknown cartridge format: '#{format}'"
+          end
+        end
+
+        def self.markdown(raw)
+          yaml_source = []
+
+          tools = []
+
+          blocks = Markdown.new.render(raw).blocks
+
+          previous_block_is_tool = false
+
+          blocks.each do |block|
+            if block[:language] == 'yaml'
+              parsed = Logic::Helpers::Hash.symbolize_keys(
+                YAML.safe_load(block[:source], permitted_classes: [Symbol])
+              )
+
+              if parsed.key?(:tools) && parsed[:tools].is_a?(Array) && !parsed[:tools].empty?
+                previous_block_is_tool = true
+
+                tools.concat(parsed[:tools])
+
+                parsed.delete(:tools)
+
+                unless parsed.empty?
+                  yaml_source << YAML.dump(
+                    Logic::Helpers::Hash.stringify_keys(parsed)
+                  ).gsub(/^---/, '') # TODO: Is this safe enough?
+                end
+              else
+                yaml_source << block[:source]
+                previous_block_is_tool = false
+                nil
+              end
+            elsif previous_block_is_tool
+              tools.last[block[:language].to_sym] = block[:source]
+              previous_block_is_tool = false
+            end
+          end
+
+          unless tools.empty?
+            yaml_source << YAML.dump(
+              Logic::Helpers::Hash.stringify_keys({ tools: })
+            ).gsub(/^---/, '') # TODO: Is this safe enough?
+          end
+
+          cartridge = {}
+
+          yaml_source.each do |source|
+            cartridge = Logic::Helpers::Hash.deep_merge(cartridge, yaml(source))
+          end
+
+          cartridge
+        end
+
+        def self.yaml(raw)
+          Logic::Helpers::Hash.symbolize_keys(
+            YAML.safe_load(raw, permitted_classes: [Symbol])
+          )
+        end
+
+        class Renderer < Redcarpet::Render::Base
+          LANGUAGES_MAP = {
+            'yml' => 'yaml',
+            'yaml' => 'yaml',
+            'lua' => 'lua',
+            'fnl' => 'fennel',
+            'fennel' => 'fennel',
+            'clj' => 'clojure',
+            'clojure' => 'clojure'
+          }.freeze
+
+          LANGUAGES = LANGUAGES_MAP.keys.freeze
+
+          def initialize(...)
+            super(...)
+            @_nano_bots_blocks = []
+          end
+
+          attr_reader :_nano_bots_blocks
+
+          def block_code(code, language)
+            key = language.to_s.downcase.strip
+
+            return nil unless LANGUAGES.include?(key)
+
+            @_nano_bots_blocks << { language: LANGUAGES_MAP[key], source: code }
+
+            nil
+          end
+        end
+
+        class Markdown
+          attr_reader :markdown
+
+          def initialize
+            @renderer = Renderer.new
+            @markdown = Redcarpet::Markdown.new(@renderer, fenced_code_blocks: true)
+          end
+
+          def blocks
+            @renderer._nano_bots_blocks
+          end
+
+          def render(raw)
+            @markdown.render(raw.gsub(/```\w/, "\n\n\\0"))
+            self
+          end
+        end
+      end
+    end
+  end
+end

data/logic/helpers/hash.rb

@@ -4,6 +4,16 @@ module NanoBot
   module Logic
     module Helpers
       module Hash
+        def self.deep_merge(hash1, hash2)
+          hash1.merge(hash2) do |_key, old_val, new_val|
+            if old_val.is_a?(::Hash) && new_val.is_a?(::Hash)
+              deep_merge(old_val, new_val)
+            else
+              new_val
+            end
+          end
+        end
+
         def self.symbolize_keys(object)
           case object
           when ::Hash
@@ -17,6 +27,19 @@ module NanoBot
           end
         end
 
+        def self.stringify_keys(object)
+          case object
+          when ::Hash
+            object.each_with_object({}) do |(key, value), result|
+              result[key.to_s] = stringify_keys(value)
+            end
+          when Array
+            object.map { |e| stringify_keys(e) }
+          else
+            object
+          end
+        end
+
         def self.fetch(object, path)
           node = object
 

data/nano-bots.gemspec

@@ -37,12 +37,13 @@ Gem::Specification.new do |spec|
   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 'cohere-ai', '~> 1.0', '>= 1.0.1'
   spec.add_dependency 'gemini-ai', '~> 3.1', '>= 3.1.2'
   spec.add_dependency 'maritaca-ai', '~> 1.0'
-  spec.add_dependency 'mistral-ai', '~> 1.1'
+  spec.add_dependency 'mistral-ai', '~> 1.1', '>= 1.1.1'
   spec.add_dependency 'ollama-ai', '~> 1.0'
   spec.add_dependency 'ruby-openai', '~> 6.3', '>= 6.3.1'
 

data/ports/dsl/nano-bots/cartridges.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require_relative '../../../controllers/cartridges'
+
+module NanoBot
+  module Cartridges
+    def self.all(components: {})
+      Controllers::Cartridges.all(components:)
+    end
+
+    def self.load(path)
+      Controllers::Cartridges.load(path)
+    end
+  end
+end

data/ports/dsl/nano-bots.rb

@@ -8,6 +8,7 @@ require_relative '../../controllers/instance'
 require_relative '../../controllers/security'
 require_relative '../../controllers/interfaces/cli'
 require_relative '../../components/stream'
+require_relative 'nano-bots/cartridges'
 
 module NanoBot
   def self.new(cartridge: '-', state: '-', environment: {})
@@ -24,7 +25,7 @@ module NanoBot
   end
 
   def self.cartridges
-    Controllers::Cartridges.all
+    Cartridges
   end
 
   def self.cli

data/static/gem.rb

@@ -3,8 +3,8 @@
 module NanoBot
   GEM = {
     name: 'nano-bots',
-    version: '2.5.0',
-    specification: '2.3.0',
+    version: '3.0.0',
+    specification: '3.0.0',
     author: 'icebaker',
     summary: 'Ruby Implementation of Nano Bots: small, AI-powered bots for OpenAI ChatGPT, Ollama, Mistral AI, Cohere Command, Maritaca AI MariTalk, 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, Ollama, Mistral AI, Cohere Command, Maritaca AI MariTalk, and Google Gemini, with support for calling Tools (Functions).',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nano-bots
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 3.0.0
 platform: ruby
 authors:
 - icebaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-07 00:00:00.000000000 Z
+date: 2024-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: babosa
@@ -118,6 +118,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 7.1.1
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: sweet-moon
   requirement: !ruby/object:Gem::Requirement
@@ -193,6 +207,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -200,6 +217,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: ollama-ai
   requirement: !ruby/object:Gem::Requirement
@@ -281,6 +301,7 @@ files:
 - logic/cartridge/default.rb
 - logic/cartridge/fetch.rb
 - logic/cartridge/interaction.rb
+- logic/cartridge/parser.rb
 - logic/cartridge/safety.rb
 - logic/cartridge/streaming.rb
 - logic/cartridge/tools.rb
@@ -296,6 +317,7 @@ files:
 - logic/providers/openai/tools.rb
 - nano-bots.gemspec
 - ports/dsl/nano-bots.rb
+- ports/dsl/nano-bots/cartridges.rb
 - ports/dsl/nano-bots/cli.rb
 - static/cartridges/baseline.yml
 - static/cartridges/default.yml