ollama_chat 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ca8b4d15da972d1600ccab9349f1852ccb75f2733cd9a85ccfb57f2890cb786
-  data.tar.gz: 3ec2450f156b98ac722b58358de3190e58d30ebf6f8e09dd435804b409c1e1e0
+  metadata.gz: 5b9fa311f0d8759e37629d79db604ca81c344699e18203efd60f4b3361eb95f0
+  data.tar.gz: '0727224708a9fb941a6572322793f0161fc21cee945ed08642fd41707c26d57f'
 SHA512:
-  metadata.gz: 98a1335f95549196c6a6a486465c3dad12694b8006c18a7ff2619be8a866b826869ed35dde99d810fea330101e67361142000ac705e5784450bc9ae11952f8d7
-  data.tar.gz: dce73464d416d095eee8d86723ca241cc7affdbc87b4472bf4e0cf0caf084f52d2c47810fd3fe8ec67cb883df85e58098caae1ad45c4088850d98cc37705c2b0
+  metadata.gz: ba5167d27ca64037115b36fc77c405e85311f1595fb771835b3c55429305b2e6304e7064c30e08f57fb8d97e99ccda818cc45cb43681c25b42e120c30d9feb64
+  data.tar.gz: 43b994f34e3e161b49c989dfec1df0d02f6debb710c7a078902d3872b2bebea2fc3606481ef5d36142afba36b9a60a5daa80630663f2ef5614d30674e4329c1e

data/CHANGES.md

@@ -1,5 +1,25 @@
 # 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

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/VERSION

@@ -1 +1 @@
-0.0.17
+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/, '')
@@ -350,6 +353,14 @@ class OllamaChat::Chat
       input_prompt   = bold { color(172) { message_type(@images) + " user" } } + bold { "> " }
       begin
         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

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

@@ -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

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.17'
+  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.17 ruby lib
+# stub: ollama_chat 0.0.18 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama_chat".freeze
-  s.version = "0.0.17".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])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ollama_chat
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  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