ollama_chat 0.0.21 → 0.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91a8452d2970be06a595b83e8dfdc4ee8be0388b37171967ef884139ad97b492
-  data.tar.gz: 116ca9055525145d36a65abc5d38341a603fbc62ccf4d52257876ddaa3a3f0d9
+  metadata.gz: 7811d92313881ed278cca428c652ec13b6e52288a7f403f0dd88d771f8c7f494
+  data.tar.gz: 950605c809843f1b81ff94795f0db0ae062b9e8485f85dbe4ad23eded4001507
 SHA512:
-  metadata.gz: 710139d1db7d25ed49218eaf6c22f61cea64352bbd2d8d1c418ccaba67f190c6157b14d8c5ec41da18e83669177310143b0e3683d5df7b2d7e9c68e3edf72df7
-  data.tar.gz: ef6f2705cfacb4c4523ead9e3361ce980aef227e06b6bc3a7a639d6e492d82cbd03f6c1ca4b82383b29cb95d740d9b815fff3d5c57336baf5f885e1e43e81277
+  metadata.gz: 60980bfcfd8aca4de1c7bbbe4451d08d99512bd70b438e63f7fca5dbb4bbbcf9e2855477f7e6cf26d38ed9d673a36beca565d8fe29bacd99e66a34a01de114bc
+  data.tar.gz: e1b5a35b0a24c870668d59670d405fce3f6d654bc801e280677a43b04ad720c564d1dbc48e058464b00e159bac1e5d27d5782ec045fce97d490046064ff5a560

data/CHANGES.md

@@ -1,5 +1,50 @@
 # Changes
 
+## 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`
+- 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
+- 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
+
+## 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
+- 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
+- Updated `gem_hadar` development dependency from version **1.27** to **2.0**
+- Simplified SimpleCov setup by using `GemHadar::SimpleCov.start` instead of manual configuration
+
+## 2025-08-11 v0.0.21
+
+* **Vim Integration**: The `/vim` command allows users to insert the last chat
+  message into a Vim server, improving workflow integration. It uses
+  `--servername` and `--remote-send` to insert text at the cursor position and
+  automatically indents based on the current column.
+* **Improved Documentation**: Comprehensive documentation has been added to
+  various modules and classes, making it easier for developers to understand
+  and use the gem's features.
+* **Model Selection Logic**: When only a single model is available, the code
+  now automatically selects that model instead of showing a prompt, improving
+  usability.
+* **Configuration Handling**: Configuration file error handling has been
+  updated to use `STDERR` for output, ensuring errors are displayed
+  appropriately.
+
 ## 2025-08-11 v0.0.20
 
 ### Documentation

data/README.md

@@ -15,6 +15,34 @@ gem install ollama_chat
 
 in your terminal.
 
+## Configuration
+
+### Environment Variables
+
+The following environment variables can be used to configure behavior:
+
+- `OLLAMA_URL` - Base URL for Ollama server (default: `http://localhost:11434`)
+- `OLLAMA_HOST` - Base URL for Ollama server (default: `localhost:11434`)
+- `OLLAMA_MODEL` - Default model to use (e.g., `llama3.1`)
+- `KRAMDOWN_ANSI_OLLAMA_CHAT_STYLES` - Custom ANSI styles for Markdown formatting
+- `KRAMDOWN_ANSI_STYLES` - Fallback ANSI styles configuration
+- `OLLAMA_CHAT_SYSTEM` - System prompt file or content (default: `null`)
+- `OLLAMA_CHAT_COLLECTION` - Collection name for embeddings
+- `PAGER` - Default pager for output
+- `REDIS_URL` - Redis connection URL for caching
+- `REDIS_EXPIRING_URL` - Redis connection URL for expiring data
+- `OLLAMA_CHAT_HISTORY` - Chat history filename (default: `~/.ollama_chat_history`)
+- `OLLAMA_CHAT_DEBUG` - Debug mode toggle (1 = enabled)
+- `DIFF_TOOL` - Tool for diff operations (default: `vimdiff`)
+- `OLLAMA_SEARXNG_URL` - SearxNG search endpoint URL
+
+Example usage for `KRAMDOWN_ANSI_OLLAMA_CHAT_STYLES`:
+
+```bash
+# Set custom ANSI colors for Markdown output as a JSON object:
+export KRAMDOWN_ANSI_OLLAMA_CHAT_STYLES='{"header":["bold","on_color241","white"],"strong":["bold","color76"],"em":["italic","color227"],"code":["bold","color214"]}'
+```
+
 ## Usage
 
 It can be started with the following arguments:
@@ -191,6 +219,14 @@ The `ollama_chat_send` command now supports additional parameters to enhance fun
   $ echo "$response"
   ```
 
+- **Source Parsing (`-p`)**: Enables automatic parsing of URLs, file paths, and
+  similar tokens in input content. When enabled, the system will attempt to
+  resolve and include external resources.
+
+  ```bash
+  $ echo "Visit https://example.com for more info" | ollama_chat_send -p
+  ```
+
 - **Help (`-h` or `--help`)**: Displays usage information and available options.
 
   ```bash

data/VERSION

@@ -1 +1 @@
-0.0.21
+0.0.23

data/bin/ollama_chat_send

@@ -5,7 +5,7 @@ require 'tins/go'
 include Tins::GO
 
 
-opts = go 'f:rth', ARGV
+opts = go 'f:rtph', ARGV
 
 def usage(rc = 0)
   puts <<~EOT
@@ -14,6 +14,7 @@ def usage(rc = 0)
     Options:
       -r         Wait for the response from Ollama Chat and output it
       -t         Send input as terminal input including commands, e. g. /import
+      -p         Send input with source parsing enabled (defaults to disabled)
       -f CONFIG  file to read
       -h         Show this help message
 
@@ -30,7 +31,7 @@ begin
          else
            opts[?r] ? :socket_input_with_response : :socket_input
          end
-  response = OllamaChat::ServerSocket.send_to_server_socket(STDIN.read, type:, config:)
+  response = OllamaChat::ServerSocket.send_to_server_socket(STDIN.read, type:, config:, parse: !!opts[?p])
   type == :socket_input_with_response and puts response.content
 rescue => e
   warn "Caught #{e.class}: #{e}"

data/lib/ollama_chat/chat.rb

@@ -33,6 +33,7 @@ class OllamaChat::Chat
   include OllamaChat::MessageFormat
   include OllamaChat::History
   include OllamaChat::ServerSocket
+  include OllamaChat::KramdownANSI
 
   # Initializes a new OllamaChat::Chat instance with the given command-line
   # arguments.
@@ -97,10 +98,11 @@ class OllamaChat::Chat
         system.present? and messages.set_system_prompt(system)
       end
     end
-    @documents     = setup_documents
-    @cache         = setup_cache
-    @current_voice = config.voice.default
-    @images        = []
+    @documents            = setup_documents
+    @cache                = setup_cache
+    @current_voice        = config.voice.default
+    @images               = []
+    @kramdown_ansi_styles = configure_kramdown_ansi_styles
     init_chat_history
     @opts[?S] and init_server_socket
   rescue ComplexConfig::AttributeMissing, ComplexConfig::ConfigurationSyntaxError => e
@@ -217,7 +219,7 @@ class OllamaChat::Chat
       :next
     when %r(^/drop(?:\s+(\d*))?$)
       messages.drop($1)
-      messages.list_conversation(2)
+      messages.show_last
       :next
     when %r(^/model$)
       @model = choose_model('', @model)
@@ -495,8 +497,9 @@ class OllamaChat::Chat
         end
       rescue Interrupt
         if message = server_socket_message
-          type    = message.type.full?(:to_sym) || :socket_input
-          content = message.content
+          type           = message.type.full?(:to_sym) || :socket_input
+          content        = message.content
+          @parse_content = message.parse
           STDOUT.puts color(112) { "Received a server socket message. Processing now…" }
         else
           raise

data/lib/ollama_chat/follow_chat.rb

@@ -102,9 +102,9 @@ class OllamaChat::FollowChat
   def display_formatted_terminal_output
     content, thinking = @messages.last.content, @messages.last.thinking
     if @chat.markdown.on?
-      content = talk_annotate { Kramdown::ANSI.parse(content) }
+      content = talk_annotate { @chat.kramdown_ansi_parse(content) }
       if @chat.think.on?
-        thinking = think_annotate { Kramdown::ANSI.parse(thinking) }
+        thinking = think_annotate { @chat.kramdown_ansi_parse(content) }
       end
     else
       content = talk_annotate { content }

data/lib/ollama_chat/kramdown_ansi.rb

@@ -0,0 +1,31 @@
+module OllamaChat::KramdownANSI
+  # The configure_kramdown_ansi_styles method sets up ANSI styling for
+  # Kramdown::ANSI output by checking for specific environment variables and
+  # falling back to default styles.
+  #
+  # @return [ Hash ] a hash of ANSI styles configured either from environment
+  # variables or using default settings
+  def configure_kramdown_ansi_styles
+    if env_var = %w[ KRAMDOWN_ANSI_OLLAMA_CHAT_STYLES KRAMDOWN_ANSI_STYLES ].find { ENV.key?(_1) }
+      Kramdown::ANSI::Styles.from_env_var(env_var).ansi_styles
+    else
+      Kramdown::ANSI::Styles.new.ansi_styles
+    end
+  end
+
+  # The kramdown_ansi_parse method processes content using Kramdown::ANSI with
+  # custom ANSI styles.
+  #
+  # This method takes raw content and converts it into formatted ANSI output by
+  # applying the instance's configured ANSI styles. It is used to render
+  # content with appropriate terminal formatting based on the application's
+  # styling configuration.
+  #
+  # @param content [ String ] the raw content to be parsed and formatted
+  #
+  # @return [ String ] the content formatted with ANSI escape sequences
+  # according to the configured styles
+  def kramdown_ansi_parse(content)
+    Kramdown::ANSI.parse(content, ansi_styles: @kramdown_ansi_styles)
+  end
+end

data/lib/ollama_chat/message_list.rb

@@ -193,7 +193,7 @@ class OllamaChat::MessageList
   #
   # @return [self, NilClass] nil if the system prompt is empty, otherwise self.
   def show_system_prompt
-    system_prompt = Kramdown::ANSI.parse(system.to_s).gsub(/\n+\z/, '').full?
+    system_prompt = @chat.kramdown_ansi_parse(system.to_s).gsub(/\n+\z/, '').full?
     system_prompt or return
     STDOUT.puts <<~EOT
       Configured system prompt is:
@@ -307,10 +307,10 @@ class OllamaChat::MessageList
                  end
     thinking = if @chat.think.on?
                  think_annotate do
-                   message.thinking.full? { @chat.markdown.on? ? Kramdown::ANSI.parse(_1) : _1 }
+                   message.thinking.full? { @chat.markdown.on? ? @chat.kramdown_ansi_parse(_1) : _1 }
                  end
                end
-    content = message.content.full? { @chat.markdown.on? ? Kramdown::ANSI.parse(_1) : _1 }
+    content = message.content.full? { @chat.markdown.on? ? @chat.kramdown_ansi_parse(_1) : _1 }
     message_text = message_type(message.images) + " "
     message_text += bold { color(role_color) { message.role } }
     if thinking

data/lib/ollama_chat/parsing.rb

@@ -200,6 +200,11 @@ module OllamaChat::Parsing
       when file
         file = file.sub(/#.*/, '')
         file =~ %r(\A[~./]) or file.prepend('./')
+        file = begin
+                 File.expand_path(file)
+               rescue ArgumentError
+                 next
+               end
         File.exist?(file) or next
         source = file
       when url

data/lib/ollama_chat/server_socket.rb

@@ -1,24 +1,48 @@
 module OllamaChat::ServerSocket
   class << self
-    # The send_to_server_socket method sends content to the server socket and returns
-    # the response if type is :socket_input_with_response, otherwise it returns nil.
-
-    # @param content [ String ] the message to be sent to the server
-    # @param type [ Symbol ] the type of message being sent (default: :socket_input)
+    # The send_to_server_socket method transmits a message to a Unix domain
+    # socket server for processing by the Ollama Chat client.
+    #
+    # This method creates a socket server instance using the provided
+    # configuration, prepares a message with the given content, type, and parse
+    # flag, then sends it either as a simple transmission or with a response
+    # expectation depending on the message type. It is used to enable
+    # communication between external processes and the chat session via a named
+    # Unix socket.
     #
-    # @return [ String, NilClass ] the response from the server if type is
-    #   :socket_input_with_response, otherwise nil.
-    def send_to_server_socket(content, config:, type: :socket_input)
+    # @param content [ String ] the message content to be sent
+    # @param config [ ComplexConfig::Settings ] the configuration object containing server settings
+    # @param type [ Symbol ] the type of message transmission, defaults to :socket_input
+    # @param parse [ TrueClass, FalseClass ] whether to parse the response, defaults to false
+    #
+    # @return [ UnixSocks::Message, nil ] the response from transmit_with_response if type
+    # is :socket_input_with_response, otherwise nil
+    def send_to_server_socket(content, config:, type: :socket_input, parse: false)
       server  = create_socket_server(config:)
-      message = { content:, type: }
+      message = { content:, type:, parse: }
       if type.to_sym == :socket_input_with_response
-         return server.transmit_with_response(message)
+        server.transmit_with_response(message)
       else
-         server.transmit(message)
-         nil
+        server.transmit(message)
+        nil
       end
     end
 
+    # The create_socket_server method constructs and returns a Unix domain
+    # socket server instance for communication with the Ollama Chat client.
+    #
+    # This method initializes a UnixSocks::Server object configured to listen
+    # for incoming messages on a named socket file. It supports specifying a
+    # custom runtime directory for the socket, which is useful for isolating
+    # multiple instances or environments. If no runtime directory is provided
+    # in the configuration, it defaults to using the standard system location
+    # for Unix domain sockets.
+    #
+    # @param config [ComplexConfig::Settings] the configuration object
+    # containing server settings
+    #
+    # @return [UnixSocks::Server] a configured Unix domain socket server
+    # instance ready to receive messages
     def create_socket_server(config:)
       if runtime_dir = config.server_socket_runtime_dir
         UnixSocks::Server.new(socket_name: 'ollama_chat.sock', runtime_dir:)
@@ -37,9 +61,6 @@ module OllamaChat::ServerSocket
   # messages in the background. When a message is received, it updates the
   # instance variable `server_socket_message` and sends an interrupt signal
   # to the current process in order to handle the message.
-  #
-  # @return [ nil ] This method does not return any value, it only sets up the
-  # server socket and kills the process when a message is received.
   def init_server_socket
     server = OllamaChat::ServerSocket.create_socket_server(config:)
     server.receive_in_background do |message|

data/lib/ollama_chat/version.rb

@@ -1,6 +1,6 @@
 module OllamaChat
   # OllamaChat version
-  VERSION         = '0.0.21'
+  VERSION         = '0.0.23'
   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

@@ -23,4 +23,5 @@ require 'ollama_chat/vim'
 require 'ollama_chat/document_cache'
 require 'ollama_chat/history'
 require 'ollama_chat/server_socket'
+require 'ollama_chat/kramdown_ansi'
 require 'ollama_chat/chat'

data/ollama_chat.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: ollama_chat 0.0.21 ruby lib
+# stub: ollama_chat 0.0.23 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama_chat".freeze
-  s.version = "0.0.21".freeze
+  s.version = "0.0.23".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -12,19 +12,19 @@ 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/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 = [".all_images.yml".freeze, ".envrc".freeze, ".gitignore".freeze, "CHANGES.md".freeze, "Gemfile".freeze, "README.md".freeze, "Rakefile".freeze, "VERSION".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/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/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/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/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 = [".all_images.yml".freeze, ".envrc".freeze, ".gitignore".freeze, "CHANGES.md".freeze, "Gemfile".freeze, "README.md".freeze, "Rakefile".freeze, "VERSION".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/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]
   s.required_ruby_version = Gem::Requirement.new("~> 3.1".freeze)
   s.rubygems_version = "3.6.9".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/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/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]
+  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/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]
 
   s.specification_version = 4
 
-  s.add_development_dependency(%q<gem_hadar>.freeze, ["~> 1.27".freeze])
+  s.add_development_dependency(%q<gem_hadar>.freeze, ["~> 2.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])

data/spec/ollama_chat/chat_spec.rb

@@ -79,7 +79,7 @@ describe OllamaChat::Chat do
 
     it 'returns :next when input is "/drop(?:\s+(\d*))?"' do
       expect(chat.messages).to receive(:drop).with(?2)
-      expect(chat.messages).to receive(:list_conversation).with(2)
+      expect(chat.messages).to receive(:show_last)
       expect(chat.handle_input("/drop 2")).to eq :next
     end
 

data/spec/ollama_chat/message_list_spec.rb

@@ -23,6 +23,12 @@ describe OllamaChat::MessageList do
     double('Chat', config:)
   end
 
+  before do
+    allow(chat).to receive(:kramdown_ansi_parse) do |content|
+      Kramdown::ANSI.parse(content)
+    end
+  end
+
   let :list do
     described_class.new(chat).tap do |list|
       list << Ollama::Message.new(role: 'system', content: 'hello')
@@ -133,8 +139,6 @@ describe OllamaChat::MessageList do
 
   it 'can show_system_prompt' do
     expect(list).to receive(:system).and_return 'test **prompt**'
-    expect(Kramdown::ANSI).to receive(:parse).with('test **prompt**').
-      and_call_original
     expect(list.show_system_prompt).to eq list
   end
 

data/spec/ollama_chat/parsing_spec.rb

@@ -191,7 +191,7 @@ EOT
     it 'can add images' do
       images = []
       expect(chat).to receive(:add_image).
-        with(images, kind_of(IO), %r(/spec/assets/kitten.jpg\z)).
+        with(images, kind_of(IO), %r(/spec/assets/kitten\.jpg\z)).
         and_call_original
       chat.parse_content('./spec/assets/kitten.jpg', images)
       expect(images.size).to eq 1

data/spec/ollama_chat/server_socket_spec.rb

@@ -0,0 +1,133 @@
+require 'spec_helper'
+
+describe OllamaChat::ServerSocket do
+  let :instance do
+    Object.extend(described_class)
+  end
+
+  describe '#send_to_server_socket' do
+    let(:config) { double('Config') }
+    let(:server) { double('Server') }
+
+    before do
+      expect(OllamaChat::ServerSocket).to receive(:create_socket_server).with(config: config).and_return(server)
+    end
+
+    context 'with default parameters' do
+      it 'uses correct defaults' do
+        message = { content: 'test', type: :socket_input, parse: false }
+
+        expect(server).to receive(:transmit).with(message).and_return(nil)
+
+        result = OllamaChat::ServerSocket.send_to_server_socket('test', config: config)
+
+        expect(result).to be_nil
+      end
+    end
+
+    context 'with :socket_input type and parse: true' do
+      it 'sends message with parse flag and returns nil' do
+        message = { content: 'test', type: :socket_input, parse: true }
+
+        expect(server).to receive(:transmit).with(message).and_return(nil)
+
+        result = OllamaChat::ServerSocket.send_to_server_socket(
+          'test',
+          config: config,
+          type: :socket_input,
+          parse: true
+        )
+
+        expect(result).to be_nil
+      end
+    end
+
+    context 'with :socket_input_with_response type and parse: false' do
+      it 'sends message and returns response with parse flag' do
+        message = { content: 'test', type: :socket_input_with_response, parse: false }
+        response = double('Response')
+
+        expect(server).to receive(:transmit_with_response).with(message).and_return(response)
+
+        result = OllamaChat::ServerSocket.send_to_server_socket(
+          'test',
+          config: config,
+          type: :socket_input_with_response,
+          parse: false
+        )
+
+        expect(result).to eq(response)
+      end
+    end
+
+    context 'with :socket_input_with_response type and parse: true' do
+      it 'sends message and returns response with parse flag' do
+        message = { content: 'test', type: :socket_input_with_response, parse: true }
+        response = double('Response')
+
+        expect(server).to receive(:transmit_with_response).with(message).and_return(response)
+
+        result = OllamaChat::ServerSocket.send_to_server_socket(
+          'test',
+          config: config,
+          type: :socket_input_with_response,
+          parse: true
+        )
+
+        expect(result).to eq(response)
+      end
+    end
+
+  end
+
+  describe '#create_socket_server' do
+    context 'with configured runtime_dir' do
+      it 'can be created with configured runtime_dir' do
+        config = double('Config', server_socket_runtime_dir: '/custom/runtime')
+        expect(UnixSocks::Server).to receive(:new).with(
+          socket_name: 'ollama_chat.sock',
+          runtime_dir: '/custom/runtime'
+        ).and_return :unix_socks_server
+
+        result = OllamaChat::ServerSocket.create_socket_server(config: config)
+        expect(result).to eq :unix_socks_server
+      end
+    end
+
+    context 'with default runtime_dir' do
+      it 'can be created with default runtime_dir' do
+        config = double('Config', server_socket_runtime_dir: nil)
+        expect(UnixSocks::Server).to receive(:new).with(
+          socket_name: 'ollama_chat.sock'
+        ).and_return :unix_socks_server
+
+        result = OllamaChat::ServerSocket.create_socket_server(config: config)
+        expect(result).to eq :unix_socks_server
+      end
+    end
+  end
+
+  describe '#server_socket_message' do
+    it 'can be set' do
+      message = double('message')
+      instance.server_socket_message = message
+      expect(instance.server_socket_message).to eq(message)
+    end
+
+    it 'can be read' do
+      message = double('message')
+      instance.server_socket_message = message
+      expect(instance.server_socket_message).to eq(message)
+    end
+  end
+
+  describe '#init_server_socket' do
+    it 'can be initialized' do
+      config = double('Config')
+      expect(instance).to receive(:config).and_return config
+      server = double('Server', receive_in_background: :receive_in_background)
+      expect(described_class).to receive(:create_socket_server).and_return server
+      expect(instance.init_server_socket).to eq :receive_in_background
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,9 +1,5 @@
-if ENV['START_SIMPLECOV'].to_i == 1
-  require 'simplecov'
-  SimpleCov.start do
-    add_filter "#{File.basename(File.dirname(__FILE__))}/"
-  end
-end
+require 'gem_hadar/simplecov'
+GemHadar::SimpleCov.start
 require 'rspec'
 require 'tins/xt/expose'
 begin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ollama_chat
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.23
 platform: ruby
 authors:
 - Florian Frank
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.27'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.27'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: all_images
   requirement: !ruby/object:Gem::Requirement
@@ -386,6 +386,7 @@ extra_rdoc_files:
 - lib/ollama_chat/follow_chat.rb
 - lib/ollama_chat/history.rb
 - lib/ollama_chat/information.rb
+- lib/ollama_chat/kramdown_ansi.rb
 - lib/ollama_chat/message_format.rb
 - lib/ollama_chat/message_list.rb
 - lib/ollama_chat/message_output.rb
@@ -424,6 +425,7 @@ files:
 - lib/ollama_chat/follow_chat.rb
 - lib/ollama_chat/history.rb
 - lib/ollama_chat/information.rb
+- lib/ollama_chat/kramdown_ansi.rb
 - lib/ollama_chat/message_format.rb
 - lib/ollama_chat/message_list.rb
 - lib/ollama_chat/message_output.rb
@@ -468,6 +470,7 @@ files:
 - spec/ollama_chat/message_output_spec.rb
 - spec/ollama_chat/model_handling_spec.rb
 - spec/ollama_chat/parsing_spec.rb
+- spec/ollama_chat/server_socket_spec.rb
 - spec/ollama_chat/source_fetching_spec.rb
 - spec/ollama_chat/switches_spec.rb
 - spec/ollama_chat/utils/cache_fetcher_spec.rb
@@ -511,6 +514,7 @@ test_files:
 - spec/ollama_chat/message_output_spec.rb
 - spec/ollama_chat/model_handling_spec.rb
 - spec/ollama_chat/parsing_spec.rb
+- spec/ollama_chat/server_socket_spec.rb
 - spec/ollama_chat/source_fetching_spec.rb
 - spec/ollama_chat/switches_spec.rb
 - spec/ollama_chat/utils/cache_fetcher_spec.rb