ollama-ruby 0.4.0 → 0.6.0

data/bin/ollama_cli

@@ -16,6 +16,8 @@ def usage
       -M OPTIONS     the ollama model options to use, OLLAMA_MODEL_OPTIONS
       -s SYSTEM      the system prompt to use as a file, OLLAMA_SYSTEM
       -p PROMPT      the user prompt to use as a file, OLLAMA_PROMPT
+                     if it contains %{stdin} it is substituted by stdin input
+      -P VARIABLE    sets prompt var %{foo} to "bar" if VARIABLE is foo=bar
       -H HANDLER     the handler to use for the response, defaults to Print
       -S             use streaming for generation
       -h             this help
@@ -24,7 +26,7 @@ def usage
   exit 0
 end
 
-opts = go 'u:m:M:s:p:H:Sh', defaults: { ?H => 'Print', ?M => '{}' }
+opts = go 'u:m:M:s:p:P:H:Sh', defaults: { ?H => 'Print', ?M => '{}' }
 
 opts[?h] and usage
 
@@ -38,14 +40,14 @@ prompt   = get_file_argument(opts[?p], default: ENV['OLLAMA_PROMPT'])
 
 if prompt.nil?
   prompt = STDIN.read
-elsif c = prompt.scan('%s').size
-  case c
-  when 0
-  when 1
-    prompt = prompt % STDIN.read
-  else
-    STDERR.puts "Found more than one plaeceholder %s. => Ignoring."
-  end
+else
+  vars = prompt.scan(/%\{([^}]+)\}/).inject([], &:concat).uniq.map(&:to_sym)
+  stdin = (STDIN.read if vars.include?(:stdin)).to_s
+  values = opts[?P].to_a.inject({ stdin: }) { |h, pair|
+    n, v = pair.split(?=, 2)
+    h.merge(n.to_sym => v)
+  }
+  prompt = prompt % values
 end
 
 if ENV['DEBUG'].to_i == 1

data/docker-compose.yml

@@ -2,10 +2,9 @@ services:
   redis:
     image: redis:7.2.5-alpine
     restart: unless-stopped
-    ports:
-    - "9736:6379"
+    ports: [ "127.0.0.1:9736:6379" ]
     volumes:
-    - "redis-data:/data:delegated"
-    - "./config/redis.conf:/etc/redis.conf"
+      - "redis-data:/data:delegated"
+      - "./config/redis.conf:/etc/redis.conf"
 volumes:
   redis-data:

data/lib/ollama/client.rb

@@ -19,8 +19,8 @@ class Ollama::Client
         'missing :base_url parameter or OLLAMA_URL environment variable'
     end
     base_url.is_a? URI or base_url = URI.parse(base_url)
-		base_url.is_a?(URI::HTTP) || base_url.is_a?(URI::HTTPS) or
-			raise ArgumentError, "require #{base_url.inspect} to be http/https-URI"
+    base_url.is_a?(URI::HTTP) || base_url.is_a?(URI::HTTPS) or
+      raise ArgumentError, "require #{base_url.inspect} to be http/https-URI"
     @ssl_verify_peer = base_url.query.to_s.split(?&).inject({}) { |h, l|
       h.merge Hash[*l.split(?=)]
     }['ssl_verify_peer'] != 'false'

data/lib/ollama/documents/cache/redis_backed_memory_cache.rb

@@ -2,16 +2,18 @@ require 'redis'
 
 class Ollama::Documents
   class RedisBackedMemoryCache < MemoryCache
-    def initialize(prefix:, url: ENV['REDIS_URL'])
+    def initialize(prefix:, url: ENV['REDIS_URL'], object_class: nil)
       super(prefix:)
       url or raise ArgumentError, 'require redis url'
-      @prefix, @url = prefix, url
-      @redis_cache  = Ollama::Documents::RedisCache.new(prefix:, url:)
+      @prefix, @url, @object_class = prefix, url, object_class
+      @redis_cache  = Ollama::Documents::RedisCache.new(prefix:, url:, object_class:)
       @redis_cache.full_each do |key, value|
         @data[key] = value
       end
     end
 
+    attr_reader :object_class
+
     def redis
       @redis_cache.redis
     end
@@ -32,13 +34,5 @@ class Ollama::Documents
       super
       self
     end
-
-    def pre(key)
-      [ @prefix, key ].join
-    end
-
-    def unpre(key)
-      key.sub(/\A#@prefix/, '')
-    end
   end
 end

data/lib/ollama/documents/cache/redis_cache.rb

@@ -4,11 +4,13 @@ require 'redis'
 class Ollama::Documents::RedisCache
   include Ollama::Documents::Cache::Common
 
-  def initialize(prefix:, url: ENV['REDIS_URL'])
+  def initialize(prefix:, url: ENV['REDIS_URL'], object_class: nil, ex: nil)
     url or raise ArgumentError, 'require redis url'
-    @prefix, @url = prefix, url
+    @prefix, @url, @object_class, @ex = prefix, url, object_class, ex
   end
 
+  attr_reader :object_class
+
   def redis
     @redis ||= Redis.new(url: @url)
   end
@@ -16,12 +18,16 @@ class Ollama::Documents::RedisCache
   def [](key)
     value = redis.get(pre(key))
     unless value.nil?
-      JSON(value, object_class: Ollama::Documents::Record)
+      JSON(value, object_class:)
     end
   end
 
   def []=(key, value)
-    redis.set(pre(key), JSON(value))
+    redis.set(pre(key), JSON.generate(value), ex: @ex)
+  end
+
+  def ttl(key)
+    redis.ttl(pre(key))
   end
 
   def key?(key)
@@ -50,7 +56,7 @@ class Ollama::Documents::RedisCache
   include Enumerable
 
   def full_each(&block)
-    redis.scan_each do |key|
+    redis.scan_each(match: [ Ollama::Documents, ?* ] * ?-) do |key|
       value = redis.get(key) or next
       value = JSON(value, object_class: Ollama::Documents::Record)
       block.(key, value)

data/lib/ollama/documents/splitters/character.rb

@@ -2,8 +2,9 @@ module Ollama::Documents::Splitters
   class Character
     DEFAULT_SEPARATOR = /(?:\r?\n){2,}/
 
-    def initialize(separator: DEFAULT_SEPARATOR, include_separator: false, chunk_size: 4096)
-      @separator, @include_separator, @chunk_size = separator, include_separator, chunk_size
+    def initialize(separator: DEFAULT_SEPARATOR, include_separator: false, combining_string: "\n\n", chunk_size: 4096)
+      @separator, @include_separator, @combining_string, @chunk_size =
+        separator, include_separator, combining_string, chunk_size
       if include_separator
         @separator = Regexp.new("(#@separator)")
       end
@@ -22,7 +23,7 @@ module Ollama::Documents::Splitters
       current_text = +''
       texts.each do |t|
         if current_text.size + t.size < @chunk_size
-          current_text += t
+          current_text << t << @combining_string
         else
           current_text.empty? or result << current_text
           current_text = t
@@ -41,11 +42,11 @@ module Ollama::Documents::Splitters
       //,
     ].freeze
 
-    def initialize(separators: DEFAULT_SEPARATORS, include_separator: false, chunk_size: 4096)
+    def initialize(separators: DEFAULT_SEPARATORS, include_separator: false, combining_string: "\n\n", chunk_size: 4096)
       separators.empty? and
         raise ArgumentError, "non-empty array of separators required"
-      @separators, @include_separator, @chunk_size =
-        separators, include_separator, chunk_size
+      @separators, @include_separator, @combining_string, @chunk_size =
+        separators, include_separator, combining_string, chunk_size
     end
 
     def split(text, separators: @separators)
@@ -55,6 +56,7 @@ module Ollama::Documents::Splitters
       texts = Character.new(
         separator:,
         include_separator: @include_separator,
+        combining_string: @combining_string,
         chunk_size: @chunk_size
       ).split(text)
       texts.count == 0 and return [ text ]

data/lib/ollama/documents/splitters/semantic.rb

@@ -12,7 +12,7 @@ module Ollama::Documents::Splitters
     def split(text, batch_size: 100, breakpoint: :percentile, **opts)
       sentences  = Ollama::Documents::Splitters::Character.new(
         separator: @separator,
-        include_separator: true,
+        include_separator: opts.fetch(:include_separator, true),
         chunk_size: 1,
       ).split(text)
       embeddings = sentences.with_infobar(label: 'Split').each_slice(batch_size).inject([]) do |e, batch|

data/lib/ollama/documents.rb

@@ -35,16 +35,20 @@ class Ollama::Documents
     alias inspect to_s
   end
 
-  def initialize(ollama:, model:, model_options: nil, collection: default_collection, cache: MemoryCache, redis_url: nil)
-    @ollama, @model, @model_options, @collection = ollama, model, model_options, collection.to_sym
-    @cache, @redis_url = connect_cache(cache), redis_url
+  def initialize(ollama:, model:, model_options: nil, collection: nil, cache: MemoryCache, redis_url: nil, debug: false)
+    collection ||= default_collection
+    @ollama, @model, @model_options, @collection =
+      ollama, model, model_options, collection.to_sym
+    @redis_url = redis_url
+    @cache     = connect_cache(cache)
+    @debug     = debug
   end
 
   def default_collection
     :default
   end
 
-  attr_reader :ollama, :model, :collection
+  attr_reader :ollama, :model, :collection, :cache
 
   def collection=(new_collection)
     @collection   = new_collection.to_sym
@@ -61,6 +65,9 @@ class Ollama::Documents
     }
     inputs.reject! { |i| exist?(i) }
     inputs.empty? and return self
+    if @debug
+      puts Ollama::Utils::ColorizeTexts.new(inputs)
+    end
     batches = inputs.each_slice(batch_size).
       with_infobar(
         label: "Add #{truncate(tags.to_s, percentage: 25)}",
@@ -161,7 +168,7 @@ class Ollama::Documents
     cache = nil
     if cache_class.instance_method(:redis)
       begin
-        cache = cache_class.new(prefix:)
+        cache = cache_class.new(prefix:, url: @redis_url, object_class: Record)
         cache.size
       rescue Redis::CannotConnectError
         STDERR.puts(

data/lib/ollama/utils/cache_fetcher.rb

@@ -0,0 +1,38 @@
+require 'digest/md5'
+
+class Ollama::Utils::CacheFetcher
+  def initialize(cache)
+    @cache = cache
+  end
+
+  def get(url, &block)
+    block or raise ArgumentError, 'require block argument'
+    body         = @cache[key(:body, url)]
+    content_type = @cache[key(:content_type, url)]
+    content_type = MIME::Types[content_type].first
+    if body && content_type
+      io = StringIO.new(body)
+      io.rewind
+      io.extend(Ollama::Utils::Fetcher::ContentType)
+      io.content_type = content_type
+      block.(io)
+    end
+  end
+
+  def put(url, io)
+    io.rewind
+    body = io.read
+    body.empty? and return
+    content_type = io.content_type
+    content_type.nil? and return
+    @cache[key(:body, url)]          = body
+    @cache[key(:content_type,  url)] = content_type.to_s
+    self
+  end
+
+  private
+
+  def key(type, url)
+    [ type, Digest::MD5.hexdigest(url) ] * ?-
+  end
+end

data/lib/ollama/utils/fetcher.rb

@@ -3,22 +3,80 @@ require 'tins/unit'
 require 'infobar'
 require 'mime-types'
 require 'stringio'
+require 'ollama/utils/cache_fetcher'
 
 class Ollama::Utils::Fetcher
   module ContentType
     attr_accessor :content_type
+
+    def self.failed
+      object = StringIO.new.extend(self)
+      object.content_type = MIME::Types['text/plain'].first
+      object
+    end
   end
 
   class RetryWithoutStreaming < StandardError; end
 
-  def initialize(debug: false)
-    @debug     = debug
-    @started   = false
-    @streaming = true
+  def self.get(url, **options, &block)
+    cache = options.delete(:cache) and
+      cache = Ollama::Utils::CacheFetcher.new(cache)
+    if result = cache&.get(url, &block)
+      infobar.puts "Getting #{url.inspect} from cache."
+      return result
+    else
+      new(**options).send(:get, url) do |tmp|
+        result = block.(tmp)
+        if cache && !tmp.is_a?(StringIO)
+          tmp.rewind
+          cache.put(url, tmp)
+        end
+        result
+      end
+    end
   end
 
-  def self.get(url, **options, &block)
-    new(**options).get(url, &block)
+  def self.read(filename, &block)
+    if File.exist?(filename)
+      File.open(filename) do |file|
+        file.extend(Ollama::Utils::Fetcher::ContentType)
+        file.content_type = MIME::Types.type_for(filename).first
+        block.(file)
+      end
+    end
+  end
+
+  def self.execute(command, &block)
+    Tempfile.open do |tmp|
+      IO.popen(command) do |command|
+        until command.eof?
+          tmp.write command.read(4096)
+        end
+        tmp.rewind
+        tmp.extend(Ollama::Utils::Fetcher::ContentType)
+        tmp.content_type = MIME::Types['text/plain'].first
+        block.(tmp)
+      end
+    end
+  rescue => e
+    STDERR.puts "Cannot execute #{command.inspect} (#{e})"
+    if @debug && !e.is_a?(RuntimeError)
+      STDERR.puts "#{e.backtrace * ?\n}"
+    end
+    yield ContentType.failed
+  end
+
+  def initialize(debug: false, http_options: {})
+    @debug        = debug
+    @started      = false
+    @streaming    = true
+    @http_options = http_options
+  end
+
+  private
+
+  def excon(url, **options)
+    Excon.new(url, options.merge(@http_options))
   end
 
   def get(url, &block)
@@ -26,13 +84,13 @@ class Ollama::Utils::Fetcher
     Tempfile.open do |tmp|
       infobar.label = 'Getting'
       if @streaming
-        response = Excon.get(url, headers:, response_block: callback(tmp))
+        response = excon(url, headers:, response_block: callback(tmp)).request(method: :get)
         response.status != 200 || !@started and raise RetryWithoutStreaming
         decorate_io(tmp, response)
         infobar.finish
         block.(tmp)
       else
-        response = Excon.get(url, headers:, middlewares:)
+        response = excon(url, headers:, middlewares:).request(method: :get)
         if response.status != 200
           raise "invalid response status code"
         end
@@ -52,7 +110,7 @@ class Ollama::Utils::Fetcher
     if @debug && !e.is_a?(RuntimeError)
       STDERR.puts "#{e.backtrace * ?\n}"
     end
-    yield StringIO.new.extend(ContentType)
+    yield ContentType.failed
   end
 
   def headers
@@ -94,14 +152,4 @@ class Ollama::Utils::Fetcher
     }
     '%l ' + progress + ' in %te, ETA %e @%E'
   end
-
-  def self.read(filename, &block)
-    if File.exist?(filename)
-      File.open(filename) do |file|
-        file.extend(Ollama::Utils::Fetcher::ContentType)
-        file.content_type = MIME::Types.type_for(filename).first
-        block.(file)
-      end
-    end
-  end
 end

data/lib/ollama/utils/file_argument.rb

@@ -23,7 +23,7 @@ module Ollama::Utils::FileArgument
     if path_or_content.present? && path_or_content.size < 2 ** 15 &&
         File.basename(path_or_content).size < 2 ** 8 &&
         File.exist?(path_or_content)
-      then
+    then
       File.read(path_or_content)
     elsif path_or_content.present?
       path_or_content

data/lib/ollama/version.rb

@@ -1,6 +1,6 @@
 module Ollama
   # Ollama version
-  VERSION         = '0.4.0'
+  VERSION         = '0.6.0'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/lib/ollama.rb

@@ -1,4 +1,5 @@
 require 'json'
+require 'logger'
 require 'excon'
 
 module Ollama

data/ollama-ruby.gemspec

@@ -1,30 +1,30 @@
 # -*- encoding: utf-8 -*-
-# stub: ollama-ruby 0.4.0 ruby lib
+# stub: ollama-ruby 0.6.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama-ruby".freeze
-  s.version = "0.4.0".freeze
+  s.version = "0.6.0".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-09-21"
+  s.date = "2024-09-30"
   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]
