Skip to content

Tiny refactor router RAII guards#16560

Merged
slin1237 merged 21 commits intosgl-project:mainfrom
fzyzcjy:feat/unify_guarded_body
Jan 9, 2026
Merged

Tiny refactor router RAII guards#16560
slin1237 merged 21 commits intosgl-project:mainfrom
fzyzcjy:feat/unify_guarded_body

Conversation

@fzyzcjy
Copy link
Copy Markdown
Collaborator

@fzyzcjy fzyzcjy commented Jan 6, 2026

Motivation

prereq of enhancing ManualPolicy

Modifications

Accuracy Tests

Benchmarking and Profiling

Checklist

Review Process

  1. Ping Merge Oncalls to start the PR flow. See the PR Merge Process.
  2. Get approvals from CODEOWNERS and other reviewers.
  3. Trigger CI tests with comments (/tag-run-ci-label, /rerun-failed-ci, /tag-and-rerun-ci) or contact authorized users to do so.
  4. After green CI and required approvals, ask Merge Oncalls to merge.

@fzyzcjy
Copy link
Copy Markdown
Collaborator Author

fzyzcjy commented Jan 6, 2026

/tag-and-rerun-ci

@gemini-code-assist
Copy link
Copy Markdown
Contributor

Summary of Changes

Hello @fzyzcjy, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request performs a targeted refactoring to improve the handling of RAII guards associated with HTTP response bodies. It introduces a new generic utility, AttachedBody, which centralizes the logic for attaching a lifetime-managed object to an axum::response::Response. This change streamlines the implementation of resource management patterns, such as decrementing worker load or returning tokens, by abstracting the body-wrapping mechanism. This refactoring is a prerequisite for future enhancements to the ManualPolicy by providing a cleaner and more consistent way to manage resources tied to response lifetimes.

Highlights

  • New Generic AttachedBody Utility: Introduced a new generic AttachedBody<T> struct in sgl-model-gateway/src/utils/http_utils.rs that wraps an axum::body::Body and holds an attached type T. This utility centralizes the logic for associating a resource (like a RAII guard) with the lifetime of an HTTP response body, ensuring the resource is dropped when the body is fully consumed or the connection closes.
  • Refactored Worker Load Guards: The WorkerLoadGuard in sgl-model-gateway/src/core/worker.rs has been refactored to utilize the new AttachedBody utility. This change removes the custom GuardedBody and MultiGuardedBody implementations, simplifying the code for decrementing worker load when a response stream completes.
  • Refactored Token Guards in Middleware: The TokenGuard in sgl-model-gateway/src/middleware.rs has been updated to leverage the AttachedBody utility. The previous TokenGuardBody struct was removed, and TokenGuardBody is now a type alias for AttachedBody<TokenGuard>, streamlining the mechanism for returning tokens to a bucket upon stream completion.
  • Code Simplification and Modularity: This refactoring effort reduces code duplication by consolidating generic body-wrapping logic into a single utility, improving modularity and maintainability across the codebase. It also removes several http_body::Body implementations that are now handled by the new AttachedBody.

🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console.

Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

@github-actions github-actions Bot added the run-ci label Jan 6, 2026
Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request introduces a great refactoring by creating a generic AttachedBody<T> utility to handle RAII guards for Axum response bodies. This effectively removes duplicated code from core/worker.rs and middleware.rs, where similar body-wrapping logic existed for WorkerLoadGuard and TokenGuardBody. The new implementation is cleaner and more maintainable.

I have one suggestion in utils/http_utils.rs to make the new AttachedBody utility even more generic by removing the Unpin trait bound, which would improve its reusability for future use cases.

Overall, this is a solid improvement to the codebase.

Comment thread sgl-model-gateway/src/utils/http_utils.rs Outdated
@fzyzcjy fzyzcjy requested a review from key4ng as a code owner January 6, 2026 09:09
Copy link
Copy Markdown
Collaborator

@slin1237 slin1237 left a comment

Choose a reason for hiding this comment

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

please don't create an util just to merge those two
people will put a lot of random code until util class and this will become a mess

@fzyzcjy
Copy link
Copy Markdown
Collaborator Author

fzyzcjy commented Jan 6, 2026

done

@slin1237 slin1237 merged commit 9e3a032 into sgl-project:main Jan 9, 2026
64 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants