foobara-anthropic-api 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f6a67c657c9b5459dfdb50e330cd25c35a3a48f63a49692c2eea441e96ec466
-  data.tar.gz: c8ec1d575c6dcb6856e5bb99aa04b5a0ddb94fd3e83db2d266e0e7d9c0466630
+  metadata.gz: daf62838415e58692f48048970c2306fb4c4432c9be1036e73c2d1c93f5f488a
+  data.tar.gz: d40457b63a22ee95e691a7070ad6cb0b971284575b897961d6885644f50f8519
 SHA512:
-  metadata.gz: f22fc5a3ec4436f162afe6b36701741f8d2c4c05616cc9e44e7d0862cdcc8eac7f1a2c7ada1430941492d2b5364fdc913f44e846147bdb5fa357907aea550cbd
-  data.tar.gz: 169e96d8314445850b7baeb20c3e5c7f342ad8d494baab08d710dda32b2f234fab55d8201419208c793bd6118e6c1635ad914f718066ca3b413963b5e376fafa
+  metadata.gz: a8b7e11af929dd6b675cdc8b20bb9a6a07ab93d30f4868acb60f9e62d9e4760904015f5a88349cfe7dbc8cc17cd534e105539dca6a3c0c9f1b276f74c05e18c1
+  data.tar.gz: '08ebc138fd1cbe48dd1429971c2654b483f29e88d8b7b5b11f920c3ca481aef653ddc55fd2408417a14ccedebe803a743d57e27c4d9efa4d4cc44cc1f0450d6e'

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

@@ -0,0 +1,42 @@
+require "foobara/http_api_command"
+
+module Foobara
+  module Ai
+    module AnthropicApi
+      class BaseCommand < Foobara::Command
+        class << self
+          attr_accessor :api_token
+        end
+
+        include HttpApiCommand
+
+        base_url "https://api.anthropic.com/v1"
+
+        inputs do
+          api_token :string
+          anthropic_version :string
+        end
+
+        def build_request_headers
+          self.request_headers = {
+            "Content-Type" => "application/json",
+            "X-Api-Key" => api_token,
+            "Anthropic-Version" => anthropic_version
+          }
+        end
+
+        def api_token
+          inputs[:api_token] || BaseCommand.api_token || api_token_from_env
+        end
+
+        def api_token_from_env
+          ENV.fetch("ANTHROPIC_API_KEY", nil)
+        end
+
+        def anthropic_version
+          inputs[:anthropic_version] || ENV.fetch("ANTHROPIC_VERSION", "2023-06-01")
+        end
+      end
+    end
+  end
+end

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

@@ -1,13 +1,13 @@
+require_relative "base_command"
+
 module Foobara
   module Ai
     module AnthropicApi
-      class CreateMessage < Foobara::Command
-        URL = "https://api.anthropic.com/v1/messages".freeze
+      class CreateMessage < BaseCommand
+        path "/messages"
+        http_method :post
 
-        inputs do
-          # TODO: come up with some kind of execution context object to wrap all of these calls upon which
-          # data wrapping a "request" can live instead of being passed around?
-          api_token :string
+        add_inputs do
           system :string
           max_tokens :integer, default: 1024
           model :model, default: Types::ModelEnum::CLAUDE_3_5_SONNET
@@ -16,54 +16,12 @@ module Foobara
 
         result Types::MessageResult
 
-        def execute
-          build_request_body
-          build_request_headers
-          issue_http_request
-          parse_response
-          build_message_result
-
-          message_result
-        end
-
-        attr_accessor :request_body, :request_headers, :response, :response_body, :message_result
-
         def build_request_body
           self.request_body = { model:, max_tokens:, messages: }
         end
 
-        def build_request_headers
-          self.request_headers = {
-            "Content-Type" => "application/json",
-            "X-Api-Key" => api_token,
-            "Anthropic-Version" => "2023-06-01"
-          }
-        end
-
-        def api_token
-          inputs[:api_token] || ENV.fetch("ANTHROPIC_API_KEY", nil)
-        end
-
-        def issue_http_request
-          url = URI.parse(URL)
-          self.response = Net::HTTP.post(url, JSON.generate(request_body), request_headers)
-        end
-
-        def parse_response
-          json = if response.is_a?(Net::HTTPSuccess)
-                   response.body
-                 else
-                   # :nocov:
-                   raise "Could not get message result from #{URL}: " \
-                         "#{response.code} #{response.message}"
-                   # :nocov:
-                 end
-
-          self.response_body = JSON.parse(json)
-        end
-
-        def build_message_result
-          self.message_result = Types::MessageResult.new(response_body, ignore_unexpected_attributes: true)
+        def build_result
+          Types::MessageResult.new(response_body, ignore_unexpected_attributes: true)
         end
       end
     end

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

@@ -0,0 +1,33 @@
+require_relative "base_command"
+
+module Foobara
+  module Ai
+    module AnthropicApi
+      class GetPageOfModels < BaseCommand
+        path "/models"
+
+        add_inputs do
+          before_id :string
+          after_id :string
+          limit :integer, max: 2000, min: 1
+        end
+
+        result Types::PageOfModels
+
+        def build_request_body
+          body = {}
+
+          body[:before_id] = before_id if before_id
+          body[:after_id] = after_id if after_id
+          body[:limit] = limit if limit
+
+          self.request_body = body
+        end
+
+        def build_result
+          Types::PageOfModels.new(response_body, ignore_unexpected_attributes: true)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,68 @@
+require_relative "base_command"
+
+module Foobara
+  module Ai
+    module AnthropicApi
+      class ListModels < BaseCommand
+        description "A convenience command that will repeatedly fetch pages of models until all are fetched"
+
+        inputs do
+          page_size :integer, max: 2000, min: 1, default: 20
+          api_token :string, :allow_nil
+        end
+
+        result [Types::Model]
+
+        depends_on GetPageOfModels
+
+        def execute
+          get_page_of_models
+
+          extract_models
+
+          while has_more?
+            get_next_page_of_models
+            extract_models
+          end
+
+          models
+        end
+
+        attr_accessor :page_of_models
+
+        def get_page_of_models
+          self.page_of_models = run_subcommand!(GetPageOfModels, get_page_of_models_inputs)
+        end
+
+        def extract_models
+          models.concat(page_of_models.data)
+        end
+
+        def has_more?
+          page_of_models.has_more
+        end
+
+        def get_next_page_of_models
+          inputs = get_page_of_models_inputs.merge(after_id: page_of_models.last_id)
+          self.page_of_models = run_subcommand!(GetPageOfModels, inputs)
+        end
+
+        def models
+          @models ||= []
+        end
+
+        def get_page_of_models_inputs
+          return @get_page_of_models_inputs if @get_page_of_models_inputs
+
+          @get_page_of_models_inputs = {}
+
+          if page_size
+            @get_page_of_models_inputs[:limit] = page_size
+          end
+
+          @get_page_of_models_inputs
+        end
+      end
+    end
+  end
+end

data/src/foobara/ai/anthropic_api/types/message_result.rb

@@ -1,4 +1,4 @@
-require_relative "model"
+require_relative "model_enum"
 require_relative "role"
 
 module Foobara

data/src/foobara/ai/anthropic_api/types/model.rb

@@ -2,14 +2,14 @@ module Foobara
   module Ai
     module AnthropicApi
       module Types
-        module ModelEnum
-          CLAUDE_3_5_SONNET = "claude-3-5-sonnet-20240620".freeze
-          CLAUDE_3_OPUS = "claude-3-opus-20240229".freeze
-          CLAUDE_3_SONNET = "claude-3-sonnet-20240229".freeze
-          CLAUDE_3_HAIKU = "claude-3-haiku-20240307".freeze
+        class Model < Foobara::Model
+          attributes do
+            id :string, :required
+            display_name :string, :required
+            type :string, :required
+            created_at :datetime, :required
+          end
         end
-
-        Model = AnthropicApi.foobara_register_type(:model, :string, one_of: ModelEnum)
       end
     end
   end

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

@@ -0,0 +1,16 @@
+module Foobara
+  module Ai
+    module AnthropicApi
+      module Types
+        module ModelEnum
+          CLAUDE_3_5_SONNET = "claude-3-5-sonnet-20240620".freeze
+          CLAUDE_3_OPUS = "claude-3-opus-20240229".freeze
+          CLAUDE_3_SONNET = "claude-3-sonnet-20240229".freeze
+          CLAUDE_3_HAIKU = "claude-3-haiku-20240307".freeze
+        end
+
+        AnthropicApi.foobara_register_type(:model, :string, one_of: ModelEnum)
+      end
+    end
+  end
+end

data/src/foobara/ai/anthropic_api/types/page_of_models.rb

@@ -0,0 +1,18 @@
+require_relative "model"
+
+module Foobara
+  module Ai
+    module AnthropicApi
+      module Types
+        class PageOfModels < Foobara::Model
+          attributes do
+            data [Types::Model], :required
+            first_id :string, :allow_nil, :required
+            last_id :string, :allow_nil, :required
+            has_more :boolean, :required
+          end
+        end
+      end
+    end
+  end
+end

data/src/foobara/ai/anthropic_api.rb

@@ -7,6 +7,16 @@ module Foobara
 
     module AnthropicApi
       foobara_domain!
+
+      class << self
+        def api_token=(token)
+          BaseCommand.api_token = token
+        end
+
+        def api_token
+          BaseCommand.api_token
+        end
+      end
     end
   end
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: foobara-anthropic-api
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - Miles Georgi
 bindir: bin
 cert_chain: []
-date: 2025-02-17 00:00:00.000000000 Z
+date: 2025-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: foobara
+  name: foobara-http-api-command
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -32,12 +32,17 @@ 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
 homepage: https://github.com/foobara/anthropic-api
 licenses: