ollama_chat 0.0.118 → 0.0.119

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5db2a60d43d3a57a30e3c33a16b9ba26e60807afd9ff6b74c0781af25fe2516
-  data.tar.gz: e670d0cfcbbcfa815e4b9a7f6e0ccb6093dc4986b736035aea3dc38b4bc646ab
+  metadata.gz: a7b876b681130c1ff2ec672460bb04aa85ed095e9358dbdaa62d744f82d68720
+  data.tar.gz: 3f85175d15231880d45e8f192f9f9af47c861cb8f1475d2fe653309ca173ab1c
 SHA512:
-  metadata.gz: 8f7cb31ed0e38db5baca42a29076b3a01e3bae64d5a80d55584bd0ecdaaa41fd15eb814fc8b34ac55d2e73e4d767c52f305167cd8d2a7b32af4e9668f7d43706
-  data.tar.gz: a54ebe900c8b8a2c9e31ce3a4aded809f1b6e179679b2f2b4e3174f9e4ba5f6c976c8e7f1aaf3ae7efb8b8c8417f605b8c2522676eb0952f6d4b38165ac087af
+  metadata.gz: 9cf60761b6ce28cb22873b30808d3398ffcefc9e9991fcf781621b4db8a8fed5fd6cca21de046d8bf2851dd60a7529cfa162125ca4ee567e32c09042f4dc4e81
+  data.tar.gz: a2f1e6210141a8f00c4b9428453c49e4e1673e51521f788dcec694cd2c2c9963542bd491618ec8d1a4bb3ad5788588ca3d2c7f51ed3b67b977eaac1b4a59115a

data/CHANGES.md

@@ -1,5 +1,63 @@
 # Changes
 
+## 2026-09-14 v0.0.119
+
+*   **Word-boundary fuzzy matching in chooser**
+    *   Pass `/\b/` as the word-boundary argument to `matcher.similar` in
+        `chooser.rb` to filter out partial-word hits, improving ranked results
+        for model names containing `/`, `-`, `:`, and `.` separators.
+
+*   **Parallel embedding via bounded thread pool**
+    *   Add `concurrency: 3` under `embedding:` in `default_config.yml`.
+    *   Add `bulk_embed_sources` to `source_fetching.rb` using a
+        `Tins::Limited` bounded thread pool with a `Mutex`-guarded results
+        array.
+    *   Change `embed` to accept a `prompt:` kwarg (defaults to
+        `prompt(:embed)`) so worker threads share a single resolved template
+        instead of each hitting Sequel/SQLite.
+    *   Replace `STDOUT.puts` with `infobar.puts` in `embed_source` to prevent
+        raw output from clobbering the progress bar in concurrent workers.
+    *   Rewrite the `-p` pattern path in `commands.rb` embedding to build a
+        `{source => tags}` Hash and call `bulk_embed_sources`.
+    *   Rewrite `update_collection` in `rag_handling.rb` to collect both
+        modified and new sources into a single Hash and issue one
+        `bulk_embed_sources` call instead of a sequential `embed` loop.
+    *   Update `commands_spec.rb` to stub `bulk_embed_sources` returning an
+        array.
+
+*   **Speed up embedding generation**
+    *   Implement batch processing in the ollama server.
+
+*   **Dependency updates**
+    *   Update `documentrix` minimum version to **0.7.0** in `Rakefile` and
+        `ollama_chat.gemspec` to support improved embedding speed.
+
+*   **Improve session switching and duplication robustness**
+    *   In `duplicate_session`, replaced defensive `session.lock?` check with a
+        direct `session.lock` call, since a freshly duplicated session is never
+        yet locked.
+    *   In `change_session`, added `except_id: session.id` to `choose_session`
+        to prevent re-selecting the current session from the chooser.
+    *   Track `previous_session` as a full object instead of just an ID,
+        enabling restoration on lock failure.
+    *   On lock failure, restore `@session` to the previous session, re-acquire
+        its lock, and reset `name` to `??` so the next iteration opens the
+        interactive picker instead of retrying the same locked session.
+    *   Log `previous_session_id` correctly in the "Session changed" info
+        message.
+
+*   **Formatting fix**
+    *   Add space before `\`.
+
+*   **Fix `context_spook` returning `nil` instead of context**
+    *   Reordered `STDOUT.puts` and `ctx.send("to_#{format.downcase}")` in
+        `context_spook` so the serialized context is the last expression in the
+        `if count > 0` branch, preventing `STDOUT.puts` from clobbering the
+        implicit return value.
+    *   Added a regression spec in `input_content_spec.rb` that exercises the
+        `count > 0` path with a real file and `all: true`, asserting the return
+        value is a non-blank `String` containing the ingested file path.
+
 ## 2026-09-05 v0.0.118
 
 *   Documented the upgrade workflow in the README, adding an "Upgrading"

data/Rakefile

@@ -40,7 +40,7 @@ GemHadar do
 
   dependency             'excon',                 '~> 1.0'
   dependency             'ollama-ruby',           '~> 1.23'
-  dependency             'documentrix',           '>= 0.6.0'
+  dependency             'documentrix',           '>= 0.7.0'
   dependency             'unix_socks',            '>= 0.4'
   dependency             'rss',                   '~> 0.3'
   dependency             'term-ansicolor',        '~> 1.11'

data/lib/ollama_chat/commands.rb

@@ -883,7 +883,8 @@ module OllamaChat::Commands
         if opts[?p]
           all = opts.fetch(?a, false)
           patterns = extract_patterns(arg)
-          next provide_file_set_content(patterns, all:, skip_blank: true) { embed(_1, tags:) } || :next
+          sources = file_set_each(patterns, all:).map(&:to_s).to_h { [_1, tags] }
+          next bulk_embed_sources(sources) || :next
         elsif arg
           next embed(arg, tags:) || :next
         else

data/lib/ollama_chat/input_content.rb

@@ -106,8 +106,8 @@ module OllamaChat::InputContent
         end
       end
       if count > 0
-        ctx.send("to_#{format.downcase}")
         STDOUT.puts "✅ Ingesting context now."
+        ctx.send("to_#{format.downcase}")
       else
         STDERR.puts "❌ No files in context. ⇨ Cancelled."
       end

data/lib/ollama_chat/ollama_chat_config/default_config.yml

@@ -478,10 +478,12 @@ embedding:
     name: snowflake-arctic-embed:137m
     embedding_length: 768
     context_length: 2048
-    options: {}
+    options:
+      num_batch: 2048
     # Retrieval prompt template:
     prompt: 'Represent this sentence for searching relevant passages: %s'
-  batch_size: 100
+  batch_size: 500
+  concurrency: 3
   database_filename: null # ':memory:'
   collection: <%= OC::OLLAMA::CHAT::COLLECTION %>
   found_texts_size: 16384

data/lib/ollama_chat/prompt_management.rb

@@ -432,7 +432,7 @@ module OllamaChat::PromptManagement
     end
 
     if orphans.any?
-      STDOUT.puts "\n#{orphans.count} orphaned prompt(s) "\
+      STDOUT.puts "\n#{orphans.count} orphaned prompt(s) " \
                  "(no longer in default config):\n"
       orphans.each { |p| STDOUT.puts "  • #{bold{p.name}} in #{italic{p.context}}" }
       STDOUT.puts

data/lib/ollama_chat/rag_handling.rb

@@ -184,12 +184,13 @@ module OllamaChat::RAGHandling
   #
   # @return [String] a newline-separated string of embedding result messages.
   def update_collection(collection)
+    results = []
     switch_collection(collection) do
       unless col = database_collection?(collection)
         STDERR.puts "❌ Collection #{collection.inspect} not found in database."
-        return
+        return ''
       end
-      results = []
+      sources = {}
       seen = {}
       @documents.each_record do |record|
         source = @documents.normalize_source(record.source) or next
@@ -199,24 +200,20 @@ module OllamaChat::RAGHandling
           infobar.puts "Source #{source.to_s.inspect} is unmodified. => Skipping."
           next
         end
-        tags = record.tags_set
+        sources[source] = record.tags_set
         @documents.source_remove(source)
-        r = embed(source, tags:) or next
-        results << r
       end
 
       if patterns = col.patterns.full?
-        all_file_set(patterns).each do |file|
-          seen[file.to_s] and next
-          seen[file.to_s] = true
-          r = embed(file.to_s, tags: []) or next
-          results << r
-        end
+        new_sources = all_file_set(patterns).map(&:to_s).reject { seen.key?(_1) }
+        new_sources.each { seen[_1] = true }
+        new_sources.each { sources[_1] = [] }
       end
 
+      results.concat(bulk_embed_sources(sources))
       log(:info, "Collection updated", data: { collection:, sources_updated: results.size })
-      results * "\n"
     end
+    results * ?\n
   end
 
   # Extracts and normalizes file patterns from a shell-style string.

data/lib/ollama_chat/session_management.rb

@@ -219,8 +219,7 @@ module OllamaChat::SessionManagement
     @session = session.duplicate
     set_previous_session_on_change(old_session.id)
     session.update(name:)
-    session.lock? or raise OllamaChat::OllamaChatError,
-      "Could not lock session #{session.id} #{session.errors.full?(:inspect)}"
+    session.lock
     confirm?(
       prompt: "🔔 Clear messages of duplicated session? (y/n) ",
       yes: /\Ay/i
@@ -537,9 +536,9 @@ module OllamaChat::SessionManagement
   # @param name [String] the name or ID of the session to switch to
   def change_session(name)
     name.full? or name = ??
-    previous_session_id = nil
+    previous_session = nil
     loop do
-      if chosen_session = choose_session(name, allow_new: true)
+      if chosen_session = choose_session(name, except_id: session.id, allow_new: true)
         if chosen_session.nil? || chosen_session == session
           confirm?(
             prompt: "\n⏎  Same session chosen, Press any key to continue (%s). ",
@@ -548,7 +547,7 @@ module OllamaChat::SessionManagement
           break
         end
         session_close
-        previous_session_id = session.id
+        previous_session = session
         @session = chosen_session
         if session.lock?
           messages.read_conversation_jsonl(session.messages.to_s)
@@ -563,10 +562,13 @@ module OllamaChat::SessionManagement
           set_default_persona_name(session.default_persona_name.full? || :none)
           set_current_system_prompt(session.current_system_prompt.full? || 'default')
           session_apply
-          log(:info, "Session changed", data: { session_id: session.id, name: session.name, previous_session_id: })
+          log(:info, "Session changed", data: { session_id: session.id, name: session.name, previous_session_id: previous_session&.id })
           info_session
           break
         else
+          @session = previous_session
+          @session.lock
+          name = ??
           confirm?(
             prompt: "\n⏎  Session locked: could not switch, Press any key to continue (%s). ",
             timeout: 3
@@ -579,7 +581,7 @@ module OllamaChat::SessionManagement
       end
     end
   ensure
-    set_previous_session_on_change(previous_session_id)
+    set_previous_session_on_change(previous_session&.id)
     session_sync
   end
 

data/lib/ollama_chat/source_fetching.rb

@@ -185,7 +185,7 @@ module OllamaChat::SourceFetching
   def embed_source(source_io, source, tags: [], count: nil)
     @embedding.on? or return parse_source(source_io)
     unless @documents.source_modified?(source)
-      STDOUT.puts "Source #{source.to_s.inspect} already up-to-date. => Skipping."
+      infobar.puts "Source #{source.to_s.inspect} already up-to-date. => Skipping."
       log(:info, "Source up-to-date", data: { source: source.to_s })
       return
     end
@@ -225,9 +225,9 @@ module OllamaChat::SourceFetching
       chunks: inputs.size
     })
     if count
-      STDOUT.puts '%u. %s' % [ count, m ]
+      infobar.puts '%u. %s' % [ count, m ]
     else
-      STDOUT.puts m
+      infobar.puts m
     end
     source  = source.to_s
     command = false
@@ -253,10 +253,14 @@ module OllamaChat::SourceFetching
   #
   # @param source [String] The source identifier which can be a command, URL,
   #   or file path
+  # @param tags [Array<String>] Tags to apply to the embedded source
+  # @param prompt [#to_s] The prompt template to format the result with
+  #   (defaults to `prompt(:embed)`)
   #
   # @return [String, nil] The formatted embedding result or summary message, or
   #   nil if the operation fails
-  def embed(source, tags: [])
+  def embed(source, tags: [], prompt: prompt(:embed))
+    prompt = prompt.to_s
     @embedding.on? or return
     fetch_source(source) do |source_io|
       content = parse_source(source_io)
@@ -264,7 +268,31 @@ module OllamaChat::SourceFetching
       source_io.rewind
       embed_source(source_io, source, tags:) or return
     end
-    prompt(:embed).to_s % { source:, collection: }
+    prompt.to_s % { source:, collection: }
+  end
+
+  # Embeds multiple sources concurrently using a bounded thread pool.
+  #
+  # @param sources_tags [Hash{String => Array}] mapping of source identifier
+  #   to the tags array to apply to that source
+  # @return [Array<String>] results from each successful embed call
+  def bulk_embed_sources(sources_tags)
+    return sources_tags.map { |s, tags| embed(s, tags:) }.compact if
+      sources_tags.size <= 1 or config.embedding.concurrency <= 1
+
+    results = []
+    mutex   = Mutex.new
+    prompt = prompt(:embed)
+    Tins::Limited.new(config.embedding.concurrency, name: 'embed').process do |l|
+      sources_tags.each do |s, tags|
+        l.execute do
+          r = embed(s, prompt:, tags:)
+          mutex.synchronize { results << r } if r
+        end
+      end
+      l.stop
+    end
+    results
   end
 
   private

data/lib/ollama_chat/utils/chooser.rb

@@ -51,7 +51,7 @@ module OllamaChat::Utils::Chooser
         matches = entries.map { |n|
           [
             n,
-            -matcher.similar(n.ask_and_send_or_self(:value).to_s.downcase)
+            -matcher.similar(n.ask_and_send_or_self(:value).to_s.downcase, /\b/)
           ]
         }.select { |_, s| s < 0 }.sort_by(&:last).map(&:first)
         matches.empty? and matches = entries

data/lib/ollama_chat/version.rb

@@ -1,6 +1,6 @@
 module OllamaChat
   # OllamaChat version
-  VERSION         = '0.0.118'
+  VERSION         = '0.0.119'
   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,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: ollama_chat 0.0.118 ruby lib
+# stub: ollama_chat 0.0.119 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama_chat".freeze
-  s.version = "0.0.118".freeze
+  s.version = "0.0.119".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency(%q<utils>.freeze, [">= 0".freeze])
   s.add_runtime_dependency(%q<excon>.freeze, ["~> 1.0".freeze])
   s.add_runtime_dependency(%q<ollama-ruby>.freeze, ["~> 1.23".freeze])
-  s.add_runtime_dependency(%q<documentrix>.freeze, [">= 0.6.0".freeze])
+  s.add_runtime_dependency(%q<documentrix>.freeze, [">= 0.7.0".freeze])
   s.add_runtime_dependency(%q<unix_socks>.freeze, [">= 0.4".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/commands_spec.rb

@@ -411,11 +411,11 @@ describe OllamaChat::Commands, protect_env: true do
       end
 
       it 'returns "success" when input is "/input embedding -p (.+)"' do
-        expect(chat).to receive(:embed).
-          with(asset_pathname('example.rb'), tags: nil).
-          and_return 'success'
-        expect(chat.handle_input("/input embedding -a -p #{asset('*.rb')}")).
-          to match(/success/)
+        expect(chat).to receive(:bulk_embed_sources).
+          with(anything).
+          and_return [ 'success' ]
+        expect(chat.handle_input("/input embedding -a -p #{asset('*.rb')}"))
+          .to eq [ 'success' ]
       end
 
       it 'returns :next when input is "/input embedding"' do

data/spec/ollama_chat/input_content_spec.rb

@@ -97,5 +97,15 @@ describe OllamaChat::InputContent do
         and_return(nil)
       expect(chat.context_spook(nil)).to be_nil
     end
+
+    it 'returns the serialized context instead of nil' do
+      patterns = ['spec/assets/example.rb']
+      expect(STDOUT).to receive(:puts).with(/Ingesting context now/)
+      result = chat.context_spook(patterns, all: true)
+      expect(result).to be_a(String)
+      json     = JSON.parse(result)
+      expected = Pathname.new('spec/assets/example.rb').expand_path.to_path
+      expect(json['files'].keys).to include(expected)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ollama_chat
 version: !ruby/object:Gem::Version
-  version: 0.0.118
+  version: 0.0.119
 platform: ruby
 authors:
 - Florian Frank
@@ -169,14 +169,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: unix_socks
   requirement: !ruby/object:Gem::Requirement