ollama-ruby 0.9.0 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0b3ea2bd67e3f4fa2ca4da88a25cb869fc81e35578f1e7fd97ba43e84fc2278
-  data.tar.gz: 626c534bd2fd0580ab0520e8b70587489edbc963e179be0f800ee63235690b33
+  metadata.gz: d2a82c4fc1db4e92e628d0e3a84525273f2ee3bd994f34185c742f0dab1d9b78
+  data.tar.gz: b77caa026511e2bc49bdf3d2e3782cc6a1edd1f60161f1301efbc927dc2d3cba
 SHA512:
-  metadata.gz: 149986d8144b1bc2c20771e245ead20f6e6bc07b46dbe26f8f355e0bc61eca146cc085a920dcbe3e3e08de65632693a35b6995c9dffef288aa929dd6b034de16
-  data.tar.gz: 4214aa2911db561635011b8ea200074d15c74b93bf7abb3c8e77af9c40ac5d8994e908e2ade8e5f288c2919678e03ea5d84d07684a63ba1f8039de52b6091a86
+  metadata.gz: 6ea50f6c8fd275365b52b4c7047abc627079804dd7db61120dbbcf2c6b3f3fddf1946a46508fbb0bc26d0d7284d3b23f4f934b7c418bc91799417a5c2b72332c
+  data.tar.gz: cef39db9d4eb0ee160c53c4e522a158942c3532203f46d50ee88af2c1f3f36aac0030087e71864045c4979018be4891329155ad0e8863c4e8c52080ba3e28f3f

data/CHANGES.md

@@ -1,5 +1,39 @@
 # Changes
 
+## 2024-10-20 v0.9.2
+
+* Added SourceParsing module and update parse_source method to use it:
+  + Added `SourceParsing` module with `parse_source` method that handles
+    different file types (e.g. HTML, XML, CSV, RSS)
+  + Added `parse_csv` method to `SourceParsing` module
+  + Updated `parse_source` method in main file to include new functionality
+* Add colorize texts spec for Ollama::Utils::ColorizeTexts to test its
+  functionality.
+* Added test for expected output of `documents.tags`
+* Add test for empty Ollama options:
+  + Added test case for `Ollama::Options` being empty
+* Display (embedding) model options in info output
+* Only show `collection_stats` if embedding is performed
+* Add empty? method to DTO class:
+  + Added `empty?` method to `Ollama::DTO` class using `to_hash.empty?`
+  + Method is used to check if the object's hash representation is empty.
+
+## 2024-10-19 v0.9.1
+
+* Fixing string interpolation in `import_source` method:
+  + Changed result to use `#{}` instead of `%{}` for string interpolation
+* Move `pull_model_unless_present` method:
+  + Moved the method before other methods
+* Moved Switch classes and `setup_switches` method into Switches module:
+  + Moved the classes and method into a new module
+* Utils::Fetcher: Normalize URL in fetcher utility:
+  + Added `normalize_url` method to class Ollama::Utils::Fetcher
+  + Normalizes URL by decoding URI components, removing anchors, and escaping special characters
+  + `excon` method now calls `normalize_url` on the provided URL
+  + Added specs for `normalize_url` in `fetcher_spec.rb`
+* Remove Ollama top level Namespace b/c we include it from `ollama_chat`: 
+  + Removed the top-level namespace
+
 ## 2024-10-18 v0.9.0
 
 * Add document policy chooser and modify embedding/importing/summarizing

data/bin/ollama_chat

@@ -2,9 +2,9 @@
 
 require 'ollama'
 include Ollama
+include Tins::GO
 require 'term/ansicolor'
 include Term::ANSIColor
-include Tins::GO
 require 'reline'
 require 'reverse_markdown'
 require 'complex_config'
@@ -108,7 +108,7 @@ class OllamaChatConfig
 end
 
 class FollowChat
-  include Ollama::Handlers::Concern
+  include Handlers::Concern
   include Term::ANSIColor
 
   def initialize(messages:, markdown: false, voice: nil, output: $stdout)
@@ -164,114 +164,142 @@ class FollowChat
   end
 end
 
-module CheckSwitch
-  extend Tins::Concern
+module Switches
+  module CheckSwitch
+    extend Tins::Concern
 
-  included do
-    alias_method :on?, :value
-  end
+    included do
+      alias_method :on?, :value
+    end
 
-  def off?
-    !on?
-  end
+    def off?
+      !on?
+    end
 
-  def show
-    puts @msg[value]
+    def show
+      puts @msg[value]
+    end
   end
-end
 
-class Switch
-  def initialize(name, msg:, config: $config)
-    @value = [ false, true ].include?(config) ? config : !!config.send("#{name}?")
-    @msg   = msg
-  end
+  class Switch
+    def initialize(name, msg:, config: $config)
+      @value = [ false, true ].include?(config) ? config : !!config.send("#{name}?")
+      @msg   = msg
+    end
 
-  attr_reader :value
+    attr_reader :value
 
-  def set(value, show: false)
-    @value = !!value
-    show && self.show
-  end
+    def set(value, show: false)
+      @value = !!value
+      show && self.show
+    end
+
+    def toggle(show: true)
+      @value = !@value
+      show && self.show
+    end
 
-  def toggle(show: true)
-    @value = !@value
-    show && self.show
+    include CheckSwitch
   end
 
-  include CheckSwitch
-end
+  class CombinedSwitch
+    def initialize(value:, msg:)
+      @value = value
+      @msg   = msg
+    end
 
-class CombinedSwitch
-  def initialize(value:, msg:)
-    @value = value
-    @msg   = msg
-  end
+    def value
+      @value.()
+    end
 
-  def value
-    @value.()
+    include CheckSwitch
   end
 
-  include CheckSwitch
-end
+  def setup_switches
+    $markdown = Switch.new(
+      :markdown,
+      msg: {
+        true  => "Using #{italic{'ANSI'}} markdown to output content.",
+        false => "Using plaintext for outputting content.",
+      }
+    )
 
-def setup_switches
-  $markdown = Switch.new(
-    :markdown,
-    msg: {
-      true  => "Using #{italic{'ANSI'}} markdown to output content.",
-      false => "Using plaintext for outputting content.",
-    }
-  )
+    $stream = Switch.new(
+      :stream,
+      msg: {
+        true  => "Streaming enabled.",
+        false => "Streaming disabled.",
+      }
+    )
 
-  $stream = Switch.new(
-    :stream,
-    msg: {
-      true  => "Streaming enabled.",
-      false => "Streaming disabled.",
-    }
-  )
+    $voice = Switch.new(
+      :stream,
+      msg: {
+        true  => "Voice output enabled.",
+        false => "Voice output disabled.",
+      },
+      config: $config.voice
+    )
 
-  $voice = Switch.new(
-    :stream,
-    msg: {
-      true  => "Voice output enabled.",
-      false => "Voice output disabled.",
-    },
-    config: $config.voice
-  )
+    $embedding_enabled = Switch.new(
+      :embedding_enabled,
+      msg: {
+        true  => "Embedding enabled.",
+        false => "Embedding disabled.",
+      }
+    )
 
-  $embedding_enabled = Switch.new(
-    :embedding_enabled,
-    msg: {
-      true  => "Embedding enabled.",
-      false => "Embedding disabled.",
-    }
-  )
+    $embedding_paused = Switch.new(
+      :embedding_paused,
+      msg: {
+        true  => "Embedding paused.",
+        false => "Embedding resumed.",
+      }
+    )
 
-  $embedding_paused = Switch.new(
-    :embedding_paused,
-    msg: {
-      true  => "Embedding paused.",
-      false => "Embedding resumed.",
-    }
-  )
+    $embedding = CombinedSwitch.new(
+      value: -> { $embedding_enabled.on? && $embedding_paused.off? },
+      msg: {
+        true  => "Embedding is currently performed.",
+        false => "Embedding is currently not performed.",
+      }
+    )
 
-  $embedding = CombinedSwitch.new(
-    value: -> { $embedding_enabled.on? && $embedding_paused.off? },
-    msg: {
-      true  => "Embedding is currently performed.",
-      false => "Embedding is currently not performed.",
-    }
-  )
+    $location = Switch.new(
+      :location,
+      msg: {
+        true  => "Location and localtime enabled.",
+        false => "Location and localtime disabled.",
+      },
+      config: $config.location.enabled
+    )
+  end
+end
+include Switches
 
-  $location = Switch.new(
-    :location,
-    msg: {
-      true  => "Location and localtime enabled.",
-      false => "Location and localtime disabled.",
-    },
-    config: $config.location.enabled
-  )
+def pull_model_unless_present(model, options, retried = false)
+  ollama.show(name: model) { |response|
+    puts "Model #{bold{model}} with architecture "\
+      "#{response.model_info['general.architecture']} found."
+    if system = response.system
+      puts "Configured model system prompt is:\n#{italic { system }}"
+      return system
+    else
+      return
+    end
+  }
+rescue Errors::NotFoundError
+  puts "Model #{bold{model}} not found locally, attempting to pull it from remote now…"
+  ollama.pull(name: model)
+  if retried
+    exit 1
+  else
+    retried = true
+    retry
+  end
+rescue Errors::Error => e
+  warn "Caught #{e.class} while pulling model: #{e} => Exiting."
+  exit 1
 end
 
 def search_web(query, n = nil)
@@ -282,7 +310,7 @@ def search_web(query, n = nil)
   n < 1 and n = 1
   query = URI.encode_uri_component(query)
   url = "https://www.duckduckgo.com/html/?q=#{query}"
-  Ollama::Utils::Fetcher.get(url, debug: $config.debug) do |tmp|
+  Utils::Fetcher.get(url, debug: $config.debug) do |tmp|
     result = []
     doc = Nokogiri::HTML(tmp)
     doc.css('.results_links').each do |link|
@@ -303,38 +331,13 @@ def search_web(query, n = nil)
   end
 end
 
-def pull_model_unless_present(model, options, retried = false)
-  ollama.show(name: model) { |response|
-    puts "Model #{bold{model}} with architecture "\
-      "#{response.model_info['general.architecture']} found."
-    if system = response.system
-      puts "Configured model system prompt is:\n#{italic { system }}"
-      return system
-    else
-      return
-    end
-  }
-rescue Errors::NotFoundError
-  puts "Model #{bold{model}} not found locally, attempting to pull it from remote now…"
-  ollama.pull(name: model)
-  if retried
-    exit 1
-  else
-    retried = true
-    retry
-  end
-rescue Errors::Error => e
-  warn "Caught #{e.class} while pulling model: #{e} => Exiting."
-  exit 1
-end
-
 def load_conversation(filename)
   unless File.exist?(filename)
     puts "File #{filename} doesn't exist. Choose another filename."
     return
   end
   File.open(filename, 'r') do |output|
-    return JSON(output.read).map { Ollama::Message.from_hash(_1) }
+    return JSON(output.read).map { Message.from_hash(_1) }
   end
 end
 
@@ -372,113 +375,120 @@ def list_conversation(messages, last = nil)
   end
 end
 
-def reverse_markdown(html)
-  ReverseMarkdown.convert(
-    html,
-    unknown_tags: :bypass,
-    github_flavored: true,
-    tag_border: ''
-  )
-end
+module SourceParsing
+  def parse_source(source_io)
+    case source_io&.content_type
+    when 'text/html'
+      reverse_markdown(source_io.read)
+    when 'text/xml'
+      if source_io.readline =~ %r(^\s*<rss\s)
+        source_io.rewind
+        return parse_rss(source_io)
+      end
+      source_io.rewind
+      source_io.read
+    when 'text/csv' # TODO
+      parse_csv(source_io)
+    when 'application/rss+xml'
+      parse_rss(source_io)
+    when 'application/atom+xml'
+      parse_atom(source_io)
+    when 'application/postscript'
+      ps_read(source_io)
+    when 'application/pdf'
+      pdf_read(source_io)
+    when %r(\Aapplication/(json|ld\+json|x-ruby|x-perl|x-gawk|x-python|x-javascript|x-c?sh|x-dosexec|x-shellscript|x-tex|x-latex|x-lyx|x-bibtex)), %r(\Atext/), nil
+      source_io.read
+    else
+      STDERR.puts "Cannot embed #{source_io&.content_type} document."
+      return
+    end
+  end
 
-def parse_rss(source_io)
-  feed = RSS::Parser.parse(source_io, false, false)
-  title = <<~EOT
-    # #{feed&.channel&.title}
+  def parse_csv(source_io)
+    result = +''
+    CSV.table(File.new(source_io), col_sep: ?,).each do |row|
+      next if row.fields.select(&:present?).size == 0
+      result << row.map { |pair|
+        pair.compact.map { _1.to_s.strip } * ': ' if pair.last.present?
+      }.select(&:present?).map { _1.prepend('  ') } * ?\n
+      result << "\n\n"
+    end
+    result
+  end
 
-  EOT
-  feed.items.inject(title) do |text, item|
-    text << <<~EOT
-      ## [#{item&.title}](#{item&.link})
+  def parse_rss(source_io)
+    feed = RSS::Parser.parse(source_io, false, false)
+    title = <<~EOT
+      # #{feed&.channel&.title}
 
-      updated on #{item&.pubDate}
+    EOT
+    feed.items.inject(title) do |text, item|
+      text << <<~EOT
+        ## [#{item&.title}](#{item&.link})
 
-      #{reverse_markdown(item&.description)}
+        updated on #{item&.pubDate}
 
-    EOT
+        #{reverse_markdown(item&.description)}
+
+      EOT
+    end
   end
-end
 
-def parse_atom(source_io)
-  feed = RSS::Parser.parse(source_io, false, false)
-  title = <<~EOT
-    # #{feed.title.content}
+  def parse_atom(source_io)
+    feed = RSS::Parser.parse(source_io, false, false)
+    title = <<~EOT
+      # #{feed.title.content}
 
-  EOT
-  feed.items.inject(title) do |text, item|
-    text << <<~EOT
-      ## [#{item&.title&.content}](#{item&.link&.href})
+    EOT
+    feed.items.inject(title) do |text, item|
+      text << <<~EOT
+        ## [#{item&.title&.content}](#{item&.link&.href})
 
-      updated on #{item&.updated&.content}
+        updated on #{item&.updated&.content}
 
-      #{reverse_markdown(item&.content&.content)}
+        #{reverse_markdown(item&.content&.content)}
 
-    EOT
+      EOT
+    end
   end
-end
 
-def pdf_read(io)
-  reader = PDF::Reader.new(io)
-  reader.pages.inject(+'') { |result, page| result << page.text }
-end
+  def pdf_read(io)
+    reader = PDF::Reader.new(io)
+    reader.pages.inject(+'') { |result, page| result << page.text }
+  end
 
-def ps_read(io)
-  gs = `which gs`.chomp
-  if gs.present?
-    Tempfile.create do |tmp|
-      IO.popen("#{gs} -q -sDEVICE=pdfwrite -sOutputFile=#{tmp.path} -", 'wb') do |gs_io|
-        until io.eof?
-          buffer = io.read(1 << 17)
-          IO.select(nil, [ gs_io ], nil)
-          gs_io.write buffer
-        end
-        gs_io.close
-        File.open(tmp.path, 'rb') do |pdf|
-          pdf_read(pdf)
+  def ps_read(io)
+    gs = `which gs`.chomp
+    if gs.present?
+      Tempfile.create do |tmp|
+        IO.popen("#{gs} -q -sDEVICE=pdfwrite -sOutputFile=#{tmp.path} -", 'wb') do |gs_io|
+          until io.eof?
+            buffer = io.read(1 << 17)
+            IO.select(nil, [ gs_io ], nil)
+            gs_io.write buffer
+          end
+          gs_io.close
+          File.open(tmp.path, 'rb') do |pdf|
+            pdf_read(pdf)
+          end
         end
       end
+    else
+      STDERR.puts "Cannot convert #{io&.content_type} whith ghostscript, gs not in path."
     end
-  else
-    STDERR.puts "Cannot convert #{io&.content_type} whith ghostscript, gs not in path."
   end
-end
 
-def parse_source(source_io)
-  case source_io&.content_type
-  when 'text/html'
-    reverse_markdown(source_io.read)
-  when 'text/xml'
-    if source_io.readline =~ %r(^\s*<rss\s)
-      source_io.rewind
-      return parse_rss(source_io)
-    end
-    source_io.rewind
-    source_io.read
-  when 'text/csv'
-    result = +''
-    CSV.table(File.new(source_io), col_sep: ?,).each do |row|
-      next if row.fields.select(&:present?).size == 0
-      result << row.map { |pair|
-        pair.compact.map { _1.to_s.strip } * ': ' if pair.last.present?
-      }.select(&:present?).map { _1.prepend('  ') } * ?\n
-      result << "\n\n"
-    end
-    result
-  when 'application/rss+xml'
-    parse_rss(source_io)
-  when 'application/atom+xml'
-    parse_atom(source_io)
-  when 'application/postscript'
-    ps_read(source_io)
-  when 'application/pdf'
-    pdf_read(source_io)
-  when %r(\Aapplication/(json|ld\+json|x-ruby|x-perl|x-gawk|x-python|x-javascript|x-c?sh|x-dosexec|x-shellscript|x-tex|x-latex|x-lyx|x-bibtex)), %r(\Atext/), nil
-    source_io.read
-  else
-    STDERR.puts "Cannot embed #{source_io&.content_type} document."
-    return
+  def reverse_markdown(html)
+    ReverseMarkdown.convert(
+      html,
+      unknown_tags: :bypass,
+      github_flavored: true,
+      tag_border: ''
+    )
   end
 end
+include SourceParsing
 
 def http_options(url)
   options = {}
@@ -504,7 +514,7 @@ def fetch_source(source, &block)
       source,
       cache:        $cache,
       debug:        $config.debug,
-      http_options: http_options(source)
+      http_options: http_options(Utils::Fetcher.normalize_url(source))
     ) do |tmp|
       block.(tmp)
     end
@@ -518,7 +528,7 @@ def fetch_source(source, &block)
     raise "invalid source"
   end
 rescue => e
-  STDERR.puts "Cannot fetch source #{source.to_s.inspect}: #{e}\n#{e.backtrace * ?\n}"
+  STDERR.puts "Cannot fetch source #{source.to_s.inspect}: #{e.class} #{e}\n#{e.backtrace * ?\n}"
 end
 
 def add_image(images, source_io, source)
@@ -530,7 +540,8 @@ end
 def import_source(source_io, source)
   source = source.to_s
   puts "Importing #{italic { source_io&.content_type }} document #{source.inspect} now."
-  "Imported #{source.inspect}:\n%s\n\n" % parse_source(source_io)
+	source_content = parse_source(source_io)
+  "Imported #{source.inspect}:\n#{source_content}\n\n"
 end
 
 def import(source)
@@ -572,17 +583,17 @@ def embed_source(source_io, source, count: nil)
   inputs = nil
   case splitter_config.name
   when 'Character'
-    splitter = Ollama::Documents::Splitters::Character.new(
+    splitter = Documents::Splitters::Character.new(
       chunk_size: splitter_config.chunk_size,
     )
     inputs = splitter.split(text)
   when 'RecursiveCharacter'
-    splitter = Ollama::Documents::Splitters::RecursiveCharacter.new(
+    splitter = Documents::Splitters::RecursiveCharacter.new(
       chunk_size: splitter_config.chunk_size,
     )
     inputs = splitter.split(text)
   when 'Semantic'
-    splitter = Ollama::Documents::Splitters::Semantic.new(
+    splitter = Documents::Splitters::Semantic.new(
       ollama:, model: $config.embedding.model.name,
       chunk_size: splitter_config.chunk_size,
     )
@@ -597,7 +608,7 @@ def embed_source(source_io, source, count: nil)
   inputs or return
   source = source.to_s
   if source.start_with?(?!)
-    source = Ollama::Utils::Width.truncate(
+    source = Utils::Width.truncate(
       source[1..-1].gsub(/\W+/, ?_),
       length: 10
     )
@@ -662,7 +673,7 @@ end
 def choose_model(cli_model, current_model)
   models = ollama.tags.models.map(&:name).sort
   model = if cli_model == ''
-            Ollama::Utils::Chooser.choose(models) || current_model
+            Utils::Chooser.choose(models) || current_model
           else
             cli_model || current_model
           end
@@ -679,7 +690,7 @@ def choose_collection(current_collection)
   collections = [ current_collection ] + $documents.collections
   collections = collections.compact.map(&:to_s).uniq.sort
   collections.unshift('[EXIT]').unshift('[NEW]')
-  collection = Ollama::Utils::Chooser.choose(collections) || current_collection
+  collection = Utils::Chooser.choose(collections) || current_collection
   case collection
   when '[NEW]'
     $documents.collection = ask?(prompt: "Enter name of the new collection: ")
@@ -703,7 +714,7 @@ def choose_document_policy
                policies.first
              end
   policies.unshift('[EXIT]')
-  policy = Ollama::Utils::Chooser.choose(policies)
+  policy = Utils::Chooser.choose(policies)
   case policy
   when nil, '[EXIT]'
     puts "Exiting chooser."
@@ -722,7 +733,6 @@ def collection_stats
   puts <<~EOT
     Current Collection
       Name: #{bold{$documents.collection}}
-      Embedding model: #{bold{$embedding_model}}
       #Embeddings: #{$documents.size}
       #Tags: #{$documents.tags.size}
       Tags: #{$documents.tags}
@@ -733,19 +743,19 @@ end
 
 def configure_cache
   if $opts[?M]
-    Ollama::Documents::MemoryCache
+    Documents::MemoryCache
   else
     Object.const_get($config.cache)
   end
 rescue => e
   STDERR.puts "Caught #{e.class}: #{e} => Falling back to MemoryCache."
-  Ollama::Documents::MemoryCache
+  Documents::MemoryCache
 end
 
 def show_system_prompt
   puts <<~EOT
     Configured system prompt is:
-    #{Ollama::Utils::ANSIMarkdown.parse($system.to_s).gsub(/\n+\z/, '').full? || 'n/a'}
+    #{Utils::ANSIMarkdown.parse($system.to_s).gsub(/\n+\z/, '').full? || 'n/a'}
   EOT
 end
 
@@ -769,7 +779,7 @@ end
 
 def change_system_prompt(messages, default)
   prompts = $config.system_prompts.attribute_names.compact
-  chosen  = Ollama::Utils::Chooser.choose(prompts)
+  chosen  = Utils::Chooser.choose(prompts)
   system  = if chosen
               $config.system_prompts.send(chosen)
             else
@@ -779,16 +789,23 @@ def change_system_prompt(messages, default)
 end
 
 def change_voice
-  chosen  = Ollama::Utils::Chooser.choose($config.voice.list)
+  chosen  = Utils::Chooser.choose($config.voice.list)
   $current_voice = chosen.full? || $config.voice.default
 end
 
 def info
   puts "Current model is #{bold{$model}}."
-  collection_stats
+  if $model_options.present?
+    puts "  Options: #{JSON.pretty_generate($model_options).gsub(/(?<!\A)^/, '  ')}"
+  end
   $embedding.show
   if $embedding.on?
+    puts "Embedding model is #{bold{$embedding_model}}"
+    if $embedding_model_options.present?
+      puts "  Options: #{JSON.pretty_generate($embedding_model_options).gsub(/(?<!\A)^/, '  ')}"
+    end
     puts "Text splitter is #{bold{$config.embedding.splitter.name}}."
+    collection_stats
   end
   puts "Documents database cache is #{$documents.nil? ? 'n/a' : bold{$documents.cache.class}}"
   $markdown.show
@@ -891,12 +908,12 @@ $opts[?h] and usage
 $opts[?V] and version
 
 base_url = $opts[?u] || $config.url
-$ollama      = Client.new(base_url:, debug: $config.debug)
+$ollama  = Client.new(base_url:, debug: $config.debug)
 
 $document_policy = $config.document_policy
 $model           = choose_model($opts[?m], $config.model.name)
-options          = Options[$config.model.options]
-model_system     = pull_model_unless_present($model, options)
+$model_options   = Options[$config.model.options]
+model_system     = pull_model_unless_present($model, $model_options)
 messages         = []
 $embedding_enabled.set($config.embedding.enabled && !$opts[?E])
 
@@ -907,15 +924,15 @@ else
   if $opts[?s] == ??
     change_system_prompt(messages, default)
   else
-    system = Ollama::Utils::FileArgument.get_file_argument($opts[?s], default:)
+    system = Utils::FileArgument.get_file_argument($opts[?s], default:)
     system.present? and set_system_prompt(messages, system)
   end
 end
 
 if $embedding.on?
   $embedding_model         = $config.embedding.model.name
-  embedding_model_options = Options[$config.embedding.model.options]
-  pull_model_unless_present($embedding_model, embedding_model_options)
+  $embedding_model_options = Options[$config.embedding.model.options]
+  pull_model_unless_present($embedding_model, $embedding_model_options)
   collection = $opts[?C] || $config.embedding.collection
   $documents = Documents.new(
     ollama:,
@@ -957,7 +974,7 @@ else
 end
 
 if redis_expiring_url = $config.redis.expiring.url?
-  $cache = Ollama::Documents::RedisCache.new(
+  $cache = Documents::RedisCache.new(
     prefix: 'Expiring-',
     url:    redis_expiring_url,
     ex:     $config.redis.expiring.ex,
@@ -1051,7 +1068,7 @@ loop do
     when 'clear'
       loop do
         tags = $documents.tags.add('[EXIT]').add('[ALL]')
-        tag = Ollama::Utils::Chooser.choose(tags, prompt: 'Clear? %s')
+        tag = Utils::Chooser.choose(tags, prompt: 'Clear? %s')
         case tag
         when nil, '[EXIT]'
           puts "Exiting chooser."
@@ -1154,7 +1171,7 @@ loop do
   messages << Message.new(role: 'user', content:, images: images.dup)
   images.clear
   handler = FollowChat.new(messages:, markdown: $markdown.on?, voice: ($current_voice if $voice.on?))
-  ollama.chat(model: $model, messages:, options:, stream: $stream.on?, &handler)
+  ollama.chat(model: $model, messages:, options: $model_options, stream: $stream.on?, &handler)
 
   if $embedding.on? && !records.empty?
     puts "", records.map { |record|

data/lib/ollama/dto.rb

@@ -33,6 +33,10 @@ module Ollama::DTO
 
   alias to_hash as_json
 
+  def empty?
+    to_hash.empty?
+  end
+
   def to_json(*)
     as_json.to_json(*)
   end

data/lib/ollama/utils/fetcher.rb

@@ -38,6 +38,13 @@ class Ollama::Utils::Fetcher
     end
   end
 
+  def self.normalize_url(url)
+    url = url.to_s
+    url = URI.decode_uri_component(url)
+    url = url.sub(/#.*/, '')
+    URI::Parser.new.escape(url).to_s
+  end
+
   def self.read(filename, &block)
     if File.exist?(filename)
       File.open(filename) do |file|
@@ -80,6 +87,7 @@ class Ollama::Utils::Fetcher
   private
 
   def excon(url, **options)
+    url = self.class.normalize_url(url)
     Excon.new(url, options.merge(@http_options))
   end
 

data/lib/ollama/version.rb

@@ -1,6 +1,6 @@
 module Ollama
   # Ollama version
-  VERSION         = '0.9.0'
+  VERSION         = '0.9.2'
   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,26 +1,26 @@
 # -*- encoding: utf-8 -*-
-# stub: ollama-ruby 0.9.0 ruby lib
+# stub: ollama-ruby 0.9.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama-ruby".freeze
-  s.version = "0.9.0".freeze
+  s.version = "0.9.2".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Florian Frank".freeze]
-  s.date = "2024-10-18"
+  s.date = "2024-10-20"
   s.description = "Library that allows interacting with the Ollama API".freeze
   s.email = "flori@ping.de".freeze
   s.executables = ["ollama_console".freeze, "ollama_chat".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/documents.rb".freeze, "lib/ollama/documents/cache/common.rb".freeze, "lib/ollama/documents/cache/memory_cache.rb".freeze, "lib/ollama/documents/cache/redis_backed_memory_cache.rb".freeze, "lib/ollama/documents/cache/redis_cache.rb".freeze, "lib/ollama/documents/splitters/character.rb".freeze, "lib/ollama/documents/splitters/semantic.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/utils/ansi_markdown.rb".freeze, "lib/ollama/utils/cache_fetcher.rb".freeze, "lib/ollama/utils/chooser.rb".freeze, "lib/ollama/utils/colorize_texts.rb".freeze, "lib/ollama/utils/fetcher.rb".freeze, "lib/ollama/utils/file_argument.rb".freeze, "lib/ollama/utils/math.rb".freeze, "lib/ollama/utils/tags.rb".freeze, "lib/ollama/utils/width.rb".freeze, "lib/ollama/version.rb".freeze]
-  s.files = [".envrc".freeze, "CHANGES.md".freeze, "Gemfile".freeze, "LICENSE".freeze, "README.md".freeze, "Rakefile".freeze, "bin/ollama_chat".freeze, "bin/ollama_cli".freeze, "bin/ollama_console".freeze, "bin/ollama_update".freeze, "config/redis.conf".freeze, "docker-compose.yml".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/documents.rb".freeze, "lib/ollama/documents/cache/common.rb".freeze, "lib/ollama/documents/cache/memory_cache.rb".freeze, "lib/ollama/documents/cache/redis_backed_memory_cache.rb".freeze, "lib/ollama/documents/cache/redis_cache.rb".freeze, "lib/ollama/documents/splitters/character.rb".freeze, "lib/ollama/documents/splitters/semantic.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/utils/ansi_markdown.rb".freeze, "lib/ollama/utils/cache_fetcher.rb".freeze, "lib/ollama/utils/chooser.rb".freeze, "lib/ollama/utils/colorize_texts.rb".freeze, "lib/ollama/utils/fetcher.rb".freeze, "lib/ollama/utils/file_argument.rb".freeze, "lib/ollama/utils/math.rb".freeze, "lib/ollama/utils/tags.rb".freeze, "lib/ollama/utils/width.rb".freeze, "lib/ollama/version.rb".freeze, "ollama-ruby.gemspec".freeze, "spec/assets/embeddings.json".freeze, "spec/assets/kitten.jpg".freeze, "spec/assets/prompt.txt".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/documents/memory_cache_spec.rb".freeze, "spec/ollama/documents/redis_backed_memory_cache_spec.rb".freeze, "spec/ollama/documents/redis_cache_spec.rb".freeze, "spec/ollama/documents/splitters/character_spec.rb".freeze, "spec/ollama/documents/splitters/semantic_spec.rb".freeze, "spec/ollama/documents_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/ollama/utils/ansi_markdown_spec.rb".freeze, "spec/ollama/utils/cache_fetcher_spec.rb".freeze, "spec/ollama/utils/fetcher_spec.rb".freeze, "spec/ollama/utils/file_argument_spec.rb".freeze, "spec/ollama/utils/tags_spec.rb".freeze, "spec/ollama/utils/width_spec.rb".freeze, "spec/spec_helper.rb".freeze, "tmp/.keep".freeze]
+  s.files = [".envrc".freeze, "CHANGES.md".freeze, "Gemfile".freeze, "LICENSE".freeze, "README.md".freeze, "Rakefile".freeze, "bin/ollama_chat".freeze, "bin/ollama_cli".freeze, "bin/ollama_console".freeze, "bin/ollama_update".freeze, "config/redis.conf".freeze, "docker-compose.yml".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/documents.rb".freeze, "lib/ollama/documents/cache/common.rb".freeze, "lib/ollama/documents/cache/memory_cache.rb".freeze, "lib/ollama/documents/cache/redis_backed_memory_cache.rb".freeze, "lib/ollama/documents/cache/redis_cache.rb".freeze, "lib/ollama/documents/splitters/character.rb".freeze, "lib/ollama/documents/splitters/semantic.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/utils/ansi_markdown.rb".freeze, "lib/ollama/utils/cache_fetcher.rb".freeze, "lib/ollama/utils/chooser.rb".freeze, "lib/ollama/utils/colorize_texts.rb".freeze, "lib/ollama/utils/fetcher.rb".freeze, "lib/ollama/utils/file_argument.rb".freeze, "lib/ollama/utils/math.rb".freeze, "lib/ollama/utils/tags.rb".freeze, "lib/ollama/utils/width.rb".freeze, "lib/ollama/version.rb".freeze, "ollama-ruby.gemspec".freeze, "spec/assets/embeddings.json".freeze, "spec/assets/kitten.jpg".freeze, "spec/assets/prompt.txt".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/documents/memory_cache_spec.rb".freeze, "spec/ollama/documents/redis_backed_memory_cache_spec.rb".freeze, "spec/ollama/documents/redis_cache_spec.rb".freeze, "spec/ollama/documents/splitters/character_spec.rb".freeze, "spec/ollama/documents/splitters/semantic_spec.rb".freeze, "spec/ollama/documents_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/ollama/utils/ansi_markdown_spec.rb".freeze, "spec/ollama/utils/cache_fetcher_spec.rb".freeze, "spec/ollama/utils/colorize_texts_spec.rb".freeze, "spec/ollama/utils/fetcher_spec.rb".freeze, "spec/ollama/utils/file_argument_spec.rb".freeze, "spec/ollama/utils/tags_spec.rb".freeze, "spec/ollama/utils/width_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.5.18".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/documents/memory_cache_spec.rb".freeze, "spec/ollama/documents/redis_backed_memory_cache_spec.rb".freeze, "spec/ollama/documents/redis_cache_spec.rb".freeze, "spec/ollama/documents/splitters/character_spec.rb".freeze, "spec/ollama/documents/splitters/semantic_spec.rb".freeze, "spec/ollama/documents_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/ollama/utils/ansi_markdown_spec.rb".freeze, "spec/ollama/utils/cache_fetcher_spec.rb".freeze, "spec/ollama/utils/fetcher_spec.rb".freeze, "spec/ollama/utils/file_argument_spec.rb".freeze, "spec/ollama/utils/tags_spec.rb".freeze, "spec/ollama/utils/width_spec.rb".freeze, "spec/spec_helper.rb".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/documents/memory_cache_spec.rb".freeze, "spec/ollama/documents/redis_backed_memory_cache_spec.rb".freeze, "spec/ollama/documents/redis_cache_spec.rb".freeze, "spec/ollama/documents/splitters/character_spec.rb".freeze, "spec/ollama/documents/splitters/semantic_spec.rb".freeze, "spec/ollama/documents_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/ollama/utils/ansi_markdown_spec.rb".freeze, "spec/ollama/utils/cache_fetcher_spec.rb".freeze, "spec/ollama/utils/colorize_texts_spec.rb".freeze, "spec/ollama/utils/fetcher_spec.rb".freeze, "spec/ollama/utils/file_argument_spec.rb".freeze, "spec/ollama/utils/tags_spec.rb".freeze, "spec/ollama/utils/width_spec.rb".freeze, "spec/spec_helper.rb".freeze]
 
   s.specification_version = 4
 

data/spec/ollama/documents_spec.rb

@@ -60,16 +60,16 @@ RSpec.describe Ollama::Documents do
     expect(ollama).to receive(:embed).
       with(model:, input: [ 'foo' ], options: nil).
       and_return(double(embeddings: [ [ 0.1 ] ]))
-    expect(documents.add('foo', tags: %i[ test ])).to eq documents
+    expect(documents.add('foo', tags: %w[ test ])).to eq documents
     expect(ollama).to receive(:embed).
       with(model:, input: 'foo', options: nil).
       and_return(double(embeddings: [ [ 0.1 ] ]))
-    records = documents.find('foo', tags: %i[ nix ])
+    records = documents.find('foo', tags: %w[ nix ])
     expect(records).to eq []
     expect(ollama).to receive(:embed).
       with(model:, input: 'foo', options: nil).
       and_return(double(embeddings: [ [ 0.1 ] ]))
-    records = documents.find('foo', tags: %i[ test ])
+    records = documents.find('foo', tags: %w[ test ])
     expect(records).to eq [
       Ollama::Documents::Record[text: 'foo', embedding: [ 0.1 ], similarity: 1.0 ]
     ]
@@ -135,8 +135,9 @@ RSpec.describe Ollama::Documents do
       expect(ollama).to receive(:embed).
         with(model:, input: %w[ bar ], options: nil).
         and_return(double(embeddings: [ [ 0.1 ] ]))
-      expect(documents.add('foo', tags: %i[ test ])).to eq documents
-      expect(documents.add('bar', tags: %i[ test2 ])).to eq documents
+      expect(documents.add('foo', tags: %w[ test ])).to eq documents
+      expect(documents.add('bar', tags: %w[ test2 ])).to eq documents
+      expect(documents.tags.to_a).to eq %w[ test test2 ]
       expect {
         documents.clear tags: 'test'
       }.to change { documents.size }.from(2).to(1)

data/spec/ollama/options_spec.rb

@@ -13,6 +13,10 @@ RSpec.describe Ollama::Options do
     expect(options).to be_a described_class
   end
 
+  it 'can be empty' do
+    expect(described_class.new).to be_empty
+  end
+
   it 'can be used to cast hashes' do
     expect(described_class[{
       penalize_newline: true,

data/spec/ollama/utils/colorize_texts_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+RSpec.describe Ollama::Utils::ColorizeTexts do
+  it 'colorizes texts' do
+    ct = described_class.new(%w[ foo bar ])
+    colored   = ct.to_s
+    uncolored = Term::ANSIColor.uncolor(ct.to_s)
+    expect(colored.size).to be > uncolored.size
+    expect(uncolored).to eq(
+      "foo\n#3 \n\nbar\n#3 \n\n"
+    )
+  end
+end

data/spec/ollama/utils/fetcher_spec.rb

@@ -19,7 +19,7 @@ RSpec.describe Ollama::Utils::Fetcher do
   end
 
   it 'can #get with streaming' do
-    stub_request(:get, 'https://www.example.com/hello').
+    stub_request(:get, url).
       with(headers: fetcher.headers).
       to_return(
         status: 200,
@@ -37,7 +37,7 @@ RSpec.describe Ollama::Utils::Fetcher do
     fetcher = described_class.new(
       http_options: { ssl_verify_peer: false }
     ).expose
-    stub_request(:get, 'https://www.example.com/hello').
+    stub_request(:get, url).
       with(headers: fetcher.headers).
       to_return(
         status: 200,
@@ -45,7 +45,7 @@ RSpec.describe Ollama::Utils::Fetcher do
         headers: { 'Content-Type' => 'text/plain' },
       )
     expect(Excon).to receive(:new).with(
-      'https://www.example.com/hello',
+      url,
       hash_including(ssl_verify_peer: false)
     ).and_call_original
     fetcher.get(url) do |tmp|
@@ -56,7 +56,7 @@ RSpec.describe Ollama::Utils::Fetcher do
   end
 
   it 'can #get and fallback from streaming' do
-    stub_request(:get, 'https://www.example.com/hello').
+    stub_request(:get, url).
       with(headers: fetcher.headers).
       to_return(
         { status: 501 },
@@ -74,9 +74,10 @@ RSpec.describe Ollama::Utils::Fetcher do
   end
 
   it 'can #get and finally fail' do
-    stub_request(:get, 'https://www.example.com/hello').
+    stub_request(:get, url).
       with(headers: fetcher.headers).
       to_return(status: 500)
+		expect(STDERR).to receive(:puts).with(/cannot.*get.*#{url}/i)
     fetcher.get(url) do |tmp|
       expect(tmp).to be_a StringIO
       expect(tmp.read).to eq ''
@@ -106,10 +107,31 @@ RSpec.describe Ollama::Utils::Fetcher do
 
   it 'can .execute and fail' do
     expect(IO).to receive(:popen).and_raise StandardError
+		expect(STDERR).to receive(:puts).with(/cannot.*execute.*foobar/i)
     described_class.execute('foobar') do |file|
       expect(file).to be_a StringIO
       expect(file.read).to be_empty
       expect(file.content_type).to eq 'text/plain'
     end
   end
+
+	describe '.normalize_url' do
+		it 'can handle umlauts' do
+			expect(described_class.normalize_url('https://foo.de/bär')).to eq(
+				'https://foo.de/b%C3%A4r'
+			)
+		end
+
+		it 'can handle escaped umlauts' do
+			expect(described_class.normalize_url('https://foo.de/b%C3%A4r')).to eq(
+				'https://foo.de/b%C3%A4r'
+			)
+		end
+
+		it 'can remove #anchors' do
+			expect(described_class.normalize_url('https://foo.de#bar')).to eq(
+				'https://foo.de'
+			)
+		end
+	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ollama-ruby
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.2
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-18 00:00:00.000000000 Z
+date: 2024-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -516,6 +516,7 @@ files:
 - spec/ollama/tool_spec.rb
 - spec/ollama/utils/ansi_markdown_spec.rb
 - spec/ollama/utils/cache_fetcher_spec.rb
+- spec/ollama/utils/colorize_texts_spec.rb
 - spec/ollama/utils/fetcher_spec.rb
 - spec/ollama/utils/file_argument_spec.rb
 - spec/ollama/utils/tags_spec.rb
@@ -585,6 +586,7 @@ test_files:
 - spec/ollama/tool_spec.rb
 - spec/ollama/utils/ansi_markdown_spec.rb
 - spec/ollama/utils/cache_fetcher_spec.rb
+- spec/ollama/utils/colorize_texts_spec.rb
 - spec/ollama/utils/fetcher_spec.rb
 - spec/ollama/utils/file_argument_spec.rb
 - spec/ollama/utils/tags_spec.rb