foobara-ai 0.0.11 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc15c8346f2afa89586829dba2c16741e63838012af8120b790018941cda79b4
-  data.tar.gz: 942a26bfe13bdc7d51deeb800bcbdd6d7ee1b7ccbe696ff26b233ff27bbbe256
+  metadata.gz: f95051eb1f729d1c5d7d9222c057bb9b3482b943514cec30169d873e48357db9
+  data.tar.gz: 02d3b9173387a1dc0e75b711604fb437eb4139e65b6143244edb4d1789fe6a53
 SHA512:
-  metadata.gz: 8664935bc503f4531bdbe7a801e3c6d7968cf25a1a1b2ac2cf7a1c6edef9c06c51119499fe8a3e59e41d3afda1662766049cd49a43d1c0d3fc8d581e8877b9d5
-  data.tar.gz: 10bb054e4e6d56c9fa69e30aa5b18f49bf660dd6795f51d03bf362b3efdabbca9a62810a2958eb3eaebaa897225b0900aa494da7787c255248cacfb357bca84a
+  metadata.gz: e023eadbdc74d8ba0625cb3ad69dcdb19b024412cbaadcf79e07b5a1ebcd9854921bfcc67f796441070a6b2a7a832803abdd4cc4755a038a5049e59895257841
+  data.tar.gz: 37316615e1c52161e88b79a864ef20eb5d7487544f478f7703ba4168ceb703a7762f348921378c64b52b94103886ffce94a0ee2c5531466826f2e3aaaa850c05

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [0.0.13] - 2025-06-27
+
+- Add GenerateChatCompletion command
+
+## [0.0.12] - 2025-05-27
+
+- Do not load service models in parallel due to undiagnosed race condition somewhere
+
 ## [0.0.11] - 2025-03-06
 
 - Fix bug that broke ListModels

data/src/foobara/ai/answer_bot/ask.rb

@@ -43,7 +43,10 @@ module Foobara
             inputs[:instructions] = instructions
           end
 
-          self.answer = run_mapped_subcommand!(ai_command, inputs)
+          inputs = domain_map!(inputs, to: ai_command)
+          answer = run_subcommand!(ai_command, inputs)
+
+          self.answer = domain_map!(answer, to: :string)
         end
       end
     end

data/src/foobara/ai/answer_bot/domain_mappers/anthropic_api/chat_to_create_message.rb

@@ -0,0 +1,56 @@
+require_relative "../../types/model_enum"
+
+module Foobara
+  module Ai
+    module AnswerBot
+      module DomainMappers
+        module AnthropicApi
+          class ChatToCreateMessage < Foobara::DomainMapper
+            from do
+              chat Types::Chat, :required
+              temperature :float
+              model :model_enum
+            end
+            to Foobara::Ai::AnthropicApi::CreateMessage
+
+            def map
+              system_messages, non_system_messages = chat.messages.partition(&:system?)
+
+              inputs = {
+                messages: non_system_messages.map do |message|
+                  { role: message.role, content: message.content }
+                end
+              }
+
+              unless system_messages.empty?
+                inputs[:system] = system_messages.map(&:content).join("\n")
+              end
+
+              if temperature
+                inputs[:temperature] = temperature
+              end
+
+              if model
+                inputs[:model] = model
+              end
+
+              inputs
+            end
+
+            def chat
+              from[:chat]
+            end
+
+            def temperature
+              from[:temperature]
+            end
+
+            def model
+              from[:model]
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/src/foobara/ai/answer_bot/domain_mappers/anthropic_api/message_result_to_message.rb

@@ -0,0 +1,23 @@
+module Foobara
+  module Ai
+    module AnswerBot
+      module DomainMappers
+        module AnthropicApi
+          class MessageResultToMessage < Foobara::DomainMapper
+            from Foobara::Ai::AnthropicApi::Types::MessageResult
+            to Types::Message
+
+            def map
+              {
+                content: message_result.content.last.text,
+                role: message_result.role
+              }
+            end
+
+            alias message_result from
+          end
+        end
+      end
+    end
+  end
+end

data/src/foobara/ai/answer_bot/domain_mappers/ollama_api/chat_completion_result_to_message.rb

@@ -0,0 +1,25 @@
+module Foobara
+  module Ai
+    module AnswerBot
+      module DomainMappers
+        module OllamaApi
+          class ChatCompletionResultToMessage < Foobara::DomainMapper
+            from Foobara::Ai::OllamaApi::Types::ChatCompletion
+            to Types::Message
+
+            def map
+              message = chat_completion.message
+
+              {
+                content: message.content,
+                role: message.role
+              }
+            end
+
+            alias chat_completion from
+          end
+        end
+      end
+    end
+  end
+end

data/src/foobara/ai/answer_bot/domain_mappers/ollama_api/chat_to_generate_chat_completion.rb

@@ -0,0 +1,52 @@
+require_relative "../../types/model_enum"
+
+module Foobara
+  module Ai
+    module AnswerBot
+      module DomainMappers
+        module OllamaApi
+          class ChatToGenerateChatCompletion < Foobara::DomainMapper
+            from do
+              chat Types::Chat, :required
+              temperature :float
+              model :model_enum
+            end
+            to Foobara::Ai::OllamaApi::GenerateChatCompletion
+
+            def map
+              inputs = {
+                messages: chat.messages.map do |message|
+                  { role: message.role, content: message.content }
+                end
+              }
+
+              if temperature
+                inputs[:options] = {
+                  temperature:
+                }
+              end
+
+              if model
+                inputs[:model] = model
+              end
+
+              inputs
+            end
+
+            def chat
+              from[:chat]
+            end
+
+            def temperature
+              from[:temperature]
+            end
+
+            def model
+              from[:model]
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/src/foobara/ai/answer_bot/domain_mappers/open_ai_api/chat_completion_result_to_message.rb

@@ -0,0 +1,25 @@
+module Foobara
+  module Ai
+    module AnswerBot
+      module DomainMappers
+        module OpenAiApi
+          class ChatCompletionResultToMessage < Foobara::DomainMapper
+            from Foobara::Ai::OpenAiApi::Types::ChatCompletion
+            to Types::Message
+
+            def map
+              message = chat_completion.choices.first.message
+
+              {
+                content: message.content,
+                role: message.role
+              }
+            end
+
+            alias chat_completion from
+          end
+        end
+      end
+    end
+  end
+end

data/src/foobara/ai/answer_bot/domain_mappers/open_ai_api/chat_to_generate_chat_completion.rb

@@ -0,0 +1,50 @@
+require_relative "../../types/model_enum"
+
+module Foobara
+  module Ai
+    module AnswerBot
+      module DomainMappers
+        module OpenAiApi
+          class ChatToGenerateChatCompletion < Foobara::DomainMapper
+            from do
+              chat Types::Chat, :required
+              temperature :float
+              model :model_enum
+            end
+            to Foobara::Ai::OpenAiApi::CreateChatCompletion
+
+            def map
+              inputs = {
+                messages: chat.messages.map do |message|
+                  { role: message.role, content: message.content }
+                end
+              }
+
+              if temperature
+                inputs[:temperature] = temperature
+              end
+
+              if model
+                inputs[:model] = model
+              end
+
+              inputs
+            end
+
+            def chat
+              from[:chat]
+            end
+
+            def temperature
+              from[:temperature]
+            end
+
+            def model
+              from[:model]
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/src/foobara/ai/answer_bot/generate_next_message.rb

@@ -0,0 +1,49 @@
+module Foobara
+  module Ai
+    module AnswerBot
+      class GenerateNextMessage < Foobara::Command
+        description "Takes a chat and generates the next message using the model of your choice."
+
+        inputs do
+          chat Types::Chat, :required
+          service :service_enum, "If two services expose the same model, you can specify which one to use."
+          model :model_enum, default: "claude-3-7-sonnet-20250219", description: "The model to use."
+          temperature :float
+        end
+
+        result Types::Message
+
+        AI_SERVICES.each_key do |service|
+          command = Foobara::Ai::AnswerBot::DomainMappers::ServiceToChatCompletionCommand.map!(service)
+          depends_on command
+        end
+
+        def execute
+          determine_ai_service
+          determine_ai_command
+          run_ai_service
+
+          next_message
+        end
+
+        attr_accessor :ai_command, :response, :ai_service, :next_message
+
+        def determine_ai_service
+          self.ai_service = service || domain_map!(model, from: :model_enum)
+        end
+
+        def determine_ai_command
+          self.ai_command = Foobara::Ai::AnswerBot::DomainMappers::ServiceToChatCompletionCommand.map!(ai_service)
+        end
+
+        def run_ai_service
+          inputs = { chat:, temperature:, model: }
+          inputs = domain_map!(inputs, to: ai_command)
+          next_message = run_subcommand!(ai_command, inputs)
+
+          self.next_message = domain_map!(next_message, to: Types::Message)
+        end
+      end
+    end
+  end
+end

data/src/foobara/ai/answer_bot/types/chat.rb

@@ -0,0 +1,13 @@
+module Foobara
+  module Ai
+    module AnswerBot
+      module Types
+        class Chat < Foobara::Model
+          attributes do
+            messages [Message]
+          end
+        end
+      end
+    end
+  end
+end

data/src/foobara/ai/answer_bot/types/message.rb

@@ -0,0 +1,18 @@
+module Foobara
+  module Ai
+    module AnswerBot
+      module Types
+        class Message < Foobara::Model
+          attributes do
+            role :symbol, one_of: [:assistant, :user, :system]
+            content :string
+          end
+
+          def system?
+            role == :system
+          end
+        end
+      end
+    end
+  end
+end

data/src/foobara/ai/answer_bot/types/model_enum.rb

@@ -5,16 +5,27 @@ module Foobara
   module Ai
     module AnswerBot
       module Types
-        threads = AI_SERVICES.keys.map do |service|
-          Thread.new do
-            service_models = AnswerBot.foobara_domain_map!(service).run!
-            service_models.map do |model|
-              AnswerBot.foobara_domain_map!(model, to: :string)
-            end
+        models = []
+        AI_SERVICES.each_key do |service|
+          service_models = AnswerBot.foobara_domain_map!(service).run!
+          service_models.map do |model|
+            models << AnswerBot.foobara_domain_map!(model, to: :string)
           end
         end
 
-        models = threads.each(&:join).map(&:value).flatten
+        # Doing this in a threaded fashion creates a race condition somewhere for some unidentified reason
+        # so commenting this all out for now.
+        #
+        # threads = AI_SERVICES.keys.map do |service|
+        #           Thread.new do
+        #             service_models = AnswerBot.foobara_domain_map!(service).run!
+        #             service_models.map do |model|
+        #               AnswerBot.foobara_domain_map!(model, to: :string)
+        #             end
+        #           end
+        #         end
+        #
+        #         models = threads.each(&:join).map(&:value).flatten
 
         unless models.uniq == models
           # :nocov:

data/src/foobara/ai/answer_bot/types/service_enum.rb

@@ -2,10 +2,10 @@ module Foobara
   module Ai
     module AnswerBot
       module Types
-        services = %w[
-          open-ai
-          anthropic
-          ollama
+        services = [
+          "open-ai",
+          "anthropic",
+          "ollama"
         ]
 
         ServiceEnum = Foobara::Enumerated.make_module(services)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: foobara-ai
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.13
 platform: ruby
 authors:
 - Miles Georgi
 bindir: bin
 cert_chain: []
-date: 2025-03-06 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
 email:
 - azimux@gmail.com
@@ -21,22 +21,31 @@ files:
 - README.md
 - lib/foobara/ai.rb
 - src/foobara/ai/answer_bot/ask.rb
+- src/foobara/ai/answer_bot/domain_mappers/anthropic_api/chat_to_create_message.rb
 - src/foobara/ai/answer_bot/domain_mappers/anthropic_api/message_result_to_answer.rb
+- src/foobara/ai/answer_bot/domain_mappers/anthropic_api/message_result_to_message.rb
 - src/foobara/ai/answer_bot/domain_mappers/anthropic_api/model_to_foobara_model.rb
 - src/foobara/ai/answer_bot/domain_mappers/anthropic_api/model_to_model_enum_string.rb
 - src/foobara/ai/answer_bot/domain_mappers/anthropic_api/question_to_create_message.rb
 - src/foobara/ai/answer_bot/domain_mappers/model_to_ai_service.rb
+- src/foobara/ai/answer_bot/domain_mappers/ollama_api/chat_completion_result_to_message.rb
 - src/foobara/ai/answer_bot/domain_mappers/ollama_api/chat_completion_to_answer.rb
+- src/foobara/ai/answer_bot/domain_mappers/ollama_api/chat_to_generate_chat_completion.rb
 - src/foobara/ai/answer_bot/domain_mappers/ollama_api/model_to_foobara_model.rb
 - src/foobara/ai/answer_bot/domain_mappers/ollama_api/model_to_model_enum_string.rb
 - src/foobara/ai/answer_bot/domain_mappers/ollama_api/question_to_generate_chat_completion.rb
+- src/foobara/ai/answer_bot/domain_mappers/open_ai_api/chat_completion_result_to_message.rb
 - src/foobara/ai/answer_bot/domain_mappers/open_ai_api/chat_completion_to_answer.rb
+- src/foobara/ai/answer_bot/domain_mappers/open_ai_api/chat_to_generate_chat_completion.rb
 - src/foobara/ai/answer_bot/domain_mappers/open_ai_api/model_to_foobara_model.rb
 - src/foobara/ai/answer_bot/domain_mappers/open_ai_api/model_to_model_enum_string.rb
 - src/foobara/ai/answer_bot/domain_mappers/open_ai_api/question_to_create_chat_completion.rb
 - src/foobara/ai/answer_bot/domain_mappers/service_to_command.rb
 - src/foobara/ai/answer_bot/domain_mappers/service_to_list_models_command.rb
+- src/foobara/ai/answer_bot/generate_next_message.rb
 - src/foobara/ai/answer_bot/list_models.rb
+- src/foobara/ai/answer_bot/types/chat.rb
+- src/foobara/ai/answer_bot/types/message.rb
 - src/foobara/ai/answer_bot/types/model.rb
 - src/foobara/ai/answer_bot/types/model_enum.rb
 - src/foobara/ai/answer_bot/types/service_enum.rb
@@ -62,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.5
+rubygems_version: 3.6.9
 specification_version: 4
 summary: No description. Add one.
 test_files: []