elelem-ollama 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed18986dc0288ed968cbfacfec76a970d8ff096df3ebc3ca8e7f0d72c9128c5e
-  data.tar.gz: ba32c8f12ae8c4bda87cab6de6c7aa09d390ac38608d1e45a4c5624ddf18bca9
+  metadata.gz: 103d5e51990858afaab14fe8042a85b0a05517e2896535677b29adbd60e861d7
+  data.tar.gz: c45b6f097c19dfb9515c80a4ff742a190b8d950ca414ae6d3be071171f6ffd99
 SHA512:
-  metadata.gz: 7ebb2bdd4cd7cc9eb396f60007400c976976e8b0622f053395e852c25023906003ae6d815678998d7d994b59daea68653aa75fed47784b2b1b13aeaf372a48c7
-  data.tar.gz: f9e679d352b8bc01268e7cee6c09af48b6974db4781b650ba369467a4a974b1903081273730551658fb697157d70c873b223140e10edd696ea9a7cd64ece0e5a
+  metadata.gz: bc6342db3a78a8cc206f2547b88b9af13eeb0ee146ba8d7dd1698695839559cdba5292e45894ceb916fc6978cc19735535078713bcd2032b0d9b2f16e602a31e
+  data.tar.gz: 61560a4fd4857899427828c20b9121ff7f0237b98f652d1b32b3612056f7b8451282251051a0d75794bb3b268d22bb9a3f92c8287f5147fba4b829e3611ff064

data/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/Rakefile

@@ -1,4 +1,8 @@
 # frozen_string_literal: true
 
 require "bundler/gem_tasks"
-task default: %i[]
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+
+task default: %i[spec]

data/lib/elelem/ollama/client.rb

@@ -6,12 +6,13 @@ module Elelem
       def initialize(
         model:,
         host: "localhost:11434",
-        think: false,
-        keep_alive: "5m",
+        think: nil,
+        keep_alive: nil,
         options: {},
         params: {},
         read_timeout: 3600,
-        open_timeout: 10
+        open_timeout: 10,
+        http: nil
       )
         @uri = normalize_uri(host)
         @model = model
@@ -21,6 +22,7 @@ module Elelem
         @params = params
         @read_timeout = read_timeout
         @open_timeout = open_timeout
+        @http = http
       end
 
       def fetch(messages, tools = [], &block)
@@ -103,24 +105,17 @@ module Elelem
       end
 
       def stream(body)
-        request = Net::HTTP::Post.new(@uri)
-        request["content-type"] = "application/json"
-        request.body = JSON.generate(body)
+        http.post(@uri, body: body) do |response|
+          raise "HTTP #{response.code}: #{response.body}" unless response.is_a?(Net::HTTPSuccess)
 
-        http = Net::HTTP.new(@uri.host, @uri.port)
-        http.use_ssl = @uri.scheme == "https"
-        http.read_timeout = @read_timeout
-        http.open_timeout = @open_timeout
-
-        http.start do |conn|
-          conn.request(request) do |response|
-            raise "HTTP #{response.code}: #{response.body}" unless response.is_a?(Net::HTTPSuccess)
-
-            read_ndjson_stream(response) { |event| yield event }
-          end
+          read_ndjson_stream(response) { |event| yield event }
         end
       end
 
+      def http
+        @http ||= HttpAdapter.new(read_timeout: @read_timeout, open_timeout: @open_timeout)
+      end
+
       def read_ndjson_stream(response)
         buffer = String.new
 
@@ -145,6 +140,28 @@ module Elelem
           }
         end
       end
+
+      class HttpAdapter
+        def initialize(read_timeout:, open_timeout:)
+          @read_timeout = read_timeout
+          @open_timeout = open_timeout
+        end
+
+        def post(uri, body:)
+          request = Net::HTTP::Post.new(uri)
+          request["content-type"] = "application/json"
+          request.body = JSON.generate(body)
+
+          http = Net::HTTP.new(uri.host, uri.port)
+          http.use_ssl = uri.scheme == "https"
+          http.read_timeout = @read_timeout
+          http.open_timeout = @open_timeout
+
+          http.start do |conn|
+            conn.request(request) { |response| yield response }
+          end
+        end
+      end
     end
   end
 end

data/lib/elelem/ollama/version.rb

@@ -2,6 +2,6 @@
 
 module Elelem
   module Ollama
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

data/lib/elelem/ollama.rb

@@ -8,9 +8,13 @@ require "uri"
 require_relative "ollama/version"
 require_relative "ollama/client"
 
-Elelem::Providers.register(:ollama) do
-  Elelem::Ollama::Client.new(
-    model: ENV.fetch("OLLAMA_MODEL", "gpt-oss:latest"),
-    host: ENV.fetch("OLLAMA_HOST", "localhost:11434")
-  )
+Elelem.configure do |config|
+  config.provider(:ollama) do
+    Elelem::Ollama::Client.new(
+      model: ENV.fetch("OLLAMA_MODEL", "gpt-oss:latest"),
+      host: ENV.fetch("OLLAMA_HOST", "localhost:11434"),
+      think: ENV["OLLAMA_THINK"],
+      keep_alive: ENV["OLLAMA_KEEP_ALIVE"]
+    )
+  end
 end

data/spec/elelem/ollama/client_spec.rb

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+RSpec.describe Elelem::Ollama::Client do
+  subject(:client) { described_class.new(model: "gpt-oss:latest", http:, **params) }
+
+  let(:params) { {} }
+  let(:messages) { [{ role: "user", content: "hi" }] }
+  let(:body) { http.body }
+
+  let(:response) do
+    ::Net::HTTPOK.new("1.1", "200", "OK").tap do |it|
+      allow(it).to receive(:read_body).and_yield(%({"done":true,"message":{}}\n))
+    end
+  end
+
+  let(:http) do
+    Class.new do
+      attr_reader :body
+
+      def initialize(response)
+        @response = response
+      end
+
+      def post(_url, body:)
+        @body = body
+        yield @response
+      end
+    end.new(response)
+  end
+
+  describe "#fetch" do
+    it "sends only model, messages and stream by default" do
+      client.fetch(messages) { }
+
+      expect(body).to eq(model: "gpt-oss:latest", messages:, stream: true)
+    end
+
+    it "sends tools when present" do
+      tools = [{ type: "function", function: { name: "read" } }]
+
+      client.fetch(messages, tools) { }
+
+      expect(body[:tools]).to eq(tools)
+    end
+
+    context "with tuning keywords" do
+      let(:params) { { think: "high", keep_alive: "30m", options: { num_ctx: 32_768 } } }
+
+      it "sends them in the request body" do
+        client.fetch(messages) { }
+
+        expect(body).to include(think: "high", keep_alive: "30m", options: { num_ctx: 32_768 })
+      end
+    end
+
+    context "with an empty options hash" do
+      let(:params) { { options: {} } }
+
+      it "omits options" do
+        client.fetch(messages) { }
+
+        expect(body).not_to have_key(:options)
+      end
+    end
+
+    context "with passthrough params" do
+      let(:params) { { params: { format: "json", truncate: false, top_logprobs: 3 } } }
+
+      it "merges them into the request body" do
+        client.fetch(messages) { }
+
+        expect(body).to include(format: "json", truncate: false, top_logprobs: 3)
+      end
+    end
+
+    context "with a passthrough param that collides with a keyword" do
+      let(:params) { { think: "low", params: { think: "high" } } }
+
+      it "prefers the passthrough value" do
+        client.fetch(messages) { }
+
+        expect(body[:think]).to eq("high")
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require_relative "../lib/elelem/ollama"
+
+RSpec.configure do |config|
+  config.disable_monkey_patching!
+
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elelem-ollama
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - mo khan
@@ -15,28 +15,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.21'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.21'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: net-http
   requirement: !ruby/object:Gem::Requirement
@@ -73,12 +73,15 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".rspec"
 - LICENSE.txt
 - Rakefile
 - exe/elelem-ollama
 - lib/elelem/ollama.rb
 - lib/elelem/ollama/client.rb
 - lib/elelem/ollama/version.rb
+- spec/elelem/ollama/client_spec.rb
+- spec/spec_helper.rb
 homepage: https://src.mokhan.ca/elelem/ollama
 licenses:
 - MIT