Update AmazonBedrockStructureConfig with helper params

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `GoogleWebSearchDriver` to web search with the Google Customsearch API.
 - `DuckDuckGoWebSearchDriver` to web search with the DuckDuckGo search SDK.
 - `ProxyWebScraperDriver` to web scrape using proxies.
+- Parameter `session` on `AmazonBedrockStructureConfig`.
 
 ### Changed
 - **BREAKING**: removed parameters `google_api_lang`, `google_api_key`, `google_api_search_id`, `google_api_country` on `WebSearch` in favor of `web_search_driver`.

docs/griptape-framework/structures/config.md

@@ -48,11 +48,19 @@ agent = Agent(
 The [Amazon Bedrock Structure Config](../../reference/griptape/config/amazon_bedrock_structure_config.md) provides default Drivers for Amazon Bedrock's APIs.
 
 ```python
+import os
+import boto3
 from griptape.structures import Agent
 from griptape.config import AmazonBedrockStructureConfig
 
 agent = Agent(
-    config=AmazonBedrockStructureConfig()
+    config=AmazonBedrockStructureConfig(
+        session=boto3.Session(
+            region_name=os.environ["AWS_DEFAULT_REGION"],
+            aws_access_key_id=os.environ["AWS_ACCESS_KEY_ID"],
+            aws_secret_access_key=os.environ["AWS_SECRET_ACCESS_KEY"],
+        )
+    )
 )
 ```
 

griptape/config/amazon_bedrock_structure_config.py

@@ -1,5 +1,9 @@
+from __future__ import annotations
+from typing import TYPE_CHECKING
 from attrs import Factory, define, field
 
+from griptape.drivers import BasePromptDriver
+from griptape.utils import import_optional_dependency
 from griptape.config import StructureConfig
 from griptape.drivers import (
     AmazonBedrockImageGenerationDriver,
@@ -8,49 +12,68 @@
     AmazonBedrockTitanEmbeddingDriver,
     BaseEmbeddingDriver,
     BaseImageGenerationDriver,
-    BasePromptDriver,
     BaseVectorStoreDriver,
     BedrockClaudeImageQueryModelDriver,
     BedrockTitanImageGenerationModelDriver,
     LocalVectorStoreDriver,
 )
 
+if TYPE_CHECKING:
+    import boto3
 
-@define()
+
+@define
 class AmazonBedrockStructureConfig(StructureConfig):
+    session: boto3.Session = field(
+        default=Factory(lambda: import_optional_dependency("boto3").Session()),
+        kw_only=True,
+        metadata={"serializable": False},
+    )
+
     prompt_driver: BasePromptDriver = field(
         default=Factory(
-            lambda: AmazonBedrockPromptDriver(model="anthropic.claude-3-sonnet-20240229-v1:0", stream=False)
+            lambda self: AmazonBedrockPromptDriver(
+                session=self.session, model="anthropic.claude-3-sonnet-20240229-v1:0"
+            ),
+            takes_self=True,
         ),
+        kw_only=True,
+        metadata={"serializable": True},
+    )
+    embedding_driver: BaseEmbeddingDriver = field(
+        default=Factory(
+            lambda self: AmazonBedrockTitanEmbeddingDriver(session=self.session, model="amazon.titan-embed-text-v1"),
+            takes_self=True,
+        ),
+        kw_only=True,
         metadata={"serializable": True},
     )
     image_generation_driver: BaseImageGenerationDriver = field(
         default=Factory(
-            lambda: AmazonBedrockImageGenerationDriver(
+            lambda self: AmazonBedrockImageGenerationDriver(
+                session=self.session,
                 model="amazon.titan-image-generator-v1",
                 image_generation_model_driver=BedrockTitanImageGenerationModelDriver(),
-            )
+            ),
+            takes_self=True,
         ),
+        kw_only=True,
         metadata={"serializable": True},
     )
     image_query_driver: BaseImageGenerationDriver = field(
         default=Factory(
-            lambda: AmazonBedrockImageQueryDriver(
+            lambda self: AmazonBedrockImageQueryDriver(
+                session=self.session,
                 model="anthropic.claude-3-sonnet-20240229-v1:0",
                 image_query_model_driver=BedrockClaudeImageQueryModelDriver(),
-            )
+            ),
+            takes_self=True,
         ),
-        metadata={"serializable": True},
-    )
-    embedding_driver: BaseEmbeddingDriver = field(
-        default=Factory(lambda: AmazonBedrockTitanEmbeddingDriver(model="amazon.titan-embed-text-v1")),
+        kw_only=True,
         metadata={"serializable": True},
     )
     vector_store_driver: BaseVectorStoreDriver = field(
-        default=Factory(
-            lambda: LocalVectorStoreDriver(
-                embedding_driver=AmazonBedrockTitanEmbeddingDriver(model="amazon.titan-embed-text-v1")
-            )
-        ),
+        default=Factory(lambda self: LocalVectorStoreDriver(embedding_driver=self.embedding_driver), takes_self=True),
+        kw_only=True,
         metadata={"serializable": True},
     )

tests/unit/config/test_amazon_bedrock_structure_config.py

@@ -1,3 +1,4 @@
+import boto3
 from pytest import fixture
 from griptape.config import AmazonBedrockStructureConfig
 from tests.utils.aws import mock_aws_credentials
@@ -10,8 +11,17 @@ def run_before_and_after_tests(self):
 
     @fixture
     def config(self):
+        mock_aws_credentials()
         return AmazonBedrockStructureConfig()
 
+    @fixture
+    def config_with_values(self):
+        return AmazonBedrockStructureConfig(
+            session=boto3.Session(
+                aws_access_key_id="testing", aws_secret_access_key="testing", region_name="region-value"
+            )
+        )
+
     def test_to_dict(self, config):
         assert config.to_dict() == {
             "conversation_memory_driver": None,
@@ -56,3 +66,52 @@ def test_to_dict(self, config):
 
     def test_from_dict(self, config):
         assert AmazonBedrockStructureConfig.from_dict(config.to_dict()).to_dict() == config.to_dict()
+
+    def test_from_dict_with_values(self, config_with_values):
+        assert (
+            AmazonBedrockStructureConfig.from_dict(config_with_values.to_dict()).to_dict()
+            == config_with_values.to_dict()
+        )
+
+    def test_to_dict_with_values(self, config_with_values):
+        assert config_with_values.to_dict() == {
+            "conversation_memory_driver": None,
+            "embedding_driver": {"model": "amazon.titan-embed-text-v1", "type": "AmazonBedrockTitanEmbeddingDriver"},
+            "image_generation_driver": {
+                "image_generation_model_driver": {
+                    "cfg_scale": 7,
+                    "outpainting_mode": "PRECISE",
+                    "quality": "standard",
+                    "type": "BedrockTitanImageGenerationModelDriver",
+                },
+                "image_height": 512,
+                "image_width": 512,
+                "model": "amazon.titan-image-generator-v1",
+                "seed": None,
+                "type": "AmazonBedrockImageGenerationDriver",
+            },
+            "image_query_driver": {
+                "type": "AmazonBedrockImageQueryDriver",
+                "model": "anthropic.claude-3-sonnet-20240229-v1:0",
+                "max_tokens": 256,
+                "image_query_model_driver": {"type": "BedrockClaudeImageQueryModelDriver"},
+            },
+            "prompt_driver": {
+                "max_tokens": None,
+                "model": "anthropic.claude-3-sonnet-20240229-v1:0",
+                "stream": False,
+                "temperature": 0.1,
+                "type": "AmazonBedrockPromptDriver",
+            },
+            "vector_store_driver": {
+                "embedding_driver": {
+                    "model": "amazon.titan-embed-text-v1",
+                    "type": "AmazonBedrockTitanEmbeddingDriver",
+                },
+                "type": "LocalVectorStoreDriver",
+            },
+            "type": "AmazonBedrockStructureConfig",
+            "text_to_speech_driver": {"type": "DummyTextToSpeechDriver"},
+            "audio_transcription_driver": {"type": "DummyAudioTranscriptionDriver"},
+        }
+        assert config_with_values.session.region_name == "region-value"