foobara-ai 0.0.7 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2cf7c8f4de4993afb316ca3187bdc4372346b0743da3ed98b9fa7d4779538ffe
-  data.tar.gz: 3f6d6eeb012a70d8faf1f2327ec170e0c99ee6f1dab48c8c0fd5b958ff902f06
+  metadata.gz: 3a8b6d134f68bc97ddf98d960fc36d70918244142609338d0f99b9ae5de09ab7
+  data.tar.gz: aa161360695ddd0eb94691575dc64c95419653968246dccb65c553df159c2638
 SHA512:
-  metadata.gz: 55f47ea5885ae3f62ebbb456b27725cbc7572c8dbfeb4eeb8242e1a3c7b4c39577e0b08bd62c6ce19b706b9f1b9bf332418a39d02b9684e89960c0c31f5e14da
-  data.tar.gz: 15b66c3c34b6b316a5aa18936abff18a3a439ce9f9de6aaed957b180a71a0abd1e5bf0e18393986a1d2dd7ed201de6c3e535ff1fd92843cbc457dd6da00745f7
+  metadata.gz: 6d41d1bc30e01d6f8e2b6bd83a0cf676306b5d468fb6373686d58e13ebe31ba21f3288218c4919c33d4d1ec7ae746206ab8cf2673e33e834f4e4d2144e1f0e52
+  data.tar.gz: 23f6f679f973c0987945976501fdb0c827c35335fa5b807dfebe3452d01ae15cbf1ae9c59a613c135536a9914e04cfa5251b6a7f22c4de4f853d9d9b3eed8a13

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-## [0.0.7] - 2025-03-04
+## [0.0.9] - 2025-03-05
 
 - Do not require all 3 services to function. Let user require which services they want to use.
 

data/lib/foobara/ai.rb

@@ -28,6 +28,12 @@ module Foobara
       AI_SERVICES = ai_services
 
       base_dir = "#{__dir__}/../../src/foobara/ai/answer_bot"
+
+      AI_SERVICES.each_value do |domain|
+        path = Util.underscore(domain.foobara_domain_name)
+        require_relative "#{base_dir}/domain_mappers/#{path}/model_to_model_enum_string"
+      end
+
       Util.require_directory "#{base_dir}/types"
       Dir["#{base_dir}/domain_mappers/*.rb"].each { |f| require f }
       Dir["#{base_dir}/*.rb"].each { |f| require f }

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

@@ -13,16 +13,11 @@ module Foobara
 
         result :string
 
-        depends_on OpenAiApi::CreateChatCompletion,
-                   AnthropicApi::CreateMessage,
-                   OllamaApi::GenerateChatCompletion
-        # including these is now optional
-        # DomainMappers::ModelToAiService,
-        # DomainMappers::ServiceToCommand,
-        # DomainMappers::OpenAiApi::QuestionToCreateChatCompletion,
-        # DomainMappers::OpenAiApi::ChatCompletionToAnswer,
-        # DomainMappers::AnthropicApi::QuestionToCreateMessage,
-        # DomainMappers::AnthropicApi::MessageResultToAnswer
+        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
@@ -38,7 +33,7 @@ module Foobara
         end
 
         def determine_ai_command
-          self.ai_command = domain_map!(ai_service, to: Foobara::Command)
+          self.ai_command = Foobara::Ai::AnswerBot::DomainMappers::ServiceToChatCompletionCommand.map!(ai_service)
         end
 
         def run_ai_service

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

@@ -1,5 +1,3 @@
-require_relative "../../types/model_enum"
-
 module Foobara
   module Ai
     module AnswerBot

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

@@ -1,5 +1,3 @@
-require_relative "../../types/model_enum"
-
 module Foobara
   module Ai
     module AnswerBot

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

@@ -1,5 +1,3 @@
-require_relative "../../types/model_enum"
-
 module Foobara
   module Ai
     module AnswerBot

data/src/foobara/ai/answer_bot/domain_mappers/service_to_list_models_command.rb

@@ -1,10 +1,8 @@
-require_relative "../types/service_enum"
-
 module Foobara
   module Ai
     module AnswerBot
       module DomainMappers
-        class ServiceToChatCompletionCommand < Foobara::DomainMapper
+        class ServiceToListModelsCommand < Foobara::DomainMapper
           from :service_enum
           # TODO: create a :class type? Maybe with an inherits: validator?
           to Class

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

@@ -9,12 +9,8 @@ module Foobara
 
         result [Types::Model]
 
-        LIST_COMMANDS = AI_SERVICES.values.map do |domain|
-          if domain == OllamaApi
-            OllamaApi::ListLocalModels
-          else
-            domain::ListModels
-          end
+        LIST_COMMANDS = AI_SERVICES.keys.map do |service|
+          Foobara::Ai::AnswerBot::DomainMappers::ServiceToChatCompletionCommand.map!(service)
         end
 
         depends_on(*LIST_COMMANDS)

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

@@ -1,14 +1,11 @@
 require_relative "service_enum"
 require_relative "../domain_mappers/service_to_list_models_command"
-require_relative "../domain_mappers/anthropic_api/model_to_model_enum_string"
-require_relative "../domain_mappers/ollama_api/model_to_model_enum_string"
-require_relative "../domain_mappers/open_ai_api/model_to_model_enum_string"
 
 module Foobara
   module Ai
     module AnswerBot
       module Types
-        threads = ServiceEnum.all_values.map do |service|
+        threads = AI_SERVICES.keys.map do |service|
           Thread.new do
             service_models = AnswerBot.foobara_domain_map!(service).run!
             service_models.map do |model|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foobara-ai
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.9
 platform: ruby
 authors:
 - Miles Georgi