llama-rb 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '03801e4f99933be9c0e8d559008626991535c2167af88c8cb31defb31c88d0f6'
-  data.tar.gz: 6f17e50818de906f33de2686cf1b75c0e17aa052f0fba60889bad85df0591f59
+  metadata.gz: 4f2bc2e51fa10f5dcdc890664eb5603d1f3a3742d3259d3aa8784c790ded070f
+  data.tar.gz: 2b08904fca31b95d35bb1b6ea2a2c78288898ad072aaae26b7cf3f3a8c64184a
 SHA512:
-  metadata.gz: 40602fc8c253087a78fd4e5edf5fbae24f3a4ad0d9a3bb2f6730ef701753f6815e8716303220e8edcb1984484d5ffbd20c6adb7e07690244cd738ec6918c80e8
-  data.tar.gz: 9cbf6bed4fa4359bd007d083f99976a885b1557b0bf01c4d22a55e231515adf7f66e58e951e01bf731e827b893bf6fc278a306f8a566be3e133039f210214bc2
+  metadata.gz: 3504f141131b27bca91c7348ef9617ec57d85b2ed1de67020afa46b89618fe008ce99c2df29cfe3ff1be1b01f9fe2b5b600389b298b66b7ff575767923eae6af
+  data.tar.gz: 404109c7650567a2bc2953324c0b9abda35381ecaa74bb7197e46f18e0f72e8c00f74d674009a4d25e2e458f3b77ceda605fcb91d4e954a8e9805fe2f26cc9bf

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    llama-rb (0.2.0)
+    llama-rb (0.3.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/llama/model.rb

@@ -6,29 +6,61 @@ module Llama
     class ModelError < StandardError
     end
 
-    def initialize(
+    def initialize( # rubocop:disable all
       model,
+      binary: default_binary,
       seed: Time.now.to_i,
-      n_predict: 128,
-      binary: default_binary
+      n_predict: nil,
+      threads: nil,
+      top_k: nil,
+      top_p: nil,
+      repeat_last_n: nil,
+      repeat_penalty: nil,
+      ctx_size: nil,
+      ignore_eos: nil,
+      memory_f32: nil,
+      temp: nil,
+      n_parts: nil,
+      batch_size: nil,
+      keep: nil,
+      mlock: nil
     )
       @model = model
       @seed = seed
       @n_predict = n_predict
       @binary = binary
+      @threads = threads
+      @top_k = top_k
+      @top_p = top_p
+      @repeat_last_n = repeat_last_n
+      @repeat_penalty = repeat_penalty
+      @ctx_size = ctx_size
+      @ignore_eos = ignore_eos
+      @memory_f32 = memory_f32
+      @temp = temp
+      @n_parts = n_parts
+      @batch_size = batch_size
+      @keep = keep
+      @mlock = mlock
     end
 
     def predict(prompt)
       stdout, @stderr, @status = Open3.capture3(command(prompt))
 
-      raise ModelError, "Error #{status.to_i}" unless status.success?
+      unless status.success?
+        error_string = stderr.split("\n").first
+
+        raise ModelError, "Error #{error_string}"
+      end
 
       # remove the space that is added as a tokenizer hack in examples/main/main.cpp
       stdout[0] = ''
       stdout
     end
 
-    attr_reader :model, :seed, :n_predict, :binary
+    attr_reader :model, :seed, :n_predict, :binary, :threads, :top_k, :top_p, :repeat_last_n,
+      :repeat_penalty, :ctx_size, :ignore_eos, :memory_f32, :temp, :n_parts, :batch_size, :keep,
+      :mlock
 
     private
 
@@ -38,19 +70,42 @@ module Llama
       File.join(File.dirname(__FILE__), '..', '..', 'bin', 'llama')
     end
 
-    def command(prompt)
-      escape_command(binary,
+    def command(prompt) # rubocop:disable all
+      escape_command(
+        binary,
         model: model,
         prompt: prompt,
         seed: seed,
-        n_predict: n_predict)
+        n_predict: n_predict,
+        threads: threads,
+        top_k: top_k,
+        top_p: top_p,
+        repeat_last_n: repeat_last_n,
+        repeat_penalty: repeat_penalty,
+        ctx_size: ctx_size,
+        'ignore-eos': !!ignore_eos,
+        memory_f32: !!memory_f32,
+        temp: temp,
+        n_parts: n_parts,
+        batch_size: batch_size,
+        keep: keep,
+        mlock: mlock,
+      )
     end
 
     def escape_command(command, **flags)
-      flags_string = flags.map do |key, value|
-        "--#{Shellwords.escape(key)} #{Shellwords.escape(value)}"
-      end.join(' ')
+      flags_components = []
+
+      flags.each do |key, value|
+        if value == true
+          flags_components.push("--#{Shellwords.escape(key)}")
+        elsif value
+          flags_components.push("--#{Shellwords.escape(key)} #{Shellwords.escape(value)}")
+        end
+      end
+
       command_string = Shellwords.escape(command)
+      flags_string = flags_components.join(' ')
 
       "#{command_string} #{flags_string}"
     end

data/lib/llama/version.rb

@@ -1,3 +1,3 @@
 module Llama
-  VERSION = '0.2.1'.freeze
+  VERSION = '0.3.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: llama-rb
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - zfletch
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-06 00:00:00.000000000 Z
+date: 2023-04-07 00:00:00.000000000 Z
 dependencies: []
 description: ggerganov/llama.cpp with Ruby hooks
 email: