ollama-ruby 1.2.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b6a67a947af787d3a67180531d7afb1390a009adf38616b55f32bc6c9301942
-  data.tar.gz: e7fb09439a06ede0a240f42f64048e88ac2d295fa50a8d3bc59dfed3bdb98b3a
+  metadata.gz: d7010b648d380dea2bb5fcfd89597af4abbb37e064905dce4e393162d9896ef5
+  data.tar.gz: ea8df217db7e0ddd70df548820c3abc73c7efa233af56ccde171dbaa087a9a92
 SHA512:
-  metadata.gz: acc5e14fca8df34795a2cca585ff56157023b14dbd53c10995bf1751a39d2f137dbb9c5a26bbb2c58dc7a2ac1402d56ceea37eaf744189a5fc191f3532a0e57b
-  data.tar.gz: b8f0357fa9734eed66dd7b9013df7f6e464d3a0af7bd00acd11552dfffb15951b18d12bd2ab7c2c45736a735f4ee4f9ae2900d96415cf30bf9ff6a401e4dd3f8
+  metadata.gz: 4ac32ac4fd527aa94f11b50fe72c0d22a4d326368d2d7655d090a4af9e3fea466f478574c2c0ce2d70ef1394e7f3da8709ee5f76fdbf9672004d91850d45245d
+  data.tar.gz: cfe22940814d91e3755cfc0d83b662db4ff505ac7b00980915eeaa51f63ff3b06a8a240cd926dbcf798d27c558c20c768a6f19e99119497e220c1e8fd1fd30f9

data/CHANGES.md

@@ -1,5 +1,30 @@
 # Changes
 
+## 2025-07-17 v1.4.0
+
+* **New CLI Tool**: Added `bin/ollama_browse` for exploring model tags and
+  metadata.
+* **JSON Configuration Support**:
+  - Introduced `lib/ollama/json_loader.rb` to load configurations from JSON
+    files.
+  - Enhanced `Config` and `Options` classes with JSON parsing capabilities.
+* **Client Customization**:
+  - Added `configure_with` method in `Ollama::Client` for initializing clients
+    using `Config` objects.
+* **Documentation Updates**: Included detailed usage examples for basic setups
+  and configurations.
+* **Testing Improvements**: Expanded test coverage for JSON file parsing and
+  configuration handling.
+* **Output Enhancements**: Refined formatting in `ollama_browse` to display
+  file size and context size.
+
+## 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:

data/README.md

@@ -28,18 +28,41 @@ to your Gemfile and run `bundle install` in your terminal.
 
 ## Usage
 
-In your own software the library can be used as shown in this example:
+In your own software the library can be used as shown in these examples:
+
+### Basic Usage
 
 ```ruby
 require 'ollama'
 include Ollama
 
+# Call directly with settings as keywords
 ollama = Client.new(base_url: 'http://localhost:11434')
+
+messages = Message.new(role: 'user', content: 'Why is the sky blue?')
+ollama.chat(model: 'llama3.1', stream: true, messages:, &Print)
+```
+
+### Using Configuration Object
+
+```ruby
+require 'ollama'
+include Ollama
+
+# Create a configuration object with desired settings
+config = Client::Config[
+  base_url: 'http://localhost:11434',
+  output: $stdout,
+  connect_timeout: 15,
+  read_timeout: 300
+]
+# Or config = Client::Config.load_from_json('path/to/client.json')
+
+# Initialize client using the configuration
+ollama = Client.configure_with(config)
+
 messages = Message.new(role: 'user', content: 'Why is the sky blue?')
-ollama.chat(model: 'llama3.1', stream: true, messages:, &Print) # or
-print ollama.chat(model: 'llama3.1', stream: true, messages:).lazy.map { |response|
-  response.message.content
-}
+ollama.chat(model: 'llama3.1', stream: true, messages:, &Print)
 ```
 
 ## Try out things in ollama\_console

data/bin/ollama_browse

@@ -0,0 +1,41 @@
+#!/usr/bin/env ruby
+
+require 'term/ansicolor'
+include Term::ANSIColor
+require 'ollama'
+include Ollama
+require 'excon'
+require 'nokogiri'
+
+model      = ARGV.shift or fail 'model name as first argument is required'
+url_prefix = 'https://ollama.com/library'
+tags_url   = '%s/%s/tags' % [ url_prefix, model ]
+result       = Excon.get(tags_url)
+if result.status >= 400
+  STDERR.puts 'Model %s cannot be browsed, HTTP result code %u' % [ model, result.status ]
+  exit 1
+end
+body = result.body
+doc  = Nokogiri::HTML(body)
+
+# They are never permitted to change the structure of this HTML…
+css        = 'section div div .group.px-4.py-3'
+tags = (doc / css).map do |element|
+  tagged_name             = (element / 'a div div div span').text
+  file_size, context_size = (element / 'p').map(&:text)
+  hash                    = (element / 'a .text-neutral-500 span .font-mono').text
+  [ tagged_name, file_size, context_size, hash ]
+end.group_by(&:last)
+
+puts bold('Model: ') + hyperlink(tags_url) { model }
+tags.each do |hash, tagged_blobs|
+  print bold(hash)
+  first_blob = true
+  tagged_blobs.each do |(tag, _), file_size, context_size|
+    if first_blob
+      puts ' ' + [ file_size, context_size ] * ' '
+      first_blob = false
+    end
+    puts ' · ' + hyperlink('%s/%s' % [ url_prefix, tag ]) { blue(tag) }
+  end
+end

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
 
@@ -115,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:,
@@ -128,7 +137,7 @@ Client.new(base_url:, read_timeout: 120).generate(
   &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/client/configuration/config.rb

@@ -0,0 +1,35 @@
+require 'ollama/json_loader'
+
+module Ollama::Client::Configuration
+  class Config
+    extend Ollama::JSONLoader
+
+    def initialize(**attributes)
+      attributes.each { |k, v| send("#{k}=", v) }
+      self.output ||= $stdout
+    end
+
+    def self.[](value)
+      new(**value.to_h)
+    end
+
+    attr_accessor :base_url, :output, :connect_timeout, :read_timeout,
+      :write_timeout, :debug, :user_agent
+  end
+
+  extend Tins::Concern
+
+  module ClassMethods
+    def configure_with(config)
+      new(
+        base_url:        config.base_url,
+        output:          config.output,
+        connect_timeout: config.connect_timeout,
+        read_timeout:    config.read_timeout,
+        write_timeout:   config.write_timeout,
+        debug:           config.debug,
+        user_agent:      config.user_agent
+      )
+    end
+  end
+end

data/lib/ollama/client.rb

@@ -2,10 +2,12 @@ class Ollama::Client
 end
 require 'ollama/client/doc'
 require 'ollama/client/command'
+require 'ollama/client/configuration/config'
 
 class Ollama::Client
   include Tins::Annotate
   include Ollama::Handlers
+  include Ollama::Client::Configuration
   include Ollama::Client::Command
 
   annotate :doc

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/json_loader.rb

@@ -0,0 +1,6 @@
+module Ollama::JSONLoader
+  def load_from_json(path)
+    json = File.read(path)
+    new(**config_hash = JSON.parse(json, symbolize_names: true))
+  end
+end

data/lib/ollama/options.rb

@@ -1,7 +1,10 @@
+require 'ollama/json_loader'
+
 # Options are explained in the parameters for the modelfile:
 # https://github.com/ollama/ollama/blob/main/docs/modelfile.md#parameter
 class Ollama::Options
   include Ollama::DTO
+  extend Ollama::JSONLoader
 
   @@types = {
     numa:              [ false, true ],

data/lib/ollama/version.rb

@@ -1,6 +1,6 @@
 module Ollama
   # Ollama version
-  VERSION         = '1.2.1'
+  VERSION         = '1.4.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.1 ruby lib
+# stub: ollama-ruby 1.4.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama-ruby".freeze
-  s.version = "1.2.1".freeze
+  s.version = "1.4.0".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -12,13 +12,13 @@ Gem::Specification.new do |s|
   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]
-  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/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/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 = [".yardopts".freeze, "CHANGES.md".freeze, "Gemfile".freeze, "LICENSE".freeze, "README.md".freeze, "Rakefile".freeze, "bin/ollama_cli".freeze, "bin/ollama_console".freeze, "bin/ollama_update".freeze, "lib/ollama.rb".freeze, "lib/ollama/client.rb".freeze, "lib/ollama/client/command.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/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/kitten.jpg".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.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 = [".yardopts".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_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 = "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/assets/client.json

@@ -0,0 +1,4 @@
+{
+  "connect_timeout": 60,
+  "read_timeout": 3600
+}

data/spec/assets/options.json

@@ -0,0 +1,8 @@
+{
+  "num_ctx": 16384,
+  "seed": -1,
+  "num_predict": 1024,
+  "temperature": 0.666,
+  "top_p": 0.95,
+  "min_p": 0.1
+}

data/spec/ollama/client_spec.rb

@@ -13,6 +13,27 @@ RSpec.describe Ollama::Client do
     expect(ollama).to be_a described_class
   end
 
+  it 'can be instantiated with config' do
+    config = Ollama::Client::Config[base_url: base_url]
+    client = described_class.configure_with(config)
+    expect(client).to be_a described_class
+    expect(client.base_url.to_s).to eq base_url
+    expect(client.output).to be $stdout
+  end
+
+  it 'can be instantiated with config loaded from JSON' do
+    config = Ollama::Client::Config.load_from_json(asset('client.json'))
+    config.base_url = base_url
+    expect(config.read_timeout).to eq 3_600
+    expect(config.connect_timeout).to eq 60
+    client = described_class.configure_with(config)
+    expect(client).to be_a described_class
+    expect(client.base_url.to_s).to eq base_url
+    expect(client.output).to be $stdout
+    expect(client.instance_variable_get(:@connect_timeout)).to eq 60
+    expect(client.instance_variable_get(:@read_timeout)).to eq 3_600
+  end
+
   it 'can be configured via environment variable' do
     expect { described_class.new }.to raise_error(ArgumentError)
     ENV['OLLAMA_URL'] = base_url

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

data/spec/ollama/options_spec.rb

@@ -13,6 +13,17 @@ RSpec.describe Ollama::Options do
     expect(options).to be_a described_class
   end
 
+  it 'can be configured by loading from JSON' do
+    options = described_class.load_from_json(asset('options.json'))
+    expect(options).to be_a described_class
+    expect(options.num_ctx).to eq(16384)
+    expect(options.seed).to eq(-1)
+    expect(options.num_predict).to eq(1024)
+    expect(options.temperature).to be_within(1E-6).of(0.666)
+    expect(options.top_p).to be_within(0.001).of(0.95)
+    expect(options.min_p).to be_within(0.001).of(0.1)
+  end
+
   it 'can be empty' do
     expect(described_class.new).to be_empty
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ollama-ruby
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Florian Frank
@@ -223,6 +223,7 @@ extra_rdoc_files:
 - lib/ollama.rb
 - lib/ollama/client.rb
 - lib/ollama/client/command.rb
+- lib/ollama/client/configuration/config.rb
 - lib/ollama/client/doc.rb
 - lib/ollama/commands/chat.rb
 - lib/ollama/commands/copy.rb
@@ -251,6 +252,7 @@ extra_rdoc_files:
 - lib/ollama/handlers/say.rb
 - lib/ollama/handlers/single.rb
 - lib/ollama/image.rb
+- lib/ollama/json_loader.rb
 - lib/ollama/message.rb
 - lib/ollama/options.rb
 - lib/ollama/response.rb
@@ -266,12 +268,14 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- bin/ollama_browse
 - bin/ollama_cli
 - bin/ollama_console
 - bin/ollama_update
 - lib/ollama.rb
 - lib/ollama/client.rb
 - lib/ollama/client/command.rb
+- lib/ollama/client/configuration/config.rb
 - lib/ollama/client/doc.rb
 - lib/ollama/commands/chat.rb
 - lib/ollama/commands/copy.rb
@@ -300,6 +304,7 @@ files:
 - lib/ollama/handlers/say.rb
 - lib/ollama/handlers/single.rb
 - lib/ollama/image.rb
+- lib/ollama/json_loader.rb
 - lib/ollama/message.rb
 - lib/ollama/options.rb
 - lib/ollama/response.rb
@@ -309,7 +314,9 @@ files:
 - lib/ollama/tool/function/parameters/property.rb
 - lib/ollama/version.rb
 - ollama-ruby.gemspec
+- spec/assets/client.json
 - spec/assets/kitten.jpg
+- spec/assets/options.json
 - spec/ollama/client/doc_spec.rb
 - spec/ollama/client_spec.rb
 - spec/ollama/commands/chat_spec.rb
@@ -362,7 +369,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: