Merge branch 'dev' into french/240514/transcription--transcription

CHANGELOG.md

@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `AudioLoader` for loading audio content into an `AudioArtifact`.
 - `AudioTranscriptionTask` and `AudioTranscriptionClient` for transcribing audio content in Structures.
 - `OpenAiAudioTranscriptionDriver` for integration with OpenAI's speech-to-text models, including Whisper.
+- Parameter `env` to `BaseStructureRunDriver` to set environment variables for a Structure Run.
 
 ### Changed
 - **BREAKING**: Updated OpenAI-based image query drivers to remove Vision from the name.

griptape/artifacts/audio_artifact.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from attr import define
+from attrs import define
 
 from griptape.artifacts import MediaArtifact
 

griptape/artifacts/base_artifact.py

@@ -4,7 +4,7 @@
 import json
 import uuid
 from abc import ABC, abstractmethod
-from attr import define, field, Factory
+from attrs import define, field, Factory
 
 
 @define()

griptape/artifacts/blob_artifact.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 import os.path
 from typing import Optional
-from attr import field, define
+from attrs import field, define
 from griptape.artifacts import BaseArtifact
 
 

griptape/artifacts/csv_row_artifact.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 import csv
 import io
-from attr import define, field
+from attrs import define, field
 from griptape.artifacts import TextArtifact, BaseArtifact
 
 

griptape/artifacts/error_artifact.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 from typing import Optional
-from attr import define, field
+from attrs import define, field
 from griptape.artifacts import BaseArtifact
 
 

griptape/artifacts/image_artifact.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from attr import define, field
+from attrs import define, field
 
 from griptape.artifacts import MediaArtifact
 

griptape/artifacts/info_artifact.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from attr import define, field
+from attrs import define, field
 from griptape.artifacts import BaseArtifact
 
 

griptape/artifacts/list_artifact.py

@@ -1,17 +1,18 @@
 from typing import Optional
 from collections.abc import Sequence
-from attr import field, define
+from attrs import field, define
 from griptape.artifacts import BaseArtifact
 
 
 @define
 class ListArtifact(BaseArtifact):
     value: Sequence[BaseArtifact] = field(factory=list, metadata={"serializable": True})
     item_separator: str = field(default="\n\n", kw_only=True, metadata={"serializable": True})
+    validate_uniform_types: bool = field(default=False, kw_only=True, metadata={"serializable": True})
 
     @value.validator  # pyright: ignore
     def validate_value(self, _, value: list[BaseArtifact]) -> None:
-        if len(value) > 0:
+        if self.validate_uniform_types and len(value) > 0:
             first_type = type(value[0])
 
             if not all(isinstance(v, first_type) for v in value):

griptape/artifacts/media_artifact.py

@@ -5,7 +5,7 @@
 import random
 from typing import Optional
 
-from attr import define, field
+from attrs import define, field
 from griptape.artifacts import BlobArtifact
 import base64
 

griptape/artifacts/text_artifact.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 from typing import TYPE_CHECKING, Optional
-from attr import define, field
+from attrs import define, field
 from griptape.artifacts import BaseArtifact
 
 if TYPE_CHECKING:

griptape/chunkers/base_chunker.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 from abc import ABC
 from typing import Optional
-from attr import define, field, Factory
+from attrs import define, field, Factory
 from griptape.artifacts import TextArtifact
 from griptape.chunkers import ChunkSeparator
 from griptape.tokenizers import BaseTokenizer, OpenAiTokenizer

griptape/config/base_structure_config.py

@@ -3,7 +3,7 @@
 from abc import ABC
 from typing import Optional
 
-from attr import define, field
+from attrs import define, field
 
 from griptape.config import BaseConfig
 from griptape.drivers import (

griptape/drivers/embedding/amazon_bedrock_cohere_embedding_driver.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 import json
 from typing import Any, TYPE_CHECKING
-from attr import define, field, Factory
+from attrs import define, field, Factory
 from griptape.drivers import BaseEmbeddingDriver
 from griptape.tokenizers import BedrockCohereTokenizer
 from griptape.utils import import_optional_dependency

griptape/drivers/embedding/amazon_bedrock_titan_embedding_driver.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 import json
 from typing import Any, TYPE_CHECKING
-from attr import define, field, Factory
+from attrs import define, field, Factory
 from griptape.drivers import BaseEmbeddingDriver
 from griptape.tokenizers import BedrockTitanTokenizer
 from griptape.utils import import_optional_dependency

griptape/drivers/embedding/amazon_sagemaker_embedding_driver.py

@@ -3,7 +3,7 @@
 import json
 from typing import Any
 
-from attr import Factory, define, field
+from attrs import Factory, define, field
 
 from griptape.drivers import BaseMultiModelEmbeddingDriver
 from griptape.utils import import_optional_dependency

griptape/drivers/embedding/azure_openai_embedding_driver.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from typing import Callable, Optional
-from attr import define, field, Factory
+from attrs import define, field, Factory
 from griptape.drivers import OpenAiEmbeddingDriver
 from griptape.tokenizers import OpenAiTokenizer
 import openai

griptape/drivers/embedding/base_embedding_driver.py

@@ -2,7 +2,7 @@
 import numpy as np
 from typing import Optional
 from abc import ABC, abstractmethod
-from attr import define, field
+from attrs import define, field
 from griptape.artifacts import TextArtifact
 from griptape.mixins import ExponentialBackoffMixin
 from griptape.tokenizers import BaseTokenizer

griptape/drivers/embedding/base_multi_model_embedding_driver.py

@@ -2,7 +2,7 @@
 from abc import ABC
 from typing import TYPE_CHECKING
 
-from attr import define, field
+from attrs import define, field
 
 from griptape.drivers import BaseEmbeddingDriver
 

griptape/drivers/embedding/google_embedding_driver.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 from typing import Optional
-from attr import define, field
+from attrs import define, field
 from griptape.drivers import BaseEmbeddingDriver
 from griptape.utils import import_optional_dependency
 

griptape/drivers/embedding/huggingface_hub_embedding_driver.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 from typing import TYPE_CHECKING
 from griptape.utils import import_optional_dependency
-from attr import define, field, Factory
+from attrs import define, field, Factory
 from griptape.drivers import BaseEmbeddingDriver
 
 if TYPE_CHECKING:

griptape/drivers/embedding/openai_embedding_driver.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 from typing import Optional
-from attr import define, field, Factory
+from attrs import define, field, Factory
 from griptape.drivers import BaseEmbeddingDriver
 from griptape.tokenizers import OpenAiTokenizer
 import openai

griptape/drivers/embedding/voyageai_embedding_driver.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 from typing import Optional, Any
-from attr import define, field, Factory
+from attrs import define, field, Factory
 from griptape.utils import import_optional_dependency
 from griptape.drivers import BaseEmbeddingDriver
 from griptape.tokenizers import VoyageAiTokenizer

griptape/drivers/embedding_model/base_embedding_model_driver.py

@@ -1,4 +1,4 @@
-from attr import define
+from attrs import define
 from abc import ABC, abstractmethod
 
 

griptape/drivers/embedding_model/sagemaker_huggingface_embedding_model_driver.py

@@ -1,4 +1,4 @@
-from attr import define
+from attrs import define
 from griptape.drivers import BaseEmbeddingModelDriver
 
 

griptape/drivers/embedding_model/sagemaker_tensorflow_hub_embedding_model_driver.py

@@ -1,4 +1,4 @@
-from attr import define
+from attrs import define
 from griptape.drivers import BaseEmbeddingModelDriver
 
 

griptape/drivers/event_listener/amazon_sqs_event_listener_driver.py

@@ -3,7 +3,7 @@
 import json
 from typing import TYPE_CHECKING, Any
 
-from attr import Factory, define, field
+from attrs import Factory, define, field
 
 from griptape.drivers.event_listener.base_event_listener_driver import BaseEventListenerDriver
 from griptape.utils import import_optional_dependency

griptape/drivers/event_listener/aws_iot_core_event_listener_driver.py

@@ -3,7 +3,7 @@
 import json
 from typing import TYPE_CHECKING, Any
 
-from attr import Factory, define, field
+from attrs import Factory, define, field
 
 from griptape.drivers.event_listener.base_event_listener_driver import BaseEventListenerDriver
 from griptape.utils import import_optional_dependency

griptape/drivers/event_listener/base_event_listener_driver.py

@@ -4,7 +4,7 @@
 from concurrent import futures
 from logging import Logger
 
-from attr import Factory, define, field
+from attrs import Factory, define, field
 
 from griptape.events import BaseEvent
 

griptape/drivers/event_listener/griptape_cloud_event_listener_driver.py

@@ -4,7 +4,7 @@
 import requests
 
 from urllib.parse import urljoin
-from attr import define, field, Factory
+from attrs import define, field, Factory
 
 from griptape.drivers.event_listener.base_event_listener_driver import BaseEventListenerDriver
 

griptape/drivers/event_listener/webhook_event_listener_driver.py

@@ -2,7 +2,7 @@
 
 import requests
 
-from attr import define, field
+from attrs import define, field
 
 from griptape.drivers.event_listener.base_event_listener_driver import BaseEventListenerDriver
 

griptape/drivers/file_manager/amazon_s3_file_manager_driver.py

@@ -2,7 +2,7 @@
 import os
 from pathlib import Path
 from typing import TYPE_CHECKING, Any
-from attr import define, field, Factory
+from attrs import define, field, Factory
 from griptape.utils.import_utils import import_optional_dependency
 from .base_file_manager_driver import BaseFileManagerDriver
 

griptape/drivers/file_manager/base_file_manager_driver.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 from abc import ABC, abstractmethod
-from attr import Factory, define, field
+from attrs import Factory, define, field
 from griptape.artifacts import BaseArtifact, ErrorArtifact, TextArtifact, InfoArtifact, ListArtifact
 import griptape.loaders as loaders
 

griptape/drivers/file_manager/local_file_manager_driver.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 import os
 from pathlib import Path
-from attr import define, field, Factory
+from attrs import define, field, Factory
 from .base_file_manager_driver import BaseFileManagerDriver
 
 

griptape/drivers/image_generation/amazon_bedrock_image_generation_driver.py

@@ -3,7 +3,7 @@
 import json
 from typing import TYPE_CHECKING, Any, Optional
 
-from attr import define, field, Factory
+from attrs import define, field, Factory
 
 from griptape.artifacts import ImageArtifact
 from griptape.drivers import BaseMultiModelImageGenerationDriver

griptape/drivers/image_generation/azure_openai_image_generation_driver.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import openai
-from attr import field, Factory, define
+from attrs import field, Factory, define
 from typing import Callable, Optional
 
 from griptape.drivers import OpenAiImageGenerationDriver

griptape/drivers/image_generation/base_image_generation_driver.py

@@ -3,7 +3,7 @@
 from abc import ABC, abstractmethod
 from typing import TYPE_CHECKING, Optional
 
-from attr import define, field
+from attrs import define, field
 
 from griptape.artifacts import ImageArtifact
 from griptape.events import StartImageGenerationEvent, FinishImageGenerationEvent

griptape/drivers/image_generation/base_multi_model_image_generation_driver.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 from abc import ABC
 
-from attr import field, define
+from attrs import field, define
 
 from griptape.drivers import BaseImageGenerationDriver, BaseImageGenerationModelDriver
 

griptape/drivers/image_generation/leonardo_image_generation_driver.py

@@ -3,7 +3,7 @@
 from typing import Optional, Literal
 
 import requests
-from attr import field, define, Factory
+from attrs import field, define, Factory
 
 from griptape.artifacts import ImageArtifact
 from griptape.drivers import BaseImageGenerationDriver

griptape/drivers/image_generation/openai_image_generation_driver.py

@@ -5,7 +5,7 @@
 
 import openai
 from openai.types.images_response import ImagesResponse
-from attr import field, Factory, define
+from attrs import field, Factory, define
 
 from griptape.artifacts import ImageArtifact
 from griptape.drivers import BaseImageGenerationDriver

griptape/drivers/image_generation_model/base_image_generation_model_driver.py

@@ -3,7 +3,7 @@
 from abc import ABC, abstractmethod
 from typing import Any, Optional
 
-from attr import define
+from attrs import define
 
 from griptape.artifacts import ImageArtifact
 from griptape.mixins import SerializableMixin

griptape/drivers/image_generation_model/bedrock_stable_diffusion_image_generation_model_driver.py

@@ -4,7 +4,7 @@
 import logging
 from typing import Optional
 
-from attr import field, define
+from attrs import field, define
 
 from griptape.artifacts import ImageArtifact
 from griptape.drivers import BaseImageGenerationModelDriver

griptape/drivers/image_generation_model/bedrock_titan_image_generation_model_driver.py

@@ -3,7 +3,7 @@
 import base64
 from typing import Any, Optional
 
-from attr import field, define
+from attrs import field, define
 
 from griptape.artifacts import ImageArtifact
 from griptape.drivers import BaseImageGenerationModelDriver

griptape/drivers/image_query/amazon_bedrock_image_query_driver.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 from typing import TYPE_CHECKING, Any
-from attr import define, field, Factory
+from attrs import define, field, Factory
 from griptape.artifacts import ImageArtifact, TextArtifact
 from griptape.drivers import BaseMultiModelImageQueryDriver
 from griptape.utils import import_optional_dependency

griptape/drivers/image_query/anthropic_image_query_driver.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 from typing import Optional, Any
-from attr import define, field, Factory
+from attrs import define, field, Factory
 from griptape.artifacts import ImageArtifact, TextArtifact
 from griptape.drivers import BaseImageQueryDriver
 from griptape.utils import import_optional_dependency