ollama-ruby 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b77be573fc0b5bf72e9d46c5ff580454cc5a0fe08a77b95cc607f532b06902c3
-  data.tar.gz: 9f8fa137acbac201e5fbf615c791258babeac6185f7656ba14574efa9020fc14
+  metadata.gz: e26fc8b8ae9847d35f0422d1b4d8915c496b3a0d96b8ac202b7928c0f9ae7bd0
+  data.tar.gz: 802709860c8611397faf70b4f4fa7af41a0bebc2c5a642d97163b6337e6326e1
 SHA512:
-  metadata.gz: 0f589bf0e5db1f682eae38fe481541c58e843c3511960b8d5bd659a0249661baf975b617b0d47768d33fe2fe7555ce71688bf904b0a2a9a2d7d2bfe06a6bb569
-  data.tar.gz: 1257d170eaff46b79838861638860c2ddb491bd7ca9d833fba92c841a4c6e366e70eb234bd7f7ebeeb4542ce98748c414eb58f59aca1151bed148ed16f6c2432
+  metadata.gz: 26c44972749476a2fe6af10c97f7c18482d0ecca058e4ef3b416ec7e019d0109d6f5d24f7266cb37ddb420f59cd2c939a21bed44ab5db0180b1988bc4a8350de
+  data.tar.gz: 6be99709d688a678a4d6bbb12501cb0d758a5e794f76cb8310ce315c7956c53af456e8148bf05962fd4a8801c9f17f06187d84631182d03609920870aa8a84d4

data/CHANGES.md

@@ -1,5 +1,17 @@
 # Changes
 
+## 2025-07-06 v1.3.0
+
+* Added toggleable streaming in Markdown handler:
+  * Added conditional handler initialization
+  * Implemented toggleable streaming in Markdown handler
+  * Tested non-streaming (`stream: false`) behavior
+
+## 2025-06-02 v1.2.1
+
+* Added thinking mode option to CLI:
+  + `bin/ollama_cli` now includes `-T` flag for thinking mode generation
+
 ## 2025-06-01 v1.2.0
 
 * Added `tool_calls` parameter to the `initialize` method of the `Message` class:

data/bin/ollama_cli

@@ -8,24 +8,26 @@ require 'tins/xt/secure_write'
 require 'json'
 require 'tmpdir'
 
-class ChatStart
-  include Ollama::Handlers::Concern
-
-  def initialize(output: $stdout)
-    super
-    @output.sync = true
-    @content     = ''
-  end
+module Ollama::Handlers
+  class ChatStart
+    include Ollama::Handlers::Concern
+
+    def initialize(output: $stdout)
+      super
+      @output.sync = true
+      @content     = ''
+    end
 
-  attr_reader :content
+    attr_reader :content
 
-  def call(response)
-    if content = response.response
-      @content << content
-      @output << content
+    def call(response)
+      if content = response.response
+        @content << content
+        @output << content
+      end
+      response.done and @output.puts
+      self
     end
-    response.done and @output.puts
-    self
   end
 end
 
@@ -74,13 +76,14 @@ def usage
       -P VARIABLE    sets prompt var %{foo} to "bar" if VARIABLE is foo=bar
       -H HANDLER     the handler to use for the response, defaults to ChatStart
       -S             use streaming for generation
+      -T             use thinking for generation
       -h             this help
 
   EOT
   exit 0
 end
 
-opts = go 'u:m:M:s:p:P:H:Sh', defaults: { ?H => 'ChatStart', ?M => '{}' }
+opts = go 'u:m:M:s:p:P:H:STh', defaults: { ?H => 'ChatStart', ?M => '{}' }
 
 opts[?h] and usage
 
@@ -114,8 +117,15 @@ if ENV['DEBUG'].to_i == 1
   EOT
 end
 
-handler = Object.const_get(opts[?H])
-handler == ChatStart and handler = handler.new
+handler = Ollama::Handlers.const_get(opts[?H])
+handler = case
+          when handler == Ollama::Handlers::ChatStart
+            handler.new
+          when handler == Ollama::Handlers::Markdown
+            handler.new(stream: !!opts[?S])
+          else
+            handler
+          end
 
 Client.new(base_url:, read_timeout: 120).generate(
   model:,
@@ -123,10 +133,11 @@ Client.new(base_url:, read_timeout: 120).generate(
   prompt:,
   options:,
   stream: !!opts[?S],
+  think: !!opts[?T],
   &handler
 )
 
-if handler.is_a?(ChatStart)
+if handler.is_a?(Ollama::Handlers::ChatStart)
   filename = File.join(Dir.tmpdir, 'chat_start_%u.json' % $$)
   File.secure_write(filename) do |out|
     JSON.dump(

data/lib/ollama/handlers/markdown.rb

@@ -5,17 +5,23 @@ class Ollama::Handlers::Markdown
   include Ollama::Handlers::Concern
   include Term::ANSIColor
 
-  def initialize(output: $stdout)
-    super
-    @output.sync = true
+  def initialize(output: $stdout, stream: true)
+    super(output:)
+    @stream      = stream
+    @output.sync = @stream
     @content     = ''
   end
 
   def call(response)
     if content = response.response || response.message&.content
-      @content << content
-      markdown_content = Kramdown::ANSI.parse(@content)
-      @output.print clear_screen, move_home, markdown_content
+      if @stream
+        @content << content
+        markdown_content = Kramdown::ANSI.parse(@content)
+        @output.print clear_screen, move_home, markdown_content
+      else
+        markdown_content = Kramdown::ANSI.parse(content)
+        @output.print markdown_content
+      end
     end
     self
   end

data/lib/ollama/version.rb

@@ -1,6 +1,6 @@
 module Ollama
   # Ollama version
-  VERSION         = '1.2.0'
+  VERSION         = '1.3.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.2.0 ruby lib
+# stub: ollama-ruby 1.3.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama-ruby".freeze
-  s.version = "1.2.0".freeze
+  s.version = "1.3.0".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".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.7".freeze
+  s.rubygems_version = "3.6.9".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/handlers/markdown_spec.rb

@@ -41,4 +41,14 @@ RSpec.describe Ollama::Handlers::Markdown do
     response = double('response', response: nil, message: nil, done: true)
     markdown.call(response)
   end
+
+  it 'displays markdown response in one go when stream is false' do
+    output = double('output', :sync= => false)
+    expect(output).to receive(:print).with(ansi).once
+    markdown = described_class.new(output:, stream: false)
+    response = double('response', response: md, done: true)
+    markdown.call(response)
+    response = double('response', response: nil, message: nil, done: true)
+    markdown.call(response)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ollama-ruby
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Florian Frank
@@ -362,7 +362,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Interacting with the Ollama API
 test_files: