llamafile 0.4.9 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5045b21fc2338baff2c3035474ca7d3c4788e0ff2aafdeeea5b48a7993bcdacf
-  data.tar.gz: f64deb0fdbe227cf4888d440e69f4deb8bad1ea6f302f464aad7aa52f868db53
+  metadata.gz: dd2f077f1692c00a61954000c64dc038004e24fe0df98c4a440316516e0d9a4a
+  data.tar.gz: 7a2dbf3c9191d974fea4fe1f0c2d8c51d35a01bd0c9a48b0adf5d5331e8aa0dc
 SHA512:
-  metadata.gz: 8b839ab0fdd4b0ac3a37bb3ba9542476d7bc6cd769b6089a5f4db905739ca18b42d511bc1cf691b85de1b02391d41d9f80e56c99500eea0a44599999b154dd59
-  data.tar.gz: d418a352e7c15d2d2910000ba7bae52a8ba24a81a250f47d904b9e33b4384cf62a06d22d602f0c55ad26980b0ba5b05980b4eaa387372d5a4eca08ff14e05dc9
+  metadata.gz: 96777f7209ab075189c7f01218a852d73d33c5bb218eb015e8ef9958024a3f371051d3cfc0effab4cdd588a060177cfb599becc7fa61eea94f05139ea4b55094
+  data.tar.gz: 834d4b313d6894b3c612cc2bd696d34d2d719bffa8eca6c6391ccae0b7a974e6c2c620052c8d2e3167cef2aaa4e71811c63661fc3e2cee4a2025f23f46963d46

data/lib/llamafile/llama.rb

@@ -1,4 +1,4 @@
-require 'httparty'
+
 module LLAMA                                               
   DEF = { 
     stream: false,
@@ -25,19 +25,12 @@ module LLAMA
   class Llama
     include HTTParty
     base_uri ENV['LLAMA']
-    #default_timeout 120
   end
   def self.post h={}, &b
-  	#puts %[LLAMA IN: #{h}]
     hh = { 
-      headers: { 
-	"Content-Type": "application/json",
-	"Connection": 'keep-alive',
-	"Priority": 'u=0'
-      }, 
+      headers: { "Content-Type": "application/json", "Connection": 'keep-alive', "Priority": 'u=0' }, 
       body: JSON.generate(DEF.merge(h)) 
     }
-    #puts %[LLAMA PACK: #{hh}]
     fiber = Fiber.new do |hhh|
     	begin
 	    	r = Llama.post('/completion', hhh)
@@ -59,49 +52,5 @@ module LLAMA
 	end
 	fiber.resume(hh)
   end
-
-  def self.make h={}
-	fiber = Fiber.new do |hh|
-		if r = LLAMA.post(prompt: PROMPT.make(hh))
-			Fiber.yield r
-		else
-			Fiber.yield false
-		end
-	end
-	fiber.resume h
-  end
-  
-  def self.if? h={}
-  	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   
-
-  def self.test h={}
-  	fiber = Fiber.new do |hh|
-  		hh[:grammar] = GRAMMAR[:bool]
-  		hh[:n_predict] = 4
-		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.4.9"
+  VERSION = "0.5.0"
 end

data/lib/llamafile.rb

@@ -1,19 +1,68 @@
 # frozen_string_literal: true
 
-require 'mqtt'
+require 'httparty'
 
 require_relative "llamafile/version"
-#require_relative "llamafile/mind"
-require_relative "llamafile/llama"
-require_relative "llamafile/grammar"
-#require_relative "llamafile/prompt"
-#require_relative "llamafile/voice"
+
+module LLAMA                                               
+  DEF = { 
+    stream: false,
+    grammar: %[root ::= l+\nl ::= i "\n"\ni ::= [^\n\t{|}]+ [.!?]], 
+    n_predict: 2048, 
+    n_probs: 0,
+    cache_prompt: true,
+    min_keep: 10,
+    min_p: 0.05,
+    mirostat: 2,
+    mirostat_eta: 0.1,
+    mirostat_tau: 5,
+    repeat_lat_n: 256,
+    repeat_penalty: 2,
+    slot_id: -1,
+    temperature: 0,
+    tfs_z: 1,
+    top_k: 95,
+    top_p: 0.95,
+    typical_p: 1,
+    stop: ['</s>','Llama:','User:']
+  }
+                                                                                                                                       
+  class Llama
+    include HTTParty
+    base_uri ENV['LLAMA']
+  end
+  def self.post h={}, &b
+    hh = { 
+      headers: { "Content-Type": "application/json", "Connection": 'keep-alive', "Priority": 'u=0' }, 
+      body: JSON.generate(DEF.merge(h)) 
+    }
+    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
+	end
+	fiber.resume(hh)
+  end
+end
 
 module Lf
 	AI = %[a helpful artificial intelligence who responds accurately and truthfully to User.]
 
 	AND_BOOL = %[ Respond yes or no.]
-	AND_WORD = %[ Respond with a single word.]
 	
 	@@CHAR = AI
 	def self.character
@@ -22,57 +71,39 @@ module Lf
 	def self.inspector
 		%[#{@@CHAR} #{AND_BOOL}]
 	end
-	def self.researcher
-		%[#{@@CHAR} #{AND_WORD}]
-	end
 
+	@@GRAM = {
+	  bool: %[root ::= "yes" | "no"],
+  	  string: %[root ::= en+ (" " en+)+ "\n"\nen ::= [a-zA-Z] | [.!?]],		
+	}
+	def self.grammar
+		@@GRAM
+	end
+	
 	@@TMPL = {
-		does: %[AI is <%= Lf.inspector %>\nUser: Does "<%= @response %>" <%= @condition %> "<%= @query %>"\nAI: ],
-		word: %[AI is <%= Lf.researcher %>\nUser: <%= @query %>\nAI: ],
-		user: %[AI is <%= Lf.character %>\nUser: <%= @query %>\nAI: ],
-		task: %[AI is <%= Lf.character %>\nUser: <%= @query.join("\n") %>\nAI: ],
+		bool: %[AI is <%= Lf.inspector %>\nUser: Does "<%= @output %>" <%= @condition %> "<%= @input %>"\nAI: ],
+		string: %[AI is <%= Lf.character %>\nUser: <%= [@query].flatten.join("\n") %>\nAI: ],
 	}
 	def self.template
 		@@TMPL
 	end
 	
-	def self.erb s, params={}
+	def self.erb s
 		ERB.new(s).result(binding)
 	end
 	
-	def self.does? r, c, q
-		@query = q
-		@response = r
-		@condition = c
-		LLAMA.post(n_predict: 4, grammar: GRAMMAR[:bool], prompt: Lf.erb(Lf.template[:does])) == 'yes';
+	def self.does? output, condition, input
+		@input = input
+		@output = output
+		@condition = condition
+		LLAMA.post(n_predict: 4, grammar: @@GRAM[:bool], prompt: Lf.erb(Lf.template[:bool])) == 'yes';
 	end
-	
-	def self.number q
-		@query = q
-		LLAMA.post(grammar: GRAMMAR[:number], prompt: Lf.erb(Lf.template[:user]));
-	end	
-	def self.word q
-		@query = q
-		LLAMA.post(grammar: GRAMMAR[:word], prompt: Lf.erb(Lf.template[:word]));
-	end	
-	def self.string q
-		@query = q
-		LLAMA.post(grammar: GRAMMAR[:string], prompt: Lf.erb(Lf.template[:user]));
-	end
-	def self.list q
-		@query = q
-		LLAMA.post(grammar: GRAMMAR[:list], prompt: Lf.erb(Lf.template[:user]));
+	def self.prompt input
+		@input = input
+		LLAMA.post(grammar: @@GRAM[:string], prompt: Lf.erb(Lf.template[:string]));
 	end
-	def self.task *q
-		@query = q
-		LLAMA.post(grammar: GRAMMAR[:string], prompt: Lf.erb(Lf.template[:task]));
+	
+	def llamafile
+		Lf
 	end
 end
-
-#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); }
-#MIND.output = lambda { |tgt, payload| puts %[THINK OUTPUT #{tgt}: #{payload}]; }
-
-#MIND.think!

data/llamafile.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   # Uncomment to register a new dependency of your gem
   spec.add_dependency "httparty"
   spec.add_dependency "multi_xml"
-  spec.add_dependency "mqtt"
+#  spec.add_dependency "mqtt"
   spec.add_dependency "csv"
   spec.add_dependency "bigdecimal"
   # For more information and examples about making a new gem, check out our

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: llamafile
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.5.0
 platform: ruby
 authors:
 - Erik Olson
@@ -37,20 +37,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mqtt
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: csv
   requirement: !ruby/object:Gem::Requirement