ollama_chat 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2f4b23386064513dc339fa0b3479e70c8e15b091b146bfcf700602fd1497b87
-  data.tar.gz: ce9857a08de2bec94a1e19b5e28a13535657ebdab3ca977fe2b5582a86708bb7
+  metadata.gz: 36395404aa00934bda9f2229306a374143c30046bf7439188d369b9fe167f649
+  data.tar.gz: 2dc4c482a17e31a86c347d557475af52eccbe6638f2487abc564c11b5ef379b7
 SHA512:
-  metadata.gz: c7bcfbc3966c7189cc3d93b6ac3e09a49d79b1dd3bbfd5ed729a7ae5484ef7fcdadd194705363c574f18dd43f11c6c8d204577292516c3f9b286ba4380417e41
-  data.tar.gz: 855accf3d5d72aa6c8a6cdd9fc8e534db40d97a4533bee03fc6a240cc5a12b8da46f304d02cf1c71378f592347866b84a95e9b18f9046975f630902996dd409a
+  metadata.gz: ece58d0452a5695dc3fec1a1032a9e45a6e9400085e48f512c13b9473acd53596a55d69a7f9264689fdb0a3b3335b8223547efbc504c9a3052a85e5ef9a0cc89
+  data.tar.gz: 11a052d21eed75504722adde01ff43c10213ba371887b7f376fdbe4b962cf3dd3bd550325341af16c2215101776ca14753cf353eec221f3f5e98fff386053f51

data/CHANGES.md

@@ -1,5 +1,16 @@
 # Changes
 
+## 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,

data/README.md

@@ -144,6 +144,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/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

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
@@ -67,6 +68,8 @@ class OllamaChat::Chat
     @images        = []
     init_chat_history
     init_server_socket
+  rescue ComplexConfig::AttributeMissing, ComplexConfig::ConfigurationSyntaxError => e
+    fix_config(e)
   end
 
   attr_reader :ollama
@@ -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/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/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.8'
   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.8 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama_chat".freeze
-  s.version = "0.0.7".freeze
+  s.version = "0.0.8".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".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.8
 platform: ruby
 authors:
 - Florian Frank