ollama-ruby 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3efc65090c37d60db61417738d3780ce7b86af805c86e1828421b86e83c11c13
-  data.tar.gz: 3d18b6d92320c889bcef7b566a818867cbd55ff29a519738e3dd0e524d766aa6
+  metadata.gz: bb7858cf04c638fa3369fe7d96d96eed12e5553fd17abe9ed48c1eaf25113ffb
+  data.tar.gz: ccb56d4b85a6e74256feb52ac5642d50850f7b980f9060dbb9fdf933985be746
 SHA512:
-  metadata.gz: 5086fa3669dd9a19d917a528dacf8073cf250400ef91210086b96a99e62468f3b232d55a1a04240537ab79f58cb9015c5f591b46b61e60424e068107133a944a
-  data.tar.gz: 93837384222c5221e8b70db3034fe8ac4dbb86c379bd583a66c29b500376e6fc6bacba2419d673cf84f1b81a2b13b2cbd0ac8d32a2280e09e1c46acc48de5f8b
+  metadata.gz: f36aacde399c0be934425f12669fa6cc55cdfad938ea8157c5195db8c2367243cc6470dff24ec5bf83800079732bfa271450a4779246335c45c2bedbb0e3a6cf
+  data.tar.gz: 56e465f056934210a6cc45677d52518d8adb76e8702561248b6db4cd1e4b129cfd22eedbdcc0c935f69bf85eeb9bc324aef6876f39969942af4529978a277756

data/.envrc

@@ -1 +1,2 @@
 export REDIS_URL=redis://localhost:9736
+export REDIS_EXPRING_URL=redis://localhost:9736

data/README.md

@@ -45,7 +45,6 @@ ollama_chat [OPTIONS]
   -D DOCUMENT    load document and add to collection (multiple)
   -M             use (empty) MemoryCache for this chat session
   -E             disable embeddings for this chat session
-  -v             use voice output
   -h             this help
 ```
 
@@ -154,13 +153,17 @@ subject - the young, blue-eyed cat.
 The following commands can be given inside the chat, if prefixed by a `/`:
 
 ```
+/copy                           to copy last response to clipboard
 /paste                          to paste content
 /markdown                       toggle markdown output
+/stream                         toggle stream output
+/voice( change)                 toggle voice output or change the voice
 /list [n]                       list the last n / all conversation exchanges
 /clear                          clear the whole conversation
 /clobber                        clear the conversation and collection
 /pop [n]                        pop the last n exchanges, defaults to 1
 /model                          change the model
+/system                         change system prompt (clears conversation)
 /regenerate                     the last answer message
 /collection clear [tag]|change  clear or show stats of current collection
 /import source                  import the source's content

data/Rakefile

@@ -41,6 +41,7 @@ GemHadar do
   dependency             'pdf-reader',            '~> 2.0'
   dependency             'logger',                '~> 1.0'
   dependency             'json',                  '~> 2.0'
+  dependency             'xdg',                   '~> 7.0'
   development_dependency 'all_images',            '~> 0.4'
   development_dependency 'rspec',                 '~> 3.2'
   development_dependency 'webmock'

data/bin/ollama_chat

@@ -17,6 +17,7 @@ require 'nokogiri'
 require 'rss'
 require 'pdf/reader'
 require 'csv'
+require 'xdg'
 
 class OllamaChatConfig
   include ComplexConfig
@@ -31,7 +32,6 @@ class OllamaChatConfig
       options:
         num_ctx: 8192
     prompts:
-      system: <%= ENV.fetch('OLLAMA_CHAT_SYSTEM', 'null') %>
       embed: "This source was now embedded: %{source}"
       summarize: |
         Generate an abstract summary of the content in this document using
@@ -42,8 +42,14 @@ class OllamaChatConfig
         Answer the the query %{query} using these sources and summaries:
 
         %{results}
-    voice: Samantha
+    system_prompts:
+      default: <%= ENV.fetch('OLLAMA_CHAT_SYSTEM', 'null') %>
+    voice:
+      enabled: false
+      default: Samantha
+      list: <%= `say -v ?`.lines.map { _1[/^(.+?)\s+[a-z]{2}_[a-zA-Z0-9]{2,}/, 1] }.uniq.sort.to_s.force_encoding('ASCII-8BIT') %>
     markdown: true
+    stream: true
     embedding:
       enabled: true
       model:
@@ -57,14 +63,16 @@ class OllamaChatConfig
       splitter:
         name: RecursiveCharacter
         chunk_size: 1024
-    cache: Ollama::Documents::Cache::RedisBackedMemoryCache
+    cache: Ollama::Documents::RedisBackedMemoryCache
     redis:
       documents:
         url: <%= ENV.fetch('REDIS_URL', 'null') %>
       expiring:
         url: <%= ENV.fetch('REDIS_EXPIRING_URL', 'null') %>
+        ex: 86400
     debug: <%= ENV['OLLAMA_CHAT_DEBUG'].to_i == 1 ? true : false %>
     ssl_no_verify: []
+    copy: pbcopy
   EOT
 
   def initialize(filename = nil)
@@ -75,7 +83,7 @@ class OllamaChatConfig
     if @filename == default_path && !retried
       retried = true
       mkdir_p File.dirname(default_path)
-      File.secure_write(default_path, DEFAULT_CONFIG)
+      File.secure_write(default_path.to_s, DEFAULT_CONFIG)
       retry
     else
       raise
@@ -87,17 +95,11 @@ class OllamaChatConfig
   attr_reader :config
 
   def default_path
-    File.join(config_dir_path, 'config.yml')
+    config_dir_path + 'config.yml'
   end
 
   def config_dir_path
-    File.join(
-      ENV.fetch(
-        'XDG_CONFIG_HOME',
-        File.join(ENV.fetch('HOME'), '.config')
-      ),
-      'ollama_chat'
-    )
+    XDG.new.config_home + 'ollama_chat'
   end
 end
 
@@ -158,12 +160,113 @@ class FollowChat
   end
 end
 
+module CheckSwitch
+  extend Tins::Concern
+
+  included do
+    alias_method :on?, :value
+  end
+
+  def off?
+    !on?
+  end
+
+  def show
+    puts @msg[value]
+  end
+end
+
+class Switch
+  def initialize(name, msg:, config: $config)
+    @value = !!config.send("#{name}?")
+    @msg   = msg
+  end
+
+  attr_reader :value
+
+  def set(value, show: false)
+    @value = !!value
+    show && self.show
+  end
+
+  def toggle(show: true)
+    @value = !@value
+    show && self.show
+  end
+
+  include CheckSwitch
+end
+
+class CombinedSwitch
+  def initialize(value:, msg:)
+    @value = value
+    @msg   = msg
+  end
+
+  def value
+    @value.()
+  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.",
+    }
+  )
+
+  $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
+  )
+
+  $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 = CombinedSwitch.new(
+    value: -> { $embedding_enabled.on? && $embedding_paused.off? },
+    msg: {
+      true  => "Embedding is currently performed.",
+      false => "Embedding is currently not performed.",
+    }
+  )
+end
+
 def search_web(query, n = nil)
   n = n.to_i
   n < 1 and n = 1
   query = URI.encode_uri_component(query)
   url = "https://www.duckduckgo.com/html/?q=#{query}"
-  Ollama::Utils::Fetcher.new(debug: $config.debug).get(url) do |tmp|
+  Ollama::Utils::Fetcher.get(url, debug: $config.debug) do |tmp|
     result = []
     doc = Nokogiri::HTML(tmp)
     doc.css('.results_links').each do |link|
@@ -196,7 +299,7 @@ def pull_model_unless_present(model, options, retried = false)
     end
   }
 rescue Errors::NotFoundError
-  puts "Model #{bold{model}} not found, attempting to pull it now…"
+  puts "Model #{bold{model}} not found locally, attempting to pull it from remote now…"
   ollama.pull(name: model)
   if retried
     exit 1
@@ -205,7 +308,7 @@ rescue Errors::NotFoundError
     retry
   end
 rescue Errors::Error => e
-  warn "Caught #{e.class}: #{e} => Exiting."
+  warn "Caught #{e.class} while pulling model: #{e} => Exiting."
   exit 1
 end
 
@@ -242,7 +345,7 @@ def list_conversation(messages, last = nil)
                  when 'system' then 213
                  else 210
                  end
-    content = m.content.full? { $markdown ? Utils::ANSIMarkdown.parse(_1) : _1 }
+    content = m.content.full? { $markdown.on? ? Utils::ANSIMarkdown.parse(_1) : _1 }
     message_text = message_type(m.images) + " "
     message_text += bold { color(role_color) { m.role } }
     message_text += ":\n#{content}"
@@ -319,8 +422,6 @@ def parse_source(source_io)
       result << "\n\n"
     end
     result
-  when %r(\Atext/)
-    source_io.read
   when 'application/rss+xml'
     parse_rss(source_io)
   when 'application/atom+xml'
@@ -330,6 +431,8 @@ def parse_source(source_io)
   when 'application/pdf'
     reader = PDF::Reader.new(source_io)
     reader.pages.inject(+'') { |result, page| result << page.text }
+  when %r(\Atext/), nil
+    source_io.read
   else
     STDERR.puts "Cannot embed #{source_io&.content_type} document."
     return
@@ -337,7 +440,7 @@ def parse_source(source_io)
 end
 
 def embed_source(source_io, source)
-  embedding_enabled? or return parse_source(source_io)
+  $embedding.on? or return parse_source(source_io)
   puts "Embedding #{italic { source_io&.content_type }} document #{source.to_s.inspect}."
   text = parse_source(source_io) or return
   text.downcase!
@@ -404,7 +507,12 @@ def fetch_source(source, &block)
       block.(tmp)
     end
   when %r(\Ahttps?://\S+)
-    Utils::Fetcher.get(source, debug: $config.debug, http_options: http_options(source)) do |tmp|
+    Utils::Fetcher.get(
+      source,
+      cache:        $cache,
+      debug:        $config.debug,
+      http_options: http_options(source)
+    ) do |tmp|
       block.(tmp)
     end
   when %r(\Afile://(?:(?:[.-]|[[:alnum:]])*)(/\S*)|([~.]?/\S*))
@@ -417,7 +525,7 @@ def fetch_source(source, &block)
     raise "invalid source"
   end
 rescue => e
-  STDERR.puts "Cannot add source #{source.to_s.inspect}: #{e}\n#{e.backtrace * ?\n}"
+  STDERR.puts "Cannot fetch source #{source.to_s.inspect}: #{e}\n#{e.backtrace * ?\n}"
 end
 
 def import(source)
@@ -445,7 +553,7 @@ def summarize(source, words: nil)
 end
 
 def embed(source)
-  if embedding_enabled?
+  if $embedding.on?
     puts "Now embedding #{source.to_s.inspect}."
     fetch_source(source) do |source_io|
       content = parse_source(source_io)
@@ -537,62 +645,84 @@ rescue => e
   Ollama::Documents::MemoryCache
 end
 
-def toggle_markdown
-  $markdown = !$markdown
-  show_markdown
-end
-
-def show_markdown
-  if $markdown
-    puts "Using ANSI markdown to output content."
-  else
-    puts "Using plaintext for outputting content."
-  end
-  $markdown
-end
-
-def set_embedding(embedding)
-  $embedding_enabled = embedding
-  show_embedding
+def show_system_prompt
+  puts <<~EOT
+    Configured system prompt is:
+    #{Ollama::Utils::ANSIMarkdown.parse($system.to_s).gsub(/\n+\z/, '').full? || 'n/a'}
+  EOT
 end
 
-def show_embedding
-  puts "Embedding is #{embedding_enabled? ? "on" : "off"}."
-  $embedding_enabled
+def set_system_prompt(messages, system)
+  $system = system
+  messages.clear
+  messages << Message.new(role: 'system', content: system)
 end
 
-def embedding_enabled?
-  $embedding_enabled && !$embedding_paused
+def change_system_prompt(messages)
+  prompts = $config.system_prompts.attribute_names.compact
+  chosen  = Ollama::Utils::Chooser.choose(prompts)
+  system  = if chosen
+              $config.system_prompts.send(chosen)
+            else
+              default
+            end
+  set_system_prompt(messages, system)
 end
 
-def toggle_embedding_paused
-  $embedding_paused = !$embedding_paused
-  show_embedding
+def change_voice
+  chosen  = Ollama::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 show_embedding
+  $embedding.show
+  if $embedding.on?
     puts "Text splitter is #{bold{$config.embedding.splitter.name}}."
   end
-  puts "Documents database cache is #{$documents.nil? ? 'n/a' : $documents.cache.class}"
-  show_markdown
+  puts "Documents database cache is #{$documents.nil? ? 'n/a' : bold{$documents.cache.class}}"
+  $markdown.show
+  $stream.show
+  if $voice.on?
+    puts "Using voice #{bold{$current_voice}} to speak."
+  end
+  show_system_prompt
 end
 
 def clear_messages(messages)
   messages.delete_if { _1.role != 'system' }
 end
 
+def copy_to_clipboard(messages)
+  if message = messages.last and message.role == 'assistant'
+    copy = `which #{$config.copy}`.chomp
+    if copy.present?
+      IO.popen(copy, 'w') do |clipboard|
+        clipboard.write(message.content)
+      end
+      STDOUT.puts "The last response has been copied to the system clipboard."
+    else
+      STDERR.puts "#{$config.copy.inspect} command not found in system's path!"
+    end
+  else
+    STDERR.puts "No response available to copy to the system clipboard."
+  end
+end
+
 def display_chat_help
   puts <<~EOT
+    /copy                           to copy last response to clipboard
     /paste                          to paste content
     /markdown                       toggle markdown output
+    /stream                         toggle stream output
+    /voice( change)                 toggle voice output or change the voice
     /list [n]                       list the last n / all conversation exchanges
     /clear                          clear the whole conversation
     /clobber                        clear the conversation and collection
     /pop [n]                        pop the last n exchanges, defaults to 1
     /model                          change the model
+    /system                         change system prompt (clears conversation)
     /regenerate                     the last answer message
     /collection clear [tag]|change  clear or show stats of current collection
     /import source                  import the source's content
@@ -620,25 +750,31 @@ def usage
       -D DOCUMENT    load document and add to embeddings collection (multiple)
       -M             use (empty) MemoryCache for this chat session
       -E             disable embeddings for this chat session
-      -v             use voice output
+      -V             display the current version number and quit
       -h             this help
 
   EOT
   exit 0
 end
 
+def version
+  puts "%s %s" % [ File.basename($0), Ollama::VERSION ]
+  exit 0
+end
+
 def ollama
   $ollama
 end
 
-$opts = go 'f:u:m:s:c:C:D:MEvh'
+$opts = go 'f:u:m:s:c:C:D:MEVh'
 
 config = OllamaChatConfig.new($opts[?f])
 $config = config.config
 
-$opts[?h] and usage
+setup_switches
 
-puts "Configuration read from #{config.filename.inspect} is:", $config
+$opts[?h] and usage
+$opts[?V] and version
 
 base_url = $opts[?u] || $config.url
 $ollama      = Client.new(base_url:, debug: $config.debug)
@@ -647,14 +783,21 @@ $model       = choose_model($opts[?m], $config.model.name)
 options      = Options[$config.model.options]
 model_system = pull_model_unless_present($model, options)
 messages     = []
-set_embedding($config.embedding.enabled && !$opts[?E])
+$embedding_enabled.set($config.embedding.enabled && !$opts[?E])
 
-if voice = ($config.voice if $opts[?v])
-  puts "Using voice #{bold{voice}} to speak."
+if $opts[?c]
+  messages.concat load_conversation($opts[?c])
+else
+  default = $config.system_prompts.default? || model_system
+  if $opts[?s] == ??
+    change_system_prompt(messages)
+  else
+    system = Ollama::Utils::FileArgument.get_file_argument($opts[?s], default:)
+    system.present? and set_system_prompt(messages, system)
+  end
 end
-$markdown = $config.markdown
 
-if embedding_enabled?
+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)
@@ -666,6 +809,7 @@ if embedding_enabled?
     collection:,
     cache:         configure_cache,
     redis_url:     $config.redis.documents.url?,
+    debug:         ENV['DEBUG'].to_i == 1,
   )
 
   document_list = $opts[?D].to_a
@@ -691,24 +835,22 @@ if embedding_enabled?
       end
     end
   end
-  collection_stats
 else
   $documents = Tins::NULL
 end
 
-if $opts[?c]
-  messages.concat load_conversation($opts[?c])
-else
-  if system = Ollama::Utils::FileArgument.
-      get_file_argument($opts[?s], default: $config.prompts.system? || model_system)
-    messages << Message.new(role: 'system', content: system)
-    puts <<~EOT
-      Configured system prompt is:
-      #{italic{Ollama::Utils::Width.wrap(system, percentage: 90)}}
-    EOT
-  end
+if redis_expiring_url = $config.redis.expiring.url?
+  $cache = Ollama::Documents::RedisCache.new(
+    prefix: 'Expiring-',
+    url:    redis_expiring_url,
+    ex:     $config.redis.expiring.ex,
+  )
 end
 
+$current_voice = $config.voice.default
+
+puts "Configuration read from #{config.filename.inspect} is:", $config
+info
 puts "\nType /help to display the chat help."
 
 images = []
@@ -721,8 +863,21 @@ loop do
   when %r(^/paste$)
     puts bold { "Paste your content and then press C-d!" }
     content = STDIN.read
+  when %r(^/copy$)
+    copy_to_clipboard(messages)
+    next
   when %r(^/markdown$)
-    $markdown = toggle_markdown
+    $markdown.toggle
+    next
+  when %r(^/stream$)
+    $stream.toggle
+    next
+  when %r(^/voice(?:\s+(change))?$)
+    if $1 == 'change'
+      change_voice
+    else
+      $voice.toggle
+    end
     next
   when %r(^/list(?:\s+(\d*))?$)
     last = if $1
@@ -755,6 +910,10 @@ loop do
       choose_collection(collection)
     end
     next
+  when %r(^/system$)
+    change_system_prompt(messages)
+    info
+    next
   when %r(/info)
     info
     next
@@ -789,7 +948,8 @@ loop do
     parse_content = false
     content       = summarize($2, words: $1) or next
   when %r(^/embedding$)
-    toggle_embedding_paused
+    $embedding_paused.toggle(show: false)
+    $embedding.show
     next
   when %r(^/embed\s+(.+))
     parse_content = false
@@ -828,12 +988,12 @@ loop do
   end
 
   content, tags = if parse_content
-                    parse_content(content, images.clear)
+                    parse_content(content, images)
                   else
                     [ content, Utils::Tags.new ]
                   end
 
-  if embedding_enabled? && content
+  if $embedding.on? && content
     records = $documents.find_where(
       content.downcase,
       tags:,
@@ -847,11 +1007,12 @@ loop do
     end
   end
 
-  messages << Message.new(role: 'user', content:, images:)
-  handler = FollowChat.new(messages:, markdown: $markdown, voice:)
-  ollama.chat(model: $model, messages:, options:, stream: true, &handler)
+  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)
 
-  if embedding_enabled? && !records.empty?
+  if $embedding.on? && !records.empty?
     puts "", records.map { |record|
       link = if record.source =~ %r(\Ahttps?://)
                record.source

data/docker-compose.yml

@@ -2,10 +2,9 @@ services:
   redis:
     image: redis:7.2.5-alpine
     restart: unless-stopped
-    ports:
-    - "9736:6379"
+    ports: [ "127.0.0.1:9736:6379" ]
     volumes:
-    - "redis-data:/data:delegated"
-    - "./config/redis.conf:/etc/redis.conf"
+      - "redis-data:/data:delegated"
+      - "./config/redis.conf:/etc/redis.conf"
 volumes:
   redis-data:

data/lib/ollama/client.rb

@@ -19,8 +19,8 @@ class Ollama::Client
         'missing :base_url parameter or OLLAMA_URL environment variable'
     end
     base_url.is_a? URI or base_url = URI.parse(base_url)
-		base_url.is_a?(URI::HTTP) || base_url.is_a?(URI::HTTPS) or
-			raise ArgumentError, "require #{base_url.inspect} to be http/https-URI"
+    base_url.is_a?(URI::HTTP) || base_url.is_a?(URI::HTTPS) or
+      raise ArgumentError, "require #{base_url.inspect} to be http/https-URI"
     @ssl_verify_peer = base_url.query.to_s.split(?&).inject({}) { |h, l|
       h.merge Hash[*l.split(?=)]
     }['ssl_verify_peer'] != 'false'

data/lib/ollama/documents.rb

@@ -35,12 +35,13 @@ class Ollama::Documents
     alias inspect to_s
   end
 
-  def initialize(ollama:, model:, model_options: nil, collection: nil, cache: MemoryCache, redis_url: nil)
+  def initialize(ollama:, model:, model_options: nil, collection: nil, cache: MemoryCache, redis_url: nil, debug: false)
     collection ||= default_collection
     @ollama, @model, @model_options, @collection =
       ollama, model, model_options, collection.to_sym
     @redis_url = redis_url
-    @cache = connect_cache(cache)
+    @cache     = connect_cache(cache)
+    @debug     = debug
   end
 
   def default_collection
@@ -64,6 +65,9 @@ class Ollama::Documents
     }
     inputs.reject! { |i| exist?(i) }
     inputs.empty? and return self
+    if @debug
+      puts Ollama::Utils::ColorizeTexts.new(inputs)
+    end
     batches = inputs.each_slice(batch_size).
       with_infobar(
         label: "Add #{truncate(tags.to_s, percentage: 25)}",

data/lib/ollama/utils/cache_fetcher.rb

@@ -0,0 +1,38 @@
+require 'digest/md5'
+
+class Ollama::Utils::CacheFetcher
+  def initialize(cache)
+    @cache = cache
+  end
+
+  def get(url, &block)
+    block or raise ArgumentError, 'require block argument'
+    body         = @cache[key(:body, url)]
+    content_type = @cache[key(:content_type, url)]
+    content_type = MIME::Types[content_type].first
+    if body && content_type
+      io = StringIO.new(body)
+      io.rewind
+      io.extend(Ollama::Utils::Fetcher::ContentType)
+      io.content_type = content_type
+      block.(io)
+    end
+  end
+
+  def put(url, io)
+    io.rewind
+    body = io.read
+    body.empty? and return
+    content_type = io.content_type
+    content_type.nil? and return
+    @cache[key(:body, url)]          = body
+    @cache[key(:content_type,  url)] = content_type.to_s
+    self
+  end
+
+  private
+
+  def key(type, url)
+    [ type, Digest::MD5.hexdigest(url) ] * ?-
+  end
+end

data/lib/ollama/utils/fetcher.rb

@@ -3,6 +3,7 @@ require 'tins/unit'
 require 'infobar'
 require 'mime-types'
 require 'stringio'
+require 'ollama/utils/cache_fetcher'
 
 class Ollama::Utils::Fetcher
   module ContentType
@@ -17,6 +18,54 @@ class Ollama::Utils::Fetcher
 
   class RetryWithoutStreaming < StandardError; end
 
+  def self.get(url, **options, &block)
+    cache = options.delete(:cache) and
+      cache = Ollama::Utils::CacheFetcher.new(cache)
+    if result = cache&.get(url, &block)
+      infobar.puts "Getting #{url.inspect} from cache."
+      return result
+    else
+      new(**options).send(:get, url) do |tmp|
+        result = block.(tmp)
+        if cache && !tmp.is_a?(StringIO)
+          tmp.rewind
+          cache.put(url, tmp)
+        end
+        result
+      end
+    end
+  end
+
+  def self.read(filename, &block)
+    if File.exist?(filename)
+      File.open(filename) do |file|
+        file.extend(Ollama::Utils::Fetcher::ContentType)
+        file.content_type = MIME::Types.type_for(filename).first
+        block.(file)
+      end
+    end
+  end
+
+  def self.execute(command, &block)
+    Tempfile.open do |tmp|
+      IO.popen(command) do |command|
+        until command.eof?
+          tmp.write command.read(4096)
+        end
+        tmp.rewind
+        tmp.extend(Ollama::Utils::Fetcher::ContentType)
+        tmp.content_type = MIME::Types['text/plain'].first
+        block.(tmp)
+      end
+    end
+  rescue => e
+    STDERR.puts "Cannot execute #{command.inspect} (#{e})"
+    if @debug && !e.is_a?(RuntimeError)
+      STDERR.puts "#{e.backtrace * ?\n}"
+    end
+    yield ContentType.failed
+  end
+
   def initialize(debug: false, http_options: {})
     @debug        = debug
     @started      = false
@@ -24,9 +73,7 @@ class Ollama::Utils::Fetcher
     @http_options = http_options
   end
 
-  def self.get(url, **options, &block)
-    new(**options).get(url, &block)
-  end
+  private
 
   def excon(url, **options)
     Excon.new(url, options.merge(@http_options))
@@ -105,34 +152,4 @@ class Ollama::Utils::Fetcher
     }
     '%l ' + progress + ' in %te, ETA %e @%E'
   end
-
-  def self.read(filename, &block)
-    if File.exist?(filename)
-      File.open(filename) do |file|
-        file.extend(Ollama::Utils::Fetcher::ContentType)
-        file.content_type = MIME::Types.type_for(filename).first
-        block.(file)
-      end
-    end
-  end
-
-  def self.execute(command, &block)
-    Tempfile.open do |tmp|
-      IO.popen(command) do |command|
-        until command.eof?
-          tmp.write command.read(4096)
-        end
-        tmp.rewind
-        tmp.extend(Ollama::Utils::Fetcher::ContentType)
-        tmp.content_type = MIME::Types['text/plain'].first
-        block.(tmp)
-      end
-    end
-  rescue => e
-    STDERR.puts "Cannot execute #{command.inspect} (#{e})"
-    if @debug && !e.is_a?(RuntimeError)
-      STDERR.puts "#{e.backtrace * ?\n}"
-    end
-    yield ContentType.failed
-  end
 end

data/lib/ollama/utils/file_argument.rb

@@ -25,8 +25,10 @@ module Ollama::Utils::FileArgument
         File.exist?(path_or_content)
     then
       File.read(path_or_content)
+    elsif path_or_content.present?
+      path_or_content
     else
-      path_or_content.full? || default
+      default
     end
   end
 end

data/lib/ollama/version.rb

@@ -1,6 +1,6 @@
 module Ollama
   # Ollama version
-  VERSION         = '0.5.0'
+  VERSION         = '0.6.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,26 +1,26 @@
 # -*- encoding: utf-8 -*-
-# stub: ollama-ruby 0.5.0 ruby lib
+# stub: ollama-ruby 0.6.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama-ruby".freeze
-  s.version = "0.5.0".freeze
+  s.version = "0.6.0".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-09-26"
+  s.date = "2024-09-30"
   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/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/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/fetcher_spec.rb".freeze, "spec/ollama/utils/file_argument_spec.rb".freeze, "spec/ollama/utils/tags_spec.rb".freeze, "spec/spec_helper.rb".freeze, "tmp/.keep".freeze]
+  s.extra_rdoc_files = ["README.md".freeze, "lib/ollama.rb".freeze, "lib/ollama/client.rb".freeze, "lib/ollama/client/command.rb".freeze, "lib/ollama/client/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/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/fetcher_spec.rb".freeze, "spec/ollama/utils/file_argument_spec.rb".freeze, "spec/ollama/utils/tags_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/fetcher_spec.rb".freeze, "spec/ollama/utils/file_argument_spec.rb".freeze, "spec/ollama/utils/tags_spec.rb".freeze, "spec/spec_helper.rb".freeze]
 
   s.specification_version = 4
 
@@ -47,4 +47,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<pdf-reader>.freeze, ["~> 2.0".freeze])
   s.add_runtime_dependency(%q<logger>.freeze, ["~> 1.0".freeze])
   s.add_runtime_dependency(%q<json>.freeze, ["~> 2.0".freeze])
+  s.add_runtime_dependency(%q<xdg>.freeze, ["~> 7.0".freeze])
 end

data/spec/ollama/utils/cache_fetcher_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+
+RSpec.describe Ollama::Utils::CacheFetcher do
+  let :url do
+    'https://www.example.com/hello'
+  end
+
+  let :cache do
+    double('RedisCache')
+  end
+
+  let :fetcher do
+    described_class.new(cache).expose
+  end
+
+  it 'can be instantiated' do
+    expect(fetcher).to be_a described_class
+  end
+
+  it 'has #get' do
+    expect(cache).to receive(:[]).with('body-69ce405ab83f42dffa9fd22bbd47783f').and_return 'world'
+    expect(cache).to receive(:[]).with('content_type-69ce405ab83f42dffa9fd22bbd47783f').and_return 'text/plain'
+    yielded_io = nil
+    block = -> io { yielded_io = io }
+    fetcher.get(url, &block)
+    expect(yielded_io).to be_a StringIO
+    expect(yielded_io.read).to eq 'world'
+  end
+
+  it '#get needs block' do
+    expect { fetcher.get(url) }.to raise_error(ArgumentError)
+  end
+
+  it 'has #put' do
+    io = StringIO.new('world')
+    io.extend(Ollama::Utils::Fetcher::ContentType)
+    io.content_type = MIME::Types['text/plain'].first
+    expect(cache).to receive(:[]=).with('body-69ce405ab83f42dffa9fd22bbd47783f', 'world')
+    expect(cache).to receive(:[]=).with('content_type-69ce405ab83f42dffa9fd22bbd47783f', 'text/plain')
+    fetcher.put(url, io)
+  end
+end

