ollama-ruby 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44b2b4e2384b4f05a8457cf9dbcd7d9c654ceff267080245d5d7a1915554743b
-  data.tar.gz: b03c72fed7968802c87681464b6bcd365f05906a351f7cdcde61dc60661f15cd
+  metadata.gz: 96d3c8afe0962abc4938b2e2d6cea5dd773e224ac05e87f819b371429083d79d
+  data.tar.gz: 6e293ec73919c33eede640b9043b9adfff00f5d9761c1d2759f022016a2b6daa
 SHA512:
-  metadata.gz: 7ab16b2e5b23dbe1b94f240124c70a9073184af44d7cbdc31c6fedab92960f30b0a605c4e499eb7ac0a93f7cdf2b72ea62a380d4ea29e2d5d79d2667eabfc1c0
-  data.tar.gz: 20e6c0e290ad0c076fede5bde2d0959da37697e17d0ed90fb6e136bc8f6ab3c4084202086299a38b27ca62084dafb6979394b9bb2d52c47f553ca2eeaa32959f
+  metadata.gz: c11223503b8ff33ed77c0629f52ea5eb703ac8fc838b6a258e27e07eda297c66ad40ec672fccf1e5dd9e00f432754b219196114dd1bed93bacdd7760451d88db
+  data.tar.gz: 2d089cfaaeccced65a17dbe622ec9f621238241c25c24b6504815310e3bc157f3a7baba95747275d4300292722dc5df2a74fa6cef581a7997af65e9bd86613cb

data/CHANGES.md

@@ -1,5 +1,16 @@
 # Changes
 
+## 2025-02-17 v0.16.0
+
+* Updated Ollama CLI with new handler that allows saving of chat and
+  continuation with `ollama_chat`:
+  * Added `require 'tins/xt/secure_write'` and `require 'tmpdir'`.
+  * Created a new `ChatStart` class that handles chat responses.
+  * Updated options parsing to use `ChatStart` as the default handler.
+  * Changed code to handle `ChatStart` instances.
+  * Added secure write functionality for chat conversation in tmpdir.
+* Added `yaml-dev` to `apk add` command in `.all_images.yml`
+
 ## 2025-02-12 v0.15.0
 
 * Added "version" command to display version of the ollama server:

data/bin/ollama_cli

@@ -4,7 +4,30 @@ require 'ollama'
 include Ollama
 require 'tins'
 include Tins::GO
+require 'tins/xt/secure_write'
 require 'json'
+require 'tmpdir'
+
+class ChatStart
+  include Ollama::Handlers::Concern
+
+  def initialize(output: $stdout)
+    super
+    @output.sync = true
+    @content     = ''
+  end
+
+  attr_reader :content
+
+  def call(response)
+    if content = response.response
+      @content << content
+      @output << content
+    end
+    response.done and @output.puts
+    self
+  end
+end
 
 # Returns the contents of a file or string, or a default value if neither is provided.
 #
@@ -49,7 +72,7 @@ def usage
       -p PROMPT      the user prompt to use as a file, $OLLAMA_PROMPT
                      if it contains %{stdin} it is substituted by stdin input
       -P VARIABLE    sets prompt var %{foo} to "bar" if VARIABLE is foo=bar
-      -H HANDLER     the handler to use for the response, defaults to Print
+      -H HANDLER     the handler to use for the response, defaults to ChatStart
       -S             use streaming for generation
       -h             this help
 
@@ -57,7 +80,7 @@ def usage
   exit 0
 end
 
-opts = go 'u:m:M:s:p:P:H:Sh', defaults: { ?H => 'Print', ?M => '{}' }
+opts = go 'u:m:M:s:p:P:H:Sh', defaults: { ?H => 'ChatStart', ?M => '{}' }
 
 opts[?h] and usage
 
@@ -91,11 +114,30 @@ if ENV['DEBUG'].to_i == 1
   EOT
 end
 
+handler = Object.const_get(opts[?H])
+handler == ChatStart and handler = handler.new
+
 Client.new(base_url:, read_timeout: 120).generate(
   model:,
   system:,
   prompt:,
   options:,
   stream: !!opts[?S],
-  &Object.const_get(opts[?H])
+  &handler
 )
+
+if handler.is_a?(ChatStart)
+  filename = File.join(Dir.tmpdir, 'chat_start_%u.json' % $$)
+  File.secure_write(filename) do |out|
+    JSON.dump(
+      [
+        Message.new(role: 'user', content: prompt),
+        Message.new(role: 'assistant', content: handler.content),
+      ],
+      out
+    )
+  end
+  if STDERR.tty?
+    STDERR.puts "\nContinue the chat with: ollama_chat -c '%s'" % filename
+  end
+end

data/lib/ollama/version.rb

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

data/ollama-ruby.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: ollama-ruby 0.15.0 ruby lib
+# stub: ollama-ruby 0.16.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ollama-ruby".freeze
-  s.version = "0.15.0".freeze
+  s.version = "0.16.0".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Florian Frank".freeze]
-  s.date = "2025-02-12"
+  s.date = "2025-02-17"
   s.description = "Library that allows interacting with the Ollama API".freeze
   s.email = "flori@ping.de".freeze
   s.executables = ["ollama_console".freeze, "ollama_update".freeze, "ollama_cli".freeze]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ollama-ruby
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Florian Frank
 bindir: bin
 cert_chain: []
-date: 2025-02-12 00:00:00.000000000 Z
+date: 2025-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar