ollama_chat 0.0.43 → 0.0.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc5f503ab89f249029f367c0bbd92e26494f7ebaaa1514b90fe20160c099b51f
-  data.tar.gz: f13c4a61429743b6265fb8b2fa836f58966e4cccf9092d311daa28cade51f8e9
+  metadata.gz: d0c9a525754d546b6d7cd0fa88e20c4767bd1dae51313d1f2c2409c06762f4b0
+  data.tar.gz: fc9ddde83495908f965c9225246b6668b01c40fe7391fb83c54beb3ce46321d2
 SHA512:
-  metadata.gz: 4560b3a2cc81610c3fca8c5f24167957a32b1c0521e241aa77fb87b701decbd3640eb04e9f63a487a668f78de077d733e1a0fb1b60ba8a08b0e0f06b5c82bd96
-  data.tar.gz: 12c982a3250583e5bb689941fe680b8632a9f3526d1e6548e261e5e7ffe738649c8f9d98bb07224faa5fbf5745bb0eb9d4988aae647e50f5075b121e1ca534f4
+  metadata.gz: 97dc5c42b59b3f0d7abf50a0647ff3a3c79681e88e4e9b61c37f706fadc450731ed0240795362e6a061f07ada56502934f5992e796c602b01c27f3b20e6c575f
+  data.tar.gz: 34c1f4dded9b54155b407913290354707cb63104b3ea126ca438a245d03458ee868962068f85398954cf6be0ff17f826bdc627985168817d55642cb231732459

data/CHANGES.md

@@ -1,5 +1,34 @@
 # Changes
 
+## 2025-12-10 v0.0.44
+
+- Fixed `stream` option in `spec/ollama_chat/follow_chat_spec.rb` from `on?
+  true` to `on?: true`
+- Extracted `prepare_last_message` method to handle content and thinking text
+  formatting with markdown and annotation support
+- Introduced `display_output` method that uses `use_pager` from `MessageList`
+  to handle large outputs gracefully
+- Modified `FollowChat#process_response` to conditionally call
+  `display_formatted_terminal_output` based on `@chat.stream.on?`
+- Added `use_pager` method to `MessageList` that wraps output blocks with pager
+  context using `Kramdown::ANSI::Pager`
+- Updated conditional logic in `follow_chat.rb` to properly distinguish between
+  streaming and non-streaming display modes
+- Updated `kramdown-ansi` dependency version from `~> 0.2` to `~> 0.3` in
+  `Rakefile` and `ollama_chat.gemspec`
+- Added `truncate_for_terminal` method to `OllamaChat::FollowChat` class that
+  limits text to a specified number of lines
+- Modified `display_formatted_terminal_output` to use `truncate_for_terminal`
+  when processing content and thinking text
+- Updated spec file to expose the `FollowChat` instance for testing
+- Added comprehensive tests for the new `truncate_for_terminal` method covering
+  various line count scenarios
+- The method handles edge cases like negative and zero line counts by returning
+  the last line
+- Uses `Tins::Terminal.lines` as default maximum lines parameter
+- The implementation ensures terminal output stays within display limits while
+  preserving content integrity
+
 ## 2025-12-09 v0.0.43
 
 - Added retry logic in `interact_with_user` method to handle

data/Rakefile

@@ -45,7 +45,7 @@ GemHadar do
   dependency             'redis',                 '~> 5.0'
   dependency             'mime-types',            '~> 3.0'
   dependency             'reverse_markdown',      '~> 3.0'
-  dependency             'kramdown-ansi',         '~> 0.2'
+  dependency             'kramdown-ansi',         '~> 0.3'
   dependency             'complex_config',        '~> 0.22', '>= 0.22.2'
   dependency             'tins',                  '~> 1.47'
   dependency             'search_ui',             '~> 0.0'

data/lib/ollama_chat/follow_chat.rb

@@ -68,7 +68,13 @@ class OllamaChat::FollowChat
     if response&.message&.role == 'assistant'
       ensure_assistant_response_exists
       update_last_message(response)
-      display_formatted_terminal_output
+      if @chat.stream.on?
+        display_formatted_terminal_output
+      else
+        if display_output
+          display_formatted_terminal_output
+        end
+      end
       @say.call(response)
     end
 
@@ -79,6 +85,25 @@ class OllamaChat::FollowChat
 
   private
 
+  # The truncate_for_terminal method processes text to fit within a specified
+  # number of lines.
+  #
+  # This method takes a text string and trims it to ensure it doesn't exceed
+  # the maximum number of lines allowed for terminal display. If the text
+  # exceeds the limit, only
+  # the last N lines are retained where N equals the maximum lines parameter.
+  #
+  # @param text [ String ] the text content to be processed
+  # @param max_lines [ Integer ] the maximum number of lines allowed (defaults to terminal lines)
+  #
+  # @return [ String ] the text truncated to fit within the specified line limit
+  def truncate_for_terminal(text, max_lines: Tins::Terminal.lines)
+    max_lines = max_lines.clamp(1..)
+    lines = text.lines
+    return text if lines.size <= max_lines
+    lines[-max_lines..-1].join('')
+  end
+
   # The ensure_assistant_response_exists method ensures that the last message
   # in the conversation is from the assistant role.
   #
@@ -111,6 +136,46 @@ class OllamaChat::FollowChat
     end
   end
 
+  # The prepare_last_message method processes and formats content and thinking
+  # annotations for display.
+  #
+  # This method prepares the final content and thinking text by applying
+  # appropriate formatting based on the chat's markdown and think loud
+  # settings. It handles parsing of content through Kramdown::ANSI when
+  # markdown is enabled, and applies annotation
+  # formatting to both content and thinking text according to the chat's
+  # configuration.
+  #
+  # @return [Array<String, String>] an array containing the processed content
+  #   and thinking text
+  # @return [Array<String, nil>] an array containing the processed content and
+  #   nil if thinking is disabled
+  def prepare_last_message
+    content, thinking = @messages.last.content, @messages.last.thinking
+    if @chat.markdown.on?
+      content = talk_annotate { truncate_for_terminal @chat.kramdown_ansi_parse(content) }
+      if @chat.think_loud?
+        thinking = think_annotate { truncate_for_terminal@chat.kramdown_ansi_parse(thinking) }
+      end
+    else
+      content = talk_annotate { content }
+      @chat.think? and thinking = think_annotate { thinking }
+    end
+    return content, thinking
+  end
+
+  # The last_message_with_user method constructs a formatted message array by
+  # combining user information, newline characters, thinking annotations, and
+  # content for display in the terminal output.
+  #
+  # @return [ Array ] an array containing the user identifier, newline
+  #   character, thinking annotation (if present), and content formatted for
+  #   terminal display
+  def last_message_with_user
+    content, thinking = prepare_last_message
+    [ @user, ?\n, thinking, content ]
+  end
+
   # The display_formatted_terminal_output method formats and outputs the
   # terminal content by processing the last message's content and thinking,
   # then prints it to the output. It handles markdown parsing and annotation
@@ -119,19 +184,21 @@ class OllamaChat::FollowChat
   # thinking modes are enabled to determine how to process and display the
   # content.
   def display_formatted_terminal_output
-    content, thinking = @messages.last.content, @messages.last.thinking
-    if @chat.markdown.on?
-      content = talk_annotate { @chat.kramdown_ansi_parse(content) }
-      if @chat.think_loud?
-        thinking = think_annotate { @chat.kramdown_ansi_parse(thinking) }
-      end
-    else
-      content = talk_annotate { content }
-      @chat.think? and thinking = think_annotate { thinking }
+    @output.print(*([ clear_screen, move_home, *last_message_with_user ].compact))
+  end
+
+  # The display_output method shows the last message in the conversation.
+  #
+  # This method delegates to the messages object's show_last method, which
+  # displays the most recent non-user message in the conversation history.
+  # It is typically used to provide feedback to the user about the last
+  # response from the assistant.
+  # @return [ nil, String ] the pager command or nil if no paging was
+  #   performed.
+  def display_output
+    @messages.use_pager do |output|
+      output.print(*last_message_with_user)
     end
-    @output.print(*([
-      clear_screen, move_home, @user, ?\n, thinking, content
-    ].compact))
   end
 
   # The eval_stats method processes response statistics and formats them into a

data/lib/ollama_chat/message_list.rb

@@ -290,6 +290,22 @@ class OllamaChat::MessageList
     end.to_s
   end
 
+  # The use_pager method wraps the given block with a pager context.
+  # If the output would exceed the terminal's line capacity, it pipes the content
+  # through an appropriate pager command (like 'less' or 'more').
+  #
+  # @yield A block that yields an IO object to write output to
+  # @yieldparam [IO] the IO object to write to
+  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
+
   private
 
   # The config method provides access to the chat configuration object.
@@ -311,22 +327,6 @@ class OllamaChat::MessageList
     OllamaChat::EnvConfig::PAGER?
   end
 
-  # The use_pager method wraps the given block with a pager context.
-  # If the output would exceed the terminal's line capacity, it pipes the content
-  # through an appropriate pager command (like 'less' or 'more').
-  #
-  # @yield A block that yields an IO object to write output to
-  # @yieldparam [IO] the IO object to write to
-  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
-
   # The message_text_for method generates formatted text representation of a
   # message including its role, content, thinking annotations, and associated
   # images.

data/lib/ollama_chat/version.rb

@@ -1,6 +1,6 @@
 module OllamaChat
   # OllamaChat version
-  VERSION         = '0.0.43'
+  VERSION         = '0.0.44'
   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.43 ruby lib
+# stub: ollama_chat 0.0.44 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama_chat".freeze
-  s.version = "0.0.43".freeze
+  s.version = "0.0.44".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
   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<kramdown-ansi>.freeze, ["~> 0.2".freeze])
+  s.add_runtime_dependency(%q<kramdown-ansi>.freeze, ["~> 0.3".freeze])
   s.add_runtime_dependency(%q<complex_config>.freeze, ["~> 0.22".freeze, ">= 0.22.2".freeze])
   s.add_runtime_dependency(%q<tins>.freeze, ["~> 1.47".freeze])
   s.add_runtime_dependency(%q<search_ui>.freeze, ["~> 0.0".freeze])

data/spec/ollama_chat/follow_chat_spec.rb

@@ -9,11 +9,11 @@ describe OllamaChat::FollowChat do
 
   let :chat do
     double('Chat', markdown: double(on?: false), think_loud?: true,
-           think?: false, debug: false)
+           think?: false, debug: false, stream: double(on?: true))
   end
 
   let :follow_chat do
-    described_class.new(chat:, messages:, output:)
+    described_class.new(chat:, messages:, output:).expose
   end
 
   let :output do
@@ -46,4 +46,33 @@ describe OllamaChat::FollowChat do
     expect(output).to receive(:puts).with("", /eval_duration/)
     follow_chat.call(response)
   end
+
+  context '#truncate_for_terminal' do
+    it 'can truncate text for 5 lines' do
+      text = (?A..?Z).to_a.join(?\n)
+      expect(follow_chat.truncate_for_terminal(text, max_lines: 5)).to eq(
+        (?V..?Z).to_a.join(?\n)
+      )
+    end
+
+    it 'can truncate text for -1 lines' do
+      text = (?A..?Z).to_a.join(?\n)
+      expect(follow_chat.truncate_for_terminal(text, max_lines: -1)).to eq(?Z)
+    end
+
+    it 'can truncate text for 0 lines' do
+      text = (?A..?Z).to_a.join(?\n)
+      expect(follow_chat.truncate_for_terminal(text, max_lines: 0)).to eq(?Z)
+    end
+
+    it 'can truncate text for 1 lines' do
+      text = (?A..?Z).to_a.join(?\n)
+      expect(follow_chat.truncate_for_terminal(text, max_lines: 1)).to eq(?Z)
+    end
+
+    it 'can truncate text for 42 lines' do
+      text = (?A..?Z).to_a.join(?\n)
+      expect(follow_chat.truncate_for_terminal(text, max_lines: 42)).to eq(text)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ollama_chat
 version: !ruby/object:Gem::Version
-  version: 0.0.43
+  version: 0.0.44
 platform: ruby
 authors:
 - Florian Frank
@@ -259,14 +259,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: complex_config
   requirement: !ruby/object:Gem::Requirement