activeagent 0.2.5 → 0.2.5.202503060823

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbfba3a78246c1008e29842f64cfb2bd880e2a33800639590324844ce6045bcd
-  data.tar.gz: a52d61ba1dac3d01ae6b84db9d70d81cb230dc1a975897218b48e372392710c3
+  metadata.gz: 87f9e1274f4d7ed4546eef11619ca81ffa0def6713414fab764ae264753dfb90
+  data.tar.gz: 5c13b957ed730b58356a5fbb7c7e2ab4bc3032b8960cabd555f6e352ca74ff70
 SHA512:
-  metadata.gz: a85609f0e5d816b9fabe84fdbf589d2da716c740aa2406386c3c6cf0898436ac1d57ee04adca0d99418d2b38fd4c88c700ff468d1a6040869c3b22b790c2c780
-  data.tar.gz: 040fb0a37075cb2fc691be6b42e0395b7b3ab664e869a984f6581ee3c7a7357864676699af852e6b3e76e2ae765ab403e6a6e04cff46aa544f83b2e156fa86aa
+  metadata.gz: a94a933b7436f45d92cc75f6bf600428d0d7b2a6a62b8578fc2defbaec8637c1d28563eab9c4868bc8caac4d45d02a4beb8ba26decf9c8b7c1141103fc3fbb0b
+  data.tar.gz: ed85714725dada7f2911af809e1f4eb78af9db4ad73e8939964abea40861b39e9e5d7273be02aa58bd0ace6ce225c1f8f9d33e5740a56e00f72ae0299794ee13

data/lib/active_agent/action_prompt/prompt.rb

@@ -12,7 +12,7 @@ module ActiveAgent
         @instructions = attributes.fetch(:instructions, "")
         @body = attributes.fetch(:body, "")
         @content_type = attributes.fetch(:content_type, "text/plain")
-        @message = attributes.fetch(:message, Message.new)
+        @message = attributes.fetch(:message, nil)
         @messages = attributes.fetch(:messages, [])
         @params = attributes.fetch(:params, {})
         @mime_version = attributes.fetch(:mime_version, "1.0")
@@ -21,7 +21,7 @@ module ActiveAgent
         @headers = attributes.fetch(:headers, {})
         @parts = attributes.fetch(:parts, [])
 
-        set_message if attributes[:message].is_a?(String) || @body.is_a?(String) && @message.content
+        set_message if attributes[:message].is_a?(String) || @body.is_a?(String) && @message&.content
         set_messages if @messages.any? || @instructions.present?
       end
 
@@ -30,12 +30,11 @@ module ActiveAgent
         @message.to_s
       end
 
-      def add_part(prompt_part)
-        @message = prompt_part.message
+      def add_part(message)
+        @message = message
+        set_message if @content_type == message.content_type && @message.content.present?
 
-        set_message if @content_type == prompt_part.content_type && @message.content.present?
-
-        @parts << prompt_part
+        @parts << context
       end
 
       def multipart?

data/lib/active_agent/base.rb

@@ -128,8 +128,8 @@ module ActiveAgent
       # Define how the agent should generate content
       def generate_with(provider, **options)
         self.generation_provider = provider
-        self.options = (options || {}).merge(options)
-        generation_provider.config.merge!(options)
+        self.options = (options || {}).merge(options)        
+        generation_provider.config.merge!(self.options)
       end
 
       def stream_with(&stream)
@@ -203,20 +203,27 @@ module ActiveAgent
     attr_internal :context
 
     def perform_generation
-      context.options.merge(options)      
+      context.options.merge(options)
       generation_provider.generate(context) if context && generation_provider
-      handle_response(generation_provider.response)      
-      generation_provider.response
+      handle_response(generation_provider.response)
     end
 
     def handle_response(response)
       perform_actions(requested_actions: response.message.requested_actions) if response.message.requested_actions.present?
-      update_context(response)
+      
+      update_context(response)      
     end
 
     def update_context(response)
+      if response.prompt.message != response.prompt.messages.last
+        response = ActiveAgent::GenerationProvider::Response.new(
+          prompt: response.prompt, 
+          message: response.prompt.messages.last, 
+          raw_response: response.raw_response
+        )
+      end
       context.message = response.message
-      context.messages << response.message
+      response
     end
 
     def perform_actions(requested_actions:)
@@ -232,7 +239,7 @@ module ActiveAgent
     def initialize
       super
       @_prompt_was_called = false
-      @_context = ActiveAgent::ActionPrompt::Prompt.new(instructions: options[:instructions])
+      @_context = ActiveAgent::ActionPrompt::Prompt.new(instructions: options[:instructions], options: options)
     end
 
     def process(method_name, *args) # :nodoc:
@@ -332,7 +339,7 @@ module ActiveAgent
 
     def action_schemas
       action_methods.map do |action|
-        if action != "prompt"
+        if action != "text_prompt"
           JSON.parse render_to_string(locals: {action_name: action}, action: action, formats: :json)
         end
       end.compact
@@ -431,24 +438,22 @@ module ActiveAgent
 
     def create_parts_from_responses(context, responses)
       if responses.size > 1
-        prompt_container = ActiveAgent::ActionPrompt::Prompt.new
-        prompt_container.content_type = "multipart/alternative"
+        # prompt_container = ActiveAgent::ActionPrompt::Prompt.new
+        # prompt_container.content_type = "multipart/alternative"
         responses.each { |r| insert_part(context, r, context.charset) }
-        context.add_part(prompt_container)
+        # context.add_part(prompt_container)
       else
         responses.each { |r| insert_part(context, r, context.charset) }
       end
     end
 
-    def insert_part(container, response, charset)
-      prompt = ActiveAgent::ActionPrompt::Prompt.new
+    def insert_part(context, response, charset)
       message = ActiveAgent::ActionPrompt::Message.new(
         content: response[:body],
         content_type: response[:content_type],
         charset: charset
       )
-      prompt.message = message
-      container.add_part(prompt)
+      context.add_part(message)
     end
     # This and #instrument_name is for caching instrument
     def instrument_payload(key)

data/lib/active_agent/callbacks.rb

@@ -7,6 +7,7 @@ module ActiveAgent
     included do
       include ActiveSupport::Callbacks
       define_callbacks :generate, skip_after_callbacks_if_terminated: true
+      define_callbacks :stream, skip_after_callbacks_if_terminated: true
     end
 
     module ClassMethods
@@ -26,6 +27,18 @@ module ActiveAgent
       def around_generate(*filters, &)
         set_callback(:generate, :around, *filters, &)
       end
+      
+      # Defines a callback for handling streaming responses during generation
+      def on_stream(*filters, &)
+        set_callback(:stream, :before, *filters, &)
+      end
+    end
+    
+    # Helper method to run stream callbacks
+    def run_stream_callbacks(message, delta = nil, stop = false)
+      run_callbacks(:stream) do
+        yield(message, delta, stop) if block_given?
+      end
     end
   end
-end
+end

data/lib/active_agent/generation_job.rb

@@ -23,7 +23,7 @@ module ActiveAgent
       agent = agent_class.new
       agent.params = params if params
       agent.process(action_name, *args)
-      agent.generate
+      agent.generate_now
     end
 
     private

data/lib/active_agent/generation_provider/base.rb

@@ -25,7 +25,6 @@ module ActiveAgent
 
       def update_context(prompt:, message:, response:)
         prompt.message = message
-        prompt.messages << message
       end
 
       protected

data/lib/active_agent/generation_provider/open_ai_provider.rb

@@ -17,7 +17,8 @@ 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)
@@ -60,19 +61,19 @@ module ActiveAgent
       def provider_stream
         # prompt.options[:stream] will define a proc found in prompt at runtime
         # config[:stream] will define a proc found in config. stream would come from an Agent class's generate_with or stream_with method calls
-        agent_stream = prompt.options[:stream] || config["stream"]
+        agent_stream = prompt.options[:stream]
+        message = ActiveAgent::ActionPrompt::Message.new(content: "", role: :assistant)
+        @response = ActiveAgent::GenerationProvider::Response.new(prompt: prompt, message: ) 
+        
         proc do |chunk, bytesize|
-          # Provider parsing logic here
-          new_content = chunk.dig("choices", 0, "delta", "content")
-          message = @prompt.messages.find { |message| message.response_number == chunk.dig("choices", 0, "index") }
-          message.update(content: message.content + new_content) if new_content
-
-          # Call the custom stream_proc if provided
-          agent_stream.call(message) if agent_stream.respond_to?(:call)
+          if new_content = chunk.dig("choices", 0, "delta", "content")
+            message.content += new_content
+            agent_stream.call(message) if agent_stream.respond_to?(:call)
+          end          
         end
       end
 
-      def prompt_parameters(model: @model_name, messages: @prompt.messages, temperature: @config["temperature"] || 0.7, tools: @prompt.actions)
+      def prompt_parameters(model: @prompt.options[:model] || @model_name, messages: @prompt.messages, temperature: @config["temperature"] || 0.7, tools: @prompt.actions)
         {
           model: model,
           messages: messages,
@@ -82,7 +83,10 @@ module ActiveAgent
       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"],

data/lib/active_agent/version.rb

@@ -1,3 +1,3 @@
 module ActiveAgent
-  VERSION = "0.2.5"
+  VERSION = "0.2.5.202503060823"
 end

data/lib/generators/active_agent/templates/application_agent.rb.tt

@@ -4,8 +4,8 @@ class ApplicationAgent < ActiveAgent::Base
   
   generate_with :openai, model: "gpt-4o-mini", instructions: "You are a helpful assistant."
   
-  def prompt
-    super { |format| format.text { render plain: params[:message] } }
+  def text_prompt
+    prompt { |format| format.text { render plain: params[:message] } }
   end
 end
 <% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeagent
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.5.202503060823
 platform: ruby
 authors:
 - Justin Bowen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-28 00:00:00.000000000 Z
+date: 2025-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack