Merge branch 'dev' into feature/driver-config-context

CHANGELOG.md

@@ -22,6 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - **BREAKING**: `BaseConversationMemoryDriver.load` now returns `tuple[list[Run], dict]`. This represents the runs and metadata.
 - **BREAKING**: `BaseConversationMemoryDriver.store` now takes `runs: list[Run]` and `metadata: dict` as input.
 - **BREAKING**: Parameter `file_path` on `LocalConversationMemoryDriver` renamed to `persist_file` and is now type `Optional[str]`.
+- **BREAKING**: Removed the `__all__` declaration from the `griptape.mixins` module. 
 - `Defaults.drivers_config.conversation_memory_driver` now defaults to `LocalConversationMemoryDriver` instead of `None`.
 - `CsvRowArtifact.to_text()` now includes the header.
 

griptape/artifacts/action_artifact.py

@@ -5,7 +5,7 @@
 from attrs import define, field
 
 from griptape.artifacts import BaseArtifact
-from griptape.mixins import SerializableMixin
+from griptape.mixins.serializable_mixin import SerializableMixin
 
 if TYPE_CHECKING:
     from griptape.common import ToolAction

griptape/artifacts/base_artifact.py

@@ -7,7 +7,7 @@
 
 from attrs import Factory, define, field
 
-from griptape.mixins import SerializableMixin
+from griptape.mixins.serializable_mixin import SerializableMixin
 
 if TYPE_CHECKING:
     from griptape.common import Reference

griptape/common/actions/base_action.py

@@ -1,6 +1,6 @@
 from abc import ABC
 
-from griptape.mixins import SerializableMixin
+from griptape.mixins.serializable_mixin import SerializableMixin
 
 
 class BaseAction(SerializableMixin, ABC): ...

griptape/common/prompt_stack/contents/base_message_content.py

@@ -5,7 +5,7 @@
 
 from attrs import define, field
 
-from griptape.mixins import SerializableMixin
+from griptape.mixins.serializable_mixin import SerializableMixin
 
 if TYPE_CHECKING:
     from collections.abc import Sequence

griptape/common/prompt_stack/messages/base_message.py

@@ -5,7 +5,7 @@
 
 from attrs import Factory, define, field
 
-from griptape.mixins import SerializableMixin
+from griptape.mixins.serializable_mixin import SerializableMixin
 
 if TYPE_CHECKING:
     from griptape.common import BaseDeltaMessageContent, BaseMessageContent

griptape/common/prompt_stack/prompt_stack.py

@@ -22,7 +22,7 @@
     Message,
     TextMessageContent,
 )
-from griptape.mixins import SerializableMixin
+from griptape.mixins.serializable_mixin import SerializableMixin
 
 if TYPE_CHECKING:
     from griptape.tools import BaseTool

griptape/common/reference.py

@@ -5,7 +5,7 @@
 
 from attrs import Factory, define, field
 
-from griptape.mixins import SerializableMixin
+from griptape.mixins.serializable_mixin import SerializableMixin
 
 
 @define(kw_only=True)

griptape/configs/drivers/base_drivers_config.py

@@ -5,7 +5,7 @@
 
 from attrs import define, field
 
-from griptape.mixins import SerializableMixin
+from griptape.mixins.serializable_mixin import SerializableMixin
 from griptape.utils.decorators import lazy_property
 
 if TYPE_CHECKING:

griptape/drivers/audio_transcription/base_audio_transcription_driver.py

@@ -6,7 +6,8 @@
 from attrs import define, field
 
 from griptape.events import EventBus, FinishAudioTranscriptionEvent, StartAudioTranscriptionEvent
-from griptape.mixins import ExponentialBackoffMixin, SerializableMixin
+from griptape.mixins.exponential_backoff_mixin import ExponentialBackoffMixin
+from griptape.mixins.serializable_mixin import SerializableMixin
 
 if TYPE_CHECKING:
     from griptape.artifacts import AudioArtifact, TextArtifact

griptape/drivers/embedding/base_embedding_driver.py

@@ -7,7 +7,8 @@
 from attrs import define, field
 
 from griptape.chunkers import BaseChunker, TextChunker
-from griptape.mixins import ExponentialBackoffMixin, SerializableMixin
+from griptape.mixins.exponential_backoff_mixin import ExponentialBackoffMixin
+from griptape.mixins.serializable_mixin import SerializableMixin
 
 if TYPE_CHECKING:
     from griptape.artifacts import TextArtifact

griptape/drivers/event_listener/base_event_listener_driver.py

@@ -7,7 +7,7 @@
 
 from attrs import Factory, define, field
 
-from griptape.mixins import FuturesExecutorMixin
+from griptape.mixins.futures_executor_mixin import FuturesExecutorMixin
 
 if TYPE_CHECKING:
     from griptape.events import BaseEvent

griptape/drivers/image_generation/base_image_generation_driver.py

@@ -6,7 +6,8 @@
 from attrs import define, field
 
 from griptape.events import EventBus, FinishImageGenerationEvent, StartImageGenerationEvent
-from griptape.mixins import ExponentialBackoffMixin, SerializableMixin
+from griptape.mixins.exponential_backoff_mixin import ExponentialBackoffMixin
+from griptape.mixins.serializable_mixin import SerializableMixin
 
 if TYPE_CHECKING:
     from griptape.artifacts import ImageArtifact

griptape/drivers/image_generation_model/base_image_generation_model_driver.py

@@ -5,7 +5,7 @@
 
 from attrs import define
 
-from griptape.mixins import SerializableMixin
+from griptape.mixins.serializable_mixin import SerializableMixin
 
 if TYPE_CHECKING:
     from griptape.artifacts import ImageArtifact

griptape/drivers/image_query/base_image_query_driver.py

@@ -6,7 +6,8 @@
 from attrs import define, field
 
 from griptape.events import EventBus, FinishImageQueryEvent, StartImageQueryEvent
-from griptape.mixins import ExponentialBackoffMixin, SerializableMixin
+from griptape.mixins.exponential_backoff_mixin import ExponentialBackoffMixin
+from griptape.mixins.serializable_mixin import SerializableMixin
 
 if TYPE_CHECKING:
     from griptape.artifacts import ImageArtifact, TextArtifact

griptape/drivers/image_query_model/base_image_query_model_driver.py

@@ -5,7 +5,7 @@
 
 from attrs import define
 
-from griptape.mixins import SerializableMixin
+from griptape.mixins.serializable_mixin import SerializableMixin
 
 if TYPE_CHECKING:
     from griptape.artifacts import ImageArtifact, TextArtifact

griptape/drivers/memory/conversation/base_conversation_memory_driver.py

@@ -3,7 +3,7 @@
 from abc import ABC, abstractmethod
 from typing import TYPE_CHECKING, Any
 
-from griptape.mixins import SerializableMixin
+from griptape.mixins.serializable_mixin import SerializableMixin
 
 if TYPE_CHECKING:
     from griptape.memory.structure import Run

griptape/drivers/prompt/base_prompt_driver.py

@@ -17,7 +17,8 @@
     observable,
 )
 from griptape.events import CompletionChunkEvent, EventBus, FinishPromptEvent, StartPromptEvent
-from griptape.mixins import ExponentialBackoffMixin, SerializableMixin
+from griptape.mixins.exponential_backoff_mixin import ExponentialBackoffMixin
+from griptape.mixins.serializable_mixin import SerializableMixin
 
 if TYPE_CHECKING:
     from collections.abc import Iterator

griptape/drivers/text_to_speech/base_text_to_speech_driver.py

@@ -8,7 +8,8 @@
 from griptape.events import EventBus
 from griptape.events.finish_text_to_speech_event import FinishTextToSpeechEvent
 from griptape.events.start_text_to_speech_event import StartTextToSpeechEvent
-from griptape.mixins import ExponentialBackoffMixin, SerializableMixin
+from griptape.mixins.exponential_backoff_mixin import ExponentialBackoffMixin
+from griptape.mixins.serializable_mixin import SerializableMixin
 
 if TYPE_CHECKING:
     from griptape.artifacts.audio_artifact import AudioArtifact

griptape/drivers/vector/base_vector_store_driver.py

@@ -9,7 +9,8 @@
 
 from griptape import utils
 from griptape.artifacts import BaseArtifact, ListArtifact, TextArtifact
-from griptape.mixins import FuturesExecutorMixin, SerializableMixin
+from griptape.mixins.futures_executor_mixin import FuturesExecutorMixin
+from griptape.mixins.serializable_mixin import SerializableMixin
 
 if TYPE_CHECKING:
     from griptape.drivers import BaseEmbeddingDriver

griptape/engines/rag/modules/base_rag_module.py

@@ -7,7 +7,7 @@
 from attrs import Factory, define, field
 
 from griptape.common import Message, PromptStack
-from griptape.mixins import FuturesExecutorMixin
+from griptape.mixins.futures_executor_mixin import FuturesExecutorMixin
 
 if TYPE_CHECKING:
     from griptape.engines.rag import RagContext

griptape/engines/rag/modules/response/prompt_response_rag_module.py

@@ -7,7 +7,7 @@
 from griptape.artifacts.text_artifact import TextArtifact
 from griptape.configs import Defaults
 from griptape.engines.rag.modules import BaseResponseRagModule
-from griptape.mixins import RuleMixin
+from griptape.mixins.rule_mixin import RuleMixin
 from griptape.utils import J2
 
 if TYPE_CHECKING:

griptape/engines/rag/rag_context.py

@@ -5,7 +5,7 @@
 from attrs import define, field
 
 from griptape import utils
-from griptape.mixins import SerializableMixin
+from griptape.mixins.serializable_mixin import SerializableMixin
 
 if TYPE_CHECKING:
     from griptape.artifacts import BaseArtifact, TextArtifact

griptape/engines/rag/stages/base_rag_stage.py

@@ -5,7 +5,7 @@
 
 from griptape.engines.rag import RagContext
 from griptape.engines.rag.modules import BaseRagModule
-from griptape.mixins import FuturesExecutorMixin
+from griptape.mixins.futures_executor_mixin import FuturesExecutorMixin
 
 
 @define(kw_only=True)

griptape/events/base_event.py

@@ -7,7 +7,7 @@
 
 from attrs import Factory, define, field
 
-from griptape.mixins import SerializableMixin
+from griptape.mixins.serializable_mixin import SerializableMixin
 
 
 @define

griptape/loaders/base_loader.py

@@ -5,7 +5,7 @@
 
 from attrs import define, field
 
-from griptape.mixins import FuturesExecutorMixin
+from griptape.mixins.futures_executor_mixin import FuturesExecutorMixin
 from griptape.utils.futures import execute_futures_dict
 from griptape.utils.hash import bytes_to_hash, str_to_hash
 

griptape/memory/meta/base_meta_entry.py

@@ -4,7 +4,7 @@
 
 from attrs import define
 
-from griptape.mixins import SerializableMixin
+from griptape.mixins.serializable_mixin import SerializableMixin
 
 
 @define

griptape/memory/structure/base_conversation_memory.py

@@ -7,7 +7,7 @@
 
 from griptape.common import PromptStack
 from griptape.configs import Defaults
-from griptape.mixins import SerializableMixin
+from griptape.mixins.serializable_mixin import SerializableMixin
 from griptape.utils import dict_merge
 
 if TYPE_CHECKING:

griptape/memory/structure/run.py

@@ -5,7 +5,7 @@
 
 from attrs import Factory, define, field
 
-from griptape.mixins import SerializableMixin
+from griptape.mixins.serializable_mixin import SerializableMixin
 
 if TYPE_CHECKING:
     from griptape.artifacts import BaseArtifact

griptape/memory/task/task_memory.py

@@ -7,7 +7,7 @@
 from griptape.artifacts import BaseArtifact, BlobArtifact, ErrorArtifact, InfoArtifact, ListArtifact, TextArtifact
 from griptape.memory.meta import ActionSubtaskMetaEntry
 from griptape.memory.task.storage import BlobArtifactStorage, TextArtifactStorage
-from griptape.mixins import ActivityMixin
+from griptape.mixins.activity_mixin import ActivityMixin
 
 if TYPE_CHECKING:
     from griptape.memory.task.storage import BaseArtifactStorage

griptape/mixins/__init__.py

@@ -1,19 +0,0 @@
-from .activity_mixin import ActivityMixin
-from .exponential_backoff_mixin import ExponentialBackoffMixin
-from .actions_subtask_origin_mixin import ActionsSubtaskOriginMixin
-from .rule_mixin import RuleMixin
-from .serializable_mixin import SerializableMixin
-from .media_artifact_file_output_mixin import BlobArtifactFileOutputMixin
-from .futures_executor_mixin import FuturesExecutorMixin
-from .singleton_mixin import SingletonMixin
-
-__all__ = [
-    "ActivityMixin",
-    "ExponentialBackoffMixin",
-    "ActionsSubtaskOriginMixin",
-    "RuleMixin",
-    "BlobArtifactFileOutputMixin",
-    "SerializableMixin",
-    "FuturesExecutorMixin",
-    "SingletonMixin",
-]

griptape/schemas/base_schema.py

@@ -25,7 +25,7 @@ def from_attrs_cls(cls, attrs_cls: type) -> type:
         """
         from marshmallow import post_load
 
-        from griptape.mixins import SerializableMixin
+        from griptape.mixins.serializable_mixin import SerializableMixin
 
         class SubSchema(cls):
             @post_load

griptape/structures/workflow.py

@@ -9,7 +9,7 @@
 from griptape.artifacts import ErrorArtifact
 from griptape.common import observable
 from griptape.memory.structure import Run
-from griptape.mixins import FuturesExecutorMixin
+from griptape.mixins.futures_executor_mixin import FuturesExecutorMixin
 from griptape.structures import Structure
 
 if TYPE_CHECKING:

griptape/tasks/actions_subtask.py

@@ -13,7 +13,7 @@
 from griptape.common import ToolAction
 from griptape.configs import Defaults
 from griptape.events import EventBus, FinishActionsSubtaskEvent, StartActionsSubtaskEvent
-from griptape.mixins import ActionsSubtaskOriginMixin
+from griptape.mixins.actions_subtask_origin_mixin import ActionsSubtaskOriginMixin
 from griptape.tasks import BaseTask
 from griptape.utils import remove_null_values_in_dict_recursively
 

griptape/tasks/base_audio_generation_task.py

@@ -6,7 +6,8 @@
 from attrs import define
 
 from griptape.configs import Defaults
-from griptape.mixins import BlobArtifactFileOutputMixin, RuleMixin
+from griptape.mixins.media_artifact_file_output_mixin import BlobArtifactFileOutputMixin
+from griptape.mixins.rule_mixin import RuleMixin
 from griptape.tasks import BaseTask
 
 logger = logging.getLogger(Defaults.logging_config.logger_name)

griptape/tasks/base_audio_input_task.py

@@ -8,7 +8,7 @@
 
 from griptape.artifacts.audio_artifact import AudioArtifact
 from griptape.configs import Defaults
-from griptape.mixins import RuleMixin
+from griptape.mixins.rule_mixin import RuleMixin
 from griptape.tasks import BaseTask
 
 logger = logging.getLogger(Defaults.logging_config.logger_name)

griptape/tasks/base_image_generation_task.py

@@ -10,7 +10,8 @@
 
 from griptape.configs import Defaults
 from griptape.loaders import ImageLoader
-from griptape.mixins import BlobArtifactFileOutputMixin, RuleMixin
+from griptape.mixins.media_artifact_file_output_mixin import BlobArtifactFileOutputMixin
+from griptape.mixins.rule_mixin import RuleMixin
 from griptape.rules import Rule, Ruleset
 from griptape.tasks import BaseTask
 

griptape/tasks/base_task.py

@@ -11,7 +11,7 @@
 from griptape.artifacts import ErrorArtifact
 from griptape.configs import Defaults
 from griptape.events import EventBus, FinishTaskEvent, StartTaskEvent
-from griptape.mixins import FuturesExecutorMixin
+from griptape.mixins.futures_executor_mixin import FuturesExecutorMixin
 
 if TYPE_CHECKING:
     from griptape.artifacts import BaseArtifact

griptape/tasks/prompt_task.py

@@ -8,7 +8,7 @@
 from griptape.artifacts import BaseArtifact, ListArtifact, TextArtifact
 from griptape.common import PromptStack
 from griptape.configs import Defaults
-from griptape.mixins import RuleMixin
+from griptape.mixins.rule_mixin import RuleMixin
 from griptape.tasks import BaseTask
 from griptape.utils import J2
 

griptape/tasks/tool_task.py

@@ -8,7 +8,7 @@
 
 from griptape import utils
 from griptape.artifacts import BaseArtifact, ErrorArtifact, InfoArtifact, ListArtifact
-from griptape.mixins import ActionsSubtaskOriginMixin
+from griptape.mixins.actions_subtask_origin_mixin import ActionsSubtaskOriginMixin
 from griptape.tasks import ActionsSubtask, PromptTask
 from griptape.utils import J2
 

griptape/tasks/toolkit_task.py

@@ -8,7 +8,7 @@
 from griptape import utils
 from griptape.artifacts import ActionArtifact, BaseArtifact, ErrorArtifact, ListArtifact, TextArtifact
 from griptape.common import PromptStack, ToolAction
-from griptape.mixins import ActionsSubtaskOriginMixin
+from griptape.mixins.actions_subtask_origin_mixin import ActionsSubtaskOriginMixin
 from griptape.tasks import ActionsSubtask, PromptTask
 from griptape.utils import J2
 

griptape/tools/base_image_generation_tool.py

@@ -1,6 +1,6 @@
 from attrs import define
 
-from griptape.mixins import BlobArtifactFileOutputMixin
+from griptape.mixins.media_artifact_file_output_mixin import BlobArtifactFileOutputMixin
 from griptape.tools import BaseTool