foobara-anthropic-api 1.0.7 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eda96d5cdb535c70b4b794742575e31fbdb084f081480372b6212b94dc514053
-  data.tar.gz: d13ebe86723cb1685e47ffdbb65965fa28d8835189d374548c1f91d8bca35b69
+  metadata.gz: 035ce75a8e886f9915e02247e1c5353c8b6b0ce39d48e50420b1b502617c5683
+  data.tar.gz: 061bd3fbcd6aaf34e7af8bc159f6b3cee5616b178fa4636c6f8d53936502a2d0
 SHA512:
-  metadata.gz: 4a49028e521f5ee955f7636cca01b5be45036fb89faf7c6d1fcdde9ebd2629c183af4a9f9790a24c58a110e437dde7a71880fc49d23bc6379e6316389f410699
-  data.tar.gz: 6a80261967d7d9cc57e140b5b9c62e9c523d8fef3b5ebdcd9eca5f6966ea0542baad19069303d7b20ad1940c7a6a7974e1166094714d874b93c19657f0d2ae05
+  metadata.gz: a3ea40b32ff300ad9081f618806325443c0693fa47c5fa82a1a4191f41e5b9487826d7969a3a0b3ee6a7e8e93c65c9c1f5cb50ed30b4c8a972f1ab2173a75bd8
+  data.tar.gz: 1e100cf3f5117f604f3cc3a4b3b205250edaf5465d46895f52467808025c6ec589c08b75db7a5d26b0353025bb87a87749d367ad1eb117ec3df571c5961d62da

data/lib/foobara/anthropic_api.rb

@@ -1,5 +1,5 @@
 require "foobara/all"
 
-require_relative "../../src/foobara/ai/anthropic_api"
+require_relative "../../src/anthropic_api"
 
 Foobara::Util.require_directory "#{__dir__}/../../src"

data/src/create_message.rb

@@ -0,0 +1,59 @@
+require_relative "get_model"
+
+module Foobara
+  module Ai
+    module AnthropicApi
+      class CreateMessage < BaseCommand
+        path "/messages"
+        http_method :post
+
+        add_inputs do
+          system :string
+          max_tokens :integer, :allow_nil, "nil means whatever the max allowed is.", default: nil
+          model :model_enum, default: AnthropicApi.default_llm_model
+          messages [Types::Message]
+          # TODO: maybe this shouldn't be supported here?? It's not really part of this API.
+          # Maybe relocate this to Foobara::Ai instead.
+          fail_if_hitting_token_limit :boolean, default: false
+        end
+
+        result Types::MessageResult
+
+        possible_error :hit_token_limit, context: { model: :model_enum, max_tokens: :integer }
+
+        depends_on GetModel
+
+        def build_request_body
+          body = { model:, max_tokens:, messages: }
+
+          sys = inputs[:system]
+          if sys
+            body[:system] = sys
+          end
+
+          self.request_body = body
+        end
+
+        def max_tokens
+          @max_tokens ||= inputs[:max_tokens] ||
+                          run_subcommand!(GetModel, model:).max_tokens ||
+                          64_000
+        end
+
+        def build_result
+          message_result = Types::MessageResult.new(
+            response_body,
+            # Set this to false to discover new attributes
+            ignore_unexpected_attributes: true
+          )
+
+          if fail_if_hitting_token_limit && message_result.hit_max_tokens?
+            add_runtime_error(:hit_token_limit, model:, max_tokens:)
+          end
+
+          message_result
+        end
+      end
+    end
+  end
+end

data/src/get_model.rb

@@ -0,0 +1,31 @@
+require_relative "base_command"
+
+module Foobara
+  module Ai
+    module AnthropicApi
+      class GetModel < BaseCommand
+        include CachedCommand
+
+        self.foobara_cache_expiry = 24 * 60 * 60
+
+        def foobara_cache_key
+          @foobara_cache_key ||= [Util.underscore(self.class.name), model].join("-")
+        end
+
+        path { "/models/#{model}" }
+
+        add_inputs do
+          model :model_enum, :required
+        end
+
+        result Types::Model
+
+        def build_result
+          Types::Model.new(response_body,
+                           # Set this to false to discover new attributes
+                           ignore_unexpected_attributes: true)
+        end
+      end
+    end
+  end
+end

data/src/{foobara/ai/anthropic_api/types → types}/message_result.rb

@@ -23,8 +23,10 @@ module Foobara
           end
 
           def text
-            content.find { it.type == "text" }.text
+            content.rfind { it.type == "text" }&.text
           end
+
+          def hit_max_tokens? = stop_reason == "max_tokens"
         end
       end
     end

data/src/{foobara/ai/anthropic_api/types → types}/model_enum.rb

@@ -7,6 +7,7 @@ module Foobara
         model_list = ListModels.run!.map(&:id).sort
         ModelEnum = Foobara::Enumerated.make_module(model_list)
 
+        # TODO: change all 3 projects to use :symbol instead of :string
         AnthropicApi.foobara_register_type(:model_enum, :string, one_of: ModelEnum)
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foobara-anthropic-api
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.1.0
 platform: ruby
 authors:
 - Miles Georgi
@@ -65,19 +65,20 @@ extra_rdoc_files: []
 files:
 - LICENSE.txt
 - lib/foobara/anthropic_api.rb
-- src/foobara/ai/anthropic_api.rb
-- src/foobara/ai/anthropic_api/base_command.rb
-- src/foobara/ai/anthropic_api/create_message.rb
-- src/foobara/ai/anthropic_api/get_page_of_models.rb
-- src/foobara/ai/anthropic_api/list_models.rb
-- src/foobara/ai/anthropic_api/types/message.rb
-- src/foobara/ai/anthropic_api/types/message_result.rb
-- src/foobara/ai/anthropic_api/types/message_result/content.rb
-- src/foobara/ai/anthropic_api/types/message_result/usage.rb
-- src/foobara/ai/anthropic_api/types/model.rb
-- src/foobara/ai/anthropic_api/types/model_enum.rb
-- src/foobara/ai/anthropic_api/types/page_of_models.rb
-- src/foobara/ai/anthropic_api/types/role.rb
+- src/anthropic_api.rb
+- src/base_command.rb
+- src/create_message.rb
+- src/get_model.rb
+- src/get_page_of_models.rb
+- src/list_models.rb
+- src/types/message.rb
+- src/types/message_result.rb
+- src/types/message_result/content.rb
+- src/types/message_result/usage.rb
+- src/types/model.rb
+- src/types/model_enum.rb
+- src/types/page_of_models.rb
+- src/types/role.rb
 homepage: https://github.com/foobara/anthropic-api
 licenses:
 - None specified yet

data/src/foobara/ai/anthropic_api/create_message.rb

@@ -1,40 +0,0 @@
-require_relative "base_command"
-
-module Foobara
-  module Ai
-    module AnthropicApi
-      class CreateMessage < BaseCommand
-        path "/messages"
-        http_method :post
-
-        add_inputs do
-          system :string
-          max_tokens :integer, default: 1024
-          model :model_enum, default: AnthropicApi.default_llm_model
-          messages [Types::Message]
-        end
-
-        result Types::MessageResult
-
-        def build_request_body
-          body = { model:, max_tokens:, messages: }
-
-          sys = inputs[:system]
-          if sys
-            body[:system] = sys
-          end
-
-          self.request_body = body
-        end
-
-        def build_result
-          Types::MessageResult.new(
-            response_body,
-            # Set this to false to discover new attributes
-            ignore_unexpected_attributes: true
-          )
-        end
-      end
-    end
-  end
-end