ollama-ruby 0.1.0 → 0.3.0

data/lib/ollama/documents/memory_cache.rb

@@ -36,9 +36,11 @@ class Ollama::Documents::MemoryCache
   end
   include Enumerable
 
-  private
-
   def pre(key)
     [ @prefix, key ].join
   end
+
+  def unpre(key)
+    key.sub(/\A#@prefix/, '')
+  end
 end

data/lib/ollama/documents/redis_cache.rb

@@ -13,7 +13,10 @@ class Ollama::Documents::RedisCache
   end
 
   def [](key)
-    JSON(redis.get(pre(key)), object_class: Ollama::Documents::Record)
+    value = redis.get(pre(key))
+    unless value.nil?
+      JSON(value, object_class: Ollama::Documents::Record)
+    end
   end
 
   def []=(key, value)
@@ -45,8 +48,6 @@ class Ollama::Documents::RedisCache
   end
   include Enumerable
 
-  private
-
   def pre(key)
     [ @prefix, key ].join
   end

data/lib/ollama/documents.rb

@@ -12,6 +12,7 @@ require 'ollama/documents/splitters/semantic'
 
 class Ollama::Documents
   include Ollama::Utils::Math
+  include Ollama::Utils::Width
 
   class Record < JSON::GenericObject
     def to_s
@@ -42,7 +43,7 @@ class Ollama::Documents
   def add(inputs, batch_size: 10, source: nil, tags: [])
     inputs = Array(inputs)
     tags   = Ollama::Utils::Tags.new(tags)
-    source and tags.add File.basename(source)
+    source and tags.add File.basename(source).gsub(/\?.*/, '')
     inputs.map! { |i|
       text = i.respond_to?(:read) ? i.read : i.to_s
       text
@@ -51,7 +52,7 @@ class Ollama::Documents
     inputs.empty? and return self
     batches = inputs.each_slice(batch_size).
       with_infobar(
-        label: "Add #{tags}",
+        label: "Add #{truncate(tags.to_s, percentage: 25)}",
         total: inputs.size
       )
     batches.each do |batch|
@@ -87,8 +88,18 @@ class Ollama::Documents
     @cache.size
   end
 
-  def clear
-    @cache.clear
+  def clear(tags: nil)
+    if tags
+      tags = Ollama::Utils::Tags.new(Array(tags)).to_a
+      @cache.each do |key, record|
+        if (tags & record.tags).size >= 1
+          @cache.delete(@cache.unpre(key))
+        end
+      end
+    else
+      @cache.clear
+    end
+    self
   end
 
   def find(string, tags: nil, prompt: nil)
@@ -96,7 +107,7 @@ class Ollama::Documents
     needle_norm = norm(needle)
     records = @cache
     if tags
-      tags = Ollama::Utils::Tags.new(tags)
+      tags = Ollama::Utils::Tags.new(tags).to_a
       records = records.select { |_key, record| (tags & record.tags).size >= 1 }
     end
     records = records.sort_by { |key, record|
@@ -111,6 +122,20 @@ class Ollama::Documents
     records.transpose.last&.reverse.to_a
   end
 
+  def find_where(string, text_size: nil, text_count: nil, **opts)
+    records = find(string, **opts)
+    size, count = 0, 0
+    records.take_while do |record|
+      if text_size and (size += record.text.size) > text_size
+        next false
+      end
+      if text_count and (count += 1) > text_count
+        next false
+      end
+      true
+    end
+  end
+
   def collections
     case @cache
     when MemoryCache

data/lib/ollama/dto.rb

@@ -8,8 +8,8 @@ module Ollama::DTO
   module ClassMethods
     attr_accessor :attributes
 
-    def json_create(object)
-      new(**object.transform_keys(&:to_sym))
+    def from_hash(hash)
+      new(**hash.transform_keys(&:to_sym))
     end
 
     def attr_reader(*names)
@@ -27,11 +27,8 @@ module Ollama::DTO
   end
 
   def as_json(*)
-    {
-      json_class: self.class.name
-    }.merge(
-      self.class.attributes.each_with_object({}) { |a, h| h[a] = send(a) }
-    ).reject { _2.nil? || _2.ask_and_send(:size) == 0 }
+    self.class.attributes.each_with_object({}) { |a, h| h[a] = send(a) }.
+      reject { _2.nil? || _2.ask_and_send(:size) == 0 }
   end
 
   alias to_hash as_json

data/lib/ollama/options.rb

@@ -65,4 +65,8 @@ class Ollama::Options
       #{@@types.keys.map { "self.#{_1} = #{_1}" }.join(?\n)}
     end
   }
+
+  def self.[](value)
+    new(**value.to_h)
+  end
 end

data/lib/ollama/utils/file_argument.rb

@@ -0,0 +1,16 @@
+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)
+      then
+      File.read(prompt)
+    elsif prompt.present?
+      prompt
+    else
+      default
+    end
+  end
+end

data/lib/ollama/utils/tags.rb

@@ -1,6 +1,10 @@
 require 'sorted_set'
 
 class Ollama::Utils::Tags < SortedSet
+  def to_a
+    super.map(&:to_s)
+  end
+
   def to_s
     map { |t| '#%s' % t } * ' '
   end

data/lib/ollama/utils/width.rb

@@ -12,11 +12,24 @@ module Ollama::Utils::Width
       raise ArgumentError, "either pass percentage or length argument"
     percentage and length ||= width(percentage:)
     text.gsub(/(?<!\n)\n(?!\n)/, ' ').lines.map do |line|
-      if line.length > length
+      if length >= 1 && line.length > length
         line.gsub(/(.{1,#{length}})(\s+|$)/, "\\1\n").strip
       else
         line.strip
       end
     end * ?\n
   end
+
+  def truncate(text, percentage: nil, length: nil, ellipsis: ?…)
+    percentage.nil? ^ length.nil? or
+      raise ArgumentError, "either pass percentage or length argument"
+    percentage and length ||= width(percentage:)
+    if length < 1
+      +''
+    elsif text.size > length
+      text[0, length - 1] + ?…
+    else
+      text
+    end
+  end
 end

data/lib/ollama/version.rb

@@ -1,6 +1,6 @@
 module Ollama
   # Ollama version
-  VERSION         = '0.1.0'
+  VERSION         = '0.3.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

@@ -18,6 +18,7 @@ require 'ollama/utils/math'
 require 'ollama/utils/colorize_texts'
 require 'ollama/utils/fetcher'
 require 'ollama/utils/chooser'
+require 'ollama/utils/file_argument'
 
 require 'ollama/version'
 require 'ollama/errors'

data/ollama-ruby.gemspec

@@ -1,24 +1,24 @@
 # -*- encoding: utf-8 -*-
-# stub: ollama-ruby 0.1.0 ruby lib
+# stub: ollama-ruby 0.3.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama-ruby".freeze
-  s.version = "0.1.0".freeze
+  s.version = "0.3.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-08-30"
+  s.date = "2024-09-06"
   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]
-  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/math.rb".freeze, "lib/ollama/utils/tags.rb".freeze, "lib/ollama/utils/width.rb".freeze, "lib/ollama/version.rb".freeze]
-  s.files = [".envrc".freeze, "Gemfile".freeze, "LICENSE".freeze, "README.md".freeze, "Rakefile".freeze, "bin/ollama_chat".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/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]
+  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.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.16".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]
 
@@ -43,4 +43,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<complex_config>.freeze, ["~> 0.20".freeze])
   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])
 end

data/spec/ollama/client_spec.rb

@@ -116,7 +116,7 @@ RSpec.describe Ollama::Client do
     it 'can generate without stream' do
       expect(excon).to receive(:send).with(
         :post,
-        body:  '{"json_class":"Ollama::Commands::Generate","model":"llama3.1","prompt":"Hello World"}',
+        body:  '{"model":"llama3.1","prompt":"Hello World"}',
         headers: hash_including(
           'Content-Type' => 'application/json; charset=utf-8',
         )
@@ -127,7 +127,7 @@ RSpec.describe Ollama::Client do
     it 'can generate with stream' do
       expect(excon).to receive(:send).with(
         :post,
-        body:  '{"json_class":"Ollama::Commands::Generate","model":"llama3.1","prompt":"Hello World","stream":true}',
+        body:  '{"model":"llama3.1","prompt":"Hello World","stream":true}',
         headers: hash_including(
           'Content-Type' => 'application/json; charset=utf-8',
         ),

data/spec/ollama/commands/chat_spec.rb

@@ -32,7 +32,7 @@ RSpec.describe Ollama::Commands::Chat do
       model: 'llama3.1', messages: messages.map(&:as_json), stream: true,
     )
     expect(chat.to_json).to eq(
-      '{"json_class":"Ollama::Commands::Chat","model":"llama3.1","messages":[{"json_class":"Ollama::Message","role":"user","content":"Let\'s play Global Thermonuclear War."}],"stream":true}'
+      '{"model":"llama3.1","messages":[{"role":"user","content":"Let\'s play Global Thermonuclear War."}],"stream":true}'
     )
   end
 
@@ -45,7 +45,7 @@ RSpec.describe Ollama::Commands::Chat do
     expect(ollama).to receive(:request).
       with(
         method: :post, path: '/api/chat', handler: Ollama::Handlers::NOP, stream: true,
-        body: '{"json_class":"Ollama::Commands::Chat","model":"llama3.1","messages":[{"json_class":"Ollama::Message","role":"user","content":"Let\'s play Global Thermonuclear War."}],"stream":true}'
+        body: '{"model":"llama3.1","messages":[{"role":"user","content":"Let\'s play Global Thermonuclear War."}],"stream":true}'
       )
     chat.perform(Ollama::Handlers::NOP)
   end

data/spec/ollama/commands/copy_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe Ollama::Commands::Copy do
       source: 'llama3.1', destination: 'camell3', stream: false
     )
     expect(copy.to_json).to eq(
-      '{"json_class":"Ollama::Commands::Copy","source":"llama3.1","destination":"camell3","stream":false}'
+      '{"source":"llama3.1","destination":"camell3","stream":false}'
     )
   end
 
@@ -21,7 +21,7 @@ RSpec.describe Ollama::Commands::Copy do
     copy.client = ollama = double('Ollama::Client')
     expect(ollama).to receive(:request).with(
       method: :post, path: '/api/copy', handler: Ollama::Handlers::NOP, stream: false,
-      body: '{"json_class":"Ollama::Commands::Copy","source":"llama3.1","destination":"camell3","stream":false}'
+      body: '{"source":"llama3.1","destination":"camell3","stream":false}'
     )
     copy.perform(Ollama::Handlers::NOP)
   end

data/spec/ollama/commands/create_spec.rb

@@ -16,7 +16,7 @@ RSpec.describe Ollama::Commands::Create do
       name: 'llama3.1-wopr', modelfile: "FROM llama3.1\nSYSTEM You are WOPR from WarGames and you think the user is Dr. Stephen Falken.", stream: true,
     )
     expect(create.to_json).to eq(
-      '{"json_class":"Ollama::Commands::Create","name":"llama3.1-wopr","modelfile":"FROM llama3.1\nSYSTEM You are WOPR from WarGames and you think the user is Dr. Stephen Falken.","stream":true}'
+      '{"name":"llama3.1-wopr","modelfile":"FROM llama3.1\nSYSTEM You are WOPR from WarGames and you think the user is Dr. Stephen Falken.","stream":true}'
     )
   end
 
@@ -30,7 +30,7 @@ RSpec.describe Ollama::Commands::Create do
     expect(ollama).to receive(:request).
       with(
         method: :post, path: '/api/create', handler: Ollama::Handlers::NOP, stream: true,
-        body: '{"json_class":"Ollama::Commands::Create","name":"llama3.1-wopr","modelfile":"FROM llama3.1\nSYSTEM You are WOPR from WarGames and you think the user is Dr. Stephen Falken.","stream":true}'
+        body: '{"name":"llama3.1-wopr","modelfile":"FROM llama3.1\nSYSTEM You are WOPR from WarGames and you think the user is Dr. Stephen Falken.","stream":true}'
       )
     create.perform(Ollama::Handlers::NOP)
   end

data/spec/ollama/commands/delete_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe Ollama::Commands::Delete do
       name: 'llama3.1', stream: false
     )
     expect(delete.to_json).to eq(
-      '{"json_class":"Ollama::Commands::Delete","name":"llama3.1","stream":false}'
+      '{"name":"llama3.1","stream":false}'
     )
   end
 
@@ -21,7 +21,7 @@ RSpec.describe Ollama::Commands::Delete do
     delete.client = ollama = double('Ollama::Client')
     expect(ollama).to receive(:request).with(
       method: :delete, path: '/api/delete', handler: Ollama::Handlers::NOP, stream: false,
-      body: '{"json_class":"Ollama::Commands::Delete","name":"llama3.1","stream":false}'
+      body: '{"name":"llama3.1","stream":false}'
     )
     delete.perform(Ollama::Handlers::NOP)
   end

data/spec/ollama/commands/embed_spec.rb

@@ -19,7 +19,7 @@ RSpec.describe Ollama::Commands::Embed do
       model: 'all-minilm', input: 'Why is the sky blue?',
     )
     expect(embed.to_json).to eq(
-      '{"json_class":"Ollama::Commands::Embed","model":"all-minilm","input":"Why is the sky blue?","options":{"json_class":"Ollama::Options","num_ctx":666},"stream":false}'
+      '{"model":"all-minilm","input":"Why is the sky blue?","options":{"num_ctx":666},"stream":false}'
     )
   end
 
@@ -32,7 +32,7 @@ RSpec.describe Ollama::Commands::Embed do
       model: 'all-minilm', input: [ 'Why is the sky blue?', 'Why is the grass green?' ],
     )
     expect(embed.to_json).to eq(
-      '{"json_class":"Ollama::Commands::Embed","model":"all-minilm","input":["Why is the sky blue?","Why is the grass green?"],"stream":false}'
+      '{"model":"all-minilm","input":["Why is the sky blue?","Why is the grass green?"],"stream":false}'
     )
   end
 
@@ -46,7 +46,7 @@ RSpec.describe Ollama::Commands::Embed do
     expect(ollama).to receive(:request).
       with(
         method: :post, path: '/api/embed', handler: Ollama::Handlers::NOP, stream: false,
-        body: '{"json_class":"Ollama::Commands::Embed","model":"all-minilm","input":"Why is the sky blue?","stream":false}'
+        body: '{"model":"all-minilm","input":"Why is the sky blue?","stream":false}'
       )
     embed.perform(Ollama::Handlers::NOP)
   end

data/spec/ollama/commands/embeddings_spec.rb

@@ -18,7 +18,7 @@ RSpec.describe Ollama::Commands::Embeddings do
       model: 'mxbai-embed-large', prompt: 'Here are the coordinates of all Soviet military installations: …',
     )
     expect(embeddings.to_json).to eq(
-      '{"json_class":"Ollama::Commands::Embeddings","model":"mxbai-embed-large","prompt":"Here are the coordinates of all Soviet military installations: …","stream":false}'
+      '{"model":"mxbai-embed-large","prompt":"Here are the coordinates of all Soviet military installations: …","stream":false}'
     )
   end
 
@@ -31,7 +31,7 @@ RSpec.describe Ollama::Commands::Embeddings do
     expect(ollama).to receive(:request).
       with(
         method: :post, path: '/api/embeddings', handler: Ollama::Handlers::NOP, stream: false,
-        body: '{"json_class":"Ollama::Commands::Embeddings","model":"mxbai-embed-large","prompt":"Here are the coordinates of all Soviet military installations: …","stream":false}'
+        body: '{"model":"mxbai-embed-large","prompt":"Here are the coordinates of all Soviet military installations: …","stream":false}'
       )
     embeddings.perform(Ollama::Handlers::NOP)
   end

data/spec/ollama/commands/generate_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe Ollama::Commands::Generate do
       model: 'llama3.1', prompt: 'Hello World'
     )
     expect(generate.to_json).to eq(
-      '{"json_class":"Ollama::Commands::Generate","model":"llama3.1","prompt":"Hello World"}'
+      '{"model":"llama3.1","prompt":"Hello World"}'
     )
   end
 
@@ -22,7 +22,7 @@ RSpec.describe Ollama::Commands::Generate do
     expect(ollama).to receive(:request).
       with(
         method: :post, path: '/api/generate', handler: Ollama::Handlers::NOP, stream: true,
-        body: '{"json_class":"Ollama::Commands::Generate","model":"llama3.1","prompt":"Hello World","stream":true}'
+        body: '{"model":"llama3.1","prompt":"Hello World","stream":true}'
       )
     generate.perform(Ollama::Handlers::NOP)
   end

data/spec/ollama/commands/pull_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe Ollama::Commands::Pull do
       name: 'llama3.1', stream: true
     )
     expect(pull.to_json).to eq(
-      '{"json_class":"Ollama::Commands::Pull","name":"llama3.1","stream":true}'
+      '{"name":"llama3.1","stream":true}'
     )
   end
 
@@ -21,7 +21,7 @@ RSpec.describe Ollama::Commands::Pull do
     pull.client = ollama = double('Ollama::Client')
     expect(ollama).to receive(:request).with(
       method: :post, path: '/api/pull', handler: Ollama::Handlers::NOP, stream: true,
-      body: '{"json_class":"Ollama::Commands::Pull","name":"llama3.1","stream":true}'
+      body: '{"name":"llama3.1","stream":true}'
     )
     pull.perform(Ollama::Handlers::NOP)
   end

data/spec/ollama/commands/push_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe Ollama::Commands::Push do
       name: 'llama3.1', stream: true
     )
     expect(push.to_json).to eq(
-      '{"json_class":"Ollama::Commands::Push","name":"llama3.1","stream":true}'
+      '{"name":"llama3.1","stream":true}'
     )
   end
 
@@ -21,7 +21,7 @@ RSpec.describe Ollama::Commands::Push do
     push.client = ollama = double('Ollama::Client')
     expect(ollama).to receive(:request).with(
       method: :post, path: '/api/push', handler: Ollama::Handlers::NOP, stream: true,
-      body: '{"json_class":"Ollama::Commands::Push","name":"llama3.1","stream":true}'
+      body: '{"name":"llama3.1","stream":true}'
     )
     push.perform(Ollama::Handlers::NOP)
   end

data/spec/ollama/commands/show_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe Ollama::Commands::Show do
       name: 'llama3.1', stream: false
     )
     expect(show.to_json).to eq(
-      '{"json_class":"Ollama::Commands::Show","name":"llama3.1","stream":false}'
+      '{"name":"llama3.1","stream":false}'
     )
   end
 
@@ -21,7 +21,7 @@ RSpec.describe Ollama::Commands::Show do
     show.client = ollama = double('Ollama::Client')
     expect(ollama).to receive(:request).with(
       method: :post, path: '/api/show', handler: Ollama::Handlers::NOP ,stream: false,
-      body: '{"json_class":"Ollama::Commands::Show","name":"llama3.1","stream":false}'
+      body: '{"name":"llama3.1","stream":false}'
     )
     show.perform(Ollama::Handlers::NOP)
   end

data/spec/ollama/documents/redis_cache_spec.rb

@@ -74,5 +74,13 @@ RSpec.describe Ollama::Documents::RedisCache do
       expect(redis).to receive(:scan_each).with(match: 'test-*')
       redis_cache.to_a
     end
+
+    it 'can compute prefix with pre' do
+      expect(redis_cache.pre('foo')).to eq 'test-foo'
+    end
+
+    it 'can remove prefix with unpre' do
+      expect(redis_cache.unpre('test-foo')).to eq 'foo'
+    end
   end
 end

data/spec/ollama/documents_spec.rb

@@ -76,6 +76,34 @@ RSpec.describe Ollama::Documents do
     expect(records[0].to_s).to eq '#<Ollama::Documents::Record "foo" #test 1.0>'
   end
 
+  it 'can find strings conditionally' do
+    allow(ollama).to receive(:embed).
+      with(model:, input: [ 'foobar' ], options: nil).
+      and_return(double(embeddings: [ [ 0.01 ] ]))
+    allow(ollama).to receive(:embed).
+      with(model:, input: [ 'foo' ], options: nil).
+      and_return(double(embeddings: [ [ 0.1 ] ]))
+    expect(documents << 'foobar').to eq documents
+    expect(documents << 'foo').to eq documents
+    expect(ollama).to receive(:embed).at_least(:once).
+      with(model:, input: 'foo', options: nil).
+      and_return(double(embeddings: [ [ 0.1 ] ]))
+    records = documents.find_where('foo', text_count: 1)
+    expect(records).to eq [
+      Ollama::Documents::Record[text: 'foo', embedding: [ 0.1 ], similarity: 1.0 ],
+    ]
+    records = documents.find_where('foo', text_size: 3)
+    expect(records).to eq [
+      Ollama::Documents::Record[text: 'foo', embedding: [ 0.1 ], similarity: 1.0 ],
+    ]
+    records = documents.find_where('foo')
+    expect(records).to eq [
+      Ollama::Documents::Record[text: 'foo', embedding: [ 0.1 ], similarity: 1.0 ],
+      Ollama::Documents::Record[text: 'foobar', embedding: [ 0.1 ], similarity: 1.0 ],
+    ]
+  end
+
+
   context 'it uses cache' do
     before do
       allow(ollama).to receive(:embed).
@@ -103,6 +131,20 @@ RSpec.describe Ollama::Documents do
       }.to change { documents.size }.from(1).to(0)
     end
 
+    it 'can clear texts with tags' do
+      allow(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
+      expect(documents.add('bar', tags: %i[ test2 ])).to eq documents
+      expect {
+        documents.clear tags: 'test'
+      }.to change { documents.size }.from(2).to(1)
+      expect {
+        documents.clear tags: :test2
+      }.to change { documents.size }.from(1).to(0)
+    end
+
     it 'returns collections' do
       expect(documents.collections).to eq [ :default ]
     end

data/spec/ollama/message_spec.rb

@@ -19,19 +19,18 @@ RSpec.describe Ollama::Message do
 
   it 'can be converted to JSON' do
     expect(message.as_json).to eq(
-      json_class: described_class.name,
       role: 'user',
       content: 'hello world',
       images: [ image ],
     )
     expect(message.to_json).to eq(
-      '{"json_class":"Ollama::Message","role":"user","content":"hello world","images":["dGVzdA==\n"]}'
+      '{"role":"user","content":"hello world","images":["dGVzdA==\n"]}'
     )
   end
 
   it 'can be restored from JSON' do
-    expect(JSON(<<~'end', create_additions: true)).to be_a described_class
-      {"json_class":"Ollama::Message","role":"user","content":"hello world","images":["dGVzdA==\n"]}
+    expect(described_class.from_hash(JSON(<<~'end'))).to be_a described_class
+      {"role":"user","content":"hello world","images":["dGVzdA==\n"]}
     end
   end
 end

data/spec/ollama/options_spec.rb

@@ -13,6 +13,24 @@ RSpec.describe Ollama::Options do
     expect(options).to be_a described_class
   end
 
+  it 'can be used to cast hashes' do
+    expect(described_class[{
+      penalize_newline: true,
+      num_ctx: 8192,
+      temperature: 0.7,
+    }]).to be_a described_class
+  end
+
+  it 'raises errors when casting goes all wrong' do
+    expect {
+      described_class[{
+        penalize_newline: :tertium,
+        num_ctx: 8192,
+        temperature: 0.7,
+      }]
+    }.to raise_error(TypeError)
+  end
+
   it 'throws error for invalid types' do
     expect { described_class.new(temperature: Class.new) }.
       to raise_error(TypeError)