From c9d8b3a8cf1984778f0a593af31c7329c69c322d Mon Sep 17 00:00:00 2001 From: matt Date: Thu, 17 Oct 2024 19:06:21 -0500 Subject: [PATCH] remove str --- griptape/events/action_chunk_event.py | 18 ------------------ griptape/events/base_chunk_event.py | 2 -- griptape/events/text_chunk_event.py | 3 --- griptape/utils/stream.py | 4 ++-- tests/unit/events/test_action_chunk_event.py | 1 - tests/unit/events/test_text_chunk_event.py | 1 - 6 files changed, 2 insertions(+), 27 deletions(-) diff --git a/griptape/events/action_chunk_event.py b/griptape/events/action_chunk_event.py index d22605e26..baa52252c 100644 --- a/griptape/events/action_chunk_event.py +++ b/griptape/events/action_chunk_event.py @@ -13,21 +13,3 @@ class ActionChunkEvent(BaseChunkEvent): tag: Optional[str] = field(default=None, kw_only=True, metadata={"serializable": True}) name: Optional[str] = field(default=None, kw_only=True, metadata={"serializable": True}) path: Optional[str] = field(default=None, kw_only=True, metadata={"serializable": True}) - - def __str__(self) -> str: - parts = [] - - if self.name: - parts.append(self.name) - if self.path: - parts.append(f".{self.path}") - if self.tag: - parts.append(f" ({self.tag})") - - if self.partial_input: - if parts: - parts.append(f" {self.partial_input}") - else: - parts.append(self.partial_input) - - return "".join(parts) diff --git a/griptape/events/base_chunk_event.py b/griptape/events/base_chunk_event.py index d457a244b..f464709f6 100644 --- a/griptape/events/base_chunk_event.py +++ b/griptape/events/base_chunk_event.py @@ -6,5 +6,3 @@ @define class BaseChunkEvent(BaseEvent): index: int = field(default=0, metadata={"serializable": True}) - - def __str__(self) -> str: ... diff --git a/griptape/events/text_chunk_event.py b/griptape/events/text_chunk_event.py index 7d3880bf2..0f71cd048 100644 --- a/griptape/events/text_chunk_event.py +++ b/griptape/events/text_chunk_event.py @@ -6,6 +6,3 @@ @define class TextChunkEvent(BaseChunkEvent): token: str = field(kw_only=True, metadata={"serializable": True}) - - def __str__(self) -> str: - return self.token diff --git a/griptape/utils/stream.py b/griptape/utils/stream.py index a6e174b43..9142733ef 100644 --- a/griptape/utils/stream.py +++ b/griptape/utils/stream.py @@ -27,7 +27,7 @@ @define class Stream: - """A wrapper for Structures that converts `CompletionChunkEvent`s into an iterator of TextArtifacts. + """A wrapper for Structures that converts `BaseChunkEvent`s into an iterator of TextArtifacts. It achieves this by running the Structure in a separate thread, listening for events from the Structure, and yielding those events. @@ -68,7 +68,7 @@ def run(self, *args) -> Iterator[TextArtifact]: elif isinstance(event, FinishPromptEvent): yield TextArtifact(value="\n") elif isinstance(event, TextChunkEvent): - yield TextArtifact(value=str(event)) + yield TextArtifact(value=event.token) elif isinstance(event, ActionChunkEvent): action_str = action_gen.send(event) if action_str is not None: diff --git a/tests/unit/events/test_action_chunk_event.py b/tests/unit/events/test_action_chunk_event.py index bd7e94737..98230aa48 100644 --- a/tests/unit/events/test_action_chunk_event.py +++ b/tests/unit/events/test_action_chunk_event.py @@ -19,7 +19,6 @@ def test_token(self, action_chunk_event): assert action_chunk_event.tag == "foo" assert action_chunk_event.name == "bar" assert action_chunk_event.path == "baz" - assert str(action_chunk_event) == "bar.baz (foo) foo bar" def test_to_dict(self, action_chunk_event): assert action_chunk_event.to_dict()["partial_input"] == "foo bar" diff --git a/tests/unit/events/test_text_chunk_event.py b/tests/unit/events/test_text_chunk_event.py index 582de3ca1..ab5dce398 100644 --- a/tests/unit/events/test_text_chunk_event.py +++ b/tests/unit/events/test_text_chunk_event.py @@ -10,7 +10,6 @@ def text_chunk_event(self): def test_token(self, text_chunk_event): assert text_chunk_event.token == "foo bar" - assert str(text_chunk_event) == "foo bar" def test_to_dict(self, text_chunk_event): assert text_chunk_event.to_dict()["token"] == "foo bar"