ollama_chat 0.0.13 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6a03b8af7c470d83520d269829f51fe480f7a5813bc1b4df50c63d339e28953
-  data.tar.gz: cb86dd9896d6948fb736c889a672fb29e4f21c8174a3ddb62d6fcc93be59f020
+  metadata.gz: c05a3e4579e75ba1c724d7128581de7b96dac914c2bd633368920a207be24b3a
+  data.tar.gz: 6d4cf892e3a3ec3d00dc1b4cf00e686f311240893a5cd2af561afdb7ea6946de
 SHA512:
-  metadata.gz: ef19594894b1bb11217e710e1a302a2d30add6140da629c66e3e60d990e30f45a29196d310e06f7c06b36d8ddf33f84e7bd4278f87705b48e501b06d5f53d290
-  data.tar.gz: 332c66cdca39a187ecb3aff193e5a2522ad11deabaedb584c32a78a620d4c068be3cc062d181a5e6c1d0bf44fed371b3409010f2a4e404614ba142e37d5afbdc
+  metadata.gz: 9afec82d69645e4b8400b63c8f5bf51bd4b4d0471cb59c419b304e9a532fe874dce33f403625abb4fac4543892ed5c0e40b476a56da7023eda4ea99a15ac6275
+  data.tar.gz: 611da289b8ac3d9bef78d7453418ec9e90123e5f7af36d386b62a7646a578adbe90ebc5396a09248152d117085ee0598a743cf4746e4e1e9a402a6e32475bd02

data/CHANGES.md

@@ -1,8 +1,36 @@
 # Changes
 
+## 2025-07-02 v0.0.15
+
+- **Enhanced `ollama_chat_send` and Unix Domain Socket Support:**
+  - Added support for advanced parameters:
+    - `-t`: Sends input as terminal commands.
+    - `-r`: Enables two-way communication by waiting for and returning the server's response.
+    - `-h` or `--help`: Displays usage information and available options.
+  - Improved socket management using the `unix_socks` gem.
+  - Enhanced message processing logic to handle different types of messages
+    (`:socket_input`, `:terminal_input`, `:socket_input_with_response`).
+- **Selector Support for Model and System Prompt Selection:**
+  - Introduced `?selector` syntax to filter models and prompts.
+  - Updated documentation to reflect this new feature.
+  - Added a chooser dialog when multiple options match the selector.
+
+## 2025-06-07 v0.0.14
+
+* **Message List Improvements**:
+  * Added thinking status to messages when chat is in think mode
+  * Improved system prompt handling with new method documentation
+* **Improved /system command handling for OllamaChat chat system**:
+  * Added support for '/system [show]' command to show or change system prompt.
+* Add conversation length to chat information display
+* **Improvements to OllamaChat::SourceFetching**:
+  * Fixed bug where document type concatenation could cause errors when `full?`
+    returns `nil`, ensuring proper string formatting and avoiding potential
+    crashes.
+
 ## 2025-06-05 v0.0.13
 
-* Improved chat command handling
+* **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`.

data/README.md

@@ -24,8 +24,8 @@ Usage: ollama_chat [OPTIONS]
 
   -f CONFIG      config file to read
   -u URL         the ollama base url, OLLAMA_URL
-  -m MODEL       the ollama model to chat with, OLLAMA_CHAT_MODEL
-  -s SYSTEM      the system prompt to use as a file, OLLAMA_CHAT_SYSTEM
+  -m MODEL       the ollama model to chat with, OLLAMA_CHAT_MODEL, ?selector
+  -s SYSTEM      the system prompt to use as a file, OLLAMA_CHAT_SYSTEM, ?selector
   -c CHAT        a saved chat conversation to load
   -C COLLECTION  name of the collection used in this conversation
   -D DOCUMENT    load document and add to embeddings collection (multiple)
@@ -34,6 +34,9 @@ Usage: ollama_chat [OPTIONS]
   -S             open a socket to receive input from ollama_chat_send
   -V             display the current version number and quit
   -h             this help
+
+  Use `?selector` with `-m` or `-s` to filter options. Multiple matches
+  will open a chooser dialog.
 ```
 
 The base URL can be either set by the environment variable `OLLAMA_URL` or it
@@ -123,11 +126,11 @@ The following commands can be given inside the chat, if prefixed by a `/`:
 /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
-/system                         change system prompt (clears conversation)
+/system [show]                  change/show system prompt
 /regenerate                     the last answer message
 /collection [clear|change]      change (default) collection or clear
 /info                           show information for current session
@@ -167,6 +170,32 @@ function! OllamaChatSend(input)
 endfunction
 ```
 
+#### Advanced Parameters for `ollama_chat_send`
+
+The `ollama_chat_send` command now supports additional parameters to enhance functionality:
+
+- **Terminal Input (`-t`)**: Sends input as terminal commands, enabling special commands like `/import`.
+
+  ```bash
+  $ echo "/import https://example.com/some-content" | ollama_chat_send -t
+  ```
+
+- **Wait for Response (`-r`)**: Enables two-way communication by waiting for and returning the server's response.
+
+  ```bash
+  $ response=$(echo "Tell me a joke." | ollama_chat_send -r)
+  $ echo "$response"
+  ```
+
+- **Help (`-h` or `--help`)**: Displays usage information and available options.
+
+  ```bash
+  $ ollama_chat_send -h
+  ```
+
+These parameters provide greater flexibility in how you interact with
+`ollama_chat`, whether from the command line or integrated tools like `vim`.
+
 ## Download
 
 The homepage of this app is located at

data/Rakefile

@@ -32,6 +32,7 @@ GemHadar do
   dependency             'excon',                 '~> 1.0'
   dependency             'ollama-ruby',           '~> 1.2'
   dependency             'documentrix',           '~> 0.0', '>= 0.0.2'
+  dependency             'unix_socks'
   dependency             'rss',                   '~> 0.3'
   dependency             'term-ansicolor',        '~> 1.11'
   dependency             'redis',                 '~> 5.0'

data/VERSION

@@ -1 +1 @@
-0.0.13
+0.0.15

data/bin/ollama_chat_send

@@ -1,10 +1,35 @@
 #!/usr/bin/env ruby
 
 require 'ollama_chat'
+require 'tins/go'
+include Tins::GO
 
+
+opts = go 'rth', ARGV
+
+def usage(rc = 0)
+  puts <<~EOT
+    Usage: #{File.basename($0)} [OPTIONS]
+
+    Options:
+      -r    Wait for the response from Ollama Chat and output it
+      -t    Send input as terminal input including commands, e. g. /import
+      -h    Show this help message
+
+    Send data to a running Ollame Chat client via standard input.
+  EOT
+  exit rc
+end
+
+opts[?h] and usage
 begin
-  type = (ARGV.shift || 'socket_input').to_sym
-  OllamaChat::ServerSocket.send_to_server_socket(STDIN.read, type:)
+  type = if opts[?t]
+           :terminal_input
+         else
+           opts[?r] ? :socket_input_with_response : :socket_input
+         end
+  response = OllamaChat::ServerSocket.send_to_server_socket(STDIN.read, type:)
+  type == :socket_input_with_response and puts response.content
 rescue => e
   warn "Caught #{e.class}: #{e}"
   exit 1

data/lib/ollama_chat/chat.rb

@@ -1,6 +1,7 @@
 require 'tins'
 require 'tins/secure_write'
 require 'tins/xt/string_version'
+require 'tins/xt/full'
 require 'json'
 require 'term/ansicolor'
 require 'reline'
@@ -152,9 +153,11 @@ class OllamaChat::Chat
     when %r(^/model$)
       @model = choose_model('', @model)
       :next
-    when %r(^/system$)
-      change_system_prompt(@system)
-      info
+    when %r(^/system(?:\s+(show))?$)
+      if $1 != 'show'
+        change_system_prompt(@system)
+      end
+      @messages.show_system_prompt
       :next
     when %r(^/regenerate$)
       if content = messages.second_last&.content
@@ -350,15 +353,14 @@ class OllamaChat::Chat
         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']
+          type    = message.type.full?(:to_sym) || :socket_input
+          content = message.content
         else
           raise
         end
       end
 
-      unless type == :socket_input
+      if type == :terminal_input
         case next_action = handle_input(content)
         when :next
           next
@@ -371,6 +373,8 @@ class OllamaChat::Chat
         end
       end
 
+      content = content.encode(invalid: :replace)
+
       content, tags = if @parse_content
                         parse_content(content, @images)
                       else
@@ -417,10 +421,22 @@ class OllamaChat::Chat
         }.uniq.map { |l, t| hyperlink(l, t) }.join(' ')
         config.debug and jj messages.to_ary
       end
+
+      case type
+      when :socket_input
+        server_socket_message&.disconnect
+      when :socket_input_with_response
+        if message = handler.messages.last
+          server_socket_message.respond({ role: message.role, content: message.content })
+        end
+        server_socket_message&.disconnect
+      end
     rescue Ollama::Errors::TimeoutError
       STDOUT.puts "#{bold('Error')}: Currently lost connection to ollama server and cannot send command."
     rescue Interrupt
       STDOUT.puts "Type /quit to quit."
+    ensure
+        self.server_socket_message = nil
     end
     0
   rescue ComplexConfig::AttributeMissing, ComplexConfig::ConfigurationSyntaxError => e

data/lib/ollama_chat/dialog.rb

@@ -1,6 +1,11 @@
 module OllamaChat::Dialog
   def choose_model(cli_model, current_model)
+    selector = if cli_model =~ /\A\?+(.*)\z/
+                 cli_model = ''
+                 Regexp.new($1)
+               end
     models = ollama.tags.models.map(&:name).sort
+    selector and models = models.grep(selector)
     model = if cli_model == ''
               OllamaChat::Utils::Chooser.choose(models) || current_model
             else
@@ -58,8 +63,12 @@ module OllamaChat::Dialog
   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)
+    selector = if system =~ /\A\?(.+)\z/
+                 Regexp.new($1)
+               else
+                 Regexp.new(system.to_s)
+               end
+    prompts = config.system_prompts.attribute_names.compact.grep(selector)
     if prompts.size == 1
       system = config.system_prompts.send(prompts.first)
     else

data/lib/ollama_chat/follow_chat.rb

@@ -13,6 +13,8 @@ class OllamaChat::FollowChat
     @user        = nil
   end
 
+  attr_reader :messages
+
   def call(response)
     debug_output(response)
 

data/lib/ollama_chat/history.rb

@@ -1,8 +1,12 @@
 module OllamaChat::History
+  # Returns the full path of the chat history filename based on the
+  # configuration.
   def chat_history_filename
     File.expand_path(config.chat_history_filename)
   end
 
+  # Initializes the chat history by loading it from a file if it exists, and
+  # then loads the history into Readline::HISTORY.
   def init_chat_history
     if File.exist?(chat_history_filename)
       File.open(chat_history_filename, ?r) do |history|
@@ -13,10 +17,12 @@ module OllamaChat::History
     end
   end
 
+  # Saves the current chat history to a file in JSON format.
   def save_history
     File.secure_write(chat_history_filename, JSON.dump(Readline::HISTORY))
   end
 
+  # Clears all entries from Readline::HISTORY.
   def clear_history
     Readline::HISTORY.clear
   end

data/lib/ollama_chat/information.rb

@@ -29,31 +29,32 @@ module OllamaChat::Information
 
   def info
     STDOUT.puts "Running ollama_chat version: #{bold(OllamaChat::VERSION)}"
-    STDOUT.puts "Connected to ollama server version: #{bold(server_version)}"
-    STDOUT.puts "Current model is #{bold{@model}}."
+    STDOUT.puts "Connected to ollama server version: #{bold(server_version)} on: #{bold(server_url)}"
+    STDOUT.puts "Current conversation model is #{bold{@model}}."
     if @model_options.present?
       STDOUT.puts "  Options: #{JSON.pretty_generate(@model_options).gsub(/(?<!\A)^/, '  ')}"
     end
     @embedding.show
     if @embedding.on?
-      STDOUT.puts "Embedding model is #{bold{@embedding_model}}"
+      STDOUT.puts "Current embedding model is #{bold{@embedding_model}}"
       if @embedding_model_options.present?
         STDOUT.puts "  Options: #{JSON.pretty_generate(@embedding_model_options).gsub(/(?<!\A)^/, '  ')}"
       end
       STDOUT.puts "Text splitter is #{bold{config.embedding.splitter.name}}."
       collection_stats
     end
-    STDOUT.puts "Documents database cache is #{@documents.nil? ? 'n/a' : bold{@documents.cache.class}}"
     markdown.show
     stream.show
+    think.show
     location.show
-    STDOUT.puts "Document policy for references in user text: #{bold{@document_policy}}"
-    STDOUT.puts "Thinking is #{bold(think.on? ? 'enabled' : 'disabled')}."
-    STDOUT.puts "Currently selected search engine is #{bold(search_engine)}."
+    voice.show
     if @voice.on?
-      STDOUT.puts "Using voice #{bold{@current_voice}} to speak."
+      STDOUT.puts "  Using voice #{bold{@current_voice}} to speak."
     end
-    @messages.show_system_prompt
+    STDOUT.puts "Documents database cache is #{@documents.nil? ? 'n/a' : bold{@documents.cache.class}}"
+    STDOUT.puts "Document policy for references in user text: #{bold{@document_policy}}"
+    STDOUT.puts "Currently selected search engine is #{bold(search_engine)}."
+    STDOUT.puts "Conversation length: #{bold(@messages.size.to_s)} message(s)."
     nil
   end
 
@@ -70,7 +71,7 @@ module OllamaChat::Information
       /clobber                        clear the conversation, links, and collection
       /drop [n]                       drop the last n exchanges, defaults to 1
       /model                          change the model
-      /system                         change system prompt (clears conversation)
+      /system [show]                  change/show system prompt
       /regenerate                     the last answer message
       /collection [clear|change]      change (default) collection or clear
       /info                           show information for current session
@@ -97,8 +98,8 @@ module OllamaChat::Information
 
         -f CONFIG      config file to read
         -u URL         the ollama base url, OLLAMA_URL
-        -m MODEL       the ollama model to chat with, OLLAMA_CHAT_MODEL
-        -s SYSTEM      the system prompt to use as a file, OLLAMA_CHAT_SYSTEM
+        -m MODEL       the ollama model to chat with, OLLAMA_CHAT_MODEL, ?selector
+        -s SYSTEM      the system prompt to use as a file, OLLAMA_CHAT_SYSTEM, ?selector
         -c CHAT        a saved chat conversation to load
         -C COLLECTION  name of the collection used in this conversation
         -D DOCUMENT    load document and add to embeddings collection (multiple)
@@ -108,6 +109,8 @@ module OllamaChat::Information
         -V             display the current version number and quit
         -h             this help
 
+        Use `?selector` with `-m` or `-s` to filter options. Multiple matches
+        will open a chooser dialog.
     EOT
     0
   end
@@ -120,4 +123,8 @@ module OllamaChat::Information
   def server_version
     @server_version ||= ollama.version.version
   end
+
+  def server_url
+    @server_url ||= ollama.base_url
+  end
 end

data/lib/ollama_chat/message_list.rb

@@ -106,10 +106,20 @@ class OllamaChat::MessageList
                    when 'system' then 213
                    else 210
                    end
+      thinking = if @chat.think.on?
+                   think_annotate do
+                     m.thinking.full? { @chat.markdown.on? ? Kramdown::ANSI.parse(_1) : _1 }
+                   end
+                 end
       content = m.content.full? { @chat.markdown.on? ? Kramdown::ANSI.parse(_1) : _1 }
       message_text = message_type(m.images) + " "
       message_text += bold { color(role_color) { m.role } }
-      message_text += ":\n#{content}"
+      if thinking
+        message_text += [ ?:, thinking, talk_annotate { content } ].compact.
+          map { _1.chomp } * ?\n
+      else
+        message_text += ":\n#{content}"
+      end
       m.images.full? { |images|
         message_text += "\nImages: " + italic { images.map(&:path) * ', ' }
       }
@@ -118,35 +128,64 @@ class OllamaChat::MessageList
     self
   end
 
-  # The drop method removes the last n exchanges from the message list and returns the number of removed exchanges.
+  # Removes the last `n` exchanges from the message list. An exchange consists
+  # of a user and an assistant message. If only a single user message is
+  # present at the end, it will be removed first before proceeding with
+  # complete exchanges.
   #
-  # @param n [ Integer ] the number of exchanges to remove
+  # @param n [Integer] The number of exchanges to remove.
+  # @return [Integer] The actual number of complete exchanges removed.
+  #                   This may be less than `n` if there are not enough messages.
   #
-  # @return [ Integer ] the number of removed exchanges, or 0 if there are no more exchanges to pop
+  # @note
+  #   - System messages are preserved and not considered part of an exchange.
+  #   - If only one incomplete exchange (a single user message) exists, it will
+  #     be dropped first before removing complete exchanges.
   def drop(n)
-    if @messages.reject { _1.role == 'system' }.size > 1
-      n = n.to_i.clamp(1, Float::INFINITY)
-      r = @messages.pop(2 * n)
-      m = r.size / 2
-      STDOUT.puts "Dropped the last #{m} exchanges."
-      m
-    else
-      STDOUT.puts "No more exchanges you can drop."
-      0
+    n = n.to_i.clamp(1, Float::INFINITY)
+    non_system_messages = @messages.reject { _1.role == 'system' }
+    if non_system_messages&.last&.role == 'user'
+      @messages.pop
+      n -= 1
+    end
+    if n == 0
+      STDOUT.puts "Dropped the last exchange."
+      return 1
     end
+    if non_system_messages.empty?
+      STDOUT.puts "No more exchanges can be dropped."
+      return 0
+    end
+    m = 0
+    while @messages.size > 1 && n > 0
+      @messages.pop(2)
+      m += 1
+      n -= 1
+    end
+    STDOUT.puts "Dropped the last #{m} exchanges."
+    m
   end
 
-  # The set_system_prompt method sets the system prompt for the chat session.
-  # This implies deleting all of the messages in the message list, so it only
-  # contains the system prompt at the end.
+  # Sets the system prompt for the chat session.
+  #
+  # @param system [String, nil] The new system prompt. If `nil` or `false`, clears the system prompt.
   #
-  # @param system [ String ] the new system prompt
+  # @return [OllamaChat::MessageList] Returns `self` to allow chaining of method calls.
   #
-  # @return [ OllamaChat::MessageList ] the message list instance itself, allowing for chaining.
+  # @note This method:
+  #   - Removes all existing system prompts from the message list
+  #   - Adds the new system prompt to the beginning of the message list if provided
+  #   - Handles edge cases such as clearing prompts when `system` is `nil` or `false`
   def set_system_prompt(system)
-    @system = system.to_s
-    @messages.clear
-    @messages << Ollama::Message.new(role: 'system', content: self.system)
+    @messages.reject! { |msg| msg.role == 'system' }
+    if new_system_prompt = system.full?(:to_s)
+      @system = new_system_prompt
+      @messages.unshift(
+        Ollama::Message.new(role: 'system', content: self.system)
+      )
+    else
+      @system = nil
+    end
     self
   end
 

data/lib/ollama_chat/model_handling.rb

@@ -1,15 +1,44 @@
 module OllamaChat::ModelHandling
+
+  # The model_present? method checks if the specified Ollama model is available.
+  #
+  # @param model [ String ] the name of the Ollama model
+  #
+  # @return [ String, FalseClass ] the system prompt if the model is present,
+  # false otherwise
   def model_present?(model)
     ollama.show(model:) { return _1.system.to_s }
   rescue Ollama::Errors::NotFoundError
     false
   end
 
+  # The pull_model_from_remote method attempts to retrieve a model from the
+  # remote server if it is not found locally.
+  #
+  # @param model [ String ] the name of the model to be pulled
+  #
+  # @return [ nil ]
   def pull_model_from_remote(model)
     STDOUT.puts "Model #{bold{model}} not found locally, attempting to pull it from remote now…"
     ollama.pull(model:)
   end
 
+  # The pull_model_unless_present method checks if the specified model is
+  # present on the system.
+  #
+  # If the model is already present, it returns the system prompt if it is
+  # present.
+  #
+  # Otherwise, it attempts to pull the model from the remote server using the
+  # pull_model_from_remote method. If the model is still not found after
+  # pulling, it exits the program with a message indicating that the model was
+  # not found remotely.
+  #
+  # @param model [ String ] The name of the model to check for presence.
+  # @param options [ Hash ] Options for the pull_model_from_remote method.
+  #
+  # @return [ String, FalseClass ] the system prompt if the model and it are
+  # present, false otherwise.
   def pull_model_unless_present(model, options)
     if system = model_present?(model)
       return system.full?

data/lib/ollama_chat/server_socket.rb

@@ -1,65 +1,42 @@
 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
+    # The send_to_server_socket method sends content to the server socket and returns
+    # the response if type is :socket_input_with_response, otherwise it returns nil.
 
-    # Sends a message to the server socket.
+    # @param content [ String ] the message to be sent to the server
+    # @param type [ Symbol ] the type of message being sent (default: :socket_input)
     #
-    # @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)
+    # @return [ String, NilClass ] the response from the server if type is
+    #   :socket_input_with_response, otherwise nil.
     def send_to_server_socket(content, type: :socket_input)
-      FileUtils.mkdir_p runtime_dir
+      server = UnixSocks::Server.new(socket_name: 'ollama_chat.sock')
       message = { content:, type: }
-      socket = UNIXSocket.new(server_socket_path)
-      socket.puts JSON(message)
-      socket.close
+      if type.to_sym == :socket_input_with_response
+         return server.transmit_with_response(message)
+      else
+         server.transmit(message)
+         nil
+      end
     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.
+  # Initializes the server socket to receive messages from the Ollama Chat
+  # Client.
   #
-  # 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.
+  # This method sets up a Unix domain socket server that listens for incoming
+  # messages in the background. When a message is received, it updates the
+  # instance variable `server_socket_message` and sends an interrupt signal
+  # to the current process in order to handle the message.
   #
-  # Raises Errno::EEXIST if the socket path already exists.
+  # @return [ nil ] This method does not return any value, it only sets up the
+  # server socket and kills the process when a message is received.
   def init_server_socket
-    FileUtils.mkdir_p OllamaChat::ServerSocket.runtime_dir
-    if File.exist?(OllamaChat::ServerSocket.server_socket_path)
-      raise Errno::EEXIST, "Path already exists #{OllamaChat::ServerSocket.server_socket_path.inspect}"
-    end
-    Thread.new do
-      Socket.unix_server_loop(OllamaChat::ServerSocket.server_socket_path) do |sock, client_addrinfo|
-        begin
-          data = sock.readline.chomp
-          self.server_socket_message = JSON.load(data)
-          Process.kill :INT, $$
-        rescue JSON::ParserError
-        ensure
-          sock.close
-        end
-      end
-    rescue Errno::ENOENT
-    ensure
-      FileUtils.rm_f OllamaChat::ServerSocket.server_socket_path
+    server = UnixSocks::Server.new(socket_name: 'ollama_chat.sock')
+    server.receive_in_background do |message|
+      self.server_socket_message = message
+      Process.kill :INT, $$
     end
   end
 end

data/lib/ollama_chat/source_fetching.rb

@@ -50,7 +50,7 @@ module OllamaChat::SourceFetching
 
   def import_source(source_io, source)
     source        = source.to_s
-    document_type = source_io&.content_type.full? { |ct| italic { ct } } + ' '
+    document_type = source_io&.content_type.full? { |ct| italic { ct } + ' ' }
     STDOUT.puts "Importing #{document_type}document #{source.to_s.inspect} now."
     source_content = parse_source(source_io)
     "Imported #{source.inspect}:\n\n#{source_content}\n\n"

data/lib/ollama_chat/version.rb

@@ -1,6 +1,6 @@
 module OllamaChat
   # OllamaChat version
-  VERSION         = '0.0.13'
+  VERSION         = '0.0.15'
   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

@@ -3,6 +3,7 @@ end
 
 require 'ollama'
 require 'documentrix'
+require 'unix_socks'
 require 'ollama_chat/version'
 require 'ollama_chat/utils'
 require 'ollama_chat/message_format'

data/ollama_chat.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: ollama_chat 0.0.13 ruby lib
+# stub: ollama_chat 0.0.15 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama_chat".freeze
-  s.version = "0.0.13".freeze
+  s.version = "0.0.15".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   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]
   s.required_ruby_version = Gem::Requirement.new("~> 3.1".freeze)
-  s.rubygems_version = "3.6.7".freeze
+  s.rubygems_version = "3.6.9".freeze
   s.summary = "A command-line interface (CLI) for interacting with an Ollama AI model.".freeze
   s.test_files = ["spec/assets/example.rb".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]
 
@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<excon>.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<unix_socks>.freeze, [">= 0".freeze])
   s.add_runtime_dependency(%q<rss>.freeze, ["~> 0.3".freeze])
   s.add_runtime_dependency(%q<term-ansicolor>.freeze, ["~> 1.11".freeze])
   s.add_runtime_dependency(%q<redis>.freeze, ["~> 5.0".freeze])

data/spec/ollama_chat/chat_spec.rb

@@ -5,6 +5,10 @@ RSpec.describe OllamaChat::Chat do
     %w[ -C test ]
   end
 
+  before do
+    ENV['OLLAMA_CHAT_MODEL'] = 'llama3.1'
+  end
+
   let :chat do
     OllamaChat::Chat.new(argv: argv).expose
   end
@@ -86,7 +90,7 @@ RSpec.describe OllamaChat::Chat do
 
     it 'returns :next when input is "/system"' do
       expect(chat).to receive(:change_system_prompt).with(nil)
-      expect(chat).to receive(:info)
+      expect(chat.messages).to receive(:show_system_prompt)
       expect(chat.handle_input("/system")).to eq :next
     end
 
@@ -288,7 +292,8 @@ RSpec.describe OllamaChat::Chat do
           /
             Running\ ollama_chat\ version|
             Connected\ to\ ollama\ server|
-            Current\ model|
+            Current\ conversation\ model|
+            Current\ embedding\ model|
             Options|
             Embedding|
             Text\ splitter|
@@ -297,8 +302,10 @@ RSpec.describe OllamaChat::Chat do
             Streaming|
             Location|
             Document\ policy|
-            Thinking\ is|
-            Currently\ selected\ search\ engine
+            Thinking|
+            Voice\ output|
+            Currently\ selected\ search\ engine|
+            Conversation\ length
           /x
         ).at_least(1)
       expect(chat.info).to be_nil

data/spec/ollama_chat/information_spec.rb

@@ -24,7 +24,7 @@ RSpec.describe OllamaChat::Information do
 
   it 'can show info' do
     expect(STDOUT).to receive(:puts).with(/Connected to ollama server version/)
-    expect(STDOUT).to receive(:puts).with(/Current model is/)
+    expect(STDOUT).to receive(:puts).with(/Current conversation model is/)
     expect(STDOUT).to receive(:puts).at_least(1)
     expect(chat.info).to be_nil
   end
@@ -39,7 +39,16 @@ RSpec.describe OllamaChat::Information do
     expect(chat.usage).to eq 0
   end
 
-  it 'can show version' do
+  it 'can show  version' do
+    expect(STDOUT).to receive(:puts).with(/^ollama_chat \d+\.\d+\.\d+$/)
     expect(chat.version).to eq 0
   end
+
+  it 'can show server version' do
+    expect(chat.server_version).to eq '6.6.6'
+  end
+
+  it 'can show server URL' do
+    expect(chat.server_url).to be_a URI::HTTP
+  end
 end

data/spec/ollama_chat/message_list_spec.rb

@@ -64,9 +64,11 @@ RSpec.describe OllamaChat::MessageList do
     FileUtils.rm_f 'tmp/test-conversation.json'
   end
 
-  it 'can list conversations' do
+  it 'can list conversations without thinking' do
     expect(chat).to receive(:markdown).
       and_return(double(on?: true)).at_least(:once)
+    expect(chat).to receive(:think).
+      and_return(double(on?: false)).at_least(:once)
     list <<  Ollama::Message.new(role: 'user', content: 'world')
     expect(STDOUT).to receive(:puts).
       with("📨 \e[1m\e[38;5;213msystem\e[0m\e[0m:\nhello\n")
@@ -75,6 +77,21 @@ RSpec.describe OllamaChat::MessageList do
     list.list_conversation
   end
 
+  it 'can list conversations with thinking' do
+    expect(chat).to receive(:markdown).
+      and_return(double(on?: true)).at_least(:once)
+    expect(chat).to receive(:think).
+      and_return(double(on?: true)).at_least(:once)
+    expect(STDOUT).to receive(:puts).
+      with("📨 \e[1m\e[38;5;213msystem\e[0m\e[0m:\n💭\nI need to say something nice…\n\n💬\nhello\n")
+    expect(STDOUT).to receive(:puts).
+      with("📨 \e[1m\e[38;5;172muser\e[0m\e[0m:\nworld\n")
+    list.set_system_prompt nil
+    list << Ollama::Message.new(role: 'system', content: 'hello', thinking: 'I need to say something nice…')
+    list << Ollama::Message.new(role: 'user', content: 'world')
+    list.list_conversation
+  end
+
   it 'can show_system_prompt' do
     expect(list).to receive(:system).and_return 'test **prompt**'
     expect(Kramdown::ANSI).to receive(:parse).with('test **prompt**').
@@ -82,10 +99,27 @@ RSpec.describe OllamaChat::MessageList do
     expect(list.show_system_prompt).to eq list
   end
 
-  it 'can set_system_prompt' do
+  it 'can set_system_prompt if unset' do
+    list.messages.clear
+    expect(list.messages.count { _1.role == 'system' }).to eq 0
     expect {
       expect(list.set_system_prompt('test prompt')).to eq list
     }.to change { list.system }.from(nil).to('test prompt')
+    expect(list.messages.count { _1.role == 'system' }).to eq 1
+  end
+
+  it 'can set_system_prompt if already set' do
+    list.messages.clear
+    expect(list.messages.count { _1.role == 'system' }).to eq 0
+    list.set_system_prompt('first prompt')
+    expect(list.system).to eq('first prompt')
+    expect(list.messages.count { _1.role == 'system' }).to eq 1
+    #
+    list.set_system_prompt('new prompt')
+    expect(list.system).to eq('new prompt')
+    expect(list.messages.count { _1.role == 'system' }).to eq 1
+    expect(list.messages.first.role).to eq('system')
+    expect(list.messages.first.content).to eq('new prompt')
   end
 
   it 'can drop n conversations exhanges' do
@@ -94,11 +128,26 @@ RSpec.describe OllamaChat::MessageList do
     expect(list.size).to eq 1
     list <<  Ollama::Message.new(role: 'user', content: 'world')
     expect(list.size).to eq 2
-    expect(list.drop(1)).to eq 0
     list <<  Ollama::Message.new(role: 'assistant', content: 'hi')
     expect(list.size).to eq 3
     expect(list.drop(1)).to eq 1
     expect(list.size).to eq 1
+    expect(list.drop(1)).to eq 0
+    expect(list.size).to eq 1
+    expect(list.drop(1)).to eq 0
+    expect(list.size).to eq 1
+  end
+
+  it 'drops the last user message when there is no assistant response' do
+    expect(list.size).to eq 1
+    list << Ollama::Message.new(role: 'user', content: 'hello')
+    list << Ollama::Message.new(role: 'assistant', content: 'hi')
+    list << Ollama::Message.new(role: 'user', content: 'world')
+    expect(list.size).to eq 4
+    expect(list.drop(1)).to eq 1
+    expect(list.size).to eq 3
+    expect(list.drop(1)).to eq 1
+    expect(list.size).to eq 1
   end
 
   it 'can determine location for system prompt' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ollama_chat
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.15
 platform: ruby
 authors:
 - Florian Frank
@@ -155,6 +155,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.2
+- !ruby/object:Gem::Dependency
+  name: unix_socks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rss
   requirement: !ruby/object:Gem::Requirement
@@ -479,7 +493,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: A command-line interface (CLI) for interacting with an Ollama AI model.
 test_files: