ollama-ruby 0.6.0 → 0.8.0

data/lib/ollama/utils/fetcher.rb

@@ -6,9 +6,11 @@ require 'stringio'
 require 'ollama/utils/cache_fetcher'
 
 class Ollama::Utils::Fetcher
-  module ContentType
+  module HeaderExtension
     attr_accessor :content_type
 
+    attr_accessor :ex
+
     def self.failed
       object = StringIO.new.extend(self)
       object.content_type = MIME::Types['text/plain'].first
@@ -22,7 +24,7 @@ class Ollama::Utils::Fetcher
     cache = options.delete(:cache) and
       cache = Ollama::Utils::CacheFetcher.new(cache)
     if result = cache&.get(url, &block)
-      infobar.puts "Getting #{url.inspect} from cache."
+      infobar.puts "Getting #{url.to_s.inspect} from cache."
       return result
     else
       new(**options).send(:get, url) do |tmp|
@@ -39,10 +41,12 @@ class Ollama::Utils::Fetcher
   def self.read(filename, &block)
     if File.exist?(filename)
       File.open(filename) do |file|
-        file.extend(Ollama::Utils::Fetcher::ContentType)
+        file.extend(Ollama::Utils::Fetcher::HeaderExtension)
         file.content_type = MIME::Types.type_for(filename).first
         block.(file)
       end
+    else
+      STDERR.puts "File #{filename.to_s.inspect} doesn't exist."
     end
   end
 
@@ -50,10 +54,10 @@ class Ollama::Utils::Fetcher
     Tempfile.open do |tmp|
       IO.popen(command) do |command|
         until command.eof?
-          tmp.write command.read(4096)
+          tmp.write command.read(1 << 14)
         end
         tmp.rewind
-        tmp.extend(Ollama::Utils::Fetcher::ContentType)
+        tmp.extend(Ollama::Utils::Fetcher::HeaderExtension)
         tmp.content_type = MIME::Types['text/plain'].first
         block.(tmp)
       end
@@ -63,7 +67,7 @@ class Ollama::Utils::Fetcher
     if @debug && !e.is_a?(RuntimeError)
       STDERR.puts "#{e.backtrace * ?\n}"
     end
-    yield ContentType.failed
+    yield HeaderExtension.failed
   end
 
   def initialize(debug: false, http_options: {})
@@ -110,7 +114,7 @@ class Ollama::Utils::Fetcher
     if @debug && !e.is_a?(RuntimeError)
       STDERR.puts "#{e.backtrace * ?\n}"
     end
-    yield ContentType.failed
+    yield HeaderExtension.failed
   end
 
   def headers
@@ -123,12 +127,20 @@ class Ollama::Utils::Fetcher
     (Excon.defaults[:middlewares] + [ Excon::Middleware::RedirectFollower ]).uniq
   end
 
+  private
+
   def decorate_io(tmp, response)
     tmp.rewind
-    tmp.extend(ContentType)
+    tmp.extend(HeaderExtension)
     if content_type = MIME::Types[response.headers['content-type']].first
       tmp.content_type = content_type
     end
+    if cache_control = response.headers['cache-control'] and
+        cache_control !~ /no-store|no-cache/ and
+        ex = cache_control[/s-maxage\s*=\s*(\d+)/, 1] || cache_control[/max-age\s*=\s*(\d+)/, 1]
+    then
+      tmp.ex = ex.to_i
+    end
   end
 
   def callback(tmp)

data/lib/ollama/utils/tags.rb

@@ -1,12 +1,66 @@
-require 'sorted_set'
+class Ollama::Utils::Tags
+  class Tag < String
+    include Term::ANSIColor
 
+    def initialize(tag, source: nil)
+      super(tag.to_s)
+      self.source = source
+    end
 
-class Ollama::Utils::Tags < SortedSet
-  def to_a
-    super.map(&:to_s)
+    attr_accessor :source
+
+    alias_method :internal, :to_s
+
+    def to_s(link: true)
+      tag_string = start_with?(?#) ? super() : ?# + super()
+      my_source  = source
+      if link && my_source
+        unless my_source =~ %r(\A(https?|file)://)
+          my_source = 'file://%s' % File.expand_path(my_source)
+        end
+        hyperlink(my_source) { tag_string }
+      else
+        tag_string
+      end
+    end
+  end
+
+  def initialize(tags = [], source: nil)
+    @set = []
+    tags.each { |tag| add(tag, source:) }
+  end
+
+  def add(tag, source: nil)
+    unless tag.is_a?(Tag)
+      tag = Tag.new(tag, source:)
+    end
+    index = @set.bsearch_index { _1 >= tag }
+    if index == nil
+      @set.push(tag)
+    elsif @set.at(index) != tag
+      @set.insert(index, tag)
+    end
+    self
+  end
+
+  def empty?
+    @set.empty?
+  end
+
+  def size
+    @set.size
+  end
+
+  def clear
+    @set.clear
+  end
+
+  def each(&block)
+    @set.each(&block)
   end
+  include Enumerable
 
-  def to_s
-    map { |t| '#%s' % t } * ' '
+  def to_s(link: true)
+    @set.map { |tag| tag.to_s(link:) } * ' '
   end
 end

data/lib/ollama/utils/width.rb

@@ -2,6 +2,7 @@ require 'tins/terminal'
 
 module Ollama::Utils::Width
   include Term::ANSIColor
+  extend Term::ANSIColor
 
   module_function
 
@@ -26,10 +27,11 @@ module Ollama::Utils::Width
     percentage.nil? ^ length.nil? or
       raise ArgumentError, "either pass percentage or length argument"
     percentage and length ||= width(percentage:)
-    if length < 1
+    ellipsis_length = ellipsis.size
+    if length < ellipsis_length
       +''
-    elsif text.size > length
-      text[0, length - 1] + ?…
+    elsif text.size >= length + ellipsis_length
+      text[0, length - ellipsis_length] + ellipsis
     else
       text
     end

data/lib/ollama/version.rb

@@ -1,6 +1,6 @@
 module Ollama
   # Ollama version
-  VERSION         = '0.6.0'
+  VERSION         = '0.8.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,6 +1,10 @@
 require 'json'
 require 'logger'
 require 'excon'
+require 'tins'
+require 'tins/xt/full'
+require 'tins/xt/hash_union'
+require 'tins/xt/string_camelize'
 
 module Ollama
 end

data/ollama-ruby.gemspec

@@ -1,26 +1,26 @@
 # -*- encoding: utf-8 -*-
-# stub: ollama-ruby 0.6.0 ruby lib
+# stub: ollama-ruby 0.8.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama-ruby".freeze
-  s.version = "0.6.0".freeze
+  s.version = "0.8.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-30"
+  s.date = "2024-10-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, "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/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.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/ollama/utils/width_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/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.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/ollama/utils/width_spec.rb".freeze, "spec/spec_helper.rb".freeze]
 
   s.specification_version = 4
 
@@ -38,7 +38,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<redis>.freeze, ["~> 5.0".freeze])
   s.add_runtime_dependency(%q<numo-narray>.freeze, ["~> 0.9".freeze])
   s.add_runtime_dependency(%q<more_math>.freeze, ["~> 1.1".freeze])
-  s.add_runtime_dependency(%q<sorted_set>.freeze, ["~> 1.0".freeze])
   s.add_runtime_dependency(%q<mime-types>.freeze, ["~> 3.0".freeze])
   s.add_runtime_dependency(%q<reverse_markdown>.freeze, ["~> 2.0".freeze])
   s.add_runtime_dependency(%q<complex_config>.freeze, ["~> 0.22".freeze])
@@ -48,4 +47,5 @@ Gem::Specification.new do |s|
   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])
+  s.add_runtime_dependency(%q<tins>.freeze, ["~> 1.34".freeze])
 end

data/spec/ollama/image_spec.rb

@@ -9,6 +9,11 @@ RSpec.describe Ollama::Image do
     expect(image).to be_a described_class
   end
 
+  it 'can be equal or not' do
+    expect(image).not_to eq described_class.for_string('')
+    expect(image).to eq described_class.for_filename(asset('kitten.jpg'))
+  end
+
   it 'cannot be created via .new' do
     expect {
       described_class.new('nix')

data/spec/ollama/utils/cache_fetcher_spec.rb

@@ -33,10 +33,11 @@ RSpec.describe Ollama::Utils::CacheFetcher do
 
   it 'has #put' do
     io = StringIO.new('world')
-    io.extend(Ollama::Utils::Fetcher::ContentType)
+    io.extend(Ollama::Utils::Fetcher::HeaderExtension)
     io.content_type = MIME::Types['text/plain'].first
-    expect(cache).to receive(:[]=).with('body-69ce405ab83f42dffa9fd22bbd47783f', 'world')
-    expect(cache).to receive(:[]=).with('content_type-69ce405ab83f42dffa9fd22bbd47783f', 'text/plain')
+    io.ex = 666
+    expect(cache).to receive(:set).with('body-69ce405ab83f42dffa9fd22bbd47783f', 'world', ex: 666)
+    expect(cache).to receive(:set).with('content_type-69ce405ab83f42dffa9fd22bbd47783f', 'text/plain', ex: 666)
     fetcher.put(url, io)
   end
 end

data/spec/ollama/utils/tags_spec.rb

@@ -14,11 +14,35 @@ 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 %w[ baz baz2 ]
-    expect(tags.to_a).to eq %w[ bar baz baz2 foo ]
+  end
+
+  it 'can increase in size' do
+    tags = described_class.new
+    expect { tags.add 'foo' }.to change { tags.size }.from(0).to(1)
+    expect { tags.add 'bar' }.to change { tags.size }.from(1).to(2)
+  end
+
+  it 'can be cleared' do
+    tags = described_class.new([ 'foo', 'bar' ])
+    expect { tags.clear }.to change { tags.size }.from(2).to(0)
+  end
+
+  it 'tags can be empt' do
+    tags = described_class.new([ 'foo' ])
+    expect { tags.clear }.to change { tags.empty? }.from(false).to(true)
   end
 
   it 'can be output nicely' do
     expect(described_class.new(%w[ foo bar ]).to_s).to eq '#bar #foo'
   end
+
+  it 'can be output nicely with links to source' do
+    tags = described_class.new([ 'foo' ], source: 'https://foo.example.com')
+    tags.add 'bar', source: '/path/to/bar.html'
+    expect(tags.to_a).to eq %w[ bar foo ]
+    tags.all? { expect(_1).to be_a(Ollama::Utils::Tags::Tag) }
+    expect(tags.to_s).to eq(
+      "\e]8;;file:///path/to/bar.html\e\\#bar\e]8;;\e\\ \e]8;;https://foo.example.com\e\\#foo\e]8;;\e\\"
+    )
+  end
 end

data/spec/ollama/utils/width_spec.rb

@@ -0,0 +1,82 @@
+require 'spec_helper'
+
+RSpec.describe Ollama::Utils::Width do
+  before do
+    allow(Tins::Terminal).to receive(:columns).and_return 80
+  end
+
+  describe '.width' do
+    it 'defaults to 100%' do
+      expect(described_class.width).to eq 80
+    end
+
+    it 'can be to 80%' do
+      expect(described_class.width(percentage: 80)).to eq 64
+    end
+  end
+
+  describe '.wrap' do
+    it 'can wrap with percentage' do
+      wrapped = described_class.wrap([ ?A * 10 ] * 10 * ' ', percentage: 80)
+      expect(wrapped).to eq(
+        "AAAAAAAAAA AAAAAAAAAA AAAAAAAAAA AAAAAAAAAA AAAAAAAAAA\n"\
+        "AAAAAAAAAA AAAAAAAAAA AAAAAAAAAA AAAAAAAAAA AAAAAAAAAA"
+      )
+      expect(wrapped.size).to eq 109
+    end
+
+    it 'can wrap with length' do
+      wrapped = described_class.wrap([ ?A * 10 ] * 10 * ' ', length: 64)
+      expect(wrapped).to eq(
+        "AAAAAAAAAA AAAAAAAAAA AAAAAAAAAA AAAAAAAAAA AAAAAAAAAA\n"\
+        "AAAAAAAAAA AAAAAAAAAA AAAAAAAAAA AAAAAAAAAA AAAAAAAAAA"
+      )
+      expect(wrapped.size).to eq 109
+    end
+
+    it "doesn't wrap with length 0" do
+      wrapped = described_class.wrap([ ?A * 10 ] * 10 * ' ', length: 0)
+      expect(wrapped).to eq(
+        "AAAAAAAAAA AAAAAAAAAA AAAAAAAAAA AAAAAAAAAA AAAAAAAAAA "\
+        "AAAAAAAAAA AAAAAAAAAA AAAAAAAAAA AAAAAAAAAA AAAAAAAAAA"
+      )
+    end
+  end
+
+  describe '.truncate' do
+    it 'can truncate with percentage' do
+      truncated = described_class.truncate([ ?A * 10 ] * 10 * ' ', percentage: 80)
+      expect(truncated).to eq(
+        "AAAAAAAAAA AAAAAAAAAA AAAAAAAAAA AAAAAAAAAA AAAAAAAAAA AAAAAAAA…"
+      )
+      expect(truncated.size).to eq 64
+    end
+
+    it 'can truncate with length' do
+      truncated = described_class.truncate([ ?A * 10 ] * 10 * ' ', length: 64)
+      expect(truncated).to eq(
+        "AAAAAAAAAA AAAAAAAAAA AAAAAAAAAA AAAAAAAAAA AAAAAAAAAA AAAAAAAA…"
+      )
+      expect(truncated.size).to eq 64
+    end
+
+    it 'cannot truncate if not necessary' do
+      text = [ ?A * 10 ] * 5 * ' '
+      truncated = described_class.truncate(text, length: 54)
+      expect(truncated).to eq text
+    end
+
+    it 'can truncate with length 0' do
+      truncated = described_class.truncate([ ?A * 10 ] * 10 * ' ', length: 0)
+      expect(truncated).to be_empty
+    end
+
+    it 'can truncate with ...' do
+      truncated = described_class.truncate([ ?A * 10 ] * 10 * ' ', length: 64, ellipsis: '...')
+      expect(truncated).to eq(
+        "AAAAAAAAAA AAAAAAAAAA AAAAAAAAAA AAAAAAAAAA AAAAAAAAAA AAAAAA..."
+      )
+      expect(truncated.size).to eq 64
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ollama-ruby
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-30 00:00:00.000000000 Z
+date: 2024-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -206,20 +206,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: sorted_set
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -346,6 +332,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '7.0'
+- !ruby/object:Gem::Dependency
+  name: tins
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.34'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.34'
 description: Library that allows interacting with the Ollama API
 email: flori@ping.de
 executables:
@@ -519,6 +519,7 @@ files:
 - spec/ollama/utils/fetcher_spec.rb
 - spec/ollama/utils/file_argument_spec.rb
 - spec/ollama/utils/tags_spec.rb
+- spec/ollama/utils/width_spec.rb
 - spec/spec_helper.rb
 - tmp/.keep
 homepage: https://github.com/flori/ollama-ruby
@@ -587,4 +588,5 @@ test_files:
 - spec/ollama/utils/fetcher_spec.rb
 - spec/ollama/utils/file_argument_spec.rb
 - spec/ollama/utils/tags_spec.rb
+- spec/ollama/utils/width_spec.rb
 - spec/spec_helper.rb