ollama_chat 0.0.99 → 0.0.100

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0818076703ebd6e8d8babbe5898a6a0069863ce7cebf18658f70e8d4b5592c51'
-  data.tar.gz: 7e9f768d41bff3560c2d22ac20ace84da0b580b3b17f8f9d1ffd3522af5d8db1
+  metadata.gz: 436406ccfaa267c8996e6986759b3f79773ad8b48127ed8b7f7bd749b8c82dd1
+  data.tar.gz: f2a66b87ebc221adf19e382568979f57baabfabef49929e123bbe0cc1932916d
 SHA512:
-  metadata.gz: 4864950b3246106793b51ffe74e3ead6dad4683f1b9fcaf710bf7f672264c646dc90dacdbcef437725b725230b8d0b70938045729ca982c83845ebce41bb773d
-  data.tar.gz: 5b99426668efc34bbb89a17faf2dcf016c1a6ada4c69d44882ebb40bcb836907741f96b5fb66ee99ea75b78abbdd34069ddbc186d525acd015302bcea95e55a7
+  metadata.gz: 576fc144f38595bec62043b30c170dc65a2bb891df41ab36bdd1b4bef2ad32dbe0b72b413d0e0f785604c0c0e3add5ca847e6da25144011518d67241b7fb8771
+  data.tar.gz: e3c808321e651a55bdf29326d41150700bcd2c8b28d4b2b407c49fdd6aff156e4e4d8555eafb1cf10c46589e44963714dafea95f667305c4173e788cd514da7f

data/CHANGES.md

@@ -1,5 +1,76 @@
 # Changes
 
+## 2026-07-23 v0.0.100
+
+### New Features
+
+- **UUID v7 Integration**: Implemented a compatibility shim via
+  `OllamaChat::UUIDV7.generate` that utilizes native `SecureRandom.uuid_v7` for
+  Ruby **3.3**+ and a custom RFC 9562 compliant implementation for older
+  versions.
+- **Document Parsing & Embeddings**:
+    - Added EPUB support using `pandoc` via the `epub_read` method and updated
+      `parse_source` to handle `application/epub+zip`.
+    - Enhanced retrieval precision by prepending source identifiers to document
+      chunks in `embed_source`.
+- **Structured Logging**: Implemented a JSON formatter in `OllamaChat::Logging`
+  with a `data:` keyword argument for structured context, including separate
+  capture of backtraces and tool execution details.
+- **Prompt Management Refactor**: 
+    - Unified prompt API using a `context:` keyword argument across `prompt`,
+      `each_prompt`, `delete_prompt`, `store_prompt`, and `write_prompt`.
+    - Introduced dynamic context parameters (defaulting to `'prompt'`) and
+      restructured `default_config.yml` to nest prompts under `prompt:`,
+      `suggest:`, and `system:`.
+    - Promoted `/suggest` to a top-level command and simplified the `/system`
+      command.
+- **Conversation Grouping**: Introduced `group_uuid` in `OllamaChat::Message`
+  to enable conversation grouping, including a `repair_group_uuids` method in
+  `OllamaChat::SessionManagement` for legacy data migration.
+- **Tool Enhancements**:
+    - **`read_file`**: Added support for line numbering via the `line_numbers`
+      parameter and range extraction using `start_line` and `end_line`. Now
+      returns total `line_count` and file `mtime` in ISO8601 format.
+    - **`patch_file`**: Refactored to support coordinate-based patching via an
+      `edits` parameter for targeted line-range replacements, including overlap
+      detection and freshness checks using `mtime`.
+    - **`generate_password`**: Added `base64url` alphabet support and critical
+      security warnings to discourage the use of `eval_ruby` for secret
+      generation.
+
+### Improvements & Refactoring
+
+- **CLI & UX**:
+    - Refactored command help strings with emoji prefixes and a more concise,
+      scannable multi-line format using heredocs.
+    - Added a welcome message upon startup displaying the version, connected
+      server version, and URL via `print_welcome`.
+    - Standardized the creation workflow for prompts and personae with a source
+      selection menu (`[CLIPBOARD]`, `[FILES]`, `[EMPTY/MANUAL]`).
+- **Application Flow**: 
+    - Implemented `OllamaChatQuitError` to handle graceful application
+      shutdowns via exception-based control flow.
+    - Added a `[QUIT-APP]` option to the session chooser after deletion.
+- **Internal Logic**:
+    - Optimized `ps_read` by replacing manual read loops with `IO.copy_stream`.
+    - Centralized Ollama chat request logging through a new `call_ollama_chat`
+      wrapper.
+    - Refactored model option reconfiguration into a dedicated
+      `reconfigure_model_options` method in
+      `lib/ollama_chat/model_handling.rb`.
+    - Updated dependencies: `ollama-ruby` to **1.23** and `tins` to **1.54**.
+
+### Bug Fixes & Stability
+
+- Added error logging (`chat.log(:error, e)`) to the `rescue` blocks of all 33
+  tool execution methods.
+- Fixed a typo in the Ghostscript error message within `ps_read`.
+- Added defensive handling for `JSON.load` results in `model_handling.rb` using
+  `.full? || {}` to prevent `nil` propagation.
+- Removed implicit fallbacks to the last assistant response in
+  `copy_to_clipboard` and `paste_into_editor`, making `text` a required
+  parameter.
+
 ## 2026-07-13 v0.0.99
 
 ### Changed

data/Rakefile

@@ -39,7 +39,7 @@ GemHadar do
   )
 
   dependency             'excon',                 '~> 1.0'
-  dependency             'ollama-ruby',           '~> 1.22'
+  dependency             'ollama-ruby',           '~> 1.23'
   dependency             'documentrix',           '>= 0.6.0'
   dependency             'unix_socks',            '>= 0.4'
   dependency             'rss',                   '~> 0.3'
@@ -49,7 +49,7 @@ GemHadar do
   dependency             'reverse_markdown',      '~> 3.0'
   dependency             'kramdown-ansi',         '~> 0.5'
   dependency             'complex_config',        '~> 0.22', '>= 0.22.2'
-  dependency             'tins',                  '~> 1.53'
+  dependency             'tins',                  '~> 1.55'
   dependency             'search_ui',             '>= 0.2'
   dependency             'amatch',                '~> 0.4'
   dependency             'pdf-reader',            '~> 2.0'

data/lib/ollama_chat/chat.rb

@@ -116,6 +116,7 @@ class OllamaChat::Chat
     else
       messages.read_conversation_jsonl(session.messages.to_s)
     end
+    repair_group_uuids
     embedding_enabled.set(config.embedding.enabled && !@opts[?E])
     @documents            = setup_documents
     @cache                = setup_cache
@@ -124,7 +125,6 @@ class OllamaChat::Chat
     @tool_call_results    = Hash.new { |h, name| h[name] = [] }
     setup_personae_directory
     @opts[?S] and init_server_socket
-    info_session
   rescue ComplexConfig::AttributeMissing, ComplexConfig::ConfigurationSyntaxError => e
     fix_config(e)
   end
@@ -183,6 +183,7 @@ class OllamaChat::Chat
     setup_persona_from_session
     setup_system_prompt
 
+    print_welcome
     info_session
 
     STDOUT.puts "\nType /help to display the chat help."
@@ -255,7 +256,7 @@ class OllamaChat::Chat
       ),
     ]
 
-    content = ollama.chat(
+    content = call_ollama_chat(
       model:    @model,
       messages: ,
       options:  model_options,
@@ -265,22 +266,33 @@ class OllamaChat::Chat
     )&.message&.content.to_s
 
     if content.empty?
-      log(
-        :warn,
-        "Sent #{prompt.inspect} to LLM for generation, received no content!"
-      )
+      log(:warn, "LLM generation returned empty content", data: { prompt: })
     else
-      log(
-        :info,
-        "Sent #{prompt.inspect} to LLM for generation, received #{content.inspect}"
-      )
+      log(:info, "LLM generation successful", data: { prompt:, content: })
     end
 
     content
   end
 
+  # Returns a human-readable string representation of the Chat object,
+  # including the class name and the base URL.
+  #
+  # @return [String] the inspected string
+  def inspect
+    "#<#{self.class}: #{base_url.to_s}>"
+  end
+
   private
 
+  # Wrapper for ollama.chat to provide consistent logging of all arguments.
+  #
+  # @param opts [Hash] keyword arguments for the chat call
+  # @param block [Proc] optional handler block
+  def call_ollama_chat(**opts, &block)
+    log(:info, "Ollama chat request", data: { opts: })
+    ollama.chat(**opts, &block)
+  end
+
   # @return [Module] The module containing the database models.
   def models
     OllamaChat::Database::Models
@@ -328,6 +340,14 @@ class OllamaChat::Chat
   # @param prefill_prompt [String, nil] The text to prefill, or nil to clear it
   attr_writer :prefill_prompt
 
+  # Signals a graceful shutdown of the application.
+  #
+  # Raises {OllamaChat::OllamaChatQuitError} which is caught by the main
+  # interaction loop to terminate the session cleanly.
+  def quit_app
+    raise OllamaChat::OllamaChatQuitError
+  end
+
   # Handles user input commands and processes chat interactions.
   #
   # @param content [String] The input content to process
@@ -397,10 +417,11 @@ class OllamaChat::Chat
   def interact_with_user
     loop do
       content           = nil
+      group_uuid        = OllamaChat::UUIDV7.generate
       tools_were_called = false
       enable_content_parsing
-      type              = :terminal_input
-      input_prompt      = bold { color(172) { message_type(@images) + " user" } } + bold { "> " }
+      type         = :terminal_input
+      input_prompt = bold { color(172) { message_type(@images) + " user" } } + bold { "> " }
       begin
         tools_were_called = handle_tool_call_results? { |index, tool_name, content|
           messages << OllamaChat::Message.new(
@@ -408,7 +429,8 @@ class OllamaChat::Chat
             sender_name: tool_name,
             tool_name:   ,
             content:     ,
-            images:      @images.dup
+            images:      @images.dup,
+            group_uuid:
           )
         }
         tools_were_called and type = :tool_input
@@ -444,8 +466,6 @@ class OllamaChat::Chat
           next
         when :redo
           redo
-        when :return
-          return
         when String
           content = next_action
         end
@@ -458,6 +478,14 @@ class OllamaChat::Chat
 
         parse_content? and content = parse_content(content, @images)
 
+        messages << OllamaChat::Message.new(
+          role:        'user',
+          sender_name: user_name,
+          content:     ,
+          images:      @images.dup,
+          group_uuid:
+        )
+
         if runtime_info.on?
           tool_name = 'runtime_information'
           messages << OllamaChat::Message.new(
@@ -465,22 +493,17 @@ class OllamaChat::Chat
             tool_name:   ,
             sender_name: tool_name,
             content:     dynamic_runtime_information,
-            images:      @images.dup
+            images:      @images.dup,
+            group_uuid:
           )
         end
-
-        messages << OllamaChat::Message.new(
-          role:        'user',
-          sender_name: user_name,
-          content:     ,
-          images:      @images.dup
-        )
       end
       @images.clear
       handler = OllamaChat::FollowChat.new(
         chat:     self,
         messages:,
-        voice:    (voices.selected if voice.on?)
+        voice:    (voices.selected if voice.on?),
+        group_uuid:
       )
       begin
         retried = false
@@ -493,7 +516,7 @@ class OllamaChat::Chat
           }
         end
         prepare_model(@model)
-        ollama.chat(
+        call_ollama_chat(
           model:    @model,
           messages: sent_messages,
           options:  model_options,
@@ -534,6 +557,8 @@ class OllamaChat::Chat
       self.server_socket_message = nil
     end
     0
+  rescue OllamaChat::OllamaChatQuitError
+    STDOUT.puts "Goodbye."
   rescue ComplexConfig::AttributeMissing, ComplexConfig::ConfigurationSyntaxError => e
     log(:error, e)
     fix_config(e)
@@ -572,7 +597,7 @@ class OllamaChat::Chat
     if server_version.version < '0.9.0'.version
       raise 'require ollama API version 0.9.0 or higher'
     end
-    log(:info, "Connection to #{base_url} established.")
+    log(:info, "Connection established", data: { base_url: })
     @ollama
   end