ollama-ruby 0.11.0 → 0.12.1

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

@@ -0,0 +1,215 @@
+require 'ollama/documents/cache/common'
+require 'sqlite3'
+require 'sqlite_vec'
+require 'digest/md5'
+
+class Ollama::Documents::Cache::SQLiteCache
+  include Ollama::Documents::Cache::Common
+
+  def initialize(prefix:, embedding_length: 1_024, filename: ':memory:', debug: false)
+    super(prefix:)
+    @embedding_length = embedding_length
+    @filename         = filename
+    @debug            = debug
+    setup_database(filename)
+  end
+
+  attr_reader :filename # filename for the database, `:memory:` is in memory
+
+  attr_reader :embedding_length # length of the embeddings vector
+
+  def [](key)
+    result = execute(
+      %{
+        SELECT records.key, records.text, records.norm, records.source,
+          records.tags, embeddings.embedding
+        FROM records
+        INNER JOIN embeddings ON records.embedding_id = embeddings.rowid
+        WHERE records.key = ?
+      },
+      pre(key)
+    )&.first or return
+    key, text, norm, source, tags, embedding = *result
+    embedding = embedding.unpack("f*")
+    tags      = Ollama::Utils::Tags.new(JSON(tags.to_s).to_a, source:)
+    convert_value_to_record(key:, text:, norm:, source:, tags:, embedding:)
+  end
+
+  def []=(key, value)
+    value = convert_value_to_record(value)
+    embedding = value.embedding.pack("f*")
+    execute(%{BEGIN})
+    execute(%{INSERT INTO embeddings(embedding) VALUES(?)}, [ embedding ])
+    embedding_id, = execute(%{ SELECT last_insert_rowid() }).flatten
+    execute(%{
+      INSERT INTO records(key,text,embedding_id,norm,source,tags)
+      VALUES(?,?,?,?,?,?)
+    }, [ pre(key), value.text, embedding_id, value.norm, value.source, JSON(value.tags) ])
+    execute(%{COMMIT})
+  end
+
+  def key?(key)
+    execute(
+      %{ SELECT count(records.key) FROM records WHERE records.key = ? },
+      pre(key)
+    ).flatten.first == 1
+  end
+
+  def delete(key)
+    result = key?(key) ? pre(key) : nil
+    execute(
+      %{ DELETE FROM records WHERE records.key = ? },
+      pre(key)
+    )
+    result
+  end
+
+  def tags
+    result = Ollama::Utils::Tags.new
+    execute(%{
+        SELECT DISTINCT(tags) FROM records WHERE key LIKE ?
+      }, [ "#@prefix%" ]
+    ).flatten.each do
+      JSON(_1).each { |t| result.add(t) }
+    end
+    result
+  end
+
+  def size
+    execute(%{SELECT COUNT(*) FROM records WHERE key LIKE ?}, [ "#@prefix%" ]).flatten.first
+  end
+
+  def clear_for_tags(tags = nil)
+    tags = Ollama::Utils::Tags.new(tags).to_a
+    if tags.present?
+      records = find_records_for_tags(tags)
+      keys = '(%s)' % records.transpose.first.map { "'%s'" % quote(_1) }.join(?,)
+      execute(%{DELETE FROM records WHERE key IN #{keys}})
+    else
+      clear
+    end
+    self
+  end
+
+  def clear
+    execute(%{DELETE FROM records WHERE key LIKE ?}, [ "#@prefix%" ])
+    self
+  end
+
+  def each(prefix: "#@prefix%", &block)
+    execute(%{
+      SELECT records.key, records.text, records.norm, records.source,
+        records.tags, embeddings.embedding
+      FROM records
+      INNER JOIN embeddings ON records.embedding_id = embeddings.rowid
+      WHERE records.key LIKE ?
+    }, [ prefix ]).each do |key, text, norm, source, tags, embedding|
+      embedding = embedding.unpack("f*")
+      tags      = Ollama::Utils::Tags.new(JSON(tags.to_s).to_a, source:)
+      value     = convert_value_to_record(key:, text:, norm:, source:, tags:, embedding:)
+      block.(key, value)
+    end
+  end
+  include Enumerable
+
+  def full_each(&block)
+    each(prefix: ?%, &block)
+  end
+
+  def convert_to_vector(vector)
+    vector
+  end
+
+  def find_records_for_tags(tags)
+    if tags.present?
+      tags_filter = Ollama::Utils::Tags.new(tags).to_a
+      unless  tags_filter.empty?
+        tags_where  = ' AND (%s)' % tags_filter.map {
+          'tags LIKE "%%%s%%"' % quote(_1)
+        }.join(' OR ')
+      end
+    end
+    records = execute(%{
+      SELECT key, tags, embedding_id
+      FROM records
+      WHERE key LIKE ?#{tags_where}
+    }, [ "#@prefix%" ])
+    if tags_filter
+      records = records.select { |key, tags, embedding_id|
+        (tags_filter & JSON(tags.to_s).to_a).size >= 1
+      }
+    end
+    records
+  end
+
+  def find_records(needle, tags: nil, max_records: nil)
+    needle.size != @embedding_length and
+      raise ArgumentError, "needle embedding length != %s" % @embedding_length
+    needle_binary = needle.pack("f*")
+    max_records   = [ max_records, size, 4_096 ].compact.min
+    records = find_records_for_tags(tags)
+    rowids_where = '(%s)' % records.transpose.last&.join(?,)
+    execute(%{
+      SELECT records.key, records.text, records.norm, records.source,
+        records.tags, embeddings.embedding
+      FROM records
+      INNER JOIN embeddings ON records.embedding_id = embeddings.rowid
+      WHERE embeddings.rowid IN #{rowids_where}
+        AND embeddings.embedding MATCH ? AND embeddings.k = ?
+    }, [ needle_binary, max_records ]).map do |key, text, norm, source, tags, embedding|
+      key       = unpre(key)
+      embedding = embedding.unpack("f*")
+      tags      = Ollama::Utils::Tags.new(JSON(tags.to_s).to_a, source:)
+      convert_value_to_record(key:, text:, norm:, source:, tags:, embedding:)
+    end
+  end
+
+  private
+
+  def execute(*a)
+    if @debug
+      e = a[0].gsub(/^\s*\n/, '')
+      e = e.gsub(/\A\s+/, '')
+      n = $&.to_s.size
+      e = e.gsub(/^\s{0,#{n}}/, '')
+      e = e.chomp
+      STDERR.puts("EXPLANATION:\n%s\n%s" % [
+        e,
+        @database.execute("EXPLAIN #{e}", *a[1..-1]).pretty_inspect
+      ])
+    end
+    @database.execute(*a)
+  end
+
+  def quote(string)
+    SQLite3::Database.quote(string)
+  end
+
+  def setup_database(filename)
+    @database = SQLite3::Database.new(filename)
+    @database.enable_load_extension(true)
+    SqliteVec.load(@database)
+    @database.enable_load_extension(false)
+    execute %{
+      CREATE VIRTUAL TABLE IF NOT EXISTS embeddings USING vec0(
+        embedding float[#@embedding_length]
+      )
+    }
+    execute %{
+      CREATE TABLE IF NOT EXISTS records (
+        key          text NOT NULL PRIMARY KEY ON CONFLICT REPLACE,
+        text         text NOT NULL DEFAULT '',
+        embedding_id integer,
+        norm         float NOT NULL DEFAULT 0.0,
+        source       text,
+        tags         json NOT NULL DEFAULT [],
+        FOREIGN KEY(embedding_id) REFERENCES embeddings(id) ON DELETE CASCADE
+      )
+    }
+  end
+
+  def convert_value_to_record(value)
+    value.is_a?(Ollama::Documents::Record) and return value
+    Ollama::Documents::Record[value.to_hash]
+  end
+end

data/lib/ollama/documents/splitters/semantic.rb

@@ -21,6 +21,7 @@ module Ollama::Documents::Splitters
         e
       end
       infobar.newline
+      embeddings.size < 2 and return sentences
       distances = embeddings.each_cons(2).map do |a, b|
         1.0 - cosine_similarity(a:, b:)
       end

data/lib/ollama/documents.rb

@@ -4,11 +4,13 @@ require 'kramdown/ansi'
 
 class Ollama::Documents
 end
-class Ollama::Documents::Cache
+module Ollama::Documents::Cache
 end
+require 'ollama/documents/cache/records'
 require 'ollama/documents/cache/memory_cache'
 require 'ollama/documents/cache/redis_cache'
 require 'ollama/documents/cache/redis_backed_memory_cache'
+require 'ollama/documents/cache/sqlite_cache'
 module Ollama::Documents::Splitters
 end
 require 'ollama/documents/splitters/character'
@@ -16,32 +18,16 @@ require 'ollama/documents/splitters/semantic'
 
 class Ollama::Documents
   include Kramdown::ANSI::Width
+  include Ollama::Documents::Cache
 
-  class Record < JSON::GenericObject
-    def to_s
-      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, source:)
-    end
-
-    def ==(other)
-      text == other.text
-    end
+  Record = Class.new Ollama::Documents::Cache::Records::Record
 
-    alias inspect to_s
-  end
-
-  def initialize(ollama:, model:, model_options: nil, collection: nil, cache: MemoryCache, redis_url: nil, debug: false)
+  def initialize(ollama:, model:, model_options: nil, collection: nil, embedding_length: 1_024, cache: MemoryCache, database_filename: nil, 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)
-    @debug     = debug
+    @ollama, @model, @model_options, @collection, @debug =
+      ollama, model, model_options, collection.to_sym, debug
+    database_filename ||= ':memory:'
+    @cache = connect_cache(cache, redis_url, embedding_length, database_filename)
   end
 
   def default_collection
@@ -110,40 +96,19 @@ class Ollama::Documents
   end
 
   def clear(tags: nil)
-    if tags
-      tags = Ollama::Utils::Tags.new(Array(tags)).to_a
-      @cache.each do |key, record|
-        if (tags & record.tags).size >= 1
-          @cache.delete(@cache.unpre(key))
-        end
-      end
-    else
-      @cache.clear
-    end
+    @cache.clear(tags:)
     self
   end
 
-  def find(string, tags: nil, prompt: nil)
-    needle      = convert_to_vector(string, prompt:)
-    needle_norm = @cache.norm(needle)
-    records = @cache
-    if tags
-      tags = Ollama::Utils::Tags.new(tags).to_a
-      records = records.select { |_key, record| (tags & record.tags).size >= 1 }
-    end
-    records = records.sort_by { |key, record|
-      record.key        = key
-      record.similarity = @cache.cosine_similarity(
-        a: needle,
-        b: record.embedding,
-        a_norm: needle_norm,
-        b_norm: record.norm,
-      )
-    }
-    records.transpose.last&.reverse.to_a
+  def find(string, tags: nil, prompt: nil, max_records: nil)
+    needle = convert_to_vector(string, prompt:)
+    @cache.find_records(needle, tags:, max_records: nil)
   end
 
   def find_where(string, text_size: nil, text_count: nil, **opts)
+    if text_count
+      opts[:max_records] =  text_count
+    end
     records = find(string, **opts)
     size, count = 0, 0
     records.take_while do |record|
@@ -162,30 +127,38 @@ class Ollama::Documents
   end
 
   def 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
+    @cache.tags
   end
 
   private
 
-  def connect_cache(cache_class)
+  def connect_cache(cache_class, redis_url, embedding_length, database_filename)
     cache = nil
-    if cache_class.instance_method(:redis)
+    if (cache_class.instance_method(:redis) rescue nil)
       begin
-        cache = cache_class.new(prefix:, url: @redis_url, object_class: Record)
+        cache = cache_class.new(prefix:, url: redis_url, object_class: Record)
         cache.size
       rescue Redis::CannotConnectError
         STDERR.puts(
-          "Cannot connect to redis URL #{@redis_url.inspect}, "\
+          "Cannot connect to redis URL #{redis_url.inspect}, "\
           "falling back to MemoryCache."
         )
       end
+    elsif cache_class == SQLiteCache
+      cache = cache_class.new(
+        prefix:,
+        embedding_length:,
+        filename: database_filename,
+        debug: @debug
+      )
     end
   ensure
-    cache ||= MemoryCache.new(prefix:)
+    cache ||= MemoryCache.new(prefix:,)
+    cache.respond_to?(:find_records) or cache.extend(Records::FindRecords)
+    cache.extend(Records::Tags)
+    if cache.respond_to?(:redis)
+      cache.extend(Records::RedisFullEach)
+    end
     return cache
   end
 

data/lib/ollama/utils/chooser.rb

@@ -8,7 +8,21 @@ module Ollama::Utils::Chooser
 
   module_function
 
-  def choose(entries, prompt: 'Search? %s')
+  # The choose method presents a list of entries and prompts the user
+  # for input, allowing them to select one entry based on their input.
+  #
+  # @param entries [Array] the list of entries to present to the user
+  # @param prompt [String] the prompt message to display when asking for input (default: 'Search? %s')
+  # @param return_immediately [Boolean] whether to immediately return the first entry if there is only one or nil when there is none (default: false)
+  #
+  # @return [Object] the selected entry, or nil if no entry was chosen
+  #
+  # @example
+  #   choose(['entry1', 'entry2'], prompt: 'Choose an option:')
+  def choose(entries, prompt: 'Search? %s', return_immediately: false)
+    if return_immediately && entries.size <= 1
+      return entries.first
+    end
     entry = Search.new(
       prompt:,
       match: -> answer {

data/lib/ollama/utils/tags.rb

@@ -3,7 +3,7 @@ class Ollama::Utils::Tags
     include Term::ANSIColor
 
     def initialize(tag, source: nil)
-      super(tag.to_s)
+      super(tag.to_s.gsub(/\A#+/, ''))
       self.source = source
     end
 
@@ -26,6 +26,7 @@ class Ollama::Utils::Tags
   end
 
   def initialize(tags = [], source: nil)
+    tags = Array(tags)
     @set = []
     tags.each { |tag| add(tag, source:) }
   end

data/lib/ollama/version.rb

@@ -1,6 +1,6 @@
 module Ollama
   # Ollama version
-  VERSION         = '0.11.0'
+  VERSION         = '0.12.1'
   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,31 +1,31 @@
 # -*- encoding: utf-8 -*-
-# stub: ollama-ruby 0.11.0 ruby lib
+# stub: ollama-ruby 0.12.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama-ruby".freeze
-  s.version = "0.11.0".freeze
+  s.version = "0.12.1".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-11-20"
+  s.date = "2024-11-27"
   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/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/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/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/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/cache_fetcher_spec.rb".freeze, "spec/ollama/utils/colorize_texts_spec.rb".freeze, "spec/ollama/utils/fetcher_spec.rb".freeze, "spec/ollama/utils/file_argument_spec.rb".freeze, "spec/ollama/utils/tags_spec.rb".freeze, "spec/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/records.rb".freeze, "lib/ollama/documents/cache/redis_backed_memory_cache.rb".freeze, "lib/ollama/documents/cache/redis_cache.rb".freeze, "lib/ollama/documents/cache/sqlite_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/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/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/records.rb".freeze, "lib/ollama/documents/cache/redis_backed_memory_cache.rb".freeze, "lib/ollama/documents/cache/redis_cache.rb".freeze, "lib/ollama/documents/cache/sqlite_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/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/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/cache/memory_cache_spec.rb".freeze, "spec/ollama/documents/cache/redis_backed_memory_cache_spec.rb".freeze, "spec/ollama/documents/cache/redis_cache_spec.rb".freeze, "spec/ollama/documents/cache/sqlite_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/cache_fetcher_spec.rb".freeze, "spec/ollama/utils/colorize_texts_spec.rb".freeze, "spec/ollama/utils/fetcher_spec.rb".freeze, "spec/ollama/utils/file_argument_spec.rb".freeze, "spec/ollama/utils/tags_spec.rb".freeze, "spec/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.22".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/cache_fetcher_spec.rb".freeze, "spec/ollama/utils/colorize_texts_spec.rb".freeze, "spec/ollama/utils/fetcher_spec.rb".freeze, "spec/ollama/utils/file_argument_spec.rb".freeze, "spec/ollama/utils/tags_spec.rb".freeze, "spec/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/cache/memory_cache_spec.rb".freeze, "spec/ollama/documents/cache/redis_backed_memory_cache_spec.rb".freeze, "spec/ollama/documents/cache/redis_cache_spec.rb".freeze, "spec/ollama/documents/cache/sqlite_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/cache_fetcher_spec.rb".freeze, "spec/ollama/utils/colorize_texts_spec.rb".freeze, "spec/ollama/utils/fetcher_spec.rb".freeze, "spec/ollama/utils/file_argument_spec.rb".freeze, "spec/ollama/utils/tags_spec.rb".freeze, "spec/spec_helper.rb".freeze]
 
   s.specification_version = 4
 
   s.add_development_dependency(%q<gem_hadar>.freeze, ["~> 1.19".freeze])
-  s.add_development_dependency(%q<all_images>.freeze, ["~> 0.4".freeze])
+  s.add_development_dependency(%q<all_images>.freeze, ["~> 0.6".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])
@@ -48,4 +48,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<tins>.freeze, ["~> 1.34".freeze])
   s.add_runtime_dependency(%q<kramdown-ansi>.freeze, ["~> 0.0".freeze, ">= 0.0.1".freeze])
   s.add_runtime_dependency(%q<ostruct>.freeze, ["~> 0.0".freeze])
+  s.add_runtime_dependency(%q<sqlite-vec>.freeze, ["~> 0.0".freeze])
+  s.add_runtime_dependency(%q<sqlite3>.freeze, ["~> 2.0".freeze, ">= 2.0.1".freeze])
 end

data/spec/ollama/documents/{memory_cache_spec.rb → cache/memory_cache_spec.rb}

@@ -1,8 +1,12 @@
 require 'spec_helper'
 
 RSpec.describe Ollama::Documents::MemoryCache do
+  let :prefix do
+    'test-'
+  end
+
   let :cache do
-    described_class.new prefix: 'test-'
+    described_class.new prefix:
   end
 
   it 'can be instantiated' do
@@ -27,16 +31,46 @@ RSpec.describe Ollama::Documents::MemoryCache do
     }.from(false).to(true)
   end
 
+  it 'can set key with different prefixes' do
+    key, value = 'foo', { test: true }
+    expect {
+      cache[key] = value
+    }.to change {
+      cache.size
+    }.from(0).to(1)
+    cache2 = cache.dup
+    cache2.prefix = 'test2-'
+    expect {
+      cache2[key] = value
+    }.to change {
+      cache2.size
+    }.from(0).to(1)
+    expect(cache.size).to eq 1
+    s = 0
+    cache.full_each { s += 1 }
+    expect(s).to eq 2
+  end
+
   it 'can delete' do
     key, value = 'foo', { test: true }
+    expect(cache.delete(key)).to be_falsy
     cache[key] = value
     expect {
-      cache.delete(key)
+      expect(cache.delete(key)).to be_truthy
     }.to change {
       cache.key?(key)
     }.from(true).to(false)
   end
 
+  it 'can iterate over keys, values' do
+    key, value = 'foo', { test: true }
+    cache[key] = value
+    cache.each do |k, v|
+      expect(k).to eq prefix + key
+      expect(v).to eq value
+    end
+  end
+
   it 'returns size' do
     key, value = 'foo', { test: true }
     expect {
@@ -58,6 +92,6 @@ RSpec.describe Ollama::Documents::MemoryCache do
 
   it 'can iterate over keys under a prefix' do
     cache['foo'] = 'bar'
-    expect(cache.to_a).to eq [ %w[ test-foo bar ] ]
+    expect(cache.to_a).to eq [ %W[ #{prefix}foo bar ] ]
   end
 end

data/spec/ollama/documents/{redis_backed_memory_cache_spec.rb → cache/redis_backed_memory_cache_spec.rb}

@@ -1,17 +1,21 @@
 require 'spec_helper'
 
 RSpec.describe Ollama::Documents::RedisBackedMemoryCache do
+  let :prefix do
+    'test-'
+  end
+
+  let :cache do
+    described_class.new prefix: 'test-', url: 'something'
+  end
+
   it 'raises ArgumentError if url is missing' do
     expect {
-      described_class.new prefix: 'test-', url: nil
+      described_class.new prefix:, 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
@@ -31,12 +35,10 @@ RSpec.describe Ollama::Documents::RedisBackedMemoryCache do
     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 'defaults to nil object_class' do
-      cache = described_class.new prefix: 'test-', url: 'something'
       expect(cache.object_class).to be_nil
     end
 
@@ -77,6 +79,16 @@ RSpec.describe Ollama::Documents::RedisBackedMemoryCache do
       cache.delete(key)
     end
 
+    it 'can iterate over keys, values' do
+      key, value = 'foo', { 'test' => true }
+      expect(redis).to receive(:set).with('test-' + key, JSON(value))
+      cache[key] = value
+      cache.each do |k, v|
+        expect(k).to eq prefix + key
+        expect(v).to eq value
+      end
+    end
+
     it 'returns size' do
       expect(cache).to receive(:count).and_return 3
       expect(cache.size).to eq 3