foobara-agent 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc4b3804b5930b121fdc679ecf203b9e8b4d11122d24da967cfbfd10a1e6562d
-  data.tar.gz: '0739391b9b59d453783756a8efed38ec3d559ce7636873776ee71a14027059b5'
+  metadata.gz: dc32aeaa66ec947920e085944f7948d22d97b4fa3b39d1a4b4fbf58755ca4321
+  data.tar.gz: 0dc7b3d02061bf0a615ab6299ea5f607fff1d703804d5368b57a9157d4edf64a
 SHA512:
-  metadata.gz: 0ff04dba39a3edae5a80a98234cd7708c2f90d30bded9f12a0e2b665ea640c302e1ed14c607d61533daa5a0b3d7712684d92de740a3f3e085a1704286f95b837
-  data.tar.gz: 252b0f1a1c298bd984a856f4e63e57808b63cace046d58cf82f8c55f391c6d21fb3d98b8dda869582aa995eb6438a2fe998bae3952c5f6791eca00d25c5d181c
+  metadata.gz: e1a1d3780d7a3112cff93e7e626ec677ad558ce605e65c60f00ec3b8213b604e248ca4428311303b1902451f2bcc7d2a5f17f3725dde77bbb4725aeb10b9898d
+  data.tar.gz: f6113517024dc34e999fafcb3bc5ee0ec98fb63628f61725b5631e454d6edd4714933a745232e57f2a1c8f686f0d2544b481b1726cfff3e4dbbc47666bdd74c4

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [0.0.14] - 2025-07-08
+
+- Better handle serialization/pre-commit loading for various entity-depth scenarios
+
 ## [0.0.13] - 2025-07-06
 
 - Eliminate NotifyUser... result_type to save tokens/improve accuracy

data/src/foobara/agent/accomplish_goal.rb

@@ -19,7 +19,6 @@ module Foobara
         io_out :duck
         io_err :duck
         agent Agent, :required
-        context Context, :required, "The current context of the agent"
         maximum_command_calls :integer,
                               :allow_nil,
                               default: 25,
@@ -30,7 +29,9 @@ module Foobara
                   default: "claude-3-7-sonnet-20250219",
                   description: "The model to use for the LLM"
         max_llm_calls_per_minute :integer, :allow_nil
-        result_entity_depth :symbol, :allow_nil, one_of: [:atom, :aggregate]
+        user_association_depth :symbol, :allow_nil, one_of: Foobara::AssociationDepth
+        result_entity_depth :symbol, :allow_nil, one_of: Foobara::AssociationDepth
+        pass_aggregates_to_llm :boolean, :allow_nil
       end
 
       result do
@@ -41,8 +42,10 @@ module Foobara
       depends_on ListCommands
 
       def execute
-        simulate_describe_list_commands_command
-        simulate_list_commands_run
+        unless list_commands_already_ran?
+          simulate_describe_list_commands_command
+          simulate_list_commands_run
+        end
         # simulate_describe_command_run_for_all_commands
 
         until mission_accomplished or given_up
@@ -68,6 +71,10 @@ module Foobara
                     :final_result, :final_message, :command_response, :delayed_command_name,
                     :command_calls
 
+      def list_commands_already_ran?
+        context.command_log.any? { |log_entry| log_entry.command_name =~ /\bListCommands\z/ }
+      end
+
       def simulate_list_commands_run
         self.next_command_name = ListCommands.full_command_name
         self.next_command_raw_inputs = nil
@@ -141,7 +148,10 @@ module Foobara
 
         compact_command_log
 
-        inputs_for_determine = { context:, llm_model: }
+        inputs_for_determine = { agent:, llm_model: }
+        unless pass_aggregates_to_llm.nil?
+          inputs_for_determine[:pass_aggregates_to_llm] = pass_aggregates_to_llm
+        end
         determine_command = DetermineNextCommandNameAndInputs.new(inputs_for_determine)
 
         outcome = begin
@@ -516,6 +526,10 @@ module Foobara
           sleep seconds
         end
       end
+
+      def context
+        agent.context
+      end
     end
   end
 end

data/src/foobara/agent/determine_base.rb

@@ -2,9 +2,12 @@ require "foobara/llm_backed_command"
 
 module Foobara
   class Agent < CommandConnector
+    # TODO: just move this back to DetermineNextCommandAndInputs since it's now the only base class
     class DetermineBase < Foobara::LlmBackedCommand
       inputs do
-        context Context, :required, "Context of the progress towards the goal so far"
+        pass_aggregates_to_llm :boolean, :allow_nil, "Should we send aggregates to the LLM or " \
+                                                     "require it to fetch what it needs?"
+        agent Agent, :required
         llm_model :string,
                   one_of: Foobara::Ai::AnswerBot::Types::ModelEnum,
                   default: "claude-3-7-sonnet-20250219",
@@ -12,7 +15,11 @@ module Foobara
       end
 
       def association_depth
-        Foobara::JsonSchemaGenerator::AssociationDepth::ATOM
+        if pass_aggregates_to_llm
+          Foobara::AssociationDepth::AGGREGATE
+        else
+          Foobara::AssociationDepth::ATOM
+        end
       end
 
       def build_messages
@@ -49,34 +56,13 @@ module Foobara
         p
       end
 
-      def llm_instructions
-        return @llm_instructions if defined?(@llm_instructions)
-
-        description = self.class.description
-
-        instructions = "You are the implementation of a command called #{self.class.scoped_full_name}"
-
-        instructions += if description && !description.empty?
-                          " which has the following description:\n\n#{self.class.description}\n\n"
-                        else
-                          # :nocov:
-                          ". "
-                          # :nocov:
-                        end
-
-        instructions += "You are working towards accomplishing the following goal:\n\n#{goal}\n\n"
-        instructions += "Your response should match the following JSON schema: \n\n#{self.class.result_json_schema}\n\n"
-        instructions += "You can get more details about the result schema for a specific command by " \
-                        "choosing the DescribeCommand command. " \
-                        "You will reply with nothing more than the JSON you've generated so that the calling code " \
-                        "can successfully parse your answer."
-
-        @llm_instructions = instructions
-      end
-
       def goal
         context.current_goal
       end
+
+      def context
+        agent.context
+      end
     end
   end
 end

data/src/foobara/agent/determine_next_command_name_and_inputs.rb

@@ -3,6 +3,44 @@ require_relative "determine_base"
 module Foobara
   class Agent < CommandConnector
     class DetermineNextCommandNameAndInputs < DetermineBase
+      class << self
+        def llm_instructions(assistant_association_depth, goal)
+          key = [assistant_association_depth, goal]
+
+          @llm_instructions_cache ||= {}
+
+          if @llm_instructions_cache.key?(key)
+            @llm_instructions_cache[key]
+          else
+            @llm_instructions_cache[key] = build_llm_instructions(assistant_association_depth, goal)
+          end
+        end
+
+        def build_llm_instructions(assistant_association_depth, goal)
+          instructions = "You are the implementation of a command called #{scoped_full_name}"
+
+          instructions += if description && !description.empty?
+                            " which has the following description:\n\n#{description}\n\n"
+                          else
+                            # :nocov:
+                            ". "
+                            # :nocov:
+                          end
+
+          result_schema = result_json_schema(assistant_association_depth)
+
+          instructions += "You are working towards accomplishing the following goal:\n\n#{goal}\n\n"
+          instructions += "Your response of which command to run next should match the following JSON schema:"
+          instructions += "\n\n#{result_schema}\n\n"
+          instructions += "You can get more details about the inputs and result schemas for a specific command by " \
+                          "choosing the DescribeCommand command. " \
+                          "You will reply with nothing more than the JSON you've generated so that the calling code " \
+                          "can successfully parse your answer."
+
+          instructions
+        end
+      end
+
       description "Returns the name of the next command to run and its inputs given the progress  " \
                   "towards accomplishing the current goal. " \
                   "If the goal has been accomplished it will choose the " \
@@ -12,6 +50,10 @@ module Foobara
         command :string, :required
         inputs :attributes, :allow_nil
       end
+
+      def determine_llm_instructions
+        self.llm_instructions = self.class.llm_instructions(computed_user_association_depth, goal)
+      end
     end
   end
 end

data/src/foobara/agent.rb

@@ -24,6 +24,7 @@ module Foobara
                   :io_out,
                   :io_err,
                   :max_llm_calls_per_minute,
+                  :pass_aggregates_to_llm,
                   :result_entity_depth
 
     def initialize(
@@ -38,6 +39,7 @@ module Foobara
       io_err: nil,
       max_llm_calls_per_minute: nil,
       result_entity_depth: AssociationDepth::AGGREGATE,
+      pass_aggregates_to_llm: nil,
       **opts
     )
       # TODO: shouldn't have to pass command_log here since it has a default, debug that
@@ -51,25 +53,21 @@ module Foobara
       self.io_err = io_err
       self.max_llm_calls_per_minute = max_llm_calls_per_minute
       self.result_entity_depth = result_entity_depth
+      self.pass_aggregates_to_llm = pass_aggregates_to_llm
 
-      # unless opts.key?(:default_serializers)
-      #   opts = opts.merge(default_serializers: [
-      #                       Foobara::CommandConnectors::Serializers::ErrorsSerializer,
-      #                       Foobara::CommandConnectors::Serializers::AggregateSerializer
-      #                     ])
-      # end
+      pre_commit_transformer = if pass_aggregates_to_llm
+                                 CommandConnectors::Transformers::LoadAggregatesPreCommitTransformer
+                               else
+                                 CommandConnectors::Transformers::LoadAtomsPreCommitTransformer
+                               end
 
-      unless opts.key?(:default_pre_commit_transformers)
-        opts = opts.merge(
-          default_pre_commit_transformers: Foobara::CommandConnectors::Transformers::LoadAtomsPreCommitTransformer
-        )
-      end
+      opts = opts.merge(default_pre_commit_transformers: [
+        *opts[:default_pre_commit_transformers],
+        pre_commit_transformer
+      ].uniq)
 
       super(**opts)
 
-      # TODO: this should work now, switch to this approach
-      # add_default_inputs_transformer EntityToPrimaryKeyInputsTransformer
-
       # TODO: push this convenience method up into base class?
       command_classes&.each do |command_class|
         connect(command_class)
@@ -171,7 +169,6 @@ module Foobara
       inputs = {
         goal:,
         final_result_type: self.result_type,
-        context:,
         agent: self
       }
 
@@ -209,6 +206,10 @@ module Foobara
         inputs[:result_entity_depth] = result_entity_depth
       end
 
+      unless pass_aggregates_to_llm.nil?
+        inputs[:pass_aggregates_to_llm] = pass_aggregates_to_llm
+      end
+
       inputs
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foobara-agent
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Miles Georgi
@@ -29,14 +29,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 1.0.0
 email:
 - azimux@gmail.com
 executables: []