omniai-anthropic 1.2.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb7e8977e3dc6cdd5770822c5eb2ce65aed056994edc321a0feeb4f240f603fb
-  data.tar.gz: 5465ae68dd2d5762c579547d40118e6f4c8b9b5a2e46117d2824d22ab0e9bb58
+  metadata.gz: 81f979cca2281d6d2462bfd301d9112d2347c6db184b77ff5aaad73e4fb141ef
+  data.tar.gz: 906591303f337817e2f086169fe382d69e26a98674aad3feaedcb239e1087161
 SHA512:
-  metadata.gz: f62501a64b8b0367f0d2d318802df1c82a818013497d7f201f2f3c6d9bdbd2dfcc7014bc7851e2b566dc11498dc4a9abefb1e61ade0c913fe6520e239c202fd0
-  data.tar.gz: 4bee864a29284258a4847556ec039a9a7c3684dd04c669cc5a6eafa1c6bb4c2dc012101e24c386dc8f584b53cf04648f162fbe29ad4a1289741ba3844b86c212
+  metadata.gz: 5510b9cafbeea22e709f515eb0179ec6cb49e251fdd1391b6a1527f06908d2582ca22c56b06af3aee4cbb80ad63cb9aac047c0ed706eefa84cc69eb90c0ec0c2
+  data.tar.gz: 3ea6790fad0c04efc10f987125e64755e5a53416e5652440f65d660a7c276206bbc62d632c0c475555ba151bf2eae7103682aea71fea13388b3ef602a540ce0e

data/README.md

@@ -67,7 +67,7 @@ completion.choice.message.content # 'The capital of Canada is Ottawa.'
 `model` takes an optional string (default is `claude-3-haiku-20240307`):
 
 ```ruby
-completion = client.chat('Provide code for fibonacci', model: OmniAI::Anthropic::Chat::Model::CLAUDE_OPUS)
+completion = client.chat('Provide code for fibonacci', model: OmniAI::Anthropic::Chat::Model::CLAUDE_SONET)
 completion.choice.message.content # 'def fibonacci(n)...end'
 ```
 

data/lib/omniai/anthropic/chat/completion.rb

@@ -5,13 +5,13 @@ module OmniAI
     class Chat
       # A completion returned by the API.
       class Completion < OmniAI::Chat::Completion
-        # @return [Array<OmniAI::Chat::Choice>]
+        # @return [Array<OmniAI::Chat::MessageChoice>]
         def choices
           @choices ||= begin
             role = @data['role']
 
             @data['content'].map do |data, index|
-              OmniAI::Chat::Choice.for(data: {
+              OmniAI::Chat::MessageChoice.for(data: {
                 'index' => index,
                 'message' => { 'role' => role, 'content' => data['text'] },
               })

data/lib/omniai/anthropic/chat.rb

@@ -27,20 +27,6 @@ module OmniAI
 
       protected
 
-      # @param response [HTTP::Response]
-      # @return [OmniAI::Anthropic::Chat::Stream]
-      def stream!(response:)
-        raise Error, "#{self.class.name}#stream! unstreamable" unless @stream
-
-        Stream.new(response:).stream! { |chunk| @stream.call(chunk) }
-      end
-
-      # @param response [HTTP::Response]
-      # @param response [OmniAI::Anthropic::Chat::Completion]
-      def complete!(response:)
-        Completion.new(data: response.parse)
-      end
-
       # @return [Hash]
       def payload
         OmniAI::Anthropic.config.chat_options.merge({

data/lib/omniai/anthropic/client.rb

@@ -24,15 +24,19 @@ module OmniAI
 
       # @param api_key [String] optional - defaults to `OmniAI::Anthropic.config.api_key`
       # @param host [String] optional - defaults to `OmniAI::Anthropic.config.host`
+      # @param version [String] optional - defaults to `OmniAI::Anthropic.config.version`
+      # @param logger [Logger] optional - defaults to `OmniAI::Anthropic.config.logger`
+      # @param timeout [Integer] optional - defaults to `OmniAI::Anthropic.config.timeout`
       def initialize(
         api_key: OmniAI::Anthropic.config.api_key,
+        host: OmniAI::Anthropic.config.host,
         version: OmniAI::Anthropic.config.version,
         logger: OmniAI::Anthropic.config.logger,
-        host: OmniAI::Anthropic.config.host
+        timeout: OmniAI::Anthropic.config.timeout
       )
         raise(ArgumentError, %(ENV['ANTHROPIC_API_KEY'] must be defined or `api_key` must be passed)) if api_key.nil?
 
-        super(api_key:, logger:)
+        super(api_key:, host:, logger:, timeout:)
 
         @host = host
         @version = version
@@ -40,10 +44,10 @@ module OmniAI
 
       # @return [HTTP::Client]
       def connection
-        HTTP
-          .headers('x-api-key': @api_key)
-          .headers('anthropic-version': @version)
-          .persistent('https://api.anthropic.com')
+        @connection ||= super.headers({
+          'x-api-key': @api_key,
+          'anthropic-version': @version,
+        }.compact)
       end
 
       # @raise [OmniAI::Error]

data/lib/omniai/anthropic/config.rb

@@ -2,16 +2,30 @@
 
 module OmniAI
   module Anthropic
-    # Config for the Anthropic `api_key` / `host` / `logger` / `version` / `chat_options`.
+    # Configuration for Anthropic.
     class Config < OmniAI::Config
-      attr_accessor :version, :chat_options
+      DEFAULT_HOST = 'https://api.anthropic.com'
+      DEFAULT_VERSION = '2023-06-01'
 
-      def initialize
-        super
-        @api_key = ENV.fetch('ANTHROPIC_API_KEY', nil)
-        @host = ENV.fetch('ANTHROPIC_HOST', 'https://api.anthropic.com')
-        @version = ENV.fetch('ANTHROPIC_VERSION', '2023-06-01')
-        @chat_options = { max_tokens: 4096 }
+      # @!attribute [rw] version
+      #   @return [String, nil] passed as `anthropic-version` if specified
+      attr_accessor :version
+
+      # @param api_key [String, nil] optional - defaults to `ENV['ANTHROPIC_API_KEY']`
+      # @param host [String, nil] optional - defaults to `ENV['ANTHROPIC_HOST'] w/ fallback to `DEFAULT_HOST`
+      # @param version [String, nil] optional - defaults to `ENV['ANTHROPIC_VERSION'] w/ fallback to `DEFAULT_VERSION`
+      # @param logger [Logger, nil] optional - defaults to
+      # @param timeout [Integer, Hash, nil] optional
+      def initialize(
+        api_key: ENV.fetch('ANTHROPIC_API_KEY', nil),
+        host: ENV.fetch('ANTHROPIC_HOST', DEFAULT_HOST),
+        version: ENV.fetch('ANTHROPIC_VERSION', DEFAULT_VERSION),
+        logger: nil,
+        timeout: nil
+      )
+        super(api_key:, host:, logger:, timeout:)
+        @version = version
+        @chat_options[:max_tokens] = 4096
       end
     end
   end

data/lib/omniai/anthropic/version.rb

@@ -2,6 +2,6 @@
 
 module OmniAI
   module Anthropic
-    VERSION = '1.2.1'
+    VERSION = '1.4.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniai-anthropic
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Kevin Sylvestre
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-06-20 00:00:00.000000000 Z
+date: 2024-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: event_stream_parser