llamafile 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f65be502a0aaa502ab94785114d66f057e9af629cda650851a39c73d3b78c97
-  data.tar.gz: 376add4a170db17299c3e11b1f2cc20313433894c1264c1ee729827b240ec08d
+  metadata.gz: 69461d4fef1f2c1f6c10e899443b6440f73ddac25da733ab88bac5404e5b683f
+  data.tar.gz: 27c0ca0a03ffcd32de69bc2d06488dd724159897c7a64a0f3848e765b44e0e9c
 SHA512:
-  metadata.gz: 13ccc9565d30515cafe42c61ee8e32c270e89399d1189b0f834285f277f70e31351b8ff0fdcdcacec0b5f78f16960768115918a4f3ee60ad92a03e16fda94e74
-  data.tar.gz: 3ef5540c172c6bdb6b021b20bfa0cbba2420f70059903a9961eb83586aaf2ae91ed069101d6b92100de396313825cbf8f4a767a79ff0b6b547ac430bba90b7f1
+  metadata.gz: 3cb14dbffb8d76109a4777493bf2c937505dca106277aa9cc8946b0e51a7580af7719724142fa0dc741f9a85b1225a92a88df771889a59e7d32c45d629e954db
+  data.tar.gz: 63e72fb3177eb128fb5677d21dc22fafc191390aba42ca978fe3ce0cefda073a7dd0ee760e3559e52e5b41f344f474b7c24f4a3c1d07259cdd764f29e95b923f

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.1"
+  VERSION = "0.2.3"
 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,20 +32,14 @@ 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 = []
-		end
-		def fact q, a
-			@convo << [ q, a ]
+			@history = ["Hello","Hi."]
 		end
-		def hist
-			@convo
-		end
-		def convo
-			o = []; @convo[-5..-1].each { |e| o << %[User: #{e[0]}\nLlama: #{e[1]}] };
+		def conversation
+			o = @history.map { |e| %[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
@@ -52,7 +47,7 @@ module Lf
 		def chain *p
 			[p].flatten.compact.each { |e|
 				puts %[<-- #{e}]
-				@convo << [ e, Lf.prompt(output: prompt, input: e)]
+				@history << [ e, Lf.make("<%= params[:output] %>\n<%= params[:input] %>", output: prompt, input: e)]
 				@output = @convo[-1][1]
 				puts %[--> #{@output}]
 				@input = e
@@ -69,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.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Erik Olson