llamafile 0.3.9 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f3686b69a33f6422b291c25dff604a5dc8175ad2e20d1dc3702a1e5532c76c1
-  data.tar.gz: f4bb41a795d358c09d06f03c72db44851c2b88ba2615dcdf4a0e4f8bf79c3341
+  metadata.gz: ecc7265e061f8bc2abedbb40ae7642590d640285b67610a6832ecf9712c9debe
+  data.tar.gz: 8210a87d0facedfa9c8a1d7cfb4ded91231935716d1c244a03f47097c60dc603
 SHA512:
-  metadata.gz: f91f2bd7d09782a430dad150af2b3acf4e2552ad56738f97045e7584f6360a6ce4eafbca6f350d0cebb139f14c690c6c256a4c913111018df0cbf006331de434
-  data.tar.gz: 030e39dcb743f45512512399c3a1eed818ec73356abb0b6f94107e50bae801e905cc027220939f9dc294cb5b91879c3127c9f03a64c43be7de668ed7fa35a2f4
+  metadata.gz: b6c5e65dd402325172b92b363d94cc3c3640036e6bc18390979516b0b4624d14d84a19c61a5af54c8670eba30eaf5c1eedf29147a3a8f83e15bf16deea76dda3
+  data.tar.gz: 35f791caed2c0e5f4f19ed38e56cbe2d0c64497720fd7d961364f13b23affabe8e5757a468f6c1930d0127a6c2ca1112ccf73404fc37fccbb728a156ec2746d7

data/lib/llamafile/llama.rb

@@ -27,7 +27,7 @@ module LLAMA
     base_uri ENV['LLAMA']
     #default_timeout 120
   end
-  def self.post h={}
+  def self.post h={}, &b
   	#puts %[LLAMA IN: #{h}]
     hh = { 
       headers: { 
@@ -38,18 +38,26 @@ module LLAMA
       body: JSON.generate(DEF.merge(h)) 
     }
     #puts %[LLAMA PACK: #{hh}]
-    begin
-	    r = Llama.post('/completion', hh)
-    	#puts %[LLAMA CODE: #{r.code}]
-    	if r.code == 200
-			return r['content'].gsub(/<.+>/, "").gsub(/\s\s+/, " ").gsub(/\n+/, "\n");
-		else
-			return false
+    fiber = Fiber.new do |hhh|
+    	begin
+	    	r = Llama.post('/completion', hhh)
+    		#puts %[LLAMA CODE: #{r.code}]
+    		if r.code == 200
+    			rr = r['content'].gsub(/<.+>/, "").gsub(/\s\s+/, " ").gsub(/\n+/, "\n");
+    			if block_given?
+					Fiber.yield b.call(rr);
+				else
+					Fiber.yield rr;
+				end
+			else
+				Fiber.yield false
+			end
+		rescue => err
+			puts %[LLAMA POST ERR: #{err}]
+			Fiber.yield false
 		end
-	rescue => err
-		puts %[LLAMA POST ERR: #{err}]
-		return false
 	end
+	fiber.resume(hh)
   end
 
   def self.make h={}

data/lib/llamafile/version.rb

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

data/lib/llamafile.rb

@@ -10,11 +10,46 @@ require_relative "llamafile/grammar"
 #require_relative "llamafile/voice"
 
 module Lf
-	def self.make h={}
-		LLAMA.make h
+	AI = %[a helpful artificial intelligence who responds accurately and truthfully to User.]
+	AND_YN = %[ Respond yes or no.]
+	@@CHAR = AI
+	def self.character
+		@@CHAR
 	end
-	def self.if? h={}
-		LLAMA.if?(h)
+	def self.inspector
+		%[#{@@CHAR} #{AND_YN}]
+	end
+
+	@@TMPL = {
+		does: %[AI is <%= Lf.inspector %>\nUser: Does "<%= response %>" <%= condition %> "<%= query %>"\nAI: ],
+		user: %[AI is <%= Lf.character %>\nUser: <%= query %>\nAI: ],
+		task: %[AI is <%= Lf.character %>\nUser: <%= inst %>\n<%= query %>\nAI: ],
+	}
+	def self.template
+		@@TMPL
+	end
+	
+	def self.erb s, params={}
+		ERB.new(s).result(binding)
+	end
+	
+	def self.does? query, response, condition
+		LLAMA.post(n_predict: 4, grammar: GRAMMAR[:bool], prompt: Lf.erb(Lf.template[:does])) == yes;
+	end
+	def self.number query
+		LLAMA.post(grammar: GRAMMAR[:number], prompt: Lf.erb(Lf.template[:user]));
+	end	
+	def self.word query
+		LLAMA.post(grammar: GRAMMAR[:word], prompt: Lf.erb(Lf.template[:user]));
+	end	
+	def self.user query
+		LLAMA.post(grammar: GRAMMAR[:string], prompt: Lf.erb(Lf.template[:user]));
+	end
+	def self.list query
+		LLAMA.post(grammar: GRAMMAR[:list], prompt: Lf.erb(Lf.template[:user]));
+	end
+	def self.task inst, query
+		LLAMA.post(grammar: GRAMMAR[:steps], prompt: Lf.erb(Lf.template[:task]));
 	end
 end
 

metadata

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