intelli_agent 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f4f0af0654ac3e8e2e468dd804d3f18b254ebadf5649f6786ef05958279b59d
-  data.tar.gz: 5cd51d0ac3f2b083cea25cc499b87bcdfc46212e9af3934a4bc3f5fed25f1fa5
+  metadata.gz: 586990e6d1d8fa1fb890bb9530d7f175f4f403ed309ca111517755ed5e07c2f3
+  data.tar.gz: 669c3765fd006605eb86b93a31b90aa4e6101a50820e8e3dd9eaeec54f17f2d0
 SHA512:
-  metadata.gz: 3508e10d08f4ffbaa16f096e765168953a65b0831bcfe637932b2a808b8b5d0a62a6f049fddfdfbfad75f30ef02c6753980bf4ef216984c8aa5211555a949005
-  data.tar.gz: 3d0e9ed70b2acdd03e3cd9a1aedd9de0478ff4cd9187efaf3eda5dbba01d03c2744736e55a161a498af7c58b0a5dabd0a8c6b13c70bd3f5ed3b268fc28fe5482
+  metadata.gz: 7af7fe5d68898a89ace33fd71a5eeb519566760900c675782d5620ff29c56013b3e6b92e7074b006668cafa825e5b3ce48db5666b61e5140e14903b54874e739
+  data.tar.gz: dbb26d71d8187090d151436a8ec2229950b13f93f87c228c42cfaaa77ec98762f75f86e9696f1f9a843b0848cfde92a2ca9cd3afdab613cb51d693193ac17fb8

data/lib/intelli_agent/openai.rb

@@ -8,6 +8,8 @@ module IntelliAgent::OpenAI
   MAX_TOKENS = ENV.fetch('OPENAI_MAX_TOKENS', 16_383).to_i
 
   module ResponseExtender
+    def chat_params = self[:chat_params]
+
     def message = dig('choices', 0, 'message')
 
     def content = dig('choices', 0, 'message', 'content')
@@ -24,13 +26,29 @@ module IntelliAgent::OpenAI
       
       functions_list = []
       functions.map.with_index do |function, function_index|
-        function_def = tool_calls.dig(function_index, 'function')
-        functions_list << { id: function['id'], name: function_def['name'], arguments: Oj.load(function_def['arguments'], symbol_keys: true) }
+        function_info = tool_calls.dig(function_index, 'function')
+        function_def = { id: function['id'], name: function_info['name'], arguments: Oj.load(function_info['arguments'], symbol_keys: true) }
+        
+        def function_def.run(context:)
+          {
+            tool_call_id: self[:id],
+            role: :tool,
+            name: self[:name],
+            content: context.send(self[:name], **self[:arguments])
+          }
+        end
+
+        functions_list << function_def
       end
 
       functions_list
     end
 
+    def functions_run_all(context:)
+      raise 'No functions to run' if functions.nil?
+      functions.map { |function| function.run(context:) }
+    end
+
     def functions? = !functions.nil?
   end
 
@@ -55,15 +73,15 @@ module IntelliAgent::OpenAI
     response
   end  
 
-  def self.single_prompt(prompt:, model: :gpt_basic, response_format: nil, max_tokens: MAX_TOKENS, tools: nil, auto_run_functions: false, function_context: nil)
-    chat(messages: [{ user: prompt }], model:, response_format:, max_tokens:, tools:, auto_run_functions:, function_context:)
+  def self.single_prompt(prompt:, model: :gpt_basic, response_format: nil, max_tokens: MAX_TOKENS, store: true, tools: nil, auto_run_functions: false, function_context: nil)
+    chat(messages: [{ user: prompt }], model:, response_format:, max_tokens:, store:, tools:, auto_run_functions:, function_context:)
   end
 
-  def self.single_chat(system:, user:, model: :gpt_basic, response_format: nil, max_tokens: MAX_TOKENS, tools: nil, auto_run_functions: false, function_context: nil)
-    chat(messages: [{ system: }, { user: }], model:, response_format:, max_tokens:, tools:, auto_run_functions:, function_context:)
+  def self.single_chat(system:, user:, model: :gpt_basic, response_format: nil, max_tokens: MAX_TOKENS, store: true, tools: nil, auto_run_functions: false, function_context: nil)
+    chat(messages: [{ system: }, { user: }], model:, response_format:, max_tokens:, store:, tools:, auto_run_functions:, function_context:)
   end
 
-  def self.chat(messages:, model: :gpt_basic, response_format: nil, max_tokens: MAX_TOKENS, tools: nil, auto_run_functions: false, function_context: nil)
+  def self.chat(messages:, model: :gpt_basic, response_format: nil, max_tokens: MAX_TOKENS, store: true, tools: nil, auto_run_functions: false, function_context: nil)
     model = select_model(model)
 
     # o1 models doesn't support max_tokens, instead max_completion_tokens
@@ -72,7 +90,7 @@ module IntelliAgent::OpenAI
 
     messages = parse_messages(messages)
     
-    parameters = { model:, messages:, store: true }
+    parameters = { model:, messages:, store: }
 
     parameters[:max_completion_tokens] = max_completion_tokens if is_o1_model
     parameters[:max_tokens] = max_completion_tokens unless is_o1_model
@@ -81,26 +99,18 @@ module IntelliAgent::OpenAI
     parameters[:tools] = tools if tools
 
     response = OpenAI::Client.new.chat(parameters:)
+    
+    response[:chat_params] = parameters   
     response.extend(ResponseExtender)
 
     if response.functions? && auto_run_functions
       raise 'Function context not provided for auto-running functions' if function_context.nil?
-
       parameters[:messages] << response.message
+      parameters[:messages] += response.functions_run_all(context: function_context)
 
-      response.functions.each do |function|
-        parameters[:messages] << {
-          tool_call_id: function[:id],
-          role: :tool,
-          name: function[:name],
-          content: function_context.send(function[:name], **function[:arguments])
-        }
-      end
-
-      response = OpenAI::Client.new.chat(parameters:)
-      response.extend(ResponseExtender)
+      response = chat(**parameters.except(:chat_params))
     end
-
+   
     response
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: intelli_agent
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Gedean Dias