ollama_chat 0.0.11 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae96668b9a38eb238d0d9352e4c6866f3a99c8e89796ca696a6c09acce776c32
-  data.tar.gz: 44171082a4e6c971a4cd3cf4a95ab89cf76388e13fc9638e140261a2702437c7
+  metadata.gz: a6a03b8af7c470d83520d269829f51fe480f7a5813bc1b4df50c63d339e28953
+  data.tar.gz: cb86dd9896d6948fb736c889a672fb29e4f21c8174a3ddb62d6fcc93be59f020
 SHA512:
-  metadata.gz: 13ae7bdd0e3012e34341d989ace27240472c8e442f8dc9f49ec94b1e9729c71353f70089a80f066d34d65ad67dc3e52cffe0d2f873a1881a185dea88f63f413a
-  data.tar.gz: ae099dfe86b2888b5ed545b5c5f630eeccef4f4d52c000ffa1a5fbc2f36897705e31634e5c0810a962fecd27241645efdcedaa667d5eebcead72c26ca3448c05
+  metadata.gz: ef19594894b1bb11217e710e1a302a2d30add6140da629c66e3e60d990e30f45a29196d310e06f7c06b36d8ddf33f84e7bd4278f87705b48e501b06d5f53d290
+  data.tar.gz: 332c66cdca39a187ecb3aff193e5a2522ad11deabaedb584c32a78a620d4c068be3cc062d181a5e6c1d0bf44fed371b3409010f2a4e404614ba142e37d5afbdc

data/CHANGES.md

@@ -1,16 +1,31 @@
 # Changes
 
+## 2025-06-05 v0.0.13
+
+* Improved chat command handling
+  - Added support for '/clear tags' to clear all tags.
+  - Updated cases for 'history', 'all' and added case for 'tags'.
+  - Added commands to clear documents collection and print a message in `information.rb`.
+  - `OllamaChat::Chat#clean` now accepts 'tags' as an option.
+* Apply read and write timeouts from configuration (300 seconds) for ollama server.
+* Added method comments
+
+## 2025-06-01 v0.0.12
+
+* **API Compatibility**: Enforces Ollama API version `0.9.0` or higher to
+  support new features like the `thinking` attribute.
+* **Think Output Splitting**: When `think` is enabled, the API response is
+  split into `content` and `thinking` fields, enabled by the new API version.
+* **Think Mode Simplified**: The previous multi-mode `think_mode` system has
+  been replaced with a boolean `think` switch for cleaner, more intuitive
+  control.
+
 ## 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.
+  + Added conditional logic based on `@think_mode` value to handle different modes
 * **User Interface Improvements**:
   + Added `/think_mode` command to help users understand think mode options
   + Updated session output to include current think mode

data/README.md

@@ -133,7 +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)
+/think                          enable ollama think setting for 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

data/Rakefile

@@ -30,7 +30,7 @@ GemHadar do
   executables << 'ollama_chat' << 'ollama_chat_send'
 
   dependency             'excon',                 '~> 1.0'
-  dependency             'ollama-ruby',           '~> 1.0'
+  dependency             'ollama-ruby',           '~> 1.2'
   dependency             'documentrix',           '~> 0.0', '>= 0.0.2'
   dependency             'rss',                   '~> 0.3'
   dependency             'term-ansicolor',        '~> 1.11'

data/VERSION

@@ -1 +1 @@
-0.0.11
+0.0.13

data/docker-compose.yml

@@ -1,7 +1,7 @@
 services:
   redis:
     container_name: redis
-    image: valkey/valkey:7.2.9-alpine
+    image: valkey/valkey:8.1.1-alpine
     restart: unless-stopped
     ports: [ "127.0.0.1:9736:6379" ]
     volumes:

data/lib/ollama_chat/chat.rb

@@ -1,5 +1,6 @@
 require 'tins'
 require 'tins/secure_write'
+require 'tins/xt/string_version'
 require 'json'
 require 'term/ansicolor'
 require 'reline'
@@ -27,7 +28,7 @@ class OllamaChat::Chat
   include OllamaChat::Dialog
   include OllamaChat::Information
   include OllamaChat::Clipboard
-  include OllamaChat::MessageType
+  include OllamaChat::MessageFormat
   include OllamaChat::History
   include OllamaChat::ServerSocket
 
@@ -40,13 +41,17 @@ class OllamaChat::Chat
     setup_switches(config)
     base_url         = @opts[?u] || config.url
     @ollama          = Ollama::Client.new(
-      base_url:   base_url,
-      debug:      config.debug,
+      connect_timeout: config.timeouts.connect_timeout?,
+      read_timeout:    config.timeouts.read_timeout?,
+      write_timeout:   config.timeouts.write_timeout?,
+      base_url:        base_url,
+      debug:           config.debug,
       user_agent:
     )
-    server_version
+    if server_version.version < '0.9.0'.version
+      raise ArgumentError, 'require ollama API version 0.9.0 or higher'
+    end
     @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)
@@ -134,7 +139,7 @@ class OllamaChat::Chat
       last = 2 * $1.to_i if $1
       messages.list_conversation(last)
       :next
-    when %r(^/clear(?:\s+(messages|links|history|all))?$)
+    when %r(^/clear(?:\s+(messages|links|history|tags|all))?$)
       clean($1)
       :next
     when %r(^/clobber$)
@@ -196,6 +201,9 @@ class OllamaChat::Chat
     when %r(^/document_policy$)
       choose_document_policy
       :next
+    when %r(^/think$)
+      think.toggle
+      :next
     when %r(^/import\s+(.+))
       @parse_content = false
       import($1) or :next
@@ -301,6 +309,9 @@ class OllamaChat::Chat
     when 'history'
       clear_history
       STDOUT.puts "Cleared history."
+    when 'tags'
+      @documents.clear
+      STDOUT.puts "Cleared all tags."
     when 'all'
       if ask?(prompt: 'Are you sure to clear messages and collection? (y/n) ') =~ /\Ay/i
         messages.clear
@@ -387,17 +398,12 @@ 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: messages_to_send,
+        messages: ,
         options:  @model_options,
         stream:   stream.on?,
+        think:    think.on?,
         &handler
       )
       if embedding.on? && !records.empty?
@@ -425,19 +431,6 @@ 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/clipboard.rb

@@ -1,4 +1,13 @@
 module OllamaChat::Clipboard
+
+  # Copy the last assistant's message to the system clipboard.
+  #
+  # This method checks if there is a last message from an assistant in the `@messages`
+  # array and copies its content to the clipboard using the specified command from `config.copy`.
+  # If no assistant response is available or the clipboard command is not found, appropriate
+  # error messages are displayed.
+  #
+  # @return [NilClass] Always returns nil.
   def copy_to_clipboard
     if message = @messages.last and message.role == 'assistant'
       copy = `which #{config.copy}`.chomp
@@ -16,6 +25,13 @@ module OllamaChat::Clipboard
     nil
   end
 
+  # Paste content from the input.
+  #
+  # Prompts the user to paste their content and then press C-d (Ctrl+D) to terminate
+  # input. Reads all lines from standard input until Ctrl+D is pressed and returns
+  # the pasted content as a string.
+  #
+  # @return [String] The pasted content entered by the user.
   def paste_from_input
     STDOUT.puts bold { "Paste your content and then press C-d!" }
     STDIN.read

data/lib/ollama_chat/dialog.rb

@@ -57,30 +57,6 @@ 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

@@ -2,7 +2,7 @@ class OllamaChat::FollowChat
   include Ollama
   include Ollama::Handlers::Concern
   include Term::ANSIColor
-  include OllamaChat::MessageType
+  include OllamaChat::MessageFormat
 
   def initialize(chat:, messages:, voice: nil, output: STDOUT)
     super(output:)
@@ -14,40 +14,59 @@ class OllamaChat::FollowChat
   end
 
   def call(response)
-    OllamaChat::Chat.config.debug and jj response
+    debug_output(response)
+
     if response&.message&.role == 'assistant'
-      if @messages&.last&.role != 'assistant'
-        @messages << Message.new(role: 'assistant', content: '')
-        @user = message_type(@messages.last.images) + " " +
-          bold { color(111) { 'assistant:' } }
-      end
-      @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
+      ensure_assistant_response_exists
+      update_last_message(response)
+      display_formatted_terminal_output
       @say.call(response)
     end
-    if response.done
-      @output.puts "", eval_stats(response)
-    end
+
+    output_eval_stats(response)
+
     self
   end
 
+  private
+
+  def ensure_assistant_response_exists
+    if @messages&.last&.role != 'assistant'
+      @messages << Message.new(
+        role: 'assistant',
+        content: '',
+        thinking: ('' if @chat.think.on?)
+      )
+      @user = message_type(@messages.last.images) + " " +
+        bold { color(111) { 'assistant:' } }
+    end
+  end
+
+  def update_last_message(response)
+    @messages.last.content << response.message&.content
+    if @chat.think.on? and response_thinking = response.message&.thinking.full?
+      @messages.last.thinking << response_thinking
+    end
+  end
+
+  def display_formatted_terminal_output
+    content, thinking = @messages.last.content, @messages.last.thinking
+    if @chat.markdown.on?
+      content = talk_annotate { Kramdown::ANSI.parse(content) }
+      if @chat.think.on?
+        thinking = think_annotate { Kramdown::ANSI.parse(thinking) }
+      end
+    else
+      content = talk_annotate { content }
+      @chat.think.on? and thinking = think_annotate { @messages.last.thinking.full? }
+    end
+    @output.print(*([
+      clear_screen, move_home, @user, ?\n, thinking, content
+    ].compact))
+  end
+
   def eval_stats(response)
-    eval_duration = response.eval_duration / 1e9
+    eval_duration        = response.eval_duration / 1e9
     prompt_eval_duration = response.prompt_eval_duration / 1e9
     stats_text = {
       eval_duration:        Tins::Duration.new(eval_duration),
@@ -64,21 +83,12 @@ class OllamaChat::FollowChat
     }
   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, '')
+  def output_eval_stats(response)
+    response.done or return
+    @output.puts "", eval_stats(response)
   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
+  def debug_output(response)
+    OllamaChat::Chat.config.debug and jj response
   end
 end

data/lib/ollama_chat/information.rb

@@ -48,7 +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 "Thinking is #{bold(think.on? ? 'enabled' : 'disabled')}."
     STDOUT.puts "Currently selected search engine is #{bold(search_engine)}."
     if @voice.on?
       STDOUT.puts "Using voice #{bold{@current_voice}} to speak."
@@ -66,7 +66,7 @@ module OllamaChat::Information
       /location                       toggle location submission
       /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)
+      /clear [what]                   clear what=messages|links|history|tags|all
       /clobber                        clear the conversation, links, and collection
       /drop [n]                       drop the last n exchanges, defaults to 1
       /model                          change the model
@@ -76,7 +76,7 @@ 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
+      /think                          enable ollama think setting for 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

data/lib/ollama_chat/message_format.rb

@@ -0,0 +1,23 @@
+module OllamaChat::MessageFormat
+  def message_type(images)
+    images.present? ? ?📸 : ?📨
+  end
+
+  def think_annotate(&block)
+    string = block.()
+    string.to_s.size == 0 and return
+    if @chat.think.on?
+      "💭\n#{string}\n"
+    end
+  end
+
+  def talk_annotate(&block)
+    string = block.()
+    string.to_s.size == 0 and return
+    if @chat.think.on?
+      "💬\n#{string}\n"
+    else
+      string
+    end
+  end
+end

data/lib/ollama_chat/message_list.rb

@@ -1,6 +1,6 @@
 class OllamaChat::MessageList
   include Term::ANSIColor
-  include OllamaChat::MessageType
+  include OllamaChat::MessageFormat
 
   # The initialize method sets up the message list for an OllamaChat session.
   #

data/lib/ollama_chat/ollama_chat_config/default_config.yml

@@ -5,6 +5,10 @@ model:
   name: <%= ENV.fetch('OLLAMA_CHAT_MODEL', 'llama3.1') %>
   options:
     num_ctx: 8192
+timeouts:
+  connect_timeout: null
+  read_timeout: 300
+  write_timeout: 300
 location:
   enabled: false
   name: Berlin
@@ -32,7 +36,7 @@ voice:
 markdown: true
 stream: true
 document_policy: importing
-think_mode: display
+think: false
 embedding:
   enabled: true
   model:

data/lib/ollama_chat/server_socket.rb

@@ -1,13 +1,23 @@
 module OllamaChat::ServerSocket
   class << self
+    # Returns the path to the XDG runtime directory, or a default path if not set.
+    # @return [String] the expanded path to the XDG runtime directory
     def runtime_dir
       File.expand_path(ENV.fetch('XDG_RUNTIME_DIR',  '~/.local/run'))
     end
 
+    # Constructs the full path to the server socket file.
+    # @return [String] the full path to the Unix socket
     def server_socket_path
       File.join(runtime_dir, 'ollama_chat.sock')
     end
 
+    # Sends a message to the server socket.
+    #
+    # @param content [String] the content to send
+    # @param type [Symbol] the type of message (default: :socket_input)
+    # @raise [Errno::ENOENT] if the socket file does not exist
+    # @raise [Errno::ECONNREFUSED] if the socket is not listening (server no running)
     def send_to_server_socket(content, type: :socket_input)
       FileUtils.mkdir_p runtime_dir
       message = { content:, type: }
@@ -17,8 +27,20 @@ module OllamaChat::ServerSocket
     end
   end
 
+  # Accessor for the server socket message.
+  # Holds the last message received from the Unix socket.
+  # @return [String, nil] the message content, or nil if not set
+  # @see OllamaChat::ServerSocket#init_server_socket
+  # @see OllamaChat::ServerSocket#send_to_server_socket
   attr_accessor :server_socket_message
 
+  # Initializes a Unix domain socket server for OllamaChat.
+  #
+  # Creates the necessary runtime directory, checks for existing socket file,
+  # and starts a server loop in a new thread. Listens for incoming connections,
+  # reads JSON data, and terminates the server upon receiving a message.
+  #
+  # Raises Errno::EEXIST if the socket path already exists.
   def init_server_socket
     FileUtils.mkdir_p OllamaChat::ServerSocket.runtime_dir
     if File.exist?(OllamaChat::ServerSocket.server_socket_path)

data/lib/ollama_chat/switches.rb

@@ -49,10 +49,12 @@ module OllamaChat::Switches
     include CheckSwitch
   end
 
-  attr_reader :markdown
-
   attr_reader :stream
 
+  attr_reader :think
+
+  attr_reader :markdown
+
   attr_reader :voice
 
   attr_reader :embedding
@@ -64,21 +66,30 @@ module OllamaChat::Switches
   attr_reader :location
 
   def setup_switches(config)
-    @markdown = Switch.new(
-      :markdown,
+    @stream = Switch.new(
+      :stream,
       config:,
       msg: {
-        true  => "Using #{italic{'ANSI'}} markdown to output content.",
-        false => "Using plaintext for outputting content.",
+        true  => "Streaming enabled.",
+        false => "Streaming disabled.",
       }
     )
 
-    @stream = Switch.new(
-      :stream,
+    @think = Switch.new(
+      :think,
       config:,
       msg: {
-        true  => "Streaming enabled.",
-        false => "Streaming disabled.",
+        true  => "Thinking enabled.",
+        false => "Thinking disabled.",
+      }
+    )
+
+    @markdown = Switch.new(
+      :markdown,
+      config:,
+      msg: {
+        true  => "Using #{italic{'ANSI'}} markdown to output content.",
+        false => "Using plaintext for outputting content.",
       }
     )
 

data/lib/ollama_chat/version.rb

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

data/lib/ollama_chat.rb

@@ -5,7 +5,7 @@ require 'ollama'
 require 'documentrix'
 require 'ollama_chat/version'
 require 'ollama_chat/utils'
-require 'ollama_chat/message_type'
+require 'ollama_chat/message_format'
 require 'ollama_chat/ollama_chat_config'
 require 'ollama_chat/follow_chat'
 require 'ollama_chat/switches'

data/ollama_chat.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: ollama_chat 0.0.11 ruby lib
+# stub: ollama_chat 0.0.13 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama_chat".freeze
-  s.version = "0.0.11".freeze
+  s.version = "0.0.13".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
   s.description = "The app provides a command-line interface (CLI) to an Ollama AI model,\nallowing users to engage in text-based conversations and generate\nhuman-like responses. Users can import data from local files or web pages,\nwhich are then processed through three different modes: fully importing the\ncontent into the conversation context, summarizing the information for\nconcise reference, or storing it in an embedding vector database for later\nretrieval based on the conversation.\n".freeze
   s.email = "flori@ping.de".freeze
   s.executables = ["ollama_chat".freeze, "ollama_chat_send".freeze]
-  s.extra_rdoc_files = ["README.md".freeze, "lib/ollama_chat.rb".freeze, "lib/ollama_chat/chat.rb".freeze, "lib/ollama_chat/clipboard.rb".freeze, "lib/ollama_chat/dialog.rb".freeze, "lib/ollama_chat/document_cache.rb".freeze, "lib/ollama_chat/follow_chat.rb".freeze, "lib/ollama_chat/history.rb".freeze, "lib/ollama_chat/information.rb".freeze, "lib/ollama_chat/message_list.rb".freeze, "lib/ollama_chat/message_type.rb".freeze, "lib/ollama_chat/model_handling.rb".freeze, "lib/ollama_chat/ollama_chat_config.rb".freeze, "lib/ollama_chat/parsing.rb".freeze, "lib/ollama_chat/server_socket.rb".freeze, "lib/ollama_chat/source_fetching.rb".freeze, "lib/ollama_chat/switches.rb".freeze, "lib/ollama_chat/utils.rb".freeze, "lib/ollama_chat/utils/cache_fetcher.rb".freeze, "lib/ollama_chat/utils/chooser.rb".freeze, "lib/ollama_chat/utils/fetcher.rb".freeze, "lib/ollama_chat/utils/file_argument.rb".freeze, "lib/ollama_chat/version.rb".freeze, "lib/ollama_chat/web_searching.rb".freeze]
-  s.files = [".all_images.yml".freeze, ".envrc".freeze, ".gitignore".freeze, "CHANGES.md".freeze, "Gemfile".freeze, "README.md".freeze, "Rakefile".freeze, "VERSION".freeze, "bin/ollama_chat".freeze, "bin/ollama_chat_send".freeze, "config/searxng/settings.yml".freeze, "docker-compose.yml".freeze, "lib/ollama_chat.rb".freeze, "lib/ollama_chat/chat.rb".freeze, "lib/ollama_chat/clipboard.rb".freeze, "lib/ollama_chat/dialog.rb".freeze, "lib/ollama_chat/document_cache.rb".freeze, "lib/ollama_chat/follow_chat.rb".freeze, "lib/ollama_chat/history.rb".freeze, "lib/ollama_chat/information.rb".freeze, "lib/ollama_chat/message_list.rb".freeze, "lib/ollama_chat/message_type.rb".freeze, "lib/ollama_chat/model_handling.rb".freeze, "lib/ollama_chat/ollama_chat_config.rb".freeze, "lib/ollama_chat/ollama_chat_config/default_config.yml".freeze, "lib/ollama_chat/parsing.rb".freeze, "lib/ollama_chat/server_socket.rb".freeze, "lib/ollama_chat/source_fetching.rb".freeze, "lib/ollama_chat/switches.rb".freeze, "lib/ollama_chat/utils.rb".freeze, "lib/ollama_chat/utils/cache_fetcher.rb".freeze, "lib/ollama_chat/utils/chooser.rb".freeze, "lib/ollama_chat/utils/fetcher.rb".freeze, "lib/ollama_chat/utils/file_argument.rb".freeze, "lib/ollama_chat/version.rb".freeze, "lib/ollama_chat/web_searching.rb".freeze, "ollama_chat.gemspec".freeze, "redis/redis.conf".freeze, "spec/assets/api_show.json".freeze, "spec/assets/api_tags.json".freeze, "spec/assets/api_version.json".freeze, "spec/assets/conversation.json".freeze, "spec/assets/duckduckgo.html".freeze, "spec/assets/example.atom".freeze, "spec/assets/example.csv".freeze, "spec/assets/example.html".freeze, "spec/assets/example.pdf".freeze, "spec/assets/example.ps".freeze, "spec/assets/example.rb".freeze, "spec/assets/example.rss".freeze, "spec/assets/example.xml".freeze, "spec/assets/kitten.jpg".freeze, "spec/assets/prompt.txt".freeze, "spec/assets/searxng.json".freeze, "spec/ollama_chat/chat_spec.rb".freeze, "spec/ollama_chat/clipboard_spec.rb".freeze, "spec/ollama_chat/follow_chat_spec.rb".freeze, "spec/ollama_chat/information_spec.rb".freeze, "spec/ollama_chat/message_list_spec.rb".freeze, "spec/ollama_chat/model_handling_spec.rb".freeze, "spec/ollama_chat/parsing_spec.rb".freeze, "spec/ollama_chat/source_fetching_spec.rb".freeze, "spec/ollama_chat/switches_spec.rb".freeze, "spec/ollama_chat/utils/cache_fetcher_spec.rb".freeze, "spec/ollama_chat/utils/fetcher_spec.rb".freeze, "spec/ollama_chat/utils/file_argument_spec.rb".freeze, "spec/ollama_chat/web_searching_spec.rb".freeze, "spec/spec_helper.rb".freeze, "tmp/.keep".freeze]
+  s.extra_rdoc_files = ["README.md".freeze, "lib/ollama_chat.rb".freeze, "lib/ollama_chat/chat.rb".freeze, "lib/ollama_chat/clipboard.rb".freeze, "lib/ollama_chat/dialog.rb".freeze, "lib/ollama_chat/document_cache.rb".freeze, "lib/ollama_chat/follow_chat.rb".freeze, "lib/ollama_chat/history.rb".freeze, "lib/ollama_chat/information.rb".freeze, "lib/ollama_chat/message_format.rb".freeze, "lib/ollama_chat/message_list.rb".freeze, "lib/ollama_chat/model_handling.rb".freeze, "lib/ollama_chat/ollama_chat_config.rb".freeze, "lib/ollama_chat/parsing.rb".freeze, "lib/ollama_chat/server_socket.rb".freeze, "lib/ollama_chat/source_fetching.rb".freeze, "lib/ollama_chat/switches.rb".freeze, "lib/ollama_chat/utils.rb".freeze, "lib/ollama_chat/utils/cache_fetcher.rb".freeze, "lib/ollama_chat/utils/chooser.rb".freeze, "lib/ollama_chat/utils/fetcher.rb".freeze, "lib/ollama_chat/utils/file_argument.rb".freeze, "lib/ollama_chat/version.rb".freeze, "lib/ollama_chat/web_searching.rb".freeze]
+  s.files = [".all_images.yml".freeze, ".envrc".freeze, ".gitignore".freeze, "CHANGES.md".freeze, "Gemfile".freeze, "README.md".freeze, "Rakefile".freeze, "VERSION".freeze, "bin/ollama_chat".freeze, "bin/ollama_chat_send".freeze, "config/searxng/settings.yml".freeze, "docker-compose.yml".freeze, "lib/ollama_chat.rb".freeze, "lib/ollama_chat/chat.rb".freeze, "lib/ollama_chat/clipboard.rb".freeze, "lib/ollama_chat/dialog.rb".freeze, "lib/ollama_chat/document_cache.rb".freeze, "lib/ollama_chat/follow_chat.rb".freeze, "lib/ollama_chat/history.rb".freeze, "lib/ollama_chat/information.rb".freeze, "lib/ollama_chat/message_format.rb".freeze, "lib/ollama_chat/message_list.rb".freeze, "lib/ollama_chat/model_handling.rb".freeze, "lib/ollama_chat/ollama_chat_config.rb".freeze, "lib/ollama_chat/ollama_chat_config/default_config.yml".freeze, "lib/ollama_chat/parsing.rb".freeze, "lib/ollama_chat/server_socket.rb".freeze, "lib/ollama_chat/source_fetching.rb".freeze, "lib/ollama_chat/switches.rb".freeze, "lib/ollama_chat/utils.rb".freeze, "lib/ollama_chat/utils/cache_fetcher.rb".freeze, "lib/ollama_chat/utils/chooser.rb".freeze, "lib/ollama_chat/utils/fetcher.rb".freeze, "lib/ollama_chat/utils/file_argument.rb".freeze, "lib/ollama_chat/version.rb".freeze, "lib/ollama_chat/web_searching.rb".freeze, "ollama_chat.gemspec".freeze, "redis/redis.conf".freeze, "spec/assets/api_show.json".freeze, "spec/assets/api_tags.json".freeze, "spec/assets/api_version.json".freeze, "spec/assets/conversation.json".freeze, "spec/assets/duckduckgo.html".freeze, "spec/assets/example.atom".freeze, "spec/assets/example.csv".freeze, "spec/assets/example.html".freeze, "spec/assets/example.pdf".freeze, "spec/assets/example.ps".freeze, "spec/assets/example.rb".freeze, "spec/assets/example.rss".freeze, "spec/assets/example.xml".freeze, "spec/assets/kitten.jpg".freeze, "spec/assets/prompt.txt".freeze, "spec/assets/searxng.json".freeze, "spec/ollama_chat/chat_spec.rb".freeze, "spec/ollama_chat/clipboard_spec.rb".freeze, "spec/ollama_chat/follow_chat_spec.rb".freeze, "spec/ollama_chat/information_spec.rb".freeze, "spec/ollama_chat/message_list_spec.rb".freeze, "spec/ollama_chat/model_handling_spec.rb".freeze, "spec/ollama_chat/parsing_spec.rb".freeze, "spec/ollama_chat/source_fetching_spec.rb".freeze, "spec/ollama_chat/switches_spec.rb".freeze, "spec/ollama_chat/utils/cache_fetcher_spec.rb".freeze, "spec/ollama_chat/utils/fetcher_spec.rb".freeze, "spec/ollama_chat/utils/file_argument_spec.rb".freeze, "spec/ollama_chat/web_searching_spec.rb".freeze, "spec/spec_helper.rb".freeze, "tmp/.keep".freeze]
   s.homepage = "https://github.com/flori/ollama_chat".freeze
   s.licenses = ["MIT".freeze]
   s.rdoc_options = ["--title".freeze, "OllamaChat - A command-line interface (CLI) for interacting with an Ollama AI model.".freeze, "--main".freeze, "README.md".freeze]
@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency(%q<debug>.freeze, [">= 0".freeze])
   s.add_development_dependency(%q<simplecov>.freeze, [">= 0".freeze])
   s.add_runtime_dependency(%q<excon>.freeze, ["~> 1.0".freeze])
-  s.add_runtime_dependency(%q<ollama-ruby>.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<rss>.freeze, ["~> 0.3".freeze])
   s.add_runtime_dependency(%q<term-ansicolor>.freeze, ["~> 1.11".freeze])

data/spec/ollama_chat/chat_spec.rb

@@ -297,7 +297,7 @@ RSpec.describe OllamaChat::Chat do
             Streaming|
             Location|
             Document\ policy|
-            Think\ mode|
+            Thinking\ is|
             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), think_mode: 'display')
+    double('Chat', markdown: double(on?: false), think: double(on?: false))
   end
 
   let :follow_chat do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ollama_chat
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.13
 platform: ruby
 authors:
 - Florian Frank
@@ -127,14 +127,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: documentrix
   requirement: !ruby/object:Gem::Requirement
@@ -372,8 +372,8 @@ extra_rdoc_files:
 - lib/ollama_chat/follow_chat.rb
 - lib/ollama_chat/history.rb
 - lib/ollama_chat/information.rb
+- lib/ollama_chat/message_format.rb
 - lib/ollama_chat/message_list.rb
-- lib/ollama_chat/message_type.rb
 - lib/ollama_chat/model_handling.rb
 - lib/ollama_chat/ollama_chat_config.rb
 - lib/ollama_chat/parsing.rb
@@ -408,8 +408,8 @@ files:
 - lib/ollama_chat/follow_chat.rb
 - lib/ollama_chat/history.rb
 - lib/ollama_chat/information.rb
+- lib/ollama_chat/message_format.rb
 - lib/ollama_chat/message_list.rb
-- lib/ollama_chat/message_type.rb
 - lib/ollama_chat/model_handling.rb
 - lib/ollama_chat/ollama_chat_config.rb
 - lib/ollama_chat/ollama_chat_config/default_config.yml

data/lib/ollama_chat/message_type.rb

@@ -1,5 +0,0 @@
-module OllamaChat::MessageType
-  def message_type(images)
-    images.present? ? ?📸 : ?📨
-  end
-end