ollama-ruby 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb7858cf04c638fa3369fe7d96d96eed12e5553fd17abe9ed48c1eaf25113ffb
-  data.tar.gz: ccb56d4b85a6e74256feb52ac5642d50850f7b980f9060dbb9fdf933985be746
+  metadata.gz: 5bdf85f296b631c52b44984eee6a5e6d98c82a4cfc4a5764529f4d46b3bdaba7
+  data.tar.gz: 05e391e492f85f8c6fb1106d49ff4118c26a0922c5978156e2f1364aad82299d
 SHA512:
-  metadata.gz: f36aacde399c0be934425f12669fa6cc55cdfad938ea8157c5195db8c2367243cc6470dff24ec5bf83800079732bfa271450a4779246335c45c2bedbb0e3a6cf
-  data.tar.gz: 56e465f056934210a6cc45677d52518d8adb76e8702561248b6db4cd1e4b129cfd22eedbdcc0c935f69bf85eeb9bc324aef6876f39969942af4529978a277756
+  metadata.gz: 7a3f77296a526154ed46860a675515b864baa8c991933e76ceeb178b00037df844f20201ad200cb9df8d4fa105066fb40bb0248db3bb65c5bad81012ce3b7288
+  data.tar.gz: 1d25c9420fba86d992b77f29e4f4f57734dcbdaba864650f626af1c828262a9470f9c981da602335f8d3a03ef3cfc9773ad33d90d3e88a70a4d86be0518d762a

data/CHANGES.md

@@ -1,5 +1,89 @@
 # Changes
 
+## 2024-10-03 v0.7.0
+
+* **Refactor command line interface**
+	+ Moved case order
+	+ Renamed `/collection clear [tag]|change` to `/collection (clear|change)`
+	+ Improved help message, added /info
+* **Update README.md** 
+	+ Update README.md to reflect changed/added commands
+* **Add support for reading PostScript**
+	+ Extracted `pdf_read` method to read PDF files using `PDF::Reader`
+	+ Added `ps_read` method to read PostScript files by converting them to PDF with Ghostscript and using `pdf_read`.
+	+ Updated `parse_source` method to handle PostScript files
+* **Update read buffer size for tempfile writes**
+	+ Updated `tmp.write` to use a larger buffer size (**16KB**) in IO.popen block.
+* **Refactor Collection Chooser and usages**
+	+ Added confirmation prompt before clearing collection
+	+ Improved collection chooser with `[EXIT]` and `[ALL]` options
+	+ Added `ask?` method for user input
+* **Add prompt to choose method**
+	+ Added `prompt` parameter to `choose` method in `Ollama::Utils::Chooser`
+	+ Modified output formatting for selected entry in `choose` method
+	+ Updated `choose` method to handle cases better where no entry was chosen
+* **Fix Redis cache expiration logic**
+	+ Update `set` method to delete key expiration time is less than 1 second.
+* **Update dependencies and add source tracking** 
+	- Remove `sorted_set` dependency from Rakefile
+	- Modify `Ollama::Documents` class to track source of tags
+	- Update `Ollama::Utils::Tags` class to include source in tag output and add methods for tracking source
+	- Update tests for `Ollama::Utils::Tags` class
+* **Refactor width calculation and add tests for wrap and truncate methods.**
+	+ Extend `Term::ANSIColor` in `Ollama::Utils::Width`
+	+ Update `width` method to use ellipsis length when truncating text
+	+ Add tests for `wrap` and `truncate` methods with percentage and length arguments
+* **Add attr_reader for data and update equality check**
+	+ Added `attr_reader :data` to Ollama::Image class
+	+ Updated `==` method in Ollama::Image class to use `other.data`
+	+ Added test case in `image_spec.rb` to verify equality of images
+
+## 2024-09-30 v0.6.0
+
+### Significant Changes
+
+* **Added voice toggle and change functionality**:
+	+ Removed `-v` command line switch
+	+ Added new Switch class for voice output
+	+ Added new method `change_voice` to toggle or change voice output
+	+ Updated `info` method to display current voice output if enabled
+	+ Updated `display_chat_help` method to include /voice command
+* **Added expiring cache support**:
+	+ Added `Ollama::Utils::CacheFetcher` class for caching HTTP responses
+	+ Modified `Ollama::Utils::Fetcher` to use the new cache class
+	+ Updated `ollama_chat` script to use the cache when fetching sources
+	+ Added specs for the new cache fetcher class
+* **Added change system prompt feature**:
+	+ Added `/system` command to change system prompt
+	+ Implemented `set_system_prompt` and `change_system_prompt` methods in `bin/ollama_chat`
+	+ Updated help messages in `README.md`
+
+### Other Changes
+
+* **Updated dependencies**:
+	+ Updated version of `xdg` gem to **7.0**
+	+ Added `xdg` dependency to Rakefile
+* **Refactored error handling**:
+	+ Warn message updated to include more context about the error
+	+ `warn` statement now mentions "while pulling model"
+* **Updated chat commands and added clipboard functionality**:
+	+ Added `/copy` command to copy last response to clipboard
+	+ Implemented `copy_to_clipboard` method in `ollama_chat`
+	+ Updated chat help display to include new `/copy` command
+* **Refactored Ollama::Utils::Fetcher**:
+	+ Made instance methods private and only exposed class methods
+	+ Added `expose` method to `Ollama::Utils::FetcherSpec` for testing
+* **Added version command to ollama chat binary**:
+	+ Added `version` method to print Ollama version and exit
+	+ Updated `$opts` string in `ollama` script to include `-V` option for version command
+	+ Added call to `version` method when `-V` option is used
+* **Updated system prompt display**:
+	+ Changed `Ollama::Utils::Width.wrap` to `Ollama::Utils::ANSIMarkdown.parse` in `show_system_prompt` method
+* **Added system prompt configuration via search_ui for ? argument value**:
+	+ Added `show_system_prompt` method to print configured system prompt
+	+ Modified `info` method to include system prompt in output
+	+ Implemented option `-s ?` to choose or specify system prompt
+
 ## 2024-09-26 v0.5.0
 
 ### New Features

data/README.md

@@ -34,7 +34,7 @@ This a chat client, that can be used to connect to an ollama server and enter a
 chat converstation with a LLM. It can be called with the following arguments:
 
 ```
-ollama_chat [OPTIONS]
+Usage: ollama_chat [OPTIONS]
 
   -f CONFIG      config file to read
   -u URL         the ollama base url, OLLAMA_URL
@@ -42,9 +42,10 @@ ollama_chat [OPTIONS]
   -s SYSTEM      the system prompt to use as a file, OLLAMA_CHAT_SYSTEM
   -c CHAT        a saved chat conversation to load
   -C COLLECTION  name of the collection used in this conversation
-  -D DOCUMENT    load document and add to collection (multiple)
+  -D DOCUMENT    load document and add to embeddings collection (multiple)
   -M             use (empty) MemoryCache for this chat session
   -E             disable embeddings for this chat session
+  -V             display the current version number and quit
   -h             this help
 ```
 
@@ -157,6 +158,7 @@ The following commands can be given inside the chat, if prefixed by a `/`:
 /paste                          to paste content
 /markdown                       toggle markdown output
 /stream                         toggle stream output
+/location                       toggle location submission
 /voice( change)                 toggle voice output or change the voice
 /list [n]                       list the last n / all conversation exchanges
 /clear                          clear the whole conversation
@@ -165,7 +167,8 @@ The following commands can be given inside the chat, if prefixed by a `/`:
 /model                          change the model
 /system                         change system prompt (clears conversation)
 /regenerate                     the last answer message
-/collection clear [tag]|change  clear or show stats of current collection
+/collection( clear|change)      change (default) collection or clear
+/info                           show information for current session
 /import source                  import the source's content
 /summarize [n] source           summarize the source's content in n words
 /embedding                      toggle embedding paused or not

data/Rakefile

@@ -32,7 +32,6 @@ GemHadar do
   dependency             'redis',                 '~> 5.0'
   dependency             'numo-narray',           '~> 0.9'
   dependency             'more_math',             '~> 1.1'
-  dependency             'sorted_set',            '~> 1.0'
   dependency             'mime-types',            '~> 3.0'
   dependency             'reverse_markdown',      '~> 2.0'
   dependency             'complex_config',        '~> 0.22'
@@ -42,6 +41,7 @@ GemHadar do
   dependency             'logger',                '~> 1.0'
   dependency             'json',                  '~> 2.0'
   dependency             'xdg',                   '~> 7.0'
+  dependency             'tins',                  '~> 1.34'
   development_dependency 'all_images',            '~> 0.4'
   development_dependency 'rspec',                 '~> 3.2'
   development_dependency 'webmock'

data/bin/ollama_chat

@@ -4,9 +4,6 @@ require 'ollama'
 include Ollama
 require 'term/ansicolor'
 include Term::ANSIColor
-require 'tins'
-require 'tins/xt/full'
-require 'tins/xt/hash_union'
 include Tins::GO
 require 'reline'
 require 'reverse_markdown'
@@ -31,6 +28,11 @@ class OllamaChatConfig
       name: <%= ENV.fetch('OLLAMA_CHAT_MODEL', 'llama3.1') %>
       options:
         num_ctx: 8192
+    location:
+      enabled: false
+      name: Berlin
+      decimal_degrees: [ 52.514127, 13.475211 ]
+      units: SI (International System of Units) # or USCS (United States Customary System)
     prompts:
       embed: "This source was now embedded: %{source}"
       summarize: |
@@ -83,7 +85,7 @@ class OllamaChatConfig
     if @filename == default_path && !retried
       retried = true
       mkdir_p File.dirname(default_path)
-      File.secure_write(default_path.to_s, DEFAULT_CONFIG)
+      File.secure_write(default_path, DEFAULT_CONFIG)
       retry
     else
       raise
@@ -178,7 +180,7 @@ end
 
 class Switch
   def initialize(name, msg:, config: $config)
-    @value = !!config.send("#{name}?")
+    @value = [ false, true ].include?(config) ? config : !!config.send("#{name}?")
     @msg   = msg
   end
 
@@ -259,9 +261,21 @@ def setup_switches
       false => "Embedding is currently not performed.",
     }
   )
+
+  $location = Switch.new(
+    :location,
+    msg: {
+      true  => "Location and localtime enabled.",
+      false => "Location and localtime disabled.",
+    },
+    config: $config.location.enabled
+  )
 end
 
 def search_web(query, n = nil)
+  if l = at_location
+    query += " #{at_location}"
+  end
   n = n.to_i
   n < 1 and n = 1
   query = URI.encode_uri_component(query)
@@ -401,6 +415,32 @@ def parse_atom(source_io)
   end
 end
 
+def pdf_read(io)
+  reader = PDF::Reader.new(io)
+  reader.pages.inject(+'') { |result, page| result << page.text }
+end
+
+def ps_read(io)
+  gs = `which gs`.chomp
+  if gs.present?
+    Tempfile.create do |tmp|
+      IO.popen("#{gs} -q -sDEVICE=pdfwrite -sOutputFile=#{tmp.path} -", 'wb') do |gs_io|
+        until io.eof?
+          buffer = io.read(1 << 17)
+          IO.select(nil, [ gs_io ], nil)
+          gs_io.write buffer
+        end
+        gs_io.close
+        File.open(tmp.path, 'rb') do |pdf|
+          pdf_read(pdf)
+        end
+      end
+    end
+  else
+    STDERR.puts "Cannot convert #{io&.content_type} whith ghostscript, gs not in path."
+  end
+end
+
 def parse_source(source_io)
   case source_io&.content_type
   when 'text/html'
@@ -426,12 +466,11 @@ def parse_source(source_io)
     parse_rss(source_io)
   when 'application/atom+xml'
     parse_atom(source_io)
-  when 'application/json'
-    source_io.read
+  when 'application/postscript'
+    ps_read(source_io)
   when 'application/pdf'
-    reader = PDF::Reader.new(source_io)
-    reader.pages.inject(+'') { |result, page| result << page.text }
-  when %r(\Atext/), nil
+    pdf_read(source_io)
+  when %r(\Aapplication/(json|ld\+json|x-ruby|x-perl|x-gawk|x-python|x-javascript|x-c?sh|x-dosexec|x-shellscript|x-tex|x-latex|x-lyx|x-bibtex)), %r(\Atext/), nil
     source_io.read
   else
     STDERR.puts "Cannot embed #{source_io&.content_type} document."
@@ -478,7 +517,7 @@ def embed_source(source_io, source)
       length: 10
     )
   end
-  $documents.add(inputs, source: source)
+  $documents.add(inputs, source:)
 end
 
 def add_image(images, source_io, source)
@@ -576,7 +615,7 @@ def parse_content(content, images)
   content.scan(%r([.~]?/\S+|https?://\S+|#\S+)).each do |source|
     case source
     when /\A#(\S+)/
-      tags << $1
+      tags.add($1, source:)
     else
       source = source.sub(/(["')]|\*+)\z/, '')
       fetch_source(source) do |source_io|
@@ -598,29 +637,37 @@ def parse_content(content, images)
   return content, (tags unless tags.empty?)
 end
 
-def choose_model(cli_model, default_model)
+def choose_model(cli_model, current_model)
   models = ollama.tags.models.map(&:name).sort
   model = if cli_model == ''
-            Ollama::Utils::Chooser.choose(models) || default_model
+            Ollama::Utils::Chooser.choose(models) || current_model
           else
-            cli_model || default_model
+            cli_model || current_model
           end
 ensure
   puts green { "Connecting to #{model}@#{ollama.base_url} now…" }
 end
 
-def choose_collection(default_collection)
-  collections = [ default_collection ] + $documents.collections
+def ask?(prompt:)
+  print prompt
+  STDIN.gets.chomp
+end
+
+def choose_collection(current_collection)
+  collections = [ current_collection ] + $documents.collections
   collections = collections.compact.map(&:to_s).uniq.sort
-  collections.unshift('[NEW]')
-  collection = Ollama::Utils::Chooser.choose(collections) || default_collection
-  if collection == '[NEW]'
-      print "Enter name of the new collection: "
-      collection = STDIN.gets.chomp
+  collections.unshift('[EXIT]').unshift('[NEW]')
+  collection = Ollama::Utils::Chooser.choose(collections) || current_collection
+  case collection
+  when '[NEW]'
+    $documents.collection = ask?(prompt: "Enter name of the new collection: ")
+  when nil, '[EXIT]'
+    puts "Exiting chooser."
+  when /./
+    $documents.collection = collection
   end
-  $documents.collection = collection
 ensure
-  puts "Changing to collection #{bold{collection}}."
+  puts "Using collection #{bold{$documents.collection}}."
   collection_stats
 end
 
@@ -652,13 +699,25 @@ def show_system_prompt
   EOT
 end
 
+def at_location
+  if $location.on?
+    location_name            = $config.location.name
+    location_decimal_degrees = $config.location.decimal_degrees * ', '
+    localtime                = Time.now.iso8601
+    units                    = $config.location.units
+    $config.prompts.location % {
+      location_name:, location_decimal_degrees:, localtime:, units:,
+    }
+  end.to_s
+end
+
 def set_system_prompt(messages, system)
   $system = system
   messages.clear
   messages << Message.new(role: 'system', content: system)
 end
 
-def change_system_prompt(messages)
+def change_system_prompt(messages, default)
   prompts = $config.system_prompts.attribute_names.compact
   chosen  = Ollama::Utils::Chooser.choose(prompts)
   system  = if chosen
@@ -684,6 +743,7 @@ def info
   puts "Documents database cache is #{$documents.nil? ? 'n/a' : bold{$documents.cache.class}}"
   $markdown.show
   $stream.show
+  $location.show
   if $voice.on?
     puts "Using voice #{bold{$current_voice}} to speak."
   end
@@ -716,6 +776,7 @@ def display_chat_help
     /paste                          to paste content
     /markdown                       toggle markdown output
     /stream                         toggle stream output
+    /location                       toggle location submission
     /voice( change)                 toggle voice output or change the voice
     /list [n]                       list the last n / all conversation exchanges
     /clear                          clear the whole conversation
@@ -724,7 +785,8 @@ def display_chat_help
     /model                          change the model
     /system                         change system prompt (clears conversation)
     /regenerate                     the last answer message
-    /collection clear [tag]|change  clear or show stats of current collection
+    /collection( clear|change)      change (default) collection or clear
+    /info                           show information for current session
     /import source                  import the source's content
     /summarize [n] source           summarize the source's content in n words
     /embedding                      toggle embedding paused or not
@@ -739,7 +801,7 @@ end
 
 def usage
   puts <<~EOT
-    #{File.basename($0)} [OPTIONS]
+    Usage: #{File.basename($0)} [OPTIONS]
 
       -f CONFIG      config file to read
       -u URL         the ollama base url, OLLAMA_URL
@@ -790,7 +852,7 @@ if $opts[?c]
 else
   default = $config.system_prompts.default? || model_system
   if $opts[?s] == ??
-    change_system_prompt(messages)
+    change_system_prompt(messages, default)
   else
     system = Ollama::Utils::FileArgument.get_file_argument($opts[?s], default:)
     system.present? and set_system_prompt(messages, system)
@@ -860,18 +922,21 @@ loop do
   content = Reline.readline(input_prompt, true)&.chomp
 
   case content
-  when %r(^/paste$)
-    puts bold { "Paste your content and then press C-d!" }
-    content = STDIN.read
   when %r(^/copy$)
     copy_to_clipboard(messages)
     next
+  when %r(^/paste$)
+    puts bold { "Paste your content and then press C-d!" }
+    content = STDIN.read
   when %r(^/markdown$)
     $markdown.toggle
     next
   when %r(^/stream$)
     $stream.toggle
     next
+  when %r(^/location$)
+    $location.toggle
+    next
   when %r(^/voice(?:\s+(change))?$)
     if $1 == 'change'
       change_voice
@@ -890,33 +955,14 @@ loop do
     puts "Cleared messages."
     next
   when %r(^/clobber$)
-    clear_messages(messages)
-    $documents.clear
-    puts "Cleared messages and collection."
-    next
-  when %r(^/collection\s+(clear|change)(?:\s+(.+))?$)
-    command, arg = $1, $2
-    case command
-    when 'clear'
-      tags = arg.present? ? arg.sub(/\A#*/, '') : nil
-      if tags
-        $documents.clear(tags:)
-        puts "Cleared tag ##{tags} from collection #{bold{collection}}."
-      else
-        $documents.clear
-        puts "Cleared collection #{bold{collection}}."
-      end
-    when 'change'
-      choose_collection(collection)
+    if ask?(prompt: 'Are you sure? (y/n) ') =~ /\Ay/i
+      clear_messages(messages)
+      $documents.clear
+      puts "Cleared messages and collection #{bold{$documents.collection}}."
+    else
+      puts 'Cancelled.'
     end
     next
-  when %r(^/system$)
-    change_system_prompt(messages)
-    info
-    next
-  when %r(/info)
-    info
-    next
   when %r(^/pop(?:\s+(\d*))?$)
     if messages.size > 1
       n = $1.to_i.clamp(1, Float::INFINITY)
@@ -931,6 +977,10 @@ loop do
   when %r(^/model$)
     $model = choose_model('', $model)
     next
+  when %r(^/system$)
+    change_system_prompt(messages, $system)
+    info
+    next
   when %r(^/regenerate$)
     if content = messages[-2]&.content
       content.gsub!(/\nConsider these chunks for your answer.*\z/, '')
@@ -941,6 +991,38 @@ loop do
     end
     parse_content = false
     content
+  when %r(^/collection(?:\s+(clear|change))?$)
+    case $1 || 'change'
+    when 'clear'
+      loop do
+        tags = $documents.tags.add('[EXIT]').add('[ALL]')
+        tag = Ollama::Utils::Chooser.choose(tags, prompt: 'Clear? %s')
+        case tag
+        when nil, '[EXIT]'
+          puts "Exiting chooser."
+          break
+        when '[ALL]'
+          if ask?(prompt: 'Are you sure? (y/n) ') =~ /\Ay/i
+            $documents.clear
+            puts "Cleared collection #{bold{$documents.collection}}."
+            break
+          else
+            puts 'Cancelled.'
+            sleep 3
+          end
+        when /./
+          $documents.clear(tags: [ tag ])
+          puts "Cleared tag #{tag} from collection #{bold{$documents.collection}}."
+          sleep 3
+        end
+      end
+    when 'change'
+      choose_collection($documents.collection)
+    end
+    next
+  when %r(/info)
+    info
+    next
   when %r(^/import\s+(.+))
     parse_content = false
     content       = import($1) or next
@@ -1007,6 +1089,10 @@ loop do
     end
   end
 
+  if location = at_location.full?
+    content += " [#{location} – do not comment on this information, just consider it for eventual queries]"
+  end
+
   messages << Message.new(role: 'user', content:, images: images.dup)
   images.clear
   handler = FollowChat.new(messages:, markdown: $markdown.on?, voice: ($current_voice if $voice.on?))

data/bin/ollama_cli

@@ -8,8 +8,8 @@ include Tins::GO
 require 'json'
 
 def usage
-  puts <<~end
-    #{File.basename($0)} [OPTIONS]
+  puts <<~EOT
+    Usage: #{File.basename($0)} [OPTIONS]
 
       -u URL         the ollama base url, OLLAMA_URL
       -m MODEL       the ollama model to chat with, OLLAMA_MODEL
@@ -22,7 +22,7 @@ def usage
       -S             use streaming for generation
       -h             this help
 
-  end
+  EOT
   exit 0
 end
 

data/bin/ollama_update

@@ -14,4 +14,6 @@ ollama.tags.models.each do |model|
     "Updating model #{bold {name}} (last modified at #{modified_at.iso8601}):"
   )
   ollama.pull(name:)
+rescue Ollama::Errors::Error => e
+  infobar.puts "Caught #{e.class} for model #{bold { model.name }}: #{e} => Continuing."
 end

data/lib/ollama/client.rb

@@ -1,6 +1,3 @@
-require 'tins/xt/string_camelize'
-require 'tins/annotate'
-
 class Ollama::Client
 end
 require 'ollama/client/doc'

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

@@ -23,7 +23,17 @@ class Ollama::Documents::RedisCache
   end
 
   def []=(key, value)
-    redis.set(pre(key), JSON.generate(value), ex: @ex)
+    set(key, value)
+  end
+
+  def set(key, value, ex: nil)
+    ex ||= @ex
+    if !ex.nil? && ex < 1
+      redis.del(pre(key))
+    else
+      redis.set(pre(key), JSON.generate(value), ex:)
+    end
+    value
   end
 
   def ttl(key)

data/lib/ollama/documents.rb

@@ -25,7 +25,7 @@ class Ollama::Documents
     end
 
     def tags_set
-      Ollama::Utils::Tags.new(tags)
+      Ollama::Utils::Tags.new(tags, source:)
     end
 
     def ==(other)
@@ -57,8 +57,10 @@ 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).gsub(/\?.*/, '')
+    tags = Ollama::Utils::Tags.new(tags, source:)
+    if source
+      tags.add(File.basename(source).gsub(/\?.*/, ''), source:)
+    end
     inputs.map! { |i|
       text = i.respond_to?(:read) ? i.read : i.to_s
       text
@@ -70,7 +72,7 @@ class Ollama::Documents
     end
     batches = inputs.each_slice(batch_size).
       with_infobar(
-        label: "Add #{truncate(tags.to_s, percentage: 25)}",
+        label: "Add #{truncate(tags.to_s(link: false), percentage: 25)}",
         total: inputs.size
       )
     batches.each do |batch|
@@ -159,7 +161,11 @@ class Ollama::Documents
   end
 
   def tags
-    @cache.inject(Ollama::Utils::Tags.new) { |t, (_, record)| t.merge(record.tags) }
+    @cache.each_with_object(Ollama::Utils::Tags.new) do |(_, record), t|
+      record.tags.each do |tag|
+        t.add(tag, source: record.source)
+      end
+    end
   end
 
   private

data/lib/ollama/image.rb

@@ -7,6 +7,8 @@ class Ollama::Image
 
   attr_accessor :path
 
+  attr_reader :data
+
   class << self
     def for_base64(data, path: nil)
       obj = new(data)
@@ -31,7 +33,7 @@ class Ollama::Image
   end
 
   def ==(other)
-    @data == other..data
+    @data == other.data
   end
 
   def to_s

data/lib/ollama/utils/cache_fetcher.rb

@@ -13,7 +13,7 @@ class Ollama::Utils::CacheFetcher
     if body && content_type
       io = StringIO.new(body)
       io.rewind
-      io.extend(Ollama::Utils::Fetcher::ContentType)
+      io.extend(Ollama::Utils::Fetcher::HeaderExtension)
       io.content_type = content_type
       block.(io)
     end
@@ -25,8 +25,8 @@ class Ollama::Utils::CacheFetcher
     body.empty? and return
     content_type = io.content_type
     content_type.nil? and return
-    @cache[key(:body, url)]          = body
-    @cache[key(:content_type,  url)] = content_type.to_s
+    @cache.set(key(:body, url), body, ex: io.ex)
+    @cache.set(key(:content_type,  url), content_type.to_s, ex: io.ex)
     self
   end
 

data/lib/ollama/utils/chooser.rb

@@ -8,8 +8,9 @@ module Ollama::Utils::Chooser
 
   module_function
 
-  def choose(entries)
+  def choose(entries, prompt: 'Search? %s')
     entry = Search.new(
+      prompt:,
       match: -> answer {
         matcher = Amatch::PairDistance.new(answer.downcase)
         matches = entries.map { |n| [ n, -matcher.similar(n.to_s.downcase) ] }.
@@ -19,7 +20,7 @@ module Ollama::Utils::Chooser
       },
       query: -> _answer, matches, selector {
         matches.each_with_index.map { |m, i|
-          i == selector ? "#{blue{?⮕}} #{on_blue{m}}" : "  #{m}"
+          i == selector ? "#{blue{?⮕}} #{on_blue{m}}" : "  #{m.to_s}"
         } * ?\n
       },
       found: -> _answer, matches, selector {
@@ -27,6 +28,11 @@ module Ollama::Utils::Chooser
       },
       output: STDOUT
     ).start
-    return entry if entry
+    if entry
+      entry
+    else
+      print clear_screen, move_home
+      nil
+    end
   end
 end

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,7 +41,7 @@ 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
@@ -50,10 +52,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 +65,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 +112,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 +125,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.7.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.7.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama-ruby".freeze
-  s.version = "0.6.0".freeze
+  s.version = "0.7.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-02"
   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.7.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-30 00:00:00.000000000 Z
+date: 2024-10-02 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