Skip to content

Update jules_wip branch with latest main and fix Executive Assistant implementation #16

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

Open
wants to merge 11 commits into
base: jules_wip_10459775938551966727
Choose a base branch
from

Conversation

Copilot
Copy link

@Copilot Copilot AI commented May 24, 2025

Branch Update Summary

This PR updates the jules_wip_10459775938551966727 branch 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:

  1. Executive Assistant Implementation

    • Moved from top-level agents/ directory to src/agents/executive_assistant/ to match current project structure
    • Preserved memory management functionality including short-term and long-term memory stores
    • Maintained RAG retrieval functionality for information storage and retrieval
    • Kept calendar/email tools implementation
  2. Deepgram Voice Support

    • Added Deepgram voice model provider in src/agents/voice/models/
    • Implemented speech-to-text (STT) and text-to-speech (TTS) models
    • Integrated with existing voice pipeline infrastructure
    • Updated voice module exports to include new Deepgram components
  3. Tests

    • Added tests for Executive Assistant agent functionality
    • Added tests for Deepgram voice models
    • Fixed potential circular import issues

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:

  • Verified that imports work correctly
  • Tested Executive Assistant component functionality
  • Tested Deepgram voice model initialization

💡 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.

franz101 and others added 10 commits May 19, 2025 15:41
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>
@TGreen87 TGreen87 marked this pull request as ready for review May 24, 2025 03:28
Co-authored-by: TGreen87 <170493160+TGreen87@users.noreply.github.com>
@Copilot Copilot AI changed the title [WIP] Update jules_wip_10459775938551966727 to merge cleanly with main Update jules_wip branch with latest main and fix Executive Assistant implementation May 24, 2025
@Copilot Copilot AI requested a review from TGreen87 May 24, 2025 03:43
Copilot finished work on behalf of TGreen87 May 24, 2025 03:43
Copy link
Owner

@TGreen87 TGreen87 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/approve

@TGreen87 TGreen87 changed the base branch from main to jules_wip_10459775938551966727 May 24, 2025 15:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants