ollama_chat 0.0.84 → 0.0.85

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2439d1523f092997e86300083d46a0db7efcc3e2e6d4253c828ae83ae417043
-  data.tar.gz: 3e946c28dc28d5b6eacd948437dbede5f7160cdad4dca205d2b9fc7f57a0f5fe
+  metadata.gz: 4a9e61c3d789441bb11ee79fe2ec63f219cc8d938845a7dc6fe9c8f6d012d5bb
+  data.tar.gz: f453e609568a6df073fbaf865860fa1c919419b728c309ae0e19e97dc09d6b52
 SHA512:
-  metadata.gz: 8e06a5f8362fe5760eb063eb810041449d1faeec408e40c6d806621814f148818e06e1799452c0357add7d723c512c52bc04aab768166bf8c73e8fa923ebc6d1
-  data.tar.gz: 6194047eb8d4f3ef45b62df2d307e7f498e29b08566ea2061a73813ef1753a5554e41427f212b7381bd093b50806529ac2da255f02f35d0667dc62892984424f
+  metadata.gz: 24fadb41107daee4f625bb3d80743c8323624da545e6386b07ef25da5be3974afa2b0759a8db86d44eea04c9b156b92400e6a348d6bd9aae3dd71791939533bd
+  data.tar.gz: 7c43765e2da1f09781b6a8b0af70ea562cdec22fbdb4c92ab7f4eca033fdd3b9f79a55cbe3d7c3e91684c771a29cca95c76f26c44b7871cf9e142c3d0ca12179

data/CHANGES.md

@@ -1,5 +1,29 @@
 # Changes
 
+## 2026-03-29 v0.0.85
+
+- Added `list` and `rename` subcommands to the `/collection` command, allowing
+  users to display available collections and rename them via the
+  `rename_collection` method in `lib/ollama_chat/dialog.rb`.
+    - Enhanced the `/collection` command to be optional; running `/collection`
+      without arguments now displays collection statistics by invoking the
+      `collection_stats` method.
+    - Updated `README.md` to reflect new command options and adjusted help text for
+      the `/collection` command.
+    - Modified tests in `spec/ollama_chat/chat_spec.rb` to accommodate new command
+      options and collection handling.
+    - Adjusted `regexp` and `complete` configurations in `lib/ollama_chat/chat.rb`
+      for the `/collection` command.
+    - Updated the `documentrix` dependency from **0.0.4** to **0.1.0**.
+- Introduced progress feedback in `lib/ollama_chat/input_content.rb` within the
+  `provide_file_set_content` method, displaying `count/total` for batch
+  processing or just `count` for interactive mode.
+- Optimized persona loading logic to skip setting a default persona if the
+  conversation already contains messages, while retaining fallbacks from
+  command-line options for new conversations.
+- Fixed the warning condition in `OllamaChat::FollowChat` by correcting the
+  success check in `lib/ollama_chat/follow_chat.rb`.
+
 ## 2026-03-26 v0.0.84
 
 - Added `OllamaChat::Utils::ValueFormatter` with helper `format_bytes` in

data/README.md

@@ -209,8 +209,10 @@ The following commands can be given inside the chat, if prefixed by a `/`:
 ├──────────────────┼────────────────────┼──────────────────┼──────────────────────────────────────────────────────────┤
 │ /load            │                    │ path             │ load conversation messages                               │
 ├──────────────────┼────────────────────┼──────────────────┼──────────────────────────────────────────────────────────┤
-│ /collection      │ change﹡           │                  │ change (default) collection or clear                     │
-│                  │ clear﹡            │                  │                                                          │
+│ /collection      │ change             │                  │ display, clear (current), change, list, or rename        │
+│                  │ clear              │                  │ collection                                               │
+│                  │ list               │                  │                                                          │
+│                  │ rename             │                  │                                                          │
 ├──────────────────┼────────────────────┼──────────────────┼──────────────────────────────────────────────────────────┤
 │ /persona         │ add                │                  │ manage and load/play personae for roleplay               │
 │                  │ delete             │                  │                                                          │

data/Rakefile

@@ -42,7 +42,7 @@ GemHadar do
 
   dependency             'excon',                 '~> 1.0'
   dependency             'ollama-ruby',           '~> 1.21'
-  dependency             'documentrix',           '>= 0.0.4'
+  dependency             'documentrix',           '>= 0.1.0'
   dependency             'unix_socks',            '~> 0.3'
   dependency             'rss',                   '~> 0.3'
   dependency             'term-ansicolor',        '~> 1.11'

data/lib/ollama_chat/chat.rb

@@ -479,11 +479,12 @@ class OllamaChat::Chat
 
   command(
     name: :collection,
-    regexp: %r(^/collection(?:\s+(clear|change))?$),
-    complete: [ 'collection', %w[ clear change ] ],
-    help: 'change (default) collection or clear'
+    regexp: %r(^/collection(?:\s+(clear|change|list|rename))?$),
+    complete: [ 'collection', %w[ clear change list rename ] ],
+    optional: true,
+    help: 'display, clear (current), change, list, or rename collection'
   ) do |subcommand|
-    case subcommand || 'change'
+    case subcommand
     when 'clear'
       loop do
         tags = @documents.tags.add('[EXIT]').add('[ALL]')
@@ -509,6 +510,14 @@ class OllamaChat::Chat
       end
     when 'change'
       choose_collection(@documents.collection)
+    when 'list'
+      current_collection = @documents.collection
+      puts @documents.collections.
+        map { |c| current_collection == c ? bold { c } : c }
+    when 'rename'
+      rename_collection(@documents.collection)
+    when nil
+      collection_stats
     end
     :next
   end

data/lib/ollama_chat/dialog.rb

@@ -135,6 +135,27 @@ module OllamaChat::Dialog
     info
   end
 
+  # Rename an existing collection to a new, user‑supplied name.
+  #
+  # This helper prompts the user to provide a new name for the collection
+  # identified by <code>current_collection</code>. It then renames the current
+  # collection to have the new_name and switches to it.
+  #
+  # @param current_collection [Symbol] the current collection name
+  def rename_collection(current_collection)
+    prompt = 'Rename collection %s to: ' % current_collection
+    if new_collection = ask?(prompt:).full?(:to_sym)
+      begin
+        @documents.rename_collection(new_collection)
+        STDOUT.puts "Renamed current collection #{current_collection} to #{new_collection}."
+      rescue
+        STDERR.puts "Renaming to #{new_collection} failed, it already exists."
+      end
+    else
+      STDOUT.puts "Renaming cancelled."
+    end
+  end
+
   # The change_system_prompt method allows the user to select or enter a new
   # system prompt for the chat session.
   # It provides an interactive chooser when multiple prompts match the given

data/lib/ollama_chat/follow_chat.rb

@@ -185,7 +185,7 @@ class OllamaChat::FollowChat
                  end
       warn =
         begin
-          !!data.ask_and_send(:[], 'error') || data.ask_and_send(:[], 'success')
+          !!data.ask_and_send(:[], 'error') || data.ask_and_send(:[], 'success') == false
         rescue
           false
         end

data/lib/ollama_chat/input_content.rb

@@ -161,7 +161,16 @@ module OllamaChat::InputContent
   # @yield [filename] the block that processes each filename
   # @return [String] the concatenated result of the block applied to each file
   def provide_file_set_content(patterns, all: false, &block)
+    total = 0
+    all and file_set_each(patterns, all:) { total += 1 }
+    count = 0
     file_set_each(patterns, all:).each_with_object('') do |filename, result|
+      count += 1
+      if all
+        STDOUT.puts "Handling File (#{bold{count}}/#{bold{total}}):"
+      else
+        STDOUT.puts "Handling File (#{bold{count}}):"
+      end
       result << ("%s:\n\n%s\n\n" % [ filename, block.(filename) ])
     end.full?
   end

data/lib/ollama_chat/personae_management.rb

@@ -40,7 +40,7 @@ module OllamaChat::PersonaeManagement
   # playing the persona file if it exists.
   def setup_persona_from_opts
     @default_persona and return
-    @opts[?c] and return
+    @messages.size > 0 and return
     if persona = @opts[?p].full? { Pathname.new(_1) }
       if persona.extname == '.md'
         pathname = persona

data/lib/ollama_chat/version.rb

@@ -1,6 +1,6 @@
 module OllamaChat
   # OllamaChat version
-  VERSION         = '0.0.84'
+  VERSION         = '0.0.85'
   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.84 ruby lib
+# stub: ollama_chat 0.0.85 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama_chat".freeze
-  s.version = "0.0.84".freeze
+  s.version = "0.0.85".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.21".freeze])
-  s.add_runtime_dependency(%q<documentrix>.freeze, [">= 0.0.4".freeze])
+  s.add_runtime_dependency(%q<documentrix>.freeze, [">= 0.1.0".freeze])
   s.add_runtime_dependency(%q<unix_socks>.freeze, ["~> 0.3".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

@@ -1,6 +1,10 @@
 describe OllamaChat::Chat, protect_env: true do
+  let :collection do
+    "test-#{Random.hex}"
+  end
+
   let :argv do
-    chat_default_config(%w[ -C test ])
+    chat_default_config(%w[ -C ] << collection)
   end
 
   before do
@@ -153,6 +157,10 @@ describe OllamaChat::Chat, protect_env: true do
       expect(chat).to receive(:info)
       expect(STDOUT).to receive(:puts).with(/./)
       expect(chat.handle_input("/collection change")).to eq :next
+      expect(STDOUT).to receive(:puts).with(array_including(:default))
+      expect(chat.handle_input("/collection list")).to eq :next
+      expect(chat).to receive(:rename_collection).with(collection.to_sym)
+      expect(chat.handle_input("/collection rename")).to eq :next
     end
 
     it 'returns :next when input is "/info"' do
@@ -358,7 +366,7 @@ describe OllamaChat::Chat, protect_env: true do
     connect_to_ollama_server(instantiate: false)
 
     let :argv do
-      chat_default_config(%w[ -C test -c ] << asset('conversation.json'))
+      chat_default_config(%w[ -C ] << collection << '-c' << asset('conversation.json'))
     end
 
     it 'dispays the last exchange of the converstation' do
@@ -396,7 +404,7 @@ describe OllamaChat::Chat, protect_env: true do
     connect_to_ollama_server(instantiate: false)
 
       let :argv do
-        chat_default_config(%w[ -C test -D ] << asset('example.html'))
+        chat_default_config(%w[ -C ] << collection << '-D' << asset('example.html'))
       end
 
       it 'Adds documents passed to app via -D option' do
@@ -421,7 +429,7 @@ describe OllamaChat::Chat, protect_env: true do
     it 'can display collection_stats' do
       chat
       expect(STDOUT).to receive(:puts).with(
-        "Current Collection\n  Name: \e[1mtest\e[0m\n  #Embeddings: 0\n  #Tags: 0\n  Tags: \n"
+        "Current Collection\n  Name: \e[1m#{collection}\e[0m\n  #Embeddings: 0\n  #Tags: 0\n  Tags: \n"
       )
       expect(chat.collection_stats).to be_nil
     end

metadata

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