ollama_chat 0.0.7 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2f4b23386064513dc339fa0b3479e70c8e15b091b146bfcf700602fd1497b87
-  data.tar.gz: ce9857a08de2bec94a1e19b5e28a13535657ebdab3ca977fe2b5582a86708bb7
+  metadata.gz: c66eb0eb6290d5161516ac786036a66c381339db5ea9a91039efc0c26b069591
+  data.tar.gz: a762ad194903ce17b01d07fa44af1b2e2fc832049ae5ec665da0236291a58561
 SHA512:
-  metadata.gz: c7bcfbc3966c7189cc3d93b6ac3e09a49d79b1dd3bbfd5ed729a7ae5484ef7fcdadd194705363c574f18dd43f11c6c8d204577292516c3f9b286ba4380417e41
-  data.tar.gz: 855accf3d5d72aa6c8a6cdd9fc8e534db40d97a4533bee03fc6a240cc5a12b8da46f304d02cf1c71378f592347866b84a95e9b18f9046975f630902996dd409a
+  metadata.gz: b133ad766292019028dc584a6197d8cc84503e8260307a9fbf141a9635a1b798bffe5f24dbe2de88c6a62408b51fbed0a9826fa0a9716fafc22c0b3c63092a2a
+  data.tar.gz: d200903b0f20a6135c8603f831e454fdcdbc272bf646984ca733566e932fa2590fb89848d7776e1ae2ac7f37143966b18b489c73ec30c1b56e348dbf154435e7

data/CHANGES.md

@@ -1,8 +1,30 @@
 # Changes
 
+## 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`:
+  * 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.
+  * Modified usage message in `README.md` and `information.rb` files.
+
+## 2025-05-23 v0.0.8
+
+* Introduce `fix_config` method to rescue `ComplexConfig` exceptions and prompt
+  user for correction.
+  * Added section to README.md on using `ollama_chat_send` to send input to a
+  running `ollama_chat` process.
+* Fix path existence check and cleanup on server socket initialization.
+  * Added check for existing path at
+    `OllamaChat::ServerSocket.server_socket_path` to prevent overwrite.
+  * Clean up server socket file if it exists when leaving thread.
+
 ## 2025-05-22 v0.0.7
 
-* Added `ollama_chat_send` executable in `/bin`, required 'ollama_chat' gem,
+* Added `ollama_chat_send` executable in `/bin`, required `ollama_chat` gem,
   sent user input to Ollama server via
   `OllamaChat::ServerSocket.send_to_server_socket` method and handled
   exceptions and exit with non-zero status code if an error occurs.

data/README.md

@@ -31,6 +31,7 @@ Usage: ollama_chat [OPTIONS]
   -D DOCUMENT    load document and add to embeddings collection (multiple)
   -M             use (empty) MemoryCache for this chat session
   -E             disable embeddings for this chat session
+  -S             open a socket to receive input from ollama_chat_send
   -V             display the current version number and quit
   -h             this help
 ```
@@ -144,6 +145,27 @@ The following commands can be given inside the chat, if prefixed by a `/`:
 /help                           to view this help
 ```
 
+### Using `ollama_chat_send` to send input to a running `ollama_chat`
+
+You can do this from the shell by pasting into the `ollama_chat_send`
+executable.
+
+```
+$ echo "Why is the sky blue?" | ollama_chat_send
+```
+
+To send a text from inside a `vim` buffer, you can use a function/leader like
+this:
+
+```
+map <leader>o :<C-U>call OllamaChatSend(@*)<CR>
+
+function! OllamaChatSend(input)
+  let input = "Take note of the following code snippet (" . &filetype . ") **AND** await further instructions:\n\n```\n" . a:input . "\n```\n"
+  call system('ollama_chat_send', input)
+endfunction
+```
+
 ## Download
 
 The homepage of this app is located at

data/Rakefile

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

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.9

data/lib/ollama_chat/chat.rb

@@ -13,6 +13,7 @@ require 'pdf/reader'
 require 'csv'
 require 'xdg'
 require 'socket'
+require 'shellwords'
 
 class OllamaChat::Chat
   include Tins::GO
@@ -31,7 +32,7 @@ class OllamaChat::Chat
   include OllamaChat::ServerSocket
 
   def initialize(argv: ARGV.dup)
-    @opts               = go 'f:u:m:s:c:C:D:MEVh', argv
+    @opts               = go 'f:u:m:s:c:C:D:MESVh', argv
     @opts[?h] and exit usage
     @opts[?V] and exit version
     @ollama_chat_config = OllamaChat::OllamaChatConfig.new(@opts[?f])
@@ -66,7 +67,9 @@ class OllamaChat::Chat
     @current_voice = config.voice.default
     @images        = []
     init_chat_history
-    init_server_socket
+    @opts[?S] and init_server_socket
+  rescue ComplexConfig::AttributeMissing, ComplexConfig::ConfigurationSyntaxError => e
+    fix_config(e)
   end
 
   attr_reader :ollama
@@ -328,7 +331,7 @@ class OllamaChat::Chat
       content, tags = if parse_content
                         parse_content(content, @images)
                       else
-                        [ content, Documentrix::Utils::Tags.new ]
+                        [ content, Documentrix::Utils::Tags.new(valid_tag: /\A#*([\w\]\[]+)/) ]
                       end
 
       if embedding.on? && content
@@ -376,6 +379,8 @@ class OllamaChat::Chat
       STDOUT.puts "Type /quit to quit."
     end
     0
+  rescue ComplexConfig::AttributeMissing, ComplexConfig::ConfigurationSyntaxError => e
+    fix_config(e)
   ensure
     save_history
   end
@@ -445,4 +450,19 @@ class OllamaChat::Chat
       )
     end
   end
+
+  def fix_config(exception)
+    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
+      system Shellwords.join([
+        @ollama_chat_config.diff_tool,
+        @ollama_chat_config.filename,
+        @ollama_chat_config.default_config_path,
+      ])
+      exit 0
+    else
+      exit 1
+    end
+  end
 end

data/lib/ollama_chat/information.rb

@@ -102,6 +102,7 @@ module OllamaChat::Information
         -D DOCUMENT    load document and add to embeddings collection (multiple)
         -M             use (empty) MemoryCache for this chat session
         -E             disable embeddings for this chat session
+        -S             open a socket to receive input from ollama_chat_send
         -V             display the current version number and quit
         -h             this help
 

data/lib/ollama_chat/ollama_chat_config.rb

@@ -4,9 +4,10 @@ class OllamaChat::OllamaChatConfig
   include ComplexConfig
   include FileUtils
 
-  DEFAULT_CONFIG = File.read(
-    Pathname.new(__FILE__).dirname.join('ollama_chat_config/default_config.yml')
-  )
+  DEFAULT_CONFIG_PATH = Pathname.new(__FILE__).dirname.
+    join('ollama_chat_config/default_config.yml')
+
+  DEFAULT_CONFIG = File.read(DEFAULT_CONFIG_PATH)
 
   def initialize(filename = nil)
     @filename = filename || default_path
@@ -30,6 +31,10 @@ class OllamaChat::OllamaChatConfig
 
   attr_reader :config
 
+  def default_config_path
+    DEFAULT_CONFIG_PATH
+  end
+
   def default_path
     config_dir_path + 'config.yml'
   end
@@ -45,4 +50,8 @@ class OllamaChat::OllamaChatConfig
   def database_path
     cache_dir_path + 'documents.db'
   end
+
+  def diff_tool
+    ENV.fetch('DIFF_TOOL', 'vimdiff')
+  end
 end

data/lib/ollama_chat/parsing.rb

@@ -113,10 +113,10 @@ module OllamaChat::Parsing
 
   def parse_content(content, images)
     images.clear
-    tags = Documentrix::Utils::Tags.new
+    tags = Documentrix::Utils::Tags.new valid_tag: /\A#*([\w\]\[]+)/
 
     contents = [ content ]
-    content.scan(%r((https?://\S+)|(#\S+)|(?:file://)?(\S*\/\S+))).each do |url, tag, file|
+    content.scan(%r((https?://\S+)|(?<![a-zA-Z\d])#+([\w\]\[]+)|(?:file://)?(\S*\/\S+))).each do |url, tag, file|
       case
       when tag
         tags.add(tag)

data/lib/ollama_chat/server_socket.rb

@@ -21,6 +21,9 @@ module OllamaChat::ServerSocket
 
   def init_server_socket
     FileUtils.mkdir_p OllamaChat::ServerSocket.runtime_dir
+    if File.exist?(OllamaChat::ServerSocket.server_socket_path)
+      raise Errno::EEXIST, "Path already exists #{OllamaChat::ServerSocket.server_socket_path.inspect}"
+    end
     Thread.new do
       Socket.unix_server_loop(OllamaChat::ServerSocket.server_socket_path) do |sock, client_addrinfo|
         begin
@@ -33,6 +36,8 @@ module OllamaChat::ServerSocket
         end
       end
     rescue Errno::ENOENT
+    ensure
+      FileUtils.rm_f OllamaChat::ServerSocket.server_socket_path
     end
   end
 end

data/lib/ollama_chat/version.rb

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

data/ollama_chat.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: ollama_chat 0.0.7 ruby lib
+# stub: ollama_chat 0.0.9 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama_chat".freeze
-  s.version = "0.0.7".freeze
+  s.version = "0.0.9".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency(%q<simplecov>.freeze, [">= 0".freeze])
   s.add_runtime_dependency(%q<excon>.freeze, ["~> 1.0".freeze])
   s.add_runtime_dependency(%q<ollama-ruby>.freeze, ["~> 1.0".freeze])
-  s.add_runtime_dependency(%q<documentrix>.freeze, ["~> 0.0".freeze])
+  s.add_runtime_dependency(%q<documentrix>.freeze, ["~> 0.0".freeze, ">= 0.0.2".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])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ollama_chat
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.9
 platform: ruby
 authors:
 - Florian Frank
@@ -142,6 +142,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -149,6 +152,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: rss
   requirement: !ruby/object:Gem::Requirement