ollama-ruby 0.3.1 → 0.4.0

data/lib/ollama/utils/fetcher.rb

@@ -2,6 +2,7 @@ require 'tempfile'
 require 'tins/unit'
 require 'infobar'
 require 'mime-types'
+require 'stringio'
 
 class Ollama::Utils::Fetcher
   module ContentType
@@ -10,13 +11,14 @@ class Ollama::Utils::Fetcher
 
   class RetryWithoutStreaming < StandardError; end
 
-  def initialize
+  def initialize(debug: false)
+    @debug     = debug
     @started   = false
     @streaming = true
   end
 
-  def self.get(url, &block)
-    new.get(url, &block)
+  def self.get(url, **options, &block)
+    new(**options).get(url, &block)
   end
 
   def get(url, &block)
@@ -46,11 +48,11 @@ class Ollama::Utils::Fetcher
     @streaming = false
     retry
   rescue => e
-    STDERR.puts "Cannot get #{url.to_s.inspect} (#{e}): #{response&.status_line}"
-    unless e.is_a?(RuntimeError)
+    STDERR.puts "Cannot get #{url.to_s.inspect} (#{e}): #{response&.status_line || 'n/a'}"
+    if @debug && !e.is_a?(RuntimeError)
       STDERR.puts "#{e.backtrace * ?\n}"
     end
-    yield nil
+    yield StringIO.new.extend(ContentType)
   end
 
   def headers

data/lib/ollama/utils/file_argument.rb

@@ -1,14 +1,32 @@
 module Ollama::Utils::FileArgument
   module_function
 
-  def get_file_argument(prompt, default: nil)
-    if prompt.present? && prompt.size < 2 ** 15 &&
-        File.basename(prompt).size < 2 ** 8 &&
-        File.exist?(prompt)
+  # Returns the contents of a file or string, or a default value if neither is provided.
+  #
+  # @param [String] path_or_content The path to a file or a string containing
+  #                 the content.
+  #
+  # @param [String] default The default value to return if no valid input is
+  #                 given. Defaults to nil.
+  #
+  # @return [String] The contents of the file, the string, or the default value.
+  #
+  # @example Get the contents of a file
+  #   get_file_argument('path/to/file')
+  #
+  # @example Use a string as content
+  #   get_file_argument('string content')
+  #
+  # @example Return a default value if no valid input is given
+  #   get_file_argument(nil, default: 'default content')
+  def get_file_argument(path_or_content, default: nil)
+    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
-      File.read(prompt)
-    elsif prompt.present?
-      prompt
+      File.read(path_or_content)
+    elsif path_or_content.present?
+      path_or_content
     else
       default
     end

data/lib/ollama/utils/tags.rb

@@ -1,5 +1,6 @@
 require 'sorted_set'
 
+
 class Ollama::Utils::Tags < SortedSet
   def to_a
     super.map(&:to_s)

data/lib/ollama/version.rb

@@ -1,6 +1,6 @@
 module Ollama
   # Ollama version
-  VERSION         = '0.3.1'
+  VERSION         = '0.4.0'
   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,34 +1,35 @@
 # -*- encoding: utf-8 -*-
-# stub: ollama-ruby 0.3.1 ruby lib
+# stub: ollama-ruby 0.4.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama-ruby".freeze
-  s.version = "0.3.1".freeze
+  s.version = "0.4.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-12"
+  s.date = "2024-09-21"
   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/memory_cache.rb".freeze, "lib/ollama/documents/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/memory_cache.rb".freeze, "lib/ollama/documents/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/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_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/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/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.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_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/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/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<all_images>.freeze, ["~> 0.4".freeze])
   s.add_development_dependency(%q<rspec>.freeze, ["~> 3.2".freeze])
-  s.add_development_dependency(%q<utils>.freeze, [">= 0".freeze])
   s.add_development_dependency(%q<webmock>.freeze, [">= 0".freeze])
+  s.add_development_dependency(%q<debug>.freeze, [">= 0".freeze])
+  s.add_development_dependency(%q<simplecov>.freeze, [">= 0".freeze])
   s.add_runtime_dependency(%q<excon>.freeze, ["~> 0.111".freeze])
   s.add_runtime_dependency(%q<infobar>.freeze, ["~> 0.8".freeze])
   s.add_runtime_dependency(%q<term-ansicolor>.freeze, ["~> 1.11".freeze])

data/spec/assets/prompt.txt

@@ -0,0 +1 @@
+You are a test prompt just used for testing.

data/spec/ollama/documents/memory_cache_spec.rb

@@ -1,63 +1,63 @@
 require 'spec_helper'
 
 RSpec.describe Ollama::Documents::MemoryCache do
-  let :memory_cache do
+  let :cache do
     described_class.new prefix: 'test-'
   end
 
   it 'can be instantiated' do
-    expect(memory_cache).to be_a described_class
+    expect(cache).to be_a described_class
   end
 
   it 'can get/set a key' do
     key, value = 'foo', { test: true }
     expect {
-      memory_cache[key] = value
+      cache[key] = value
     }.to change {
-      memory_cache[key]
+      cache[key]
     }.from(nil).to(value)
   end
 
   it 'can determine if key exists' do
     key, value = 'foo', { test: true }
     expect {
-      memory_cache[key] = value
+      cache[key] = value
     }.to change {
-      memory_cache.key?(key)
+      cache.key?(key)
     }.from(false).to(true)
   end
 
   it 'can delete' do
     key, value = 'foo', { test: true }
-    memory_cache[key] = value
+    cache[key] = value
     expect {
-      memory_cache.delete(key)
+      cache.delete(key)
     }.to change {
-      memory_cache.key?(key)
+      cache.key?(key)
     }.from(true).to(false)
   end
 
   it 'returns size' do
     key, value = 'foo', { test: true }
     expect {
-      memory_cache[key] = value
+      cache[key] = value
     }.to change {
-      memory_cache.size
+      cache.size
     }.from(0).to(1)
   end
 
   it 'can clear' do
     key, value = 'foo', { test: true }
-    memory_cache[key] = value
+    cache[key] = value
     expect {
-      expect(memory_cache.clear).to eq memory_cache
+      expect(cache.clear).to eq cache
     }.to change {
-      memory_cache.size
+      cache.size
     }.from(1).to(0)
   end
 
   it 'can iterate over keys under a prefix' do
-    memory_cache['foo'] = 'bar'
-    expect(memory_cache.to_a).to eq [ %w[ test-foo bar ] ]
+    cache['foo'] = 'bar'
+    expect(cache.to_a).to eq [ %w[ test-foo bar ] ]
   end
 end

data/spec/ollama/documents/redis_backed_memory_cache_spec.rb

@@ -0,0 +1,95 @@
+require 'spec_helper'
+
+RSpec.describe Ollama::Documents::RedisBackedMemoryCache do
+  it 'raises ArgumentError if url is missing' do
+    expect {
+      described_class.new prefix: 'test-', url: nil
+    }.to raise_error ArgumentError
+  end
+
+  context 'test redis interactions' do
+    let :cache do
+      described_class.new prefix: 'test-', url: 'something'
+    end
+
+    let :data do
+      cache.instance_eval { @data }
+    end
+
+    let :redis_cache do
+      cache.instance_eval { @redis_cache }
+    end
+
+    let :redis do
+      double('Redis')
+    end
+
+    before do
+      allow_any_instance_of(Ollama::Documents::RedisCache).to\
+        receive(:redis).and_return(redis)
+      allow(redis).to receive(:scan_each)
+    end
+
+    it 'can be instantiated and initialized' do
+      cache = described_class.new prefix: 'test-', url: 'something'
+      expect(cache).to be_a described_class
+    end
+
+    it 'has Redis client' do
+      expect(cache.redis).to eq redis
+    end
+
+    it 'can get a key' do
+      key = 'foo'
+      expect(data).to receive(:[]).with('test-' + key).and_return 666
+      expect(cache[key]).to eq 666
+    end
+
+    it 'can set a value for a key' do
+      key, value = 'foo', { test: true }
+      expect(data).to receive(:[]=).with('test-' + key, { test: true }).and_call_original
+      expect(redis).to receive(:set).with('test-' + key, JSON(value))
+      cache[key] = value
+    end
+
+    it 'can determine if key exists' do
+      key = 'foo'
+      expect(data).to receive(:key?).with('test-' + key).and_return(false, true)
+      expect(cache.key?('foo')).to eq false
+      expect(cache.key?('foo')).to eq true
+    end
+
+    it 'can delete' do
+      key = 'foo'
+      expect(data).to receive(:delete).with('test-' + key)
+      expect(redis).to receive(:del).with('test-' + key)
+      cache.delete(key)
+    end
+
+    it 'returns size' do
+      allow(cache).to receive(:count).and_return 3
+      expect(cache.size).to eq 3
+    end
+
+    it 'can clear' do
+      expect(redis).to receive(:scan_each).with(match: 'test-*').and_yield(
+        'test-foo'
+      )
+      expect(redis).to receive(:del).with('test-foo')
+      expect(cache.clear).to eq cache
+    end
+
+    it 'can iterate over keys under a prefix' do
+      data['test-foo'] = 'bar'
+      expect(cache.to_a).to eq [ %w[ test-foo bar ] ]
+    end
+
+    it 'can compute prefix with pre' do
+      expect(cache.pre('foo')).to eq 'test-foo'
+    end
+
+    it 'can remove prefix with unpre' do
+      expect(cache.unpre('test-foo')).to eq 'foo'
+    end
+  end
+end

data/spec/ollama/documents/redis_cache_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 RSpec.describe Ollama::Documents::RedisCache do
   it 'can be instantiated' do
-    redis_cache = described_class.new prefix: 'test-', url: 'something'
-    expect(redis_cache).to be_a described_class
+    cache = described_class.new prefix: 'test-', url: 'something'
+    expect(cache).to be_a described_class
   end
 
   it 'raises ArgumentError if url is missing' do
@@ -13,7 +13,7 @@ RSpec.describe Ollama::Documents::RedisCache do
   end
 
   context 'test redis interactions' do
-    let :redis_cache do
+    let :cache do
       described_class.new prefix: 'test-', url: 'something'
     end
 
@@ -26,32 +26,32 @@ RSpec.describe Ollama::Documents::RedisCache do
     end
 
     it 'has Redis client' do
-      expect(redis_cache.redis).to eq redis
+      expect(cache.redis).to eq redis
     end
 
     it 'can get a key' do
       key = 'foo'
-      expect(redis).to receive(:get).with('test-' + key).and_return 666
-      redis_cache[key]
+      expect(redis).to receive(:get).with('test-' + key).and_return '"some_json"'
+      expect(cache[key]).to eq 'some_json'
     end
 
     it 'can set a value for a key' do
       key, value = 'foo', { test: true }
       expect(redis).to receive(:set).with('test-' + key, JSON(value))
-      redis_cache[key] = value
+      cache[key] = value
     end
 
     it 'can determine if key exists' do
       key = 'foo'
       expect(redis).to receive(:exists?).with('test-' + key).and_return(false, true)
-      expect(redis_cache.key?('foo')).to eq false
-      expect(redis_cache.key?('foo')).to eq true
+      expect(cache.key?('foo')).to eq false
+      expect(cache.key?('foo')).to eq true
     end
 
     it 'can delete' do
       key = 'foo'
       expect(redis).to receive(:del).with('test-' + key)
-      redis_cache.delete(key)
+      cache.delete(key)
     end
 
     it 'returns size' do
@@ -59,7 +59,7 @@ RSpec.describe Ollama::Documents::RedisCache do
         and_yield('test-foo').
         and_yield('test-bar').
         and_yield('test-baz')
-      expect(redis_cache.size).to eq 3
+      expect(cache.size).to eq 3
     end
 
     it 'can clear' do
@@ -67,20 +67,20 @@ RSpec.describe Ollama::Documents::RedisCache do
         'test-foo'
       )
       expect(redis).to receive(:del).with('test-foo')
-      expect(redis_cache.clear).to eq redis_cache
+      expect(cache.clear).to eq cache
     end
 
     it 'can iterate over keys under a prefix' do
       expect(redis).to receive(:scan_each).with(match: 'test-*')
-      redis_cache.to_a
+      cache.to_a
     end
 
     it 'can compute prefix with pre' do
-      expect(redis_cache.pre('foo')).to eq 'test-foo'
+      expect(cache.pre('foo')).to eq 'test-foo'
     end
 
     it 'can remove prefix with unpre' do
-      expect(redis_cache.unpre('test-foo')).to eq 'foo'
+      expect(cache.unpre('test-foo')).to eq 'foo'
     end
   end
 end

data/spec/ollama/utils/fetcher_spec.rb

@@ -56,7 +56,8 @@ RSpec.describe Ollama::Utils::Fetcher do
       with(headers: fetcher.headers).
       to_return(status: 500)
     fetcher.get(url) do |tmp|
-      expect(tmp).to be_nil
+      expect(tmp).to be_a StringIO
+      expect(tmp.read).to eq ''
     end
   end
 

data/spec/ollama/utils/file_argument_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+RSpec.describe Ollama::Utils::FileArgument do
+  it 'it can return content' do
+    expect(described_class.get_file_argument('foo')).to eq 'foo'
+  end
+
+  it 'it can return content at path' do
+    expect(described_class.get_file_argument(asset('prompt.txt'))).to include\
+      'test prompt'
+  end
+
+  it 'it can return default content' do
+    expect(described_class.get_file_argument('', default: 'foo')).to eq 'foo'
+    expect(described_class.get_file_argument(nil, default: 'foo')).to eq 'foo'
+  end
+end

data/spec/ollama/utils/tags_spec.rb

@@ -6,7 +6,7 @@ RSpec.describe Ollama::Utils::Tags do
   end
 
   it 'can contain unique tags and is sorted' do
-    tags = described_class.new([ 'bar', 'foo'])
+    tags = described_class.new(%w[ bar foo ])
     expect(tags.to_a).to eq %w[ bar foo ]
   end
 
@@ -14,11 +14,11 @@ RSpec.describe Ollama::Utils::Tags do
     tags = described_class.new([ 'foo' ])
     tags.add 'bar'
     expect(tags.to_a).to eq %w[ bar foo ]
-    tags.merge [ 'baz', 'baz2' ]
+    tags.merge %w[ 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'
+    expect(described_class.new(%w[ foo bar ]).to_s).to eq '#bar #foo'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ollama-ruby
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-12 00:00:00.000000000 Z
+date: 2024-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: utils
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: debug
+  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: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -317,8 +331,10 @@ extra_rdoc_files:
 - 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/cache/common.rb
+- lib/ollama/documents/cache/memory_cache.rb
+- lib/ollama/documents/cache/redis_backed_memory_cache.rb
+- lib/ollama/documents/cache/redis_cache.rb
 - lib/ollama/documents/splitters/character.rb
 - lib/ollama/documents/splitters/semantic.rb
 - lib/ollama/dto.rb
@@ -381,8 +397,10 @@ files:
 - 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/cache/common.rb
+- lib/ollama/documents/cache/memory_cache.rb
+- lib/ollama/documents/cache/redis_backed_memory_cache.rb
+- lib/ollama/documents/cache/redis_cache.rb
 - lib/ollama/documents/splitters/character.rb
 - lib/ollama/documents/splitters/semantic.rb
 - lib/ollama/dto.rb
@@ -418,6 +436,7 @@ files:
 - ollama-ruby.gemspec
 - spec/assets/embeddings.json
 - spec/assets/kitten.jpg
+- spec/assets/prompt.txt
 - spec/ollama/client/doc_spec.rb
 - spec/ollama/client_spec.rb
 - spec/ollama/commands/chat_spec.rb
@@ -433,6 +452,7 @@ files:
 - spec/ollama/commands/show_spec.rb
 - spec/ollama/commands/tags_spec.rb
 - spec/ollama/documents/memory_cache_spec.rb
+- spec/ollama/documents/redis_backed_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
@@ -452,6 +472,7 @@ files:
 - spec/ollama/tool_spec.rb
 - spec/ollama/utils/ansi_markdown_spec.rb
 - spec/ollama/utils/fetcher_spec.rb
+- spec/ollama/utils/file_argument_spec.rb
 - spec/ollama/utils/tags_spec.rb
 - spec/spec_helper.rb
 - tmp/.keep
@@ -498,6 +519,7 @@ test_files:
 - spec/ollama/commands/show_spec.rb
 - spec/ollama/commands/tags_spec.rb
 - spec/ollama/documents/memory_cache_spec.rb
+- spec/ollama/documents/redis_backed_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
@@ -517,5 +539,6 @@ test_files:
 - spec/ollama/tool_spec.rb
 - spec/ollama/utils/ansi_markdown_spec.rb
 - spec/ollama/utils/fetcher_spec.rb
+- spec/ollama/utils/file_argument_spec.rb
 - spec/ollama/utils/tags_spec.rb
 - spec/spec_helper.rb