llamafile 0.3.5 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e7a366c441e6feef72b17cf6cbfd3a758768b973c3454131c0e18eac09dc7ad
-  data.tar.gz: 01b3d50cf746afeea018769bcf0b8b55413876064ba580be5b8b4c8297703a54
+  metadata.gz: c08f0c8c4a3230f3a43e859ea03d391a5a48790202cc558a32dcf7d97522be08
+  data.tar.gz: e0c73f07843c6d70dd036e742f653b4123b5e728e13e3cf40b128006d4e9a6e6
 SHA512:
-  metadata.gz: 02d69af21ca3be1c43831620add093d25ba03bae55730fcbbc2774a6cd4b58ad3bcc0833727682615bfc4ec3b74f6ee3252af083ffddb919c0aa6760cdfcceef
-  data.tar.gz: 2d764141eb69c1184b5c317359cd9f250a205e08461d92d21b6fb6249882ee9a0e29bd0a84dfe623b88101d8d55c7db6b86b0b5f29b057420da48c0caa43e1fe
+  metadata.gz: a01711608b5ebe36229d9d79b19fa486864ba11b7e799755f9be53bfe8fe4570fb72877a82e6bd8944bf22a2bb4fdc55d229450d0595e72a51a9fa63f53399ba
+  data.tar.gz: 92561b3595845a9a25f468220847a8e527b13ebccc4ce6c97c16d45f703153033fa9d543d6cfb2c35c13288373a95db662cc6298f639c6c912c364be29e5fcb0

data/lib/llamafile/llama.rb

@@ -38,27 +38,27 @@ module LLAMA
       body: JSON.generate(DEF.merge(h)) 
     }
     #puts %[LLAMA PACK: #{hh}]
-    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
+    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
+		end
+	rescue => err
+		puts %[LLAMA POST ERR: #{err}]
 		return false
 	end
   end
 
-  # LLAMA.post prompt: PROMPT.make("prompt template", params={})
-  
-  def self.<< i
-	fiber = Fiber.new do |ii|
-		Fiber.yield LLAMA.post(prompt: ii)
-	end
-	fiber.resume i
-  end
-
   def self.make h={}
 	fiber = Fiber.new do |hh|
-		Fiber.yield LLAMA.post(prompt: PROMPT.make(hh))
+		if r = LLAMA.post(prompt: PROMPT.make(hh))
+			Fiber.yield r
+		else
+			Fiber.yield false
+		end
 	end
 	fiber.resume h
   end
@@ -73,5 +73,26 @@ module LLAMA
 	end
 	fiber.resume h
   end   
+
+  def self.test h={}
+  	fiber = Fiber.new do |hh|
+  		hh[:grammar] = GRAMMAR[:bool]
+		if LLAMA.post(hh) == 'yes'
+			Fiber.yield true
+		else
+			Fiber.yield false
+		end
+	end
+	fiber.resume h
+  end
+
+  def self.prompt h={}, &b
+  	if block_given?
+		fiber = Fiber.new { |hh| Fiber.yield b.call(LLAMA.post(hh)) }
+	else
+		fiber = Fiber.new { |hh| Fiber.yield LLAMA.post(hh) }
+	end
+	fiber.resume h	
+  end
 end
 

data/lib/llamafile/version.rb

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

data/lib/llamafile.rb

@@ -6,22 +6,19 @@ require_relative "llamafile/version"
 require_relative "llamafile/mind"
 require_relative "llamafile/llama"
 require_relative "llamafile/grammar"
-require_relative "llamafile/prompt"
-require_relative "llamafile/voice"
+#require_relative "llamafile/prompt"
+#require_relative "llamafile/voice"
 
 module Lf
 	def self.make h={}
 		LLAMA.make h
 	end
-	def self.<< p
-		LLAMA << p
-	end
 	def self.if? h={}
 		LLAMA.if?(h)
 	end
 end
 
-require_relative "llamafile/actor"
+#require_relative "llamafile/actor"
 
 VOICE.hear = lambda { |tgt, voice, payload| puts %[VOICE #{tgt}: #{voice} #{payload}]; MIND.publish(%[#{tgt}/], %[Thinking like a #{voice}, #{payload}]) }
 MIND.input = lambda { |tgt, payload| puts %[THINK INPUT #{tgt}: #{payload}]; VOICE.hear(tgt, payload); }

metadata

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