ollama_chat 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3f84805f1f6ef58ce6fd25f0f4a477b919c7afa72d909bf3c48ca8fa643d1dd
-  data.tar.gz: 61ce65c1f30464f4b30c0a4228a88aa9f4796a15407820d84db5c6240527d014
+  metadata.gz: fc27a8640616134647d04ee2d9b806e41806a55dc8a492e24bcf90509a84f8c8
+  data.tar.gz: b560ce8230eb463f38881605c29f73cab6a601dc9194b79cacec2ce443b1a4bc
 SHA512:
-  metadata.gz: 68bff70a1b439a0a01ec0daf7c8a643c6814450f8dbdd8368d92a43941d774034fe34a616f237ecec66c59ab1ed97585eda5e39d857625fd8f5a9a61d8d3f7b0
-  data.tar.gz: 20ec1a209f3e23374f0b3ee8b0bb1b1757fbb412500c823f1b8117f19ddc323dec2b9d1715fb9e3726549885dee08d4ccf00e25f1036a5af57699cb3f42b02c6
+  metadata.gz: 92e51935010fcace611baa132f5619b2894da2509854eb20d428e2a5d74b6bc658fa90edd577633a887b381f24861c7d3c580a79891e7cfc348a11b6b9191a08
+  data.tar.gz: d74878f18ff236f99c75fee50b40a91c69a3aaa245c2c681d33f68d8869d5a745afb7afcc8219e8cb4a1f443fe3c055661a3a25b5f03f6007fa8f9042ffaa0d6

data/CHANGES.md

@@ -1,5 +1,20 @@
 # Changes
 
+## 2025-03-22 v0.0.5
+
+* Updated default config to use environment variable for Searxng URL:
+  * Changed `url` field in `searxng` section of `default_config.yml`.
+  * Replaced hardcoded URL with expression that fetches value from `OLLAMA_SEARXNG_URL` environment variable.
+* Handle Ollama server disconnection:
+  * Added error handling for `Ollama::Errors::TimeoutError`.
+  * Print error message when connection is lost.
+* Output last exchange of a loaded conversation:
+  * Add attribute reader to `messages` in `lib/ollama_chat/chat.rb`.
+  * Replace `@messages` with `messages` in method calls throughout the class.
+  * Update conversation listing, clearing, dropping, saving, loading methods.
+  * Refactor interaction with user logic.
+  * Update tests in `spec/ollama_chat/chat_spec.rb`.
+
 ## 2025-02-21 v0.0.4
 
 * Added support for web searching with SearXNG:

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lib/ollama_chat/chat.rb

@@ -46,14 +46,14 @@ class OllamaChat::Chat
     embedding_enabled.set(config.embedding.enabled && !@opts[?E])
     @messages        = OllamaChat::MessageList.new(self)
     if @opts[?c]
-      @messages.load_conversation(@opts[?c])
+      messages.load_conversation(@opts[?c])
     else
       default = config.system_prompts.default? || model_system
       if @opts[?s] =~ /\A\?/
         change_system_prompt(default, system: @opts[?s])
       else
         system = OllamaChat::Utils::FileArgument.get_file_argument(@opts[?s], default:)
-        system.present? and @messages.set_system_prompt(system)
+        system.present? and messages.set_system_prompt(system)
       end
     end
     @documents     = setup_documents
@@ -66,6 +66,8 @@ class OllamaChat::Chat
 
   attr_reader :documents
 
+  attr_reader :messages
+
   def links
     @links ||= Set.new
   end
@@ -84,8 +86,17 @@ class OllamaChat::Chat
 
   def start
     info
+    if messages.size > 1
+      messages.list_conversation(2)
+    end
     STDOUT.puts "\nType /help to display the chat help."
 
+    interact_with_user
+  end
+
+  private
+
+  def interact_with_user
     loop do
       parse_content = true
       input_prompt = bold { color(172) { message_type(@images) + " user" } } + bold { "> " }
@@ -115,15 +126,15 @@ class OllamaChat::Chat
         next
       when %r(^/list(?:\s+(\d*))?$)
         last = 2 * $1.to_i if $1
-        @messages.list_conversation(last)
+        messages.list_conversation(last)
         next
       when %r(^/clear$)
-        @messages.clear
+        messages.clear
         STDOUT.puts "Cleared messages."
         next
       when %r(^/clobber$)
         if ask?(prompt: 'Are you sure to clear messages and collection? (y/n) ') =~ /\Ay/i
-          @messages.clear
+          messages.clear
           @documents.clear
           links.clear
           STDOUT.puts "Cleared messages and collection #{bold{@documents.collection}}."
@@ -132,8 +143,8 @@ class OllamaChat::Chat
         end
         next
       when %r(^/drop(?:\s+(\d*))?$)
-        @messages.drop($1)
-        @messages.list_conversation(2)
+        messages.drop($1)
+        messages.list_conversation(2)
         next
       when %r(^/model$)
         @model = choose_model('', @model)
@@ -143,9 +154,9 @@ class OllamaChat::Chat
         info
         next
       when %r(^/regenerate$)
-        if content = @messages.second_last&.content
+        if content = messages.second_last&.content
           content.gsub!(/\nConsider these chunks for your answer.*\z/, '')
-          @messages.drop(2)
+          messages.drop(2)
         else
           STDOUT.puts "Not enough messages in this conversation."
           redo
@@ -212,7 +223,7 @@ class OllamaChat::Chat
           map { |u, s| "%s as \n:%s" % [ u, s ] } * "\n\n"
         content = config.prompts.web % { query:, results: }
       when %r(^/save\s+(.+)$)
-        @messages.save_conversation($1)
+        messages.save_conversation($1)
         STDOUT.puts "Saved conversation to #$1."
         next
       when %r(^/links(?:\s+(clear))?$)
@@ -252,7 +263,10 @@ class OllamaChat::Chat
         end
         next
       when %r(^/load\s+(.+)$)
-        @messages.load_conversation($1)
+        messages.load_conversation($1)
+        if messages.size > 1
+          messages.list_conversation(2)
+        end
         STDOUT.puts "Loaded conversation from #$1."
         next
       when %r(^/config$)
@@ -303,16 +317,16 @@ class OllamaChat::Chat
         end
       end
 
-      @messages << Ollama::Message.new(role: 'user', content:, images: @images.dup)
+      messages << Ollama::Message.new(role: 'user', content:, images: @images.dup)
       @images.clear
       handler = OllamaChat::FollowChat.new(
         chat:     self,
-        messages: @messages,
+        messages:,
         voice:    (@current_voice if voice.on?)
       )
       ollama.chat(
         model: @model,
-        messages: @messages,
+        messages:,
         options: @model_options,
         stream: stream.on?,
         &handler
@@ -326,16 +340,16 @@ class OllamaChat::Chat
                  end
           [ link, record.tags.first ]
         }.uniq.map { |l, t| hyperlink(l, t) }.join(' ')
-        config.debug and jj @messages.to_ary
+        config.debug and jj messages.to_ary
       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."
     end
     0
   end
 
-  private
-
   def setup_documents
     if embedding.on?
       @embedding_model         = config.embedding.model.name
@@ -346,6 +360,7 @@ class OllamaChat::Chat
         ollama:,
         model:             @embedding_model,
         model_options:     config.embedding.model.options,
+        embedding_length:  config.embedding.model.embedding_length,
         database_filename: config.embedding.database_filename || @ollama_chat_config.database_path,
         collection:        ,
         cache:             configure_cache,

data/lib/ollama_chat/follow_chat.rb

@@ -52,7 +52,7 @@ class OllamaChat::FollowChat
       prompt_eval_rate:     bold { "%.2f c/s" % (response.prompt_eval_count.to_i / prompt_eval_duration) } + color(111),
       total_duration:       Tins::Duration.new(response.total_duration / 1e9),
       load_duration:        Tins::Duration.new(response.load_duration / 1e9),
-    }.map { _1 * '=' } * ' '
+    }.map { _1 * ?= } * ' '
     '📊 ' + color(111) {
       Kramdown::ANSI::Width.wrap(stats_text, percentage: 90).gsub(/(?<!\A)^/, '   ')
     }

data/lib/ollama_chat/ollama_chat_config/default_config.yml

@@ -21,7 +21,7 @@ prompts:
     Answer the the query %{query} using these sources and summaries:
 
     %{results}
-  location: You are at %{location_name} (%{location_decimal_degrees}), on %{localtime}, preferring %{units}
+  location: You are at %{location_name}, %{location_decimal_degrees}, on %{localtime}, preferring %{units}
 system_prompts:
   default: <%= ENV.fetch('OLLAMA_CHAT_SYSTEM', 'null') %>
   assistant: You are a helpful assistant.
