ollama-ruby 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17d71b1a18444b7e2d80e3e0da1e56c38140eaa47ac671aef4968f3cc2cb8c56
-  data.tar.gz: f395c4750e3a440739423906fb722ae2f7c1feedd31f417f4dc1e6677a5d86ba
+  metadata.gz: 6611c14b779a919b256552774080305825b4e81cd5e43ae0303026aaaed7c13e
+  data.tar.gz: a34e71ef5b07cdd8a0cdf5dce9de7f7e9c3faca1829e4837c54ea243458b8f05
 SHA512:
-  metadata.gz: ff1b123a36389fcc17dcaf45e8fc655fad7a8d143825621645606178346d09becba16ba5586031bf983d5c951cebbdb03a0720a41c2d3211fe47d4d9c8b244c2
-  data.tar.gz: 33700ca555ce9328d753544ba964a6482416bf62bac22fb358a2eb1cb214a7c85d6df9fa9b54b2e22cc673f45da8df03821f2c41b2d8361e4313626197c3fea5
+  metadata.gz: aa38db4bdd42ebffe2ef9b5abf7f644e38821acc4fb9650b7e8646a9fab3350640224c4ba59e13d7f182becd2a84ac881fd0c5d136ca88782e1a7febec31c2fe
+  data.tar.gz: b14f2626d9f2c8e6e8bc6c3b3d8947d78b4400cf0dd8888cf9f818261ba3605fc9971c2c9015f976ec48f2004cb4b0ff5d922e2efe001b5b443f03728f14ce51

data/CHANGES.md

@@ -1,5 +1,24 @@
 # 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`:

data/Rakefile

@@ -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,7 +40,8 @@ GemHadar do
   dependency             'json',                  '~> 2.0'
   dependency             'xdg',                   '~> 7.0'
   dependency             'tins',                  '~> 1.34'
-  dependency             'kramdown-ansi',         '~> 0.0'
+  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)
@@ -540,7 +540,7 @@ end
 def import_source(source_io, source)
   source = source.to_s
   puts "Importing #{italic { source_io&.content_type }} document #{source.to_s.inspect} now."
-	source_content = parse_source(source_io)
+  source_content = parse_source(source_io)
   "Imported #{source.inspect}:\n#{source_content}\n\n"
 end
 
@@ -657,6 +657,8 @@ def parse_content(content, images)
         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'
@@ -711,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)

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/version.rb

@@ -1,6 +1,6 @@
 module Ollama
   # Ollama version
-  VERSION         = '0.10.0'
+  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/ollama-ruby.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: ollama-ruby 0.10.0 ruby lib
+# stub: ollama-ruby 0.11.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama-ruby".freeze
-  s.version = "0.10.0".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-31"
+  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]
@@ -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,5 +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])
+  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.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-31 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
@@ -354,6 +326,26 @@ dependencies:
         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:
     - - "~>"