activeagent 0.5.0rc3 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f3087fa32e11e33dd1f48e093a8d92b38e11264bf403faa65f4a57c8e3b2a4b
-  data.tar.gz: 57ce989b2279b23d56ab3b40eba65877ec336bc056cc375f869b1caf301aad2f
+  metadata.gz: ae6f20cf300442f42f9bc00eefea0b8b987dd7e3852e410c685b1f51ba5dcdc2
+  data.tar.gz: aaabea49a2e71c68c4b8a9b8769fd541b2fad12e1fc16d90aad2219cd0775522
 SHA512:
-  metadata.gz: 25c0437d878f5c2452276614c23c868dfdcec6667906e546b13176916fd12edd30ae4f6c21296ad3a724f5382e82a71a84594b4563165076aa5b50c52b98f7a2
-  data.tar.gz: 0cef9d5c876bf9d235c0090dfd4d873da3d0508c8c77820c70d408df2595eae7d3e167ffe65644ebcc7faa5b5e361be81c56446ad5c106877a2d651407a6d8a9
+  metadata.gz: 454f25de89fd2ba05d31e8a39304d0d6a25e6cf7ad3694464ee9013e0f946ca3794500a889d75e77da3d0c1433a084557caf70765b471eb3a6e9324ef78d8853
+  data.tar.gz: 72075033b38ac50b840e6d6a944922ae2402ab1fdb608f458b9e274883b1ff65286a7eec0530d0a4327c77bf2f1d01f3d471bc18ac986eaee7f9c1ad463816f7

data/lib/active_agent/action_prompt/base.rb

@@ -304,9 +304,9 @@ module ActiveAgent
 
       def prompt(headers = {}, &block)
         return context if @_prompt_was_called && headers.blank? && !block
+        # Apply option hierarchy: prompt options > agent options > config options
+        merged_options = merge_options(headers[:options] || {})
 
-        # Apply option hierarchy: prompt options > agent > config options
-        merged_options = merge_options(headers)
         raw_instructions = headers.has_key?(:instructions) ? headers[:instructions] : context.options[:instructions]
 
         context.instructions = prepare_instructions(raw_instructions)
@@ -403,9 +403,8 @@ module ActiveAgent
         # Extract runtime options from prompt_options (exclude instructions as it has special template logic)
         runtime_options = prompt_options.slice(
           :model, :temperature, :max_tokens, :stream, :top_p, :frequency_penalty,
-          :presence_penalty, :response_format, :seed, :stop, :tools_choice, :user
+          :presence_penalty, :response_format, :seed, :stop, :tools_choice
         )
-
         # Handle explicit options parameter
         explicit_options = prompt_options[:options] || {}
 
@@ -535,7 +534,6 @@ module ActiveAgent
       end
 
       def prepare_instructions(instructions)
-        binding.irb
         case instructions
         when Hash
           raise ArgumentError, "Expected `:template` key in instructions hash" unless instructions[:template]

data/lib/active_agent/generation_provider/anthropic_provider.rb

@@ -32,7 +32,7 @@ module ActiveAgent
       def chat_prompt(parameters: prompt_parameters)
         parameters[:stream] = provider_stream if prompt.options[:stream] || config["stream"]
 
-        chat_response(@client.messages(parameters))
+        chat_response(@client.messages(parameters: parameters))
       end
 
       private
@@ -51,8 +51,11 @@ module ActiveAgent
       end
 
       def prompt_parameters(model: @prompt.options[:model] || @model_name, messages: @prompt.messages, temperature: @prompt.options[:temperature] || @config["temperature"] || 0.7, tools: @prompt.actions)
+        # fix for new Anthropic API that requires messages to be in a specific format without system role
+        messages = messages.reject { |m| m.role == :system }
         params = {
           model: model,
+          system: @prompt.options[:instructions],
           messages: provider_messages(messages),
           temperature: temperature,
           max_tokens: @prompt.options[:max_tokens] || @config["max_tokens"] || 4096
@@ -68,9 +71,9 @@ module ActiveAgent
       def format_tools(tools)
         tools.map do |tool|
           {
-            name: tool[:name] || tool[:function][:name],
-            description: tool[:description],
-            input_schema: tool[:parameters]
+            name: tool["name"] || tool["function"]["name"],
+            description: tool["description"] || tool["function"]["description"],
+            input_schema: tool["parameters"]  || tool["function"]["parameters"]
           }
         end
       end
@@ -114,13 +117,13 @@ module ActiveAgent
       def chat_response(response)
         return @response if prompt.options[:stream]
 
-        content = response.content.first[:text]
+        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)
+          action_requested: response["stop_reason"] == "tool_use",
+          requested_actions: handle_actions(response["tool_use"])
         )
 
         update_context(prompt: prompt, message: message, response: response)

data/lib/active_agent/generation_provider/open_ai_provider.rb

@@ -1,5 +1,5 @@
 begin
-  gem "ruby-openai", "~> 8.1.0"
+  gem "ruby-openai", ">= 8.1.0"
   require "openai"
 rescue LoadError
   raise LoadError, "The 'ruby-openai' gem is required for OpenAIProvider. Please add it to your Gemfile and run `bundle install`."

data/lib/active_agent/parameterized.rb

@@ -15,12 +15,12 @@ module ActiveAgent
     module ClassMethods
       def with(params = {})
         # Separate runtime options from regular params
-        runtime_options = params.extract!(:model, :temperature, :max_tokens, :stream, :top_p,
-                                          :frequency_penalty, :presence_penalty, :response_format,
-                                          :seed, :stop, :tools_choice, :user)
+        # runtime_options = params.extract!(:model, :temperature, :max_tokens, :stream, :top_p,
+        #                                   :frequency_penalty, :presence_penalty, :response_format,
+        #                                   :seed, :stop, :tools_choice, :user)
 
-        # Pass runtime options as :options parameter
-        params[:options] = runtime_options if runtime_options.any?
+        # # Pass runtime options as :options parameter
+        # params[:options] = runtime_options if runtime_options.any?
 
         ActiveAgent::Parameterized::Agent.new(self, params)
       end

data/lib/active_agent/version.rb

@@ -1,3 +1,3 @@
 module ActiveAgent
-  VERSION = "0.5.0rc3"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeagent
 version: !ruby/object:Gem::Version
-  version: 0.5.0rc3
+  version: 0.5.1
 platform: ruby
 authors:
 - Justin Bowen