intelli_agent 0.2.11 → 0.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e94ab4d8cf68071308ab502086f092fc7424622de20420d00bba18451cd10705
-  data.tar.gz: f74579964f8d1a40a7d3f26f64b079ada32d202f2cf6c08f15e615e24ded8ee7
+  metadata.gz: c91be5552b13825b657164e1ac9836e88fbdd98e99930ba7aececb54cb6e273a
+  data.tar.gz: f80215a13d785d1d50f835148be4f842a6c058f9f8445b94928feeb4f64b6e01
 SHA512:
-  metadata.gz: fbc1c8b705f7050b8f9bf18aa8aef380559e38019bde3911f598b4546ac6cdd2d2596b158502509663058cdfa8d052cd4e3dc992973f813739f86bd9336930bc
-  data.tar.gz: b82503246fe4365c46fad3528522cd4ee1acf8d7ecb9a72d3c4975acfde835031fc0a6556cb85944fecf3806bcf1de8c75d9b1fa04a03c21d7f8b2398ac989fe
+  metadata.gz: 184e9e14319cfa84487eb3919ffb0b27a1f1b273464fd9410992d1c0467bbfbf2f68eabf7e31e3002f26feecd5107d37cae2acbfafdf7a3473ec1a0076a1699a
+  data.tar.gz: 8a3facc0c1bc891a457573e20b4581422565dd970cf666e1a848e46e226b5fd7203130e2740859c2c6393ef3826314ff914bfab0811c79af9845ed5192359ad9

data/lib/intelli_agent/openai/messages.rb

@@ -0,0 +1,41 @@
+class IntelliAgent::OpenAI::Messages < Array
+  # VALID_ROLES = %i[system user assistant function tool].freeze
+
+  def initialize messages = nil
+    super parse_messages(messages)
+  end
+
+  def add(message) = concat(parse_messages(message))
+
+=begin
+The output format should be an array of hashes with the keys `role` and `content`.
+
+The input can be:
+  - A simple hash `{ user: 'user message' }`, which should be transformed into `{ role: 'user', content: 'user message' }`
+  - A hash with multiple keys `{system: 'message', user: 'user message' }`, which should be transformed into `[{ role: 'system', content: 'message' }, { role: 'user', content: 'user message' }]`
+  - An array of hashes `[{ system: 'message' }, { user: 'user message' }]`, which should be transformed into `[{ role: 'system', content: 'message' }, { role: 'user', content: 'user message' }]`
+
+Important note: the content can be either a string or an array.
+=end
+  private
+  def parse_messages(messages)
+    return [] if messages.nil?
+
+    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

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

@@ -0,0 +1,40 @@
+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

data/lib/intelli_agent/openai.rb

@@ -75,7 +75,7 @@ module IntelliAgent::OpenAI
     model = select_model(model)
     is_o1_model = model.start_with?('o1')
 
-    messages = parse_messages(messages)
+    messages = IntelliAgent::OpenAI::Messages.new(messages) unless messages.is_a?(IntelliAgent::OpenAI::Messages)
     
     parameters = { model:, messages:, store: }
     parameters[:metadata] = metadata if metadata
@@ -120,16 +120,4 @@ module IntelliAgent::OpenAI
       model
     end
   end
-
-  def self.parse_messages(messages)
-    case messages
-    in [{ role: String | Symbol, content: String | Array }, *]
-      messages
-    else
-      messages.map do |msg|
-        role, content = msg.first
-        { role: role.to_s, content: content }
-      end
-    end
-  end
 end

data/lib/intelli_agent.rb

@@ -6,3 +6,4 @@ end
 
 require 'intelli_agent/anthropic'
 require 'intelli_agent/openai'
+require 'intelli_agent/openai/messages'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: intelli_agent
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.13
 platform: ruby
 authors:
 - Gedean Dias
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-10 00:00:00.000000000 Z
+date: 2024-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-openai
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: anthropic
   requirement: !ruby/object:Gem::Requirement
@@ -65,6 +65,8 @@ files:
 - lib/intelli_agent/agent_test.rb_
 - lib/intelli_agent/anthropic.rb
 - lib/intelli_agent/openai.rb
+- lib/intelli_agent/openai/messages.rb
+- lib/intelli_agent/openai/messages_helper copy.rb
 homepage: https://github.com/gedean/intelli_agent
 licenses:
 - MIT