ollama-ruby 1.3.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e26fc8b8ae9847d35f0422d1b4d8915c496b3a0d96b8ac202b7928c0f9ae7bd0
-  data.tar.gz: 802709860c8611397faf70b4f4fa7af41a0bebc2c5a642d97163b6337e6326e1
+  metadata.gz: 6f22498af2b68b25f11d486872f46a42ad16b94244d3f0a9cb7df9e436056894
+  data.tar.gz: aa154d720f3df668020bdf39d38c7964e7081cabcfa4daec761ebb3809bfa57f
 SHA512:
-  metadata.gz: 26c44972749476a2fe6af10c97f7c18482d0ecca058e4ef3b416ec7e019d0109d6f5d24f7266cb37ddb420f59cd2c939a21bed44ab5db0180b1988bc4a8350de
-  data.tar.gz: 6be99709d688a678a4d6bbb12501cb0d758a5e794f76cb8310ce315c7956c53af456e8148bf05962fd4a8801c9f17f06187d84631182d03609920870aa8a84d4
+  metadata.gz: a32fb5d1bd7dd225c8917c8e43b43f9983eb85c971fbe01f4993f9b0131761d467a93658d2cf50ca5db1d44da6ea20ad6885aded8a5747ea259ab3d4c261c6b2
+  data.tar.gz: 067ca2f5c9c7de901732aae837dc151e023751a935952e4c0533dd50124610c367fc6149e16c096724077bb0c8f9f0781028f7dd108a32dfd4cdf1b533af9040

data/CHANGES.md

@@ -1,5 +1,40 @@
 # Changes
 
+## 2025-07-21 v1.5.0
+
+* Update `ollama_cli` script to handle client configuration via JSON and
+  clarify argument types:
+  * Added support for `-c ` option to specify client configuration as JSON
+  * Updated documentation to clarify which arguments expect JSON input
+  * Replaced direct client initialization with `configure_with` method for
+    better maintainability
+* Update documentation for `ollama_cli` script:
+  * Reorganized usage instructions for clarity
+  * Added descriptions for new options: `-c ` and `-H `
+  * Clarified which arguments expect JSON input:
+    - `-M OPTIONS`: model options in JSON format
+    - `-s SYSTEM` and `-p PROMPT`: plain text inputs
+  * Improved formatting for better readability
+* Add `ollama_browse` to Rakefile executable tasks
+
+## 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:

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
@@ -327,26 +350,22 @@ To use `ollama_cli`, simply run it from the command line and follow the usage
 instructions:
 
 ```bash
-ollama_cli [OPTIONS]
-```
+Usage: ollama_cli [OPTIONS]
+
+  -u URL         the ollama base url, $OLLAMA_URL
+  -c CLIENT      the ollama client config (JSON), $OLLAMA_CLIENT
+  -m MODEL       the ollama model to chat with, $OLLAMA_MODEL
+  -M OPTIONS     the ollama model options (JSON), $OLLAMA_MODEL_OPTIONS
+  -s SYSTEM      the system prompt as plain text, $OLLAMA_SYSTEM
+  -p PROMPT      the user prompt as plain text, $OLLAMA_PROMPT
+                 if it contains %{stdin} it is substituted by stdin input
+  -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
 
-The available options are:
-
-* `-u URL`: The Ollama base URL. Can be set as an environment variable
-  `OLLAMA_URL`.
-* `-m MODEL`: The Ollama model to chat with. Defaults to `llama3.1` if not
-  specified.
-* `-M OPTIONS`: The Ollama model options to use. Can be set as an environment
-  variable `OLLAMA_MODEL_OPTIONS`.
-* `-s SYSTEM`: The system prompt to use as a file. Can be set as an environment
-  variable `OLLAMA_SYSTEM`.
-* `-p PROMPT`: The user prompt to use as a file. If it contains `%{stdin}`, it
-  will be substituted with the standard input. If not given, stdin will be used
-  as the prompt.
-* `-P VARIABLE`: Sets a prompt variable, e.g. `foo=bar`. Can be used multiple
-  times.
-* `-H HANDLER`: The handler to use for the response. Defaults to `Print`.
-* `-S`: Use streaming for generation.
+```
 
 #### Environment Variables
 
@@ -354,10 +373,11 @@ The following environment variables can be set to customize the behavior of
 `ollama_cli`:
 
 * `OLLAMA_URL`: The Ollama base URL.
+* `OLLAMA_CLIENT`: The client config (JSON).
 * `OLLAMA_MODEL`: The Ollama model to chat with.
-* `OLLAMA_MODEL_OPTIONS`: The Ollama model options to use.
-* `OLLAMA_SYSTEM`: The system prompt to use as a file.
-* `OLLAMA_PROMPT`: The user prompt to use as a file.
+* `OLLAMA_MODEL_OPTIONS`: The Ollama model options (JSON).
+* `OLLAMA_SYSTEM`: The system prompt to use as plain text.
+* `OLLAMA_PROMPT`: The user prompt to use as plain text.
 
 #### Debug Mode
 

data/Rakefile

@@ -19,7 +19,7 @@ GemHadar do
      '.rspec', *Dir.glob('.github/**/*', File::FNM_DOTMATCH)
   readme      'README.md'
 
-  executables << 'ollama_console' << 'ollama_update' << 'ollama_cli'
+  executables << 'ollama_console' << 'ollama_update' << 'ollama_cli' << 'ollama_browse'
 
   required_ruby_version  '~> 3.1'
 

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

@@ -68,10 +68,11 @@ def usage
     Usage: #{File.basename($0)} [OPTIONS]
 
       -u URL         the ollama base url, $OLLAMA_URL
+      -c CLIENT      the ollama client config (JSON), $OLLAMA_CLIENT
       -m MODEL       the ollama model to chat with, $OLLAMA_MODEL
-      -M OPTIONS     the ollama model options to use, $OLLAMA_MODEL_OPTIONS
-      -s SYSTEM      the system prompt to use as a file, $OLLAMA_SYSTEM
-      -p PROMPT      the user prompt to use as a file, $OLLAMA_PROMPT
+      -M OPTIONS     the ollama model options (JSON), $OLLAMA_MODEL_OPTIONS
+      -s SYSTEM      the system prompt as plain text, $OLLAMA_SYSTEM
+      -p PROMPT      the user prompt as plain text, $OLLAMA_PROMPT
                      if it contains %{stdin} it is substituted by stdin input
       -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
@@ -83,11 +84,15 @@ def usage
   exit 0
 end
 
-opts = go 'u:m:M:s:p:P:H:STh', defaults: { ?H => 'ChatStart', ?M => '{}' }
+opts = go 'u:m:M:s:p:P:H:c:STh', defaults: { ?H => 'ChatStart', ?M => '{}' }
 
 opts[?h] and usage
 
-base_url = opts[?u] || ENV['OLLAMA_URL'] || 'http://%s' % ENV.fetch('OLLAMA_HOST')
+base_url  = opts[?u] || ENV['OLLAMA_URL'] || 'http://%s' % ENV.fetch('OLLAMA_HOST')
+client_config = Client::Config[
+  { base_url: } |
+  JSON(get_file_argument(opts[?c], default: ENV['OLLAMA_CLIENT']).full? || '{}')
+]
 model    = opts[?m] || ENV.fetch('OLLAMA_MODEL', 'llama3.1')
 options  = Ollama::Options.from_hash(JSON(
   get_file_argument(opts[?M], default: ENV['OLLAMA_MODEL_OPTIONS'])
@@ -127,7 +132,7 @@ handler = case
             handler
           end
 
-Client.new(base_url:, read_timeout: 120).generate(
+Client.configure_with(client_config).generate(
   model:,
   system:,
   prompt:,

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/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.3.0'
+  VERSION         = '1.5.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.3.0 ruby lib
+# stub: ollama-ruby 1.5.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama-ruby".freeze
-  s.version = "1.3.0".freeze
+  s.version = "1.5.0".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -11,9 +11,9 @@ Gem::Specification.new do |s|
   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]
-  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.executables = ["ollama_console".freeze, "ollama_update".freeze, "ollama_cli".freeze, "ollama_browse".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]

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/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.3.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Florian Frank
@@ -214,6 +214,7 @@ dependencies:
 description: Library that allows interacting with the Ollama API
 email: flori@ping.de
 executables:
+- ollama_browse
 - ollama_cli
 - ollama_console
 - ollama_update
@@ -223,6 +224,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 +253,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 +269,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 +305,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 +315,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