ollama-ruby 1.25.0 → 1.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a8729b76057bbe9bda6d774b3d5ee4e9227ed0c6f3eaa6518b40efe5b0e979a
-  data.tar.gz: c56b35df0a1afe4cdf12cc06a95763d62d4fdcdc5fc96093c0b28484c4174d6b
+  metadata.gz: f101efa42abe520f7fb3f718bf6b4ac146ec0b28639dd3183d75d180a471d346
+  data.tar.gz: 2875f4865a3fb7a47d2f737752b0e3e6025f5d129ea4510d289bb4cdbabc6412
 SHA512:
-  metadata.gz: 9f51f5d86982a8d32c69df5f6660fd4a51e6c054fbfb9ef245c40fc46cac1d18cf42c00544649839377ccc7f2383cf9bb040e37a4a1f72fe517dde1b66708add
-  data.tar.gz: f870f0e817b8c33072ceac03e73d076f93c0b396942a689068fccbb8b14fa217b68105e152f087ea0fc3871a71a927f2612831a7b2c8538a1ae91ec6bb76118c
+  metadata.gz: c8e41ec6ec520238ccfe3a721600faa9d61356f05fb3fb46f3ca6c83ff0abbc78585a9c01afda0287d2ace92132d2458aecc6acc75ab0a9266df65cf964a60a0
+  data.tar.gz: b054b3326b5cde5afaf96ed8b667f13d3fb32710dff22a817da52133e418577388026d5e117395f405a743fe0a205cbdfc65e96eaf8185c64c38d9c00a5865aa

data/CHANGES.md

@@ -1,5 +1,50 @@
 # Changes
 
+## 2026-10-23 v1.26.0
+
+### Features
+
+- Added `Ollama::BaseURL` module with a `base_url` method to normalize host
+  specifications into `URI` objects, automatically prepending `http://` when no
+  scheme is present.
+- Exposed `Ollama.base_url` as the public entry point for resolving base URLs.
+
+### Fixes
+
+- Updated `bin/ollama_browse` to strip the tag suffix from the model argument
+  before querying the tags URL, preventing 404 errors for models with tags
+  (e.g., `qwen3-coder:latest`).
+
+### Improvements
+
+- Replaced inline base URL construction in `bin/ollama_cli`,
+  `bin/ollama_console`, `bin/ollama_ps`, and `bin/ollama_update` with calls to
+  `Ollama.base_url`.
+
+### Build & CI
+
+- Updated the `gem_hadar` development dependency to **2.20.1**.
+
+### Testing
+
+- Added `spec/ollama/base_url_spec.rb` to cover bare host:port strings,
+  IP:port, full `http://`/`https://` URLs, `URI` object pass-through, and
+  `fallback: false` behavior.
+
+### Documentation
+
+- Added a "Vision (Multimodal) Models" section to the README with a workflow
+  for importing vision models using `push_blob` and `create`.
+- Added a note clarifying that `push_blob` returns `sha256:`-prefixed digests
+  and that `files` map keys must be basenames.
+- Added a tip to verify exact filenames via the Hugging Face API
+  `siblings[].rfilename`.
+- Simplified the `show`/`create` parameter-inheritance example in the README to
+  use Ruby 3.1+ hash shorthand.
+- Fixed various typos in the README, including `&` to `&`, "the the",
+  "choosen" to "chosen", "commdand(s)" to "command(s)", and "can be be created"
+  to "can be created".
+
 ## 2026-10-17 v1.25.0
 
 * `DTO#to_hash` now only rejects `nil` attribute values instead of also

data/README.md

@@ -10,7 +10,7 @@ an ollama server via the
 
 Complete API documentation is available at: [GitHub.io](https://flori.github.io/ollama-ruby/)
 
-## Installation (gem & bundler)
+## Installation (gem & bundler)
 
 To install Ollama, you can use the following methods:
 
@@ -89,7 +89,7 @@ Commands: chat,copy,create,delete,embeddings,generate,help,ps,pull,push,show,tag
 
 ## API
 
-This Ollama library provides commands to interact with the the [Ollama REST
+This Ollama library provides commands to interact with the [Ollama REST
 API](https://github.com/ollama/ollama/blob/main/docs/api.md)
 
 
@@ -131,9 +131,9 @@ The following standard handlers are available for the commands below:
 Their `output` IO handle can be changed by e. g. passing `Print.new(output:
 io)` with `io` as the IO handle to the _generate_ command.
 
-If you don't pass a handler explicitly, either the `stream_handler` is choosen
+If you don't pass a handler explicitly, either the `stream_handler` is chosen
 if the command expects a streaming response or the `default_handler` otherwise.
-See the following commdand descriptions to find out what these defaults are for
+See the following command descriptions to find out what these defaults are for
 each command. These commands can be tried out directly in the `ollama_console`.
 
 ### Chat
@@ -280,16 +280,63 @@ create(
 This method is highly efficient as it uses streaming uploads and avoids
 redundant data transfers if the blob already exists on the server.
 
+> **Note:** `push_blob` returns the digest with the `sha256:` prefix already
+> included. The keys in the `files` map must be the **basename** of the file
+> (e.g., `my-model-q4_0.gguf`), not a path or digest.
+
 You can also import parameters from an existing model using the `show`
 endpoint. `Options.from_string` parses the multi-line `parameters` field into
 a typed `Options` instance that can be passed to `create(…, parameters:)`:
 
 ```ruby
-info    = show(model: 'llama3.1')
-options = Options.from_string(info.parameters)
-create(model: 'my-clone', from: 'llama3.1', parameters: options)
+info       = show(model: 'llama3.1')
+parameters = Options.from_string(info.parameters)
+create(model: 'my-clone', from: 'llama3.1', parameters:)
 ```
 
+### Vision (Multimodal) Models
+
+For vision-capable models (e.g., Gemma 4, Qwen VL), you push **two** blobs:
+the language model weights and the vision projector. The `mmproj-*` filename
+convention is what tells Ollama a file is a projector — there is no Modelfile
+directive for it.
+
+This workflow is particularly convenient in the `ollama_console`:
+
+```ruby
+# Point at your local files (full paths from hf download)
+gp = '/home/flori/.cache/huggingface/hub/…/model.i1-Q5_K_S.gguf'  # Large Language Model
+mp = '/home/flori/.cache/huggingface/hub/…/model.mmproj-f16.gguf' # Vision Encoder
+
+# Push both blobs (digests come back sha256:-prefixed)
+digest_gp = push_blob(body: File.new(gp, 'rb'))
+digest_mp = push_blob(body: File.new(mp, 'rb'))
+
+# Build the files map: basename => digest
+files = {
+  File.basename(gp) => digest_gp,
+  File.basename(mp) => digest_mp
+}
+
+# Inherit template & parameters from a same-architecture reference
+ref        = show(model: 'gemma4:31b-it-q4_K_M')
+template   = ref.template
+parameters = Ollama::Options.from_string(ref.parameters)
+
+# Create the model
+create(
+  model: 'flori/my-visual-model:i1-Q5_K_S',
+  files:,
+  template:,
+  parameters:
+)
+```
+
+> **Tip:** Verify exact filenames via the HF API
+> (`/api/models/<repo_id>` → `siblings[].rfilename`) or the repo file tree
+> before downloading. Model card tables may use display names (e.g., "BF16")
+> that differ from actual filenames (e.g., `mmproj-f16.gguf`).
+
 ## Auxiliary objects
 
 The following objects are provided to interact with the ollama server. You can
@@ -297,7 +344,7 @@ run all of the examples in the `ollama_console`.
 
 ### Message
 
-Messages can be be created by using the **Message** class:
+Messages can be created by using the **Message** class:
 
 ```ruby
 message = Message.new role: 'user', content: 'hello world'
@@ -317,10 +364,10 @@ It's possible to create an **Image** object via `for_base64(data)`,
 
 ### Options
 
-For `chat` and `generate` commdands it's possible to pass an **Options** object
+For `chat` and `generate` commands it's possible to pass an **Options** object
 to configure different
 [parameters](https://github.com/ollama/ollama/blob/main/docs/modelfile.md#parameter)
-for the running model. To set the `temperature` can be done via:
+for the running model. To set the `temperature` you can:
 
 ```ruby
 options = Options.new(temperature: 0.999)
@@ -603,7 +650,6 @@ the following command:
 ```bash
 gem install ollama-chat
 ```
-- Set default format to **table** when no `-f` flag is provided
 
 Once installed, you can run `ollama_chat` from your terminal or command prompt.
 This will launch a chat interface where you can interact with an LLM.

data/bin/ollama_browse

@@ -15,6 +15,7 @@ require 'excon'
 require 'nokogiri'
 
 model      = ARGV.shift or fail 'model name as first argument is required'
+model      = model.gsub(/:.*/, '')
 url_prefix = 'https://ollama.com/library'
 tags_url   = '%s/%s/tags' % [ url_prefix, model ]
 result       = Excon.get(tags_url)

data/bin/ollama_cli

@@ -137,7 +137,7 @@ opts = go 'u:m:M:s:p:P:H:c:I:STdih', defaults: { ?H => 'ChatStart' }
 
 opts[?h] and usage
 
-base_url = opts[?u] || ENV['OLLAMA_URL'] || 'http://%s' % ENV.fetch('OLLAMA_HOST')
+base_url = Ollama.base_url(opts[?u] || ENV['OLLAMA_URL'] || ENV.fetch('OLLAMA_HOST'))
 api_key  = ENV['OLLAMA_API_KEY']
 client_config = Client::Config[
   { base_url:, api_key:, debug: !!opts[?d] } |

data/bin/ollama_console

@@ -25,11 +25,12 @@ require 'irb/history'
 # The base_url method returns the Ollama API base URL.
 #
 # It first checks for the OLLAMA_URL environment variable.
-# If not set, it defaults to 'http://' followed by the OLLAMA_HOST environment variable.
+# If not set, it falls back to the OLLAMA_HOST environment variable.
+# The result is normalized via {Ollama.base_url}.
 #
-# @return [ String ] the base URL for the Ollama API
+# @return [URI, nil] the normalized base URL for the Ollama API
 def base_url
-  ENV['OLLAMA_URL'] || 'http://%s' % ENV.fetch('OLLAMA_HOST')
+  Ollama.base_url(ENV['OLLAMA_URL'] || ENV.fetch('OLLAMA_HOST'))
 end
 
 # The client_config method retrieves and merges client configuration settings.

data/bin/ollama_ps

@@ -60,12 +60,12 @@ end
 # The base_url method returns the Ollama API base URL.
 #
 # It first checks for the OLLAMA_URL environment variable.
-# If not set, it defaults to 'http://' followed by the OLLAMA_HOST environment
-# variable.
+# If not set, it falls back to the OLLAMA_HOST environment variable.
+# The result is normalized via {Ollama.base_url}.
 #
-# @return [ String ] the base URL for the Ollama API
+# @return [URI, nil] the normalized base URL for the Ollama API
 def base_url
-  ENV['OLLAMA_URL'] || 'http://%s' % ENV.fetch('OLLAMA_HOST')
+  Ollama.base_url(ENV['OLLAMA_URL'] || ENV.fetch('OLLAMA_HOST'))
 end
 
 # The format_bytes method formats a number of bytes into a human-readable

data/bin/ollama_update

@@ -16,7 +16,7 @@ include Term::ANSIColor
 require 'ollama'
 include Ollama
 
-base_url = ENV['OLLAMA_URL'] || 'http://%s' % ENV.fetch('OLLAMA_HOST')
+base_url = Ollama.base_url(ENV['OLLAMA_URL'] || ENV.fetch('OLLAMA_HOST'))
 ollama = Client.new(base_url:)
 ollama.tags.models.each do |model|
   name, modified_at = model.name, Time.parse(model.modified_at)

data/lib/ollama/base_url.rb

@@ -0,0 +1,54 @@
+# A module that provides URL normalization for the Ollama base URL.
+#
+# This module is extended into the Ollama namespace, making
+# +Ollama.base_url+ the public entry point for resolving a
+# user-supplied host specification into a fully-qualified
+# {URI} suitable for HTTP(S) communication with an Ollama server.
+#
+# @example Resolving a bare host:port
+#   Ollama.base_url('127.0.0.1:11434')
+#   # => #<URI::HTTP http://127.0.0.1:11434>
+#
+# @example Resolving a fully-qualified URL (unchanged)
+#   Ollama.base_url('https://mybox:11434/v1')
+#   # => #<URI::HTTPS https://mybox:11434/v1>
+module Ollama::BaseURL
+  # Normalizes a base URL specification into a {URI} object.
+  #
+  # Accepts either a {URI} instance or a String. If the String
+  # does not contain an explicit +http://+ or +https://+ scheme,
+  # one is prepended automatically.
+  #
+  # @param spec [URI, String] the host specification or full URL
+  # @param fallback [Boolean] when true (default), a missing or
+  #   unrecognized scheme triggers an automatic +http://+ prepend.
+  #   When false, unrecognized schemes return +nil+.
+  # @return [URI, nil] the normalized URI, or +nil+ if +fallback+
+  #   is false and the scheme is not http/https.
+  #
+  # @example Bare IP:port (scheme prepended)
+  #   base_url('127.0.0.1:11434')
+  #   # => #<URI::HTTP http://127.0.0.1:11434>
+  #
+  # @example Fully-qualified URL (passed through)
+  #   base_url('https://mybox:11434/v1')
+  #   # => #<URI::HTTPS https://mybox:11434/v1>
+  def base_url(spec, fallback: true)
+    uri = nil
+    begin
+      uri = spec.is_a?(URI) ? spec : URI.parse(spec)
+    rescue URI::InvalidURIError
+      if fallback
+        return base_url('http://%s' % spec, fallback: false)
+      else
+        return
+      end
+    end
+    case
+    when uri&.scheme =~ /\Ahttps?\z/
+      uri
+    when fallback
+      base_url('http://%s' % spec, fallback: false)
+    end
+  end
+end

data/lib/ollama/version.rb

@@ -1,6 +1,11 @@
+# Version information for the Ollama gem.
+#
+# This module is auto-generated by GemHadar and exposes the
+# current release version as a set of constants. Do not edit it
+# by hand; it is rewritten on every `rake version` invocation.
 module Ollama
-  # Ollama version
-  VERSION         = '1.25.0'
+  # The current version of the Ollama gem as a String.
+  VERSION         = '1.26.0'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/lib/ollama.rb

@@ -23,8 +23,10 @@ module Ollama
 end
 
 require 'ollama/handlers'
+require 'ollama/base_url'
 module Ollama
   include Ollama::Handlers
+  extend Ollama::BaseURL
 end
 
 require 'ollama/version'

data/ollama-ruby.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: ollama-ruby 1.25.0 ruby lib
+# stub: ollama-ruby 1.26.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama-ruby".freeze
-  s.version = "1.25.0".freeze
+  s.version = "1.26.0".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -12,19 +12,19 @@ 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, "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/blob_exists.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/push_blob.rb".freeze, "lib/ollama/commands/show.rb".freeze, "lib/ollama/commands/tags.rb".freeze, "lib/ollama/commands/version.rb".freeze, "lib/ollama/digester.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 = [".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/blob_exists.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/push_blob.rb".freeze, "lib/ollama/commands/show.rb".freeze, "lib/ollama/commands/tags.rb".freeze, "lib/ollama/commands/version.rb".freeze, "lib/ollama/digester.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/blob_exists_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_blob_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/digester_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/base_url.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/blob_exists.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/push_blob.rb".freeze, "lib/ollama/commands/show.rb".freeze, "lib/ollama/commands/tags.rb".freeze, "lib/ollama/commands/version.rb".freeze, "lib/ollama/digester.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 = [".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/base_url.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/blob_exists.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/push_blob.rb".freeze, "lib/ollama/commands/show.rb".freeze, "lib/ollama/commands/tags.rb".freeze, "lib/ollama/commands/version.rb".freeze, "lib/ollama/digester.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/base_url_spec.rb".freeze, "spec/ollama/client/doc_spec.rb".freeze, "spec/ollama/client_spec.rb".freeze, "spec/ollama/commands/blob_exists_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_blob_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/digester_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.22".freeze
+  s.rubygems_version = "4.0.20".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/blob_exists_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_blob_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/digester_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]
+  s.test_files = ["spec/ollama/base_url_spec.rb".freeze, "spec/ollama/client/doc_spec.rb".freeze, "spec/ollama/client_spec.rb".freeze, "spec/ollama/commands/blob_exists_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_blob_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/digester_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]
 
   s.specification_version = 4
 
-  s.add_development_dependency(%q<gem_hadar>.freeze, [">= 2.18.0".freeze])
+  s.add_development_dependency(%q<gem_hadar>.freeze, [">= 2.20.1".freeze])
   s.add_development_dependency(%q<all_images>.freeze, ["~> 0.12".freeze])
   s.add_development_dependency(%q<rspec>.freeze, ["~> 3.2".freeze])
   s.add_development_dependency(%q<kramdown>.freeze, ["~> 2.0".freeze])

data/spec/ollama/base_url_spec.rb

@@ -0,0 +1,61 @@
+describe Ollama do
+  describe '.base_url' do
+    context 'with a bare host:port string' do
+      it 'prepends http://' do
+        result = Ollama.base_url('127.0.0.1:11434')
+        expect(result).to be_a(URI::HTTP)
+        expect(result.to_s).to eq('http://127.0.0.1:11434')
+      end
+
+      it 'works with a hostname' do
+        result = Ollama.base_url('localhost:11434')
+        expect(result.to_s).to eq('http://localhost:11434')
+      end
+    end
+
+    context 'with a fully-qualified http URL' do
+      it 'returns the URI unchanged' do
+        result = Ollama.base_url('http://127.0.0.1:11434')
+        expect(result).to be_a(URI::HTTP)
+        expect(result.to_s).to eq('http://127.0.0.1:11434')
+      end
+
+      it 'preserves the path' do
+        result = Ollama.base_url('http://127.0.0.1:11434/v1')
+        expect(result.to_s).to eq('http://127.0.0.1:11434/v1')
+      end
+    end
+
+    context 'with a fully-qualified https URL' do
+      it 'returns the URI unchanged' do
+        result = Ollama.base_url('https://mybox.example.com:8443/v1')
+        expect(result).to be_a(URI::HTTPS)
+        expect(result.to_s).to eq('https://mybox.example.com:8443/v1')
+      end
+    end
+
+    context 'with a URI object' do
+      it 'returns the same object for http' do
+        uri = URI.parse('http://127.0.0.1:11434')
+        expect(Ollama.base_url(uri)).to be(uri)
+      end
+
+      it 'returns the same object for https' do
+        uri = URI.parse('https://secure.example.com')
+        expect(Ollama.base_url(uri)).to be(uri)
+      end
+    end
+
+    context 'with fallback: false' do
+      it 'returns nil when scheme is not http(s)' do
+        expect(Ollama.base_url('localhost:11434', fallback: false))
+          .to be_nil
+      end
+
+      it 'still returns the URI when scheme is http' do
+        result = Ollama.base_url('http://127.0.0.1:11434', fallback: false)
+        expect(result.to_s).to eq('http://127.0.0.1:11434')
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ollama-ruby
 version: !ruby/object:Gem::Version
-  version: 1.25.0
+  version: 1.26.0
 platform: ruby
 authors:
 - Florian Frank
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.18.0
+        version: 2.20.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.18.0
+        version: 2.20.1
 - !ruby/object:Gem::Dependency
   name: all_images
   requirement: !ruby/object:Gem::Requirement
@@ -265,6 +265,7 @@ extensions: []
 extra_rdoc_files:
 - README.md
 - lib/ollama.rb
+- lib/ollama/base_url.rb
 - lib/ollama/client.rb
 - lib/ollama/client/command.rb
 - lib/ollama/client/configuration/config.rb
@@ -322,6 +323,7 @@ files:
 - bin/ollama_ps
 - bin/ollama_update
 - lib/ollama.rb
+- lib/ollama/base_url.rb
 - lib/ollama/client.rb
 - lib/ollama/client/command.rb
 - lib/ollama/client/configuration/config.rb
@@ -369,6 +371,7 @@ files:
 - spec/assets/client.json
 - spec/assets/kitten.jpg
 - spec/assets/options.json
+- spec/ollama/base_url_spec.rb
 - spec/ollama/client/doc_spec.rb
 - spec/ollama/client_spec.rb
 - spec/ollama/commands/blob_exists_spec.rb
@@ -424,10 +427,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.22
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Interacting with the Ollama API
 test_files:
+- spec/ollama/base_url_spec.rb
 - spec/ollama/client/doc_spec.rb
 - spec/ollama/client_spec.rb
 - spec/ollama/commands/blob_exists_spec.rb