Skip to content

Commit

Permalink
Merge branch 'dev' into feature/futures-executor-mixin
Browse files Browse the repository at this point in the history
# Conflicts:
#	griptape/structures/workflow.py
  • Loading branch information
vasinov committed Aug 16, 2024
2 parents 7741938 + 24a6824 commit 6e5bf91
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 2 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Fixed
- `JsonExtractionEngine` failing to parse json when the LLM outputs more than just the json.
## [0.29.2] - 2024-08-16

### Fixed
- `Workflow` threads not being properly cleaned up after completion.
- Crash when `ToolAction`s were missing output due to an `ActionsSubtask` exception.

## [0.29.1] - 2024-08-02

Expand Down
7 changes: 6 additions & 1 deletion griptape/tasks/toolkit_task.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,12 @@ def prompt_stack(self) -> PromptStack:
for action in s.actions
]
action_results = [
ToolAction(name=action.name, path=action.path, tag=action.tag, output=action.output)
ToolAction(
name=action.name,
path=action.path,
tag=action.tag,
output=action.output if action.output is not None else s.output,
)
for action in s.actions
]

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "griptape"
version = "0.29.1"
version = "0.29.2"
description = "Modular Python framework for LLM workflows, tools, memory, and data."
authors = ["Griptape <[email protected]>"]
license = "Apache 2.0"
Expand Down

0 comments on commit 6e5bf91

Please sign in to comment.