data/spec/ollama/utils/fetcher_spec.rb

@@ -6,7 +6,7 @@ RSpec.describe Ollama::Utils::Fetcher do
   end
 
   let :fetcher do
-    described_class.new
+    described_class.new.expose
   end
 
   it 'can be instantiated' do
@@ -36,7 +36,7 @@ RSpec.describe Ollama::Utils::Fetcher do
   it 'can #get without ssl peer verification' do
     fetcher = described_class.new(
       http_options: { ssl_verify_peer: false }
-    )
+    ).expose
     stub_request(:get, 'https://www.example.com/hello').
       with(headers: fetcher.headers).
       to_return(

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ if ENV['START_SIMPLECOV'].to_i == 1
   end
 end
 require 'rspec'
+require 'tins/xt/expose'
 begin
   require 'debug'
 rescue LoadError

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ollama-ruby
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-26 00:00:00.000000000 Z
+date: 2024-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -332,6 +332,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: xdg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.0'
 description: Library that allows interacting with the Ollama API
 email: flori@ping.de
 executables:
@@ -387,6 +401,7 @@ extra_rdoc_files:
 - lib/ollama/tool/function/parameters.rb
 - lib/ollama/tool/function/parameters/property.rb
 - lib/ollama/utils/ansi_markdown.rb
+- lib/ollama/utils/cache_fetcher.rb
 - lib/ollama/utils/chooser.rb
 - lib/ollama/utils/colorize_texts.rb
 - lib/ollama/utils/fetcher.rb
@@ -453,6 +468,7 @@ files:
 - lib/ollama/tool/function/parameters.rb
 - lib/ollama/tool/function/parameters/property.rb
 - lib/ollama/utils/ansi_markdown.rb
+- lib/ollama/utils/cache_fetcher.rb
 - lib/ollama/utils/chooser.rb
 - lib/ollama/utils/colorize_texts.rb
 - lib/ollama/utils/fetcher.rb
@@ -499,6 +515,7 @@ files:
 - spec/ollama/options_spec.rb
 - spec/ollama/tool_spec.rb
 - spec/ollama/utils/ansi_markdown_spec.rb
+- spec/ollama/utils/cache_fetcher_spec.rb
 - spec/ollama/utils/fetcher_spec.rb
 - spec/ollama/utils/file_argument_spec.rb
 - spec/ollama/utils/tags_spec.rb
@@ -566,6 +583,7 @@ test_files:
 - spec/ollama/options_spec.rb
 - spec/ollama/tool_spec.rb
 - spec/ollama/utils/ansi_markdown_spec.rb
+- spec/ollama/utils/cache_fetcher_spec.rb
 - spec/ollama/utils/fetcher_spec.rb
 - spec/ollama/utils/file_argument_spec.rb
 - spec/ollama/utils/tags_spec.rb