ollama-ruby 1.0.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b75645170e207cb661e3b98fed0754610a8807012715343c674206a66b0b72a
-  data.tar.gz: 64617fa5bc78f5658db02ea7ae61dee6c537924951de022f2aaddda9ae933131
+  metadata.gz: b77be573fc0b5bf72e9d46c5ff580454cc5a0fe08a77b95cc607f532b06902c3
+  data.tar.gz: 9f8fa137acbac201e5fbf615c791258babeac6185f7656ba14574efa9020fc14
 SHA512:
-  metadata.gz: 9e2968fca36a1c4345c0f948d12252d3f501186f24f5c433d824dd2cd8cfda8afeb65d7073655cca1f74ef2ff4f14546747ebf08f15cf842c2065a33e714d953
-  data.tar.gz: f09c3d81093347f898af01386a2f84bd9a97e99b6c7e33e41eaf3eb3261815107ac12723ba4fb00e7180203396c95f0e20f55b3cbbc65dc5d3c5e0dc92753ffe
+  metadata.gz: 0f589bf0e5db1f682eae38fe481541c58e843c3511960b8d5bd659a0249661baf975b617b0d47768d33fe2fe7555ce71688bf904b0a2a9a2d7d2bfe06a6bb569
+  data.tar.gz: 1257d170eaff46b79838861638860c2ddb491bd7ca9d833fba92c841a4c6e366e70eb234bd7f7ebeeb4542ce98748c414eb58f59aca1151bed148ed16f6c2432

data/CHANGES.md

@@ -1,5 +1,24 @@
 # Changes
 
+## 2025-06-01 v1.2.0
+
+* Added `tool_calls` parameter to the `initialize` method of the `Message` class:
+  * `def initialize(tool_calls: nil)`
+  * Updated instance variable assignment in the `initialize` method.
+* Added `:thinking` reader attribute to the `Ollama::Message` class:
+  * `attr_reader :thinking`
+* Updated `initialize` method in `Ollama::Message` to accept `thinking` option:
+  * `def initialize(thinking: false)`
+* Updated spec tests for `Ollama::Message` with new attributes.
+
+## 2025-06-01 v1.1.0
+
+* Added the `think` option to chat and generate commands:
+  * Added `think` parameter to `initialize` method in `lib/ollama/commands/chat.rb`
+  * Added `think` attribute reader and writer to `lib/ollama/commands/chat.rb`
+  * Added `think` parameter to `initialize` method in `lib/ollama/commands/generate.rb`
+  * Added `think` attribute reader to `lib/ollama/commands/generate.rb`
+
 ## 2025-04-15 v1.0.0
 
 **Use model parameter and support new create parameters**

data/lib/ollama/commands/chat.rb

@@ -5,13 +5,13 @@ class Ollama::Commands::Chat
     '/api/chat'
   end
 
-  def initialize(model:, messages:, tools: nil, format: nil, options: nil, stream: nil, keep_alive: nil)
-    @model, @messages, @tools, @format, @options, @stream, @keep_alive =
+  def initialize(model:, messages:, tools: nil, format: nil, options: nil, stream: nil, keep_alive: nil, think: nil)
+    @model, @messages, @tools, @format, @options, @stream, @keep_alive, @think =
       model, as_array_of_hashes(messages), as_array_of_hashes(tools),
-      format, options, stream, keep_alive
+      format, options, stream, keep_alive, think
   end
 
-  attr_reader :model, :messages, :tools, :format, :options, :stream, :keep_alive
+  attr_reader :model, :messages, :tools, :format, :options, :stream, :keep_alive, :think
 
   attr_writer :client
 

data/lib/ollama/commands/generate.rb

@@ -5,13 +5,13 @@ class Ollama::Commands::Generate
     '/api/generate'
   end
 
-  def initialize(model:, prompt:, suffix: nil, images: nil, format: nil, options: nil, system: nil, template: nil, context: nil, stream: nil, raw: nil, keep_alive: nil)
-    @model, @prompt, @suffix, @images, @format, @options, @system, @template, @context, @stream, @raw, @keep_alive =
-      model, prompt, suffix, (Array(images) if images), format, options, system, template, context, stream, raw, keep_alive
+  def initialize(model:, prompt:, suffix: nil, images: nil, format: nil, options: nil, system: nil, template: nil, context: nil, stream: nil, raw: nil, keep_alive: nil, think: nil)
+    @model, @prompt, @suffix, @images, @format, @options, @system, @template, @context, @stream, @raw, @keep_alive, @think =
+      model, prompt, suffix, (Array(images) if images), format, options, system, template, context, stream, raw, keep_alive, think
   end
 
   attr_reader :model, :prompt, :suffix, :images, :format, :options, :system,
-    :template, :context, :stream, :raw, :keep_alive
+    :template, :context, :stream, :raw, :keep_alive, :think
 
   attr_writer :client
 

data/lib/ollama/message.rb

@@ -1,9 +1,11 @@
 class Ollama::Message
   include Ollama::DTO
 
-  attr_reader :role, :content, :images
+  attr_reader :role, :content, :thinking, :images
 
-  def initialize(role:, content:, images: nil, **)
-    @role, @content, @images = role, content, (Array(images) if images)
+  def initialize(role:, content:, thinking: nil, images: nil, tool_calls: nil, **)
+    @role, @content, @thinking, @images, @tool_calls =
+      role, content, thinking, (Array(images) if images),
+      (Array(tool_calls) if tool_calls)
   end
 end

data/lib/ollama/version.rb

@@ -1,6 +1,6 @@
 module Ollama
   # Ollama version
-  VERSION         = '1.0.0'
+  VERSION         = '1.2.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,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: ollama-ruby 1.0.0 ruby lib
+# stub: ollama-ruby 1.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama-ruby".freeze
-  s.version = "1.0.0".freeze
+  s.version = "1.2.0".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Florian Frank".freeze]
-  s.date = "2025-04-14"
+  s.date = "1980-01-02"
   s.description = "Library that allows interacting with the Ollama API".freeze
   s.email = "flori@ping.de".freeze
   s.executables = ["ollama_console".freeze, "ollama_update".freeze, "ollama_cli".freeze]
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   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 = "3.6.2".freeze
+  s.rubygems_version = "3.6.7".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]
 

data/spec/ollama/message_spec.rb

@@ -7,9 +7,10 @@ RSpec.describe Ollama::Message do
 
   let :message do
     described_class.new(
-      role: 'user',
+      role:    'user',
       content: 'hello world',
-      images: image
+      thinking: 'which world?',
+      images:  image
     )
   end
 
@@ -21,16 +22,17 @@ RSpec.describe Ollama::Message do
     expect(message.as_json).to eq(
       role: 'user',
       content: 'hello world',
+      thinking: 'which world?',
       images: [ image ],
     )
     expect(message.to_json).to eq(
-      '{"role":"user","content":"hello world","images":["dGVzdA==\n"]}'
+      '{"role":"user","content":"hello world","thinking":"which world?","images":["dGVzdA==\n"]}'
     )
   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","images":["dGVzdA==\n"]}
+      {"role":"user","content":"hello world","thinking":"which world?","images":["dGVzdA==\n"]}
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ollama-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Florian Frank
 bindir: bin
 cert_chain: []
-date: 2025-04-14 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -214,9 +214,9 @@ dependencies:
 description: Library that allows interacting with the Ollama API
 email: flori@ping.de
 executables:
+- ollama_cli
 - ollama_console
 - ollama_update
-- ollama_cli
 extensions: []
 extra_rdoc_files:
 - README.md
@@ -362,7 +362,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Interacting with the Ollama API
 test_files: