ollama-ruby 0.0.1 → 0.1.0

data/spec/ollama/documents_spec.rb

@@ -0,0 +1,119 @@
+require 'spec_helper'
+
+RSpec.describe Ollama::Documents do
+  let :ollama do
+    double('Ollama::Client')
+  end
+
+  let :model do
+    'mxbai-embed-large'
+  end
+
+  let :documents do
+    described_class.new ollama:, model:
+  end
+
+  it 'can be instantiated' do
+    expect(documents).to be_a described_class
+  end
+
+  it 'no texts can be added to it' do
+    expect(documents.add([])).to eq documents
+  end
+
+  it 'texts can be added to it' do
+    expect(ollama).to receive(:embed).
+      with(model:, input: %w[ foo bar ], options: nil).
+      and_return(double(embeddings: [ [ 0.1 ], [ 0.2 ] ]))
+    expect(documents.add(%w[ foo bar ])).to eq documents
+    expect(documents.exist?('foo')).to eq true
+    expect(documents.exist?('bar')).to eq true
+    expect(documents['foo']).to be_a Ollama::Documents::Record
+  end
+
+  it 'a text can be added to it' do
+    expect(ollama).to receive(:embed).
+      with(model:, input: %w[ foo ], options: nil).
+      and_return(double(embeddings: [ [ 0.1 ] ]))
+    expect(documents << 'foo').to eq documents
+    expect(documents.exist?('foo')).to eq true
+    expect(documents.exist?('bar')).to eq false
+    expect(documents['foo']).to be_a Ollama::Documents::Record
+  end
+
+  it 'can find strings' do
+    allow(ollama).to receive(:embed).
+      with(model:, input: [ 'foo' ], options: nil).
+      and_return(double(embeddings: [ [ 0.1 ] ]))
+    expect(documents << 'foo').to eq documents
+    expect(ollama).to receive(:embed).
+      with(model:, input: 'foo', options: nil).
+      and_return(double(embeddings: [ [ 0.1 ] ]))
+    records = documents.find('foo')
+    expect(records).to eq [
+      Ollama::Documents::Record[text: 'foo', embedding: [ 0.1 ], similarity: 1.0 ]
+    ]
+    expect(records[0].to_s).to eq '#<Ollama::Documents::Record "foo" 1.0>'
+  end
+
+  it 'can find only tagged strings' do
+    allow(ollama).to receive(:embed).
+      with(model:, input: [ 'foo' ], options: nil).
+      and_return(double(embeddings: [ [ 0.1 ] ]))
+    expect(documents.add('foo', tags: %i[ test ])).to eq documents
+    expect(ollama).to receive(:embed).
+      with(model:, input: 'foo', options: nil).
+      and_return(double(embeddings: [ [ 0.1 ] ]))
+    records = documents.find('foo', tags: %i[ nix ])
+    expect(records).to eq []
+    expect(ollama).to receive(:embed).
+      with(model:, input: 'foo', options: nil).
+      and_return(double(embeddings: [ [ 0.1 ] ]))
+    records = documents.find('foo', tags: %i[ test ])
+    expect(records).to eq [
+      Ollama::Documents::Record[text: 'foo', embedding: [ 0.1 ], similarity: 1.0 ]
+    ]
+    expect(records[0].to_s).to eq '#<Ollama::Documents::Record "foo" #test 1.0>'
+  end
+
+  context 'it uses cache' do
+    before do
+      allow(ollama).to receive(:embed).
+        with(model:, input: %w[ foo ], options: nil).
+        and_return(double(embeddings: [ [ 0.1 ] ]))
+    end
+
+    it 'can delete texts' do
+      expect(documents << 'foo').to eq documents
+      expect {
+        documents.delete('foo')
+      }.to change { documents.exist?('foo') }.from(true).to(false)
+    end
+
+    it 'tracks size' do
+      expect {
+        expect(documents << 'foo').to eq documents
+      }.to change { documents.size }.from(0).to(1)
+    end
+
+    it 'can clear texts' do
+      expect(documents << 'foo').to eq documents
+      expect {
+        documents.clear
+      }.to change { documents.size }.from(1).to(0)
+    end
+
+    it 'returns collections' do
+      expect(documents.collections).to eq [ :default ]
+    end
+
+    it 'can change collection' do
+      expect(documents.instance_eval { @cache }).to receive(:prefix=).
+        with(/#@collection/).and_call_original
+      expect { documents.collection = :new_collection }.
+        to change { documents.collection }.
+        from(:default).
+        to(:new_collection)
+    end
+  end
+end

data/spec/ollama/handlers/progress_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe Ollama::Handlers::Progress do
   end
 
   it 'can display progress' do
-    response = double('response', status: 'testing', completed: 23, total: 666)
+    response = double('response', status: 'testing', completed: 23, total: 666, error: nil)
     expect(infobar.counter).to receive(:progress).with(by: 23).and_call_original
     expect(infobar.display).to receive(:update).and_call_original
     described_class.new.call(response)
@@ -16,7 +16,7 @@ RSpec.describe Ollama::Handlers::Progress do
   it 'can display errors in progress' do
     response = double('response', error: 'foo', status: nil, completed: nil, total: nil)
     progress = described_class.new
-    expect(progress.output).to receive(:puts).with(/Error: .*foo/)
+    expect(infobar).to receive(:puts).with(/Error: .*foo/)
     progress.call(response)
   end
 end

data/spec/ollama/image_spec.rb

@@ -20,4 +20,8 @@ RSpec.describe Ollama::Image do
     expect(image.to_s.sum).to eq 42460
     expect(image.to_s[0, 40]).to eq '/9j/4AAQSkZJRgABAQAASABIAAD/4QBYRXhpZgAA'
   end
+
+  it 'tracks path of file' do
+    expect(image.path).to eq asset('kitten.jpg')
+  end
 end

data/spec/ollama/utils/fetcher_spec.rb

@@ -0,0 +1,74 @@
+require 'spec_helper'
+
+RSpec.describe Ollama::Utils::Fetcher do
+  let :url do
+    'https://www.example.com/hello'
+  end
+
+  let :fetcher do
+    described_class.new
+  end
+
+  it 'can be instantiated' do
+    expect(fetcher).to be_a described_class
+  end
+
+  it 'has .get' do
+    expect(described_class).to receive(:new).and_return double(get: true)
+    described_class.get(url)
+  end
+
+  it 'can #get with streaming' do
+    stub_request(:get, 'https://www.example.com/hello').
+      with(headers: fetcher.headers).
+      to_return(
+        status: 200,
+        body: 'world',
+        headers: { 'Content-Type' => 'text/plain' },
+      )
+    fetcher.get(url) do |tmp|
+      expect(tmp).to be_a Tempfile
+      expect(tmp.read).to eq 'world'
+      expect(tmp.content_type).to eq 'text/plain'
+    end
+  end
+
+  it 'can #get and fallback from streaming' do
+    stub_request(:get, 'https://www.example.com/hello').
+      with(headers: fetcher.headers).
+      to_return(
+        { status: 501 },
+        {
+          status: 200,
+          body: 'world',
+          headers: { 'Content-Type' => 'text/plain' },
+        }
+      )
+    fetcher.get(url) do |tmp|
+      expect(tmp).to be_a Tempfile
+      expect(tmp.read).to eq 'world'
+      expect(tmp.content_type).to eq 'text/plain'
+    end
+  end
+
+  it 'can #get and finally fail' do
+    stub_request(:get, 'https://www.example.com/hello').
+      with(headers: fetcher.headers).
+      to_return(status: 500)
+    fetcher.get(url) do |tmp|
+      expect(tmp).to be_nil
+    end
+  end
+
+  it 'can redirect' do
+    expect(fetcher.middlewares).to include Excon::Middleware::RedirectFollower
+  end
+
+  it 'can .read' do
+    described_class.read(__FILE__) do |file|
+      expect(file).to be_a File
+      expect(file.read).to include 'can .read'
+      expect(file.content_type).to eq 'application/x-ruby'
+    end
+  end
+end

data/spec/ollama/utils/tags_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+RSpec.describe Ollama::Utils::Tags do
+  it 'can be instantiated' do
+    expect(described_class.new).to be_a described_class
+  end
+
+  it 'can contain unique tags and is sorted' do
+    tags = described_class.new([ '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'
+    expect(tags.to_a).to eq %w[ bar foo ]
+    tags.merge [ 'baz', 'baz2' ]
+    expect(tags.to_a).to eq %w[ bar baz baz2 foo ]
+  end
+
+  it 'can be output nicely' do
+    expect(described_class.new(%w[foo bar]).to_s).to eq '#bar #foo'
+  end
+end

data/spec/spec_helper.rb

@@ -9,8 +9,16 @@ begin
   require 'debug'
 rescue LoadError
 end
+require 'webmock/rspec'
+WebMock.disable_net_connect!
 require 'ollama'
 
 def asset(name)
   File.join(__dir__, 'assets', name)
 end
+
+RSpec.configure do |config|
+  config.before(:suite) do
+    infobar.show = nil
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ollama-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-16 00:00:00.000000000 Z
+date: 2024-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.1
+        version: 1.17.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.1
+        version: 1.17.0
 - !ruby/object:Gem::Dependency
   name: all_images
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  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
@@ -136,11 +150,138 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: numo-narray
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: more_math
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: sorted_set
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: reverse_markdown
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: complex_config
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.20'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.20'
+- !ruby/object:Gem::Dependency
+  name: search_ui
+  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: amatch
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.1
 description: Library that allows interacting with the Ollama API
 email: flori@ping.de
 executables:
 - ollama_console
 - ollama_chat
+- ollama_update
 extensions: []
 extra_rdoc_files:
 - README.md
@@ -160,6 +301,11 @@ extra_rdoc_files:
 - lib/ollama/commands/push.rb
 - 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/splitters/character.rb
+- lib/ollama/documents/splitters/semantic.rb
 - lib/ollama/dto.rb
 - lib/ollama/errors.rb
 - lib/ollama/handlers.rb
@@ -182,15 +328,24 @@ extra_rdoc_files:
 - lib/ollama/tool/function/parameters.rb
 - lib/ollama/tool/function/parameters/property.rb
 - lib/ollama/utils/ansi_markdown.rb
+- lib/ollama/utils/chooser.rb
+- lib/ollama/utils/colorize_texts.rb
+- lib/ollama/utils/fetcher.rb
+- lib/ollama/utils/math.rb
+- lib/ollama/utils/tags.rb
 - lib/ollama/utils/width.rb
 - lib/ollama/version.rb
 files:
+- ".envrc"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - bin/ollama_chat
 - bin/ollama_console
+- bin/ollama_update
+- config/redis.conf
+- docker-compose.yml
 - lib/ollama.rb
 - lib/ollama/client.rb
 - lib/ollama/client/command.rb
@@ -207,6 +362,11 @@ files:
 - lib/ollama/commands/push.rb
 - 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/splitters/character.rb
+- lib/ollama/documents/splitters/semantic.rb
 - lib/ollama/dto.rb
 - lib/ollama/errors.rb
 - lib/ollama/handlers.rb
@@ -229,9 +389,15 @@ files:
 - lib/ollama/tool/function/parameters.rb
 - lib/ollama/tool/function/parameters/property.rb
 - lib/ollama/utils/ansi_markdown.rb
+- lib/ollama/utils/chooser.rb
+- lib/ollama/utils/colorize_texts.rb
+- lib/ollama/utils/fetcher.rb
+- lib/ollama/utils/math.rb
+- lib/ollama/utils/tags.rb
 - lib/ollama/utils/width.rb
 - lib/ollama/version.rb
 - ollama-ruby.gemspec
+- spec/assets/embeddings.json
 - spec/assets/kitten.jpg
 - spec/ollama/client/doc_spec.rb
 - spec/ollama/client_spec.rb
@@ -247,6 +413,11 @@ 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_cache_spec.rb
+- spec/ollama/documents/splitters/character_spec.rb
+- spec/ollama/documents/splitters/semantic_spec.rb
+- spec/ollama/documents_spec.rb
 - spec/ollama/handlers/collector_spec.rb
 - spec/ollama/handlers/dump_json_spec.rb
 - spec/ollama/handlers/dump_yaml_spec.rb
@@ -261,6 +432,8 @@ files:
 - spec/ollama/options_spec.rb
 - spec/ollama/tool_spec.rb
 - spec/ollama/utils/ansi_markdown_spec.rb
+- spec/ollama/utils/fetcher_spec.rb
+- spec/ollama/utils/tags_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/flori/ollama-ruby
 licenses:
@@ -304,6 +477,11 @@ 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_cache_spec.rb
+- spec/ollama/documents/splitters/character_spec.rb
+- spec/ollama/documents/splitters/semantic_spec.rb
+- spec/ollama/documents_spec.rb
 - spec/ollama/handlers/collector_spec.rb
 - spec/ollama/handlers/dump_json_spec.rb
 - spec/ollama/handlers/dump_yaml_spec.rb
@@ -318,4 +496,6 @@ test_files:
 - spec/ollama/options_spec.rb
 - spec/ollama/tool_spec.rb
 - spec/ollama/utils/ansi_markdown_spec.rb
+- spec/ollama/utils/fetcher_spec.rb
+- spec/ollama/utils/tags_spec.rb
 - spec/spec_helper.rb