ollama-ruby 0.5.0 → 0.7.0

data/bin/ollama_cli

@@ -8,8 +8,8 @@ include Tins::GO
 require 'json'
 
 def usage
-  puts <<~end
-    #{File.basename($0)} [OPTIONS]
+  puts <<~EOT
+    Usage: #{File.basename($0)} [OPTIONS]
 
       -u URL         the ollama base url, OLLAMA_URL
       -m MODEL       the ollama model to chat with, OLLAMA_MODEL
@@ -22,7 +22,7 @@ def usage
       -S             use streaming for generation
       -h             this help
 
-  end
+  EOT
   exit 0
 end
 

data/bin/ollama_update

@@ -14,4 +14,6 @@ ollama.tags.models.each do |model|
     "Updating model #{bold {name}} (last modified at #{modified_at.iso8601}):"
   )
   ollama.pull(name:)
+rescue Ollama::Errors::Error => e
+  infobar.puts "Caught #{e.class} for model #{bold { model.name }}: #{e} => Continuing."
 end

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

@@ -1,6 +1,3 @@
-require 'tins/xt/string_camelize'
-require 'tins/annotate'
-
 class Ollama::Client
 end
 require 'ollama/client/doc'
@@ -19,8 +16,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/cache/redis_cache.rb

@@ -23,7 +23,17 @@ class Ollama::Documents::RedisCache
   end
 
   def []=(key, value)
-    redis.set(pre(key), JSON.generate(value), ex: @ex)
+    set(key, value)
+  end
+
+  def set(key, value, ex: nil)
+    ex ||= @ex
+    if !ex.nil? && ex < 1
+      redis.del(pre(key))
+    else
+      redis.set(pre(key), JSON.generate(value), ex:)
+    end
+    value
   end
 
   def ttl(key)

data/lib/ollama/documents.rb

@@ -25,7 +25,7 @@ class Ollama::Documents
     end
 
     def tags_set
-      Ollama::Utils::Tags.new(tags)
+      Ollama::Utils::Tags.new(tags, source:)
     end
 
     def ==(other)
@@ -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
@@ -56,17 +57,22 @@ class Ollama::Documents
 
   def add(inputs, batch_size: 10, source: nil, tags: [])
     inputs = Array(inputs)
-    tags   = Ollama::Utils::Tags.new(tags)
-    source and tags.add File.basename(source).gsub(/\?.*/, '')
+    tags = Ollama::Utils::Tags.new(tags, source:)
+    if source
+      tags.add(File.basename(source).gsub(/\?.*/, ''), source:)
+    end
     inputs.map! { |i|
       text = i.respond_to?(:read) ? i.read : i.to_s
       text
     }
     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)}",
+        label: "Add #{truncate(tags.to_s(link: false), percentage: 25)}",
         total: inputs.size
       )
     batches.each do |batch|
@@ -155,7 +161,11 @@ class Ollama::Documents
   end
 
   def tags
-    @cache.inject(Ollama::Utils::Tags.new) { |t, (_, record)| t.merge(record.tags) }
+    @cache.each_with_object(Ollama::Utils::Tags.new) do |(_, record), t|
+      record.tags.each do |tag|
+        t.add(tag, source: record.source)
+      end
+    end
   end
 
   private

data/lib/ollama/image.rb

@@ -7,6 +7,8 @@ class Ollama::Image
 
   attr_accessor :path
 
+  attr_reader :data
+
   class << self
     def for_base64(data, path: nil)
       obj = new(data)
@@ -31,7 +33,7 @@ class Ollama::Image
   end
 
   def ==(other)
-    @data == other..data
+    @data == other.data
   end
 
   def to_s

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::HeaderExtension)
+      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.set(key(:body, url), body, ex: io.ex)
+    @cache.set(key(:content_type,  url), content_type.to_s, ex: io.ex)
+    self
+  end
+
+  private
+
+  def key(type, url)
+    [ type, Digest::MD5.hexdigest(url) ] * ?-
+  end
+end

data/lib/ollama/utils/chooser.rb

@@ -8,8 +8,9 @@ module Ollama::Utils::Chooser
 
   module_function
 
-  def choose(entries)
+  def choose(entries, prompt: 'Search? %s')
     entry = Search.new(
+      prompt:,
       match: -> answer {
         matcher = Amatch::PairDistance.new(answer.downcase)
         matches = entries.map { |n| [ n, -matcher.similar(n.to_s.downcase) ] }.
@@ -19,7 +20,7 @@ module Ollama::Utils::Chooser
       },
       query: -> _answer, matches, selector {
         matches.each_with_index.map { |m, i|
-          i == selector ? "#{blue{?⮕}} #{on_blue{m}}" : "  #{m}"
+          i == selector ? "#{blue{?⮕}} #{on_blue{m}}" : "  #{m.to_s}"
         } * ?\n
       },
       found: -> _answer, matches, selector {
@@ -27,6 +28,11 @@ module Ollama::Utils::Chooser
       },
       output: STDOUT
     ).start
-    return entry if entry
+    if entry
+      entry
+    else
+      print clear_screen, move_home
+      nil
+    end
   end
 end

data/lib/ollama/utils/fetcher.rb

@@ -3,11 +3,14 @@ require 'tins/unit'
 require 'infobar'
 require 'mime-types'
 require 'stringio'
+require 'ollama/utils/cache_fetcher'
 
 class Ollama::Utils::Fetcher
-  module ContentType
+  module HeaderExtension
     attr_accessor :content_type
 
+    attr_accessor :ex
+
     def self.failed
       object = StringIO.new.extend(self)
       object.content_type = MIME::Types['text/plain'].first
@@ -17,6 +20,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.to_s.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::HeaderExtension)
+        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(1 << 14)
+        end
+        tmp.rewind
+        tmp.extend(Ollama::Utils::Fetcher::HeaderExtension)
+        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 HeaderExtension.failed
+  end
+
   def initialize(debug: false, http_options: {})
     @debug        = debug
     @started      = false
@@ -24,9 +75,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))
@@ -63,7 +112,7 @@ class Ollama::Utils::Fetcher
     if @debug && !e.is_a?(RuntimeError)
       STDERR.puts "#{e.backtrace * ?\n}"
     end
-    yield ContentType.failed
+    yield HeaderExtension.failed
   end
 
   def headers
@@ -76,12 +125,20 @@ class Ollama::Utils::Fetcher
     (Excon.defaults[:middlewares] + [ Excon::Middleware::RedirectFollower ]).uniq
   end
 
+  private
+
   def decorate_io(tmp, response)
     tmp.rewind
-    tmp.extend(ContentType)
+    tmp.extend(HeaderExtension)
     if content_type = MIME::Types[response.headers['content-type']].first
       tmp.content_type = content_type
     end
+    if cache_control = response.headers['cache-control'] and
+        cache_control !~ /no-store|no-cache/ and
+        ex = cache_control[/s-maxage\s*=\s*(\d+)/, 1] || cache_control[/max-age\s*=\s*(\d+)/, 1]
+    then
+      tmp.ex = ex.to_i
+    end
   end
 
   def callback(tmp)
@@ -105,34 +162,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/utils/tags.rb

@@ -1,12 +1,66 @@
-require 'sorted_set'
+class Ollama::Utils::Tags
+  class Tag < String
+    include Term::ANSIColor
 
+    def initialize(tag, source: nil)
+      super(tag.to_s)
+      self.source = source
+    end
 
-class Ollama::Utils::Tags < SortedSet
-  def to_a
-    super.map(&:to_s)
+    attr_accessor :source
+
+    alias_method :internal, :to_s
+
+    def to_s(link: true)
+      tag_string = start_with?(?#) ? super() : ?# + super()
+      my_source  = source
+      if link && my_source
+        unless my_source =~ %r(\A(https?|file)://)
+          my_source = 'file://%s' % File.expand_path(my_source)
+        end
+        hyperlink(my_source) { tag_string }
+      else
+        tag_string
+      end
+    end
+  end
+
+  def initialize(tags = [], source: nil)
+    @set = []
+    tags.each { |tag| add(tag, source:) }
+  end
+
+  def add(tag, source: nil)
+    unless tag.is_a?(Tag)
+      tag = Tag.new(tag, source:)
+    end
+    index = @set.bsearch_index { _1 >= tag }
+    if index == nil
+      @set.push(tag)
+    elsif @set.at(index) != tag
+      @set.insert(index, tag)
+    end
+    self
+  end
+
+  def empty?
+    @set.empty?
+  end
+
+  def size
+    @set.size
+  end
+
+  def clear
+    @set.clear
+  end
+
+  def each(&block)
+    @set.each(&block)
   end
+  include Enumerable
 
-  def to_s
-    map { |t| '#%s' % t } * ' '
+  def to_s(link: true)
+    @set.map { |tag| tag.to_s(link:) } * ' '
   end
 end

data/lib/ollama/utils/width.rb

@@ -2,6 +2,7 @@ require 'tins/terminal'
 
 module Ollama::Utils::Width
   include Term::ANSIColor
+  extend Term::ANSIColor
 
   module_function
 
@@ -26,10 +27,11 @@ module Ollama::Utils::Width
     percentage.nil? ^ length.nil? or
       raise ArgumentError, "either pass percentage or length argument"
     percentage and length ||= width(percentage:)
-    if length < 1
+    ellipsis_length = ellipsis.size
+    if length < ellipsis_length
       +''
-    elsif text.size > length
-      text[0, length - 1] + ?…
+    elsif text.size >= length + ellipsis_length
+      text[0, length - ellipsis_length] + ellipsis
     else
       text
     end

data/lib/ollama/version.rb

@@ -1,6 +1,6 @@
 module Ollama
   # Ollama version
-  VERSION         = '0.5.0'
+  VERSION         = '0.7.0'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/lib/ollama.rb

@@ -1,6 +1,10 @@
 require 'json'
 require 'logger'
 require 'excon'
+require 'tins'
+require 'tins/xt/full'
+require 'tins/xt/hash_union'
+require 'tins/xt/string_camelize'
 
 module Ollama
 end

data/ollama-ruby.gemspec

@@ -1,26 +1,26 @@
 # -*- encoding: utf-8 -*-
-# stub: ollama-ruby 0.5.0 ruby lib
+# stub: ollama-ruby 0.7.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama-ruby".freeze
-  s.version = "0.5.0".freeze
+  s.version = "0.7.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-10-02"
   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/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/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/ollama/utils/width_spec.rb".freeze, "spec/spec_helper.rb".freeze]
 
   s.specification_version = 4
 
@@ -38,7 +38,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<redis>.freeze, ["~> 5.0".freeze])
   s.add_runtime_dependency(%q<numo-narray>.freeze, ["~> 0.9".freeze])
   s.add_runtime_dependency(%q<more_math>.freeze, ["~> 1.1".freeze])
-  s.add_runtime_dependency(%q<sorted_set>.freeze, ["~> 1.0".freeze])
   s.add_runtime_dependency(%q<mime-types>.freeze, ["~> 3.0".freeze])
   s.add_runtime_dependency(%q<reverse_markdown>.freeze, ["~> 2.0".freeze])
   s.add_runtime_dependency(%q<complex_config>.freeze, ["~> 0.22".freeze])
@@ -47,4 +46,6 @@ 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])
+  s.add_runtime_dependency(%q<tins>.freeze, ["~> 1.34".freeze])
 end

data/spec/ollama/image_spec.rb

@@ -9,6 +9,11 @@ RSpec.describe Ollama::Image do
     expect(image).to be_a described_class
   end
 
+  it 'can be equal or not' do
+    expect(image).not_to eq described_class.for_string('')
+    expect(image).to eq described_class.for_filename(asset('kitten.jpg'))
+  end
+
   it 'cannot be created via .new' do
     expect {
       described_class.new('nix')

data/spec/ollama/utils/cache_fetcher_spec.rb

@@ -0,0 +1,43 @@
+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::HeaderExtension)
+    io.content_type = MIME::Types['text/plain'].first
+    io.ex = 666
+    expect(cache).to receive(:set).with('body-69ce405ab83f42dffa9fd22bbd47783f', 'world', ex: 666)
+    expect(cache).to receive(:set).with('content_type-69ce405ab83f42dffa9fd22bbd47783f', 'text/plain', ex: 666)
+    fetcher.put(url, io)
+  end
+end