-  s.extra_rdoc_files = ["README.md".freeze, "lib/ollama.rb".freeze, "lib/ollama/client.rb".freeze, "lib/ollama/client/command.rb".freeze, "lib/ollama/client/doc.rb".freeze, "lib/ollama/commands/chat.rb".freeze, "lib/ollama/commands/copy.rb".freeze, "lib/ollama/commands/create.rb".freeze, "lib/ollama/commands/delete.rb".freeze, "lib/ollama/commands/embed.rb".freeze, "lib/ollama/commands/embeddings.rb".freeze, "lib/ollama/commands/generate.rb".freeze, "lib/ollama/commands/ps.rb".freeze, "lib/ollama/commands/pull.rb".freeze, "lib/ollama/commands/push.rb".freeze, "lib/ollama/commands/show.rb".freeze, "lib/ollama/commands/tags.rb".freeze, "lib/ollama/documents.rb".freeze, "lib/ollama/documents/cache/common.rb".freeze, "lib/ollama/documents/cache/memory_cache.rb".freeze, "lib/ollama/documents/cache/redis_backed_memory_cache.rb".freeze, "lib/ollama/documents/cache/redis_cache.rb".freeze, "lib/ollama/documents/splitters/character.rb".freeze, "lib/ollama/documents/splitters/semantic.rb".freeze, "lib/ollama/dto.rb".freeze, "lib/ollama/errors.rb".freeze, "lib/ollama/handlers.rb".freeze, "lib/ollama/handlers/collector.rb".freeze, "lib/ollama/handlers/concern.rb".freeze, "lib/ollama/handlers/dump_json.rb".freeze, "lib/ollama/handlers/dump_yaml.rb".freeze, "lib/ollama/handlers/markdown.rb".freeze, "lib/ollama/handlers/nop.rb".freeze, "lib/ollama/handlers/print.rb".freeze, "lib/ollama/handlers/progress.rb".freeze, "lib/ollama/handlers/say.rb".freeze, "lib/ollama/handlers/single.rb".freeze, "lib/ollama/image.rb".freeze, "lib/ollama/message.rb".freeze, "lib/ollama/options.rb".freeze, "lib/ollama/response.rb".freeze, "lib/ollama/tool.rb".freeze, "lib/ollama/tool/function.rb".freeze, "lib/ollama/tool/function/parameters.rb".freeze, "lib/ollama/tool/function/parameters/property.rb".freeze, "lib/ollama/utils/ansi_markdown.rb".freeze, "lib/ollama/utils/chooser.rb".freeze, "lib/ollama/utils/colorize_texts.rb".freeze, "lib/ollama/utils/fetcher.rb".freeze, "lib/ollama/utils/file_argument.rb".freeze, "lib/ollama/utils/math.rb".freeze, "lib/ollama/utils/tags.rb".freeze, "lib/ollama/utils/width.rb".freeze, "lib/ollama/version.rb".freeze]
-  s.files = [".envrc".freeze, "CHANGES.md".freeze, "Gemfile".freeze, "LICENSE".freeze, "README.md".freeze, "Rakefile".freeze, "bin/ollama_chat".freeze, "bin/ollama_cli".freeze, "bin/ollama_console".freeze, "bin/ollama_update".freeze, "config/redis.conf".freeze, "docker-compose.yml".freeze, "lib/ollama.rb".freeze, "lib/ollama/client.rb".freeze, "lib/ollama/client/command.rb".freeze, "lib/ollama/client/doc.rb".freeze, "lib/ollama/commands/chat.rb".freeze, "lib/ollama/commands/copy.rb".freeze, "lib/ollama/commands/create.rb".freeze, "lib/ollama/commands/delete.rb".freeze, "lib/ollama/commands/embed.rb".freeze, "lib/ollama/commands/embeddings.rb".freeze, "lib/ollama/commands/generate.rb".freeze, "lib/ollama/commands/ps.rb".freeze, "lib/ollama/commands/pull.rb".freeze, "lib/ollama/commands/push.rb".freeze, "lib/ollama/commands/show.rb".freeze, "lib/ollama/commands/tags.rb".freeze, "lib/ollama/documents.rb".freeze, "lib/ollama/documents/cache/common.rb".freeze, "lib/ollama/documents/cache/memory_cache.rb".freeze, "lib/ollama/documents/cache/redis_backed_memory_cache.rb".freeze, "lib/ollama/documents/cache/redis_cache.rb".freeze, "lib/ollama/documents/splitters/character.rb".freeze, "lib/ollama/documents/splitters/semantic.rb".freeze, "lib/ollama/dto.rb".freeze, "lib/ollama/errors.rb".freeze, "lib/ollama/handlers.rb".freeze, "lib/ollama/handlers/collector.rb".freeze, "lib/ollama/handlers/concern.rb".freeze, "lib/ollama/handlers/dump_json.rb".freeze, "lib/ollama/handlers/dump_yaml.rb".freeze, "lib/ollama/handlers/markdown.rb".freeze, "lib/ollama/handlers/nop.rb".freeze, "lib/ollama/handlers/print.rb".freeze, "lib/ollama/handlers/progress.rb".freeze, "lib/ollama/handlers/say.rb".freeze, "lib/ollama/handlers/single.rb".freeze, "lib/ollama/image.rb".freeze, "lib/ollama/message.rb".freeze, "lib/ollama/options.rb".freeze, "lib/ollama/response.rb".freeze, "lib/ollama/tool.rb".freeze, "lib/ollama/tool/function.rb".freeze, "lib/ollama/tool/function/parameters.rb".freeze, "lib/ollama/tool/function/parameters/property.rb".freeze, "lib/ollama/utils/ansi_markdown.rb".freeze, "lib/ollama/utils/chooser.rb".freeze, "lib/ollama/utils/colorize_texts.rb".freeze, "lib/ollama/utils/fetcher.rb".freeze, "lib/ollama/utils/file_argument.rb".freeze, "lib/ollama/utils/math.rb".freeze, "lib/ollama/utils/tags.rb".freeze, "lib/ollama/utils/width.rb".freeze, "lib/ollama/version.rb".freeze, "ollama-ruby.gemspec".freeze, "spec/assets/embeddings.json".freeze, "spec/assets/kitten.jpg".freeze, "spec/assets/prompt.txt".freeze, "spec/ollama/client/doc_spec.rb".freeze, "spec/ollama/client_spec.rb".freeze, "spec/ollama/commands/chat_spec.rb".freeze, "spec/ollama/commands/copy_spec.rb".freeze, "spec/ollama/commands/create_spec.rb".freeze, "spec/ollama/commands/delete_spec.rb".freeze, "spec/ollama/commands/embed_spec.rb".freeze, "spec/ollama/commands/embeddings_spec.rb".freeze, "spec/ollama/commands/generate_spec.rb".freeze, "spec/ollama/commands/ps_spec.rb".freeze, "spec/ollama/commands/pull_spec.rb".freeze, "spec/ollama/commands/push_spec.rb".freeze, "spec/ollama/commands/show_spec.rb".freeze, "spec/ollama/commands/tags_spec.rb".freeze, "spec/ollama/documents/memory_cache_spec.rb".freeze, "spec/ollama/documents/redis_backed_memory_cache_spec.rb".freeze, "spec/ollama/documents/redis_cache_spec.rb".freeze, "spec/ollama/documents/splitters/character_spec.rb".freeze, "spec/ollama/documents/splitters/semantic_spec.rb".freeze, "spec/ollama/documents_spec.rb".freeze, "spec/ollama/handlers/collector_spec.rb".freeze, "spec/ollama/handlers/dump_json_spec.rb".freeze, "spec/ollama/handlers/dump_yaml_spec.rb".freeze, "spec/ollama/handlers/markdown_spec.rb".freeze, "spec/ollama/handlers/nop_spec.rb".freeze, "spec/ollama/handlers/print_spec.rb".freeze, "spec/ollama/handlers/progress_spec.rb".freeze, "spec/ollama/handlers/say_spec.rb".freeze, "spec/ollama/handlers/single_spec.rb".freeze, "spec/ollama/image_spec.rb".freeze, "spec/ollama/message_spec.rb".freeze, "spec/ollama/options_spec.rb".freeze, "spec/ollama/tool_spec.rb".freeze, "spec/ollama/utils/ansi_markdown_spec.rb".freeze, "spec/ollama/utils/fetcher_spec.rb".freeze, "spec/ollama/utils/file_argument_spec.rb".freeze, "spec/ollama/utils/tags_spec.rb".freeze, "spec/spec_helper.rb".freeze, "tmp/.keep".freeze]
+  s.extra_rdoc_files = ["README.md".freeze, "lib/ollama.rb".freeze, "lib/ollama/client.rb".freeze, "lib/ollama/client/command.rb".freeze, "lib/ollama/client/doc.rb".freeze, "lib/ollama/commands/chat.rb".freeze, "lib/ollama/commands/copy.rb".freeze, "lib/ollama/commands/create.rb".freeze, "lib/ollama/commands/delete.rb".freeze, "lib/ollama/commands/embed.rb".freeze, "lib/ollama/commands/embeddings.rb".freeze, "lib/ollama/commands/generate.rb".freeze, "lib/ollama/commands/ps.rb".freeze, "lib/ollama/commands/pull.rb".freeze, "lib/ollama/commands/push.rb".freeze, "lib/ollama/commands/show.rb".freeze, "lib/ollama/commands/tags.rb".freeze, "lib/ollama/documents.rb".freeze, "lib/ollama/documents/cache/common.rb".freeze, "lib/ollama/documents/cache/memory_cache.rb".freeze, "lib/ollama/documents/cache/redis_backed_memory_cache.rb".freeze, "lib/ollama/documents/cache/redis_cache.rb".freeze, "lib/ollama/documents/splitters/character.rb".freeze, "lib/ollama/documents/splitters/semantic.rb".freeze, "lib/ollama/dto.rb".freeze, "lib/ollama/errors.rb".freeze, "lib/ollama/handlers.rb".freeze, "lib/ollama/handlers/collector.rb".freeze, "lib/ollama/handlers/concern.rb".freeze, "lib/ollama/handlers/dump_json.rb".freeze, "lib/ollama/handlers/dump_yaml.rb".freeze, "lib/ollama/handlers/markdown.rb".freeze, "lib/ollama/handlers/nop.rb".freeze, "lib/ollama/handlers/print.rb".freeze, "lib/ollama/handlers/progress.rb".freeze, "lib/ollama/handlers/say.rb".freeze, "lib/ollama/handlers/single.rb".freeze, "lib/ollama/image.rb".freeze, "lib/ollama/message.rb".freeze, "lib/ollama/options.rb".freeze, "lib/ollama/response.rb".freeze, "lib/ollama/tool.rb".freeze, "lib/ollama/tool/function.rb".freeze, "lib/ollama/tool/function/parameters.rb".freeze, "lib/ollama/tool/function/parameters/property.rb".freeze, "lib/ollama/utils/ansi_markdown.rb".freeze, "lib/ollama/utils/cache_fetcher.rb".freeze, "lib/ollama/utils/chooser.rb".freeze, "lib/ollama/utils/colorize_texts.rb".freeze, "lib/ollama/utils/fetcher.rb".freeze, "lib/ollama/utils/file_argument.rb".freeze, "lib/ollama/utils/math.rb".freeze, "lib/ollama/utils/tags.rb".freeze, "lib/ollama/utils/width.rb".freeze, "lib/ollama/version.rb".freeze]
+  s.files = [".envrc".freeze, "CHANGES.md".freeze, "Gemfile".freeze, "LICENSE".freeze, "README.md".freeze, "Rakefile".freeze, "bin/ollama_chat".freeze, "bin/ollama_cli".freeze, "bin/ollama_console".freeze, "bin/ollama_update".freeze, "config/redis.conf".freeze, "docker-compose.yml".freeze, "lib/ollama.rb".freeze, "lib/ollama/client.rb".freeze, "lib/ollama/client/command.rb".freeze, "lib/ollama/client/doc.rb".freeze, "lib/ollama/commands/chat.rb".freeze, "lib/ollama/commands/copy.rb".freeze, "lib/ollama/commands/create.rb".freeze, "lib/ollama/commands/delete.rb".freeze, "lib/ollama/commands/embed.rb".freeze, "lib/ollama/commands/embeddings.rb".freeze, "lib/ollama/commands/generate.rb".freeze, "lib/ollama/commands/ps.rb".freeze, "lib/ollama/commands/pull.rb".freeze, "lib/ollama/commands/push.rb".freeze, "lib/ollama/commands/show.rb".freeze, "lib/ollama/commands/tags.rb".freeze, "lib/ollama/documents.rb".freeze, "lib/ollama/documents/cache/common.rb".freeze, "lib/ollama/documents/cache/memory_cache.rb".freeze, "lib/ollama/documents/cache/redis_backed_memory_cache.rb".freeze, "lib/ollama/documents/cache/redis_cache.rb".freeze, "lib/ollama/documents/splitters/character.rb".freeze, "lib/ollama/documents/splitters/semantic.rb".freeze, "lib/ollama/dto.rb".freeze, "lib/ollama/errors.rb".freeze, "lib/ollama/handlers.rb".freeze, "lib/ollama/handlers/collector.rb".freeze, "lib/ollama/handlers/concern.rb".freeze, "lib/ollama/handlers/dump_json.rb".freeze, "lib/ollama/handlers/dump_yaml.rb".freeze, "lib/ollama/handlers/markdown.rb".freeze, "lib/ollama/handlers/nop.rb".freeze, "lib/ollama/handlers/print.rb".freeze, "lib/ollama/handlers/progress.rb".freeze, "lib/ollama/handlers/say.rb".freeze, "lib/ollama/handlers/single.rb".freeze, "lib/ollama/image.rb".freeze, "lib/ollama/message.rb".freeze, "lib/ollama/options.rb".freeze, "lib/ollama/response.rb".freeze, "lib/ollama/tool.rb".freeze, "lib/ollama/tool/function.rb".freeze, "lib/ollama/tool/function/parameters.rb".freeze, "lib/ollama/tool/function/parameters/property.rb".freeze, "lib/ollama/utils/ansi_markdown.rb".freeze, "lib/ollama/utils/cache_fetcher.rb".freeze, "lib/ollama/utils/chooser.rb".freeze, "lib/ollama/utils/colorize_texts.rb".freeze, "lib/ollama/utils/fetcher.rb".freeze, "lib/ollama/utils/file_argument.rb".freeze, "lib/ollama/utils/math.rb".freeze, "lib/ollama/utils/tags.rb".freeze, "lib/ollama/utils/width.rb".freeze, "lib/ollama/version.rb".freeze, "ollama-ruby.gemspec".freeze, "spec/assets/embeddings.json".freeze, "spec/assets/kitten.jpg".freeze, "spec/assets/prompt.txt".freeze, "spec/ollama/client/doc_spec.rb".freeze, "spec/ollama/client_spec.rb".freeze, "spec/ollama/commands/chat_spec.rb".freeze, "spec/ollama/commands/copy_spec.rb".freeze, "spec/ollama/commands/create_spec.rb".freeze, "spec/ollama/commands/delete_spec.rb".freeze, "spec/ollama/commands/embed_spec.rb".freeze, "spec/ollama/commands/embeddings_spec.rb".freeze, "spec/ollama/commands/generate_spec.rb".freeze, "spec/ollama/commands/ps_spec.rb".freeze, "spec/ollama/commands/pull_spec.rb".freeze, "spec/ollama/commands/push_spec.rb".freeze, "spec/ollama/commands/show_spec.rb".freeze, "spec/ollama/commands/tags_spec.rb".freeze, "spec/ollama/documents/memory_cache_spec.rb".freeze, "spec/ollama/documents/redis_backed_memory_cache_spec.rb".freeze, "spec/ollama/documents/redis_cache_spec.rb".freeze, "spec/ollama/documents/splitters/character_spec.rb".freeze, "spec/ollama/documents/splitters/semantic_spec.rb".freeze, "spec/ollama/documents_spec.rb".freeze, "spec/ollama/handlers/collector_spec.rb".freeze, "spec/ollama/handlers/dump_json_spec.rb".freeze, "spec/ollama/handlers/dump_yaml_spec.rb".freeze, "spec/ollama/handlers/markdown_spec.rb".freeze, "spec/ollama/handlers/nop_spec.rb".freeze, "spec/ollama/handlers/print_spec.rb".freeze, "spec/ollama/handlers/progress_spec.rb".freeze, "spec/ollama/handlers/say_spec.rb".freeze, "spec/ollama/handlers/single_spec.rb".freeze, "spec/ollama/image_spec.rb".freeze, "spec/ollama/message_spec.rb".freeze, "spec/ollama/options_spec.rb".freeze, "spec/ollama/tool_spec.rb".freeze, "spec/ollama/utils/ansi_markdown_spec.rb".freeze, "spec/ollama/utils/cache_fetcher_spec.rb".freeze, "spec/ollama/utils/fetcher_spec.rb".freeze, "spec/ollama/utils/file_argument_spec.rb".freeze, "spec/ollama/utils/tags_spec.rb".freeze, "spec/spec_helper.rb".freeze, "tmp/.keep".freeze]
   s.homepage = "https://github.com/flori/ollama-ruby".freeze
   s.licenses = ["MIT".freeze]
   s.rdoc_options = ["--title".freeze, "Ollama-ruby - Interacting with the Ollama API".freeze, "--main".freeze, "README.md".freeze]
   s.required_ruby_version = Gem::Requirement.new("~> 3.1".freeze)
   s.rubygems_version = "3.5.18".freeze
   s.summary = "Interacting with the Ollama API".freeze
-  s.test_files = ["spec/ollama/client/doc_spec.rb".freeze, "spec/ollama/client_spec.rb".freeze, "spec/ollama/commands/chat_spec.rb".freeze, "spec/ollama/commands/copy_spec.rb".freeze, "spec/ollama/commands/create_spec.rb".freeze, "spec/ollama/commands/delete_spec.rb".freeze, "spec/ollama/commands/embed_spec.rb".freeze, "spec/ollama/commands/embeddings_spec.rb".freeze, "spec/ollama/commands/generate_spec.rb".freeze, "spec/ollama/commands/ps_spec.rb".freeze, "spec/ollama/commands/pull_spec.rb".freeze, "spec/ollama/commands/push_spec.rb".freeze, "spec/ollama/commands/show_spec.rb".freeze, "spec/ollama/commands/tags_spec.rb".freeze, "spec/ollama/documents/memory_cache_spec.rb".freeze, "spec/ollama/documents/redis_backed_memory_cache_spec.rb".freeze, "spec/ollama/documents/redis_cache_spec.rb".freeze, "spec/ollama/documents/splitters/character_spec.rb".freeze, "spec/ollama/documents/splitters/semantic_spec.rb".freeze, "spec/ollama/documents_spec.rb".freeze, "spec/ollama/handlers/collector_spec.rb".freeze, "spec/ollama/handlers/dump_json_spec.rb".freeze, "spec/ollama/handlers/dump_yaml_spec.rb".freeze, "spec/ollama/handlers/markdown_spec.rb".freeze, "spec/ollama/handlers/nop_spec.rb".freeze, "spec/ollama/handlers/print_spec.rb".freeze, "spec/ollama/handlers/progress_spec.rb".freeze, "spec/ollama/handlers/say_spec.rb".freeze, "spec/ollama/handlers/single_spec.rb".freeze, "spec/ollama/image_spec.rb".freeze, "spec/ollama/message_spec.rb".freeze, "spec/ollama/options_spec.rb".freeze, "spec/ollama/tool_spec.rb".freeze, "spec/ollama/utils/ansi_markdown_spec.rb".freeze, "spec/ollama/utils/fetcher_spec.rb".freeze, "spec/ollama/utils/file_argument_spec.rb".freeze, "spec/ollama/utils/tags_spec.rb".freeze, "spec/spec_helper.rb".freeze]
+  s.test_files = ["spec/ollama/client/doc_spec.rb".freeze, "spec/ollama/client_spec.rb".freeze, "spec/ollama/commands/chat_spec.rb".freeze, "spec/ollama/commands/copy_spec.rb".freeze, "spec/ollama/commands/create_spec.rb".freeze, "spec/ollama/commands/delete_spec.rb".freeze, "spec/ollama/commands/embed_spec.rb".freeze, "spec/ollama/commands/embeddings_spec.rb".freeze, "spec/ollama/commands/generate_spec.rb".freeze, "spec/ollama/commands/ps_spec.rb".freeze, "spec/ollama/commands/pull_spec.rb".freeze, "spec/ollama/commands/push_spec.rb".freeze, "spec/ollama/commands/show_spec.rb".freeze, "spec/ollama/commands/tags_spec.rb".freeze, "spec/ollama/documents/memory_cache_spec.rb".freeze, "spec/ollama/documents/redis_backed_memory_cache_spec.rb".freeze, "spec/ollama/documents/redis_cache_spec.rb".freeze, "spec/ollama/documents/splitters/character_spec.rb".freeze, "spec/ollama/documents/splitters/semantic_spec.rb".freeze, "spec/ollama/documents_spec.rb".freeze, "spec/ollama/handlers/collector_spec.rb".freeze, "spec/ollama/handlers/dump_json_spec.rb".freeze, "spec/ollama/handlers/dump_yaml_spec.rb".freeze, "spec/ollama/handlers/markdown_spec.rb".freeze, "spec/ollama/handlers/nop_spec.rb".freeze, "spec/ollama/handlers/print_spec.rb".freeze, "spec/ollama/handlers/progress_spec.rb".freeze, "spec/ollama/handlers/say_spec.rb".freeze, "spec/ollama/handlers/single_spec.rb".freeze, "spec/ollama/image_spec.rb".freeze, "spec/ollama/message_spec.rb".freeze, "spec/ollama/options_spec.rb".freeze, "spec/ollama/tool_spec.rb".freeze, "spec/ollama/utils/ansi_markdown_spec.rb".freeze, "spec/ollama/utils/cache_fetcher_spec.rb".freeze, "spec/ollama/utils/fetcher_spec.rb".freeze, "spec/ollama/utils/file_argument_spec.rb".freeze, "spec/ollama/utils/tags_spec.rb".freeze, "spec/spec_helper.rb".freeze]
 
   s.specification_version = 4
 
-  s.add_development_dependency(%q<gem_hadar>.freeze, ["~> 1.17.1".freeze])
+  s.add_development_dependency(%q<gem_hadar>.freeze, ["~> 1.18.0".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])
@@ -45,4 +45,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<search_ui>.freeze, ["~> 0.0".freeze])
   s.add_runtime_dependency(%q<amatch>.freeze, ["~> 0.4.1".freeze])
   s.add_runtime_dependency(%q<pdf-reader>.freeze, ["~> 2.0".freeze])
+  s.add_runtime_dependency(%q<logger>.freeze, ["~> 1.0".freeze])
+  s.add_runtime_dependency(%q<json>.freeze, ["~> 2.0".freeze])
+  s.add_runtime_dependency(%q<xdg>.freeze, ["~> 7.0".freeze])
 end

data/spec/ollama/documents/redis_backed_memory_cache_spec.rb

@@ -35,6 +35,17 @@ RSpec.describe Ollama::Documents::RedisBackedMemoryCache do
       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:)
+      expect(cache.object_class).to eq object_class
+    end
+
     it 'has Redis client' do
       expect(cache.redis).to eq redis
     end

data/spec/ollama/documents/redis_cache_spec.rb

@@ -6,6 +6,17 @@ RSpec.describe Ollama::Documents::RedisCache do
     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:)
+    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
@@ -37,8 +48,17 @@ RSpec.describe Ollama::Documents::RedisCache do
 
     it 'can set a value for a key' do
       key, value = 'foo', { test: true }
-      expect(redis).to receive(:set).with('test-' + key, JSON(value))
+      expect(redis).to receive(:set).with('test-' + 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
+      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(cache.ttl(key)).to eq 3_600
     end
 
     it 'can determine if key exists' do