-
Notifications
You must be signed in to change notification settings - Fork 16
Update conversation history handling #24
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
+946
−384
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -147,3 +147,6 @@ env/ | |
|
|
||
| # Python package management | ||
| uv.lock | ||
|
|
||
| # Internal files | ||
| internal_examples/ | ||
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,6 +13,7 @@ | |
| from ._base_client import GuardrailsResponse | ||
| from .exceptions import GuardrailTripwireTriggered | ||
| from .types import GuardrailResult | ||
| from .utils.conversation import merge_conversation_with_items | ||
|
|
||
| logger = logging.getLogger(__name__) | ||
|
|
||
|
|
@@ -25,6 +26,7 @@ async def _stream_with_guardrails( | |
| llm_stream: Any, # coroutine or async iterator of OpenAI chunks | ||
| preflight_results: list[GuardrailResult], | ||
| input_results: list[GuardrailResult], | ||
| conversation_history: list[dict[str, Any]] | None = None, | ||
| check_interval: int = 100, | ||
| suppress_tripwire: bool = False, | ||
| ) -> AsyncIterator[GuardrailsResponse]: | ||
|
|
@@ -46,7 +48,16 @@ async def _stream_with_guardrails( | |
| # Run output guardrails periodically | ||
| if chunk_count % check_interval == 0: | ||
| try: | ||
| await self._run_stage_guardrails("output", accumulated_text, suppress_tripwire=suppress_tripwire) | ||
| history = merge_conversation_with_items( | ||
| conversation_history or [], | ||
| [{"role": "assistant", "content": accumulated_text}], | ||
| ) | ||
| await self._run_stage_guardrails( | ||
| "output", | ||
| accumulated_text, | ||
| conversation_history=history, | ||
| suppress_tripwire=suppress_tripwire, | ||
| ) | ||
| except GuardrailTripwireTriggered: | ||
| # Clear accumulated output and re-raise | ||
| accumulated_text = "" | ||
|
|
@@ -57,7 +68,16 @@ async def _stream_with_guardrails( | |
|
|
||
| # Final output check | ||
| if accumulated_text: | ||
| await self._run_stage_guardrails("output", accumulated_text, suppress_tripwire=suppress_tripwire) | ||
| history = merge_conversation_with_items( | ||
| conversation_history or [], | ||
| [{"role": "assistant", "content": accumulated_text}], | ||
| ) | ||
| await self._run_stage_guardrails( | ||
| "output", | ||
| accumulated_text, | ||
| conversation_history=history, | ||
| suppress_tripwire=suppress_tripwire, | ||
| ) | ||
| # Note: This final result won't be yielded since stream is complete | ||
| # but the results are available in the last chunk | ||
|
|
||
|
|
@@ -66,6 +86,7 @@ def _stream_with_guardrails_sync( | |
| llm_stream: Any, # iterator of OpenAI chunks | ||
| preflight_results: list[GuardrailResult], | ||
| input_results: list[GuardrailResult], | ||
| conversation_history: list[dict[str, Any]] | None = None, | ||
|
||
| check_interval: int = 100, | ||
| suppress_tripwire: bool = False, | ||
| ): | ||
|
|
@@ -83,7 +104,16 @@ def _stream_with_guardrails_sync( | |
| # Run output guardrails periodically | ||
| if chunk_count % check_interval == 0: | ||
| try: | ||
| self._run_stage_guardrails("output", accumulated_text, suppress_tripwire=suppress_tripwire) | ||
| history = merge_conversation_with_items( | ||
| conversation_history or [], | ||
| [{"role": "assistant", "content": accumulated_text}], | ||
| ) | ||
| self._run_stage_guardrails( | ||
| "output", | ||
| accumulated_text, | ||
| conversation_history=history, | ||
| suppress_tripwire=suppress_tripwire, | ||
| ) | ||
| except GuardrailTripwireTriggered: | ||
| # Clear accumulated output and re-raise | ||
| accumulated_text = "" | ||
|
|
@@ -94,6 +124,15 @@ def _stream_with_guardrails_sync( | |
|
|
||
| # Final output check | ||
| if accumulated_text: | ||
| self._run_stage_guardrails("output", accumulated_text, suppress_tripwire=suppress_tripwire) | ||
| history = merge_conversation_with_items( | ||
| conversation_history or [], | ||
| [{"role": "assistant", "content": accumulated_text}], | ||
| ) | ||
| self._run_stage_guardrails( | ||
| "output", | ||
| accumulated_text, | ||
| conversation_history=history, | ||
| suppress_tripwire=suppress_tripwire, | ||
| ) | ||
| # Note: This final result won't be yielded since stream is complete | ||
| # but the results are available in the last chunk | ||
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The union syntax
list[dict[str, Any]] | Nonerequires Python 3.10+. Consider usingOptional[list[dict[str, Any]]]for broader compatibility.