@@ -66,4 +66,4 @@ web_search:
     duckduckgo:
       url: 'https://www.duckduckgo.com/html/?q=%{query}'
     searxng:
-      url: 'http://localhost:8088/search?q=%{query}&format=json'
+      url: <%= ENV.fetch('OLLAMA_SEARXNG_URL', 'http://localhost:8088/search?q=%{query}&language=en&format=json') %>

data/lib/ollama_chat/version.rb

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

data/ollama_chat.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: ollama_chat 0.0.4 ruby lib
+# stub: ollama_chat 0.0.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama_chat".freeze
-  s.version = "0.0.4".freeze
+  s.version = "0.0.5".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-02-21"
+  s.date = "2025-03-22"
   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]
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
 
   s.specification_version = 4
 
-  s.add_development_dependency(%q<gem_hadar>.freeze, ["~> 1.19".freeze])
+  s.add_development_dependency(%q<gem_hadar>.freeze, ["~> 1.20".freeze])
   s.add_development_dependency(%q<all_images>.freeze, ["~> 0.6".freeze])
   s.add_development_dependency(%q<rspec>.freeze, ["~> 3.2".freeze])
   s.add_development_dependency(%q<kramdown>.freeze, ["~> 2.0".freeze])

data/spec/ollama_chat/chat_spec.rb

@@ -15,6 +15,19 @@ RSpec.describe OllamaChat::Chat do
     expect(chat).to be_a described_class
   end
 
+  context 'loading conversations' do
+    let :argv do
+      %w[ -C test -c ] << asset('conversation.json')
+    end
+
+    it 'dispays the last exchange of the converstation' do
+      expect(chat).to receive(:interact_with_user).and_return 0
+      expect(STDOUT).to receive(:puts).at_least(1)
+      expect(chat.messages).to receive(:list_conversation)
+      chat.start
+    end
+  end
+
   describe OllamaChat::DocumentCache do
     context 'with MemoryCache' do
       let :argv do

data/spec/ollama_chat/web_searching_spec.rb

@@ -8,9 +8,11 @@ RSpec.describe OllamaChat::WebSearching do
   connect_to_ollama_server
 
   it 'can search web with duckduckgo' do
+    url = 'https://www.duckduckgo.com/html/?q=foo'
+    chat.config.web_search.engines.duckduckgo.attributes_update(url:)
     expect(chat).to receive(:search_engine).and_return 'duckduckgo'
-    stub_request(:get, 'https://www.duckduckgo.com/html/?q=foo').
-      with(headers: { 'Host'=>'www.duckduckgo.com' }).
+    stub_request(:get, url).
+      with(headers: { 'Host'=> 'www.duckduckgo.com' }).
       to_return(status: 200, body: asset_content('duckduckgo.html'), headers: {})
     expect(chat.search_web('foo').first.to_s).to eq(
       'https://en.wikipedia.org/wiki/Foo_Fighters'
@@ -18,8 +20,10 @@ RSpec.describe OllamaChat::WebSearching do
   end
 
   it 'can search web with searxng' do
+    url = 'http://localhost:8088/search?format=json&language=en&q=foo'
+    chat.config.web_search.engines.searxng.attributes_update(url:)
     expect(chat).to receive(:search_engine).and_return 'searxng'
-    stub_request(:get, 'http://localhost:8088/search?format=json&language=en&q=foo').
+    stub_request(:get, url).
       with(headers: { 'Host'=>'localhost:8088' }).
       to_return(status: 200, body: asset_content('searxng.json'), headers: {})
     expect(chat.search_web('foo').first.to_s).to eq(

data/spec/spec_helper.rb

@@ -14,6 +14,8 @@ require 'webmock/rspec'
 WebMock.disable_net_connect!
 require 'ollama_chat'
 
+ComplexConfig::Provider.deep_freeze = false
+
 def asset(name)
   File.join(__dir__, 'assets', name)
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ollama_chat
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Florian Frank
 bindir: bin
 cert_chain: []
-date: 2025-02-21 00:00:00.000000000 Z
+date: 2025-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.19'
+        version: '1.20'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.19'
+        version: '1.20'
 - !ruby/object:Gem::Dependency
   name: all_images
   requirement: !ruby/object:Gem::Requirement