ollama_chat 0.0.6 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 495be78e16eba41edf9e1a785ed215a6137750d17c0faf9ca77b26cd45d9003b
-  data.tar.gz: 1e8bdf99a0b5171ba786e09109892e1fe05743886b0a9990c0ad14d8ca8c9a4d
+  metadata.gz: 36395404aa00934bda9f2229306a374143c30046bf7439188d369b9fe167f649
+  data.tar.gz: 2dc4c482a17e31a86c347d557475af52eccbe6638f2487abc564c11b5ef379b7
 SHA512:
-  metadata.gz: d83e739ee797ef746a53b96d76b8cca1e57c12a4f0325106c031108d1c5306899475d887e8ac8572364ee9d5167f864743620b380d981dfc6cccfbce1394e412
-  data.tar.gz: a9ef9c72777c16d5321b11fb7b0f00278cde2a4e44a1fb01ecf3de5bef6abbbe98bcbb7c774423b0df73e2876618027613b2202d416ce636514c56e86d6fd97d
+  metadata.gz: ece58d0452a5695dc3fec1a1032a9e45a6e9400085e48f512c13b9473acd53596a55d69a7f9264689fdb0a3b3335b8223547efbc504c9a3052a85e5ef9a0cc89
+  data.tar.gz: 11a052d21eed75504722adde01ff43c10213ba371887b7f376fdbe4b962cf3dd3bd550325341af16c2215101776ca14753cf353eec221f3f5e98fff386053f51

data/CHANGES.md

@@ -1,5 +1,41 @@
 # Changes
 
+## 2025-05-23 v0.0.8
+
+* Introduce `fix_config` method to rescue `ComplexConfig` exceptions and prompt
+  user for correction.
+  * Added section to README.md on using `ollama_chat_send` to send input to a
+  running `ollama_chat` process.
+* Fix path existence check and cleanup on server socket initialization.
+  * Added check for existing path at
+    `OllamaChat::ServerSocket.server_socket_path` to prevent overwrite.
+  * Clean up server socket file if it exists when leaving thread.
+
+## 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**.

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,13 +137,34 @@ 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
 /help                           to view this help
 ```
 
+### Using `ollama_chat_send` to send input to a running `ollama_chat`
+
+You can do this from the shell by pasting into the `ollama_chat_send`
+executable.
+
+```
+$ echo "Why is the sky blue?" | ollama_chat_send
+```
+
+To send a text from inside a `vim` buffer, you can use a function/leader like
+this:
+
+```
+map <leader>o :<C-U>call OllamaChatSend(@*)<CR>
+
+function! OllamaChatSend(input)
+  let input = "Take note of the following code snippet (" . &filetype . ") **AND** await further instructions:\n\n```\n" . a:input . "\n```\n"
+  call system('ollama_chat_send', input)
+endfunction
+```
+
 ## Download
 
 The homepage of this app is located at

data/Rakefile

@@ -27,7 +27,7 @@ GemHadar do
 
   required_ruby_version  '~> 3.1'
 
-  executables << 'ollama_chat'
+  executables << 'ollama_chat' << 'ollama_chat_send'
 
   dependency             'excon',                 '~> 1.0'
   dependency             'ollama-ruby',           '~> 1.0'

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.8

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,8 @@ require 'rss'
 require 'pdf/reader'
 require 'csv'
 require 'xdg'
+require 'socket'
+require 'shellwords'
 
 class OllamaChat::Chat
   include Tins::GO
@@ -24,6 +28,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 +66,10 @@ class OllamaChat::Chat
     @cache         = setup_cache
     @current_voice = config.voice.default
     @images        = []
+    init_chat_history
+    init_server_socket
+  rescue ComplexConfig::AttributeMissing, ComplexConfig::ConfigurationSyntaxError => e
+    fix_config(e)
   end
 
   attr_reader :ollama
@@ -100,7 +110,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 +148,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 +379,14 @@ class OllamaChat::Chat
       STDOUT.puts "Type /quit to quit."
     end
     0
+  rescue ComplexConfig::AttributeMissing, ComplexConfig::ConfigurationSyntaxError => e
+    fix_config(e)
+  ensure
+    save_history
   end
 
+  private
+
   def setup_documents
     if embedding.on?
       @embedding_model         = config.embedding.model.name
@@ -405,11 +442,27 @@ 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
+
+  def fix_config(exception)
+    STDOUT.puts "When reading the config file, a #{exception.class} "\
+      "exception was caught: #{exception.message.inspect}"
+    if ask?(prompt: 'Do you want to fix the config? (y/n) ') =~ /\Ay/i
+      system Shellwords.join([
+        @ollama_chat_config.diff_tool,
+        @ollama_chat_config.filename,
+        @ollama_chat_config.default_config_path,
+      ])
+      exit 0
+    else
+      exit 1
+    end
+  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/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/ollama_chat_config.rb

@@ -4,9 +4,10 @@ class OllamaChat::OllamaChatConfig
   include ComplexConfig
   include FileUtils
 
-  DEFAULT_CONFIG = File.read(
-    Pathname.new(__FILE__).dirname.join('ollama_chat_config/default_config.yml')
-  )
+  DEFAULT_CONFIG_PATH = Pathname.new(__FILE__).dirname.
+    join('ollama_chat_config/default_config.yml')
+
+  DEFAULT_CONFIG = File.read(DEFAULT_CONFIG_PATH)
 
   def initialize(filename = nil)
     @filename = filename || default_path
@@ -30,6 +31,10 @@ class OllamaChat::OllamaChatConfig
 
   attr_reader :config
 
+  def default_config_path
+    DEFAULT_CONFIG_PATH
+  end
+
   def default_path
     config_dir_path + 'config.yml'
   end
@@ -45,4 +50,8 @@ class OllamaChat::OllamaChatConfig
   def database_path
     cache_dir_path + 'documents.db'
   end
+
+  def diff_tool
+    ENV.fetch('DIFF_TOOL', 'vimdiff')
+  end
 end

data/lib/ollama_chat/server_socket.rb

@@ -0,0 +1,43 @@
+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
+    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
+    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/version.rb

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

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.6
+  version: 0.0.8
 platform: ruby
 authors:
 - Florian Frank
 bindir: bin
 cert_chain: []
-date: 2025-04-14 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -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: