ollama_chat 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7e85d325cc40d5cb5dbe01e9971c22da13b4afada35fbb17f130d9430b1f508
-  data.tar.gz: 275b88f332344e7d1664e58c60540243d6cf512b2ba78547fbe784cfd02a6acc
+  metadata.gz: ae96668b9a38eb238d0d9352e4c6866f3a99c8e89796ca696a6c09acce776c32
+  data.tar.gz: 44171082a4e6c971a4cd3cf4a95ab89cf76388e13fc9638e140261a2702437c7
 SHA512:
-  metadata.gz: 3b3a8bbf023960e38a33f4f2c4fc1e75e7e7be4c11213144975b1ad370efd9a71e4d61c76a7de3f3340d80eaa77d53882184f1f7635d7d5f678753e2e2c0dc6f
-  data.tar.gz: 69f57301a1308f75d55842630f7902172c8b67cf37d0ea2aad7564423be0567beb9e70bdff81b6e485cf2b3700040d6039e7c170d6a6bc4ebf65e1bf32bb32f9
+  metadata.gz: 13ae7bdd0e3012e34341d989ace27240472c8e442f8dc9f49ec94b1e9729c71353f70089a80f066d34d65ad67dc3e52cffe0d2f873a1881a185dea88f63f413a
+  data.tar.gz: ae099dfe86b2888b5ed545b5c5f630eeccef4f4d52c000ffa1a5fbc2f36897705e31634e5c0810a962fecd27241645efdcedaa667d5eebcead72c26ca3448c05

data/CHANGES.md

@@ -1,5 +1,26 @@
 # Changes
 
+## 2025-06-01 v0.0.11
+
+* **Think Mode Implementation**:
+  + Introduced `@think_mode` attribute to read think mode setting from config
+  + Implemented `remove_think_blocks` method to filter out thought blocks from chat messages sent to the LLM model.
+  + Added conditional logic based on `@think_mode` value to handle different modes (`'display'`, `'omit'`, `'no_delete'`, `'only_delete'`)
+
+    * **'display'**: Displays thought blocks' tags as emojis.
+    * **'omit'**: Omit internal reasoning blocks and tags from the output entirely.
+    * **'no_delete'**: Sends the entire conversation, including all think tags, to the Large Language Model (LLM) for processing.
+    * **'only_delete'**: Removes the explicit indicators of thought processes only from the conversation sent to the LLM, but does not modify the output shown to the user.
+* **User Interface Improvements**:
+  + Added `/think_mode` command to help users understand think mode options
+  + Updated session output to include current think mode
+  + Added think mode chooser to OllamaChat::Dialog, allowing users to select their preferred think mode
+* **Output Handling Enhancements**:
+  + Improved markdown handling for think blocks in OllamaChat::FollowChat class
+  + Modified output to print clear screen, move home, and user info before printing content
+* **Configuration Updates**:
+  + Added `think_mode` key with value `"display"` to `default_config.yml`
+
 ## 2025-05-28 v0.0.10
 
 * Simplify and improve command handling logic.

data/README.md

@@ -121,7 +121,7 @@ The following commands can be given inside the chat, if prefixed by a `/`:
 /markdown                       toggle markdown output
 /stream                         toggle stream output
 /location                       toggle location submission
-/voice( change)                 toggle voice output or change the voice
+/voice [change]                 toggle voice output or change the voice
 /list [n]                       list the last n / all conversation exchanges
 /clear [messages|links|history] clear the all messages, links, or the chat history (defaults to messages)
 /clobber                        clear the conversation, links, and collection
@@ -133,6 +133,7 @@ The following commands can be given inside the chat, if prefixed by a `/`:
 /info                           show information for current session
 /config                         output current configuration ("/Users/flori/.config/ollama_chat/config.yml")
 /document_policy                pick a scan policy for document references
+/think_mode                     pick a think mode for reasoning models (display, omit, only_delete, no_delete)
 /import source                  import the source's content
 /summarize [n] source           summarize the source's content in n words
 /embedding                      toggle embedding paused or not

data/VERSION

@@ -1 +1 @@
-0.0.10
+0.0.11

data/lib/ollama_chat/chat.rb

@@ -46,6 +46,7 @@ class OllamaChat::Chat
     )
     server_version
     @document_policy = config.document_policy
+    @think_mode      = config.think_mode
     @model           = choose_model(@opts[?m], config.model.name)
     @model_options   = Ollama::Options[config.model.options]
     model_system     = pull_model_unless_present(@model, @model_options)
@@ -153,7 +154,7 @@ class OllamaChat::Chat
     when %r(^/regenerate$)
       if content = messages.second_last&.content
         content.gsub!(/\nConsider these chunks for your answer.*\z/, '')
-        messages.drop(2)
+        messages.drop(1)
       else
         STDOUT.puts "Not enough messages in this conversation."
         return :redo
@@ -246,7 +247,6 @@ class OllamaChat::Chat
       fetch_source(url) { |url_io| embed_source(url_io, url) }
     end
     urls_summarized = urls.map { summarize(_1) }
-    query   = $2.inspect
     results = urls.zip(urls_summarized).
       map { |u, s| "%s as \n:%s" % [ u, s ] } * "\n\n"
     config.prompts.web % { query:, results: }
@@ -387,11 +387,17 @@ class OllamaChat::Chat
         messages:,
         voice:    (@current_voice if voice.on?)
       )
+      messages_to_send =
+        if @think_mode == 'no_delete'
+          messages
+        else
+          remove_think_blocks(messages)
+        end
       ollama.chat(
-        model: @model,
-        messages:,
-        options: @model_options,
-        stream: stream.on?,
+        model:    @model,
+        messages: messages_to_send,
+        options:  @model_options,
+        stream:   stream.on?,
         &handler
       )
       if embedding.on? && !records.empty?
@@ -419,6 +425,19 @@ class OllamaChat::Chat
 
   private
 
+  def remove_think_blocks(messages)
+    new_messages = OllamaChat::MessageList.new(self)
+    messages.to_ary.each do |message|
+      thought_less_content = message.content.gsub(%r(<think(?:ing)?>.*?</think(?:ing)?>)im, '')
+      new_messages << Ollama::Message.new(
+        role: message.role,
+        content: thought_less_content,
+        images: message.images
+      )
+    end
+    new_messages
+  end
+
   def setup_documents
     if embedding.on?
       @embedding_model         = config.embedding.model.name

data/lib/ollama_chat/dialog.rb

@@ -57,6 +57,30 @@ module OllamaChat::Dialog
     info
   end
 
+  attr_accessor :think_mode
+
+  def choose_think_mode
+    modes = %w[ display omit only_delete no_delete ].sort
+    current  = if modes.index(@think_mode)
+                 @think_mode
+               elsif modes.index(config.think_mode)
+                 config.think_mode
+               else
+                 modes.first
+               end
+    modes.unshift('[EXIT]')
+    think_mode = OllamaChat::Utils::Chooser.choose(modes)
+    case think_mode
+    when nil, '[EXIT]'
+      STDOUT.puts "Exiting chooser."
+      think_mode = current
+    end
+    self.think_mode = think_mode
+  ensure
+    STDOUT.puts "Using think mode #{bold{@think_mode}}."
+    info
+  end
+
   def change_system_prompt(default, system: nil)
     selector = Regexp.new(system.to_s[1..-1].to_s)
     prompts  = config.system_prompts.attribute_names.compact.grep(selector)

data/lib/ollama_chat/follow_chat.rb

@@ -20,17 +20,23 @@ class OllamaChat::FollowChat
         @messages << Message.new(role: 'assistant', content: '')
         @user = message_type(@messages.last.images) + " " +
           bold { color(111) { 'assistant:' } }
-        @output.puts @user unless @chat.markdown.on?
       end
-      if content = response.message&.content
-        content = content.gsub(%r(<think>), "💭\n").gsub(%r(</think>), "\n💬")
-      end
-      @messages.last.content << content
-      if @chat.markdown.on? and content = @messages.last.content.full?
-        markdown_content = Kramdown::ANSI.parse(content)
-        @output.print clear_screen, move_home, @user, ?\n, markdown_content
-      else
-        @output.print content
+      @messages.last.content << response.message&.content
+      if content = @messages.last.content.full?
+        case @chat.think_mode
+        when 'display'
+          content = emphasize_think_block(content)
+        when 'omit'
+          content = omit_think_block(content)
+        when 'no_delete', 'only_delete'
+          content = quote_think_tags(content)
+        end
+        if @chat.markdown.on?
+          markdown_content = Kramdown::ANSI.parse(content)
+          @output.print clear_screen, move_home, @user, ?\n, markdown_content
+        else
+          @output.print clear_screen, move_home, @user, ?\n, content
+        end
       end
       @say.call(response)
     end
@@ -57,4 +63,22 @@ class OllamaChat::FollowChat
       Kramdown::ANSI::Width.wrap(stats_text, percentage: 90).gsub(/(?<!\A)^/, '   ')
     }
   end
+
+  private
+
+  def emphasize_think_block(content)
+    content.gsub(%r(<think(?:ing)?>)i, "\n💭\n").gsub(%r(</think(?:ing)?>)i, "\n💬\n")
+  end
+
+  def omit_think_block(content)
+    content.gsub(%r(<think(?:ing)?>.*?(</think(?:ing)?>|\z))im, '')
+  end
+
+  def quote_think_tags(content)
+    if @chat.markdown.on?
+      content.gsub(%r(<(think(?:ing)?)>)i, "\n\\<\\1\\>\n").gsub(%r(</(think(?:ing)?)>)i, "\n\\</\\1\\>\n")
+    else
+      content.gsub(%r(<(think(?:ing)?)>)i, "\n<\\1\>\n").gsub(%r(</(think(?:ing)?)>)i, "\n</\\1>\n")
+    end
+  end
 end

data/lib/ollama_chat/information.rb

@@ -48,6 +48,7 @@ module OllamaChat::Information
     stream.show
     location.show
     STDOUT.puts "Document policy for references in user text: #{bold{@document_policy}}"
+    STDOUT.puts "Think mode is currently: #{bold{@think_mode}}"
     STDOUT.puts "Currently selected search engine is #{bold(search_engine)}."
     if @voice.on?
       STDOUT.puts "Using voice #{bold{@current_voice}} to speak."
@@ -75,12 +76,13 @@ module OllamaChat::Information
       /info                           show information for current session
       /config                         output current configuration (#{@ollama_chat_config.filename.to_s.inspect})
       /document_policy                pick a scan policy for document references
+      /think_mode                     pick a think mode for reasoning models
       /import source                  import the source's content
       /summarize [n] source           summarize the source's content in n words
       /embedding                      toggle embedding paused or not
       /embed source                   embed the source's content
       /web [n] query                  query web search & return n or 1 results
-      /links( clear)                  display (or clear) links used in the chat
+      /links [clear]                  display (or clear) links used in the chat
       /save filename                  store conversation messages
       /load filename                  load conversation messages
       /quit                           to quit

data/lib/ollama_chat/ollama_chat_config/default_config.yml

@@ -32,6 +32,7 @@ voice:
 markdown: true
 stream: true
 document_policy: importing
+think_mode: display
 embedding:
   enabled: true
   model:

data/lib/ollama_chat/version.rb

@@ -1,6 +1,6 @@
 module OllamaChat
   # OllamaChat version
-  VERSION         = '0.0.10'
+  VERSION         = '0.0.11'
   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.10 ruby lib
+# stub: ollama_chat 0.0.11 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama_chat".freeze
-  s.version = "0.0.10".freeze
+  s.version = "0.0.11".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]

data/spec/ollama_chat/chat_spec.rb

@@ -297,6 +297,7 @@ RSpec.describe OllamaChat::Chat do
             Streaming|
             Location|
             Document\ policy|
+            Think\ mode|
             Currently\ selected\ search\ engine
           /x
         ).at_least(1)

data/spec/ollama_chat/follow_chat_spec.rb

@@ -8,7 +8,7 @@ RSpec.describe OllamaChat::FollowChat do
   end
 
   let :chat do
-    double('Chat', markdown: double(on?: false))
+    double('Chat', markdown: double(on?: false), think_mode: 'display')
   end
 
   let :follow_chat do
@@ -31,8 +31,10 @@ RSpec.describe OllamaChat::FollowChat do
   it 'can follow without markdown' do
     message = Ollama::Message.new(role: 'assistant', content: 'world')
     response = double(message:, done: false)
-    expect(output).to receive(:puts).with(/assistant/)
-    expect(output).to receive(:print).with(/world/)
+    expect(output).to receive(:print).with(
+      "\e[2J", "\e[1;1H", "📨 \e[1m\e[38;5;111massistant:\e[0m\e[0m", "\n",
+      "world"
+    )
     follow_chat.call(response)
     response = double(
       message:              nil,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ollama_chat
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Florian Frank