ollama-ruby 0.4.0 → 0.6.0

data/spec/ollama/documents/splitters/character_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 RSpec.describe Ollama::Documents::Splitters::Character do
   let :splitter do
-    described_class.new chunk_size: 23
+    described_class.new chunk_size: 23, combining_string: ''
   end
 
   it 'can be instantiated' do
@@ -10,29 +10,41 @@ RSpec.describe Ollama::Documents::Splitters::Character do
   end
 
   it 'can split' do
-    text = [ "A" * 10 ] * 10 * "\n\n"
+    text = [ ?A * 10 ] * 10 * "\n\n"
     result = splitter.split(text)
     expect(result.count).to eq 5
     expect(result.to_a.join('')).to eq ?A * 100
   end
 
+  it 'can split combining with separation' do
+    splitter = described_class.new chunk_size: 25, include_separator: false,
+      combining_string: ?X
+    text = [ ?A * 10 ] * 10 * "\n\n"
+    result = splitter.split(text)
+    expect(result.count).to eq 5
+    expect(result.to_a.join(?B)).to eq\
+      "AAAAAAAAAAXAAAAAAAAAAXBAAAAAAAAAAAAAAAAAAAAXBAAAAAAAAAAAAAAAAAAAAXB"\
+      "AAAAAAAAAAAAAAAAAAAAXBAAAAAAAAAAAAAAAAAAAAX"
+  end
+
   it 'can split including separator' do
-    splitter = described_class.new chunk_size: 25, include_separator: true
-    text = [ "A" * 10 ] * 10 * "\n\n"
+    splitter = described_class.new chunk_size: 25, include_separator: true,
+      combining_string: ''
+    text = [ ?A * 10 ] * 10 * "\n\n"
     result = splitter.split(text)
     expect(result.count).to eq 5
     expect(result.to_a.join('')).to eq text
   end
 
   it 'cannot split' do
-    text = [ "A" * 10 ] * 10 * "\n"
+    text = [ ?A * 10 ] * 10 * "\n"
     result = splitter.split(text)
     expect(result.count).to eq 1
     expect(result.to_a.join('').count(?A)).to eq text.count(?A)
   end
 
   it 'cannot split2' do
-    text = "A" * 25
+    text = ?A * 25
     result = splitter.split(text)
     expect(result.count).to eq 1
     expect(result.to_a.join('')).to eq ?A * 25
@@ -48,7 +60,7 @@ end
 
 RSpec.describe Ollama::Documents::Splitters::RecursiveCharacter do
   let :splitter do
-    described_class.new chunk_size: 23
+    described_class.new chunk_size: 23, combining_string: ''
   end
 
   it 'can be instantiated' do
@@ -56,7 +68,7 @@ RSpec.describe Ollama::Documents::Splitters::RecursiveCharacter do
   end
 
   it 'can split' do
-    text = [ "A" * 10 ] * 10 * "\n\n"
+    text = [ ?A * 10 ] * 10 * "\n\n"
     result = splitter.split(text)
     expect(result.count).to eq 5
     expect(result.to_a.join('')).to eq ?A * 100
@@ -65,30 +77,32 @@ RSpec.describe Ollama::Documents::Splitters::RecursiveCharacter do
   it 'cannot split' do
     splitter = described_class.new chunk_size: 23, include_separator: true,
       separators: described_class::DEFAULT_SEPARATORS[0..-2]
-    text = "A" * 25
+    text = ?A * 25
     result = splitter.split(text)
     expect(result.count).to eq 1
     expect(result.to_a.join('')).to eq ?A * 25
   end
 
   it 'can split including separator' do
-    splitter = described_class.new chunk_size: 25, include_separator: true
-    text = [ "A" * 10 ] * 10 * "\n\n"
+    splitter = described_class.new chunk_size: 25, include_separator: true,
+      combining_string: ''
+    text = [ ?A * 10 ] * 10 * "\n\n"
     result = splitter.split(text)
     expect(result.count).to eq 5
     expect(result.to_a.join('')).to eq text
   end
 
   it 'can split single newline as well' do
-    text = [ "A" * 10 ] * 10 * "\n"
+    text = [ ?A * 10 ] * 10 * "\n"
     result = splitter.split(text)
     expect(result.count).to eq 5
     expect(result.to_a.join('')).to eq ?A * 100
   end
 
   it 'can split single newline as well including separator' do
-    splitter = described_class.new chunk_size: 25, include_separator: true
-    text = [ "A" * 10 ] * 10 * "\n"
+    splitter = described_class.new chunk_size: 25, include_separator: true,
+      combining_string: ''
+    text = [ ?A * 10 ] * 10 * "\n"
     result = splitter.split(text)
     expect(result.count).to eq 5
     expect(result.to_a.join('')).to eq text

data/spec/ollama/utils/cache_fetcher_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+
+RSpec.describe Ollama::Utils::CacheFetcher do
+  let :url do
+    'https://www.example.com/hello'
+  end
+
+  let :cache do
+    double('RedisCache')
+  end
+
+  let :fetcher do
+    described_class.new(cache).expose
+  end
+
+  it 'can be instantiated' do
+    expect(fetcher).to be_a described_class
+  end
+
+  it 'has #get' do
+    expect(cache).to receive(:[]).with('body-69ce405ab83f42dffa9fd22bbd47783f').and_return 'world'
+    expect(cache).to receive(:[]).with('content_type-69ce405ab83f42dffa9fd22bbd47783f').and_return 'text/plain'
+    yielded_io = nil
+    block = -> io { yielded_io = io }
+    fetcher.get(url, &block)
+    expect(yielded_io).to be_a StringIO
+    expect(yielded_io.read).to eq 'world'
+  end
+
+  it '#get needs block' do
+    expect { fetcher.get(url) }.to raise_error(ArgumentError)
+  end
+
+  it 'has #put' do
+    io = StringIO.new('world')
+    io.extend(Ollama::Utils::Fetcher::ContentType)
+    io.content_type = MIME::Types['text/plain'].first
+    expect(cache).to receive(:[]=).with('body-69ce405ab83f42dffa9fd22bbd47783f', 'world')
+    expect(cache).to receive(:[]=).with('content_type-69ce405ab83f42dffa9fd22bbd47783f', 'text/plain')
+    fetcher.put(url, io)
+  end
+end

data/spec/ollama/utils/fetcher_spec.rb

@@ -6,7 +6,7 @@ RSpec.describe Ollama::Utils::Fetcher do
   end
 
   let :fetcher do
-    described_class.new
+    described_class.new.expose
   end
 
   it 'can be instantiated' do
@@ -33,6 +33,28 @@ RSpec.describe Ollama::Utils::Fetcher do
     end
   end
 
+  it 'can #get without ssl peer verification' do
+    fetcher = described_class.new(
+      http_options: { ssl_verify_peer: false }
+    ).expose
+    stub_request(:get, 'https://www.example.com/hello').
+      with(headers: fetcher.headers).
+      to_return(
+        status: 200,
+        body: 'world',
+        headers: { 'Content-Type' => 'text/plain' },
+      )
+    expect(Excon).to receive(:new).with(
+      'https://www.example.com/hello',
+      hash_including(ssl_verify_peer: false)
+    ).and_call_original
+    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).
@@ -58,6 +80,7 @@ RSpec.describe Ollama::Utils::Fetcher do
     fetcher.get(url) do |tmp|
       expect(tmp).to be_a StringIO
       expect(tmp.read).to eq ''
+      expect(tmp.content_type).to eq 'text/plain'
     end
   end
 
@@ -72,4 +95,21 @@ RSpec.describe Ollama::Utils::Fetcher do
       expect(file.content_type).to eq 'application/x-ruby'
     end
   end
+
+  it 'can .execute' do
+    described_class.execute('echo -n hello world') do |file|
+      expect(file).to be_a Tempfile
+      expect(file.read).to eq 'hello world'
+      expect(file.content_type).to eq 'text/plain'
+    end
+  end
+
+  it 'can .execute and fail' do
+    allow(IO).to receive(:popen).and_raise StandardError
+    described_class.execute('foobar') do |file|
+      expect(file).to be_a StringIO
+      expect(file.read).to be_empty
+      expect(file.content_type).to eq 'text/plain'
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ if ENV['START_SIMPLECOV'].to_i == 1
   end
 end
 require 'rspec'
+require 'tins/xt/expose'
 begin
   require 'debug'
 rescue LoadError

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ollama-ruby
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-21 00:00:00.000000000 Z
+date: 2024-09-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.17.1
+        version: 1.18.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.17.1
+        version: 1.18.0
 - !ruby/object:Gem::Dependency
   name: all_images
   requirement: !ruby/object:Gem::Requirement
@@ -304,6 +304,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: logger
+  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: json
+  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: xdg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.0'
 description: Library that allows interacting with the Ollama API
 email: flori@ping.de
 executables:
@@ -359,6 +401,7 @@ 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/cache_fetcher.rb
 - lib/ollama/utils/chooser.rb
 - lib/ollama/utils/colorize_texts.rb
 - lib/ollama/utils/fetcher.rb
@@ -425,6 +468,7 @@ files:
 - lib/ollama/tool/function/parameters.rb
 - lib/ollama/tool/function/parameters/property.rb
 - lib/ollama/utils/ansi_markdown.rb
+- lib/ollama/utils/cache_fetcher.rb
 - lib/ollama/utils/chooser.rb
 - lib/ollama/utils/colorize_texts.rb
 - lib/ollama/utils/fetcher.rb
@@ -471,6 +515,7 @@ files:
 - spec/ollama/options_spec.rb
 - spec/ollama/tool_spec.rb
 - spec/ollama/utils/ansi_markdown_spec.rb
+- spec/ollama/utils/cache_fetcher_spec.rb
 - spec/ollama/utils/fetcher_spec.rb
 - spec/ollama/utils/file_argument_spec.rb
 - spec/ollama/utils/tags_spec.rb
@@ -538,6 +583,7 @@ test_files:
 - spec/ollama/options_spec.rb
 - spec/ollama/tool_spec.rb
 - spec/ollama/utils/ansi_markdown_spec.rb
+- spec/ollama/utils/cache_fetcher_spec.rb
 - spec/ollama/utils/fetcher_spec.rb
 - spec/ollama/utils/file_argument_spec.rb
 - spec/ollama/utils/tags_spec.rb