ollama_chat 0.0.55 → 0.0.56

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2e00c933dc3118c04db47cbe4361fadcc500004a4f5ddd5aded07cea3bf6119
-  data.tar.gz: 5b959cdf55031620153e8176f69aaa1bb815872a03d8e1ae172fcc0e4b3d2977
+  metadata.gz: 683c0bf5fdb8756030c0c5b69767d95f8ae852094a0048cb61b4cf7166f6a045
+  data.tar.gz: 8e7f9022cfd1e9c32f987b76196222d346100cd5ceaa6d59e6dc5c30257e5dbb
 SHA512:
-  metadata.gz: ba54894c682fec7e4c3756d6875eb0644b0104a8affcb95b6b55d15416998ffdf667e8e308c21fb04a5191a67a646d7c4d11a2a0516fa20d122e25d825f00d62
-  data.tar.gz: e0590805be446b6512ff0fbe3e44e960360be18681e9cd557de20bda2f2c8b44cd59e96059a62bdca4db311a6dcdcf3cb7c0e710e3e56570ba980e3e20dc7948
+  metadata.gz: 854af0ea07ced05e3f2f36741dd98592a2f6968e3307662e10c14bcb9a10b2168a1dde962de32f44e73719d177547cbccd8eee76c0554878a0de7ce2e1811772
+  data.tar.gz: 86b71f7b0748be19d0f772213b1a21ea8c7f838296bcd48348076ef39372e0a0f07db20c59a1c1b56f8a7592d100993a7ffa6b6507b4febbbca2977f0375baff

data/CHANGES.md

@@ -1,5 +1,32 @@
 # Changes
 
+## 2026-01-17 v0.0.56
+
+- Updated `context_spook` dependency from version **1.4** to **1.5**
+- Expanded context file inclusion to support YAML files
+- Updated `context_spook` method to pass `format` parameter to
+  `ContextSpook::generate_context` calls
+    - Added `context` section to default configuration with `format: JSON` setting
+- Added `/reconnect` command to reset Ollama connection
+    - Introduced `connect_ollama` method to create new Ollama client instances with
+      current configuration
+    - Added `base_url` method to resolve connection URL from command-line or
+      environment config
+    - Updated `handle_input` to process `/reconnect` command and trigger
+      reconnection
+- Enhanced `OllamaChat::InputContent#input` method to select and read multiple
+  files matching a glob pattern
+    - Updated `OllamaChat::InputContent#choose_filename` to accept a `chosen`
+      parameter for tracking selections
+    - Modified test cases in `spec/ollama_chat/input_content_spec.rb` to verify
+      multiple file selection behavior
+    - Files are now concatenated with filename headers in the output
+    - Maintains backward compatibility with single file selection
+    - Uses `Set` for efficient duplicate prevention during selection
+- Removed specialized CSV parsing functionality from `OllamaChat::Parsing`
+  module
+- Handle nil from `STDIN.gets` to prevent `NoMethodError`
+
 ## 2026-01-08 v0.0.55
 
 - Added `OllamaChat::Vim` class for inserting text into Vim buffers using the

data/README.md

@@ -151,6 +151,7 @@ subject - the young, blue-eyed cat.
 The following commands can be given inside the chat, if prefixed by a `/`:
 
 ```
+/reconnect                      reconnect to current ollama server
 /copy                           to copy last response to clipboard
 /paste                          to paste content
 /markdown                       toggle markdown output

data/Rakefile

@@ -58,7 +58,7 @@ GemHadar do
   dependency             'bigdecimal',            '~> 3.1'
   dependency             'csv',                   '~> 3.0'
   dependency             'const_conf',            '~> 0.3'
-  dependency             'context_spook',         '~> 1.1'
+  dependency             'context_spook',         '~> 1.5'
   development_dependency 'all_images',            '~> 0.6'
   development_dependency 'rspec',                 '~> 3.2'
   development_dependency 'kramdown',              '~> 2.0'

data/lib/ollama_chat/chat.rb

@@ -88,15 +88,7 @@ class OllamaChat::Chat
     @ollama_chat_config = OllamaChat::OllamaChatConfig.new(@opts[?f])
     self.config         = @ollama_chat_config.config
     setup_switches(config)
-    base_url         = @opts[?u] || OllamaChat::EnvConfig::OLLAMA::URL
-    @ollama          = Ollama::Client.new(
-      connect_timeout: config.timeouts.connect_timeout?,
-      read_timeout:    config.timeouts.read_timeout?,
-      write_timeout:   config.timeouts.write_timeout?,
-      base_url:        base_url,
-      debug:           ,
-      user_agent:
-    )
+    @ollama = connect_ollama
     if server_version.version < '0.9.0'.version
       raise ArgumentError, 'require ollama API version 0.9.0 or higher'
     end
@@ -213,6 +205,11 @@ class OllamaChat::Chat
   #   the content to be processed, or nil for no action needed
   def handle_input(content)
     case content
+    when %r(^/reconnect)
+      STDERR.print green { "Reconnecting to ollama #{base_url.to_s.inspect}…" }
+      @ollama = connect_ollama
+      STDERR.puts green { " Done." }
+      :next
     when %r(^/copy$)
       copy_to_clipboard
       :next
@@ -680,6 +677,21 @@ class OllamaChat::Chat
 
   private
 
+  def base_url
+    @opts[?u] || OllamaChat::EnvConfig::OLLAMA::URL
+  end
+
+  def connect_ollama
+    Ollama::Client.new(
+      connect_timeout: config.timeouts.connect_timeout?,
+      read_timeout:    config.timeouts.read_timeout?,
+      write_timeout:   config.timeouts.write_timeout?,
+      base_url:        base_url,
+      debug:           ,
+      user_agent:
+    )
+  end
+
   # The setup_documents method initializes the document processing pipeline by
   # configuring the embedding model and database connection.
   # It then loads specified documents into the system and returns the

data/lib/ollama_chat/dialog.rb

@@ -76,7 +76,7 @@ module OllamaChat::Dialog
   # @return [ String ] the user's response with trailing newline removed
   def ask?(prompt:)
     print prompt
-    STDIN.gets.chomp
+    STDIN.gets.to_s.chomp
   end
 
   # The choose_collection method presents a menu to select or create a document

data/lib/ollama_chat/information.rb

@@ -118,6 +118,7 @@ module OllamaChat::Information
   # interface.
   private def display_chat_help_message
     <<~EOT
+      /reconnect                      reconnect to current ollama server
       /copy                           to copy last response to clipboard
       /paste                          to paste content
       /markdown                       toggle markdown output

data/lib/ollama_chat/input_content.rb

@@ -8,35 +8,40 @@ require 'tempfile'
 # interactive file selection and context collection for enhancing chat
 # interactions with local or remote content.
 module OllamaChat::InputContent
-  # The input method reads and returns the content of a selected file.
+  # The input method selects and reads content from files matching a pattern.
   #
-  # This method searches for files matching the given pattern and presents them
-  # in an interactive chooser menu. If a file is selected, its content is read
-  # and returned. If the user chooses to exit or no file is selected, the
-  # method returns nil.
+  # This method prompts the user to select files matching the given glob
+  # pattern, reads their content, and returns a concatenated string with each
+  # file's content preceded by its filename.
   #
-  # @param pattern [ String ] the glob pattern to search for files (defaults to '**/*')
+  # @param pattern [String] the glob pattern to search for files (defaults to '**/*')
   #
-  # @return [ String, nil ] the content of the selected file or nil if no file
-  #   was chosen
+  # @return [String] a concatenated string of file contents with filenames as headers
   def input(pattern)
     pattern ||= '**/*'
-    if filename = choose_filename(pattern)
-      File.read(filename)
+    files = Set[]
+    while filename = choose_filename(pattern, chosen: files)
+      files << filename
     end
+    result = ''
+    files.each do |filename|
+      result << ("%s:\n\n%s\n\n" % [ filename, File.read(filename) ])
+    end
+    result.full?
   end
 
-  # The choose_filename method selects a file from a list of matching files.
-  #
-  # This method searches for files matching the given glob pattern, presents
-  # them in an interactive chooser menu, and returns the selected filename. If
-  # the user chooses to exit or no file is selected, the method returns nil.
+  # The choose_filename method selects a file from a list of matching files. It
+  # searches for files matching the given pattern, excludes already chosen
+  # files, and presents them in an interactive chooser menu.
   #
-  # @param pattern [ String ] the glob pattern to search for files (defaults to '**/*')
+  # @param pattern [ String ] the glob pattern to search for files
+  # @param chosen [ Set ] a set of already chosen filenames to exclude from
+  #   selection
   #
-  # @return [ String, nil ] the path to the selected file or nil if no file was chosen
-  def choose_filename(pattern)
-    files = Dir.glob(pattern).select { File.file?(_1) }
+  # @return [ String, nil ] the selected filename or nil if no file was chosen or user exited
+  def choose_filename(pattern, chosen: nil)
+    files = Dir.glob(pattern).reject { chosen&.member?(_1) }.
+      select { File.file?(_1) }
     files.unshift('[EXIT]')
     case chosen = OllamaChat::Utils::Chooser.choose(files)
     when '[EXIT]', nil
@@ -75,8 +80,9 @@ module OllamaChat::InputContent
   # @example Load default context
   #   context_spook(nil)
   def context_spook(patterns)
+    format = config.context.format
     if patterns
-      ContextSpook::generate_context(verbose: true) do |context|
+      ContextSpook::generate_context(verbose: true, format:) do |context|
         context do
           Dir.glob(patterns).each do |filename|
             File.file?(filename) or next
@@ -86,7 +92,7 @@ module OllamaChat::InputContent
       end.to_json
     else
       if context_filename = choose_filename('.contexts/*.rb')
-        ContextSpook.generate_context(context_filename, verbose: true).to_json
+        ContextSpook.generate_context(context_filename, verbose: true, format:).to_json
       end
     end
   end

data/lib/ollama_chat/ollama_chat_config/default_config.yml

@@ -43,6 +43,8 @@ stream: true
 document_policy: importing
 think: false
 think_loud: true
+context:
+  format: JSON
 embedding:
   enabled: true
   paused: false

data/lib/ollama_chat/parsing.rb

@@ -30,8 +30,6 @@ module OllamaChat::Parsing
       end
       source_io.rewind
       source_io.read
-    when 'text/csv'
-      parse_csv(source_io)
     when 'application/rss+xml'
       parse_rss(source_io)
     when 'application/atom+xml'

data/lib/ollama_chat/version.rb

@@ -1,6 +1,6 @@
 module OllamaChat
   # OllamaChat version
-  VERSION         = '0.0.55'
+  VERSION         = '0.0.56'
   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.55 ruby lib
+# stub: ollama_chat 0.0.56 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama_chat".freeze
-  s.version = "0.0.55".freeze
+  s.version = "0.0.56".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -18,13 +18,13 @@ Gem::Specification.new do |s|
   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.2".freeze)
-  s.rubygems_version = "4.0.2".freeze
+  s.rubygems_version = "4.0.3".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/input_content_spec.rb".freeze, "spec/ollama_chat/kramdown_ansi_spec.rb".freeze, "spec/ollama_chat/message_editing_spec.rb".freeze, "spec/ollama_chat/message_list_spec.rb".freeze, "spec/ollama_chat/message_output_spec.rb".freeze, "spec/ollama_chat/model_handling_spec.rb".freeze, "spec/ollama_chat/parsing_spec.rb".freeze, "spec/ollama_chat/redis_cache_spec.rb".freeze, "spec/ollama_chat/server_socket_spec.rb".freeze, "spec/ollama_chat/source_fetching_spec.rb".freeze, "spec/ollama_chat/switches_spec.rb".freeze, "spec/ollama_chat/think_control_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/vim_spec.rb".freeze, "spec/ollama_chat/web_searching_spec.rb".freeze, "spec/spec_helper.rb".freeze]
 
   s.specification_version = 4
 
-  s.add_development_dependency(%q<gem_hadar>.freeze, [">= 2.16.3".freeze])
+  s.add_development_dependency(%q<gem_hadar>.freeze, [">= 2.17.0".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])
@@ -50,5 +50,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<bigdecimal>.freeze, ["~> 3.1".freeze])
   s.add_runtime_dependency(%q<csv>.freeze, ["~> 3.0".freeze])
   s.add_runtime_dependency(%q<const_conf>.freeze, ["~> 0.3".freeze])
-  s.add_runtime_dependency(%q<context_spook>.freeze, ["~> 1.1".freeze])
+  s.add_runtime_dependency(%q<context_spook>.freeze, ["~> 1.5".freeze])
 end

data/spec/ollama_chat/chat_spec.rb

@@ -28,6 +28,11 @@ describe OllamaChat::Chat, protect_env: true do
   describe 'handle_input' do
     connect_to_ollama_server
 
+    it 'returns :next when input is "/reconnect"' do
+      expect(chat).to receive(:connect_ollama).and_return double('ollama')
+      expect(chat.handle_input("/reconnect")).to eq :next
+    end
+
     it 'returns :next when input is "/copy"' do
       expect(chat).to receive(:copy_to_clipboard)
       expect(chat.handle_input("/copy")).to eq :next

data/spec/ollama_chat/input_content_spec.rb

@@ -9,9 +9,12 @@ describe OllamaChat::InputContent do
 
   describe '#input' do
     it 'can read content from a selected file' do
+      selected_filename = 'spec/assets/example.rb'
       # Mock the file selection process
-      expect(chat).to receive(:choose_filename).with('**/*').
-        and_return('spec/assets/example.rb')
+      expect(chat).to receive(:choose_filename).with('**/*', chosen: Set[]).
+        and_return(selected_filename)
+      expect(chat).to receive(:choose_filename).with('**/*', chosen: Set[selected_filename]).
+        and_return nil
 
       # Test that it returns the file content
       result = chat.input(nil)
@@ -19,13 +22,19 @@ describe OllamaChat::InputContent do
     end
 
     it 'returns nil when no file is selected' do
-      expect(chat).to receive(:choose_filename).with('**/*').and_return(nil)
+      expect(chat).to receive(:choose_filename).with('**/*', chosen: Set[]).
+        and_return(nil)
       expect(chat.input(nil)).to be_nil
     end
 
     it 'can read content with specific pattern' do
-      expect(chat).to receive(:choose_filename).with('spec/assets/*').
-        and_return('spec/assets/example.rb')
+      selected_filename = 'spec/assets/example.rb'
+      expect(chat).to receive(:choose_filename).
+        with('spec/assets/*', chosen: Set[]).
+        and_return(selected_filename)
+      expect(chat).to receive(:choose_filename).
+        with('spec/assets/*', chosen: Set[selected_filename]).
+        and_return nil
       result = chat.input('spec/assets/*')
       expect(result).to include('puts "Hello World!"')
     end

data/spec/ollama_chat/parsing_spec.rb

@@ -49,24 +49,7 @@ describe OllamaChat::Parsing do
         def io.content_type
           'text/csv'
         end
-        expect(chat.parse_source(io)).to eq(<<EOT)
-  name: John Doe
-  age: 32
-  occupation: Software Engineer
-
-  name: Jane Smith
-  age: 28
-  occupation: Marketing Manager
-
-  name: Bob Johnson
-  age: 45
-  occupation: Retired
-
-  name: Alice Brown
-  age: 25
-  occupation: Student
-
-EOT
+        expect(chat.parse_source(io)).to eq(asset_content('example.csv'))
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ollama_chat
 version: !ruby/object:Gem::Version
-  version: 0.0.55
+  version: 0.0.56
 platform: ruby
 authors:
 - Florian Frank
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.16.3
+        version: 2.17.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.16.3
+        version: 2.17.0
 - !ruby/object:Gem::Dependency
   name: all_images
   requirement: !ruby/object:Gem::Requirement
@@ -385,14 +385,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.5'
 description: |
   The app provides a command-line interface (CLI) to an Ollama AI model,
   allowing users to engage in text-based conversations and generate
@@ -547,7 +547,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.2
+rubygems_version: 4.0.3
 specification_version: 4
 summary: A command-line interface (CLI) for interacting with an Ollama AI model.
 test_files: