ollama-ruby 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9304634c783477787792071f039d6941222bcca0577cd59cdbc5103f820ea299
-  data.tar.gz: 9edc7eaf98c0601e08bb5cde23fc2d46b745982172caea349982d8867790166a
+  metadata.gz: 29863f68627a05541de5eab810850b0509db94c1d91b2e9a5a9be9bd387e8aea
+  data.tar.gz: 07f3558153a0a724c08e27a86482e0951070348bf25641d2a9feed113e3e7046
 SHA512:
-  metadata.gz: 0bda727610f0793d6c360a63c76b2c42e032109f34011ed7cbd54df5663102c3738498be836adcb00645e4ce407cab1f422737970b83a3fa757ea0b4d90d8453
-  data.tar.gz: b9df134561b2a44accfdc1ec6da68eb0b3b9b5ce64c2d64c744834a0b74cbfde8018e270977440224d0433c681e7a203d272453e391b85a3d32f34e3b0c790ca
+  metadata.gz: 11c405277b59c6acc75c24220942dd883bb7aec99d97d19bc9baf8d61aa4e5dc59af905631dc37641b91babdd9e5ab7305720a8720451db7b4bb6ca067833913
+  data.tar.gz: 129f49e2d4b5cb65b7999f666f33798511b8a34b1be84bbc7bd4433872cd7c323812cd4dd3e8d2ae325cb013cfb6403db8181c8cbe641139469e5ea9821cc71d

data/CHANGES.md

@@ -1,5 +1,33 @@
 # Changes
 
+## 2024-09-21 v0.4.0
+
+### Change Log for **1.2.3**
+
+#### New Features
+
+* Added `-E` option to disable embeddings for this chat session.
+* Added `-M` option to load document embeddings into (empty) MemoryCache for this chat session.
+* Added CSV parsing support to `ollama_chat`.
+* Improved error handling in `Ollama::Utils::Fetcher` methods.
+
+#### Bug Fixes
+
+* Handle case in `ollama_chat` where responses don't provide counts, display 0
+  rates instead.
+
+#### Refactoring and Improvements
+
+* Updated eval count and rate display in FollowChat class.
+* Refactor system prompt display and chunk listing in chat output.
+* Refactor cache implementation to use Ollama::Documents::Cache::Common module.
+* Improved system prompt formatting in `ollama_chat` script.
+* Renamed `tags` method to `tags_set` in `Ollama::Documents::Record` class.
+
+#### Documentation
+
+* Added comments to ColorizeTexts utility class.
+
 ## 2024-09-15 v0.3.2
 
 * Add color support to chooser module:

data/README.md

@@ -43,6 +43,8 @@ ollama_chat [OPTIONS]
   -c CHAT        a saved chat conversation to load
   -C COLLECTION  name of the collection used in this conversation
   -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
 ```

data/Rakefile

@@ -13,7 +13,8 @@ GemHadar do
   description 'Library that allows interacting with the Ollama API'
   test_dir    'spec'
   ignore      '.*.sw[pon]', 'pkg', 'Gemfile.lock', '.AppleDouble', '.bundle',
-    '.yardoc', 'tags', 'errors.lst', 'cscope.out', 'coverage', 'tmp', 'corpus'
+    '.yardoc', 'doc', 'tags', 'errors.lst', 'cscope.out', 'coverage', 'tmp',
+    'corpus'
   package_ignore '.all_images.yml', '.tool-versions', '.gitignore', 'VERSION',
      '.rspec', *Dir.glob('.github/**/*', File::FNM_DOTMATCH)
   readme      'README.md'
@@ -41,6 +42,8 @@ GemHadar do
   development_dependency 'all_images',            '~> 0.4'
   development_dependency 'rspec',                 '~> 3.2'
   development_dependency 'webmock'
+  development_dependency 'debug'
+  development_dependency 'simplecov'
 
   licenses << 'MIT'
 

data/bin/ollama_chat

@@ -14,6 +14,7 @@ require 'uri'
 require 'nokogiri'
 require 'rss'
 require 'pdf/reader'
+require 'csv'
 
 class OllamaChatConfig
   include ComplexConfig
@@ -47,7 +48,7 @@ class OllamaChatConfig
       splitter:
         name: RecursiveCharacter
         chunk_size: 1024
-    cache: Ollama::Documents::RedisCache
+    cache: Ollama::Documents::Cache::RedisBackedMemoryCache
     redis:
       url: <%= ENV.fetch('REDIS_URL', 'null') %>
     debug: <%= ENV['OLLAMA_CHAT_DEBUG'].to_i == 1 ? true : false %>
@@ -130,11 +131,11 @@ class FollowChat
     prompt_eval_duration = response.prompt_eval_duration / 1e9
     stats_text = {
       eval_duration:        Tins::Duration.new(eval_duration),
-      eval_count:           response.eval_count,
-      eval_rate:            bold { "%.2f c/s" % (response.eval_count / eval_duration) } + color(111),
+      eval_count:           response.eval_count.to_i,
+      eval_rate:            bold { "%.2f c/s" % (response.eval_count.to_i / eval_duration) } + color(111),
       prompt_eval_duration: Tins::Duration.new(prompt_eval_duration),
-      prompt_eval_count:    response.prompt_eval_count,
-      prompt_eval_rate:     bold { "%.2f c/s" % (response.prompt_eval_count / prompt_eval_duration) } + color(111),
+      prompt_eval_count:    response.prompt_eval_count.to_i,
+      prompt_eval_rate:     bold { "%.2f c/s" % (response.prompt_eval_count.to_i / prompt_eval_duration) } + color(111),
       total_duration:       Tins::Duration.new(response.total_duration / 1e9),
       load_duration:        Tins::Duration.new(response.load_duration / 1e9),
     }.map { _1 * '=' } * ' '
@@ -149,7 +150,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.new.get(url) do |tmp|
+  Ollama::Utils::Fetcher.new(debug: $config.debug).get(url) do |tmp|
     result = []
     doc = Nokogiri::HTML(tmp)
     doc.css('.results_links').each do |link|
@@ -302,6 +303,16 @@ def parse_source(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 %r(\Atext/)
     source_io.read
   when 'application/rss+xml'
@@ -312,11 +323,7 @@ def parse_source(source_io)
     source_io.read
   when 'application/pdf'
     reader = PDF::Reader.new(source_io)
-    result = +''
-    reader.pages.each do |page|
-      result << page.text
-    end
-    result
+    reader.pages.inject(+'') { |result, page| result << page.text }
   else
     STDERR.puts "Cannot import #{source_io&.content_type} document."
     return
@@ -324,10 +331,7 @@ def parse_source(source_io)
 end
 
 def import_document(source_io, source)
-  unless $config.embedding.enabled
-    STDOUT.puts "Embedding disabled, I won't import any documents, try: /summarize"
-    return
-  end
+  embedding_enabled? or return parse_source(source_io)
   puts "Importing #{italic { source_io&.content_type }} document #{source.to_s.inspect}."
   text = parse_source(source_io) or return
   text.downcase!
@@ -364,7 +368,7 @@ end
 def fetch_source(source, &block)
   case source
   when %r(\Ahttps?://\S+)
-    Utils::Fetcher.get(source) do |tmp|
+    Utils::Fetcher.get(source, debug: $config.debug) do |tmp|
       block.(tmp)
     end
   when %r(\Afile://(?:(?:[.-]|[[:alnum:]])*)(/\S*)|([~.]?/\S*))
@@ -384,7 +388,8 @@ def summarize(source)
   puts "Now summarizing #{source.to_s.inspect}."
   source_content =
     fetch_source(source) do |source_io|
-      content = parse_source(source_io) or return
+      content = parse_source(source_io)
+      content.present? or return
       source_io.rewind
       import_document(source_io, source)
       content
@@ -433,7 +438,7 @@ ensure
 end
 
 def choose_collection(default_collection)
-  collections = [ default_collection ] + $documents.collections
+  collections = [ default_collection ] + $documents.collections.map(&:to_s)
   collections = collections.uniq.sort
   $documents.collection = collection =
     Ollama::Utils::Chooser.choose(collections) || default_collection
@@ -452,7 +457,11 @@ def collection_stats
 end
 
 def configure_cache
-  Object.const_get($config.cache)
+  if $opts[?M]
+    Ollama::Documents::MemoryCache
+  else
+    Object.const_get($config.cache)
+  end
 rescue => e
   STDERR.puts "Caught #{e.class}: #{e} => Falling back to MemoryCache."
   Ollama::Documents::MemoryCache
@@ -468,6 +477,14 @@ def set_markdown(value)
   end
 end
 
+def clear_messages(messages)
+  messages.delete_if { _1.role != 'system' }
+end
+
+def embedding_enabled?
+  $config.embedding.enabled && !$opts[?E]
+end
+
 def display_chat_help
   puts <<~end
     /paste                                   to paste content
@@ -498,7 +515,9 @@ def usage
       -s SYSTEM      the system prompt to use as a file, OLLAMA_CHAT_SYSTEM
       -c CHAT        a saved chat conversation to load
       -C COLLECTION  name of the collection used in this conversation
-      -D DOCUMENT    load document and add to collection (multiple)
+      -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
       -h             this help
 
@@ -510,28 +529,28 @@ def ollama
   $ollama
 end
 
-opts = go 'f:u:m:s:c:C:D:vh'
+$opts = go 'f:u:m:s:c:C:D:MEvh'
 
-config = OllamaChatConfig.new(opts[?f])
+config = OllamaChatConfig.new($opts[?f])
 $config = config.config
 
-opts[?h] and usage
+$opts[?h] and usage
 
 puts "Configuration read from #{config.filename.inspect} is:", $config
 
-base_url = opts[?u] || $config.url
+base_url = $opts[?u] || $config.url
 $ollama      = Client.new(base_url:, debug: $config.debug)
 
-model        = choose_model(opts[?m], $config.model.name)
+model        = choose_model($opts[?m], $config.model.name)
 options      = Options[$config.model.options]
 model_system = pull_model_unless_present(model, options)
 messages     = []
 
-if $config.embedding.enabled
+if embedding_enabled?
   embedding_model         = $config.embedding.model.name
   embedding_model_options = Options[$config.embedding.model.options]
   pull_model_unless_present(embedding_model, embedding_model_options)
-  collection = opts[?C] || $config.embedding.collection
+  collection = $opts[?C] || $config.embedding.collection
   $documents = Documents.new(
     ollama:,
     model:         $config.embedding.model.name,
@@ -541,7 +560,7 @@ if $config.embedding.enabled
     redis_url:     $config.redis.url?,
   )
 
-  document_list = opts[?D].to_a
+  document_list = $opts[?D].to_a
   if document_list.any?(&:empty?)
     puts "Clearing collection #{bold{collection}}."
     $documents.clear
@@ -569,18 +588,21 @@ else
   $documents = Documents.new(ollama:, model:)
 end
 
-if voice = ($config.voice if opts[?v])
+if voice = ($config.voice if $opts[?v])
   puts "Using voice #{bold{voice}} to speak."
 end
 markdown = set_markdown($config.markdown)
 
-if opts[?c]
-  messages.concat load_conversation(opts[?c])
+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)
+      get_file_argument($opts[?s], default: $config.prompts.system? || model_system)
     messages << Message.new(role: 'system', content: system)
-    puts "Configured system prompt is:\n#{italic { system }}"
+    puts <<~end
+      Configured system prompt is:
+      #{italic{Ollama::Utils::Width.wrap(system, percentage: 90)}}
+    end
   end
 end
 
@@ -606,11 +628,11 @@ loop do
     list_conversation(messages, markdown)
     next
   when %r(^/clear$)
-    messages.clear
+    clear_messages(messages)
     puts "Cleared messages."
     next
   when %r(^/clobber$)
-    messages.clear
+    clear_messages(messages)
     $documents.clear
     puts "Cleared messages and collection."
     next
@@ -697,7 +719,7 @@ loop do
                     [ content, Utils::Tags.new ]
                   end
 
-  if $config.embedding.enabled && content
+  if embedding_enabled? && content
     records = $documents.find_where(
       content.downcase,
       tags:,
@@ -705,10 +727,9 @@ loop do
       text_size:  $config.embedding.found_texts_size?,
       text_count: $config.embedding.found_texts_count?,
     )
-    found_texts = records.map(&:text)
-    unless found_texts.empty?
-      content += "\nConsider these chunks for your answer:\n"\
-        "#{found_texts.join("\n\n---\n\n")}"
+    unless records.empty?
+      content += "\nConsider these chunks for your answer:\n\n"\
+        "#{records.map { [ _1.text, _1.tags_set ] * ?\n }.join("\n\n---\n\n")}"
     end
   end
 
@@ -716,8 +737,8 @@ loop do
   handler = FollowChat.new(messages:, markdown:, voice:)
   ollama.chat(model:, messages:, options:, stream: true, &handler)
 
-  if records
-    puts records.map { |record|
+  if embedding_enabled? && !records.empty?
+    puts "", records.map { |record|
       link = if record.source =~ %r(\Ahttps?://)
                record.source
              else

data/lib/ollama/documents/cache/common.rb

@@ -0,0 +1,17 @@
+module Ollama::Documents::Cache::Common
+  attr_writer :prefix
+
+  def collections(prefix)
+    unique = Set.new
+    full_each { |key, _| unique << key[/\A#{prefix}(.*)-/, 1] }
+    unique.map(&:to_sym)
+  end
+
+  def pre(key)
+    [ @prefix, key ].join
+  end
+
+  def unpre(key)
+    key.sub(/\A#@prefix/, '')
+  end
+end

data/lib/ollama/documents/{memory_cache.rb → cache/memory_cache.rb}

@@ -1,11 +1,13 @@
+require 'ollama/documents/cache/common'
+
 class Ollama::Documents::MemoryCache
+  include Ollama::Documents::Cache::Common
+
   def initialize(prefix:)
     @prefix = prefix
     @data   = {}
   end
 
-  attr_writer :prefix
-
   def [](key)
     @data[pre(key)]
   end
@@ -23,11 +25,11 @@ class Ollama::Documents::MemoryCache
   end
 
   def size
-    @data.size
+    count
   end
 
   def clear
-    @data.clear
+    @data.delete_if { |key, _| key.start_with?(@prefix) }
     self
   end
 
@@ -36,11 +38,7 @@ class Ollama::Documents::MemoryCache
   end
   include Enumerable
 
-  def pre(key)
-    [ @prefix, key ].join
-  end
-
-  def unpre(key)
-    key.sub(/\A#@prefix/, '')
+  def full_each(&block)
+    @data.each(&block)
   end
 end

data/lib/ollama/documents/cache/redis_backed_memory_cache.rb

@@ -0,0 +1,44 @@
+require 'redis'
+
+class Ollama::Documents
+  class RedisBackedMemoryCache < MemoryCache
+    def initialize(prefix:, url: ENV['REDIS_URL'])
+      super(prefix:)
+      url or raise ArgumentError, 'require redis url'
+      @prefix, @url = prefix, url
+      @redis_cache  = Ollama::Documents::RedisCache.new(prefix:, url:)
+      @redis_cache.full_each do |key, value|
+        @data[key] = value
+      end
+    end
+
+    def redis
+      @redis_cache.redis
+    end
+
+    def []=(key, value)
+      super
+      redis.set(pre(key), JSON(value))
+    end
+
+    def delete(key)
+      result = redis.del(pre(key))
+      super
+      result
+    end
+
+    def clear
+      redis.scan_each(match: "#@prefix*") { |key| redis.del(key) }
+      super
+      self
+    end
+
+    def pre(key)
+      [ @prefix, key ].join
+    end
+
+    def unpre(key)
+      key.sub(/\A#@prefix/, '')
+    end
+  end
+end

data/lib/ollama/documents/{redis_cache.rb → cache/redis_cache.rb}

@@ -1,13 +1,14 @@
+require 'ollama/documents/cache/common'
 require 'redis'
 
 class Ollama::Documents::RedisCache
+  include Ollama::Documents::Cache::Common
+
   def initialize(prefix:, url: ENV['REDIS_URL'])
     url or raise ArgumentError, 'require redis url'
     @prefix, @url = prefix, url
   end
 
-  attr_writer :prefix
-
   def redis
     @redis ||= Redis.new(url: @url)
   end
@@ -48,11 +49,11 @@ class Ollama::Documents::RedisCache
   end
   include Enumerable
 
-  def pre(key)
-    [ @prefix, key ].join
-  end
-
-  def unpre(key)
-    key.sub(/\A#@prefix/, '')
+  def full_each(&block)
+    redis.scan_each do |key|
+      value = redis.get(key) or next
+      value = JSON(value, object_class: Ollama::Documents::Record)
+      block.(key, value)
+    end
   end
 end

data/lib/ollama/documents.rb

@@ -3,8 +3,11 @@ require 'digest'
 
 class Ollama::Documents
 end
-require 'ollama/documents/memory_cache'
-require 'ollama/documents/redis_cache'
+class Ollama::Documents::Cache
+end
+require 'ollama/documents/cache/memory_cache'
+require 'ollama/documents/cache/redis_cache'
+require 'ollama/documents/cache/redis_backed_memory_cache'
 module Ollama::Documents::Splitters
 end
 require 'ollama/documents/splitters/character'
@@ -16,11 +19,15 @@ class Ollama::Documents
 
   class Record < JSON::GenericObject
     def to_s
-      my_tags = Ollama::Utils::Tags.new(tags)
+      my_tags = tags_set
       my_tags.empty? or my_tags = " #{my_tags}"
       "#<#{self.class} #{text.inspect}#{my_tags} #{similarity || 'n/a'}>"
     end
 
+    def tags_set
+      Ollama::Utils::Tags.new(tags)
+    end
+
     def ==(other)
       text == other.text
     end
@@ -28,15 +35,19 @@ class Ollama::Documents
     alias inspect to_s
   end
 
-  def initialize(ollama:, model:, model_options: nil, collection: :default, cache: MemoryCache, redis_url: nil)
-    @ollama, @model, @model_options, @collection = ollama, model, model_options, collection
+  def initialize(ollama:, model:, model_options: nil, collection: default_collection, cache: MemoryCache, redis_url: nil)
+    @ollama, @model, @model_options, @collection = ollama, model, model_options, collection.to_sym
     @cache, @redis_url = connect_cache(cache), redis_url
   end
 
+  def default_collection
+    :default
+  end
+
   attr_reader :ollama, :model, :collection
 
   def collection=(new_collection)
-    @collection = new_collection
+    @collection   = new_collection.to_sym
     @cache.prefix = prefix
   end
 
@@ -137,15 +148,7 @@ class Ollama::Documents
   end
 
   def collections
-    case @cache
-    when MemoryCache
-      [ @collection ]
-    when RedisCache
-      prefix = '%s-' % self.class
-      Documents::RedisCache.new(prefix:, url: @redis_url).map { _1[/#{prefix}(.*)-/, 1] }.uniq
-    else
-      []
-    end
+    ([ default_collection ] + @cache.collections('%s-' % self.class)).uniq
   end
 
   def tags
@@ -156,7 +159,7 @@ class Ollama::Documents
 
   def connect_cache(cache_class)
     cache = nil
-    if cache_class == RedisCache
+    if cache_class.instance_method(:redis)
       begin
         cache = cache_class.new(prefix:)
         cache.size

data/lib/ollama/utils/colorize_texts.rb

@@ -3,11 +3,20 @@ class Ollama::Utils::ColorizeTexts
   include Term::ANSIColor
   include Ollama::Utils::Width
 
+  # Initializes a new instance of Ollama::Utils::ColorizeTexts
+  #
+  # @param [Array<String>] texts the array of strings to be displayed with colors
+  #
+  # @return [Ollama::Utils::ColorizeTexts] an instance of Ollama::Utils::ColorizeTexts
   def initialize(*texts)
-    texts = texts.map(&:to_a)
+    texts  = texts.map(&:to_a)
     @texts = Array(texts.flatten)
   end
 
+  # Returns a string representation of the object, including all texts content,
+  # colored differently and their sizes.
+  #
+  # @return [String] The formatted string.
   def to_s
     result = +''
     @texts.each_with_index do |t, i|
@@ -22,6 +31,14 @@ class Ollama::Utils::ColorizeTexts
 
   private
 
+  # Returns the nearest RGB color to the given ANSI color
+  #
+  # @param [color] color The ANSI color attribute
+  #
+  # @return [Array<RGBTriple>] An array containing two RGB colors, one for black and
+  #   one for white text, where the first is the closest match to the input color
+  #   when printed on a black background, and the second is the closest match
+  #   when printed on a white background.
   def text_color(color)
     color = Term::ANSIColor::Attribute[color]
     [
@@ -30,6 +47,9 @@ class Ollama::Utils::ColorizeTexts
     ].max_by { |t| t.distance_to(color) }
   end
 
+  # Returns an array of colors for each step in the gradient
+  #
+  # @return [Array<Array<Integer>>] An array of RGB color arrays
   def colors
     @colors ||= (0..255).map { |i|
       [

data/lib/ollama/utils/fetcher.rb

@@ -2,6 +2,7 @@ require 'tempfile'
 require 'tins/unit'
 require 'infobar'
 require 'mime-types'
+require 'stringio'
 
 class Ollama::Utils::Fetcher
   module ContentType
@@ -10,13 +11,14 @@ class Ollama::Utils::Fetcher
 
   class RetryWithoutStreaming < StandardError; end
 
-  def initialize
+  def initialize(debug: false)
+    @debug     = debug
     @started   = false
     @streaming = true
   end
 
-  def self.get(url, &block)
-    new.get(url, &block)
+  def self.get(url, **options, &block)
+    new(**options).get(url, &block)
   end
 
   def get(url, &block)
@@ -46,11 +48,11 @@ class Ollama::Utils::Fetcher
     @streaming = false
     retry
   rescue => e
-    STDERR.puts "Cannot get #{url.to_s.inspect} (#{e}): #{response&.status_line}"
-    unless e.is_a?(RuntimeError)
+    STDERR.puts "Cannot get #{url.to_s.inspect} (#{e}): #{response&.status_line || 'n/a'}"
+    if @debug && !e.is_a?(RuntimeError)
       STDERR.puts "#{e.backtrace * ?\n}"
     end
-    yield nil
+    yield StringIO.new.extend(ContentType)
   end
 
   def headers

data/lib/ollama/utils/file_argument.rb

@@ -1,6 +1,24 @@
 module Ollama::Utils::FileArgument
   module_function
 
+  # Returns the contents of a file or string, or a default value if neither is provided.
+  #
+  # @param [String] path_or_content The path to a file or a string containing
+  #                 the content.
+  #
+  # @param [String] default The default value to return if no valid input is
+  #                 given. Defaults to nil.
+  #
+  # @return [String] The contents of the file, the string, or the default value.
+  #
+  # @example Get the contents of a file
+  #   get_file_argument('path/to/file')
+  #
+  # @example Use a string as content
+  #   get_file_argument('string content')
+  #
+  # @example Return a default value if no valid input is given
+  #   get_file_argument(nil, default: 'default content')
   def get_file_argument(path_or_content, default: nil)
     if path_or_content.present? && path_or_content.size < 2 ** 15 &&
         File.basename(path_or_content).size < 2 ** 8 &&

data/lib/ollama/utils/tags.rb

@@ -1,5 +1,6 @@
 require 'sorted_set'
 
+
 class Ollama::Utils::Tags < SortedSet
   def to_a
     super.map(&:to_s)

data/lib/ollama/version.rb

@@ -1,6 +1,6 @@
 module Ollama
   # Ollama version
-  VERSION         = '0.3.2'
+  VERSION         = '0.4.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.3.2 ruby lib
+# stub: ollama-ruby 0.4.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama-ruby".freeze
-  s.version = "0.3.2".freeze
+  s.version = "0.4.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-15"
+  s.date = "2024-09-21"
   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/memory_cache.rb".freeze, "lib/ollama/documents/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/memory_cache.rb".freeze, "lib/ollama/documents/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_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/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.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_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/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
 
@@ -28,6 +28,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency(%q<all_images>.freeze, ["~> 0.4".freeze])
   s.add_development_dependency(%q<rspec>.freeze, ["~> 3.2".freeze])
   s.add_development_dependency(%q<webmock>.freeze, [">= 0".freeze])
+  s.add_development_dependency(%q<debug>.freeze, [">= 0".freeze])
+  s.add_development_dependency(%q<simplecov>.freeze, [">= 0".freeze])
   s.add_runtime_dependency(%q<excon>.freeze, ["~> 0.111".freeze])
   s.add_runtime_dependency(%q<infobar>.freeze, ["~> 0.8".freeze])
   s.add_runtime_dependency(%q<term-ansicolor>.freeze, ["~> 1.11".freeze])

data/spec/ollama/documents/memory_cache_spec.rb

@@ -1,63 +1,63 @@
 require 'spec_helper'
 
 RSpec.describe Ollama::Documents::MemoryCache do
-  let :memory_cache do
+  let :cache do
     described_class.new prefix: 'test-'
   end
 
   it 'can be instantiated' do
-    expect(memory_cache).to be_a described_class
+    expect(cache).to be_a described_class
   end
 
   it 'can get/set a key' do
     key, value = 'foo', { test: true }
     expect {
-      memory_cache[key] = value
+      cache[key] = value
     }.to change {
-      memory_cache[key]
+      cache[key]
     }.from(nil).to(value)
   end
 
   it 'can determine if key exists' do
     key, value = 'foo', { test: true }
     expect {
-      memory_cache[key] = value
+      cache[key] = value
     }.to change {
-      memory_cache.key?(key)
+      cache.key?(key)
     }.from(false).to(true)
   end
 
   it 'can delete' do
     key, value = 'foo', { test: true }
-    memory_cache[key] = value
+    cache[key] = value
     expect {
-      memory_cache.delete(key)
+      cache.delete(key)
     }.to change {
-      memory_cache.key?(key)
+      cache.key?(key)
     }.from(true).to(false)
   end
 
   it 'returns size' do
     key, value = 'foo', { test: true }
     expect {
-      memory_cache[key] = value
+      cache[key] = value
     }.to change {
-      memory_cache.size
+      cache.size
     }.from(0).to(1)
   end
 
   it 'can clear' do
     key, value = 'foo', { test: true }
-    memory_cache[key] = value
+    cache[key] = value
     expect {
-      expect(memory_cache.clear).to eq memory_cache
+      expect(cache.clear).to eq cache
     }.to change {
-      memory_cache.size
+      cache.size
     }.from(1).to(0)
   end
 
   it 'can iterate over keys under a prefix' do
-    memory_cache['foo'] = 'bar'
-    expect(memory_cache.to_a).to eq [ %w[ test-foo bar ] ]
+    cache['foo'] = 'bar'
+    expect(cache.to_a).to eq [ %w[ test-foo bar ] ]
   end
 end

data/spec/ollama/documents/redis_backed_memory_cache_spec.rb

@@ -0,0 +1,95 @@
+require 'spec_helper'
+
+RSpec.describe Ollama::Documents::RedisBackedMemoryCache do
+  it 'raises ArgumentError if url is missing' do
+    expect {
+      described_class.new prefix: 'test-', url: nil
+    }.to raise_error ArgumentError
+  end
+
+  context 'test redis interactions' do
+    let :cache do
+      described_class.new prefix: 'test-', url: 'something'
+    end
+
+    let :data do
+      cache.instance_eval { @data }
+    end
+
+    let :redis_cache do
+      cache.instance_eval { @redis_cache }
+    end
+
+    let :redis do
+      double('Redis')
+    end
+
+    before do
+      allow_any_instance_of(Ollama::Documents::RedisCache).to\
+        receive(:redis).and_return(redis)
+      allow(redis).to receive(:scan_each)
+    end
+
+    it 'can be instantiated and initialized' do
+      cache = described_class.new prefix: 'test-', url: 'something'
+      expect(cache).to be_a described_class
+    end
+
+    it 'has Redis client' do
+      expect(cache.redis).to eq redis
+    end
+
+    it 'can get a key' do
+      key = 'foo'
+      expect(data).to receive(:[]).with('test-' + key).and_return 666
+      expect(cache[key]).to eq 666
+    end
+
+    it 'can set a value for a key' do
+      key, value = 'foo', { test: true }
+      expect(data).to receive(:[]=).with('test-' + key, { test: true }).and_call_original
+      expect(redis).to receive(:set).with('test-' + key, JSON(value))
+      cache[key] = value
+    end
+
+    it 'can determine if key exists' do
+      key = 'foo'
+      expect(data).to receive(:key?).with('test-' + key).and_return(false, true)
+      expect(cache.key?('foo')).to eq false
+      expect(cache.key?('foo')).to eq true
+    end
+
+    it 'can delete' do
+      key = 'foo'
+      expect(data).to receive(:delete).with('test-' + key)
+      expect(redis).to receive(:del).with('test-' + key)
+      cache.delete(key)
+    end
+
+    it 'returns size' do
+      allow(cache).to receive(:count).and_return 3
+      expect(cache.size).to eq 3
+    end
+
+    it 'can clear' do
+      expect(redis).to receive(:scan_each).with(match: 'test-*').and_yield(
+        'test-foo'
+      )
+      expect(redis).to receive(:del).with('test-foo')
+      expect(cache.clear).to eq cache
+    end
+
+    it 'can iterate over keys under a prefix' do
+      data['test-foo'] = 'bar'
+      expect(cache.to_a).to eq [ %w[ test-foo bar ] ]
+    end
+
+    it 'can compute prefix with pre' do
+      expect(cache.pre('foo')).to eq 'test-foo'
+    end
+
+    it 'can remove prefix with unpre' do
+      expect(cache.unpre('test-foo')).to eq 'foo'
+    end
+  end
+end

data/spec/ollama/documents/redis_cache_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 RSpec.describe Ollama::Documents::RedisCache do
   it 'can be instantiated' do
-    redis_cache = described_class.new prefix: 'test-', url: 'something'
-    expect(redis_cache).to be_a described_class
+    cache = described_class.new prefix: 'test-', url: 'something'
+    expect(cache).to be_a described_class
   end
 
   it 'raises ArgumentError if url is missing' do
@@ -13,7 +13,7 @@ RSpec.describe Ollama::Documents::RedisCache do
   end
 
   context 'test redis interactions' do
-    let :redis_cache do
+    let :cache do
       described_class.new prefix: 'test-', url: 'something'
     end
 
@@ -26,32 +26,32 @@ RSpec.describe Ollama::Documents::RedisCache do
     end
 
     it 'has Redis client' do
-      expect(redis_cache.redis).to eq redis
+      expect(cache.redis).to eq redis
     end
 
     it 'can get a key' do
       key = 'foo'
-      expect(redis).to receive(:get).with('test-' + key).and_return 666
-      redis_cache[key]
+      expect(redis).to receive(:get).with('test-' + key).and_return '"some_json"'
+      expect(cache[key]).to eq 'some_json'
     end
 
     it 'can set a value for a key' do
       key, value = 'foo', { test: true }
       expect(redis).to receive(:set).with('test-' + key, JSON(value))
-      redis_cache[key] = value
+      cache[key] = value
     end
 
     it 'can determine if key exists' do
       key = 'foo'
       expect(redis).to receive(:exists?).with('test-' + key).and_return(false, true)
-      expect(redis_cache.key?('foo')).to eq false
-      expect(redis_cache.key?('foo')).to eq true
+      expect(cache.key?('foo')).to eq false
+      expect(cache.key?('foo')).to eq true
     end
 
     it 'can delete' do
       key = 'foo'
       expect(redis).to receive(:del).with('test-' + key)
-      redis_cache.delete(key)
+      cache.delete(key)
     end
 
     it 'returns size' do
@@ -59,7 +59,7 @@ RSpec.describe Ollama::Documents::RedisCache do
         and_yield('test-foo').
         and_yield('test-bar').
         and_yield('test-baz')
-      expect(redis_cache.size).to eq 3
+      expect(cache.size).to eq 3
     end
 
     it 'can clear' do
@@ -67,20 +67,20 @@ RSpec.describe Ollama::Documents::RedisCache do
         'test-foo'
       )
       expect(redis).to receive(:del).with('test-foo')
-      expect(redis_cache.clear).to eq redis_cache
+      expect(cache.clear).to eq cache
     end
 
     it 'can iterate over keys under a prefix' do
       expect(redis).to receive(:scan_each).with(match: 'test-*')
-      redis_cache.to_a
+      cache.to_a
     end
 
     it 'can compute prefix with pre' do
-      expect(redis_cache.pre('foo')).to eq 'test-foo'
+      expect(cache.pre('foo')).to eq 'test-foo'
     end
 
     it 'can remove prefix with unpre' do
-      expect(redis_cache.unpre('test-foo')).to eq 'foo'
+      expect(cache.unpre('test-foo')).to eq 'foo'
     end
   end
 end

data/spec/ollama/utils/fetcher_spec.rb

@@ -56,7 +56,8 @@ RSpec.describe Ollama::Utils::Fetcher do
       with(headers: fetcher.headers).
       to_return(status: 500)
     fetcher.get(url) do |tmp|
-      expect(tmp).to be_nil
+      expect(tmp).to be_a StringIO
+      expect(tmp.read).to eq ''
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ollama-ruby
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-15 00:00:00.000000000 Z
+date: 2024-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -66,6 +66,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: debug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
@@ -303,8 +331,10 @@ extra_rdoc_files:
 - lib/ollama/commands/show.rb
 - lib/ollama/commands/tags.rb
 - lib/ollama/documents.rb
-- lib/ollama/documents/memory_cache.rb
-- lib/ollama/documents/redis_cache.rb
+- lib/ollama/documents/cache/common.rb
+- lib/ollama/documents/cache/memory_cache.rb
+- lib/ollama/documents/cache/redis_backed_memory_cache.rb
+- lib/ollama/documents/cache/redis_cache.rb
 - lib/ollama/documents/splitters/character.rb
 - lib/ollama/documents/splitters/semantic.rb
 - lib/ollama/dto.rb
@@ -367,8 +397,10 @@ files:
 - lib/ollama/commands/show.rb
 - lib/ollama/commands/tags.rb
 - lib/ollama/documents.rb
-- lib/ollama/documents/memory_cache.rb
-- lib/ollama/documents/redis_cache.rb
+- lib/ollama/documents/cache/common.rb
+- lib/ollama/documents/cache/memory_cache.rb
+- lib/ollama/documents/cache/redis_backed_memory_cache.rb
+- lib/ollama/documents/cache/redis_cache.rb
 - lib/ollama/documents/splitters/character.rb
 - lib/ollama/documents/splitters/semantic.rb
 - lib/ollama/dto.rb
@@ -420,6 +452,7 @@ files:
 - spec/ollama/commands/show_spec.rb
 - spec/ollama/commands/tags_spec.rb
 - spec/ollama/documents/memory_cache_spec.rb
+- spec/ollama/documents/redis_backed_memory_cache_spec.rb
 - spec/ollama/documents/redis_cache_spec.rb
 - spec/ollama/documents/splitters/character_spec.rb
 - spec/ollama/documents/splitters/semantic_spec.rb
@@ -486,6 +519,7 @@ test_files:
 - spec/ollama/commands/show_spec.rb
 - spec/ollama/commands/tags_spec.rb
 - spec/ollama/documents/memory_cache_spec.rb
+- spec/ollama/documents/redis_backed_memory_cache_spec.rb
 - spec/ollama/documents/redis_cache_spec.rb
 - spec/ollama/documents/splitters/character_spec.rb
 - spec/ollama/documents/splitters/semantic_spec.rb