activeagent 0.2.6.7 → 0.2.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 046bee054500815713a48ba1f4b6716d82c15ce122a2bd94867fa1287052ca94
-  data.tar.gz: b625b8759720d87b5570db0322ed83d98c39cfaf97cf66d1d3bf1516cc2c8170
+  metadata.gz: '08db8e070616e81109c24a4738d29cc5c7b2911a3b7584e90c23cd9a1072a20a'
+  data.tar.gz: 424e66ddfde6018b15b33d440764604db3cb3c1c3bef3f6cc0c0e765cad8d06e
 SHA512:
-  metadata.gz: 5b26d995bea053663904e9e26b898c6dc60a30b5d70d46c97c28aa3e943eed198d09627431f711e94e39f97de038851463307bb321767aebf63ca08219b7938a
-  data.tar.gz: 94b53137b2496b6c8c8958d8ae0686a4c7d6106ce71bc59ad5bdd11c215e94718d92f5a0458ff41f5502ba6b3a6bffc7fda1805e7c75421ccdebac2b69e22d66
+  metadata.gz: d6b7d4b86153dfea08db656c6b0620229902d371fd0afccbc4eca30e961875a4982339dfd4cdc77c2349d9ecf7e9085a98de07a406c73c15cf4a25ffc0fe3548
+  data.tar.gz: 4bb01d36f8610e25f0f0220f9b465779e15afa083786dfa8628def00b5a693a2804ff9665f967e484034ef30ea4312e2eafcc813aef1f66fb597ff7dd5bbbe49

data/lib/active_agent/action_prompt/message.rb

@@ -3,14 +3,13 @@ module ActiveAgent
     class Message
       VALID_ROLES = %w[system assistant user tool function].freeze
 
-      attr_accessor :action_id, :content, :role, :name, :action_requested, :requested_actions, :content_type, :charset
+      attr_accessor :action_id, :content, :role, :action_requested, :requested_actions, :content_type, :charset
 
       def initialize(attributes = {})
         @action_id = attributes[:action_id]
         @charset = attributes[:charset] || "UTF-8"
         @content = attributes[:content] || ""
         @content_type = attributes[:content_type] || "text/plain"
-        @name = attributes[:name]
         @role = attributes[:role] || :user
         @requested_actions = attributes[:requested_actions] || []
         @action_requested = @requested_actions.any?
@@ -26,7 +25,6 @@ module ActiveAgent
           charset: charset
         }
 
-        hash[:name] = name if name
         hash[:action_requested] = requested_actions.any?
         hash[:requested_actions] = requested_actions if requested_actions.any?
         hash

data/lib/active_agent/action_prompt/prompt.rb

@@ -3,10 +3,11 @@ require_relative "message"
 module ActiveAgent
   module ActionPrompt
     class Prompt
-      attr_accessor :actions, :body, :content_type, :instructions, :message, :messages, :options, :mime_version, :charset, :context, :parts
+      attr_accessor :actions, :body, :content_type, :context_id, :instructions, :message, :messages, :options, :mime_version, :charset, :context, :parts
 
       def initialize(attributes = {})
         @options = attributes.fetch(:options, {})
+        @agent_class = attributes.fetch(:agent_class, ApplicationAgent)
         @actions = attributes.fetch(:actions, [])
         @action_choice = attributes.fetch(:action_choice, "")
         @instructions = attributes.fetch(:instructions, "")
@@ -18,6 +19,7 @@ module ActiveAgent
         @mime_version = attributes.fetch(:mime_version, "1.0")
         @charset = attributes.fetch(:charset, "UTF-8")
         @context = attributes.fetch(:context, [])
+        @context_id = attributes.fetch(:context_id, nil)
         @headers = attributes.fetch(:headers, {})
         @parts = attributes.fetch(:parts, [])
 

data/lib/active_agent/base.rb

@@ -129,6 +129,7 @@ module ActiveAgent
       def generate_with(provider, **options)
         self.generation_provider = provider
         self.options = (options || {}).merge(options)
+        self.options[:stream] = new.agent_stream if self.options[:stream]
         generation_provider.config.merge!(self.options)
       end
 
@@ -176,13 +177,8 @@ module ActiveAgent
 
       def set_payload_for_prompt(payload, prompt)
         payload[:prompt] = prompt.encoded
-        payload[:agent] = name
+        payload[:agent] = agent_name
         payload[:message_id] = prompt.message_id
-        payload[:subject] = prompt.subject
-        payload[:to] = prompt.to
-        payload[:from] = prompt.from
-        payload[:bcc] = prompt.bcc if prompt.bcc.present?
-        payload[:cc] = prompt.cc if prompt.cc.present?
         payload[:date] = prompt.date
         payload[:perform_generations] = prompt.perform_generations
       end
@@ -200,47 +196,56 @@ module ActiveAgent
       end
     end
 
-    attr_internal :context
+    attr_internal :prompt_context
+
+    def agent_stream
+      proc do |message, delta, stop|
+        run_stream_callbacks(message, delta, stop) do |message, delta, stop|
+          yield message, delta, stop if block_given?
+        end
+      end
+    end
 
     def embed
-      context.options.merge(options)
-      generation_provider.embed(context) if context && generation_provider
+      prompt_context.options.merge(options)
+      generation_provider.embed(prompt_context) if prompt_context && generation_provider
       handle_response(generation_provider.response)
     end
 
     def perform_generation
-      context.options.merge(options)
-      generation_provider.generate(context) if context && generation_provider
+      prompt_context.options.merge(options)
+      generation_provider.generate(prompt_context) if prompt_context && generation_provider
       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_prompt_context(response)
     end
 
-    def update_context(response)
-      response.prompt
+    def update_prompt_context(response)
+      # response.prompt = prompt_context
+      # response.message = response.messages.last
       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
 
     def perform_action(action)
       process(action.name, *action.params)
+      prompt_context.messages.last.role = :tool
+      prompt_context.messages.last.action_id = action.id
     end
 
     def initialize
       super
       @_prompt_was_called = false
-      @_context = ActiveAgent::ActionPrompt::Prompt.new(instructions: options[:instructions], options: options)
+      @_prompt_context = ActiveAgent::ActionPrompt::Prompt.new(instructions: options[:instructions], options: options)
     end
 
     def process(method_name, *args) # :nodoc:
@@ -252,7 +257,7 @@ module ActiveAgent
 
       ActiveSupport::Notifications.instrument("process.active_agent", payload) do
         super
-        @_context = ActiveAgent::ActionPrompt::Prompt.new unless @_prompt_was_called
+        @_prompt_context = ActiveAgent::ActionPrompt::Prompt.new unless @_prompt_was_called
       end
     end
     ruby2_keywords(:process)
@@ -282,20 +287,12 @@ module ActiveAgent
 
     def headers(args = nil)
       if args
-        @_context.headers(args)
+        @_prompt_context.headers(args)
       else
-        @_context
+        @_prompt_context
       end
     end
 
-    # def attachments
-    #   if @_prompt_was_called
-    #     LateAttachmentsProxy.new(@_context.attachments)
-    #   else
-    #     @_context.attachments
-    #   end
-    # end
-
     class LateAttachmentsProxy < SimpleDelegator
       def inline
         self
@@ -314,28 +311,30 @@ module ActiveAgent
     end
 
     def prompt_with(*)
-      context.update_context(*)
+      prompt_context.update_prompt_context(*)
     end
 
     def prompt(headers = {}, &block)
-      return context if @_prompt_was_called && headers.blank? && !block
+      return prompt_context if @_prompt_was_called && headers.blank? && !block
 
       content_type = headers[:content_type]
 
       headers = apply_defaults(headers)
 
-      context.charset = charset = headers[:charset]
+      prompt_context.context_id = headers[:context_id]
+
+      prompt_context.charset = charset = headers[:charset]
 
       responses = collect_responses(headers, &block)
 
       @_prompt_was_called = true
 
-      create_parts_from_responses(context, responses)
+      create_parts_from_responses(prompt_context, responses)
 
-      context.content_type = set_content_type(context, content_type, headers[:content_type])
-      context.charset = charset
-      context.actions = headers[:actions] || action_schemas
-      context
+      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
 
     def action_schemas
@@ -352,7 +351,7 @@ module ActiveAgent
       if user_content_type.present?
         user_content_type
       else
-        context.content_type || class_default
+        prompt_context.content_type || class_default
       end
     end
 
