diff --git a/Gemfile.lock b/Gemfile.lock index 2884e99..6b3cc60 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,14 +1,14 @@ PATH remote: . specs: - nano-bots (2.5.0) + nano-bots (2.5.1) 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) @@ -59,7 +59,7 @@ 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) @@ -68,7 +68,7 @@ GEM faraday (~> 2.8) os (1.1.4) parallel (1.24.0) - parser (3.3.0.0) + parser (3.3.0.1) ast (~> 2.4.1) racc pry (0.14.2) diff --git a/README.md b/README.md index bb87e41..d878960 100644 --- a/README.md +++ b/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 2.5.0 +gem install nano-bots -v 2.5.1 ``` ```bash @@ -50,7 +50,7 @@ nb gpt.yml - eval "hi" ``` ```ruby -gem 'nano-bots', '~> 2.5.0' +gem 'nano-bots', '~> 2.5.1' ``` ```ruby @@ -241,13 +241,13 @@ end To install the CLI on your system: ```sh -gem install nano-bots -v 2.5.0 +gem install nano-bots -v 2.5.1 ``` To use it in a Ruby project as a library, add to your `Gemfile`: ```ruby -gem 'nano-bots', '~> 2.5.0' +gem 'nano-bots', '~> 2.5.1' ``` ```sh @@ -963,7 +963,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 2.5.1 && bash" environment: COHERE_API_KEY: your-api-key NANO_BOTS_ENCRYPTION_PASSWORD: UNSAFE @@ -980,7 +980,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 2.5.1 && bash" environment: MARITACA_API_KEY: your-api-key NANO_BOTS_ENCRYPTION_PASSWORD: UNSAFE @@ -997,7 +997,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 2.5.1 && bash" environment: MISTRAL_API_KEY: your-api-key NANO_BOTS_ENCRYPTION_PASSWORD: UNSAFE @@ -1009,21 +1009,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 2.5.1 && 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 +1035,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 2.5.1 && bash" environment: OPENAI_API_KEY: your-access-token NANO_BOTS_ENCRYPTION_PASSWORD: UNSAFE @@ -1052,7 +1054,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 2.5.1 && bash" environment: GOOGLE_API_KEY: your-api-key NANO_BOTS_ENCRYPTION_PASSWORD: UNSAFE @@ -1069,7 +1071,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 2.5.1 && bash" environment: GOOGLE_CREDENTIALS_FILE_PATH: /root/.config/google-credentials.json GOOGLE_REGION: us-east4 @@ -1088,7 +1090,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 2.5.1 && bash" environment: GOOGLE_REGION: us-east4 NANO_BOTS_ENCRYPTION_PASSWORD: UNSAFE @@ -1144,5 +1146,5 @@ gem build nano-bots.gemspec gem signin -gem push nano-bots-2.5.0.gem +gem push nano-bots-2.5.1.gem ``` diff --git a/docker-compose.example.yml b/docker-compose.example.yml index df5b09b..1323801 100644 --- a/docker-compose.example.yml +++ b/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 2.5.1 && 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. diff --git a/nano-bots.gemspec b/nano-bots.gemspec index 946559a..f843f37 100644 --- a/nano-bots.gemspec +++ b/nano-bots.gemspec @@ -42,7 +42,7 @@ Gem::Specification.new do |spec| 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' diff --git a/static/gem.rb b/static/gem.rb index c89b4c3..513378d 100644 --- a/static/gem.rb +++ b/static/gem.rb @@ -3,7 +3,7 @@ module NanoBot GEM = { name: 'nano-bots', - version: '2.5.0', + version: '2.5.1', specification: '2.3.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.',