Add llama370b_instruct_v1

CHANGELOG.md

@@ -1,3 +1,7 @@
+## [0.2.4] - 2024-04-25
+
+- Support the use of AWS Named Profiles for authentication
+
 ## [0.2.3] - 2024-01-12
 
 - Fix A121 Labs bug for maxTokens parameter

Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    ruby-amazon-bedrock (0.2.3)
+    ruby-amazon-bedrock (0.2.5)
       aws-sdk-bedrockruntime (~> 1.0)
       aws-sdk-s3 (~> 1.0)
+      base64 (~> 0.2)
 
 GEM
   remote: https://rubygems.org/
@@ -30,6 +31,7 @@ GEM
       aws-sigv4 (~> 1.6)
     aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
+    base64 (0.2.0)
     bundler-audit (0.9.1)
       bundler (>= 1.2.0, < 3)
       thor (~> 1.0)
@@ -106,4 +108,4 @@ DEPENDENCIES
   webmock (~> 3.12)
 
 BUNDLED WITH
-   2.4.22
+   2.4.14

README.md

@@ -63,16 +63,14 @@ client = RubyAmazonBedrock::Client.new(
 )
 ```
 
-## With Configuration
+### AWS Named Profiles
 
-```ruby
-RubyAmazonBedrock.configure do |config|
-  config.region = ENV.fetch('AWS_REGION', nil)
-  config.access_key_id = ENV.fetch('AWS_ACCESS_KEY_ID', nil)
-  config.secret_access_key = ENV.fetch('AWS_SECRET_ACCESS_KEY', nil)
-end
+You can also use [AWS Named Profiles](https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-files.html#cli-configure-files-format-profile) by passing the `profile` keywoard argument. When using a named profile, specyfing the `region`, `access_key_id` and `access_token` won't be required.
 
-client = RubyAmazonBedrock::Client.new
+```ruby
+client = RubyAmazonBedrock::Client.new(
+  profile: "AWS_PROFILE"
+)
 ```
 
 ## Options

lib/amazon_bedrock.rb

@@ -13,7 +13,7 @@ class Error < StandardError; end
 
   # Configuration class for setting up AWS credentials and region.
   class Configuration
-    attr_accessor :region, :access_key_id, :secret_access_key
+    attr_accessor :region, :access_key_id, :secret_access_key, :profile
 
     # Initializes a new Configuration instance, loading values from
     # environment variables or setting them to nil by default so the
@@ -22,6 +22,7 @@ def initialize
       @region = ENV.fetch('AWS_REGION', nil)
       @access_key_id = ENV.fetch('AWS_ACCESS_KEY_ID', nil)
       @secret_access_key = ENV.fetch('AWS_SECRET_ACCESS_KEY', nil)
+      @profile = ENV.fetch('AWS_PROFILE', nil)
     end
   end
 

lib/amazon_bedrock/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubyAmazonBedrock
-  VERSION = "0.2.3"
+  VERSION = "0.2.5"
 end

lib/bedrock_runtime/client.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'pry'
+
 require 'base64'
 require 'aws-sdk-bedrockruntime'
 require 'bedrock_runtime/payload_factory'
@@ -14,14 +16,20 @@ class Client
     # Initializes the AWS BedrockRuntime client.
     #
     # @note The AWS credentials and region are fetched from the environment variables.
-    def initialize(region: nil, access_key_id: nil, secret_access_key: nil)
+    def initialize(region: nil, access_key_id: nil, secret_access_key: nil, profile: nil)
       config = RubyAmazonBedrock.configuration || RubyAmazonBedrock::Configuration.new
 
-      @client = Aws::BedrockRuntime::Client.new(
-        region: region || config.region,
-        access_key_id: access_key_id || config.access_key_id,
-        secret_access_key: secret_access_key || config.secret_access_key
-      )
+      @client = if profile
+                  Aws::BedrockRuntime::Client.new(
+                    profile: profile
+                  )
+                else
+                  Aws::BedrockRuntime::Client.new(
+                    region: region || config.region,
+                    access_key_id: access_key_id || config.access_key_id,
+                    secret_access_key: secret_access_key || config.secret_access_key
+                  )
+                end
     end
 
     # Invokes a model using the Bedrock Runtime client.

lib/bedrock_runtime/payload_builders/meta/llama370b_instruct_v1.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module RubyAmazonBedrock
+  module PayloadBuilders
+    module Meta
+      # Llama370bInstructV1  is a subclass of Base. It provides functionalities specific to the Meta
+      # Llama 3 70B Instruct model.
+      #
+      # @see https://us-west-2.console.aws.amazon.com/bedrock/home?region=us-west-2#/providers?model=meta.llama3-70b-instruct-v1:0
+      # for more information about the Meta model.
+      class Llama370bInstructV1 < Base
+        # Returns the model ID for the Meta Llama 3 70B Instruct model.
+        #
+        # @return [String] 'meta.llama2-70b-chat-v1:0'
+        def model_id
+          'meta.llama3-70b-instruct-v1:0'
+        end
+      end
+    end
+  end
+end

lib/bedrock_runtime/payload_factory.rb

@@ -14,6 +14,7 @@
 require_relative 'payload_builders/cohere/embed_multilingual_v3'
 require_relative 'payload_builders/meta/llama213b_chat_v1'
 require_relative 'payload_builders/meta/llama270b_chat_v1'
+require_relative 'payload_builders/meta/llama370b_instruct_v1'
 require_relative 'payload_builders/stability_ai/stable_diffusion_xl_v0'
 require_relative 'payload_builders/stability_ai/stable_diffusion_xl_v1'
 
@@ -64,6 +65,7 @@ def models_to_builders
         'cohere.embed-multilingual-v3' => PayloadBuilders::Cohere::EmbedMultilingualV3,
         'meta.llama2-13b-chat-v1' => PayloadBuilders::Meta::Llama213bChatV1,
         'meta.llama2-70b-chat-v1' => PayloadBuilders::Meta::Llama270bChatV1,
+        'meta.llama3-70b-instruct-v1:0' => PayloadBuilders::Meta::Llama370bInstructV1,
         'stability.stable-diffusion-xl-v0' => PayloadBuilders::StabilityAi::StableDiffusionXlV0,
         'stability.stable-diffusion-xl-v1' => PayloadBuilders::StabilityAi::StableDiffusionXlV1
       }