@@ -383,10 +382,10 @@ module ActiveAgent
       end
     end
 
-    def assign_headers_to_context(context, headers)
+    def assign_headers_to_prompt_context(prompt_context, headers)
       assignable = headers.except(:parts_order, :content_type, :body, :template_name,
         :template_path, :delivery_method, :delivery_method_options)
-      assignable.each { |k, v| context[k] = v }
+      assignable.each { |k, v| prompt_context[k] = v }
     end
 
     def collect_responses(headers, &)
@@ -437,24 +436,24 @@ module ActiveAgent
       end
     end
 
-    def create_parts_from_responses(context, responses)
+    def create_parts_from_responses(prompt_context, responses)
       if responses.size > 1
         # 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)
+        responses.each { |r| insert_part(prompt_context, r, prompt_context.charset) }
+        # prompt_context.add_part(prompt_container)
       else
-        responses.each { |r| insert_part(context, r, context.charset) }
+        responses.each { |r| insert_part(prompt_context, r, prompt_context.charset) }
       end
     end
 
-    def insert_part(context, response, charset)
+    def insert_part(prompt_context, response, charset)
       message = ActiveAgent::ActionPrompt::Message.new(
         content: response[:body],
         content_type: response[:content_type],
         charset: charset
       )
-      context.add_part(message)
+      prompt_context.add_part(message)
     end
 
     # This and #instrument_name is for caching instrument

data/lib/active_agent/generation.rb

@@ -11,14 +11,14 @@ module ActiveAgent
     ruby2_keywords(:initialize)
 
     def __getobj__
-      @prompt_context ||= processed_agent.context
+      @prompt_context ||= processed_agent.prompt_context
     end
 
     def __setobj__(prompt_context)
       @prompt_context = prompt_context
     end
 
-    def context
+    def prompt_context
       __getobj__
     end
 

data/lib/active_agent/generation_provider/anthropic_provider.rb

@@ -0,0 +1,142 @@
+# lib/active_agent/generation_provider/anthropic_provider.rb
+
+require "anthropic"
+require "active_agent/action_prompt/action"
+require_relative "base"
+require_relative "response"
+
+module ActiveAgent
+  module GenerationProvider
+    class AnthropicProvider < Base
+      def initialize(config)
+        super
+        @api_key = config["api_key"]
+        @model_name = config["model"] || "claude-3-5-sonnet-20240620"
+        @client = Anthropic::Client.new(access_token: @api_key)
+      end
+
+      def generate(prompt)
+        @prompt = prompt
+
+        chat_prompt(parameters: prompt_parameters)
+      rescue => e
+        raise GenerationProviderError, e.message
+      end
+
+      def chat_prompt(parameters: prompt_parameters)
+        parameters[:stream] = provider_stream if prompt.options[:stream] || config["stream"]
+
+        chat_response(@client.messages(parameters))
+      end
+
+      private
+
+      def provider_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|
+          if new_content = chunk.dig(:delta, :text)
+            message.content += new_content
+            agent_stream.call(message) if agent_stream.respond_to?(:call)
+          end
+        end
+      end
+
+      def prompt_parameters(model: @prompt.options[:model] || @model_name, messages: @prompt.messages, temperature: @config["temperature"] || 0.7, tools: @prompt.actions)
+        params = {
+          model: model,
+          messages: provider_messages(messages),
+          temperature: temperature,
+          max_tokens: 4096
+        }
+
+        if tools&.present?
+          params[:tools] = format_tools(tools)
+        end
+
+        params
+      end
+
+      def format_tools(tools)
+        tools.map do |tool|
+          {
+            name: tool[:name] || tool[:function][:name],
+            description: tool[:description],
+            input_schema: tool[:parameters]
+          }
+        end
+      end
+
+      def provider_messages(messages)
+        messages.map do |message|
+          provider_message = {
+            role: convert_role(message.role),
+            content: []
+          }
+
+          provider_message[:content] << if message.content_type == "image_url"
+            {
+              type: "image",
+              source: {
+                type: "url",
+                url: message.content
+              }
+            }
+          else
+            {
+              type: "text",
+              text: message.content
+            }
+          end
+
+          provider_message
+        end
+      end
+
+      def convert_role(role)
+        case role.to_s
+        when "system" then "system"
+        when "user" then "user"
+        when "assistant" then "assistant"
+        when "tool", "function" then "assistant"
+        else "user"
+        end
+      end
+
+      def chat_response(response)
+        return @response if prompt.options[:stream]
+
+        content = response.content.first[:text]
+
+        message = ActiveAgent::ActionPrompt::Message.new(
+          content: content,
+          role: "assistant",
+          action_requested: response.stop_reason == "tool_use",
+          requested_actions: handle_actions(response.tool_use)
+        )
+
+        update_context(prompt: prompt, message: message, response: response)
+
+        @response = ActiveAgent::GenerationProvider::Response.new(
+          prompt: prompt,
+          message: message,
+          raw_response: response
+        )
+      end
+
+      def handle_actions(tool_uses)
+        return unless tool_uses&.present?
+
+        tool_uses.map do |tool_use|
+          ActiveAgent::ActionPrompt::Action.new(
+            id: tool_use[:id],
+            name: tool_use[:name],
+            params: tool_use[:input]
+          )
+        end
+      end
+    end
+  end
+end

