ollama_chat 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc27a8640616134647d04ee2d9b806e41806a55dc8a492e24bcf90509a84f8c8
-  data.tar.gz: b560ce8230eb463f38881605c29f73cab6a601dc9194b79cacec2ce443b1a4bc
+  metadata.gz: b2f4b23386064513dc339fa0b3479e70c8e15b091b146bfcf700602fd1497b87
+  data.tar.gz: ce9857a08de2bec94a1e19b5e28a13535657ebdab3ca977fe2b5582a86708bb7
 SHA512:
-  metadata.gz: 92e51935010fcace611baa132f5619b2894da2509854eb20d428e2a5d74b6bc658fa90edd577633a887b381f24861c7d3c580a79891e7cfc348a11b6b9191a08
-  data.tar.gz: d74878f18ff236f99c75fee50b40a91c69a3aaa245c2c681d33f68d8869d5a745afb7afcc8219e8cb4a1f443fe3c055661a3a25b5f03f6007fa8f9042ffaa0d6
+  metadata.gz: c7bcfbc3966c7189cc3d93b6ac3e09a49d79b1dd3bbfd5ed729a7ae5484ef7fcdadd194705363c574f18dd43f11c6c8d204577292516c3f9b286ba4380417e41
+  data.tar.gz: 855accf3d5d72aa6c8a6cdd9fc8e534db40d97a4533bee03fc6a240cc5a12b8da46f304d02cf1c71378f592347866b84a95e9b18f9046975f630902996dd409a

data/CHANGES.md

@@ -1,5 +1,40 @@
 # Changes
 
+## 2025-05-22 v0.0.7
+
+* Added `ollama_chat_send` executable in `/bin`, required 'ollama_chat' gem,
+  sent user input to Ollama server via
+  `OllamaChat::ServerSocket.send_to_server_socket` method and handled
+  exceptions and exit with non-zero status code if an error occurs.
+* Added new `server_socket.rb` file containing module and methods for
+  server-side socket handling, modified `chat.rb` to include `ServerSocket`
+  module and use its `init_server_socket` method to start server socket,
+  updated `chat.rb` to handle incoming messages from server socket in
+  interactive loop sent via `send_to_server_socket`.
+* Refactored chat history management into separate module by adding
+  OllamaChat::History module, including History in OllamaChat::Chat and moving
+  chat history methods to new History module.
+* Refactored chat history configuration by making chat history filename use
+  config setting first instead of environment variable OLLAMA_CHAT_HISTORY.
+* Updated chat commands and documentation by updating `/clear`, `/collection`,
+  `/links` command helps to use more consistent syntax, updated
+  `OllamaChat::Information` module in `lib/ollama_chat/information.rb` to
+  reflect changes.
+* Added support for chat history loading and saving by adding `require
+  'tins/secure_write'` and `require 'json'` to dependencies, modified
+  OllamaChat::Chat class to initialize, save, and clear chat history, utilized
+  `File.secure_write` for secure saving of chat history.
+
+## 2025-04-15 v0.0.6
+
+* Updated Rakefile to use `ollama-ruby` version **1.0**.
+* Modified `model_present?` method in `lib/ollama_chat/model_handling.rb` to use `ollama.show(model:)`.
+* Changed `pull_model_from_remote` method in `lib/ollama_chat/model_handling.rb` to use `ollama.pull(model:).
+* Updated `ollama_chat.gemspec` to use `ollama-ruby` version **1.0** and updated date to **2025-04-14**.
+* Attempt to capture stderr as well by redirecting stderr to stdout for
+  commands that output to it always or in the error case.
+* Updated development dependencies in `ollama_chat.gemspec`.
+
 ## 2025-03-22 v0.0.5
 
 * Updated default config to use environment variable for Searxng URL:

data/README.md

@@ -122,13 +122,13 @@ 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                          clear the whole conversation
-/clobber                        clear the conversation and collection
-/drop [n]                        drop the last n exchanges, defaults to 1
+/clear [messages|links|history] clear the all messages, links, or the chat history (defaults to messages)
+/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)
 /regenerate                     the last answer message
-/collection( clear|change)      change (default) collection or clear
+/collection [clear|change]      change (default) collection or clear
 /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
@@ -137,7 +137,7 @@ The following commands can be given inside the chat, if prefixed by a `/`:
 /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/Rakefile

@@ -27,10 +27,10 @@ GemHadar do
 
   required_ruby_version  '~> 3.1'
 
-  executables << 'ollama_chat'
+  executables << 'ollama_chat' << 'ollama_chat_send'
 
   dependency             'excon',                 '~> 1.0'
-  dependency             'ollama-ruby',           '~> 0.15'
+  dependency             'ollama-ruby',           '~> 1.0'
   dependency             'documentrix',           '~> 0.0'
   dependency             'rss',                   '~> 0.3'
   dependency             'term-ansicolor',        '~> 1.11'

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.7

data/bin/ollama_chat_send

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+
+require 'ollama_chat'
+
+begin
+  OllamaChat::ServerSocket.send_to_server_socket(STDIN.read)
+rescue => e
+  warn "Caught #{e.class}: #{e}"
+  exit 1
+end
+exit 0

data/docker-compose.yml

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

data/lib/ollama_chat/chat.rb

@@ -1,4 +1,6 @@
 require 'tins'
+require 'tins/secure_write'
+require 'json'
 require 'term/ansicolor'
 require 'reline'
 require 'reverse_markdown'
@@ -10,6 +12,7 @@ require 'rss'
 require 'pdf/reader'
 require 'csv'
 require 'xdg'
+require 'socket'
 
 class OllamaChat::Chat
   include Tins::GO
@@ -24,6 +27,8 @@ class OllamaChat::Chat
   include OllamaChat::Information
   include OllamaChat::Clipboard
   include OllamaChat::MessageType
+  include OllamaChat::History
+  include OllamaChat::ServerSocket
 
   def initialize(argv: ARGV.dup)
     @opts               = go 'f:u:m:s:c:C:D:MEVh', argv
@@ -60,6 +65,8 @@ class OllamaChat::Chat
     @cache         = setup_cache
     @current_voice = config.voice.default
     @images        = []
+    init_chat_history
+    init_server_socket
   end
 
   attr_reader :ollama
@@ -100,7 +107,17 @@ class OllamaChat::Chat
     loop do
       parse_content = true
       input_prompt = bold { color(172) { message_type(@images) + " user" } } + bold { "> " }
-      content = Reline.readline(input_prompt, true)&.chomp
+
+      begin
+        content = Reline.readline(input_prompt, true)&.chomp
+      rescue Interrupt
+        if message = server_socket_message
+          self.server_socket_message = nil
+          content = message['content']
+        else
+          raise
+        end
+      end
 
       case content
       when %r(^/copy$)
@@ -128,15 +145,26 @@ class OllamaChat::Chat
         last = 2 * $1.to_i if $1
         messages.list_conversation(last)
         next
-      when %r(^/clear$)
-        messages.clear
-        STDOUT.puts "Cleared messages."
+      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.'
@@ -348,8 +376,12 @@ class OllamaChat::Chat
       STDOUT.puts "Type /quit to quit."
     end
     0
+  ensure
+    save_history
   end
 
+  private
+
   def setup_documents
     if embedding.on?
       @embedding_model         = config.embedding.model.name
@@ -405,10 +437,11 @@ class OllamaChat::Chat
 
   def setup_cache
     if url = config.redis.expiring.url?
+      ex = config.redis.expiring.ex?.to_i
       Documentrix::Documents::RedisCache.new(
         prefix: 'Expiring-',
         url:,
-        ex:     config.redis.expiring.ex?.to_i,
+        ex:
       )
     end
   end

data/lib/ollama_chat/history.rb

@@ -0,0 +1,23 @@
+module OllamaChat::History
+  def chat_history_filename
+    File.expand_path(config.chat_history_filename)
+  end
+
+  def init_chat_history
+    if File.exist?(chat_history_filename)
+      File.open(chat_history_filename, ?r) do |history|
+        history_data = JSON.load(history)
+        clear_history
+        Readline::HISTORY.push(*history_data)
+      end
+    end
+  end
+
+  def save_history
+    File.secure_write(chat_history_filename, JSON.dump(Readline::HISTORY))
+  end
+
+  def clear_history
+    Readline::HISTORY.clear
+  end
+end

data/lib/ollama_chat/information.rb

@@ -63,15 +63,15 @@ module OllamaChat::Information
       /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                          clear the whole conversation
+      /clear [messages|links|history] clear the all messages, links, or the chat history (defaults to messages)
       /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)
       /regenerate                     the last answer message
-      /collection( clear|change)      change (default) collection or clear
+      /collection [clear|change]      change (default) collection or clear
       /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

data/lib/ollama_chat/model_handling.rb

@@ -1,13 +1,13 @@
 module OllamaChat::ModelHandling
   def model_present?(model)
-    ollama.show(name: model) { return _1.system.to_s }
+    ollama.show(model:) { return _1.system.to_s }
   rescue Ollama::Errors::NotFoundError
     false
   end
 
   def pull_model_from_remote(model)
     STDOUT.puts "Model #{bold{model}} not found locally, attempting to pull it from remote now…"
-    ollama.pull(name: model)
+    ollama.pull(model:)
   end
 
   def pull_model_unless_present(model, options)

data/lib/ollama_chat/ollama_chat_config/default_config.yml

@@ -55,6 +55,7 @@ redis:
   expiring:
     url: <%= ENV.fetch('REDIS_EXPIRING_URL', 'null') %>
     ex: 86400
+chat_history_filename: <%= ENV.fetch('OLLAMA_CHAT_HISTORY', '~/.ollama_chat_history') %>
 debug: <%= ENV['OLLAMA_CHAT_DEBUG'].to_i == 1 ? true : false %>
 request_headers:
   Accept: 'text/*,application/*,image/*'

data/lib/ollama_chat/server_socket.rb

@@ -0,0 +1,38 @@
+module OllamaChat::ServerSocket
+  class << self
+    def runtime_dir
+      File.expand_path(ENV.fetch('XDG_RUNTIME_DIR',  '~/.local/run'))
+    end
+
+    def server_socket_path
+      File.join(runtime_dir, 'ollama_chat.sock')
+    end
+
+    def send_to_server_socket(content)
+      FileUtils.mkdir_p runtime_dir
+      message = { content: }
+      socket = UNIXSocket.new(server_socket_path)
+      socket.puts JSON(message)
+      socket.close
+    end
+  end
+
+  attr_accessor :server_socket_message
+
+  def init_server_socket
+    FileUtils.mkdir_p OllamaChat::ServerSocket.runtime_dir
+    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
+    end
+  end
+end

data/lib/ollama_chat/source_fetching.rb

@@ -49,8 +49,9 @@ module OllamaChat::SourceFetching
   end
 
   def import_source(source_io, source)
-    source = source.to_s
-    STDOUT.puts "Importing #{italic { source_io&.content_type }} document #{source.to_s.inspect} now."
+    source        = source.to_s
+    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"
   end

data/lib/ollama_chat/utils/fetcher.rb

@@ -59,9 +59,12 @@ class OllamaChat::Utils::Fetcher
 
   def self.execute(command, &block)
     Tempfile.open do |tmp|
-      IO.popen(command) do |command|
-        until command.eof?
-          tmp.write command.read(1 << 14)
+      unless command =~ /2>&1/
+        command += ' 2>&1'
+      end
+      IO.popen(command) do |io|
+        until io.eof?
+          tmp.write io.read(1 << 14)
         end
         tmp.rewind
         tmp.extend(OllamaChat::Utils::Fetcher::HeaderExtension)

data/lib/ollama_chat/version.rb

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

@@ -18,4 +18,6 @@ require 'ollama_chat/dialog'
 require 'ollama_chat/information'
 require 'ollama_chat/clipboard'
 require 'ollama_chat/document_cache'
+require 'ollama_chat/history'
+require 'ollama_chat/server_socket'
 require 'ollama_chat/chat'

data/ollama_chat.gemspec

@@ -1,24 +1,24 @@
 # -*- encoding: utf-8 -*-
-# stub: ollama_chat 0.0.5 ruby lib
+# stub: ollama_chat 0.0.7 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama_chat".freeze
-  s.version = "0.0.5".freeze
+  s.version = "0.0.7".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Florian Frank".freeze]
-  s.date = "2025-03-22"
+  s.date = "1980-01-02"
   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]
-  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/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/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, "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/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/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.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.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]
   s.required_ruby_version = Gem::Requirement.new("~> 3.1".freeze)
-  s.rubygems_version = "3.6.2".freeze
+  s.rubygems_version = "3.6.7".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]
 
@@ -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, ["~> 0.15".freeze])
+  s.add_runtime_dependency(%q<ollama-ruby>.freeze, ["~> 1.0".freeze])
   s.add_runtime_dependency(%q<documentrix>.freeze, ["~> 0.0".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

@@ -15,6 +15,33 @@ RSpec.describe OllamaChat::Chat do
     expect(chat).to be_a described_class
   end
 
+  describe 'chat history' do
+    it 'derives chat_history_filename' do
+      expect(chat.send(: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),
+        kind_of(String)
+      )
+      chat.send(:save_history)
+    end
+
+    it 'can initialize chat history' do
+      expect(File).to receive(:exist?).with(chat.send(:chat_history_filename)).
+        and_return true
+      expect(File).to receive(:open).with(chat.send(:chat_history_filename), ?r)
+      chat.send(:init_chat_history)
+    end
+
+    it 'can clear history' do
+      chat
+      expect(Readline::HISTORY).to receive(:clear)
+      chat.send(:clear_history)
+    end
+  end
+
   context 'loading conversations' do
     let :argv do
       %w[ -C test -c ] << asset('conversation.json')

data/spec/ollama_chat/parsing_spec.rb

@@ -3,7 +3,9 @@ require 'pathname'
 
 RSpec.describe OllamaChat::Parsing do
   let :chat do
-    OllamaChat::Chat.new
+    OllamaChat::Chat.new.tap do |chat|
+      chat.document_policy = 'importing'
+    end
   end
 
   connect_to_ollama_server
@@ -212,6 +214,7 @@ EOT
           Pathname.pwd.join('spec/assets/example.html').to_s
         )
         content, = chat.parse_content(c, [])
+        expect(content).to eq c
       end
 
       it 'can be summarizing' do

data/spec/ollama_chat/utils/fetcher_spec.rb

@@ -113,9 +113,9 @@ RSpec.describe OllamaChat::Utils::Fetcher do
   end
 
   it 'can .execute' do
-    described_class.execute('echo -n hello world') do |file|
+    described_class.execute('echo hello world') do |file|
       expect(file).to be_a Tempfile
-      expect(file.read).to eq 'hello world'
+      expect(file.read).to eq "hello world\n"
       expect(file.content_type).to eq 'text/plain'
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ollama_chat
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Florian Frank
 bindir: bin
 cert_chain: []
-date: 2025-03-22 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -127,14 +127,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: documentrix
   requirement: !ruby/object:Gem::Requirement
@@ -354,6 +354,7 @@ description: |
 email: flori@ping.de
 executables:
 - ollama_chat
+- ollama_chat_send
 extensions: []
 extra_rdoc_files:
 - README.md
@@ -363,12 +364,14 @@ extra_rdoc_files:
 - lib/ollama_chat/dialog.rb
 - lib/ollama_chat/document_cache.rb
 - lib/ollama_chat/follow_chat.rb
+- lib/ollama_chat/history.rb
 - lib/ollama_chat/information.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
+- lib/ollama_chat/server_socket.rb
 - lib/ollama_chat/source_fetching.rb
 - lib/ollama_chat/switches.rb
 - lib/ollama_chat/utils.rb
@@ -388,6 +391,7 @@ files:
 - Rakefile
 - VERSION
 - bin/ollama_chat
+- bin/ollama_chat_send
 - config/searxng/settings.yml
 - docker-compose.yml
 - lib/ollama_chat.rb
@@ -396,6 +400,7 @@ files:
 - lib/ollama_chat/dialog.rb
 - lib/ollama_chat/document_cache.rb
 - lib/ollama_chat/follow_chat.rb
+- lib/ollama_chat/history.rb
 - lib/ollama_chat/information.rb
 - lib/ollama_chat/message_list.rb
 - lib/ollama_chat/message_type.rb
@@ -403,6 +408,7 @@ files:
 - lib/ollama_chat/ollama_chat_config.rb
 - lib/ollama_chat/ollama_chat_config/default_config.yml
 - lib/ollama_chat/parsing.rb
+- lib/ollama_chat/server_socket.rb
 - lib/ollama_chat/source_fetching.rb
 - lib/ollama_chat/switches.rb
 - lib/ollama_chat/utils.rb
@@ -467,7 +473,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.7
 specification_version: 4
 summary: A command-line interface (CLI) for interacting with an Ollama AI model.
 test_files: