intelli_agent 0.2.12 → 0.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37f7cac456bcc0441d34d9f0e9901dfd49d04b3fde889ab44498bd1a735dcbd0
-  data.tar.gz: 0e3cb4e3597410c51db19ee141d273839a1ea8945c99029d422ce85c247874c7
+  metadata.gz: '0316292d323a05a6e573a22aedb01706c5f5e2458acf33cbb59393a3821ee3ef'
+  data.tar.gz: c77fb697c72ce71ca89ee866f10e7d3c4fbd1f39719f6f95742dd9c130edbb22
 SHA512:
-  metadata.gz: 47133255200fa5ee3cac2d91db4293348eadd243c11d0893f65280c7ecc378a39db2196cfd81b52343273e1cdc36e738bfa469b5c670e4bb5840c494e5f1cde1
-  data.tar.gz: cfc9cbf181b2971f51e44cf056bebd5bd0cd344d7561dfea2824249db4cc7c629100dade0fe0013ba29538d11a520e68ded5d811729585b0e7db2dd7f12fef9c
+  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

@@ -0,0 +1,43 @@
+class IntelliAgent::OpenAI::Messages < Array
+
+  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)
+    
+    # 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)
+        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,12 +75,11 @@ 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
 
-
     # 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)
@@ -120,16 +123,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.12
+  version: 0.2.14
 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
@@ -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/message_collection.rb
+- lib/intelli_agent/openai/messages.rb
 homepage: https://github.com/gedean/intelli_agent
 licenses:
 - MIT