foobara-agent-backed-command 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44612bf50517981f612d5cc6da7ebf23149455f80ed3ff523c5c9453b2e9168e
-  data.tar.gz: 294abdb6334158e2544eeb171ce8405194544c461c83df6e0e57d6b78a540734
+  metadata.gz: dc71a16e925bc371058a8fa67197ffbb4628fc5b9a7201a41a19e9bb86b661b6
+  data.tar.gz: 1274e53472b00432601ad7ca1c9db89716e82d804816c2b6b35383d9f1dbffb4
 SHA512:
-  metadata.gz: 9d94e43106f216cb08b4a6378fe571882656bb0526b9a340084f8a60c9090136d0f6cb0ccfb0e661417e87fb62f2294547643b7b516c6f19a0f66eb30b5e8e0d
-  data.tar.gz: 0cd7d6926331e9f8c0fa1665336291fa552fadd4ce8af8ccaffa3708b4135fda0c136edfdba01f87429651b99d0aeb0578adedd9019f57406783e0639633b1ed
+  metadata.gz: 74a9526f5b9e09496b5a0c0e162181af418d8a2aa9efecdaffe5bb9c6e0e2f04222dbcba84ceded5d7c14d3a0a2b24fefb3b54c8986d23832aa95ed6f3ec5686
+  data.tar.gz: 6c442453cec558c796c836ab9a24b74d0106307dda2cb51689611df1b86e28201adc158e8f3c18cede0b10c3ed662606152074fc2b70c6e2afc491d2460f2d3e

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [0.0.7] - 2025-07-23
+
+- Do not let ABCs use the #agent_options input of other ABCs
+
+## [0.0.6] - 2025-07-21
+
+- Make sure foobara-ai gem is properly loaded
+
 ## [0.0.5] - 2025-07-12
 
 - Allow agent_options input to be removed

data/lib/foobara/agent_backed_command.rb

@@ -1,3 +1,4 @@
 require "foobara/all"
+require "foobara/ai"
 
 Foobara::Util.require_directory "#{__dir__}/../../src"

data/src/agent_backed_command.rb

@@ -30,8 +30,8 @@ module Foobara
       [
         :agent_name,
         :llm_model,
-        :max_llm_calls_per_minute,
-        :result_entity_depth
+        :result_entity_depth,
+        :maximum_command_calls
       ].each do |method_name|
         define_method method_name do |*args|
           case args.size
@@ -60,8 +60,11 @@ module Foobara
                   one_of: Ai::AnswerBot::Types::ModelEnum,
                   default: Ai.default_llm_model,
                   description: "The model to use for the LLM"
-        max_llm_calls_per_minute :integer, :allow_nil
         pass_aggregates_to_llm :boolean, :allow_nil
+        maximum_command_calls :integer,
+                              :allow_nil,
+                              default: 25,
+                              description: "Maximum number of commands to run before giving up"
         result_entity_depth :symbol, :allow_nil, one_of: Foobara::AssociationDepth
       end
     end
@@ -123,13 +126,12 @@ module Foobara
                             end
                           end
 
-      agent_name = agent_options&.[](:agent_name) || self.class.agent_name || "#{self.class.scoped_short_name}Agent"
+      agent_name = agent_options&.[](:agent_name) || self.class.agent_name || self.class.scoped_short_name
 
       verbose = agent_options&.[](:verbose)
       verbose = self.class.verbose? if verbose.nil?
 
       opts = {
-        command_classes:,
         include_message_to_user_in_result:,
         result_type: agent_result_type,
         verbose:,
@@ -137,9 +139,7 @@ module Foobara
         io_err: agent_options&.[](:io_err) || self.class.io_err,
         agent_name:,
         context: agent_options&.[](:context) || self.class.context,
-        llm_model: agent_options&.[](:llm_model) || self.class.llm_model,
-        # TODO: eliminate this now that we have backoffs for 529s and 429s
-        max_llm_calls_per_minute: agent_options&.[](:max_llm_calls_per_minute) || self.class.max_llm_calls_per_minute
+        llm_model: agent_options&.[](:llm_model) || self.class.llm_model
       }
 
       if agent_options&.[](:result_entity_depth).nil?
@@ -156,7 +156,34 @@ module Foobara
                                         agent_options[:pass_aggregates_to_llm]
                                       end
 
+      maximum_command_calls = agent_options&.[](:maximum_command_calls) || self.class.maximum_command_calls
+
+      if maximum_command_calls
+        opts[:maximum_command_calls] = maximum_command_calls
+      end
+
       self.agent = Foobara::Agent.new(**opts)
+
+      command_classes.each do |klass|
+        if klass.is_a?(::Symbol)
+          real_class = Namespace.global.foobara_lookup_command(
+            klass,
+            mode: Namespace::LookupMode::ABSOLUTE
+          )
+
+          if real_class
+            klass = real_class
+          end
+        end
+
+        opts = if klass.is_a?(Class) && klass < AgentBackedCommand
+                 { inputs: { reject: [:agent_options] } }
+               else
+                 {}
+               end
+
+        agent.connect(klass, **opts)
+      end
     end
 
     def agent_options
@@ -177,10 +204,9 @@ module Foobara
         goal = Util.underscore(goal)
         goal = Util.humanize(goal)
 
-        goal = "You are an agent backed command named #{self.class.scoped_short_name}. Your goal is: #{goal}."
-
         if self.class.description
-          goal += " The command description is: #{self.class.description}."
+          goal += "\n\nYour behavior has been described to the person or agent that chose to run you as: "
+          goal += self.class.description
         end
 
         inputs_type = self.class.inputs_type
@@ -202,7 +228,7 @@ module Foobara
               inputs_type,
               association_depth:
             )
-            goal += " The inputs to this command have the following type:\n\n#{json_inputs_type}\n\n"
+            goal += "\n\nYour inputs to this command have the following type:\n\n#{json_inputs_type}\n\n"
 
             serializer = if pass_aggregates_to_llm?
                            CommandConnectors::Serializers::AggregateSerializer

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foobara-agent-backed-command
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Miles Georgi