lib/bedrock_runtime/response_factory.rb

@@ -55,6 +55,7 @@ def models_to_builders
         'cohere.embed-multilingual-v3' => ResponseBuilders::CohereEmbed,
         'meta.llama2-13b-chat-v1' => ResponseBuilders::Meta,
         'meta.llama2-70b-chat-v1' => ResponseBuilders::Meta,
+        'meta.llama3-70b-instruct-v1:0' => ResponseBuilders::Meta,
         'stability.stable-diffusion-xl-v0' => ResponseBuilders::StabilityAi,
         'stability.stable-diffusion-xl-v1' => ResponseBuilders::StabilityAi
       }

ruby-amazon-bedrock.gemspec

@@ -37,4 +37,5 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "aws-sdk-bedrockruntime", "~> 1.0"
   spec.add_dependency "aws-sdk-s3", "~> 1.0"
+  spec.add_dependency "base64", "~> 0.2"
 end

spec/bedrock_runtime/client_spec.rb

@@ -8,7 +8,8 @@
     described_class.new(
       region: ENV.fetch('AWS_REGION', nil),
       access_key_id: ENV.fetch('AWS_ACCESS_KEY_ID', nil),
-      secret_access_key: ENV.fetch('AWS_SECRET_ACCESS_KEY', nil)
+      secret_access_key: ENV.fetch('AWS_SECRET_ACCESS_KEY', nil),
+      profile: ENV.fetch('AWS_PROFILE', nil)
     )
   end