Remove uses of deprecated fields (griptape-ai#645)

igor-2lemetry · Feb 13, 2024 · a28eb73 · a28eb73
1 parent a5bd70e
commit a28eb73
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 15 deletions.
diff --git a/griptape/structures/structure.py b/griptape/structures/structure.py
@@ -157,16 +157,16 @@ def finished_tasks(self) -> list[BaseTask]:
     def default_config(self) -> BaseStructureConfig:
         config = OpenAiStructureConfig()
 
-        if self.prompt_driver is not None:
-            config.global_drivers.prompt_driver = self.prompt_driver
-            config.task_memory.query_engine.prompt_driver = self.prompt_driver
-            config.task_memory.summary_engine.prompt_driver = self.prompt_driver
-            config.task_memory.extraction_engine.csv.prompt_driver = self.prompt_driver
-            config.task_memory.extraction_engine.json.prompt_driver = self.prompt_driver
-        if self.embedding_driver is not None:
-            config.task_memory.query_engine.vector_store_driver.embedding_driver = self.embedding_driver
-        if self.stream is not None:
-            config.global_drivers.prompt_driver.stream = self.stream
+        if self._prompt_driver is not None:
+            config.global_drivers.prompt_driver = self._prompt_driver
+            config.task_memory.query_engine.prompt_driver = self._prompt_driver
+            config.task_memory.summary_engine.prompt_driver = self._prompt_driver
+            config.task_memory.extraction_engine.csv.prompt_driver = self._prompt_driver
+            config.task_memory.extraction_engine.json.prompt_driver = self._prompt_driver
+        if self._embedding_driver is not None:
+            config.task_memory.query_engine.vector_store_driver.embedding_driver = self._embedding_driver
+        if self._stream is not None:
+            config.global_drivers.prompt_driver.stream = self._stream
 
         return config
 

diff --git a/griptape/utils/chat.py b/griptape/utils/chat.py
@@ -21,7 +21,7 @@ class Chat:
     )
 
     def default_output_fn(self, text: str) -> None:
-        if self.structure.prompt_driver.stream:
+        if self.structure.config.global_drivers.prompt_driver.stream:
             print(text, end="", flush=True)
         else:
             print(text)
@@ -36,7 +36,7 @@ def start(self) -> None:
                 self.output_fn(self.exiting_text)
                 break
 
-            if self.structure.prompt_driver.stream:
+            if self.structure.config.global_drivers.prompt_driver.stream:
                 self.output_fn(self.processing_text + "\n")
                 stream = Stream(self.structure).run(question)
                 first_chunk = next(stream)

diff --git a/griptape/utils/prompt_stack.py b/griptape/utils/prompt_stack.py
@@ -66,7 +66,7 @@ def add_conversation_memory(self, memory: BaseConversationMemory, index: Optiona
 
         if memory.autoprune and hasattr(memory, "structure"):
             should_prune = True
-            prompt_driver = memory.structure.prompt_driver
+            prompt_driver = memory.structure.config.global_drivers.prompt_driver
             temp_stack = PromptStack()
 
             # Try to determine how many Conversation Memory runs we can

diff --git a/griptape/utils/stream.py b/griptape/utils/stream.py
@@ -1,5 +1,6 @@
 from __future__ import annotations
-from typing import TYPE_CHECKING, Iterator
+from typing import TYPE_CHECKING
+from collections.abc import Iterator
 from threading import Thread
 from queue import Queue
 from griptape.artifacts.text_artifact import TextArtifact
@@ -32,7 +33,7 @@ class Stream:
 
     @structure.validator  # pyright: ignore
     def validate_structure(self, _, structure: Structure):
-        if structure and not structure.prompt_driver.stream:
+        if structure and not structure.config.global_drivers.prompt_driver.stream:
             raise ValueError("prompt driver does not have streaming enabled, enable with stream=True")
 
     _event_queue: Queue[BaseEvent] = field(default=Factory(lambda: Queue()))