ollama-ruby 0.9.1 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3976b4254bbedc3655a6a737000903217eff8b4b941971eb6ae4fda630ba40c3
-  data.tar.gz: 29187dded0f2748e8e684648ab374d027aaff18a6f85ede48df78dc34b705645
+  metadata.gz: fda5b55631024d2e7367400032462d87244daaa44dac2835aae7f7dad3f3f885
+  data.tar.gz: b085138d8de3daa61cc5f7f2cdfc17ff14c7a17737675452ce8e9ea5be002113
 SHA512:
-  metadata.gz: 69ad552c73c297d23db6a65681008c79329de3d4a02a07f28b027a94820f9505488870e4bce6b43c1ae6a6fb64c6107ce4cc3d28b307f07573987464e6eaed84
-  data.tar.gz: 79dd0a71d48726900ed7df4508f2031191f00f15b3713cc562aa29112c4942e72836c5d487c8883b173dc760d8e815461b66e3c4b0fbdccd1226e6019af2419a
+  metadata.gz: dc3c61c2f9484d5d2a5e8b5fc97c357139d8326700ea83e6b61984c7b58d62fe2377a5c288a65a6aad7c98dcf4b3bb341772f0ff4fd9bf3b3bf9b23061040eb1
+  data.tar.gz: 4c14196cea496a866f50bd1e414620bc7441a1923a729cffe52a42ef8cc77b16982b4be2bc644b09601900d5b403b117dd3dfe462dd5d4c6e1f324699d7396d8

data/CHANGES.md

@@ -1,5 +1,29 @@
 # Changes
 
+## 2024-10-21 v0.9.3
+
+* Update dependencies and date:
+  + dependency `complex_config` updated to `~> 0.22` and `>= 0.22.2`
+  + Date changed in ollama-ruby.gemspec from "2024-10-20" to "2024-10-21"
+
+## 2024-10-20 v0.9.2
+
+* Added SourceParsing module and update `parse_source` method to use it:
+  + Added `SourceParsing` module with `parse_source` method that handles
+    different file types (e.g. HTML, XML, CSV, RSS)
+  + Added `parse_csv` method to `SourceParsing` module
+  + Updated `parse_source` method in main file to include new functionality
+* Add colorize texts spec for Ollama::Utils::ColorizeTexts to test its
+  functionality.
+* Added test for expected output of `documents.tags`
+* Add test for empty Ollama options:
+  + Added test case for `Ollama::Options` being empty
+* Display (embedding) model options in info output
+* Only show `collection_stats` if embedding is performed
+* Add empty? method to DTO class:
+  + Added `empty?` method to `Ollama::DTO` class using `to_hash.empty?`
+  + Method is used to check if the object's hash representation is empty.
+
 ## 2024-10-19 v0.9.1
 
 * Fixing string interpolation in `import_source` method:

data/Rakefile

@@ -34,7 +34,7 @@ GemHadar do
   dependency             'more_math',             '~> 1.1'
   dependency             'mime-types',            '~> 3.0'
   dependency             'reverse_markdown',      '~> 2.0'
-  dependency             'complex_config',        '~> 0.22'
+  dependency             'complex_config',        '~> 0.22', '>= 0.22.2'
   dependency             'search_ui',             '~> 0.0'
   dependency             'amatch',                '~> 0.4.1'
   dependency             'pdf-reader',            '~> 2.0'

data/bin/ollama_chat

@@ -2,9 +2,9 @@
 
 require 'ollama'
 include Ollama
+include Tins::GO
 require 'term/ansicolor'
 include Term::ANSIColor
-include Tins::GO
 require 'reline'
 require 'reverse_markdown'
 require 'complex_config'
@@ -375,113 +375,120 @@ def list_conversation(messages, last = nil)
   end
 end
 
-def reverse_markdown(html)
-  ReverseMarkdown.convert(
-    html,
-    unknown_tags: :bypass,
-    github_flavored: true,
-    tag_border: ''
-  )
-end
+module SourceParsing
+  def parse_source(source_io)
+    case source_io&.content_type
+    when 'text/html'
+      reverse_markdown(source_io.read)
+    when 'text/xml'
+      if source_io.readline =~ %r(^\s*<rss\s)
+        source_io.rewind
+        return parse_rss(source_io)
+      end
+      source_io.rewind
+      source_io.read
+    when 'text/csv' # TODO
+      parse_csv(source_io)
+    when 'application/rss+xml'
+      parse_rss(source_io)
+    when 'application/atom+xml'
+      parse_atom(source_io)
+    when 'application/postscript'
+      ps_read(source_io)
+    when 'application/pdf'
+      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."
+      return
+    end
+  end
+
+  def parse_csv(source_io)
+    result = +''
+    CSV.table(File.new(source_io), col_sep: ?,).each do |row|
+      next if row.fields.select(&:present?).size == 0
+      result << row.map { |pair|
+        pair.compact.map { _1.to_s.strip } * ': ' if pair.last.present?
+      }.select(&:present?).map { _1.prepend('  ') } * ?\n
+      result << "\n\n"
+    end
+    result
+  end
 
-def parse_rss(source_io)
-  feed = RSS::Parser.parse(source_io, false, false)
-  title = <<~EOT
-    # #{feed&.channel&.title}
+  def parse_rss(source_io)
+    feed = RSS::Parser.parse(source_io, false, false)
+    title = <<~EOT
+      # #{feed&.channel&.title}
 
-  EOT
-  feed.items.inject(title) do |text, item|
-    text << <<~EOT
-      ## [#{item&.title}](#{item&.link})
+    EOT
+    feed.items.inject(title) do |text, item|
+      text << <<~EOT
+        ## [#{item&.title}](#{item&.link})
 
-      updated on #{item&.pubDate}
+        updated on #{item&.pubDate}
 
-      #{reverse_markdown(item&.description)}
+        #{reverse_markdown(item&.description)}
 
-    EOT
+      EOT
+    end
   end
-end
 
-def parse_atom(source_io)
-  feed = RSS::Parser.parse(source_io, false, false)
-  title = <<~EOT
-    # #{feed.title.content}
+  def parse_atom(source_io)
+    feed = RSS::Parser.parse(source_io, false, false)
+    title = <<~EOT
+      # #{feed.title.content}
 
-  EOT
-  feed.items.inject(title) do |text, item|
-    text << <<~EOT
-      ## [#{item&.title&.content}](#{item&.link&.href})
+    EOT
+    feed.items.inject(title) do |text, item|
+      text << <<~EOT
+        ## [#{item&.title&.content}](#{item&.link&.href})
 
-      updated on #{item&.updated&.content}
+        updated on #{item&.updated&.content}
 
-      #{reverse_markdown(item&.content&.content)}
+        #{reverse_markdown(item&.content&.content)}
 
-    EOT
+      EOT
+    end
   end
-end
 
-def pdf_read(io)
-  reader = PDF::Reader.new(io)
-  reader.pages.inject(+'') { |result, page| result << page.text }
-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)
+  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
-  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'
-    reverse_markdown(source_io.read)
-  when 'text/xml'
-    if source_io.readline =~ %r(^\s*<rss\s)
-      source_io.rewind
-      return parse_rss(source_io)
-    end
-    source_io.rewind
-    source_io.read
-  when 'text/csv'
-    result = +''
-    CSV.table(File.new(source_io), col_sep: ?,).each do |row|
-      next if row.fields.select(&:present?).size == 0
-      result << row.map { |pair|
-        pair.compact.map { _1.to_s.strip } * ': ' if pair.last.present?
-      }.select(&:present?).map { _1.prepend('  ') } * ?\n
-      result << "\n\n"
-    end
-    result
-  when 'application/rss+xml'
-    parse_rss(source_io)
-  when 'application/atom+xml'
-    parse_atom(source_io)
-  when 'application/postscript'
-    ps_read(source_io)
-  when 'application/pdf'
-    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."
-    return
+  def reverse_markdown(html)
+    ReverseMarkdown.convert(
+      html,
+      unknown_tags: :bypass,
+      github_flavored: true,
+      tag_border: ''
+    )
   end
 end
+include SourceParsing
 
 def http_options(url)
   options = {}
@@ -726,7 +733,6 @@ def collection_stats
   puts <<~EOT
     Current Collection
       Name: #{bold{$documents.collection}}
-      Embedding model: #{bold{$embedding_model}}
       #Embeddings: #{$documents.size}
       #Tags: #{$documents.tags.size}
       Tags: #{$documents.tags}
@@ -789,10 +795,17 @@ end
 
 def info
   puts "Current model is #{bold{$model}}."
-  collection_stats
+  if $model_options.present?
+    puts "  Options: #{JSON.pretty_generate($model_options).gsub(/(?<!\A)^/, '  ')}"
+  end
   $embedding.show
   if $embedding.on?
+    puts "Embedding model is #{bold{$embedding_model}}"
+    if $embedding_model_options.present?
+      puts "  Options: #{JSON.pretty_generate($embedding_model_options).gsub(/(?<!\A)^/, '  ')}"
+    end
     puts "Text splitter is #{bold{$config.embedding.splitter.name}}."
+    collection_stats
   end
   puts "Documents database cache is #{$documents.nil? ? 'n/a' : bold{$documents.cache.class}}"
   $markdown.show
@@ -876,7 +889,7 @@ def usage
 end
 
 def version
-  puts "%s %s" % [ File.basename($0), VERSION ]
+  puts "%s %s" % [ File.basename($0), Ollama::VERSION ]
   exit 0
 end
 
@@ -895,12 +908,12 @@ $opts[?h] and usage
 $opts[?V] and version
 
 base_url = $opts[?u] || $config.url
-$ollama      = Client.new(base_url:, debug: $config.debug)
+$ollama  = Client.new(base_url:, debug: $config.debug)
 
 $document_policy = $config.document_policy
 $model           = choose_model($opts[?m], $config.model.name)
-options          = Options[$config.model.options]
-model_system     = pull_model_unless_present($model, options)
+$model_options   = Options[$config.model.options]
+model_system     = pull_model_unless_present($model, $model_options)
 messages         = []
 $embedding_enabled.set($config.embedding.enabled && !$opts[?E])
 
@@ -918,8 +931,8 @@ end
 
 if $embedding.on?
   $embedding_model         = $config.embedding.model.name
-  embedding_model_options = Options[$config.embedding.model.options]
-  pull_model_unless_present($embedding_model, embedding_model_options)
+  $embedding_model_options = Options[$config.embedding.model.options]
+  pull_model_unless_present($embedding_model, $embedding_model_options)
   collection = $opts[?C] || $config.embedding.collection
   $documents = Documents.new(
     ollama:,
@@ -1158,7 +1171,7 @@ loop do
   messages << Message.new(role: 'user', content:, images: images.dup)
   images.clear
   handler = FollowChat.new(messages:, markdown: $markdown.on?, voice: ($current_voice if $voice.on?))
-  ollama.chat(model: $model, messages:, options:, stream: $stream.on?, &handler)
+  ollama.chat(model: $model, messages:, options: $model_options, stream: $stream.on?, &handler)
 
   if $embedding.on? && !records.empty?
     puts "", records.map { |record|

data/lib/ollama/dto.rb

@@ -33,6 +33,10 @@ module Ollama::DTO
 
   alias to_hash as_json
 
+  def empty?
+    to_hash.empty?
+  end
+
   def to_json(*)
     as_json.to_json(*)
   end

data/lib/ollama/version.rb

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

data/ollama-ruby.gemspec

@@ -1,26 +1,26 @@
 # -*- encoding: utf-8 -*-
-# stub: ollama-ruby 0.9.1 ruby lib
+# stub: ollama-ruby 0.9.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama-ruby".freeze
-  s.version = "0.9.1".freeze
+  s.version = "0.9.3".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-10-19"
+  s.date = "2024-10-21"
   s.description = "Library that allows interacting with the Ollama API".freeze
   s.email = "flori@ping.de".freeze
   s.executables = ["ollama_console".freeze, "ollama_chat".freeze, "ollama_update".freeze, "ollama_cli".freeze]
   s.extra_rdoc_files = ["README.md".freeze, "lib/ollama.rb".freeze, "lib/ollama/client.rb".freeze, "lib/ollama/client/command.rb".freeze, "lib/ollama/client/doc.rb".freeze, "lib/ollama/commands/chat.rb".freeze, "lib/ollama/commands/copy.rb".freeze, "lib/ollama/commands/create.rb".freeze, "lib/ollama/commands/delete.rb".freeze, "lib/ollama/commands/embed.rb".freeze, "lib/ollama/commands/embeddings.rb".freeze, "lib/ollama/commands/generate.rb".freeze, "lib/ollama/commands/ps.rb".freeze, "lib/ollama/commands/pull.rb".freeze, "lib/ollama/commands/push.rb".freeze, "lib/ollama/commands/show.rb".freeze, "lib/ollama/commands/tags.rb".freeze, "lib/ollama/documents.rb".freeze, "lib/ollama/documents/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/ollama/utils/width_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/colorize_texts_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.rubygems_version = "3.5.22".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/ollama/utils/width_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/colorize_texts_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
 
@@ -40,7 +40,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<more_math>.freeze, ["~> 1.1".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])
+  s.add_runtime_dependency(%q<complex_config>.freeze, ["~> 0.22".freeze, ">= 0.22.2".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])

data/spec/ollama/documents_spec.rb

@@ -60,16 +60,16 @@ RSpec.describe Ollama::Documents do
     expect(ollama).to receive(:embed).
       with(model:, input: [ 'foo' ], options: nil).
       and_return(double(embeddings: [ [ 0.1 ] ]))
-    expect(documents.add('foo', tags: %i[ test ])).to eq documents
+    expect(documents.add('foo', tags: %w[ test ])).to eq documents
     expect(ollama).to receive(:embed).
       with(model:, input: 'foo', options: nil).
       and_return(double(embeddings: [ [ 0.1 ] ]))
-    records = documents.find('foo', tags: %i[ nix ])
+    records = documents.find('foo', tags: %w[ nix ])
     expect(records).to eq []
     expect(ollama).to receive(:embed).
       with(model:, input: 'foo', options: nil).
       and_return(double(embeddings: [ [ 0.1 ] ]))
-    records = documents.find('foo', tags: %i[ test ])
+    records = documents.find('foo', tags: %w[ test ])
     expect(records).to eq [
       Ollama::Documents::Record[text: 'foo', embedding: [ 0.1 ], similarity: 1.0 ]
     ]
@@ -135,8 +135,9 @@ RSpec.describe Ollama::Documents do
       expect(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.add('foo', tags: %w[ test ])).to eq documents
+      expect(documents.add('bar', tags: %w[ test2 ])).to eq documents
+      expect(documents.tags.to_a).to eq %w[ test test2 ]
       expect {
         documents.clear tags: 'test'
       }.to change { documents.size }.from(2).to(1)

data/spec/ollama/options_spec.rb

@@ -13,6 +13,10 @@ RSpec.describe Ollama::Options do
     expect(options).to be_a described_class
   end
 
+  it 'can be empty' do
+    expect(described_class.new).to be_empty
+  end
+
   it 'can be used to cast hashes' do
     expect(described_class[{
       penalize_newline: true,

data/spec/ollama/utils/colorize_texts_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+RSpec.describe Ollama::Utils::ColorizeTexts do
+  it 'colorizes texts' do
+    ct = described_class.new(%w[ foo bar ])
+    colored   = ct.to_s
+    uncolored = Term::ANSIColor.uncolor(ct.to_s)
+    expect(colored.size).to be > uncolored.size
+    expect(uncolored).to eq(
+      "foo\n#3 \n\nbar\n#3 \n\n"
+    )
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ollama-ruby
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.3
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-19 00:00:00.000000000 Z
+date: 2024-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -241,6 +241,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.22'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.22.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -248,6 +251,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.22'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.22.2
 - !ruby/object:Gem::Dependency
   name: search_ui
   requirement: !ruby/object:Gem::Requirement
@@ -516,6 +522,7 @@ files:
 - spec/ollama/tool_spec.rb
 - spec/ollama/utils/ansi_markdown_spec.rb
 - spec/ollama/utils/cache_fetcher_spec.rb
+- spec/ollama/utils/colorize_texts_spec.rb
 - spec/ollama/utils/fetcher_spec.rb
 - spec/ollama/utils/file_argument_spec.rb
 - spec/ollama/utils/tags_spec.rb
@@ -545,7 +552,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.18
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Interacting with the Ollama API
@@ -585,6 +592,7 @@ test_files:
 - spec/ollama/tool_spec.rb
 - spec/ollama/utils/ansi_markdown_spec.rb
 - spec/ollama/utils/cache_fetcher_spec.rb
+- spec/ollama/utils/colorize_texts_spec.rb
 - spec/ollama/utils/fetcher_spec.rb
 - spec/ollama/utils/file_argument_spec.rb
 - spec/ollama/utils/tags_spec.rb