activeagent 0.2.6.rc1 → 0.2.6.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5be38e4a523b45e6456791eaa43e9a04ea377d0d6921c8c0e427b8bb06418f3
-  data.tar.gz: 191f478a1d79f5bfe65e2016f9ec4063dce945eb09912da2cd70d393f0fda3c5
+  metadata.gz: 2b9c764679c8c11bbf82e3aa132c5d563fc0a6c3cd5c28da2f6804639d1c153b
+  data.tar.gz: ec6a3c3495d44071264665e88be075005a240e52afe9202c506819e89897b1f8
 SHA512:
-  metadata.gz: 8f4749307fec6f7b9a7339486c09b9f20d61b05388a67f12f0c2e00267fc14979f6d193f649c64117f13b822baac75511b0269700a6362d0e3cb548c9d68c1df
-  data.tar.gz: 7b3adbd0b9372d037b6fd303f55103d06e54ae7693b3920c7746ee1b7efe95f14134c7998a0bf5034e044fd3548ab0e44bf69df7a64109a2a0e319201273cd84
+  metadata.gz: de1673c61fabca8b9bdcf5a4d72d963d7de1538fb96d72580af25cff5c074199cb2a325b3ef0ef34f5c05a8aa5ad642b09782c4655cd5e1b7a98de6a59b50d1a
+  data.tar.gz: b70d1f16c1056d7c54bf964f9b5d0202e8b63f027d2eb1457276fd1bb07dd7acf00c6bff1ae45a36c33253463a348fdb75a1b9906559544b58b1f853ec77983c

data/lib/active_agent/action_prompt/action.rb

@@ -1,16 +1,13 @@
 module ActiveAgent
   module ActionPrompt
     class Action
-      attr_accessor :agent_name, :name, :params
+      attr_accessor :agent_name, :id, :name, :params
 
       def initialize(attributes = {})
+        @id = attributes.fetch(:id, nil)
         @name = attributes.fetch(:name, "")
         @params = attributes.fetch(:params, {})
       end
-
-      def perform_action
-        agent_name.constantize.new.process(name, params)
-      end
     end
   end
 end

data/lib/active_agent/action_prompt/message.rb

@@ -3,10 +3,10 @@ module ActiveAgent
     class Message
       VALID_ROLES = %w[system assistant user tool function].freeze
 
-      attr_accessor :content, :role, :name, :action_requested, :requested_actions, :content_type, :charset
+      attr_accessor :action_id, :content, :role, :name, :action_requested, :requested_actions, :content_type, :charset
 
-      def initialize(attributes = {})
-        @agent_class = attributes[:agent_class]       
+      def initialize(attributes = {})        
+        @action_id = attributes[:action_id]
         @charset = attributes[:charset] || "UTF-8"
         @content = attributes[:content] || ""
         @content_type = attributes[:content_type] || "text/plain"
@@ -20,16 +20,22 @@ module ActiveAgent
       def to_h
         hash = {
           role: role, 
+          action_id: action_id,
           content: content,
-          content_type: content_type,
+          type: content_type,
           charset: charset
         }
+
         hash[:name] = name if name
         hash[:action_requested] = requested_actions.any?
         hash[:requested_actions] = requested_actions if requested_actions.any?
         hash
       end
 
+      def embed
+        @agent_class.embed(@content)
+      end
+
       private
 
       def validate_role

data/lib/active_agent/base.rb

@@ -202,6 +202,12 @@ module ActiveAgent
 
     attr_internal :context
 
+    def embed
+      context.options.merge(options)
+      generation_provider.embed(context) if context && generation_provider
+      handle_response(generation_provider.response) 
+    end
+
     def perform_generation
       context.options.merge(options)
       generation_provider.generate(context) if context && generation_provider
@@ -215,13 +221,15 @@ module ActiveAgent
     end
 
     def update_context(response)
-      context.message = response.message
+      context = response.prompt
       response
     end
 
     def perform_actions(requested_actions:)
       requested_actions.each do |action|
         perform_action(action)
+        prompt.messages.last.role = :tool
+        prompt.messages.last.action_id = action.id
       end
     end
 

data/lib/active_agent/generation_provider/open_ai_provider.rb

@@ -17,9 +17,6 @@ module ActiveAgent
 
       def generate(prompt)
         @prompt = prompt
-        
-        # prompt_parameters(model: @model_name, messages: prompt.messages, tools: prompt.actions)
-        # parameters[:instructions] = prompt.instructions.content if prompt.instructions.present?
 
         chat_prompt(parameters: prompt_parameters)
       rescue => e
@@ -28,6 +25,7 @@ module ActiveAgent
 
       def chat_prompt(parameters: prompt_parameters)
         parameters[:stream] = provider_stream if prompt.options[:stream] || config["stream"]
+        
         chat_response(@client.chat(parameters: parameters))
       end
 
@@ -39,7 +37,7 @@ module ActiveAgent
         raise GenerationProviderError, e.message  
       end
 
-      def embeddings_parameters(input: prompt.message.content, model: "text-embedding-ada-002")
+      def embeddings_parameters(input: prompt.message.content, model: "text-embedding-3-large")
         {
           model: model,
           input: input
@@ -76,17 +74,33 @@ module ActiveAgent
       def prompt_parameters(model: @prompt.options[:model] || @model_name, messages: @prompt.messages, temperature: @config["temperature"] || 0.7, tools: @prompt.actions)
         {
           model: model,
-          messages: messages,
+          messages: provider_messages(messages),
           temperature: temperature,
           tools: tools.presence
         }
       end
 
+      def provider_messages(messages)
+        messages.map do |message|
+          provider_message {
+            role: message.role, 
+            tool_call_id: message.action_id.presence,
+            content: message.content,
+            type: message.content_type,
+            charset: message.charset
+        }.compact
+
+        if content_type == "image_url"
+          provider_message[:image_url] = { url: content }
+        end        
+        end
+      end
+
       def chat_response(response)
         return @response if prompt.options[:stream]
 
         message_json = response.dig("choices", 0, "message")
-
+        
         message = ActiveAgent::ActionPrompt::Message.new(
           content: message_json["content"],
           role: message_json["role"],
@@ -102,6 +116,7 @@ module ActiveAgent
         if tool_calls
           tool_calls.map do |tool_call|
             ActiveAgent::ActionPrompt::Action.new(
+              id: tool_call["id"],
               name: tool_call.dig("function", "name"),
               params: JSON.parse(
                 tool_call.dig("function", "arguments"),

data/lib/active_agent/version.rb

@@ -1,3 +1,3 @@
 module ActiveAgent
-  VERSION = "0.2.6.rc1"
+  VERSION = "0.2.6.rc2"
 end

data/lib/generators/active_agent/install_generator.rb

@@ -4,11 +4,7 @@ module ActiveAgent
   module Generators
     class InstallGenerator < ::Rails::Generators::Base
       source_root File.expand_path("templates", __dir__)
-
-      def create_initializer
-        template "initializer.rb", "config/initializers/active_agent.rb"
-      end
-
+      
       def create_configuration
         template "active_agent.yml", "config/active_agent.yml"
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeagent
 version: !ruby/object:Gem::Version
-  version: 0.2.6.rc1
+  version: 0.2.6.rc2
 platform: ruby
 authors:
 - Justin Bowen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-13 00:00:00.000000000 Z
+date: 2025-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack