foobara-agent-backed-command 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 282e1d35799a4c8226d1d381689f21a09450e4533c0ec3cdd1a52daabe2565e1
-  data.tar.gz: d1eeb6e39f5518f5e9800d8e9c010cf5e4a3607aa533f29c9a2949fa52da9eb5
+  metadata.gz: 1285ca282dd917cdb1193550613fafd8b73a0de6fa28e9b3bb54645b559c0f32
+  data.tar.gz: 5db41d9063471ad5d537aac616ac6c66ab54f6bee854cc32dec4f8ca86b78e0a
 SHA512:
-  metadata.gz: f8a4237ef3f621ab8c854a9f9f2f89f3021ccf6ea4679dcbbeba59237e55572e5d1c7221a6c483fd80ddd2556a4534572fbc69d603b25beb51c5f1587d2433e5
-  data.tar.gz: dc5baf5bd4cd96fe08ad0294b45561c954e8cadef331e98b86e426d91986da4a637c1108777d8784e214de7492a6ad4f5ada7295d6cd6d5bd0f801d066efa7df
+  metadata.gz: 031bb05dfe8d289d7ceaa4a8ba6151644305c56dc7a670a4482e71f618226aebdee4dde73f492d057e8c571ba9cf60bdccbd83839d2ce74f811a288a43e9b383
+  data.tar.gz: 7f723d58cf19367d5a0d3ecb31e77aa1b2563fd7be4f187ac8260e5d7c0f7c38ba76f1d40a49e5cd54df04be90875262c12dcaf6e87c2ba465fc5ea12ca2513d

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [0.0.3] - 2025-07-09
+
+- Make use of Ai.default_llm_model
+
+## [0.0.2] - 2025-07-08
+
+- Better handle serialization/pre-commit loading for different inputs/result scenarios
+
 ## [0.0.1] - 2025-07-03
 
 - Initial release

data/src/agent_backed_command.rb

@@ -9,7 +9,8 @@ module Foobara
 
     class << self
       # TODO: does this need to be a Concern for proper inheritance?
-      attr_accessor :is_verbose, :io_out, :io_err, :context, :agent_name, :llm_model, :max_llm_calls_per_minute
+      attr_accessor :is_verbose, :io_out, :io_err, :context, :agent_name, :llm_model, :max_llm_calls_per_minute,
+                    :pass_aggregates_to_llm, :result_entity_depth
 
       def verbose(value = true)
         self.is_verbose = value
@@ -22,16 +23,19 @@ module Foobara
 
     inputs do
       agent_options do
-        verbose :boolean
+        verbose :boolean, :allow_nil
         io_out :duck
         io_err :duck
         context Foobara::Agent::Context, :allow_nil, "The current context of the agent"
         agent_name :string, :allow_nil
         llm_model :string,
                   :allow_nil,
-                  one_of: Foobara::Ai::AnswerBot::Types::ModelEnum,
+                  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
+        result_entity_depth :symbol, :allow_nil, one_of: Foobara::AssociationDepth
       end
     end
 
@@ -97,7 +101,7 @@ module Foobara
       verbose = agent_options&.[](:verbose)
       verbose = self.class.verbose? if verbose.nil?
 
-      self.agent = Foobara::Agent.new(
+      opts = {
         command_classes:,
         include_message_to_user_in_result:,
         result_type: agent_result_type,
@@ -107,8 +111,35 @@ module Foobara
         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
-      )
+      }
+
+      if agent_options&.[](:result_entity_depth).nil?
+        unless self.class.result_entity_depth.nil?
+          opts[:result_entity_depth] = self.class.result_entity_depth
+        end
+      else
+        opts[:result_entity_depth] = agent_options[:result_entity_depth]
+      end
+
+      if agent_options&.[](:pass_aggregates_to_llm).nil?
+        unless self.class.pass_aggregates_to_llm.nil?
+          opts[:pass_aggregates_to_llm] = self.class.pass_aggregates_to_llm
+        end
+      else
+        opts[:pass_aggregates_to_llm] = agent_options[:pass_aggregates_to_llm]
+      end
+
+      self.agent = Foobara::Agent.new(**opts)
+    end
+
+    def pass_aggregates_to_llm?
+      if agent_options&.[](:pass_aggregates_to_llm).nil?
+        self.class.pass_aggregates_to_llm
+      else
+        agent_options[:pass_aggregates_to_llm]
+      end
     end
 
     def construct_goal_if_needed
@@ -132,13 +163,24 @@ module Foobara
             inputs_type = TypeDeclarations::Attributes.reject(inputs_type.declaration_data, :agent_options)
             inputs_type = domain.foobara_type_from_declaration(inputs_type)
 
+            association_depth = if pass_aggregates_to_llm?
+                                  AssociationDepth::AGGREGATE
+                                else
+                                  AssociationDepth::ATOM
+                                end
+
             json_inputs_type = JsonSchemaGenerator.to_json_schema(
               inputs_type,
-              association_depth: JsonSchemaGenerator::AssociationDepth::ATOM
+              association_depth:
             )
             goal += " The inputs to this command have the following type:\n\n#{json_inputs_type}\n\n"
 
-            serializer = Foobara::CommandConnectors::Serializers::AtomicSerializer.new
+            serializer = if pass_aggregates_to_llm?
+                           CommandConnectors::Serializers::AggregateSerializer
+                         else
+                           CommandConnectors::Serializers::AtomicSerializer
+                         end.new
+
             inputs_json = serializer.serialize(inputs.except(:agent_options))
             inputs_json = JSON.fast_generate(inputs_json)
             goal += "You have been ran with the following inputs:\n\n#{inputs_json}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foobara-agent-backed-command
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Miles Georgi
@@ -16,6 +16,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -23,6 +26,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 email:
 - azimux@gmail.com
 executables: []