ollama-ruby 0.9.3 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fda5b55631024d2e7367400032462d87244daaa44dac2835aae7f7dad3f3f885
-  data.tar.gz: b085138d8de3daa61cc5f7f2cdfc17ff14c7a17737675452ce8e9ea5be002113
+  metadata.gz: 6611c14b779a919b256552774080305825b4e81cd5e43ae0303026aaaed7c13e
+  data.tar.gz: a34e71ef5b07cdd8a0cdf5dce9de7f7e9c3faca1829e4837c54ea243458b8f05
 SHA512:
-  metadata.gz: dc3c61c2f9484d5d2a5e8b5fc97c357139d8326700ea83e6b61984c7b58d62fe2377a5c288a65a6aad7c98dcf4b3bb341772f0ff4fd9bf3b3bf9b23061040eb1
-  data.tar.gz: 4c14196cea496a866f50bd1e414620bc7441a1923a729cffe52a42ef8cc77b16982b4be2bc644b09601900d5b403b117dd3dfe462dd5d4c6e1f324699d7396d8
+  metadata.gz: aa38db4bdd42ebffe2ef9b5abf7f644e38821acc4fb9650b7e8646a9fab3350640224c4ba59e13d7f182becd2a84ac881fd0c5d136ca88782e1a7febec31c2fe
+  data.tar.gz: b14f2626d9f2c8e6e8bc6c3b3d8947d78b4400cf0dd8888cf9f818261ba3605fc9971c2c9015f976ec48f2004cb4b0ff5d922e2efe001b5b443f03728f14ce51

data/CHANGES.md

@@ -1,5 +1,48 @@
 # Changes
 
+## 2024-11-20 v0.11.0
+
+* Added `voice` and `interactive` reader attributes to the Say handler class.
+* Refactored the `call` method in the Say handler to reopen the output stream
+  if it has been closed.
+* Added the `open_output` method to open a new IO stream with synchronization
+  enabled.
+* Added a test for the reopened output stream in the Say spec.
+* Updated `initialize` method in `lib/ollama/handlers/say.rb` to add
+  `interactive` option and call new `command` method.
+* Add private `command` method in lib/ollama/handlers/say.rb to generate
+  command for say utility based on voice and interactive options.
+* Update specs in `spec/ollama/handlers/say_spec.rb` to test new behavior.
+* Updated `FollowChat` class to correctly initialize markdown and voice
+  attributes
+* Update `choose_document_policy` policy list in chat script to include
+  'ignoring'
+* Updated `parse_content` method to handle 'ignoring' document policy.
+
+## 2024-10-31 v0.10.0
+
+* Improved URL and tag parsing in `parse_content`:
+  + Added support for `file://` protocol to content scans.
+  + Updated regex pattern to match local files starting with `~`, `.`, or `/`.
+  + Remove # anchors for file URLs (and files)
+* Improved parsing of content in ollama_chat:
+  + Use `content.scan(%r((https?://\S+)|(#\S+)|(\S+\/\S+)))` to match URLs, tags and files.
+  + For foo/bar file pathes prepend `./`foo/bar, for foo you have to enter ./foo still.
+  + Added a check for file existence before fetching its content
+* Move vector methods into cache implementations:
+  + Update `documents.rb` to use `@cache.norm` and `@cache.cosine_similarity`
+  + Remove unused code in `documents.rb` (including `Ollama::Utils::Math`)
+  + Add `include Ollama::Utils::Math` in `cache/common.rb`
+* Document existing collections, pre, and unpre methods:
+  + Update module Ollama::Documents::Cache::Common to include documentation for existing methods
+* Use kramdown-ansi gem for Markdown output in terminal:
+  + Update `kramdown-ansi` to **0.0** in Gemfile and Rakefile
+  + Remove `ollama/utils/width.rb` as it's no longer needed
+  + Remove `spec/ollama/utils/width_spec.rb` and `spec/ollama/utils/ansi_markdown_spec.rb` as they're not used anymore
+  + Update `ollama-ruby.gemspec` to reflect the new dependencies and remove unused files
+* Updated print messages to include `.to_s.inspect` for accurate inspection of
+  source content in `ollama_chat`.
+
 ## 2024-10-21 v0.9.3
 
 * Update dependencies and date:

data/Rakefile

@@ -14,7 +14,7 @@ GemHadar do
   test_dir    'spec'
   ignore      '.*.sw[pon]', 'pkg', 'Gemfile.lock', '.AppleDouble', '.bundle',
     '.yardoc', 'doc', 'tags', 'errors.lst', 'cscope.out', 'coverage', 'tmp',
-    'corpus'
+    'corpus', 'yard'
   package_ignore '.all_images.yml', '.tool-versions', '.gitignore', 'VERSION',
      '.rspec', *Dir.glob('.github/**/*', File::FNM_DOTMATCH)
   readme      'README.md'
@@ -24,11 +24,9 @@ GemHadar do
 
   required_ruby_version  '~> 3.1'
 
-  dependency             'excon',                 '~> 0.111'
+  dependency             'excon',                 '~> 1.0'
   dependency             'infobar',               '~> 0.8'
   dependency             'term-ansicolor',        '~> 1.11'
-  dependency             'kramdown-parser-gfm',   '~> 1.1'
-  dependency             'terminal-table',        '~> 3.0'
   dependency             'redis',                 '~> 5.0'
   dependency             'numo-narray',           '~> 0.9'
   dependency             'more_math',             '~> 1.1'
@@ -42,6 +40,8 @@ GemHadar do
   dependency             'json',                  '~> 2.0'
   dependency             'xdg',                   '~> 7.0'
   dependency             'tins',                  '~> 1.34'
+  dependency             'kramdown-ansi',         '~> 0.0', '>= 0.0.1'
+  dependency             'ostruct',               '~> 0.0'
   development_dependency 'all_images',            '~> 0.4'
   development_dependency 'rspec',                 '~> 3.2'
   development_dependency 'webmock'

data/bin/ollama_chat

@@ -114,10 +114,10 @@ class FollowChat
   def initialize(messages:, markdown: false, voice: nil, output: $stdout)
     super(output:)
     @output.sync = true
-    @markdown = markdown
-    @say = voice ? Handlers::Say.new(voice:) : NOP
-    @messages = messages
-    @user     = nil
+    @markdown    = markdown
+    @say         = voice ? Handlers::Say.new(voice:) : NOP
+    @messages    = messages
+    @user        = nil
   end
 
   def call(response)
@@ -132,7 +132,7 @@ class FollowChat
       content = response.message&.content
       @messages.last.content << content
       if @markdown and content = @messages.last.content.full?
-        markdown_content = Utils::ANSIMarkdown.parse(content)
+        markdown_content = Kramdown::ANSI.parse(content)
         @output.print clear_screen, move_home, @user, ?\n, markdown_content
       else
         @output.print content
@@ -159,7 +159,7 @@ class FollowChat
       load_duration:        Tins::Duration.new(response.load_duration / 1e9),
     }.map { _1 * '=' } * ' '
     '📊 ' + color(111) {
-      Utils::Width.wrap(stats_text, percentage: 90).gsub(/(?<!\A)^/, '   ')
+      Kramdown::ANSI::Width.wrap(stats_text, percentage: 90).gsub(/(?<!\A)^/, '   ')
     }
   end
 end
@@ -364,7 +364,7 @@ def list_conversation(messages, last = nil)
                  when 'system' then 213
                  else 210
                  end
-    content = m.content.full? { $markdown.on? ? Utils::ANSIMarkdown.parse(_1) : _1 }
+    content = m.content.full? { $markdown.on? ? Kramdown::ANSI.parse(_1) : _1 }
     message_text = message_type(m.images) + " "
     message_text += bold { color(role_color) { m.role } }
     message_text += ":\n#{content}"
@@ -539,8 +539,8 @@ end
 
 def import_source(source_io, source)
   source = source.to_s
-  puts "Importing #{italic { source_io&.content_type }} document #{source.inspect} now."
-	source_content = parse_source(source_io)
+  puts "Importing #{italic { source_io&.content_type }} document #{source.to_s.inspect} now."
+  source_content = parse_source(source_io)
   "Imported #{source.inspect}:\n#{source_content}\n\n"
 end
 
@@ -553,7 +553,7 @@ def import(source)
 end
 
 def summarize_source(source_io, source, words: nil)
-  puts "Summarizing #{italic { source_io&.content_type }} document #{source.inspect} now."
+  puts "Summarizing #{italic { source_io&.content_type }} document #{source.to_s.inspect} now."
   words = words.to_i
   words < 1 and words = 100
   source_content = parse_source(source_io)
@@ -608,7 +608,7 @@ def embed_source(source_io, source, count: nil)
   inputs or return
   source = source.to_s
   if source.start_with?(?!)
-    source = Utils::Width.truncate(
+    source = Kramdown::ANSI::Width.truncate(
       source[1..-1].gsub(/\W+/, ?_),
       length: 10
     )
@@ -638,31 +638,39 @@ def parse_content(content, images)
   tags = Utils::Tags.new
 
   contents = [ content ]
-  content.scan(%r((?:\.\.|[.~])?/\S+|https?://\S+|#\S+)).each do |source|
-    case source
-    when /\A#(\S+)/
-      tags.add($1, source:)
-    else
-      source = source.sub(/(["')]|\*+)\z/, '')
-      fetch_source(source) do |source_io|
-        case source_io&.content_type&.media_type
-        when 'image'
-          add_image(images, source_io, source)
-        when 'text', 'application', nil
-          case $document_policy
-          when 'importing'
-            contents << import_source(source_io, source)
-          when 'embedding'
-            embed_source(source_io, source)
-          when 'summarizing'
-            contents << summarize_source(source_io, source)
-          end
-        else
-          STDERR.puts(
-            "Cannot fetch #{source.to_s.inspect} with content type "\
-            "#{source_io&.content_type.inspect}"
-          )
+  content.scan(%r((https?://\S+)|(#\S+)|(?:file://)?(\S*\/\S+))).each do |url, tag, file|
+    case
+    when tag
+      tags.add(tag)
+      next
+    when file
+      file = file.sub(/#.*/, '')
+      file =~ %r(\A[~./]) or file.prepend('./')
+      File.exist?(file) or next
+      source = file
+    when url
+      source = url
+    end
+    fetch_source(source) do |source_io|
+      case source_io&.content_type&.media_type
+      when 'image'
+        add_image(images, source_io, source)
+      when 'text', 'application', nil
+        case $document_policy
+        when 'ignoring'
+          nil
+        when 'importing'
+          contents << import_source(source_io, source)
+        when 'embedding'
+          embed_source(source_io, source)
+        when 'summarizing'
+          contents << summarize_source(source_io, source)
         end
+      else
+        STDERR.puts(
+          "Cannot fetch #{source.to_s.inspect} with content type "\
+          "#{source_io&.content_type.inspect}"
+        )
       end
     end
   end
@@ -705,7 +713,7 @@ ensure
 end
 
 def choose_document_policy
-  policies = %w[ importing embedding summarizing ].sort
+  policies = %w[ importing embedding summarizing ignoring ].sort
   current  = if policies.index($document_policy)
                $document_policy
              elsif policies.index($config.document_policy)
@@ -755,7 +763,7 @@ end
 def show_system_prompt
   puts <<~EOT
     Configured system prompt is:
-    #{Utils::ANSIMarkdown.parse($system.to_s).gsub(/\n+\z/, '').full? || 'n/a'}
+    #{Kramdown::ANSI.parse($system.to_s).gsub(/\n+\z/, '').full? || 'n/a'}
   EOT
 end
 
@@ -1165,7 +1173,8 @@ loop do
   end
 
   if location = at_location.full?
-    content += " [#{location} – do not comment on this information, just consider it for eventual queries]"
+    content += " [#{location} – do not comment on this the time and location, "\
+      "just consider it for eventual queries]"
   end
 
   messages << Message.new(role: 'user', content:, images: images.dup)

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

@@ -1,16 +1,31 @@
 module Ollama::Documents::Cache::Common
-  attr_writer :prefix
+  include Ollama::Utils::Math
 
+  attr_writer :prefix # current prefix defined for the cache
+
+  # Returns an array of collection names that match the given prefix.
+  #
+  # @param prefix [String] a string to search for in collection names
+  # @return [Array<Symbol>] an array of matching collection names
   def collections(prefix)
     unique = Set.new
     full_each { |key, _| unique << key[/\A#{prefix}(.*)-/, 1] }
     unique.map(&:to_sym)
   end
 
+  # Returns a string representing the given `key` prefixed with the defined
+  # prefix.
+  #
+  # @param key [String] the key to join with the prefix
+  # @return [String] the joined string of prefix and key
   def pre(key)
     [ @prefix, key ].join
   end
 
+  # Returns a string with the prefix removed from the given `key`.
+  #
+  # @param key [String] the input string containing the prefix.
+  # @return [String] the input string without the prefix.
   def unpre(key)
     key.sub(/\A#@prefix/, '')
   end

data/lib/ollama/documents.rb

@@ -1,5 +1,6 @@
 require 'numo/narray'
 require 'digest'
+require 'kramdown/ansi'
 
 class Ollama::Documents
 end
@@ -14,8 +15,7 @@ require 'ollama/documents/splitters/character'
 require 'ollama/documents/splitters/semantic'
 
 class Ollama::Documents
-  include Ollama::Utils::Math
-  include Ollama::Utils::Width
+  include Kramdown::ANSI::Width
 
   class Record < JSON::GenericObject
     def to_s
@@ -79,7 +79,7 @@ class Ollama::Documents
     batches.each do |batch|
       embeddings = fetch_embeddings(model:, options: @model_options, input: batch)
       batch.zip(embeddings) do |text, embedding|
-        norm       = norm(embedding)
+        norm       = @cache.norm(embedding)
         self[text] = Record[text:, embedding:, norm:, source:, tags: tags.to_a]
       end
       infobar.progress by: batch.size
@@ -125,7 +125,7 @@ class Ollama::Documents
 
   def find(string, tags: nil, prompt: nil)
     needle      = convert_to_vector(string, prompt:)
-    needle_norm = norm(needle)
+    needle_norm = @cache.norm(needle)
     records = @cache
     if tags
       tags = Ollama::Utils::Tags.new(tags).to_a
@@ -133,7 +133,7 @@ class Ollama::Documents
     end
     records = records.sort_by { |key, record|
       record.key        = key
-      record.similarity = cosine_similarity(
+      record.similarity = @cache.cosine_similarity(
         a: needle,
         b: record.embedding,
         a_norm: needle_norm,
@@ -193,11 +193,8 @@ class Ollama::Documents
     if prompt
       input = prompt % input
     end
-    if input.is_a?(String)
-      Numo::NArray[*fetch_embeddings(model:, input:).first]
-    else
-      super(input)
-    end
+    input.is_a?(String) and input = fetch_embeddings(model:, input:).first
+    @cache.convert_to_vector(input)
   end
 
   def fetch_embeddings(model:, input:, options: nil)

data/lib/ollama/handlers/markdown.rb

@@ -1,4 +1,5 @@
 require 'term/ansicolor'
+require 'kramdown/ansi'
 
 class Ollama::Handlers::Markdown
   include Ollama::Handlers::Concern
@@ -13,7 +14,7 @@ class Ollama::Handlers::Markdown
   def call(response)
     if content = response.response || response.message&.content
       @content << content
-      markdown_content = Ollama::Utils::ANSIMarkdown.parse(@content)
+      markdown_content = Kramdown::ANSI.parse(@content)
       @output.print clear_screen, move_home, markdown_content
     end
     self

data/lib/ollama/handlers/say.rb

@@ -3,17 +3,56 @@ require 'shellwords'
 class Ollama::Handlers::Say
   include Ollama::Handlers::Concern
 
-  def initialize(output: nil, voice: 'Samantha')
-    output ||= IO.popen(Shellwords.join([ 'say', '-v', voice ]), 'w')
+  def initialize(output: nil, voice: 'Samantha', interactive: nil)
+    @voice       = voice
+    @interactive = interactive
     super(output:)
-    @output.sync = true
+    unless output
+      @output = open_output
+      @output_pid = @output.pid
+    end
   end
 
+  attr_reader :voice
+
+  attr_reader :interactive
+
   def call(response)
+    if @output.closed?
+      wait_output_pid
+      @output     = open_output
+      @output_pid = @output.pid
+    end
     if content = response.response || response.message&.content
       @output.print content
     end
     response.done and @output.close
     self
   end
+
+  private
+
+  def open_output
+    io = IO.popen(Shellwords.join(command(voice:, interactive:)), 'w')
+    io.sync = true
+    io
+  end
+
+  def wait_output_pid
+    @output_pid or return
+    Process.wait(@output_pid, Process::WNOHANG | Process::WUNTRACED)
+  rescue Errno::ECHILD
+  end
+
+  def command(voice:, interactive:)
+    command = [ 'say' ]
+    voice and command.concat([ '-v', voice ])
+    case interactive
+    when true
+      command << '-i'
+    when String
+      command << '--interactive=%s' % interactive
+    end
+    command
+  end
 end

data/lib/ollama/utils/colorize_texts.rb

@@ -1,7 +1,10 @@
+require 'term/ansicolor'
+require 'kramdown/ansi'
+
 class Ollama::Utils::ColorizeTexts
   include Math
   include Term::ANSIColor
-  include Ollama::Utils::Width
+  include Kramdown::ANSI::Width
 
   # Initializes a new instance of Ollama::Utils::ColorizeTexts
   #

data/lib/ollama/version.rb

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

@@ -16,8 +16,6 @@ end
 
 module Ollama::Utils
 end
-require 'ollama/utils/width'
-require 'ollama/utils/ansi_markdown'
 require 'ollama/utils/tags'
 require 'ollama/utils/math'
 require 'ollama/utils/colorize_texts'

data/ollama-ruby.gemspec

@@ -1,26 +1,26 @@
 # -*- encoding: utf-8 -*-
-# stub: ollama-ruby 0.9.3 ruby lib
+# stub: ollama-ruby 0.11.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama-ruby".freeze
-  s.version = "0.9.3".freeze
+  s.version = "0.11.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-10-21"
+  s.date = "2024-11-20"
   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/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.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/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/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/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/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/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/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.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/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.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/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/spec_helper.rb".freeze]
 
   s.specification_version = 4
 
@@ -30,11 +30,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency(%q<webmock>.freeze, [">= 0".freeze])
   s.add_development_dependency(%q<debug>.freeze, [">= 0".freeze])
   s.add_development_dependency(%q<simplecov>.freeze, [">= 0".freeze])
-  s.add_runtime_dependency(%q<excon>.freeze, ["~> 0.111".freeze])
+  s.add_runtime_dependency(%q<excon>.freeze, ["~> 1.0".freeze])
   s.add_runtime_dependency(%q<infobar>.freeze, ["~> 0.8".freeze])
   s.add_runtime_dependency(%q<term-ansicolor>.freeze, ["~> 1.11".freeze])
-  s.add_runtime_dependency(%q<kramdown-parser-gfm>.freeze, ["~> 1.1".freeze])
-  s.add_runtime_dependency(%q<terminal-table>.freeze, ["~> 3.0".freeze])
   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])
@@ -48,4 +46,6 @@ Gem::Specification.new do |s|
   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])
+  s.add_runtime_dependency(%q<kramdown-ansi>.freeze, ["~> 0.0".freeze, ">= 0.0.1".freeze])
+  s.add_runtime_dependency(%q<ostruct>.freeze, ["~> 0.0".freeze])
 end

data/spec/ollama/handlers/say_spec.rb

@@ -1,30 +1,93 @@
 require 'spec_helper'
 
 RSpec.describe Ollama::Handlers::Say do
+  let :say do
+    described_class.new
+  end
+
   it 'has .to_proc' do
     expect_any_instance_of(described_class).to receive(:call).with(:foo)
     described_class.call(:foo)
   end
 
-  it 'can print response' do
-    output = double('output', :sync= => true)
+  it 'can be instantiated' do
+    expect(say).to be_a described_class
+  end
+
+  it 'can be instantiated with a given voice' do
+    expect_any_instance_of(described_class).to receive(:command).
+      with(hash_including(voice: 'TheVoice')).and_return %w[ true ]
+    say = described_class.new(voice: 'TheVoice')
+    expect(say).to be_a described_class
+  end
+
+  describe 'command' do
+    it 'can be instantiated interactively' do
+      expect_any_instance_of(described_class).to receive(:command).
+        with(hash_including(interactive: true)).and_return %w[ true ]
+      say = described_class.new(interactive: true)
+      expect(say).to be_a described_class
+    end
+
+    it 'can set the voice' do
+      expect(say.send(:command, voice: 'TheVoice', interactive: nil)).to eq(
+        %w[ say -v TheVoice ]
+      )
+    end
+
+    it 'can be instantiated interactively with green' do
+      expect_any_instance_of(described_class).to receive(:command).
+        with(hash_including(interactive: 'green')).and_return %w[ true ]
+      say = described_class.new(interactive: 'green')
+      expect(say).to be_a described_class
+    end
+
+    it 'can set interactive mode' do
+      expect(say.send(:command, voice: nil, interactive: true)).to eq(
+        %w[ say -i ]
+      )
+    end
+
+    it 'can set interactive mode to green' do
+      expect(say.send(:command, voice: nil, interactive: 'green')).to eq(
+        %w[ say --interactive=green ]
+      )
+    end
+  end
+
+  it 'can say response' do
+    output = double('output', :sync= => true, closed?: false)
     expect(output).to receive(:print).with('testing')
     expect(output).to receive(:close)
-    print = described_class.new(output:)
+    say = described_class.new(output:)
     response = double('response', response: 'testing', done: false)
-    print.call(response)
+    say.call(response)
     response = double('response', response: nil, message: nil, done: true)
-    print.call(response)
+    say.call(response)
   end
 
-  it 'can print message content' do
-    output = double('output', :sync= => true)
+  it 'can say message content' do
+    output = double('output', :sync= => true, closed?: false)
     expect(output).to receive(:print).with('testing')
     expect(output).to receive(:close)
-    print = described_class.new(output:)
+    say = described_class.new(output:)
     response = double('response', response: nil, message: double(content: 'testing'), done: false)
-    print.call(response)
+    say.call(response)
+    response = double('response', response: nil, message: nil, done: true)
+    say.call(response)
+  end
+
+  it 'can reopen output if closed' do
+    output = double('output', :sync= => true, closed?: true)
+    reopened_output = double('output', :sync= => true, closed?: false, pid: 666)
+    expect(reopened_output).to receive(:print).with('testing')
+    expect(reopened_output).to receive(:close)
+    say = described_class.new(output:)
+    expect(say).to receive(:open_output).and_return(reopened_output)
+    response = double('response', response: 'testing', done: false)
+    say.call(response)
     response = double('response', response: nil, message: nil, done: true)
-    print.call(response)
+    say.call(response)
   end
+
 end

data/spec/ollama/utils/fetcher_spec.rb

@@ -77,12 +77,12 @@ RSpec.describe Ollama::Utils::Fetcher do
     stub_request(:get, url).
       with(headers: fetcher.headers).
       to_return(status: 500)
-		expect(STDERR).to receive(:puts).with(/cannot.*get.*#{url}/i)
-    fetcher.get(url) do |tmp|
-      expect(tmp).to be_a StringIO
-      expect(tmp.read).to eq ''
-      expect(tmp.content_type).to eq 'text/plain'
-    end
+    expect(STDERR).to receive(:puts).with(/cannot.*get.*#{url}/i)
+      fetcher.get(url) do |tmp|
+        expect(tmp).to be_a StringIO
+        expect(tmp.read).to eq ''
+        expect(tmp.content_type).to eq 'text/plain'
+      end
   end
 
   it 'can redirect' do
@@ -107,7 +107,7 @@ RSpec.describe Ollama::Utils::Fetcher do
 
   it 'can .execute and fail' do
     expect(IO).to receive(:popen).and_raise StandardError
-		expect(STDERR).to receive(:puts).with(/cannot.*execute.*foobar/i)
+    expect(STDERR).to receive(:puts).with(/cannot.*execute.*foobar/i)
     described_class.execute('foobar') do |file|
       expect(file).to be_a StringIO
       expect(file.read).to be_empty
@@ -115,23 +115,23 @@ RSpec.describe Ollama::Utils::Fetcher do
     end
   end
 
-	describe '.normalize_url' do
-		it 'can handle umlauts' do
-			expect(described_class.normalize_url('https://foo.de/bär')).to eq(
-				'https://foo.de/b%C3%A4r'
-			)
-		end
+  describe '.normalize_url' do
+    it 'can handle umlauts' do
+      expect(described_class.normalize_url('https://foo.de/bär')).to eq(
+        'https://foo.de/b%C3%A4r'
+      )
+    end
 
-		it 'can handle escaped umlauts' do
-			expect(described_class.normalize_url('https://foo.de/b%C3%A4r')).to eq(
-				'https://foo.de/b%C3%A4r'
-			)
-		end
+    it 'can handle escaped umlauts' do
+      expect(described_class.normalize_url('https://foo.de/b%C3%A4r')).to eq(
+        'https://foo.de/b%C3%A4r'
+      )
+    end
 
-		it 'can remove #anchors' do
-			expect(described_class.normalize_url('https://foo.de#bar')).to eq(
-				'https://foo.de'
-			)
-		end
-	end
+    it 'can remove #anchors' do
+      expect(described_class.normalize_url('https://foo.de#bar')).to eq(
+        'https://foo.de'
+      )
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ollama-ruby
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.11.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-21 00:00:00.000000000 Z
+date: 2024-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.111'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.111'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: infobar
   requirement: !ruby/object:Gem::Requirement
@@ -136,34 +136,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
-- !ruby/object:Gem::Dependency
-  name: kramdown-parser-gfm
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: terminal-table
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -352,6 +324,40 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.34'
+- !ruby/object:Gem::Dependency
+  name: kramdown-ansi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
 description: Library that allows interacting with the Ollama API
 email: flori@ping.de
 executables:
@@ -406,7 +412,6 @@ extra_rdoc_files:
 - lib/ollama/tool/function.rb
 - lib/ollama/tool/function/parameters.rb
 - lib/ollama/tool/function/parameters/property.rb
-- lib/ollama/utils/ansi_markdown.rb
 - lib/ollama/utils/cache_fetcher.rb
 - lib/ollama/utils/chooser.rb
 - lib/ollama/utils/colorize_texts.rb
@@ -414,7 +419,6 @@ extra_rdoc_files:
 - lib/ollama/utils/file_argument.rb
 - lib/ollama/utils/math.rb
 - lib/ollama/utils/tags.rb
-- lib/ollama/utils/width.rb
 - lib/ollama/version.rb
 files:
 - ".envrc"
@@ -473,7 +477,6 @@ files:
 - lib/ollama/tool/function.rb
 - lib/ollama/tool/function/parameters.rb
 - lib/ollama/tool/function/parameters/property.rb
-- lib/ollama/utils/ansi_markdown.rb
 - lib/ollama/utils/cache_fetcher.rb
 - lib/ollama/utils/chooser.rb
 - lib/ollama/utils/colorize_texts.rb
@@ -481,7 +484,6 @@ files:
 - lib/ollama/utils/file_argument.rb
 - lib/ollama/utils/math.rb
 - lib/ollama/utils/tags.rb
-- lib/ollama/utils/width.rb
 - lib/ollama/version.rb
 - ollama-ruby.gemspec
 - spec/assets/embeddings.json
@@ -520,13 +522,11 @@ files:
 - spec/ollama/message_spec.rb
 - spec/ollama/options_spec.rb
 - 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
-- spec/ollama/utils/width_spec.rb
 - spec/spec_helper.rb
 - tmp/.keep
 homepage: https://github.com/flori/ollama-ruby
@@ -590,11 +590,9 @@ test_files:
 - spec/ollama/message_spec.rb
 - spec/ollama/options_spec.rb
 - 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
-- spec/ollama/utils/width_spec.rb
 - spec/spec_helper.rb

data/lib/ollama/utils/ansi_markdown.rb

@@ -1,217 +0,0 @@
-require 'kramdown'
-require 'kramdown-parser-gfm'
-require 'terminal-table'
-
-class Ollama::Utils::ANSIMarkdown < Kramdown::Converter::Base
-  include Term::ANSIColor
-  include Ollama::Utils::Width
-
-  class ::Kramdown::Parser::Mygfm <  ::Kramdown::Parser::GFM
-    def initialize(source, options)
-      options[:gfm_quirks] << :no_auto_typographic
-      super
-      @block_parsers -= %i[
-        definition_list block_html block_math
-        footnote_definition abbrev_definition
-      ]
-      @span_parsers -= %i[ footnote_marker inline_math ]
-    end
-  end
-
-  def self.parse(source)
-    @doc = Kramdown::Document.new(
-      source, input: :mygfm, auto_ids: false, entity_output: :as_char
-    ).to_ansi
-  end
-
-  def initialize(root, options)
-    super
-  end
-
-  def convert(el, opts = {})
-    send("convert_#{el.type}", el, opts)
-  end
-
-  def inner(el, opts, &block)
-    result = +''
-    options = opts.dup.merge(parent: el)
-    el.children.each_with_index do |inner_el, index|
-      options[:index] = index
-      options[:result] = result
-      begin
-        content = send("convert_#{inner_el.type}", inner_el, options)
-        result << (block&.(inner_el, index, content) || content)
-      rescue NameError => e
-        warning "Caught #{e.class} for #{inner_el.type}"
-      end
-    end
-    result
-  end
-
-  def convert_root(el, opts)
-    inner(el, opts)
-  end
-
-  def convert_blank(_el, opts)
-    opts[:result] =~ /\n\n\Z|\A\Z/ ? "" : "\n"
-  end
-
-  def convert_text(el, _opts)
-    el.value
-  end
-
-  def convert_header(el, opts)
-    newline bold { underline { inner(el, opts) } }
-  end
-
-  def convert_p(el, opts)
-    length = width(percentage: 90) - opts[:list_indent].to_i
-    length < 0 and return ''
-    newline wrap(inner(el, opts), length:)
-  end
-
-  def convert_strong(el, opts)
-    bold { inner(el, opts) }
-  end
-
-  def convert_em(el, opts)
-    italic { inner(el, opts) }
-  end
-
-  def convert_a(el, opts)
-    url = el.attr['href']
-    hyperlink(url) { inner(el, opts) }
-  end
-
-  def convert_codespan(el, _opts)
-    blue { el.value }
-  end
-
-  def convert_codeblock(el, _opts)
-    blue { el.value }
-  end
-
-  def convert_blockquote(el, opts)
-    newline ?“ + inner(el, opts).sub(/\n+\z/, '') + ?”
-  end
-
-  def convert_hr(_el, _opts)
-    newline ?─ * width(percentage: 100)
-  end
-
-  def convert_img(el, _opts)
-    url = el.attr['src']
-    alt = el.attr['alt']
-    alt.strip.size == 0 and alt = url
-    alt = '🖼 ' + alt
-    hyperlink(url) { alt }
-  end
-
-  def convert_ul(el, opts)
-    list_indent = opts[:list_indent].to_i
-    inner(el, opts) { |_inner_el, index, content|
-      result = '· %s' % content
-      result = newline(result, count: index <= el.children.size - 1 ? 1 : 2)
-      result.gsub(/^/, ' ' * list_indent)
-    }
-  end
-
-  def convert_ol(el, opts)
-    list_indent = opts[:list_indent].to_i
-    inner(el, opts) { |_inner_el, index, content|
-      result = '%u. %s' % [ index + 1, content ]
-      result = newline(result, count: index <= el.children.size - 1 ? 1 : 2)
-      result.gsub(/^/, ' ' * list_indent)
-    }
-  end
-
-  def convert_li(el, opts)
-    opts = opts.dup
-    opts[:list_indent] = 2 + opts[:list_indent].to_i
-    newline inner(el, opts).sub(/\n+\Z/, '')
-  end
-
-  def convert_html_element(el, opts)
-    if el.value == 'i' || el.value == 'em'
-      italic { inner(el, opts) }
-    elsif el.value == 'b' || el.value == 'strong'
-      bold { inner(el, opts) }
-    else
-      ''
-    end
-  end
-
-  def convert_table(el, opts)
-    table = Terminal::Table.new
-    table.style = {
-      all_separators: true,
-      border: :unicode_round,
-    }
-    opts[:table] = table
-    inner(el, opts)
-    el.options[:alignment].each_with_index do |a, i|
-      a == :default and next
-      opts[:table].align_column(i, a)
-    end
-    newline table.to_s
-  end
-
-  def convert_thead(el, opts)
-    rows = inner(el, opts)
-    rows = rows.split(/\s*\|\s*/)[1..].map(&:strip)
-    opts[:table].headings = rows
-    ''
-  end
-
-  def convert_tbody(el, opts)
-    res = +''
-    res << inner(el, opts)
-  end
-
-  def convert_tfoot(el, opts)
-    ''
-  end
-
-  def convert_tr(el, opts)
-    return '' if el.children.empty?
-    full_width = width(percentage: 90)
-    cols = el.children.map { |c| convert(c, opts).strip }
-    row_size = cols.sum(&:size)
-    return '' if row_size.zero?
-    opts[:table] << cols.map { |c|
-      length = (full_width * (c.size / row_size.to_f)).floor
-      wrap(c, length:)
-    }
-    ''
-  end
-
-  def convert_td(el, opts)
-    inner(el, opts)
-  end
-
-  def convert_entity(el, _opts)
-    el.value.char
-  end
-
-  def convert_xml_comment(*)
-    ''
-  end
-
-  def convert_xml_pi(*)
-    ''
-  end
-
-  def convert_br(_el, opts)
-    ''
-  end
-
-  def convert_smart_quote(el, _opts)
-    el.value.to_s =~ /[rl]dquo/ ? "\"" : "'"
-  end
-
-  def newline(text, count: 1)
-    text.gsub(/\n*\z/, ?\n * count)
-  end
-end
-
-Kramdown::Converter.const_set(:Ansi, Ollama::Utils::ANSIMarkdown)

data/lib/ollama/utils/width.rb

@@ -1,39 +0,0 @@
-require 'tins/terminal'
-
-module Ollama::Utils::Width
-  include Term::ANSIColor
-  extend Term::ANSIColor
-
-  module_function
-
-  def width(percentage: 100.0)
-    ((Float(percentage) * Tins::Terminal.columns) / 100).floor
-  end
-
-  def wrap(text, percentage: nil, length: nil)
-    percentage.nil? ^ length.nil? or
-      raise ArgumentError, "either pass percentage or length argument"
-    percentage and length ||= width(percentage:)
-    text.gsub(/(?<!\n)\n(?!\n)/, ' ').lines.map do |line|
-      if length >= 1 && uncolor { line }.length > length
-        line.gsub(/(.{1,#{length}})(\s+|$)/, "\\1\n").strip
-      else
-        line.strip
-      end
-    end * ?\n
-  end
-
-  def truncate(text, percentage: nil, length: nil, ellipsis: ?…)
-    percentage.nil? ^ length.nil? or
-      raise ArgumentError, "either pass percentage or length argument"
-    percentage and length ||= width(percentage:)
-    ellipsis_length = ellipsis.size
-    if length < ellipsis_length
-      +''
-    elsif text.size >= length + ellipsis_length
-      text[0, length - ellipsis_length] + ellipsis
-    else
-      text
-    end
-  end
-end

data/spec/ollama/utils/ansi_markdown_spec.rb

@@ -1,15 +0,0 @@
-require 'spec_helper'
-
-RSpec.describe Ollama::Utils::ANSIMarkdown do
-  let :source  do
-    File.read(Pathname.new(__dir__) + '..' + '..' + '..' + 'README.md')
-  end
-
-  it 'can parse' do
-    File.open('tmp/README.ansi', ?w) do |output|
-      ansi = described_class.parse(source)
-      expect(ansi).to match("This is the end.")
-      output.puts ansi
-    end
-  end
-end

data/spec/ollama/utils/width_spec.rb

@@ -1,82 +0,0 @@
-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