foobara-llm-backed-command 0.0.8 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a99e4dfeadb80533aa7e5206636a4c5950600730d9851b958c8d7fee30fa6b2
-  data.tar.gz: c552bc618a58e71b7613b9d405273843fc92f949f97c35cae356eb2892e90fc4
+  metadata.gz: ad9f2ebc5f7f9277ed85e0f8cc410470a8ee00d9b6d88c8afb8dabab1bd604fb
+  data.tar.gz: 1076fec92769e65d72a4674e77989520f562e0c5c6f432afe4a11cab5e38a853
 SHA512:
-  metadata.gz: 37440535a4b5a690efdb7f130e8a88f87e31ee78899316c7a0d1f35410d5f6f50059a853a21e1fccebd9c834b1ac34068bf4f68a4fe85fe89cf1ad055f502d57
-  data.tar.gz: 9b09abf6b2ed06f6fb274aac373f4df0a701d8ba5ea6d4257860b93e1bb48f3a673324a808ee354988c5fa7ae13603cfe3efd3d095c5f5d82460ecf84d5ccf20
+  metadata.gz: 03e6f1c662e353803a097cc675e8f71d8911d02036fa668a66f64dbd6940b7c48125d538dd975ae80ff8348a9f43cfdecd602bb0a4393fd8c0d27f9871c31e1c
+  data.tar.gz: 99f9120528785f7260d896967c4d9737e3ebdd75967aec9432e20ce9a3dbed5f85a1d6ebd1a254a23e370562e4ab4f44825f8b662ce3b7732abb0068d2c6e706

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [0.0.10] - 2025-07-06
+
+- Handle bizarre deepseek-r1 stranded </think> tag
+
+## [0.0.9] - 2025-06-28
+
+- Use temperature and replace Ask with GenerateNextMessage
+
 ## [0.0.8] - 2025-06-19
 
 - Convert result type entities to their primary key types with a description

data/lib/foobara/llm_backed_command.rb

@@ -13,4 +13,4 @@ end
 
 Foobara::Util.require_directory "#{__dir__}/../../src"
 
-Foobara::Monorepo.project "llm_backed_command", project_path: "#{__dir__}/../../"
+Foobara.project "llm_backed_command", project_path: "#{__dir__}/../../"

data/src/llm_backed_execute_method.rb

@@ -10,7 +10,7 @@ module Foobara
     include Concern
 
     on_include do
-      depends_on Ai::AnswerBot::Ask
+      depends_on Ai::AnswerBot::GenerateNextMessage
       possible_error :could_not_parse_result_json,
                      message: "Could not parse answer",
                      context: {
@@ -21,14 +21,14 @@ module Foobara
 
     def execute
       determine_serializer
-      construct_input_json
+      construct_messages
       generate_answer
       parse_answer
 
       parsed_answer
     end
 
-    attr_accessor :serializer, :input_json, :answer, :parsed_answer
+    attr_accessor :serializer, :answer, :parsed_answer, :messages
 
     def determine_serializer
       depth = if respond_to?(:association_depth)
@@ -56,24 +56,48 @@ module Foobara
       self.serializer = serializer.new
     end
 
-    def construct_input_json
-      inputs_without_llm_integration_inputs = inputs.except(:llm_model, :association_depth)
-      input_json = serializer.serialize(inputs_without_llm_integration_inputs)
-
-      self.input_json = JSON.fast_generate(input_json)
-    end
-
     def generate_answer
-      ask_inputs = {
-        instructions: llm_instructions,
-        question: input_json
+      inputs = {
+        chat: Ai::AnswerBot::Types::Chat.new(messages:)
       }
 
+      inputs[:temperature] = if respond_to?(:temperature)
+                               temperature
+                             end || 0
+
       if respond_to?(:llm_model)
-        ask_inputs[:model] = llm_model
+        inputs[:model] = llm_model
+      end
+
+      message = run_subcommand!(Ai::AnswerBot::GenerateNextMessage, inputs)
+
+      self.answer = message.content
+    end
+
+    def construct_messages
+      self.messages = build_messages.map do |message|
+        content = message[:content]
+
+        if content.is_a?(String)
+          message
+        else
+          content = serializer.serialize(content)
+          message.merge(content: JSON.fast_generate(content))
+        end
       end
+    end
 
-      self.answer = run_subcommand!(Ai::AnswerBot::Ask, ask_inputs)
+    def build_messages
+      [
+        {
+          role: :system,
+          content: llm_instructions
+        },
+        {
+          role: :user,
+          content: inputs.except(:llm_model, :association_depth)
+        }
+      ]
     end
 
     def llm_instructions
@@ -82,6 +106,9 @@ module Foobara
 
     def parse_answer
       stripped_answer = answer.gsub(/<THINK>.*?<\/THINK>/mi, "")
+      # For some reason sometimes deepseek-r1:32b starts the answer with "\n\n</think>\n\n"
+      # so removing it as a special case
+      stripped_answer = stripped_answer.gsub(/\A\s*<\/think>\s*/mi, "")
       fencepostless_answer = stripped_answer.gsub(/^\s*```\w*\n(.*)```\s*\z/m, "\\1")
 
       # TODO: should we verify against json-schema or no?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foobara-llm-backed-command
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.10
 platform: ruby
 authors:
 - Miles Georgi