ollama_chat 0.0.27 → 0.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2155f3ea224b97ac3a471848b53530b60308b685b21804a23138ce31e752891
-  data.tar.gz: f96db1b34a1d1a95bad394d6c0ac0ba43f7bc1c481344aa7d0d19565c4889149
+  metadata.gz: c4521bf944235fe5a3507f46e8c1ff8016faab3c178c2c8981d223c02c32ad1e
+  data.tar.gz: 8266fb46c588c5e456c00574a2c291b89da9aab453e8d33690a32c9b5e23762a
 SHA512:
-  metadata.gz: 6dfc776afc77a3cfdb3b5ab6d6d4d41e188345c15d4e8341495c00e90d4c03aefef4ac01af1d8ffae4b1a20deb11c8cfe3f063e8d4d11c53aaa8253fd66d5466
-  data.tar.gz: aee0b2f2fe0a17af19d09384df6dca08a3848fb6ebea981d71f93f1e8dc56858e6e293619b1755ea97aaefd2f7174925d50387cb5b9782c976ef477270d4e373
+  metadata.gz: b3bf3bc435c932230a7ac671f52fb41890abf8e673dd31bf8784eac721ef859e7726c06a164f5a15f7a474351274213bbbd82fe8973c9340ef3cd5463343799d
+  data.tar.gz: 7a05cc98e971adaac2e1ae834ac732533bfea925bc6c7e084068bad4dc4fc16292f3eac936406ff8abca9253cafc5b61f61f1597af8945595bd62a0084c85aba

data/.utilsrc

@@ -0,0 +1,68 @@
+# vim: set ft=ruby:
+
+search do
+  prune_dirs /\A(\.svn|\.git|\.terraform|CVS|tmp|coverage|corpus|pkg|\.yardoc|doc)\z/
+  skip_files /(\A\.|\.sw[pon]\z|\.(log|fnm|jpg|jpeg|png|pdf|svg)\z|\A(tags|cscope\.out)\z|~\z)/i
+end
+
+discover do
+  prune_dirs /\A(\.svn|\.git|\.terraform|\.yardoc|CVS|tmp|coverage|corpus|pkg|\.yardoc|doc)\z/
+  skip_files /(\A\.|\.sw[pon]\z|\.log\z|~\z)/
+  index_expire_after 3_600
+end
+
+strip_spaces do
+  prune_dirs /\A(\..*|CVS|pkg|\.yardoc)\z/
+  skip_files /(\A\.|\.sw[pon]\z|\.log\z|~\z)/
+end
+
+probe do
+  test_framework :rspec
+end
+
+ssh_tunnel do
+  terminal_multiplexer :tmux
+  login_session "/home/#{ENV['USER']}"
+end
+
+classify do
+  shift_path_by_default 1
+end
+
+code_indexer do
+  verbose false
+
+  gems = %w[
+    amatch
+    base64
+    bigdecimal
+    complex_config
+    date
+    documentrix
+    excon
+    json
+    kramdown-ansi
+    mize
+    more_math
+    ollama-ruby
+    ostruct
+    reverse_markdown
+    rspec
+    rspec-core
+    rspec-expectations
+    rspec-mocks
+    rspec-support
+    search_ui
+    sqlite3
+    stringio
+    term-ansicolor
+    tins
+    unix_socks
+    webmock
+    xdg
+  ]
+
+  paths {
+    %w[ lib ] + gems.map { `bundle show #{it}` }.map(&:chomp)
+  }
+end

data/CHANGES.md

@@ -1,5 +1,30 @@
 # Changes
 
+## 2025-09-08 v0.0.29
+
+- Refactored conversation persistence into a dedicated
+  `OllamaChat::Conversation` module
+- Added automatic backup saving in the `fix_config` method using
+  **backup.json**
+- Simplified `/save` and `/load` commands to delegate to module methods
+- Introduced document processing policies for web search results with three
+  modes: **embedding**, **summarizing**, and **importing**
+- Added `@document_policy` configuration to control result processing mode
+- Updated `/web` command help text and added new prompt templates for summarization and importing modes
+- Modified conditional logic from `@embedding.on?` to `@document_policy == 'embedding' && @embedding.on?`
+
+## 2025-09-08 v0.0.28
+
+- Replaced `server_socket_runtime_dir` config option with
+  `working_dir_dependent_socket`
+- Used `Digest::MD5` to generate unique socket names based on working directory
+- Socket names now follow format `ollama_chat-<hash>.sock` instead of fixed
+  name
+- Updated `unix_socks` dependency version constraint from >= 0.0.1 to ~> 0.1
+- Added new `.utilsrc` configuration file for code indexing and search
+  utilities
+- Added return type documentation to `CacheFetcher#get` method
+
 ## 2025-09-05 v0.0.27
 
 - Enhanced cache hit notifications to properly handle content type with
@@ -49,22 +74,31 @@
 ## 2025-08-17 v0.0.24
 
 - Updated `kramdown-ansi` dependency version constraint from **0.0** to **0.1**
-- Modified both Rakefile and ollama_chat.gemspec files to reflect new version
+- Modified both Rakefile and `ollama_chat.gemspec` files to reflect new version
   constraint for `kramdown-ansi`
 
 ## 2025-08-17 v0.0.23
 
-- Added `OllamaChat::KramdownANSI` module with `configure_kramdown_ansi_styles` and `kramdown_ansi_parse` methods for consistent Markdown formatting
-- Replaced direct calls to `Kramdown::ANSI.parse` with `@chat.kramdown_ansi_parse` in `FollowChat` and `MessageList`
+- Added `OllamaChat::KramdownANSI` module with `configure_kramdown_ansi_styles`
+  and `kramdown_ansi_parse` methods for consistent Markdown formatting
+- Replaced direct calls to `Kramdown::ANSI.parse` with
+  `@chat.kramdown_ansi_parse` in `FollowChat` and `MessageList`
 - Integrated `OllamaChat::KramdownANSI` module into `OllamaChat::Chat` class
 - Configured `@kramdown_ansi_styles` during chat initialization
-- Added support for environment variables `KRAMDOWN_ANSI_OLLAMA_CHAT_STYLES` and `KRAMDOWN_ANSI_STYLES` for styling configuration
-- Updated tests to mock `kramdown_ansi_parse` instead of direct `Kramdown::ANSI.parse`
-- Documented environment variables for customizing Markdown formatting with example JSON format
-- Added `lib/ollama_chat/kramdown_ansi.rb` to `extra_rdoc_files` and `files` list in gemspec
-- Escaped dot in regex pattern in `parsing_spec.rb` for proper image file matching
-- Implemented `File.expand_path` to resolve `~` shortcuts before existence check in parsing module
-- Added error handling for malformed paths by rescuing `ArgumentError` exceptions
+- Added support for environment variables `KRAMDOWN_ANSI_OLLAMA_CHAT_STYLES`
+  and `KRAMDOWN_ANSI_STYLES` for styling configuration
+- Updated tests to mock `kramdown_ansi_parse` instead of direct
+  `Kramdown::ANSI.parse`
+- Documented environment variables for customizing Markdown formatting with
+  example JSON format
+- Added `lib/ollama_chat/kramdown_ansi.rb` to `extra_rdoc_files` and `files`
+  list in gemspec
+- Escaped dot in regex pattern in `parsing_spec.rb` for proper image file
+  matching
+- Implemented `File.expand_path` to resolve `~` shortcuts before existence
+  check in parsing module
+- Added error handling for malformed paths by rescuing `ArgumentError`
+  exceptions
 - Skipped invalid file paths during processing loop using `next` statement
 - Maintained backward compatibility for standard file paths
 - Added comprehensive list of supported environment variables in documentation
@@ -72,14 +106,19 @@
 ## 2025-08-13 v0.0.22
 
 - Added new `-p` command line flag for enabling source parsing functionality
-- Enhanced `send_to_server_socket` method to accept and pass a `parse` parameter
+- Enhanced `send_to_server_socket` method to accept and pass a `parse`
+  parameter
 - Modified `chat.rb` to handle the `parse` content flag from server messages
 - Updated documentation in `README.md` with example usage of the new `-p` flag
-- Added comprehensive tests for the new parsing functionality in `server_socket_spec.rb`
-- Improved method documentation in `server_socket.rb` with detailed parameter descriptions
-- Replaced `messages.list_conversation(2)` with `messages.show_last` in `/drop` command behavior
+- Added comprehensive tests for the new parsing functionality in
+  `server_socket_spec.rb`
+- Improved method documentation in `server_socket.rb` with detailed parameter
+  descriptions
+- Replaced `messages.list_conversation(2)` with `messages.show_last` in `/drop`
+  command behavior
 - Updated `gem_hadar` development dependency from version **1.27** to **2.0**
-- Simplified SimpleCov setup by using `GemHadar::SimpleCov.start` instead of manual configuration
+- Simplified SimpleCov setup by using `GemHadar::SimpleCov.start` instead of
+  manual configuration
 
 ## 2025-08-11 v0.0.21
 
@@ -101,7 +140,8 @@
 
 ### Documentation
 
-- Added more YARD-style documentation to all public methods throughout the codebase.
+- Added more YARD-style documentation to all public methods throughout the
+  codebase.
 
 ### Fixed
 
@@ -174,8 +214,10 @@
 - **Enhancements**
   - Improved logging with debug output for received server socket messages.
   - Refactored server socket handling:
-    - Created `create_socket_server` method for UnixSocks setup with configurable runtime directories.
-    - Updated `send_to_server_socket` and `init_server_socket` methods to use the new helper.
+    - Created `create_socket_server` method for UnixSocks setup with
+      configurable runtime directories.
+    - Updated `send_to_server_socket` and `init_server_socket` methods to use
+      the new helper.
   - Changed evaluation rate metrics from 'c/s' to 't/s' for better clarity.
 
 - **Documentation**
@@ -233,37 +275,48 @@
 
 * **Think Mode Implementation**:
   + Introduced `@think_mode` attribute to read think mode setting from config
-  + Implemented `remove_think_blocks` method to filter out thought blocks from chat messages sent to the LLM model.
-  + Added conditional logic based on `@think_mode` value to handle different modes
+  + Implemented `remove_think_blocks` method to filter out thought blocks from
+    chat messages sent to the LLM model.
+  + Added conditional logic based on `@think_mode` value to handle different
+    modes
 * **User Interface Improvements**:
   + Added `/think_mode` command to help users understand think mode options
   + Updated session output to include current think mode
-  + Added think mode chooser to OllamaChat::Dialog, allowing users to select their preferred think mode
+  + Added think mode chooser to OllamaChat::Dialog, allowing users to select
+    their preferred think mode
 * **Output Handling Enhancements**:
   + Improved markdown handling for think blocks in OllamaChat::FollowChat class
-  + Modified output to print clear screen, move home, and user info before printing content
+  + Modified output to print clear screen, move home, and user info before
+    printing content
 * **Configuration Updates**:
   + Added `think_mode` key with value `"display"` to `default_config.yml`
 
 ## 2025-05-28 v0.0.10
 
 * Simplify and improve command handling logic.
-    * Update chat input handling to use a single `handle_input` method for all commands.
+    * Update chat input handling to use a single `handle_input` method for all
+      commands.
     * Add tests for various chat commands, including input handling, document
       policy selection, summarization, and more.
-    * Improve test coverage for `DocumentCache`, `Information`, and other modules.
-    * Improved handling of commands, e.g. **don't** when sending via `ollama_chat_send` by default.
+    * Improve test coverage for `DocumentCache`, `Information`, and other
+      modules.
+    * Improved handling of commands, e.g. **don't** when sending via
+      `ollama_chat_send` by default.
 * Added support for sending content to server socket with specific type.
 
 ## 2025-05-26 v0.0.9
 
 * Improved tag parsing in OllamaChat:
   * Added regex validation for valid tags to `Documentrix::Utils::Tags`.
-  * Modified `parse_content` method in `OllamaChat::Parsing` to handle valid tag formats.
-  * Updated `scan` methods in `content` processing to more correctly identify tags.
-* Added option to explicitly open socket for receiving input from `ollama_chat_send`:
+  * Modified `parse_content` method in `OllamaChat::Parsing` to handle valid
+    tag formats.
+  * Updated `scan` methods in `content` processing to more correctly identify
+    tags.
+* Added option to explicitly open socket for receiving input from
+  `ollama_chat_send`:
   * Added new command-line option `-S` to enable server socket functionality.
-  * Updated `OllamaChat::Chat` class to include server socket initialization based on the new option.
+  * Updated `OllamaChat::Chat` class to include server socket initialization
+    based on the new option.
   * Modified usage message in `README.md` and `information.rb` files.
 
 ## 2025-05-23 v0.0.8
@@ -305,9 +358,12 @@
 ## 2025-04-15 v0.0.6
 
 * Updated Rakefile to use `ollama-ruby` version **1.0**.
-* Modified `model_present?` method in `lib/ollama_chat/model_handling.rb` to use `ollama.show(model:)`.
-* Changed `pull_model_from_remote` method in `lib/ollama_chat/model_handling.rb` to use `ollama.pull(model:).
-* Updated `ollama_chat.gemspec` to use `ollama-ruby` version **1.0** and updated date to **2025-04-14**.
+* Modified `model_present?` method in `lib/ollama_chat/model_handling.rb` to
+  use `ollama.show(model:)`.
+* Changed `pull_model_from_remote` method in
+  `lib/ollama_chat/model_handling.rb` to use `ollama.pull(model:).
+* Updated `ollama_chat.gemspec` to use `ollama-ruby` version **1.0** and
+  updated date to **2025-04-14**.
 * Attempt to capture stderr as well by redirecting stderr to stdout for
   commands that output to it always or in the error case.
 * Updated development dependencies in `ollama_chat.gemspec`.
@@ -316,7 +372,8 @@
 
 * Updated default config to use environment variable for Searxng URL:
   * Changed `url` field in `searxng` section of `default_config.yml`.
-  * Replaced hardcoded URL with expression that fetches value from `OLLAMA_SEARXNG_URL` environment variable.
+  * Replaced hardcoded URL with expression that fetches value from
+    `OLLAMA_SEARXNG_URL` environment variable.
 * Handle Ollama server disconnection:
   * Added error handling for `Ollama::Errors::TimeoutError`.
   * Print error message when connection is lost.
@@ -336,18 +393,23 @@
     for web searching with all engines.
   + Updated `ollama_chat/chat.rb` to use the new `web_searching` module and
     updated the `search_web` method to return results from either engine.
-  + Added specs in `spec/ollama_chat/web_searching_spec.rb` to test the new functionality.
+  + Added specs in `spec/ollama_chat/web_searching_spec.rb` to test the new
+    functionality.
 * Added ollama chat version display to information module and spec:
-  + Added `STDOUT.puts` for displaying ollama chat version in `lib/ollama_chat/information.rb`
-  + Updated test in `spec/ollama_chat/chat_spec.rb` to include new output string
+  + Added `STDOUT.puts` for displaying ollama chat version in
+    `lib/ollama_chat/information.rb`
+  + Updated test in `spec/ollama_chat/chat_spec.rb` to include new output
+    string
 * Update chat document redis cache expiration time default to 0.
 
 ## 2025-02-17 v0.0.3
 
 * Support setting of request headers:
     * Added `request_headers` option to `default_config.yml
-    * Updated `OllamaChat::SourceFetching` module to pass `config.request_headers?.to_h` to `Fetcher.get`
-    * Updated `OllamaChat::Utils::Fetcher.get` method to take an optional `headers:` parameter
+    * Updated `OllamaChat::SourceFetching` module to pass
+      `config.request_headers?.to_h` to `Fetcher.get`
+    * Updated `OllamaChat::Utils::Fetcher.get` method to take an optional
+      `headers:` parameter
     * Updated tests for Fetcher utility to include new headers option
 * Refactoring
     * Added `connect_to_ollama_server` method to `spec_helper.rb`
@@ -379,8 +441,10 @@
 ## 2025-02-02 v0.0.1
 
 * Renamed `documents` variable to `@documents` in `OllamaChat::Chat`
-    * Modified `add_documents_from_argv` method to accept only `document_list` as argument
-    * Updated spec for `OllamaChat::Chat` to reflect changes in `add_documents_from_argv` method
+    * Modified `add_documents_from_argv` method to accept only `document_list`
+      as argument
+    * Updated spec for `OllamaChat::Chat` to reflect changes in
+      `add_documents_from_argv` method
 * Use `clamp(1..)` instead of manual checks for `n.to_i` in source fetching
 * Dropped is now used consistently in the code for message popping
 * Set up Redis environment and service for development:

data/README.md

@@ -171,7 +171,7 @@ The following commands can be given inside the chat, if prefixed by a `/`:
 /summarize [n] source           summarize the source's content in n words
 /embedding                      toggle embedding paused or not
 /embed source                   embed the source's content
-/web [n] query                  query web search & return n or 1 results
+/web [n] query                  query web & for n(=1) results (policy: importing)
 /links [clear]                  display (or clear) links used in the chat
 /save filename                  store conversation messages
 /load filename                  load conversation messages

data/Rakefile

@@ -36,7 +36,7 @@ GemHadar do
   dependency             'excon',                 '~> 1.0'
   dependency             'ollama-ruby',           '~> 1.6'
   dependency             'documentrix',           '~> 0.0', '>= 0.0.2'
-  dependency             'unix_socks',            '>= 0.0.1'
+  dependency             'unix_socks',            '~> 0.1'
   dependency             'rss',                   '~> 0.3'
   dependency             'term-ansicolor',        '~> 1.11'
   dependency             'redis',                 '~> 5.0'

data/lib/ollama_chat/chat.rb

@@ -48,6 +48,7 @@ class OllamaChat::Chat
   include OllamaChat::History
   include OllamaChat::ServerSocket
   include OllamaChat::KramdownANSI
+  include OllamaChat::Conversation
 
   # Initializes a new OllamaChat::Chat instance with the given command-line
   # arguments.
@@ -312,27 +313,13 @@ class OllamaChat::Chat
       @parse_content = false
       web($1, $2)
     when %r(^/save\s+(.+)$)
-      filename = $1
-      if messages.save_conversation(filename)
-        STDOUT.puts "Saved conversation to #{filename.inspect}."
-      else
-        STDERR.puts "Saving conversation to #{filename.inspect} failed."
-      end
+      save_conversation($1)
       :next
     when %r(^/links(?:\s+(clear))?$)
       manage_links($1)
       :next
     when %r(^/load\s+(.+)$)
-      filename = $1
-      success = messages.load_conversation(filename)
-      if messages.size > 1
-        messages.list_conversation(2)
-      end
-      if success
-        STDOUT.puts "Loaded conversation from #{filename.inspect}."
-      else
-        STDERR.puts "Loading conversation from #{filename.inspect} failed."
-      end
+      load_conversation($1)
       :next
     when %r(^/pipe\s+(.+)$)
       pipe($1)
@@ -362,31 +349,60 @@ class OllamaChat::Chat
     end
   end
 
-  # The web method performs a web search and processes the results based on
-  # embedding configuration.
-  #
-  # It searches for the given query using the configured search engine and
-  # processes up to the specified number of URLs. If embeddings are enabled, it
-  # embeds each result and interpolates the query into the web_embed prompt.
-  # Otherwise, it imports each result and interpolates both the query and
-  # results into the web_import prompt.
-  #
-  # @param count [ String ] the maximum number of search results to process
-  # @param query [ String ] the search query string
-  #
-  # @return [ String, Symbol ] the interpolated prompt content or :next if no URLs were found
+  # Performs a web search and processes the results based on document processing configuration.
+  #
+  # Searches for the given query using the configured search engine and processes up to
+  # the specified number of URLs. The processing approach varies based on the current
+  # document policy and embedding status:
+  #
+  # - **Embedding mode**: When `@document_policy == 'embedding'` AND `@embedding.on?` is true,
+  #   each result is embedded and the query is interpolated into the `web_embed` prompt.
+  # - **Summarizing mode**: When `@document_policy == 'summarizing'`,
+  #   each result is summarized and both query and results are interpolated into the
+  #   `web_summarize` prompt.
+  # - **Importing mode**: For all other cases, each result is imported and both query and
+  #   results are interpolated into the `web_import` prompt.
+  #
+  # @param count [String] The maximum number of search results to process (defaults to 1)
+  # @param query [String] The search query string
+  #
+  # @return [String, Symbol] The interpolated prompt content when successful,
+  #   or :next if no URLs were found or processing failed
+  #
+  # @example Basic web search
+  #   web('3', 'ruby programming tutorials')
+  #
+  # @example Web search with embedding policy
+  #   # With @document_policy == 'embedding' and @embedding.on?
+  #   # Processes results through embedding pipeline
+  #
+  # @example Web search with summarizing policy
+  #   # With @document_policy == 'summarizing'
+  #   # Processes results through summarization pipeline
+  #
+  # @see #search_web
+  # @see #fetch_source
+  # @see #embed_source
+  # @see #import
+  # @see #summarize
   def web(count, query)
     urls = search_web(query, count.to_i) or return :next
-    if @embedding.on?
+    if @document_policy == 'embedding' && @embedding.on?
       prompt = config.prompts.web_embed
       urls.each do |url|
         fetch_source(url) { |url_io| embed_source(url_io, url) }
       end
       prompt.named_placeholders_interpolate({query:})
+    elsif @document_policy == 'summarizing'
+      prompt = config.prompts.web_summarize
+      results = urls.each_with_object('') do |url, content|
+        import(url).full? { |c| content << c }
+      end
+      prompt.named_placeholders_interpolate({query:, results:})
     else
       prompt = config.prompts.web_import
       results = urls.each_with_object('') do |url, content|
-        import(url).full? { |c| content << c }
+        summarize(url).full? { |c| content << c }
       end
       prompt.named_placeholders_interpolate({query:, results:})
     end
@@ -727,6 +743,7 @@ class OllamaChat::Chat
   # @param exception [ Exception ] the exception that occurred while reading
   # the config file
   def fix_config(exception)
+    save_conversation('backup.json')
     STDOUT.puts "When reading the config file, a #{exception.class} "\
       "exception was caught: #{exception.message.inspect}"
     if ask?(prompt: 'Do you want to fix the config? (y/n) ') =~ /\Ay/i

data/lib/ollama_chat/conversation.rb

@@ -0,0 +1,58 @@
+# A module that provides conversation persistence functionality for the
+# OllamaChat::Chat class.
+#
+# This module encapsulates the logic for saving and loading chat conversations
+# to/from JSON files. It delegates the actual file operations to the `messages`
+# object, which is expected to respond to `save_conversation` and
+# `load_conversation` methods.
+#
+# @example Save a conversation
+#   chat.save_conversation('my_chat.json')
+#
+# @example Load a conversation
+#   chat.load_conversation('my_chat.json')
+module OllamaChat::Conversation
+  # Saves the current conversation to a JSON file.
+  #
+  # This method delegates to the `messages` object's `save_conversation`
+  # method, which handles the actual serialization of messages into JSON
+  # format.
+  #
+  # @param filename [String] The path to the file where the conversation should
+  # be saved
+  #
+  # @example Save conversation with explicit filename
+  #   chat.save_conversation('conversations/2023-10-15_my_session.json')
+  def save_conversation(filename)
+    if messages.save_conversation(filename)
+      STDOUT.puts "Saved conversation to #{filename.inspect}."
+    else
+      STDERR.puts "Saving conversation to #{filename.inspect} failed."
+    end
+  end
+
+  # Loads a conversation from a JSON file and replaces the current message
+  # history.
+  #
+  # This method delegates to the `messages` object's `load_conversation`
+  # method, which handles deserialization of messages from JSON format. After
+  # loading, if there are more than one message, it lists the last two messages
+  # for confirmation.
+  #
+  # @param filename [String] The path to the file containing the conversation
+  # to load
+  #
+  # @example Load a conversation from a specific file
+  #   chat.load_conversation('conversations/2023-10-15_my_session.json')
+  def load_conversation(filename)
+    success = messages.load_conversation(filename)
+    if messages.size > 1
+      messages.list_conversation(2)
+    end
+    if success
+      STDOUT.puts "Loaded conversation from #{filename.inspect}."
+    else
+      STDERR.puts "Loading conversation from #{filename.inspect} failed."
+    end
+  end
+end

data/lib/ollama_chat/information.rb

@@ -141,7 +141,7 @@ module OllamaChat::Information
       /summarize [n] source           summarize the source's content in n words
       /embedding                      toggle embedding paused or not
       /embed source                   embed the source's content
-      /web [n] query                  query web search & return n or 1 results
+      /web [n] query                  query web & for n(=1) results (policy: #@document_policy)
       /links [clear]                  display (or clear) links used in the chat
       /save filename                  store conversation messages
       /load filename                  load conversation messages

data/lib/ollama_chat/ollama_chat_config/default_config.yml

@@ -24,7 +24,11 @@ prompts:
   web_embed: |
     Answer the the query %{query} using the provided chunks.
   web_import: |
-    Answer the the query %{query} using these imported source:
+    Answer the the query %{query} using these imported sources:
+
+    %{results}
+  web_summarize: |
+    Answer the the query %{query} using these summarized sources:
 
     %{results}
   location: You are at %{location_name}, %{location_decimal_degrees}, on %{localtime}, preferring %{units}
@@ -64,7 +68,7 @@ redis:
     url: <%= ENV.fetch('REDIS_EXPIRING_URL', 'null') %>
     ex: 86400
 chat_history_filename: <%= ENV.fetch('OLLAMA_CHAT_HISTORY', '~/.ollama_chat_history') %>
-server_socket_runtime_dir: .
+working_dir_dependent_socket: true
 debug: <%= ENV['OLLAMA_CHAT_DEBUG'].to_i == 1 ? true : false %>
 request_headers:
   Accept: 'text/*,application/*,image/*'

data/lib/ollama_chat/server_socket.rb

@@ -1,3 +1,5 @@
+require 'digest/md5'
+
 # A module that provides server socket functionality for OllamaChat
 #
 # The ServerSocket module encapsulates the logic for creating and managing Unix
@@ -70,8 +72,10 @@ module OllamaChat::ServerSocket
       if runtime_dir
         return UnixSocks::Server.new(socket_name: 'ollama_chat.sock', runtime_dir:)
       end
-      if runtime_dir = config.server_socket_runtime_dir
-        UnixSocks::Server.new(socket_name: 'ollama_chat.sock', runtime_dir:)
+      if config.working_dir_dependent_socket
+        path   = File.expand_path(Dir.pwd)
+        digest = Digest::MD5.hexdigest(path)
+        UnixSocks::Server.new(socket_name: "ollama_chat-#{digest}.sock")
       else
         UnixSocks::Server.new(socket_name: 'ollama_chat.sock')
       end

data/lib/ollama_chat/utils/cache_fetcher.rb

@@ -34,6 +34,7 @@ class OllamaChat::Utils::CacheFetcher
   # @param url [ String ] the URL used as a key for caching
   #
   # @yield [ io ] yields the cached IO object if found
+  # @return [ io ] the cached IO object if found
   def get(url, &block)
     block or raise ArgumentError, 'require block argument'
     body         = @cache[key(:body, url)]

data/lib/ollama_chat/version.rb

@@ -1,6 +1,6 @@
 module OllamaChat
   # OllamaChat version
-  VERSION         = '0.0.27'
+  VERSION         = '0.0.29'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/lib/ollama_chat.rb

@@ -33,4 +33,5 @@ require 'ollama_chat/document_cache'
 require 'ollama_chat/history'
 require 'ollama_chat/server_socket'
 require 'ollama_chat/kramdown_ansi'
+require 'ollama_chat/conversation'
 require 'ollama_chat/chat'

data/ollama_chat.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: ollama_chat 0.0.27 ruby lib
+# stub: ollama_chat 0.0.29 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama_chat".freeze
-  s.version = "0.0.27".freeze
+  s.version = "0.0.29".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
   s.description = "The app provides a command-line interface (CLI) to an Ollama AI model,\nallowing users to engage in text-based conversations and generate\nhuman-like responses. Users can import data from local files or web pages,\nwhich are then processed through three different modes: fully importing the\ncontent into the conversation context, summarizing the information for\nconcise reference, or storing it in an embedding vector database for later\nretrieval based on the conversation.\n".freeze
   s.email = "flori@ping.de".freeze
   s.executables = ["ollama_chat".freeze, "ollama_chat_send".freeze]
-  s.extra_rdoc_files = ["README.md".freeze, "lib/ollama_chat.rb".freeze, "lib/ollama_chat/chat.rb".freeze, "lib/ollama_chat/clipboard.rb".freeze, "lib/ollama_chat/dialog.rb".freeze, "lib/ollama_chat/document_cache.rb".freeze, "lib/ollama_chat/follow_chat.rb".freeze, "lib/ollama_chat/history.rb".freeze, "lib/ollama_chat/information.rb".freeze, "lib/ollama_chat/kramdown_ansi.rb".freeze, "lib/ollama_chat/message_format.rb".freeze, "lib/ollama_chat/message_list.rb".freeze, "lib/ollama_chat/message_output.rb".freeze, "lib/ollama_chat/model_handling.rb".freeze, "lib/ollama_chat/ollama_chat_config.rb".freeze, "lib/ollama_chat/parsing.rb".freeze, "lib/ollama_chat/server_socket.rb".freeze, "lib/ollama_chat/source_fetching.rb".freeze, "lib/ollama_chat/switches.rb".freeze, "lib/ollama_chat/utils.rb".freeze, "lib/ollama_chat/utils/cache_fetcher.rb".freeze, "lib/ollama_chat/utils/chooser.rb".freeze, "lib/ollama_chat/utils/fetcher.rb".freeze, "lib/ollama_chat/utils/file_argument.rb".freeze, "lib/ollama_chat/version.rb".freeze, "lib/ollama_chat/vim.rb".freeze, "lib/ollama_chat/web_searching.rb".freeze]
-  s.files = ["CHANGES.md".freeze, "Gemfile".freeze, "README.md".freeze, "Rakefile".freeze, "bin/ollama_chat".freeze, "bin/ollama_chat_send".freeze, "config/searxng/settings.yml".freeze, "docker-compose.yml".freeze, "lib/ollama_chat.rb".freeze, "lib/ollama_chat/chat.rb".freeze, "lib/ollama_chat/clipboard.rb".freeze, "lib/ollama_chat/dialog.rb".freeze, "lib/ollama_chat/document_cache.rb".freeze, "lib/ollama_chat/follow_chat.rb".freeze, "lib/ollama_chat/history.rb".freeze, "lib/ollama_chat/information.rb".freeze, "lib/ollama_chat/kramdown_ansi.rb".freeze, "lib/ollama_chat/message_format.rb".freeze, "lib/ollama_chat/message_list.rb".freeze, "lib/ollama_chat/message_output.rb".freeze, "lib/ollama_chat/model_handling.rb".freeze, "lib/ollama_chat/ollama_chat_config.rb".freeze, "lib/ollama_chat/ollama_chat_config/default_config.yml".freeze, "lib/ollama_chat/parsing.rb".freeze, "lib/ollama_chat/server_socket.rb".freeze, "lib/ollama_chat/source_fetching.rb".freeze, "lib/ollama_chat/switches.rb".freeze, "lib/ollama_chat/utils.rb".freeze, "lib/ollama_chat/utils/cache_fetcher.rb".freeze, "lib/ollama_chat/utils/chooser.rb".freeze, "lib/ollama_chat/utils/fetcher.rb".freeze, "lib/ollama_chat/utils/file_argument.rb".freeze, "lib/ollama_chat/version.rb".freeze, "lib/ollama_chat/vim.rb".freeze, "lib/ollama_chat/web_searching.rb".freeze, "ollama_chat.gemspec".freeze, "redis/redis.conf".freeze, "spec/assets/api_show.json".freeze, "spec/assets/api_tags.json".freeze, "spec/assets/api_version.json".freeze, "spec/assets/conversation.json".freeze, "spec/assets/duckduckgo.html".freeze, "spec/assets/example.atom".freeze, "spec/assets/example.csv".freeze, "spec/assets/example.html".freeze, "spec/assets/example.pdf".freeze, "spec/assets/example.ps".freeze, "spec/assets/example.rb".freeze, "spec/assets/example.rss".freeze, "spec/assets/example.xml".freeze, "spec/assets/kitten.jpg".freeze, "spec/assets/prompt.txt".freeze, "spec/assets/searxng.json".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/kramdown_ansi_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/server_socket_spec.rb".freeze, "spec/ollama_chat/source_fetching_spec.rb".freeze, "spec/ollama_chat/switches_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/web_searching_spec.rb".freeze, "spec/spec_helper.rb".freeze, "tmp/.keep".freeze]
+  s.extra_rdoc_files = ["README.md".freeze, "lib/ollama_chat.rb".freeze, "lib/ollama_chat/chat.rb".freeze, "lib/ollama_chat/clipboard.rb".freeze, "lib/ollama_chat/conversation.rb".freeze, "lib/ollama_chat/dialog.rb".freeze, "lib/ollama_chat/document_cache.rb".freeze, "lib/ollama_chat/follow_chat.rb".freeze, "lib/ollama_chat/history.rb".freeze, "lib/ollama_chat/information.rb".freeze, "lib/ollama_chat/kramdown_ansi.rb".freeze, "lib/ollama_chat/message_format.rb".freeze, "lib/ollama_chat/message_list.rb".freeze, "lib/ollama_chat/message_output.rb".freeze, "lib/ollama_chat/model_handling.rb".freeze, "lib/ollama_chat/ollama_chat_config.rb".freeze, "lib/ollama_chat/parsing.rb".freeze, "lib/ollama_chat/server_socket.rb".freeze, "lib/ollama_chat/source_fetching.rb".freeze, "lib/ollama_chat/switches.rb".freeze, "lib/ollama_chat/utils.rb".freeze, "lib/ollama_chat/utils/cache_fetcher.rb".freeze, "lib/ollama_chat/utils/chooser.rb".freeze, "lib/ollama_chat/utils/fetcher.rb".freeze, "lib/ollama_chat/utils/file_argument.rb".freeze, "lib/ollama_chat/version.rb".freeze, "lib/ollama_chat/vim.rb".freeze, "lib/ollama_chat/web_searching.rb".freeze]
+  s.files = [".utilsrc".freeze, "CHANGES.md".freeze, "Gemfile".freeze, "README.md".freeze, "Rakefile".freeze, "bin/ollama_chat".freeze, "bin/ollama_chat_send".freeze, "config/searxng/settings.yml".freeze, "docker-compose.yml".freeze, "lib/ollama_chat.rb".freeze, "lib/ollama_chat/chat.rb".freeze, "lib/ollama_chat/clipboard.rb".freeze, "lib/ollama_chat/conversation.rb".freeze, "lib/ollama_chat/dialog.rb".freeze, "lib/ollama_chat/document_cache.rb".freeze, "lib/ollama_chat/follow_chat.rb".freeze, "lib/ollama_chat/history.rb".freeze, "lib/ollama_chat/information.rb".freeze, "lib/ollama_chat/kramdown_ansi.rb".freeze, "lib/ollama_chat/message_format.rb".freeze, "lib/ollama_chat/message_list.rb".freeze, "lib/ollama_chat/message_output.rb".freeze, "lib/ollama_chat/model_handling.rb".freeze, "lib/ollama_chat/ollama_chat_config.rb".freeze, "lib/ollama_chat/ollama_chat_config/default_config.yml".freeze, "lib/ollama_chat/parsing.rb".freeze, "lib/ollama_chat/server_socket.rb".freeze, "lib/ollama_chat/source_fetching.rb".freeze, "lib/ollama_chat/switches.rb".freeze, "lib/ollama_chat/utils.rb".freeze, "lib/ollama_chat/utils/cache_fetcher.rb".freeze, "lib/ollama_chat/utils/chooser.rb".freeze, "lib/ollama_chat/utils/fetcher.rb".freeze, "lib/ollama_chat/utils/file_argument.rb".freeze, "lib/ollama_chat/version.rb".freeze, "lib/ollama_chat/vim.rb".freeze, "lib/ollama_chat/web_searching.rb".freeze, "ollama_chat.gemspec".freeze, "redis/redis.conf".freeze, "spec/assets/api_show.json".freeze, "spec/assets/api_tags.json".freeze, "spec/assets/api_version.json".freeze, "spec/assets/conversation.json".freeze, "spec/assets/duckduckgo.html".freeze, "spec/assets/example.atom".freeze, "spec/assets/example.csv".freeze, "spec/assets/example.html".freeze, "spec/assets/example.pdf".freeze, "spec/assets/example.ps".freeze, "spec/assets/example.rb".freeze, "spec/assets/example.rss".freeze, "spec/assets/example.xml".freeze, "spec/assets/kitten.jpg".freeze, "spec/assets/prompt.txt".freeze, "spec/assets/searxng.json".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/kramdown_ansi_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/server_socket_spec.rb".freeze, "spec/ollama_chat/source_fetching_spec.rb".freeze, "spec/ollama_chat/switches_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/web_searching_spec.rb".freeze, "spec/spec_helper.rb".freeze, "tmp/.keep".freeze]
   s.homepage = "https://github.com/flori/ollama_chat".freeze
   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]
@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency(%q<excon>.freeze, ["~> 1.0".freeze])
   s.add_runtime_dependency(%q<ollama-ruby>.freeze, ["~> 1.6".freeze])
   s.add_runtime_dependency(%q<documentrix>.freeze, ["~> 0.0".freeze, ">= 0.0.2".freeze])
-  s.add_runtime_dependency(%q<unix_socks>.freeze, [">= 0.0.1".freeze])
+  s.add_runtime_dependency(%q<unix_socks>.freeze, ["~> 0.1".freeze])
   s.add_runtime_dependency(%q<rss>.freeze, ["~> 0.3".freeze])
   s.add_runtime_dependency(%q<term-ansicolor>.freeze, ["~> 1.11".freeze])
   s.add_runtime_dependency(%q<redis>.freeze, ["~> 5.0".freeze])

data/spec/ollama_chat/server_socket_spec.rb

@@ -102,12 +102,11 @@ describe OllamaChat::ServerSocket do
   end
 
   describe '#create_socket_server' do
-    context 'with configured runtime_dir' do
+    context 'with working dir dependent socket' do
       it 'can be created with configured runtime_dir' do
-        config = double('Config', server_socket_runtime_dir: '/custom/runtime')
+        config = double('Config', working_dir_dependent_socket: true)
         expect(UnixSocks::Server).to receive(:new).with(
-          socket_name: 'ollama_chat.sock',
-          runtime_dir: '/custom/runtime'
+          socket_name: /\Aollama_chat-\h{32}.sock\z/,
         ).and_return :unix_socks_server
 
         result = OllamaChat::ServerSocket.create_socket_server(config: config)
@@ -115,9 +114,9 @@ describe OllamaChat::ServerSocket do
       end
     end
 
-    context 'with default runtime_dir' do
+    context 'with default runtime_dir and name' do
       it 'can be created with default runtime_dir' do
-        config = double('Config', server_socket_runtime_dir: nil)
+        config = double('Config', working_dir_dependent_socket: false)
         expect(UnixSocks::Server).to receive(:new).with(
           socket_name: 'ollama_chat.sock'
         ).and_return :unix_socks_server

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ollama_chat
 version: !ruby/object:Gem::Version
-  version: 0.0.27
+  version: 0.0.29
 platform: ruby
 authors:
 - Florian Frank
@@ -173,16 +173,16 @@ dependencies:
   name: unix_socks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: rss
   requirement: !ruby/object:Gem::Requirement
@@ -389,6 +389,7 @@ extra_rdoc_files:
 - lib/ollama_chat.rb
 - lib/ollama_chat/chat.rb
 - lib/ollama_chat/clipboard.rb
+- lib/ollama_chat/conversation.rb
 - lib/ollama_chat/dialog.rb
 - lib/ollama_chat/document_cache.rb
 - lib/ollama_chat/follow_chat.rb
@@ -413,6 +414,7 @@ extra_rdoc_files:
 - lib/ollama_chat/vim.rb
 - lib/ollama_chat/web_searching.rb
 files:
+- ".utilsrc"
 - CHANGES.md
 - Gemfile
 - README.md
@@ -424,6 +426,7 @@ files:
 - lib/ollama_chat.rb
 - lib/ollama_chat/chat.rb
 - lib/ollama_chat/clipboard.rb
+- lib/ollama_chat/conversation.rb
 - lib/ollama_chat/dialog.rb
 - lib/ollama_chat/document_cache.rb
 - lib/ollama_chat/follow_chat.rb