data/lib/active_agent/generation_provider/open_ai_provider.rb

@@ -17,7 +17,7 @@ module ActiveAgent
 
       def generate(prompt)
         @prompt = prompt
-        binding.irb
+
         chat_prompt(parameters: prompt_parameters)
       rescue => e
         raise GenerationProviderError, e.message
@@ -64,9 +64,16 @@ module ActiveAgent
         @response = ActiveAgent::GenerationProvider::Response.new(prompt: prompt, message:)
 
         proc do |chunk, bytesize|
-          if new_content = chunk.dig("choices", 0, "delta", "content")
+          if (new_content = chunk.dig("choices", 0, "delta", "content"))
             message.content += new_content
-            agent_stream.call(message) if agent_stream.respond_to?(:call)
+
+            agent_stream.call(message, new_content, false) do |message, new_content|
+              yield message, new_content if block_given?
+            end
+          end
+
+          agent_stream.call(message, nil, true) do |message|
+            yield message, nil if block_given?
           end
         end
       end

data/lib/active_agent/version.rb

@@ -1,3 +1,3 @@
 module ActiveAgent
-  VERSION = "0.2.6.7"
+  VERSION = "0.2.6.9"
 end

data/lib/generators/active_agent/agent_generator.rb

@@ -31,9 +31,9 @@ module ActiveAgent
         actions.each do |action|
           @action = action
           @schema_path = File.join("app/views", class_path, file_name, "#{action}.json.jbuilder")
-          @view_path = File.join("app/views", class_path, file_name, "#{action}.html.#{template_engine}")
+          @view_path = File.join("app/views", class_path, file_name, "#{action}.html.erb")
           template "action.json.jbuilder", @schema_path
-          template "action.html.#{template_engine}", @view_path
+          template "action.html.erb", @view_path
         end
       end
 

data/lib/generators/active_agent/install_generator.rb

@@ -12,6 +12,10 @@ 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

data/lib/generators/active_agent/templates/agent.text.erb

@@ -0,0 +1 @@
+<%= yield %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeagent
 version: !ruby/object:Gem::Version
-  version: 0.2.6.7
+  version: 0.2.6.9
 platform: ruby
 authors:
 - Justin Bowen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-17 00:00:00.000000000 Z
+date: 2025-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -156,6 +156,7 @@ files:
 - lib/active_agent/generation_methods.rb
 - lib/active_agent/generation_provider.rb
 - lib/active_agent/generation_provider/README.md
+- lib/active_agent/generation_provider/anthropic_provider.rb
 - lib/active_agent/generation_provider/base.rb
 - lib/active_agent/generation_provider/open_ai_provider.rb
 - lib/active_agent/generation_provider/response.rb
@@ -179,6 +180,7 @@ files:
 - lib/generators/active_agent/templates/action.json.jbuilder.tt
 - lib/generators/active_agent/templates/active_agent.yml
 - lib/generators/active_agent/templates/agent.rb.tt
+- lib/generators/active_agent/templates/agent.text.erb
 - lib/generators/active_agent/templates/agent_spec.rb.tt
 - lib/generators/active_agent/templates/agent_test.rb.tt
 - lib/generators/active_agent/templates/application_agent.rb.tt