activeai 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a327faafb1ed168dfbbfce2c3f5beed3b6090c8ed5c95d24913d988e39227143
-  data.tar.gz: f3bb5b04eabc7838193f099e649f5dbe48ae3f151537b28469d1b6738848fb00
+  metadata.gz: 446cdb7b4d1341e1450486380b0926a68ff594b4361a330f6baa7466ac208c76
+  data.tar.gz: 5416c0e23d45fb0c7b7833b3ed8888a7339a5e51fb8bf2f34447283452e3db5b
 SHA512:
-  metadata.gz: c3530fdce13cab64414b9b921a49672cd2dae8c170e6f50af5486fe30b33055403a1ef37b6a8c2e3172178ff61ac8c4d26292a3708877111d329cecb0dc59a72
-  data.tar.gz: 9dc7550488f4dab988b11719a065f0e7fd0c17afa2712c6670b97e8300969fb9d218ac47e2939d295134e5313594f00f45e8838c34c5d9fb178237e3292adcce
+  metadata.gz: 0e5f825a3d3b3c2781cc353462ed74087b5c56bd5492e70dad21f3294328dce63d1e198b28e745f98e503a5483b9eb7f0d41c4a552f680200809753a6527b09e
+  data.tar.gz: b7fa0ae8250c6bacd2f5083acfbcbcf2fa58f481721e69b9ce060f5a4fac934b8d6b28b41386ce2bafa6f1cef019543e113b04929fcb7bd2e086858068a38596

data/README.md

@@ -108,7 +108,7 @@ controller.call("Pay Mom R127 for groceries")
 It's possible to instantiate an `ActiveAI::Router`, load up the examples from multiple controllers, and then have it handle many types of requests. It does this in a similar way to how the controller uses an LLM to map to action and params, but it concatenates all controller routing examples and strips out the parameter preparation step for efficiency, since the controller handles this.
 
 ```ruby
-router = ActiveAI::Router.new
+router = ActiveAI::Router.new # TODO you need to add providers now.. should be optional?
 
 # load all auto-detected routes:
 router.auto_load_routing(Rails.root.join('config','routes')) # loads all .yml files as controller examples

data/lib/activeai/behavior/llm/write_function_call.rb

@@ -6,26 +6,31 @@ class ActiveAI::Behavior::LLM::WriteFunctionCall < ActiveAI::Behavior::LLM
   end
 
   def base_prompt
-    @state[:examples].map do |example|
-      [
-        "// #{example[:description]}",
-        example[:code]
-      ].join("\n")
-    end.join("\n\n") + "\n\n"
+    (@state[:examples].map do |example|
+      "/* #{example[:description]} */\n#{example[:code]}"
+    end + [""]).join("<|endoftext|>")
   end
 
   def call(comment)
-    prompt = base_prompt + "\n\n"
-    prompt += "//#{comment}\n"
-    complete_result = complete(prompt, stop: "\n")
+    prompt = base_prompt
+    prompt += "/* #{comment} */\n"
 
-    # TODO stop \n works for the router but not for other stuff, later
+    complete_result = complete(prompt) # this still breaks sometimes by generating like 50 functions instead of stopping. think i fixed it? forgot an <|endoftext|> at the end
+
+    # puts prompt
+    # puts complete_result
 
     completion = complete_result['choices'][0]['text']
+    completion = completion.strip.gsub("\n", "\\n") # fixes parsing errors (in JSON??)
 
-    matcher = /(.*)\((.*)\)/
+    matcher = /(.*?)\((.*)\)/m # should be made ungreedy, but then i dont see when it over-completes because it fails silently
     matches = matcher.match(completion)
 
+    if matches.nil?
+      # binding.pry
+      raise "Unmatched router response in #{self.class}"
+    end
+
     return {
       text: completion.strip,
       path: matches[1],

data/lib/activeai/controller.rb

@@ -9,7 +9,7 @@ class ActiveAI::Controller
   end
 
   def self.load_routing(routes_config)
-    @llm = ActiveAI::NeuralNetwork::GPT3.new(ActiveAI.config[:gpt3_token], model: 'code-davinci-002', temperature: 0.2)
+    @llm = ActiveAI::NeuralNetwork::GPT3.new(ActiveAI.config[:gpt3_token], model: 'code-cushman-001', temperature: 0)
 
     examples = ActiveAI.route_examples_to_function_call_examples(routes_config['examples'])
     self.routing_behavior = ActiveAI::Behavior::LLM::WriteFunctionCall.new(@llm, { examples: examples })
@@ -17,6 +17,10 @@ class ActiveAI::Controller
 
   attr_accessor :params
 
+  def initialize(provider)
+    @provider = provider
+  end
+
   def prepare_action(request)
     # samples to parse:
     #   plugins.slack.send_message({ \"channel\": \"#general\", \"text\": \"Hi\" })

data/lib/activeai/router.rb

@@ -4,7 +4,7 @@ class ActiveAI::Router
 
   def initialize
     @routings = []
-    @llm = ActiveAI::NeuralNetwork::GPT3.new(ActiveAI.config[:gpt3_token], model: 'code-davinci-002', temperature: 0.2)
+    @llm = ActiveAI::NeuralNetwork::GPT3.new(ActiveAI.config[:gpt3_token], model: 'code-cushman-001', temperature: 0)
   end
 
   def add_controller_routing(routing)
@@ -69,11 +69,18 @@ class ActiveAI::Router
     end
   end
 
-  def call(request)
-    if controller = find_controller(request)
-      controller.new.call(request)
-    else
-      return nil
-    end
-  end
+  # This stopped being necessary, because we find controller and call it elsewhere:
+  # def call(request, providers=nil)
+  #   if controller = find_controller(request)
+
+  #     provider = if providers.respond_to?(:find_by)
+  #       provider_name = controller.to_s.gsub("Plugins::", "").gsub("Controller","")
+  #       providers.find_by(name: provider_name)
+  #     end
+
+  #     controller.new(provider).call(request)
+  #   else
+  #     return nil
+  #   end
+  # end
 end

data/lib/activeai/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveAI
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeai
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - jeriko
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-01-06 00:00:00.000000000 Z
+date: 2023-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday