ollama-ruby 0.11.0 → 0.12.1

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

@@ -1,33 +1,35 @@
 require 'spec_helper'
 
 RSpec.describe Ollama::Documents::RedisCache do
+  let :prefix do
+    'test-'
+  end
+
+  let :cache do
+    described_class.new prefix:, url: 'something'
+  end
+
   it 'can be instantiated' 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
 
   it 'can be configured with object_class' do
     object_class = Class.new(JSON::GenericObject)
-    cache = described_class.new(prefix: 'test-', url: 'something', object_class:)
+    cache = described_class.new(prefix:, url: 'something', object_class:)
     expect(cache.object_class).to eq object_class
   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 :redis do
       double('Redis')
     end
@@ -42,43 +44,56 @@ RSpec.describe Ollama::Documents::RedisCache do
 
     it 'can get a key' do
       key = 'foo'
-      expect(redis).to receive(:get).with('test-' + key).and_return '"some_json"'
+      expect(redis).to receive(:get).with(prefix + 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), ex: nil)
+      expect(redis).to receive(:set).with(prefix + key, JSON(value), ex: nil)
       cache[key] = value
     end
 
     it 'can set a value for a key with ttl' do
-      cache = described_class.new prefix: 'test-', url: 'something', ex: 3_600
+      cache = described_class.new prefix:, url: 'something', ex: 3_600
       key, value = 'foo', { test: true }
-      expect(redis).to receive(:set).with('test-' + key, JSON(value), ex: 3_600)
+      expect(redis).to receive(:set).with(prefix + key, JSON(value), ex: 3_600)
       cache[key] = value
-      expect(redis).to receive(:ttl).with('test-' + key).and_return 3_600
+      expect(redis).to receive(:ttl).with(prefix + key).and_return 3_600
       expect(cache.ttl(key)).to eq 3_600
     end
 
     it 'can determine if key exists' do
       key = 'foo'
-      expect(redis).to receive(:exists?).with('test-' + key).and_return(false, true)
+      expect(redis).to receive(:exists?).with(prefix + 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(redis).to receive(:del).with('test-' + key)
+      expect(redis).to receive(:del).with(prefix + key)
       cache.delete(key)
     end
 
+    it 'can iterate over keys, values' do
+      key, value = 'foo', { 'test' => true }
+      expect(redis).to receive(:set).with(prefix + key, JSON(value), ex: nil)
+      cache[key] = value
+      expect(redis).to receive(:scan_each).with(match: "#{prefix}*").
+        and_yield("#{prefix}foo")
+      expect(redis).to receive(:get).with(prefix + key).and_return(JSON(test: true))
+      cache.each do |k, v|
+        expect(k).to eq prefix + key
+        expect(v).to eq value
+      end
+    end
+
     it 'returns size' do
-      allow(redis).to receive(:scan_each).with(match: 'test-*').
-        and_yield('test-foo').
-        and_yield('test-bar').
-        and_yield('test-baz')
+      expect(redis).to receive(:scan_each).with(match: "#{prefix}*").
+        and_yield("#{prefix}foo").
+        and_yield("#{prefix}bar").
+        and_yield("#{prefix}baz")
       expect(cache.size).to eq 3
     end
 

data/spec/ollama/documents/cache/sqlite_cache_spec.rb

@@ -0,0 +1,141 @@
+require 'spec_helper'
+
+RSpec.describe Ollama::Documents::SQLiteCache do
+  let :prefix do
+    'test-'
+  end
+
+  let :test_value do
+    {
+      key:       'test',
+      text:      'test text',
+      norm:      0.5,
+      source:    'for-test.txt',
+      tags:      %w[ test ],
+      embedding: [ 0.5 ] * 1_024,
+    }
+  end
+
+  let :cache do
+    described_class.new prefix:
+  end
+
+  it 'can be instantiated' do
+    expect(cache).to be_a described_class
+  end
+
+  it 'defaults to :memory: mode' do
+    expect(cache.filename).to eq ':memory:'
+  end
+
+  it 'can be switchted to file mode' do
+    expect(SQLite3::Database).to receive(:new).with('foo.sqlite').
+      and_return(double.as_null_object)
+    cache = described_class.new prefix:, filename: 'foo.sqlite'
+    expect(cache.filename).to eq 'foo.sqlite'
+  end
+
+  it 'can get/set a key' do
+    key, value = 'foo', test_value
+    queried_value = nil
+    expect {
+      cache[key] = value
+    }.to change {
+      queried_value = cache[key]
+    }.from(nil).to(Ollama::Documents::Record[value])
+    expect(queried_value.embedding).to eq [ 0.5 ] * 1_024
+  end
+
+  it 'can determine if key exists' do
+    key, value = 'foo', test_value
+    expect {
+      cache[key] = value
+    }.to change {
+      cache.key?(key)
+    }.from(false).to(true)
+  end
+
+  it 'can set key with different prefixes' do
+    key, value = 'foo', test_value
+    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_value
+    expect(cache.delete(key)).to be_falsy
+    cache[key] = value
+    expect {
+      expect(cache.delete(key)).to be_truthy
+    }.to change {
+      cache.key?(key)
+    }.from(true).to(false)
+  end
+
+  it 'returns size' do
+    key, value = 'foo', test_value
+    expect {
+      cache[key] = value
+    }.to change {
+      cache.size
+    }.from(0).to(1)
+  end
+
+  it 'can convert_to_vector' do
+    vector = [ 23.0, 666.0 ]
+    expect(cache.convert_to_vector(vector)).to eq vector
+  end
+
+  it 'can clear' do
+    key, value = 'foo', { embedding: [ 0.5 ] * 1_024 }
+    cache[key] = value
+    expect {
+      expect(cache.clear).to eq cache
+    }.to change {
+      cache.size
+    }.from(1).to(0)
+  end
+
+  it 'can clear for tags' do
+    key, value = 'foo', { tags: %w[ foo ], embedding: [ 0.5 ] * 1_024 }
+    cache[key] = value
+    key, value = 'bar', { embedding: [ 0.5 ] * 1_024 }
+    cache[key] = value
+    expect {
+      expect(cache.clear_for_tags(%w[ #foo ])).to eq cache
+    }.to change {
+      cache.size
+    }.from(2).to(1)
+    expect(cache).not_to be_key 'foo'
+    expect(cache).to be_key 'bar'
+  end
+
+  it 'can return tags' do
+    key, value = 'foo', { tags: %w[ foo ], embedding: [ 0.5 ] * 1_024 }
+    cache[key] = value
+    key, value = 'bar', { tags: %w[ bar baz ], embedding: [ 0.5 ] * 1_024 }
+    cache[key] = value
+    tags = cache.tags
+    expect(tags).to be_a Ollama::Utils::Tags
+    expect(tags.to_a).to eq %w[ bar baz foo ]
+  end
+
+  it 'can iterate over keys under a prefix' do
+    cache['foo'] = test_value
+    expect(cache.to_a).to eq [ [ 'test-foo', Ollama::Documents::Record[test_value] ] ]
+  end
+end

data/spec/ollama/utils/tags_spec.rb

@@ -10,6 +10,11 @@ RSpec.describe Ollama::Utils::Tags do
     expect(tags.to_a).to eq %w[ bar foo ]
   end
 
+  it 'can contain unique tags with leading # characters and is sorted' do
+    tags = described_class.new(%w[ #bar ##foo ])
+    expect(tags.to_a).to eq %w[ bar foo ]
+  end
+
   it 'tags can be added to it' do
     tags = described_class.new([ 'foo' ])
     tags.add 'bar'
@@ -27,13 +32,13 @@ RSpec.describe Ollama::Utils::Tags do
     expect { tags.clear }.to change { tags.size }.from(2).to(0)
   end
 
-  it 'tags can be empt' do
+  it 'tags can be empty' do
     tags = described_class.new([ 'foo' ])
     expect { tags.clear }.to change { tags.empty? }.from(false).to(true)
   end
 
   it 'can be output nicely' do
-    expect(described_class.new(%w[ foo bar ]).to_s).to eq '#bar #foo'
+    expect(described_class.new(%w[ #foo bar ]).to_s).to eq '#bar #foo'
   end
 
   it 'can be output nicely with links to source' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ollama-ruby
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-20 00:00:00.000000000 Z
+date: 2024-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -358,6 +358,40 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
+- !ruby/object:Gem::Dependency
+  name: sqlite-vec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.1
 description: Library that allows interacting with the Ollama API
 email: flori@ping.de
 executables:
@@ -387,8 +421,10 @@ extra_rdoc_files:
 - lib/ollama/documents.rb
 - lib/ollama/documents/cache/common.rb
 - lib/ollama/documents/cache/memory_cache.rb
+- lib/ollama/documents/cache/records.rb
 - lib/ollama/documents/cache/redis_backed_memory_cache.rb
 - lib/ollama/documents/cache/redis_cache.rb
+- lib/ollama/documents/cache/sqlite_cache.rb
 - lib/ollama/documents/splitters/character.rb
 - lib/ollama/documents/splitters/semantic.rb
 - lib/ollama/dto.rb
@@ -452,8 +488,10 @@ files:
 - lib/ollama/documents.rb
 - lib/ollama/documents/cache/common.rb
 - lib/ollama/documents/cache/memory_cache.rb
+- lib/ollama/documents/cache/records.rb
 - lib/ollama/documents/cache/redis_backed_memory_cache.rb
 - lib/ollama/documents/cache/redis_cache.rb
+- lib/ollama/documents/cache/sqlite_cache.rb
 - lib/ollama/documents/splitters/character.rb
 - lib/ollama/documents/splitters/semantic.rb
 - lib/ollama/dto.rb
@@ -503,9 +541,10 @@ files:
 - spec/ollama/commands/push_spec.rb
 - 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/cache/memory_cache_spec.rb
+- spec/ollama/documents/cache/redis_backed_memory_cache_spec.rb
+- spec/ollama/documents/cache/redis_cache_spec.rb
+- spec/ollama/documents/cache/sqlite_cache_spec.rb
 - spec/ollama/documents/splitters/character_spec.rb
 - spec/ollama/documents/splitters/semantic_spec.rb
 - spec/ollama/documents_spec.rb
@@ -571,9 +610,10 @@ test_files:
 - spec/ollama/commands/push_spec.rb
 - 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/cache/memory_cache_spec.rb
+- spec/ollama/documents/cache/redis_backed_memory_cache_spec.rb
+- spec/ollama/documents/cache/redis_cache_spec.rb
+- spec/ollama/documents/cache/sqlite_cache_spec.rb
 - spec/ollama/documents/splitters/character_spec.rb
 - spec/ollama/documents/splitters/semantic_spec.rb
 - spec/ollama/documents_spec.rb