activeagent 0.3 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf6889f20afa4e61e46ab6edbe801186aee0d3fe85284f3ce6379509a6a76bc4
-  data.tar.gz: 3340dcc2d65740cea5a98f4c0640ac806e1686bb48bee2a3260cf3e65b5478b2
+  metadata.gz: d679bd3d4f68b5c696ed4cc194e9b5476ebb0da34d6ac683296f7f7f5feae0f8
+  data.tar.gz: 2f11870fc423e399c53bf0728203faf47cbe3303d7aa47bb2d5d77bc603cda8d
 SHA512:
-  metadata.gz: 8c63eaaad2c5049fac65902d5d5676f976580fffd40477287b149d29695c15b75143e1bbf8e60128c04adfc23531770c9ab1c7893a6cf73bd4f258315a93e251
-  data.tar.gz: 0be4d79a4755d23d1c7e2c659871d8e0480c05583e6fe1d6eae48571fd1d2540cc88ea53a827192109bf76476e237e8c09f1bbc64f97bca429416b3c7503154c
+  metadata.gz: 8261c5df1f59b50a96e6c46f1363b470fadff9bbc0231ab6a1c2e6975e906d73d150f0c3d11367d8c766d49ffc0c67428ed3fb40a5fcbbd4c5b78e03a4274805
+  data.tar.gz: 64b70a42b0f09f175e441dccab85468946df03ec5f3cd6e007a5e4180d13726230817b5b4ddc4adc348a5b9b838adf8a9d3342490e7d6e96f07c79fa983bc366

data/lib/active_agent/action_prompt/prompt.rb

@@ -3,7 +3,8 @@ require_relative "message"
 module ActiveAgent
   module ActionPrompt
     class Prompt
-      attr_accessor :actions, :body, :content_type, :context_id, :instructions, :message, :messages, :options, :mime_version, :charset, :context, :parts
+      attr_reader :messages
+      attr_accessor :actions, :body, :content_type, :context_id, :instructions, :message, :options, :mime_version, :charset, :context, :parts, :params, :action_choice, :agent_class
 
       def initialize(attributes = {})
         @options = attributes.fetch(:options, {})
@@ -27,6 +28,11 @@ module ActiveAgent
         set_messages
       end
 
+      def messages=(messages)
+        @messages = messages
+        set_messages
+      end
+
       # Generate the prompt as a string (for debugging or sending to the provider)
       def to_s
         @message.to_s
@@ -62,7 +68,7 @@ module ActiveAgent
       private
 
       def set_messages
-        @messages = [Message.new(content: @instructions, role: :system)] + @messages
+        @messages = [Message.new(content: @instructions, role: :system)] + @messages if @instructions.present?
       end
 
       def set_message
@@ -71,6 +77,7 @@ module ActiveAgent
         elsif @body.is_a?(String) && @message.content.blank?
           @message = Message.new(content: @body, role: :user)
         end
+
         @messages << @message
       end
     end

data/lib/active_agent/base.rb

@@ -219,15 +219,14 @@ module ActiveAgent
     end
 
     def handle_response(response)
-      perform_actions(requested_actions: response.message.requested_actions) if response.message.requested_actions.present?
-
+      return response unless response.message.requested_actions.present?
+      perform_actions(requested_actions: response.message.requested_actions)
       update_prompt_context(response)
     end
 
     def update_prompt_context(response)
-      # response.prompt = prompt_context
-      # response.message = response.messages.last
-      response
+      prompt_context.message = prompt_context.messages.last
+      ActiveAgent::GenerationProvider::Response.new(prompt: prompt_context)
     end
 
     def perform_actions(requested_actions:)
@@ -237,9 +236,12 @@ module ActiveAgent
     end
 
     def perform_action(action)
+      current_context = prompt_context.clone
       process(action.name, *action.params)
       prompt_context.messages.last.role = :tool
       prompt_context.messages.last.action_id = action.id
+      current_context.messages << prompt_context.messages.last
+      self.prompt_context = current_context
     end
 
     def initialize
@@ -299,15 +301,11 @@ module ActiveAgent
 
     def prompt(headers = {}, &block)
       return prompt_context if @_prompt_was_called && headers.blank? && !block
-
       content_type = headers[:content_type]
-
       headers = apply_defaults(headers)
-
+      prompt_context.messages = headers[:messages] || []
       prompt_context.context_id = headers[:context_id]
 
-      prompt_context.options = options.merge(headers[:options] || {})
-
       prompt_context.charset = charset = headers[:charset]
 
       responses = collect_responses(headers, &block)
@@ -319,6 +317,7 @@ module ActiveAgent
       prompt_context.content_type = set_content_type(prompt_context, content_type, headers[:content_type])
       prompt_context.charset = charset
       prompt_context.actions = headers[:actions] || action_schemas
+
       prompt_context
     end
 

data/lib/active_agent/callbacks.rb

@@ -41,4 +41,4 @@ module ActiveAgent
       end
     end
   end
-end
+end

data/lib/active_agent/generation_provider/open_ai_provider.rb

@@ -23,12 +23,6 @@ module ActiveAgent
         raise GenerationProviderError, e.message
       end
 
-      def chat_prompt(parameters: prompt_parameters)
-        parameters[:stream] = provider_stream if prompt.options[:stream] || config["stream"]
-
-        chat_response(@client.chat(parameters: parameters))
-      end
-
       def embed(prompt)
         @prompt = prompt
 
@@ -37,39 +31,25 @@ module ActiveAgent
         raise GenerationProviderError, e.message
       end
 
-      def embeddings_parameters(input: prompt.message.content, model: "text-embedding-3-large")
-        {
-          model: model,
-          input: input
-        }
-      end
-
-      def embeddings_response(response)
-        message = Message.new(content: response.dig("data", 0, "embedding"), role: "assistant")
-
-        @response = ActiveAgent::GenerationProvider::Response.new(prompt: prompt, message: message, raw_response: response)
-      end
-
-      def embeddings_prompt(parameters:)
-        embeddings_response(@client.embeddings(parameters: embeddings_parameters))
-      end
-
       private
 
       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]
         message = ActiveAgent::ActionPrompt::Message.new(content: "", role: :assistant)
-        @response = ActiveAgent::GenerationProvider::Response.new(prompt: prompt, message:)
 
+        @response = ActiveAgent::GenerationProvider::Response.new(prompt:, message:)
         proc do |chunk, bytesize|
-          if (new_content = chunk.dig("choices", 0, "delta", "content"))
+          new_content = chunk.dig("choices", 0, "delta", "content")
+          if new_content && !new_content.blank
             message.content += new_content
 
             agent_stream.call(message, new_content, false) do |message, new_content|
               yield message, new_content if block_given?
             end
+          elsif chunk.dig("choices", 0, "delta", "tool_calls") && !chunk.dig("choices", 0, "delta", "tool_calls").empty?
+            message = handle_message(chunk.dig("choices", 0, "delta"))
+            prompt.messages << message
+            @response = ActiveAgent::GenerationProvider::Response.new(prompt:, message:)
           end
 
           agent_stream.call(message, nil, true) do |message|
@@ -105,35 +85,61 @@ module ActiveAgent
       end
 
       def chat_response(response)
-        binding.irb
         return @response if prompt.options[:stream]
 
         message_json = response.dig("choices", 0, "message")
 
-        message = ActiveAgent::ActionPrompt::Message.new(
+        message = handle_message(message_json)
+
+        update_context(prompt: prompt, message: message, response: response)
+
+        @response = ActiveAgent::GenerationProvider::Response.new(prompt: prompt, message: message, raw_response: response)
+      end
+
+      def handle_message(message_json)
+        ActiveAgent::ActionPrompt::Message.new(
           content: message_json["content"],
-          role: message_json["role"],
+          role: message_json["role"].intern,
           action_requested: message_json["finish_reason"] == "tool_calls",
           requested_actions: handle_actions(message_json["tool_calls"])
         )
-        update_context(prompt: prompt, message: message, response: response)
+      end
+
+      def handle_actions(tool_calls)
+        return [] if tool_calls.nil? || tool_calls.empty?
+
+        tool_calls.map do |tool_call|
+          next if tool_call["function"].nil? || tool_call["function"]["name"].blank?
+          args = tool_call["function"]["arguments"].blank? ? nil : JSON.parse(tool_call["function"]["arguments"], {symbolize_names: true})
+
+          ActiveAgent::ActionPrompt::Action.new(
+            id: tool_call["id"],
+            name: tool_call.dig("function", "name"),
+            params: args
+          )
+        end.compact
+      end
+
+      def chat_prompt(parameters: prompt_parameters)
+        parameters[:stream] = provider_stream if prompt.options[:stream] || config["stream"]
+        chat_response(@client.chat(parameters: parameters))
+      end
+
+      def embeddings_parameters(input: prompt.message.content, model: "text-embedding-3-large")
+        {
+          model: model,
+          input: input
+        }
+      end
+
+      def embeddings_response(response)
+        message = Message.new(content: response.dig("data", 0, "embedding"), role: "assistant")
 
         @response = ActiveAgent::GenerationProvider::Response.new(prompt: prompt, message: message, raw_response: response)
       end
 
-      def handle_actions(tool_calls)
-        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"),
-                {symbolize_names: true}
-              )
-            )
-          end
-        end
+      def embeddings_prompt(parameters:)
+        embeddings_response(@client.embeddings(parameters: embeddings_parameters))
       end
     end
   end

data/lib/active_agent/generation_provider/response.rb

@@ -5,9 +5,9 @@ module ActiveAgent
     class Response
       attr_reader :message, :prompt, :raw_response
 
-      def initialize(prompt:, message:, raw_response: nil)
-        @message = message
+      def initialize(prompt:, message: nil, raw_response: nil)
         @prompt = prompt
+        @message = message || prompt.message
         @raw_response = raw_response
       end
     end

data/lib/active_agent/version.rb

@@ -1,3 +1,3 @@
 module ActiveAgent
-  VERSION = "0.3"
+  VERSION = "0.3.1"
 end

data/lib/generators/active_agent/agent_generator.rb

@@ -19,57 +19,8 @@ module ActiveAgent
         end
       end
 
-      def create_test_file
-        if test_framework == :rspec
-          template "agent_spec.rb", File.join("spec/agents", class_path, "#{file_name}_agent_spec.rb")
-        else
-          template "agent_test.rb", File.join("test/agents", class_path, "#{file_name}_agent_test.rb")
-        end
-      end
-
-      def create_view_files
-        actions.each do |action|
-          @action = action
-          
-          # Use configured template engines or fall back to defaults
-          json_template_engine = json_template_engine_for_views || "jbuilder"
-          html_template_engine = html_template_engine_for_views || "erb"
-          
-          @schema_path = File.join("app/views", class_path, file_name, "#{action}.json.#{json_template_engine}")
-          @view_path = File.join("app/views", class_path, file_name, "#{action}.html.#{html_template_engine}")
-          
-          template "action.json.#{json_template_engine}", @schema_path
-          template "action.html.#{html_template_engine}", @view_path
-        end
-      end
-
-      def create_layout_files
-        # Create the application agent layouts
-        template "layout.text.erb", "app/views/layouts/agent.text.erb"
-        template "layout.html.erb", "app/views/layouts/agent.html.erb"
-      end
-
       private
 
-      def test_framework
-        ::Rails.application.config.generators.options[:rails][:test_framework]
-      end
-
-      def template_engine
-        ::Rails.application.config.generators.options[:rails][:template_engine]
-      end
-
-      def json_template_engine_for_views
-        # Check if there's a specific JSON template engine configured
-        json_engine = ::Rails.application.config.generators.options[:rails][:json_template_engine]
-        json_engine || "jbuilder" # Default to jbuilder if not specified
-      end
-      
-      def html_template_engine_for_views
-        # Use the configured template engine or default to erb
-        template_engine || "erb"
-      end
-
       def file_name # :doc:
         @_file_name ||= super + "_agent"
       end

data/lib/generators/active_agent/install_generator.rb

@@ -12,10 +12,6 @@ module ActiveAgent
       def create_application_agent
         template "application_agent.rb", "app/agents/application_agent.rb"
       end
-
-      def create_agent_layout_template
-        template "agent.text.erb", "app/views/layouts/agent.text.erb"
-      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeagent
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: 0.3.1
 platform: ruby
 authors:
 - Justin Bowen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-30 00:00:00.000000000 Z
+date: 2025-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -150,7 +150,6 @@ files:
 - lib/active_agent/base.rb
 - lib/active_agent/callbacks.rb
 - lib/active_agent/deprecator.rb
-- lib/active_agent/engine.rb
 - lib/active_agent/generation.rb
 - lib/active_agent/generation_job.rb
 - lib/active_agent/generation_methods.rb
@@ -162,7 +161,6 @@ files:
 - lib/active_agent/generation_provider/response.rb
 - lib/active_agent/inline_preview_interceptor.rb
 - lib/active_agent/log_subscriber.rb
-- lib/active_agent/operation.rb
 - lib/active_agent/parameterized.rb
 - lib/active_agent/preview.rb
 - lib/active_agent/prompt_helper.rb

data/lib/active_agent/engine.rb

@@ -1,14 +0,0 @@
-# require "rails/engine"
-
-# module ActiveAgent
-#   class Engine < ::Rails::Engine
-#     isolate_namespace ActiveAgent
-
-#     initializer "active_agent.view_paths" do |app|
-#       # Adding your gem's view path to Rails lookup paths
-#       ActiveSupport.on_load(:action_controller) do
-#         append_view_path Engine.root.join("app/views")
-#       end
-#     end
-#   end
-# end

data/lib/active_agent/operation.rb

@@ -1,13 +0,0 @@
-module ActiveAgent
-  class Operation < AbstractController::Base
-    include AbstractController::Rendering
-    include ActionView::Rendering  # Allows rendering of ERB templates without a view context tied to a request
-    append_view_path "app/views"  # Ensure the controller knows where to look for view templates
-
-    def process_tool(tool_name, params)
-      send(tool_name, params)  # Dynamically calls the method corresponding to tool_name
-    rescue NoMethodError
-      "Tool not found: #{tool_name}"
-    end
-  end
-end