ollama-ruby 1.19.2 → 1.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c79c75dcf2f3530d26ade8051ff7c541dd3559a1ad39cb53b1c139ddece5001
-  data.tar.gz: 652b5d050acde1837ac8a23731b7467f77c3dcae4aa8b34ce15b3dda094d73c4
+  metadata.gz: 6ba6bf03f34b785b65a26f7bcdeb2d77d00c8f4d2403987d31258b1f78d27680
+  data.tar.gz: ee8337571ff29a5fb2db7f514ec4037ce4dca00da9193d18f80cff671dde06a3
 SHA512:
-  metadata.gz: e754534c172336251aac7ac822c2abc7deaa0058fe85e832c39b11eccd2088498e48ab7e14760140c01f40fd04b99e3c375e193a80e234a6877fb4c3984e6543
-  data.tar.gz: 21bac2a43656d7cc4abed8a4a44a7b8bbeb225e96977503d2f7aef72fb19522a4fd0316afcf123a18128fe93c4b55f5691a5fda21c790213f6d66afe3e4eec54
+  metadata.gz: 0f70a40fe9cc263e073df7f30e358d3ed9ff416b74ebf281cd9324ae73bcf2c27d23c3e41e92a5d1524b013a39706f243322b9344a9ee68759ea5ea214286dce
+  data.tar.gz: a6091750f7b86920191ff2dca0efde302ecfbd2f2af11a43bb41b8b01ac44016b9b273a15461b6d2f582dbff05be9162139cf9305d4fa85ce67e4010344f2637

data/.envrc

@@ -0,0 +1 @@
+export OLLAMA_CHAT_TOOLS_TEST_RUNNER="bundle exec rspec"

data/.utilsrc

@@ -0,0 +1,78 @@
+# vim: set ft=ruby:
+
+search do
+  prune_dirs /\A(\.svn|\.git|CVS|tmp|coverage|pkg|\.yardoc|doc)\z/
+  skip_files /(\A\.|\.sw[pon]\z|\.(log|fnm|jpg|jpeg|png|pdf|svg)\z|\A(tags|cscope\.out)\z|~\z)/i
+end
+
+discover do
+  prune_dirs /\A(\.svn|\.git|\.yardoc|CVS|tmp|coverage|corpus|pkg|\.yardoc|doc)\z/
+  skip_files /(\A\.|\.sw[pon]\z|\.log\z|~\z)/
+  index_expire_after 3_600
+end
+
+strip_spaces do
+  prune_dirs /\A(\..*|CVS|pkg|\.yardoc)\z/
+  skip_files /(\A\.|\.sw[pon]\z|\.log\z|~\z)/
+end
+
+probe do
+  test_framework :rspec
+end
+
+ssh_tunnel do
+  terminal_multiplexer :tmux
+  login_session "/home/#{ENV['USER']}"
+end
+
+classify do
+  shift_path_by_default 1
+end
+
+code_indexer do
+  verbose false
+
+  gems = %w[
+    all_images
+    amatch
+    base64
+    bigdecimal
+    complex_config
+    context_spook
+    date
+    excon
+    fileutils
+    gem_hadar
+    infobar
+    irb
+    json
+    kramdown
+    kramdown-ansi
+    kramdown-parser-gfm
+    mize
+    more_math
+    ollama-ruby
+    ostruct
+    pathname
+    readline
+    reline
+    rspec
+    rspec-core
+    rspec-expectations
+    rspec-mocks
+    rspec-support
+    search_ui
+    shellwords
+    stringio
+    term-ansicolor
+    terminal-table
+    tins
+    uri
+    webmock
+    yard
+  ]
+
+  paths {
+    %w[ lib ] + gems.map { `bundle show #{it}` }.map(&:chomp)
+  }
+end

data/CHANGES.md

@@ -1,5 +1,45 @@
 # Changes
 
+## 2026-03-20 v1.21.0
+
+- Added a template accessor to Ollama::Commands::Create, exposing a new
+  `attr_reader` :template with a descriptive comment block.
+- Added `to_json` method to `Ollama::Image` class that delegates to `as_json`
+    - Included documentation comments for the new `to_json` method
+    - Ensures `as_json` is properly invoked when serializing `Ollama::Image`
+      objects with Ruby's JSON gems
+- Updated `terminal-table` dependency from `~> 3.0` to `>= 3.0` in Rakefile
+- Updated gemspec dependency for `terminal-table` to `>= 3.0`
+
+## 2026-03-20 v1.20.0
+
+- Created `.rspec` file with `--force-color` and `-r spec_helper` options.  
+    - Removed `require 'spec_helper'` from all spec files.  
+- Added `dimensions` keyword argument to `initialize` in
+  `lib/ollama/commands/embeddings.rb`.  
+    - Added `@dimensions` instance variable and `attr_reader :dimensions` to
+      `Ollama::Commands::Embeddings`.  
+    - Reordered instance variables in the constructor of
+      `Ollama::Commands::Embeddings`.  
+- Added `.envrc` setting `OLLAMA_CHAT_TOOLS_TEST_RUNNER`.  
+- Added `tool_calls` and `tool_name` reader attributes to `Ollama::Message` in
+  `lib/ollama/message.rb`.  
+    - Extended `initialize` signature of `Ollama::Message` to accept `tool_calls`
+      and `tool_name` and store them.  
+    - Updated `message_spec.rb` to include `tool_calls` and `tool_name` in
+      expectations for JSON serialization and round‑trip.  
+    - Normalized `tool_calls` to an array when provided.  
+- Added `.utilsrc` file with configuration blocks for `search`, `discover`,
+  `strip_spaces`, `probe`, `ssh_tunnel`, `classify`, and `code_indexer`.  
+    - Configured pruning of directories such as `.svn`, `.git`, `CVS`, `tmp`,
+      `coverage`, etc., and skipped files matching patterns like `\.sw[pon]`,
+      `\.(log|fnm|jpg|jpeg|png|pdf|svg)`.  
+    - Set RSpec (`:rspec`) as the test framework in `probe`.  
+    - Enabled tmux terminal multiplexer for SSH tunnels with login session to
+      `/home/${ENV['USER']}` via `ssh_tunnel`.  
+    - Defined a comprehensive gem list (e.g., `all_images`, `amatch`, `base64`, …,
+      `yard`) and included their paths using `bundle show`.
+
 ## 2026-03-08 v1.19.2
 
 - Improve polling loop safety in `ollama_ps`.  

data/Rakefile

@@ -38,7 +38,7 @@ GemHadar do
   dependency             'term-ansicolor',        '~> 1.11'
   dependency             'kramdown-ansi',         '~> 0.0', '>= 0.0.1'
   dependency             'ostruct',               '~> 0.0'
-  dependency             'terminal-table',        '~> 3.0'
+  dependency             'terminal-table',        '>= 3.0'
   dependency             'nokogiri',              '~> 1.0'
   development_dependency 'all_images',            '~> 0.12'
   development_dependency 'rspec',                 '~> 3.2'

data/lib/ollama/commands/create.rb

@@ -48,8 +48,8 @@ class Ollama::Commands::Create
   # @param stream [ TrueClass, FalseClass ] whether to enable streaming for the operation, defaults to true
   # @param quantize [ String, nil ] quantization method to use (e.g., 'Q4_0')
   def initialize(model:, from: nil, files: nil, adapters: nil, template: nil, license: nil, system: nil, parameters: nil, messages: nil, stream: true, quantize: nil)
-    @model, @from, @files, @adapters, @license, @system, @parameters, @messages, @stream, @quantize =
-      model, from, as_hash(files), as_hash(adapters), as_array(license), system,
+    @model, @from, @files, @adapters, @template, @license, @system, @parameters, @messages, @stream, @quantize =
+      model, from, as_hash(files), as_hash(adapters), template, as_array(license), system,
       as_hash(parameters), as_array_of_hashes(messages), stream, quantize
   end
 
@@ -73,6 +73,11 @@ class Ollama::Commands::Create
   # @return [ Hash, nil ] adapter files to use for quantization
   attr_reader :adapters
 
+  # The template attribute reader returns the template associated with the object.
+  #
+  # @return [ String, nil ] the template string or nil if not defined
+  attr_reader :template
+
   # The license attribute reader returns the license(s) associated with the object.
   #
   # @return [ String, Array<String>, nil ] the license(s) for the model

data/lib/ollama/commands/embeddings.rb

@@ -32,9 +32,10 @@ class Ollama::Commands::Embeddings
   # @param prompt [ String ] the text prompt to generate embeddings for
   # @param options [ Ollama::Options, nil ] optional configuration parameters for the model
   # @param keep_alive [ String, nil ] duration to keep the model loaded in memory
-  def initialize(model:, prompt:, options: nil, keep_alive: nil)
-    @model, @prompt, @options, @keep_alive, @stream =
-      model, prompt, options, keep_alive, false
+  # @param dimensions [ Integer, nil ] number of dimensions for the embedding
+  def initialize(model:, prompt:, options: nil, keep_alive: nil, dimensions: nil)
+    @model, @prompt, @options, @keep_alive, @dimensions, @stream =
+      model, prompt, options, dimensions, keep_alive, false
   end
 
   # The model attribute reader returns the model name associated with the object.
@@ -57,6 +58,12 @@ class Ollama::Commands::Embeddings
   # @return [ String, nil ] duration to keep the model loaded in memory
   attr_reader :keep_alive
 
+  # The dimensions attribute reader returns the dimensions associated with the
+  # object.
+  #
+  # @return [ Integer, nil ]
+  attr_reader :dimensions
+
   # The stream attribute reader returns the streaming behavior setting
   # associated with the object.
   #

data/lib/ollama/image.rb

@@ -116,4 +116,13 @@ class Ollama::Image
   def as_json(*_args)
     to_s
   end
+
+  # The to_json method converts the object's JSON representation into a JSON
+  # string format.
+  #
+  # @param args [Array] optional arguments passed to JSON serialization
+  # @return [String] a JSON string representation of the object
+  def to_json(*args)
+    as_json.to_json(*args)
+  end
 end

data/lib/ollama/message.rb

@@ -41,6 +41,18 @@ class Ollama::Message
   # @return [ Array<Ollama::Image>, nil ] an array of image objects, or nil if no images are associated with the message
   attr_reader :images
 
+  # The tool_calls attribute reader returns the tool call hashes or objects
+  # associated with the message.
+  #
+  # @return [ Array<Hash>, nil ] an array of tool call definitions, or nil if none
+  attr_reader :tool_calls
+
+  # The tool_name attribute reader returns the name of the tool used in the
+  # message, if any.
+  #
+  # @return [ String, nil ] the name of the tool, or nil if not set
+  attr_reader :tool_name
+
   # The initialize method sets up a new Message instance with the specified attributes.
   #
   # @param role [ String ] the role of the message sender, such as 'user' or 'assistant'
@@ -48,9 +60,10 @@ class Ollama::Message
   # @param thinking [ String, nil ] optional thinking content for the message
   # @param images [ Ollama::Image, Array<Ollama::Image>, nil ] optional image objects associated with the message
   # @param tool_calls [ Hash, Array<Hash>, nil ] optional tool calls made in the message
-  def initialize(role:, content:, thinking: nil, images: nil, tool_calls: nil, **)
-    @role, @content, @thinking, @images, @tool_calls =
+  def initialize(role:, content:, thinking: nil, images: nil, tool_calls: nil, tool_name: nil, **)
+    @role, @content, @thinking, @images, @tool_calls, @tool_name =
       role, content, thinking, (Array(images) if images),
-      (Array(tool_calls) if tool_calls)
+      (Array(tool_calls) if tool_calls),
+      tool_name
   end
 end

data/lib/ollama/version.rb

@@ -1,6 +1,6 @@
 module Ollama
   # Ollama version
-  VERSION         = '1.19.2'
+  VERSION         = '1.21.0'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/ollama-ruby.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: ollama-ruby 1.19.2 ruby lib
+# stub: ollama-ruby 1.21.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama-ruby".freeze
-  s.version = "1.19.2".freeze
+  s.version = "1.21.0".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -13,12 +13,12 @@ Gem::Specification.new do |s|
   s.email = "flori@ping.de".freeze
   s.executables = ["ollama_console".freeze, "ollama_update".freeze, "ollama_cli".freeze, "ollama_browse".freeze, "ollama_ps".freeze]
   s.extra_rdoc_files = ["README.md".freeze, "lib/ollama.rb".freeze, "lib/ollama/client.rb".freeze, "lib/ollama/client/command.rb".freeze, "lib/ollama/client/configuration/config.rb".freeze, "lib/ollama/client/doc.rb".freeze, "lib/ollama/commands/chat.rb".freeze, "lib/ollama/commands/copy.rb".freeze, "lib/ollama/commands/create.rb".freeze, "lib/ollama/commands/delete.rb".freeze, "lib/ollama/commands/embed.rb".freeze, "lib/ollama/commands/embeddings.rb".freeze, "lib/ollama/commands/generate.rb".freeze, "lib/ollama/commands/ps.rb".freeze, "lib/ollama/commands/pull.rb".freeze, "lib/ollama/commands/push.rb".freeze, "lib/ollama/commands/show.rb".freeze, "lib/ollama/commands/tags.rb".freeze, "lib/ollama/commands/version.rb".freeze, "lib/ollama/dto.rb".freeze, "lib/ollama/errors.rb".freeze, "lib/ollama/handlers.rb".freeze, "lib/ollama/handlers/collector.rb".freeze, "lib/ollama/handlers/concern.rb".freeze, "lib/ollama/handlers/dump_json.rb".freeze, "lib/ollama/handlers/dump_yaml.rb".freeze, "lib/ollama/handlers/markdown.rb".freeze, "lib/ollama/handlers/nop.rb".freeze, "lib/ollama/handlers/print.rb".freeze, "lib/ollama/handlers/progress.rb".freeze, "lib/ollama/handlers/say.rb".freeze, "lib/ollama/handlers/single.rb".freeze, "lib/ollama/image.rb".freeze, "lib/ollama/json_loader.rb".freeze, "lib/ollama/message.rb".freeze, "lib/ollama/options.rb".freeze, "lib/ollama/response.rb".freeze, "lib/ollama/tool.rb".freeze, "lib/ollama/tool/function.rb".freeze, "lib/ollama/tool/function/parameters.rb".freeze, "lib/ollama/tool/function/parameters/property.rb".freeze, "lib/ollama/version.rb".freeze]
-  s.files = ["CHANGES.md".freeze, "Gemfile".freeze, "LICENSE".freeze, "README.md".freeze, "Rakefile".freeze, "bin/ollama_browse".freeze, "bin/ollama_cli".freeze, "bin/ollama_console".freeze, "bin/ollama_ps".freeze, "bin/ollama_update".freeze, "lib/ollama.rb".freeze, "lib/ollama/client.rb".freeze, "lib/ollama/client/command.rb".freeze, "lib/ollama/client/configuration/config.rb".freeze, "lib/ollama/client/doc.rb".freeze, "lib/ollama/commands/chat.rb".freeze, "lib/ollama/commands/copy.rb".freeze, "lib/ollama/commands/create.rb".freeze, "lib/ollama/commands/delete.rb".freeze, "lib/ollama/commands/embed.rb".freeze, "lib/ollama/commands/embeddings.rb".freeze, "lib/ollama/commands/generate.rb".freeze, "lib/ollama/commands/ps.rb".freeze, "lib/ollama/commands/pull.rb".freeze, "lib/ollama/commands/push.rb".freeze, "lib/ollama/commands/show.rb".freeze, "lib/ollama/commands/tags.rb".freeze, "lib/ollama/commands/version.rb".freeze, "lib/ollama/dto.rb".freeze, "lib/ollama/errors.rb".freeze, "lib/ollama/handlers.rb".freeze, "lib/ollama/handlers/collector.rb".freeze, "lib/ollama/handlers/concern.rb".freeze, "lib/ollama/handlers/dump_json.rb".freeze, "lib/ollama/handlers/dump_yaml.rb".freeze, "lib/ollama/handlers/markdown.rb".freeze, "lib/ollama/handlers/nop.rb".freeze, "lib/ollama/handlers/print.rb".freeze, "lib/ollama/handlers/progress.rb".freeze, "lib/ollama/handlers/say.rb".freeze, "lib/ollama/handlers/single.rb".freeze, "lib/ollama/image.rb".freeze, "lib/ollama/json_loader.rb".freeze, "lib/ollama/message.rb".freeze, "lib/ollama/options.rb".freeze, "lib/ollama/response.rb".freeze, "lib/ollama/tool.rb".freeze, "lib/ollama/tool/function.rb".freeze, "lib/ollama/tool/function/parameters.rb".freeze, "lib/ollama/tool/function/parameters/property.rb".freeze, "lib/ollama/version.rb".freeze, "ollama-ruby.gemspec".freeze, "spec/assets/client.json".freeze, "spec/assets/kitten.jpg".freeze, "spec/assets/options.json".freeze, "spec/ollama/client/doc_spec.rb".freeze, "spec/ollama/client_spec.rb".freeze, "spec/ollama/commands/chat_spec.rb".freeze, "spec/ollama/commands/copy_spec.rb".freeze, "spec/ollama/commands/create_spec.rb".freeze, "spec/ollama/commands/delete_spec.rb".freeze, "spec/ollama/commands/embed_spec.rb".freeze, "spec/ollama/commands/embeddings_spec.rb".freeze, "spec/ollama/commands/generate_spec.rb".freeze, "spec/ollama/commands/ps_spec.rb".freeze, "spec/ollama/commands/pull_spec.rb".freeze, "spec/ollama/commands/push_spec.rb".freeze, "spec/ollama/commands/show_spec.rb".freeze, "spec/ollama/commands/tags_spec.rb".freeze, "spec/ollama/commands/version_spec.rb".freeze, "spec/ollama/handlers/collector_spec.rb".freeze, "spec/ollama/handlers/dump_json_spec.rb".freeze, "spec/ollama/handlers/dump_yaml_spec.rb".freeze, "spec/ollama/handlers/markdown_spec.rb".freeze, "spec/ollama/handlers/nop_spec.rb".freeze, "spec/ollama/handlers/print_spec.rb".freeze, "spec/ollama/handlers/progress_spec.rb".freeze, "spec/ollama/handlers/say_spec.rb".freeze, "spec/ollama/handlers/single_spec.rb".freeze, "spec/ollama/image_spec.rb".freeze, "spec/ollama/message_spec.rb".freeze, "spec/ollama/options_spec.rb".freeze, "spec/ollama/tool_spec.rb".freeze, "spec/spec_helper.rb".freeze, "tmp/.keep".freeze]
+  s.files = [".envrc".freeze, ".utilsrc".freeze, "CHANGES.md".freeze, "Gemfile".freeze, "LICENSE".freeze, "README.md".freeze, "Rakefile".freeze, "bin/ollama_browse".freeze, "bin/ollama_cli".freeze, "bin/ollama_console".freeze, "bin/ollama_ps".freeze, "bin/ollama_update".freeze, "lib/ollama.rb".freeze, "lib/ollama/client.rb".freeze, "lib/ollama/client/command.rb".freeze, "lib/ollama/client/configuration/config.rb".freeze, "lib/ollama/client/doc.rb".freeze, "lib/ollama/commands/chat.rb".freeze, "lib/ollama/commands/copy.rb".freeze, "lib/ollama/commands/create.rb".freeze, "lib/ollama/commands/delete.rb".freeze, "lib/ollama/commands/embed.rb".freeze, "lib/ollama/commands/embeddings.rb".freeze, "lib/ollama/commands/generate.rb".freeze, "lib/ollama/commands/ps.rb".freeze, "lib/ollama/commands/pull.rb".freeze, "lib/ollama/commands/push.rb".freeze, "lib/ollama/commands/show.rb".freeze, "lib/ollama/commands/tags.rb".freeze, "lib/ollama/commands/version.rb".freeze, "lib/ollama/dto.rb".freeze, "lib/ollama/errors.rb".freeze, "lib/ollama/handlers.rb".freeze, "lib/ollama/handlers/collector.rb".freeze, "lib/ollama/handlers/concern.rb".freeze, "lib/ollama/handlers/dump_json.rb".freeze, "lib/ollama/handlers/dump_yaml.rb".freeze, "lib/ollama/handlers/markdown.rb".freeze, "lib/ollama/handlers/nop.rb".freeze, "lib/ollama/handlers/print.rb".freeze, "lib/ollama/handlers/progress.rb".freeze, "lib/ollama/handlers/say.rb".freeze, "lib/ollama/handlers/single.rb".freeze, "lib/ollama/image.rb".freeze, "lib/ollama/json_loader.rb".freeze, "lib/ollama/message.rb".freeze, "lib/ollama/options.rb".freeze, "lib/ollama/response.rb".freeze, "lib/ollama/tool.rb".freeze, "lib/ollama/tool/function.rb".freeze, "lib/ollama/tool/function/parameters.rb".freeze, "lib/ollama/tool/function/parameters/property.rb".freeze, "lib/ollama/version.rb".freeze, "ollama-ruby.gemspec".freeze, "spec/assets/client.json".freeze, "spec/assets/kitten.jpg".freeze, "spec/assets/options.json".freeze, "spec/ollama/client/doc_spec.rb".freeze, "spec/ollama/client_spec.rb".freeze, "spec/ollama/commands/chat_spec.rb".freeze, "spec/ollama/commands/copy_spec.rb".freeze, "spec/ollama/commands/create_spec.rb".freeze, "spec/ollama/commands/delete_spec.rb".freeze, "spec/ollama/commands/embed_spec.rb".freeze, "spec/ollama/commands/embeddings_spec.rb".freeze, "spec/ollama/commands/generate_spec.rb".freeze, "spec/ollama/commands/ps_spec.rb".freeze, "spec/ollama/commands/pull_spec.rb".freeze, "spec/ollama/commands/push_spec.rb".freeze, "spec/ollama/commands/show_spec.rb".freeze, "spec/ollama/commands/tags_spec.rb".freeze, "spec/ollama/commands/version_spec.rb".freeze, "spec/ollama/handlers/collector_spec.rb".freeze, "spec/ollama/handlers/dump_json_spec.rb".freeze, "spec/ollama/handlers/dump_yaml_spec.rb".freeze, "spec/ollama/handlers/markdown_spec.rb".freeze, "spec/ollama/handlers/nop_spec.rb".freeze, "spec/ollama/handlers/print_spec.rb".freeze, "spec/ollama/handlers/progress_spec.rb".freeze, "spec/ollama/handlers/say_spec.rb".freeze, "spec/ollama/handlers/single_spec.rb".freeze, "spec/ollama/image_spec.rb".freeze, "spec/ollama/message_spec.rb".freeze, "spec/ollama/options_spec.rb".freeze, "spec/ollama/tool_spec.rb".freeze, "spec/spec_helper.rb".freeze, "tmp/.keep".freeze]
   s.homepage = "https://github.com/flori/ollama-ruby".freeze
   s.licenses = ["MIT".freeze]
   s.rdoc_options = ["--title".freeze, "Ollama-ruby - Interacting with the Ollama API".freeze, "--main".freeze, "README.md".freeze]
   s.required_ruby_version = Gem::Requirement.new(">= 3.1".freeze)
-  s.rubygems_version = "4.0.3".freeze
+  s.rubygems_version = "4.0.8".freeze
   s.summary = "Interacting with the Ollama API".freeze
   s.test_files = ["spec/ollama/client/doc_spec.rb".freeze, "spec/ollama/client_spec.rb".freeze, "spec/ollama/commands/chat_spec.rb".freeze, "spec/ollama/commands/copy_spec.rb".freeze, "spec/ollama/commands/create_spec.rb".freeze, "spec/ollama/commands/delete_spec.rb".freeze, "spec/ollama/commands/embed_spec.rb".freeze, "spec/ollama/commands/embeddings_spec.rb".freeze, "spec/ollama/commands/generate_spec.rb".freeze, "spec/ollama/commands/ps_spec.rb".freeze, "spec/ollama/commands/pull_spec.rb".freeze, "spec/ollama/commands/push_spec.rb".freeze, "spec/ollama/commands/show_spec.rb".freeze, "spec/ollama/commands/tags_spec.rb".freeze, "spec/ollama/commands/version_spec.rb".freeze, "spec/ollama/handlers/collector_spec.rb".freeze, "spec/ollama/handlers/dump_json_spec.rb".freeze, "spec/ollama/handlers/dump_yaml_spec.rb".freeze, "spec/ollama/handlers/markdown_spec.rb".freeze, "spec/ollama/handlers/nop_spec.rb".freeze, "spec/ollama/handlers/print_spec.rb".freeze, "spec/ollama/handlers/progress_spec.rb".freeze, "spec/ollama/handlers/say_spec.rb".freeze, "spec/ollama/handlers/single_spec.rb".freeze, "spec/ollama/image_spec.rb".freeze, "spec/ollama/message_spec.rb".freeze, "spec/ollama/options_spec.rb".freeze, "spec/ollama/tool_spec.rb".freeze, "spec/spec_helper.rb".freeze]
 
@@ -39,6 +39,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<term-ansicolor>.freeze, ["~> 1.11".freeze])
   s.add_runtime_dependency(%q<kramdown-ansi>.freeze, ["~> 0.0".freeze, ">= 0.0.1".freeze])
   s.add_runtime_dependency(%q<ostruct>.freeze, ["~> 0.0".freeze])
-  s.add_runtime_dependency(%q<terminal-table>.freeze, ["~> 3.0".freeze])
+  s.add_runtime_dependency(%q<terminal-table>.freeze, [">= 3.0".freeze])
   s.add_runtime_dependency(%q<nokogiri>.freeze, ["~> 1.0".freeze])
 end

data/spec/ollama/client/doc_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Ollama::Client::Doc do
   it 'can document commands' do
     expect(Ollama::Client::Doc.new(:generate).to_s).to match(/generate-a-completion/)

data/spec/ollama/client_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Ollama::Client do
   let :base_url do
     'https://ai.foo.bar'

data/spec/ollama/commands/chat_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Ollama::Commands::Chat do
   it 'can be instantiated' do
     messages = [

data/spec/ollama/commands/copy_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Ollama::Commands::Copy do
   it 'can be instantiated' do
     copy = described_class.new(source: 'llama3.1', destination: 'camell3')

data/spec/ollama/commands/create_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Ollama::Commands::Create do
   it 'can be instantiated' do
     create = described_class.new(model: 'llama3.1', stream: true)

data/spec/ollama/commands/delete_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Ollama::Commands::Delete do
   it 'can be instantiated' do
     delete = described_class.new(model: 'llama3.1')

data/spec/ollama/commands/embed_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Ollama::Commands::Embed do
   it 'can be instantiated' do
     embed = described_class.new(

data/spec/ollama/commands/embeddings_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Ollama::Commands::Embeddings do
   it 'can be instantiated' do
     embeddings = described_class.new(

data/spec/ollama/commands/generate_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Ollama::Commands::Generate do
   it 'can be instantiated' do
     generate = described_class.new(model: 'llama3.1', prompt: 'Hello World')

data/spec/ollama/commands/ps_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Ollama::Commands::Ps do
   let :ps do
     described_class.new

data/spec/ollama/commands/pull_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Ollama::Commands::Pull do
   it 'can be instantiated' do
     pull = described_class.new(model: 'llama3.1')

data/spec/ollama/commands/push_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Ollama::Commands::Push do
   it 'can be instantiated' do
     push = described_class.new(model: 'llama3.1')

data/spec/ollama/commands/show_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Ollama::Commands::Show do
   it 'can be instantiated' do
     show = described_class.new(model: 'llama3.1')

data/spec/ollama/commands/tags_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Ollama::Commands::Tags do
   let :tags do
     described_class.new

data/spec/ollama/commands/version_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Ollama::Commands::Version do
   let :version do
     described_class.new

data/spec/ollama/handlers/collector_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Ollama::Handlers::Collector do
   it 'has .call' do
     expect_any_instance_of(described_class).to receive(:call).with(:foo)

data/spec/ollama/handlers/dump_json_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Ollama::Handlers::DumpJSON do
   it 'has .call' do
     expect_any_instance_of(described_class).to receive(:call).with(:foo)

data/spec/ollama/handlers/dump_yaml_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Ollama::Handlers::DumpYAML do
   it 'has .call' do
     expect_any_instance_of(described_class).to receive(:call).with(:foo)

data/spec/ollama/handlers/markdown_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Ollama::Handlers::Markdown do
   it 'has .call' do
     expect_any_instance_of(described_class).to receive(:call).with(:foo)

data/spec/ollama/handlers/nop_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Ollama::Handlers::NOP do
   it 'has .to_proc' do
     expect_any_instance_of(described_class).to receive(:call).with(:foo)

data/spec/ollama/handlers/print_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Ollama::Handlers::Print do
   it 'has .to_proc' do
     expect_any_instance_of(described_class).to receive(:call).with(:foo)

data/spec/ollama/handlers/progress_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Ollama::Handlers::Progress do
   it 'has .to_proc' do
     expect_any_instance_of(described_class).to receive(:call).with(:foo)

data/spec/ollama/handlers/say_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 skip_reason = nil
 unless File.executable?(`which say`.chomp)
   skip_reason = 'Command say not in path'

data/spec/ollama/handlers/single_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Ollama::Handlers::Single do
   it 'has .call' do
     expect_any_instance_of(described_class).to receive(:call).with(:foo)

data/spec/ollama/image_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Ollama::Image do
   let :image do
     described_class.for_filename(asset('kitten.jpg'))

data/spec/ollama/message_spec.rb

@@ -1,16 +1,20 @@
-require 'spec_helper'
-
 describe Ollama::Message do
   let :image do
     Ollama::Image.for_string("test")
   end
 
+  let :tool_call do
+    { name: "search", arguments: { query: "ruby" } }
+  end
+
   let :message do
     described_class.new(
       role:    'user',
       content: 'hello world',
       thinking: 'which world?',
-      images:  image
+      images:  image,
+      tool_calls: [ tool_call ],
+      tool_name: 'search'
     )
   end
 
@@ -24,15 +28,17 @@ describe Ollama::Message do
       content: 'hello world',
       thinking: 'which world?',
       images: [ image ],
+      tool_calls: [ tool_call ],
+      tool_name: 'search'
     )
     expect(message.to_json).to eq(
-      '{"role":"user","content":"hello world","thinking":"which world?","images":["dGVzdA=="]}'
+      '{"role":"user","content":"hello world","thinking":"which world?","images":["dGVzdA=="],"tool_calls":[{"name":"search","arguments":{"query":"ruby"}}],"tool_name":"search"}'
     )
   end
 
   it 'can be restored from JSON' do
     expect(described_class.from_hash(JSON(<<~'end'))).to be_a described_class
-      {"role":"user","content":"hello world","thinking":"which world?","images":["dGVzdA==\n"]}
+      {"role":"user","content":"hello world","thinking":"which world?","images":["dGVzdA==\n"],"tool_calls":[{"name":"search","arguments":{"query":"ruby"}}],"tool_name":"search"}
     end
   end
 

data/spec/ollama/options_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Ollama::Options do
   let :options do
     described_class.new(

data/spec/ollama/tool_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Ollama::Tool do
   let :location do
     Ollama::Tool::Function::Parameters::Property.new(

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ollama-ruby
 version: !ruby/object:Gem::Version
-  version: 1.19.2
+  version: 1.21.0
 platform: ruby
 authors:
 - Florian Frank
@@ -229,14 +229,14 @@ dependencies:
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
@@ -306,6 +306,8 @@ extra_rdoc_files:
 - lib/ollama/tool/function/parameters/property.rb
 - lib/ollama/version.rb
 files:
+- ".envrc"
+- ".utilsrc"
 - CHANGES.md
 - Gemfile
 - LICENSE
@@ -413,7 +415,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.8
 specification_version: 4
 summary: Interacting with the Ollama API
 test_files: