ollama_chat 0.0.9 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c66eb0eb6290d5161516ac786036a66c381339db5ea9a91039efc0c26b069591
-  data.tar.gz: a762ad194903ce17b01d07fa44af1b2e2fc832049ae5ec665da0236291a58561
+  metadata.gz: ae96668b9a38eb238d0d9352e4c6866f3a99c8e89796ca696a6c09acce776c32
+  data.tar.gz: 44171082a4e6c971a4cd3cf4a95ab89cf76388e13fc9638e140261a2702437c7
 SHA512:
-  metadata.gz: b133ad766292019028dc584a6197d8cc84503e8260307a9fbf141a9635a1b798bffe5f24dbe2de88c6a62408b51fbed0a9826fa0a9716fafc22c0b3c63092a2a
-  data.tar.gz: d200903b0f20a6135c8603f831e454fdcdbc272bf646984ca733566e932fa2590fb89848d7776e1ae2ac7f37143966b18b489c73ec30c1b56e348dbf154435e7
+  metadata.gz: 13ae7bdd0e3012e34341d989ace27240472c8e442f8dc9f49ec94b1e9729c71353f70089a80f066d34d65ad67dc3e52cffe0d2f873a1881a185dea88f63f413a
+  data.tar.gz: ae099dfe86b2888b5ed545b5c5f630eeccef4f4d52c000ffa1a5fbc2f36897705e31634e5c0810a962fecd27241645efdcedaa667d5eebcead72c26ca3448c05

data/CHANGES.md

@@ -1,5 +1,36 @@
 # 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.
+    * Update chat input handling to use a single `handle_input` method for all commands.
+    * Add tests for various chat commands, including input handling, document
+      policy selection, summarization, and more.
+    * Improve test coverage for `DocumentCache`, `Information`, and other modules.
+    * Improved handling of commands, e.g. **don't** when sending via `ollama_chat_send` by default.
+* Added support for sending content to server socket with specific type.
+
 ## 2025-05-26 v0.0.9
 
 * Improved tag parsing in OllamaChat:

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.9
+0.0.11

data/bin/ollama_chat_send

@@ -3,7 +3,8 @@
 require 'ollama_chat'
 
 begin
-  OllamaChat::ServerSocket.send_to_server_socket(STDIN.read)
+  type = (ARGV.shift || 'socket_input').to_sym
+  OllamaChat::ServerSocket.send_to_server_socket(STDIN.read, type:)
 rescue => e
   warn "Caught #{e.class}: #{e}"
   exit 1

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)
@@ -106,229 +107,260 @@ class OllamaChat::Chat
 
   private
 
+  def handle_input(content)
+    case content
+    when %r(^/copy$)
+      copy_to_clipboard
+      :next
+    when %r(^/paste$)
+      paste_from_input
+    when %r(^/markdown$)
+      markdown.toggle
+      :next
+    when %r(^/stream$)
+      stream.toggle
+      :next
+    when %r(^/location$)
+      location.toggle
+      :next
+    when %r(^/voice(?:\s+(change))?$)
+      if $1 == 'change'
+        change_voice
+      else
+        voice.toggle
+      end
+      :next
+    when %r(^/list(?:\s+(\d*))?$)
+      last = 2 * $1.to_i if $1
+      messages.list_conversation(last)
+      :next
+    when %r(^/clear(?:\s+(messages|links|history|all))?$)
+      clean($1)
+      :next
+    when %r(^/clobber$)
+      clean('all')
+      :next
+    when %r(^/drop(?:\s+(\d*))?$)
+      messages.drop($1)
+      messages.list_conversation(2)
+      :next
+    when %r(^/model$)
+      @model = choose_model('', @model)
+      :next
+    when %r(^/system$)
+      change_system_prompt(@system)
+      info
+      :next
+    when %r(^/regenerate$)
+      if content = messages.second_last&.content
+        content.gsub!(/\nConsider these chunks for your answer.*\z/, '')
+        messages.drop(1)
+      else
+        STDOUT.puts "Not enough messages in this conversation."
+        return :redo
+      end
+      @parse_content = false
+      content
+    when %r(^/collection(?:\s+(clear|change))?$)
+      case $1 || 'change'
+      when 'clear'
+        loop do
+          tags = @documents.tags.add('[EXIT]').add('[ALL]')
+          tag = OllamaChat::Utils::Chooser.choose(tags, prompt: 'Clear? %s')
+          case tag
+          when nil, '[EXIT]'
+            STDOUT.puts "Exiting chooser."
+            break
+          when '[ALL]'
+            if ask?(prompt: 'Are you sure? (y/n) ') =~ /\Ay/i
+              @documents.clear
+              STDOUT.puts "Cleared collection #{bold{@documents.collection}}."
+              break
+            else
+              STDOUT.puts 'Cancelled.'
+              sleep 3
+            end
+          when /./
+            @documents.clear(tags: [ tag ])
+            STDOUT.puts "Cleared tag #{tag} from collection #{bold{@documents.collection}}."
+            sleep 3
+          end
+        end
+      when 'change'
+        choose_collection(@documents.collection)
+      end
+      :next
+    when %r(^/info$)
+      info
+      :next
+    when %r(^/document_policy$)
+      choose_document_policy
+      :next
+    when %r(^/import\s+(.+))
+      @parse_content = false
+      import($1) or :next
+    when %r(^/summarize\s+(?:(\d+)\s+)?(.+))
+      @parse_content = false
+      summarize($2, words: $1) or :next
+    when %r(^/embedding$)
+      embedding_paused.toggle(show: false)
+      embedding.show
+      :next
+    when %r(^/embed\s+(.+))
+      @parse_content = false
+      embed($1) or :next
+    when %r(^/web\s+(?:(\d+)\s+)?(.+))
+      @parse_content = false
+      web($1, $2)
+    when %r(^/save\s+(.+)$)
+      messages.save_conversation($1)
+      STDOUT.puts "Saved conversation to #$1."
+      :next
+    when %r(^/links(?:\s+(clear))?$)
+      manage_links($1)
+      :next
+    when %r(^/load\s+(.+)$)
+      messages.load_conversation($1)
+      if messages.size > 1
+        messages.list_conversation(2)
+      end
+      STDOUT.puts "Loaded conversation from #$1."
+      :next
+    when %r(^/config$)
+      display_config
+      :next
+    when %r(^/quit$), nil
+      STDOUT.puts "Goodbye."
+      :return
+    when %r(^/)
+      display_chat_help
+      :next
+    when /\A\s*\z/
+      STDOUT.puts "Type /quit to quit."
+      :next
+    end
+  end
+
+  def web(count, query)
+    urls            = search_web(query, count.to_i) or return :next
+    urls.each do |url|
+      fetch_source(url) { |url_io| embed_source(url_io, url) }
+    end
+    urls_summarized = urls.map { summarize(_1) }
+    results = urls.zip(urls_summarized).
+      map { |u, s| "%s as \n:%s" % [ u, s ] } * "\n\n"
+    config.prompts.web % { query:, results: }
+  end
+
+  def manage_links(command)
+    case command
+    when 'clear'
+      loop do
+        links_options = links.dup.add('[EXIT]').add('[ALL]')
+        link = OllamaChat::Utils::Chooser.choose(links_options, prompt: 'Clear? %s')
+        case link
+        when nil, '[EXIT]'
+          STDOUT.puts "Exiting chooser."
+          break
+        when '[ALL]'
+          if ask?(prompt: 'Are you sure? (y/n) ') =~ /\Ay/i
+            links.clear
+            STDOUT.puts "Cleared all links in list."
+            break
+          else
+            STDOUT.puts 'Cancelled.'
+            sleep 3
+          end
+        when /./
+          links.delete(link)
+          STDOUT.puts "Cleared link from links in list."
+          sleep 3
+        end
+      end
+    when nil
+      if links.empty?
+        STDOUT.puts "List is empty."
+      else
+        Math.log10(links.size).ceil
+        format  = "% #{}s. %s"
+        connect = -> link { hyperlink(link) { link } }
+        STDOUT.puts links.each_with_index.map { |x, i| format % [ i + 1, connect.(x) ] }
+      end
+    end
+  end
+
+  def clean(what)
+    what = 'messages' if what.nil?
+    case what
+    when 'messages'
+      messages.clear
+      STDOUT.puts "Cleared messages."
+    when 'links'
+      links.clear
+      STDOUT.puts "Cleared links."
+    when 'history'
+      clear_history
+      STDOUT.puts "Cleared history."
+    when 'all'
+      if ask?(prompt: 'Are you sure to clear messages and collection? (y/n) ') =~ /\Ay/i
+        messages.clear
+        @documents.clear
+        links.clear
+        clear_history
+        STDOUT.puts "Cleared messages and collection #{bold{@documents.collection}}."
+      else
+        STDOUT.puts 'Cancelled.'
+      end
+    end
+  end
+
+  def display_config
+    default_pager = ENV['PAGER'].full?
+    if fallback_pager = `which less`.chomp.full? || `which more`.chomp.full?
+      fallback_pager << ' -r'
+    end
+    my_pager = default_pager || fallback_pager
+    rendered = config.to_s
+    Kramdown::ANSI::Pager.pager(
+      lines: rendered.count(?\n),
+      command: my_pager
+    ) do |output|
+      output.puts rendered
+    end
+  end
+
   def interact_with_user
     loop do
-      parse_content = true
-      input_prompt = bold { color(172) { message_type(@images) + " user" } } + bold { "> " }
+      @parse_content = true
+      type           = :terminal_input
+      input_prompt   = bold { color(172) { message_type(@images) + " user" } } + bold { "> " }
 
       begin
         content = Reline.readline(input_prompt, true)&.chomp
       rescue Interrupt
         if message = server_socket_message
           self.server_socket_message = nil
+          type    = message.fetch('type', 'socket_input').to_sym
           content = message['content']
         else
           raise
         end
       end
 
-      case content
-      when %r(^/copy$)
-        copy_to_clipboard
-        next
-      when %r(^/paste$)
-        content = paste_from_input
-      when %r(^/markdown$)
-        markdown.toggle
-        next
-      when %r(^/stream$)
-        stream.toggle
-        next
-      when %r(^/location$)
-        location.toggle
-        next
-      when %r(^/voice(?:\s+(change))?$)
-        if $1 == 'change'
-          change_voice
-        else
-          voice.toggle
-        end
-        next
-      when %r(^/list(?:\s+(\d*))?$)
-        last = 2 * $1.to_i if $1
-        messages.list_conversation(last)
-        next
-      when %r(^/clear(?:\s+(messages|links|history))?$)
-        what = $1.nil? ? 'messages' : $1
-        case what
-        when 'messages'
-          messages.clear
-          STDOUT.puts "Cleared messages."
-        when 'links'
-          links.clear
-          STDOUT.puts "Cleared links."
-        when 'history'
-          clear_history
-          STDOUT.puts "Cleared history."
-        end
-        next
-      when %r(^/clobber$)
-        if ask?(prompt: 'Are you sure to clear messages and collection? (y/n) ') =~ /\Ay/i
-          messages.clear
-          @documents.clear
-          links.clear
-          clear_history
-          STDOUT.puts "Cleared messages and collection #{bold{@documents.collection}}."
-        else
-          STDOUT.puts 'Cancelled.'
-        end
-        next
-      when %r(^/drop(?:\s+(\d*))?$)
-        messages.drop($1)
-        messages.list_conversation(2)
-        next
-      when %r(^/model$)
-        @model = choose_model('', @model)
-        next
-      when %r(^/system$)
-        change_system_prompt(@system)
-        info
-        next
-      when %r(^/regenerate$)
-        if content = messages.second_last&.content
-          content.gsub!(/\nConsider these chunks for your answer.*\z/, '')
-          messages.drop(2)
-        else
-          STDOUT.puts "Not enough messages in this conversation."
+      unless type == :socket_input
+        case next_action = handle_input(content)
+        when :next
+          next
+        when :redo
           redo
+        when :return
+          return
+        when String
+          content = next_action
         end
-        parse_content = false
-        content
-      when %r(^/collection(?:\s+(clear|change))?$)
-        case $1 || 'change'
-        when 'clear'
-          loop do
-            tags = @documents.tags.add('[EXIT]').add('[ALL]')
-            tag = OllamaChat::Utils::Chooser.choose(tags, prompt: 'Clear? %s')
-            case tag
-            when nil, '[EXIT]'
-              STDOUT.puts "Exiting chooser."
-              break
-            when '[ALL]'
-              if ask?(prompt: 'Are you sure? (y/n) ') =~ /\Ay/i
-                @documents.clear
-                STDOUT.puts "Cleared collection #{bold{@documents.collection}}."
-                break
-              else
-                STDOUT.puts 'Cancelled.'
-                sleep 3
-              end
-            when /./
-              @documents.clear(tags: [ tag ])
-              STDOUT.puts "Cleared tag #{tag} from collection #{bold{@documents.collection}}."
-              sleep 3
-            end
-          end
-        when 'change'
-          choose_collection(@documents.collection)
-        end
-        next
-      when %r(^/info$)
-        info
-        next
-      when %r(^/document_policy$)
-        choose_document_policy
-        next
-      when %r(^/import\s+(.+))
-        parse_content = false
-        content       = import($1) or next
-      when %r(^/summarize\s+(?:(\d+)\s+)?(.+))
-        parse_content = false
-        content       = summarize($2, words: $1) or next
-      when %r(^/embedding$)
-        embedding_paused.toggle(show: false)
-        embedding.show
-        next
-      when %r(^/embed\s+(.+))
-        parse_content = false
-        content       = embed($1) or next
-      when %r(^/web\s+(?:(\d+)\s+)?(.+))
-        parse_content   = false
-        urls            = search_web($2, $1.to_i) or next
-        urls.each do |url|
-          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"
-        content = config.prompts.web % { query:, results: }
-      when %r(^/save\s+(.+)$)
-        messages.save_conversation($1)
-        STDOUT.puts "Saved conversation to #$1."
-        next
-      when %r(^/links(?:\s+(clear))?$)
-        case $1
-        when 'clear'
-          loop do
-            links_options = links.dup.add('[EXIT]').add('[ALL]')
-            link = OllamaChat::Utils::Chooser.choose(links_options, prompt: 'Clear? %s')
-            case link
-            when nil, '[EXIT]'
-              STDOUT.puts "Exiting chooser."
-              break
-            when '[ALL]'
-              if ask?(prompt: 'Are you sure? (y/n) ') =~ /\Ay/i
-                links.clear
-                STDOUT.puts "Cleared all links in list."
-                break
-              else
-                STDOUT.puts 'Cancelled.'
-                sleep 3
-              end
-            when /./
-              links.delete(link)
-              STDOUT.puts "Cleared link from links in list."
-              sleep 3
-            end
-          end
-        when nil
-          if links.empty?
-            STDOUT.puts "List is empty."
-          else
-            Math.log10(links.size).ceil
-            format  = "% #{}s. %s"
-            connect = -> link { hyperlink(link) { link } }
-            STDOUT.puts links.each_with_index.map { |x, i| format % [ i + 1, connect.(x) ] }
-          end
-        end
-        next
-      when %r(^/load\s+(.+)$)
-        messages.load_conversation($1)
-        if messages.size > 1
-          messages.list_conversation(2)
-        end
-        STDOUT.puts "Loaded conversation from #$1."
-        next
-      when %r(^/config$)
-        default_pager = ENV['PAGER'].full?
-        if fallback_pager = `which less`.chomp.full? || `which more`.chomp.full?
-          fallback_pager << ' -r'
-        end
-        my_pager = default_pager || fallback_pager
-        rendered = config.to_s
-        Kramdown::ANSI::Pager.pager(
-          lines: rendered.count(?\n),
-          command: my_pager
-        ) do |output|
-          output.puts rendered
-        end
-        next
-      when %r(^/quit$)
-        STDOUT.puts "Goodbye."
-        return
-      when %r(^/)
-        display_chat_help
-        next
-      when ''
-        STDOUT.puts "Type /quit to quit."
-        next
-      when nil
-        STDOUT.puts "Goodbye."
-        return
       end
 
-      content, tags = if parse_content
+      content, tags = if @parse_content
                         parse_content(content, @images)
                       else
                         [ content, Documentrix::Utils::Tags.new(valid_tag: /\A#*([\w\]\[]+)/) ]
@@ -355,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?
@@ -387,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/server_socket.rb

@@ -8,9 +8,9 @@ module OllamaChat::ServerSocket
       File.join(runtime_dir, 'ollama_chat.sock')
     end
 
-    def send_to_server_socket(content)
+    def send_to_server_socket(content, type: :socket_input)
       FileUtils.mkdir_p runtime_dir
-      message = { content: }
+      message = { content:, type: }
       socket = UNIXSocket.new(server_socket_path)
       socket.puts JSON(message)
       socket.close

data/lib/ollama_chat/version.rb

@@ -1,6 +1,6 @@
 module OllamaChat
   # OllamaChat version
-  VERSION         = '0.0.9'
+  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.9 ruby lib
+# stub: ollama_chat 0.0.11 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama_chat".freeze
-  s.version = "0.0.9".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

@@ -6,43 +6,211 @@ RSpec.describe OllamaChat::Chat do
   end
 
   let :chat do
-    OllamaChat::Chat.new argv: argv
+    OllamaChat::Chat.new(argv: argv).expose
   end
 
-  connect_to_ollama_server(instantiate: false)
+  describe 'instantiation' do
+    connect_to_ollama_server(instantiate: false)
 
-  it 'can be instantiated' do
-    expect(chat).to be_a described_class
+    it 'can be instantiated' do
+      expect(chat).to be_a described_class
+    end
+  end
+
+  describe 'handle_input' do
+    connect_to_ollama_server
+
+    it 'returns :next when input is "/copy"' do
+      expect(chat).to receive(:copy_to_clipboard)
+      expect(chat.handle_input("/copy")).to eq :next
+    end
+
+    it 'returns :next when input is "/paste"' do
+      expect(chat).to receive(:paste_from_input).and_return "pasted this"
+      expect(chat.handle_input("/paste")).to eq "pasted this"
+    end
+
+    it 'returns :next when input is "/markdown"' do
+      expect(chat.markdown).to receive(:toggle)
+      expect(chat.handle_input("/markdown")).to eq :next
+    end
+
+    it 'returns :next when input is "/stream"' do
+      expect(chat.stream).to receive(:toggle)
+      expect(chat.handle_input("/stream")).to eq :next
+    end
+
+    it 'returns :next when input is "/location"' do
+      expect(chat.location).to receive(:toggle)
+      expect(chat.handle_input("/location")).to eq :next
+    end
+
+    it 'returns :next when input is "/voice(?:\s+(change))? "' do
+      expect(chat.voice).to receive(:toggle)
+      expect(chat.handle_input("/voice")).to eq :next
+      expect(chat).to receive(:change_voice)
+      expect(chat.handle_input("/voice change")).to eq :next
+    end
+
+    it 'returns :next when input is "/list(?:\s+(\d*))? "' do
+      expect(chat.messages).to receive(:list_conversation).with(4)
+      expect(chat.handle_input("/list 2")).to eq :next
+    end
+
+    it 'returns :next when input is "/clear(messages|links|history|all)"' do
+      expect(chat).to receive(:clean).with('messages')
+      expect(chat.handle_input("/clear messages")).to eq :next
+      expect(chat).to receive(:clean).with('links')
+      expect(chat.handle_input("/clear links")).to eq :next
+      expect(chat).to receive(:clean).with('history')
+      expect(chat.handle_input("/clear history")).to eq :next
+      expect(chat).to receive(:clean).with('all')
+      expect(chat.handle_input("/clear all")).to eq :next
+    end
+
+    it 'returns :next when input is "/clobber"' do
+      expect(chat).to receive(:clean).with('all')
+      expect(chat.handle_input("/clobber")).to eq :next
+    end
+
+    it 'returns :next when input is "/drop(?:\s+(\d*))?"' do
+      expect(chat.messages).to receive(:drop).with(?2)
+      expect(chat.messages).to receive(:list_conversation).with(2)
+      expect(chat.handle_input("/drop 2")).to eq :next
+    end
+
+    it 'returns :next when input is "/model"' do
+      expect(chat).to receive(:choose_model).with('', 'llama3.1')
+      expect(chat.handle_input("/model")).to eq :next
+    end
+
+    it 'returns :next when input is "/system"' do
+      expect(chat).to receive(:change_system_prompt).with(nil)
+      expect(chat).to receive(:info)
+      expect(chat.handle_input("/system")).to eq :next
+    end
+
+    it 'returns :next when input is "/regenerate"' do
+      expect(STDOUT).to receive(:puts).with(/Not enough messages/)
+      expect(chat.handle_input("/regenerate")).to eq :redo
+    end
+
+    it 'returns :next when input is "/collection(clear|change)"' do
+      expect(OllamaChat::Utils::Chooser).to receive(:choose)
+      expect(STDOUT).to receive(:puts).with(/Exiting/)
+      expect(chat.handle_input("/collection clear")).to eq :next
+      expect(OllamaChat::Utils::Chooser).to receive(:choose)
+      expect(chat).to receive(:info)
+      expect(STDOUT).to receive(:puts).with(/./)
+      expect(chat.handle_input("/collection change")).to eq :next
+    end
+
+    it 'returns :next when input is "/info"' do
+      expect(chat).to receive(:info)
+      expect(chat.handle_input("/info")).to eq :next
+    end
+
+    it 'returns :next when input is "/document_policy"' do
+      expect(chat).to receive(:choose_document_policy)
+      expect(chat.handle_input("/document_policy")).to eq :next
+    end
+
+    it 'returns :next when input is "/import\s+(.+)"' do
+      expect(chat).to receive(:import).with('./some_file')
+      expect(chat.handle_input("/import ./some_file")).to eq :next
+    end
+
+    it 'returns :next when input is "/summarize\s+(?:(\d+)\s+)?(.+)"' do
+      expect(chat).to receive(:summarize).with('./some_file', words: '23')
+      expect(chat.handle_input("/summarize 23 ./some_file")).to eq :next
+    end
+
+    it 'returns :next when input is "/embedding"' do
+      expect(chat.embedding_paused).to receive(:toggle)
+      expect(chat.embedding).to receive(:show)
+      expect(chat.handle_input("/embedding")).to eq :next
+    end
+
+    it 'returns :next when input is "/embed\s+(.+)"' do
+      expect(chat).to receive(:embed).with('./some_file')
+      expect(chat.handle_input("/embed ./some_file")).to eq :next
+    end
+
+    it 'returns :next when input is "/web\s+(?:(\d+)\s+)?(.+)"' do
+      expect(chat).to receive(:web).with('23', 'query').and_return 'the response'
+      expect(chat.handle_input("/web 23 query")).to eq 'the response'
+    end
+
+    it 'returns :next when input is "/save\s+(.+)$"' do
+      expect(chat.messages).to receive(:save_conversation).with('./some_file')
+      expect(chat.handle_input("/save ./some_file")).to eq :next
+    end
+
+    it 'returns :next when input is "/links(?:\s+(clear))?$" ' do
+      expect(chat).to receive(:manage_links).with(nil)
+      expect(chat.handle_input("/links")).to eq :next
+      expect(chat).to receive(:manage_links).with('clear')
+      expect(chat.handle_input("/links clear")).to eq :next
+    end
+
+    it 'returns :next when input is "/load\s+(.+)$"' do
+      expect(chat.messages).to receive(:load_conversation).with('./some_file')
+      expect(chat.handle_input("/load ./some_file")).to eq :next
+    end
+
+    it 'returns :next when input is "/config"' do
+      expect(chat).to receive(:display_config)
+      expect(chat.handle_input("/config")).to eq :next
+    end
+
+    it 'returns :next when input is "/quit"' do
+      expect(STDOUT).to receive(:puts).with(/Goodbye/)
+      expect(chat.handle_input("/quit")).to eq :return
+    end
+
+    it 'returns :next when input is "/nixda"' do
+      expect(chat).to receive(:display_chat_help)
+      expect(chat.handle_input("/nixda")).to eq :next
+    end
+
+    it 'returns :next when input is "   "' do
+      expect(STDOUT).to receive(:puts).with(/to quit/)
+      expect(chat.handle_input("   ")).to eq :next
+    end
   end
 
   describe 'chat history' do
+    connect_to_ollama_server(instantiate: false)
+
     it 'derives chat_history_filename' do
-      expect(chat.send(:chat_history_filename)).to_not be_nil
+      expect(chat.chat_history_filename).to_not be_nil
     end
 
     it 'can save chat history' do
       expect(File).to receive(:secure_write).with(
-        chat.send(:chat_history_filename),
+        chat.chat_history_filename,
         kind_of(String)
       )
-      chat.send(:save_history)
+      chat.save_history
     end
 
     it 'can initialize chat history' do
-      expect(File).to receive(:exist?).with(chat.send(:chat_history_filename)).
+      expect(File).to receive(:exist?).with(chat.chat_history_filename).
         and_return true
-      expect(File).to receive(:open).with(chat.send(:chat_history_filename), ?r)
-      chat.send(:init_chat_history)
+      expect(File).to receive(:open).with(chat.chat_history_filename, ?r)
+      chat.init_chat_history
     end
 
     it 'can clear history' do
       chat
       expect(Readline::HISTORY).to receive(:clear)
-      chat.send(:clear_history)
+      chat.clear_history
     end
   end
 
   context 'loading conversations' do
+    connect_to_ollama_server(instantiate: false)
+
     let :argv do
       %w[ -C test -c ] << asset('conversation.json')
     end
@@ -56,7 +224,10 @@ RSpec.describe OllamaChat::Chat do
   end
 
   describe OllamaChat::DocumentCache do
+    connect_to_ollama_server(instantiate: false)
+
     context 'with MemoryCache' do
+
       let :argv do
         %w[ -M ]
       end
@@ -77,6 +248,8 @@ RSpec.describe OllamaChat::Chat do
 
   describe Documentrix::Documents do
     context 'with documents' do
+    connect_to_ollama_server(instantiate: false)
+
       let :argv do
         %w[ -C test -D ] << asset('example.html')
       end
@@ -90,6 +263,8 @@ RSpec.describe OllamaChat::Chat do
   end
 
   describe OllamaChat::Information do
+    connect_to_ollama_server(instantiate: false)
+
     it 'has progname' do
       expect(chat.progname).to eq 'ollama_chat'
     end
@@ -122,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.9
+  version: 0.0.11
 platform: ruby
 authors:
 - Florian Frank