refactor(api): centralize service-tier primitives - #1040
Open
WebMad wants to merge 10 commits into
Open
Conversation
This was referenced Jul 28, 2026
Contributor
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: defaults Review profile: CHILL Plan: Pro Plus Run ID: 📒 Files selected for processing (4)
🚧 Files skipped from review as they are similar to previous changes (2)
📝 WalkthroughWalkthroughOpenAI service tiers are centralized in a shared enum and payload-key constant, then applied to provider request/response handling, pricing calculations, and settings UI components. Tests cover request payloads, resolved-tier pricing, streaming behavior, tier selection, and pricing-table rendering. ChangesService tier integration
Estimated code review effort: 3 (Moderate) | ~25 minutes Suggested labels: Suggested reviewers: Sequence Diagram(s)sequenceDiagram
participant OpenAiNativeHandler
participant OpenAIResponsesAPI
participant SSEEventProcessor
participant CostCalculator
OpenAiNativeHandler->>OpenAIResponsesAPI: Send request with service tier
OpenAIResponsesAPI-->>SSEEventProcessor: Stream events with resolved tier
SSEEventProcessor->>CostCalculator: Calculate cost from resolved tier
🚥 Pre-merge checks | ✅ 3 | ❌ 2❌ Failed checks (2 warnings)
✅ Passed checks (3 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
Codecov Report✅ All modified and coverable lines are covered by tests. 📢 Thoughts on this report? Let us know! |
WebMad
marked this pull request as ready for review
July 29, 2026 00:51
WebMad
requested review from
JamesRobert20,
edelauna,
hannesrudolph,
navedmerchant and
taltas
as code owners
July 29, 2026 00:51
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
🧹 Nitpick comments (2)
src/api/providers/openai-native.ts (1)
373-376: 📐 Maintainability & Code Quality | 🔵 Trivial | ⚡ Quick winDuplicate tier-gating logic between
buildRequestBodyandcompletePrompt.Both methods independently rebuild
allowedTierNamesand re-implement the identical "is tier allowed" condition (requestedTier === OpenAiServiceTier.Default || allowedTierNames.has(requestedTier)). Extracting a shared private helper avoids future divergence if the gating rule changes.♻️ Proposed helper extraction
+ private resolveEffectiveServiceTier(model: OpenAiNativeModel): ServiceTier | undefined { + const requestedTier = (this.options.openAiNativeServiceTier as ServiceTier | undefined) || undefined + if (!requestedTier) return undefined + const allowedTierNames = new Set(model.info.tiers?.map((t) => t.name).filter(Boolean) || []) + return requestedTier === OpenAiServiceTier.Default || allowedTierNames.has(requestedTier) + ? requestedTier + : undefined + } + private buildRequestBody(...): any { ... - const requestedTier = (this.options.openAiNativeServiceTier as ServiceTier | undefined) || undefined - const allowedTierNames = new Set(model.info.tiers?.map((t) => t.name).filter(Boolean) || []) + const effectiveRequestedTier = this.resolveEffectiveServiceTier(model) ... - ...(requestedTier && - (requestedTier === OpenAiServiceTier.Default || allowedTierNames.has(requestedTier)) && { - [SERVICE_TIER_KEY]: requestedTier, - }), + ...(effectiveRequestedTier && { [SERVICE_TIER_KEY]: effectiveRequestedTier }),async completePrompt(prompt: string, options?: CompletePromptOptions): Promise<string> { ... - const requestedTier = (this.options.openAiNativeServiceTier as ServiceTier | undefined) || undefined - const allowedTierNames = new Set(model.info.tiers?.map((t) => t.name).filter(Boolean) || []) - if (requestedTier && (requestedTier === OpenAiServiceTier.Default || allowedTierNames.has(requestedTier))) { - requestBody[SERVICE_TIER_KEY] = requestedTier + const effectiveRequestedTier = this.resolveEffectiveServiceTier(model) + if (effectiveRequestedTier) { + requestBody[SERVICE_TIER_KEY] = effectiveRequestedTier }Also applies to: 1513-1515
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@src/api/providers/openai-native.ts` around lines 373 - 376, Extract the shared tier-approval logic from buildRequestBody and completePrompt into a private helper that accepts requestedTier and the allowed tier names, then reuse it in both SERVICE_TIER_KEY construction paths. Remove the duplicated allowedTierNames setup and condition while preserving acceptance of OpenAiServiceTier.Default and configured allowed tiers.webview-ui/src/components/settings/ModelInfoView.tsx (1)
149-194: 📐 Maintainability & Code Quality | 🔵 Trivial | ⚡ Quick winFlex and Priority pricing rows are near-identical; extract a shared row renderer.
Each block repeats the same
td/fmt/tiers.find(...)pattern, differing only by tier enum and label. A small helper removes the duplication and keeps the two rows from drifting.♻️ Proposed row-renderer helper
+ {([ + [OpenAiServiceTier.Flex, t("settings:serviceTier.flex")], + [OpenAiServiceTier.Priority, t("settings:serviceTier.priority")], + ] as const) + .filter(([tierName]) => allowedTierNames.includes(tierName)) + .map(([tierName, label]) => { + const tierInfo = modelInfo?.tiers?.find((t) => t.name === tierName) + return ( + <tr key={tierName} className="border-t border-vscode-dropdown-border/60"> + <td className="px-3 py-1.5">{label}</td> + <td className="px-3 py-1.5 text-right"> + {fmt(tierInfo?.inputPrice ?? modelInfo?.inputPrice)} + </td> + <td className="px-3 py-1.5 text-right"> + {fmt(tierInfo?.outputPrice ?? modelInfo?.outputPrice)} + </td> + <td className="px-3 py-1.5 text-right"> + {fmt(tierInfo?.cacheReadsPrice ?? modelInfo?.cacheReadsPrice)} + </td> + </tr> + ) + })} - {allowedTierNames.includes(OpenAiServiceTier.Flex) && ( ... )} - {allowedTierNames.includes(OpenAiServiceTier.Priority) && ( ... )}🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@webview-ui/src/components/settings/ModelInfoView.tsx` around lines 149 - 194, In ModelInfoView, extract the duplicated Flex and Priority pricing-row markup into a shared row renderer or component that accepts the tier enum and translated label, while preserving the existing allowedTierNames checks and fallback pricing behavior. Replace both inline blocks with calls to this helper so the tier-specific lookup and labels remain configurable without repeating the td/fmt structure.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Nitpick comments:
In `@src/api/providers/openai-native.ts`:
- Around line 373-376: Extract the shared tier-approval logic from
buildRequestBody and completePrompt into a private helper that accepts
requestedTier and the allowed tier names, then reuse it in both SERVICE_TIER_KEY
construction paths. Remove the duplicated allowedTierNames setup and condition
while preserving acceptance of OpenAiServiceTier.Default and configured allowed
tiers.
In `@webview-ui/src/components/settings/ModelInfoView.tsx`:
- Around line 149-194: In ModelInfoView, extract the duplicated Flex and
Priority pricing-row markup into a shared row renderer or component that accepts
the tier enum and translated label, while preserving the existing
allowedTierNames checks and fallback pricing behavior. Replace both inline
blocks with calls to this helper so the tier-specific lookup and labels remain
configurable without repeating the td/fmt structure.
ℹ️ Review info
⚙️ Run configuration
Configuration used: defaults
Review profile: CHILL
Plan: Pro Plus
Run ID: 56e7c7fe-047d-4f43-8288-851cb3b38ebe
📒 Files selected for processing (12)
packages/types/src/model.tssrc/api/providers/__tests__/bedrock.spec.tssrc/api/providers/__tests__/openai-native-usage.spec.tssrc/api/providers/__tests__/openai-native.spec.tssrc/api/providers/bedrock.tssrc/api/providers/openai-native.tssrc/shared/cost.tssrc/utils/__tests__/cost.spec.tswebview-ui/src/components/settings/ModelInfoView.tsxwebview-ui/src/components/settings/__tests__/ModelInfoView.spec.tsxwebview-ui/src/components/settings/providers/OpenAI.tsxwebview-ui/src/components/settings/providers/__tests__/OpenAI.spec.tsx
github-actions
Bot
added
the
awaiting-review
edelauna
requested changes
Jul 29, 2026
edelauna
left a comment
edelauna
left a comment
Contributor
There was a problem hiding this comment.
Nice! Thanks for this PR - had 2 comments related to the implementation.
github-actions
Bot
added
awaiting-author
Contributor
Author
|
Addressed both review comments in 5f0179c:
Also centralized request-tier gating so streaming requests and Validation completed:
|
github-actions
Bot
added
awaiting-review
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Responsibility and scope
Centralizes the shared service-tier primitives used by provider request construction so later stack layers can consume one canonical representation. Tests travel with the behavior in this PR.
Behavior and non-goals
Task.throttle.test.tsfix.Test evidence
Stack dependency
main).Review and merge this PR first; each subsequent PR is based on the preceding contributor branch.
Summary by CodeRabbit
New Features
Bug Fixes
Tests