Backmerge main to dev for v0.24.2
#733
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: Collin Dutter <collin@griptape.ai> Co-authored-by: Vasily Vasinov <vasily@griptape.ai>
collindutter
reviewed
Apr 4, 2024
griptape/tasks/toolkit_task.py
Outdated
| @@ -93,7 +93,7 @@ def default_system_template_generator(self, _: PromptTask) -> str: | |||
| return J2("tasks/toolkit_task/system.j2").render( | |||
| rulesets=J2("rulesets/rulesets.j2").render(rulesets=self.all_rulesets), | |||
| action_names=str.join(", ", [tool.name for tool in self.tools]), | |||
| actions_schema=utils.minify_json(json.dumps(schema)), | |||
| actions_schema=utils.minify_json(json.dumps(self.actions_schema().json_schema("Actions Schema"))), | |||
There was a problem hiding this comment.
I think this is incorrect, should be schema
There was a problem hiding this comment.
Thanks, looks like I way overcomplicated that merge conflict. It's one commit on main!
collindutter
approved these changes
Apr 8, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge hotfix changes since v0.24.0 into
dev. This merge is coming fromtmp/240404_backmerge-main-to-devto handle conflicts without creating extra commits tomain.