foobara-llm-backed-command 1.0.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cd4264ef20eceef87e44331408218af76d8d1d07743533c6afc5eed05422867
-  data.tar.gz: 104f619f341c20bd5a0e98ebf737c6f38cf5bf674ad73fcaaa8e25869f185e0e
+  metadata.gz: db414e87fff804a75d681c2ab455fbb8c451de1ef45e1b9372057700fbf6f2a0
+  data.tar.gz: 5ea0d6368f246450905e30625f69341cce3512312a0ed707dbc463e16160a36b
 SHA512:
-  metadata.gz: c7562aafb2b293e4ccf0d3337a22d18ec261a3275291e5b21082d873b632d4875e50092b65bf2e1283e790660bd9c5de420a1348a32c31f5d5d0ff851a2f9523
-  data.tar.gz: 80924f44dc355c5bb1272c0c5f17ed816f8c4e702c7e7f71a6154c7172cf90f61d92a42e72c9182ed4044b6643a456ee5c00224625507b9fb010e2430276073e
+  metadata.gz: 6a81124c1e05859be811881e0ec32a850bb42f8d1e314af3e11fdac4c9c803472f2428f1b5345da58447fc00641c09ceaf1de2bf41ab64677bdd141b2519770b
+  data.tar.gz: e84c195fade06f93fb2a86d472af0a6c2b68a57f529cd96e9bcec35705d649a5bd0100c5201ebf71954d7d13cdfb703a46fb529a2330a7799038d574d3526ef4

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [1.0.3] - 2026-09-11
+
+- Handle removed JSON.fast_generate
+
+## [1.0.2] - 2025-08-11
+
+- Handle situation where smaller models incorrectly use {"result":"whatever"} instead of "whatever"
+
 ## [1.0.1] - 2025-07-09
 
 - Use foobara-ai version 1.0.0

data/lib/foobara/llm_backed_command.rb

@@ -5,10 +5,10 @@ require "foobara/ai"
 require "foobara/json_schema_generator"
 
 if Foobara::Ai.foobara_all_command.empty?
-  # :nocov:
+  # simplecov:disable
   raise "No api services loaded. " \
         "Did you forget to set a URL/API key env var or a require for either ollama, anthropic, or openai?"
-  # :nocov:
+  # simplecov:enable
 end
 
 Foobara::Util.require_directory "#{__dir__}/../../src"

data/src/llm_backed_execute_method.rb

@@ -35,11 +35,12 @@ module Foobara
       construct_messages
       generate_answer
       parse_answer
+      attempt_to_recover_from_bad_format
 
-      parsed_answer
+      final_answer
     end
 
-    attr_accessor :answer, :parsed_answer, :messages, :assistant_serializer, :user_serializer,
+    attr_accessor :final_answer, :answer, :parsed_answer, :messages, :assistant_serializer, :user_serializer,
                   :computed_assistant_association_depth, :computed_user_association_depth,
                   :llm_instructions
 
@@ -80,9 +81,9 @@ module Foobara
       when Foobara::AssociationDepth::PRIMARY_KEY_ONLY
         Foobara::CommandConnectors::Serializers::EntitiesToPrimaryKeysSerializer
       else
-        # :nocov:
+        # simplecov:disable
         raise "Unknown depth: #{depth}"
-        # :nocov:
+        # simplecov:enable
       end.instance
     end
 
@@ -119,7 +120,7 @@ module Foobara
                        end
 
           content = serializer.serialize(content)
-          message.merge(content: JSON.fast_generate(content))
+          message.merge(content: JSON.generate(content))
         end
       end
     end
@@ -165,22 +166,47 @@ module Foobara
             fencepostless_answer = match[1]
             JSON.parse(fencepostless_answer)
           else
-            # :nocov:
+            # simplecov:disable
             raise
-            # :nocov:
+            # simplecov:enable
           end
         rescue JSON::ParserError => e
           # TODO: figure out how to test this code path
-          # :nocov:
+          # simplecov:disable
           add_runtime_error :could_not_parse_result_json,
                             "Could not parse result JSON: #{e.message}",
                             raw_answer: answer,
                             stripped_answer: fencepostless_answer
-          # :nocov:
+          # simplecov:enable
         end
       end
     end
 
+    # Sometimes we get {"result": "whatever"} instead of just "whatever" from some smaller models.
+    # Let's detect that and handle it...
+    def attempt_to_recover_from_bad_format
+      self.final_answer = if parsed_answer.is_a?(::Hash) && parsed_answer.keys == ["result"]
+                            result_type = self.class.result_type
+
+                            # TODO: implement a Type#valid? method
+                            if result_type.process_value(parsed_answer).success?
+                              parsed_answer
+                            else
+                              result = parsed_answer["result"]
+
+                              if result_type.process_value(result).success?
+                                result
+                              else
+                                # simplecov:disable
+                                parsed_answer
+                                # simplecov:enable
+                              end
+                            end
+                          else
+                            parsed_answer
+                          end
+    end
+
     module ClassMethods
       def inputs_json_schema(association_depth)
         JsonSchemaGenerator.to_json_schema(
@@ -236,9 +262,9 @@ module Foobara
         @llm_instructions_cache ||= {}
 
         if @llm_instructions_cache.key?(key)
-          # :nocov:
+          # simplecov:disable
           @llm_instructions_cache[key]
-          # :nocov:
+          # simplecov:enable
         else
           @llm_instructions_cache[key] = build_llm_instructions(user_association_depth, assistant_association_depth)
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foobara-llm-backed-command
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.3
 platform: ruby
 authors:
 - Miles Georgi
@@ -15,7 +15,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.136
+        version: 0.1.1
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -25,7 +25,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.136
+        version: 0.1.1
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -98,13 +98,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: 3.4.0
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '4.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Provides an easy way to implement a command whose logic is managed by an
   LLM