Update jules_wip branch with latest main and fix Executive Assistant implementation #16
Conversation
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
PR to enhance the `Usage` object and related logic, to support more granular token accounting, matching the details available in the [OpenAI Responses API](https://platform.openai.com/docs/api-reference/responses) . Specifically, it: - Adds `input_tokens_details` and `output_tokens_details` fields to the `Usage` dataclass, storing detailed token breakdowns (e.g., `cached_tokens`, `reasoning_tokens`). - Flows this change through - Updates and extends tests to match - Adds a test for the Usage.add method ### Motivation - Aligns the SDK’s usage with the latest OpenAI responses API Usage object - Supports downstream use cases that require fine-grained token usage data (e.g., billing, analytics, optimization) requested by startups --------- Co-authored-by: Wulfie Bain <wulfie@openai.com>
--- [//]: # (BEGIN SAPLING FOOTER) * openai#732 * openai#731 * __->__ openai#730
--- [//]: # (BEGIN SAPLING FOOTER) * openai#732 * __->__ openai#731
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: TGreen87 <170493160+TGreen87@users.noreply.github.com>
Copilot finished work on behalf of
TGreen87
May 24, 2025 03:43
|
@copilot fix the conflicts that must be resolved before merging please |
Co-authored-by: TGreen87 <170493160+TGreen87@users.noreply.github.com>
Fixed the circular import conflict in the executive assistant module. The issue was in |
Co-authored-by: TGreen87 <170493160+TGreen87@users.noreply.github.com>
Co-authored-by: TGreen87 <170493160+TGreen87@users.noreply.github.com>
Copilot finished work on behalf of
TGreen87
June 1, 2025 11:48
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.
Branch Update Summary
This PR updates the
jules_wip_10459775938551966727branch to be fully compatible with the latest main branch. The original feature branch had diverged significantly, so changes were reimplemented on top of the current main codebase.Key Components Preserved & Updated:
Executive Assistant Implementation
agents/directory tosrc/agents/executive_assistant/to match current project structureDeepgram Voice Support
src/agents/voice/models/Tests
Merge Strategy:
The branches had diverged to the point where there was no direct common ancestor, so a clean implementation based on the latest main was created rather than attempting to resolve complex merge conflicts. All functional code from the feature branch was preserved and integrated into the proper locations.
Breaking Changes:
None. This update maintains backward compatibility while adding the new Executive Assistant and Deepgram voice functionality.
Testing:
💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.