Post merge fixes

griptape-ai · May 17, 2024 · e0e0adb · e0e0adb
1 parent 11a5f8b
commit e0e0adb
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 51 deletions.
diff --git a/docs/griptape-framework/drivers/event-listener-drivers.md b/docs/griptape-framework/drivers/event-listener-drivers.md
@@ -134,10 +134,8 @@ agent = Agent(
         )
     ],
     config=StructureConfig(
-        global_drivers=StructureGlobalDriversConfig(
-            prompt_driver=OpenAiChatPromptDriver(
-                model="gpt-3.5-turbo", temperature=0.7
-            ),
+        prompt_driver=OpenAiChatPromptDriver(
+            model="gpt-3.5-turbo", temperature=0.7
         )
     ),
     event_listeners=[

diff --git a/griptape/config/base_structure_config.py b/griptape/config/base_structure_config.py
@@ -13,6 +13,7 @@
     BaseImageQueryDriver,
     BasePromptDriver,
     BaseVectorStoreDriver,
+    BaseTextToSpeechDriver,
 )
 from griptape.utils import dict_merge
 
@@ -27,6 +28,7 @@ class BaseStructureConfig(BaseConfig, ABC):
     conversation_memory_driver: Optional[BaseConversationMemoryDriver] = field(
         default=None, kw_only=True, metadata={"serializable": True}
     )
+    text_to_speech_driver: BaseTextToSpeechDriver = field(kw_only=True, metadata={"serializable": True})
 
     def merge_config(self, config: dict) -> BaseStructureConfig:
         base_config = self.to_dict()

diff --git a/griptape/config/structure_config.py b/griptape/config/structure_config.py
@@ -15,6 +15,8 @@
     DummyPromptDriver,
     DummyImageQueryDriver,
     BaseImageQueryDriver,
+    BaseTextToSpeechDriver,
+    DummyTextToSpeechDriver,
 )
 
 
@@ -38,3 +40,6 @@ class StructureConfig(BaseStructureConfig):
     conversation_memory_driver: Optional[BaseConversationMemoryDriver] = field(
         default=None, kw_only=True, metadata={"serializable": True}
     )
+    text_to_speech_driver: BaseTextToSpeechDriver = field(
+        default=Factory(lambda: DummyTextToSpeechDriver()), kw_only=True, metadata={"serializable": True}
+    )
diff --git a/griptape/config/structure_global_drivers_config.py b/griptape/config/structure_global_drivers_config.py
diff --git a/griptape/tasks/text_to_speech_task.py b/griptape/tasks/text_to_speech_task.py
@@ -37,7 +37,7 @@ def text_to_speech_engine(self) -> TextToSpeechEngine:
         if self._text_to_speech_engine is None:
             if self.structure is not None:
                 self._text_to_speech_engine = TextToSpeechEngine(
-                    text_to_speech_driver=self.structure.config.global_drivers.text_to_speech_driver
+                    text_to_speech_driver=self.structure.config.text_to_speech_driver
                 )
             else:
                 raise ValueError("Audio Generation Engine is not set.")

diff --git a/tests/unit/config/test_amazon_bedrock_structure_config.py b/tests/unit/config/test_amazon_bedrock_structure_config.py
@@ -51,6 +51,7 @@ def test_to_dict(self, config):
                 "type": "LocalVectorStoreDriver",
             },
             "type": "AmazonBedrockStructureConfig",
+            "text_to_speech_driver": {"type": "DummyTextToSpeechDriver"},
         }
 
     def test_from_dict(self, config):

diff --git a/tests/unit/config/test_anthropic_structure_config.py b/tests/unit/config/test_anthropic_structure_config.py
@@ -44,6 +44,7 @@ def test_to_dict(self, config):
                 },
             },
             "conversation_memory_driver": None,
+            "text_to_speech_driver": {"type": "DummyTextToSpeechDriver"},
         }
 
     def test_from_dict(self, config):

diff --git a/tests/unit/config/test_google_structure_config.py b/tests/unit/config/test_google_structure_config.py
@@ -41,6 +41,7 @@ def test_to_dict(self, config):
                 },
             },
             "conversation_memory_driver": None,
+            "text_to_speech_driver": {"type": "DummyTextToSpeechDriver"},
         }
 
     def test_from_dict(self, config):

diff --git a/tests/unit/config/test_openai_structure_config.py b/tests/unit/config/test_openai_structure_config.py
@@ -17,7 +17,7 @@ def test_to_dict(self, config):
             "prompt_driver": {
                 "type": "OpenAiChatPromptDriver",
                 "base_url": None,
-                "model": "gpt-4",
+                "model": "gpt-4o",
                 "organization": None,
                 "response_format": None,
                 "seed": None,
@@ -27,6 +27,7 @@ def test_to_dict(self, config):
                 "user": "",
             },
             "conversation_memory_driver": None,
+            "text_to_speech_driver": {"type": "DummyTextToSpeechDriver"},
             "embedding_driver": {
                 "base_url": None,
                 "model": "text-embedding-3-small",

diff --git a/tests/unit/config/test_structure_config.py b/tests/unit/config/test_structure_config.py
@@ -19,6 +19,7 @@ def test_to_dict(self, config):
                 "embedding_driver": {"type": "DummyEmbeddingDriver"},
                 "type": "DummyVectorStoreDriver",
             },
+            "text_to_speech_driver": {"type": "DummyTextToSpeechDriver"},
         }
 
     def test_from_dict(self, config):
-Original file line number
+Diff line change
@@ Expand Up / @@ -44,6 +44,7 @@ def test_to_dict(self, config): @@
                     },
                 },
                 "conversation_memory_driver": None,
+                "text_to_speech_driver": {"type": "DummyTextToSpeechDriver"},
             }
         def test_from_dict(self, config):
@@ Expand Down @@