intelli_agent 0.2.13 → 0.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c91be5552b13825b657164e1ac9836e88fbdd98e99930ba7aececb54cb6e273a
-  data.tar.gz: f80215a13d785d1d50f835148be4f842a6c058f9f8445b94928feeb4f64b6e01
+  metadata.gz: '0316292d323a05a6e573a22aedb01706c5f5e2458acf33cbb59393a3821ee3ef'
+  data.tar.gz: c77fb697c72ce71ca89ee866f10e7d3c4fbd1f39719f6f95742dd9c130edbb22
 SHA512:
-  metadata.gz: 184e9e14319cfa84487eb3919ffb0b27a1f1b273464fd9410992d1c0467bbfbf2f68eabf7e31e3002f26feecd5107d37cae2acbfafdf7a3473ec1a0076a1699a
-  data.tar.gz: 8a3facc0c1bc891a457573e20b4581422565dd970cf666e1a848e46e226b5fd7203130e2740859c2c6393ef3826314ff914bfab0811c79af9845ed5192359ad9
+  metadata.gz: a235150a5f8790a7662c1d72bb2f644c3da98d2d16ce13eb1337873221efd8fa1d871eea38828f6d942329e66b0afabc94b2d617ae4decc2d10609f296764999
+  data.tar.gz: 3d002f5c352348ba7e975f229f8f3831d3ee8875b82749b14ff31eb4c58f85b6c178c73e716abe872acc2d646a15a906d7158d477e0045016f74ba0a3c2b0a81

data/lib/intelli_agent/openai/message_collection.rb

@@ -0,0 +1 @@
+ 

data/lib/intelli_agent/openai/messages.rb

@@ -1,5 +1,4 @@
 class IntelliAgent::OpenAI::Messages < Array
-  # VALID_ROLES = %i[system user assistant function tool].freeze
 
   def initialize messages = nil
     super parse_messages(messages)
@@ -22,6 +21,9 @@ Important note: the content can be either a string or an array.
     return [] if messages.nil?
 
     messages = [messages] unless messages.is_a?(Array)
+    
+    # if first element is ok, then do not parse the rest
+    return messages if messages.first in { role: String | Symbol, content: String | Array | Hash}
 
     messages.flat_map do |msg|
       if msg.is_a?(Hash)

data/lib/intelli_agent/openai.rb

@@ -80,7 +80,6 @@ module IntelliAgent::OpenAI
     parameters = { model:, messages:, store: }
     parameters[:metadata] = metadata if metadata
 
-
     # o1 family models doesn't support max_tokens params. Instead, use max_completion_tokens
     parameters[:max_completion_tokens] = max_tokens if is_o1_model
     parameters[:max_tokens] = max_tokens unless is_o1_model
@@ -88,7 +87,11 @@ module IntelliAgent::OpenAI
     parameters[:response_format] = { type: 'json_object' } if response_format.eql?(:json)
     parameters[:tools] = tools if tools
 
-    response = OpenAI::Client.new.chat(parameters:)
+    begin
+      response = OpenAI::Client.new.chat(parameters:)
+    rescue => e
+      raise "Error in OpenAI chat: #{e.message}\nParameters: #{parameters.inspect}"
+    end
     
     response[:chat_params] = parameters   
     response.extend(ResponseExtender)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: intelli_agent
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.2.14
 platform: ruby
 authors:
 - Gedean Dias
@@ -65,8 +65,8 @@ files:
 - lib/intelli_agent/agent_test.rb_
 - lib/intelli_agent/anthropic.rb
 - lib/intelli_agent/openai.rb
+- lib/intelli_agent/openai/message_collection.rb
 - lib/intelli_agent/openai/messages.rb
-- lib/intelli_agent/openai/messages_helper copy.rb
 homepage: https://github.com/gedean/intelli_agent
 licenses:
 - MIT

data/lib/intelli_agent/openai/messages_helper copy.rb

@@ -1,40 +0,0 @@
-class IntelliAgent::OpenAI::Messages < Array
-  VALID_ROLES = %i[system user assistant tool].freeze
-
-  def initialize(messages = [])
-    @messages = self.class.parse_messages(messages)
-  end
-
-  def add(message) = @messages.concat(self.class.parse_messages(message))
-
-=begin
-  O Formato de saída deve ser um array de hashes com as chaves `role` e `content`.
-
-  A entrada pode ser:
-    - um hash simples { user: 'mensagem do usuário' }, deve ser transformado em { role: 'user', content: 'mensagem do usuário' }
-    - um hash com várias chaves {system: 'mensagem', user: 'mensagem do usuário' }, deve ser transformado em [{ role: 'system', content: 'mensagem'}, { role: 'user', content: 'mensagem do usuário' }] 
-    - um array de hashes [{ system: 'mensagem'}, { user: 'mensagem do usuário' }], deve ser transformado em [{ role: 'system', content: 'mensagem'}, { role: 'user', content: 'mensagem do usuário' }]
-  Obervação imporante: o content pode ser uma string ou um array
-=end
-
-  def self.parse_messages(messages)
-    return [] if messages.empty?
-
-    messages = [messages] unless messages.is_a?(Array)
-
-    messages.flat_map do |msg|
-      if msg.is_a?(Hash)
-        if msg.keys.size == 1
-          role, content = msg.first
-          { role: role.to_s, content: content }
-        elsif msg.key?(:role) && msg.key?(:content)
-          { role: msg[:role].to_s, content: msg[:content] }
-        else
-          msg.map { |role, content| { role: role.to_s, content: content } }
-        end
-      else
-        raise ArgumentError, "Invalid message format: #{msg}"
-      end
-    end
-  end
-end