ollama_chat 0.0.16 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1cddb901277529210fcc39b4c086217515e98aa75c1569044a47e1cf7149acbe
-  data.tar.gz: f7a40ef2722c750bb71ff2b42d3c2cf0c04816bfd11753e22fa7a09f2d13c9f8
+  metadata.gz: 5b9fa311f0d8759e37629d79db604ca81c344699e18203efd60f4b3361eb95f0
+  data.tar.gz: '0727224708a9fb941a6572322793f0161fc21cee945ed08642fd41707c26d57f'
 SHA512:
-  metadata.gz: 7cd5baab3a073464bbf28d3cd9e6ebbcfdcd938c55b1a17ca5d6f2a6b3949d1a2d0a138d9aacf192f6d2f2de1751b8d3e10368c2c15eba5b955ee5454fbd6ff1
-  data.tar.gz: 3ed3442aa4962666de9a56ce5a10e816c9b6f21d85e1281c65962d70c41c60e0c9c8f47fc4e380703799d67e006b2aef36fbe4e2208632e7c3d02c4cc3120c1a
+  metadata.gz: ba5167d27ca64037115b36fc77c405e85311f1595fb771835b3c55429305b2e6304e7064c30e08f57fb8d97e99ccda818cc45cb43681c25b42e120c30d9feb64
+  data.tar.gz: 43b994f34e3e161b49c989dfec1df0d02f6debb710c7a078902d3872b2bebea2fc3606481ef5d36142afba36b9a60a5daa80630663f2ef5614d30674e4329c1e

data/CHANGES.md

@@ -1,5 +1,32 @@
 # Changes
 
+## 2025-07-31 v0.0.18
+
+* **Added /prompt command**: The `/prompt` command was added to the list of
+  supported commands, allowing users to prefill their input with text from
+  predefined prompts.
+  + Integrated prompt handling in `lib/ollama_chat/chat.rb`, where a new case
+    statement for `/prompt` sets up prefill functionality.
+  + Implemented prompt selection using the `choose_prompt` method in
+    `lib/ollama_chat/dialog.rb`.
+  + Set up input hooks using `Reline.pre_input_hook` to insert selected prompts
+    before user input.
+* **Improved user interaction**:
+  - Added model size display during model selection via the `model_with_size`
+    method in `lib/ollama_chat/dialog.rb`.
+  - Updated model selection logic to include formatted sizes in the display.
+* **Optimized voice list generation**: In
+  `lib/ollama_chat/ollama_chat_config/default_config.yml`, updated the voice
+  list generation logic to use a more efficient method of retrieving voice
+  names.
+
+## 2025-07-14 v0.0.17
+
+* Implement Pager Support for List Command
+* Add simple command completion to chat
+* Improved chat link generation
+  + Changed `record.tags.first` to have prefix `?#` before the tag
+
 ## 2025-07-10 v0.0.16
 
 - **New Features**

data/README.md

@@ -131,6 +131,7 @@ The following commands can be given inside the chat, if prefixed by a `/`:
 /drop [n]                       drop the last n exchanges, defaults to 1
 /model                          change the model
 /system [show]                  change/show system prompt
+/prompt                         prefill user prompt with preset prompts
 /regenerate                     the last answer message
 /collection [clear|change]      change (default) collection or clear
 /info                           show information for current session

data/Rakefile

@@ -32,13 +32,13 @@ GemHadar do
   dependency             'excon',                 '~> 1.0'
   dependency             'ollama-ruby',           '~> 1.2'
   dependency             'documentrix',           '~> 0.0', '>= 0.0.2'
-  dependency             'unix_socks'
+  dependency             'unix_socks',            '>= 0.0.1'
   dependency             'rss',                   '~> 0.3'
   dependency             'term-ansicolor',        '~> 1.11'
   dependency             'redis',                 '~> 5.0'
   dependency             'mime-types',            '~> 3.0'
   dependency             'reverse_markdown',      '~> 3.0'
-  dependency             'xdg',                   '~> 7.0'
+  dependency             'xdg'
   dependency             'kramdown-ansi',         '~> 0.0', '>= 0.0.1'
   dependency             'complex_config',        '~> 0.22', '>= 0.22.2'
   dependency             'tins',                  '~> 1.34'

data/VERSION

@@ -1 +1 @@
-0.0.16
+0.0.18

data/lib/ollama_chat/chat.rb

@@ -159,6 +159,9 @@ class OllamaChat::Chat
       end
       @messages.show_system_prompt
       :next
+    when %r(^/prompt)
+      @prefill_prompt = choose_prompt
+      :next
     when %r(^/regenerate$)
       if content = messages.second_last&.content
         content.gsub!(/\nConsider these chunks for your answer.*\z/, '')
@@ -348,9 +351,18 @@ class OllamaChat::Chat
       @parse_content = true
       type           = :terminal_input
       input_prompt   = bold { color(172) { message_type(@images) + " user" } } + bold { "> " }
-
       begin
-        content = Reline.readline(input_prompt, true)&.chomp
+        content = enable_command_completion do
+          if prefill_prompt = @prefill_prompt.full?
+            Reline.pre_input_hook = -> {
+              Reline.insert_text prefill_prompt.gsub(/\n*\z/, '')
+              @prefill_prompt = nil
+            }
+          else
+            Reline.pre_input_hook = nil
+          end
+          Reline.readline(input_prompt, true)&.chomp
+        end
       rescue Interrupt
         if message = server_socket_message
           type    = message.type.full?(:to_sym) || :socket_input
@@ -418,7 +430,7 @@ class OllamaChat::Chat
                  else
                    'file://%s' % File.expand_path(record.source)
                  end
-          [ link, record.tags.first ]
+          [ link, ?# + record.tags.first ]
         }.uniq.map { |l, t| hyperlink(l, t) }.join(' ')
         config.debug and jj messages.to_ary
       end
@@ -526,4 +538,15 @@ class OllamaChat::Chat
       exit 1
     end
   end
+
+  def enable_command_completion(&block)
+    old = Reline.completion_proc
+    commands = display_chat_help_message.scan(/^\s*(\S+)/).inject(&:concat)
+    Reline.completion_proc = -> input {
+      commands.grep Regexp.new('\A' + Regexp.quote(input))
+    }
+    block.()
+  ensure
+    Reline.completion_proc = old
+  end
 end

data/lib/ollama_chat/dialog.rb

@@ -1,10 +1,21 @@
 module OllamaChat::Dialog
+  private def model_with_size(model)
+    result = model.name
+    formatted_size = Term::ANSIColor.bold {
+      Tins::Unit.format(model.size, unit: ?B, prefix: 1024, format: '%.1f %U')
+    }
+    result.singleton_class.class_eval do
+      define_method(:to_s) { "%s %s" % [ model.name, formatted_size ] }
+    end
+    result
+  end
+
   def choose_model(cli_model, current_model)
     selector = if cli_model =~ /\A\?+(.*)\z/
                  cli_model = ''
                  Regexp.new($1)
                end
-    models = ollama.tags.models.map(&:name).sort
+    models = ollama.tags.models.sort_by(&:name).map { |m| model_with_size(m) }
     selector and models = models.grep(selector)
     model = if cli_model == ''
               OllamaChat::Utils::Chooser.choose(models) || current_model
@@ -92,6 +103,18 @@ module OllamaChat::Dialog
     @messages.set_system_prompt(system)
   end
 
+  def choose_prompt
+    prompts = config.prompts.attribute_names
+    prompts.unshift('[EXIT]')
+    case chosen = OllamaChat::Utils::Chooser.choose(prompts)
+    when '[EXIT]', nil
+      STDOUT.puts "Exiting chooser."
+      return
+    when *prompts
+      config.prompts.send(chosen)
+    end
+  end
+
   def change_voice
     chosen  = OllamaChat::Utils::Chooser.choose(config.voice.list)
     @current_voice = chosen.full? || config.voice.default

data/lib/ollama_chat/information.rb

@@ -58,8 +58,8 @@ module OllamaChat::Information
     nil
   end
 
-  def display_chat_help
-    STDOUT.puts <<~EOT
+  private def display_chat_help_message
+    <<~EOT
       /copy                           to copy last response to clipboard
       /paste                          to paste content
       /markdown                       toggle markdown output
@@ -72,6 +72,7 @@ module OllamaChat::Information
       /drop [n]                       drop the last n exchanges, defaults to 1
       /model                          change the model
       /system [show]                  change/show system prompt
+      /prompt                         prefill user prompt with preset prompts
       /regenerate                     the last answer message
       /collection [clear|change]      change (default) collection or clear
       /info                           show information for current session
@@ -89,6 +90,10 @@ module OllamaChat::Information
       /quit                           to quit
       /help                           to view this help
     EOT
+  end
+
+  def display_chat_help
+    STDOUT.puts display_chat_help_message
     nil
   end
 

data/lib/ollama_chat/message_list.rb

@@ -99,31 +99,33 @@ class OllamaChat::MessageList
   # @return [ OllamaChat::MessageList ]
   def list_conversation(last = nil)
     last = (last || @messages.size).clamp(0, @messages.size)
-    @messages[-last..-1].to_a.each do |m|
-      role_color = case m.role
-                   when 'user' then 172
-                   when 'assistant' then 111
-                   when 'system' then 213
-                   else 210
+    use_pager do |output|
+      @messages[-last..-1].to_a.each do |m|
+        role_color = case m.role
+                     when 'user' then 172
+                     when 'assistant' then 111
+                     when 'system' then 213
+                     else 210
+                     end
+        thinking = if @chat.think.on?
+                     think_annotate do
+                       m.thinking.full? { @chat.markdown.on? ? Kramdown::ANSI.parse(_1) : _1 }
+                     end
                    end
-      thinking = if @chat.think.on?
-                   think_annotate do
-                     m.thinking.full? { @chat.markdown.on? ? Kramdown::ANSI.parse(_1) : _1 }
-                   end
-                 end
-      content = m.content.full? { @chat.markdown.on? ? Kramdown::ANSI.parse(_1) : _1 }
-      message_text = message_type(m.images) + " "
-      message_text += bold { color(role_color) { m.role } }
-      if thinking
-        message_text += [ ?:, thinking, talk_annotate { content } ].compact.
-          map { _1.chomp } * ?\n
-      else
-        message_text += ":\n#{content}"
+        content = m.content.full? { @chat.markdown.on? ? Kramdown::ANSI.parse(_1) : _1 }
+        message_text = message_type(m.images) + " "
+        message_text += bold { color(role_color) { m.role } }
+        if thinking
+          message_text += [ ?:, thinking, talk_annotate { content } ].compact.
+            map { _1.chomp } * ?\n
+        else
+          message_text += ":\n#{content}"
+        end
+        m.images.full? { |images|
+          message_text += "\nImages: " + italic { images.map(&:path) * ', ' }
+        }
+        output.puts message_text
       end
-      m.images.full? { |images|
-        message_text += "\nImages: " + italic { images.map(&:path) * ', ' }
-      }
-      STDOUT.puts message_text
     end
     self
   end
@@ -261,4 +263,22 @@ class OllamaChat::MessageList
   def config
     @chat.config
   end
+
+  def determine_pager_command
+    default_pager = ENV['PAGER'].full?
+    if fallback_pager = `which less`.chomp.full? || `which more`.chomp.full?
+      fallback_pager << ' -r'
+    end
+    default_pager || fallback_pager
+  end
+
+  def use_pager
+    command       = determine_pager_command
+    output_buffer = StringIO.new
+    yield output_buffer
+    messages = output_buffer.string
+    Kramdown::ANSI::Pager.pager(command:, lines: messages.count(?\n)) do |output|
+      output.puts messages
+    end
+  end
 end

data/lib/ollama_chat/ollama_chat_config/default_config.yml

@@ -32,7 +32,7 @@ system_prompts:
 voice:
   enabled: false
   default: Samantha
-  list: <%= `say -v ? 2>/dev/null`.lines.map { _1[/^(.+?)\s+[a-z]{2}_[a-zA-Z0-9]{2,}/, 1] }.uniq.sort.to_s.force_encoding('ASCII-8BIT') %>
+  list: <%= `say -v ? 2>/dev/null`.lines.map { |l| l.force_encoding('ASCII-8BIT'); l[/^(.+?)\s+[a-z]{2}_[a-zA-Z0-9]{2,}/, 1] }.uniq.sort.to_s %>
 markdown: true
 stream: true
 document_policy: importing

data/lib/ollama_chat/version.rb

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

data/ollama_chat.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: ollama_chat 0.0.16 ruby lib
+# stub: ollama_chat 0.0.18 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama_chat".freeze
-  s.version = "0.0.16".freeze
+  s.version = "0.0.18".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
 
   s.specification_version = 4
 
-  s.add_development_dependency(%q<gem_hadar>.freeze, ["~> 1.20".freeze])
+  s.add_development_dependency(%q<gem_hadar>.freeze, ["~> 1.23".freeze])
   s.add_development_dependency(%q<all_images>.freeze, ["~> 0.6".freeze])
   s.add_development_dependency(%q<rspec>.freeze, ["~> 3.2".freeze])
   s.add_development_dependency(%q<kramdown>.freeze, ["~> 2.0".freeze])
@@ -34,13 +34,13 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<excon>.freeze, ["~> 1.0".freeze])
   s.add_runtime_dependency(%q<ollama-ruby>.freeze, ["~> 1.2".freeze])
   s.add_runtime_dependency(%q<documentrix>.freeze, ["~> 0.0".freeze, ">= 0.0.2".freeze])
-  s.add_runtime_dependency(%q<unix_socks>.freeze, [">= 0".freeze])
+  s.add_runtime_dependency(%q<unix_socks>.freeze, [">= 0.0.1".freeze])
   s.add_runtime_dependency(%q<rss>.freeze, ["~> 0.3".freeze])
   s.add_runtime_dependency(%q<term-ansicolor>.freeze, ["~> 1.11".freeze])
   s.add_runtime_dependency(%q<redis>.freeze, ["~> 5.0".freeze])
   s.add_runtime_dependency(%q<mime-types>.freeze, ["~> 3.0".freeze])
   s.add_runtime_dependency(%q<reverse_markdown>.freeze, ["~> 3.0".freeze])
-  s.add_runtime_dependency(%q<xdg>.freeze, ["~> 7.0".freeze])
+  s.add_runtime_dependency(%q<xdg>.freeze, [">= 0".freeze])
   s.add_runtime_dependency(%q<kramdown-ansi>.freeze, ["~> 0.0".freeze, ">= 0.0.1".freeze])
   s.add_runtime_dependency(%q<complex_config>.freeze, ["~> 0.22".freeze, ">= 0.22.2".freeze])
   s.add_runtime_dependency(%q<tins>.freeze, ["~> 1.34".freeze])

data/spec/ollama_chat/message_list_spec.rb

@@ -10,7 +10,8 @@ RSpec.describe OllamaChat::MessageList do
         units: 'SI (International System of Units)'
       ),
       prompts: double(
-        location: 'You are at %{location_name} (%{location_decimal_degrees}), on %{localtime}, preferring %{units}'
+        location: 'You are at %{location_name} (%{location_decimal_degrees}),' \
+        ' on %{localtime}, preferring %{units}'
       ),
       system_prompts: double(
         assistant?: 'You are a helpful assistant.'
@@ -64,32 +65,60 @@ RSpec.describe OllamaChat::MessageList do
     FileUtils.rm_f 'tmp/test-conversation.json'
   end
 
-  it 'can list conversations without thinking' do
-    expect(chat).to receive(:markdown).
-      and_return(double(on?: true)).at_least(:once)
-    expect(chat).to receive(:think).
-      and_return(double(on?: false)).at_least(:once)
-    list <<  Ollama::Message.new(role: 'user', content: 'world')
-    expect(STDOUT).to receive(:puts).
-      with("📨 \e[1m\e[38;5;213msystem\e[0m\e[0m:\nhello\n")
-    expect(STDOUT).to receive(:puts).
-      with("📨 \e[1m\e[38;5;172muser\e[0m\e[0m:\nworld\n")
-    list.list_conversation
-  end
-
-  it 'can list conversations with thinking' do
-    expect(chat).to receive(:markdown).
-      and_return(double(on?: true)).at_least(:once)
-    expect(chat).to receive(:think).
-      and_return(double(on?: true)).at_least(:once)
-    expect(STDOUT).to receive(:puts).
-      with("📨 \e[1m\e[38;5;213msystem\e[0m\e[0m:\n💭\nI need to say something nice…\n\n💬\nhello\n")
-    expect(STDOUT).to receive(:puts).
-      with("📨 \e[1m\e[38;5;172muser\e[0m\e[0m:\nworld\n")
-    list.set_system_prompt nil
-    list << Ollama::Message.new(role: 'system', content: 'hello', thinking: 'I need to say something nice…')
-    list << Ollama::Message.new(role: 'user', content: 'world')
-    list.list_conversation
+  context 'without pager' do
+    before do
+      expect(list).to receive(:determine_pager_command).and_return nil
+    end
+
+    it 'can list conversations without thinking' do
+      expect(chat).to receive(:markdown).
+        and_return(double(on?: true)).at_least(:once)
+      expect(chat).to receive(:think).
+        and_return(double(on?: false)).at_least(:once)
+      list <<  Ollama::Message.new(role: 'user', content: 'world')
+      expect(STDOUT).to receive(:puts).
+        with(
+          "📨 \e[1m\e[38;5;213msystem\e[0m\e[0m:\nhello\n" \
+          "📨 \e[1m\e[38;5;172muser\e[0m\e[0m:\nworld\n"
+        )
+      list.list_conversation
+    end
+
+    it 'can list conversations with thinking' do
+      expect(chat).to receive(:markdown).
+        and_return(double(on?: true)).at_least(:once)
+      expect(chat).to receive(:think).
+        and_return(double(on?: true)).at_least(:once)
+      expect(STDOUT).to receive(:puts).
+        with(
+          "📨 \e[1m\e[38;5;213msystem\e[0m\e[0m:\n" \
+          "💭\nI need to say something nice…\n\n💬\nhello\n" \
+          "📨 \e[1m\e[38;5;172muser\e[0m\e[0m:\nworld\n"
+        )
+      list.set_system_prompt nil
+      list << Ollama::Message.new(
+        role: 'system', content: 'hello',
+        thinking: 'I need to say something nice…'
+      )
+      list << Ollama::Message.new(role: 'user', content: 'world')
+      list.list_conversation
+    end
+  end
+
+  context 'with pager' do
+    before do
+      expect(list).to receive(:determine_pager_command).and_return 'true'
+      expect(Tins::Terminal).to receive(:lines).and_return 1
+    end
+
+    it 'can list conversations' do
+      expect(chat).to receive(:markdown).
+        and_return(double(on?: true)).at_least(:once)
+      expect(chat).to receive(:think).
+        and_return(double(on?: false)).at_least(:once)
+      list <<  Ollama::Message.new(role: 'user', content: 'world')
+      list.list_conversation
+    end
   end
 
   it 'can show_system_prompt' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ollama_chat
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.18
 platform: ruby
 authors:
 - Florian Frank
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.20'
+        version: '1.23'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.20'
+        version: '1.23'
 - !ruby/object:Gem::Dependency
   name: all_images
   requirement: !ruby/object:Gem::Requirement
@@ -161,14 +161,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: rss
   requirement: !ruby/object:Gem::Requirement
@@ -243,16 +243,16 @@ dependencies:
   name: xdg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: kramdown-ansi
   requirement: !ruby/object:Gem::Requirement