ollama_chat 0.0.147 → 0.0.148

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: c88561e1d4f3443a63e9cc410b7c43893029c1f3051474d1f592051578f3b7ca
4
- data.tar.gz: 49005ac04370d403fcd5b41ac996fa526f5b3f19c772cd820691f11504aef364
3
+ metadata.gz: 5367c4f665305ef1f89fa529f29a91d6df711cf93f66d8a4e738c9783ab8b242
4
+ data.tar.gz: c8b949cf02726f574077632f5887d5ac900cd41083004f00192e4c7db13025ae
5
5
  SHA512:
6
- metadata.gz: f278a4f5559cc4fdc51f4961e8c9574ff412c7d8db03285ce1581e2fa3b55b7d53ea30156652fedf0478c88d23a0ee4840eb2a7f8e2dadd39b40102bca37d6aa
7
- data.tar.gz: 67f9ed49399c796d11ea87b93aab73fc7a162a93584f9703259e8d8278018bb0e62d874ced85db940fb62906e1c541cbace82f7c37613ec55b83cd40fb511329
6
+ metadata.gz: 444ee4f8219cb515fa9af8e3dc94a4cabf1b475dce88b61301b1b63a1a7e0bc987398e84229a76ddf1affe3e489e4885596db68f0d7f157df77c9fc73e474e10
7
+ data.tar.gz: 7de6bb1dd2d5d4dc318c60ee53a1c5a4ce34f3178fa771c21cb730efe8121d5c56bef15c4ccf9f9f781d29ac617d92f393302b9b415ba5acaf8634da1f6ca62d
data/CHANGES.md CHANGED
@@ -1,5 +1,38 @@
1
1
  # Changes
2
2
 
3
+ ## 2026-11-21 v0.0.148
4
+
5
+ ### Features
6
+
7
+ - Display byte and token estimates in file choosers
8
+ (`choose_multiple_filenames` and `choose_filename`) by wrapping `Pathname`
9
+ entries in `SearchUI::Wrapper` with a compact size annotation (e.g.,
10
+ `lib/foo.rb (12.4 KB · ~3.5 KT)`).
11
+
12
+ ### Fixes
13
+
14
+ - Use the graceful `paste_from_clipboard` wrapper instead of
15
+ `perform_paste_from_clipboard` in `/persona import` and `/prompt edit`
16
+ command handlers to prevent unhandled exceptions when the clipboard is empty
17
+ or the paste command is missing.
18
+
19
+ ### Improvements
20
+
21
+ - Broaden the `json` gem dependency constraint to `>= 2.0, < 4` for future
22
+ compatibility.
23
+ - Modernize dependency declarations in the gemspec using string interpolation
24
+ syntax.
25
+
26
+ ### Build & CI
27
+
28
+ - Upgrade `rubygems_version` dependency to **4.1.0**.
29
+ - Increase `gem_hadar` dev dependency minimum to **2.26.1**.
30
+
31
+ ### Testing
32
+
33
+ - Relax the `choose_filename` spec to capture presented entries and assert on
34
+ their `.value`, decoupling the test from display formatting.
35
+
3
36
  ## 2026-11-18 v0.0.147
4
37
 
5
38
  ### Improvements
data/Rakefile CHANGED
@@ -38,7 +38,7 @@ GemHadar do
38
38
  'static.yml' => {}
39
39
  )
40
40
 
41
- dependency 'json', '~> 2.0'
41
+ dependency 'json', '>= 2.0', '< 4'
42
42
  dependency 'json-generic_object', '>= 0.2.0'
43
43
  dependency 'excon', '~> 1.0'
44
44
  dependency 'ollama-ruby', '~> 1.27'
@@ -127,14 +127,20 @@ module OllamaChat::Dialog
127
127
  patterns = Array(patterns).map { Pathname.new(_1).expand_path }
128
128
  files = patterns.flat_map { Pathname.glob(_1) }
129
129
  files = files.select { _1.file? }.uniq
130
+ entries = files.map do |f|
131
+ f_display = f.to_path.sub(/^#{File.expand_path('~')}/, ?~)
132
+ es = OllamaChat::TokenEstimator.estimate(f.size)
133
+ SearchUI::Wrapper.new(f, display:
134
+ "#{f_display} (#{es.bytes_formatted} · ~#{es.tokens_formatted})")
135
+ end
130
136
  result = choose_multi(
131
- %w[ [ALL] [NONE] ] + files,
137
+ %w[ [ALL] [NONE] ] + entries,
132
138
  all: '[ALL]',
133
139
  none: '[NONE]',
134
140
  prompt: 'Select files to import: %s ' \
135
141
  '[Tab=toggle, Enter=apply, C-c=abort]'
136
142
  )
137
- (result || []).to_set
143
+ (result || []).map { _1.respond_to?(:value) ? _1.value : _1 }.to_set
138
144
  end
139
145
 
140
146
  # Displays an info-level feedback message indicating that a connection
@@ -54,13 +54,19 @@ module OllamaChat::InputContent
54
54
  patterns = Array(patterns)
55
55
  files = patterns.flat_map { Pathname.glob(_1) }
56
56
  files = files.reject { chosen&.member?(_1.expand_path) }.select { _1.file? }
57
- files.unshift('[EXIT]')
58
- case chosen_file = choose_entry(files, prompt: 'Select a file to import: %s')
57
+ wrapped = files.map do |file|
58
+ f_display = file.to_path.sub(/^#{File.expand_path('~')}/, ?~)
59
+ es = OllamaChat::TokenEstimator.estimate(file.size)
60
+ SearchUI::Wrapper.new(file, display: "#{f_display} " \
61
+ "(#{es.bytes_formatted} · ~#{es.tokens_formatted})")
62
+ end
63
+ wrapped.unshift('[EXIT]')
64
+ case chosen = choose_entry(wrapped, prompt: 'Select a file to import: %s')
59
65
  when '[EXIT]', nil
60
66
  feedback("Exiting chooser.")
61
67
  return
62
68
  else
63
- Pathname.new(chosen_file)
69
+ Pathname.new(chosen.value.to_path)
64
70
  end
65
71
  end
66
72
 
@@ -219,7 +219,7 @@ module OllamaChat::PersonaeManagement
219
219
 
220
220
  content = case chosen_source
221
221
  when '[CLIPBOARD]'
222
- perform_paste_from_clipboard(edit: false)
222
+ paste_from_clipboard(edit: false) or return
223
223
  when '[FILES]'
224
224
  patterns = switch_history(:patterns) do
225
225
  ask?(
@@ -134,7 +134,7 @@ module OllamaChat::PromptManagement
134
134
 
135
135
  content = case chosen_source
136
136
  when '[CLIPBOARD]'
137
- perform_paste_from_clipboard(edit: false)
137
+ paste_from_clipboard(edit: false) or return
138
138
  when '[FILES]'
139
139
  patterns = switch_history(:patterns) do
140
140
  ask?(
@@ -5,7 +5,7 @@
5
5
  # by hand; it is rewritten on every `rake version` invocation.
6
6
  module OllamaChat
7
7
  # The current version of the OllamaChat gem as a String.
8
- VERSION = '0.0.147'
8
+ VERSION = '0.0.148'
9
9
  VERSION_ARRAY = VERSION.split('.').map(&:to_i) # :nodoc:
10
10
  VERSION_MAJOR = VERSION_ARRAY[0] # :nodoc:
11
11
  VERSION_MINOR = VERSION_ARRAY[1] # :nodoc:
data/ollama_chat.gemspec CHANGED
@@ -1,9 +1,9 @@
1
1
  # -*- encoding: utf-8 -*-
2
- # stub: ollama_chat 0.0.147 ruby lib
2
+ # stub: ollama_chat 0.0.148 ruby lib
3
3
 
4
4
  Gem::Specification.new do |s|
5
5
  s.name = "ollama_chat".freeze
6
- s.version = "0.0.147".freeze
6
+ s.version = "0.0.148".freeze
7
7
 
8
8
  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
9
9
  s.require_paths = ["lib".freeze]
@@ -18,44 +18,44 @@ Gem::Specification.new do |s|
18
18
  s.licenses = ["MIT".freeze]
19
19
  s.rdoc_options = ["--title".freeze, "OllamaChat - A command-line interface (CLI) for interacting with an Ollama AI model.".freeze, "--main".freeze, "README.md".freeze]
20
20
  s.required_ruby_version = Gem::Requirement.new(">= 3.2".freeze)
21
- s.rubygems_version = "4.0.24".freeze
21
+ s.rubygems_version = "4.1.0".freeze
22
22
  s.summary = "A command-line interface (CLI) for interacting with an Ollama AI model.".freeze
23
23
  s.test_files = ["spec/assets/example.rb".freeze, "spec/ollama_chat/asr_spec.rb".freeze, "spec/ollama_chat/chat_spec.rb".freeze, "spec/ollama_chat/clipboard_spec.rb".freeze, "spec/ollama_chat/collection_search_spec.rb".freeze, "spec/ollama_chat/command_concern_spec.rb".freeze, "spec/ollama_chat/commands_spec.rb".freeze, "spec/ollama_chat/compaction_spec.rb".freeze, "spec/ollama_chat/config_handling_spec.rb".freeze, "spec/ollama_chat/context_usage_spec.rb".freeze, "spec/ollama_chat/conversation_spec.rb".freeze, "spec/ollama_chat/database/models/favourite_spec.rb".freeze, "spec/ollama_chat/favourites_management_spec.rb".freeze, "spec/ollama_chat/file_editing_spec.rb".freeze, "spec/ollama_chat/follow_chat_spec.rb".freeze, "spec/ollama_chat/history_spec.rb".freeze, "spec/ollama_chat/http_handling_spec.rb".freeze, "spec/ollama_chat/information_spec.rb".freeze, "spec/ollama_chat/input_content_spec.rb".freeze, "spec/ollama_chat/invidious_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/message_spec.rb".freeze, "spec/ollama_chat/model_handling/model_cache_spec.rb".freeze, "spec/ollama_chat/model_handling_spec.rb".freeze, "spec/ollama_chat/parsing_spec.rb".freeze, "spec/ollama_chat/personae_management_spec.rb".freeze, "spec/ollama_chat/prompt_handling_spec.rb".freeze, "spec/ollama_chat/prompt_management_spec.rb".freeze, "spec/ollama_chat/rag_handling_spec.rb".freeze, "spec/ollama_chat/redis_cache_spec.rb".freeze, "spec/ollama_chat/server_socket_spec.rb".freeze, "spec/ollama_chat/session_management_spec.rb".freeze, "spec/ollama_chat/source_fetching_spec.rb".freeze, "spec/ollama_chat/speaker_spec.rb".freeze, "spec/ollama_chat/state_selectors_spec.rb".freeze, "spec/ollama_chat/switches_spec.rb".freeze, "spec/ollama_chat/system_prompt_management_spec.rb".freeze, "spec/ollama_chat/think_control_spec.rb".freeze, "spec/ollama_chat/token_estimator_spec.rb".freeze, "spec/ollama_chat/tool_call_processor_spec.rb".freeze, "spec/ollama_chat/tool_calling_spec.rb".freeze, "spec/ollama_chat/tools/browse_spec.rb".freeze, "spec/ollama_chat/tools/compute_bmi_spec.rb".freeze, "spec/ollama_chat/tools/concern_spec.rb".freeze, "spec/ollama_chat/tools/copy_to_clipboard_spec.rb".freeze, "spec/ollama_chat/tools/delete_file_spec.rb".freeze, "spec/ollama_chat/tools/execute_grep_spec.rb".freeze, "spec/ollama_chat/tools/execute_jira_twg_spec.rb".freeze, "spec/ollama_chat/tools/execute_ri_spec.rb".freeze, "spec/ollama_chat/tools/execute_shell_spec.rb".freeze, "spec/ollama_chat/tools/forget_spec.rb".freeze, "spec/ollama_chat/tools/generate_image_spec.rb".freeze, "spec/ollama_chat/tools/generate_password_spec.rb".freeze, "spec/ollama_chat/tools/get_current_weather_spec.rb".freeze, "spec/ollama_chat/tools/get_cve_spec.rb".freeze, "spec/ollama_chat/tools/get_endoflife_spec.rb".freeze, "spec/ollama_chat/tools/get_ghr_spec.rb".freeze, "spec/ollama_chat/tools/get_jira_issue_spec.rb".freeze, "spec/ollama_chat/tools/get_location_spec.rb".freeze, "spec/ollama_chat/tools/get_rfc_spec.rb".freeze, "spec/ollama_chat/tools/get_time_spec.rb".freeze, "spec/ollama_chat/tools/get_url_spec.rb".freeze, "spec/ollama_chat/tools/list_directory_spec.rb".freeze, "spec/ollama_chat/tools/lookup_gem_path_spec.rb".freeze, "spec/ollama_chat/tools/lookup_group_spec.rb".freeze, "spec/ollama_chat/tools/memorize_spec.rb".freeze, "spec/ollama_chat/tools/move_file_spec.rb".freeze, "spec/ollama_chat/tools/open_file_in_editor_spec.rb".freeze, "spec/ollama_chat/tools/paste_from_clipboard_spec.rb".freeze, "spec/ollama_chat/tools/paste_into_editor_spec.rb".freeze, "spec/ollama_chat/tools/patch_file_spec.rb".freeze, "spec/ollama_chat/tools/read_file_spec.rb".freeze, "spec/ollama_chat/tools/resolve_tag_spec.rb".freeze, "spec/ollama_chat/tools/roll_dice_spec.rb".freeze, "spec/ollama_chat/tools/run_tests_spec.rb".freeze, "spec/ollama_chat/tools/search_knowledge_spec.rb".freeze, "spec/ollama_chat/tools/search_web_spec.rb".freeze, "spec/ollama_chat/tools/write_file_spec.rb".freeze, "spec/ollama_chat/tts_spec.rb".freeze, "spec/ollama_chat/utils/analyze_directory_spec.rb".freeze, "spec/ollama_chat/utils/audio_player_spec.rb".freeze, "spec/ollama_chat/utils/cache_fetcher_spec.rb".freeze, "spec/ollama_chat/utils/excon_logger_spec.rb".freeze, "spec/ollama_chat/utils/fetcher_spec.rb".freeze, "spec/ollama_chat/utils/log_rotation_spec.rb".freeze, "spec/ollama_chat/utils/log_viewer_spec.rb".freeze, "spec/ollama_chat/utils/ordered_queue_spec.rb".freeze, "spec/ollama_chat/utils/path_completer_spec.rb".freeze, "spec/ollama_chat/utils/png_metadata_extractor_spec.rb".freeze, "spec/ollama_chat/vim_spec.rb".freeze, "spec/ollama_chat/web_searching_spec.rb".freeze, "spec/spec_helper.rb".freeze]
24
24
 
25
25
  s.specification_version = 4
26
26
 
27
- s.add_development_dependency(%q<gem_hadar>.freeze, [">= 2.24.1".freeze])
28
- s.add_development_dependency(%q<all_images>.freeze, ["~> 0.12".freeze])
29
- s.add_development_dependency(%q<rspec>.freeze, ["~> 3.2".freeze])
30
- s.add_development_dependency(%q<kramdown>.freeze, ["~> 2.0".freeze])
31
- s.add_development_dependency(%q<webmock>.freeze, [">= 0".freeze])
32
- s.add_development_dependency(%q<debug>.freeze, [">= 0".freeze])
33
- s.add_development_dependency(%q<simplecov>.freeze, [">= 0".freeze])
34
- s.add_development_dependency(%q<utils>.freeze, [">= 0".freeze])
35
- s.add_runtime_dependency(%q<json>.freeze, ["~> 2.0".freeze])
36
- s.add_runtime_dependency(%q<json-generic_object>.freeze, [">= 0.2.0".freeze])
37
- s.add_runtime_dependency(%q<excon>.freeze, ["~> 1.0".freeze])
38
- s.add_runtime_dependency(%q<ollama-ruby>.freeze, ["~> 1.27".freeze])
39
- s.add_runtime_dependency(%q<documentrix>.freeze, [">= 0.8.1".freeze])
40
- s.add_runtime_dependency(%q<unix_socks>.freeze, [">= 0.4".freeze])
41
- s.add_runtime_dependency(%q<rss>.freeze, ["~> 0.3".freeze])
42
- s.add_runtime_dependency(%q<term-ansicolor>.freeze, ["~> 1.11".freeze])
43
- s.add_runtime_dependency(%q<redis>.freeze, ["~> 5.0".freeze])
44
- s.add_runtime_dependency(%q<mime-types>.freeze, ["~> 3.0".freeze])
45
- s.add_runtime_dependency(%q<reverse_markdown>.freeze, ["~> 3.0".freeze])
46
- s.add_runtime_dependency(%q<kramdown-ansi>.freeze, ["~> 0.9".freeze])
47
- s.add_runtime_dependency(%q<complex_config>.freeze, ["~> 0.22".freeze, ">= 0.22.2".freeze])
48
- s.add_runtime_dependency(%q<tins>.freeze, ["~> 1.62".freeze])
49
- s.add_runtime_dependency(%q<search_ui>.freeze, [">= 0.4".freeze])
50
- s.add_runtime_dependency(%q<amatch>.freeze, ["~> 0.4".freeze])
51
- s.add_runtime_dependency(%q<pdf-reader>.freeze, ["~> 2.0".freeze])
52
- s.add_runtime_dependency(%q<bigdecimal>.freeze, ["~> 3.1".freeze])
53
- s.add_runtime_dependency(%q<csv>.freeze, ["~> 3.0".freeze])
54
- s.add_runtime_dependency(%q<const_conf>.freeze, ["~> 0.9".freeze])
55
- s.add_runtime_dependency(%q<context_spook>.freeze, ["~> 1.7".freeze])
56
- s.add_runtime_dependency(%q<infobar>.freeze, [">= 0.16.0".freeze])
57
- s.add_runtime_dependency(%q<rubyzip>.freeze, ["~> 3.0".freeze])
58
- s.add_runtime_dependency(%q<sequel>.freeze, ["~> 5.0".freeze])
59
- s.add_runtime_dependency(%q<file-tail>.freeze, ["~> 1.4".freeze])
60
- s.add_runtime_dependency(%q<nokogiri>.freeze, ["~> 1.0".freeze])
27
+ s.add_development_dependency("gem_hadar".freeze, [">= 2.26.1".freeze])
28
+ s.add_development_dependency("all_images".freeze, ["~> 0.12".freeze])
29
+ s.add_development_dependency("rspec".freeze, ["~> 3.2".freeze])
30
+ s.add_development_dependency("kramdown".freeze, ["~> 2.0".freeze])
31
+ s.add_development_dependency("webmock".freeze, [">= 0".freeze])
32
+ s.add_development_dependency("debug".freeze, [">= 0".freeze])
33
+ s.add_development_dependency("simplecov".freeze, [">= 0".freeze])
34
+ s.add_development_dependency("utils".freeze, [">= 0".freeze])
35
+ s.add_runtime_dependency("json".freeze, [">= 2.0".freeze, "< 4".freeze])
36
+ s.add_runtime_dependency("json-generic_object".freeze, [">= 0.2.0".freeze])
37
+ s.add_runtime_dependency("excon".freeze, ["~> 1.0".freeze])
38
+ s.add_runtime_dependency("ollama-ruby".freeze, ["~> 1.27".freeze])
39
+ s.add_runtime_dependency("documentrix".freeze, [">= 0.8.1".freeze])
40
+ s.add_runtime_dependency("unix_socks".freeze, [">= 0.4".freeze])
41
+ s.add_runtime_dependency("rss".freeze, ["~> 0.3".freeze])
42
+ s.add_runtime_dependency("term-ansicolor".freeze, ["~> 1.11".freeze])
43
+ s.add_runtime_dependency("redis".freeze, ["~> 5.0".freeze])
44
+ s.add_runtime_dependency("mime-types".freeze, ["~> 3.0".freeze])
45
+ s.add_runtime_dependency("reverse_markdown".freeze, ["~> 3.0".freeze])
46
+ s.add_runtime_dependency("kramdown-ansi".freeze, ["~> 0.9".freeze])
47
+ s.add_runtime_dependency("complex_config".freeze, ["~> 0.22".freeze, ">= 0.22.2".freeze])
48
+ s.add_runtime_dependency("tins".freeze, ["~> 1.62".freeze])
49
+ s.add_runtime_dependency("search_ui".freeze, [">= 0.4".freeze])
50
+ s.add_runtime_dependency("amatch".freeze, ["~> 0.4".freeze])
51
+ s.add_runtime_dependency("pdf-reader".freeze, ["~> 2.0".freeze])
52
+ s.add_runtime_dependency("bigdecimal".freeze, ["~> 3.1".freeze])
53
+ s.add_runtime_dependency("csv".freeze, ["~> 3.0".freeze])
54
+ s.add_runtime_dependency("const_conf".freeze, ["~> 0.9".freeze])
55
+ s.add_runtime_dependency("context_spook".freeze, ["~> 1.7".freeze])
56
+ s.add_runtime_dependency("infobar".freeze, [">= 0.16.0".freeze])
57
+ s.add_runtime_dependency("rubyzip".freeze, ["~> 3.0".freeze])
58
+ s.add_runtime_dependency("sequel".freeze, ["~> 5.0".freeze])
59
+ s.add_runtime_dependency("file-tail".freeze, ["~> 1.4".freeze])
60
+ s.add_runtime_dependency("nokogiri".freeze, ["~> 1.0".freeze])
61
61
  end
@@ -32,19 +32,22 @@ describe OllamaChat::InputContent do
32
32
 
33
33
  describe '#choose_filename' do
34
34
  it 'can select a file from matching patterns' do
35
- # Test with a pattern that matches existing files
36
35
  files = Pathname.glob('spec/assets/**/*.txt')
37
36
  expect(files).to_not be_empty
38
37
 
39
- # Mock the selection process
40
- expect(chat).to receive(:choose_entry).
41
- with(
42
- files.unshift('[EXIT]'),
43
- prompt: 'Select a file to import: %s',
44
- ).and_return(files[1])
38
+ # The picker surfaces size-annotated Wrappers; capture them and assert
39
+ # on the underlying values so the spec doesn't couple to the display.
40
+ presented = nil
41
+ allow(chat).to receive(:choose_entry) do |entries, **_opts|
42
+ presented = entries
43
+ entries[1] # return the first real entry (a Wrapper)
44
+ end
45
45
 
46
46
  result = chat.choose_filename('spec/assets/**/*.txt')
47
- expect(result).to eq Pathname.new(files[1])
47
+
48
+ expect(presented.first).to eq '[EXIT]'
49
+ expect(presented.drop(1).map(&:value)).to match_array(files)
50
+ expect(result).to be_a(Pathname)
48
51
  end
49
52
 
50
53
  it 'returns nil when user exits selection' do