intelli_agent 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be996d76730695ba38477d0e748affd640eb03bf361892128305e668e32e1a43
-  data.tar.gz: d860d1779e054c68214bf69fe640f2420486e514dded5f0b2b9c328da09a0e32
+  metadata.gz: a70f9043e7c97455596b720e803c7ae02274c8bf8e63eff090cf813327e256d7
+  data.tar.gz: b0e4e27b5ea461dbf87e8b7fa551b85de2258f3ffcb56c8fb98ba32d74d6a3a7
 SHA512:
-  metadata.gz: 46b6fe360ca8265f5d495b2853f4ea8e3fe9c5834e6e7e2cd072de2196b77e49483d8e67a74c334f526b12ed26d36bb66720241946c9de088b931ef7d5f4eacc
-  data.tar.gz: d61707f97959304260975fc8b9b17f0f1cf355345b2f4db5715db2675645fcb19bec6e521fdf4d5ec54e4f7f2d6f7dd7bcfc636cae885f8b67151df7070aa3a7
+  metadata.gz: 8792b7a3c0fddbbf7969f9d45a3f1a171613ad4f6f5331f88c0e43aa0adbd2c58ea4c7ad563dcd6eff6e5d00f4a4fda33cfaf8568efaacaff7fe242970c8464b
+  data.tar.gz: 7e60f9ddb4c80bfdd642330f1e066e641023f206f72302d9cc07cc27c4e70e4d353030d24600831dae1f97ec7edfd913ba6e37c5e53360c122492d658a4228e0

data/lib/intelli_agent/openai.bkp.rb

@@ -0,0 +1,145 @@
+module IntelliAgent::OpenAI
+  BASIC_MODEL = ENV.fetch('OPENAI_BASIC_MODEL', 'gpt-4o-mini')
+  ADVANCED_MODEL = ENV.fetch('OPENAI_ADVANCED_MODEL', 'gpt-4o-2024-08-06')
+  MAX_TOKENS = ENV.fetch('OPENAI_MAX_TOKENS', 16_383).to_i
+
+  module ResponseExtender
+    def content
+      dig('choices', 0, 'message', 'content')
+    end
+
+    def message
+      dig('choices', 0, 'message')
+    end
+
+    def content?
+      !content.nil?
+    end
+
+    def tool_calls
+      dig('choices', 0, 'message', 'tool_calls')
+    end
+
+    def tool_calls?
+      !tool_calls.nil?
+    end
+
+    def functions
+      return if tool_calls.nil?
+      
+      functions = tool_calls.filter { |tool| tool['type'].eql? 'function' }
+      return if functions.empty?
+      
+      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) }
+      end
+
+      functions_list
+    end
+
+    def functions?
+      !functions.nil?
+    end
+  end
+
+  def self.embed(input, model: 'text-embedding-3-large')
+    response = OpenAI::Client.new.embeddings(parameters: { input:, model: })
+    response.dig('data', 0, 'embedding')
+  end
+
+  def self.vision(prompt:, image_url:, model: :advanced, response_format: nil, max_tokens: MAX_TOKENS)
+    model = select_model(model)
+    messages = [{ type: :text, text: prompt },
+                { type: :image_url, image_url: { url: image_url } }]
+
+    parameters = { model: model, messages: [{ role: :user, content: messages }], max_tokens: }
+    parameters[:response_format] = { type: 'json_object' } if response_format.eql?(:json)
+
+    response = OpenAI::Client.new.chat(parameters:)
+    
+    response.dig('choices', 0, 'message', 'content').strip
+  end  
+ 
+
+
+  def self.single_prompt(prompt:, model: :basic, response_format: nil, max_tokens: MAX_TOKENS, tools: nil, function_run_context: self)
+    model = select_model(model)
+    
+    parameters = { model:, messages: [{ role: 'user', content: prompt }], max_tokens: }
+    parameters[:response_format] = { type: 'json_object' } if response_format.eql?(:json)
+    parameters[:tools] = tools if tools
+    banana(parameters:)
+  end
+
+  def self.single_chat(system:, user:, model: :basic, response_format: nil, max_tokens: MAX_TOKENS, tools: nil, function_run_context: self)
+    model = select_model(model)
+    parameters = { model:,
+                   messages: [
+                     { role: 'system', content: system },
+                     { role: 'user', content: user }
+                   ], max_tokens: }
+
+    parameters[:response_format] = { type: 'json_object' } if response_format.eql?(:json)
+    parameters[:tools] = tools if tools
+
+    banana(parameters:)
+  end
+
+  def self.chat(messages:, model: :basic, response_format: nil, max_tokens: MAX_TOKENS, tools: nil, function_run_context: self)
+    model = select_model(model)
+    
+    messages = parse_messages(messages)
+    
+    parameters = { model:, messages:, max_tokens: }
+    parameters[:response_format] = { type: 'json_object' } if response_format.eql?(:json)
+    parameters[:tools] = tools if tools
+
+    response = OpenAI::Client.new.chat(parameters:)
+    response.extend(ResponseExtender)
+
+    if response.functions?
+      parameters[:messages] << response.message
+
+      response.functions.each do |function|
+        parameters[:messages] << {
+          tool_call_id: function[:id],
+          role: :tool,
+          name: function[:name],
+          content: parameters[:function_run_context].send(function[:name], **function[:arguments])
+        }
+      end
+
+      response = OpenAI::Client.new.chat(parameters:)
+      response.extend(ResponseExtender)
+    end
+
+    response
+  end
+
+  def self.models = OpenAI::Client.new.models.list
+
+  def self.select_model(model)
+    case model
+    when :basic
+      BASIC_MODEL
+    when :advanced
+      ADVANCED_MODEL
+    else
+      model
+    end
+  end
+
+  def self.parse_messages(messages)
+    case messages
+    in [{ role: String, content: String }, *]
+      messages
+    else
+      messages.map do |msg|
+        role, content = msg.first
+        { role: role.to_s, content: content }
+      end
+    end
+  end
+end

data/lib/intelli_agent/openai.rb

@@ -8,6 +8,10 @@ module IntelliAgent::OpenAI
       dig('choices', 0, 'message', 'content')
     end
 
+    def message
+      dig('choices', 0, 'message')
+    end
+
     def content?
       !content.nil?
     end
@@ -19,6 +23,25 @@ module IntelliAgent::OpenAI
     def tool_calls?
       !tool_calls.nil?
     end
+
+    def functions
+      return if tool_calls.nil?
+      
+      functions = tool_calls.filter { |tool| tool['type'].eql? 'function' }
+      return if functions.empty?
+      
+      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) }
+      end
+
+      functions_list
+    end
+
+    def functions?
+      !functions.nil?
+    end
   end
 
   def self.embed(input, model: 'text-embedding-3-large')
@@ -39,38 +62,17 @@ module IntelliAgent::OpenAI
     response.dig('choices', 0, 'message', 'content').strip
   end  
 
-  def self.single_prompt(prompt:, model: :basic, response_format: nil, max_tokens: MAX_TOKENS, tools: nil)
-    model = select_model(model)
-    
-    parameters = { model:, messages: [{ role: 'user', content: prompt }], max_tokens: }
-    parameters[:response_format] = { type: 'json_object' } if response_format.eql?(:json)
-    parameters[:tools] = tools if tools
-
-    response = OpenAI::Client.new.chat(parameters:)
-    response.extend(ResponseExtender)
-    response
+  def self.single_prompt(prompt:, model: :basic, response_format: nil, max_tokens: MAX_TOKENS, tools: nil, function_run_context: self)
+    chat(messages: [{ user: prompt }], model:, response_format:, max_tokens:, tools:, function_run_context:)
   end
 
-  def self.single_chat(system:, user:, model: :basic, response_format: nil, max_tokens: MAX_TOKENS)
-    model = select_model(model)
-    parameters = { model:,
-                   messages: [
-                     { role: 'system', content: system },
-                     { role: 'user', content: user }
-                   ], max_tokens: }
-
-    parameters[:response_format] = { type: 'json_object' } if response_format.eql?(:json)
-    parameters[:tools] = tools if tools
-
-    response = OpenAI::Client.new.chat(parameters:)
-    response.extend(ResponseExtender)
-    response
+  def self.single_chat(system:, user:, model: :basic, response_format: nil, max_tokens: MAX_TOKENS, tools: nil, function_run_context: self)
+    chat(messages: [{ system: }, { user: }], model:, response_format:, max_tokens:, tools:, function_run_context:)
   end
 
-  def self.chat(messages:, model: :basic, response_format: nil, max_tokens: MAX_TOKENS)
+  def self.chat(messages:, model: :basic, response_format: nil, max_tokens: MAX_TOKENS, tools: nil, function_run_context: self)
     model = select_model(model)
-    
-    messages = determine_message_format(messages).eql?(:short_format) ? convert_message_to_standard_format(messages) : messages
+    messages = parse_messages(messages)
     
     parameters = { model:, messages:, max_tokens: }
     parameters[:response_format] = { type: 'json_object' } if response_format.eql?(:json)
@@ -78,6 +80,23 @@ module IntelliAgent::OpenAI
 
     response = OpenAI::Client.new.chat(parameters:)
     response.extend(ResponseExtender)
+
+    if response.functions?
+      parameters[:messages] << response.message
+
+      response.functions.each do |function|
+        parameters[:messages] << {
+          tool_call_id: function[:id],
+          role: :tool,
+          name: function[:name],
+          content: parameters[:function_run_context].send(function[:name], **function[:arguments])
+        }
+      end
+
+      response = OpenAI::Client.new.chat(parameters:)
+      response.extend(ResponseExtender)
+    end
+
     response
   end
 
@@ -94,21 +113,15 @@ module IntelliAgent::OpenAI
     end
   end
 
-  def self.determine_message_format(messages)
+  def self.parse_messages(messages)
     case messages
     in [{ role: String, content: String }, *]
-      :standard_format
-    in [{ system: String }, { user: String }, *]
-      :short_format
+      messages
     else
-      :unknown_format
+      messages.map do |msg|
+        role, content = msg.first
+        { role: role.to_s, content: content }
+      end
     end
   end
-
-  def self.convert_message_to_standard_format(messages)
-    messages.map do |msg|
-      role, content = msg.first
-      { role: role.to_s, content: content }
-    end
-  end  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: intelli_agent
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Gedean Dias
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
 description: A helper layer over Anthropic and OpenAI API
 email: gedean.dias@gmail.com
 executables: []
@@ -49,6 +63,7 @@ files:
 - lib/intelli_agent/agent.rb.disabled
 - lib/intelli_agent/agent_test.rb_
 - lib/intelli_agent/anthropic.rb
+- lib/intelli_agent/openai.bkp.rb
 - lib/intelli_agent/openai.rb
 homepage: https://github.com/gedean/intelli_agent
 licenses: