llamafile 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa8d8b3b005c7f195b14adc3c06a6779302862704942399a8d622a0ab82d86c4
-  data.tar.gz: caa2a7f2c3d092b402c37a352f85aed52d1a47472d4a32685f7a0a7bdd4bcdf0
+  metadata.gz: 7b22adb7e909226fefd56fde304cfb5ba59588656c29fa35d38295ce40044d7f
+  data.tar.gz: 5654991e8854d1681e562cc01ecd5d0c4237c271be718a4561bf842d7a77c22f
 SHA512:
-  metadata.gz: 0fd5a0a86e10c80de170d2c4c4bed938036ac317ab9f866080a5c971a035605d38c9e22b711de2e53ea5c6ef7331c61d0b3a1a2d9dd58b943c0dd8451e53ab10
-  data.tar.gz: 75af1fe10bbf5224e76aeda87ff15db852fdbbd43e8f4ef9c9933a36f81593f99763172460720b7ced9f8583a0f343e4354d47a5d088fd5c5b9d864a3e97f8cc
+  metadata.gz: ecc418a654492771d3325b5695296f0723ad19ec57d24e09940c4d64eb1730a8444248d54592ef5bf17ed10e2426ac0260c6953364b10027d37498849115aac1
+  data.tar.gz: 86658abe351a2b3536be1ef2000d019cb7030f4e4c2d9947f7a9411ebf749b48c3058126012766483e976f2f3b6756a4f61f323aa06a29c36361cf0dd99333b2

data/lib/llamafile/llama.rb

@@ -47,21 +47,31 @@ module LLAMA
 	end
   end
 
-  # LLAMA.post prompt: PROMPT.make { system: "system prompt", mode: "output mode", output: "previous output", input: "new input" }
+  # LLAMA.post prompt: PROMPT.make("prompt template", params={})
   
   def self.<< i
 	fiber = Fiber.new do |ii|
-		Fiber.yield LLAMA.post(prompt: PROMPT.make(input: ii))
+		Fiber.yield LLAMA.post(prompt: i)
 	end
 	fiber.resume i
   end
+
+  def self.make t, h={}
+	fiber = Fiber.new do |tt, hh|
+		Fiber.yield LLAMA.post(prompt: PROMPT.make(tt, hh))
+	end
+	fiber.resume t, h
+  end
   
   def self.if? h={}
-	if LLAMA.post({ n_predict: 4, grammar: GRAMMAR[:bool], prompt: PROMPT.test(h) }) == 'yes'
-		return true
-	else
-		return false
+  	fiber = Fiber.new do |hh|
+		if LLAMA.post({ n_predict: 4, grammar: GRAMMAR[:bool], prompt: PROMPT.test(hh) }) == 'yes'
+			Fiber.yield true
+		else
+			Fiber.yield false
+		end
 	end
+	fiber.resume h
   end   
 end
 

data/lib/llamafile/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Llamafile
-  VERSION = "0.2.0"
+  VERSION = "0.2.2"
 end

data/lib/llamafile.rb

@@ -10,19 +10,20 @@ require_relative "llamafile/prompt"
 require_relative "llamafile/voice"
 
 module Lf
+	def self.make t, h={}
+		LLAMA.make t, h
+	end
 	def self.<< p
 		LLAMA << p
 	end
 	def self.if? h={}
 		LLAMA.if?(h)
 	end
-	def self.prompt h={}
-		LLAMA.post(prompt: PROMPT.make(h))
-	end
+	
 	@@C = Hash.new { |h,k| h[k] = C.new(k) }
 	class C
 		attr_accessor :character, :actor, :example, :format
-		attr_reader :output, :input
+		attr_reader :output, :input, :history
 		def initialize k
 			@id = k
 			@input = ""
@@ -31,25 +32,24 @@ module Lf
 			@actor = %[an honest person.]
 			@format = %[Format your response as properly formatted markdown.]
 			@example = %[# this is a heading\nThis is some general text about the heading.\n1. list item one.\n2. list item two.\n3. list item three.]
-			@convo = []
+			@history = ["Hello","Hi."]
 		end
-		def pre q, a
-			@convo << [ q, a ]
-		end
-		def convo
-			o = []; @convo[-5..-1].each { |e| o << %[User: #{e[0]}\nLlama: #{e[1]}] };
+		def conversation
+			o = @history.map { |e| o << %[User: #{e[0]}\nLlama: #{e[1]}] };
 			return o.join("\n\n")
 		end
 		def prompt
-			%[Llama is #{@character}\nUser is #{@actor}\n#{@format}\nUse this example to guide your response:\n#{@example}\n#{convo}]
+			%[Llama is #{@character}\nUser is #{@actor}\n#{@format}\nUse this example to guide your response:\n#{@example}\n#{conversation}]
 		end
 		def << i
 			chain i
 		end
 		def chain *p
 			[p].flatten.compact.each { |e|
-				@convo << [ i, Lf.prompt(output: prompt, input: i)]
+				puts %[<-- #{e}]
+				@history << [ e, Lf.make("<%= params[:output] %>\n<%= params[:input] %>", output: prompt, input: e)]
 				@output = @convo[-1][1]
+				puts %[--> #{@output}]
 				@input = e
 			}
 			return @output
@@ -64,11 +64,6 @@ module Lf
 	def self.delete k
 		@@C.delete(k)
 	end
-	def self.chain *p
-		s = {}
-		[p].flatten.compact.each { |e| o = []; s.each_pair {|k,v| o << %[User: #{k}\nLlama: #{v}] }; s[e] = Lf.prompt(output: o.join("\n"), input: e); }
-		return s
-	end
 end
 
 VOICE.hear = lambda { |tgt, voice, payload| puts %[VOICE #{tgt}: #{voice} #{payload}]; MIND.publish(%[#{tgt}/], %[Thinking like a #{voice}, #{payload}]) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: llamafile
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Erik Olson