ollama-ruby 0.8.0 → 0.9.1

data/lib/ollama/utils/fetcher.rb

@@ -38,6 +38,13 @@ class Ollama::Utils::Fetcher
     end
   end
 
+  def self.normalize_url(url)
+    url = url.to_s
+    url = URI.decode_uri_component(url)
+    url = url.sub(/#.*/, '')
+    URI::Parser.new.escape(url).to_s
+  end
+
   def self.read(filename, &block)
     if File.exist?(filename)
       File.open(filename) do |file|
@@ -80,6 +87,7 @@ class Ollama::Utils::Fetcher
   private
 
   def excon(url, **options)
+    url = self.class.normalize_url(url)
     Excon.new(url, options.merge(@http_options))
   end
 

data/lib/ollama/version.rb

@@ -1,6 +1,6 @@
 module Ollama
   # Ollama version
-  VERSION         = '0.8.0'
+  VERSION         = '0.9.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,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: ollama-ruby 0.8.0 ruby lib
+# stub: ollama-ruby 0.9.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama-ruby".freeze
-  s.version = "0.8.0".freeze
+  s.version = "0.9.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-10-06"
+  s.date = "2024-10-19"
   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]
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
 
   s.specification_version = 4
 
-  s.add_development_dependency(%q<gem_hadar>.freeze, ["~> 1.18.0".freeze])
+  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<rspec>.freeze, ["~> 3.2".freeze])
   s.add_development_dependency(%q<webmock>.freeze, [">= 0".freeze])

data/spec/ollama/client_spec.rb

@@ -54,21 +54,21 @@ RSpec.describe Ollama::Client do
   end
 
   it 'can raise error on connection error' do
-    allow(excon).to receive(:post).and_raise Excon::Error::Socket
+    expect(excon).to receive(:post).and_raise Excon::Error::Socket
     expect {
       ollama.generate(model: 'llama3.1', prompt: 'Hello World')
     }.to raise_error(Ollama::Errors::SocketError)
   end
 
   it 'can raise error on timeout' do
-    allow(excon).to receive(:post).and_raise Excon::Errors::Timeout
+    expect(excon).to receive(:post).and_raise Excon::Errors::Timeout
     expect {
       ollama.generate(model: 'llama3.1', prompt: 'Hello World')
     }.to raise_error(Ollama::Errors::TimeoutError)
   end
 
   it 'can raise a generic error' do
-    allow(excon).to receive(:post).and_raise Excon::Errors::Error
+    expect(excon).to receive(:post).and_raise Excon::Errors::Error
     expect {
       ollama.generate(model: 'llama3.1', prompt: 'Hello World')
     }.to raise_error(Ollama::Errors::Error)

data/spec/ollama/documents/redis_backed_memory_cache_spec.rb

@@ -78,7 +78,7 @@ RSpec.describe Ollama::Documents::RedisBackedMemoryCache do
     end
 
     it 'returns size' do
-      allow(cache).to receive(:count).and_return 3
+      expect(cache).to receive(:count).and_return 3
       expect(cache.size).to eq 3
     end
 

data/spec/ollama/documents/redis_cache_spec.rb

@@ -57,7 +57,7 @@ RSpec.describe Ollama::Documents::RedisCache do
       key, value = 'foo', { test: true }
       expect(redis).to receive(:set).with('test-' + key, JSON(value), ex: 3_600)
       cache[key] = value
-      allow(redis).to receive(:ttl).with('test-' + key).and_return 3_600
+      expect(redis).to receive(:ttl).with('test-' + key).and_return 3_600
       expect(cache.ttl(key)).to eq 3_600
     end
 

data/spec/ollama/documents_spec.rb

@@ -42,7 +42,7 @@ RSpec.describe Ollama::Documents do
   end
 
   it 'can find strings' do
-    allow(ollama).to receive(:embed).
+    expect(ollama).to receive(:embed).
       with(model:, input: [ 'foo' ], options: nil).
       and_return(double(embeddings: [ [ 0.1 ] ]))
     expect(documents << 'foo').to eq documents
@@ -57,7 +57,7 @@ RSpec.describe Ollama::Documents do
   end
 
   it 'can find only tagged strings' do
-    allow(ollama).to receive(:embed).
+    expect(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
@@ -77,10 +77,10 @@ RSpec.describe Ollama::Documents do
   end
 
   it 'can find strings conditionally' do
-    allow(ollama).to receive(:embed).
+    expect(ollama).to receive(:embed).
       with(model:, input: [ 'foobar' ], options: nil).
       and_return(double(embeddings: [ [ 0.01 ] ]))
-    allow(ollama).to receive(:embed).
+    expect(ollama).to receive(:embed).
       with(model:, input: [ 'foo' ], options: nil).
       and_return(double(embeddings: [ [ 0.1 ] ]))
     expect(documents << 'foobar').to eq documents
@@ -132,7 +132,7 @@ RSpec.describe Ollama::Documents do
     end
 
     it 'can clear texts with tags' do
-      allow(ollama).to receive(:embed).
+      expect(ollama).to receive(:embed).
         with(model:, input: %w[ bar ], options: nil).
         and_return(double(embeddings: [ [ 0.1 ] ]))
       expect(documents.add('foo', tags: %i[ test ])).to eq documents

data/spec/ollama/handlers/markdown_spec.rb

@@ -25,7 +25,6 @@ RSpec.describe Ollama::Handlers::Markdown do
   it 'can markdown response as markdown' do
     output = double('output', :sync= => true)
     expect(output).to receive(:print).with("\e[2J", "\e[1;1H", ansi)
-    expect(output).to receive(:puts)
     markdown = described_class.new(output:)
     response = double('response', response: md, done: false)
     markdown.call(response)
@@ -36,7 +35,6 @@ RSpec.describe Ollama::Handlers::Markdown do
   it 'can markdown message content as markdown' do
     output = double('output', :sync= => true)
     expect(output).to receive(:print).with("\e[2J", "\e[1;1H", ansi)
-    expect(output).to receive(:puts)
     markdown = described_class.new(output:)
     response = double('response', response: nil, message: double(content: md), done: false)
     markdown.call(response)

data/spec/ollama/utils/fetcher_spec.rb

@@ -19,7 +19,7 @@ RSpec.describe Ollama::Utils::Fetcher do
   end
 
   it 'can #get with streaming' do
-    stub_request(:get, 'https://www.example.com/hello').
+    stub_request(:get, url).
       with(headers: fetcher.headers).
       to_return(
         status: 200,
@@ -37,7 +37,7 @@ RSpec.describe Ollama::Utils::Fetcher do
     fetcher = described_class.new(
       http_options: { ssl_verify_peer: false }
     ).expose
-    stub_request(:get, 'https://www.example.com/hello').
+    stub_request(:get, url).
       with(headers: fetcher.headers).
       to_return(
         status: 200,
@@ -45,7 +45,7 @@ RSpec.describe Ollama::Utils::Fetcher do
         headers: { 'Content-Type' => 'text/plain' },
       )
     expect(Excon).to receive(:new).with(
-      'https://www.example.com/hello',
+      url,
       hash_including(ssl_verify_peer: false)
     ).and_call_original
     fetcher.get(url) do |tmp|
@@ -56,7 +56,7 @@ RSpec.describe Ollama::Utils::Fetcher do
   end
 
   it 'can #get and fallback from streaming' do
-    stub_request(:get, 'https://www.example.com/hello').
+    stub_request(:get, url).
       with(headers: fetcher.headers).
       to_return(
         { status: 501 },
@@ -74,9 +74,10 @@ RSpec.describe Ollama::Utils::Fetcher do
   end
 
   it 'can #get and finally fail' do
-    stub_request(:get, 'https://www.example.com/hello').
+    stub_request(:get, url).
       with(headers: fetcher.headers).
       to_return(status: 500)
+		expect(STDERR).to receive(:puts).with(/cannot.*get.*#{url}/i)
     fetcher.get(url) do |tmp|
       expect(tmp).to be_a StringIO
       expect(tmp.read).to eq ''
@@ -105,11 +106,32 @@ RSpec.describe Ollama::Utils::Fetcher do
   end
 
   it 'can .execute and fail' do
-    allow(IO).to receive(:popen).and_raise StandardError
+    expect(IO).to receive(:popen).and_raise StandardError
+		expect(STDERR).to receive(:puts).with(/cannot.*execute.*foobar/i)
     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
+
+	describe '.normalize_url' do
+		it 'can handle umlauts' do
+			expect(described_class.normalize_url('https://foo.de/bär')).to eq(
+				'https://foo.de/b%C3%A4r'
+			)
+		end
+
+		it 'can handle escaped umlauts' do
+			expect(described_class.normalize_url('https://foo.de/b%C3%A4r')).to eq(
+				'https://foo.de/b%C3%A4r'
+			)
+		end
+
+		it 'can remove #anchors' do
+			expect(described_class.normalize_url('https://foo.de#bar')).to eq(
+				'https://foo.de'
+			)
+		end
+	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ollama-ruby
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-06 00:00:00.000000000 Z
+date: 2024-10-19 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.18.0
+        version: '1.19'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.18.0
+        version: '1.19'
 - !ruby/object:Gem::Dependency
   name: all_images
   requirement: !ruby/object:Gem::Requirement